From 6c7736b81ed56be7d77166c3c7072cfbd37f35aa Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 9 Oct 2024 13:14:26 +0200
Subject: [PATCH] Improve box item move modal [SCI-11162]

---
 app/javascript/vue/storage_locations/container.vue   |  5 +++++
 .../vue/storage_locations/modals/assign.vue          | 12 +++++++++---
 config/locales/en.yml                                |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/javascript/vue/storage_locations/container.vue b/app/javascript/vue/storage_locations/container.vue
index 2cd4913e2..d4314000d 100644
--- a/app/javascript/vue/storage_locations/container.vue
+++ b/app/javascript/vue/storage_locations/container.vue
@@ -34,6 +34,7 @@
         :selectedContainer="assignToContainer"
         :selectedPosition="assignToPosition"
         :selectedRow="rowIdToMove"
+        :selectedRowName="rowNameToMove"
         :cellId="cellIdToUnassign"
         @close="openAssignModal = false; resetTableSearch(); this.reloadingTable = true"
       ></AssignModal>
@@ -115,6 +116,7 @@ export default {
       assignToPosition: null,
       assignToContainer: null,
       rowIdToMove: null,
+      rowNameToMove: null,
       cellIdToUnassign: null,
       assignMode: 'assign',
       storageLocationUnassignDescription: ''
@@ -219,6 +221,7 @@ export default {
     assignRow() {
       this.openAssignModal = true;
       this.rowIdToMove = null;
+      this.rowNameToMove = null;
       this.assignToContainer = this.containerId;
       this.assignToPosition = null;
       this.cellIdToUnassign = null;
@@ -227,6 +230,7 @@ export default {
     assignRowToPosition(position) {
       this.openAssignModal = true;
       this.rowIdToMove = null;
+      this.rowNameToMove = null;
       this.assignToContainer = this.containerId;
       this.assignToPosition = position;
       this.cellIdToUnassign = null;
@@ -235,6 +239,7 @@ export default {
     moveRow(_event, data) {
       this.openAssignModal = true;
       this.rowIdToMove = data[0].row_id;
+      this.rowNameToMove = data[0].row_name || this.i18n.t('storage_locations.show.hidden');
       this.assignToContainer = null;
       this.assignToPosition = null;
       this.cellIdToUnassign = data[0].id;
diff --git a/app/javascript/vue/storage_locations/modals/assign.vue b/app/javascript/vue/storage_locations/modals/assign.vue
index 2cb53d78f..d99290704 100644
--- a/app/javascript/vue/storage_locations/modals/assign.vue
+++ b/app/javascript/vue/storage_locations/modals/assign.vue
@@ -10,19 +10,25 @@
             <h4 v-if="selectedPosition" class="modal-title truncate !block">
               {{ i18n.t(`storage_locations.show.assign_modal.selected_position_title`, { position: formattedPosition }) }}
             </h4>
-            <h4 v-else-if="selectedRow && selectedRowName" class="modal-title truncate !block">
+            <h4 v-else-if="assignMode === 'assign' && selectedRow && selectedRowName" class="modal-title truncate !block">
               {{ i18n.t(`storage_locations.show.assign_modal.selected_row_title`) }}
             </h4>
+            <h4 v-else-if="assignMode === 'move'" class="modal-title truncate !block">
+              {{ i18n.t(`storage_locations.show.assign_modal.move_title`, { name: selectedRowName }) }}
+            </h4>
             <h4 v-else class="modal-title truncate !block">
-              {{ i18n.t(`storage_locations.show.assign_modal.${assignMode}_title`) }}
+              {{ i18n.t(`storage_locations.show.assign_modal.assign_title`) }}
             </h4>
           </div>
           <div class="modal-body">
             <p v-if="selectedRow && selectedRowName" class="mb-4">
               {{ i18n.t(`storage_locations.show.assign_modal.selected_row_description`, { name: selectedRowName }) }}
             </p>
+            <h4 v-else-if="assignMode === 'move'" class="modal-title truncate !block">
+              {{ i18n.t(`storage_locations.show.assign_modal.move_description`, { name: selectedRowName }) }}
+            </h4>
             <p v-else class="mb-4">
-              {{ i18n.t(`storage_locations.show.assign_modal.${assignMode}_description`) }}
+              {{ i18n.t(`storage_locations.show.assign_modal.assign_description`) }}
             </p>
             <RowSelector v-if="!selectedRow" @change="this.rowId = $event" class="mb-4"></RowSelector>
             <ContainerSelector v-if="!selectedContainer" @change="this.containerId = $event"></ContainerSelector>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 780dbbe20..37872d19b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2696,9 +2696,9 @@ en:
         selected_position_title: 'Assign to position %{position}'
         selected_row_title: 'Assign new location'
         assign_title: 'Assign position'
-        move_title: 'Move item'
+        move_title: 'Move %{name}'
         assign_description: 'Select an item to assign it to a location.'
-        move_description: 'Select a new location for your item.'
+        move_description: 'Select where you want to move %{name}.'
         selected_row_description: "Select a location for the item %{name}."
         assign_action: 'Assign'
         move_action: 'Move'