From 7ee3f10247f1c68a19dade24657cad5284de4cb6 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 8 Oct 2024 13:50:12 +0200
Subject: [PATCH 01/20] Add legacy support for modals [SCI-11155]

---
 app/javascript/vue/shared/datatable/action_toolbar.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/vue/shared/datatable/action_toolbar.vue b/app/javascript/vue/shared/datatable/action_toolbar.vue
index 6d97bfb6c..9486b946b 100644
--- a/app/javascript/vue/shared/datatable/action_toolbar.vue
+++ b/app/javascript/vue/shared/datatable/action_toolbar.vue
@@ -11,6 +11,8 @@
         <a :class="`rounded flex gap-2 items-center py-1.5 px-1.5 xl:px-2.5 hover:text-sn-white hover:bg-sn-blue
                   bg-sn-white color-sn-blue hover:no-underline focus:no-underline ${action.button_class}`"
           :href="(['link', 'remote-modal']).includes(action.type) ? action.path : '#'"
+          :data-target="action.target"
+          :data-toggle="action.type === 'modal' && 'modal'"
           :id="action.button_id"
           :title="action.label"
           :data-e2e="`e2e-BT-actionToolbar-${action.name}`"
@@ -64,6 +66,9 @@ export default {
           this.$emit('toolbar:action', action);
           // do nothing, this is handled by legacy code based on the button class
           break;
+        case 'modal':
+          // do nothihg, boostrap modal handled by data-toggle="modal" and data-target
+          break;
         case 'link':
           // do nothing, already handled by href
           break;

From e88cc66e69ae1c05f9432d0c8b6cf7ff84df74a1 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 8 Oct 2024 14:39:08 +0200
Subject: [PATCH 02/20] Fix for storage locations import [SCI-11152]

---
 app/services/storage_locations/import_service.rb | 4 +++-
 config/locales/en.yml                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/services/storage_locations/import_service.rb b/app/services/storage_locations/import_service.rb
index 74f55c883..70bcb6ab0 100644
--- a/app/services/storage_locations/import_service.rb
+++ b/app/services/storage_locations/import_service.rb
@@ -15,7 +15,7 @@ module StorageLocations
     end
 
     def import_items
-      @rows = SpreadsheetParser.spreadsheet_enumerator(@sheet).reject { |r| r.all?(&:blank?) }
+      @rows = SpreadsheetParser.spreadsheet_enumerator(@sheet).to_a
 
       # Check if the file has proper headers
       header = SpreadsheetParser.parse_row(@rows[0], @sheet)
@@ -73,6 +73,8 @@ module StorageLocations
           repository_row_id: (row[1].to_s.gsub('IT', '') if row[1].present?)
         }
       end
+
+      @rows.reject! { |r| r[:repository_row_id].blank? && r[:position].blank? }
     end
 
     def import_row!(row)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fbd20bce..780dbbe20 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2709,7 +2709,7 @@ en:
       import_modal:
         import_button: 'Import items'
         title: "Import items to a box"
-        description: "Import items to a box allows for assigning items to a box and updating positions within a grid box. First, export the current box data to download a file listing the items already in the box. Then, edit the exported file to add or update the items you want to place in the box. When importing the file, ensure it includes the ‘Position’ and ‘Item ID’ columns for a successful import."
+        description: "Import items to a box allows for assigning items to a box and updating positions within a grid box. First, export the current box data to download a file listing the items already in the box. Then, edit the exported file to add or update the items you want to place in the box. When importing the file, ensure it includes the ‘Box position’ and ‘Item ID’ columns for a successful import."
         export: "Export"
         export_button: "Export current box"
         import: "Import"

From 8ccc805cd872155c3742ff5a099c32928f07ad60 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 8 Oct 2024 15:22:25 +0200
Subject: [PATCH 03/20] Fix shared location duplication [SCI-11161]

---
 app/controllers/storage_locations_controller.rb |  2 +-
 app/models/storage_location.rb                  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
index 13da18b9c..43e3a6588 100644
--- a/app/controllers/storage_locations_controller.rb
+++ b/app/controllers/storage_locations_controller.rb
@@ -86,7 +86,7 @@ class StorageLocationsController < ApplicationController
 
   def duplicate
     ActiveRecord::Base.transaction do
-      new_storage_location = @storage_location.duplicate!(current_user)
+      new_storage_location = @storage_location.duplicate!(current_user, current_team)
       if new_storage_location
         @storage_location = new_storage_location
         log_activity('storage_location_created')
diff --git a/app/models/storage_location.rb b/app/models/storage_location.rb
index c2880c6fc..2553e9132 100644
--- a/app/models/storage_location.rb
+++ b/app/models/storage_location.rb
@@ -61,14 +61,15 @@ class StorageLocation < ApplicationRecord
     storage_location_repository_rows.count.zero?
   end
 
-  def duplicate!(user)
+  def duplicate!(user, team)
     ActiveRecord::Base.transaction do
       new_storage_location = dup
       new_storage_location.name = next_clone_name
+      new_storage_location.team = team unless parent_id
       new_storage_location.created_by = user
       new_storage_location.save!
       copy_image(self, new_storage_location)
-      recursive_duplicate(id, new_storage_location.id, user)
+      recursive_duplicate(id, new_storage_location.id, user, new_storage_location.team)
       new_storage_location
     rescue ActiveRecord::RecordInvalid
       false
@@ -144,14 +145,15 @@ class StorageLocation < ApplicationRecord
 
   private
 
-  def recursive_duplicate(old_parent_id = nil, new_parent_id = nil, user = nil)
+  def recursive_duplicate(old_parent_id = nil, new_parent_id = nil, user = nil, team = nil)
     StorageLocation.where(parent_id: old_parent_id).find_each do |child|
       new_child = child.dup
       new_child.parent_id = new_parent_id
+      new_child.team = team
       new_child.created_by = user
       new_child.save!
       copy_image(child, new_child)
-      recursive_duplicate(child.id, new_child.id, user)
+      recursive_duplicate(child.id, new_child.id, user, team)
     end
   end
 

From 024486d1402bf8bcdd556e0d8eb6d0be8e89c26d Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 9 Oct 2024 10:26:34 +0200
Subject: [PATCH 04/20] Fix moving inside shared storage locations [SCI-11149]

---
 app/controllers/storage_locations_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
index 13da18b9c..bdd615100 100644
--- a/app/controllers/storage_locations_controller.rb
+++ b/app/controllers/storage_locations_controller.rb
@@ -104,9 +104,11 @@ class StorageLocationsController < ApplicationController
         if move_params[:destination_storage_location_id] == 'root_storage_location'
           nil
         else
-          current_team.storage_locations.find(move_params[:destination_storage_location_id])
+          StorageLocation.find(move_params[:destination_storage_location_id])
         end
 
+      render_403 and return unless can_manage_storage_location?(destination_storage_location)
+
       @storage_location.update!(parent: destination_storage_location)
 
       log_activity('storage_location_moved', {

From 826feea2bb89ec59faf7a3114f263fbeae5d485f Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 9 Oct 2024 10:37:56 +0200
Subject: [PATCH 05/20] Add validation for unselected container [SCI-11167]

---
 app/javascript/vue/storage_locations/modals/assign.vue | 7 +++++--
 app/javascript/vue/storage_locations/modals/move.vue   | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/javascript/vue/storage_locations/modals/assign.vue b/app/javascript/vue/storage_locations/modals/assign.vue
index 2cb53d78f..0a97fe58e 100644
--- a/app/javascript/vue/storage_locations/modals/assign.vue
+++ b/app/javascript/vue/storage_locations/modals/assign.vue
@@ -27,14 +27,14 @@
             <RowSelector v-if="!selectedRow" @change="this.rowId = $event" class="mb-4"></RowSelector>
             <ContainerSelector v-if="!selectedContainer" @change="this.containerId = $event"></ContainerSelector>
             <PositionSelector
-              v-if="containerId && !selectedPosition"
+              v-if="containerId && containerId > 0 && !selectedPosition"
               :key="containerId"
               :selectedContainerId="containerId"
               @change="this.position = $event"></PositionSelector>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ i18n.t('general.cancel') }}</button>
-            <button class="btn btn-primary" type="submit">
+            <button class="btn btn-primary" type="submit" :disabled="!validObject">
               {{ i18n.t(`storage_locations.show.assign_modal.${assignMode}_action`) }}
             </button>
           </div>
@@ -70,6 +70,9 @@ export default {
   },
   mixins: [modalMixin],
   computed: {
+    validObject() {
+      return this.rowId && this.containerId && this.containerId > 0 && this.position;
+    },
     createUrl() {
       return storage_location_storage_location_repository_rows_path({
         storage_location_id: this.containerId
diff --git a/app/javascript/vue/storage_locations/modals/move.vue b/app/javascript/vue/storage_locations/modals/move.vue
index fd8cb851d..741bf8dd0 100644
--- a/app/javascript/vue/storage_locations/modals/move.vue
+++ b/app/javascript/vue/storage_locations/modals/move.vue
@@ -43,7 +43,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ i18n.t('general.cancel') }}</button>
-            <button class="btn btn-primary" type="submit">
+            <button class="btn btn-primary" :disabled="!validContainer" type="submit">
               {{ i18n.t('general.move') }}
             </button>
           </div>
@@ -69,6 +69,11 @@ export default {
   created() {
     this.teamId = this.selectedObject.team_id;
   },
+  computed: {
+    validContainer() {
+      return (this.selectedStorageLocationId && this.selectedStorageLocationId > 0) || this.selectedStorageLocationId === null;
+    }
+  },
   mixins: [modalMixin, MoveTreeMixin],
   data() {
     return {

From 746ac085077beb9581315a0d453de36eb4b2e7cb Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 9 Oct 2024 11:13:19 +0200
Subject: [PATCH 06/20] Add warning modal when unsharing inventories from teams
 [SCI-11159]

---
 app/javascript/vue/repositories/table.vue | 19 ++++++++++++
 app/javascript/vue/shared/share_modal.vue | 37 +++++++++++++++++++----
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/app/javascript/vue/repositories/table.vue b/app/javascript/vue/repositories/table.vue
index 9aaf91157..a7c11ce8e 100644
--- a/app/javascript/vue/repositories/table.vue
+++ b/app/javascript/vue/repositories/table.vue
@@ -54,8 +54,27 @@
     v-if="shareRepository"
     :object="shareRepository"
     :globalShareEnabled="true"
+    :confirmationModal="$refs.shareConfirmationModal"
     @close="shareRepository = null"
     @share="updateTable" />
+  <ConfirmationModal
+    ref="shareConfirmationModal"
+    :title="i18n.t('repositories.index.modal_confirm_sharing.title')"
+    :description="`
+      <p>${i18n.t('repositories.index.modal_confirm_sharing.description_1')}</p>
+      <p><b>${i18n.t('repositories.index.modal_confirm_sharing.description_2')}</b></p>
+    `"
+    :confirmClass="'btn btn-danger'"
+    :confirmText="i18n.t('repositories.index.modal_confirm_sharing.confirm')"
+    :e2eAttributes="{
+          modalName: 'e2e-MD-confirmSharingChanges',
+          title: 'e2e-TX-confirmSharingChangesModal-title',
+          content: 'e2e-TX-confirmSharingChangesModal-content',
+          close: 'e2e-BT-confirmSharingChangesModal-close',
+          cancel: 'e2e-BT-confirmSharingChangesModal-cancel',
+          confirm: 'e2e-BT-confirmSharingChangesModal-delete'
+    }"
+  ></ConfirmationModal>
 </template>
 
 <script>
diff --git a/app/javascript/vue/shared/share_modal.vue b/app/javascript/vue/shared/share_modal.vue
index 802bcd207..1b41f577a 100644
--- a/app/javascript/vue/shared/share_modal.vue
+++ b/app/javascript/vue/shared/share_modal.vue
@@ -77,27 +77,52 @@ export default {
   name: 'ShareObjectModal',
   props: {
     object: Object,
-    globalShareEnabled: { type: Boolean, default: false }
+    globalShareEnabled: { type: Boolean, default: false },
+    confirmationModal: { type: Object }
   },
   mixins: [modalMixin],
   data() {
     return {
       sharedWithAllRead: this.object.shared_read || this.object.shared_write,
       sharedWithAllWrite: this.object.shared_write,
-      shareableTeams: [],
-      permission_changes: {}
+      initialState: {},
+      shareableTeams: []
     };
   },
   mounted() {
-    this.getTeams();
+    this.initTeams();
+  },
+  computed: {
+    willUnshare() {
+      if (this.globalShareEnabled && !this.sharedWithAllRead && this.initialState.sharedWithAllRead) return true;
+
+      // true if any team would switch from shared to unshared, based on initial state
+      return this.shareableTeams.some((t) => {
+        return this.initialState.shareableTeams.find((it) => t.id === it.id).attributes.private_shared_with && !t.attributes.private_shared_with;
+      });
+    }
   },
   methods: {
-    getTeams() {
+    initTeams() {
       axios.get(this.object.urls.shareable_teams).then((response) => {
+        this.initialState = {
+          shareableTeams: JSON.parse(JSON.stringify(response.data.data)), // object needs to be deep cloned to get rid of references
+          sharedWithAllRead: this.sharedWithAllRead,
+          sharedWithAllWrite: this.sharedWithAllWrite
+        };
         this.shareableTeams = response.data.data;
       });
     },
-    submit() {
+    async submit() {
+      $(this.$refs.modal).hide();
+
+      if (this.confirmationModal ? !this.willUnshare || await this.confirmationModal.show() : true) {
+        this.doRequest();
+      } else {
+        $(this.$refs.modal).show();
+      }
+    },
+    doRequest() {
       const data = {
         select_all_teams: this.sharedWithAllRead,
         select_all_write_permission: this.sharedWithAllWrite,

From 250eba45e01305eb5da327244df327cd49d89491 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 9 Oct 2024 11:17:57 +0200
Subject: [PATCH 07/20] Add missing trasnlations for confirmation modal
 [SCI-11159]

---
 config/locales/en.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fbd20bce..d02f0e94d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2014,6 +2014,11 @@ en:
         name_placeholder: "My inventory"
         submit: "Create"
         success_flash_html: "Inventory <strong>%{name}</strong> successfully created."
+      modal_confirm_sharing:
+        title: "Inventory sharing changes"
+        description_1: "You will no longer share this inventory with some of the teams. All unshared inventory items assigned to tasks will be automatically removed and this action is irreversible."
+        description_2: "Are you sure you want to apply the changes you made?"
+        confirm: "Apply"
       export:
         notification:
           error:

From c22998adf23ca1b1891e41481a4935125329c1c2 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Wed, 9 Oct 2024 11:43:09 +0200
Subject: [PATCH 08/20] Fix repository snapshots datatable loading with active
 reminders [SCI-11134] (#7947)

---
 app/services/repository_datatable_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/repository_datatable_service.rb b/app/services/repository_datatable_service.rb
index 8b96a60d3..ade46fb1f 100644
--- a/app/services/repository_datatable_service.rb
+++ b/app/services/repository_datatable_service.rb
@@ -83,7 +83,7 @@ class RepositoryDatatableService
       repository_rows =
         if @repository.archived? || @repository.is_a?(RepositorySnapshot)
           # don't load reminders for archived repositories or snapshots
-          repository_rows.select('FALSE AS has_active_stock_reminders, FALSE AS has_active_datetime_reminders')
+          repository_rows.select('FALSE AS has_active_reminders')
         else
           repository_rows.left_outer_joins_active_reminders(@repository, @user)
                          .select('COUNT(repository_cells_with_active_reminders.id) > 0 AS has_active_reminders')

From ca944f1bf705b8b788ca4bef6f3aba84420c6ed8 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 9 Oct 2024 11:44:49 +0200
Subject: [PATCH 09/20] Fix storage location item move activity [SCI-11164]

---
 .../storage_location_repository_rows_controller.rb    | 11 ++++++++++-
 config/locales/global_activities/en.yml               |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/controllers/storage_location_repository_rows_controller.rb b/app/controllers/storage_location_repository_rows_controller.rb
index 4ffa5365b..579516a75 100644
--- a/app/controllers/storage_location_repository_rows_controller.rb
+++ b/app/controllers/storage_location_repository_rows_controller.rb
@@ -54,6 +54,9 @@ class StorageLocationRepositoryRowsController < ApplicationController
 
   def move
     ActiveRecord::Base.transaction do
+      @original_storage_location = @storage_location_repository_row.storage_location
+      @original_position = @storage_location_repository_row.human_readable_position
+
       @storage_location_repository_row.discard
       @storage_location_repository_row = StorageLocationRepositoryRow.create!(
         repository_row: @repository_row,
@@ -61,7 +64,13 @@ class StorageLocationRepositoryRowsController < ApplicationController
         metadata: storage_location_repository_row_params[:metadata] || {},
         created_by: current_user
       )
-      log_activity(:storage_location_repository_row_moved)
+      log_activity(
+        :storage_location_repository_row_moved,
+        {
+          storage_location_original: @original_storage_location.id,
+          position_original: @original_position
+        }
+      )
       render json: @storage_location_repository_row,
              serializer: Lists::StorageLocationRepositoryRowSerializer
     rescue ActiveRecord::RecordInvalid => e
diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml
index 6d1a470a1..9e4f337d4 100644
--- a/config/locales/global_activities/en.yml
+++ b/config/locales/global_activities/en.yml
@@ -338,7 +338,7 @@ en:
       container_storage_location_sharing_updated_html: "%{user} changed permission of shared box %{storage_location} with team %{team} to %{permission_level}."
       storage_location_repository_row_created_html: "%{user} assigned %{repository_row} to box %{storage_location} %{position}."
       storage_location_repository_row_deleted_html: "%{user} unassigned %{repository_row} from box %{storage_location} %{position}."
-      storage_location_repository_row_moved_html: "%{user} moved item %{repository_row} from box %{storage_location_original} %{positions} to box %{storage_location_destination} %{positions}."
+      storage_location_repository_row_moved_html: "%{user} moved item %{repository_row} from box %{storage_location_original} %{position_original} to box %{storage_location} %{position}."
       container_storage_location_imported_html: "%{user} assigned %{assigned_count} item(s) and unassigned %{unassigned_count} item(s) by import to %{storage_location}."
     activity_name:
       create_project: "Project created"

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 10/20] 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'

From 63a470a8acdde88a9c3b034cc368965b415f9493 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Wed, 9 Oct 2024 15:10:35 +0200
Subject: [PATCH 11/20] Fix inventory snapshot loading in full view [SCI-11168]
 (#7954)

---
 app/services/repository_snapshot_datatable_service.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/services/repository_snapshot_datatable_service.rb b/app/services/repository_snapshot_datatable_service.rb
index ca2ff4b38..eaaef2390 100644
--- a/app/services/repository_snapshot_datatable_service.rb
+++ b/app/services/repository_snapshot_datatable_service.rb
@@ -20,6 +20,8 @@ class RepositorySnapshotDatatableService < RepositoryDatatableService
     repository_rows = fetch_rows(search_value).preload(Extends::REPOSITORY_ROWS_PRELOAD_RELATIONS)
     repository_rows = repository_rows.preload(:repository_columns, repository_cells: { value: @repository.cell_preload_includes }) if @preload_cells
     repository_rows = repository_rows.preload(:repository_stock_cell, :repository_stock_value) if @repository.has_stock_management?
+    # don't load reminders for snapshots
+    repository_rows = repository_rows.select('FALSE AS has_active_reminders') if Repository.reminders_enabled?
 
     sort_rows(order_by_column, repository_rows)
   end

From ac1fda35616ec814831767ded464a2d202c28de6 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 10 Oct 2024 11:16:23 +0200
Subject: [PATCH 12/20] Fix moving location to root [SCI-11149]

---
 app/controllers/storage_locations_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
index c27da478d..75673efc4 100644
--- a/app/controllers/storage_locations_controller.rb
+++ b/app/controllers/storage_locations_controller.rb
@@ -107,7 +107,7 @@ class StorageLocationsController < ApplicationController
           StorageLocation.find(move_params[:destination_storage_location_id])
         end
 
-      render_403 and return unless can_manage_storage_location?(destination_storage_location)
+      render_403 and return if destination_storage_location && !can_manage_storage_location?(destination_storage_location)
 
       @storage_location.update!(parent: destination_storage_location)
 

From 40a7b88d1a051a6bbe378c6b58052a34b0431aa3 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 10 Oct 2024 12:55:03 +0200
Subject: [PATCH 13/20] Add warning for unsharing repository relationships
 [SCI-11110]

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7cfb1ea56..6aecb3170 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2016,7 +2016,7 @@ en:
         success_flash_html: "Inventory <strong>%{name}</strong> successfully created."
       modal_confirm_sharing:
         title: "Inventory sharing changes"
-        description_1: "You will no longer share this inventory with some of the teams. All unshared inventory items assigned to tasks will be automatically removed and this action is irreversible."
+        description_1: "You will no longer share this inventory with some of the teams. All unshared inventory items assigned to tasks will be automatically removed and this action is irreversible. Any item relationship links (if they exist) will also be deleted."
         description_2: "Are you sure you want to apply the changes you made?"
         confirm: "Apply"
       export:

From 02921072459a89df040000cc92c1922dc7ef40db Mon Sep 17 00:00:00 2001
From: Klemen Benedicic <klemen.benedicic@scinote.net>
Date: Wed, 9 Oct 2024 13:48:51 +0200
Subject: [PATCH 14/20] Add data-e2e to reorderable items and manage access
 modals [SCI-11055]

---
 app/javascript/vue/protocol/container.vue     |  1 +
 app/javascript/vue/protocol/step.vue          |  2 +-
 app/javascript/vue/protocols/modals/new.vue   |  7 +++-
 app/javascript/vue/results/result.vue         |  1 +
 .../vue/shared/access_modal/assign_flyout.vue | 37 ++++++++++++-----
 .../vue/shared/access_modal/edit.vue          | 41 ++++++++++++++-----
 .../vue/shared/access_modal/modal.vue         | 11 +++--
 .../vue/shared/reorderable_items_modal.vue    | 32 +++++++++++----
 8 files changed, 98 insertions(+), 34 deletions(-)

diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue
index d03b02909..a85f124d5 100644
--- a/app/javascript/vue/protocol/container.vue
+++ b/app/javascript/vue/protocol/container.vue
@@ -225,6 +225,7 @@
       :title="i18n.t('protocols.reorder_steps.modal.title')"
       :items="steps"
       :includeNumbers="true"
+      dataE2e="protocol-templateSteps-reorder"
       @reorder="updateStepOrder"
       @close="closeStepReorderModal"
     />
diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index 88a7dd2b0..0546f3f04 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -162,7 +162,7 @@
     <ReorderableItemsModal v-if="reordering"
       :title="i18n.t('protocols.steps.modals.reorder_elements.title', { step_position: step.attributes.position + 1 })"
       :items="reorderableElements"
-      :dataE2e="`e2e-BT-protocol-step${step.id}-reorder`"
+      :dataE2e="`protocol-step${step.id}-reorder`"
       @reorder="updateElementOrder"
       @close="closeReorderModal"
     />
diff --git a/app/javascript/vue/protocols/modals/new.vue b/app/javascript/vue/protocols/modals/new.vue
index f97c78ae4..1ca7c71e7 100644
--- a/app/javascript/vue/protocols/modals/new.vue
+++ b/app/javascript/vue/protocols/modals/new.vue
@@ -31,7 +31,12 @@
             </div>
             <div class="mt-6" :class="{'hidden': !visible}">
               <label class="sci-label">{{ i18n.t("protocols.new_protocol_modal.role_label") }}</label>
-              <SelectDropdown :options="userRoles" :value="defaultRole" @change="changeRole" />
+              <SelectDropdown
+                :options="userRoles"
+                :value="defaultRole"
+                :data-e2e="`e2e-DD-newProtocolModal-defaultUserRole`"
+                @change="changeRole"
+              />
             </div>
           </div>
           <div class="modal-footer">
diff --git a/app/javascript/vue/results/result.vue b/app/javascript/vue/results/result.vue
index b67181a73..3dac62e7f 100644
--- a/app/javascript/vue/results/result.vue
+++ b/app/javascript/vue/results/result.vue
@@ -97,6 +97,7 @@
       <ReorderableItemsModal v-if="reordering"
         :title="i18n.t('my_modules.modals.reorder_results.title')"
         :items="reorderableElements"
+        :dataE2e="`task-result${result.id}-reorder`"
         @reorder="updateElementOrder"
         @close="closeReorderModal"
       />
diff --git a/app/javascript/vue/shared/access_modal/assign_flyout.vue b/app/javascript/vue/shared/access_modal/assign_flyout.vue
index f45d66d78..b7fc01bc2 100644
--- a/app/javascript/vue/shared/access_modal/assign_flyout.vue
+++ b/app/javascript/vue/shared/access_modal/assign_flyout.vue
@@ -1,22 +1,27 @@
 <template>
   <div class="mb-6">
-    <div class="sci-label mb-2">
+    <div class="sci-label mb-2" :data-e2e="`e2e-TX-${dataE2e}-grantAccessLabel`">
       {{ i18n.t('access_permissions.partials.new_assignments_form.grant_access') }}
     </div>
     <GeneralDropdown ref="dropdown" @open="$emit('assigningNewUsers', true)" @close="$emit('assigningNewUsers', false)" :fieldOnlyOpen="true" :fixed-width="true">
       <template v-slot:field>
         <div class="sci-input-container-v2 left-icon">
-          <input type="text" v-model="query" class="sci-input-field"
-                  :placeholder="i18n.t('access_permissions.partials.new_assignments_form.find_people_html')" />
-          <i class="sn-icon sn-icon-search"></i>
+          <input
+            type="text"
+            v-model="query"
+            class="sci-input-field"
+            :placeholder="i18n.t('access_permissions.partials.new_assignments_form.find_people_html')"
+            :data-e2e="`e2e-IF-${dataE2e}-searchUsers`"
+          />
+          <i class="sn-icon sn-icon-search" :data-e2e="`e2e-IC-${dataE2e}-searchUsers`"></i>
         </div>
       </template>
       <template v-slot:flyout>
         <div v-if="!visible && roles.length > 0" class="py-2 flex border-solid border-0 border-b border-b-sn-sleepy-grey items-center gap-2">
           <div>
-            <img src="/images/icon/team.png" class="rounded-full w-8 h-8">
+            <img src="/images/icon/team.png" class="rounded-full w-8 h-8" :data-e2e="`e2e-IC-${dataE2e}-grantAccessTeam`">
           </div>
-          <div>
+          <div :data-e2e="`e2e-TX-${dataE2e}-grantAccessTeam`">
             {{ i18n.t('user_assignment.assign_all_team_members') }}
           </div>
           <MenuDropdown
@@ -25,16 +30,23 @@
             btnText="Assign"
             :position="'right'"
             :caret="true"
+            :data-e2e="`e2e-DD-${dataE2e}-grantAccessTeam`"
             @setRole="(...args) => this.assignRole('all', ...args)"
           ></MenuDropdown>
         </div>
         <perfect-scrollbar class="max-h-80 relative">
           <div v-for="user in filteredUsers" :key="user.id" class="py-2 flex items-center w-full">
             <div>
-              <img :src="user.attributes.avatar_url" class="rounded-full w-8 h-8">
+              <img :src="user.attributes.avatar_url" class="rounded-full w-8 h-8" :data-e2e="`e2e-IC-${dataE2e}-${user.attributes.name.replace(/\W/g, '')}-grantAccess`">
             </div>
-            <div class="truncate ml-2" :title="user.attributes.name">{{ user.attributes.name }}</div>
-            <div v-if="user.attributes.current_user" class="text-nowrap ml-1">
+            <div
+              class="truncate ml-2"
+              :title="user.attributes.name"
+              :data-e2e="`e2e-TX-${dataE2e}-${user.attributes.name.replace(/\W/g, '')}-grantAccess-name`"
+            >
+              {{ user.attributes.name }}
+            </div>
+            <div v-if="user.attributes.current_user" class="text-nowrap ml-1" :data-e2e="`e2e-TX-${dataE2e}-${user.attributes.name.replace(/\W/g, '')}-grantAccess-permission`">
               {{ `(${i18n.t('access_permissions.you')})` }}
             </div>
             <MenuDropdown
@@ -43,10 +55,11 @@
               btnText="Assign"
               :position="'right'"
               :caret="true"
+              :data-e2e="`e2e-DD-${dataE2e}-${user.attributes.name.replace(/\W/g, '')}-grantAccess`"
               @setRole="(...args) => this.assignRole(user.id, ...args)"
             ></MenuDropdown>
           </div>
-          <div v-if="filteredUsers.length === 0" class="p-2 flex items-center w-full">
+          <div v-if="filteredUsers.length === 0" class="p-2 flex items-center w-full" :data-e2e="`e2e-TX-${dataE2e.replace(/\W/g, '')}-grantAccess-noResults`">
             {{ i18n.t('access_permissions.no_results') }}
           </div>
         </perfect-scrollbar>
@@ -76,6 +89,10 @@ export default {
     },
     reloadUsers: {
       type: Boolean
+    },
+    dataE2e: {
+      type: String,
+      default: ''
     }
   },
   mounted() {
diff --git a/app/javascript/vue/shared/access_modal/edit.vue b/app/javascript/vue/shared/access_modal/edit.vue
index 71ead9411..a483430b2 100644
--- a/app/javascript/vue/shared/access_modal/edit.vue
+++ b/app/javascript/vue/shared/access_modal/edit.vue
@@ -3,14 +3,14 @@
     <perfect-scrollbar class="h-[50vh] relative">
       <div v-if="roles.length > 0 && visible && default_role" class="p-2 flex items-center gap-2 border-solid border-0 border-b border-b-sn-sleepy-grey">
         <div>
-          <img src="/images/icon/team.png" class="rounded-full w-8 h-8">
+          <img src="/images/icon/team.png" class="rounded-full w-8 h-8" :data-e2e="`e2e-IC-${dataE2e}-everyoneElse-team`">
         </div>
-        <div>
+        <div :data-e2e="`e2e-TX-${dataE2e}-everyoneElse`">
           {{ i18n.t('access_permissions.everyone_else', { team_name: params.object.team }) }}
         </div>
         <GeneralDropdown @open="loadUsers" @close="closeFlyout">
           <template v-slot:field>
-            <i class="sn-icon sn-icon-info"></i>
+            <i class="sn-icon sn-icon-info" :data-e2e="`e2e-IC-${dataE2e}-everyoneElse-info`"></i>
           </template>
           <template v-slot:flyout>
             <perfect-scrollbar class="flex flex-col max-h-96 max-w-[280px] relative pr-4 gap-y-px">
@@ -18,8 +18,12 @@
                   :key="user.attributes.user.id"
                   :title="user.attributes.user.name"
                   class="rounded px-3 py-2.5 flex items-center hover:no-underline leading-5 gap-2">
-                <img :src="user.attributes.user.avatar_url" class="w-6 h-6 rounded-full">
-                <span class="truncate">{{ user.attributes.user.name }}</span>
+                <img
+                  :src="user.attributes.user.avatar_url"
+                  class="w-6 h-6 rounded-full"
+                  :data-e2e="`e2e-IC-${dataE2e}-everyoneElse-${user.attributes.user.name.replace(/\W/g, '')}`"
+                >
+                <span class="truncate" :data-e2e="`e2e-TX-${dataE2e}-everyoneElse-${user.attributes.user.name.replace(/\W/g, '')}`">{{ user.attributes.user.name }}</span>
               </div>
             </perfect-scrollbar>
           </template>
@@ -31,6 +35,7 @@
           :btnText="this.roles.find((role) => role[0] == default_role)[1]"
           :position="'right'"
           :caret="true"
+          :data-e2e="`e2e-DD-${dataE2e}-everyoneElse-roles`"
           @setRole="(...args) => this.changeDefaultRole(...args)"
           @removeRole="() => this.changeDefaultRole()"
         ></MenuDropdown>
@@ -43,18 +48,29 @@
             :key="userAssignment.id"
             class="p-2 flex items-center gap-2">
         <div>
-          <img :src="userAssignment.attributes.user.avatar_url" class="rounded-full w-8 h-8">
+          <img
+            class="rounded-full w-8 h-8"
+            :src="userAssignment.attributes.user.avatar_url"
+            :data-e2e="`e2e-IC-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}`"
+          >
         </div>
         <div class="truncate">
           <div class="flex flex-row gap-2">
             <div class="truncate"
                 :title="userAssignment.attributes.user.name"
+                :data-e2e="`e2e-TX-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-name`"
             >{{ userAssignment.attributes.user.name }}</div>
-            <div v-if="userAssignment.attributes.current_user" class="text-nowrap">
+            <div
+              v-if="userAssignment.attributes.current_user"
+              class="text-nowrap"
+              :data-e2e="`e2e-TX-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-currentUserLabel`"
+            >
               {{ `(${i18n.t('access_permissions.you')})` }}
             </div>
           </div>
-          <div class="text-xs text-sn-grey text-nowrap">{{ userAssignment.attributes.inherit_message }}</div>
+          <div class="text-xs text-sn-grey text-nowrap" :data-e2e="`e2e-TX-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-inheritLabel`">
+            {{ userAssignment.attributes.inherit_message }}
+          </div>
         </div>
         <MenuDropdown
           v-if="!userAssignment.attributes.last_owner && params.object.urls.update_access && !(userAssignment.attributes.current_user && userAssignment.attributes.inherit_message)"
@@ -63,10 +79,11 @@
           :btnText="userAssignment.attributes.user_role.name"
           :position="'right'"
           :caret="true"
+          :data-e2e="`e2e-DD-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-role`"
           @setRole="(...args) => this.changeRole(userAssignment.attributes.user.id, ...args)"
           @removeRole="() => this.removeRole(userAssignment.attributes.user.id)"
         ></MenuDropdown>
-        <div class="ml-auto btn btn-light pointer-events-none" v-else>
+        <div v-else class="ml-auto btn btn-light pointer-events-none" :data-e2e="`e2e-TX-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-role`">
           {{ userAssignment.attributes.user_role.name }}
           <div class="h-6 w-6"></div>
         </div>
@@ -78,7 +95,7 @@
 <script>
 /* global HelperModule */
 import MenuDropdown from '../menu_dropdown.vue';
-import GeneralDropdown from '../../shared/general_dropdown.vue';
+import GeneralDropdown from '../general_dropdown.vue';
 import axios from '../../../packs/custom_axios.js';
 
 export default {
@@ -96,6 +113,10 @@ export default {
     },
     reloadUsers: {
       type: Boolean
+    },
+    dataE2e: {
+      type: String,
+      default: ''
     }
   },
   mounted() {
diff --git a/app/javascript/vue/shared/access_modal/modal.vue b/app/javascript/vue/shared/access_modal/modal.vue
index bc623cb19..8ea738931 100644
--- a/app/javascript/vue/shared/access_modal/modal.vue
+++ b/app/javascript/vue/shared/access_modal/modal.vue
@@ -1,13 +1,14 @@
 <template>
   <div ref="modal" class="modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
-      <div class="modal-content">
+      <div class="modal-content" data-e2e="e2e-MD-manageAccess">
         <div class="modal-header">
           <button type="button"
                   class="close"
                   data-dismiss="modal"
-                  aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
-          <h4 class="modal-title truncate !block">
+                  aria-label="Close"
+                  data-e2e="e2e-BT-manageAccess-close"><i class="sn-icon sn-icon-close"></i></button>
+          <h4 class="modal-title truncate !block" data-e2e="e2e-TX-manageAccessModal-title">
             {{ i18n.t(`access_permissions.${params.object.type}.modals.edit_modal.title`, {
               resource_name: params.object.name
             }) }}
@@ -20,12 +21,13 @@
             :visible="visible"
             :default_role="default_role"
             :reloadUsers="reloadUnAssignedUsers"
+            :dataE2e="`manageAccessModal-flyout`"
             @modified="modified = true; reloadUsers = true"
             @assigningNewUsers="(v) => { assigningNewUsers = v }"
             @usersReloaded="reloadUnAssignedUsers = false"
             @changeVisibility="changeVisibility"
           />
-          <h5 class="py-2.5">
+          <h5 class="py-2.5" data-e2e="e2e-TX-manageAccessModal-peopleWithAccess">
             {{ i18n.t('access_permissions.partials.new_assignments_form.people_with_access') }}
           </h5>
           <editView
@@ -34,6 +36,7 @@
             :visible="visible"
             :default_role="default_role"
             :reloadUsers="reloadUsers"
+            :dataE2e="`manageAccessModal-usersWithAccess`"
             @modified="modified = true; reloadUnAssignedUsers = true"
             @usersReloaded="reloadUsers = false"
             @changeVisibility="changeVisibility"
diff --git a/app/javascript/vue/shared/reorderable_items_modal.vue b/app/javascript/vue/shared/reorderable_items_modal.vue
index d3218e906..c4fa0e762 100644
--- a/app/javascript/vue/shared/reorderable_items_modal.vue
+++ b/app/javascript/vue/shared/reorderable_items_modal.vue
@@ -1,10 +1,12 @@
 <template>
-  <div ref="modal" @keydown.esc="close" class="modal sci-reorderable-items" tabindex="-1" role="dialog">
+  <div ref="modal" @keydown.esc="close" class="modal sci-reorderable-items" tabindex="-1" role="dialog" :data-e2e="`e2e-MD-${dataE2e}`">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button @click="close" type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
-          <h4 class="modal-title">
+          <button @click="close" type="button" class="close" data-dismiss="modal" aria-label="Close" :data-e2e="`e2e-BT-${dataE2e}-close`">
+            <i class="sn-icon sn-icon-close"></i>
+          </button>
+          <h4 class="modal-title" :data-e2e="`e2e-TX-${dataE2e}-title`">
             {{ title }}
           </h4>
         </div>
@@ -20,13 +22,23 @@
             <template #item="{element, index}">
               <div class="step-element-header flex items-center">
                 <div class="step-element-grip step-element-grip--draggable">
-                  <i class="sn-icon sn-icon-drag"></i>
+                  <i class="sn-icon sn-icon-drag" :data-e2e="`e2e-BT-${dataE2e}-element${index + 1}-drag`"></i>
                 </div>
                 <div class="step-element-name text-center flex items-center gap-2">
-                  <strong v-if="includeNumbers" class="step-element-number">{{ index + 1 }}</strong>
-                  <i v-if="element.attributes.icon" class="fas" :class="element.attributes.icon"></i>
-                  <span :title="nameWithFallbacks(element)" v-if="nameWithFallbacks(element)">{{ nameWithFallbacks(element) }}</span>
-                  <span :title="element.attributes.placeholder" v-else class="step-element-name-placeholder">{{ element.attributes.placeholder }}</span>
+                  <strong v-if="includeNumbers" class="step-element-number" :data-e2e="`e2e-TX-${dataE2e}-element${index + 1}-position`">
+                    {{ index + 1 }}
+                  </strong>
+                  <i v-if="element.attributes.icon" class="fas" :class="element.attributes.icon" :data-e2e="`e2e-IC-${dataE2e}-element${index + 1}`"></i>
+                  <span
+                    :title="nameWithFallbacks(element)"
+                    v-if="nameWithFallbacks(element)"
+                    :data-e2e="`e2e-TX-${dataE2e}-element${index + 1}-name`"
+                  >
+                    {{ nameWithFallbacks(element) }}
+                  </span>
+                  <span :title="element.attributes.placeholder" v-else class="step-element-name-placeholder" :data-e2e="`e2e-TX-${dataE2e}-element${index + 1}-name`">
+                    {{ element.attributes.placeholder }}
+                  </span>
                 </div>
               </div>
             </template>
@@ -56,6 +68,10 @@ export default {
     includeNumbers: {
       type: Boolean,
       default: false
+    },
+    dataE2e: {
+      type: String,
+      default: ''
     }
   },
   data() {

From 26f832be96bd53416e9be491442782cc368713cd Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 10 Oct 2024 14:34:03 +0200
Subject: [PATCH 15/20] Remove position validation for non grid box [SCI-11175]

---
 app/javascript/vue/storage_locations/modals/assign.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/vue/storage_locations/modals/assign.vue b/app/javascript/vue/storage_locations/modals/assign.vue
index 5cf58e9da..86a7af71c 100644
--- a/app/javascript/vue/storage_locations/modals/assign.vue
+++ b/app/javascript/vue/storage_locations/modals/assign.vue
@@ -77,7 +77,7 @@ export default {
   mixins: [modalMixin],
   computed: {
     validObject() {
-      return this.rowId && this.containerId && this.containerId > 0 && this.position;
+      return this.rowId && this.containerId && this.containerId > 0;
     },
     createUrl() {
       return storage_location_storage_location_repository_rows_path({

From c18d2b31b2fc8a1044f5d4acb08dd7ebc1a0ff30 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Fri, 11 Oct 2024 10:00:46 +0200
Subject: [PATCH 16/20] Fix rendering of HTML elements in inventory tables
 [SCI-11176] (#7959)

---
 .../repository_datatable/repository_text_value_serializer.rb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/repository_datatable/repository_text_value_serializer.rb b/app/serializers/repository_datatable/repository_text_value_serializer.rb
index d851ad09b..e3820f992 100644
--- a/app/serializers/repository_datatable/repository_text_value_serializer.rb
+++ b/app/serializers/repository_datatable/repository_text_value_serializer.rb
@@ -9,7 +9,7 @@ module RepositoryDatatable
     def value
       @user = scope[:user]
       {
-        view: value_object.has_smart_annotation? ? custom_auto_link(value_object.data, simple_format: true, team: scope[:team]) : escape_input(value_object.data),
+        view: value_object.has_smart_annotation? ? custom_auto_link(value_object.data, simple_format: true, team: scope[:team]) : sanitize_input(value_object.data),
         edit: value_object.data
       }
     end

From 7ee81c1a2bdf800be8aba2d6a990e055875b38bb Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 14 Oct 2024 11:00:43 +0200
Subject: [PATCH 17/20] Fix location permissions for viewer team role
 [SCI-11181]

---
 app/permissions/storage_location.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/permissions/storage_location.rb b/app/permissions/storage_location.rb
index ec2595db4..58b5550e4 100644
--- a/app/permissions/storage_location.rb
+++ b/app/permissions/storage_location.rb
@@ -19,9 +19,7 @@ Canaid::Permissions.register_for(StorageLocation) do
   can :manage_storage_location do |user, storage_location|
     root_storage_location = storage_location.root_storage_location
 
-    next true if root_storage_location.shared_with_write?(user.current_team)
-
-    user.current_team == root_storage_location.team && root_storage_location.team.permission_granted?(
+    next false unless user.current_team.permission_granted?(
       user,
       if root_storage_location.container?
         TeamPermissions::STORAGE_LOCATION_CONTAINERS_MANAGE
@@ -29,10 +27,15 @@ Canaid::Permissions.register_for(StorageLocation) do
         TeamPermissions::STORAGE_LOCATIONS_MANAGE
       end
     )
+
+    next true if user.current_team == root_storage_location.team
+
+    root_storage_location.shared_with_write?(user.current_team)
   end
 
   can :create_storage_location_repository_rows do |user, storage_location|
-    can_read_storage_location?(user, storage_location)
+    can_read_storage_location?(user, storage_location) &&
+      user.current_team.permission_granted?(user, TeamPermissions::STORAGE_LOCATION_CONTAINERS_MANAGE)
   end
 
   can :share_storage_location do |user, storage_location|

From d38ccea98f2c85f114d2317577e824455b91e8c0 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 14 Oct 2024 11:43:52 +0200
Subject: [PATCH 18/20] Fix switching between global share and team shares
 [SCI-11182]

---
 .../team_shared_objects_controller.rb         | 23 ++++++++-----------
 app/javascript/vue/shared/share_modal.vue     |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/controllers/team_shared_objects_controller.rb b/app/controllers/team_shared_objects_controller.rb
index c3cbb65f9..41e712d0c 100644
--- a/app/controllers/team_shared_objects_controller.rb
+++ b/app/controllers/team_shared_objects_controller.rb
@@ -8,26 +8,24 @@ class TeamSharedObjectsController < ApplicationController
     ActiveRecord::Base.transaction do
       @activities_to_log = []
 
+      global_permission_level =
+        if params[:select_all_teams]
+          params[:select_all_write_permission] ? :shared_write : :shared_read
+        else
+          :not_shared
+        end
+
       # Global share
       if @model.globally_shareable?
-        permission_level =
-          if params[:select_all_teams]
-            params[:select_all_write_permission] ? :shared_write : :shared_read
-          else
-            :not_shared
-          end
-
-        @model.permission_level = permission_level
+        @model.permission_level = global_permission_level
 
         if @model.permission_level_changed?
           @model.save!
-          @model.team_shared_objects.each(&:destroy!) unless permission_level == :not_shared
+          @model.team_shared_objects.each(&:destroy!) unless global_permission_level == :not_shared
           case @model
           when Repository
             setup_repository_global_share_activity
           end
-
-          log_activities and next
         end
       end
 
@@ -35,11 +33,10 @@ class TeamSharedObjectsController < ApplicationController
       params[:team_share_params].each do |t|
         next unless t['private_shared_with']
 
-        @model.update!(permission_level: :not_shared) if @model.globally_shareable?
-
         team_shared_object = @model.team_shared_objects.find_or_initialize_by(team_id: t['id'])
 
         new_record = team_shared_object.new_record?
+
         team_shared_object.update!(
           permission_level: t['private_shared_with_write'] ? :shared_write : :shared_read
         )
diff --git a/app/javascript/vue/shared/share_modal.vue b/app/javascript/vue/shared/share_modal.vue
index 1b41f577a..39e2d3a3d 100644
--- a/app/javascript/vue/shared/share_modal.vue
+++ b/app/javascript/vue/shared/share_modal.vue
@@ -126,7 +126,7 @@ export default {
       const data = {
         select_all_teams: this.sharedWithAllRead,
         select_all_write_permission: this.sharedWithAllWrite,
-        team_share_params: this.shareableTeams.map((team) => { return { id: team.id, ...team.attributes } })
+        team_share_params: this.sharedWithAllRead ? [] : this.shareableTeams.map((team) => { return { id: team.id, ...team.attributes } })
       };
       axios.post(this.object.urls.share, data).then(() => {
         HelperModule.flashAlertMsg(this.i18n.t(

From bab4dbd9ef9ecd3d1f61d22bf4e85c7d4eda5098 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 14 Oct 2024 11:59:32 +0200
Subject: [PATCH 19/20] Further fix team viewer location permissions
 [SCI-11181]

---
 ...torage_location_repository_rows_controller.rb |  4 ++--
 app/controllers/storage_locations_controller.rb  |  5 +++++
 .../vue/storage_locations/container.vue          | 16 ++++++++--------
 .../storage_location_repository_rows_service.rb  |  4 ++--
 app/views/storage_locations/show.html.erb        |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/controllers/storage_location_repository_rows_controller.rb b/app/controllers/storage_location_repository_rows_controller.rb
index 579516a75..a35aa8cbf 100644
--- a/app/controllers/storage_location_repository_rows_controller.rb
+++ b/app/controllers/storage_location_repository_rows_controller.rb
@@ -6,7 +6,7 @@ class StorageLocationRepositoryRowsController < ApplicationController
   before_action :load_storage_location
   before_action :load_repository_row, only: %i(create update destroy move)
   before_action :check_read_permissions, except: %i(create actions_toolbar)
-  before_action :check_manage_permissions, only: %i(create update destroy)
+  before_action :check_manage_permissions, only: %i(create update destroy move)
 
   def index
     storage_location_repository_row = Lists::StorageLocationRepositoryRowsService.new(
@@ -134,7 +134,7 @@ class StorageLocationRepositoryRowsController < ApplicationController
   end
 
   def check_manage_permissions
-    render_403 unless can_create_storage_location_repository_rows?(@storage_location)
+    render_403 unless can_manage_storage_location_repository_rows?(@storage_location)
   end
 
   def log_activity(type_of, message_items = {})
diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
index 75673efc4..3bae95dd8 100644
--- a/app/controllers/storage_locations_controller.rb
+++ b/app/controllers/storage_locations_controller.rb
@@ -10,6 +10,7 @@ class StorageLocationsController < ApplicationController
   before_action :check_storage_locations_enabled, except: :unassign_rows
   before_action :load_storage_location, only: %i(update destroy duplicate move show available_positions unassign_rows export_container import_container)
   before_action :check_read_permissions, except: %i(index create tree actions_toolbar import_container unassign_rows)
+  before_action :check_manage_repository_rows_permissions, only: %i(import_container unassign_rows)
   before_action :check_create_permissions, only: :create
   before_action :check_manage_permissions, only: %i(update destroy duplicate move)
   before_action :set_breadcrumbs_items, only: %i(index show)
@@ -230,6 +231,10 @@ class StorageLocationsController < ApplicationController
     render_403 unless can_manage_storage_location?(@storage_location)
   end
 
+  def check_manage_repository_rows_permissions
+    render_403 unless can_manage_storage_location_repository_rows?(@storage_location)
+  end
+
   def set_breadcrumbs_items
     @breadcrumbs_items = []
 
diff --git a/app/javascript/vue/storage_locations/container.vue b/app/javascript/vue/storage_locations/container.vue
index d4314000d..8a9839704 100644
--- a/app/javascript/vue/storage_locations/container.vue
+++ b/app/javascript/vue/storage_locations/container.vue
@@ -181,15 +181,15 @@ export default {
           type: 'emit',
           buttonStyle: 'btn btn-primary'
         });
-      }
 
-      left.push({
-        name: 'import',
-        icon: 'sn-icon sn-icon-import',
-        label: this.i18n.t('storage_locations.show.import_modal.import_button'),
-        type: 'emit',
-        buttonStyle: 'btn btn-light'
-      });
+        left.push({
+          name: 'import',
+          icon: 'sn-icon sn-icon-import',
+          label: this.i18n.t('storage_locations.show.import_modal.import_button'),
+          type: 'emit',
+          buttonStyle: 'btn btn-light'
+        });
+      }
 
       return {
         left,
diff --git a/app/services/toolbars/storage_location_repository_rows_service.rb b/app/services/toolbars/storage_location_repository_rows_service.rb
index d0507f980..6c711248d 100644
--- a/app/services/toolbars/storage_location_repository_rows_service.rb
+++ b/app/services/toolbars/storage_location_repository_rows_service.rb
@@ -27,7 +27,7 @@ module Toolbars
     private
 
     def unassign_action
-      return unless can_read_storage_location?(@storage_location)
+      return unless can_manage_storage_location_repository_rows?(@storage_location)
 
       {
         name: 'unassign',
@@ -39,7 +39,7 @@ module Toolbars
     end
 
     def move_action
-      return unless @single && can_read_storage_location?(@storage_location)
+      return unless @single && can_manage_storage_location_repository_rows?(@storage_location)
 
       {
         name: 'move',
diff --git a/app/views/storage_locations/show.html.erb b/app/views/storage_locations/show.html.erb
index 5c78f26f3..48a9a1af8 100644
--- a/app/views/storage_locations/show.html.erb
+++ b/app/views/storage_locations/show.html.erb
@@ -14,7 +14,7 @@
           ref="container"
           actions-url="<%= actions_toolbar_storage_location_storage_location_repository_rows_path(@storage_location) %>"
           data-source="<%= storage_location_storage_location_repository_rows_path(@storage_location)  %>"
-          :can-manage="<%= can_create_storage_location_repository_rows?(@storage_location) %>"
+          :can-manage="<%= can_manage_storage_location_repository_rows?(@storage_location) %>"
           :with-grid="<%= @storage_location.with_grid? %>"
           :grid-size="<%= @storage_location.grid_size.to_json %>"
           :container-id="<%= @storage_location.id %>"

From ba2e2cd686604e7833fbc571f98498367c86f98d Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 14 Oct 2024 13:04:12 +0200
Subject: [PATCH 20/20] Add missing permisson changes [SCI-11181]

---
 app/permissions/storage_location.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/permissions/storage_location.rb b/app/permissions/storage_location.rb
index 58b5550e4..cfc99642f 100644
--- a/app/permissions/storage_location.rb
+++ b/app/permissions/storage_location.rb
@@ -33,7 +33,7 @@ Canaid::Permissions.register_for(StorageLocation) do
     root_storage_location.shared_with_write?(user.current_team)
   end
 
-  can :create_storage_location_repository_rows do |user, storage_location|
+  can :manage_storage_location_repository_rows do |user, storage_location|
     can_read_storage_location?(user, storage_location) &&
       user.current_team.permission_granted?(user, TeamPermissions::STORAGE_LOCATION_CONTAINERS_MANAGE)
   end