diff --git a/.gitignore b/.gitignore
index a16f03f0c..4e459907b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,7 @@ public/marvin4js-license.cxl
 
 /app/assets/builds/*
 !/app/assets/builds/.keep
+
+# Ignore automatically generated js-routes files.
+/app/javascript/routes.js
+/app/javascript/routes.d.ts
diff --git a/.rubocop.yml b/.rubocop.yml
index a897a2c64..319819f1b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -384,7 +384,7 @@ Layout/DefEndAlignment:
   EnforcedStyleAlignWith: start_of_line
 
 Layout/LineLength:
-  Max: 120
+  Max: 180
   AllowHeredoc: true
   AllowURI: true
   URISchemes:
diff --git a/.travis.yml b/.travis.yml
index c04c0e859..01e963877 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ before_install:
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
+  - sudo chown --recursive 1000 .
   - make docker-ci
 script:
   - make tests-ci
diff --git a/Dockerfile b/Dockerfile
index 4dc87507a..da11bb47f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-bookworm
+FROM ruby:3.2-bookworm
 MAINTAINER SciNote <info@scinote.net>
 
 # additional dependecies
@@ -20,14 +20,15 @@ RUN apt-get update -qq && \
   fonts-wqy-microhei \
   fonts-wqy-zenhei \
   libfile-mimeinfo-perl \
-  chromium-driver \
+  chromium \
+  chromium-sandbox \
   yarnpkg && \
   ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so && \
   rm -rf /var/lib/apt/lists/*
 
 ENV PATH=/usr/share/nodejs/yarn/bin:$PATH
 
-RUN yarn add puppeteer@npm:puppeteer-core 
+RUN yarn add puppeteer@npm:puppeteer-core@^22.15.0
 
 ENV BUNDLE_PATH /usr/local/bundle/
 
@@ -35,6 +36,10 @@ ENV BUNDLE_PATH /usr/local/bundle/
 ENV APP_HOME /usr/src/app
 ENV PATH $APP_HOME/bin:$PATH
 RUN mkdir $APP_HOME
+RUN adduser --uid 1000 scinote
+RUN chown scinote:scinote $APP_HOME
+USER scinote
+ENV CHROMIUM_PATH=$APP_HOME/bin/chromium
 WORKDIR $APP_HOME
 
 CMD rails s -b 0.0.0.0
diff --git a/Dockerfile.production b/Dockerfile.production
index b5a7a99fb..2a8af22f0 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -1,5 +1,5 @@
 # Building stage
-FROM ruby:3.2.2-bookworm AS builder
+FROM ruby:3.2-bookworm AS builder
 
 RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN \
@@ -23,7 +23,7 @@ COPY . $APP_HOME
 RUN rm -f $APP_HOME/config/application.yml $APP_HOME/production.env
 WORKDIR $APP_HOME
 RUN \
-  --mount=target=$APP_HOME/tmp/bundle,type=cache \
+  --mount=target=/usr/src/app/tmp/bundle,type=cache \
   bundle config set without 'development test' && \
   bundle config set path '/usr/src/app/tmp/bundle' && \
   bundle install --jobs `nproc` && \
@@ -34,14 +34,14 @@ RUN \
 
 RUN \
   --mount=type=cache,target=/usr/local/share/.cache/yarn/v6,sharing=locked \
-  --mount=type=cache,target=$APP_HOME/node_modules,sharing=locked \
+  --mount=type=cache,target=/usr/src/app/node_modules,sharing=locked \
   DATABASE_URL=postgresql://postgres@db/scinote_production \
   SECRET_KEY_BASE=dummy \
   DEFACE_ENABLED=true \
-  bash -c "rake assets:precompile && rake deface:precompile"
+  bash -c "rake assets:precompile && rake deface:precompile && rm -rf ./tmp/cache"
 
 # Final stage
-FROM ruby:3.2.2-bookworm AS runner
+FROM ruby:3.2-bookworm AS runner
 MAINTAINER SciNote <info@scinote.net>
 
 RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
@@ -76,9 +76,10 @@ RUN \
   libvips42 \
   graphviz \
   chromium \
+  chromium-sandbox \
   libfile-mimeinfo-perl \
   yarnpkg && \
-  /usr/share/nodejs/yarn/bin/yarn add puppeteer@npm:puppeteer-core && \
+  /usr/share/nodejs/yarn/bin/yarn add puppeteer@npm:puppeteer-core@^22.15.0 && \
   apt-get install -y libreoffice && \
   ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so
 
@@ -88,6 +89,8 @@ RUN \
   --mount=type=cache,target=/var/lib/apt,sharing=locked \
   touch /etc/build-${BUILD_TIMESTAMP} && \
   DEBIAN_FRONTEND=noninteractive \
+  apt-get remove -y *-dev && \
+  apt-get autoremove -y && \
   apt-get update -qq && \
   apt-get upgrade -y && \
   rm -rf /var/lib/apt/lists/*
@@ -98,7 +101,10 @@ ENV GEM_HOME=$APP_HOME/vendor/bundle/ruby/3.2.0
 ENV PATH=$GEM_HOME/bin:$PATH
 ENV BUNDLE_APP_CONFIG=.bundle
 
-COPY --from=builder $APP_HOME $APP_HOME
+RUN adduser --uid 1000 scinote
+USER scinote
+
+COPY --from=builder --chown=scinote:scinote $APP_HOME $APP_HOME
 
 WORKDIR $APP_HOME
 
diff --git a/Gemfile b/Gemfile
index 675d300cf..e28a8437a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'http://rubygems.org'
 
-ruby '3.2.2'
+ruby '~> 3.2.2'
 
 gem 'activerecord-session_store'
 gem 'bootsnap', require: false
@@ -62,6 +62,7 @@ gem 'logging', '~> 2.0.0'
 gem 'nested_form_fields'
 gem 'nokogiri', '~> 1.16.5' # HTML/XML parser
 gem 'noticed'
+gem 'oj'
 gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
 gem 'rgl' # Graph framework for project diagram calculations
 gem 'roo', '~> 2.10.0' # Spreadsheet parser
@@ -81,9 +82,6 @@ gem 'aws-sdk-lambda'
 gem 'aws-sdk-rails'
 gem 'aws-sdk-s3'
 gem 'delayed_job_active_record'
-gem 'devise-async',
-    git: 'https://github.com/mhfs/devise-async.git',
-    branch: 'devise-4.x'
 gem 'image_processing'
 gem 'img2zpl', git: 'https://github.com/scinote-eln/img2zpl'
 gem 'rufus-scheduler'
@@ -94,6 +92,7 @@ gem 'graphviz'
 
 gem 'cssbundling-rails'
 gem 'jsbundling-rails'
+gem 'js-routes'
 
 gem 'tailwindcss-rails', '~> 2.4'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 80dba088e..82d0e20e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,14 +5,6 @@ GIT
     sneaky-save (0.1.3)
       activerecord (>= 3.2.0)
 
-GIT
-  remote: https://github.com/mhfs/devise-async.git
-  revision: 177f6363a002f7ff28f1d289c8cab7ad8d9cb8c5
-  branch: devise-4.x
-  specs:
-    devise-async (0.10.2)
-      devise (>= 4.0)
-
 GIT
   remote: https://github.com/scinote-eln/canaid
   revision: bba1b817d1c9b0c7e0440a83d0f62848aabc0a1b
@@ -105,9 +97,9 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_model_serializers (0.10.13)
-      actionpack (>= 4.1, < 7.1)
-      activemodel (>= 4.1, < 7.1)
+    active_model_serializers (0.10.14)
+      actionpack (>= 4.1)
+      activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     activejob (7.0.8.4)
@@ -203,6 +195,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
+    bigdecimal (3.1.8)
     bindata (2.5.0)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -210,7 +203,7 @@ GEM
       msgpack (~> 1.2)
     brakeman (6.1.2)
       racc
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.0.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -248,7 +241,7 @@ GEM
     combine_pdf (1.0.23)
       matrix
       ruby-rc4 (>= 0.1.5)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.4)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -324,8 +317,8 @@ GEM
       railties (>= 5)
     down (5.4.1)
       addressable (~> 2.8)
-    erubi (1.12.0)
-    et-orbi (1.2.7)
+    erubi (1.13.0)
+    et-orbi (1.2.11)
       tzinfo
     execjs (2.8.1)
     factory_bot (6.2.1)
@@ -348,8 +341,8 @@ GEM
       rake
     figaro (1.2.0)
       thor (>= 0.14.0, < 2)
-    fugit (1.8.1)
-      et-orbi (~> 1, >= 1.2.7)
+    fugit (1.11.1)
+      et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -372,7 +365,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -380,7 +373,7 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     iniparse (1.5.0)
-    jbuilder (2.11.5)
+    jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
@@ -388,6 +381,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    js-routes (2.2.8)
+      railties (>= 4)
     jsbundling-rails (1.1.1)
       railties (>= 6.0.0)
     json (2.6.3)
@@ -441,8 +436,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.23.1)
+    minitest (5.25.1)
     msgpack (1.7.1)
     multi_json (1.15.0)
     multi_test (1.1.0)
@@ -463,13 +457,13 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     newrelic_rpm (9.2.2)
-    nio4r (2.7.0)
-    nokogiri (1.16.5)
+    nio4r (2.7.3)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
@@ -481,7 +475,10 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.1)
+    oj (3.16.6)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -495,9 +492,9 @@ GEM
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth-saml (2.1.0)
-      omniauth (~> 2.0)
-      ruby-saml (~> 1.12)
+    omniauth-saml (2.2.1)
+      omniauth (~> 2.1)
+      ruby-saml (~> 1.17)
     omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 2.2)
@@ -515,6 +512,7 @@ GEM
       validate_url
       webfinger (~> 2.0)
     orm_adapter (0.5.0)
+    ostruct (0.6.0)
     overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
@@ -545,10 +543,10 @@ GEM
       pry (>= 0.10.4)
     psych (3.3.4)
     public_suffix (5.0.1)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (2.2.9)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
@@ -561,8 +559,9 @@ GEM
       faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.6)
-      rack
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8.4)
@@ -617,8 +616,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.7)
     rgl (0.6.3)
       pairing_heap (>= 0.3.0)
       rexml (~> 3.2, >= 3.2.4)
@@ -670,7 +668,7 @@ GEM
       rubocop (>= 1.33.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
-    ruby-saml (1.16.0)
+    ruby-saml (1.17.0)
       nokogiri (>= 1.13.10)
       rexml
     ruby-vips (2.1.4)
@@ -710,7 +708,6 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stream (0.5.5)
-    strscan (3.1.0)
     swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -829,6 +826,7 @@ DEPENDENCIES
   image_processing
   img2zpl!
   jbuilder
+  js-routes
   jsbundling-rails
   json-jwt
   json_matchers
@@ -841,6 +839,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri (~> 1.16.5)
   noticed
+  oj
   omniauth (~> 2.1)
   omniauth-azure-activedirectory-v2
   omniauth-linkedin-oauth2
@@ -899,4 +898,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.10
+   2.5.11
diff --git a/Makefile b/Makefile
index c413735b8..928acecb2 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,13 @@ heroku:
 	@echo "Set environment variables, DATABASE_URL, RAILS_SERVE_STATIC_FILES, RAKE_ENV, RAILS_ENV, SECRET_KEY_BASE"
 
 docker:
-	@docker-compose build
+	@docker-compose --progress plain build
 
 docker-ci:
 	@docker-compose --progress plain build web
 
 docker-production:
-	@docker-compose -f docker-compose.production.yml build --build-arg BUILD_TIMESTAMP=$(BUILD_TIMESTAMP)
+	@docker-compose --progress plain -f docker-compose.production.yml build --build-arg BUILD_TIMESTAMP=$(BUILD_TIMESTAMP)
 
 config-production:
 ifeq (production.env,$(wildcard production.env))
diff --git a/Rakefile b/Rakefile
index 9f98587c3..c172d03df 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,3 +5,5 @@ require File.expand_path('../config/application', __FILE__)
 
 Rails.application.load_tasks
 Doorkeeper::Rake.load_tasks
+# Update js-routes file before javascript build
+task 'javascript:build' => 'js:routes:typescript'
diff --git a/VERSION b/VERSION
index 39fc130ef..bf50e910e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.36.0
+1.37.0
diff --git a/app/assets/javascripts/my_modules/archived.js b/app/assets/javascripts/my_modules/archived.js
index c4b1ce39b..6c7c0890d 100644
--- a/app/assets/javascripts/my_modules/archived.js
+++ b/app/assets/javascripts/my_modules/archived.js
@@ -7,14 +7,15 @@
     let taskId = $(this).closest('.task-selector-container').data('task-id');
     let index = $.inArray(taskId, selectedTasks);
 
-    window.actionToolbarComponent.fetchActions({ my_module_ids: selectedTasks });
-
     // If checkbox is checked and row ID is not in list of selected folder IDs
     if (this.checked && index === -1) {
       selectedTasks.push(taskId);
     } else if (!this.checked && index !== -1) {
       selectedTasks.splice(index, 1);
     }
+
+    const items = selectedTasks.length ? JSON.stringify(selectedTasks.map((item) => ({ id: item }))) : [];
+    window.actionToolbarComponent.fetchActions({ items });
   });
 
   function restoreMyModules(url, ids) {
@@ -63,7 +64,32 @@
     });
   }
 
+  function initAccessModal() {
+    $('#module-archive').on('click', '#openAccessModal', (e) => {
+      e.preventDefault();
+      const container = document.getElementById('accessModalContainer');
+      const target = e.currentTarget;
+
+      $.get(target.dataset.url, (data) => {
+        const object = {
+          ...data.data.attributes,
+          id: data.data.id,
+          type: data.data.type
+        };
+        const { rolesUrl } = container.dataset;
+        const params = {
+          object,
+          roles_path: rolesUrl
+        };
+        const modal = $('#accessModalComponent').data('accessModal');
+        modal.params = params;
+        modal.open();
+      });
+    });
+  }
+
   window.initActionToolbar();
   initRestoreMyModules();
   initMoveButton();
+  initAccessModal();
 }());
diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index 9850f40af..933bed39a 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -317,9 +317,7 @@ var RepositoryDatatable = (function(global) {
 
       checkAvailableColumns();
 
-      RepositoryDatatableRowEditor.switchRowToEditMode(row);
-
-      changeToEditMode();
+      RepositoryDatatableRowEditor.switchRowToEditMode(row, changeToEditMode);
     });
   }
 
@@ -692,6 +690,7 @@ var RepositoryDatatable = (function(global) {
       },
       rowCallback: function(row, data) {
         $(row).attr('data-editable', data.recordEditable);
+        $(row).attr('data-info-url', data.recordInfoUrl);
         $(row).attr('data-manage-stock-url', data.manageStockUrl);
         // Get row ID
         let rowId = data.DT_RowId;
@@ -1003,10 +1002,8 @@ var RepositoryDatatable = (function(global) {
       $(TABLE_ID).find('.repository-row-edit-icon').remove();
 
       rowsSelected.forEach(function(rowNumber) {
-        RepositoryDatatableRowEditor.switchRowToEditMode(TABLE.row('#' + rowNumber));
+        RepositoryDatatableRowEditor.switchRowToEditMode(TABLE.row('#' + rowNumber), changeToEditMode);
       });
-
-      changeToEditMode();
     })
     .on('click', '#assignRepositoryRecords', function(e) {
       e.preventDefault();
diff --git a/app/assets/javascripts/repositories/row_editor.js b/app/assets/javascripts/repositories/row_editor.js
index 48a9517c8..490b6f63d 100644
--- a/app/assets/javascripts/repositories/row_editor.js
+++ b/app/assets/javascripts/repositories/row_editor.js
@@ -173,11 +173,17 @@ var RepositoryDatatableRowEditor = (function() {
     TABLE.columns.adjust();
   }
 
-  function switchRowToEditMode(row) {
+  function enableEditMode(row, isEditable) {
+    if (!isEditable) {
+      HelperModule.flashAlertMsg(I18n.t('repositories.table.row_locked'), 'danger');
+      return false;
+    }
+
     let $row = $(row.node());
     let itemId = row.id();
     let formId = `repositoryRowForm${itemId}`;
     let requestUrl = $(TABLE.table().node()).data('current-uri');
+
     let rowForm = $(`
       <form id="${formId}"
             class="${EDIT_FORM_CLASS_NAME} ${GLOBAL_CONSTANTS.HAS_UNSAVED_DATA_CLASS_NAME}"
@@ -213,6 +219,26 @@ var RepositoryDatatableRowEditor = (function() {
     initAssetCellActions($row);
 
     TABLE.columns.adjust();
+
+    return true;
+  }
+
+  function switchRowToEditMode(row, editEnabledCallback) {
+    // Editable property was already preloaded
+    if (row.data().editable !== undefined) {
+      if (enableEditMode(row, row.data().editable)) editEnabledCallback();
+      return;
+    }
+
+    // Need to fetch editable property
+    $.ajax({
+      url: row.data().recordInfoUrl,
+      type: 'GET',
+      dataType: 'json',
+      success: (data) => {
+        if (enableEditMode(row, data.editable)) editEnabledCallback();
+      }
+    });
   }
 
   return Object.freeze({
diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index bcd463b09..a2e39aa83 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -284,6 +284,7 @@ var RepositoryColumns = (function() {
         let editableRow = ($(el).attr('data-editable-row') === 'true') ? 'has-permissions' : '';
         let editUrl = $(el).attr('data-edit-column-url');
         let destroyUrl = $(el).attr('data-destroy-column-url');
+        const isDisabled = $(el).attr('data-disabled') === 'true';
         let thederName;
         
         if ($(el).find('.modal-tooltiptext').length > 0) {
@@ -315,7 +316,9 @@ var RepositoryColumns = (function() {
           <span class="vis-controls">
             <span class="vis sn-icon ${visClass}" title="${visText}"  data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-visibility"></span>
           </span>
-          <div class="text truncate" title="${thederName}"  data-e2e="e2e-TX-invItems-manageColumnsModal-${e2eName}-columnName">${thederName}</div>
+          <div class="text truncate" title="${thederName}"  data-e2e="e2e-TX-invItems-manageColumnsModal-${e2eName}-columnName">
+            ${thederName} ${isDisabled ? `<span data-e2e="e2e-LB-invItems-manageColumnsModal-${e2eName}-disabled"></span>` : ''}
+          </div>
           <span class="column-type pull-right shrink-0">${
             getColumnTypeText(el, colId) || `<i class="sn-icon sn-icon-locked-task"  data-e2e="e2e-IC-invItems-manageColumnsModal-${e2eName}-locked"></i>`
           }</span>
diff --git a/app/assets/javascripts/sitewide/constants.js.erb b/app/assets/javascripts/sitewide/constants.js.erb
index ff1416e1e..bcbd62513 100644
--- a/app/assets/javascripts/sitewide/constants.js.erb
+++ b/app/assets/javascripts/sitewide/constants.js.erb
@@ -19,5 +19,6 @@ const GLOBAL_CONSTANTS = {
   ASSET_POLLING_INTERVAL: <%= Constants::ASSET_POLLING_INTERVAL %>,
   ASSET_SYNC_URL: '<%= Constants::ASSET_SYNC_URL %>',
   GLOBAL_SEARCH_PREVIEW_LIMIT: <%= Constants::GLOBAL_SEARCH_PREVIEW_LIMIT %>,
-  SEARCH_LIMIT: <%= Constants::SEARCH_LIMIT %>
+  SEARCH_LIMIT: <%= Constants::SEARCH_LIMIT %>,
+  SCINOTE_EDIT_RESTRICTED_EXTENSIONS: <%= Constants::SCINOTE_EDIT_RESTRICTED_EXTENSIONS %>
 };
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
index 400c99bdf..9e83df130 100644
--- a/app/assets/stylesheets/application.tailwind.css
+++ b/app/assets/stylesheets/application.tailwind.css
@@ -2,6 +2,7 @@
 @import "tailwind/buttons";
 @import "tailwind/modals";
 @import "tailwind/flyouts";
+@import "tailwind/radio";
 @import "tailwind/loader.css";
 
 @tailwind base;
@@ -69,6 +70,6 @@ html {
 
 @keyframes shine-lines {
   0% { background-position: -150px }
-  
+
   40%, 100% { background-position: 320px }
 }
diff --git a/app/assets/stylesheets/layouts/reminders.scss b/app/assets/stylesheets/layouts/reminders.scss
index 69a0000b3..126981812 100644
--- a/app/assets/stylesheets/layouts/reminders.scss
+++ b/app/assets/stylesheets/layouts/reminders.scss
@@ -26,5 +26,11 @@
     border-width: 0;
     height: 1px;
     margin: 0 16px 10px;
-    }
   }
+}
+
+.reminders-view-mode {
+  .row-reminders-footer {
+    display: none;
+  }
+}
diff --git a/app/assets/stylesheets/navigation/notifications.scss b/app/assets/stylesheets/navigation/notifications.scss
index 688a94995..c7049d6ef 100644
--- a/app/assets/stylesheets/navigation/notifications.scss
+++ b/app/assets/stylesheets/navigation/notifications.scss
@@ -30,7 +30,7 @@
     flex-direction: column;
     height: calc(100vh - 8rem);
     padding: 1.5rem;
-    width: 400px;
+    width: 600px;
 
   .sci--navigation--notificaitons-flyout-title {
     @include font-h2;
diff --git a/app/assets/stylesheets/shared_styles/elements/radio_buttons.scss b/app/assets/stylesheets/shared_styles/elements/radio_buttons.scss
index b940efe9e..5b7fd31ca 100644
--- a/app/assets/stylesheets/shared_styles/elements/radio_buttons.scss
+++ b/app/assets/stylesheets/shared_styles/elements/radio_buttons.scss
@@ -1,5 +1,5 @@
 // scss-lint:disable SelectorDepth QualifyingElement
-
+/*
 :root {
   --sci-radio-size: 16px;
 }
@@ -85,3 +85,4 @@ input[type="radio"].sci-radio {
     }
   }
 }
+*/
diff --git a/app/assets/stylesheets/tailwind/radio.css b/app/assets/stylesheets/tailwind/radio.css
new file mode 100644
index 000000000..197119397
--- /dev/null
+++ b/app/assets/stylesheets/tailwind/radio.css
@@ -0,0 +1,42 @@
+@layer components {
+
+  .sci-radio-container {
+    @apply inline-block h-4 w-4 relative;
+  }
+
+  input[type="radio"].sci-radio {
+    @apply cursor-pointer shrink-0 h-4 w-4 m-0 opacity-0 relative z-[2];
+  }
+
+  input[type="radio"].sci-radio + .sci-radio-label {
+    @apply inline-block shrink-0 h-4 w-4 absolute left-0;
+  }
+
+  input[type="radio"].sci-radio + .sci-radio-label::before {
+    @apply border-[1px] border-solid border-sn-black rounded-full text-white text-center transition-all
+           h-4 w-4 left-0 absolute;
+    content: "";
+  }
+
+  input[type="radio"].sci-radio + .sci-radio-label::after{
+    @apply bg-white rounded-full text-white text-center transition-all
+            absolute w-2.5 h-2.5 top-[3px] left-[3px] ;
+    content: "";
+  }
+
+  input[type="radio"].sci-radio:checked + .sci-radio-label::before {
+    @apply !border-sn-blue;
+  }
+
+  input[type="radio"].sci-radio:checked + .sci-radio-label::after {
+    @apply !bg-sn-science-blue;
+  }
+
+  input[type="radio"].sci-radio:disabled + .sci-radio-label::before {
+    @apply !border-sn-sleepy-grey;
+  }
+
+  input[type="radio"].sci-radio:checked:disabled + .sci-radio-label::after {
+    @apply !bg-sn-sleepy-grey;
+  }
+}
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 711677980..fd7f60180 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1362,6 +1362,10 @@ th.custom-field .modal-tooltiptext {
   cursor: pointer;
 }
 
+.tooltip {
+  z-index: 9999;
+}
+
 .tooltip-open {
   background-color: $color-concrete;
   color: $color-black;
diff --git a/app/controllers/api/v1/results_controller.rb b/app/controllers/api/v1/results_controller.rb
index c26c2ef02..4665f46a8 100644
--- a/app/controllers/api/v1/results_controller.rb
+++ b/app/controllers/api/v1/results_controller.rb
@@ -124,7 +124,7 @@ module Api
         Result.transaction do
           old_checksum = asset.file.blob.checksum
           if @form_multipart_upload
-            asset.file.attach(result_file_params[:file])
+            asset.attach_file_version(result_file_params[:file])
           else
             blob = create_blob_from_params
             asset.update!(file: blob)
diff --git a/app/controllers/api/v2/inventory_item_child_relationships_controller.rb b/app/controllers/api/v2/inventory_item_child_relationships_controller.rb
index 8d6043753..47571b883 100644
--- a/app/controllers/api/v2/inventory_item_child_relationships_controller.rb
+++ b/app/controllers/api/v2/inventory_item_child_relationships_controller.rb
@@ -18,7 +18,7 @@ module Api
       end
 
       def create
-        inventory_item_to_link = RepositoryRow.where(repository: Repository.accessible_by_teams(@team))
+        inventory_item_to_link = RepositoryRow.where(repository: Repository.viewable_by_user(current_user, @team))
                                               .find(connection_params[:child_id])
         child_connection = @inventory_item.child_connections.create!(
           child: inventory_item_to_link,
diff --git a/app/controllers/api/v2/inventory_item_parent_relationships_controller.rb b/app/controllers/api/v2/inventory_item_parent_relationships_controller.rb
index dec716a7d..bf0c663d5 100644
--- a/app/controllers/api/v2/inventory_item_parent_relationships_controller.rb
+++ b/app/controllers/api/v2/inventory_item_parent_relationships_controller.rb
@@ -20,7 +20,7 @@ module Api
       end
 
       def create
-        inventory_item_to_link = RepositoryRow.where(repository: Repository.accessible_by_teams(@team))
+        inventory_item_to_link = RepositoryRow.where(repository: Repository.viewable_by_user(current_user, @team))
                                               .find(connection_params[:parent_id])
         parent_connection = @inventory_item.parent_connections.create!(
           parent: inventory_item_to_link,
diff --git a/app/controllers/asset_sync_controller.rb b/app/controllers/asset_sync_controller.rb
index 54c6e7440..968503cd7 100644
--- a/app/controllers/asset_sync_controller.rb
+++ b/app/controllers/asset_sync_controller.rb
@@ -16,7 +16,8 @@ class AssetSyncController < ApplicationController
     asset_sync_token = current_user.asset_sync_tokens.find_or_create_by(asset_id: params[:asset_id])
 
     unless asset_sync_token.token_valid?
-      asset_sync_token = current_user.asset_sync_tokens.create(asset_id: params[:asset_id])
+      asset_sync_token =
+        current_user.asset_sync_tokens.create(asset_id: params[:asset_id])
     end
 
     render json: AssetSyncTokenSerializer.new(asset_sync_token).as_json
@@ -27,34 +28,32 @@ class AssetSyncController < ApplicationController
   end
 
   def update
-    if @asset_sync_token.conflicts?(request.headers['VersionToken'])
-      ActiveRecord::Base.transaction do
-        conflict_response = AssetSyncTokenSerializer.new(conflicting_asset_copy_token).as_json
-        error_message = { message: I18n.t('assets.conflict_error', filename: @asset.file.filename) }
-        log_activity(:create)
-        render json: conflict_response.merge(error_message), status: :conflict
-      end
-
-      return
-    end
-
-    orig_file_size = @asset.file_size
+    asset_conflicts = @asset_sync_token.conflicts?(request.headers['VersionToken'])
 
     ActiveRecord::Base.transaction do
       @asset.update(last_modified_by: current_user)
       if wopi_file?(@asset)
         @asset.update_contents(request.body)
       else
-        @asset.file.attach(io: request.body, filename: @asset.file.filename)
+        @asset.attach_file_version(io: request.body, filename: @asset.file.filename)
         @asset.touch
       end
 
-      @asset.team.release_space(orig_file_size)
       @asset.post_process_file
 
       log_activity(:edit)
     end
 
+    if asset_conflicts
+      ActiveRecord::Base.transaction do
+        conflict_response = AssetSyncTokenSerializer.new(@asset_sync_token).as_json
+        error_message = { message: I18n.t('assets.conflict_error', filename: @asset.file.filename) }
+        render json: conflict_response.merge(error_message), status: :conflict
+      end
+
+      return
+    end
+
     render json: AssetSyncTokenSerializer.new(@asset_sync_token).as_json
   end
 
@@ -94,7 +93,7 @@ class AssetSyncController < ApplicationController
         metadata: @asset.blob.metadata
       )
 
-      new_asset.file.attach(blob)
+      new_asset.attach_file_version(blob)
 
       case @asset.parent
       when Step
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 6a583d933..47d92e5f7 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -19,13 +19,16 @@ class AssetsController < ApplicationController
   before_action :load_vars, except: :create_wopi_file
   before_action :check_read_permission, except: %i(edit destroy duplicate create_wopi_file toggle_view_mode)
   before_action :check_manage_permission, only: %i(edit destroy duplicate rename toggle_view_mode)
+  before_action :check_restore_permission, only: :restore_version
 
   def file_preview
+    editable = can_manage_asset?(@asset) && (@asset.repository_asset_value.blank? ||
+                !@asset.repository_cell.repository_row.repository.is_a?(SoftLockedRepository))
     render json: { html: render_to_string(
       partial: 'shared/file_preview/content',
       locals: {
         asset: @asset,
-        can_edit: can_manage_asset?(@asset),
+        can_edit: editable,
         gallery: params[:gallery],
         preview: params[:preview]
       },
@@ -195,7 +198,7 @@ class AssetsController < ApplicationController
     return render_403 unless can_read_team?(@asset.team)
 
     @asset.last_modified_by = current_user
-    @asset.file.attach(io: params.require(:image), filename: orig_file_name)
+    @asset.attach_file_version(io: params.require(:image), filename: orig_file_name)
     @asset.save!
     create_edit_image_activity(@asset, current_user, :finish_editing)
     # release previous image space
@@ -240,9 +243,9 @@ class AssetsController < ApplicationController
 
     # Asset validation
     asset = Asset.new(created_by: current_user, team: current_team)
-    asset.file.attach(io: StringIO.new,
-                      filename: "#{params[:file_name]}.#{params[:file_type]}",
-                      content_type: wopi_content_type(params[:file_type]))
+    asset.attach_file_version(io: StringIO.new,
+                              filename: "#{params[:file_name]}.#{params[:file_type]}",
+                              content_type: wopi_content_type(params[:file_type]))
 
     unless asset.valid?(:wopi_file_creation)
       render json: {
@@ -395,6 +398,55 @@ class AssetsController < ApplicationController
     render json: { checksum: @asset.file.blob.checksum }
   end
 
+  def versions
+    blobs =
+      [@asset.file.blob] +
+      @asset.previous_files.map(&:blob).sort_by { |b| -1 * b.metadata['version'].to_i }[0..(VersionedAttachments.enabled? ? -1 : 1)]
+    render(
+      json: ActiveModel::SerializableResource.new(
+        blobs,
+        each_serializer: ActiveStorage::BlobSerializer
+      ).as_json.merge(
+        enabled: VersionedAttachments.enabled?,
+        enable_url: ENV.fetch('SCINOTE_FILE_VERSIONING_ENABLE_URL', nil)
+      )
+    )
+  end
+
+  def restore_version
+    render_403 unless VersionedAttachments.enabled?
+
+    @asset.restore_file_version(params[:version].to_i)
+
+    message_items = {
+      version: params[:version].to_i,
+      file: @asset.file_name
+    }
+
+    case @asset.parent
+    when Step
+      if @asset.parent.protocol.in_module?
+        message_items.merge!({ my_module: @assoc.protocol.my_module.id, step: @asset.parent.id })
+        log_restore_activity(:task_step_restore_asset_version, @assoc.protocol,
+                             @assoc.protocol.team, @assoc.my_module&.project, message_items)
+      else
+        message_items.merge!({ protocol: @assoc.protocol.id, step: @asset.parent.id })
+        log_restore_activity(:protocol_step_restore_asset_version, @assoc.protocol,
+                             @assoc.protocol.team, nil, message_items)
+      end
+    when Result
+      message_items.merge!({ result: @assoc.id, my_module: @assoc.my_module.id })
+      log_restore_activity(:task_result_restore_asset_version, @assoc,
+                           @assoc.my_module.team, @assoc.my_module.project, message_items)
+    when RepositoryCell
+      message_items.merge!({ repository_column: @assoc.repository_column.id, repository: @repository.id })
+      log_restore_activity(:repository_column_restore_asset_version, @repository,
+                           @repository.team, nil, message_items)
+    end
+
+    render json: @asset.file.blob
+  end
+
   private
 
   def load_vars
@@ -424,6 +476,10 @@ class AssetsController < ApplicationController
     render_403 and return unless can_manage_asset?(@asset)
   end
 
+  def check_restore_permission
+    render_403 and return unless can_restore_asset?(@asset)
+  end
+
   def append_wd_params(url)
     exclude_params = %w(wdPreviousSession wdPreviousCorrelation)
     wd_params = params.as_json.select { |key, _value| key[/^wd.*/] && !(exclude_params.include? key) }.to_query
@@ -470,4 +526,14 @@ class AssetsController < ApplicationController
               result: result.id
             }.merge(message_items))
   end
+
+  def log_restore_activity(type_of, subject, team, project = nil, message_items = {})
+    Activities::CreateActivityService
+      .call(activity_type: type_of,
+            owner: current_user,
+            subject: subject,
+            team: team,
+            project: project,
+            message_items: message_items)
+  end
 end
diff --git a/app/controllers/at_who_controller.rb b/app/controllers/at_who_controller.rb
index f6a801d11..f48645f81 100644
--- a/app/controllers/at_who_controller.rb
+++ b/app/controllers/at_who_controller.rb
@@ -27,7 +27,7 @@ class AtWhoController < ApplicationController
       if params[:repository_id].present?
         Repository.find_by(id: params[:repository_id])
       else
-        Repository.active.accessible_by_teams(@team).first
+        Repository.active.viewable_by_user(current_user, @team).first
       end
 
     items = []
@@ -54,8 +54,8 @@ class AtWhoController < ApplicationController
   end
 
   def menu
-    repositories = Repository.active.accessible_by_teams(@team)
-    render json: { 
+    repositories = Repository.active.viewable_by_user(current_user, @team)
+    render json: {
       html: render_to_string(partial: 'shared/smart_annotation/menu',
                              locals: { repositories: repositories },
                              formats: :html)
diff --git a/app/controllers/concerns/active_storage/check_blob_permissions.rb b/app/controllers/concerns/active_storage/check_blob_permissions.rb
index 2c99d9b7e..d23952ff6 100644
--- a/app/controllers/concerns/active_storage/check_blob_permissions.rb
+++ b/app/controllers/concerns/active_storage/check_blob_permissions.rb
@@ -28,6 +28,8 @@ module ActiveStorage
         check_tinymce_asset_read_permissions(attachment.record)
       when 'Experiment'
         can_read_experiment?(attachment.record)
+      when 'StorageLocation'
+        can_read_storage_location?(attachment.record)
       when 'Report'
         can_read_project?(attachment.record.project)
       when 'User'
diff --git a/app/controllers/dashboard/calendars_controller.rb b/app/controllers/dashboard/calendars_controller.rb
index 93217a54c..50c101638 100644
--- a/app/controllers/dashboard/calendars_controller.rb
+++ b/app/controllers/dashboard/calendars_controller.rb
@@ -9,7 +9,7 @@ module Dashboard
       date = params[:date].in_time_zone(current_user.time_zone)
       start_date = date.at_beginning_of_month.utc - 8.days
       end_date = date.at_end_of_month.utc + 15.days
-      due_dates = current_user.my_modules.active.uncomplete
+      due_dates = current_user.my_modules.readable_by_user(current_user).active.uncomplete
                               .joins(experiment: :project)
                               .where(experiments: { archived: false })
                               .where(projects: { archived: false })
@@ -23,7 +23,7 @@ module Dashboard
       date = params[:date].in_time_zone(current_user.time_zone)
       start_date = date.utc
       end_date = date.end_of_day.utc
-      my_modules = current_user.my_modules.active.uncomplete
+      my_modules = current_user.my_modules.readable_by_user(current_user).active.uncomplete
                                .joins(experiment: :project)
                                .where(experiments: { archived: false })
                                .where(projects: { archived: false })
diff --git a/app/controllers/gene_sequence_assets_controller.rb b/app/controllers/gene_sequence_assets_controller.rb
index a706a200f..a8f01908c 100644
--- a/app/controllers/gene_sequence_assets_controller.rb
+++ b/app/controllers/gene_sequence_assets_controller.rb
@@ -72,10 +72,9 @@ class GeneSequenceAssetsController < ApplicationController
 
       ensure_asset!
 
-      @asset.file.purge
       @asset.preview_image.purge
 
-      @asset.file.attach(
+      @asset.attach_file_version(
         io: StringIO.new(params[:sequence_data].to_json),
         filename: "#{params[:sequence_name]}.json"
       )
diff --git a/app/controllers/hidden_repository_cell_reminders_controller.rb b/app/controllers/hidden_repository_cell_reminders_controller.rb
index 5ed53b5f1..ad7472d8c 100644
--- a/app/controllers/hidden_repository_cell_reminders_controller.rb
+++ b/app/controllers/hidden_repository_cell_reminders_controller.rb
@@ -15,7 +15,7 @@ class HiddenRepositoryCellRemindersController < ApplicationController
   private
 
   def load_repository
-    @repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id])
+    @repository = Repository.viewable_by_user(current_user).find_by(id: params[:repository_id])
     render_404 unless @repository
   end
 
diff --git a/app/controllers/my_module_repositories_controller.rb b/app/controllers/my_module_repositories_controller.rb
index 1cb81a6c0..d89dcb42b 100644
--- a/app/controllers/my_module_repositories_controller.rb
+++ b/app/controllers/my_module_repositories_controller.rb
@@ -15,7 +15,14 @@ class MyModuleRepositoriesController < ApplicationController
     @draw = params[:draw].to_i
     per_page = params[:length].to_i < 1 ? Constants::REPOSITORY_DEFAULT_PAGE_SIZE : params[:length].to_i
     page = (params[:start].to_i / per_page) + 1
-    datatable_service = RepositoryDatatableService.new(@repository, params, current_user, @my_module)
+    if params[:simple_view]
+      rows_view = 'repository_rows/simple_view_index'
+      preload_cells = false
+    else
+      rows_view = 'repository_rows/index'
+      preload_cells = true
+    end
+    datatable_service = RepositoryDatatableService.new(@repository, params, current_user, @my_module, preload_cells: preload_cells)
 
     @datatable_params = {
       view_mode: params[:view_mode],
@@ -26,19 +33,9 @@ class MyModuleRepositoriesController < ApplicationController
 
     @all_rows_count = datatable_service.all_count
     @columns_mappings = datatable_service.mappings
-
-    if params[:simple_view]
-      repository_rows = datatable_service.repository_rows
-      rows_view = 'repository_rows/simple_view_index'
-    else
-      repository_rows = datatable_service.repository_rows
-                                         .preload(:repository_columns,
-                                                  :created_by,
-                                                  repository_cells: { value: @repository.cell_preload_includes })
-      rows_view = 'repository_rows/index'
-    end
+    repository_rows = datatable_service.repository_rows
     @repository_rows = repository_rows.page(page).per(per_page)
-
+    @filtered_rows_count = @repository_rows.load.take&.filtered_count || 0
     render rows_view
   end
 
@@ -145,7 +142,7 @@ class MyModuleRepositoriesController < ApplicationController
   end
 
   def repositories_list_html
-    @assigned_repositories = @my_module.live_and_snapshot_repositories_list
+    @assigned_repositories = @my_module.readable_live_and_snapshot_repositories_list(current_user)
     render json: {
       html: render_to_string(partial: 'my_modules/repositories/repositories_list'),
       assigned_rows_count: @assigned_repositories.map(&:assigned_rows_count).sum
@@ -162,7 +159,7 @@ class MyModuleRepositoriesController < ApplicationController
   end
 
   def repositories_dropdown_list
-    @repositories = Repository.accessible_by_teams(current_team).joins("
+    @repositories = Repository.viewable_by_user(current_user).joins("
                                 LEFT OUTER JOIN repository_rows ON
                                   repository_rows.repository_id = repositories.id
                                 LEFT OUTER JOIN my_module_repository_rows ON
diff --git a/app/controllers/my_module_repository_snapshots_controller.rb b/app/controllers/my_module_repository_snapshots_controller.rb
index 2d0c6a128..6d1cff5d3 100644
--- a/app/controllers/my_module_repository_snapshots_controller.rb
+++ b/app/controllers/my_module_repository_snapshots_controller.rb
@@ -16,20 +16,16 @@ class MyModuleRepositorySnapshotsController < ApplicationController
 
     @all_rows_count = datatable_service.all_count
     @columns_mappings = datatable_service.mappings
+    repository_rows = datatable_service.repository_rows
+
     if params[:simple_view]
-      repository_rows = datatable_service.repository_rows
       @repository = @repository_snapshot
       rows_view = 'repository_rows/simple_view_index'
     else
-      repository_rows =
-        datatable_service.repository_rows
-                         .preload(:repository_columns,
-                                  :created_by,
-                                  repository_cells: { value: @repository_snapshot.cell_preload_includes })
       rows_view = 'repository_rows/snapshot_index'
     end
     @repository_rows = repository_rows.page(page).per(per_page)
-
+    @filtered_rows_count = @repository_rows.load.take&.filtered_count || 0
     render rows_view
   end
 
diff --git a/app/controllers/my_module_shareable_links_controller.rb b/app/controllers/my_module_shareable_links_controller.rb
index 225825ab0..594d6cf8b 100644
--- a/app/controllers/my_module_shareable_links_controller.rb
+++ b/app/controllers/my_module_shareable_links_controller.rb
@@ -62,7 +62,7 @@ class MyModuleShareableLinksController < ApplicationController
     @draw = params[:draw].to_i
     per_page = params[:length].to_i < 1 ? Constants::REPOSITORY_DEFAULT_PAGE_SIZE : params[:length].to_i
     page = (params[:start].to_i / per_page) + 1
-    datatable_service = RepositoryDatatableService.new(@repository, params, nil, @my_module)
+    datatable_service = RepositoryDatatableService.new(@repository, params, nil, @my_module, preload_cells: false, disable_reminders: true)
 
     @datatable_params = {
       view_mode: params[:view_mode],
@@ -76,6 +76,7 @@ class MyModuleShareableLinksController < ApplicationController
     @columns_mappings = datatable_service.mappings
 
     @repository_rows = datatable_service.repository_rows.page(page).per(per_page)
+    @filtered_rows_count = @repository_rows.load.take&.filtered_count || 0
 
     render 'repository_rows/simple_view_index'
   end
@@ -84,13 +85,14 @@ class MyModuleShareableLinksController < ApplicationController
     @draw = params[:draw].to_i
     per_page = params[:length].to_i < 1 ? Constants::REPOSITORY_DEFAULT_PAGE_SIZE : params[:length].to_i
     page = (params[:start].to_i / per_page) + 1
-    datatable_service = RepositorySnapshotDatatableService.new(@repository_snapshot, params, nil, @my_module)
+    datatable_service = RepositorySnapshotDatatableService.new(@repository_snapshot, params, nil, @my_module, preload_cells: false)
 
     @all_rows_count = datatable_service.all_count
     @columns_mappings = datatable_service.mappings
 
     @repository = @repository_snapshot
     @repository_rows = datatable_service.repository_rows.page(page).per(per_page)
+    @filtered_rows_count = @repository_rows.load.take&.filtered_count || 0
 
     render 'repository_rows/simple_view_index'
   end
diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index 7764d6c4e..a9e941cd2 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -304,7 +304,7 @@ class MyModulesController < ApplicationController
 
   def protocols
     @protocol = @my_module.protocol
-    @assigned_repositories = @my_module.live_and_snapshot_repositories_list
+    @assigned_repositories = @my_module.readable_live_and_snapshot_repositories_list(current_user)
   end
 
   def protocol
@@ -410,7 +410,7 @@ class MyModulesController < ApplicationController
       actions:
         Toolbars::MyModulesService.new(
           current_user,
-          my_module_ids: JSON.parse(params[:items]).map { |i| i['id'] }
+          my_module_ids: params[:items].present? ? JSON.parse(params[:items]).map { |i| i['id'] } : params[:items]
         ).actions
     }
   end
@@ -651,7 +651,7 @@ class MyModulesController < ApplicationController
 
     @navigator = {
       url: tree_navigator_my_module_path(@my_module),
-      archived: params[:view_mode] == 'archived',
+      archived: @my_module.archived_branch? || params[:view_mode] == 'archived',
       id: @my_module.code
     }
   end
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index c148511f3..8e779bb0c 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -312,7 +312,7 @@ class ReportsController < ApplicationController
 
   def load_wizard_vars
     @templates = Extends::REPORT_TEMPLATES
-    live_repositories = Repository.accessible_by_teams(current_team).sort_by { |r| r.name.downcase }
+    live_repositories = Repository.viewable_by_user(current_user).sort_by { |r| r.name.downcase }
     snapshots_of_deleted = RepositorySnapshot.left_outer_joins(:original_repository)
                                              .where(team: current_team)
                                              .where.not(original_repository: live_repositories)
@@ -348,7 +348,7 @@ class ReportsController < ApplicationController
   def load_available_repositories
     @available_repositories = []
     repositories = Repository.active
-                             .accessible_by_teams(current_team)
+                             .viewable_by_user(current_user)
                              .name_like(search_params[:query])
                              .limit(Constants::SEARCH_LIMIT)
     repositories.each do |repository|
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 29fa820c3..bddd1c863 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -10,18 +10,17 @@ class RepositoriesController < ApplicationController
   include MyModulesHelper
 
   before_action :load_repository, except: %i(index create create_modal sidebar archive restore actions_toolbar
-                                             export_modal export_repositories)
-  before_action :load_repositories, only: :index
+                                             export_modal export_repositories list)
+  before_action :load_repositories, only: %i(index list)
   before_action :load_repositories_for_archiving, only: :archive
   before_action :load_repositories_for_restoring, only: :restore
-  before_action :check_view_all_permissions, only: %i(index sidebar)
+  before_action :check_view_all_permissions, only: %i(index sidebar list)
   before_action :check_view_permissions, except: %i(index create_modal create update destroy parse_sheet
                                                     import_records sidebar archive restore actions_toolbar
-                                                    export_modal export_repositories)
+                                                    export_modal export_repositories list)
   before_action :check_manage_permissions, only: %i(rename_modal update)
   before_action :check_delete_permissions, only: %i(destroy destroy_modal)
   before_action :check_archive_permissions, only: %i(archive restore)
-  before_action :check_share_permissions, only: :share_modal
   before_action :check_create_permissions, only: %i(create_modal create)
   before_action :check_copy_permissions, only: %i(copy_modal copy)
   before_action :set_inline_name_editing, only: %i(show)
@@ -44,6 +43,34 @@ class RepositoriesController < ApplicationController
     end
   end
 
+  def list
+    results = @repositories.select(:id, :name, 'LOWER(repositories.name)')
+    results = results.name_like(params[:query]) if params[:query].present?
+    results = results.joins(:repository_rows).distinct if params[:non_empty].present?
+    results = results.active if params[:active].present?
+
+    render json: { data: results.order('LOWER(repositories.name) asc').map { |r| [r.id, r.name] } }
+  end
+
+  def rows_list
+    results = @repository.repository_rows
+    if params[:query].present?
+      results = results.where_attributes_like(
+        ['repository_rows.name', RepositoryRow::PREFIXED_ID_SQL],
+        params[:query]
+      )
+    end
+    results = results.active if params[:active].present?
+
+    results = results.order('LOWER(repository_rows.name) asc').page(params[:page])
+
+    render json: {
+      paginated: true,
+      next_page: results.next_page,
+      data: results.map { |r| [r.id, r.name] }
+    }
+  end
+
   def sidebar
     render json: {
       html: render_to_string(partial: 'repositories/sidebar', locals: {
@@ -101,15 +128,6 @@ class RepositoriesController < ApplicationController
     }
   end
 
-  def share_modal
-    render json: { html: render_to_string(partial: 'share_repository_modal', formats: :html) }
-  end
-
-  def shareable_teams
-    teams = current_user.teams.order(:name) - [@repository.team]
-    render json: teams, each_serializer: ShareableTeamSerializer, repository: @repository
-  end
-
   def hide_reminders
     # synchronously hide currently visible reminders
     if params[:visible_reminder_repository_row_ids].present?
@@ -298,14 +316,14 @@ class RepositoriesController < ApplicationController
   end
 
   def import_records
-    render_403 unless can_create_repository_rows?(Repository.accessible_by_teams(current_team)
+    render_403 unless can_create_repository_rows?(Repository.viewable_by_user(current_user)
                                                             .find_by(id: import_params[:id]))
     # Check if there exist mapping for repository record (it's mandatory)
     if import_params[:mappings].present? && import_params[:mappings].value?('-1')
       status = ImportRepository::ImportRecords
                .new(
                  temp_file: TempFile.find_by(id: import_params[:file_id]),
-                 repository: Repository.accessible_by_teams(current_team).find_by(id: import_params[:id]),
+                 repository: Repository.viewable_by_user(current_user).find_by(id: import_params[:id]),
                  mappings: import_params[:mappings],
                  session: session,
                  user: current_user,
@@ -452,12 +470,12 @@ class RepositoriesController < ApplicationController
 
   def load_repository
     repository_id = params[:id] || params[:repository_id]
-    @repository = Repository.accessible_by_teams(current_user.teams).find_by(id: repository_id)
+    @repository = Repository.viewable_by_user(current_user).find_by(id: repository_id)
     render_404 unless @repository
   end
 
   def load_repositories
-    @repositories = Repository.accessible_by_teams(current_team)
+    @repositories = Repository.viewable_by_user(current_user)
   end
 
   def load_repositories_for_archiving
@@ -477,7 +495,7 @@ class RepositoriesController < ApplicationController
   end
 
   def set_inline_name_editing
-    return unless can_manage_repository?(@repository)
+    return unless can_manage_repository?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
     @inline_editable_title_config = {
       name: 'title',
@@ -522,10 +540,6 @@ class RepositoriesController < ApplicationController
     render_403 unless can_delete_repository?(@repository)
   end
 
-  def check_share_permissions
-    render_403 unless can_share_repository?(@repository)
-  end
-
   def repository_params
     params.require(:repository).permit(:name)
   end
diff --git a/app/controllers/repository_columns_controller.rb b/app/controllers/repository_columns_controller.rb
index 7b6e640dc..707a6beb8 100644
--- a/app/controllers/repository_columns_controller.rb
+++ b/app/controllers/repository_columns_controller.rb
@@ -107,7 +107,7 @@ class RepositoryColumnsController < ApplicationController
   AvailableRepositoryColumn = Struct.new(:id, :name)
 
   def load_repository
-    @repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id])
+    @repository = Repository.viewable_by_user(current_user).find_by(id: params[:repository_id])
     render_404 unless @repository
   end
 
diff --git a/app/controllers/repository_row_connections_controller.rb b/app/controllers/repository_row_connections_controller.rb
index 61e1c79b3..f3b3d998d 100644
--- a/app/controllers/repository_row_connections_controller.rb
+++ b/app/controllers/repository_row_connections_controller.rb
@@ -56,7 +56,7 @@ class RepositoryRowConnectionsController < ApplicationController
   end
 
   def repositories
-    repositories = Repository.accessible_by_teams(current_team)
+    repositories = Repository.viewable_by_user(current_user)
                              .search_by_name_and_id(current_user, current_user.teams, params[:query])
                              .order(name: :asc)
                              .page(params[:page] || 1)
@@ -69,7 +69,7 @@ class RepositoryRowConnectionsController < ApplicationController
   end
 
   def repository_rows
-    selected_repository = Repository.accessible_by_teams(current_team).find(params[:selected_repository_id])
+    selected_repository = Repository.viewable_by_user(current_user).find(params[:selected_repository_id])
 
     repository_rows = selected_repository.repository_rows
                                          .where.not(id: @repository_row.id)
@@ -93,14 +93,14 @@ class RepositoryRowConnectionsController < ApplicationController
 
     return render_422(t('.invalid_params')) unless @relation_type
 
-    @connection_repository = Repository.accessible_by_teams(current_team)
+    @connection_repository = Repository.viewable_by_user(current_user)
                                        .find_by(id: connection_params[:connection_repository_id])
     return render_404 unless @connection_repository
     return render_403 unless can_connect_repository_rows?(@connection_repository)
   end
 
   def load_repository
-    @repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id])
+    @repository = Repository.viewable_by_user(current_user).find_by(id: params[:repository_id])
     render_404 unless @repository
   end
 
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index a9c8b11e1..2e31001dc 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -4,6 +4,7 @@ class RepositoryRowsController < ApplicationController
   include ApplicationHelper
   include MyModulesHelper
   include RepositoryDatatableHelper
+  include StorageLocationsHelper
 
   before_action :load_repository, except: %i(show print rows_to_print print_zpl validate_label_template_columns)
   before_action :load_repository_or_snapshot, only: %i(show print rows_to_print print_zpl
@@ -27,15 +28,10 @@ class RepositoryRowsController < ApplicationController
 
     @all_rows_count = datatable_service.all_count
     @columns_mappings = datatable_service.mappings
-    @repository_rows = datatable_service.repository_rows
-                                        .preload(:repository_columns,
-                                                 :created_by,
-                                                 :archived_by,
-                                                 repository_cells: { value: @repository.cell_preload_includes })
-                                        .page(page)
-                                        .per(per_page)
-
-    @repository_rows = @repository_rows.where(archived: params[:archived]) unless @repository.archived?
+    repository_rows = datatable_service.repository_rows
+    repository_rows = repository_rows.where(archived: params[:archived]) unless @repository.archived?
+    @repository_rows = repository_rows.page(page).per(per_page)
+    @filtered_rows_count = @repository_rows.load.take&.filtered_count || 0
   rescue RepositoryFilters::ColumnNotFoundException
     render json: { custom_error: I18n.t('repositories.show.repository_filter.errors.column_not_found') }
   rescue RepositoryFilters::ValueNotFoundException
@@ -328,7 +324,7 @@ class RepositoryRowsController < ApplicationController
   def active_reminder_repository_cells
     reminder_cells = @repository_row.repository_cells.with_active_reminder(current_user).distinct
     render json: {
-      html: render_to_string(partial: 'shared/repository_row_reminder', locals: {
+      html: render_to_string(partial: 'shared/repository_row_reminder', formats: :html, locals: {
                                reminders: reminder_cells
                              })
     }
@@ -358,14 +354,14 @@ class RepositoryRowsController < ApplicationController
   AvailableRepositoryRow = Struct.new(:id, :name, :has_file_attached)
 
   def load_repository
-    @repository = Repository.accessible_by_teams(current_team)
+    @repository = Repository.viewable_by_user(current_user)
                             .eager_load(:repository_columns)
                             .find_by(id: params[:repository_id])
     render_404 unless @repository
   end
 
   def load_repository_or_snapshot
-    @repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id]) ||
+    @repository = Repository.viewable_by_user(current_user).find_by(id: params[:repository_id]) ||
                   RepositorySnapshot.find_by(id: params[:repository_id])
     return render_404 unless @repository
   end
diff --git a/app/controllers/repository_table_filters_controller.rb b/app/controllers/repository_table_filters_controller.rb
index 8ad3123c5..a5009529a 100644
--- a/app/controllers/repository_table_filters_controller.rb
+++ b/app/controllers/repository_table_filters_controller.rb
@@ -70,7 +70,7 @@ class RepositoryTableFiltersController < ApplicationController
   private
 
   def load_repository
-    @repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id])
+    @repository = Repository.viewable_by_user(current_user).find_by(id: params[:repository_id])
     render_403 unless can_read_repository?(@repository)
   end
 
diff --git a/app/controllers/result_assets_controller.rb b/app/controllers/result_assets_controller.rb
index e2c429260..400ae671e 100644
--- a/app/controllers/result_assets_controller.rb
+++ b/app/controllers/result_assets_controller.rb
@@ -125,7 +125,7 @@ class ResultAssetsController < ApplicationController
     ActiveRecord::Base.transaction do
       params[:results_files].each do |index, file|
         asset = Asset.create!(created_by: current_user, last_modified_by: current_user, team: current_team)
-        asset.file.attach(file[:signed_blob_id])
+        asset.attach_file_version(file[:signed_blob_id])
         result = Result.create!(user: current_user,
                                 my_module: @my_module,
                                 name: params[:results_names][index],
diff --git a/app/controllers/results_controller.rb b/app/controllers/results_controller.rb
index 075b2b669..3bc46e3d2 100644
--- a/app/controllers/results_controller.rb
+++ b/app/controllers/results_controller.rb
@@ -90,7 +90,7 @@ class ResultsController < ApplicationController
         team: @my_module.team,
         view_mode: @result.assets_view_mode
       )
-      @asset.file.attach(params[:signed_blob_id])
+      @asset.attach_file_version(params[:signed_blob_id])
       @asset.post_process_file
     end
 
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 40f2845f5..ce97a4cc2 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -41,7 +41,7 @@ class StepsController < ApplicationController
         team: @protocol.team,
         view_mode: @step.assets_view_mode
       )
-      @asset.file.attach(params[:signed_blob_id])
+      @asset.attach_file_version(params[:signed_blob_id])
       @asset.post_process_file
 
       default_message_items = {
diff --git a/app/controllers/storage_location_repository_rows_controller.rb b/app/controllers/storage_location_repository_rows_controller.rb
new file mode 100644
index 000000000..a35aa8cbf
--- /dev/null
+++ b/app/controllers/storage_location_repository_rows_controller.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+class StorageLocationRepositoryRowsController < ApplicationController
+  before_action :check_storage_locations_enabled, except: :destroy
+  before_action :load_storage_location_repository_row, only: %i(update destroy move)
+  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 move)
+
+  def index
+    storage_location_repository_row = Lists::StorageLocationRepositoryRowsService.new(
+      current_team, params
+    ).call
+    render json: storage_location_repository_row,
+           each_serializer: Lists::StorageLocationRepositoryRowSerializer,
+           meta: (pagination_dict(storage_location_repository_row) unless @storage_location.with_grid?)
+  end
+
+  def create
+    ActiveRecord::Base.transaction do
+      @storage_location_repository_row = StorageLocationRepositoryRow.new(
+        repository_row: @repository_row,
+        storage_location: @storage_location,
+        metadata: storage_location_repository_row_params[:metadata] || {},
+        created_by: current_user
+      )
+
+      @storage_location_repository_row.with_lock do
+        if @storage_location_repository_row.save
+          log_activity(:storage_location_repository_row_created)
+          render json: @storage_location_repository_row,
+                 serializer: Lists::StorageLocationRepositoryRowSerializer
+        else
+          render json: { errors: @storage_location_repository_row.errors.full_messages }, status: :unprocessable_entity
+        end
+      end
+    end
+  end
+
+  def update
+    ActiveRecord::Base.transaction do
+      @storage_location_repository_row.update(storage_location_repository_row_params)
+
+      if @storage_location_repository_row.save
+        log_activity(:storage_location_repository_row_moved)
+        render json: @storage_location_repository_row,
+               serializer: Lists::StorageLocationRepositoryRowSerializer
+      else
+        render json: { errors: @storage_location_repository_row.errors.full_messages }, status: :unprocessable_entity
+      end
+    end
+  end
+
+  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,
+        storage_location: @storage_location,
+        metadata: storage_location_repository_row_params[:metadata] || {},
+        created_by: current_user
+      )
+      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
+      render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
+      raise ActiveRecord::Rollback
+    end
+  end
+
+  def destroy
+    ActiveRecord::Base.transaction do
+      if @storage_location_repository_row.discard
+        log_activity(:storage_location_repository_row_deleted)
+        render json: {}
+      else
+        render json: { errors: @storage_location_repository_row.errors.full_messages }, status: :unprocessable_entity
+      end
+    end
+  end
+
+  def actions_toolbar
+    render json: {
+      actions: Toolbars::StorageLocationRepositoryRowsService.new(
+        current_user,
+        items_ids: JSON.parse(params[:items]).pluck('id')
+      ).actions
+    }
+  end
+
+  private
+
+  def check_storage_locations_enabled
+    render_403 unless StorageLocation.storage_locations_enabled?
+  end
+
+  def load_storage_location_repository_row
+    @storage_location_repository_row = StorageLocationRepositoryRow.find(
+      storage_location_repository_row_params[:id]
+    )
+    render_404 unless @storage_location_repository_row
+  end
+
+  def load_storage_location
+    @storage_location = StorageLocation.find(
+      storage_location_repository_row_params[:storage_location_id]
+    )
+    render_404 unless can_read_storage_location?(@storage_location)
+  end
+
+  def load_repository_row
+    @repository_row = RepositoryRow.find(storage_location_repository_row_params[:repository_row_id])
+    render_404 unless @repository_row
+  end
+
+  def storage_location_repository_row_params
+    params.permit(:id, :storage_location_id, :repository_row_id,
+                  metadata: { position: [] })
+  end
+
+  def check_read_permissions
+    render_403 unless can_read_storage_location?(@storage_location)
+  end
+
+  def check_manage_permissions
+    render_403 unless can_manage_storage_location_repository_rows?(@storage_location)
+  end
+
+  def log_activity(type_of, message_items = {})
+    Activities::CreateActivityService
+      .call(activity_type: type_of,
+            owner: current_user,
+            team: @storage_location.team,
+            subject: @storage_location_repository_row.storage_location,
+            message_items: {
+              storage_location: @storage_location_repository_row.storage_location_id,
+              repository_row: @storage_location_repository_row.repository_row_id,
+              position: @storage_location_repository_row.human_readable_position,
+              user: current_user.id
+            }.merge(message_items))
+  end
+end
diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
new file mode 100644
index 000000000..3bae95dd8
--- /dev/null
+++ b/app/controllers/storage_locations_controller.rb
@@ -0,0 +1,329 @@
+# frozen_string_literal: true
+
+class StorageLocationsController < ApplicationController
+  include ActionView::Helpers::TextHelper
+  include ApplicationHelper
+  include TeamsHelper
+  include Rails.application.routes.url_helpers
+
+  before_action :switch_team_with_param, only: %i(index show)
+  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)
+
+  def index
+    @parent_location = StorageLocation.find(storage_location_params[:parent_id]) if storage_location_params[:parent_id]
+
+    render_403 if @parent_location && !can_read_storage_location?(@parent_location)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        storage_locations = Lists::StorageLocationsService.new(current_user, current_team, params).call
+        render json: storage_locations,
+               each_serializer: Lists::StorageLocationSerializer,
+               user: current_user,
+               meta: pagination_dict(storage_locations),
+               shared_object:
+                @parent_location &&
+                StorageLocation.select('*').select(StorageLocation.shared_sql_select(current_user)).find(@parent_location.root_storage_location.id)
+      end
+    end
+  end
+
+  def show; end
+
+  def create
+    ActiveRecord::Base.transaction do
+      @storage_location = StorageLocation.new(
+        storage_location_params.merge({ created_by: current_user })
+      )
+
+      @storage_location.team = @storage_location.root_storage_location.team || current_team
+
+      @storage_location.image.attach(params[:signed_blob_id]) if params[:signed_blob_id]
+
+      if @storage_location.save
+        log_activity('storage_location_created')
+        storage_location_annotation_notification
+        render json: @storage_location, serializer: Lists::StorageLocationSerializer
+      else
+        render json: { error: @storage_location.errors.full_messages }, status: :unprocessable_entity
+      end
+    end
+  end
+
+  def update
+    ActiveRecord::Base.transaction do
+      @storage_location.image.purge if params[:file_name].blank?
+      @storage_location.image.attach(params[:signed_blob_id]) if params[:signed_blob_id]
+      old_description = @storage_location.description
+      @storage_location.update(storage_location_params)
+
+      if @storage_location.save
+        log_activity('storage_location_edited')
+        storage_location_annotation_notification(old_description) if old_description != @storage_location.description
+        render json: @storage_location, serializer: Lists::StorageLocationSerializer
+      else
+        render json: { error: @storage_location.errors.full_messages }, status: :unprocessable_entity
+      end
+    end
+  end
+
+  def destroy
+    ActiveRecord::Base.transaction do
+      if @storage_location.discard
+        log_activity('storage_location_deleted')
+        render json: {}
+      else
+        render json: { error: @storage_location.errors.full_messages }, status: :unprocessable_entity
+      end
+    end
+  end
+
+  def duplicate
+    ActiveRecord::Base.transaction do
+      new_storage_location = @storage_location.duplicate!(current_user, current_team)
+      if new_storage_location
+        @storage_location = new_storage_location
+        log_activity('storage_location_created')
+        render json: @storage_location, serializer: Lists::StorageLocationSerializer
+      else
+        render json: { errors: :failed }, status: :unprocessable_entity
+      end
+    end
+  end
+
+  def move
+    ActiveRecord::Base.transaction do
+      original_storage_location = @storage_location.parent
+      destination_storage_location =
+        if move_params[:destination_storage_location_id] == 'root_storage_location'
+          nil
+        else
+          StorageLocation.find(move_params[:destination_storage_location_id])
+        end
+
+      render_403 and return if destination_storage_location && !can_manage_storage_location?(destination_storage_location)
+
+      @storage_location.update!(parent: destination_storage_location)
+
+      log_activity('storage_location_moved', {
+                     storage_location_original: original_storage_location&.id, # nil if moved from root
+                     storage_location_destination: destination_storage_location&.id # nil if moved to root
+                   })
+    end
+
+    render json: { message: I18n.t('storage_locations.index.move_modal.success_flash') }
+  rescue StandardError => e
+    Rails.logger.error e.message
+    Rails.logger.error e.backtrace.join("\n")
+    render json: { error: I18n.t('storage_locations.index.move_modal.error_flash') }, status: :bad_request
+  end
+
+  def tree
+    records = StorageLocation.viewable_by_user(current_user, current_team)
+                             .where(
+                               parent: nil,
+                               container: [false, params[:container] == 'true']
+                             )
+    records = records.where(team_id: params[:team_id]) if params[:team_id]
+
+    render json: {
+      locations: storage_locations_recursive_builder(records),
+      movable_to_root: params[:team_id] && current_team.id == params[:team_id].to_i
+    }
+  end
+
+  def available_positions
+    render json: { positions: @storage_location.available_positions }
+  end
+
+  def unassign_rows
+    ActiveRecord::Base.transaction do
+      @storage_location_repository_rows = @storage_location.storage_location_repository_rows.where(id: params[:ids])
+      @storage_location_repository_rows.each(&:discard)
+      log_unassign_activities
+    end
+
+    render json: { status: :ok }
+  end
+
+  def export_container
+    xlsx = StorageLocations::ExportService.new(@storage_location, current_user).to_xlsx
+
+    send_data(
+      xlsx,
+      filename: "#{@storage_location.name.gsub(/\s/, '_')}_export_#{Date.current}.xlsx",
+      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    )
+  end
+
+  def import_container
+    result = StorageLocations::ImportService.new(@storage_location, params[:file], current_user).import_items
+    if result[:status] == :ok
+      if (result[:assigned_count] + result[:unassigned_count]).positive?
+        log_activity(
+          :storage_location_imported,
+          {
+            assigned_count: result[:assigned_count],
+            unassigned_count: result[:unassigned_count]
+          }
+        )
+      end
+
+      render json: result
+    else
+      render json: result, status: :unprocessable_entity
+    end
+  end
+
+  def actions_toolbar
+    render json: {
+      actions:
+        Toolbars::StorageLocationsService.new(
+          current_user,
+          storage_location_ids: JSON.parse(params[:items]).pluck('id')
+        ).actions
+    }
+  end
+
+  private
+
+  def check_storage_locations_enabled
+    render_403 unless StorageLocation.storage_locations_enabled?
+  end
+
+  def storage_location_params
+    params.permit(:id, :parent_id, :name, :container, :description,
+                  metadata: [:display_type, { dimensions: [], parent_coordinations: [] }])
+  end
+
+  def move_params
+    params.permit(:id, :destination_storage_location_id)
+  end
+
+  def load_storage_location
+    @storage_location = StorageLocation.find(storage_location_params[:id])
+    @parent_location = @storage_location.parent
+    render_404 unless can_read_storage_location?(@storage_location)
+  end
+
+  def check_read_permissions
+    render_403 unless can_read_storage_location?(@storage_location)
+  end
+
+  def check_create_permissions
+    render_403 if @parent_location && !can_manage_storage_location?(@parent_location.team)
+
+    if storage_location_params[:container]
+      render_403 unless can_create_storage_location_containers?(current_team)
+    else
+      render_403 unless can_create_storage_locations?(current_team)
+    end
+  end
+
+  def check_manage_permissions
+    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 = []
+
+    @breadcrumbs_items.push({
+                              label: t('breadcrumbs.inventories')
+                            })
+
+    @breadcrumbs_items.push({
+                              label: t('breadcrumbs.locations'),
+                              url: storage_locations_path
+                            })
+
+    storage_locations = []
+    if params[:parent_id] || @storage_location
+      location = StorageLocation.find_by(id: params[:parent_id]) || @storage_location
+      if location
+        storage_locations.unshift(breadcrumbs_item(location))
+        while location.parent
+          location = location.parent
+          storage_locations.unshift(breadcrumbs_item(location))
+        end
+      end
+    end
+    @breadcrumbs_items += storage_locations
+  end
+
+  def breadcrumbs_item(location)
+    {
+      label: location.name,
+      url: storage_locations_path(parent_id: location.id)
+    }
+  end
+
+  def storage_locations_recursive_builder(storage_locations)
+    storage_locations.order('LOWER(storage_locations.name) ASC').map do |storage_location|
+      {
+        storage_location: storage_location,
+        can_manage: (can_manage_storage_location?(storage_location) unless storage_location.parent_id),
+        children: storage_locations_recursive_builder(
+          storage_location.storage_locations.where(container: [false, params[:container] == 'true'])
+        )
+      }
+    end
+  end
+
+  def log_activity(type_of, message_items = {})
+    Activities::CreateActivityService
+      .call(activity_type: "#{'container_' if @storage_location.container}#{type_of}",
+            owner: current_user,
+            team: @storage_location.team,
+            subject: @storage_location,
+            message_items: {
+              storage_location: @storage_location.id,
+              user: current_user.id
+            }.merge(message_items))
+  end
+
+  def storage_location_annotation_notification(old_text = nil)
+    url = if @storage_location.container
+            storage_location_path(@storage_location.id)
+          else
+            storage_locations_path(parent_id: @storage_location.id)
+          end
+
+    smart_annotation_notification(
+      old_text: old_text,
+      new_text: @storage_location.description,
+      subject: @storage_location,
+      title: t('notifications.storage_location_annotation_title',
+               storage_location: @storage_location.name,
+               user: current_user.full_name),
+      message: t('notifications.storage_location_annotation_message_html',
+                 storage_location: link_to(@storage_location.name, url))
+    )
+  end
+
+  def log_unassign_activities
+    @storage_location_repository_rows.each do |storage_location_repository_row|
+      Activities::CreateActivityService
+        .call(activity_type: :storage_location_repository_row_deleted,
+              owner: current_user,
+              team: @storage_location.team,
+              subject: storage_location_repository_row.repository_row,
+              message_items: {
+                storage_location: storage_location_repository_row.storage_location_id,
+                repository_row: storage_location_repository_row.repository_row_id,
+                position: storage_location_repository_row.human_readable_position,
+                user: current_user.id
+              })
+    end
+  end
+end
diff --git a/app/controllers/team_shared_objects_controller.rb b/app/controllers/team_shared_objects_controller.rb
new file mode 100644
index 000000000..3276b5721
--- /dev/null
+++ b/app/controllers/team_shared_objects_controller.rb
@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+class TeamSharedObjectsController < ApplicationController
+  before_action :load_vars
+  before_action :check_sharing_permissions
+
+  def update
+    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?
+        @model.permission_level = global_permission_level
+
+        if @model.permission_level_changed?
+          @model.save!
+          @model.team_shared_objects.each(&:destroy!) unless global_permission_level == :not_shared
+          case @model
+          when Repository
+            setup_repository_global_share_activity
+          end
+        end
+      end
+
+      # Share to specific teams
+      params[:team_share_params].each do |t|
+        next unless t['private_shared_with']
+
+        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
+        )
+
+        setup_team_share_activity(team_shared_object, new_record) if team_shared_object.saved_changes?
+      end
+
+      # Unshare
+      @model.team_shared_objects.where.not(
+        team_id: params[:team_share_params].filter { |t| t['private_shared_with'] }.pluck('id')
+      ).each do |team_shared_object|
+        team_shared_object.destroy!
+        setup_team_share_activity(team_shared_object, false)
+      end
+
+      log_activities
+    end
+  end
+
+  def shareable_teams
+    teams = (Team.order(:name).all - [@model.team]).filter { |t| can_read_team?(t) || @model.private_shared_with?(t) }
+    render json: teams, each_serializer: ShareableTeamSerializer, model: @model
+  end
+
+  private
+
+  def load_vars
+    case params[:object_type]
+    when 'Repository'
+      @model = Repository.viewable_by_user(current_user).find_by(id: params[:object_id])
+    when 'StorageLocation'
+      @model = StorageLocation.viewable_by_user(current_user).find_by(id: params[:object_id])
+    end
+
+    render_404 unless @model
+  end
+
+  def create_params
+    params.permit(:team_id, :object_type, :object_id, :target_team_id, :permission_level)
+  end
+
+  def destroy_params
+    params.permit(:team_id, :id)
+  end
+
+  def update_params
+    params.permit(permission_changes: {}, share_team_ids: [], write_permissions: [])
+  end
+
+  def check_sharing_permissions
+    object_name = @model.is_a?(RepositoryBase) ? 'repository' : @model.model_name.param_key
+    render_403 unless public_send("can_share_#{object_name}?", @model)
+    render_403 if !@model.shareable_write? && update_params[:write_permissions].present?
+  end
+
+  def share_all_params
+    {
+      shared_with_all: params[:select_all_teams].present?,
+      shared_permissions_level: params[:select_all_write_permission].present? ? 'shared_write' : 'shared_read'
+    }
+  end
+
+  def setup_team_share_activity(team_shared_object, new_record)
+    type =
+      case @model
+      when Repository
+        if team_shared_object.destroyed?
+          :unshare_inventory
+        elsif new_record
+          :share_inventory
+        else
+          :update_share_inventory
+        end
+      when StorageLocation
+        if team_shared_object.destroyed?
+          "#{'container_' if @model.container?}storage_location_unshared"
+        elsif new_record
+          "#{'container_' if @model.container?}storage_location_shared"
+        else
+          "#{'container_' if @model.container?}storage_location_sharing_updated"
+        end
+      end
+
+    @activities_to_log << {
+      type: type,
+      message_items: {
+        @model.model_name.param_key.to_sym => team_shared_object.shared_object.id,
+        team: team_shared_object.team.id,
+        permission_level: Extends::SHARED_INVENTORIES_PL_MAPPINGS[team_shared_object.permission_level.to_sym]
+      }
+    }
+  end
+
+  def setup_repository_global_share_activity
+    message_items = {
+      repository: @model.id,
+      team: @model.team.id,
+      permission_level: Extends::SHARED_INVENTORIES_PL_MAPPINGS[@model.permission_level.to_sym]
+    }
+
+    activity_params =
+      if @model.saved_changes['permission_level'][0] == 'not_shared'
+        { type: :share_inventory_with_all, message_items: message_items }
+      elsif @model.saved_changes['permission_level'][1] == 'not_shared'
+        { type: :unshare_inventory_with_all, message_items: message_items }
+      else
+        { type: :update_share_with_all_permission_level, message_items: message_items }
+      end
+
+    @activities_to_log << activity_params
+  end
+
+  def log_activities
+    @activities_to_log.each do |activity_params|
+      Activities::CreateActivityService
+        .call(activity_type: activity_params[:type],
+              owner: current_user,
+              team: @model.team,
+              subject: @model,
+              message_items: {
+                user: current_user.id
+              }.merge(activity_params[:message_items]))
+    end
+  end
+end
diff --git a/app/controllers/user_notifications_controller.rb b/app/controllers/user_notifications_controller.rb
index ca05c3bbc..127d35289 100644
--- a/app/controllers/user_notifications_controller.rb
+++ b/app/controllers/user_notifications_controller.rb
@@ -5,11 +5,18 @@ class UserNotificationsController < ApplicationController
 
   def index
     page = (params.dig(:page, :number) || 1).to_i
-    notifications = load_notifications.page(page).per(Constants::INFINITE_SCROLL_LIMIT)
+    notifications = load_notifications
+
+    case params[:tab]
+    when 'read'
+      notifications = notifications.where.not(read_at: nil)
+    when 'unread'
+      notifications = notifications.where(read_at: nil)
+    end
+
+    notifications = notifications.page(page).per(Constants::INFINITE_SCROLL_LIMIT)
 
     render json: notifications, each_serializer: NotificationSerializer
-
-    notifications.mark_as_read!
   end
 
   def unseen_counter
@@ -18,6 +25,17 @@ class UserNotificationsController < ApplicationController
     }
   end
 
+  def mark_all_read
+    load_notifications.mark_as_read!
+    render json: { success: true }
+  end
+
+  def toggle_read
+    notification = current_user.notifications.find(params[:id])
+    notification.update(read_at: (params[:mark_as_read] ? DateTime.now : nil))
+    render json: notification, serializer: NotificationSerializer
+  end
+
   private
 
   def load_notifications
@@ -25,5 +43,4 @@ class UserNotificationsController < ApplicationController
                 .in_app
                 .order(created_at: :desc)
   end
-
 end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 6fefaf3c7..74d7fc180 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -8,7 +8,7 @@ module Users
     skip_before_action :verify_authenticity_token
     before_action :sign_up_with_provider_enabled?,
                   only: :linkedin
-    before_action :check_sso_status, only: %i(customazureactivedirectory okta openid_connect)
+    before_action :check_sso_status, only: %i(customazureactivedirectory okta openid_connect saml)
 
     # You should configure your model like this:
     # devise :omniauthable, omniauth_providers: [:twitter]
@@ -38,7 +38,7 @@ module Users
 
       if email.blank?
         # No email in the token so can not link or create user
-        error_message = I18n.t('devise.azure.errors.no_email')
+        missing_attribute = 'Email'
         return redirect_to after_omniauth_failure_path_for(resource_name)
       end
 
@@ -47,7 +47,11 @@ module Users
       if user.blank?
         # Create new user and identity
         user = create_user_from_auth(email, auth)
-        sign_in_and_redirect(user, event: :authentication)
+        if user.errors.present?
+          redirect_to after_omniauth_failure_path_for(resource_name)
+        else
+          sign_in_and_redirect(user, event: :authentication)
+        end
       elsif provider_conf['auto_link_on_sign_in']
         # Link to existing local account
         user.user_identities.create!(provider: auth.provider, uid: auth.uid)
@@ -65,7 +69,10 @@ module Users
       error_message ||= I18n.t('devise.azure.errors.generic')
       redirect_to after_omniauth_failure_path_for(resource_name)
     ensure
-      if error_message
+      if user&.errors.present? || missing_attribute.present?
+        missing_attribute ||= user.errors.first.attribute.capitalize
+        set_flash_message(:alert, :missing_attribute, attribute: missing_attribute)
+      elsif error_message
         set_flash_message(:alert, :failure, kind: I18n.t('devise.azure.provider_name'), reason: error_message)
       else
         set_flash_message(:notice, :success, kind: I18n.t('devise.azure.provider_name'))
@@ -137,13 +144,18 @@ module Users
       user = User.find_by(email: auth.info.email.downcase)
 
       if user.blank?
-        user = create_user_from_auth(email, auth)
+        user = create_user_from_auth(auth.info.email.downcase, auth)
+        if user.errors.present?
+          redirect_to after_omniauth_failure_path_for(resource_name)
+        else
+          sign_in_and_redirect(user, event: :authentication)
+        end
       else
         # Link to existing local account
         user.user_identities.create!(provider: auth.provider, uid: auth.uid)
         user.update!(confirmed_at: user.created_at) if user.confirmed_at.blank?
+        sign_in_and_redirect(user, event: :authentication)
       end
-      sign_in_and_redirect(user, event: :authentication)
     rescue StandardError => e
       Rails.logger.error e.message
       Rails.logger.error e.backtrace.join("\n")
@@ -151,7 +163,9 @@ module Users
       error_message ||= I18n.t('devise.okta.errors.generic')
       redirect_to after_omniauth_failure_path_for(resource_name)
     ensure
-      if error_message
+      if user&.errors.present?
+        set_flash_message(:alert, :missing_attribute, attribute: user.errors.first.attribute.capitalize)
+      elsif error_message
         set_flash_message(:alert, :failure, kind: I18n.t('devise.okta.provider_name'), reason: error_message)
       else
         set_flash_message(:notice, :success, kind: I18n.t('devise.okta.provider_name'))
@@ -175,7 +189,7 @@ module Users
 
       if email.blank?
         # No email in the token so can not link or create user
-        error_message = I18n.t('devise.openid_connect.errors.no_email')
+        missing_attribute = 'Email'
         return redirect_to after_omniauth_failure_path_for(resource_name)
       end
 
@@ -184,7 +198,11 @@ module Users
       if user.blank?
         # Create new user and identity
         user = create_user_from_auth(email, auth)
-        sign_in_and_redirect(user)
+        if user.errors.present?
+          redirect_to after_omniauth_failure_path_for(resource_name)
+        else
+          sign_in_and_redirect(user)
+        end
       elsif provider_conf['auto_link_on_sign_in']
         # Link to existing local account
         user.user_identities.create!(provider: auth.provider, uid: auth.uid)
@@ -202,7 +220,10 @@ module Users
       error_message ||= I18n.t('devise.openid_connect.errors.generic')
       redirect_to after_omniauth_failure_path_for(resource_name)
     ensure
-      if error_message
+      if user&.errors.present? || missing_attribute.present?
+        missing_attribute ||= user.errors.first.attribute.capitalize
+        set_flash_message(:alert, :missing_attribute, attribute: missing_attribute)
+      elsif error_message
         set_flash_message(:alert, :failure, kind: I18n.t('devise.openid_connect.provider_name'), reason: error_message)
       else
         set_flash_message(:notice, :success, kind: I18n.t('devise.openid_connect.provider_name'))
@@ -226,7 +247,7 @@ module Users
 
       if email.blank?
         # No email in the token so can not link or create user
-        error_message = I18n.t('devise.saml.errors.no_email')
+        missing_attribute = 'Email'
         return redirect_to after_omniauth_failure_path_for(resource_name)
       end
 
@@ -234,7 +255,11 @@ module Users
 
       if user.blank?
         user = create_user_from_auth(email, auth)
-        sign_in_and_redirect(user)
+        if user.errors.present?
+          redirect_to after_omniauth_failure_path_for(resource_name)
+        else
+          sign_in_and_redirect(user)
+        end
       elsif provider_conf['auto_link_on_sign_in']
         # Link to existing local account
         user.user_identities.create!(provider: auth.provider, uid: auth.uid)
@@ -252,7 +277,10 @@ module Users
       error_message ||= I18n.t('devise.saml.errors.generic')
       redirect_to after_omniauth_failure_path_for(resource_name)
     ensure
-      if error_message
+      if user&.errors.present? || missing_attribute.present?
+        missing_attribute ||= user.errors.first.attribute.to_s.capitalize
+        set_flash_message(:alert, :missing_attribute, attribute: missing_attribute)
+      elsif error_message
         set_flash_message(:alert, :failure, kind: I18n.t('devise.saml.provider_name'), reason: error_message)
       else
         set_flash_message(:notice, :success, kind: I18n.t('devise.saml.provider_name'))
@@ -306,20 +334,10 @@ module Users
         user.save!
         user.user_identities.create!(provider: auth.provider, uid: auth.uid)
         user.update!(confirmed_at: user.created_at)
-      end
-      user
-    end
-
-    def create_user_from_auth(email, auth)
-      full_name = "#{auth.info.first_name} #{auth.info.last_name}"
-      user = User.new(full_name: full_name,
-                      initials: generate_initials(full_name),
-                      email: email,
-                      password: generate_user_password)
-      User.transaction do
-        user.save!
-        user.user_identities.create!(provider: auth.provider, uid: auth.uid)
-        user.update!(confirmed_at: user.created_at)
+      rescue StandardError => e
+        Rails.logger.error e.message
+        Rails.logger.error e.backtrace.join("\n")
+        raise ActiveRecord::Rollback
       end
       user
     end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index fb4d4d496..17c936933 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -208,11 +208,12 @@ class Users::RegistrationsController < Devise::RegistrationsController
   end
 
   def regenerate_api_key
-    current_user.regenerate_api_key!
+    token = current_user.regenerate_api_key!
 
     redirect_to(edit_user_registration_path(anchor: 'api-key'),
                 flash: {
-                  success: t('users.registrations.edit.api_key.generated')
+                  success: t('users.registrations.edit.api_key.generated'),
+                  token: token
                 })
   end
 
diff --git a/app/controllers/users/settings/user_settings_controller.rb b/app/controllers/users/settings/user_settings_controller.rb
index 2b106bc17..04620a496 100644
--- a/app/controllers/users/settings/user_settings_controller.rb
+++ b/app/controllers/users/settings/user_settings_controller.rb
@@ -17,8 +17,8 @@ module Users
           next unless Extends::WHITELISTED_USER_SETTINGS.include?(key.to_s)
 
           case key.to_s
-          when 'task_step_states'
-            update_task_step_states(data)
+          when 'task_step_states', 'result_states'
+            update_object_states(data, key.to_s)
           else
             current_user.settings[key] = data
           end
@@ -34,18 +34,18 @@ module Users
 
       private
 
-      def update_task_step_states(task_step_states_data)
-        current_states = current_user.settings.fetch('task_step_states', {})
+      def update_object_states(object_states_data, object_state_key)
+        current_states = current_user.settings.fetch(object_state_key, {})
 
-        task_step_states_data.each do |step_id, collapsed|
+        object_states_data.each do |object_id, collapsed|
           if collapsed
-            current_states[step_id] = true
+            current_states[object_id] = true
           else
-            current_states.delete(step_id)
+            current_states.delete(object_id)
           end
         end
 
-        current_user.settings['task_step_states'] = current_states
+        current_user.settings[object_state_key] = current_states
       end
     end
   end
diff --git a/app/controllers/wopi_controller.rb b/app/controllers/wopi_controller.rb
index 6dbe4051e..a34b01d27 100644
--- a/app/controllers/wopi_controller.rb
+++ b/app/controllers/wopi_controller.rb
@@ -200,7 +200,6 @@ class WopiController < ActionController::Base
         if @asset.lock == lock
           logger.warn 'WOPI: replacing file'
 
-          @team.release_space(@asset.estimated_size)
           @asset.last_modified_by = @user
           @asset.update_contents(request.body)
           @asset.save
@@ -220,7 +219,6 @@ class WopiController < ActionController::Base
       elsif !@asset.file_size.nil? && @asset.file_size.zero?
         logger.warn 'WOPI: initializing empty file'
 
-        @team.release_space(@asset.estimated_size)
         @asset.update_contents(request.body)
         @asset.last_modified_by = @user
         @asset.save
diff --git a/app/helpers/active_storage_helper.rb b/app/helpers/active_storage_helper.rb
new file mode 100644
index 000000000..58ee7f4d6
--- /dev/null
+++ b/app/helpers/active_storage_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActiveStorageHelper
+  def image_preview_format(blob)
+    if ['image/jpeg', 'image/jpg'].include?(blob&.content_type)
+      :jpeg
+    else
+      :png
+    end
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 513a90ee7..5802404e7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -141,10 +141,9 @@ module ApplicationHelper
   # Check if text have smart annotations of users
   # and outputs a popover with user information
   def smart_annotation_filter_users(text, team, base64_encoded_imgs: false)
-    sa_user = /\[\@(.*?)~([0-9a-zA-Z]+)\]/
-    text.gsub(sa_user) do |el|
-      match = el.match(sa_user)
-      user = User.find_by_id(match[2].base62_decode)
+    text.gsub(SmartAnnotations::TagToHtml::USER_REGEX) do |el|
+      match = el.match(SmartAnnotations::TagToHtml::USER_REGEX)
+      user = User.find_by(id: match[2].base62_decode)
       next unless user
 
       popover_for_user_name(user, team, false, false, base64_encoded_imgs)
diff --git a/app/helpers/global_activities_helper.rb b/app/helpers/global_activities_helper.rb
index 608d3d6de..af945712a 100644
--- a/app/helpers/global_activities_helper.rb
+++ b/app/helpers/global_activities_helper.rb
@@ -3,6 +3,7 @@
 module GlobalActivitiesHelper
   include ActionView::Helpers::AssetTagHelper
   include ActionView::Helpers::UrlHelper
+  include Canaid::Helpers::PermissionsHelper
   include InputSanitizeHelper
 
   def generate_activity_content(activity, no_links: false, no_custom_links: false)
@@ -60,6 +61,9 @@ module GlobalActivitiesHelper
     when Repository
       path = repository_path(obj, team: obj.team.id)
     when RepositoryRow
+      # Handle private repository rows
+      return I18n.t('storage_locations.show.hidden') unless can_read_repository?(obj.repository)
+
       return current_value unless obj.repository
 
       path = repository_path(obj.repository, team: obj.repository.team.id)
@@ -108,6 +112,12 @@ module GlobalActivitiesHelper
              else
                project_folder_path(obj, team: obj.team.id)
              end
+    when StorageLocation
+      path = if obj.new_record?
+               storage_locations_path(team: activity.team.id)
+             else
+               storage_location_path(obj, team: activity.team.id)
+             end
     else
       return current_value
     end
@@ -121,8 +131,12 @@ module GlobalActivitiesHelper
             message_item['type'].constantize.new
           end
 
+    return I18n.t('storage_locations.show.hidden') if obj.is_a?(RepositoryRow) && !can_read_repository?(obj.repository)
+
     return I18n.t('projects.index.breadcrumbs_root') if obj.is_a?(ProjectFolder) && obj.new_record?
 
+    return I18n.t('storage_locations.index.breadcrumbs_root') if obj.is_a?(StorageLocation) && obj.new_record?
+
     return message_item['value'] unless obj
 
     value = obj.public_send(message_item['value_for'] || 'name')
diff --git a/app/helpers/input_sanitize_helper.rb b/app/helpers/input_sanitize_helper.rb
index e30a23666..73c9eaca2 100644
--- a/app/helpers/input_sanitize_helper.rb
+++ b/app/helpers/input_sanitize_helper.rb
@@ -46,9 +46,8 @@ module InputSanitizeHelper
     sanitizer_config = Constants::INPUT_SANITIZE_CONFIG.deep_dup
     text = sanitize_input(text, tags, sanitizer_config: sanitizer_config)
 
-    if text =~ SmartAnnotations::TagToHtml::USER_REGEX || text =~ SmartAnnotations::TagToHtml::REGEX
-      text = smart_annotation_parser(text, team, base64_encoded_imgs, preview_repository)
-    end
+    text = smart_annotation_parser(text, team, base64_encoded_imgs, preview_repository) if text.match?(SmartAnnotations::TagToHtml::ALL_REGEX)
+
     auto_link(
       text,
       html: { target: '_blank' },
diff --git a/app/helpers/left_menu_bar_helper.rb b/app/helpers/left_menu_bar_helper.rb
index f8a77be75..b6a2d22d2 100644
--- a/app/helpers/left_menu_bar_helper.rb
+++ b/app/helpers/left_menu_bar_helper.rb
@@ -19,8 +19,16 @@ module LeftMenuBarHelper
         url: repositories_path,
         name: t('left_menu_bar.repositories'),
         icon: 'sn-icon-inventory',
-        active: repositories_are_selected?,
-        submenu: []
+        active: repositories_are_selected? || storage_locations_are_selected?,
+        submenu: [{
+          url: repositories_path,
+          name: t('left_menu_bar.items'),
+          active: repositories_are_selected?
+        }, {
+          url: storage_locations_path,
+          name: t('left_menu_bar.locations'),
+          active: storage_locations_are_selected?
+        }]
       }, {
         url: "#",
         name: t('left_menu_bar.templates'),
@@ -63,6 +71,10 @@ module LeftMenuBarHelper
     controller_name == 'repositories'
   end
 
+  def storage_locations_are_selected?
+    controller_name == 'storage_locations'
+  end
+
   def protocols_are_selected?
     controller_name == 'protocols'
   end
diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 07e3eec42..7dcc85929 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -106,14 +106,4 @@ module ReportsHelper
       experiment_element.experiment.description
     end
   end
-
-  def assigned_to_report_repository_items(report, repository_name)
-    repository = Repository.accessible_by_teams(report.team).where(name: repository_name).take
-    return RepositoryRow.none if repository.blank?
-
-    my_modules = MyModule.joins(:experiment)
-                         .where(experiment: { project: report.project })
-                         .where(id: report.report_elements.my_module.select(:my_module_id))
-    repository.repository_rows.joins(:my_modules).where(my_modules: my_modules)
-  end
 end
diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb
index 5153d2478..2f64004d0 100644
--- a/app/helpers/repository_datatable_helper.rb
+++ b/app/helpers/repository_datatable_helper.rb
@@ -5,41 +5,38 @@ module RepositoryDatatableHelper
   include Rails.application.routes.url_helpers
 
   def prepare_row_columns(repository_rows, repository, columns_mappings, team, options = {})
+    # repository_rows collection is already preloaded in controllers, do not modify scopes or query params
+    # otherwise it will result in duplicated SQL queries
     has_stock_management = repository.has_stock_management?
+    stock_management_column_exists = repository.repository_columns.stock_type.exists?
+    repository_row_connections_enabled = Repository.repository_row_connections_enabled?
     reminders_enabled = Repository.reminders_enabled?
-    repository_rows = reminders_enabled ? with_reminders_status(repository_rows, repository) : repository_rows
     stock_managable = has_stock_management && !options[:disable_stock_management] &&
-                      can_manage_repository_stock?(repository)
+                      can_manage_repository_stock?(repository) &&
+                      !repository.is_a?(SoftLockedRepository)
     stock_consumption_permitted = has_stock_management && options[:include_stock_consumption] && options[:my_module] &&
                                   stock_consumption_permitted?(repository, options[:my_module])
+    default_columns_method_name = "#{repository.class.name.underscore}_default_columns"
 
     repository_rows.map do |record|
-      row = public_send("#{repository.class.name.underscore}_default_columns", record)
-      row.merge!(
-        DT_RowId: record.id,
-        DT_RowAttr: { 'data-state': row_style(record), 'data-e2e': "e2e-TR-invInventory-bodyRow-#{record.id}" },
-        recordInfoUrl: Rails.application.routes.url_helpers.repository_repository_row_path(repository, record),
-        rowRemindersUrl:
-          Rails.application.routes.url_helpers
-               .active_reminder_repository_cells_repository_repository_row_url(
-                 repository,
-                 record
-               ),
-        relationshipsUrl:
-          Rails.application.routes.url_helpers
-               .relationships_repository_repository_row_url(record.repository_id, record.id),
-        relationships_enabled: repository_row_connections_enabled,
-        code: record.code
-      )
+      row = public_send(default_columns_method_name, record)
+      row['code'] = record.code
+      row['DT_RowId'] = record.id
+      row['DT_RowAttr'] = { 'data-state': row_style(record), 'data-e2e': "e2e-TR-invInventory-bodyRow-#{record.id}" }
+      row['recordInfoUrl'] = Rails.application.routes.url_helpers.repository_repository_row_path(repository.id, record.id)
+      row['rowRemindersUrl'] = Rails.application.routes.url_helpers
+                                    .active_reminder_repository_cells_repository_repository_row_url(repository.id, record.id)
+      row['relationshipsUrl'] = Rails.application.routes.url_helpers
+                                     .relationships_repository_repository_row_url(record.repository_id, record.id)
+      row['relationships_enabled'] = repository_row_connections_enabled
+      row['hasActiveReminders'] = record.has_active_reminders if reminders_enabled
 
-      if reminders_enabled
-        row['hasActiveReminders'] = record.has_active_stock_reminders || record.has_active_datetime_reminders
-      end
-
-      unless options[:view_mode]
+      unless options[:view_mode] || repository.is_a?(SoftLockedRepository)
         row['recordUpdateUrl'] =
           Rails.application.routes.url_helpers.repository_repository_row_path(repository, record)
-        row['recordEditable'] = record.editable?
+
+        # if the editable? property will be checked in a separate request, we can default it to true
+        row['recordEditable'] = options[:omit_editable] ? true : record.editable?
       end
 
       row['0'] = record[:row_assigned] if options[:my_module]
@@ -48,13 +45,7 @@ module RepositoryDatatableHelper
       custom_cells = record.repository_cells.filter { |cell| cell.value_type != 'RepositoryStockValue' }
 
       custom_cells.each do |cell|
-        row[columns_mappings[cell.repository_column.id]] =
-          serialize_repository_cell_value(cell, team, repository, reminders_enabled: reminders_enabled)
-      end
-
-      if repository.repository_columns.stock_type.exists?
-        stock_cell = record.repository_cells.find { |cell| cell.value_type == 'RepositoryStockValue' }
-        row['stock'] = serialize_repository_cell_value(record.repository_stock_cell, team, repository) if stock_cell.present?
+        row[columns_mappings[cell.repository_column_id]] = serialize_repository_cell_value(cell, team, repository, reminders_enabled: reminders_enabled)
       end
 
       if has_stock_management
@@ -97,6 +88,9 @@ module RepositoryDatatableHelper
             }
           }
         end
+      elsif stock_management_column_exists
+        stock_cell = record.repository_cells.find { |cell| cell.value_type == 'RepositoryStockValue' }
+        row['stock'] = serialize_repository_cell_value(record.repository_stock_cell, team, repository) if stock_cell.present?
       end
 
       row
@@ -104,9 +98,10 @@ module RepositoryDatatableHelper
   end
 
   def prepare_simple_view_row_columns(repository_rows, repository, my_module, options = {})
+    # repository_rows collection is already preloaded in controllers, do not modify scopes or query params
+    # otherwise it will result in duplicated SQL queries
     has_stock_management = repository.has_stock_management?
     reminders_enabled = !options[:disable_reminders] && Repository.reminders_enabled?
-    repository_rows = reminders_enabled ? with_reminders_status(repository_rows, repository) : repository_rows
     # Always disabled in a simple view
     stock_managable = false
     stock_consumption_permitted = has_stock_management && stock_consumption_permitted?(repository, my_module)
@@ -125,9 +120,7 @@ module RepositoryDatatableHelper
                )
       }
 
-      if reminders_enabled
-        row['hasActiveReminders'] = record.has_active_stock_reminders || record.has_active_datetime_reminders
-      end
+      row['hasActiveReminders'] = record.has_active_reminders if reminders_enabled
 
       if has_stock_management
         stock_present = record.repository_stock_cell.present?
@@ -192,15 +185,14 @@ module RepositoryDatatableHelper
         '1': record.code,
         '2': escape_input(record.name),
         '3': I18n.l(record.created_at, format: :full),
-        '4': escape_input(record.created_by.full_name),
+        '4': escape_input(record.created_by_full_name),
         'recordInfoUrl': Rails.application.routes.url_helpers
                               .repository_repository_row_path(repository_snapshot, record)
       }
 
       # Add custom columns
       record.repository_cells.each do |cell|
-        row[columns_mappings[cell.repository_column.id]] =
-          serialize_repository_cell_value(cell, team, repository_snapshot)
+        row[columns_mappings[cell.repository_column_id]] = serialize_repository_cell_value(cell, team, repository_snapshot)
       end
 
       if has_stock_management
@@ -238,11 +230,24 @@ module RepositoryDatatableHelper
       '3': escape_input(record.name),
       '4': "#{record.parent_connections_count || 0} / #{record.child_connections_count || 0}",
       '5': I18n.l(record.created_at, format: :full),
-      '6': escape_input(record.created_by.full_name),
+      '6': escape_input(record.created_by_full_name),
       '7': (record.updated_at ? I18n.l(record.updated_at, format: :full) : ''),
-      '8': escape_input(record.last_modified_by.full_name),
+      '8': escape_input(record.last_modified_by_full_name),
       '9': (record.archived_on ? I18n.l(record.archived_on, format: :full) : ''),
-      '10': escape_input(record.archived_by&.full_name)
+      '10': escape_input(record.archived_by_full_name)
+    }
+  end
+
+  def soft_locked_repository_default_columns(record)
+    {
+      '1': assigned_row(record),
+      '2': record.code,
+      '3': escape_input(record.name),
+      '4': "#{record.parent_connections_count || 0} / #{record.child_connections_count || 0}",
+      '5': I18n.l(record.created_at, format: :full),
+      '6': escape_input(record.created_by_full_name),
+      '7': (record.archived_on ? I18n.l(record.archived_on, format: :full) : ''),
+      '8': escape_input(record.archived_by_full_name)
     }
   end
 
@@ -252,15 +257,35 @@ module RepositoryDatatableHelper
       '2': record.code,
       '3': escape_input(record.name),
       '4': I18n.l(record.created_at, format: :full),
-      '5': escape_input(record.created_by.full_name),
+      '5': escape_input(record.created_by_full_name),
       '6': (record.archived_on ? I18n.l(record.archived_on, format: :full) : ''),
-      '7': escape_input(record.archived_by&.full_name),
+      '7': escape_input(record.archived_by_full_name),
       '8': escape_input(record.external_id)
     }
   end
 
   def serialize_repository_cell_value(cell, team, repository, options = {})
-    serializer_class = "RepositoryDatatable::#{cell.repository_column.data_type}Serializer".constantize
+    # case/when is used because it is much faster then .constantize
+    serializer_class =
+      case cell.repository_column.data_type
+      when 'RepositoryTextValue' then RepositoryDatatable::RepositoryTextValueSerializer
+      when 'RepositoryNumberValue' then RepositoryDatatable::RepositoryNumberValueSerializer
+      when 'RepositoryListValue' then RepositoryDatatable::RepositoryListValueSerializer
+      when 'RepositoryChecklistValue' then RepositoryDatatable::RepositoryChecklistValueSerializer
+      when 'RepositoryStatusValue' then RepositoryDatatable::RepositoryStatusValueSerializer
+      when 'RepositoryTimeValue' then RepositoryDatatable::RepositoryTimeValueSerializer
+      when 'RepositoryDateValue' then RepositoryDatatable::RepositoryDateValueSerializer
+      when 'RepositoryDateTimeValue' then RepositoryDatatable::RepositoryDateTimeValueSerializer
+      when 'RepositoryDateRangeValue' then RepositoryDatatable::RepositoryDateRangeValueSerializer
+      when 'RepositoryTimeRangeValue' then RepositoryDatatable::RepositoryTimeRangeValueSerializer
+      when 'RepositoryDateTimeRangeValue' then RepositoryDatatable::RepositoryDateTimeRangeValueSerializer
+      when 'RepositoryAssetValue' then RepositoryDatatable::RepositoryAssetValueSerializer
+      when 'RepositoryStockValue' then RepositoryDatatable::RepositoryStockValueSerializer
+      when 'RepositoryStockConsumptionValue' then RepositoryDatatable::RepositoryStockConsumptionValueSerializer
+      else
+        Extends::REPOSITORY_EXTRA_VALUE_SERIALIZERS[cell.value_type]
+      end
+
     serializer_class.new(
       cell.value,
       scope: {
@@ -279,35 +304,6 @@ module RepositoryDatatableHelper
     ''
   end
 
-  def with_reminders_status(repository_rows, repository)
-    # don't load reminders for archived repositories or snapshots
-    if repository.archived? || repository.is_a?(RepositorySnapshot)
-      return repository_rows.select('FALSE AS has_active_stock_reminders')
-                            .select('FALSE AS has_active_datetime_reminders')
-    end
-
-    repository_cells = RepositoryCell.joins(
-      "INNER JOIN repository_columns ON repository_columns.id = repository_cells.repository_column_id " \
-      "AND repository_columns.repository_id = #{repository.id}"
-    )
-
-    repository_rows
-      .joins(
-        "LEFT OUTER JOIN (#{RepositoryCell.stock_reminder_repository_cells_scope(repository_cells, current_user)
-                                          .select(:id, :repository_row_id).to_sql}) " \
-        "AS repository_cells_with_active_stock_reminders " \
-        "ON repository_cells_with_active_stock_reminders.repository_row_id = repository_rows.id"
-      )
-      .joins(
-        "LEFT OUTER JOIN (#{RepositoryCell.date_time_reminder_repository_cells_scope(repository_cells, current_user)
-                                          .select(:id, :repository_row_id).to_sql}) " \
-        "AS repository_cells_with_active_datetime_reminders " \
-        "ON repository_cells_with_active_datetime_reminders.repository_row_id = repository_rows.id"
-      )
-      .select('COUNT(repository_cells_with_active_stock_reminders.id) > 0 AS has_active_stock_reminders')
-      .select('COUNT(repository_cells_with_active_datetime_reminders.id) > 0 AS has_active_datetime_reminders')
-  end
-
   def stock_consumption_permitted?(repository, my_module)
     return false unless repository.is_a?(Repository) && current_user
 
@@ -324,8 +320,4 @@ module RepositoryDatatableHelper
   def display_stock_warnings?(repository)
     !repository.is_a?(RepositorySnapshot)
   end
-
-  def repository_row_connections_enabled
-    Repository.repository_row_connections_enabled?
-  end
 end
diff --git a/app/helpers/storage_locations_helper.rb b/app/helpers/storage_locations_helper.rb
new file mode 100644
index 000000000..8754ad523
--- /dev/null
+++ b/app/helpers/storage_locations_helper.rb
@@ -0,0 +1,9 @@
+module StorageLocationsHelper
+  def storage_locations_placeholder
+    return if StorageLocation.storage_locations_enabled?
+
+    "<div class=\"p-4 rounded bg-sn-super-light-blue\">
+      #{I18n.t('storage_locations.storage_locations_disabled')}
+    </div>"
+  end
+end
diff --git a/app/javascript/packs/tiny_mce.js b/app/javascript/packs/tiny_mce.js
index 85fc0a903..723d3ab0a 100644
--- a/app/javascript/packs/tiny_mce.js
+++ b/app/javascript/packs/tiny_mce.js
@@ -326,9 +326,6 @@ window.TinyMCE = (() => {
             // Remove transition class
             $('.tox-editor-header').removeClass('tox-editor-dock-fadeout');
 
-            // Fixes the overflowing vertical controls bar for inserted text
-            $('.tox-editor-header').css('display', 'contents');
-
             // Init image toolbar
             initCssOverrides(editor);
 
diff --git a/app/javascript/packs/vue/design_system/breadcrumbs.js b/app/javascript/packs/vue/design_system/breadcrumbs.js
new file mode 100644
index 000000000..207ba469a
--- /dev/null
+++ b/app/javascript/packs/vue/design_system/breadcrumbs.js
@@ -0,0 +1,22 @@
+import { createApp } from 'vue/dist/vue.esm-bundler.js';
+import Breadcrumbs from '../../../vue/shared/breadcrumbs.vue';
+import { mountWithTurbolinks } from '../helpers/turbolinks.js';
+
+const app = createApp({
+  computed: {
+    breadcrumbs() {
+      return [
+        { name: 'Home', url: '/' },
+        { name: 'Very very very long name ', url: '' },
+        { name: 'Data', url: '' },
+        { name: 'Very very very very very very very very very very long name ', url: '' },
+        { name: 'Very very very very very very very  long name ', url: '' },
+        { name: 'Very very very very very long name ', url: '' },
+        { name: 'Very very very very long name ', url: '' }
+      ];
+    }
+  }
+});
+app.component('Breadcrumbs', Breadcrumbs);
+app.config.globalProperties.i18n = window.I18n;
+mountWithTurbolinks(app, '#breadcrumbs');
diff --git a/app/javascript/packs/vue/legacy/tags_modal.js b/app/javascript/packs/vue/legacy/tags_modal.js
index 176b2305d..7fb0bfc98 100644
--- a/app/javascript/packs/vue/legacy/tags_modal.js
+++ b/app/javascript/packs/vue/legacy/tags_modal.js
@@ -10,6 +10,7 @@ const app = createApp({
       myModuleParams: null,
       myModuleUrl: null,
       tagsModalOpen: false,
+      tagDeleted: false
     };
   },
   mounted() {
@@ -35,6 +36,10 @@ const app = createApp({
       this.myModuleParams = null;
       this.myModuleUrl = null;
       this.tagsModalOpen = false;
+
+      if ($('#canvas-container').length && this.tagDeleted) {
+        window.location.reload();
+      }
     },
     syncTags(tags) {
       // My module page
diff --git a/app/javascript/packs/vue/storage_locations_container.js b/app/javascript/packs/vue/storage_locations_container.js
new file mode 100644
index 000000000..e7f2e6259
--- /dev/null
+++ b/app/javascript/packs/vue/storage_locations_container.js
@@ -0,0 +1,10 @@
+import { createApp } from 'vue/dist/vue.esm-bundler.js';
+import PerfectScrollbar from 'vue3-perfect-scrollbar';
+import StorageLocationsContainer from '../../vue/storage_locations/container.vue';
+import { mountWithTurbolinks } from './helpers/turbolinks.js';
+
+const app = createApp();
+app.component('StorageLocationsContainer', StorageLocationsContainer);
+app.config.globalProperties.i18n = window.I18n;
+app.use(PerfectScrollbar);
+window.StorageLocationsContainer = mountWithTurbolinks(app, '#StorageLocationsContainer');
diff --git a/app/javascript/packs/vue/storage_locations_table.js b/app/javascript/packs/vue/storage_locations_table.js
new file mode 100644
index 000000000..e83db7824
--- /dev/null
+++ b/app/javascript/packs/vue/storage_locations_table.js
@@ -0,0 +1,10 @@
+import { createApp } from 'vue/dist/vue.esm-bundler.js';
+import PerfectScrollbar from 'vue3-perfect-scrollbar';
+import StorageLocations from '../../vue/storage_locations/table.vue';
+import { mountWithTurbolinks } from './helpers/turbolinks.js';
+
+const app = createApp();
+app.component('StorageLocations', StorageLocations);
+app.config.globalProperties.i18n = window.I18n;
+app.use(PerfectScrollbar);
+mountWithTurbolinks(app, '#storageLocationsTable');
diff --git a/app/javascript/vue/label_template/renderers/default.vue b/app/javascript/vue/label_template/renderers/default.vue
new file mode 100644
index 000000000..0081fe32a
--- /dev/null
+++ b/app/javascript/vue/label_template/renderers/default.vue
@@ -0,0 +1,14 @@
+<template>
+  <i v-if="params.data.default" class="sn-icon sn-icon-approval"></i>
+  <span v-else></span>
+</template>
+<script>
+export default {
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/label_template/renderers/format.vue b/app/javascript/vue/label_template/renderers/format.vue
new file mode 100644
index 000000000..de61fb305
--- /dev/null
+++ b/app/javascript/vue/label_template/renderers/format.vue
@@ -0,0 +1,17 @@
+<template>
+  <span>
+    <span v-html="params.data.icon_url"></span>
+    <span>{{ params.data.format }}</span>
+  </span>
+</template>
+
+<script>
+export default {
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/label_template/renderers/name.vue b/app/javascript/vue/label_template/renderers/name.vue
new file mode 100644
index 000000000..ac969e84f
--- /dev/null
+++ b/app/javascript/vue/label_template/renderers/name.vue
@@ -0,0 +1,16 @@
+<template>
+  <a :href="params.data.urls.show" :title="params.data.name">
+    {{ params.data.name }}
+  </a>
+</template>
+
+<script>
+export default {
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/label_template/table.vue b/app/javascript/vue/label_template/table.vue
index e39071a45..778b77c46 100644
--- a/app/javascript/vue/label_template/table.vue
+++ b/app/javascript/vue/label_template/table.vue
@@ -30,28 +30,34 @@ import axios from '../../packs/custom_axios.js';
 
 import DataTable from '../shared/datatable/table.vue';
 import DeleteModal from '../shared/confirmation_modal.vue';
+import NameRenderer from './renderers/name.vue';
+import DefaultRenderer from './renderers/default.vue';
+import FormatRenderer from './renderers/format.vue';
 
 export default {
   name: 'LabelTemplatesTable',
   components: {
     DataTable,
     DeleteModal,
+    NameRenderer,
+    DefaultRenderer,
+    FormatRenderer
   },
   props: {
     dataSource: {
       type: String,
-      required: true,
+      required: true
     },
     actionsUrl: {
       type: String,
-      required: true,
+      required: true
     },
     createUrl: {
-      type: String,
+      type: String
     },
     syncFluicsUrl: {
-      type: String,
-    },
+      type: String
+    }
   },
   data() {
     return {
@@ -60,40 +66,40 @@ export default {
         {
           field: 'default',
           headerName: this.i18n.t('label_templates.index.default_label'),
-          cellRenderer: this.defaultRenderer,
-          sortable: true,
+          cellRenderer: 'DefaultRenderer',
+          sortable: true
         }, {
           field: 'name',
           headerName: this.i18n.t('label_templates.index.thead_name'),
-          cellRenderer: this.labelNameRenderer,
-          sortable: true,
+          cellRenderer: 'NameRenderer',
+          sortable: true
         }, {
           field: 'format',
           headerName: this.i18n.t('label_templates.index.format'),
           sortable: true,
-          cellRenderer: ({ data: { format, icon_url: iconUrl } }) => `<span>${iconUrl}</span> <span>${format}</span>`
+          cellRenderer: 'FormatRenderer'
         }, {
           field: 'description',
           headerName: this.i18n.t('label_templates.index.description'),
-          sortable: true,
+          sortable: true
         }, {
           field: 'modified_by',
           headerName: this.i18n.t('label_templates.index.updated_by'),
-          sortable: true,
+          sortable: true
         }, {
           field: 'updated_at',
           headerName: this.i18n.t('label_templates.index.updated_at'),
-          sortable: true,
+          sortable: true
         }, {
           field: 'created_by',
           headerName: this.i18n.t('label_templates.index.created_by'),
-          sortable: true,
+          sortable: true
         }, {
           field: 'created_at',
           headerName: this.i18n.t('label_templates.index.created_at'),
-          sortable: true,
-        },
-      ],
+          sortable: true
+        }
+      ]
     };
   },
   computed: {
@@ -106,7 +112,7 @@ export default {
           label: this.i18n.t('label_templates.index.toolbar.new'),
           type: 'emit',
           path: this.createUrl,
-          buttonStyle: 'btn btn-primary',
+          buttonStyle: 'btn btn-primary'
         });
       }
       if (this.syncFluicsUrl) {
@@ -121,21 +127,11 @@ export default {
       }
       return {
         left,
-        right: [],
+        right: []
       };
-    },
+    }
   },
   methods: {
-    labelNameRenderer(params) {
-      const editUrl = params.data.urls.show;
-      return `<a href="${editUrl}" title="${params.data.name}">
-                ${params.data.name}
-              </a>`;
-    },
-    defaultRenderer(params) {
-      const defaultSelected = params.data.default;
-      return defaultSelected ? '<i class="sn-icon sn-icon-approval"></i>' : '';
-    },
     setDefault(action) {
       axios.post(action.path).then((response) => {
         this.reloadingTable = true;
@@ -175,8 +171,8 @@ export default {
           HelperModule.flashAlertMsg(error.response.data.error, 'danger');
         });
       }
-    },
-  },
+    }
+  }
 };
 
 </script>
diff --git a/app/javascript/vue/my_modules/list.vue b/app/javascript/vue/my_modules/list.vue
index 8d6ff6acd..4904aee57 100644
--- a/app/javascript/vue/my_modules/list.vue
+++ b/app/javascript/vue/my_modules/list.vue
@@ -16,6 +16,7 @@
     :hiddenDataMessage="i18n.t('experiments.empty_state.no_active_modules_archived_branch')"
     scrollMode="infinite"
     @tableReloaded="reloadingTable = false"
+    @reloadTable="reloadingTable = true"
     @create="newModalOpen = true"
     @edit="edit"
     @move="move"
@@ -56,6 +57,9 @@
 import axios from '../../packs/custom_axios.js';
 import DataTable from '../shared/datatable/table.vue';
 import ConfirmationModal from '../shared/confirmation_modal.vue';
+import NameRenderer from './renderers/name.vue';
+import ResultsRenderer from './renderers/results.vue';
+import StatusRenderer from './renderers/status.vue';
 import DueDateRenderer from './renderers/due_date.vue';
 import DesignatedUsers from './renderers/designated_users.vue';
 import TagsModal from './modals/tags.vue';
@@ -77,7 +81,10 @@ export default {
     NewModal,
     EditModal,
     MoveModal,
-    AccessModal
+    AccessModal,
+    NameRenderer,
+    ResultsRenderer,
+    StatusRenderer
   },
   props: {
     dataSource: { type: String, required: true },
@@ -115,7 +122,7 @@ export default {
         field: 'name',
         headerName: this.i18n.t('experiments.table.column.task_name_html'),
         sortable: true,
-        cellRenderer: this.nameRenderer
+        cellRenderer: NameRenderer
       },
       {
         field: 'code',
@@ -133,7 +140,7 @@ export default {
         field: 'results',
         headerName: this.i18n.t('experiments.table.column.results_html'),
         sortable: true,
-        cellRenderer: this.resultsRenderer
+        cellRenderer: ResultsRenderer
       },
       {
         field: 'age',
@@ -144,7 +151,7 @@ export default {
         field: 'status',
         headerName: this.i18n.t('experiments.table.column.status_html'),
         sortable: true,
-        cellRenderer: this.statusRenderer,
+        cellRenderer: StatusRenderer,
         minWidth: 120
       }
     ];
@@ -321,53 +328,6 @@ export default {
         roles_path: this.userRolesUrl
       };
     },
-    checkProvisioning(params) {
-      if (params.data.provisioning_status === 'done') return;
-
-      axios.get(params.data.urls.provisioning_status).then((response) => {
-        const provisioningStatus = response.data.provisioning_status;
-        if (provisioningStatus === 'done') {
-          this.reloadingTable = true;
-        } else {
-          setTimeout(() => {
-            this.checkProvisioning(params);
-          }, 5000);
-        }
-      });
-    },
-    // Renderers
-    nameRenderer(params) {
-      const { name, urls } = params.data;
-      const provisioningStatus = params.data.provisioning_status;
-      if (provisioningStatus === 'in_progress') {
-        setTimeout(() => {
-          this.checkProvisioning(params);
-        }, 5000);
-        return `
-          <span class="flex gap-2 items-center">
-            <div title="${this.i18n.t('experiments.duplicate_tasks.duplicating')}"
-                 class="loading-overlay w-6 h-6 !relative shrink-0" data-toggle="tooltip" data-placement="right"></div>
-            <span class="truncate">${name}</span>
-          </span>`;
-      }
-
-      return `<a href="${urls.show}" title="${name}" ><span class="truncate">${name}</span></a>`;
-    },
-    statusRenderer(params) {
-      const { status } = params.data;
-
-      return `<span
-                class="px-2 py-1 border border-solid rounded truncate ${!status.light_color ? 'text-sn-white' : ''}"
-                style="background-color: ${status.color};"
-              >
-                ${status.name}
-              </span>`;
-    },
-    resultsRenderer(params) {
-      const { results, urls } = params.data;
-
-      return `<a href="${urls.results}" >${results}</a>`;
-    },
     usersFilterRenderer(option) {
       return `<div class="flex items-center gap-2">
                 <img src="${option[2].avatar_url}" class="rounded-full w-6 h-6" />
diff --git a/app/javascript/vue/my_modules/modals/tags.vue b/app/javascript/vue/my_modules/modals/tags.vue
index 05515daf8..5e69d9f7e 100644
--- a/app/javascript/vue/my_modules/modals/tags.vue
+++ b/app/javascript/vue/my_modules/modals/tags.vue
@@ -147,7 +147,7 @@ import ConfirmationModal from '../../shared/confirmation_modal.vue';
 
 export default {
   name: 'TagsModal',
-  emits: ['close', 'tagsLoaded'],
+  emits: ['close', 'tagsLoaded', 'tagDeleted'],
   props: {
     params: {
       required: true
@@ -288,6 +288,8 @@ export default {
           color: tag.attributes.color
         },
         my_module_id: this.params.id
+      }).then(() => {
+        this.$emit('tagsLoaded', this.allTags);
       });
     },
     createTag() {
@@ -309,6 +311,7 @@ export default {
           }
         }).then(() => {
           this.loadAlltags();
+          this.$emit('tagDeleted', tag);
           document.body.style.overflow = 'hidden';
         });
       } else {
diff --git a/app/javascript/vue/my_modules/renderers/name.vue b/app/javascript/vue/my_modules/renderers/name.vue
new file mode 100644
index 000000000..22725492e
--- /dev/null
+++ b/app/javascript/vue/my_modules/renderers/name.vue
@@ -0,0 +1,50 @@
+<template>
+  <template v-if="params.data.provisioning_status === 'in_progress'">
+    <span class="flex gap-2 items-center">
+      <div :title="this.i18n.t('experiments.duplicate_tasks.duplicating')"
+           class="loading-overlay w-6 h-6 !relative shrink-0" data-toggle="tooltip" data-placement="right"></div>
+      <span class="truncate">{{ params.data.name }}</span>
+    </span>
+  </template>
+  <template v-else>
+    <a :href="params.data.urls.show" :title="params.data.name" >
+      <i v-if="params.data.locked" class="sn-icon sn-icon-locked-task"></i>
+      <span class="truncate">{{ params.data.name }}</span>
+    </a>
+  </template>
+</template>
+
+<script>
+import axios from '../../../packs/custom_axios.js';
+
+export default {
+  name: 'NameRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  },
+  created() {
+    if (this.params.data.provisioning_status === 'in_progress') {
+      setTimeout(() => {
+        this.checkProvisioning();
+      }, 5000);
+    }
+  },
+  methods: {
+    checkProvisioning() {
+      if (this.params.data.provisioning_status === 'done') return;
+      axios.get(this.params.data.urls.provisioning_status).then((response) => {
+        const provisioningStatus = response.data.provisioning_status;
+        if (provisioningStatus === 'done') {
+          this.params.dtComponent.$emit('reloadTable', null, [this.params.data]);
+        } else {
+          setTimeout(() => {
+            this.checkProvisioning();
+          }, 5000);
+        }
+      });
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/my_modules/renderers/results.vue b/app/javascript/vue/my_modules/renderers/results.vue
new file mode 100644
index 000000000..bcb21bad5
--- /dev/null
+++ b/app/javascript/vue/my_modules/renderers/results.vue
@@ -0,0 +1,14 @@
+<template>
+  <a :href="params.data.urls.results" >{{ params.data.results }}</a>
+</template>
+
+<script>
+export default {
+  name: 'ResultsRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/my_modules/renderers/status.vue b/app/javascript/vue/my_modules/renderers/status.vue
new file mode 100644
index 000000000..33753fc8c
--- /dev/null
+++ b/app/javascript/vue/my_modules/renderers/status.vue
@@ -0,0 +1,20 @@
+<template>
+  <span
+    class="px-2 py-1 border border-solid rounded truncate"
+    :class="{'text-sn-white' : !params.data.status.light_color}"
+    :style="{'background-color': params.data.status.color}"
+  >
+    {{ params.data.status.name }}
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'StatusRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/navigation/notifications/notification_item.vue b/app/javascript/vue/navigation/notifications/notification_item.vue
index b187636f1..9ab899648 100644
--- a/app/javascript/vue/navigation/notifications/notification_item.vue
+++ b/app/javascript/vue/navigation/notifications/notification_item.vue
@@ -1,41 +1,58 @@
 <template>
   <div class="sci-navigation--notificaitons-flyout-notification">
-    <div class="sci-navigation--notificaitons-flyout-notification-date">
-      {{ notification.attributes.created_at }}
+    <div class="flex item-center">
+      <div class="sci-navigation--notificaitons-flyout-notification-date">
+        {{ notification.attributes.created_at }}
+      </div>
+      <div class="ml-auto cursor-pointer" @click="toggleRead()">
+        <div v-if="!notification.attributes.checked" class="w-2.5 h-2.5 bg-sn-coral rounded-full cursor-pointer"></div>
+        <div v-else class="w-2.5 h-2.5 border-2 border-sn-grey rounded-full border-solid cursor-pointer"></div>
+      </div>
     </div>
-    <div class="sci-navigation--notificaitons-flyout-notification-title"
-         v-html="notification.attributes.title"
-         :data-seen="notification.attributes.checked"></div>
-    <div v-html="notification.attributes.message" class="sci-navigation--notificaitons-flyout-notification-message"></div>
+    <a :href="lastBreadcrumbUrl" @click="toggleRead(true)" class="hover:no-underline text-black hover:text-black">
+      <div class="sci-navigation--notificaitons-flyout-notification-title"
+          v-html="notification.attributes.title"
+          :data-seen="notification.attributes.checked"></div>
+      <div v-html="notification.attributes.message" class="sci-navigation--notificaitons-flyout-notification-message"></div>
+    </a>
     <div v-if="notification.attributes.breadcrumbs" class="flex items-center flex-wrap gap-0.5">
-      <template v-for="(breadcrumb, index) in notification.attributes.breadcrumbs" :key="index">
-        <div class="flex items-center gap-0.5">
-          <i v-if="index > 0" class="sn-icon sn-icon-right"></i>
-          <a :href="breadcrumb.url" :title="breadcrumb.name" class="truncate max-w-[20ch] inline-block">{{ breadcrumb.name }}</a>
-        </div>
-      </template>
+      <Breadcrumbs :breadcrumbs="notification.attributes.breadcrumbs" />
     </div>
   </div>
 </template>
 
 <script>
+import axios from '../../../packs/custom_axios.js';
+import Breadcrumbs from '../../shared/breadcrumbs.vue';
+
 export default {
   name: 'NotificationItem',
   props: {
     notification: Object
   },
+  components: {
+    Breadcrumbs
+  },
   computed: {
-    icon() {
-      switch (this.notification.attributes.type_of) {
-        case 'deliver':
-          return 'fas fa-truck';
-        case 'assignment':
-          return 'fas fa-list-alt';
-        case 'recent_changes':
-          return 'fas fa-list-alt';
-        case 'deliver_error':
-          return 'sn-icon sn-icon-alert-warning';
+    lastBreadcrumbUrl() {
+      if (!this.notification.attributes.breadcrumbs) {
+        return null;
       }
+      return this.notification.attributes.breadcrumbs[this.notification.attributes.breadcrumbs.length - 1]?.url;
+    }
+  },
+  methods: {
+    toggleRead(check = false) {
+      const params = {};
+      if (!this.notification.attributes.checked || check) {
+        params.mark_as_read = true;
+      }
+
+      axios.post(this.notification.attributes.toggle_read_url, params)
+        .then((response) => {
+          const notification = response.data.data;
+          this.$emit('updateNotification', notification);
+        });
     }
   }
 };
diff --git a/app/javascript/vue/navigation/notifications/notifications_flyout.vue b/app/javascript/vue/navigation/notifications/notifications_flyout.vue
index 7b8a4e40f..8f21e3c0d 100644
--- a/app/javascript/vue/navigation/notifications/notifications_flyout.vue
+++ b/app/javascript/vue/navigation/notifications/notifications_flyout.vue
@@ -6,17 +6,45 @@
         {{ i18n.t('nav.settings') }}
       </a>
     </div>
-    <hr>
+    <div class="flex items-center">
+      <div
+        @click="changeTab('all')"
+        class="px-4 py-2 text-sn-grey cursor-pointer border-solid border-0 border-b-4 border-transparent"
+        :class="{'!text-sn-black border-sn-blue': activeTab === 'all'}"
+      >
+        {{ i18n.t('nav.notifications.all') }}
+      </div>
+      <div
+        @click="changeTab('unread')"
+        class="px-4 py-2 text-sn-grey cursor-pointer border-solid border-0 border-b-4 border-transparent"
+        :class="{'!text-sn-black border-sn-blue': activeTab === 'unread'}"
+      >
+        {{ i18n.t('nav.notifications.unread') }}
+      </div>
+      <div
+        @click="changeTab('read')"
+        class="px-4 py-2 text-sn-grey cursor-pointer border-solid border-0 border-b-4 border-transparent"
+        :class="{'!text-sn-black  border-sn-blue': activeTab === 'read'}"
+      >
+      {{ i18n.t('nav.notifications.read') }}
+      </div>
+      <div class="py-4 ml-auto cursor-pointer" @click="markAllNotificationsAsRead">
+        {{ i18n.t('nav.notifications.read_all') }}
+      </div>
+    </div>
+    <hr class="!mt-0.5">
     <perfect-scrollbar @wheel="preventPropagation" ref="scrollContainer" class="sci--navigation--notificaitons-flyout-notifications">
       <div class="sci-navigation--notificaitons-flyout-subtitle" v-if="todayNotifications.length">
         {{ i18n.t('nav.notifications.today') }}
       </div>
       <NotificationItem v-for="notification in todayNotifications" :key="notification.type_of + '-' + notification.id"
+        @updateNotification="updateNotification"
         :notification="notification" />
       <div class="sci-navigation--notificaitons-flyout-subtitle" v-if="olderNotifications.length">
         {{ i18n.t('nav.notifications.older') }}
       </div>
       <NotificationItem v-for="notification in olderNotifications" :key="notification.type_of + '-' + notification.id"
+        @updateNotification="updateNotification"
         :notification="notification" />
       <div class="next-page-loader">
         <img src="/images/medium/loading.svg" v-if="loadingPage" />
@@ -37,6 +65,7 @@ export default {
   },
   props: {
     notificationsUrl: String,
+    markAllNotificationsUrl: String,
     unseenNotificationsCount: Number,
     preferencesUrl: String
   },
@@ -45,11 +74,14 @@ export default {
       notifications: [],
       nextPageUrl: null,
       scrollBar: null,
-      loadingPage: false
+      activeTab: 'all',
+      loadingPage: false,
+      firstPageUrl: null
     };
   },
   created() {
     this.nextPageUrl = this.notificationsUrl;
+    this.firstPageUrl = this.notificationsUrl;
     this.loadNotifications();
   },
   mounted() {
@@ -76,6 +108,27 @@ export default {
     }
   },
   methods: {
+    changeTab(tab) {
+      this.activeTab = tab;
+      this.notifications = [];
+      this.nextPageUrl = this.firstPageUrl;
+      this.loadNotifications();
+    },
+    markAllNotificationsAsRead() {
+      axios.post(this.markAllNotificationsUrl)
+        .then(() => {
+          this.notifications = this.notifications.map((n) => {
+            n.attributes.checked = true;
+            return n;
+          });
+          this.$emit('update:unseenNotificationsCount');
+        });
+    },
+    updateNotification(notification) {
+      const index = this.notifications.findIndex((n) => n.id === notification.id);
+      this.notifications.splice(index, 1, notification);
+      this.$emit('update:unseenNotificationsCount');
+    },
     preventPropagation(e) {
       e.stopPropagation();
       e.preventDefault();
@@ -85,7 +138,7 @@ export default {
 
       this.loadingPage = true;
 
-      axios.get(this.nextPageUrl)
+      axios.get(this.nextPageUrl, { params: { tab: this.activeTab } })
         .then((response) => {
           this.notifications = this.notifications.concat(response.data.data);
           this.nextPageUrl = response.data.links.next;
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index 77d92fcde..516794eb8 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -45,8 +45,9 @@
         <NotificationsFlyout
           :preferencesUrl="user.preferences_url"
           :notificationsUrl="notificationsUrl"
+          :markAllNotificationsUrl="markAllNotificationsUrl"
           :unseenNotificationsCount="unseenNotificationsCount"
-          @update:unseenNotificationsCount="checkUnseenNotifications()"
+          @update:unseenNotificationsCount="checkUnseenNotifications(false)"
           @close="$refs.notificationDropdown.$refs.field.click();"/>
       </template>
     </GeneralDropdown>
@@ -92,6 +93,7 @@ export default {
   props: {
     url: String,
     notificationsUrl: String,
+    markAllNotificationsUrl: String,
     unseenNotificationsUrl: String,
     quickSearchUrl: String,
     teamsUrl: String,
@@ -119,7 +121,7 @@ export default {
 
     $(document).on('turbolinks:load', () => {
       this.notificationsOpened = false;
-      this.checkUnseenNotifications();
+      this.checkUnseenNotifications(false);
       this.refreshCurrentTeam();
       this.hideSearch = !!document.getElementById('GlobalSearch');
       this.globalSearchKey += 1;
@@ -177,11 +179,13 @@ export default {
     searchValue(e) {
       window.open(`${this.searchUrl}?q=${e.target.value}`, '_self');
     },
-    checkUnseenNotifications() {
+    checkUnseenNotifications(repeat = true) {
       clearTimeout(this.unseenNotificationsTimeout);
       $.get(this.unseenNotificationsUrl, (result) => {
         this.unseenNotificationsCount = result.unseen;
-        this.unseenNotificationsTimeout = setTimeout(this.checkUnseenNotifications, 30000);
+        if (repeat) {
+          this.unseenNotificationsTimeout = setTimeout(this.checkUnseenNotifications, 30000);
+        }
       });
     },
     refreshCurrentTeam() {
diff --git a/app/javascript/vue/projects/list.vue b/app/javascript/vue/projects/list.vue
index fb263d886..facdf3e25 100644
--- a/app/javascript/vue/projects/list.vue
+++ b/app/javascript/vue/projects/list.vue
@@ -68,6 +68,7 @@ import axios from '../../packs/custom_axios.js';
 
 import DataTable from '../shared/datatable/table.vue';
 import UsersRenderer from './renderers/users.vue';
+import NameRenderer from './renderers/name.vue';
 import CommentsRenderer from '../shared/datatable/renderers/comments.vue';
 import ProjectCard from './card.vue';
 import ConfirmationModal from '../shared/confirmation_modal.vue';
@@ -84,6 +85,7 @@ export default {
   components: {
     DataTable,
     UsersRenderer,
+    NameRenderer,
     ProjectCard,
     ConfirmationModal,
     EditProjectModal,
@@ -129,7 +131,7 @@ export default {
         flex: 1,
         headerName: this.i18n.t('projects.index.card.name'),
         sortable: true,
-        cellRenderer: this.nameRenderer
+        cellRenderer: 'NameRenderer'
       },
       {
         field: 'code',
@@ -252,16 +254,6 @@ export default {
                 <span title="${option[1]}" class="truncate">${option[1]}</span>
               </div>`;
     },
-    nameRenderer(params) {
-      const showUrl = params.data.urls.show;
-      return `<a href="${showUrl}"
-                 class="flex items-center gap-1 hover:no-underline
-                        ${!showUrl ? 'pointer-events-none text-sn-grey' : ''}"
-                 title="${params.data.name}">
-                ${params.data.folder ? '<i class="sn-icon mini sn-icon-mini-folder-left"></i>' : ''}
-                <span class="truncate">${params.data.name} </span>
-              </a>`;
-    },
     openComments(_params, rows) {
       $(this.$refs.commentButton).data('objectId', rows[0].id);
       this.$refs.commentButton.click();
diff --git a/app/javascript/vue/projects/modals/move.vue b/app/javascript/vue/projects/modals/move.vue
index 08eaa66ab..0b92d73a9 100644
--- a/app/javascript/vue/projects/modals/move.vue
+++ b/app/javascript/vue/projects/modals/move.vue
@@ -98,20 +98,19 @@ export default {
       if (this.query === '') {
         return this.foldersTree;
       }
-      return this.foldersTree.map((folder) => (
-        {
-          folder: folder.folder,
-          children: folder.children.filter((child) => (
-            child.folder.name.toLowerCase().includes(this.query.toLowerCase())
-          )),
-        }
-      )).filter((folder) => (
-        folder.folder.name.toLowerCase().includes(this.query.toLowerCase())
-        || folder.children.length > 0
-      ));
+      return this.filteredFoldersTreeHelper(this.foldersTree);
     },
   },
   methods: {
+    filteredFoldersTreeHelper(foldersTree) {
+      return foldersTree.map(({ folder, children }) => {
+        if (folder.name.toLowerCase().includes(this.query.toLowerCase())) {
+          return { folder, children };
+        }
+        const filteredChildren = this.filteredFoldersTreeHelper(children);
+        return filteredChildren.length ? { folder, children: filteredChildren } : null;
+      }).filter(Boolean);
+    },
     selectFolder(folderId) {
       this.selectedFolderId = folderId;
     },
diff --git a/app/javascript/vue/projects/renderers/name.vue b/app/javascript/vue/projects/renderers/name.vue
new file mode 100644
index 000000000..52b7548b5
--- /dev/null
+++ b/app/javascript/vue/projects/renderers/name.vue
@@ -0,0 +1,21 @@
+<template>
+  <a  :href="params.data.urls.show"
+      class="flex items-center gap-1 hover:no-underline"
+      :class="{
+        'pointer-events-none text-sn-grey': !params.data.urls.show
+      }"
+      :title="params.data.name">
+    <i v-if="params.data.folder" class="sn-icon mini sn-icon-mini-folder-left"></i>
+    <span class="truncate">{{ params.data.name }}</span>
+  </a>
+</template>
+<script>
+export default {
+  name: 'NameRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/projects/renderers/users.vue b/app/javascript/vue/projects/renderers/users.vue
index 451693696..b07a5ce8f 100644
--- a/app/javascript/vue/projects/renderers/users.vue
+++ b/app/javascript/vue/projects/renderers/users.vue
@@ -19,8 +19,8 @@ export default {
   name: 'UsersRenderer',
   props: {
     params: {
-      required: true,
-    },
+      required: true
+    }
   },
   computed: {
     users() {
diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue
index 0d32a20f9..a85f124d5 100644
--- a/app/javascript/vue/protocol/container.vue
+++ b/app/javascript/vue/protocol/container.vue
@@ -177,7 +177,7 @@
             <div v-for="(step, index) in steps" :key="step.id" class="step-block">
               <div v-if="index > 0 && urls.add_step_url" class="insert-step" @click="addStep(index)" data-e2e="e2e-BT-protocol-templateSteps-insertStep">
                 <i class="sn-icon sn-icon-new-task"></i>
-                <span>{{ i18n.t("protocols.steps.add_step") }}</span>
+                <span class="mr-3">{{ i18n.t("protocols.steps.add_step") }}</span>
               </div>
               <Step
                 ref="steps"
@@ -202,7 +202,7 @@
               />
               <div v-if="(index === steps.length - 1) && urls.add_step_url" class="insert-step" @click="addStep(index + 1)" data-e2e="e2e-BT-protocol-templateSteps-insertStep">
                 <i class="sn-icon sn-icon-new-task"></i>
-                <span>{{ i18n.t("protocols.steps.add_step") }}</span>
+                <span class="mr-3">{{ i18n.t("protocols.steps.add_step") }}</span>
               </div>
             </div>
             <div v-if="steps.length > 0 && urls.add_step_url && inRepository" class="py-5">
@@ -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/modals/publish_protocol.vue b/app/javascript/vue/protocol/modals/publish_protocol.vue
index 742b8b090..ce336e758 100644
--- a/app/javascript/vue/protocol/modals/publish_protocol.vue
+++ b/app/javascript/vue/protocol/modals/publish_protocol.vue
@@ -1,30 +1,31 @@
 <template>
   <div ref="modal" @keydown.esc="cancel" class="modal publish-modal" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
-      <div class="modal-content">
+      <div class="modal-content" data-e2e="e2e-MD-publishProtocol">
         <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">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-publishProtocol-close"><i class="sn-icon sn-icon-close"></i></button>
+          <h4 class="modal-title" data-e2e="e2e-TX-publishProtocol-title">
             {{ i18n.t('protocols.publish_modal.title', { nr: protocol.attributes.version })}}
           </h4>
         </div>
         <div class="modal-body">
           <div class="sci-input-container">
-            <label>{{ i18n.t('protocols.publish_modal.name')}}</label>
-            <div>{{ protocol.attributes.name }}</div>
+            <label data-e2e="e2e-TX-publishProtocol-templateNameLabel">{{ i18n.t('protocols.publish_modal.name')}}</label>
+            <div data-e2e="e2e-TX-publishProtocol-templateName">{{ protocol.attributes.name }}</div>
           </div>
           <div class="sci-input-container">
-            <label>{{ i18n.t('protocols.publish_modal.comment')}}</label>
+            <label data-e2e="e2e-TX-publishProtocol-revisionNotesLabel">{{ i18n.t('protocols.publish_modal.comment')}}</label>
             <textarea ref="textarea"
                       v-model="protocol.attributes.version_comment"
                       class="sci-input-field"
-                      :placeholder="i18n.t('protocols.publish_modal.comment_placeholder')">
+                      :placeholder="i18n.t('protocols.publish_modal.comment_placeholder')"
+                      data-e2e="e2e-IF-publishProtocol-revisionNotes">
             </textarea>
           </div>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-secondary" @click="cancel">{{ i18n.t('general.cancel') }}</button>
-          <button class="btn btn-primary" @click="confirm">{{ i18n.t('protocols.publish_modal.publish')}}</button>
+          <button class="btn btn-secondary" @click="cancel" data-e2e="e2e-BT-publishProtocol-cancel">{{ i18n.t('general.cancel') }}</button>
+          <button class="btn btn-primary" @click="confirm" data-e2e="e2e-BT-publishProtocol-publish">{{ i18n.t('protocols.publish_modal.publish')}}</button>
         </div>
       </div>
     </div>
diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index 3569808f5..0546f3f04 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -146,7 +146,7 @@
                     @attachment:viewMode="updateAttachmentViewMode"/>
       </div>
       <ContentToolbar
-        v-if="orderedElements.length > 3"
+        v-if="orderedElements.length > 2 && insertMenu.length > 0"
         :insertMenu="insertMenu"
         @create:table="(...args) => this.createElement('table', ...args)"
         @create:checklist="createElement('checklist')"
@@ -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/linked_my_modules.vue b/app/javascript/vue/protocols/modals/linked_my_modules.vue
index 10305252d..13e18be2a 100644
--- a/app/javascript/vue/protocols/modals/linked_my_modules.vue
+++ b/app/javascript/vue/protocols/modals/linked_my_modules.vue
@@ -1,12 +1,12 @@
 <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-linkedTasks">
         <div class="modal-header">
-          <button type="button" class="close self-start" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="close self-start" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-linkedTasksModal-close">
             <i class="sn-icon sn-icon-close"></i>
           </button>
-          <h4 class="modal-title line-clamp-3" style="display: -webkit-box;">
+          <h4 class="modal-title line-clamp-3" style="display: -webkit-box;" data-e2e="e2e-TX-linkedTasksModal-title">
             {{ i18n.t('protocols.index.linked_children.title', { protocol: protocol.name }) }}
           </h4>
         </div>
@@ -18,6 +18,7 @@
                 :options="versionsList"
                 :value="selectedVersion"
                 @change="changeSelectedVersion"
+                e2eValue="e2e-DD-linkedTasksModal-version"
               ></SelectDropdown>
             </div>
           </div>
@@ -25,7 +26,11 @@
           <perfect-scrollbar
             class="max-h-96 relative flex flex-col gap-6 pr-8"
             @ps-scroll-y="onScroll" ref="linkedMyModules">
-            <div v-for="(myModule, idx) in linkedMyModules" class="flex items-center gap-1 flex-wrap w-full">
+            <div
+              v-for="(myModule, idx) in linkedMyModules"
+              class="flex items-center gap-1 flex-wrap w-full"
+              :data-e2e="`e2e-BC-linkedTasksModal-${myModule.my_module_name.replaceAll(/\W/g, '')}`"
+            >
               <div v-if="myModule.project_folder_name" class="flex items-center ">
                 <a :href="myModule.project_folder_url"
                     :title="myModule.project_folder_name"
@@ -67,7 +72,7 @@
           </perfect-scrollbar>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ i18n.t('general.cancel') }}</button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal" data-e2e="e2e-BT-linkedTasksModal-cancel">{{ i18n.t('general.cancel') }}</button>
         </div>
       </div>
     </div>
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/protocols/modals/versions.vue b/app/javascript/vue/protocols/modals/versions.vue
index 083b6d0e5..ec06f0b00 100644
--- a/app/javascript/vue/protocols/modals/versions.vue
+++ b/app/javascript/vue/protocols/modals/versions.vue
@@ -1,12 +1,12 @@
 <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-protocolVersions">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-protocolVersionsModal-close">
             <i class="sn-icon sn-icon-close"></i>
           </button>
-          <h4 class="modal-title truncate !block">
+          <h4 class="modal-title truncate !block" data-e2e="e2e-TX-protocolVersionsModal-title">
             {{ i18n.t('protocols.index.versions.title', { protocol: protocol.name }) }}
           </h4>
         </div>
@@ -15,9 +15,9 @@
             <img src="/images/medium/loading.svg" alt="Loading" class="p-4 rounded-xl bg-sn-white" />
           </div>
           <div class="max-h-[400px] overflow-y-auto">
-            <div v-if="draft">
+            <div v-if="draft" data-e2e="e2e-CO-protocolVersionsModal-draft">
               <div class="flex items-center gap-4">
-                <a :href="draft.urls.show" class="hover:no-underline cursor-pointer shrink-0">
+                <a :href="draft.urls.show" class="hover:no-underline cursor-pointer shrink-0" data-e2e="e2e-TL-protocolVersionsModal-draft-draftLink">
                   <span v-if="draft.previous_number"
                         v-html="i18n.t('protocols.index.versions.draft_html', {
                           parent_version: draft.previous_number
@@ -25,7 +25,7 @@
                   ></span>
                   <span v-else v-html="i18n.t('protocols.index.versions.first_draft_html')"></span>
                 </a>
-                <span class="text-xs" v-if="draft.modified_by">
+                <span class="text-xs" v-if="draft.modified_by" data-e2e="e2e-TX-protocolVersionsModal-draft-timestamp">
                   {{
                       i18n.t('protocols.index.versions.draft_full_modification_info', {
                         modified_on: draft.modified_on,
@@ -33,7 +33,7 @@
                       })
                   }}
                 </span>
-                <span class="text-xs" v-else>
+                <span class="text-xs" v-else data-e2e="e2e-TX-protocolVersionsModal-draft-timestamp">
                   {{
                       i18n.t('protocols.index.versions.draft_update_modification_info', {
                         modified_on: draft.modified_on
@@ -41,11 +41,17 @@
                   }}
                 </span>
                 <div class="flex items-center gap-2 ml-auto">
-                  <button v-if="draft.urls.publish" class="btn btn-light" :disabled="updating" @click="publishDraft">
+                  <button v-if="draft.urls.publish" class="btn btn-light" :disabled="updating" @click="publishDraft" data-e2e="e2e-BT-protocolVersionsModal-draft-publish">
                     <i class="sn-icon sn-icon-Publish"></i>
                     {{ i18n.t('protocols.index.versions.publish') }}
                   </button>
-                  <button v-if="draft.urls.destroy" @click="destroyDraft" :disabled="updating" class="btn btn-light icon-btn">
+                  <button
+                    v-if="draft.urls.destroy"
+                    @click="destroyDraft"
+                    :disabled="updating"
+                    class="btn btn-light icon-btn"
+                    data-e2e="e2e-BT-protocolVersionsModal-draft-deleteDraft"
+                  >
                     <i class="sn-icon sn-icon-delete"></i>
                   </button>
                 </div>
@@ -60,16 +66,17 @@
                   :singleLine="false"
                   :attributeName="`${i18n.t('Draft')} ${i18n.t('comment')}`"
                   @update="updateComment"
+                  :dataE2e="'protocolVersionsModal-draft-revisionNotes'"
                 />
             </div>
-            <div v-for="version in publishedVersions" :key="version.number">
+            <div v-for="version in publishedVersions" :key="version.number" :data-e2e="`e2e-CO-protocolVersionsModal-version${version.number}`">
               <div class="flex items-center gap-4 group min-h-[40px]">
-                <a :href="version.urls.show" class="hover:no-underline cursor-pointer shrink-0">
+                <a :href="version.urls.show" class="hover:no-underline cursor-pointer shrink-0" :data-e2e="`e2e-TL-protocolVersionsModal-version${version.number}-versionLink`">
                   <b>
                     {{ i18n.t('protocols.index.versions.revision', { version: version.number }) }}
                   </b>
                 </a>
-                <span class="text-xs">
+                <span class="text-xs" :data-e2e="`e2e-TX-protocolVersionsModal-version${version.number}-timestamp`">
                   {{
                       i18n.t('protocols.index.versions.revision_publishing_info', {
                         published_on: version.published_on,
@@ -83,11 +90,12 @@
                   :title="i18n.t('protocols.index.versions.save_as_draft')"
                   @click="saveAsDraft(version.urls.save_as_draft)"
                   :disabled="draft || updating"
+                  :data-e2e="`e2e-BT-protocolVersionsModal-version${version.number}-saveAsDraft`"
                 >
                   <i class="sn-icon sn-icon-duplicate"></i>
                 </button>
               </div>
-              <div class="mb-4">
+              <div class="mb-4" :data-e2e="`e2e-TX-protocolVersionsModal-version${version.number}-revisionNotes`">
                 {{  version.comment }}
               </div>
             </div>
@@ -104,6 +112,14 @@
     `"
     :confirmClass="'btn btn-danger'"
     :confirmText="i18n.t('protocols.delete_draft_modal.confirm')"
+    :e2eAttributes="{
+          modalName: 'e2e-MD-deleteProtocolDraft',
+          title: 'e2e-TX-deleteProtocolDraftModal-title',
+          content: 'e2e-TX-deleteProtocolDraftModal-content',
+          close: 'e2e-BT-deleteProtocolDraftModal-close',
+          cancel: 'e2e-BT-deleteProtocolDraftModal-cancel',
+          confirm: 'e2e-BT-deleteProtocolDraftModal-delete'
+    }"
     ref="destroyModal"
   ></ConfirmationModal>
 </template>
diff --git a/app/javascript/vue/protocols/renderers/name.vue b/app/javascript/vue/protocols/renderers/name.vue
new file mode 100644
index 000000000..0af6736df
--- /dev/null
+++ b/app/javascript/vue/protocols/renderers/name.vue
@@ -0,0 +1,21 @@
+<template>
+  <a v-if="params.data.urls.show"
+      :href="params.data.urls.show"
+      :title="params.data.name">
+    {{ params.data.name }}
+  </a>
+  <span v-else class="text-sn-grey" :title="params.data.name">
+    {{ params.data.name }}
+  </span>
+</template>
+
+<script>
+export default {
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/protocols/table.vue b/app/javascript/vue/protocols/table.vue
index 062f2df7c..715d408d2 100644
--- a/app/javascript/vue/protocols/table.vue
+++ b/app/javascript/vue/protocols/table.vue
@@ -42,6 +42,7 @@ import axios from '../../packs/custom_axios.js';
 
 import DataTable from '../shared/datatable/table.vue';
 import UsersRenderer from '../projects/renderers/users.vue';
+import NameRenderer from './renderers/name.vue';
 import NewProtocolModal from './modals/new.vue';
 import AccessModal from '../shared/access_modal/modal.vue';
 import KeywordsRenderer from './renderers/keywords.vue';
@@ -55,6 +56,7 @@ export default {
   components: {
     DataTable,
     UsersRenderer,
+    NameRenderer,
     NewProtocolModal,
     AccessModal,
     KeywordsRenderer,
@@ -116,7 +118,7 @@ export default {
         headerName: this.i18n.t('protocols.index.thead.name'),
         sortable: true,
         notSelectable: true,
-        cellRenderer: this.nameRenderer
+        cellRenderer: 'NameRenderer'
       },
       {
         field: 'code',
@@ -337,14 +339,6 @@ export default {
     linkedMyModules(_event, rows) {
       [this.linkedMyModulesModalObject] = rows;
     },
-    // renderers
-    nameRenderer(params) {
-      const { urls, name } = params.data;
-      if (urls.show) {
-        return `<a href="${urls.show}" title="${name}">${name}</a>`;
-      }
-      return `<span class="text-sn-grey" title="${name}">${name}</span>`;
-    },
     usersFilterRenderer(option) {
       return `<div class="flex items-center gap-2">
                 <img src="${option[2].avatar_url}" class="rounded-full w-6 h-6" />
diff --git a/app/javascript/vue/reports/renderers/name.vue b/app/javascript/vue/reports/renderers/name.vue
new file mode 100644
index 000000000..d2e9f7924
--- /dev/null
+++ b/app/javascript/vue/reports/renderers/name.vue
@@ -0,0 +1,16 @@
+<template>
+  <span :title="params.data.name">
+    {{ params.data.name }}
+  </span>
+</template>
+
+<script>
+export default {
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/reports/table.vue b/app/javascript/vue/reports/table.vue
index f68a7b293..9261c5f31 100644
--- a/app/javascript/vue/reports/table.vue
+++ b/app/javascript/vue/reports/table.vue
@@ -43,6 +43,7 @@ import axios from '../../packs/custom_axios.js';
 import DataTable from '../shared/datatable/table.vue';
 import DocxRenderer from './renderers/docx.vue';
 import PdfRenderer from './renderers/pdf.vue';
+import NameRenderer from './renderers/name.vue';
 import ConfirmationModal from '../shared/confirmation_modal.vue';
 import SaveToInventoryModal from './modals/save_to_inventory.vue';
 import UpdateReportModal from './modals/update.vue';
@@ -60,6 +61,7 @@ export default {
     DataTable,
     DocxRenderer,
     PdfRenderer,
+    NameRenderer,
     ConfirmationModal,
     SaveToInventoryModal,
     UpdateReportModal
@@ -108,7 +110,7 @@ export default {
           field: 'name',
           headerName: this.i18n.t('projects.reports.index.thead_name'),
           sortable: true,
-          cellRenderer: ({ data: { name } }) => `<span title="${name}">${name}</span>`
+          cellRenderer: 'NameRenderer'
         }, {
           field: 'code',
           headerName: this.i18n.t('projects.reports.index.thead_id'),
diff --git a/app/javascript/vue/repositories/modals/import/container.vue b/app/javascript/vue/repositories/modals/import/container.vue
index aa7b8100d..ec9b69e36 100644
--- a/app/javascript/vue/repositories/modals/import/container.vue
+++ b/app/javascript/vue/repositories/modals/import/container.vue
@@ -11,6 +11,7 @@
       @changeStep="changeStep"
       @importRows="importRecords"
       @updateAutoMapping="updateAutoMapping"
+      @updateAutoClearing="updateAutoClearing"
     />
     <ExportModal
       v-else
@@ -49,7 +50,7 @@ export default {
     return {
       modalOpened: false,
       activeStep: 'UploadStep',
-      params: { autoMapping: true },
+      params: { autoMapping: true, autoClearing: false },
       modalId: null,
       loading: false
     };
@@ -62,6 +63,7 @@ export default {
       this.activeStep = 'UploadStep';
       this.params.selectedItems = null;
       this.params.autoMapping = true;
+      this.params.autoClearing = false;
       this.fetchRepository();
     },
     fetchRepository() {
@@ -78,6 +80,11 @@ export default {
     },
     updateAutoMapping(value) {
       this.params.autoMapping = value;
+      this.params.autoClearing = false;
+    },
+    updateAutoClearing() {
+      this.params.autoMapping = false;
+      this.params.autoClearing = true;
     },
     generatePreview(selectedItems, updateWithEmptyCells, onlyAddNewItems) {
       this.params.selectedItems = selectedItems;
diff --git a/app/javascript/vue/repositories/modals/import/mapping_step.vue b/app/javascript/vue/repositories/modals/import/mapping_step.vue
index 35e389c2f..79526b6eb 100644
--- a/app/javascript/vue/repositories/modals/import/mapping_step.vue
+++ b/app/javascript/vue/repositories/modals/import/mapping_step.vue
@@ -19,7 +19,7 @@
           <div class="flex gap-6 items-center my-6">
             <div class="flex items-center gap-2" :title="i18n.t('repositories.import_records.steps.step2.autoMappingTooltip')">
               <div class="sci-checkbox-container">
-                <input type="checkbox" class="sci-checkbox" @change="$emit('update-auto-mapping', $event.target.checked)" :checked="params.autoMapping" />
+                <input type="checkbox" class="sci-checkbox" @change="toggleAutoMapping" :checked="params.autoMapping" />
                 <span class="sci-checkbox-label"></span>
               </div>
               {{ i18n.t('repositories.import_records.steps.step2.autoMappingText') }}
@@ -44,11 +44,11 @@
 
           {{ i18n.t('repositories.import_records.steps.step2.importedFileText') }} {{ params.file_name }}
           <hr class="m-0 mt-6">
-          <div class="grid grid-cols-[3rem_14.5rem_1.5rem_14.5rem_5rem_14.5rem] px-2">
+          <div class="grid grid-cols-[3rem_14.5rem_1.5rem_14.5rem_5rem_14.5rem] px-2" :key="JSON.stringify(this.selectedItems)">
 
             <div v-for="(column, key) in columnLabels" class="flex items-center px-2 py-2 font-bold">{{ column }}</div>
 
-            <template v-for="(item, index) in params.import_data.header" :key="item">
+            <template v-for="(item, index) in params.import_data.header" :key="index">
               <MappingStepTableRow
                 :index="index"
                 :item="item"
@@ -57,6 +57,7 @@
                 :value="this.selectedItems.find((item) => item.index === index)"
                 @selection:changed="handleChange"
                 :autoMapping="params.autoMapping"
+                :autoClearing="params.autoClearing"
               />
             </template>
           </div>
@@ -140,7 +141,12 @@ export default {
   methods: {
     handleChange(payload) {
       this.error = null;
-      const { index, key, value } = payload;
+      const {
+        index,
+        key,
+        value,
+        autoMap
+      } = payload;
 
       const item = this.selectedItems.find((i) => i.index === index);
       const usedBeforeItem = this.selectedItems.find((i) => i.key === key && i.index !== index);
@@ -152,6 +158,15 @@ export default {
 
       item.key = key;
       item.value = value;
+
+      this.$emit('updateAutoMapping', autoMap);
+    },
+    toggleAutoMapping(event) {
+      if (event.target.checked) {
+        this.$emit('updateAutoMapping', true);
+      } else {
+        this.$emit('updateAutoClearing');
+      }
     },
     loadAvailableFields() {
       // Adding alreadySelected attribute for tracking
diff --git a/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue b/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
index 341f49e7f..d4e51805f 100644
--- a/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
+++ b/app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
@@ -90,6 +90,10 @@ export default {
       type: Boolean,
       required: true
     },
+    autoClearing: {
+      type: Boolean,
+      required: false
+    },
     value: Object
   },
   data() {
@@ -122,11 +126,10 @@ export default {
       }
     },
     autoMapping(newVal) {
-      if (newVal === true) {
-        this.autoMap();
-      } else {
-        this.clearAutoMap();
-      }
+      if (newVal) this.autoMap();
+    },
+    autoClearing(newVal) {
+      if (newVal) this.clearAutoMap();
     }
   },
   computed: {
@@ -151,19 +154,31 @@ export default {
       return this.systemColumns.includes(column);
     },
     autoMap() {
-      this.changeSelected(null);
+      this.changeAutoSelected(null);
       Object.entries(this.params.import_data.available_fields).forEach(([key, value]) => {
         if (this.item === value) {
-          this.changeSelected(key);
+          this.changeAutoSelected(key);
         }
       });
     },
     clearAutoMap() {
       this.changeSelected('do_not_import');
     },
-    changeSelected(e) {
+    updateSelectedColumnType(e, autoMap) {
       const value = this.params.import_data.available_fields[e];
-      this.selectedColumnType = { index: this.index, key: e, value };
+      this.selectedColumnType = {
+        index: this.index,
+        key: e,
+        value,
+        autoMap
+      };
+    },
+    changeAutoSelected(e) {
+      this.updateSelectedColumnType(e, true);
+      this.$emit('selection:changed', this.selectedColumnType);
+    },
+    changeSelected(e) {
+      this.updateSelectedColumnType(e, false);
       this.$emit('selection:changed', this.selectedColumnType);
     }
   },
diff --git a/app/javascript/vue/repositories/renderers/name.vue b/app/javascript/vue/repositories/renderers/name.vue
new file mode 100644
index 000000000..e17aa60cb
--- /dev/null
+++ b/app/javascript/vue/repositories/renderers/name.vue
@@ -0,0 +1,22 @@
+<template>
+  <a class="hover:no-underline flex items-center gap-1"
+     :title="params.data.name"
+     :href="params.data.urls.show"
+  >
+    <span class="truncate">
+      <i v-if="params.data.shared || params.data.ishared" class="fas fa-users"></i>
+      {{ params.data.name }}
+    </span>
+  </a>
+</template>
+
+<script>
+export default {
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/repositories/table.vue b/app/javascript/vue/repositories/table.vue
index ade32b122..a7c11ce8e 100644
--- a/app/javascript/vue/repositories/table.vue
+++ b/app/javascript/vue/repositories/table.vue
@@ -50,11 +50,31 @@
     :repository="duplicateRepository"
     @close="duplicateRepository = null"
     @duplicate="updateTable" />
-  <ShareRepositoryModal
+  <ShareObjectModal
     v-if="shareRepository"
-    :repository="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>
@@ -66,8 +86,9 @@ import ExportRepositoryModal from './modals/export.vue';
 import NewRepositoryModal from './modals/new.vue';
 import EditRepositoryModal from './modals/edit.vue';
 import DuplicateRepositoryModal from './modals/duplicate.vue';
-import ShareRepositoryModal from './modals/share.vue';
+import ShareObjectModal from '../shared/share_modal.vue';
 import DataTable from '../shared/datatable/table.vue';
+import NameRenderer from './renderers/name.vue';
 
 export default {
   name: 'RepositoriesTable',
@@ -78,7 +99,8 @@ export default {
     NewRepositoryModal,
     EditRepositoryModal,
     DuplicateRepositoryModal,
-    ShareRepositoryModal
+    NameRenderer,
+    ShareObjectModal
   },
   props: {
     dataSource: {
@@ -138,7 +160,7 @@ export default {
         headerName: this.i18n.t('libraries.index.table.name'),
         sortable: true,
         notSelectable: true,
-        cellRenderer: this.nameRenderer
+        cellRenderer: 'NameRenderer'
       },
       {
         field: 'code',
@@ -277,23 +299,6 @@ export default {
     share(_event, rows) {
       const [repository] = rows;
       this.shareRepository = repository;
-    },
-    // Renderers
-    nameRenderer(params) {
-      const {
-        name,
-        urls,
-        shared,
-        ishared
-      } = params.data;
-      let sharedIcon = '';
-      if (shared || ishared) {
-        sharedIcon = '<i class="fas fa-users"></i>';
-      }
-      return `<a class="hover:no-underline flex items-center gap-1"
-                 title="${name}" href="${urls.show}">
-                 <span class="truncate">${sharedIcon}${name}</span>
-              </a>`;
     }
   }
 };
diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
index 0be9a0740..696b2daea 100644
--- a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
+++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
@@ -312,6 +312,11 @@
                   </div>
                 </section>
 
+                <div v-if="!repository?.is_snapshot" id="divider" class="bg-sn-light-grey flex px-8 items-center self-stretch h-px  "></div>
+                <!-- Locations -->
+                <section v-if="!repository?.is_snapshot" id="locations-section" ref="locationsSectionRef" data-e2e="e2e-CO-itemCard-locations">
+                  <Locations :repositoryRow="repositoryRow" :repository="repository" @reloadRow="reload" />
+                </section>
                 <div v-if="!repository?.is_snapshot" id="divider" class="bg-sn-light-grey flex px-8 items-center self-stretch h-px  "></div>
 
                 <!-- QR -->
@@ -367,6 +372,7 @@ import ScrollSpy from './repository_values/ScrollSpy.vue';
 import CustomColumns from './customColumns.vue';
 import RepositoryItemSidebarTitle from './Title.vue';
 import UnlinkModal from './unlink_modal.vue';
+import Locations from './locations.vue';
 import axios from '../../packs/custom_axios.js';
 
 const items = [
@@ -405,6 +411,14 @@ const items = [
   {
     id: 'highlight-item-5',
     textId: 'text-item-5',
+    labelAlias: 'locations_label',
+    label: 'locations-label',
+    sectionId: 'locations-section',
+    showInSnapshot: false
+  },
+  {
+    id: 'highlight-item-6',
+    textId: 'text-item-6',
     labelAlias: 'QR_label',
     label: 'QR-label',
     sectionId: 'qr-section',
@@ -416,6 +430,7 @@ export default {
   name: 'RepositoryItemSidebar',
   components: {
     CustomColumns,
+    Locations,
     'repository-item-sidebar-title': RepositoryItemSidebarTitle,
     'inline-edit': InlineEdit,
     'scroll-spy': ScrollSpy,
@@ -433,6 +448,7 @@ export default {
       repository: null,
       defaultColumns: null,
       customColumns: null,
+      repositoryRow: null,
       parentsCount: 0,
       childrenCount: 0,
       parents: null,
@@ -591,6 +607,7 @@ export default {
         { params: { my_module_id: this.myModuleId } }
       ).then((response) => {
         const result = response.data;
+        this.repositoryRow = result;
         this.repositoryRowId = result.id;
         this.repository = result.repository;
         this.optionsPath = result.options_path;
diff --git a/app/javascript/vue/repository_item_sidebar/Title.vue b/app/javascript/vue/repository_item_sidebar/Title.vue
index c238c63a1..9bba67953 100644
--- a/app/javascript/vue/repository_item_sidebar/Title.vue
+++ b/app/javascript/vue/repository_item_sidebar/Title.vue
@@ -3,7 +3,7 @@
     :characterMinLimit="0" :allowBlank="false" :smartAnnotation="false"
     :preventLeavingUntilFilled="true"
     :attributeName="`${i18n.t('repositories.item_card.header_title')}`" :singleLine="true"
-    @editingEnabled="editingName = true" @editingDisabled="editingName = false" @update="updateName" @delete="handleDelete"></inline-edit>
+    @editingEnabled="editingName = true" @editingDisabled="editingName = false" @update="updateName"></inline-edit>
   <h4 v-else class="item-name my-auto truncate text-xl" :title="computedName">
     {{ computedName }}
   </h4>
diff --git a/app/javascript/vue/repository_item_sidebar/locations.vue b/app/javascript/vue/repository_item_sidebar/locations.vue
new file mode 100644
index 000000000..88cd3e30a
--- /dev/null
+++ b/app/javascript/vue/repository_item_sidebar/locations.vue
@@ -0,0 +1,110 @@
+<template>
+  <div v-if="repositoryRow">
+    <div class="flex items-center gap-4">
+      <h4 data-e2e="e2e-TX-itemCard-locations-title">{{ i18n.t('repositories.locations.title', { count: repositoryRow.storage_locations.locations.length }) }}</h4>
+      <button v-if="repositoryRow.permissions.can_manage && repositoryRow.storage_locations.enabled"
+              @click="openAssignModal = true" class="btn btn-light ml-auto" data-e2e="e2e-BT-itemCard-assignLocation">
+        {{ i18n.t('repositories.locations.assign') }}
+      </button>
+    </div>
+    <div class="mb-4">
+      <div v-html="repositoryRow.storage_locations.placeholder"></div>
+    </div>
+    <template v-for="(location, index) in repositoryRow.storage_locations.locations" :key="location.id">
+      <div>
+        <div class="sci-divider my-4" v-if="index > 0"></div>
+        <div class="flex gap-2 mb-3">
+          <span class="shrink-0">{{ i18n.t('repositories.locations.container') }}:</span>
+          <a v-if="location.readable" :href="containerUrl(location.id)">{{ location.name }}</a>
+          <span v-else>{{ location.name }}</span>
+          <i v-if="repositoryRow.permissions.can_manage && location.metadata.display_type !== 'grid'"
+                 @click="unassignRow(location.id, location.positions[0].id)"
+                 class="sn-icon sn-icon-unlink-italic-s cursor-pointer ml-auto"></i>
+        </div>
+        <div v-if="location.metadata.display_type === 'grid'" class="flex items-center gap-2 flex-wrap">
+          <div v-for="(position) in location.positions" :key="position.id">
+            <div v-if="position.metadata.position" class="flex items-center font-sm gap-1 uppercase bg-sn-grey-300 rounded pl-1.5 pr-2">
+              {{ formatPosition(position.metadata.position) }}
+              <i v-if="repositoryRow.permissions.can_manage"
+                 @click="unassignRow(location.id, position.id)"
+                 class="sn-icon sn-icon-unlink-italic-s cursor-pointer"></i>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+    <Teleport to="body">
+      <AssignModal
+        v-if="openAssignModal"
+        assignMode="assign"
+        :selectedRow="repositoryRow.id"
+        :selectedRowName="repositoryRow.default_columns.name"
+        @close="openAssignModal = false; $emit('reloadRow'); reloadStorageLocations()"
+      ></AssignModal>
+      <ConfirmationModal
+        :title="i18n.t('storage_locations.show.unassign_modal.title')"
+        :description="i18n.t('storage_locations.show.unassign_modal.description_single')"
+        confirmClass="btn btn-danger"
+        :confirmText="i18n.t('storage_locations.show.unassign_modal.button')"
+        ref="unassignStorageLocationModal"
+      ></ConfirmationModal>
+    </Teleport>
+  </div>
+</template>
+
+<script>
+import AssignModal from '../storage_locations/modals/assign.vue';
+import ConfirmationModal from '../shared/confirmation_modal.vue';
+import axios from '../../packs/custom_axios.js';
+
+import {
+  storage_location_path,
+  unassign_rows_storage_location_path
+} from '../../routes.js';
+
+export default {
+  name: 'RepositoryItemLocations',
+  props: {
+    repositoryRow: Object,
+    repository: Object
+  },
+  components: {
+    AssignModal,
+    ConfirmationModal
+  },
+  data() {
+    return {
+      openAssignModal: false
+    };
+  },
+  methods: {
+    containerUrl(id) {
+      return storage_location_path(id);
+    },
+    formatPosition(position) {
+      if (position) {
+        return `${this.numberToLetter(position[0])}${position[1]}`;
+      }
+      return '';
+    },
+    reloadStorageLocations() {
+      if (window.StorageLocationsContainer) {
+        window.StorageLocationsContainer.$refs.container.reloadingTable = true;
+      }
+    },
+    numberToLetter(number) {
+      return String.fromCharCode(96 + number);
+    },
+    async unassignRow(locationId, rowId) {
+      const ok = await this.$refs.unassignStorageLocationModal.show();
+      if (ok) {
+        axios.post(unassign_rows_storage_location_path({ id: locationId }), { ids: [rowId] })
+          .then(() => {
+            this.$emit('reloadRow');
+            this.reloadStorageLocations();
+          });
+      }
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue
index ca18b6f0b..fd348a0a3 100644
--- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue
+++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue
@@ -16,14 +16,14 @@
         >
       </select-dropdown>
     </div>
-    <div v-else-if="computedArrOfItemObjects && computedArrOfItemObjects.length > 0"
+    <div v-else-if="colVal && colVal.length > 0"
          class="text-sn-dark-grey font-inter text-sm font-normal leading-5 w-[370px] overflow-x-auto flex flex-wrap gap-1">
-      <span v-for="(checklistItem, index) in computedArrOfItemObjects"
+      <span v-for="(checklistItem, index) in colVal"
             :key="index"
             :id="`checklist-item-${index}`"
             class="flex w-fit break-words">
         {{
-          index + 1 === computedArrOfItemObjects.length
+          index + 1 === colVal.length
             ? checklistItem?.label
             : `${checklistItem?.label} |`
         }}
@@ -66,18 +66,6 @@ export default {
       this.selectedChecklistItemsIds = this.colVal.map((item) => String(item.value));
     }
   },
-  computed: {
-    computedArrOfItemObjects() {
-      const arrOfItemObjects = this.selectedChecklistItemsIds.map((id) => {
-        const matchingItem = this.availableChecklistItems.find((item) => item[0] === id);
-        return {
-          id: matchingItem ? matchingItem[0] : null,
-          label: matchingItem ? matchingItem[1] : null
-        };
-      });
-      return arrOfItemObjects;
-    }
-  },
   methods: {
     fetchChecklistItems() {
       this.isLoading = true;
diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue
index 224af03ac..411c003da 100644
--- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue
+++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue
@@ -35,7 +35,7 @@
             'max-h-[4rem]': collapsed,
             'max-h-[40rem]': !collapsed
           }">
-      {{ colval }}
+      {{ colVal }}
     </div>
     <div v-else
           class="text-sn-dark-grey font-inter text-sm font-normal leading-5">
diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryStockValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryStockValue.vue
index be8a4541d..3b14d496f 100644
--- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryStockValue.vue
+++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryStockValue.vue
@@ -89,6 +89,8 @@ export default {
   },
   methods: {
     enableEditing() {
+      if (!this.values.stock_url) return;
+
       this.isEditing = true;
       const $this = this;
       // disable edit
diff --git a/app/javascript/vue/results/result.vue b/app/javascript/vue/results/result.vue
index 19bdc5c6b..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"
       />
@@ -130,17 +131,17 @@
                       @attachments:order="changeAttachmentsOrder"
                       @attachments:viewMode="changeAttachmentsViewMode"
                       @attachment:viewMode="updateAttachmentViewMode"/>
+        <ContentToolbar
+          v-if="orderedElements.length > 2 && insertMenu.length > 0"
+          :insertMenu="insertMenu"
+          @create:table="(...args) => this.createElement('table', ...args)"
+          @create:text="createElement('text')"
+          @create:file="openLoadFromComputer"
+          @create:wopi_file="openWopiFileModal"
+          @create:ove_file="openOVEditor"
+          @create:marvinjs_file="openMarvinJsModal($refs.marvinJsButton)"
+        ></ContentToolbar>
       </div>
-      <ContentToolbar
-        v-if="orderedElements.length > 3"
-        :insertMenu="insertMenu"
-        @create:table="(...args) => this.createElement('table', ...args)"
-        @create:text="createElement('text')"
-        @create:file="openLoadFromComputer"
-        @create:wopi_file="openWopiFileModal"
-        @create:ove_file="openOVEditor"
-        @create:marvinjs_file="openMarvinJsModal($refs.marvinJsButton)"
-      ></ContentToolbar>
     </div>
   </div>
 </template>
@@ -169,6 +170,9 @@ export default {
     resultToReload: { type: Number, required: false },
     activeDragResult: {
       required: false
+    },
+    userSettingsUrl: {
+      required: false
     }
   },
   data() {
@@ -227,6 +231,17 @@ export default {
       deep: true
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      const resultId = `#resultBody${this.result.id}`;
+      this.isCollapsed = this.result.attributes.collapsed;
+      if (this.isCollapsed) {
+        $(resultId).collapse('hide');
+      } else {
+        $(resultId).collapse('show');
+      }
+    });
+  },
   computed: {
     reorderableElements() {
       return this.orderedElements.map((e) => ({ id: e.id, attributes: e.attributes.orderable }));
@@ -337,6 +352,13 @@ export default {
     toggleCollapsed() {
       this.isCollapsed = !this.isCollapsed;
       this.result.attributes.collapsed = this.isCollapsed;
+
+      const settings = {
+        key: 'result_states',
+        data: { [this.result.id]: this.isCollapsed }
+      };
+
+      axios.put(this.userSettingsUrl, { settings: [settings] });
     },
     dragEnter(e) {
       if (!this.urls.upload_attachment_url) return;
diff --git a/app/javascript/vue/results/results.vue b/app/javascript/vue/results/results.vue
index 23eefb5e8..3b4bc97dc 100644
--- a/app/javascript/vue/results/results.vue
+++ b/app/javascript/vue/results/results.vue
@@ -22,6 +22,7 @@
         :result="result"
         :resultToReload="resultToReload"
         :activeDragResult="activeDragResult"
+        :userSettingsUrl="userSettingsUrl"
         @result:elements:loaded="resultToReload = null"
         @result:move_element="reloadResult"
         @result:attachments:loaded="resultToReload = null"
@@ -64,7 +65,8 @@ export default {
     canCreate: { type: String, required: true },
     archived: { type: String, required: true },
     active_url: { type: String, required: true },
-    archived_url: { type: String, required: true }
+    archived_url: { type: String, required: true },
+    userSettingsUrl: { type: String, required: false }
   },
   data() {
     return {
@@ -74,10 +76,12 @@ export default {
       resultToReload: null,
       nextPageUrl: null,
       loadingPage: false,
-      activeDragResult: null
+      activeDragResult: null,
+      userSettingsUrl: null
     };
   },
   mounted() {
+    this.userSettingsUrl = document.querySelector('meta[name="user-settings-url"]').getAttribute('content');
     window.addEventListener('scroll', this.loadResults, false);
     window.addEventListener('scroll', this.initStackableHeaders, false);
     this.nextPageUrl = this.url;
diff --git a/app/javascript/vue/shareable_links/container.vue b/app/javascript/vue/shareable_links/container.vue
index cb913de6e..165a9ecb2 100644
--- a/app/javascript/vue/shareable_links/container.vue
+++ b/app/javascript/vue/shareable_links/container.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div :title="shareTitle">
+    <div :title="shareTitle" :data-html="true" data-toggle="tooltip" data-placement="left">
       <button class="btn"
               id="share-button"
               type="button"
@@ -73,6 +73,7 @@ export default {
   mounted() {
     // move modal to body to avoid z-index issues
     $('body').append($(this.$refs.modal));
+    $('[data-toggle="tooltip"]').tooltip();
   },
   methods: {
     enableShare() {
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/breadcrumbs.vue b/app/javascript/vue/shared/breadcrumbs.vue
new file mode 100644
index 000000000..ff58fd6bd
--- /dev/null
+++ b/app/javascript/vue/shared/breadcrumbs.vue
@@ -0,0 +1,93 @@
+<template>
+  <div ref="container" class="w-full flex items-center flex-wrap gap-0.5">
+    <template v-if="!allVisible">
+      <div class="flex items-center gap-0.5">
+        <a :href="breadcrumbs[0].url" :title="breadcrumbs[0].name" class="max-w-[200px]">
+          <StringWithEllipsis class="w-full" :text="breadcrumbs[0].name"></StringWithEllipsis>
+        </a>
+      </div>
+      <div class="flex items-center gap-0.5">
+        <i class="sn-icon sn-icon-right text-sn-grey"></i>
+        <GeneralDropdown>
+          <template v-slot:field>
+            <a>...</a>
+          </template>
+          <template v-slot:flyout>
+            <div class="max-w-[600px]">
+              <div v-for="(breadcrumb, index) in hiddenBreadcrumbs" :key="index" class="p-2 hover:bg-sn-super-light-grey cursor-pointer">
+                <a :href="breadcrumb.url" :title="breadcrumb.name" class="max-w-[200px] hover:no-underline">
+                  <StringWithEllipsis class="w-full" :text="breadcrumb.name"></StringWithEllipsis>
+                </a>
+              </div>
+            </div>
+          </template>
+        </GeneralDropdown>
+        <i class="sn-icon sn-icon-right text-sn-grey"></i>
+      </div>
+    </template>
+    <div v-for="(breadcrumb, index) in visibleBreadcrumbs" :key="index" class="flex items-center gap-0.5">
+      <i v-if="index > 0" class="sn-icon sn-icon-right text-sn-grey"></i>
+      <a :href="breadcrumb.url" :title="breadcrumb.name" class="max-w-[200px]">
+        <StringWithEllipsis class="w-full" :text="breadcrumb.name"></StringWithEllipsis>
+      </a>
+    </div>
+  </div>
+</template>
+
+<script>
+import StringWithEllipsis from './string_with_ellipsis.vue';
+import GeneralDropdown from './general_dropdown.vue';
+
+export default {
+  name: 'Breadcrumbs',
+  props: {
+    breadcrumbs: {
+      type: Array,
+      required: true
+    }
+  },
+  components: {
+    StringWithEllipsis,
+    GeneralDropdown
+  },
+  data() {
+    return {
+      containerSize: 0,
+      breadcrumbSize: 200
+    };
+  },
+  computed: {
+    breadcrumbsVisibleCount() {
+      const size = Math.floor(this.containerSize / this.breadcrumbSize);
+      if (size < 2) {
+        return 2;
+      }
+      return size;
+    },
+    allVisible() {
+      return this.breadcrumbs.length <= this.breadcrumbsVisibleCount;
+    },
+    hiddenBreadcrumbs() {
+      return this.breadcrumbs.slice(1, this.breadcrumbs.length - this.breadcrumbsVisibleCount + 1);
+    },
+    visibleBreadcrumbs() {
+      if (this.allVisible) {
+        return this.breadcrumbs;
+      }
+      return this.breadcrumbs.slice(this.breadcrumbs.length - this.breadcrumbsVisibleCount + 1);
+    }
+  },
+  mounted() {
+    this.setContainerSize();
+    window.addEventListener('resize', this.setContainerSize);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.setContainerSize);
+  },
+  methods: {
+    setContainerSize() {
+      this.containerSize = this.$refs.container.offsetWidth;
+    }
+  }
+};
+</script>;
diff --git a/app/javascript/vue/shared/confirmation_modal.vue b/app/javascript/vue/shared/confirmation_modal.vue
index 45f5ee48f..96e8cbf34 100644
--- a/app/javascript/vue/shared/confirmation_modal.vue
+++ b/app/javascript/vue/shared/confirmation_modal.vue
@@ -8,7 +8,7 @@
             {{ title }}
           </h4>
         </div>
-        <div class="modal-body" v-html="description"></div>
+        <div class="modal-body" v-html="description" :data-e2e="e2eAttributes.content"></div>
         <div class="modal-footer">
           <button :class="cancelClass" @click="cancel" :data-e2e="e2eAttributes.cancel">{{ cancelText || i18n.t('general.cancel') }}</button>
           <button :class="confirmClass" @click="confirm" :data-e2e="e2eAttributes.confirm">{{ confirmText || i18n.t('general.confirm') }}</button>
diff --git a/app/javascript/vue/shared/content/attachments/attachment_actions.vue b/app/javascript/vue/shared/content/attachments/attachment_actions.vue
index 71561f7c3..6147efa33 100644
--- a/app/javascript/vue/shared/content/attachments/attachment_actions.vue
+++ b/app/javascript/vue/shared/content/attachments/attachment_actions.vue
@@ -27,6 +27,7 @@
       @attachment:changed="$emit('attachment:changed', $event)"
       @attachment:update="$emit('attachment:update', $event)"
       @menu-toggle="$emit('attachment:toggle_menu', $event)"
+      @attachment:versionRestored="$emit('attachment:versionRestored', $event)"
       :withBorder="withBorder"
     />
   </div>
diff --git a/app/javascript/vue/shared/content/attachments/context_menu.vue b/app/javascript/vue/shared/content/attachments/context_menu.vue
index bb17af66c..8d7d67c6d 100644
--- a/app/javascript/vue/shared/content/attachments/context_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/context_menu.vue
@@ -34,6 +34,7 @@
       @duplicate="duplicate"
       @viewMode="changeViewMode"
       @move="showMoveModal"
+      @fileVersionsModal="fileVersionsModal = true"
       @menu-toggle="$emit('menu-toggle', $event)"
     ></MenuDropdown>
     <Teleport to="body">
@@ -55,6 +56,13 @@
         :targets_url="attachment.attributes.urls.move_targets"
         @confirm="moveAttachment($event)" @cancel="closeMoveModal"
       />
+      <FileVersionsModal
+        v-if="fileVersionsModal"
+        :versionsUrl="attachment.attributes.urls.versions"
+        :restoreVersionUrl="attachment.attributes.urls.restore_version"
+        @close="fileVersionsModal = false"
+        @fileVersionRestored="$emit('attachment:versionRestored', $event)"
+      />
     </Teleport>
   </div>
 </template>
@@ -65,6 +73,7 @@ import deleteAttachmentModal from './delete_modal.vue';
 import MoveAssetModal from '../modal/move.vue';
 import MoveMixin from './mixins/move.js';
 import MenuDropdown from '../../menu_dropdown.vue';
+import FileVersionsModal from '../../file_versions_modal.vue';
 import axios from '../../../../packs/custom_axios.js';
 
 export default {
@@ -73,6 +82,7 @@ export default {
     RenameAttachmentModal,
     deleteAttachmentModal,
     MoveAssetModal,
+    FileVersionsModal,
     MenuDropdown
   },
   mixins: [MoveMixin],
@@ -91,7 +101,8 @@ export default {
     return {
       viewModeOptions: ['inline', 'thumbnail', 'list'],
       deleteModal: false,
-      renameModal: false
+      renameModal: false,
+      fileVersionsModal: false
     };
   },
   computed: {
@@ -136,6 +147,12 @@ export default {
           });
         });
       }
+      if (this.attachment.attributes.urls.versions) {
+        menu.push({
+          text: this.i18n.t('assets.context_menu.versions'),
+          emit: 'fileVersionsModal'
+        });
+      }
       return menu;
     }
   },
diff --git a/app/javascript/vue/shared/content/attachments/inline.vue b/app/javascript/vue/shared/content/attachments/inline.vue
index 14788fc32..d1fec5fb7 100644
--- a/app/javascript/vue/shared/content/attachments/inline.vue
+++ b/app/javascript/vue/shared/content/attachments/inline.vue
@@ -38,6 +38,7 @@
           @attachment:delete="deleteAttachment"
           @attachment:moved="attachmentMoved"
           @attachment:uploaded="reloadAttachments"
+          @attachment:versionRestored="reloadAttachments"
           @attachment:changed="$emit('attachment:changed', $event)"
           @attachment:update="$emit('attachment:update', $event)"
           @attachment:toggle_menu="toggleMenuDropdown"
diff --git a/app/javascript/vue/shared/content/attachments/list.vue b/app/javascript/vue/shared/content/attachments/list.vue
index d8cdc5ad6..2a2aeb03b 100644
--- a/app/javascript/vue/shared/content/attachments/list.vue
+++ b/app/javascript/vue/shared/content/attachments/list.vue
@@ -37,6 +37,7 @@
           @attachment:delete="deleteAttachment"
           @attachment:moved="attachmentMoved"
           @attachment:uploaded="reloadAttachments"
+          @attachment:versionRestored="reloadAttachments"
           @attachment:changed="$emit('attachment:changed', $event)"
           @attachment:update="$emit('attachment:update', $event)"
           @attachment:toggle_menu="toggleMenuDropdown"
diff --git a/app/javascript/vue/shared/content/attachments/mixins/open_locally.js b/app/javascript/vue/shared/content/attachments/mixins/open_locally.js
index 2a34f6e4a..b383a762a 100644
--- a/app/javascript/vue/shared/content/attachments/mixins/open_locally.js
+++ b/app/javascript/vue/shared/content/attachments/mixins/open_locally.js
@@ -1,7 +1,10 @@
+/* global GLOBAL_CONSTANTS */
+
 import axios from '../../../../../packs/custom_axios.js';
 import { satisfies } from 'compare-versions';
 import editLaunchingApplicationModal from '../../modal/edit_launching_application_modal.vue';
 import NoPredefinedAppModal from '../../modal/no_predefined_app_modal.vue';
+import RestrictedExtensionModal from '../../modal/restricted_extension_modal.vue';
 import UpdateVersionModal from '../../modal/update_version_modal.vue';
 
 export default {
@@ -10,15 +13,17 @@ export default {
       localAppName: null,
       scinoteEditRunning: null,
       showNoPredefinedAppModal: false,
+      showRestrictedExtensionModal: false,
       showUpdateVersionModal: false,
       editAppModal: false,
-      pollingInterval: null,
+      pollingInterval: null
     };
   },
   components: {
     editLaunchingApplicationModal,
     NoPredefinedAppModal,
-    UpdateVersionModal
+    UpdateVersionModal,
+    RestrictedExtensionModal
   },
   computed: {
     attributes() {
@@ -93,9 +98,16 @@ export default {
       }
     },
     async openLocally() {
+      const restrictedExtension = GLOBAL_CONSTANTS.SCINOTE_EDIT_RESTRICTED_EXTENSIONS.includes(
+        this.attributes.file_extension.toUpperCase()
+      );
+
       if (this.isWrongVersion(window.scinoteEditVersion)) {
         this.showUpdateVersionModal = true;
         return;
+      } else if (restrictedExtension) {
+        this.showRestrictedExtensionModal = true;
+        return;
       } else if (this.localAppName === null) {
         this.showNoPredefinedAppModal = true;
         return;
diff --git a/app/javascript/vue/shared/content/attachments/open_locally_menu.vue b/app/javascript/vue/shared/content/attachments/open_locally_menu.vue
index c758cd8fc..9d40e11cf 100644
--- a/app/javascript/vue/shared/content/attachments/open_locally_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/open_locally_menu.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="sn-open-locally-menu" @mouseenter="fetchLocalAppInfo">
-    <div v-if="(!canOpenLocally || disableLocalOpen) && (attachment.attributes.wopi && attachment.attributes.urls.edit_asset)">
+  <div class="sn-open-locally-menu flex" @mouseenter="fetchLocalAppInfo">
+    <div v-if="(!canOpenLocally) && (attachment.attributes.wopi && attachment.attributes.urls.edit_asset)">
       <a :href="editWopiSupported ? attachment.attributes.urls.edit_asset : null" target="_blank"
-         class="block whitespace-nowrap rounded px-3 py-2.5 hover:!text-sn-blue hover:no-underline cursor-pointer hover:bg-sn-super-light-grey"
+         class="btn btn-light"
          :class="{ 'disabled': !editWopiSupported }"
          :title="editWopiSupported ? null : attachment.attributes.wopi_context.title"
          style="pointer-events: all"
@@ -26,6 +26,7 @@
           {{ menu[0].text }}
         </a>
     </div>
+    <a @click="fileVersionsModal = true" class="btn btn-light"><i class="sn-icon sn-icon-history-search"></i>{{ i18n.t('assets.context_menu.versions') }}</a>
 
     <Teleport to="body">
       <NoPredefinedAppModal
@@ -33,6 +34,10 @@
         :fileName="attachment.attributes.file_name"
         @close="showNoPredefinedAppModal = false"
       />
+      <RestrictedExtensionModal
+        v-if="showRestrictedExtensionModal"
+        @close="showRestrictedExtensionModal = false"
+      />
       <editLaunchingApplicationModal
         v-if="editAppModal"
         :fileName="attachment.attributes.file_name"
@@ -43,6 +48,13 @@
         v-if="showUpdateVersionModal"
         @close="showUpdateVersionModal = false"
       />
+       <FileVersionsModal
+        v-if="fileVersionsModal"
+        :versionsUrl="attachment.attributes.urls.versions"
+        :restoreVersionUrl="attachment.attributes.urls.restore_version"
+        @close="fileVersionsModal = false"
+        @fileVersionRestored="refreshPreview"
+      />
     </Teleport>
   </div>
 </template>
@@ -51,14 +63,19 @@
 import OpenLocallyMixin from './mixins/open_locally.js';
 import MenuDropdown from '../../menu_dropdown.vue';
 import UpdateVersionModal from '../modal/update_version_modal.vue';
+import FileVersionsModal from '../../file_versions_modal.vue';
 
 export default {
   name: 'OpenLocallyMenu',
   mixins: [OpenLocallyMixin],
-  components: { MenuDropdown, UpdateVersionModal },
+  components: { MenuDropdown, UpdateVersionModal, FileVersionsModal },
   props: {
-    attachment: { type: Object, required: true },
-    disableLocalOpen: { type: Boolean, default: false }
+    attachment: { type: Object, required: true }
+  },
+  data() {
+    return {
+      fileVersionsModal: false
+    };
   },
   created() {
     this.fetchLocalAppInfo();
@@ -88,7 +105,7 @@ export default {
         });
       }
 
-      if (this.canOpenLocally && !this.disableLocalOpen) {
+      if (this.canOpenLocally) {
         const text = this.localAppName
           ? this.i18n.t('attachments.open_locally_in', { application: this.localAppName })
           : this.i18n.t('attachments.open_locally');
@@ -112,6 +129,13 @@ export default {
   methods: {
     openImageEditor() {
       document.getElementById('editImageButton').click();
+    },
+    refreshPreview() {
+      const imageElement = document.querySelector('.file-preview-container .asset-image');
+
+      if (!imageElement) return;
+
+      window.ActiveStoragePreviews.reCheckPreview({ target: imageElement });
     }
   }
 };
diff --git a/app/javascript/vue/shared/content/attachments/open_menu.vue b/app/javascript/vue/shared/content/attachments/open_menu.vue
index d4b3dac00..2080e86b8 100644
--- a/app/javascript/vue/shared/content/attachments/open_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/open_menu.vue
@@ -93,6 +93,10 @@
         :fileName="attachment.attributes.file_name"
         @close="showNoPredefinedAppModal = false"
       />
+      <RestrictedExtensionModal
+        v-if="showRestrictedExtensionModal"
+        @close="showRestrictedExtensionModal = false"
+      />
       <UpdateVersionModal
         v-if="showUpdateVersionModal"
         @close="showUpdateVersionModal = false"
diff --git a/app/javascript/vue/shared/content/attachments/thumbnail.vue b/app/javascript/vue/shared/content/attachments/thumbnail.vue
index ebdc25442..bc7ac5684 100644
--- a/app/javascript/vue/shared/content/attachments/thumbnail.vue
+++ b/app/javascript/vue/shared/content/attachments/thumbnail.vue
@@ -54,6 +54,7 @@
           @attachment:delete="deleteAttachment"
           @attachment:moved="attachmentMoved"
           @attachment:uploaded="reloadAttachments"
+          @attachment:versionRestored="reloadAttachments"
           @attachment:changed="$emit('attachment:changed', $event)"
           @attachment:update="$emit('attachment:update', $event)"
           @attachment:toggle_menu="toggleMenu"
diff --git a/app/javascript/vue/shared/content/content_toolbar.vue b/app/javascript/vue/shared/content/content_toolbar.vue
index f3b2829ad..a50b5c1cf 100644
--- a/app/javascript/vue/shared/content/content_toolbar.vue
+++ b/app/javascript/vue/shared/content/content_toolbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="px-4 py-2 bg-sn-super-light-blue flex gap-4 mt-10 mb-4">
+  <div class="px-4 py-2 bg-sn-super-light-blue flex gap-4 mt-10 mb-4 rounded">
     <span class="font-bold shrink-0 leading-10">
       {{ i18n.t('protocols.steps.insert.button') }}:
     </span>
diff --git a/app/javascript/vue/shared/content/modal/restricted_extension_modal.vue b/app/javascript/vue/shared/content/modal/restricted_extension_modal.vue
new file mode 100644
index 000000000..213b99906
--- /dev/null
+++ b/app/javascript/vue/shared/content/modal/restricted_extension_modal.vue
@@ -0,0 +1,29 @@
+<template>
+  <div ref="modal" @keydown.esc="cancel" class="modal" id="RestrictedExtensionModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog modal-md" role="document">
+      <div class="modal-content">
+        <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" id="modal-delete-result-element">
+            {{ i18n.t('assets.restricted_extension_modal.title') }}
+          </h4>
+        </div>
+        <div class="modal-body">
+          <p v-html="i18n.t('assets.restricted_extension_modal.body')"></p>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primary" @click="close">{{ this.i18n.t('assets.restricted_extension_modal.action') }}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import modalMixin from '../../modal_mixin';
+
+export default {
+  name: 'RestrictedExtensionModal',
+  mixins: [modalMixin]
+};
+</script>
diff --git a/app/javascript/vue/shared/content/text.vue b/app/javascript/vue/shared/content/text.vue
index 2e89fba8e..b5e5de961 100644
--- a/app/javascript/vue/shared/content/text.vue
+++ b/app/javascript/vue/shared/content/text.vue
@@ -15,7 +15,7 @@
           :allowBlank="true"
           :autofocus="editingName"
           :attributeName="`${i18n.t('Text')} ${i18n.t('name')}`"
-          :dataE2e="`${dataE2e}-stepText${element.id}`"
+          :dataE2e="`${dataE2e}-stepText${element.id}-title`"
           @editingEnabled="enableNameEdit"
           @editingDisabled="disableNameEdit"
           @update="updateName"
@@ -36,7 +36,7 @@
     </div>
     <div class="flex rounded min-h-[2.25rem] mb-4 relative group/text_container content__text-body"
       :class="{ 'edit': inEditMode, 'component__element--locked': !element.attributes.orderable.urls.update_url }"
-      :data-e2e="`e2e-IF-${dataE2e}-stepText${element.id}`"
+      :data-e2e="`e2e-IF-${dataE2e}-stepText${element.id}-content`"
       @keyup.enter="enableEditMode($event)"
       tabindex="0">
       <Tinymce
diff --git a/app/javascript/vue/shared/datatable/action_toolbar.vue b/app/javascript/vue/shared/datatable/action_toolbar.vue
index 6d97bfb6c..d7cd7a80c 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}`"
@@ -24,10 +26,13 @@
 </template>
 
 <script>
+import axios from '../../../packs/custom_axios.js';
+
 export default {
   name: 'ActionToolbar',
   props: {
     actionsUrl: { type: String, required: true },
+    actionsMethod: { type: String, default: 'get' },
     params: { type: Object },
   },
   data() {
@@ -51,8 +56,14 @@ export default {
     loadActions() {
       this.loading = true;
       this.loaded = false;
-      $.get(`${this.actionsUrl}?${new URLSearchParams(this.params).toString()}`, (data) => {
-        this.actions = data.actions;
+
+      axios.request({
+        method: this.actionsMethod,
+        url: this.actionsUrl,
+        params: this.actionsMethod === 'get' && this.params,
+        data: this.actionsMethod !== 'get' && this.params
+      }).then((response) => {
+        this.actions = response.data.actions;
         this.loading = false;
         this.loaded = true;
       });
@@ -64,6 +75,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;
diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 3c5317364..b8d6442b2 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -72,6 +72,7 @@
       <ActionToolbar
         v-if="selectedRows.length > 0 && actionsUrl"
         :actionsUrl="actionsUrl"
+        :actionsMethod="actionsMethod"
         :params="actionsParams"
         @toolbar:action="emitAction" />
     </div>
@@ -145,6 +146,9 @@ export default {
     actionsUrl: {
       type: String
     },
+    actionsMethod: {
+      type: String
+    },
     toolbarActions: {
       type: Object,
       required: true
@@ -248,7 +252,7 @@ export default {
         cellRendererParams: {
           dtComponent: this
         },
-        pinned: (column.field === 'name' ? 'left' : null),
+        pinned: (column.field === 'name' || column.field === 'name_hash' ? 'left' : null),
         comparator: () => null
       }));
 
@@ -364,7 +368,7 @@ export default {
       }
     },
     handleScroll() {
-      if (this.scrollMode === 'pages') return;
+      if (this.scrollMode === 'pages' || this.scrollMode === 'none') return;
 
       let target = null;
       if (this.currentViewRender === 'cards') {
@@ -506,15 +510,18 @@ export default {
             this.rowData = [];
           }
 
-          if (this.scrollMode === 'pages') {
+          if (this.scrollMode === 'pages' || this.scrollMode === 'none') {
             if (this.gridApi) this.gridApi.setRowData(this.formatData(response.data.data));
             this.rowData = this.formatData(response.data.data);
           } else {
             this.handleInfiniteScroll(response);
           }
-          this.totalPage = response.data.meta.total_pages;
-          this.totalEntries = response.data.meta.total_count;
-          this.$emit('tableReloaded');
+
+          if (this.scrollMode !== 'none') {
+            this.totalPage = response.data.meta.total_pages;
+            this.totalEntries = response.data.meta.total_count;
+          }
+          this.$emit('tableReloaded', this.rowData, { filtered: this.searchValue.length > 0 });
           this.dataLoading = false;
           this.restoreSelection();
 
@@ -577,8 +584,11 @@ export default {
         this.gridApi.forEachNode((node) => {
           if (this.selectedRows.find((row) => row.id === node.data.id)) {
             node.setSelected(true);
+          } else {
+            node.setSelected(false);
           }
         });
+        this.$emit('selectionChanged', this.selectedRows);
       }
     },
     setSelectedRows(e) {
@@ -591,6 +601,7 @@ export default {
       } else {
         this.selectedRows = this.selectedRows.filter((row) => row.id !== e.data.id);
       }
+      this.$emit('selectionChanged', this.selectedRows);
     },
     emitAction(action) {
       this.$emit(action.name, action, this.selectedRows);
@@ -602,6 +613,7 @@ export default {
     clickCell(e) {
       if (e.column.colId !== 'rowMenu' && e.column.userProvidedColDef.notSelectable !== true) {
         e.node.setSelected(true);
+        this.$emit('selectionChanged', this.selectedRows);
       }
     },
     applyFilters(filters) {
diff --git a/app/javascript/vue/shared/drag_and_drop_upload.vue b/app/javascript/vue/shared/drag_and_drop_upload.vue
index f822c0e29..0a7a35624 100644
--- a/app/javascript/vue/shared/drag_and_drop_upload.vue
+++ b/app/javascript/vue/shared/drag_and_drop_upload.vue
@@ -20,7 +20,7 @@
           {{ i18n.t('repositories.import_records.dragAndDropUpload.importText.firstPart') }}
         </span> {{ i18n.t('repositories.import_records.dragAndDropUpload.importText.secondPart') }}
       </div>
-      <div class="text-sn-grey">
+      <div class="text-sn-grey text-center">
         {{ supportingText }}
       </div>
     </div>
@@ -32,6 +32,7 @@
 </template>
 
 <script>
+/* global GLOBAL_CONSTANTS I18n */
 
 export default {
   name: 'DragAndDropUpload',
@@ -67,9 +68,11 @@ export default {
       }
 
       // check if it's a correct file type
-      const fileExtension = file.name.split('.')[1];
+      const fileExtension = file.name.split('.')[file.name.split('.').length - 1];
       if (!this.supportedFormats.includes(fileExtension)) {
-        const error = I18n.t('repositories.import_records.dragAndDropUpload.wrongFileTypeError');
+        const error = I18n.t('repositories.import_records.dragAndDropUpload.wrongFileTypeError', {
+          extensions: this.supportedFormats.join(', ')
+        });
         this.$emit('file:error', error);
         return false;
       }
diff --git a/app/javascript/vue/shared/file_versions_modal.vue b/app/javascript/vue/shared/file_versions_modal.vue
new file mode 100644
index 000000000..d1c893c4b
--- /dev/null
+++ b/app/javascript/vue/shared/file_versions_modal.vue
@@ -0,0 +1,133 @@
+<template>
+  <div ref="modal" @keydown.esc="close" class="modal" tabindex="-1" role="dialog">
+    <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">
+            {{ i18n.t("assets.file_versions_modal.title") }}
+          </h4>
+        </div>
+        <div class="modal-body">
+          <div class="relative" v-if="fileVersions">
+            <div v-for="(fileVersion, index) in fileVersions" :key="fileVersion.id">
+              <div class="flex w-full border border-sn-light-grey rounded mb-1.5 p-1.5 items-center">
+                <div class="basis-3/4">
+                  <div class="mb-1.5">
+                    <span v-if="fileVersion.attributes.version === 1" class="bg-sn-science-blue text-sn-white me-2 px-2 py-0.5 rounded">
+                      {{ i18n.t("assets.file_versions_modal.original_file") }}
+                    </span>
+                    <span v-else class="bg-sn-grey-300 me-2 px-2 py-0.5 rounded">v{{ fileVersion.attributes.version }}</span>
+                    <a :href="fileVersion.attributes.url" target="_blank">{{ fileVersion.attributes.filename }}</a>
+                    <small class="inline-block ml-1" v-if="fileVersion.attributes.restored_from_version">
+                      ({{ i18n.t("assets.file_versions_modal.restored_from_version", { version: fileVersion.attributes.restored_from_version }) }})
+                    </small>
+                  </div>
+                  <div class="flex text-xs text-sn-grey justify-start">
+                    <div class="mr-3">{{ fileVersion.attributes.created_at }}</div>
+                    <div class="mr-3">{{ fileVersion.attributes.created_by.full_name }}</div>
+                    <div>{{ Math.round(fileVersion.attributes.byte_size/1024) }}KB</div>
+                  </div>
+                </div>
+
+                <div class="basis-1/4 flex justify-end">
+                  <a class="btn btn-icon p-0 mr-3"đ
+                    v-if="enabled || index === 0"
+                    :href="fileVersion.attributes.url"
+                    target="_blank"
+                    data-render-tooltip="true"
+                    :title="i18n.t('assets.file_versions_modal.download')"
+                  >
+                    <i class="sn-icon sn-icon-export"></i>
+                  </a>
+                  <a v-if="restoreVersionUrl && index !== 0"
+                    @click="restoreVersion(fileVersion.attributes.version)"
+                    data-render-tooltip="true"
+                    :title="i18n.t('assets.file_versions_modal.restore')"
+                    class="btn btn-icon p-0 mr-3"
+                  >
+                    <i class="sn-icon sn-icon-restore"></i>
+                  </a>
+                </div>
+              </div>
+            </div>
+            <div v-if="!enabled" class="absolute bottom-0 w-full h-[150px] bg-gradient-to-t from-white to-transparent"></div>
+          </div>
+          <div v-else class="sci-loader"></div>
+          <div v-if="fileVersions && !enabled" class="bg-sn-super-light-blue p-4 rounded flex items-start">
+            <div class="mr-2">
+              <i class="sn-icon sn-icon-upgrade"></i>
+            </div>
+            <div>
+              <h3 class="mt-1 mb-2">{{ i18n.t('assets.file_versions_modal.title') }}</h3>
+              {{ i18n.t('assets.file_versions_modal.disabled_disclaimer') }}
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type='button' class='btn btn-secondary' @click="close">
+            {{ i18n.t('general.cancel') }}
+          </button>
+          <a v-if="fileVersions && !enabled" :href="enableUrl" class='btn btn-primary' target="_blank">
+            {{ i18n.t('assets.file_versions_modal.enable_button') }}
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import modalMixin from './modal_mixin';
+import axios from '../../packs/custom_axios';
+
+export default {
+  name: 'FileVersionsModal',
+  props: {
+    versionsUrl: {
+      type: String,
+      required: true
+    },
+    restoreVersionUrl: {
+      type: String,
+      required: true
+    }
+  },
+  mixins: [modalMixin],
+  data() {
+    return {
+      fileVersions: null,
+      enabled: null,
+      enableUrl: null
+    };
+  },
+  created() {
+    this.loadVersions();
+  },
+  beforeUnmount() {
+    document.querySelectorAll('[data-render-tooltip]').forEach((e) => {
+      window.destroyTooltip(e);
+    });
+  },
+  methods: {
+    loadVersions() {
+      axios.get(this.versionsUrl).then((response) => {
+        this.fileVersions = response.data.data;
+        this.enabled = response.data.enabled;
+        this.enableUrl = response.data.enable_url;
+        this.$nextTick(() => {
+          document.querySelectorAll('[data-render-tooltip]').forEach((e) => {
+            window.initTooltip(e);
+          });
+        });
+      });
+    },
+    restoreVersion(version) {
+      axios.post(this.restoreVersionUrl, { version: version }).then(() => {
+        this.loadVersions();
+        this.$emit('fileVersionRestored');
+      });
+    }
+  }
+};
+</script>
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() {
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index 6fc507da2..5e03d8c9f 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -28,7 +28,7 @@
              v-else
              v-model="query"
              :placeholder="placeholderRender"
-             @keyup="fetchOptions"
+             @keyup="reloadItems"
              @change.stop
              class="w-full bg-transparent border-0 outline-none pl-0 placeholder:text-sn-grey" />
       </template>
@@ -70,7 +70,7 @@
               {{ i18n.t('general.select_all') }}
             </div>
           </div>
-          <perfect-scrollbar class="p-2.5 flex flex-col max-h-80 relative" :class="{ 'pt-0': withCheckboxes }">
+          <perfect-scrollbar ref="scrollContainer" class="p-2.5 flex flex-col max-h-80 relative" :class="{ 'pt-0': withCheckboxes }">
             <template v-for="(option, i) in filteredOptions" :key="option[0]">
               <div
                 @click.stop="setValue(option[0])"
@@ -143,7 +143,8 @@ export default {
       query: '',
       fixedWidth: true,
       focusedOption: null,
-      skipQueryCallback: false
+      skipQueryCallback: false,
+      nextPage: 1
     };
   },
   mixins: [FixedFlyoutMixin],
@@ -270,19 +271,31 @@ export default {
         this.$nextTick(() => {
           this.setPosition();
           this.$refs.search?.focus();
+          this.$refs.scrollContainer.$el.addEventListener('scroll', this.loadNextPage);
         });
       }
     },
     urlParams: {
       handler(oldVal, newVal) {
         if (!this.compareObjects(oldVal, newVal)) {
-          this.fetchOptions();
+          this.reloadItems();
         }
       },
       deep: true
     }
   },
   methods: {
+    reloadItems() {
+      this.fetchedOptions = [];
+      this.nextPage = 1;
+      this.fetchOptions();
+    },
+    loadNextPage() {
+      const container = this.$refs.scrollContainer.$el;
+      if (this.nextPage && container.scrollTop + container.clientHeight >= container.scrollHeight) {
+        this.fetchOptions();
+      }
+    },
     renderLabel(option) {
       if (!option) return false;
 
@@ -354,10 +367,15 @@ export default {
     },
     fetchOptions() {
       if (this.optionsUrl) {
-        const params = { query: this.query, ...this.urlParams };
+        const params = { query: this.query, page: this.nextPage, ...this.urlParams };
         axios.get(this.optionsUrl, { params })
           .then((response) => {
-            this.fetchedOptions = response.data.data;
+            if (response.data.paginated) {
+              this.fetchedOptions = [...this.fetchedOptions, ...response.data.data];
+              this.nextPage = response.data.next_page;
+            } else {
+              this.fetchedOptions = response.data.data;
+            }
             this.$nextTick(() => {
               this.setPosition();
             });
diff --git a/app/javascript/vue/repositories/modals/share.vue b/app/javascript/vue/shared/share_modal.vue
similarity index 52%
rename from app/javascript/vue/repositories/modals/share.vue
rename to app/javascript/vue/shared/share_modal.vue
index 457c49d77..ee9c9873b 100644
--- a/app/javascript/vue/repositories/modals/share.vue
+++ b/app/javascript/vue/shared/share_modal.vue
@@ -7,29 +7,29 @@
             <i class="sn-icon sn-icon-close"></i>
           </button>
           <h4 class="modal-title truncate !block">
-            {{ i18n.t('repositories.index.modal_share.title', {name: repository.name }) }}
+            {{ i18n.t('modal_share.title', {object_name: object.name }) }}
           </h4>
         </div>
         <div class="modal-body">
           <div class="grid grid-cols-3 gap-2">
             <div class="col-span-2">
-              {{ i18n.t("repositories.index.modal_share.share_with_team") }}
+              {{ i18n.t("modal_share.share_with_team") }}
             </div>
             <div class="text-center">
-              {{ i18n.t("repositories.index.modal_share.can_edit") }}
+              {{ i18n.t("modal_share.can_edit") }}
             </div>
-            <div class="col-span-2 flex items-center h-9 gap-1">
+            <div v-if="globalShareEnabled" class="col-span-2 flex items-center h-9 gap-1">
               <span class="sci-checkbox-container">
                 <input type="checkbox" class="sci-checkbox" v-model="sharedWithAllRead" />
                 <span class="sci-checkbox-label"></span>
               </span>
-              {{ i18n.t("repositories.index.modal_share.all_teams") }}
+              {{ i18n.t("modal_share.all_teams") }}
             </div>
-            <div class="flex justify-center items-center">
+            <div v-if="globalShareEnabled" class="flex justify-center items-center">
               <span v-if="sharedWithAllRead" class="sci-toggle-checkbox-container">
                 <input type="checkbox"
                        class="sci-toggle-checkbox"
-                       :disabled="!repository.shareable_write"
+                       :disabled="!object.shareable_write"
                        v-model="sharedWithAllWrite" />
                 <span class="sci-toggle-checkbox-label"></span>
               </span>
@@ -37,19 +37,18 @@
             <template v-for="team in shareableTeams">
               <div class="col-span-2 flex items-center h-9 gap-1">
                 <span class="sci-checkbox-container" :class="{'opacity-0 pointer-events-none': sharedWithAllRead}">
-                  <input type="checkbox" class="sci-checkbox" v-model="team.attributes.private_shared_with" />
+                  <input :disabled="!team.attributes.readable" type="checkbox" class="sci-checkbox" v-model="team.attributes.private_shared_with" />
                   <span class="sci-checkbox-label"></span>
                 </span>
-                {{ team.attributes.name }}
+                {{ team.attributes.name || `(${i18n.t('teams.private_team')})` }}
               </div>
               <div class="flex justify-center items-center">
                 <span v-if="team.attributes.private_shared_with"
-                      :class="{'opacity-0 pointer-events-none': sharedWithAllRead}"
+                      :class="{'opacity-0 pointer-events-none': sharedWithAllRead || !team.attributes.readable}"
                       class="sci-toggle-checkbox-container">
                   <input type="checkbox"
                         class="sci-toggle-checkbox"
-                        @change="permission_changes[team.id] = true"
-                        :disabled="!repository.shareable_write"
+                        :disabled="!object.shareable_write"
                         v-model="team.attributes.private_shared_with_write" />
                   <span class="sci-toggle-checkbox-label"></span>
                 </span>
@@ -60,7 +59,7 @@
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ i18n.t('general.cancel') }}</button>
           <button class="btn btn-primary" @click="submit" type="submit">
-            {{ i18n.t('repositories.index.modal_share.submit') }}
+            {{ i18n.t('modal_share.submit') }}
           </button>
         </div>
       </div>
@@ -71,44 +70,68 @@
 <script>
 /* global HelperModule */
 
-import axios from '../../../packs/custom_axios.js';
-import modalMixin from '../../shared/modal_mixin';
+import axios from '../../packs/custom_axios.js';
+import modalMixin from './modal_mixin';
 
 export default {
-  name: 'ShareRepositoryModal',
+  name: 'ShareObjectModal',
   props: {
-    repository: Object
+    object: Object,
+    globalShareEnabled: { type: Boolean, default: false },
+    confirmationModal: { type: Object }
   },
   mixins: [modalMixin],
   data() {
     return {
-      sharedWithAllRead: this.repository.shared_read || this.repository.shared_write,
-      sharedWithAllWrite: this.repository.shared_write,
-      shareableTeams: [],
-      permission_changes: {}
+      sharedWithAllRead: this.object.shared_read || this.object.shared_write,
+      sharedWithAllWrite: this.object.shared_write,
+      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() {
-      axios.get(this.repository.urls.shareable_teams).then((response) => {
+    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,
-        share_team_ids: this.shareableTeams.filter((team) => team.attributes.private_shared_with).map((team) => team.id),
-        write_permissions: this.shareableTeams.filter((team) => team.attributes.private_shared_with_write).map((team) => team.id),
-        permission_changes: this.permission_changes
+        team_share_params: this.sharedWithAllRead ? [] : this.shareableTeams.map((team) => { return { id: team.id, ...team.attributes } })
       };
-      axios.post(this.repository.urls.share, data).then(() => {
+      axios.post(this.object.urls.share, data).then(() => {
         HelperModule.flashAlertMsg(this.i18n.t(
-          'repositories.index.modal_share.success_message',
-          { inventory_name: this.repository.name }
+          'modal_share.success_message',
+          { object_name: this.object.name }
         ), 'success');
         this.$emit('share');
       });
diff --git a/app/javascript/vue/storage_locations/container.vue b/app/javascript/vue/storage_locations/container.vue
new file mode 100644
index 000000000..8a9839704
--- /dev/null
+++ b/app/javascript/vue/storage_locations/container.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="grid w-full h-full gap-6" :class="{ 'grid-cols-[auto_1fr]': withGrid }">
+    <div v-if="withGrid" class="max-w-[40vw]">
+      <Grid
+        :gridSize="gridSize"
+        :assignedItems="assignedItems"
+        :selectedItems="selectedItems"
+        @assign="assignRowToPosition"
+        @select="selectRow"
+      />
+    </div>
+    <div class="h-full bg-white px-4">
+      <DataTable :columnDefs="columnDefs"
+                :tableId="tableId"
+                :dataUrl="dataSource"
+                ref="table"
+                :reloadingTable="reloadingTable"
+                :toolbarActions="toolbarActions"
+                :actionsUrl="actionsUrl"
+                :actionsMethod="'post'"
+                :scrollMode="paginationMode"
+                @assign="assignRow"
+                @move="moveRow"
+                @import="openImportModal = true"
+                @unassign="unassignRows"
+                @tableReloaded="handleTableReload"
+                @selectionChanged="selectedItems = $event"
+      />
+    </div>
+    <Teleport to="body">
+      <AssignModal
+        v-if="openAssignModal"
+        :assignMode="assignMode"
+        :selectedContainer="assignToContainer"
+        :selectedPosition="assignToPosition"
+        :selectedRow="rowIdToMove"
+        :selectedRowName="rowNameToMove"
+        :cellId="cellIdToUnassign"
+        @close="openAssignModal = false; resetTableSearch(); this.reloadingTable = true"
+      ></AssignModal>
+      <ImportModal
+        v-if="openImportModal"
+        :containerId="containerId"
+        @close="openImportModal = false"
+        @reloadTable="resetTableSearch(); reloadingTable = true"
+      ></ImportModal>
+      <ConfirmationModal
+        :title="i18n.t('storage_locations.show.unassign_modal.title')"
+        :description="storageLocationUnassignDescription"
+        confirmClass="btn btn-danger"
+        :confirmText="i18n.t('storage_locations.show.unassign_modal.button')"
+        ref="unassignStorageLocationModal"
+      ></ConfirmationModal>
+    </Teleport>
+  </div>
+</template>
+
+<script>
+/* global HelperModule */
+
+import axios from '../../packs/custom_axios.js';
+import DataTable from '../shared/datatable/table.vue';
+import Grid from './grid.vue';
+import AssignModal from './modals/assign.vue';
+import ImportModal from './modals/import.vue';
+import ConfirmationModal from '../shared/confirmation_modal.vue';
+import RemindersRender from './renderers/reminders.vue';
+import ItemNameRenderer from './renderers/item_name_renderer.vue';
+
+export default {
+  name: 'StorageLocationsContainer',
+  components: {
+    DataTable,
+    Grid,
+    AssignModal,
+    ConfirmationModal,
+    RemindersRender,
+    ImportModal,
+    ItemNameRenderer
+  },
+  props: {
+    canManage: {
+      type: String,
+      required: true
+    },
+    dataSource: {
+      type: String,
+      required: true
+    },
+    actionsUrl: {
+      type: String,
+      required: true
+    },
+    withGrid: {
+      type: Boolean,
+      default: false
+    },
+    containerId: {
+      type: Number,
+      default: null
+    },
+    gridSize: Array
+  },
+  data() {
+    return {
+      reloadingTable: false,
+      openEditModal: false,
+      openImportModal: false,
+      editModalMode: null,
+      editStorageLocation: null,
+      objectToMove: null,
+      moveToUrl: null,
+      assignedItems: [],
+      selectedItems: [],
+      openAssignModal: false,
+      assignToPosition: null,
+      assignToContainer: null,
+      rowIdToMove: null,
+      rowNameToMove: null,
+      cellIdToUnassign: null,
+      assignMode: 'assign',
+      storageLocationUnassignDescription: ''
+    };
+  },
+  computed: {
+    paginationMode() {
+      return this.withGrid ? 'none' : 'pages';
+    },
+    tableId() {
+      return this.withGrid ? 'StorageLocationsContainerGrid' : 'StorageLocationsContainer';
+    },
+    columnDefs() {
+      let columns = [];
+
+      if (this.withGrid) {
+        columns.push({
+          field: 'position_formatted',
+          headerName: this.i18n.t('storage_locations.show.table.position'),
+          sortable: true,
+          cellClass: 'text-sn-blue cursor-pointer'
+        });
+      }
+
+      columns = columns.concat(
+        [
+          {
+            field: 'reminders',
+            headerName: this.i18n.t('storage_locations.show.table.reminders'),
+            sortable: false,
+            cellRenderer: RemindersRender
+          },
+          {
+            field: 'row_code',
+            headerName: this.i18n.t('storage_locations.show.table.row_id'),
+            sortable: true
+          },
+          {
+            field: 'row_name',
+            headerName: this.i18n.t('storage_locations.show.table.row_name'),
+            sortable: true,
+            cellRenderer: ItemNameRenderer
+          },
+          {
+            field: 'stock',
+            headerName: this.i18n.t('storage_locations.show.table.stock'),
+            sortable: false
+          }
+        ]
+      );
+
+      return columns;
+    },
+    toolbarActions() {
+      const left = [];
+
+      if (this.canManage) {
+        left.push({
+          name: 'assign',
+          icon: 'sn-icon sn-icon-new-task',
+          label: this.i18n.t('storage_locations.show.toolbar.assign'),
+          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'
+        });
+      }
+
+      return {
+        left,
+        right: []
+      };
+    }
+  },
+  methods: {
+    updateTable() {
+      this.reloadingTable = true;
+    },
+    handleTableReload(items, params) {
+      this.reloadingTable = false;
+      if (!params.filtered) {
+        this.assignedItems = items;
+      }
+    },
+    resetTableSearch() {
+      this.$refs.table.searchValue = '';
+    },
+    selectRow(row) {
+      if (this.$refs.table.selectedRows.includes(row)) {
+        this.$refs.table.selectedRows = this.$refs.table.selectedRows.filter((r) => r !== row);
+      } else {
+        this.$refs.table.selectedRows.push(row);
+      }
+      this.$refs.table.restoreSelection();
+    },
+    assignRow() {
+      this.openAssignModal = true;
+      this.rowIdToMove = null;
+      this.rowNameToMove = null;
+      this.assignToContainer = this.containerId;
+      this.assignToPosition = null;
+      this.cellIdToUnassign = null;
+      this.assignMode = 'assign';
+    },
+    assignRowToPosition(position) {
+      this.openAssignModal = true;
+      this.rowIdToMove = null;
+      this.rowNameToMove = null;
+      this.assignToContainer = this.containerId;
+      this.assignToPosition = position;
+      this.cellIdToUnassign = null;
+      this.assignMode = 'assign';
+    },
+    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;
+      this.assignMode = 'move';
+    },
+    async unassignRows(event, rows) {
+      this.storageLocationUnassignDescription = this.i18n.t(
+        'storage_locations.show.unassign_modal.description',
+        { items: rows.length }
+      );
+      const ok = await this.$refs.unassignStorageLocationModal.show();
+      if (ok) {
+        axios.post(event.path).then(() => {
+          this.resetTableSearch();
+          this.reloadingTable = true;
+
+        }).catch((error) => {
+          HelperModule.flashAlertMsg(error.response.data.error, 'danger');
+        });
+      }
+    }
+  }
+};
+
+</script>
diff --git a/app/javascript/vue/storage_locations/grid.vue b/app/javascript/vue/storage_locations/grid.vue
new file mode 100644
index 000000000..9313c9d9f
--- /dev/null
+++ b/app/javascript/vue/storage_locations/grid.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="grid grid-cols-[1.5rem_auto] grid-rows-[1.5rem_auto] overflow-hidden">
+    <div class="z-10 bg-sn-super-light-grey"></div>
+    <div ref="columnsContainer" class="overflow-x-hidden">
+      <div :style="{'width': `${columnsList.length * 54}px`}">
+        <div v-for="column in columnsList" :key="column" class="uppercase float-left flex items-center justify-center w-[54px] ">
+          <span>{{ column }}</span>
+        </div>
+      </div>
+    </div>
+    <div ref="rowContainer" class="overflow-y-hidden max-h-[70vh]">
+      <div v-for="row in rowsList" :key="row" class="uppercase flex items-center justify-center h-[54px]">
+        <span>{{ row }}</span>
+      </div>
+    </div>
+    <div ref="cellsContainer" class="overflow-hidden max-h-[70vh] relative">
+      <div class="grid" :style="{
+        'grid-template-columns': `repeat(${columnsList.length}, 1fr)`,
+        'width': `${columnsList.length * 54}px`
+      }">
+        <div v-for="cell in cellsList" :key="cell.row + cell.column" class="cell">
+          <div class="w-[54px] h-[54px] uppercase items-center flex justify-center p-1
+                      border border-solid !border-transparent !border-b-sn-grey !border-r-sn-grey"
+              :class="{ '!border-t-sn-grey': cell.row === 0, '!border-l-sn-grey': cell.column === 0 }"
+          >
+            <div
+              class="h-full w-full rounded-full items-center flex justify-center"
+              @click="assignRow(cell)"
+              :class="{
+                'bg-sn-background-green': cellIsOccupied(cell),
+                'bg-sn-grey-100': cellIsHidden(cell),
+                'bg-white': cellIsAvailable(cell),
+                'bg-white border-sn-science-blue border-solid border-[1px]': cellIsSelected(cell),
+                'cursor-pointer': !cellIsHidden(cell)
+              }"
+            >
+              <template v-if="cellIsHidden(cell)">
+                <i class="sn-icon sn-icon-locked-task"></i>
+              </template>
+              <template v-else>
+                {{ rowsList[cell.row] }}{{ columnsList[cell.column] }}
+              </template>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+/* global PerfectScrollbar */
+export default {
+  name: 'StorageLocationsGrid',
+  props: {
+    gridSize: {
+      type: Array,
+      required: true
+    },
+    assignedItems: {
+      type: Array,
+      default: () => []
+    },
+    selectedItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      scrollBar: null
+    };
+  },
+  mounted() {
+    this.$refs.cellsContainer.addEventListener('scroll', this.handleScroll);
+    window.addEventListener('resize', this.handleScroll);
+    this.scrollBar = new PerfectScrollbar(this.$refs.cellsContainer, { wheelSpeed: 0.5, minScrollbarLength: 20 });
+  },
+  beforeUnmount() {
+    this.$refs.cellsContainer.removeEventListener('scroll', this.handleScroll);
+    window.removeEventListener('resize', this.handleScroll);
+  },
+  computed: {
+    columnsList() {
+      return Array.from({ length: this.gridSize[1] }, (v, i) => i + 1);
+    },
+    rowsList() {
+      return Array.from({ length: this.gridSize[0] }, (v, i) => String.fromCharCode(97 + i));
+    },
+    cellsList() {
+      const cells = [];
+      for (let i = 0; i < this.gridSize[0]; i++) {
+        for (let j = 0; j < this.gridSize[1]; j++) {
+          cells.push({ row: i, column: j });
+        }
+      }
+      return cells;
+    }
+  },
+  methods: {
+    cellObject(cell) {
+      return this.assignedItems.find((item) => item.position[0] === cell.row + 1 && item.position[1] === cell.column + 1);
+    },
+    cellIsOccupied(cell) {
+      return this.cellObject(cell) && !this.cellObject(cell)?.hidden;
+    },
+    cellIsHidden(cell) {
+      return this.cellObject(cell)?.hidden;
+    },
+    cellIsSelected(cell) {
+      return this.selectedItems.some((item) => item.position[0] === cell.row + 1 && item.position[1] === cell.column + 1);
+    },
+    cellIsAvailable(cell) {
+      return !this.cellIsOccupied(cell) && !this.cellIsHidden(cell);
+    },
+    assignRow(cell) {
+      if (this.cellIsOccupied(cell)) {
+        this.$emit('select', this.cellObject(cell));
+        return;
+      }
+
+      if (this.cellIsHidden(cell)) {
+        return;
+      }
+
+      this.$emit('assign', [cell.row + 1, cell.column + 1]);
+    },
+    handleScroll() {
+      this.$refs.columnsContainer.scrollLeft = this.$refs.cellsContainer.scrollLeft;
+      this.$refs.rowContainer.scrollTop = this.$refs.cellsContainer.scrollTop;
+
+      if (this.$refs.cellsContainer.scrollLeft > this.$refs.columnsContainer.scrollLeft) {
+        this.$refs.cellsContainer.scrollLeft = this.$refs.columnsContainer.scrollLeft;
+      }
+
+      if (this.$refs.rowContainer.scrollTop > 0) {
+        this.$refs.columnsContainer.style.boxShadow = '0px 0px 20px 0px rgba(16, 24, 40, 0.20)';
+      } else {
+        this.$refs.columnsContainer.style.boxShadow = 'none';
+      }
+
+      if (this.$refs.columnsContainer.scrollLeft > 0) {
+        this.$refs.rowContainer.style.boxShadow = '0px 0px 20px 0px rgba(16, 24, 40, 0.20)';
+      } else {
+        this.$refs.rowContainer.style.boxShadow = 'none';
+      }
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/assign.vue b/app/javascript/vue/storage_locations/modals/assign.vue
new file mode 100644
index 000000000..86a7af71c
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/assign.vue
@@ -0,0 +1,134 @@
+<template>
+  <div ref="modal" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <form @submit.prevent="submit">
+        <div class="modal-content">
+          <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 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="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.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.assign_description`) }}
+            </p>
+            <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 && 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" :disabled="!validObject">
+              {{ i18n.t(`storage_locations.show.assign_modal.${assignMode}_action`) }}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script>
+/* global HelperModule */
+
+import axios from '../../../packs/custom_axios.js';
+import modalMixin from '../../shared/modal_mixin';
+import RowSelector from './assign/row_selector.vue';
+import ContainerSelector from './assign/container_selector.vue';
+import PositionSelector from './assign/position_selector.vue';
+import {
+  storage_location_storage_location_repository_rows_path,
+  move_storage_location_storage_location_repository_row_path,
+
+} from '../../../routes.js';
+
+export default {
+  name: 'NewProjectModal',
+  props: {
+    selectedRow: Number,
+    selectedRowName: String,
+    selectedContainer: Number,
+    cellId: Number,
+    selectedPosition: Array,
+    assignMode: String
+  },
+  mixins: [modalMixin],
+  computed: {
+    validObject() {
+      return this.rowId && this.containerId && this.containerId > 0;
+    },
+    createUrl() {
+      return storage_location_storage_location_repository_rows_path({
+        storage_location_id: this.containerId
+      });
+    },
+    formattedPosition() {
+      if (this.selectedPosition) {
+        return String.fromCharCode(96 + parseInt(this.selectedPosition[0], 10)).toUpperCase() + this.selectedPosition[1];
+      }
+      return '';
+    },
+    moveUrl() {
+      return move_storage_location_storage_location_repository_row_path(this.containerId, this.cellId);
+    },
+    actionUrl() {
+      return this.assignMode === 'assign' ? this.createUrl : this.moveUrl;
+    }
+  },
+  data() {
+    return {
+      rowId: this.selectedRow,
+      containerId: this.selectedContainer,
+      position: this.selectedPosition,
+      saving: false
+    };
+  },
+  components: {
+    RowSelector,
+    ContainerSelector,
+    PositionSelector
+  },
+  methods: {
+    submit() {
+      if (this.saving) {
+        return;
+      }
+
+      this.saving = true;
+
+      axios.post(this.actionUrl, {
+        repository_row_id: this.rowId,
+        metadata: { position: this.position?.map((pos) => parseInt(pos, 10)) }
+      }).then(() => {
+        this.$emit('close');
+        this.saving = false;
+      }).catch((error) => {
+        HelperModule.flashAlertMsg(error.response.data.errors.join(', '), 'danger');
+        this.saving = false;
+      });
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/assign/container_selector.vue b/app/javascript/vue/storage_locations/modals/assign/container_selector.vue
new file mode 100644
index 000000000..5bdf693f0
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/assign/container_selector.vue
@@ -0,0 +1,52 @@
+<template>
+  <div v-if="dataLoaded">
+    <div v-if="storageLocationsTree.length > 0">
+      <div class="mb-4">
+        <div class="sci-input-container-v2 left-icon">
+          <input type="text"
+                  v-model="query"
+                  class="sci-input-field"
+                  ref="input"
+                  autofocus="true"
+                  :placeholder=" i18n.t('storage_locations.index.move_modal.placeholder.find_storage_locations')" />
+          <i class="sn-icon sn-icon-search"></i>
+        </div>
+      </div>
+      <div class="max-h-80 overflow-y-auto">
+        <div class="p-2 flex items-center gap-2 cursor-pointer text-sn-blue hover:bg-sn-super-light-grey"
+              @click="selectStorageLocation(null)"
+              :class="{'!bg-sn-super-light-blue': selectedStorageLocationId == null}">
+          <i class="sn-icon sn-icon-projects"></i>
+          {{ i18n.t('storage_locations.index.move_modal.search_header') }}
+        </div>
+        <MoveTree
+          :storageLocationsTree="filteredStorageLocationsTree"
+          :moveMode="moveMode"
+          :value="selectedStorageLocationId"
+          @selectStorageLocation="selectStorageLocation" />
+
+      </div>
+    </div>
+    <div v-else class="py-2 text-sn-dark-grey" v-html="i18n.t('storage_locations.index.move_modal.no_results')"></div>
+  </div>
+</template>
+
+<script>
+import MoveTreeMixin from '../move_tree_mixin';
+
+export default {
+  name: 'ContainerSelector',
+  mixins: [MoveTreeMixin],
+  data() {
+    return {
+      container: true,
+      moveMode: 'containers'
+    };
+  },
+  watch: {
+    selectedStorageLocationId() {
+      this.$emit('change', this.selectedStorageLocationId);
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/assign/position_selector.vue b/app/javascript/vue/storage_locations/modals/assign/position_selector.vue
new file mode 100644
index 000000000..d3556ccaf
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/assign/position_selector.vue
@@ -0,0 +1,94 @@
+<template>
+  <div v-if="availablePositions" class="grid grid-cols-2 gap-4 mb-4">
+    <div class="">
+      <div class="sci-label">{{ i18n.t(`storage_locations.show.assign_modal.row`) }}</div>
+      <SelectDropdown
+        :options="availableRows"
+        :value="selectedRow"
+        @change="selectedRow = $event"
+      ></SelectDropdown>
+    </div>
+    <div>
+      <div class="sci-label">{{ i18n.t(`storage_locations.show.assign_modal.column`) }}</div>
+      <SelectDropdown
+        :disabled="!selectedRow"
+        :options="availableColumns"
+        :value="selectedColumn"
+        @change="selectedColumn= $event"
+      ></SelectDropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+import SelectDropdown from '../../../shared/select_dropdown.vue';
+import axios from '../../../../packs/custom_axios.js';
+import {
+  available_positions_storage_location_path,
+} from '../../../../routes.js';
+
+export default {
+  name: 'PositionSelector',
+  components: {
+    SelectDropdown
+  },
+  props: {
+    selectedContainerId: Number
+  },
+  created() {
+    axios.get(this.positionsUrl)
+      .then((response) => {
+        this.availablePositions = response.data.positions;
+        if (this.availablePositions) {
+          this.$nextTick(() => {
+            [[this.selectedRow]] = this.availableRows;
+            this.$nextTick(() => {
+              [[this.selectedColumn]] = this.availableColumns;
+            });
+          });
+        }
+      });
+  },
+  watch: {
+    selectedRow() {
+      [[this.selectedColumn]] = this.availableColumns;
+      this.$emit('change', [this.selectedRow, this.selectedColumn]);
+    },
+    selectedColumn() {
+      this.$emit('change', [this.selectedRow, this.selectedColumn]);
+    }
+  },
+  computed: {
+    positionsUrl() {
+      return available_positions_storage_location_path(this.selectedContainerId);
+    },
+    availableRows() {
+      if (!this.availablePositions) {
+        return [];
+      }
+
+      return Object.keys(this.availablePositions).map((row) => [row, this.convertNumberToLetter(row)]);
+    },
+    availableColumns() {
+      if (!this.availablePositions) {
+        return [];
+      }
+
+      return (this.availablePositions[this.selectedRow] || []).map((col) => [col, col]);
+    }
+  },
+  data() {
+    return {
+      availablePositions: null,
+      selectedRow: null,
+      selectedColumn: null
+    };
+  },
+  methods: {
+    convertNumberToLetter(number) {
+      const charCode = 96 + parseInt(number, 10);
+      return String.fromCharCode(charCode).toUpperCase();
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/assign/row_selector.vue b/app/javascript/vue/storage_locations/modals/assign/row_selector.vue
new file mode 100644
index 000000000..2ae417099
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/assign/row_selector.vue
@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <div class="mb-4">
+      <div class="sci-label">{{ i18n.t(`storage_locations.show.assign_modal.inventory`) }}</div>
+      <SelectDropdown
+        :optionsUrl="repositoriesUrl"
+        placeholder="Select inventory"
+        :searchable="true"
+        @change="selectedRepository = $event"
+      ></SelectDropdown>
+    </div>
+    <div>
+      <div class="sci-label">{{ i18n.t(`storage_locations.show.assign_modal.item`) }}</div>
+      <SelectDropdown
+        :disabled="!selectedRepository"
+        :optionsUrl="rowsUrl"
+        :urlParams="{ repository_id: selectedRepository }"
+        placeholder="Select item"
+        :searchable="true"
+        @change="selectedRow= $event"
+      ></SelectDropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+import SelectDropdown from '../../../shared/select_dropdown.vue';
+import {
+  list_team_repositories_path,
+  rows_list_team_repositories_path
+} from '../../../../routes.js';
+
+export default {
+  name: 'RowSelector',
+  components: {
+    SelectDropdown
+  },
+  created() {
+    this.teamId = document.body.dataset.currentTeamId;
+  },
+  watch: {
+    selectedRepository() {
+      this.selectedRow = null;
+    },
+    selectedRow() {
+      this.$emit('change', this.selectedRow);
+    }
+  },
+  computed: {
+    repositoriesUrl() {
+      return list_team_repositories_path(this.teamId, { non_empty: true, active: true });
+    },
+    rowsUrl() {
+      if (!this.selectedRepository) {
+        return null;
+      }
+
+      return rows_list_team_repositories_path(this.teamId, { active: true });
+    }
+  },
+  data() {
+    return {
+      selectedRepository: null,
+      selectedRow: null,
+      teamId: null
+    };
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/description.vue b/app/javascript/vue/storage_locations/modals/description.vue
new file mode 100644
index 000000000..296bbb1b6
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/description.vue
@@ -0,0 +1,35 @@
+<template>
+  <div ref="modal" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <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" id="edit-project-modal-label" :title="experiment.name">
+            {{ experiment.name }}
+          </h4>
+        </div>
+        <div class="modal-body">
+          <div class="[&_.atwho-user-container]:!whitespace-normal whitespace-pre-wrap" v-html="experiment.sa_description"></div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-dismiss="modal">{{ i18n.t('general.close') }}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import modalMixin from '../../shared/modal_mixin';
+
+export default {
+  name: 'DescriptionModal',
+  props: {
+    experiment: Object
+  },
+  mixins: [modalMixin]
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/import.vue b/app/javascript/vue/storage_locations/modals/import.vue
new file mode 100644
index 000000000..1a9abfc6e
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/import.vue
@@ -0,0 +1,125 @@
+<template>
+  <div ref="modal" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <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" id="edit-project-modal-label">
+            {{ i18n.t('storage_locations.show.import_modal.title') }}
+          </h4>
+        </div>
+        <div class="modal-body flex flex-col grow">
+          <p>
+            {{ i18n.t('storage_locations.show.import_modal.description') }}
+          </p>
+          <h3 class="my-0 text-sn-dark-grey mb-3">
+            {{ i18n.t('storage_locations.show.import_modal.export') }}
+          </h3>
+          <div class="flex gap-4 mb-6">
+            <a
+              :href="exportUrl"
+              target="_blank"
+              class="btn btn-secondary btn-sm"
+            >
+              <i class="sn-icon sn-icon-export"></i>
+              {{ i18n.t('storage_locations.show.import_modal.export_button') }}
+            </a>
+          </div>
+
+          <h3 class="my-0 text-sn-dark-grey mb-3">
+            {{ i18n.t('storage_locations.show.import_modal.import') }}
+          </h3>
+          <DragAndDropUpload
+            class="h-60"
+            @file:dropped="uploadFile"
+            @file:error="handleError"
+            @file:error:clear="this.error = null"
+            :supportingText="`${i18n.t('storage_locations.show.import_modal.drag_n_drop')}`"
+            :supportedFormats="['xlsx']"
+          />
+        </div>
+        <div class="modal-footer">
+          <div v-if="error" class="flex flex-row gap-2 my-auto mr-auto text-sn-delete-red">
+            <i class="sn-icon sn-icon-alert-warning"></i>
+            <div class="my-auto">{{ error }}</div>
+          </div>
+          <button class="btn btn-secondary" @click="close" aria-label="Close">
+            {{ i18n.t('general.cancel') }}
+          </button>
+        </div>
+        <div v-if="loading" class="flex absolute top-0 left-0 items-center justify-center w-full flex-grow h-full z-10">
+          <div class="absolute top-0 left-0 w-full h-full bg-black opacity-20"></div>
+          <img src="/images/medium/loading.svg" alt="Loading" class="p-4 rounded-xl bg-sn-white relative z-10" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import DragAndDropUpload from '../../shared/drag_and_drop_upload.vue';
+import modalMixin from '../../shared/modal_mixin';
+import axios from '../../../packs/custom_axios';
+import {
+  export_container_storage_location_path,
+  import_container_storage_location_path
+} from '../../../routes.js';
+
+export default {
+  name: 'ImportContainer',
+  emits: ['uploadFile', 'close'],
+  components: {
+    DragAndDropUpload
+  },
+  mixins: [modalMixin],
+  props: {
+    containerId: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+      error: null,
+      loading: false
+    };
+  },
+  computed: {
+    exportUrl() {
+      return export_container_storage_location_path({
+        id: this.containerId
+      });
+    },
+    importUrl() {
+      return import_container_storage_location_path({
+        id: this.containerId
+      });
+    }
+  },
+  methods: {
+    handleError(error) {
+      this.error = error;
+    },
+    uploadFile(file) {
+      const formData = new FormData();
+      this.loading = true;
+      // required payload
+      formData.append('file', file);
+
+      axios.post(this.importUrl, formData, {
+        headers: { 'Content-Type': 'multipart/form-data' }
+      })
+        .then(() => {
+          this.$emit('reloadTable');
+          this.loading = false;
+          this.close();
+        }).catch((error) => {
+          this.handleError(error.response.data.message);
+          this.loading = false;
+        });
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/move.vue b/app/javascript/vue/storage_locations/modals/move.vue
new file mode 100644
index 000000000..741bf8dd0
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/move.vue
@@ -0,0 +1,100 @@
+<template>
+  <div ref="modal" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <form @submit.prevent="submit">
+        <div class="modal-content">
+          <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">
+              {{ i18n.t('storage_locations.index.move_modal.title', { name: this.selectedObject.name }) }}
+            </h4>
+          </div>
+          <div class="modal-body">
+            <div class="mb-4">{{ i18n.t('storage_locations.index.move_modal.description', { name: this.selectedObject.name }) }}</div>
+            <div class="mb-4">
+              <div class="sci-input-container-v2 left-icon">
+                <input type="text"
+                       v-model="query"
+                       class="sci-input-field"
+                       ref="input"
+                       autofocus="true"
+                       :placeholder=" i18n.t('storage_locations.index.move_modal.placeholder.find_storage_locations')" />
+                <i class="sn-icon sn-icon-search"></i>
+              </div>
+            </div>
+            <div class="max-h-80 overflow-y-auto">
+              <div class="p-2 flex items-center gap-2 "
+                   @click="selectStorageLocation(null)"
+                   :class="{
+                     '!bg-sn-super-light-blue': selectedStorageLocationId == null,
+                     'cursor-pointer text-sn-blue hover:bg-sn-super-light-grey': movableToRoot
+                   }">
+                <i class="sn-icon sn-icon-projects"></i>
+                {{ i18n.t('storage_locations.index.move_modal.search_header') }}
+              </div>
+              <MoveTree
+                :storageLocationsTree="filteredStorageLocationsTree"
+                :moveMode="moveMode"
+                :value="selectedStorageLocationId"
+                @selectStorageLocation="selectStorageLocation" />
+            </div>
+          </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" :disabled="!validContainer" type="submit">
+              {{ i18n.t('general.move') }}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script>
+/* global HelperModule */
+
+import axios from '../../../packs/custom_axios.js';
+import modalMixin from '../../shared/modal_mixin';
+import MoveTreeMixin from './move_tree_mixin';
+
+export default {
+  name: 'NewProjectModal',
+  props: {
+    selectedObject: Array,
+    moveToUrl: String
+  },
+  created() {
+    this.teamId = this.selectedObject.team_id;
+  },
+  computed: {
+    validContainer() {
+      return (this.selectedStorageLocationId && this.selectedStorageLocationId > 0) || this.selectedStorageLocationId === null;
+    }
+  },
+  mixins: [modalMixin, MoveTreeMixin],
+  data() {
+    return {
+      selectedStorageLocationId: null,
+      storageLocationsTree: [],
+      teamId: null,
+      query: '',
+      moveMode: 'locations'
+    };
+  },
+  methods: {
+    submit() {
+      axios.post(this.moveToUrl, {
+        destination_storage_location_id: this.selectedStorageLocationId || 'root_storage_location'
+      }).then((response) => {
+        this.$emit('move');
+        HelperModule.flashAlertMsg(response.data.message, 'success');
+      }).catch((error) => {
+        HelperModule.flashAlertMsg(error.response.data.error, 'danger');
+      });
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/move_tree.vue b/app/javascript/vue/storage_locations/modals/move_tree.vue
new file mode 100644
index 000000000..dfc872ec7
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/move_tree.vue
@@ -0,0 +1,65 @@
+<template>
+  <div class="pl-6" v-if="storageLocationsTree.length" v-for="storageLocationTree in storageLocationsTree"
+       :key="storageLocationTree.storage_location.id">
+    <div class="flex items-center">
+      <i v-if="storageLocationTree.children.length > 0"
+         :class="{'sn-icon-up': opendedStorageLocations[storageLocationTree.storage_location.id],
+                  'sn-icon-down': !opendedStorageLocations[storageLocationTree.storage_location.id]}"
+         @click="opendedStorageLocations[storageLocationTree.storage_location.id] = !opendedStorageLocations[storageLocationTree.storage_location.id]"
+         class="sn-icon p-2 pr-1 cursor-pointer"></i>
+      <i v-else class="sn-icon sn-icon-up p-2 pr-1 opacity-0"></i>
+      <div @click="selectStorageLocation(storageLocationTree)"
+           class="flex items-center pl-1 flex-1 gap-2"
+           :class="{
+             '!bg-sn-super-light-blue': storageLocationTree.storage_location.id == value,
+             'text-sn-blue cursor-pointer hover:bg-sn-super-light-grey': (
+               (moveMode === 'locations' || storageLocationTree.storage_location.container) && managePermission(storageLocationTree)
+             )
+          }">
+        <i v-if="storageLocationTree.storage_location.container" class="sn-icon sn-icon-item"></i>
+        <div class="flex-1 truncate p-2 pl-0" :title="storageLocationTree.storage_location.name">
+          {{ storageLocationTree.storage_location.name }}
+        </div>
+      </div>
+    </div>
+    <MoveTree v-if="opendedStorageLocations[storageLocationTree.storage_location.id]"
+              :storageLocationsTree="storageLocationTree.children"
+              :value="value"
+              :canManage="managePermission(storageLocationTree)"
+              :moveMode="moveMode"
+              @selectStorageLocation="$emit('selectStorageLocation', $event)" />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MoveTree',
+  emits: ['selectStorageLocation'],
+  props: {
+    storageLocationsTree: Array,
+    value: Number,
+    moveMode: String,
+    canManage: Boolean
+  },
+  components: {
+    MoveTree: () => import('./move_tree.vue')
+  },
+  data() {
+    return {
+      opendedStorageLocations: {}
+    };
+  },
+  methods: {
+    selectStorageLocation(storageLocationTree) {
+      if (!this.managePermission(storageLocationTree)) return;
+
+      if (this.moveMode === 'locations' || storageLocationTree.storage_location.container) {
+        this.$emit('selectStorageLocation', storageLocationTree.storage_location.id);
+      }
+    },
+    managePermission(loc) {
+      return (loc.storage_location.parent_id ? this.canManage : loc.can_manage) || loc.storage_location.container;
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/modals/move_tree_mixin.js b/app/javascript/vue/storage_locations/modals/move_tree_mixin.js
new file mode 100644
index 000000000..49d4fb7f4
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/move_tree_mixin.js
@@ -0,0 +1,61 @@
+import axios from '../../../packs/custom_axios.js';
+import MoveTree from './move_tree.vue';
+import {
+  tree_storage_locations_path
+} from '../../../routes.js';
+
+export default {
+  mounted() {
+    axios.get(this.storageLocationsTreeUrl, { params: { team_id: this.teamId } }).then((response) => {
+      this.storageLocationsTree = response.data.locations;
+      this.movableToRoot = response.data.movable_to_root;
+      if (!this.movableToRoot) {
+        this.selectedStorageLocationId = -1;
+      }
+      this.dataLoaded = true;
+    });
+  },
+  data() {
+    return {
+      selectedStorageLocationId: null,
+      movableToRoot: false,
+      storageLocationsTree: [],
+      query: '',
+      dataLoaded: false
+    };
+  },
+  computed: {
+    storageLocationsTreeUrl() {
+      return tree_storage_locations_path({ format: 'json', container: this.container });
+    },
+    filteredStorageLocationsTree() {
+      if (this.query === '') {
+        return this.storageLocationsTree;
+      }
+
+      return this.filteredStorageLocationsTreeHelper(this.storageLocationsTree);
+    }
+  },
+  components: {
+    MoveTree
+  },
+  methods: {
+    filteredStorageLocationsTreeHelper(storageLocationsTree) {
+      return storageLocationsTree.map(({ storage_location, children, can_manage }) => {
+        if (storage_location.name.toLowerCase().includes(this.query.toLowerCase())) {
+          return { storage_location, children, can_manage };
+        }
+
+        const filteredChildren = this.filteredStorageLocationsTreeHelper(children);
+        return filteredChildren.length ? { storage_location, can_manage, children: filteredChildren } : null;
+      }).filter(Boolean);
+    },
+    selectStorageLocation(storageLocationId) {
+      if (!this.movableToRoot && storageLocationId === null) {
+        return;
+      }
+
+      this.selectedStorageLocationId = storageLocationId;
+    }
+  }
+};
diff --git a/app/javascript/vue/storage_locations/modals/new_edit.vue b/app/javascript/vue/storage_locations/modals/new_edit.vue
new file mode 100644
index 000000000..b0a97df6f
--- /dev/null
+++ b/app/javascript/vue/storage_locations/modals/new_edit.vue
@@ -0,0 +1,262 @@
+<template>
+  <div ref="modal" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <form @submit.prevent="submit">
+        <div class="modal-content">
+          <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" >
+              {{ i18n.t(`storage_locations.index.edit_modal.title_${mode}_${editModalMode}`) }}
+            </h4>
+          </div>
+          <div class="modal-body">
+            <p v-if="mode == 'create'" class="mb-6">{{ i18n.t(`storage_locations.index.edit_modal.description_create_${editModalMode}`) }}</p>
+            <div class="mb-6">
+              <label class="sci-label">
+                {{ i18n.t(`storage_locations.index.edit_modal.name_label_${editModalMode}`) }}
+              </label>
+              <div class="sci-input-container-v2">
+                <input
+                  type="text"
+                  v-model="object.name"
+                  :placeholder="i18n.t(`storage_locations.index.edit_modal.name_placeholder_${editModalMode}`)"
+                >
+              </div>
+              <span v-if="this.errors.name" class="text-sn-coral text-xs">{{ this.errors.name }}</span>
+            </div>
+            <div v-if="editModalMode == 'container'" :title="warningBoxNotEmpty" class="mb-6">
+              <label class="sci-label">
+                {{ i18n.t(`storage_locations.index.edit_modal.dimensions_label`) }}
+              </label>
+              <div class="flex items-center gap-2 mb-4">
+                <div class="sci-radio-container">
+                  <input type="radio" class="sci-radio" :disabled="!canChangeGrid" v-model="object.metadata.display_type" name="display_type" value="no_grid" >
+                  <span class="sci-radio-label"></span>
+                </div>
+                <span>{{ i18n.t('storage_locations.index.edit_modal.no_grid') }}</span>
+                <i class="sn-icon sn-icon-info text-sn-grey" :title="i18n.t('storage_locations.index.edit_modal.no_grid_tooltip')"></i>
+              </div>
+              <div class="flex items-center gap-2 mb-4">
+                <div class="sci-radio-container">
+                  <input type="radio" class="sci-radio" :disabled="!canChangeGrid"  v-model="object.metadata.display_type" name="display_type" value="grid" >
+                  <span class="sci-radio-label"></span>
+                </div>
+                <span>{{ i18n.t('storage_locations.index.edit_modal.grid') }}</span>
+                <div class="sci-input-container-v2 !w-28">
+                  <input type="number" :disabled="!canChangeGrid"  v-model="object.metadata.dimensions[0]" min="1" max="24">
+                </div>
+                <i class="sn-icon sn-icon-close-small"></i>
+                <div class="sci-input-container-v2 !w-28">
+                  <input type="number" :disabled="!canChangeGrid"  v-model="object.metadata.dimensions[1]" min="1" max="24">
+                </div>
+              </div>
+            </div>
+            <div class="mb-6">
+              <label class="sci-label">
+                {{ i18n.t(`storage_locations.index.edit_modal.image_label_${editModalMode}`) }}
+              </label>
+              <DragAndDropUpload
+                v-if="!attachedImage && !object.file_name"
+                class="h-60"
+                @file:dropped="addFile"
+                @file:error="handleError"
+                @file:error:clear="this.imageError = null"
+                :supportingText="`${i18n.t('storage_locations.index.edit_modal.drag_and_drop_supporting_text')}`"
+                :supportedFormats="['jpg', 'png', 'jpeg']"
+              />
+              <div v-else class="border border-sn-light-grey rounded flex items-center p-2 gap-2">
+                <i class="sn-icon sn-icon-result-image text-sn-grey"></i>
+                <span class="text-sn-blue">{{ object.file_name || attachedImage?.name }}</span>
+                <i class="sn-icon sn-icon-close text-sn-blue ml-auto cursor-pointer" @click="removeImage"></i>
+              </div>
+            </div>
+            <div class="mb-6">
+              <label class="sci-label">
+                {{ i18n.t(`storage_locations.index.edit_modal.description_label`) }}
+              </label>
+              <div class="sci-input-container-v2 h-32">
+                <textarea
+                  ref="description"
+                  v-model="object.description"
+                  :placeholder="i18n.t(`storage_locations.index.edit_modal.description_placeholder`)"
+                ></textarea>
+              </div>
+              <span v-if="this.errors.description" class="text-sn-coral text-xs">{{ this.errors.description }}</span>
+            </div>
+          </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" :disabled="!validObject" type="submit">
+              {{ mode == 'create' ? i18n.t('general.create') : i18n.t('general.save') }}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script>
+/* global HelperModule SmartAnnotation ActiveStorage GLOBAL_CONSTANTS */
+
+import axios from '../../../packs/custom_axios.js';
+import modalMixin from '../../shared/modal_mixin';
+import DragAndDropUpload from '../../shared/drag_and_drop_upload.vue';
+
+export default {
+  name: 'EditLocationModal',
+  props: {
+    createUrl: String,
+    editModalMode: String,
+    directUploadUrl: String,
+    editStorageLocation: Object
+  },
+  components: {
+    DragAndDropUpload
+  },
+  mixins: [modalMixin],
+  data() {
+    return {
+      object: {
+        metadata: {
+          dimensions: [9, 9],
+          display_type: 'grid'
+        }
+      },
+      attachedImage: null,
+      imageError: false,
+      savingLocaiton: false,
+      errors: {}
+    };
+  },
+  computed: {
+    mode() {
+      return this.editStorageLocation ? 'edit' : 'create';
+    },
+    canChangeGrid() {
+      return !this.object.code || this.object.is_empty;
+    },
+    warningBoxNotEmpty() {
+      if (this.canChangeGrid) {
+        return '';
+      }
+      return this.i18n.t('storage_locations.index.edit_modal.warning_box_not_empty');
+    },
+    validObject() {
+      this.errors = {};
+
+      if (!this.object.name) {
+        return false;
+      }
+
+      if (this.object.name.length > GLOBAL_CONSTANTS.NAME_MAX_LENGTH) {
+        this.errors.name = this.i18n.t('storage_locations.index.edit_modal.errors.max_length', { max_length: GLOBAL_CONSTANTS.NAME_MAX_LENGTH });
+        return false;
+      }
+
+      if (this.object.description && this.object.description.length > GLOBAL_CONSTANTS.TEXT_MAX_LENGTH) {
+        this.errors.description = this.i18n.t('storage_locations.index.edit_modal.errors.max_length', { max_length: GLOBAL_CONSTANTS.TEXT_MAX_LENGTH });
+        return false;
+      }
+
+      return true;
+    }
+  },
+  created() {
+    if (this.editStorageLocation) {
+      this.object = this.editStorageLocation;
+    }
+  },
+  mounted() {
+    SmartAnnotation.init($(this.$refs.description), false);
+    $(this.$refs.modal).on('hidden.bs.modal', this.handleAtWhoModalClose);
+
+    this.object.container = this.editModalMode === 'container';
+  },
+  methods: {
+    submit() {
+      if (this.attachedImage) {
+        this.uploadImage();
+      } else {
+        this.saveLocation();
+      }
+    },
+    saveLocation() {
+      // Smart annotation fix
+      this.object.description = $(this.$refs.description).val();
+
+      if (this.savingLocaiton) {
+        return;
+      }
+
+      this.savingLocaiton = true;
+
+      const params = {
+        name: this.object.name,
+        description: this.object.description,
+        signed_blob_id: this.object.signed_blob_id,
+        container: this.object.container,
+        file_name: this.object.file_name || this.attachedImage?.name
+      };
+
+      if (this.object.container) {
+        params.metadata = this.object.metadata;
+
+        if (params.metadata.display_type === 'no_grid') {
+          delete params.metadata.dimensions;
+        }
+      }
+
+      if (this.object.code) {
+        axios.put(this.object.urls.update, params)
+          .then(() => {
+            this.$emit('tableReloaded');
+            HelperModule.flashAlertMsg(this.i18n.t(`storage_locations.index.edit_modal.success_message.edit_${this.editModalMode}`, { name: this.object.name }), 'success');
+            this.savingLocaiton = false;
+            this.close();
+          }).catch((error) => {
+            HelperModule.flashAlertMsg(error.response.data.error, 'danger');
+            this.savingLocaiton = false;
+          });
+      } else {
+        axios.post(this.createUrl, params)
+          .then(() => {
+            this.$emit('tableReloaded');
+            HelperModule.flashAlertMsg(this.i18n.t(`storage_locations.index.edit_modal.success_message.create_${this.editModalMode}`, { name: this.object.name }), 'success');
+            this.savingLocaiton = false;
+            this.close();
+          }).catch((error) => {
+            HelperModule.flashAlertMsg(error.response.data.error, 'danger');
+            this.savingLocaiton = false;
+          });
+      }
+    },
+    handleError() {
+    },
+    addFile(file) {
+      this.attachedImage = file;
+    },
+    removeImage() {
+      this.attachedImage = null;
+      this.object.file_name = null;
+    },
+    uploadImage() {
+      const upload = new ActiveStorage.DirectUpload(this.attachedImage, this.directUploadUrl);
+
+      upload.create((error, blob) => {
+        if (error) {
+          // Handle the error
+        } else {
+          this.object.signed_blob_id = blob.signed_id;
+          this.saveLocation();
+        }
+      });
+    },
+    handleAtWhoModalClose() {
+      $('.atwho-view.old').css('display', 'none');
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/renderers/description.vue b/app/javascript/vue/storage_locations/renderers/description.vue
new file mode 100644
index 000000000..49c9b7996
--- /dev/null
+++ b/app/javascript/vue/storage_locations/renderers/description.vue
@@ -0,0 +1,34 @@
+<template>
+  <div v-if="params.data.sa_description" class="group relative flex items-center group-hover:marker text-xs h-full w-full leading-[unset]">
+    <div class="flex gap-2 w-full items-center text-sm leading-[unset]">
+      <span class="cursor-pointer line-clamp-1 leading-[unset]"
+            @click.stop="showDescriptionModal"
+            v-html="params.data.sa_description">
+      </span>
+      <span @click.stop="showDescriptionModal" class="text-sn-blue cursor-pointer shrink-0 inline-block text-sm">
+        {{ i18n.t('experiments.card.more') }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DescriptionRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  },
+  computed: {
+    shouldTruncateText() {
+      return this.params.data.description?.length > 60;
+    }
+  },
+  methods: {
+    showDescriptionModal() {
+      this.params.dtComponent.$emit('showDescription', null, [this.params.data]);
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/renderers/item_name_renderer.vue b/app/javascript/vue/storage_locations/renderers/item_name_renderer.vue
new file mode 100644
index 000000000..b14040ffb
--- /dev/null
+++ b/app/javascript/vue/storage_locations/renderers/item_name_renderer.vue
@@ -0,0 +1,26 @@
+<template>
+  <span>
+    <span v-if="params.data.hidden" class="text-sn-grey-700">
+      <i class="sn-icon sn-icon-locked-task"></i>
+      {{ i18n.t('storage_locations.show.hidden') }}
+    </span>
+    <a
+      :href="params.data.row_url"
+      class="record-info-link"
+      :title="params.data.row_name"
+    >
+      {{ params.data.row_name }}
+    </a>
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'ItemNameRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/renderers/reminders.vue b/app/javascript/vue/storage_locations/renderers/reminders.vue
new file mode 100644
index 000000000..d0099d60b
--- /dev/null
+++ b/app/javascript/vue/storage_locations/renderers/reminders.vue
@@ -0,0 +1,42 @@
+<template>
+  <div v-if="params.data.has_reminder">
+    <GeneralDropdown ref="dropdown" position="right" @open="getReminders">
+      <template v-slot:field>
+        <i class="sn-icon sn-icon-notifications "></i>
+      </template>
+      <template v-slot:flyout>
+        <ul v-if="reminders" v-html="reminders.html" class="list-none p-0 reminders-view-mode"></ul>
+      </template>
+    </GeneralDropdown>
+  </div>
+</template>
+
+<script>
+import axios from '../../../packs/custom_axios.js';
+import GeneralDropdown from '../../shared/general_dropdown.vue';
+
+export default {
+  name: 'RemindersRenderer',
+  props: {
+    params: {
+      required: true
+    }
+  },
+  data() {
+    return {
+      reminders: null
+    };
+  },
+  components: {
+    GeneralDropdown
+  },
+  methods: {
+    getReminders() {
+      axios.get(this.params.data.reminders_url)
+        .then((response) => {
+          this.reminders = response.data;
+        });
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/renderers/storage_name_renderer.vue b/app/javascript/vue/storage_locations/renderers/storage_name_renderer.vue
new file mode 100644
index 000000000..608df3a8b
--- /dev/null
+++ b/app/javascript/vue/storage_locations/renderers/storage_name_renderer.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="flex gap-4">
+    <a @mouseenter="openPreview" @mouseleave="hidePreview" class="hover:no-underline cursor-pointer flex items-center gap-1"
+       :title="params.data.name"
+       :href="params.data.urls.show">
+      <i v-if="params.data.shared || params.data.ishared" class="fas fa-users"></i>
+      <i v-if="params.data.container" class="sn-icon sn-icon-item"></i>
+      <span class="truncate">{{ params.data.name }}</span>
+    </a>
+    <GeneralDropdown v-if="params.data.img_url" ref="imagePreview" >
+      <template v-slot:flyout>
+        <img class="w-48 h-48 object-cover" :src="params.data.img_url" @mouseenter="openPreview" @mouseleave="hidePreview">
+      </template>
+    </GeneralDropdown>
+  </div>
+</template>
+
+<script>
+import GeneralDropdown from '../../shared/general_dropdown.vue';
+
+export default {
+  name: 'StorageNameRenderer',
+  components: {
+    GeneralDropdown
+  },
+  props: {
+    params: {
+      type: Object,
+      required: true
+    }
+  },
+  methods: {
+    openPreview() {
+      if (this.$refs.imagePreview) {
+        this.$refs.imagePreview.isOpen = true;
+      }
+    },
+    hidePreview() {
+      if (this.$refs.imagePreview) {
+        this.$refs.imagePreview.isOpen = false;
+      }
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/storage_locations/table.vue b/app/javascript/vue/storage_locations/table.vue
new file mode 100644
index 000000000..e13803ff0
--- /dev/null
+++ b/app/javascript/vue/storage_locations/table.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="h-full">
+    <DataTable :columnDefs="columnDefs"
+               tableId="StorageLocationsTable"
+               :dataUrl="dataSource"
+               :reloadingTable="reloadingTable"
+               :toolbarActions="toolbarActions"
+               :actionsUrl="actionsUrl"
+               :filters="filters"
+               @create_location="openCreateLocationModal"
+               @create_container="openCreateContainerModal"
+               @edit="edit"
+               @duplicate="duplicate"
+               @tableReloaded="reloadingTable = false"
+               @move="move"
+               @showDescription="showDescription"
+               @delete="deleteStorageLocation"
+               @share="share"
+    />
+    <Teleport to="body">
+      <EditModal v-if="openEditModal"
+                 @close="openEditModal = false"
+                 @tableReloaded="reloadingTable = true"
+                 :createUrl="createUrl"
+                 :editModalMode="editModalMode"
+                 :directUploadUrl="directUploadUrl"
+                 :editStorageLocation="editStorageLocation"
+      />
+      <DescriptionModal
+        v-if="descriptionModalObject"
+        :experiment="descriptionModalObject"
+        @close="descriptionModalObject = null"/>
+      <MoveModal v-if="objectToMove" :moveToUrl="moveToUrl"
+             :selectedObject="objectToMove"
+             @close="objectToMove = null" @move="updateTable()" />
+      <ConfirmationModal
+        :title="storageLocationDeleteTitle"
+        :description="storageLocationDeleteDescription"
+        confirmClass="btn btn-danger"
+        :confirmText="i18n.t('general.delete')"
+        ref="deleteStorageLocationModal"
+      ></ConfirmationModal>
+      <ShareObjectModal
+        v-if="shareStorageLocation"
+        :object="shareStorageLocation"
+        @close="shareStorageLocation = null"
+        @share="updateTable" />
+    </Teleport>
+  </div>
+</template>
+
+<script>
+/* global HelperModule */
+
+import axios from '../../packs/custom_axios.js';
+import DataTable from '../shared/datatable/table.vue';
+import EditModal from './modals/new_edit.vue';
+import MoveModal from './modals/move.vue';
+import ConfirmationModal from '../shared/confirmation_modal.vue';
+import DescriptionModal from './modals/description.vue';
+import ShareObjectModal from '../shared/share_modal.vue';
+import DescriptionRenderer from './renderers/description.vue';
+import NameRenderer from './renderers/storage_name_renderer.vue';
+
+export default {
+  name: 'RepositoriesTable',
+  components: {
+    DataTable,
+    EditModal,
+    MoveModal,
+    ConfirmationModal,
+    ShareObjectModal,
+    DescriptionRenderer,
+    NameRenderer,
+    DescriptionModal
+  },
+  props: {
+    dataSource: {
+      type: String,
+      required: true
+    },
+    actionsUrl: {
+      type: String,
+      required: true
+    },
+    createLocationUrl: {
+      type: String
+    },
+    createLocationInstanceUrl: {
+      type: String
+    },
+    directUploadUrl: {
+      type: String
+    },
+    canCreateLocation: Boolean,
+    canCreateContainer: Boolean,
+    canManageParent: Boolean,
+    hasParent: Boolean
+  },
+  data() {
+    return {
+      reloadingTable: false,
+      openEditModal: false,
+      editModalMode: null,
+      editStorageLocation: null,
+      objectToMove: null,
+      moveToUrl: null,
+      shareStorageLocation: null,
+      storageLocationDeleteTitle: '',
+      storageLocationDeleteDescription: '',
+      descriptionModalObject: null
+    };
+  },
+  computed: {
+    columnDefs() {
+      const columns = [{
+        field: 'name_hash',
+        headerName: this.i18n.t('storage_locations.index.table.name'),
+        sortable: true,
+        notSelectable: true,
+        cellRenderer: 'NameRenderer'
+      },
+      {
+        field: 'code',
+        headerName: this.i18n.t('storage_locations.index.table.id'),
+        sortable: true
+      },
+      {
+        field: 'sub_location_count',
+        headerName: this.i18n.t('storage_locations.index.table.sub_locations'),
+        sortable: true,
+        cellRenderer: (params) => params.data.sub_location_count
+      },
+      {
+        field: 'shared_label',
+        headerName: this.i18n.t('storage_locations.index.table.shared'),
+        sortable: true
+      },
+      {
+        field: 'owned_by',
+        headerName: this.i18n.t('storage_locations.index.table.owned_by'),
+        sortable: true
+      },
+      {
+        field: 'created_on',
+        headerName: this.i18n.t('storage_locations.index.table.created_on'),
+        sortable: true
+      },
+      {
+        field: 'created_by',
+        headerName: this.i18n.t('storage_locations.index.table.created_by'),
+        sortable: true
+      },
+      {
+        field: 'sa_description',
+        headerName: this.i18n.t('storage_locations.index.table.description'),
+        sortable: false,
+        cellStyle: { 'white-space': 'normal' },
+        cellRenderer: DescriptionRenderer,
+        autoHeight: true,
+        minWidth: 110
+      }];
+
+      return columns;
+    },
+    toolbarActions() {
+      const left = [];
+      if (this.canCreateLocation && (this.canManageParent || !this.hasParent)) {
+        left.push({
+          name: 'create_location',
+          icon: 'sn-icon sn-icon-new-task',
+          label: this.i18n.t('storage_locations.index.new_location'),
+          type: 'emit',
+          path: this.createLocationUrl,
+          buttonStyle: 'btn btn-primary'
+        });
+      }
+
+      if (this.canCreateContainer && (this.canManageParent || !this.hasParent)) {
+        left.push({
+          name: 'create_container',
+          icon: 'sn-icon sn-icon-item',
+          label: this.i18n.t('storage_locations.index.new_container'),
+          type: 'emit',
+          path: this.createLocationInstanceUrl,
+          buttonStyle: 'btn btn-secondary'
+        });
+      }
+      return {
+        left,
+        right: []
+      };
+    },
+    filters() {
+      const filters = [
+        {
+          key: 'query',
+          type: 'Text'
+        },
+        {
+          key: 'search_tree',
+          type: 'Checkbox',
+          label: this.i18n.t('storage_locations.index.filters_modal.search_tree')
+        }
+      ];
+
+      return filters;
+    },
+    createUrl() {
+      return this.editModalMode === 'location' ? this.createLocationUrl : this.createLocationInstanceUrl;
+    }
+  },
+  methods: {
+    openCreateLocationModal() {
+      this.openEditModal = true;
+      this.editModalMode = 'location';
+      this.editStorageLocation = null;
+    },
+    openCreateContainerModal() {
+      this.openEditModal = true;
+      this.editModalMode = 'container';
+      this.editStorageLocation = null;
+    },
+    edit(action, params) {
+      this.openEditModal = true;
+      this.editModalMode = params[0].container ? 'container' : 'location';
+      [this.editStorageLocation] = params;
+    },
+    duplicate(action) {
+      axios.post(action.path)
+        .then(() => {
+          this.reloadingTable = true;
+          HelperModule.flashAlertMsg(this.i18n.t('storage_locations.index.duplicate.success_message'), 'success');
+        })
+        .catch(() => {
+          HelperModule.flashAlertMsg(this.i18n.t('errors.general'), 'danger');
+        });
+    },
+    updateTable() {
+      this.reloadingTable = true;
+      this.objectToMove = null;
+      this.shareStorageLocation = null;
+    },
+    move(event, rows) {
+      [this.objectToMove] = rows;
+      this.moveToUrl = event.path;
+    },
+    async deleteStorageLocation(event, rows) {
+      const storageLocationType = rows[0].container ? this.i18n.t('storage_locations.container') : this.i18n.t('storage_locations.location');
+      const description = `
+        <p>${this.i18n.t('storage_locations.index.delete_modal.description_1_html',
+    { name: rows[0].name, type: storageLocationType, num_of_items: event.number_of_items })}</p>
+        <p>${this.i18n.t('storage_locations.index.delete_modal.description_2_html')}</p>`;
+
+      this.storageLocationDeleteDescription = description;
+      this.storageLocationDeleteTitle = this.i18n.t('storage_locations.index.delete_modal.title', { type: storageLocationType });
+      const ok = await this.$refs.deleteStorageLocationModal.show();
+      if (ok) {
+        axios.delete(event.path).then((_) => {
+          this.reloadingTable = true;
+          HelperModule.flashAlertMsg(this.i18n.t('storage_locations.index.delete_modal.success_message',
+            {
+              type: storageLocationType[0].toUpperCase() + storageLocationType.slice(1),
+              name: rows[0].name
+            }), 'success');
+        }).catch((error) => {
+          HelperModule.flashAlertMsg(error.response.data.error, 'danger');
+        });
+      }
+    },
+    showDescription(_e, storageLocation) {
+      [this.descriptionModalObject] = storageLocation;
+    },
+    share(_event, rows) {
+      const [storageLocation] = rows;
+      this.shareStorageLocation = storageLocation;
+    }
+  }
+};
+
+</script>
diff --git a/app/javascript/vue/user_preferences/container.vue b/app/javascript/vue/user_preferences/container.vue
index f960b49b9..de10f81bd 100644
--- a/app/javascript/vue/user_preferences/container.vue
+++ b/app/javascript/vue/user_preferences/container.vue
@@ -41,16 +41,14 @@
       </div>
       <table v-if="notificationsSettings">
         <template v-for="(_subGroups, group) in notificationsGroups" :key="group">
-          <div class="contents">
-            <tr>
-              <td colspan=3 class="pt-6"><h3>{{ i18n.t(`notifications.groups.${group}`) }}</h3></td>
-            </tr>
-            <tr>
-              <td></td>
-              <td class="p-2.5 text-base w-32">{{ i18n.t('notifications.in_app') }}</td>
-              <td class="p-2.5 text-base w-32">{{ i18n.t('notifications.email') }}</td>
-            </tr>
-          </div>
+          <tr>
+            <td colspan=3 class="pt-6"><h3>{{ i18n.t(`notifications.groups.${group}`) }}</h3></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td class="p-2.5 text-base w-32">{{ i18n.t('notifications.in_app') }}</td>
+            <td class="p-2.5 text-base w-32">{{ i18n.t('notifications.email') }}</td>
+          </tr>
           <template v-for="(_notifications, subGroup, i) in notificationsGroups[group]" :key="subGroup">
             <tr v-if="subGroup !== 'always_on'"
                 class="text-base border-transparent border-b-sn-super-light-grey border-solid"
diff --git a/app/jobs/active_storage/preview_job.rb b/app/jobs/active_storage/preview_job.rb
index 2d1941ca6..d0843993b 100644
--- a/app/jobs/active_storage/preview_job.rb
+++ b/app/jobs/active_storage/preview_job.rb
@@ -2,6 +2,8 @@
 
 # Provides asynchronous generation of image previews for ActiveStorage::Blob records.
 class ActiveStorage::PreviewJob < ActiveStorage::BaseJob
+  include ActiveStorageHelper
+
   queue_as :assets
 
   discard_on StandardError do |job, error|
@@ -18,11 +20,11 @@ class ActiveStorage::PreviewJob < ActiveStorage::BaseJob
 
   def perform(blob_id)
     blob = ActiveStorage::Blob.find(blob_id)
-    preview = blob.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT).processed
+    preview = blob.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT, format: image_preview_format(blob)).processed
     Rails.logger.info "Preview for the Blod with id: #{blob.id} - successfully generated.\n" \
                       "Transformations applied: #{preview.variation.transformations}"
 
-    preview = blob.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT).processed
+    preview = blob.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT, format: image_preview_format(blob)).processed
     Rails.logger.info "Preview for the Blod with id: #{blob.id} - successfully generated.\n" \
                       "Transformations applied: #{preview.variation.transformations}"
 
diff --git a/app/jobs/cleanup_user_settings_job.rb b/app/jobs/cleanup_user_settings_job.rb
index f8bf283fa..b1554c283 100644
--- a/app/jobs/cleanup_user_settings_job.rb
+++ b/app/jobs/cleanup_user_settings_job.rb
@@ -4,7 +4,9 @@ class CleanupUserSettingsJob < ApplicationJob
   queue_as :default
 
   def perform(record_type, record_id)
-    raise ArgumentError, 'Invalid record_type' unless %w(task_step_states results_order).include?(record_type)
+    unless %w(task_step_states results_order result_states).include?(record_type)
+      raise ArgumentError, 'Invalid record_type'
+    end
 
     sanitized_record_id = record_id.to_i.to_s
     raise ArgumentError, 'Invalid record_id' unless sanitized_record_id == record_id.to_s
diff --git a/app/jobs/protocols/docx_import_job.rb b/app/jobs/protocols/docx_import_job.rb
index 49a34bbc5..dccd1a0dd 100644
--- a/app/jobs/protocols/docx_import_job.rb
+++ b/app/jobs/protocols/docx_import_job.rb
@@ -117,7 +117,7 @@ module Protocols
     def create_step_asset_element!(step, step_element_json)
       asset = @team.assets.new(created_by: @user, last_modified_by: @user)
       # Decode the file bytes
-      asset.file.attach(io: StringIO.new(Base64.decode64(step_element_json['contents'])), filename: 'file.blob')
+      asset.attach_file_version(io: StringIO.new(Base64.decode64(step_element_json['contents'])), filename: 'file.blob')
       asset.save!
       step.step_assets.create!(asset: asset)
       asset.post_process_file
diff --git a/app/jobs/repositories_export_job.rb b/app/jobs/repositories_export_job.rb
index ee53aa1c3..154c2c498 100644
--- a/app/jobs/repositories_export_job.rb
+++ b/app/jobs/repositories_export_job.rb
@@ -69,7 +69,7 @@ class RepositoriesExportJob < ApplicationJob
 
     # Generate CSV / XLSX
     service = RepositoryExportService
-              .new(@file_type, repository.repository_rows, col_ids, @user, repository, handle_name_func)
+              .new(@file_type, repository.repository_rows, col_ids, repository, handle_name_func)
     exported_data = service.export!
 
     File.binwrite(repository_items_file_name, exported_data)
diff --git a/app/jobs/repository_zip_export_job.rb b/app/jobs/repository_zip_export_job.rb
index f74dd9093..7d71262ff 100644
--- a/app/jobs/repository_zip_export_job.rb
+++ b/app/jobs/repository_zip_export_job.rb
@@ -22,20 +22,14 @@ class RepositoryZipExportJob < ZipExportJob
                      'my_module_repository_rows.stock_consumption'
                    )
       end
+      service = RepositoryExportService.new(@file_type, rows, params[:header_ids].map(&:to_i),
+                                            repository, in_module: true)
     else
-      ordered_row_ids = params[:row_ids]
-      id_row_map = RepositoryRow.where(id: ordered_row_ids,
-                                       repository: repository)
-                                .index_by(&:id)
-      rows = ordered_row_ids.collect { |id| id_row_map[id.to_i] }
+      ordered_row_ids = params[:row_ids].map(&:to_i)
+      rows = repository.repository_rows.where(id: ordered_row_ids)
+      service = RepositoryExportService.new(@file_type, rows, params[:header_ids].map(&:to_i),
+                                            repository, in_module: false, ordered_row_ids: ordered_row_ids)
     end
-    service = RepositoryExportService
-              .new(@file_type,
-                   rows,
-                   params[:header_ids].map(&:to_i),
-                   @user,
-                   repository,
-                   in_module: params[:my_module_id].present?)
     exported_data = service.export!
     File.binwrite("#{dir}/export.#{@file_type}", exported_data)
   end
diff --git a/app/jobs/team_zip_export_job.rb b/app/jobs/team_zip_export_job.rb
index 257158ceb..4a153e154 100644
--- a/app/jobs/team_zip_export_job.rb
+++ b/app/jobs/team_zip_export_job.rb
@@ -39,7 +39,7 @@ class TeamZipExportJob < ZipExportJob
       inventories = "#{project_path}/Inventories"
       FileUtils.mkdir_p(inventories)
 
-      repositories = project.assigned_repositories_and_snapshots
+      repositories = project.assigned_readable_repositories_and_snapshots(@user)
 
       # Iterate through every inventory repo and save it to CSV
       repositories.each_with_index do |repo, repo_idx|
@@ -52,13 +52,13 @@ class TeamZipExportJob < ZipExportJob
 
       # Include all experiments
       ex_idx = ex_archive_idx = 0
-      project.experiments.find_each do |experiment|
+      project.experiments.readable_by_user(@user).find_each do |experiment|
         idx = experiment.archived ? (ex_archive_idx += 1) : (ex_idx += 1)
         experiment_path = make_model_dir(project_path, experiment, idx)
 
         # Include all modules
         mod_pos = mod_archive_pos = 0
-        experiment.my_modules.order(:workflow_order).find_each do |my_module|
+        experiment.my_modules.readable_by_user(@user).order(:workflow_order).find_each do |my_module|
           pos = my_module.archived ? (mod_archive_pos += 1) : (mod_pos += 1)
           my_module_path = make_model_dir(experiment_path, my_module, pos)
 
@@ -276,7 +276,7 @@ class TeamZipExportJob < ZipExportJob
     end
 
     # Generate CSV
-    csv_data = RepositoryCsvExport.to_csv(repo.repository_rows, col_ids, @user, repo, handle_name_func, false)
+    csv_data = RepositoryCsvExport.to_csv(repo.repository_rows, col_ids, repo, handle_name_func, false)
     File.binwrite(csv_file_path, csv_data.encode('UTF-8', invalid: :replace, undef: :replace))
 
     # Save all attachments (it doesn't work directly in callback function
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 35aaabd23..13ad8b80a 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -187,6 +187,9 @@ class Activity < ApplicationRecord
     when Asset
       breadcrumbs[:asset] = subject.blob.filename.to_s
       generate_breadcrumb(subject.result || subject.step || subject.repository_cell.repository_row.repository)
+    when StorageLocation
+      breadcrumbs[:storage_location] = subject.name
+      generate_breadcrumb(subject.team)
     end
   end
 
diff --git a/app/models/asset.rb b/app/models/asset.rb
index a1c55770e..5a9085cda 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -7,6 +7,8 @@ class Asset < ApplicationRecord
   include WopiUtil
   include ActiveStorageFileUtil
   include ActiveStorageConcerns
+  include ActiveStorageHelper
+  include VersionedAttachments
 
   require 'tempfile'
   # Lock duration set to 30 minutes
@@ -16,7 +18,7 @@ class Asset < ApplicationRecord
   enum view_mode: { thumbnail: 0, list: 1, inline: 2 }
 
   # ActiveStorage configuration
-  has_one_attached :file
+  has_one_versioned_attached :file
   has_one_attached :file_pdf_preview
   has_one_attached :preview_image
 
@@ -74,7 +76,10 @@ class Asset < ApplicationRecord
                              .pluck(:id)
 
     assets_in_inventories = Asset.joins(repository_cell: { repository_column: :repository })
-                                 .where(repositories: { team: teams })
+                                 .where(repositories: {
+                                          id: Repository.with_granted_permissions(user, RepositoryPermissions::READ).select(:id),
+                                          team_id: teams
+                                        })
                                  .where.not(repositories: { type: 'RepositorySnapshot' })
                                  .pluck(:id)
 
@@ -102,11 +107,11 @@ class Asset < ApplicationRecord
   end
 
   def medium_preview
-    preview_attachment.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT)
+    preview_attachment.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT, format: image_preview_format(blob))
   end
 
   def large_preview
-    preview_attachment.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT)
+    preview_attachment.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT, format: image_preview_format(blob))
   end
 
   def file_name
@@ -162,7 +167,7 @@ class Asset < ApplicationRecord
         filename: blob.filename,
         metadata: blob.metadata
       )
-      to_asset.file.attach(to_blob)
+      to_asset.attach_file_version(to_blob)
     end
 
     if preview_image.attached?
@@ -337,7 +342,7 @@ class Asset < ApplicationRecord
   end
 
   def update_contents(new_file)
-    file.attach(io: new_file, filename: file_name)
+    attach_file_version(io: new_file, filename: file_name)
     self.version = version.nil? ? 1 : version + 1
     save
   end
diff --git a/app/models/concerns/assignable.rb b/app/models/concerns/assignable.rb
index afcea0ae8..d09db4d95 100644
--- a/app/models/concerns/assignable.rb
+++ b/app/models/concerns/assignable.rb
@@ -15,21 +15,33 @@ module Assignable
              inverse_of: :assignable
 
     scope :readable_by_user, lambda { |user|
-      joins(user_assignments: :user_role)
-        .where(user_assignments: { user: user })
-        .where('? = ANY(user_roles.permissions)', "::#{self.class.to_s.split('::').first}Permissions".constantize::READ)
+      joins("INNER JOIN user_assignments reading_user_assignments " \
+            "ON reading_user_assignments.assignable_type = '#{base_class.name}' " \
+            "AND reading_user_assignments.assignable_id = #{table_name}.id " \
+            "INNER JOIN user_roles reading_user_roles " \
+            "ON reading_user_assignments.user_role_id = reading_user_roles.id")
+        .where(reading_user_assignments: { user_id: user.id })
+        .where('? = ANY(reading_user_roles.permissions)', "::#{self.class.to_s.split('::').first}Permissions".constantize::READ)
     }
 
     scope :managable_by_user, lambda { |user|
-      joins(user_assignments: :user_role)
-        .where(user_assignments: { user: user })
-        .where('? = ANY(user_roles.permissions)', "::#{self.class.to_s.split('::').first}Permissions".constantize::MANAGE)
+      joins("INNER JOIN user_assignments managing_user_assignments " \
+            "ON managing_user_assignments.assignable_type = '#{base_class.name}' " \
+            "AND managing_user_assignments.assignable_id = #{table_name}.id " \
+            "INNER JOIN user_roles managing_user_roles " \
+            "ON managing_user_assignments.user_role_id = managing_user_roles.id")
+        .where(managing_user_assignments: { user_id: user.id })
+        .where('? = ANY(managing_user_roles.permissions)', "::#{self.class.to_s.split('::').first}Permissions".constantize::MANAGE)
     }
 
     scope :with_user_permission, lambda { |user, permission|
-      joins(user_assignments: :user_role)
-        .where(user_assignments: { user: user })
-        .where('? = ANY(user_roles.permissions)', permission)
+      joins("INNER JOIN user_assignments permission_checking_user_assignments " \
+            "ON permission_checking_user_assignments.assignable_type = '#{base_class.name}' " \
+            "AND permission_checking_user_assignments.assignable_id = #{table_name}.id " \
+            "INNER JOIN user_roles permission_checking_user_roles " \
+            "ON permission_checking_user_assignments.user_role_id = permission_checking_user_roles.id")
+        .where(permission_checking_user_assignments: { user_id: user.id })
+        .where('? = ANY(permission_checking_user_roles.permissions)', permission)
     }
 
     after_create :create_users_assignments
diff --git a/app/models/concerns/cloneable.rb b/app/models/concerns/cloneable.rb
index 7c397f9a5..1821e5f54 100644
--- a/app/models/concerns/cloneable.rb
+++ b/app/models/concerns/cloneable.rb
@@ -7,12 +7,18 @@ module Cloneable
     raise NotImplementedError, "Cloneable model must implement the '.parent' method!" unless respond_to?(:parent)
 
     clone_label = I18n.t('general.clone_label')
-    last_clone_number =
-      parent.public_send(self.class.table_name)
-            .select("substring(#{self.class.table_name}.name, '(?:^#{clone_label} )(\\d+)')::int AS clone_number")
-            .where('name ~ ?', "^#{clone_label} \\d+ - #{Regexp.escape(name)}$")
-            .order(clone_number: :asc)
-            .last&.clone_number
+
+    records = if parent
+                parent.public_send(self.class.table_name)
+              else
+                self.class.where(parent_id: nil, team: team)
+              end
+
+    last_clone_number = records
+                        .select("substring(#{self.class.table_name}.name, '(?:^#{clone_label} )(\\d+)')::int AS clone_number")
+                        .where('name ~ ?', "^#{clone_label} \\d+ - #{Regexp.escape(name)}$")
+                        .order(clone_number: :asc)
+                        .last&.clone_number
 
     "#{clone_label} #{(last_clone_number || 0) + 1} - #{name}".truncate(Constants::NAME_MAX_LENGTH)
   end
diff --git a/app/models/concerns/reminder_repository_cell_joinable.rb b/app/models/concerns/reminder_repository_cell_joinable.rb
deleted file mode 100644
index 6f874929a..000000000
--- a/app/models/concerns/reminder_repository_cell_joinable.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module ReminderRepositoryCellJoinable
-  extend ActiveSupport::Concern
-
-  included do
-    def self.reminder_repository_cells_scope(relation, user)
-      relation.joins(
-        'INNER JOIN repository_columns repository_reminder_columns ON ' \
-        'repository_reminder_columns.id = repository_cells.repository_column_id'
-      ).joins( # datetime reminders
-        'LEFT OUTER JOIN "repository_date_time_values" ON '\
-        '"repository_date_time_values"."id" = "repository_cells"."value_id" AND '\
-        '"repository_cells"."value_type" = \'RepositoryDateTimeValueBase\' '\
-        'AND repository_reminder_columns.metadata ->> \'reminder_value\' <> \'\' AND '\
-        '(repository_date_time_values.data - NOW()) <= '\
-        '(repository_reminder_columns.metadata ->> \'reminder_value\')::int * ' \
-        '(repository_reminder_columns.metadata ->> \'reminder_unit\')::int * interval \'1 sec\''
-      ).joins( # stock reminders
-        'LEFT OUTER JOIN "repository_stock_values" ON '\
-        '"repository_cells"."value_type" = \'RepositoryStockValue\' AND '\
-        '"repository_stock_values"."id" = "repository_cells"."value_id" AND '\
-        '(repository_stock_values.amount <= repository_stock_values.low_stock_threshold OR '\
-        ' repository_stock_values.amount <= 0)'
-      ).joins(
-        'LEFT OUTER JOIN "hidden_repository_cell_reminders" ON '\
-        '"repository_cells"."id" = "hidden_repository_cell_reminders"."repository_cell_id" AND '\
-        '"hidden_repository_cell_reminders"."user_id" = ' + user.id.to_s
-      ).where(
-        'hidden_repository_cell_reminders.id IS NULL AND '\
-        '(repository_date_time_values.id IS NOT NULL OR repository_stock_values.id IS NOT NULL)'
-      )
-    end
-
-    def self.stock_reminder_repository_cells_scope(relation, user)
-      relation.joins( # stock reminders
-        'LEFT OUTER JOIN "repository_stock_values" ON ' \
-        '"repository_cells"."value_type" = \'RepositoryStockValue\' AND ' \
-        '"repository_stock_values"."id" = "repository_cells"."value_id" AND ' \
-        '(repository_stock_values.amount <= repository_stock_values.low_stock_threshold OR ' \
-        'repository_stock_values.amount <= 0)'
-      ).joins(
-        'LEFT OUTER JOIN "hidden_repository_cell_reminders" ON ' \
-        '"repository_cells"."id" = "hidden_repository_cell_reminders"."repository_cell_id" AND ' \
-        '"hidden_repository_cell_reminders"."user_id" = ' + user.id.to_s
-      ).where(
-        'hidden_repository_cell_reminders.id IS NULL AND repository_stock_values.id IS NOT NULL'
-      )
-    end
-
-    def self.date_time_reminder_repository_cells_scope(relation, user)
-      relation.joins( # datetime reminders
-        'LEFT OUTER JOIN "repository_date_time_values" ON ' \
-        '"repository_date_time_values"."id" = "repository_cells"."value_id" AND ' \
-        '"repository_cells"."value_type" = \'RepositoryDateTimeValueBase\' ' \
-        'AND repository_columns.metadata ->> \'reminder_value\' <> \'\' AND ' \
-        '(repository_date_time_values.data - NOW()) <= ' \
-        '(repository_columns.metadata ->> \'reminder_value\')::int * ' \
-        '(repository_columns.metadata ->> \'reminder_unit\')::int * interval \'1 sec\''
-      ).joins(
-        'LEFT OUTER JOIN "hidden_repository_cell_reminders" ON ' \
-        '"repository_cells"."id" = "hidden_repository_cell_reminders"."repository_cell_id" AND ' \
-        '"hidden_repository_cell_reminders"."user_id" = ' + user.id.to_s
-      ).where(
-        'hidden_repository_cell_reminders.id IS NULL AND repository_date_time_values.id IS NOT NULL'
-      )
-    end
-  end
-end
diff --git a/app/models/concerns/shareable.rb b/app/models/concerns/shareable.rb
new file mode 100644
index 000000000..197e2d173
--- /dev/null
+++ b/app/models/concerns/shareable.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Shareable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :team_shared_objects, as: :shared_object, dependent: :destroy
+    has_many :teams_shared_with, through: :team_shared_objects, source: :team, dependent: :destroy
+
+    if column_names.include? 'permission_level'
+      enum permission_level: Extends::SHARED_OBJECTS_PERMISSION_LEVELS
+      define_method :globally_shareable? do
+        true
+      end
+    else
+      # If model does not include the permission_level column for global sharing,
+      # all related methods should just return false
+      Extends::SHARED_OBJECTS_PERMISSION_LEVELS.each do |level|
+        define_method "#{level[0]}?" do
+          level[0] == :not_shared
+        end
+
+        define_method :globally_shareable? do
+          false
+        end
+      end
+    end
+
+    scope :viewable_by_user, lambda { |user, teams = user.current_team|
+      readable_ids = readable_by_user(user).where(team: teams).pluck(:id)
+      shared_with_team_ids = joins(:team_shared_objects, :team).where(team_shared_objects: { team: teams }).pluck(:id)
+      globally_shared_ids =
+        if column_names.include?('permission_level')
+          joins(:team).where(
+            {
+              permission_level: [
+                Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read],
+                Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]
+              ]
+            }
+          ).pluck(:id)
+        else
+          none.pluck(:id)
+        end
+
+      where(id: (readable_ids + shared_with_team_ids + globally_shared_ids).uniq)
+    }
+  rescue ActiveRecord::NoDatabaseError,
+         ActiveRecord::ConnectionNotEstablished,
+         ActiveRecord::StatementInvalid,
+         PG::ConnectionBad
+
+    Rails.logger.info('Not connected to database, skipping sharable model initialization.')
+  end
+
+  def shareable_write?
+    true
+  end
+
+  def private_shared_with?(team)
+    team_shared_objects.where(team: team).any?
+  end
+
+  def private_shared_with_write?(team)
+    team_shared_objects.where(team: team, permission_level: :shared_write).any?
+  end
+
+  def i_shared?(team)
+    shared_with_anybody? && self.team == team
+  end
+
+  def globally_shared?
+    shared_read? || shared_write?
+  end
+
+  def shared_with_anybody?
+    (!not_shared? || team_shared_objects.any?)
+  end
+
+  def shared_with?(team)
+    return false if self.team == team
+
+    !not_shared? || private_shared_with?(team)
+  end
+
+  def shared_with_write?(team)
+    return false if self.team == team
+
+    shared_write? || private_shared_with_write?(team)
+  end
+
+  def shared_with_read?(team)
+    return false if self.team == team
+
+    shared_read? || team_shared_objects.where(team: team, permission_level: :shared_read).any?
+  end
+end
diff --git a/app/models/concerns/tiny_mce_images.rb b/app/models/concerns/tiny_mce_images.rb
index 9ab9fa986..cc0bcaa88 100644
--- a/app/models/concerns/tiny_mce_images.rb
+++ b/app/models/concerns/tiny_mce_images.rb
@@ -29,18 +29,24 @@ module TinyMceImages
         )[0]
         next unless tm_asset_to_update
 
-        tm_asset = tm_asset.image.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT).processed
+        begin
+          variant = tm_asset.image.variant(resize_to_limit: Constants::LARGE_PIC_FORMAT)
+          resized_asset = ActiveStorage::Variant.new(variant.blob, variant.variation).processed
 
-        width_attr = tm_asset_to_update.attributes['width']
-        height_attr = tm_asset_to_update.attributes['height']
+          width_attr = tm_asset_to_update.attributes['width']
+          height_attr = tm_asset_to_update.attributes['height']
 
-        if width_attr && height_attr && (width_attr.value.to_i >= Constants::LARGE_PIC_FORMAT[0] ||
-                                        height_attr.value.to_i >= Constants::LARGE_PIC_FORMAT[1])
-          width_attr.value = tm_asset.image.blob.metadata['width'].to_s
-          height_attr.value = tm_asset.image.blob.metadata['height'].to_s
+          if width_attr && height_attr && (width_attr.value.to_i >= Constants::LARGE_PIC_FORMAT[0] ||
+                                          height_attr.value.to_i >= Constants::LARGE_PIC_FORMAT[1])
+            width_attr.value = resized_asset.image.blob.metadata['width'].to_s
+            height_attr.value = resized_asset.image.blob.metadata['height'].to_s
+          end
+
+          tm_asset_to_update.attributes['src'].value = convert_to_base64(resized_asset)
+        rescue StandardError => e
+          Rails.logger.error(e)
         end
 
-        tm_asset_to_update.attributes['src'].value = convert_to_base64(tm_asset.image)
         description = html_description.css('body').inner_html.to_s
       end
       description
diff --git a/app/models/concerns/versioned_attachments.rb b/app/models/concerns/versioned_attachments.rb
new file mode 100644
index 000000000..6adc4d809
--- /dev/null
+++ b/app/models/concerns/versioned_attachments.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module VersionedAttachments
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def has_one_versioned_attached(name)
+      has_one_attached name, dependent: :detach
+      has_many_attached "previous_#{name.to_s.pluralize}", dependent: :detach
+
+      define_method :"attach_#{name}_version" do |*args, **options|
+        ActiveRecord::Base.transaction(requires_new: true) do
+          __send__(:"previous_#{name.to_s.pluralize}").attach(__send__(name).blob) if __send__(name).attached?
+          __send__(name).attach(*args, **options)
+
+          new_blob = __send__(name).blob
+          new_blob.metadata['created_by_id'] = last_modified_by_id
+          new_blob.save!
+
+          # set version of current latest file if previous versions exist
+          next unless __send__(:"previous_#{name.to_s.pluralize}").any?
+
+          new_version =
+            (__send__(:"previous_#{name.to_s.pluralize}").last.blob.metadata['version'] || 1) + 1
+          new_blob.metadata['version'] = new_version
+          new_blob.save!
+        end
+      end
+
+      define_method :"restore_#{name}_version" do |version|
+        ActiveRecord::Base.transaction(requires_new: true) do
+          blob = __send__(:"previous_#{name.to_s.pluralize}").map(&:blob).find do |b|
+            (b.metadata['version'] || 1) == version
+          end
+
+          blob.open do |tmp_file|
+            new_blob = ActiveStorage::Blob.create_and_upload!(
+              io: tmp_file,
+              filename: blob.filename,
+              metadata: blob.metadata.merge({ 'restored_from_version' => version })
+            )
+
+            __send__(:"attach_#{name}_version", new_blob)
+          end
+        end
+      end
+    end
+  end
+
+  module_function
+
+  def enabled?
+    ApplicationSettings.instance.values['storage_locations_enabled']
+  end
+end
diff --git a/app/models/experiment.rb b/app/models/experiment.rb
index 464de0f9e..57a1a820c 100644
--- a/app/models/experiment.rb
+++ b/app/models/experiment.rb
@@ -84,6 +84,8 @@ class Experiment < ApplicationRecord
   end
 
   def self.with_children_viewable_by_user(user)
+    # the NONE permission at the end also allows for experiments with hidden tasks (virtually empty)
+    # to show up on the list
     joins("
       LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id
       LEFT OUTER JOIN user_assignments my_module_user_assignments
@@ -94,8 +96,8 @@ class Experiment < ApplicationRecord
     ")
       .where('
         (my_module_user_assignments.user_id = ? AND my_module_user_roles.permissions @> ARRAY[?]::varchar[]
-          OR my_modules.id IS NULL)
-      ', user.id, MyModulePermissions::READ)
+          OR my_modules.id IS NULL OR my_module_user_roles.permissions @> ARRAY[?]::varchar[])
+      ', user.id, MyModulePermissions::READ, MyModulePermissions::NONE)
   end
 
   def self.filter_by_teams(teams = [])
diff --git a/app/models/my_module.rb b/app/models/my_module.rb
index e1eea3c3a..36b7578ff 100644
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@@ -177,13 +177,31 @@ class MyModule < ApplicationRecord
   end
 
   def assigned_repositories
-    team = experiment.project.team
-    Repository.accessible_by_teams(team)
-              .joins(repository_rows: :my_module_repository_rows)
+    Repository.joins(repository_rows: :my_module_repository_rows)
               .where(my_module_repository_rows: { my_module_id: id })
               .group(:id)
   end
 
+  def readable_live_and_snapshot_repositories_list(user, team = user.current_team)
+    snapshots = repository_snapshots.left_outer_joins(:original_repository)
+
+    selected_snapshots = snapshots.where(selected: true)
+                                  .or(snapshots.where(original_repositories_repositories: { id: nil }))
+                                  .or(snapshots.where.not(parent_id: assigned_repositories.select(:id)))
+                                  .select('DISTINCT ON ("repositories"."parent_id") "repositories".*')
+                                  .select('COUNT(repository_rows.id) AS assigned_rows_count')
+                                  .joins(:repository_rows)
+                                  .group(:parent_id, :id)
+                                  .order(:parent_id, updated_at: :desc)
+
+    live_repositories = assigned_repositories
+                        .viewable_by_user(user, team)
+                        .select('repositories.*, COUNT(DISTINCT repository_rows.id) AS assigned_rows_count')
+                        .where.not(id: repository_snapshots.where(selected: true).select(:parent_id))
+
+    (live_repositories + selected_snapshots).sort_by { |r| r.name.downcase }
+  end
+
   def live_and_snapshot_repositories_list
     snapshots = repository_snapshots.left_outer_joins(:original_repository)
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 0d04cb56b..6b6c5a027 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -201,9 +201,9 @@ class Project < ApplicationRecord
     st
   end
 
-  def assigned_repositories_and_snapshots
-    live_repositories = Repository.assigned_to_project(self)
-    snapshots = RepositorySnapshot.assigned_to_project(self)
+  def assigned_readable_repositories_and_snapshots(user)
+    live_repositories = Repository.assigned_to_project(self).readable_by_user(user)
+    snapshots = RepositorySnapshot.assigned_to_project(self).readable_by_user(user)
     (live_repositories + snapshots).sort_by { |r| r.name.downcase }
   end
 
diff --git a/app/models/protocol.rb b/app/models/protocol.rb
index f26da6f07..1c961de68 100644
--- a/app/models/protocol.rb
+++ b/app/models/protocol.rb
@@ -253,11 +253,8 @@ class Protocol < ApplicationRecord
 
   def self.viewable_by_user_my_module_protocols(user, teams)
     distinct.joins(:my_module)
-            .joins("INNER JOIN user_assignments my_module_user_assignments " \
-                   "ON my_module_user_assignments.assignable_type = 'MyModule' " \
-                   "AND my_module_user_assignments.assignable_id = my_modules.id")
-            .where(my_module_user_assignments: { user_id: user })
-            .where(team: teams)
+            .where(my_modules: MyModule.with_granted_permissions(user, MyModulePermissions::READ)
+                                       .where(user_assignments: { team: teams }))
   end
 
   def self.filter_by_teams(teams = [])
diff --git a/app/models/report.rb b/app/models/report.rb
index 35ddf5729..0d1fbc97d 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -103,7 +103,7 @@ class Report < ApplicationRecord
   def self.generate_whole_project_report(project, current_user, current_team)
     content = {
       'experiments' => [],
-      'repositories' => project.assigned_repositories_and_snapshots.pluck(:id)
+      'repositories' => project.assigned_readable_repositories_and_snapshots(current_user).pluck(:id)
     }
     project.experiments.includes(:my_modules).find_each do |experiment|
       content['experiments'].push(
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 8cca5c0f3..166dd6f89 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -7,12 +7,11 @@ class Repository < RepositoryBase
   include PermissionCheckableModel
   include RepositoryImportParser
   include ArchivableModel
+  include Shareable
 
   ID_PREFIX = 'IN'
   include PrefixedIdModel
 
-  enum permission_level: Extends::SHARED_OBJECTS_PERMISSION_LEVELS
-
   belongs_to :archived_by,
              foreign_key: :archived_by_id,
              class_name: 'User',
@@ -23,8 +22,6 @@ class Repository < RepositoryBase
              class_name: 'User',
              inverse_of: :restored_repositories,
              optional: true
-  has_many :team_shared_objects, as: :shared_object, dependent: :destroy
-  has_many :teams_shared_with, through: :team_shared_objects, source: :team, dependent: :destroy
   has_many :repository_snapshots,
            class_name: 'RepositorySnapshot',
            foreign_key: :parent_id,
@@ -48,21 +45,8 @@ class Repository < RepositoryBase
   scope :archived, -> { where(archived: true) }
   scope :globally_shared, -> { where(permission_level: %i(shared_read shared_write)) }
 
-  scope :accessible_by_teams, lambda { |teams|
-    accessible_repositories = left_outer_joins(:team_shared_objects)
-    accessible_repositories =
-      accessible_repositories
-      .where(team: teams)
-      .or(accessible_repositories.where(team_shared_objects: { team: teams }))
-      .or(accessible_repositories
-            .where(permission_level: [Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read],
-                                      Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]]))
-    accessible_repositories.distinct
-  }
-
   scope :assigned_to_project, lambda { |project|
-    accessible_by_teams(project.team)
-      .joins(repository_rows: { my_module_repository_rows: { my_module: { experiment: :project } } })
+    joins(repository_rows: { my_module_repository_rows: { my_module: { experiment: :project } } })
       .where(repository_rows: { my_module_repository_rows: { my_module: { experiments: { project: project } } } })
   }
 
@@ -82,10 +66,6 @@ class Repository < RepositoryBase
     teams.blank? ? self : where(team: teams)
   end
 
-  def shareable_write?
-    true
-  end
-
   def permission_parent
     team
   end
@@ -113,48 +93,6 @@ class Repository < RepositoryBase
     ['repository_rows.name', RepositoryRow::PREFIXED_ID_SQL, 'users.full_name']
   end
 
-  def i_shared?(team)
-    shared_with_anybody? && self.team == team
-  end
-
-  def globally_shared?
-    shared_read? || shared_write?
-  end
-
-  def shared_with_anybody?
-    (!not_shared? || team_shared_objects.any?)
-  end
-
-  def shared_with?(team)
-    return false if self.team == team
-
-    !not_shared? || private_shared_with?(team)
-  end
-
-  def shared_with_write?(team)
-    return false if self.team == team
-
-    shared_write? || private_shared_with_write?(team)
-  end
-
-  def shared_with_read?(team)
-    return false if self.team == team
-
-    shared_read? || team_shared_objects.where(team: team, permission_level: :shared_read).any?
-  end
-
-  def private_shared_with?(team)
-    team_shared_objects.where(team: team).any?
-  end
-
-  def private_shared_with_write?(team)
-    team_shared_objects.where(team: team, permission_level: :shared_write).any?
-  end
-
-  def self.viewable_by_user(_user, teams)
-    accessible_by_teams(teams)
-  end
-
   def self.name_like(query)
     where('repositories.name ILIKE ?', "%#{query}%")
   end
diff --git a/app/models/repository_asset_value.rb b/app/models/repository_asset_value.rb
index 5e9ba015f..9e4685aa6 100644
--- a/app/models/repository_asset_value.rb
+++ b/app/models/repository_asset_value.rb
@@ -60,9 +60,9 @@ class RepositoryAssetValue < ApplicationRecord
 
   def update_data!(new_data, user)
     if new_data.is_a?(String) # assume it's a signed_id_token
-      asset.file.attach(new_data)
+      asset.attach_file_version(new_data)
     elsif new_data[:file_data]
-      asset.file.attach(io: StringIO.new(Base64.decode64(new_data[:file_data])), filename: new_data[:file_name])
+      asset.attach_file_version(io: StringIO.new(Base64.decode64(new_data[:file_data])), filename: new_data[:file_name])
     end
 
     asset.file_pdf_preview.purge if asset.file_pdf_preview.attached?
@@ -99,9 +99,9 @@ class RepositoryAssetValue < ApplicationRecord
     value.asset = Asset.create!(created_by: value.created_by, last_modified_by: value.created_by, team: team)
 
     if payload.is_a?(String) # assume it's a signed_id_token
-      value.asset.file.attach(payload)
+      value.asset.attach_file_version(payload)
     elsif payload[:file_data]
-      value.asset.file.attach(io: StringIO.new(Base64.decode64(payload[:file_data])), filename: payload[:file_name])
+      value.asset.attach_file_version(io: StringIO.new(Base64.decode64(payload[:file_data])), filename: payload[:file_name])
     end
 
     value.asset.post_process_file
diff --git a/app/models/repository_base.rb b/app/models/repository_base.rb
index dab25f492..95190312e 100644
--- a/app/models/repository_base.rb
+++ b/app/models/repository_base.rb
@@ -40,7 +40,13 @@ class RepositoryBase < ApplicationRecord
   end
 
   def has_stock_management?
-    self.class.stock_management_enabled? && repository_columns.stock_type.exists?
+    @has_stock_management ||= self.class.stock_management_enabled? && repository_columns.stock_type.exists?
+  end
+
+  def has_reminders?
+    @has_reminders ||=
+      self.class.reminders_enabled? &&
+      (repository_columns.stock_type.exists? || repository_columns.where('"repository_columns"."metadata" ->> \'reminder_value\' <> \'\'').exists?)
   end
 
   def has_stock_consumption?
diff --git a/app/models/repository_cell.rb b/app/models/repository_cell.rb
index f882873a5..9afda532d 100644
--- a/app/models/repository_cell.rb
+++ b/app/models/repository_cell.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class RepositoryCell < ApplicationRecord
-  include ReminderRepositoryCellJoinable
-
   attr_accessor :importing, :to_destroy
 
   belongs_to :repository_row, touch: true
@@ -48,7 +46,47 @@ class RepositoryCell < ApplicationRecord
   after_touch :update_repository_row_last_modified_by
 
   scope :with_active_reminder, lambda { |user|
-    reminder_repository_cells_scope(self, user)
+    from(
+      "((#{with_active_stock_reminder(user).to_sql}) UNION ALL " \
+      "(#{with_active_datetime_reminder(user).to_sql})) AS repository_cells"
+    )
+  }
+
+  scope :with_active_stock_reminder, lambda { |user|
+    joins( # stock reminders
+      'LEFT OUTER JOIN "repository_stock_values" ON ' \
+      '"repository_cells"."value_type" = \'RepositoryStockValue\' AND ' \
+      '"repository_stock_values"."id" = "repository_cells"."value_id" AND ' \
+      '(repository_stock_values.amount <= repository_stock_values.low_stock_threshold OR ' \
+      'repository_stock_values.amount <= 0)'
+    ).joins(
+      'LEFT OUTER JOIN "hidden_repository_cell_reminders" ON ' \
+      '"repository_cells"."id" = "hidden_repository_cell_reminders"."repository_cell_id" AND ' \
+      '"hidden_repository_cell_reminders"."user_id" = ' + user.id.to_s
+    ).where(
+      'hidden_repository_cell_reminders.id IS NULL AND repository_stock_values.id IS NOT NULL'
+    )
+  }
+
+  scope :with_active_datetime_reminder, lambda { |user|
+    joins(
+      'INNER JOIN repository_columns repository_reminder_columns ON ' \
+      'repository_reminder_columns.id = repository_cells.repository_column_id'
+    ).joins( # datetime reminders
+      'LEFT OUTER JOIN "repository_date_time_values" ON ' \
+      '"repository_date_time_values"."id" = "repository_cells"."value_id" AND ' \
+      '"repository_cells"."value_type" = \'RepositoryDateTimeValueBase\' ' \
+      'AND repository_reminder_columns.metadata ->> \'reminder_value\' <> \'\' AND ' \
+      '(repository_date_time_values.data - NOW()) <= ' \
+      '(repository_reminder_columns.metadata ->> \'reminder_value\')::int * ' \
+      '(repository_reminder_columns.metadata ->> \'reminder_unit\')::int * interval \'1 sec\''
+    ).joins(
+      'LEFT OUTER JOIN "hidden_repository_cell_reminders" ON ' \
+      '"repository_cells"."id" = "hidden_repository_cell_reminders"."repository_cell_id" AND ' \
+      '"hidden_repository_cell_reminders"."user_id" = ' + user.id.to_s
+    ).where(
+      'hidden_repository_cell_reminders.id IS NULL AND repository_date_time_values.id IS NOT NULL'
+    )
   }
 
   def update_repository_row_last_modified_by
diff --git a/app/models/repository_row.rb b/app/models/repository_row.rb
index 923164d0f..1e8c94ecd 100644
--- a/app/models/repository_row.rb
+++ b/app/models/repository_row.rb
@@ -5,12 +5,11 @@ class RepositoryRow < ApplicationRecord
   include SearchableModel
   include SearchableByNameModel
   include ArchivableModel
-  include ReminderRepositoryCellJoinable
 
   ID_PREFIX = 'IT'
   include PrefixedIdModel
 
-  belongs_to :repository, class_name: 'RepositoryBase'
+  belongs_to :repository, class_name: 'RepositoryBase', counter_cache: :repository_rows_count
   delegate :team, to: :repository
   belongs_to :parent, class_name: 'RepositoryRow', optional: true
   belongs_to :created_by, class_name: 'User'
@@ -98,6 +97,13 @@ class RepositoryRow < ApplicationRecord
            class_name: 'RepositoryRow',
            source: :parent,
            dependent: :destroy
+  has_many :discarded_storage_location_repository_rows,
+           -> { discarded },
+           class_name: 'StorageLocationRepositoryRow',
+           inverse_of: :repository_row,
+           dependent: :destroy
+  has_many :storage_location_repository_rows, inverse_of: :repository_row, dependent: :destroy
+  has_many :storage_locations, through: :storage_location_repository_rows
 
   auto_strip_attributes :name, nullify: false
   validates :name,
@@ -110,8 +116,8 @@ class RepositoryRow < ApplicationRecord
   scope :active, -> { where(archived: false) }
   scope :archived, -> { where(archived: true) }
 
-  scope :with_active_reminders, lambda { |user|
-    reminder_repository_cells_scope(joins(:repository_cells), user)
+  scope :with_active_reminders, lambda { |repository, user|
+    left_outer_joins_active_reminders(repository, user).where.not(repository_cells_with_active_reminders: { id: nil })
   }
 
   def code
@@ -125,18 +131,17 @@ class RepositoryRow < ApplicationRecord
   def self.search(user,
                   include_archived,
                   query = nil,
-                  _current_team = nil,
+                  current_team = nil,
                   options = {})
 
     teams = options[:teams] || current_team || user.teams.select(:id)
     searchable_row_fields = [RepositoryRow::PREFIXED_ID_SQL, 'repository_rows.name', 'users.full_name']
 
-    readable_rows = distinct.joins(:repository, :created_by)
-                            .joins("INNER JOIN user_assignments repository_user_assignments " \
-                                   "ON repository_user_assignments.assignable_type = 'RepositoryBase' " \
-                                   "AND repository_user_assignments.assignable_id = repositories.id")
-                            .where(repository_user_assignments: { user_id: user, team_id: teams })
-
+    readable_rows =
+      distinct
+      .joins(:repository, :created_by)
+      .where(repositories: { id: Repository.with_granted_permissions(user, RepositoryPermissions::READ).select(:id),
+                             team_id: teams })
     readable_rows = readable_rows.active unless include_archived
     repository_rows = readable_rows.where_attributes_like_boolean(searchable_row_fields, query, options)
 
@@ -165,6 +170,16 @@ class RepositoryRow < ApplicationRecord
       .update_all(created_by_id: new_owner.id)
   end
 
+  def self.left_outer_joins_active_reminders(repository, user)
+    repository_cells = RepositoryCell.joins("INNER JOIN repository_columns ON repository_columns.id = repository_cells.repository_column_id AND " \
+                                            "repository_columns.repository_id = #{repository.id}")
+    joins(
+      "LEFT OUTER JOIN (#{repository_cells.with_active_reminder(user).select(:id, :repository_row_id).to_sql}) " \
+      "AS repository_cells_with_active_reminders " \
+      "ON repository_cells_with_active_reminders.repository_row_id = repository_rows.id"
+    )
+  end
+
   def editable?
     true
   end
diff --git a/app/models/repository_snapshot.rb b/app/models/repository_snapshot.rb
index f16f06ff1..989a7b10d 100644
--- a/app/models/repository_snapshot.rb
+++ b/app/models/repository_snapshot.rb
@@ -37,6 +37,10 @@ class RepositorySnapshot < RepositoryBase
       .where(my_module: { experiments: { project: project } })
   }
 
+  scope :readable_by_user, lambda { |user|
+    where(my_module_id: MyModule.readable_by_user(user).select(:id))
+  }
+
   def self.create_preliminary!(repository, my_module, created_by = nil)
     created_by ||= repository.created_by
     create!(
diff --git a/app/models/repository_text_value.rb b/app/models/repository_text_value.rb
index 529f89c79..be59b0a11 100644
--- a/app/models/repository_text_value.rb
+++ b/app/models/repository_text_value.rb
@@ -10,6 +10,8 @@ class RepositoryTextValue < ApplicationRecord
   has_one :repository_cell, as: :value, dependent: :destroy, touch: true
   accepts_nested_attributes_for :repository_cell
 
+  before_save -> { self.has_smart_annotation = data.match?(SmartAnnotations::TagToHtml::ALL_REGEX) }, if: -> { data_changed? }
+
   validates :repository_cell, presence: true
   validates :data, presence: true, length: { maximum: Constants::TEXT_MAX_LENGTH }
 
diff --git a/app/models/result.rb b/app/models/result.rb
index 767937497..6119458de 100644
--- a/app/models/result.rb
+++ b/app/models/result.rb
@@ -37,6 +37,9 @@ class Result < ApplicationRecord
   accepts_nested_attributes_for :tables
 
   before_save :ensure_default_name
+  after_discard do
+    CleanupUserSettingsJob.perform_later('result_states', id)
+  end
 
   def self.search(user,
                   include_archived,
@@ -45,12 +48,10 @@ class Result < ApplicationRecord
                   options = {})
     teams = options[:teams] || current_team || user.teams.select(:id)
 
-    new_query = distinct.left_joins(:result_comments, :result_texts, result_tables: :table)
-                        .joins(:my_module)
-                        .joins("INNER JOIN user_assignments my_module_user_assignments " \
-                               "ON my_module_user_assignments.assignable_type = 'MyModule' " \
-                               "AND my_module_user_assignments.assignable_id = my_modules.id")
-                        .where(my_module_user_assignments: { user_id: user, team_id: teams })
+    new_query = left_joins(:result_comments, :result_texts, result_tables: :table)
+                .joins(:my_module)
+                .where(my_modules: MyModule.with_granted_permissions(user, MyModulePermissions::READ)
+                                           .where(user_assignments: { team: teams }))
 
     unless include_archived
       new_query = new_query.joins(my_module: { experiment: :project })
@@ -60,7 +61,9 @@ class Result < ApplicationRecord
                                   projects: { archived: false })
     end
 
-    new_query.where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, { with_subquery: true, raw_input: new_query })
+    new_query.where_attributes_like_boolean(
+      SEARCHABLE_ATTRIBUTES, query, { with_subquery: true, raw_input: new_query }
+    ).distinct
   end
 
   def self.search_subquery(query, raw_input)
diff --git a/app/models/soft_locked_repository.rb b/app/models/soft_locked_repository.rb
new file mode 100644
index 000000000..93a51178d
--- /dev/null
+++ b/app/models/soft_locked_repository.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SoftLockedRepository < Repository
+  # this is for repositories only editable via API
+
+  enum permission_level: Extends::SHARED_OBJECTS_PERMISSION_LEVELS.except(:shared_write)
+
+  def shareable_write?
+    false
+  end
+end
diff --git a/app/models/storage_location.rb b/app/models/storage_location.rb
new file mode 100644
index 000000000..2553e9132
--- /dev/null
+++ b/app/models/storage_location.rb
@@ -0,0 +1,216 @@
+# frozen_string_literal: true
+
+class StorageLocation < ApplicationRecord
+  include Cloneable
+  include Discard::Model
+  ID_PREFIX = 'SL'
+  include PrefixedIdModel
+  include Shareable
+  include SearchableModel
+
+  default_scope -> { kept }
+
+  has_one_attached :image
+
+  belongs_to :team
+  belongs_to :parent, class_name: 'StorageLocation', optional: true
+  belongs_to :created_by, class_name: 'User'
+
+  has_many :storage_location_repository_rows, inverse_of: :storage_location, dependent: :destroy
+  has_many :storage_locations, foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+  has_many :repository_rows, through: :storage_location_repository_rows
+
+  validates :name, length: { maximum: Constants::NAME_MAX_LENGTH }
+  validate :parent_same_team, if: -> { parent.present? }
+  validate :parent_validation, if: -> { parent.present? }
+  validate :no_grid_options, if: -> { !container }
+  validate :no_dimensions, if: -> { !with_grid? }
+
+  scope :readable_by_user, (lambda do |user, team = user.current_team|
+    next StorageLocation.none unless team.permission_granted?(user, TeamPermissions::STORAGE_LOCATIONS_READ)
+
+    where(team: team)
+  end)
+
+  after_discard do
+    StorageLocation.where(parent_id: id).find_each(&:discard)
+    storage_location_repository_rows.each(&:discard)
+  end
+
+  def shared_with?(team)
+    return false if self.team == team
+
+    (root? ? self : root_storage_location).private_shared_with?(team)
+  end
+
+  def root?
+    parent_id.nil?
+  end
+
+  def root_storage_location
+    return self if root?
+
+    storage_location = self
+
+    storage_location = storage_location.parent while storage_location.parent_id
+
+    storage_location
+  end
+
+  def empty?
+    storage_location_repository_rows.count.zero?
+  end
+
+  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, new_storage_location.team)
+      new_storage_location
+    rescue ActiveRecord::RecordInvalid
+      false
+    end
+  end
+
+  def with_grid?
+    metadata['display_type'] == 'grid'
+  end
+
+  def grid_size
+    metadata['dimensions'] if with_grid?
+  end
+
+  def available_positions
+    return unless with_grid?
+
+    occupied_positions = storage_location_repository_rows.pluck(:metadata).map { |metadata| metadata['position'] }
+
+    rows = {}
+
+    grid_size[0].times do |row|
+      rows_cells = []
+      grid_size[1].times.filter_map do |col|
+        rows_cells.push(col + 1) if occupied_positions.exclude?([row + 1, col + 1])
+      end
+      rows[row + 1] = rows_cells unless rows_cells.empty?
+    end
+
+    rows
+  end
+
+  def self.shared_sql_select(user)
+    shared_write_value = TeamSharedObject.permission_levels['shared_write']
+    team_id = user.current_team.id
+
+    case_statement = <<-SQL.squish
+      CASE
+        WHEN EXISTS (
+          SELECT 1 FROM team_shared_objects
+          WHERE team_shared_objects.shared_object_id = storage_locations.id
+            AND team_shared_objects.shared_object_type = 'StorageLocation'
+            AND storage_locations.team_id = :team_id
+          ) THEN 1
+        WHEN EXISTS (
+          SELECT 1 FROM team_shared_objects
+          WHERE team_shared_objects.shared_object_id = storage_locations.id
+            AND team_shared_objects.shared_object_type = 'StorageLocation'
+            AND team_shared_objects.team_id = :team_id
+        ) THEN
+            CASE
+              WHEN EXISTS (
+                  SELECT 1 FROM team_shared_objects
+                  WHERE team_shared_objects.shared_object_id = storage_locations.id
+                    AND team_shared_objects.shared_object_type = 'StorageLocation'
+                    AND team_shared_objects.permission_level = :shared_write_value
+                    AND team_shared_objects.team_id = :team_id
+                ) THEN 2
+              ELSE 3
+            END
+        ELSE 4
+      END as shared
+    SQL
+
+    ActiveRecord::Base.sanitize_sql_array(
+      [case_statement, { team_id: team_id, shared_write_value: shared_write_value }]
+    )
+  end
+
+  def self.storage_locations_enabled?
+    ApplicationSettings.instance.values['storage_locations_enabled']
+  end
+
+  private
+
+  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, team)
+    end
+  end
+
+  def copy_image(old_storage_location, new_storage_location)
+    return unless old_storage_location.image.attached?
+
+    old_blob = old_storage_location.image.blob
+    old_blob.open do |tmp_file|
+      to_blob = ActiveStorage::Blob.create_and_upload!(
+        io: tmp_file,
+        filename: old_blob.filename,
+        metadata: old_blob.metadata
+      )
+      new_storage_location.image.attach(to_blob)
+    end
+  end
+
+  def self.inner_storage_locations(team, storage_location = nil)
+    entry_point_condition = storage_location ? 'parent_id = ?' : 'parent_id IS NULL'
+
+    inner_storage_locations_sql =
+      "WITH RECURSIVE inner_storage_locations(id, selected_storage_locations_ids) AS (
+        SELECT id, ARRAY[id]
+        FROM storage_locations
+        WHERE team_id = ? AND #{entry_point_condition}
+        UNION ALL
+        SELECT storage_locations.id, selected_storage_locations_ids || storage_locations.id
+        FROM inner_storage_locations
+        JOIN storage_locations ON storage_locations.parent_id = inner_storage_locations.id
+        WHERE NOT storage_locations.id = ANY(selected_storage_locations_ids)
+      )
+      SELECT id FROM inner_storage_locations ORDER BY selected_storage_locations_ids".gsub(/\n|\t/, ' ').squeeze(' ')
+
+    if storage_location.present?
+      where("storage_locations.id IN (#{inner_storage_locations_sql})", team.id, storage_location.id)
+    else
+      where("storage_locations.id IN (#{inner_storage_locations_sql})", team.id)
+    end
+  end
+
+  def parent_validation
+    if parent.id == id
+      errors.add(:parent, I18n.t('activerecord.errors.models.storage_location.attributes.parent_storage_location'))
+    elsif StorageLocation.inner_storage_locations(team, self).exists?(id: parent_id)
+      errors.add(:parent, I18n.t('activerecord.errors.models.project_folder.attributes.parent_storage_location_child'))
+    end
+  end
+
+  def no_grid_options
+    errors.add(:metadata, I18n.t('activerecord.errors.models.storage_location.attributes.metadata.invalid')) if metadata['display_type'] || metadata['dimensions']
+  end
+
+  def parent_same_team
+    errors.add(:parent, I18n.t('activerecord.errors.models.storage_location.attributes.parent_storage_location_team')) if parent.team != team
+  end
+
+  def no_dimensions
+    errors.add(:metadata, I18n.t('activerecord.errors.models.storage_location.attributes.metadata.invalid')) if !with_grid? && metadata['dimensions']
+  end
+end
diff --git a/app/models/storage_location_repository_row.rb b/app/models/storage_location_repository_row.rb
new file mode 100644
index 000000000..fd69fea25
--- /dev/null
+++ b/app/models/storage_location_repository_row.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class StorageLocationRepositoryRow < ApplicationRecord
+  include Discard::Model
+  include SearchableModel
+
+  default_scope -> { kept }
+
+  belongs_to :storage_location, inverse_of: :storage_location_repository_rows
+  belongs_to :repository_row, inverse_of: :storage_location_repository_rows
+  belongs_to :created_by, class_name: 'User'
+
+  with_options if: -> { storage_location.container && storage_location.metadata['display_type'] == 'grid' } do
+    validate :position_must_be_present
+    validate :ensure_uniq_position
+  end
+
+  with_options if: -> { storage_location.container && storage_location.metadata['display_type'] != 'grid' } do
+    validate :unique_repository_row
+  end
+
+  def human_readable_position
+    return unless metadata['position']
+
+    column_letter = ('A'..'Z').to_a[metadata['position'][0] - 1]
+    row_number = metadata['position'][1]
+
+    "#{column_letter}#{row_number}"
+  end
+
+  def position_must_be_present
+    errors.add(:base, I18n.t('activerecord.errors.models.storage_location.missing_position')) if metadata['position'].blank?
+  end
+
+  def ensure_uniq_position
+    if storage_location.storage_location_repository_rows
+                       .where("metadata->'position' = ?", metadata['position'].to_json)
+                       .where.not(id: id).exists?
+      errors.add(:base, I18n.t('activerecord.errors.models.storage_location.not_uniq_position'))
+    end
+  end
+
+  def unique_repository_row
+    if storage_location.storage_location_repository_rows
+                       .where(repository_row_id: repository_row_id)
+                       .where.not(id: id).exists?
+      errors.add(:base, I18n.t('activerecord.errors.models.storage_location.not_uniq_repository_row'))
+    end
+  end
+end
diff --git a/app/models/team.rb b/app/models/team.rb
index 4b3df88ae..311fc27bb 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -72,6 +72,7 @@ class Team < ApplicationRecord
            source_type: 'RepositoryBase',
            dependent: :destroy
   has_many :shareable_links, inverse_of: :team, dependent: :destroy
+  has_many :storage_locations, dependent: :destroy
 
   attr_accessor :without_templates
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 27470c04d..cb37cc2bc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -8,7 +8,7 @@ class User < ApplicationRecord
   include ActiveStorageConcerns
 
   devise :invitable, :confirmable, :database_authenticatable, :registerable,
-         :async, :recoverable, :rememberable, :trackable, :validatable,
+         :recoverable, :rememberable, :trackable, :validatable,
          :timeoutable, :omniauthable, :lockable,
          omniauth_providers: Extends::OMNIAUTH_PROVIDERS,
          stretches: Constants::PASSWORD_STRETCH_FACTOR
@@ -374,7 +374,7 @@ class User < ApplicationRecord
   end
 
   def current_team
-    Team.find_by_id(self.current_team_id)
+    @current_team ||= teams.find_by(id: current_team_id)
   end
 
   def permission_team=(team)
@@ -519,6 +519,7 @@ class User < ApplicationRecord
       api_key_created_at: Time.current,
       api_key_expires_at: Constants::API_KEY_EXPIRES_IN.from_now
     )
+    api_key
   end
 
   def revoke_api_key!
@@ -634,6 +635,10 @@ class User < ApplicationRecord
     Rails.configuration.x.core_api_key_enabled
   end
 
+  def send_devise_notification(notification, *args)
+    devise_mailer.send(notification, self, *args).deliver_later
+  end
+
   protected
 
   def confirmation_required?
diff --git a/app/notifications/base_notification.rb b/app/notifications/base_notification.rb
index d17d4a245..8eb97d074 100644
--- a/app/notifications/base_notification.rb
+++ b/app/notifications/base_notification.rb
@@ -34,6 +34,10 @@ class BaseNotification < Noticed::Base
 
   private
 
+  def subject_class
+    ApplicationRecord.descendants.find { |klass| klass.name == params[:subject_class] }
+  end
+
   def database_notification?
     # always save all notifications,
     # but flag if they should display in app or not
diff --git a/app/notifications/delivery_notification.rb b/app/notifications/delivery_notification.rb
index fa85905bf..403606cef 100644
--- a/app/notifications/delivery_notification.rb
+++ b/app/notifications/delivery_notification.rb
@@ -16,7 +16,7 @@ class DeliveryNotification < BaseNotification
   def subject
     return unless params[:subject_id] && params[:subject_class]
 
-    params[:subject_class].constantize.find(params[:subject_id])
+    subject_class.find(params[:subject_id])
   rescue ActiveRecord::RecordNotFound
     NonExistantRecord.new(params[:subject_name])
   end
diff --git a/app/notifications/general_notification.rb b/app/notifications/general_notification.rb
index f74c2a298..c683736d0 100644
--- a/app/notifications/general_notification.rb
+++ b/app/notifications/general_notification.rb
@@ -14,7 +14,6 @@ class GeneralNotification < BaseNotification
   end
 
   def subject
-    subject_class = params[:subject_class].constantize
     subject_class.find(params[:subject_id])
   rescue NameError, ActiveRecord::RecordNotFound
     NonExistantRecord.new(params[:subject_name])
diff --git a/app/permissions/asset.rb b/app/permissions/asset.rb
index bd6acb444..4349fdfe5 100644
--- a/app/permissions/asset.rb
+++ b/app/permissions/asset.rb
@@ -32,6 +32,10 @@ Canaid::Permissions.register_for(Asset) do
     end
   end
 
+  can :restore_asset do |user, asset|
+    VersionedAttachments.enabled? && can_manage_asset?(user, asset)
+  end
+
   can :open_asset_locally do |_user, asset|
     ENV['ASSET_SYNC_URL'].present?
   end
diff --git a/app/permissions/my_module.rb b/app/permissions/my_module.rb
index 592ed8bda..17a9f0223 100644
--- a/app/permissions/my_module.rb
+++ b/app/permissions/my_module.rb
@@ -45,7 +45,7 @@ Canaid::Permissions.register_for(MyModule) do
   end
 
   can :share_my_module do |user, my_module|
-    my_module.permission_granted?(user, MyModulePermissions::SHARE)
+    my_module.team.shareable_links_enabled? && my_module.permission_granted?(user, MyModulePermissions::SHARE)
   end
 
   can :restore_my_module do |user, my_module|
diff --git a/app/permissions/repository.rb b/app/permissions/repository.rb
index f65997154..3a7283793 100644
--- a/app/permissions/repository.rb
+++ b/app/permissions/repository.rb
@@ -6,7 +6,7 @@ Canaid::Permissions.register_for(RepositoryBase) do
     if repository.is_a?(RepositorySnapshot)
       can_read_my_module?(user, repository.my_module)
     else
-      user.teams.include?(repository.team) || repository.shared_with?(user.current_team)
+      repository.permission_granted?(user, RepositoryPermissions::READ)
     end
   end
 
@@ -104,6 +104,10 @@ Canaid::Permissions.register_for(Repository) do
       repository.permission_granted?(user, RepositoryPermissions::COLUMNS_CREATE)
   end
 
+  can :manage_repository_columns do |user, repository|
+    repository.repository_snapshots.provisioning.none? && can_create_repository_columns?(user, repository)
+  end
+
   # repository: create/update/delete filters
   can :manage_repository_filters do |user, repository|
     repository.permission_granted?(user, RepositoryPermissions::FILTERS_MANAGE)
@@ -113,3 +117,11 @@ Canaid::Permissions.register_for(Repository) do
     RepositoryBase.stock_management_enabled? && can_manage_repository_rows?(user, repository)
   end
 end
+
+Canaid::Permissions.register_for(RepositoryColumn) do
+  # repository: update/delete field
+  # Tested in scope of RepositoryPermissions spec
+  can :manage_repository_column do |user, repository_column|
+    repository_column.repository.repository_snapshots.provisioning.none? && can_create_repository_columns?(user, repository_column.repository)
+  end
+end
diff --git a/app/permissions/repository_column.rb b/app/permissions/repository_column.rb
deleted file mode 100644
index 53c10974d..000000000
--- a/app/permissions/repository_column.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-Canaid::Permissions.register_for(RepositoryColumn) do
-  # repository: update/delete field
-  # Tested in scope of RepositoryPermissions spec
-  can :manage_repository_column do |user, repository_column|
-    managable = repository_column.repository.repository_snapshots.provisioning.none? &&
-      can_create_repository_columns?(user, repository_column.repository)
-
-    managable
-  end
-end
diff --git a/app/permissions/storage_location.rb b/app/permissions/storage_location.rb
new file mode 100644
index 000000000..cfc99642f
--- /dev/null
+++ b/app/permissions/storage_location.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+Canaid::Permissions.register_for(StorageLocation) do
+  can :read_storage_location do |user, storage_location|
+    root_storage_location = storage_location.root_storage_location
+
+    next true if root_storage_location.shared_with?(user.current_team)
+
+    user.current_team == root_storage_location.team && root_storage_location.team.permission_granted?(
+      user,
+      if root_storage_location.container?
+        TeamPermissions::STORAGE_LOCATION_CONTAINERS_READ
+      else
+        TeamPermissions::STORAGE_LOCATIONS_READ
+      end
+    )
+  end
+
+  can :manage_storage_location do |user, storage_location|
+    root_storage_location = storage_location.root_storage_location
+
+    next false unless user.current_team.permission_granted?(
+      user,
+      if root_storage_location.container?
+        TeamPermissions::STORAGE_LOCATION_CONTAINERS_MANAGE
+      else
+        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 :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
+
+  can :share_storage_location do |user, storage_location|
+    user.current_team == storage_location.team &&
+      storage_location.root? &&
+      can_manage_storage_location?(user, storage_location)
+  end
+end
diff --git a/app/permissions/team.rb b/app/permissions/team.rb
index 0507a53c4..9dfce9d4f 100644
--- a/app/permissions/team.rb
+++ b/app/permissions/team.rb
@@ -43,6 +43,14 @@ Canaid::Permissions.register_for(Team) do
     within_limits && team.permission_granted?(user, TeamPermissions::INVENTORIES_CREATE)
   end
 
+  can :create_storage_locations do |user, team|
+    team.permission_granted?(user, TeamPermissions::STORAGE_LOCATIONS_CREATE)
+  end
+
+  can :create_storage_location_containers do |user, team|
+    team.permission_granted?(user, TeamPermissions::STORAGE_LOCATION_CONTAINERS_CREATE)
+  end
+
   can :create_reports do |user, team|
     team.permission_granted?(user, TeamPermissions::REPORTS_CREATE)
   end
diff --git a/app/serializers/active_storage/blob_serializer.rb b/app/serializers/active_storage/blob_serializer.rb
new file mode 100644
index 000000000..c667bdced
--- /dev/null
+++ b/app/serializers/active_storage/blob_serializer.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ActiveStorage
+  class BlobSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :filename, :url, :created_at, :byte_size, :version, :restored_from_version, :created_by
+
+    def version
+      object.metadata['version'] || 1
+    end
+
+    def restored_from_version
+      object.metadata['restored_from_version']
+    end
+
+    def created_at
+      object.created_at.strftime('%B %d, %Y at %H:%M')
+    end
+
+    def created_by
+      User.select(:id, :full_name, :email).find_by(
+        id: object.metadata['created_by_id'] || object.attachments.first&.record&.created_by_id
+      )
+    end
+  end
+end
diff --git a/app/serializers/asset_serializer.rb b/app/serializers/asset_serializer.rb
index 9817f448a..d3408bf93 100644
--- a/app/serializers/asset_serializer.rb
+++ b/app/serializers/asset_serializer.rb
@@ -138,7 +138,8 @@ class AssetSerializer < ActiveModel::Serializer
       load_asset: load_asset_path(object),
       asset_file: asset_file_url_path(object),
       marvin_js: marvin_js_asset_path(object),
-      marvin_js_icon: image_path('icon_small/marvinjs.svg')
+      marvin_js_icon: image_path('icon_small/marvinjs.svg'),
+      versions: (asset_versions_path(object) if attached)
     }
     user = scope[:user] || @instance_options[:user]
     if can_manage_asset?(user, object)
@@ -155,6 +156,7 @@ class AssetSerializer < ActiveModel::Serializer
       )
     end
 
+    urls[:restore_version] = asset_restore_version_path(object) if can_restore_asset?(user, object)
     urls[:open_vector_editor_edit] = edit_gene_sequence_asset_path(object.id) if can_manage_asset?(user, object)
 
     if can_manage_asset?(user, object) && can_open_asset_locally?(user, object)
diff --git a/app/serializers/concerns/breadcrumbs_helper.rb b/app/serializers/concerns/breadcrumbs_helper.rb
index b3b39c1b9..c28da89f3 100644
--- a/app/serializers/concerns/breadcrumbs_helper.rb
+++ b/app/serializers/concerns/breadcrumbs_helper.rb
@@ -59,6 +59,13 @@ module BreadcrumbsHelper
     when LabelTemplate
       parent = subject.team
       url = label_template_path(subject)
+    when StorageLocation
+      parent = subject.team
+      url = if subject.container
+              storage_location_path(subject, team: subject.team_id)
+            else
+              storage_locations_path(parent_id: subject.id, team: subject.team_id)
+            end
     when Team
       parent = nil
       url = projects_path(team: subject.id)
diff --git a/app/serializers/concerns/shareable_serializer.rb b/app/serializers/concerns/shareable_serializer.rb
new file mode 100644
index 000000000..1f51b45b4
--- /dev/null
+++ b/app/serializers/concerns/shareable_serializer.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module ShareableSerializer
+  extend ActiveSupport::Concern
+
+  included do
+    attributes :shared, :shared_label, :ishared, :shared_read, :shared_write, :shareable_write
+  end
+
+  def shared
+    shared_object.shared_with?(current_user.current_team)
+  end
+
+  def shared_label
+    case shared_object[:shared]
+    when 1
+      I18n.t('libraries.index.shared')
+    when 2
+      I18n.t('libraries.index.shared_for_editing')
+    when 3
+      I18n.t('libraries.index.shared_for_viewing')
+    when 4
+      I18n.t('libraries.index.not_shared')
+    end
+  end
+
+  def ishared
+    shared_object.i_shared?(current_user.current_team)
+  end
+
+  def shared_read
+    shared_object.shared_read?
+  end
+
+  def shared_write
+    shared_object.shared_write?
+  end
+
+  def shareable_write
+    shared_object.shareable_write?
+  end
+
+  private
+
+  def shared_object
+    instance_options[:shared_object] || object
+  end
+end
diff --git a/app/serializers/lists/repository_serializer.rb b/app/serializers/lists/repository_serializer.rb
index 27119e15c..f05b01c9c 100644
--- a/app/serializers/lists/repository_serializer.rb
+++ b/app/serializers/lists/repository_serializer.rb
@@ -4,34 +4,12 @@ module Lists
   class RepositorySerializer < ActiveModel::Serializer
     include Canaid::Helpers::PermissionsHelper
     include Rails.application.routes.url_helpers
+    include ShareableSerializer
 
-    attributes :name, :code, :nr_of_rows, :shared, :shared_label, :ishared,
-               :team, :created_at, :created_by, :archived_on, :archived_by,
-               :urls, :shared_read, :shared_write, :shareable_write
+    attributes :name, :code, :nr_of_rows, :team, :created_at, :created_by, :archived_on, :archived_by, :urls
 
     def nr_of_rows
-      object[:row_count]
-    end
-
-    def shared
-      object.shared_with?(current_user.current_team)
-    end
-
-    def shared_label
-      case object[:shared]
-      when 1
-        I18n.t('libraries.index.shared')
-      when 2
-        I18n.t('libraries.index.shared_for_editing')
-      when 3
-        I18n.t('libraries.index.shared_for_viewing')
-      when 4
-        I18n.t('libraries.index.not_shared')
-      end
-    end
-
-    def ishared
-      object.i_shared?(current_user.current_team)
+      object[:repository_rows_count]
     end
 
     def team
@@ -54,25 +32,15 @@ module Lists
       object[:archived_by_user]
     end
 
-    def shared_read
-      object.shared_read?
-    end
-
-    def shared_write
-      object.shared_write?
-    end
-
-    def shareable_write
-      object.shareable_write?
-    end
-
     def urls
       {
         show: repository_path(object),
         update: team_repository_path(current_user.current_team, id: object, format: :json),
-        shareable_teams: shareable_teams_team_repository_path(current_user.current_team, object),
         duplicate: team_repository_copy_path(current_user.current_team, repository_id: object, format: :json),
-        share: team_repository_team_repositories_path(current_user.current_team, object)
+        shareable_teams: shareable_teams_team_shared_objects_path(
+          current_user.current_team, object_id: object.id, object_type: 'Repository'
+        ),
+        share: team_shared_objects_path(current_user.current_team, object_id: object.id, object_type: 'Repository')
       }
     end
   end
diff --git a/app/serializers/lists/storage_location_repository_row_serializer.rb b/app/serializers/lists/storage_location_repository_row_serializer.rb
new file mode 100644
index 000000000..753975f08
--- /dev/null
+++ b/app/serializers/lists/storage_location_repository_row_serializer.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Lists
+  class StorageLocationRepositoryRowSerializer < ActiveModel::Serializer
+    include Canaid::Helpers::PermissionsHelper
+    include Rails.application.routes.url_helpers
+
+    attributes :created_by, :created_on, :position, :row_id, :row_name, :hidden, :position_formatted, :stock,
+               :has_reminder, :reminders_url, :row_url, :row_code
+
+    def row_id
+      object.repository_row.id
+    end
+
+    def row_code
+      object.repository_row.code
+    end
+
+    def row_name
+      object.repository_row.name unless hidden
+    end
+
+    def created_by
+      object.created_by.full_name unless hidden
+    end
+
+    def created_on
+      I18n.l(object.created_at, format: :full) unless hidden
+    end
+
+    def position
+      object.metadata['position']
+    end
+
+    def position_formatted
+      "#{('A'..'Z').to_a[position[0] - 1]}#{position[1]}" if position
+    end
+
+    def stock
+      if !hidden && object.repository_row.repository.has_stock_management?
+        object.repository_row.repository_cells.find_by(value_type: 'RepositoryStockValue')&.value&.formatted
+      end
+    end
+
+    def row_url
+      repository_repository_row_path(object.repository_row.repository, object.repository_row)
+    end
+
+    def hidden
+      return @hidden unless @hidden.nil?
+
+      @hidden = !can_read_repository?(object.repository_row.repository)
+    end
+
+    def has_reminder
+      object.repository_row.repository_cells.with_active_reminder(scope).any? unless hidden
+    end
+
+    def reminders_url
+      row = object.repository_row
+      active_reminder_repository_cells_repository_repository_row_url(row.repository, row)
+    end
+  end
+end
diff --git a/app/serializers/lists/storage_location_serializer.rb b/app/serializers/lists/storage_location_serializer.rb
new file mode 100644
index 000000000..257eac53e
--- /dev/null
+++ b/app/serializers/lists/storage_location_serializer.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Lists
+  class StorageLocationSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+    include ShareableSerializer
+    include ApplicationHelper
+    include ActionView::Helpers::TextHelper
+
+    attributes :id, :code, :name, :container, :description, :owned_by, :created_by,
+               :created_on, :urls, :metadata, :file_name, :sub_location_count, :is_empty,
+               :img_url, :sa_description, :name_hash, :team_id
+
+    def owned_by
+      object['team_name']
+    end
+
+    def img_url
+      return unless object.image.attached?
+
+      Rails.application.routes.url_helpers.url_for(object.image)
+    end
+
+    def is_empty
+      object.empty?
+    end
+
+    def name_hash
+      (object.name.to_s + img_url.to_s).hash
+    end
+
+    def sa_description
+      @user = scope[:user] || @instance_options[:user]
+      custom_auto_link(object.description,
+                       simple_format: false,
+                       tags: %w(img),
+                       team: object.team)
+    end
+
+    def metadata
+      {
+        display_type: object.metadata['display_type'],
+        dimensions: object.metadata['dimensions'] || []
+      }
+    end
+
+    def file_name
+      object.image.filename if object.image.attached?
+    end
+
+    def created_by
+      object['created_by_full_name']
+    end
+
+    def created_on
+      I18n.l(object.created_at, format: :full)
+    end
+
+    def sub_location_count
+      return '/' if @object.container
+
+      if object.respond_to?(:sub_location_count)
+        object.sub_location_count
+      else
+        StorageLocation.where(parent_id: object.id).count
+      end
+    end
+
+    def urls
+      show_url = if @object.container
+                   storage_location_path(@object)
+                 else
+                   storage_locations_path(parent_id: object.id)
+                 end
+      {
+        show: show_url,
+        update: storage_location_path(@object),
+        shareable_teams: shareable_teams_team_shared_objects_path(
+          current_user.current_team, object_id: object.id, object_type: object.class.name
+        ),
+        share: team_shared_objects_path(current_user.current_team, object_id: object.id, object_type: object.class.name)
+      }
+    end
+  end
+end
diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index ebb8ef838..75244c379 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -4,7 +4,7 @@ class NotificationSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
   include BreadcrumbsHelper
 
-  attributes :id, :title, :message, :created_at, :read_at, :type, :breadcrumbs, :checked, :today
+  attributes :id, :title, :message, :created_at, :read_at, :type, :breadcrumbs, :checked, :today, :toggle_read_url
 
   def title
     object.to_notification.title
@@ -31,4 +31,7 @@ class NotificationSerializer < ActiveModel::Serializer
     object.read_at.present?
   end
 
+  def toggle_read_url
+    toggle_read_user_notification_path(object)
+  end
 end
diff --git a/app/serializers/repository_datatable/repository_text_value_serializer.rb b/app/serializers/repository_datatable/repository_text_value_serializer.rb
index f1d174f5a..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: custom_auto_link(value_object.data, simple_format: true, team: scope[:team]),
+        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
diff --git a/app/serializers/result_serializer.rb b/app/serializers/result_serializer.rb
index 156cc8b7f..9988a28a6 100644
--- a/app/serializers/result_serializer.rb
+++ b/app/serializers/result_serializer.rb
@@ -10,7 +10,12 @@ class ResultSerializer < ActiveModel::Serializer
   attributes :name, :id, :urls, :updated_at, :created_at_formatted, :updated_at_formatted, :user,
              :my_module_id, :attachments_manageble, :marvinjs_enabled, :marvinjs_context, :type,
              :wopi_enabled, :wopi_context, :created_at, :created_by, :archived, :assets_order,
-             :open_vector_editor_context, :comments_count, :assets_view_mode, :storage_limit
+             :open_vector_editor_context, :comments_count, :assets_view_mode, :storage_limit, :collapsed
+
+  def collapsed
+    result_states = current_user.settings.fetch('result_states', {})
+    result_states[object.id.to_s] == true
+  end
 
   def marvinjs_enabled
     MarvinJsService.enabled?
diff --git a/app/serializers/shareable_team_serializer.rb b/app/serializers/shareable_team_serializer.rb
index e11b7c38b..7cb5f4bc8 100644
--- a/app/serializers/shareable_team_serializer.rb
+++ b/app/serializers/shareable_team_serializer.rb
@@ -2,20 +2,29 @@
 
 class ShareableTeamSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
+  include Canaid::Helpers::PermissionsHelper
 
-  attributes :id, :name, :private_shared_with, :private_shared_with_write
+  attributes :id, :name, :readable, :private_shared_with, :private_shared_with_write
+
+  def name
+    readable && object.name
+  end
+
+  def readable
+    can_read_team?(object)
+  end
 
   def private_shared_with
-    repository.private_shared_with?(object)
+    model.private_shared_with?(object)
   end
 
   def private_shared_with_write
-    repository.private_shared_with_write?(object)
+    model.private_shared_with_write?(object)
   end
 
   private
 
-  def repository
-    scope[:repository] || @instance_options[:repository]
+  def model
+    scope[:model] || @instance_options[:model]
   end
 end
diff --git a/app/services/activities/create_activity_service.rb b/app/services/activities/create_activity_service.rb
index b69533756..ce3671e80 100644
--- a/app/services/activities/create_activity_service.rb
+++ b/app/services/activities/create_activity_service.rb
@@ -61,7 +61,11 @@ module Activities
           end
 
           if id
-            obj = const.find id
+            obj = if const.respond_to?(:with_discarded)
+                    const.with_discarded.find id
+                  else
+                    const.find id
+                  end
             @activity.message_items[k] = { type: const.to_s, value: obj.public_send(getter_method).to_s, id: id }
             @activity.message_items[k][:value_for] = getter_method
             @activity.message_items[k][:value_type] = value_type unless value_type.nil?
diff --git a/app/services/activities_service.rb b/app/services/activities_service.rb
index 26d4af806..c39a00790 100644
--- a/app/services/activities_service.rb
+++ b/app/services/activities_service.rb
@@ -5,19 +5,52 @@ class ActivitiesService
     # Create condition for view permissions checking first
     visible_teams = user.teams.where(id: teams)
     visible_projects = Project.viewable_by_user(user, visible_teams)
+    visible_my_modules = MyModule.viewable_by_user(user, teams)
+
+    # Temporary solution until handling of deleted subjects is fully implemented
+    visible_repository_teams = visible_teams.with_user_permission(user, RepositoryPermissions::READ)
     visible_by_teams = Activity.where(project: nil, team_id: visible_teams.select(:id))
+                               .where.not(subject_type: %w(RepositoryBase RepositoryRow Protocol))
                                .order(created_at: :desc)
+    visible_by_repositories = Activity.where(subject_type: %w(RepositoryBase RepositoryRow), team_id: visible_repository_teams.select(:id))
+                                      .order(created_at: :desc)
     visible_by_projects = Activity.where(project_id: visible_projects.select(:id))
+                                  .where.not(subject_type: %w(Experiment MyModule Result Protocol))
                                   .order(created_at: :desc)
 
-    query = Activity.from("((#{visible_by_teams.to_sql}) UNION ALL (#{visible_by_projects.to_sql})) AS activities")
+    visible_by_experiments = Activity.where(subject_type: 'Experiment')
+                                     .where(subject_id: Experiment.viewable_by_user(user, visible_teams))
+                                     .order(created_at: :desc)
+
+    visible_by_my_modules = Activity.where("subject_id IN (?) AND subject_type = 'MyModule' OR " \
+                                           "subject_id IN (?) AND subject_type = 'Result' OR " \
+                                           "subject_id IN (?) AND subject_type = 'Protocol'",
+                                           visible_my_modules.select(:id),
+                                           Result.with_discarded.where(my_module: visible_my_modules).select(:id),
+                                           Protocol.where(my_module: visible_my_modules).select(:id))
+                                    .order(created_at: :asc)
+
+    visible_by_protocol_templates =
+      Activity.where(
+        subject_type: Protocol,
+        subject_id: Protocol.viewable_by_user(user, teams).select(:id)
+      ).order(created_at: :desc)
+
+    query = Activity.from(
+      "((#{visible_by_teams.to_sql}) UNION ALL " \
+      "(#{visible_by_repositories.to_sql}) UNION ALL " \
+      "(#{visible_by_protocol_templates.to_sql}) UNION ALL " \
+      "(#{visible_by_experiments.to_sql}) UNION ALL " \
+      "(#{visible_by_my_modules.to_sql}) UNION ALL " \
+      "(#{visible_by_projects.to_sql})) AS activities"
+    )
 
     if filters[:subjects].present?
-      subjects_with_children = load_subjects_children(filters[:subjects])
+      subjects_with_children = load_subjects_children(filters[:subjects], user, teams)
       where_condition = subjects_with_children.to_h.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR ')
       where_arguments = subjects_with_children.to_h.flatten
       if subjects_with_children[:my_module]
-        where_condition = where_condition.concat(' OR (my_module_id IN(?))')
+        where_condition.concat(' OR (my_module_id IN(?))')
         where_arguments << subjects_with_children[:my_module]
       end
       query = query.where(where_condition, *where_arguments)
@@ -45,7 +78,7 @@ class ActivitiesService
               .without_count
   end
 
-  def self.load_subjects_children(subjects = {})
+  def self.load_subjects_children(subjects = {}, user = nil, teams = nil)
     Extends::ACTIVITY_SUBJECT_CHILDREN.each do |subject_name, children|
       subject_name = subject_name.to_s.camelize
       next unless children && subjects[subject_name]
@@ -55,19 +88,23 @@ class ActivitiesService
         child_model = parent_model.reflect_on_association(child).class_name.to_sym
         next if subjects[child_model]
 
-        if subject_name == 'Result'
-          parent_model = parent_model.with_discarded
-        end
+        parent_model = parent_model.with_discarded if subject_name == 'Result'
 
-        if child == :results
-          subjects[child_model] = parent_model.where(id: subjects[subject_name])
-                                              .joins(:results_include_discarded)
-                                              .pluck('results.id')
-        else
-          subjects[child_model] = parent_model.where(id: subjects[subject_name])
-                                              .joins(child)
-                                              .pluck("#{child.to_s.pluralize}.id")
-        end
+        subjects[child_model] =
+          case child
+          when :results
+            parent_model.where(id: subjects[subject_name])
+                        .joins(:results_include_discarded)
+                        .pluck('results.id')
+          when :repositories
+            parent_model.viewable_by_user(user, teams)
+                        .where(id: subjects[subject_name])
+                        .pluck('repositories.id')
+          else
+            parent_model.where(id: subjects[subject_name])
+                        .joins(child)
+                        .pluck("#{child.to_s.pluralize}.id")
+          end
       end
     end
 
diff --git a/app/services/lists/base_service.rb b/app/services/lists/base_service.rb
index 2ac6ceb2a..c3b844f90 100644
--- a/app/services/lists/base_service.rb
+++ b/app/services/lists/base_service.rb
@@ -29,7 +29,7 @@ module Lists
     end
 
     def paginate_records
-      @records = @records.page(@params[:page]).per(@params[:per_page])
+      @records = @records.page(@params[:page]).per(@params[:per_page]) if @params[:page].present?
     end
 
     def sort_direction(order_params)
diff --git a/app/services/lists/protocols_service.rb b/app/services/lists/protocols_service.rb
index 5d57e75ca..b74c68e55 100644
--- a/app/services/lists/protocols_service.rb
+++ b/app/services/lists/protocols_service.rb
@@ -25,14 +25,21 @@ module Lists
       @records = @records.preload(:parent, :latest_published_version, :draft,
                                   :protocol_keywords, user_assignments: %i(user user_role))
                          .joins("LEFT OUTER JOIN protocols protocol_versions " \
-                                "ON protocol_versions.protocol_type = #{Protocol.protocol_types[:in_repository_published_version]} " \
+                                "ON protocol_versions.protocol_type =
+                                  #{Protocol.connection.quote(
+                                    Protocol.protocol_types[:in_repository_published_version]
+                                  )} " \
                                 "AND protocol_versions.parent_id = protocols.parent_id")
                          .joins("LEFT OUTER JOIN protocols protocol_originals " \
-                                "ON protocol_originals.protocol_type = #{Protocol.protocol_types[:in_repository_published_original]} " \
+                                "ON protocol_originals.protocol_type =
+                                  #{Protocol.connection.quote(
+                                    Protocol.protocol_types[:in_repository_published_original]
+                                  )} " \
                                 "AND protocol_originals.id = protocols.parent_id OR " \
                                 "(protocols.id = protocol_originals.id AND protocols.parent_id IS NULL)")
                          .joins("LEFT OUTER JOIN protocols linked_task_protocols " \
-                                "ON linked_task_protocols.protocol_type = #{Protocol.protocol_types[:linked]} " \
+                                "ON linked_task_protocols.protocol_type =
+                                  #{Protocol.connection.quote(Protocol.protocol_types[:linked])} " \
                                 "AND (linked_task_protocols.parent_id = protocol_versions.id OR " \
                                 "linked_task_protocols.parent_id = protocol_originals.id)")
                          .joins('LEFT OUTER JOIN "protocol_protocol_keywords" ' \
@@ -49,7 +56,8 @@ module Lists
                            '"protocols".*',
                            'COALESCE("protocols"."parent_id", "protocols"."id") AS adjusted_parent_id',
                            'STRING_AGG(DISTINCT("protocol_keywords"."name"), \', \') AS "protocol_keywords_str"',
-                           "CASE WHEN protocols.protocol_type = #{Protocol.protocol_types[:in_repository_draft]} " \
+                           "CASE WHEN protocols.protocol_type =
+                            #{Protocol.connection.quote(Protocol.protocol_types[:in_repository_draft])} " \
                            "THEN 0 ELSE COUNT(DISTINCT(\"protocol_versions\".\"id\")) + 1 " \
                            "END AS nr_of_versions",
                            'COUNT(DISTINCT("linked_task_protocols"."id")) AS nr_of_linked_tasks',
diff --git a/app/services/lists/repositories_service.rb b/app/services/lists/repositories_service.rb
index c97bfc7d0..6c66c057f 100644
--- a/app/services/lists/repositories_service.rb
+++ b/app/services/lists/repositories_service.rb
@@ -9,11 +9,9 @@ module Lists
                                  'ON repositories.created_by_id = creators.id')
                           .joins('LEFT OUTER JOIN users AS archivers ' \
                                  'ON repositories.archived_by_id = archivers.id')
-                          .left_outer_joins(:repository_rows)
                           .joins(:team)
                           .select('repositories.*')
                           .select('MAX(teams.name) AS team_name')
-                          .select('COUNT(repository_rows.*) AS row_count')
                           .select('MAX(creators.full_name) AS created_by_user')
                           .select('MAX(archivers.full_name) AS archived_by_user')
                           .select(shared_sql_select)
@@ -47,7 +45,7 @@ module Lists
         created_at: 'repositories.created_at',
         archived_on: 'repositories.archived_on',
         archived_by: 'archived_by_user',
-        nr_of_rows: 'row_count',
+        nr_of_rows: 'repository_rows_count',
         code: 'repositories.id',
         shared_label: 'shared'
       }
diff --git a/app/services/lists/storage_location_repository_rows_service.rb b/app/services/lists/storage_location_repository_rows_service.rb
new file mode 100644
index 000000000..824c9590b
--- /dev/null
+++ b/app/services/lists/storage_location_repository_rows_service.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Lists
+  class StorageLocationRepositoryRowsService < BaseService
+    def initialize(team, params)
+      @team = team
+      @storage_location_id = params[:storage_location_id]
+      @storage_location = StorageLocation.find(@storage_location_id)
+      @params = params
+    end
+
+    def fetch_records
+      @records = StorageLocationRepositoryRow.includes(
+        :created_by,
+        repository_row: {
+          repository: { user_assignments: :user_role }
+        }
+      ).where(storage_location_id: @storage_location_id)
+    end
+
+    def filter_records
+      if @params[:search].present?
+        @records = @records.joins(:repository_row)
+                           .where_attributes_like(
+                             ['repository_rows.name', RepositoryRow::PREFIXED_ID_SQL],
+                             @params[:search]
+                           )
+      end
+    end
+
+    def paginate_records
+      @records = @records.page(@params[:page]).per(@params[:per_page]) if @params[:page].present? && !@storage_location.with_grid?
+    end
+
+    def sort_records
+      return unless @params[:order]
+
+      sort = "#{order_params[:column]}_#{sort_direction(order_params)}"
+
+      case sort
+      when 'position_formatted_ASC'
+        @records = @records.order(Arel.sql("metadata -> 'position' -> 0 ASC, metadata -> 'position' -> 1 ASC"))
+      when 'position_formatted_DESC'
+        @records = @records.order(Arel.sql("metadata -> 'position' -> 0 DESC, metadata -> 'position' -> 1 DESC"))
+      when 'row_id_ASC'
+        @records = @records.order(repository_row_id: :asc)
+      when 'row_id_DESC'
+        @records = @records.order(repository_row_id: :desc)
+      when 'row_name_ASC'
+        @records = @records.joins(:repository_row).order('repository_rows.name ASC')
+      when 'row_name_DESC'
+        @records = @records.joins(:repository_row).order('repository_rows.name DESC')
+      end
+    end
+  end
+end
diff --git a/app/services/lists/storage_locations_service.rb b/app/services/lists/storage_locations_service.rb
new file mode 100644
index 000000000..b6cac8a7b
--- /dev/null
+++ b/app/services/lists/storage_locations_service.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Lists
+  class StorageLocationsService < BaseService
+    include Canaid::Helpers::PermissionsHelper
+
+    def initialize(user, team, params)
+      @user = user
+      @team = team
+      @parent_id = params[:parent_id]
+      @filters = params[:filters] || {}
+      @params = params
+    end
+
+    def fetch_records
+      if @parent_id && !can_read_storage_location?(@user, StorageLocation.find(@parent_id))
+        @records = StorageLocation.none
+        return
+      end
+
+      @records =
+        StorageLocation.joins('LEFT JOIN storage_locations AS sub_locations ' \
+                              'ON storage_locations.id = sub_locations.parent_id AND sub_locations.discarded_at IS NULL')
+                       .left_joins(:team, :created_by)
+                       .select(StorageLocation.shared_sql_select(@user))
+                       .select(
+                         'storage_locations.*,
+                        MAX(teams.name) as team_name,
+                        MAX(users.full_name) as created_by_full_name,
+                        CASE WHEN storage_locations.container THEN -1 ELSE COUNT(sub_locations.id) END AS sub_location_count'
+                       )
+                       .group(:id)
+
+      @records = @records.viewable_by_user(@user, @team) unless @parent_id
+    end
+
+    def filter_records
+      if @filters[:search_tree].present?
+        if @parent_id.present?
+          storage_location = @records.find_by(id: @parent_id)
+          @records = @records.where(id: StorageLocation.inner_storage_locations(@team, storage_location))
+        end
+      else
+        @records = @records.where(parent_id: @parent_id)
+      end
+
+      if @filters[:query].present?
+        @records = @records.where_attributes_like(
+          [
+            'storage_locations.name',
+            'storage_locations.description',
+            StorageLocation::PREFIXED_ID_SQL
+          ], @filters[:query]
+        )
+      end
+
+      if @params[:search].present?
+        @records = @records.where_attributes_like(
+          [
+            'storage_locations.name',
+            'storage_locations.description',
+            StorageLocation::PREFIXED_ID_SQL
+          ], @params[:search]
+        )
+      end
+    end
+
+    private
+
+    def sort_records
+      return unless @params[:order]
+
+      sort = "#{order_params[:column]}_#{sort_direction(order_params)}"
+
+      case sort
+      when 'code_ASC'
+        @records = @records.order(id: :asc)
+      when 'code_DESC'
+        @records = @records.order(id: :desc)
+      when 'name_hash_ASC'
+        @records = @records.order(name: :asc)
+      when 'name_hash_DESC'
+        @records = @records.order(name: :desc)
+      when 'sub_location_count_ASC'
+        @records = @records.order(sub_location_count: :asc)
+      when 'sub_location_count_DESC'
+        @records = @records.order(sub_location_count: :desc)
+      when 'owned_by_ASC'
+        @records = @records.order('team_name ASC')
+      when 'owned_by_DESC'
+        @records = @records.order('team_name DESC')
+      when 'shared_label_ASC'
+        @records = @records.order('shared ASC')
+      when 'shared_label_DESC'
+        @records = @records.order('shared DESC')
+      when 'created_on_ASC'
+        @records = @records.order(created_at: :asc)
+      when 'created_on_DESC'
+        @records = @records.order(created_at: :desc)
+      when 'created_by_ASC'
+        @records = @records.order('created_by_full_name ASC')
+      when 'created_by_DESC'
+        @records = @records.order('created_by_full_name DESC')
+      end
+    end
+  end
+end
diff --git a/app/services/marvin_js_service.rb b/app/services/marvin_js_service.rb
index 8713763ef..8541ed490 100644
--- a/app/services/marvin_js_service.rb
+++ b/app/services/marvin_js_service.rb
@@ -22,7 +22,7 @@ class MarvinJsService
       asset = Asset.new(created_by: current_user,
                           last_modified_by: current_user,
                           team_id: current_team.id)
-      attach_file(asset.file, file, params)
+      attach_file_version(asset, file, params)
       asset.save!
       asset.post_process_file
       connect_asset(asset, params, current_user)
@@ -40,21 +40,14 @@ class MarvinJsService
 
       file = generate_image(params)
       asset.update(last_modified_by: current_user) if asset.is_a?(Asset)
-      attach_file(attachment, file, params)
-      asset.post_process_file if asset.instance_of?(Asset)
-      asset
-    end
 
-    def update_file_name(new_name, asset_id, current_user, current_team)
-      asset = current_team.assets.find(asset_id)
-      prepared_name = prepare_name(new_name)
-
-      ActiveRecord::Base.transaction do
-        asset.last_modified_by = current_user
-        asset.rename_file(prepared_name)
-        asset.save!
+      if params[:object_type] == 'TinyMceAsset'
+        attach_file(attachment, file, params)
+      else
+        attach_file_version(asset, file, params)
       end
 
+      asset.post_process_file if asset.instance_of?(Asset)
       asset
     end
 
@@ -90,6 +83,19 @@ class MarvinJsService
       )
     end
 
+    def attach_file_version(asset, file, params)
+      asset.attach_file_version(
+        io: file,
+        filename: "#{prepare_name(params[:name])}.jpg",
+        content_type: 'image/jpeg',
+        metadata: {
+          name: prepare_name(params[:name]),
+          description: params[:description],
+          asset_type: 'marvinjs'
+        }
+      )
+    end
+
     def prepare_name(sketch_name)
       if !sketch_name.blank?
         sketch_name
diff --git a/app/services/model_exporters/experiment_exporter.rb b/app/services/model_exporters/experiment_exporter.rb
index 67167e78c..c82a0192f 100644
--- a/app/services/model_exporters/experiment_exporter.rb
+++ b/app/services/model_exporters/experiment_exporter.rb
@@ -93,7 +93,7 @@ module ModelExporters
       element_json = element.as_json
       case element.orderable_type
       when 'ResultText'
-        element_json['step_text'] = element.orderable.as_json
+        element_json['result_text'] = element.orderable.as_json
       when 'ResultTable'
         element_json['table'] = table(element.orderable.table)
       end
diff --git a/app/services/model_exporters/team_exporter.rb b/app/services/model_exporters/team_exporter.rb
index 31a75fd48..0f992a497 100644
--- a/app/services/model_exporters/team_exporter.rb
+++ b/app/services/model_exporters/team_exporter.rb
@@ -47,10 +47,6 @@ module ModelExporters
         user_assignments: team.user_assignments.map do |ua|
           user_assignment(ua)
         end,
-        notifications: Notification
-          .includes(:user_notifications)
-          .where('user_notifications.user_id': team.users)
-          .map { |n| notification(n) },
         repositories: team.repositories.map { |r| repository(r) },
         tiny_mce_assets: team.tiny_mce_assets.map { |tma| tiny_mce_asset_data(tma) },
         protocols: team.protocols.where(my_module: nil).map do |pr|
@@ -68,15 +64,6 @@ module ModelExporters
       }
     end
 
-    def notification(notification)
-      notification_json = notification.as_json
-      notification_json['type_of'] = Extends::NOTIFICATIONS_TYPES
-                                     .key(notification
-                                          .read_attribute('type_of'))
-                                     .to_s
-      notification_json
-    end
-
     def label_templates(templates)
       templates.where.not(type: 'FluicsLabelTemplate').map do |template|
         template_json = template.as_json
@@ -97,7 +84,6 @@ module ModelExporters
       copy_files([user], :avatar, File.join(@dir_to_export, 'avatars'))
       {
         user: user_json,
-        user_notifications: user.user_notifications,
         user_identities: user.user_identities,
         repository_table_states:
           user.repository_table_states.where(repository: @team.repositories)
diff --git a/app/services/report_actions/report_content.rb b/app/services/report_actions/report_content.rb
index 8ca49db4f..5dee86ff0 100644
--- a/app/services/report_actions/report_content.rb
+++ b/app/services/report_actions/report_content.rb
@@ -81,7 +81,7 @@ module ReportActions
 
         my_module_element = save_element!({ 'my_module_id' => my_module.id }, :my_module, experiment_element)
 
-        my_module.live_and_snapshot_repositories_list.each do |repository|
+        my_module.readable_live_and_snapshot_repositories_list(@user, @report.team).each do |repository|
           next unless @repositories.include?(repository.parent_id || repository.id)
 
           save_element!(
diff --git a/app/services/report_actions/save_pdf_to_inventory_item.rb b/app/services/report_actions/save_pdf_to_inventory_item.rb
index 0343f0230..01866820f 100644
--- a/app/services/report_actions/save_pdf_to_inventory_item.rb
+++ b/app/services/report_actions/save_pdf_to_inventory_item.rb
@@ -33,7 +33,7 @@ module ReportActions
     include Canaid::Helpers::PermissionsHelper
 
     def load_repository_collaborators
-      @repository = Repository.active.accessible_by_teams(@team).find_by(id: @params[:repository_id])
+      @repository = Repository.active.viewable_by_user(@user, @team).find_by(id: @params[:repository_id])
       unless can_create_repository_rows?(@user, @repository)
         raise ReportActions::RepositoryPermissionError, I18n.t('projects.reports.new.no_permissions')
       end
@@ -44,7 +44,7 @@ module ReportActions
 
     def create_new_asset
       asset = Asset.create(created_by: @user, last_modified_by: @user, team: @team)
-      asset.file.attach(@report.pdf_file.blob)
+      asset.attach_file_version(@report.pdf_file.blob)
       asset
     end
 
diff --git a/app/services/reports/docx/draw_my_module_repository.rb b/app/services/reports/docx/draw_my_module_repository.rb
index e6560c46e..b552211d1 100644
--- a/app/services/reports/docx/draw_my_module_repository.rb
+++ b/app/services/reports/docx/draw_my_module_repository.rb
@@ -13,7 +13,7 @@ module Reports::Docx::DrawMyModuleRepository
 
     return false unless repository_data[:rows].any? && can_read_repository?(@user, repository)
 
-    table = prepare_row_columns(repository_data, my_module, repository)
+    table = prepare_row_columns_for_docx(repository_data, my_module, repository)
 
     @docx.p
     @docx.p I18n.t('projects.reports.elements.module_repository.name',
diff --git a/app/services/reports/docx/repository_helper.rb b/app/services/reports/docx/repository_helper.rb
index f24065fd9..ff25507ef 100644
--- a/app/services/reports/docx/repository_helper.rb
+++ b/app/services/reports/docx/repository_helper.rb
@@ -4,7 +4,7 @@ module Reports::Docx::RepositoryHelper
   include InputSanitizeHelper
   include ActionView::Helpers::NumberHelper
 
-  def prepare_row_columns(repository_data, my_module, repository)
+  def prepare_row_columns_for_docx(repository_data, my_module, repository)
     result = [repository_data[:headers]]
     repository_data[:rows].each do |record|
       row = []
diff --git a/app/services/reports/html_to_word_converter.rb b/app/services/reports/html_to_word_converter.rb
index 31dc9beeb..f4e312f8e 100644
--- a/app/services/reports/html_to_word_converter.rb
+++ b/app/services/reports/html_to_word_converter.rb
@@ -92,7 +92,19 @@ module Reports
         end
 
         if elem.name == 'img'
-          elements.push(img_element(elem))
+          begin
+            elements.push(img_element(elem))
+          rescue StandardError => e
+            Rails.logger.error e.message
+            Rails.logger.error(e.backtrace.join("\n"))
+
+            elements.push(
+              type: 'text',
+              value: I18n.t('projects.reports.index.generation.file_preview_generation_error'),
+              style: { italic: true }
+            )
+          end
+
           next
         end
 
diff --git a/app/services/reports/utils.rb b/app/services/reports/utils.rb
index 055acc567..c28108c3e 100644
--- a/app/services/reports/utils.rb
+++ b/app/services/reports/utils.rb
@@ -11,9 +11,9 @@ module Reports
     def self.image_prepare(asset)
       if asset.class == Asset
         if asset.inline?
-          asset.preview_attachment.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT, format: :png)
+          asset.medium_preview
         else
-          asset.preview_attachment.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT, format: :png)
+          asset.large_preview
         end
       elsif asset.class == TinyMceAsset
         asset.image.representation(format: :png)
diff --git a/app/services/repository_csv_export.rb b/app/services/repository_csv_export.rb
index 9f164b938..05e3b67bc 100644
--- a/app/services/repository_csv_export.rb
+++ b/app/services/repository_csv_export.rb
@@ -2,82 +2,116 @@
 
 require 'csv'
 
-module RepositoryCsvExport
-  def self.to_csv(rows, column_ids, user, repository, handle_file_name_func, in_module)
-    # Parse column names
-    csv_header = []
+class RepositoryCsvExport
+  def self.to_csv(rows, column_ids, repository, handle_file_name_func, in_module, ordered_row_ids = nil)
     add_consumption = in_module && !repository.is_a?(RepositorySnapshot) && repository.has_stock_management?
-    column_ids.each do |c_id|
-      case c_id
-      when -1, -2
-        next
-      when -3
-        csv_header << I18n.t('repositories.table.id')
-      when -4
-        csv_header << I18n.t('repositories.table.row_name')
-      when -5
-        csv_header << I18n.t('repositories.table.added_by')
-      when -6
-        csv_header << I18n.t('repositories.table.added_on')
-      when -7
-        csv_header << I18n.t('repositories.table.updated_on')
-      when -8
-        csv_header << I18n.t('repositories.table.updated_by')
-      when -9
-        csv_header << I18n.t('repositories.table.archived_by')
-      when -10
-        csv_header << I18n.t('repositories.table.archived_on')
-      when -11
-        csv_header << I18n.t('repositories.table.parents')
-        csv_header << I18n.t('repositories.table.children')
-      else
-        csv_header << repository.repository_columns.find_by(id: c_id)&.name
-      end
-    end
-    csv_header << I18n.t('repositories.table.row_consumption') if add_consumption
+    csv_header = build_header(repository, column_ids, add_consumption)
 
     CSV.generate do |csv|
       csv << csv_header
-      rows.each do |row|
-        csv_row = []
-        column_ids.each do |c_id|
-          case c_id
-          when -1, -2
-            next
-          when -3
-            csv_row << (repository.is_a?(RepositorySnapshot) ? row.parent.code : row.code)
-          when -4
-            csv_row << row.name
-          when -5
-            csv_row << row.created_by.full_name
-          when -6
-            csv_row << I18n.l(row.created_at, format: :full)
-          when -7
-            csv_row << (row.updated_at ? I18n.l(row.updated_at, format: :full) : '')
-          when -8
-            csv_row << row.last_modified_by.full_name
-          when -9
-            csv_row << (row.archived? && row.archived_by.present? ? row.archived_by.full_name : '')
-          when -10
-            csv_row << (row.archived? && row.archived_on.present? ? I18n.l(row.archived_on, format: :full) : '')
-          when -11
-            csv_row << row.parent_repository_rows.map(&:code).join(' | ')
-            csv_row << row.child_repository_rows.map(&:code).join(' | ')
-          else
-            cell = row.repository_cells.find_by(repository_column_id: c_id)
 
-            csv_row << if cell
-                         if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
-                           handle_file_name_func.call(cell.value.asset)
-                         else
-                           cell.value.export_formatted
-                         end
-                       end
-          end
+      rows = rows.preload(:parent) if repository.is_a?(RepositorySnapshot)
+      rows = rows.left_outer_joins(:created_by, :last_modified_by, :archived_by)
+                 .joins('LEFT OUTER JOIN "users" "created_by" ON "created_by"."id" = "repository_rows"."created_by_id"')
+                 .joins('LEFT OUTER JOIN "users" "last_modified_by" ON "last_modified_by"."id" = "repository_rows"."last_modified_by_id"')
+                 .joins('LEFT OUTER JOIN "users" "archived_by" ON "archived_by"."id" = "repository_rows"."archived_by_id"')
+                 .preload(:parent_repository_rows,
+                          :child_repository_rows,
+                          repository_cells: { repository_column: nil, value: repository.cell_preload_includes })
+                 .select('repository_rows.* AS repository_rows')
+                 .select('created_by.full_name AS created_by_full_name')
+                 .select('last_modified_by.full_name AS last_modified_by_full_name')
+                 .select('archived_by.full_name AS archived_by_full_name')
+
+      if ordered_row_ids.present?
+        rows = rows.order(RepositoryRow.sanitize_sql_for_order([Arel.sql('array_position(ARRAY[?], repository_rows.id)'), ordered_row_ids]))
+        rows.each do |row|
+          csv << build_row(row, column_ids, repository, handle_file_name_func, add_consumption)
+        end
+      else
+        rows.find_each(batch_size: 100) do |row|
+          csv << build_row(row, column_ids, repository, handle_file_name_func, add_consumption)
         end
-        csv_row << row.row_consumption(row.stock_consumption) if add_consumption
-        csv << csv_row
       end
     end.encode('UTF-8', invalid: :replace, undef: :replace)
   end
+
+  class << self
+    private
+
+    def build_header(repository, column_ids, add_consumption)
+      # Parse column names
+      csv_header = []
+      custom_columns = repository.repository_columns.select(:id, :name)
+      column_ids.each do |c_id|
+        case c_id
+        when -1, -2
+          next
+        when -3
+          csv_header << I18n.t('repositories.table.id')
+        when -4
+          csv_header << I18n.t('repositories.table.row_name')
+        when -5
+          csv_header << I18n.t('repositories.table.added_by')
+        when -6
+          csv_header << I18n.t('repositories.table.added_on')
+        when -7
+          csv_header << I18n.t('repositories.table.updated_on')
+        when -8
+          csv_header << I18n.t('repositories.table.updated_by')
+        when -9
+          csv_header << I18n.t('repositories.table.archived_by')
+        when -10
+          csv_header << I18n.t('repositories.table.archived_on')
+        when -11
+          csv_header << I18n.t('repositories.table.parents')
+          csv_header << I18n.t('repositories.table.children')
+        else
+          csv_header << custom_columns.find { |column| column.id == c_id }&.name
+        end
+      end
+      csv_header << I18n.t('repositories.table.row_consumption') if add_consumption
+      csv_header
+    end
+
+    def build_row(row, column_ids, repository, handle_file_name_func, add_consumption)
+      csv_row = []
+      column_ids.each do |c_id|
+        case c_id
+        when -1, -2
+          next
+        when -3
+          csv_row << (repository.is_a?(RepositorySnapshot) ? row.parent.code : row.code)
+        when -4
+          csv_row << row.name
+        when -5
+          csv_row << row.created_by_full_name
+        when -6
+          csv_row << I18n.l(row.created_at, format: :full)
+        when -7
+          csv_row << (row.updated_at ? I18n.l(row.updated_at, format: :full) : '')
+        when -8
+          csv_row << row.last_modified_by_full_name
+        when -9
+          csv_row << (row.archived? && row.archived_by.present? ? row.archived_by_full_name : '')
+        when -10
+          csv_row << (row.archived? && row.archived_on.present? ? I18n.l(row.archived_on, format: :full) : '')
+        when -11
+          csv_row << row.parent_repository_rows.map(&:code).join(' | ')
+          csv_row << row.child_repository_rows.map(&:code).join(' | ')
+        else
+          cell = row.repository_cells.find { |c| c.repository_column_id == c_id }
+          csv_row << if cell
+                       if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
+                         handle_file_name_func.call(cell.value.asset)
+                       else
+                         cell.value.export_formatted
+                       end
+                     end
+        end
+      end
+      csv_row << row.row_consumption(row.stock_consumption) if add_consumption
+      csv_row
+    end
+  end
 end
diff --git a/app/services/repository_datatable_service.rb b/app/services/repository_datatable_service.rb
index 44b0d58f6..fa3911d71 100644
--- a/app/services/repository_datatable_service.rb
+++ b/app/services/repository_datatable_service.rb
@@ -13,10 +13,12 @@ class RepositoryDatatableService
   PREDEFINED_COLUMNS = %w(row_id row_name added_on added_by archived_on archived_by
                           assigned relationships updated_on updated_by).freeze
 
-  def initialize(repository, params, user, my_module = nil)
+  def initialize(repository, params, user, my_module = nil, preload_cells: true, disable_reminders: false)
     @repository = repository
     @user = user
     @my_module = my_module
+    @preload_cells = preload_cells
+    @disable_reminders = disable_reminders
     @params = params
     @assigned_view =  @params[:assigned].in?(%w(assigned assigned_simple))
     @sortable_columns = build_sortable_columns
@@ -46,7 +48,7 @@ class RepositoryDatatableService
     repository_rows = fetch_rows(search_value)
 
     # filter only rows with reminders if filter param is present
-    repository_rows = repository_rows.with_active_reminders(@user) if @params[:only_reminders]
+    repository_rows = repository_rows.with_active_reminders(@repository, @user) if @params[:only_reminders]
 
     # Aliased my_module_repository_rows join for consistent assigned counts
     repository_rows =
@@ -77,6 +79,18 @@ class RepositoryDatatableService
                           .group('current_my_module_repository_rows.id')
       end
     end
+
+    if Repository.reminders_enabled? && !@disable_reminders
+      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_reminders')
+        else
+          repository_rows.left_outer_joins_active_reminders(@repository, @user)
+                         .select('COUNT(repository_cells_with_active_reminders.id) > 0 AS has_active_reminders')
+        end
+    end
+
     repository_rows = repository_rows
                       .left_outer_joins(my_module_repository_rows: { my_module: :experiment })
                       .select('COUNT(DISTINCT all_my_module_repository_rows.id) AS "assigned_my_modules_count"')
@@ -85,6 +99,8 @@ class RepositoryDatatableService
                       .select('COALESCE(parent_connections_count, 0) + COALESCE(child_connections_count, 0)
                                AS "relationships_count"')
     repository_rows = repository_rows.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?
 
     sort_rows(order_by_column, repository_rows)
   end
@@ -101,7 +117,7 @@ class RepositoryDatatableService
                        .where(my_module_repository_rows: { my_module_id: @my_module })
                        .count
       else
-        repository_rows.count
+        @repository.repository_rows_count
       end
 
     repository_rows = repository_rows.where(external_id: @params[:external_ids]) if @params[:external_ids]
@@ -128,8 +144,13 @@ class RepositoryDatatableService
 
     repository_rows = repository_rows.where(id: advanced_search(repository_rows)) if @params[:advanced_search].present?
 
-    repository_rows.left_outer_joins(:created_by, :archived_by, :last_modified_by)
+    repository_rows.joins('LEFT OUTER JOIN "users" "created_by" ON "created_by"."id" = "repository_rows"."created_by_id"')
+                   .joins('LEFT OUTER JOIN "users" "last_modified_by" ON "last_modified_by"."id" = "repository_rows"."last_modified_by_id"')
+                   .joins('LEFT OUTER JOIN "users" "archived_by" ON "archived_by"."id" = "repository_rows"."archived_by_id"')
                    .select('repository_rows.*')
+                   .select('MAX("created_by"."full_name") AS created_by_full_name')
+                   .select('MAX("last_modified_by"."full_name") AS last_modified_by_full_name')
+                   .select('MAX("archived_by"."full_name") AS archived_by_full_name')
                    .select('COUNT("repository_rows"."id") OVER() AS filtered_count')
                    .group('repository_rows.id')
   end
@@ -616,7 +637,7 @@ class RepositoryDatatableService
              .group('values.value')
              .order("values.value #{dir}")
     when 'users.full_name'
-      records.group('users.full_name').order("users.full_name #{dir}")
+      records.group('created_by.full_name').order("created_by.full_name #{dir}")
     when 'consumed_stock'
       records.order("#{@sortable_columns[column_id - 1]} #{dir}")
     when 'relationships'
diff --git a/app/services/repository_export_service.rb b/app/services/repository_export_service.rb
index 486bea738..6724e1d6a 100644
--- a/app/services/repository_export_service.rb
+++ b/app/services/repository_export_service.rb
@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
 class RepositoryExportService
-  def initialize(file_type, rows, columns, user, repository, handle_name_func = nil, in_module: false)
+  def initialize(file_type, rows, columns, repository, handle_name_func = nil, in_module: false, ordered_row_ids: nil)
     @file_type = file_type
-    @user = user
     @rows = rows
     @columns = columns
     @repository = repository
     @handle_name_func = handle_name_func
     @in_module = in_module
+    @ordered_row_ids = ordered_row_ids
   end
 
   def export!
     case @file_type
     when :csv
-      file_data = RepositoryCsvExport.to_csv(@rows, @columns, @user, @repository, @handle_name_func, @in_module)
+      file_data = RepositoryCsvExport.to_csv(@rows, @columns, @repository, @handle_name_func, @in_module, @ordered_row_ids)
     when :xlsx
-      file_data = RepositoryXlsxExport.to_xlsx(@rows, @columns, @user, @repository, @handle_name_func, @in_module)
+      file_data = RepositoryXlsxExport.to_xlsx(@rows, @columns, @repository, @handle_name_func, @in_module, @ordered_row_ids)
     end
 
     file_data
diff --git a/app/services/repository_snapshot_datatable_service.rb b/app/services/repository_snapshot_datatable_service.rb
index c0e8528ea..eaaef2390 100644
--- a/app/services/repository_snapshot_datatable_service.rb
+++ b/app/services/repository_snapshot_datatable_service.rb
@@ -18,6 +18,10 @@ class RepositorySnapshotDatatableService < RepositoryDatatableService
     order_by_column = { column: order_params[:column].to_i, dir: order_params[:dir] }
 
     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
@@ -44,8 +48,9 @@ class RepositorySnapshotDatatableService < RepositoryDatatableService
       repository_rows = results
     end
 
-    repository_rows.left_outer_joins(:created_by)
+    repository_rows.joins('LEFT OUTER JOIN "users" "created_by" ON "created_by"."id" = "repository_rows"."created_by_id"')
                    .select('repository_rows.*')
+                   .select('MAX("created_by"."full_name") AS created_by_full_name')
                    .select('COUNT("repository_rows"."id") OVER() AS filtered_count')
                    .group('repository_rows.id')
   end
diff --git a/app/services/repository_xlsx_export.rb b/app/services/repository_xlsx_export.rb
index 317f29b97..dd1f7d3e1 100644
--- a/app/services/repository_xlsx_export.rb
+++ b/app/services/repository_xlsx_export.rb
@@ -2,12 +2,12 @@
 
 require 'caxlsx'
 
-module RepositoryXlsxExport
+class RepositoryXlsxExport
   def self.to_empty_xlsx(repository, column_ids)
     package = Axlsx::Package.new
     workbook = package.workbook
     workbook.add_worksheet(name: 'Data Export') do |sheet|
-      sheet.add_row prepare_header(repository, column_ids, false)
+      sheet.add_row build_header(repository, column_ids, false)
     end
 
     add_instruction(workbook)
@@ -15,7 +15,7 @@ module RepositoryXlsxExport
     package.to_stream.read
   end
 
-  def self.to_xlsx(rows, column_ids, user, repository, handle_file_name_func, in_module)
+  def self.to_xlsx(rows, column_ids, repository, handle_file_name_func, in_module, ordered_row_ids = nil)
     package = Axlsx::Package.new
     workbook = package.workbook
     datetime_style = workbook.styles.add_style format_code: 'dd-mmm-yyyy hh:mm:ss'
@@ -24,61 +24,32 @@ module RepositoryXlsxExport
     add_consumption = in_module && !repository.is_a?(RepositorySnapshot) && repository.has_stock_management?
 
     workbook.add_worksheet(name: 'Data Export') do |sheet|
-      sheet.add_row prepare_header(repository, column_ids, add_consumption)
+      sheet.add_row build_header(repository, column_ids, add_consumption)
 
-      rows.each do |row|
-        row_data = []
-        column_ids.each do |c_id|
-          case c_id
-          when -1, -2
-            next
-          when -3
-            row_data << (repository.is_a?(RepositorySnapshot) ? row.parent.code : row.code)
-          when -4
-            row_data << row.name
-          when -5
-            row_data << row.created_by.full_name
-          when -6
-            row_data << row.created_at
-          when -7
-            row_data << row.updated_at
-          when -8
-            row_data << row.last_modified_by.full_name
-          when -9
-            row_data << (row.archived? && row.archived_by.present? ? row.archived_by.full_name : '')
-          when -10
-            row_data << row.archived_on
-          when -11
-            row_data << row.parent_repository_rows.map(&:code).join(' | ')
-            row_data << row.child_repository_rows.map(&:code).join(' | ')
-          else
-            cell = row.repository_cells.find_by(repository_column_id: c_id)
-            row_data << if cell
-                          if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
-                            handle_file_name_func.call(cell.value.asset)
-                          elsif cell.value.is_a?(RepositoryDateTimeValue) || cell.value.is_a?(RepositoryDateValue)
-                            cell.value.data
-                          else
-                            cell.value.export_formatted
-                          end
-                        end
-          end
+      rows = rows.preload(:parent) if repository.is_a?(RepositorySnapshot)
+      rows = rows.left_outer_joins(:created_by, :last_modified_by, :archived_by)
+                 .joins('LEFT OUTER JOIN "users" "created_by" ON "created_by"."id" = "repository_rows"."created_by_id"')
+                 .joins('LEFT OUTER JOIN "users" "last_modified_by" ON "last_modified_by"."id" = "repository_rows"."last_modified_by_id"')
+                 .joins('LEFT OUTER JOIN "users" "archived_by" ON "archived_by"."id" = "repository_rows"."archived_by_id"')
+                 .preload(:parent_repository_rows,
+                          :child_repository_rows,
+                          repository_cells: { repository_column: nil, value: repository.cell_preload_includes })
+                 .select('repository_rows.* AS repository_rows')
+                 .select('created_by.full_name AS created_by_full_name')
+                 .select('last_modified_by.full_name AS last_modified_by_full_name')
+                 .select('archived_by.full_name AS archived_by_full_name')
+
+      if ordered_row_ids.present?
+        rows = rows.order(RepositoryRow.sanitize_sql_for_order([Arel.sql('array_position(ARRAY[?], repository_rows.id)'), ordered_row_ids]))
+        rows.each do |row|
+          row_data = build_row(row, column_ids, repository, handle_file_name_func, add_consumption)
+          sheet.add_row(row_data, style: build_row_style(row_data, datetime_style, date_style))
         end
-        row_data << row.row_consumption(row.stock_consumption) if add_consumption
-
-        style = row_data.map do |c|
-          case c
-          when ActiveSupport::TimeWithZone
-            datetime_style
-          when Time # Date values are of class Time for some reason
-            date_style
-          end
+      else
+        rows.find_each(batch_size: 100) do |row|
+          row_data = build_row(row, column_ids, repository, handle_file_name_func, add_consumption)
+          sheet.add_row(row_data, style: build_row_style(row_data, datetime_style, date_style))
         end
-
-        sheet.add_row(
-          row_data,
-          style: style
-        )
       end
     end
 
@@ -87,44 +58,101 @@ module RepositoryXlsxExport
     package.to_stream.read
   end
 
-  def self.add_instruction(workbook)
-    workbook.add_worksheet(name: 'Instruction') do |sheet|
-      image = File.expand_path('app/assets/images/import_instruction.png')
-      sheet.add_image(image_src: image, start_at: 'A1', width: 1260, height: 994)
-    end
-  end
+  class << self
+    private
 
-  def self.prepare_header(repository, column_ids, add_consumption)
-    header = []
-    column_ids.each do |c_id|
-      case c_id
-      when -1, -2
-        next
-      when -3
-        header << I18n.t('repositories.table.id')
-      when -4
-        header << I18n.t('repositories.table.row_name')
-      when -5
-        header << I18n.t('repositories.table.added_by')
-      when -6
-        header << I18n.t('repositories.table.added_on')
-      when -7
-        header << I18n.t('repositories.table.updated_on')
-      when -8
-        header << I18n.t('repositories.table.updated_by')
-      when -9
-        header << I18n.t('repositories.table.archived_by')
-      when -10
-        header << I18n.t('repositories.table.archived_on')
-      when -11
-        header << I18n.t('repositories.table.parents')
-        header << I18n.t('repositories.table.children')
-      else
-        header << repository.repository_columns.find_by(id: c_id)&.name
+    def add_instruction(workbook)
+      workbook.add_worksheet(name: 'Instruction') do |sheet|
+        image = File.expand_path('app/assets/images/import_instruction.png')
+        sheet.add_image(image_src: image, start_at: 'A1', width: 1260, height: 994)
       end
     end
-    header << I18n.t('repositories.table.row_consumption') if add_consumption
 
-    header
+    def build_header(repository, column_ids, add_consumption)
+      header = []
+      custom_columns = repository.repository_columns.select(:id, :name)
+      column_ids.each do |c_id|
+        case c_id
+        when -1, -2
+          next
+        when -3
+          header << I18n.t('repositories.table.id')
+        when -4
+          header << I18n.t('repositories.table.row_name')
+        when -5
+          header << I18n.t('repositories.table.added_by')
+        when -6
+          header << I18n.t('repositories.table.added_on')
+        when -7
+          header << I18n.t('repositories.table.updated_on')
+        when -8
+          header << I18n.t('repositories.table.updated_by')
+        when -9
+          header << I18n.t('repositories.table.archived_by')
+        when -10
+          header << I18n.t('repositories.table.archived_on')
+        when -11
+          header << I18n.t('repositories.table.parents')
+          header << I18n.t('repositories.table.children')
+        else
+          header << custom_columns.find { |column| column.id == c_id }&.name
+        end
+      end
+      header << I18n.t('repositories.table.row_consumption') if add_consumption
+      header
+    end
+
+    def build_row(row, column_ids, repository, handle_file_name_func, add_consumption)
+      row_data = []
+      column_ids.each do |c_id|
+        case c_id
+        when -1, -2
+          next
+        when -3
+          row_data << (repository.is_a?(RepositorySnapshot) ? row.parent.code : row.code)
+        when -4
+          row_data << row.name
+        when -5
+          row_data << row.created_by_full_name
+        when -6
+          row_data << row.created_at
+        when -7
+          row_data << row.updated_at
+        when -8
+          row_data << row.last_modified_by_full_name
+        when -9
+          row_data << (row.archived? && row.archived_by.present? ? row.archived_by_full_name : '')
+        when -10
+          row_data << row.archived_on
+        when -11
+          row_data << row.parent_repository_rows.map(&:code).join(' | ')
+          row_data << row.child_repository_rows.map(&:code).join(' | ')
+        else
+          cell = row.repository_cells.find { |c| c.repository_column_id == c_id }
+          row_data << if cell
+                        if cell.value_type == 'RepositoryAssetValue' && handle_file_name_func
+                          handle_file_name_func.call(cell.value.asset)
+                        elsif cell.value.is_a?(RepositoryDateTimeValue) || cell.value.is_a?(RepositoryDateValue)
+                          cell.value.data
+                        else
+                          cell.value.export_formatted
+                        end
+                      end
+        end
+      end
+      row_data << row.row_consumption(row.stock_consumption) if add_consumption
+      row_data
+    end
+
+    def build_row_style(row_data, datetime_style, date_style)
+      row_data.map do |c|
+        case c
+        when ActiveSupport::TimeWithZone
+          datetime_style
+        when Time # Date values are of class Time for some reason
+          date_style
+        end
+      end
+    end
   end
 end
diff --git a/app/services/smart_annotations/permission_eval.rb b/app/services/smart_annotations/permission_eval.rb
index f9110d9e5..5f4eb209d 100644
--- a/app/services/smart_annotations/permission_eval.rb
+++ b/app/services/smart_annotations/permission_eval.rb
@@ -25,7 +25,7 @@ module SmartAnnotations
 
       def validate_rep_item_permissions(user, team, object)
         if object.repository
-          return Repository.accessible_by_teams(team).find_by(id: object.repository_id).present? &&
+          return Repository.viewable_by_user(user, team).find_by(id: object.repository_id).present? &&
                  can_read_repository?(user, object.repository)
         end
 
diff --git a/app/services/smart_annotations/tag_to_html.rb b/app/services/smart_annotations/tag_to_html.rb
index c543c1169..317770e1d 100644
--- a/app/services/smart_annotations/tag_to_html.rb
+++ b/app/services/smart_annotations/tag_to_html.rb
@@ -2,8 +2,9 @@
 
 module SmartAnnotations
   class TagToHtml
-    REGEX = /\[\#(.*?)~(prj|exp|tsk|rep_item)~([0-9a-zA-Z]+)\]/.freeze
-    USER_REGEX = /\[@(.*?)~([0-9a-zA-Z]+)\]/.freeze
+    ALL_REGEX = /\[(@(.*?)|\#(.*?)~(prj|exp|tsk|rep_item))~([0-9a-zA-Z]+)\]/
+    ITEMS_REGEX = /\[\#(.*?)~(prj|exp|tsk|rep_item)~([0-9a-zA-Z]+)\]/
+    USER_REGEX = /\[@(.*?)~([0-9a-zA-Z]+)\]/
     attr_reader :html
 
     def initialize(user, team, text, preview_repository = false)
@@ -18,7 +19,7 @@ module SmartAnnotations
                         rep_item: RepositoryRow }.freeze
 
     def parse(user, team, text, preview_repository = false)
-      @html = text.gsub(REGEX) do |el|
+      @html = text.gsub(ITEMS_REGEX) do |el|
         value = extract_values(el)
         type = value[:object_type]
         begin
@@ -49,7 +50,7 @@ module SmartAnnotations
     end
 
     def extract_values(element)
-      match = element.match(REGEX)
+      match = element.match(ITEMS_REGEX)
       {
         name: match[1],
         object_type: match[2],
diff --git a/app/services/smart_annotations/tag_to_text.rb b/app/services/smart_annotations/tag_to_text.rb
index 70819ea54..51ab125b7 100644
--- a/app/services/smart_annotations/tag_to_text.rb
+++ b/app/services/smart_annotations/tag_to_text.rb
@@ -2,6 +2,9 @@
 
 module SmartAnnotations
   class TagToText
+    USER_REGEX = /\[@(.*?)~([0-9a-zA-Z]+)\]/
+    ITEMS_REGEX = /\[\#(.*?)~(prj|exp|tsk|rep_item)~([0-9a-zA-Z]+)\]/
+
     attr_reader :text
 
     def initialize(user, team, text, is_shared_object: false)
@@ -11,8 +14,6 @@ module SmartAnnotations
 
     private
 
-    USER_REGEX = /\[\@(.*?)~([0-9a-zA-Z]+)\]/
-    ITEMS_REGEX = /\[\#(.*?)~(prj|exp|tsk|rep_item)~([0-9a-zA-Z]+)\]/
     OBJECT_MAPPINGS = { prj: Project,
                         exp: Experiment,
                         tsk: MyModule,
diff --git a/app/services/storage_locations/export_service.rb b/app/services/storage_locations/export_service.rb
new file mode 100644
index 000000000..01275dff2
--- /dev/null
+++ b/app/services/storage_locations/export_service.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'caxlsx'
+
+module StorageLocations
+  class ExportService
+    include Canaid::Helpers::PermissionsHelper
+    def initialize(storage_location, user)
+      @storage_location = storage_location
+      @user = user
+    end
+
+    def to_xlsx
+      package = Axlsx::Package.new
+      workbook = package.workbook
+
+      workbook.add_worksheet(name: 'Box Export') do |sheet|
+        sheet.add_row ['Box position', 'Item ID', 'Item name']
+
+        if @storage_location.with_grid?
+          x = @storage_location.grid_size[0].to_i
+          y = @storage_location.grid_size[1].to_i
+          x.times do |row|
+            y.times do |col|
+              repository_row = @storage_location.storage_location_repository_rows.find_by(metadata: { position: [row + 1, col + 1] })&.repository_row
+              row_name = repository_row.name if repository_row && can_read_repository?(@user, repository_row.repository)
+              sheet.add_row [format_position([row + 1, col + 1]), repository_row&.code, row_name]
+            end
+          end
+        else
+          @storage_location.storage_location_repository_rows.each do |storage_location_item|
+            row = storage_location_item.repository_row
+            row_name = row.name if can_read_repository?(@user, row.repository)
+            sheet.add_row [format_position(storage_location_item.metadata['position']), storage_location_item.repository_row.code, row_name]
+          end
+        end
+      end
+
+      package.to_stream.read
+    end
+
+    private
+
+    def format_position(position)
+      return unless position
+
+      column_letter = ('A'..'Z').to_a[position[0] - 1]
+      row_number = position[1]
+
+      "#{column_letter}#{row_number}"
+    end
+  end
+end
diff --git a/app/services/storage_locations/import_service.rb b/app/services/storage_locations/import_service.rb
new file mode 100644
index 000000000..70bcb6ab0
--- /dev/null
+++ b/app/services/storage_locations/import_service.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+require 'caxlsx'
+
+module StorageLocations
+  class ImportService
+    class PositionNotValid < StandardError; end
+
+    def initialize(storage_location, file, user)
+      @storage_location = storage_location
+      @assigned_count = 0
+      @unassigned_count = 0
+      @sheet = SpreadsheetParser.open_spreadsheet(file)
+      @user = user
+    end
+
+    def import_items
+      @rows = SpreadsheetParser.spreadsheet_enumerator(@sheet).to_a
+
+      # Check if the file has proper headers
+      header = SpreadsheetParser.parse_row(@rows[0], @sheet)
+      return { status: :error, message: I18n.t('storage_locations.show.import_modal.errors.invalid_structure') } unless header[0] == 'Box position' && header[1] == 'Item ID'
+
+      parse_rows!
+
+      # Check duplicate positions in the file
+      if @storage_location.with_grid? && @rows.pluck(:position).uniq.length != @rows.length
+        return { status: :error, message: I18n.t('storage_locations.show.import_modal.errors.invalid_position') }
+      end
+
+      # Check if duplicate repository rows are present in the file
+      if !@storage_location.with_grid? && @rows.pluck(:repository_row_id).uniq.length != @rows.length
+        return { status: :error, message: I18n.t('storage_locations.show.import_modal.errors.duplicate_items') }
+      end
+
+      ActiveRecord::Base.transaction do
+        unassign_repository_rows! if @storage_location.with_grid?
+
+        @rows.each do |row|
+          next if row[:repository_row_id].blank?
+
+          if @storage_location.with_grid? && !position_valid?(row[:position])
+            @error_message = I18n.t('storage_locations.show.import_modal.errors.invalid_position')
+            raise ActiveRecord::RecordInvalid
+          end
+
+          unless RepositoryRow.exists?(id: row[:repository_row_id], parent_id: nil)
+            @error_message = I18n.t('storage_locations.show.import_modal.errors.invalid_item', row_id: row[:repository_row_id])
+            raise ActiveRecord::RecordNotFound
+          end
+
+          import_row!(row)
+        end
+      end
+
+      { status: :ok, assigned_count: @assigned_count, unassigned_count: @unassigned_count, updated_count: @updated_count }
+    rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid
+      { status: :error, message: @error_message }
+    rescue PositionNotValid
+      { status: :error, message: I18n.t('storage_locations.show.import_modal.errors.invalid_position') }
+    end
+
+    private
+
+    def parse_rows!
+      # Remove first row
+      @rows.shift
+
+      @rows.map! do |r|
+        row = SpreadsheetParser.parse_row(r, @sheet)
+        {
+          position: convert_position_letter_to_number(row[0]),
+          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)
+      storage_location_repository_row = if @storage_location.with_grid?
+                                          @storage_location.storage_location_repository_rows
+                                                           .find_or_initialize_by(
+                                                             repository_row_id: row[:repository_row_id],
+                                                             metadata: { position: row[:position] }
+                                                           )
+                                        else
+                                          @storage_location.storage_location_repository_rows
+                                                           .find_or_initialize_by(repository_row_id: row[:repository_row_id])
+                                        end
+
+      if storage_location_repository_row.new_record?
+        @assigned_count += 1
+        storage_location_repository_row.update!(created_by: @user)
+      end
+    end
+
+    def unassign_repository_rows!
+      @storage_location.storage_location_repository_rows.each do |s|
+        if @rows.exclude?({ position: s.metadata['position'], repository_row_id: s.repository_row_id })
+          @unassigned_count += 1
+          s.discard
+        end
+      end
+    end
+
+    def position_valid?(position)
+      position[0].to_i <= @storage_location.grid_size[0].to_i && position[1].to_i <= @storage_location.grid_size[1].to_i
+    end
+
+    def convert_position_letter_to_number(position)
+      return unless position
+
+      raise PositionNotValid unless position.to_s.match?(/^[A-Z]\d+$/)
+
+      column_letter = position[0]
+      row_number = position[1..]
+
+      [column_letter.ord - 64, row_number.to_i]
+    end
+  end
+end
diff --git a/app/services/team_importer.rb b/app/services/team_importer.rb
index 42a175881..e81c651c6 100644
--- a/app/services/team_importer.rb
+++ b/app/services/team_importer.rb
@@ -71,7 +71,6 @@ class TeamImporter
       # Find new id of the first admin in the team
       @admin_id = @user_mappings[team_json['default_admin_id']]
 
-      create_notifications(team_json['notifications'])
       create_protocol_keywords(team_json['protocol_keywords'], team)
       create_protocols(team_json['protocols'], nil, team)
       create_project_folders(team_json['project_folders'], team)
@@ -83,17 +82,6 @@ class TeamImporter
       # Second run, we needed it because of some models should be created
 
       team_json['users'].each do |user_json|
-        user_json['user_notifications'].each do |user_notification_json|
-          user_notification = UserNotification.new(user_notification_json)
-          user_notification.id = nil
-          user_notification.user_id = find_user(user_notification.user_id)
-          user_notification.notification_id =
-            @notification_mappings[user_notification.notification_id]
-          next if user_notification.notification_id.blank?
-
-          user_notification.save!
-        end
-
         user_json['repository_table_states'].each do |rep_tbl_state_json|
           rep_tbl_state = RepositoryTableState.new(rep_tbl_state_json)
           rep_tbl_state.id = nil
@@ -423,21 +411,6 @@ class TeamImporter
     end
   end
 
-  def create_notifications(notifications_json)
-    puts 'Creating notifications...'
-    notifications_json.each do |notification_json|
-      notification = Notification.new(notification_json)
-      next if notification.type_of.blank?
-
-      orig_notification_id = notification.id
-      notification.id = nil
-      notification.generator_user_id = find_user(notification.generator_user_id)
-      notification.save!
-      @notification_mappings[orig_notification_id] = notification.id
-      @notification_counter += 1
-    end
-  end
-
   def create_repositories(repositories_json, team, snapshots = false)
     puts 'Creating repositories...'
     repositories_json.each do |repository_json|
@@ -756,7 +729,7 @@ class TeamImporter
   def create_protocols(protocols_json, my_module = nil, team = nil,
                        user_id = nil)
 
-    sorted_protocols = protocols_json.sort_by { |p| p['id'] }
+    sorted_protocols = protocols_json.sort_by { |p| p['protocol']['id'] }
 
     puts 'Creating protocols...'
     sorted_protocols.each do |protocol_json|
@@ -961,7 +934,7 @@ class TeamImporter
       user_id || find_user(asset.last_modified_by_id)
     asset.team = team
     asset.save!
-    asset.file.attach(io: file, filename: File.basename(file))
+    asset.attach_file_version(io: file, filename: File.basename(file))
     asset.post_process_file
     @asset_mappings[orig_asset_id] = asset.id
     @asset_counter += 1
diff --git a/app/services/toolbars/my_modules_service.rb b/app/services/toolbars/my_modules_service.rb
index 2efb4d24a..87ff407ed 100644
--- a/app/services/toolbars/my_modules_service.rb
+++ b/app/services/toolbars/my_modules_service.rb
@@ -41,6 +41,7 @@ module Toolbars
         name: 'restore',
         label: I18n.t('experiments.table.toolbar.restore'),
         icon: 'sn-icon sn-icon-restore',
+        button_id: 'restoreTask',
         path: restore_my_modules_experiment_path(experiment),
         type: :emit
       }
@@ -68,16 +69,12 @@ module Toolbars
 
       return unless can_read_my_module?(my_module)
 
-      path = if can_manage_my_module_users?(my_module)
-               edit_access_permissions_my_module_path(my_module)
-             else
-               access_permissions_my_module_path(my_module)
-             end
-
       {
         name: 'access',
         label: I18n.t('experiments.table.my_module_actions.access'),
         icon: 'sn-icon sn-icon-project-member-access',
+        path: my_module_path(my_module, format: :json),
+        button_id: 'openAccessModal',
         type: :emit
       }
     end
@@ -89,6 +86,7 @@ module Toolbars
         name: 'move',
         label: I18n.t('experiments.table.toolbar.move'),
         icon: 'sn-icon sn-icon-move',
+        button_id: 'moveTask',
         type: :emit,
         path: move_modules_experiment_path(@my_modules.first.experiment, my_module_ids: @my_modules.pluck(:id))
       }
diff --git a/app/services/toolbars/repositories_service.rb b/app/services/toolbars/repositories_service.rb
index b17803a82..34ac15a30 100644
--- a/app/services/toolbars/repositories_service.rb
+++ b/app/services/toolbars/repositories_service.rb
@@ -31,7 +31,7 @@ module Toolbars
     private
 
     def rename_action
-      return unless @single && can_manage_repository?(@repository)
+      return unless @single && can_manage_repository?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       {
         name: :update,
@@ -66,7 +66,9 @@ module Toolbars
     end
 
     def archive_action
-      return unless @repositories.all? { |repository| can_archive_repository?(repository) }
+      return unless @repositories.all? do |repository|
+        can_archive_repository?(repository) && !@repository.is_a?(SoftLockedRepository)
+      end
 
       {
         name: :archive,
@@ -89,7 +91,9 @@ module Toolbars
     end
 
     def restore_action
-      return unless @repositories.all? { |repository| can_archive_repository?(repository) }
+      return unless @repositories.all? do |repository|
+        can_archive_repository?(repository) && !repository.is_a?(SoftLockedRepository)
+      end
 
       {
         name: :restore,
@@ -101,7 +105,7 @@ module Toolbars
     end
 
     def delete_action
-      return unless @single && can_delete_repository?(@repository)
+      return unless @single && can_delete_repository?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       {
         name: :delete,
diff --git a/app/services/toolbars/repository_rows_service.rb b/app/services/toolbars/repository_rows_service.rb
index ad0924727..cfbbdf84e 100644
--- a/app/services/toolbars/repository_rows_service.rb
+++ b/app/services/toolbars/repository_rows_service.rb
@@ -42,7 +42,7 @@ module Toolbars
     private
 
     def restore_action
-      return unless can_manage_repository_rows?(@repository)
+      return unless can_manage_repository_rows?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       return unless @repository_rows.all?(&:archived?)
 
@@ -57,7 +57,7 @@ module Toolbars
     end
 
     def edit_action
-      return unless can_manage_repository_rows?(@repository)
+      return unless can_manage_repository_rows?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       return unless @repository_rows.all?(&:active?)
 
@@ -87,7 +87,7 @@ module Toolbars
     end
 
     def duplicate_action
-      return unless can_create_repository_rows?(@repository)
+      return unless can_create_repository_rows?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       return unless @repository_rows.all?(&:active?)
 
@@ -151,7 +151,7 @@ module Toolbars
     end
 
     def archive_action
-      return unless can_manage_repository_rows?(@repository)
+      return unless can_manage_repository_rows?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       return unless @repository_rows.all?(&:active?)
 
@@ -166,7 +166,7 @@ module Toolbars
     end
 
     def delete_action
-      return unless can_delete_repository_rows?(@repository)
+      return unless can_delete_repository_rows?(@repository) && !@repository.is_a?(SoftLockedRepository)
 
       return unless @repository_rows.all?(&:archived?)
 
diff --git a/app/services/toolbars/storage_location_repository_rows_service.rb b/app/services/toolbars/storage_location_repository_rows_service.rb
new file mode 100644
index 000000000..6c711248d
--- /dev/null
+++ b/app/services/toolbars/storage_location_repository_rows_service.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Toolbars
+  class StorageLocationRepositoryRowsService
+    attr_reader :current_user
+
+    include Canaid::Helpers::PermissionsHelper
+    include Rails.application.routes.url_helpers
+
+    def initialize(current_user, items_ids: [])
+      @current_user = current_user
+      @assigned_rows = StorageLocationRepositoryRow.where(id: items_ids)
+      @storage_location = @assigned_rows.first&.storage_location
+
+      @single = @assigned_rows.length == 1
+    end
+
+    def actions
+      return [] if @assigned_rows.none?
+
+      [
+        unassign_action,
+        move_action
+      ].compact
+    end
+
+    private
+
+    def unassign_action
+      return unless can_manage_storage_location_repository_rows?(@storage_location)
+
+      {
+        name: 'unassign',
+        label: I18n.t('storage_locations.show.toolbar.unassign'),
+        icon: 'sn-icon sn-icon-close',
+        path: unassign_rows_storage_location_path(@storage_location, ids: @assigned_rows.pluck(:id)),
+        type: :emit
+      }
+    end
+
+    def move_action
+      return unless @single && can_manage_storage_location_repository_rows?(@storage_location)
+
+      {
+        name: 'move',
+        label: I18n.t('storage_locations.show.toolbar.move'),
+        icon: 'sn-icon sn-icon-move',
+        path: move_storage_location_storage_location_repository_row_path(
+          @storage_location, @assigned_rows.first
+        ),
+        type: :emit
+      }
+    end
+  end
+end
diff --git a/app/services/toolbars/storage_locations_service.rb b/app/services/toolbars/storage_locations_service.rb
new file mode 100644
index 000000000..955b53b82
--- /dev/null
+++ b/app/services/toolbars/storage_locations_service.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Toolbars
+  class StorageLocationsService
+    attr_reader :current_user
+
+    include Canaid::Helpers::PermissionsHelper
+    include Rails.application.routes.url_helpers
+
+    def initialize(current_user, storage_location_ids: [])
+      @current_user = current_user
+      @storage_locations = StorageLocation.where(id: storage_location_ids)
+
+      @single = @storage_locations.length == 1
+    end
+
+    def actions
+      return [] if @storage_locations.none?
+
+      [
+        edit_action,
+        move_action,
+        duplicate_action,
+        delete_action,
+        share_action
+      ].compact
+    end
+
+    private
+
+    def edit_action
+      return unless @single && can_manage_storage_location?(@storage_locations.first)
+
+      {
+        name: 'edit',
+        label: I18n.t('storage_locations.index.toolbar.edit'),
+        icon: 'sn-icon sn-icon-edit',
+        path: storage_location_path(@storage_locations.first),
+        type: :emit
+      }
+    end
+
+    def move_action
+      return unless @single && can_manage_storage_location?(@storage_locations.first)
+
+      {
+        name: 'move',
+        label: I18n.t('storage_locations.index.toolbar.move'),
+        icon: 'sn-icon sn-icon-move',
+        path: move_storage_location_path(@storage_locations.first),
+        type: :emit
+      }
+    end
+
+    def duplicate_action
+      return unless @single && can_manage_storage_location?(@storage_locations.first)
+
+      {
+        name: 'duplicate',
+        label: I18n.t('storage_locations.index.toolbar.duplicate'),
+        icon: 'sn-icon sn-icon-duplicate',
+        path: duplicate_storage_location_path(@storage_locations.first),
+        type: :emit
+      }
+    end
+
+    def delete_action
+      return unless @single && can_manage_storage_location?(@storage_locations.first)
+
+      storage_location = @storage_locations.first
+
+      number_of_items = storage_location.storage_location_repository_rows.count +
+                        StorageLocation.inner_storage_locations(current_user.current_team, storage_location)
+                                       .where(container: true)
+                                       .joins(:storage_location_repository_rows)
+                                       .count
+      {
+        name: 'delete',
+        label: I18n.t('storage_locations.index.toolbar.delete'),
+        icon: 'sn-icon sn-icon-delete',
+        number_of_items: number_of_items,
+        path: storage_location_path(storage_location),
+        type: :emit
+      }
+    end
+
+    def share_action
+      return unless @single && can_share_storage_location?(@storage_locations.first)
+
+      {
+        name: :share,
+        label: I18n.t('storage_locations.index.share'),
+        icon: 'sn-icon sn-icon-shared',
+        type: :emit
+      }
+    end
+  end
+end
diff --git a/app/utilities/protocol_importers/attachments_builder.rb b/app/utilities/protocol_importers/attachments_builder.rb
index df6788f1d..dd2bd4799 100644
--- a/app/utilities/protocol_importers/attachments_builder.rb
+++ b/app/utilities/protocol_importers/attachments_builder.rb
@@ -7,7 +7,7 @@ module ProtocolImporters
 
       step_json[:attachments].map do |f|
         asset = Asset.new(created_by: user, last_modified_by: user, team: team)
-        asset.file.attach(io: URI.open(f[:url]), filename: f[:name])
+        asset.attach_file_version(io: URI.open(f[:url]), filename: f[:name])
         asset
       end
     end
diff --git a/app/utilities/protocols_importer.rb b/app/utilities/protocols_importer.rb
index a66b8fe02..4738c8eb9 100644
--- a/app/utilities/protocols_importer.rb
+++ b/app/utilities/protocols_importer.rb
@@ -132,7 +132,7 @@ class ProtocolsImporter
         )
 
         # Decode the file bytes
-        asset.file.attach(io: StringIO.new(Base64.decode64(asset_json['bytes'])),
+        asset.attach_file_version(io: StringIO.new(Base64.decode64(asset_json['bytes'])),
                           filename: asset_json['fileName'],
                           content_type: asset_json['fileType'],
                           metadata: JSON.parse(asset_json['fileMetadata'] || '{}'))
diff --git a/app/utilities/protocols_importer_v2.rb b/app/utilities/protocols_importer_v2.rb
index ba6e3b813..9d91f438c 100644
--- a/app/utilities/protocols_importer_v2.rb
+++ b/app/utilities/protocols_importer_v2.rb
@@ -109,7 +109,7 @@ class ProtocolsImporterV2
       )
 
       # Decode the file bytes
-      asset.file.attach(io: StringIO.new(Base64.decode64(asset_json['bytes'])),
+      asset.attach_file_version(io: StringIO.new(Base64.decode64(asset_json['bytes'])),
                         filename: asset_json['fileName'],
                         content_type: asset_json['fileType'],
                         metadata: JSON.parse(asset_json['fileMetadata'] || '{}'))
diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index 754c0c9a9..112377cfe 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -79,7 +79,7 @@
   <div class="panel-footer panel-footer-scinote buttons-container">
     <ul class="nav nav-tabs nav-tabs-less" role="tablist">
       <li role="presentation">
-        <a class="btn btn-light task-card-view-users" href="<%= designated_users_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
+        <a class="task-card-view-users mt-1" href="<%= designated_users_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
           <span class="sn-icon sn-icon-users" aria-hidden="true"></span>
           <span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless my_module.designated_users_count.positive? %>"
                 data-linked-id="<%= my_module.id %>">
@@ -88,13 +88,13 @@
         </a>
       </li>
       <li role="presentation">
-        <a class="btn btn-light task-card-view-activities" href="<%= activities_my_module_url(id: my_module.id, view_mode: my_module.archived_branch? ? 'archived' : 'active') %>"
+        <a class="task-card-view-activities mt-1" href="<%= activities_my_module_url(id: my_module.id, view_mode: my_module.archived_branch? ? 'archived' : 'active') %>"
            aria-controls="<%= my_module.id %>_activities" role="tab">
           <span class="sn-icon sn-icon-activities" aria-hidden="true"></span>
         </a>
       </li>
       <li role="presentation">
-        <a href="#" class="btn btn-light open-comments-sidebar" tabindex=0
+        <a href="#" class="open-comments-sidebar mt-1" tabindex=0
            data-object-type="MyModule" data-object-id="<%= my_module.id %>">
           <span class="sn-icon sn-icon-comments" aria-hidden="true"></span>
           <span id="comment-count-<%= my_module.id %>" class="badge badge-indicator comments-badge-indicator <%= 'hidden' unless my_module.task_comments_count.positive? %>">
diff --git a/app/views/canvas/full_zoom/_tags_modal.html.erb b/app/views/canvas/full_zoom/_tags_modal.html.erb
index 62d3dae97..82807b1f9 100644
--- a/app/views/canvas/full_zoom/_tags_modal.html.erb
+++ b/app/views/canvas/full_zoom/_tags_modal.html.erb
@@ -8,6 +8,7 @@
       project-tags-url="<%= project_tags_path(@project) %>"
       @close="close"
       @tags-loaded="syncTags"
+      @tag-deleted="tagDeleted = true"
     />
   </teleport>
 </div>
diff --git a/app/views/design_elements/_breadcrumbs.html.erb b/app/views/design_elements/_breadcrumbs.html.erb
new file mode 100644
index 000000000..dc24c31d1
--- /dev/null
+++ b/app/views/design_elements/_breadcrumbs.html.erb
@@ -0,0 +1,8 @@
+<div>
+  <h1>breadcrumbs</h1>
+  <div id="breadcrumbs" class="flex items-center gap-4">
+    <Breadcrumbs :breadcrumbs="breadcrumbs">
+  </div>
+</div>
+
+<%= javascript_include_tag 'vue_design_system_breadcrumbs' %>
diff --git a/app/views/design_elements/_radio.html.erb b/app/views/design_elements/_radio.html.erb
new file mode 100644
index 000000000..2d7929388
--- /dev/null
+++ b/app/views/design_elements/_radio.html.erb
@@ -0,0 +1,19 @@
+<h1>Radio</h1>
+<div class="flex flex-items gap-8 p-6">
+  <div class="sci-radio-container">
+    <input type="radio" name="test_1" class="sci-radio">
+    <span class="sci-radio-label">
+  </div>
+  <div class="sci-radio-container">
+    <input type="radio" name="test_1" class="sci-radio" checked>
+    <span class="sci-radio-label">
+  </div>
+  <div class="sci-radio-container">
+    <input type="radio" name="test_2" class="sci-radio" disabled>
+    <span class="sci-radio-label">
+  </div>
+  <div class="sci-radio-container">
+    <input type="radio" name="test_2" class="sci-radio" checked disabled>
+    <span class="sci-radio-label">
+  </div>
+</div>
diff --git a/app/views/design_elements/index.html.erb b/app/views/design_elements/index.html.erb
index b8c3d4dc1..5f9585a19 100644
--- a/app/views/design_elements/index.html.erb
+++ b/app/views/design_elements/index.html.erb
@@ -10,8 +10,12 @@
   end
 %>
 
+<%= render partial: 'radio' %>
+
 <%= render partial: 'select' %>
 
+<%= render partial: 'breadcrumbs' %>
+
 <%= render partial: 'modals' %>
 
 <%= render partial: 'icons', locals: {icons_list: icons_list} %>
diff --git a/app/views/experiments/module_archive.html.erb b/app/views/experiments/module_archive.html.erb
index 89840b75f..4acd02b19 100644
--- a/app/views/experiments/module_archive.html.erb
+++ b/app/views/experiments/module_archive.html.erb
@@ -31,6 +31,17 @@
   <div id="actionToolbar" data-behaviour="vue">
     <action-toolbar actions-url="<%= actions_toolbar_my_modules_url %>" />
   </div>
+
+  <div id="accessModalContainer" class="vue-access-modal"
+       data-roles-url="<%= user_roles_projects_path %>">
+    <div ref="accessModal" id="accessModalComponent"></div>
+    <teleport to="body">
+      <access-modal
+        v-if="accessModalOpen"
+        :params="params"
+        @close="accessModalOpen = false" />
+    </teleport>
+  </div>
 </div>
 <% unless  @my_modules.present? %>
   <div class="pt-10">
@@ -38,5 +49,6 @@
   </div>
 <% end %>
 <%= javascript_include_tag('vue_components_action_toolbar') %>
+<%= javascript_include_tag 'vue_legacy_access_modal' %>
 <%= javascript_include_tag('projects/canvas') %>
 <%= javascript_include_tag('my_modules/archived') %>
diff --git a/app/views/global_activities/references/_repository_row.html.erb b/app/views/global_activities/references/_repository_row.html.erb
index d0e12c272..a8076ad73 100644
--- a/app/views/global_activities/references/_repository_row.html.erb
+++ b/app/views/global_activities/references/_repository_row.html.erb
@@ -7,8 +7,7 @@
                             team,
                             subject.repository.name&.truncate(Constants::NAME_TRUNCATION_LENGTH),
                             title: subject.repository.name) %>
-  <% elsif type_of == 'delete_item_inventory' && values.dig('message_items', 'repository', 'id') %>
-    <% repository = Repository.find(values.dig('message_items', 'repository', 'id')) %>
+  <% elsif repository = Repository.find_by(id: values.dig('message_items', 'repository', 'id')) %>
     <%= route_to_other_team(repository_path(repository.id, team: repository.team.id),
                         team,
                         repository.name&.truncate(Constants::NAME_TRUNCATION_LENGTH),
diff --git a/app/views/global_activities/references/_storage_location.html.erb b/app/views/global_activities/references/_storage_location.html.erb
new file mode 100644
index 000000000..ed8a8787e
--- /dev/null
+++ b/app/views/global_activities/references/_storage_location.html.erb
@@ -0,0 +1,15 @@
+<%= render partial: "global_activities/references/team",
+           locals: { team: team, subject: team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
+<div class="ga-breadcrumb">
+  <span class="sn-icon sn-icon-storage"></span>
+  <% if subject %>
+    <%= route_to_other_team(storage_location_path(subject.id, team: subject.team.id),
+                            team,
+                            subject.name&.truncate(Constants::NAME_TRUNCATION_LENGTH),
+                            title: subject.name) %>
+  <% else %>
+    <span title="<%= breadcrumbs['storage_location'] %>">
+      <%= breadcrumbs['storage_location']&.truncate(Constants::NAME_TRUNCATION_LENGTH) %>
+    </span>
+  <% end %>
+</div>
diff --git a/app/views/my_modules/_header_actions.html.erb b/app/views/my_modules/_header_actions.html.erb
index 10c66eca8..d3780b15d 100644
--- a/app/views/my_modules/_header_actions.html.erb
+++ b/app/views/my_modules/_header_actions.html.erb
@@ -1,4 +1,8 @@
-<div id="taskSecondaryMenu" class="sticky-header-element bg-sn-white border-b border-solid border-0 border-sn-sleepy-grey rounded-t px-4 py-2 pb-[16px] top-0 sticky flex items-center flex-wrap z-[106]">
+<div 
+  id="taskSecondaryMenu"
+  class="sticky-header-element bg-sn-white border-b border-solid border-0 border-sn-sleepy-grey rounded-t px-4 py-2 pb-[16px] top-0 sticky flex items-center flex-wrap z-[106]"
+  data-e2e="e2e-CO-taskTopToolbar"
+>
   <div class="flex items-center gap-4 mr-auto">
     <% if can_read_experiment?(@my_module.experiment) %>
       <a class="p-3 border-b-4 border-transparent hover:no-underline uppercase text-bold capitalize <%= is_module_protocols? ? "text-sn-blue" : "text-sn-grey" %>"
diff --git a/app/views/my_modules/protocols/_protocol_status_bar.html.erb b/app/views/my_modules/protocols/_protocol_status_bar.html.erb
index 5b4f78b94..1fd9457c1 100644
--- a/app/views/my_modules/protocols/_protocol_status_bar.html.erb
+++ b/app/views/my_modules/protocols/_protocol_status_bar.html.erb
@@ -8,44 +8,46 @@
       [<%= t("my_modules.protocols.protocol_status_bar.unlinked") %>]
     </span>
   <% end %>
-  <a href="#" id="my-module-protocol-info-button" class="status-info dropdown-toggle
+  <a href="#" id="my-module-protocol-info-button" class="status-info dropdown-toggle 
     <%= 'parent-newer' if @protocol.parent_newer? %>
     <%= 'protocol-newer' if @protocol.newer_than_parent? %>
-    " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-e2e="e2e-BT-task-protocolInfo-openInfo">
     <i class="sn-icon sn-icon-info"></i>
   </a>
-  <div class="dropdown-menu status-info-dropdown" aria-labelledby="my-module-protocol-info-button">
+  <div class="dropdown-menu status-info-dropdown" aria-labelledby="my-module-protocol-info-button" data-e2e="e2e-CO-task-protocolInfo">
     <div class="dropdown-content">
         <div class="dropdown-header">
-          <h2 class="protocol-name">
+          <h2 class="protocol-name" data-e2e="e2e-TX-task-protocolInfo-title">
             <%= @protocol.name_with_label %>
           </h2>
           <% if @protocol.linked? %>
             <div class="protocol-header-info">
-              <span><%= t('my_modules.protocols.protocol_status_bar.protocol_id_label') %> <%= @protocol.original_code %></span>
-              <span><%= t('my_modules.protocols.protocol_status_bar.protocol_version_label') %> <%= @protocol.parent&.version_number %></span>
+              <span data-e2e="e2e-TX-task-protocolInfo-id"><%= t('my_modules.protocols.protocol_status_bar.protocol_id_label') %> <%= @protocol.original_code %></span>
+              <span data-e2e="e2e-TX-task-protocolInfo-version">
+                <%= t('my_modules.protocols.protocol_status_bar.protocol_version_label') %> <%= @protocol.parent&.version_number %>
+              </span>
             </div>
           <% end %>
         </div>
         <div class="dropdown-body">
           <% if @protocol.unlinked? %>
             <div class="info-line">
-              <div class="description"><%= t("my_modules.protocols.protocol_status_bar.protocol_created") %></div>
-              <div class="value"><%= I18n.l(@protocol.created_at, format: :full) %></div>
+              <div class="description" data-e2e="e2e-TX-task-protocolInfo-createdLabel"><%= t("my_modules.protocols.protocol_status_bar.protocol_created") %></div>
+              <div class="value" data-e2e="e2e-TX-task-protocolInfo-created"><%= I18n.l(@protocol.created_at, format: :full) %></div>
             </div>
           <% end %>
           <div class="info-line">
-            <div class="description"><%= t("my_modules.protocols.protocol_status_bar.protocol_updated") %></div>
-            <div class="value"><%= I18n.l(@protocol.updated_at, format: :full) %></div>
+            <div class="description" data-e2e="e2e-TX-task-protocolInfo-modifiedLabel"><%= t("my_modules.protocols.protocol_status_bar.protocol_updated") %></div>
+            <div class="value" data-e2e="e2e-TX-task-protocolInfo-modified"><%= I18n.l(@protocol.updated_at, format: :full) %></div>
           </div>
           <% if @protocol.linked?%>
             <div class="info-line">
-              <div class="description"><%= t("my_modules.protocols.protocol_status_bar.protocol_loaded") %></div>
-              <div class="value"><%= @protocol.linked_at ? I18n.l(@protocol.linked_at, format: :full) : '' %></div>
+              <div class="description" data-e2e="e2e-TX-task-protocolInfo-loadedLabel"><%= t("my_modules.protocols.protocol_status_bar.protocol_loaded") %></div>
+              <div class="value" data-e2e="e2e-TX-task-protocolInfo-loaded"><%= @protocol.linked_at ? I18n.l(@protocol.linked_at, format: :full) : '' %></div>
             </div>
             <div class="info-line">
-              <div class="description"><%= t("my_modules.protocols.protocol_status_bar.protocol_published") %></div>
-              <div class="value"><%= I18n.l(@protocol&.parent&.published_on, format: :full) %></div>
+              <div class="description" data-e2e="e2e-TX-task-protocolInfo-publishedLabel"><%= t("my_modules.protocols.protocol_status_bar.protocol_published") %></div>
+              <div class="value" data-e2e="e2e-TX-task-protocolInfo-published"><%= I18n.l(@protocol&.parent&.published_on, format: :full) %></div>
             </div>
           <% end %>
         </div>
@@ -53,14 +55,18 @@
           <% if @protocol.linked? %>
             <% if @protocol.parent_newer? %>
               <div class="notification-line new-parent-version">
-                <i class="sn-icon sn-icon-info"></i>
-                <div class="description"><%= t("my_modules.protocols.protocol_status_bar.messages.template_updated_html") %></div>
+                <i class="sn-icon sn-icon-info" data-e2e="e2e-IC-task-protocolInfo-newVersion"></i>
+                <div class="description" data-e2e="e2e-TX-task-protocolInfo-newVersion">
+                  <%= t("my_modules.protocols.protocol_status_bar.messages.template_updated_html") %>
+                </div>
               </div>
             <% end %>
             <% if @protocol.newer_than_parent? %>
               <div class="notification-line new-protocol-version">
-                <i class="sn-icon sn-icon-info"></i>
-                <div class="description"><%= t("my_modules.protocols.protocol_status_bar.messages.protocol_updated") %></div>
+                <i class="sn-icon sn-icon-info" data-e2e="e2e-IC-task-protocolInfo-protocolModified"></i>
+                <div class="description" data-e2e="e2e-TX-task-protocolInfo-protocolModified">
+                  <%= t("my_modules.protocols.protocol_status_bar.messages.protocol_updated") %>
+                </div>
               </div>
             <% end %>
           <% end %>
diff --git a/app/views/reports/templates/scinote_template/footer.html.erb b/app/views/reports/templates/scinote_template/footer.html.erb
index c04b93659..47d39b506 100644
--- a/app/views/reports/templates/scinote_template/footer.html.erb
+++ b/app/views/reports/templates/scinote_template/footer.html.erb
@@ -2,7 +2,7 @@
   .print-footer {
     line-height: 50px;
     font-size: 13px;
-    padding-right: 30px; 
+    padding-right: 30px;
     text-align: right;
     width: 100%;
   }
diff --git a/app/views/repositories/_repository_table.html.erb b/app/views/repositories/_repository_table.html.erb
index aa0456b49..1dfd4fd57 100644
--- a/app/views/repositories/_repository_table.html.erb
+++ b/app/views/repositories/_repository_table.html.erb
@@ -37,7 +37,8 @@
         <th id="assigned" data-unmanageable="true"><%= t("repositories.table.assigned") %></th>
         <th id="row-id"><%= t("repositories.table.id") %></th>
         <th id="row-name"><%= t("repositories.table.row_name") %></th>
-        <th id="relationship" title="<%= t("repositories.table.relationships") %>"><%= t("repositories.table.relationships") %></th>
+        <th id="relationship" data-disabled="<%= !Repository.repository_row_connections_enabled? %>"
+            title="<%= t("repositories.table.relationships") %>"><%= t("repositories.table.relationships") %></th>
         <th id="added-on" ><%= t("repositories.table.added_on") %></th>
         <th id="added-by" ><%= t("repositories.table.added_by") %></th>
         <th id="updated-on" ><%= t("repositories.table.updated_on") %></th>
@@ -47,6 +48,7 @@
         <% if @repository.is_a?(LinkedRepository) %>
           <th id="row-external-id"><%= t('repositories.table.external_id') %></th>
         <% end %>
+        <% columns_editable = can_manage_repository_columns?(@repository) && !repository.is_a?(SoftLockedRepository) %>
         <% repository.repository_columns.order(:id).each do |column| %>
           <th
             class="repository-column <%= 'row-stock item-stock' if column.data_type == 'RepositoryStockValue' %>"
@@ -54,7 +56,7 @@
             data-type="<%= column.data_type %>"
             data-edit-column-url="<%= edit_repository_repository_column_path(repository, column) %>"
             data-destroy-column-url="<%= repository_columns_destroy_html_path(repository, column) %>"
-            data-editable-row="<%= can_manage_repository_column?(column) %>"
+            data-editable-row="<%= columns_editable %>"
             <% column.metadata.each do |k, v| %>
               <%= "data-metadata-#{k}=#{v}" %>
             <% end %>
diff --git a/app/views/repositories/_toolbar_buttons.html.erb b/app/views/repositories/_toolbar_buttons.html.erb
index da9940bc0..2a2655d4a 100644
--- a/app/views/repositories/_toolbar_buttons.html.erb
+++ b/app/views/repositories/_toolbar_buttons.html.erb
@@ -11,7 +11,7 @@
           <span class="button-text"><%= t('repositories.index.snapshot_provisioning_in_progress') %></span>
         </div>
       <% end %>
-      <% if can_create_repository_rows?(@repository) %>
+      <% if can_create_repository_rows?(@repository) && !@repository.is_a?(SoftLockedRepository) %>
         <button type="button" data-toggle="tooltip" data-placement="bottom" title="<%= t('repositories.show.button_tooltip.new') %>"
                 class="btn btn-primary editAdd auto-shrink-button"
                 id="addRepositoryRecord" data-view-mode="active">
@@ -37,7 +37,7 @@
         </button>
       </span>
     <% end %>
-    <% if @repository.repository_rows.with_active_reminders(current_user).any? %>
+    <% if @repository.has_reminders? && @repository.repository_rows.with_active_reminders(@repository, current_user).any? %>
       <button type="button" data-toggle="tooltip" data-placement="bottom" title="<%= t("repositories.hide_reminders") %>"
               class="btn btn-light auto-shrink-button"
               id="hideRepositoryReminders"
diff --git a/app/views/repository_columns/_manage_column_modal_index.html.erb b/app/views/repository_columns/_manage_column_modal_index.html.erb
index dc58c813d..a4d8e4131 100644
--- a/app/views/repository_columns/_manage_column_modal_index.html.erb
+++ b/app/views/repository_columns/_manage_column_modal_index.html.erb
@@ -12,7 +12,7 @@
 </div>
 
 <div class="modal-footer">
-  <% if can_create_repository_columns?(@repository)%>
+  <% if can_create_repository_columns?(@repository) && !@repository.is_a?(SoftLockedRepository) %>
     <button id="new-repo-column-modal"
             data-view-mode="active"
             class="btn btn-secondary manage-repo-column"
diff --git a/app/views/repository_rows/index.json.jbuilder b/app/views/repository_rows/index.json.jbuilder
index 34ccad523..827b249b5 100644
--- a/app/views/repository_rows/index.json.jbuilder
+++ b/app/views/repository_rows/index.json.jbuilder
@@ -6,7 +6,7 @@ json.data do
                                   @repository,
                                   @columns_mappings,
                                   @repository.team,
-                                  @datatable_params || {})
+                                  (@datatable_params || {}).merge(omit_editable: true))
 end
-json.recordsFiltered @repository_rows.first ? @repository_rows.first.filtered_count : 0
+json.recordsFiltered @filtered_rows_count
 json.recordsTotal @all_rows_count
diff --git a/app/views/repository_rows/show.json.jbuilder b/app/views/repository_rows/show.json.jbuilder
index 3526eb620..a2f4ac3ce 100644
--- a/app/views/repository_rows/show.json.jbuilder
+++ b/app/views/repository_rows/show.json.jbuilder
@@ -6,14 +6,15 @@ json.repository do
   json.name @repository.name
   json.is_snapshot @repository.is_a?(RepositorySnapshot)
 end
+json.editable @repository_row.editable?
 json.notification @notification
 
 json.update_path update_cell_repository_repository_row_path(@repository, @repository_row)
 
 json.permissions do
   json.can_export_repository_stock can_export_repository_stock?(@repository)
-  json.can_manage can_manage_repository_rows?(@repository) if @repository.is_a?(Repository)
-  json.can_connect_rows can_connect_repository_rows?(@repository) if @repository.is_a?(Repository)
+  json.can_manage can_manage_repository_rows?(@repository) if @repository.is_a?(Repository) && !@repository.is_a?(SoftLockedRepository)
+  json.can_connect_rows can_connect_repository_rows?(@repository) if @repository.is_a?(Repository) && !@repository.is_a?(SoftLockedRepository)
 end
 
 json.actions do
@@ -24,7 +25,7 @@ json.actions do
     end
   end
   json.direct_file_upload_path rails_direct_uploads_url
-  if @repository_row.has_stock?
+  if @repository_row.has_stock? && @repository.has_stock_management?
     json.stock_value_url edit_repository_stock_repository_repository_row_url(@repository, @repository_row)
   elsif @repository.has_stock_management?
     json.stock_value_url new_repository_stock_repository_repository_row_url(@repository, @repository_row)
@@ -37,6 +38,24 @@ json.actions do
   end
 end
 
+json.storage_locations do
+  json.locations(
+    @repository_row.storage_locations.distinct.map do |storage_location|
+      readable = can_read_storage_location?(storage_location)
+
+      {
+        id: storage_location.id,
+        readable: readable,
+        name: readable ? storage_location.name : storage_location.code,
+        metadata: storage_location.metadata,
+        positions: readable ? storage_location.storage_location_repository_rows.where(repository_row: @repository_row) : []
+      }
+    end
+  )
+  json.enabled StorageLocation.storage_locations_enabled?
+  json.placeholder storage_locations_placeholder
+end
+
 json.default_columns do
   json.name @repository_row.name
   json.code @repository_row.code
diff --git a/app/views/repository_rows/simple_view_index.json.jbuilder b/app/views/repository_rows/simple_view_index.json.jbuilder
index c363429ba..115956308 100644
--- a/app/views/repository_rows/simple_view_index.json.jbuilder
+++ b/app/views/repository_rows/simple_view_index.json.jbuilder
@@ -6,5 +6,5 @@ json.data do
     @repository_rows, @repository, @my_module, @datatable_params || {}
   )
 end
-json.recordsFiltered @repository_rows.first ? @repository_rows.first.filtered_count : 0
+json.recordsFiltered @filtered_rows_count
 json.recordsTotal @all_rows_count
diff --git a/app/views/repository_rows/snapshot_index.json.jbuilder b/app/views/repository_rows/snapshot_index.json.jbuilder
index 1779a2691..81329c7bb 100644
--- a/app/views/repository_rows/snapshot_index.json.jbuilder
+++ b/app/views/repository_rows/snapshot_index.json.jbuilder
@@ -7,5 +7,5 @@ json.data do
                                            @repository_snapshot.team,
                                            @repository_snapshot)
 end
-json.recordsFiltered @repository_rows.first ? @repository_rows.first.filtered_count : 0
+json.recordsFiltered @filtered_rows_count
 json.recordsTotal @all_rows_count
diff --git a/app/views/shared/comments/_comments_sidebar.html.erb b/app/views/shared/comments/_comments_sidebar.html.erb
index 7b331a402..5bf58bbbe 100644
--- a/app/views/shared/comments/_comments_sidebar.html.erb
+++ b/app/views/shared/comments/_comments_sidebar.html.erb
@@ -2,7 +2,7 @@
   <div class="sidebar-content">
     <div class="sidebar-header">
       <div class="comments-subject-title"></div>
-      <div class="btn btn-light icon-btn close-btn">
+      <div class="btn btn-light icon-btn close-btn !bg-transparent">
         <i class="sn-icon sn-icon-close"></i>
       </div>
       <div class="comments-subject-url">
diff --git a/app/views/shared/file_preview/_content.html.erb b/app/views/shared/file_preview/_content.html.erb
index b99944c80..00d259dee 100644
--- a/app/views/shared/file_preview/_content.html.erb
+++ b/app/views/shared/file_preview/_content.html.erb
@@ -4,7 +4,7 @@
     <% if can_edit && !preview %>
       <% if wopi_enabled? && wopi_file?(asset) %>
         <div id="openLocallyMenu" data-behaviour="vue">
-          <open-locally-menu :disable-local-open="<%= asset.repository_asset_value.present? %>" :attachment="<%= { attributes: AssetSerializer.new(asset, scope: { user: current_user }).as_json }.to_json %>" />
+          <open-locally-menu :attachment="<%= { attributes: AssetSerializer.new(asset, scope: { user: current_user }).as_json }.to_json %>" />
         </div>
       <% elsif asset.file.metadata[:asset_type] == 'marvinjs' %>
         <button class="btn btn-light marvinjs-edit-button"
@@ -40,7 +40,7 @@
         </button>
       <% end %>
       <div id="openLocallyMenu" data-behaviour="vue">
-        <open-locally-menu :disable-local-open="<%= asset.repository_asset_value.present? %>" :attachment="<%= { attributes: AssetSerializer.new(asset, scope: { user: current_user }).as_json }.to_json %>" />
+        <open-locally-menu :attachment="<%= { attributes: AssetSerializer.new(asset, scope: { user: current_user }).as_json }.to_json %>" />
       </div>
     <% end %>
     <a class="btn btn-light file-download-link" href="<%= rails_blob_path(asset.file, disposition: 'attachment') %>" data-turbolinks="false">
diff --git a/app/views/shared/navigation/_left.html.erb b/app/views/shared/navigation/_left.html.erb
index 5c0cdd2ef..43b79bb42 100644
--- a/app/views/shared/navigation/_left.html.erb
+++ b/app/views/shared/navigation/_left.html.erb
@@ -13,7 +13,7 @@
     <% if item[:submenu].any? %>
     <div class="sci--layout--menu-submenu" data-id="<%= index %>" data-collapsed="<%= !item[:active] %>" style="--submenu-items:<%= item[:submenu].length %>">
       <% item[:submenu].each do |subitem| %>
-        <%= link_to subitem[:url], title: subitem[:name], class:"sci--layout--menu-item", data: { e2e: "e2e-BT-leftMenu-#{item[:name].downcase}-#{subitem[:name].downcase}", active: subitem[:active], disabled: current_user.teams.blank? } do %>
+        <%= link_to subitem[:url], title: subitem[:title] || subitem[:name], class:"sci--layout--menu-item", data: { e2e: "e2e-BT-leftMenu-#{item[:name].downcase}-#{subitem[:name].downcase}", active: subitem[:active], disabled: current_user.teams.blank? } do %>
           <i class="sn-icon sn-icon-dot-small"></i>
           <%= subitem[:name].html_safe %>
         <% end %>
diff --git a/app/views/shared/navigation/_top.html.erb b/app/views/shared/navigation/_top.html.erb
index 382300e8d..2a670e52f 100644
--- a/app/views/shared/navigation/_top.html.erb
+++ b/app/views/shared/navigation/_top.html.erb
@@ -3,6 +3,7 @@
     <top-menu-container
       url="<%= top_menu_navigations_path %>"
       notifications-url="<%= user_notifications_path %>"
+      mark-all-notifications-url="<%= mark_all_read_user_notifications_path %>"
       quick-search-url="<%= quick_search_path %>"
       unseen-notifications-url="<%= unseen_counter_user_notifications_path %>"
       teams-url="<%= visible_teams_teams_path %>"
diff --git a/app/views/storage_locations/index.html.erb b/app/views/storage_locations/index.html.erb
new file mode 100644
index 000000000..110898cbf
--- /dev/null
+++ b/app/views/storage_locations/index.html.erb
@@ -0,0 +1,29 @@
+<% provide(:head_title, t("storage_locations.index.head_title")) %>
+<% provide(:container_class, "no-second-nav-container") %>
+
+<% if current_team %>
+  <div class="content-pane with-grey-background flexible">
+    <div class="content-header">
+      <div class="title-row">
+        <h1><%= @parent_location ? @parent_location.name : t('storage_locations.index.head_title') %></h1>
+      </div>
+    </div>
+    <div class="content-body " data-e2e="e2e-CO-storageLocations">
+      <div id="storageLocationsTable" class="fixed-content-body">
+        <storage-locations
+          actions-url="<%= actions_toolbar_storage_locations_path(current_team) %>"
+          :can-create-location="<%= can_create_storage_locations?(current_team) %>"
+          :can-create-container="<%= can_create_storage_location_containers?(current_team) %>"
+          :can-manage-parent="<%= can_manage_storage_location?(@parent_location) if @parent_location %>"
+          :has-parent="<%= @parent_location.present? %>"
+          data-source="<%= storage_locations_path(format: :json, parent_id: params[:parent_id]) %>"
+          direct-upload-url="<%= rails_direct_uploads_url %>"
+          create-location-url="<%= storage_locations_path(parent_id: params[:parent_id]) %>"
+          create-location-instance-url="<%= storage_locations_path(parent_id: params[:parent_id]) %>"
+        />
+      </div>
+    </div>
+  </div>
+
+  <%= javascript_include_tag 'vue_storage_locations_table' %>
+<% end %>
diff --git a/app/views/storage_locations/show.html.erb b/app/views/storage_locations/show.html.erb
new file mode 100644
index 000000000..48a9a1af8
--- /dev/null
+++ b/app/views/storage_locations/show.html.erb
@@ -0,0 +1,27 @@
+<% provide(:head_title, @storage_location.name) %>
+<% provide(:container_class, "no-second-nav-container") %>
+
+<% if current_team %>
+  <div class="content-pane flexible with-grey-background">
+    <div class="content-header">
+      <div class="title-row">
+        <h1><%= @storage_location.name %></h1>
+      </div>
+    </div>
+    <div class="content-body" data-e2e="e2e-CO-storageLocations-box">
+      <div id="StorageLocationsContainer" class="fixed-content-body">
+        <storage-locations-container
+          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_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 %>"
+        />
+      </div>
+    </div>
+  </div>
+
+  <%= javascript_include_tag 'vue_storage_locations_container' %>
+<% end %>
diff --git a/app/views/users/registrations/edit_partials/_api_key.html.erb b/app/views/users/registrations/edit_partials/_api_key.html.erb
index b219a4b55..75faaaa05 100644
--- a/app/views/users/registrations/edit_partials/_api_key.html.erb
+++ b/app/views/users/registrations/edit_partials/_api_key.html.erb
@@ -5,15 +5,13 @@
   </p>
   <% if current_user.api_key %>
     <div class="api-key-display">
-      <div class="form-group sci-input-container right-icon !w-1/2">
-        <%= password_field_tag :api_key,
-                               current_user.api_key,
-                               name: 'api_key',
-                               class: 'form-control sci-input-field !text-sn-black !font-mono !cursor-text',
-                               disabled: 'disabled'
-        %>
-        <i class="sn-icon sn-icon-visibility-show show-password" style="cursor: pointer; z-index: 10"></i>
-      </div>
+      <p>
+        <% if flash[:token] %>
+          <%= flash[:token] %>
+        <% else %>
+          <%= '*' * (current_user.api_key.length - 4) + current_user.api_key.last(4) %>
+        <% end %>
+      </p>
       <% if current_user.api_key_expires_at < Time.current %>
         <p class="">
           <%= t("users.registrations.edit.api_key.expired") %>
diff --git a/config/database.yml b/config/database.yml
index a44a2ec67..42d2ca2ce 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -15,10 +15,15 @@
 # gem 'pg'
 #
 default: &default
-  adapter: postgresql
+  adapter: <%= ENV['DATABASE_ADAPTER'] || 'postgresql' %>
   encoding: unicode
   pool: <%= ENV['DB_POOL'] || ENV['RAILS_MAX_THREADS'] || 5 %>
   url: <%= ENV['DATABASE_URL'] %>
+  host: <%= ENV['DATABASE_HOST'] %>
+  port: <%= ENV['DATABASE_PORT'] || 5432 %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
+  database: <%= ENV['DATABASE_NAME'] %>
 
   # For details on connection pooling, see rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 692d7ae73..a2b1186af 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -105,4 +105,8 @@ Rails.application.configure do
     config.x.new_team_on_signup = false
   end
   config.hosts << "dev.scinote.test"
+
+  # Automatically update js-routes file
+  # when routes.rb is changed
+  config.middleware.use(JsRoutes::Middleware)
 end
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 84c260f87..58a3386e3 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -8,8 +8,8 @@ require 'active_storage/downloader'
 # Enable PDF previews for files
 Rails.application.config.x.enable_pdf_previews = ENV['ACTIVESTORAGE_ENABLE_PDF_PREVIEWS'] == 'true'
 
-Rails.application.config.active_storage.previewers = [ActiveStorage::Previewer::PopplerPDFPreviewer,
-                                                      ActiveStorage::Previewer::LibreofficePreviewer]
+Rails.application.config.active_storage.previewers << ActiveStorage::Previewer::PopplerPDFPreviewer
+Rails.application.config.active_storage.previewers << ActiveStorage::Previewer::LibreofficePreviewer
 
 Rails.application.config.active_storage.analyzers.prepend(ActiveStorage::Analyzer::ImageAnalyzer::CustomImageMagick)
 Rails.application.config.active_storage.analyzers.append(ActiveStorage::Analyzer::TextExtractionAnalyzer)
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index f43a24956..bceb558de 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -447,6 +447,12 @@ class Constants
   MIN_SCINOTE_EDIT_VERSION = ENV['MIN_SCINOTE_EDIT_VERSION'].freeze
   MAX_SCINOTE_EDIT_VERSION = ENV['MAX_SCINOTE_EDIT_VERSION'].freeze
 
+  # SciNote Edit unsupported extensions
+  SCINOTE_EDIT_RESTRICTED_EXTENSIONS = %w(
+    ACTION APP BIN COMMAND CSH OSX WORKFLOW DMG BAT BIN CAB CMD COM CPL EX_ EXE GADGET INF1 INS INX ISU JOB
+    JSE LNK MSC MSI MSP MST PAF PIF PS1 REG RGS SCR SCT SHB SHS U3P VB VBE VBS VBSCRIPT WS WSF WSH
+  ).freeze
+
   # quick search
   QUICK_SEARCH_LIMIT = 5
   QUICK_SEARCH_SEARCHABLE_OBJECTS = %w(project experiment my_module protocol repository_row
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
deleted file mode 100644
index 0255b5671..000000000
--- a/config/initializers/devise_async.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Devise::Async.enabled = true
-Devise::Async.backend = :delayed_job
-Devise::Async.queue = :devise_email
-# Devise::Async.priority = 10
\ No newline at end of file
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index 04d84ac30..e891e9749 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -63,6 +63,8 @@ class Extends
 
   REPOSITORY_IMPORT_COLUMN_PRELOADS = %i(repository_list_items repository_status_items repository_checklist_items)
 
+  REPOSITORY_EXTRA_VALUE_SERIALIZERS = {}
+
   # Extra attributes used for search in repositories, 'filed_name' => include_hash
   REPOSITORY_EXTRA_SEARCH_ATTR = {
     RepositoryTextValue: {
@@ -137,7 +139,7 @@ class Extends
     RepositoryStockValue
   )
 
-  STI_PRELOAD_CLASSES = %w(LinkedRepository)
+  STI_PRELOAD_CLASSES = %w(LinkedRepository SoftLockedRepository)
 
   # Array of preload relations used in search query for repository rows
   REPOSITORY_ROWS_PRELOAD_RELATIONS = []
@@ -188,7 +190,7 @@ class Extends
 
   ACTIVITY_SUBJECT_TYPES = %w(
     Team RepositoryBase Project Experiment MyModule Result Protocol Report RepositoryRow
-    ProjectFolder Asset Step LabelTemplate
+    ProjectFolder Asset Step LabelTemplate StorageLocation StorageLocationRepositoryRow
   ).freeze
 
   SEARCHABLE_ACTIVITY_SUBJECT_TYPES = %w(
@@ -205,7 +207,8 @@ class Extends
     my_module: %i(results protocols),
     result: [:assets],
     protocol: [:steps],
-    step: [:assets]
+    step: [:assets],
+    storage_location: [:storage_location_repository_rows]
   }
 
   ACTIVITY_MESSAGE_ITEMS_TYPES =
@@ -495,27 +498,52 @@ class Extends
     task_step_asset_renamed: 305,
     result_asset_renamed: 306,
     protocol_step_asset_renamed: 307,
-    inventory_items_added_or_updated_with_import: 308
+    inventory_items_added_or_updated_with_import: 308,
+    storage_location_created: 309,
+    storage_location_deleted: 310,
+    storage_location_edited: 311,
+    storage_location_moved: 312,
+    storage_location_shared: 313,
+    storage_location_unshared: 314,
+    storage_location_sharing_updated: 315,
+    container_storage_location_created: 316,
+    container_storage_location_deleted: 317,
+    container_storage_location_edited: 318,
+    container_storage_location_moved: 319,
+    container_storage_location_shared: 320,
+    container_storage_location_unshared: 321,
+    container_storage_location_sharing_updated: 322,
+    storage_location_repository_row_created: 323,
+    storage_location_repository_row_deleted: 324,
+    storage_location_repository_row_moved: 325,
+    container_storage_location_imported: 326,
+    task_step_restore_asset_version: 327,
+    task_result_restore_asset_version: 328,
+    repository_column_restore_asset_version: 329,
+    protocol_step_restore_asset_version: 330
   }
 
   ACTIVITY_GROUPS = {
     projects: [*0..7, 32, 33, 34, 95, 108, 65, 109, *158..162, 241, 242, 243],
-    task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128, *246..248, *257..273, *284..291, 301, 303, 306],
+    task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128, *246..248, *257..273, *284..291, 301, 303, 306, 328],
     task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, 66, 106, 126, 120, 132,
            148, 166],
     task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137,
-                    184, 185, 188, 189, *192..203, 221, 222, 224, 225, 226, 236, *249..252, *274..278, 299, 302, 305],
+                    184, 185, 188, 189, *192..203, 221, 222, 224, 225, 226, 236, *249..252, *274..278, 299, 302, 305, 327],
     task_inventory: [55, 56, 146, 147, 183],
     experiment: [*27..31, 57, 141, 165],
     reports: [48, 50, 49, 163, 164],
     inventories: [70, 71, 105, 144, 145, 72, 73, 74, 102, 142, 143, 75, 76, 77,
-                  78, 96, 107, 113, 114, *133..136, 180, 181, 182, *292..298, 308],
+                  78, 96, 107, 113, 114, *133..136, 180, 181, 182, *292..298, 308, 329],
     protocol_repository: [80, 103, 89, 87, 79, 90, 91, 88, 85, 86, 84, 81, 82,
                           83, 101, 112, 123, 125, 117, 119, 129, 131, 187, 186,
                           190, 191, *204..215, 220, 223, 227, 228, 229, *230..235,
-                          *237..240, *253..256, *279..283, 300, 304, 307],
+                          *237..240, *253..256, *279..283, 300, 304, 307, 330],
     team: [92, 94, 93, 97, 104, 244, 245],
-    label_templates: [*216..219]
+    label_templates: [*216..219],
+    storage_locations: [*309..315],
+    container_storage_locations: [*316..322, 326],
+    storage_location_repository_rows: [*323..325]
   }
 
   TOP_LEVEL_ASSIGNABLES = %w(Project Team Protocol Repository).freeze
@@ -636,6 +664,8 @@ class Extends
     preferences/index
     addons/index
     search/index
+    storage_locations/index
+    storage_locations/show
   )
 
   DEFAULT_USER_NOTIFICATION_SETTINGS = {
@@ -668,11 +698,15 @@ class Extends
     ReportTemplates_archived_state
     Repositories_active_state
     Repositories_archived_state
+    StorageLocationsTable_active_state
+    StorageLocationsContainer_active_state
+    StorageLocationsContainerGrid_active_state
     task_step_states
     results_order
     repository_export_file_type
     navigator_collapsed
     navigator_width
+    result_states
   ).freeze
 end
 
diff --git a/config/initializers/extends/permission_extends.rb b/config/initializers/extends/permission_extends.rb
index 12b63cbca..b7b2843a1 100644
--- a/config/initializers/extends/permission_extends.rb
+++ b/config/initializers/extends/permission_extends.rb
@@ -13,7 +13,13 @@ module PermissionExtends
       REPORTS_CREATE
       LABEL_TEMPLATES_READ
       LABEL_TEMPLATES_MANAGE
-    ).each { |permission| const_set(permission, "team_#{permission.underscore}") }
+      STORAGE_LOCATIONS_CREATE
+      STORAGE_LOCATIONS_MANAGE
+      STORAGE_LOCATIONS_READ
+      STORAGE_LOCATION_CONTAINERS_CREATE
+      STORAGE_LOCATION_CONTAINERS_MANAGE
+      STORAGE_LOCATION_CONTAINERS_READ
+    ).each { |permission| const_set(permission, "team_#{permission.parameterize}") }
   end
 
   module ProtocolPermissions
@@ -24,7 +30,7 @@ module PermissionExtends
       MANAGE
       USERS_MANAGE
       MANAGE_DRAFT
-    ).each { |permission| const_set(permission, "protocol_#{permission.underscore}") }
+    ).each { |permission| const_set(permission, "protocol_#{permission.parameterize}") }
   end
 
   module ReportPermissions
@@ -33,7 +39,7 @@ module PermissionExtends
       READ
       MANAGE
       USERS_MANAGE
-    ).each { |permission| const_set(permission, "report_#{permission.underscore}") }
+    ).each { |permission| const_set(permission, "report_#{permission.parameterize}") }
   end
 
   module ProjectPermissions
@@ -51,7 +57,7 @@ module PermissionExtends
       COMMENTS_MANAGE_OWN
       TAGS_MANAGE
       EXPERIMENTS_CREATE
-    ).each { |permission| const_set(permission, "project_#{permission.underscore}") }
+    ).each { |permission| const_set(permission, "project_#{permission.parameterize}") }
   end
 
   module ExperimentPermissions
@@ -65,7 +71,7 @@ module PermissionExtends
       USERS_MANAGE
       READ_CANVAS
       ACTIVITIES_READ
-    ).each { |permission| const_set(permission, "experiment_#{permission.underscore}") }
+    ).each { |permission| const_set(permission, "experiment_#{permission.parameterize}") }
   end
 
   module MyModulePermissions
@@ -107,7 +113,7 @@ module PermissionExtends
       USERS_MANAGE
       DESIGNATED_USERS_MANAGE
       STOCK_CONSUMPTION_UPDATE
-    ).each { |permission| const_set(permission, "task_#{permission.underscore}") }
+    ).each { |permission| const_set(permission, "task_#{permission.parameterize}") }
   end
 
   module RepositoryPermissions
@@ -127,7 +133,7 @@ module PermissionExtends
       COLUMNS_DELETE
       USERS_MANAGE
       FILTERS_MANAGE
-    ).each { |permission| const_set(permission, "inventory_#{permission.underscore}") }
+    ).each { |permission| const_set(permission, "inventory_#{permission.parameterize}") }
   end
 
   module PredefinedRoles
@@ -147,6 +153,12 @@ module PermissionExtends
       TeamPermissions::REPORTS_CREATE,
       TeamPermissions::LABEL_TEMPLATES_READ,
       TeamPermissions::LABEL_TEMPLATES_MANAGE,
+      TeamPermissions::STORAGE_LOCATIONS_READ,
+      TeamPermissions::STORAGE_LOCATIONS_CREATE,
+      TeamPermissions::STORAGE_LOCATIONS_MANAGE,
+      TeamPermissions::STORAGE_LOCATION_CONTAINERS_READ,
+      TeamPermissions::STORAGE_LOCATION_CONTAINERS_CREATE,
+      TeamPermissions::STORAGE_LOCATION_CONTAINERS_MANAGE,
       ProtocolPermissions::READ,
       ProtocolPermissions::READ_ARCHIVED,
       ProtocolPermissions::MANAGE_DRAFT,
@@ -241,6 +253,8 @@ module PermissionExtends
 
     VIEWER_PERMISSIONS = [
       TeamPermissions::LABEL_TEMPLATES_READ,
+      TeamPermissions::STORAGE_LOCATIONS_READ,
+      TeamPermissions::STORAGE_LOCATION_CONTAINERS_READ,
       ProtocolPermissions::READ,
       ProtocolPermissions::READ_ARCHIVED,
       ReportPermissions::READ,
diff --git a/config/initializers/grover.rb b/config/initializers/grover.rb
index 290dfb1c0..5d4baadf8 100644
--- a/config/initializers/grover.rb
+++ b/config/initializers/grover.rb
@@ -3,8 +3,8 @@
 Grover.configure do |config|
   config.options = {
     cache: false,
-    executable_path: './bin/chromium',
-    launch_args: ['--no-sandbox'],
+    executable_path: ENV['CHROMIUM_PATH'] || './bin/chromium',
+    launch_args: %w(--disable-dev-shm-usage --disable-gpu --no-sandbox),
     timeout: Constants::GROVER_TIMEOUT_MS
   }
 end
diff --git a/config/initializers/js_routes.rb b/config/initializers/js_routes.rb
new file mode 100644
index 000000000..588f5b292
--- /dev/null
+++ b/config/initializers/js_routes.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+JsRoutes.setup do |c|
+  # Setup your JS module system:
+  # ESM, CJS, AMD, UMD or nil
+  # c.module_type = "ESM"
+end
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 85e3e4d59..4535546e1 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -94,10 +94,18 @@ SAML_SETUP_PROC = lambda do |env|
   provider_conf = settings.values['saml']
   raise StandardError, 'No SAML config available for sign in' if provider_conf.blank?
 
+  name_format = 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
+
   env['omniauth.strategy'].options[:idp_sso_service_url] = provider_conf['idp_sso_service_url']
   env['omniauth.strategy'].options[:idp_cert] = provider_conf['idp_cert']
   env['omniauth.strategy'].options[:sp_entity_id] = provider_conf['sp_entity_id']
   env['omniauth.strategy'].options[:uid_attribute] = 'uid'
+  env['omniauth.strategy'].options[:request_attributes] = [
+    { name: 'email', name_format: name_format, friendly_name: 'Email address', is_required: true },
+    { name: 'first_name', name_format: name_format, friendly_name: 'First name', is_required: true },
+    { name: 'last_name', name_format: name_format, friendly_name: 'Last name', is_required: true },
+    { name: 'uid', name_format: name_format, friendly_name: 'Unique identifier', is_required: true }
+  ]
 end
 
 Rails.application.config.middleware.use OmniAuth::Builder do
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index bff97638b..7f8ad9469 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -28,6 +28,7 @@ en:
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."
+      missing_attribute: "%{attribute} attribute is missing or empty."
     passwords:
       no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
       send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9eb819df6..b3d99ee6a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -86,14 +86,12 @@ en:
       errors:
         generic: "Failed to sign in user"
         no_local_user_map: "No local user record found"
-        no_email: "Email is missing in auth token"
         failed_to_save: "Failed to create new user"
     openid_connect:
       provider_name: "OpenID Connect"
       errors:
         generic: "Failed to sign in user"
         no_local_user_map: "No local user record found"
-        no_email: "Email is missing in auth token"
         failed_to_save: "Failed to create new user"
     okta:
       provider_name: "Okta"
@@ -260,6 +258,16 @@ en:
           attributes:
             text: Text is too long
             position: "Position has already been taken by another item in the checklist"
+        storage_location:
+          missing_position: 'Missing position metadata'
+          not_uniq_position: 'Position already taken'
+          not_uniq_repository_row: 'Inventory item already exists'
+          attributes:
+            parent_storage_location: "Storage location cannot be parent to itself"
+            parent_storage_location_team: "Parent storage location and storage location should belongs to the same team"
+            parent_storage_location_child: "Storage location cannot be moved to it's child"
+            metadata:
+              invalid: 'Invalid metadata'
   storage:
     limit_reached: "Storage limit has been reached."
   helpers:
@@ -301,6 +309,9 @@ en:
     academy_tooltip: "SciNote Academy"
     notifications:
       title: "Notifications"
+      read: "Read"
+      unread: "Unread"
+      read_all: "Read all"
       all: "All"
       message: "Messages"
       system: "System"
@@ -341,6 +352,8 @@ en:
     templates: "Templates"
     protocol: "Protocol"
     label: "Label"
+    items: "Items"
+    locations: "Locations"
     reports: "Reports"
     settings: "Settings"
     activities: "Activities"
@@ -1014,7 +1027,8 @@ en:
         guest: "Guest"
         normal_user: "Normal user"
         admin: "Administrator"
-
+  teams:
+    private_team: "Private team"
   user_projects:
     view_users:
       modal_title: "Members of %{name}"
@@ -1191,7 +1205,7 @@ en:
     shareable_links:
       share: "Share"
       shared: "Shared"
-      disabled: "Sharing is disabled for your team.\nAsk your team admin to enable sharing in the team settings."
+      disabled: "<b>Sharing is disabled for your team.</b><br>Ask your team admin to enable sharing in the team settings."
     notes:
       title: "Notes"
       no_description: "No task description"
@@ -2003,14 +2017,11 @@ en:
         name_placeholder: "My inventory"
         submit: "Create"
         success_flash_html: "Inventory <strong>%{name}</strong> successfully created."
-      modal_share:
-        title: "Share Inventory"
-        submit: "Save sharing options"
-        share_with_team: "Share with Team"
-        can_edit: "Can Edit"
-        all_teams: "All teams (current & new)"
-        all_teams_tooltip: "This will disable individual team settings"
-        success_message: "Selected sharing options for the Inventory %{inventory_name} have been saved."
+      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. 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:
         notification:
           error:
@@ -2178,6 +2189,7 @@ en:
         errors:
           too_long: "Item name is too long (maximum is %{max_length} characters)"
           is_empty: "Item name should be filled"
+      row_locked: The item is locked, snapshot creation is in progress. Please try later.
     pagination_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> before you go to another page"
     toolbar_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> first to use filters"
     add_new_record: "New item"
@@ -2340,7 +2352,7 @@ en:
             linkTo: 'https://knowledgebase.scinote.net/en/knowledge/how-to-add-items-to-an-inventory'
       dragAndDropUpload:
         notSingleFileError: 'Single file import only. Please import one file at a time.'
-        wrongFileTypeError: 'The file has invalid extension (.csv, .xlsx, .txt or .tsv.)'
+        wrongFileTypeError: 'The file has invalid extension (%{extensions}).'
         emptyFileError: 'You have uploaded empty file. There is not much to import.'
         fileTooLargeError: 'File too large. Max file size limit is'
         importText:
@@ -2607,7 +2619,12 @@ en:
       custom_columns_label: 'Custom columns'
       relationships_label: 'Relationships'
       assigned_label: 'Assigned'
+      locations_label: 'Locations'
       QR_label: 'QR'
+    locations:
+      title: 'Locations (%{count})'
+      container: 'Box'
+      assign: 'Assign new location'
   repository_stock_values:
     manage_modal:
       title: "Stock %{item}"
@@ -2662,6 +2679,123 @@ en:
   repository_ledger_records:
     errors:
       my_module_references_missing: 'Task references are not set'
+  storage_locations:
+    storage_locations_disabled: "<b>Storage locations are disabled</b>"
+    container: 'box'
+    location: 'location'
+    show:
+      hidden: "Private item"
+      table:
+        position: "Position"
+        reminders: "Reminders"
+        row_id: "Item ID"
+        row_name: "Name"
+        stock: "Stock"
+      toolbar:
+        assign: 'Assign item'
+        unassign: 'Unassign'
+        move: 'Move'
+      unassign_modal:
+        title: 'Unassign location'
+        description: 'Are you sure you want to remove %{items} item(s) from their current storage location?'
+        description_single: 'Are you sure you want to remove item from this location?'
+        button: 'Unassign'
+      assign_modal:
+        selected_position_title: 'Assign to position %{position}'
+        selected_row_title: 'Assign new location'
+        assign_title: 'Assign position'
+        move_title: 'Move %{name}'
+        assign_description: 'Select an item to assign it to a location.'
+        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'
+        row: 'Row'
+        column: 'Column'
+        inventory: 'Inventory'
+        item: 'Item'
+      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 ‘Box position’ and ‘Item ID’ columns for a successful import."
+        export: "Export"
+        export_button: "Export current box"
+        import: "Import"
+        drag_n_drop: ".xlsx file"
+        errors:
+          invalid_structure: "The imported file content doesn't meet criteria."
+          invalid_position: "Positions in the file must match with the box."
+          duplicate_items: "Item ID has duplicates in the imported file"
+          invalid_item: "Item ID %{row_id} doesn't exist."
+    index:
+      head_title: "Locations"
+      breadcrumbs_root: "Locations"
+      new_location: "New location"
+      new_container: "New box"
+      duplicate:
+        success_message: "Location was successfully duplicated."
+      toolbar:
+        edit: 'Edit'
+        move: 'Move'
+        duplicate: 'Duplicate'
+        delete: 'Delete'
+      table:
+        name: "Location name"
+        id: "ID"
+        sub_locations: "Sub-locations"
+        items: "Items"
+        free_spaces: "Free spaces"
+        shared: "Shared"
+        owned_by: "Owned by"
+        created_on: "Created on"
+        created_by: "Created by"
+        description: "Description"
+      filters_modal:
+        search_tree: "Look inside locations"
+      edit_modal:
+        title_create_location: "Create new location"
+        title_create_container: "Create new box"
+        title_edit_location: "Edit location"
+        title_edit_container: "Edit box"
+        description_create_location: "Fill in the fields and create a new location."
+        description_create_container: "Fill in the fields to create a new box. Defining the box dimensions allows you to control the number of available spaces for placing inventory items."
+        name_label_location: "Location name"
+        image_label_location: "Image of location"
+        name_label_container: "Box name"
+        image_label_container: "Image of box"
+        drag_and_drop_supporting_text: ".png or .jpg file"
+        warning_box_not_empty: "Box dimensions can be updated only when the box is empty."
+        description_label: "Description"
+        name_placeholder_location: "Big freezer"
+        name_placeholder_container: "Box 1"
+        description_placeholder: "Keep everyone on the same page. You can also use smart annotations."
+        dimensions_label: "Dimensions (rows x columns)"
+        no_grid: "No grid"
+        grid: "Grid"
+        no_grid_tooltip: "You can assign unlimited items to the “No-grid” box but they do not have assigned position."
+        success_message:
+          create_location: "Location %{name} was successfully created."
+          create_container: "Box %{name} was successfully created."
+          edit_location: "Location %{name} was successfully updated."
+          edit_container: "Box %{name} was successfully updated."
+        errors:
+          max_length: "is too long (maximum is %{max_length} characters)"
+      move_modal:
+        title: 'Move %{name}'
+        description: 'Select where you want to move %{name}.'
+        search_header: 'Locations'
+        no_results: "You haven't created any storage locations and boxes yet.<br> Go to <b>Inventories > Locations</b> and create your location structure first to assign items to locations."
+        success_flash: "You have successfully moved the selected location/box to another location."
+        error_flash: "An error occurred. The selected location/box has not been moved."
+        placeholder:
+          find_storage_locations: 'Find location'
+      delete_modal:
+        title: 'Delete a %{type}'
+        description_1_html: "You're about to delete <b>%{name}</b>. This action will delete the %{type}. <b>%{num_of_items}</b> items inside will lose their assigned positions."
+        description_2_html: '<b>Are you sure you want to delete it?</b>'
+        success_message: "%{type} %{name} successfully deleted."
+      share: "Share"
+
   libraries:
     manange_modal_column_index:
       title: "Manage columns"
@@ -3812,6 +3946,8 @@ en:
       deliver_error: 'Exportable content'
     experiment_annotation_title: "%{user} mentioned you in experiment %{experiment}."
     experiment_annotation_message_html: "Project: %{project} | Experiment: %{experiment}"
+    storage_location_annotation_title: "%{user} mentioned you in storage location %{storage_location}."
+    storage_location_annotation_message_html: "Storage location: %{storage_location}"
     project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}."
     project_annotation_message_html: "Project: %{project}"
     my_module_description_annotation_title: "%{user} mentioned you in notes on task %{my_module}."
@@ -3890,6 +4026,16 @@ en:
       inline_html: "Large"
       thumbnail_html: "Thumbnail"
       list_html: "List"
+      versions: "Version history"
+    file_versions_modal:
+      title: "Version history"
+      download: "Download"
+      restore: "Restore this version"
+      size: "Size"
+      restored_from_version: "restored from v%{version}"
+      original_file: "Original file"
+      enable_button: "Enable"
+      disabled_disclaimer: "This feature is currently disabled"
     rename_modal:
       title: "Rename file"
       min_length_error: "File name must be at least 1 character long."
@@ -3906,13 +4052,17 @@ en:
       body_text_html: "The specified application for accessing the <b>%{file_name}</b> is not preconfigured. To successfully open this file, please set up the appropriate application in your local environment beforehand.</p>"
       understand_button: "I understand"
       set_up_app: "Set up an application to open this file"
+    restricted_extension_modal:
+      title: "Open file - Security warning"
+      body: "This file type appears to be executable and can potentially harm your computer. It cannot be opened with SciNote Edit. To open the file please download it manually."
+      action: "I understand"
     update_version_modal:
       title: "Update required"
       body_text_html: "The current version of the SciNote Edit application is no longer supported. To ensure a seamless and secure user experience, we recommend updating to the latest version."
     edit_launching_application_modal:
       title: "Launching application"
       description: "%{file_name} will now open in %{application}. Saved changes in %{application} will automatically be synced in SciNote."
-    conflict_error: "A newer version of the file was already present in the SciNote web app and your file was saved as “%{filename}”. Close this window and re-open file to get the latest changes."
+    conflict_error: "The file got updated in the SciNote web app while you were editing. Your version will be stored as the latest version, and the previous one is kept in version history."
     default_error: "An error occurred while saving to SciNote. Please save changes to your open document using “Save As…” to avoid losing any working changes."
     default_error_with_filename: "An error occurred while saving “%{filename}” to SciNote. Please save changes to your open document using “Save As…” to avoid losing any working changes."
 
@@ -4302,6 +4452,7 @@ en:
     labels: "Label"
     teams: "All Teams"
     addons: "Add-ons"
+    locations: "Locations"
     label_printer: "Label printer"
     fluics_printer: "Fluics printer"
 
@@ -4413,6 +4564,15 @@ en:
     active_state: "Active state"
     archived_state: "Archived state"
 
+  modal_share:
+    title: "Share %{object_name}"
+    submit: "Save sharing options"
+    share_with_team: "Share with Team"
+    can_edit: "Can Edit"
+    all_teams: "All teams (current & new)"
+    all_teams_tooltip: "This will disable individual team settings"
+    success_message: "Selected sharing options for the %{object_name} have been saved."
+
   errors:
     general: "Something went wrong."
     general_text_too_long: 'Text is too long'
diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml
index f6b52f772..40dfe2a11 100644
--- a/config/locales/global_activities/en.yml
+++ b/config/locales/global_activities/en.yml
@@ -322,6 +322,28 @@ en:
       protocol_step_asset_renamed_html: "%{user} renamed file %{old_name} to %{new_name} on protocol’s step <strong>%{step}</strong> in Protocol repository."
       result_asset_renamed_html: "%{user} renamed file %{old_name} to %{new_name} on result <strong>%{result}</strong> on task <strong>%{my_module}</strong>."
       item_added_with_import_html: "%{user} edited %{num_of_items} inventory item(s) in %{repository}."
+      storage_location_created_html: "%{user} created location %{storage_location}."
+      storage_location_deleted_html: "%{user} deleted location %{storage_location}."
+      storage_location_edited_html: "%{user} edited location %{storage_location}."
+      storage_location_moved_html: "%{user} moved location %{storage_location} from %{storage_location_original} to %{storage_location_destination}."
+      storage_location_shared_html: "%{user} shared location %{storage_location} with team %{team} with %{permission_level} permission."
+      storage_location_unshared_html: "%{user} unshared location %{storage_location} with team %{team}."
+      storage_location_sharing_updated_html: "%{user} changed permission of shared location %{storage_location} with team %{team} to %{permission_level}."
+      container_storage_location_created_html: "%{user} created box %{storage_location}."
+      container_storage_location_deleted_html: "%{user} deleted box %{storage_location}."
+      container_storage_location_edited_html: "%{user} edited box %{storage_location}."
+      container_storage_location_moved_html: "%{user} moved box %{storage_location} from %{storage_location_original} to %{storage_location_destination}."
+      container_storage_location_shared_html: "%{user} shared box %{storage_location} with team %{team} with %{permission_level} permission."
+      container_storage_location_unshared_html: "%{user} unshared box %{storage_location} with team %{team}."
+      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} %{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}."
+      task_step_restore_asset_version_html: "%{user} restored version <strong>%{version}</strong> of the file <strong>%{file}</strong> on protocol's step <strong>%{step}</strong> on task %{my_module}."
+      task_result_restore_asset_version_html: "%{user} restored version <strong>%{version}</strong> of the file <strong>%{file}</strong> on result %{result} on task %{my_module}."
+      repository_column_restore_asset_version_html: "%{user} restored version <strong>%{version}</strong> of the file <strong>%{file}</strong> in inventory column %{repository_column} in inventory %{repository}."
+      protocol_step_restore_asset_version_html: "%{user} restored version <strong>%{version}</strong> of the file <strong>%{file}</strong> on Protocol's Template %{protocol} step <strong>%{step}</strong> in Protocol repository."
     activity_name:
       create_project: "Project created"
       rename_project: "Project renamed"
@@ -601,6 +623,28 @@ en:
       task_step_file_duplicated: "File attachment on Task step duplicated"
       result_file_duplicated: "File attachment on Task result duplicated"
       protocol_step_file_duplicated: "File attachment on Protocol step duplicated"
+      storage_location_created: "Location created"
+      storage_location_deleted: "Location deleted"
+      storage_location_edited: "Location edited"
+      storage_location_moved: "Location moved"
+      storage_location_shared: "Location shared"
+      storage_location_unshared: "Location unshared"
+      storage_location_sharing_updated: "Location sharing permission updated"
+      container_storage_location_created: "Box created"
+      container_storage_location_deleted: "Box deleted"
+      container_storage_location_edited: "Box edited"
+      container_storage_location_moved: "Box moved"
+      container_storage_location_shared: "Box shared"
+      container_storage_location_unshared: "Box unshared"
+      container_storage_location_sharing_updated: "Box sharing permission updated"
+      storage_location_repository_row_created: "Inventory item location assigned"
+      storage_location_repository_row_deleted: "Inventory item location unassigned"
+      storage_location_repository_row_moved: "Inventory item location moved"
+      container_storage_location_imported: "Box import"
+      task_step_restore_asset_version: "Task step file version restored"
+      task_result_restore_asset_version: "Result file version restored"
+      repository_column_restore_asset_version: "Inventroy item file version restored"
+      protocol_step_restore_asset_version: "Protocol step file version restored"
     activity_group:
       projects: "Projects"
       task_results: "Task results"
@@ -614,6 +658,9 @@ en:
       team: "Team"
       exports: "Exports"
       label_templates: "Label templates"
+      storage_locations: "Inventory locations"
+      container_storage_locations: "Inventory location boxes"
+      storage_location_repository_rows: "Item assignments to location"
     subject_name:
       repository: "Inventory"
       project: "Project"
@@ -623,3 +670,4 @@ en:
       protocol: "Protocol"
       step: "Step"
       report: "Report"
+      storage_location: "Location"
diff --git a/config/routes.rb b/config/routes.rb
index 49db07eb4..0fdc7fe93 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -166,7 +166,12 @@ Rails.application.routes.draw do
 
     resources :user_notifications, only: :index do
       collection do
+        get :filter_groups
         get :unseen_counter
+        post :mark_all_read
+      end
+      member do
+        post :toggle_read
       end
     end
 
@@ -194,6 +199,8 @@ Rails.application.routes.draw do
           get 'create_modal', to: 'repositories#create_modal',
               defaults: { format: 'json' }
           get 'actions_toolbar'
+          get :list
+          get :rows_list
         end
         member do
           get :export_empty_repository
@@ -253,6 +260,13 @@ Rails.application.routes.draw do
             via: [:get, :post, :put, :patch]
     end
 
+    resources :team_shared_objects, only: [] do
+      collection do
+        post 'update'
+        get 'shareable_teams'
+      end
+    end
+
     resources :reports, only: [:index, :new, :create, :update] do
       member do
         get :document_preview
@@ -807,6 +821,30 @@ Rails.application.routes.draw do
 
     resources :connected_devices, controller: 'users/connected_devices', only: %i(destroy)
 
+    resources :storage_locations, only: %i(index create destroy update show) do
+      collection do
+        get :actions_toolbar
+        get :tree
+      end
+      member do
+        post :move
+        post :duplicate
+        post :unassign_rows
+        get :available_positions
+        get :shareable_teams
+        get :export_container
+        post :import_container
+      end
+      resources :storage_location_repository_rows, only: %i(index create destroy update) do
+        collection do
+          post :actions_toolbar
+        end
+        member do
+          post :move
+        end
+      end
+    end
+
     get 'search' => 'search#index'
     get 'search/new' => 'search#new', as: :new_search
     resource :search, only: [], controller: :search do
@@ -827,6 +865,8 @@ Rails.application.routes.draw do
     get 'files/:id/edit', to: 'assets#edit', as: 'edit_asset'
     get 'files/:id/checksum', to: 'assets#checksum', as: 'asset_checksum'
     get 'files/:id/show', to: 'assets#show', as: 'asset_show'
+    get 'files/:id/versions', to: 'assets#versions', as: 'asset_versions'
+    post 'files/:id/restore_version', to: 'assets#restore_version', as: 'asset_restore_version'
     patch 'files/:id/toggle_view_mode', to: 'assets#toggle_view_mode', as: 'toggle_view_mode'
     get 'files/:id/load_asset', to: 'assets#load_asset', as: 'load_asset'
     post 'files/:id/update_image', to: 'assets#update_image',
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 623270ff4..07ac593cd 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -54,6 +54,7 @@ const entryList = {
   vue_experiments_list: './app/javascript/packs/vue/experiments_list.js',
   vue_my_modules_list: './app/javascript/packs/vue/my_modules_list.js',
   vue_design_system_select: './app/javascript/packs/vue/design_system/select.js',
+  vue_design_system_breadcrumbs: './app/javascript/packs/vue/design_system/breadcrumbs.js',
   vue_protocols_list: './app/javascript/packs/vue/protocols_list.js',
   vue_repositories_table: './app/javascript/packs/vue/repositories_table.js',
   vue_import_repository_modal: './app/javascript/packs/vue/import_repository_modal.js',
@@ -65,7 +66,9 @@ const entryList = {
   vue_legacy_tags_modal: './app/javascript/packs/vue/legacy/tags_modal.js',
   vue_legacy_access_modal: './app/javascript/packs/vue/legacy/access_modal.js',
   vue_legacy_repository_menu_dropdown: './app/javascript/packs/vue/legacy/repository_menu_dropdown.js',
-  vue_dashboard_new_task: './app/javascript/packs/vue/dashboard_new_task.js'
+  vue_dashboard_new_task: './app/javascript/packs/vue/dashboard_new_task.js',
+  vue_storage_locations_table: './app/javascript/packs/vue/storage_locations_table.js',
+  vue_storage_locations_container: './app/javascript/packs/vue/storage_locations_container.js'
 };
 
 // Engine pack loading based on https://github.com/rails/webpacker/issues/348#issuecomment-635480949
diff --git a/db/migrate/20240705122903_add_storage_locations.rb b/db/migrate/20240705122903_add_storage_locations.rb
new file mode 100644
index 000000000..10b18a733
--- /dev/null
+++ b/db/migrate/20240705122903_add_storage_locations.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class AddStorageLocations < ActiveRecord::Migration[7.0]
+  include DatabaseHelper
+
+  def up
+    create_table :storage_locations do |t|
+      t.string :name
+      t.string :description
+      t.references :parent, index: true, foreign_key: { to_table: :storage_locations }
+      t.references :team, index: true, foreign_key: { to_table: :teams }
+      t.references :created_by, foreign_key: { to_table: :users }
+      t.boolean :container, default: false, null: false, index: true
+      t.jsonb :metadata, null: false, default: {}
+      t.datetime :discarded_at, index: true
+
+      t.timestamps
+    end
+
+    create_table :storage_location_repository_rows do |t|
+      t.references :repository_row, index: true, foreign_key: { to_table: :repository_rows }
+      t.references :storage_location, index: true, foreign_key: { to_table: :storage_locations }
+      t.references :created_by, foreign_key: { to_table: :users }
+      t.jsonb :metadata, null: false, default: {}
+      t.datetime :discarded_at, index: true
+
+      t.timestamps
+    end
+
+    add_gin_index_without_tags :storage_locations, :name
+    add_gin_index_without_tags :storage_locations, :description
+  end
+
+  def down
+    drop_table :storage_location_repository_rows
+    drop_table :storage_locations
+  end
+end
diff --git a/db/migrate/20240725135302_add_storage_location_permissions.rb b/db/migrate/20240725135302_add_storage_location_permissions.rb
new file mode 100644
index 000000000..5ba79a8dd
--- /dev/null
+++ b/db/migrate/20240725135302_add_storage_location_permissions.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class AddStorageLocationPermissions < ActiveRecord::Migration[7.0]
+  STORAGE_LOCATIONS_MANAGE_PERMISSION = [
+    TeamPermissions::STORAGE_LOCATIONS_CREATE,
+    TeamPermissions::STORAGE_LOCATIONS_MANAGE,
+    TeamPermissions::STORAGE_LOCATION_CONTAINERS_CREATE,
+    TeamPermissions::STORAGE_LOCATION_CONTAINERS_MANAGE
+  ].freeze
+
+  STORAGE_LOCATIONS_READ_PERMISSION = [
+    TeamPermissions::STORAGE_LOCATIONS_READ,
+    TeamPermissions::STORAGE_LOCATION_CONTAINERS_READ
+  ].freeze
+
+  def up
+    @owner_role = UserRole.find_predefined_owner_role
+    @normal_user_role = UserRole.find_predefined_normal_user_role
+    @viewer_user_role = UserRole.find_predefined_viewer_role
+
+    @owner_role.permissions = @owner_role.permissions | STORAGE_LOCATIONS_MANAGE_PERMISSION |
+                              STORAGE_LOCATIONS_READ_PERMISSION
+    @normal_user_role.permissions = @normal_user_role.permissions | STORAGE_LOCATIONS_MANAGE_PERMISSION |
+                                    STORAGE_LOCATIONS_READ_PERMISSION
+    @viewer_user_role.permissions = @viewer_user_role.permissions | STORAGE_LOCATIONS_READ_PERMISSION
+
+    @owner_role.save(validate: false)
+    @normal_user_role.save(validate: false)
+    @viewer_user_role.save(validate: false)
+  end
+
+  def down
+    @owner_role = UserRole.find_predefined_owner_role
+    @normal_user_role = UserRole.find_predefined_normal_user_role
+    @viewer_user_role = UserRole.find_predefined_viewer_role
+
+    @owner_role.permissions = @owner_role.permissions - STORAGE_LOCATIONS_MANAGE_PERMISSION -
+                              STORAGE_LOCATIONS_READ_PERMISSION
+    @normal_user_role.permissions = @normal_user_role.permissions - STORAGE_LOCATIONS_MANAGE_PERMISSION -
+                                    STORAGE_LOCATIONS_READ_PERMISSION
+    @viewer_user_role.permissions = @viewer_user_role.permissions - STORAGE_LOCATIONS_READ_PERMISSION
+
+    @owner_role.save(validate: false)
+    @normal_user_role.save(validate: false)
+    @viewer_user_role.save(validate: false)
+  end
+end
diff --git a/db/migrate/20240911133615_remove_foreign_key_constraint_from_team_shared_objects.rb b/db/migrate/20240911133615_remove_foreign_key_constraint_from_team_shared_objects.rb
new file mode 100644
index 000000000..410557230
--- /dev/null
+++ b/db/migrate/20240911133615_remove_foreign_key_constraint_from_team_shared_objects.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveForeignKeyConstraintFromTeamSharedObjects < ActiveRecord::Migration[7.0]
+  def change
+    remove_foreign_key :team_shared_objects, :repositories, column: :shared_object_id
+  end
+end
diff --git a/db/migrate/20241001163211_add_counter_cache_repository_row.rb b/db/migrate/20241001163211_add_counter_cache_repository_row.rb
new file mode 100644
index 000000000..1b91e4ffa
--- /dev/null
+++ b/db/migrate/20241001163211_add_counter_cache_repository_row.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddCounterCacheRepositoryRow < ActiveRecord::Migration[7.0]
+  def change
+    change_table :repositories, bulk: true do |t|
+      t.integer :repository_rows_count, default: 0, null: false
+    end
+
+    Repository.find_each do |repository|
+      Repository.reset_counters(repository.id, :repository_rows)
+    end
+  end
+end
diff --git a/db/migrate/20241002122340_add_smart_annotation_flag_to_repository_text_value.rb b/db/migrate/20241002122340_add_smart_annotation_flag_to_repository_text_value.rb
new file mode 100644
index 000000000..5ae3fc994
--- /dev/null
+++ b/db/migrate/20241002122340_add_smart_annotation_flag_to_repository_text_value.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddSmartAnnotationFlagToRepositoryTextValue < ActiveRecord::Migration[7.0]
+  def up
+    add_column :repository_text_values, :has_smart_annotation, :boolean, null: false, default: false
+
+    execute('UPDATE repository_text_values SET has_smart_annotation = TRUE ' \
+            'WHERE data ~ \'\[(@(.*?)|\#(.*?)~(prj|exp|tsk|rep_item))~([0-9a-zA-Z]+)\]\'')
+  end
+
+  def down
+    remove_column :repository_text_values, :has_smart_annotation
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5ecee75c7..6bbdd86ef 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_06_26_113515) do
+ActiveRecord::Schema[7.0].define(version: 2024_10_02_122340) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gist"
   enable_extension "pg_trgm"
@@ -721,8 +721,8 @@ ActiveRecord::Schema[7.0].define(version: 2024_06_26_113515) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "type"
-    t.datetime "start_time_dup"
-    t.datetime "end_time_dup"
+    t.datetime "start_time_dup", precision: nil
+    t.datetime "end_time_dup", precision: nil
     t.index "((end_time)::date)", name: "index_repository_date_time_range_values_on_end_time_as_date", where: "((type)::text = 'RepositoryDateRangeValue'::text)"
     t.index "((end_time)::time without time zone)", name: "index_repository_date_time_range_values_on_end_time_as_time", where: "((type)::text = 'RepositoryTimeRangeValue'::text)"
     t.index "((start_time)::date)", name: "index_repository_date_time_range_values_on_start_time_as_date", where: "((type)::text = 'RepositoryDateRangeValue'::text)"
@@ -936,6 +936,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_06_26_113515) do
     t.datetime "updated_at", precision: nil
     t.bigint "created_by_id", null: false
     t.bigint "last_modified_by_id", null: false
+    t.boolean "has_smart_annotation", default: false, null: false
     t.index "trim_html_tags((data)::text) gin_trgm_ops", name: "index_repository_text_values_on_data", using: :gin
   end
 
@@ -1083,6 +1084,40 @@ ActiveRecord::Schema[7.0].define(version: 2024_06_26_113515) do
     t.index ["user_id"], name: "index_steps_on_user_id"
   end
 
+  create_table "storage_location_repository_rows", force: :cascade do |t|
+    t.bigint "repository_row_id"
+    t.bigint "storage_location_id"
+    t.bigint "created_by_id"
+    t.jsonb "metadata", default: {}, null: false
+    t.datetime "discarded_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["created_by_id"], name: "index_storage_location_repository_rows_on_created_by_id"
+    t.index ["discarded_at"], name: "index_storage_location_repository_rows_on_discarded_at"
+    t.index ["repository_row_id"], name: "index_storage_location_repository_rows_on_repository_row_id"
+    t.index ["storage_location_id"], name: "index_storage_location_repository_rows_on_storage_location_id"
+  end
+
+  create_table "storage_locations", force: :cascade do |t|
+    t.string "name"
+    t.string "description"
+    t.bigint "parent_id"
+    t.bigint "team_id"
+    t.bigint "created_by_id"
+    t.boolean "container", default: false, null: false
+    t.jsonb "metadata", default: {}, null: false
+    t.datetime "discarded_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index "trim_html_tags((description)::text) gin_trgm_ops", name: "index_storage_locations_on_description", using: :gin
+    t.index "trim_html_tags((name)::text) gin_trgm_ops", name: "index_storage_locations_on_name", using: :gin
+    t.index ["container"], name: "index_storage_locations_on_container"
+    t.index ["created_by_id"], name: "index_storage_locations_on_created_by_id"
+    t.index ["discarded_at"], name: "index_storage_locations_on_discarded_at"
+    t.index ["parent_id"], name: "index_storage_locations_on_parent_id"
+    t.index ["team_id"], name: "index_storage_locations_on_team_id"
+  end
+
   create_table "tables", force: :cascade do |t|
     t.binary "contents", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -1278,6 +1313,9 @@ ActiveRecord::Schema[7.0].define(version: 2024_06_26_113515) do
     t.integer "failed_attempts", default: 0, null: false
     t.datetime "locked_at", precision: nil
     t.string "unlock_token"
+    t.string "api_key"
+    t.datetime "api_key_expires_at", precision: nil
+    t.datetime "api_key_created_at", precision: nil
     t.index "trim_html_tags((full_name)::text) gin_trgm_ops", name: "index_users_on_full_name", using: :gin
     t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
@@ -1502,12 +1540,17 @@ ActiveRecord::Schema[7.0].define(version: 2024_06_26_113515) do
   add_foreign_key "steps", "protocols"
   add_foreign_key "steps", "users"
   add_foreign_key "steps", "users", column: "last_modified_by_id"
+  add_foreign_key "storage_location_repository_rows", "repository_rows"
+  add_foreign_key "storage_location_repository_rows", "storage_locations"
+  add_foreign_key "storage_location_repository_rows", "users", column: "created_by_id"
+  add_foreign_key "storage_locations", "storage_locations", column: "parent_id"
+  add_foreign_key "storage_locations", "teams"
+  add_foreign_key "storage_locations", "users", column: "created_by_id"
   add_foreign_key "tables", "users", column: "created_by_id"
   add_foreign_key "tables", "users", column: "last_modified_by_id"
   add_foreign_key "tags", "projects"
   add_foreign_key "tags", "users", column: "created_by_id"
   add_foreign_key "tags", "users", column: "last_modified_by_id"
-  add_foreign_key "team_shared_objects", "repositories", column: "shared_object_id"
   add_foreign_key "team_shared_objects", "teams"
   add_foreign_key "teams", "users", column: "created_by_id"
   add_foreign_key "teams", "users", column: "last_modified_by_id"
diff --git a/docker-compose.yml b/docker-compose.yml
index 91bbf19a0..8db309484 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
     container_name: scinote_web_development
     stdin_open: true
     tty: true
+    user: scinote
     depends_on:
       - db
     ports:
@@ -43,6 +44,7 @@ services:
     container_name: scinote_webpack_development
     stdin_open: true
     tty: true
+    user: scinote
     command: >
       bash -c "yarn install && yarn build --watch"
     environment:
@@ -60,6 +62,7 @@ services:
     container_name: scinote_css_bundling_development
     stdin_open: true
     tty: true
+    user: scinote
     command: >
       bash -c "yarn build:css --watch"
     environment:
@@ -77,6 +80,7 @@ services:
     container_name: scinote_tailwind_development
     stdin_open: true
     tty: true
+    user: scinote
     command: >
       bash -c "rails tailwindcss:watch"
     environment:
diff --git a/package.json b/package.json
index b7d322927..069f60220 100644
--- a/package.json
+++ b/package.json
@@ -35,11 +35,11 @@
     "@vuepic/vue-datepicker": "^7.2.0",
     "@vueuse/components": "^10.5.0",
     "@vueuse/core": "^10.5.0",
-    "ag-grid-community": "^30.1.0",
-    "ag-grid-vue3": "^30.2.1",
+    "ag-grid-community": "^31.3.4",
+    "ag-grid-vue3": "^31.3.4",
     "ajv": "6.12.6",
     "autoprefixer": "10.4.14",
-    "axios": "^1.6.0",
+    "axios": "^1.7.4",
     "babel-loader": "^8.2.5",
     "babel-plugin-macros": "^3.1.0",
     "bootstrap": "^3.4.1",
@@ -74,7 +74,7 @@
     "pdfjs-dist": "^2.5.207",
     "postcss": "8.4.32",
     "postcss-loader": "5.3.0",
-    "puppeteer": "npm:puppeteer-core",
+    "puppeteer": "npm:puppeteer-core@^22.15.0",
     "puppeteer-core": "^21.3.8",
     "raw-loader": "^4.0.2",
     "sass": "^1.63.6",
@@ -85,12 +85,12 @@
     "tui-color-picker": "^2.2.0",
     "tui-image-editor": "github:scinote-eln/tui.image-editor#3_15_2_updated",
     "twemoji": "^12.1.4",
-    "vue": "^3.3.4",
+    "vue": "^3.5.4",
     "vue-loader": "^16.0.0",
     "vue3-draggable-resizable": "^1.6.5",
     "vue3-perfect-scrollbar": "^1.6.1",
     "vuedraggable": "^4.1.0",
-    "webpack": "^5.64.4",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.10.0",
     "webpack-manifest-plugin": "^1.3.2",
     "webpack-merge": "^4.1.3",
diff --git a/spec/controllers/repositories_controller_spec.rb b/spec/controllers/repositories_controller_spec.rb
index d24d2326d..7a04b3a2f 100644
--- a/spec/controllers/repositories_controller_spec.rb
+++ b/spec/controllers/repositories_controller_spec.rb
@@ -11,7 +11,7 @@ describe RepositoriesController, type: :controller do
 
   describe 'index' do
     let(:repository) { create :repository, team: team, created_by: user }
-    let(:action) { get :index, format: :json }
+    let(:action) { get :index, format: :json, params: { page: 1, per_page: 20 } }
 
     it 'correct JSON format' do
       repository
diff --git a/yarn.lock b/yarn.lock
index 5b72e534f..5ae46aae5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -278,6 +278,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
+
 "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
@@ -288,6 +293,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
 "@babel/helper-validator-option@^7.21.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
@@ -336,6 +346,13 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
+"@babel/parser@^7.25.3":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f"
+  integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==
+  dependencies:
+    "@babel/types" "^7.25.6"
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1019,6 +1036,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.25.6":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6"
+  integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
 "@blueprintjs/colors@^4.0.0-alpha.2", "@blueprintjs/colors@^4.0.0-alpha.3":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@blueprintjs/colors/-/colors-4.2.1.tgz#603b2512caee84feddcb3dbd536534c140b9a1f3"
@@ -1198,7 +1224,7 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+"@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
   integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
@@ -1207,29 +1233,53 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+  dependencies:
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/resolve-uri@3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
 "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
+
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
 
 "@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+
 "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
@@ -1243,6 +1293,14 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@juggle/resize-observer@^3.3.1":
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
@@ -1307,6 +1365,20 @@
     unbzip2-stream "1.4.3"
     yargs "17.7.1"
 
+"@puppeteer/browsers@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-2.3.0.tgz#791ea7d80450fea24eb19fb1d70c367ad4e08cae"
+  integrity sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==
+  dependencies:
+    debug "^4.3.5"
+    extract-zip "^2.0.1"
+    progress "^2.0.3"
+    proxy-agent "^6.4.0"
+    semver "^7.6.3"
+    tar-fs "^3.0.6"
+    unbzip2-stream "^1.4.3"
+    yargs "^17.7.2"
+
 "@risingstack/react-easy-state@^6.3.0":
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/@risingstack/react-easy-state/-/react-easy-state-6.3.0.tgz#3590031f7382c5c6c7866790ba7a72e557a12407"
@@ -1553,31 +1625,10 @@
   resolved "https://registry.yarnpkg.com/@types/dom4/-/dom4-2.0.2.tgz#6495303f049689ce936ed328a3e5ede9c51408ee"
   integrity sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g==
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1"
-  integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
-
-"@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/hast@^2.0.0":
   version "2.3.5"
@@ -1594,7 +1645,7 @@
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -1684,6 +1735,17 @@
     estree-walker "^2.0.2"
     source-map-js "^1.0.2"
 
+"@vue/compiler-core@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.4.tgz#b8b5805e767b94d84af01f5527dbb4896326c478"
+  integrity sha512-oNwn+BAt3n9dK9uAYvI+XGlutwuTq/wfj4xCBaZCqwwVIGtD7D6ViihEbyYZrDHIHTDE3Q6oL3/hqmAyFEy9DQ==
+  dependencies:
+    "@babel/parser" "^7.25.3"
+    "@vue/shared" "3.5.4"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-dom@3.3.4":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151"
@@ -1692,7 +1754,30 @@
     "@vue/compiler-core" "3.3.4"
     "@vue/shared" "3.3.4"
 
-"@vue/compiler-sfc@3.3.4", "@vue/compiler-sfc@^3.3.4":
+"@vue/compiler-dom@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.4.tgz#3f98e6ca76abab73630dad055b3ef6e2e6c2b006"
+  integrity sha512-yP9RRs4BDLOLfldn6ah+AGCNovGjMbL9uHvhDHf5wan4dAHLnFGOkqtfE7PPe4HTXIqE7l/NILdYw53bo1C8jw==
+  dependencies:
+    "@vue/compiler-core" "3.5.4"
+    "@vue/shared" "3.5.4"
+
+"@vue/compiler-sfc@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.4.tgz#a530accc9afed38506b14ce7ac6fb237eb09ff2d"
+  integrity sha512-P+yiPhL+NYH7m0ZgCq7AQR2q7OIE+mpAEgtkqEeH9oHSdIRvUO+4X6MPvblJIWcoe4YC5a2Gdf/RsoyP8FFiPQ==
+  dependencies:
+    "@babel/parser" "^7.25.3"
+    "@vue/compiler-core" "3.5.4"
+    "@vue/compiler-dom" "3.5.4"
+    "@vue/compiler-ssr" "3.5.4"
+    "@vue/shared" "3.5.4"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.11"
+    postcss "^8.4.44"
+    source-map-js "^1.2.0"
+
+"@vue/compiler-sfc@^3.3.4":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df"
   integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==
@@ -1716,6 +1801,14 @@
     "@vue/compiler-dom" "3.3.4"
     "@vue/shared" "3.3.4"
 
+"@vue/compiler-ssr@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.4.tgz#b6d011adaca367e7cc364cb09dfb6a5c12ad974a"
+  integrity sha512-acESdTXsxPnYr2C4Blv0ggx5zIFMgOzZmYU2UgvIff9POdRGbRNBHRyzHAnizcItvpgerSKQbllUc9USp3V7eg==
+  dependencies:
+    "@vue/compiler-dom" "3.5.4"
+    "@vue/shared" "3.5.4"
+
 "@vue/reactivity-transform@3.3.4":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929"
@@ -1727,43 +1820,49 @@
     estree-walker "^2.0.2"
     magic-string "^0.30.0"
 
-"@vue/reactivity@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.4.tgz#a27a29c6cd17faba5a0e99fbb86ee951653e2253"
-  integrity sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==
+"@vue/reactivity@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.5.4.tgz#f1c771612e0612443583bac6ce52b8cef0ac5c40"
+  integrity sha512-HKKbEuP7tYSGCq4e4nK6ZW6l5hyG66OUetefBp4budUyjvAYsnQDf+bgFzg2RAgnH0CInyqXwD9y47jwJEHrQw==
   dependencies:
-    "@vue/shared" "3.3.4"
+    "@vue/shared" "3.5.4"
 
-"@vue/runtime-core@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.4.tgz#4bb33872bbb583721b340f3088888394195967d1"
-  integrity sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==
+"@vue/runtime-core@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.5.4.tgz#411e4f6d445d44354bbc242dfb168379c3bec5c3"
+  integrity sha512-f3ek2sTA0AFu0n+w+kCtz567Euqqa3eHewvo4klwS7mWfSj/A+UmYTwsnUFo35KeyAFY60JgrCGvEBsu1n/3LA==
   dependencies:
-    "@vue/reactivity" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/reactivity" "3.5.4"
+    "@vue/shared" "3.5.4"
 
-"@vue/runtime-dom@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz#992f2579d0ed6ce961f47bbe9bfe4b6791251566"
-  integrity sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==
+"@vue/runtime-dom@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.5.4.tgz#68242033e648a6d1400f27d923d5788362fbefb8"
+  integrity sha512-ofyc0w6rbD5KtjhP1i9hGOKdxGpvmuB1jprP7Djlj0X7R5J/oLwuNuE98GJ8WW31Hu2VxQHtk/LYTAlW8xrJdw==
   dependencies:
-    "@vue/runtime-core" "3.3.4"
-    "@vue/shared" "3.3.4"
-    csstype "^3.1.1"
+    "@vue/reactivity" "3.5.4"
+    "@vue/runtime-core" "3.5.4"
+    "@vue/shared" "3.5.4"
+    csstype "^3.1.3"
 
-"@vue/server-renderer@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.4.tgz#ea46594b795d1536f29bc592dd0f6655f7ea4c4c"
-  integrity sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==
+"@vue/server-renderer@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.5.4.tgz#8b9a102474922156c881c8ed1442907512d5435b"
+  integrity sha512-FbjV6DJLgKRetMYFBA1UXCroCiED/Ckr53/ba9wivyd7D/Xw9fpo0T6zXzCnxQwyvkyrL7y6plgYhWhNjGxY5g==
   dependencies:
-    "@vue/compiler-ssr" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-ssr" "3.5.4"
+    "@vue/shared" "3.5.4"
 
 "@vue/shared@3.3.4":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
+"@vue/shared@3.5.4":
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.4.tgz#d4768ddf13aded2774162298a3b5658cc999e1ee"
+  integrity sha512-L2MCDD8l7yC62Te5UUyPVpmexhL9ipVnYRw9CsWfm/BGRL5FwDX4a25bcJ/OJSD3+Hx+k/a8LDKcG2AFdJV3BA==
+
 "@vuepic/vue-datepicker@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@vuepic/vue-datepicker/-/vue-datepicker-7.2.0.tgz#c47ffb6eb939f2b09188c8068fcd4d118b36b6b8"
@@ -1803,125 +1902,125 @@
   dependencies:
     vue-demi ">=0.14.6"
 
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
 
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
 
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^1.2.0":
@@ -1976,10 +2075,10 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
 acorn-walk@^7.1.1:
   version "7.2.0"
@@ -1991,20 +2090,23 @@ acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.2:
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
-ag-grid-community@^30.1.0:
-  version "30.2.1"
-  resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-30.2.1.tgz#a83d153ad1dbec46402ebe89f74ebb4b0710b3c7"
-  integrity sha512-1slonXskJbbI9ybhTx//4YKfJpZVAEnHL8dui1rQJRSXKByUi+/f7XtvkLsbgBkawoWbqvRAySjYtvz80+kBfA==
+ag-grid-community@31.3.4, ag-grid-community@^31.3.4:
+  version "31.3.4"
+  resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-31.3.4.tgz#d9397672d6941aebc633a37b2b32e3637aa05642"
+  integrity sha512-jOxQO86C6eLnk1GdP24HB6aqaouFzMWizgfUwNY5MnetiWzz9ZaAmOGSnW/XBvdjXvC5Fpk3gSbvVKKQ7h9kBw==
 
-ag-grid-vue3@^30.2.1:
-  version "30.2.1"
-  resolved "https://registry.yarnpkg.com/ag-grid-vue3/-/ag-grid-vue3-30.2.1.tgz#05e542e60823b6742bfbb9b37efa7d0c46f118af"
-  integrity sha512-uIsBv5H7Nu6ao1V7cuReVj27gFdlK4kfvo/4M6AWmYswghMpc1GwzczZNV8HUypGcwxONW9YSfr8zabYQNGcAg==
+ag-grid-vue3@^31.3.4:
+  version "31.3.4"
+  resolved "https://registry.yarnpkg.com/ag-grid-vue3/-/ag-grid-vue3-31.3.4.tgz#9ec4ad5d58f7899339c6832d72c166ef7874076b"
+  integrity sha512-MFsWKeWBuzexc3hkOtDsZw4xkXfVT6B267DcUmZGy92otgGfd/I8qMKhGr1qnUnel9Jy5OKeBS+jQusfmO2/SA==
+  dependencies:
+    ag-grid-community "31.3.4"
+    vue "^3.0.0"
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
@@ -2254,10 +2356,10 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.6.0:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
-  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
+axios@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
+  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -2329,6 +2431,39 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+bare-events@^2.0.0, bare-events@^2.2.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.4.2.tgz#3140cca7a0e11d49b3edc5041ab560659fd8e1f8"
+  integrity sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==
+
+bare-fs@^2.1.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-2.3.1.tgz#cdbd63dac7a552dfb2b87d18c822298d1efd213d"
+  integrity sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==
+  dependencies:
+    bare-events "^2.0.0"
+    bare-path "^2.0.0"
+    bare-stream "^2.0.0"
+
+bare-os@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-2.4.0.tgz#5de5e3ba7704f459c9656629edca7cc736e06608"
+  integrity sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==
+
+bare-path@^2.0.0, bare-path@^2.1.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/bare-path/-/bare-path-2.1.3.tgz#594104c829ef660e43b5589ec8daef7df6cedb3e"
+  integrity sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==
+  dependencies:
+    bare-os "^2.1.0"
+
+bare-stream@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/bare-stream/-/bare-stream-2.1.3.tgz#070b69919963a437cc9e20554ede079ce0a129b2"
+  integrity sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==
+  dependencies:
+    streamx "^2.18.0"
+
 base64-arraybuffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
@@ -2491,15 +2626,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
-  version "4.21.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
-  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+  version "4.23.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
   dependencies:
-    caniuse-lite "^1.0.30001449"
-    electron-to-chromium "^1.4.284"
-    node-releases "^2.0.8"
-    update-browserslist-db "^1.0.10"
+    caniuse-lite "^1.0.30001646"
+    electron-to-chromium "^1.5.4"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.0"
 
 bson-objectid@2.0.4, bson-objectid@^2.0.4:
   version "2.0.4"
@@ -2599,11 +2734,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464:
   version "1.0.30001481"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912"
   integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
 
+caniuse-lite@^1.0.30001646:
+  version "1.0.30001655"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f"
+  integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==
+
 canvas@^2.6.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.0.tgz#7f0c3e9ae94cf469269b5d3a7963a7f3a9936434"
@@ -2678,6 +2818,15 @@ chromium-bidi@0.4.31:
     mitt "3.0.1"
     urlpattern-polyfill "9.0.0"
 
+chromium-bidi@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.6.3.tgz#363fe1ca6b9c6122b9f1b2a47f9449ecf712f755"
+  integrity sha512-qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A==
+  dependencies:
+    mitt "3.0.1"
+    urlpattern-polyfill "10.0.0"
+    zod "3.23.8"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -3130,11 +3279,16 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^3.0.2, csstype@^3.1.1:
+csstype@^3.0.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
+csstype@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+
 data-uri-to-buffer@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz#540bd4c8753a25ee129035aebdedf63b078703c7"
@@ -3180,6 +3334,13 @@ debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.5, debug@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+  dependencies:
+    ms "2.1.2"
+
 decimal.js@^10.2.1, decimal.js@^10.3.1:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
@@ -3276,6 +3437,11 @@ devtools-protocol@0.0.1179426:
   resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1179426.tgz#c4c3ee671efae868395569123002facbbbffa267"
   integrity sha512-KKC7IGwdOr7u9kTGgjUvGTov/z1s2H7oHi3zKCdR9eSDyCPia5CBi4aRhtp7d8uR7l0GS5UTDw3TjKGu5CqINg==
 
+devtools-protocol@0.0.1312386:
+  version "0.0.1312386"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz#5ab824d6f1669ec6c6eb0fba047e73601d969052"
+  integrity sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==
+
 diff-match-patch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
@@ -3369,10 +3535,10 @@ downloadjs@^1.4.7:
   resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
   integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==
 
-electron-to-chromium@^1.4.284:
-  version "1.4.369"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.369.tgz#a98d838cdd79be4471cd04e9b4dffe891d037874"
-  integrity sha512-LfxbHXdA/S+qyoTEA4EbhxGjrxx7WK2h6yb5K2v0UCOufUKX+VZaHbl3svlzZfv9sGseym/g3Ne4DpsgRULmqg==
+electron-to-chromium@^1.5.4:
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6"
+  integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
@@ -3382,9 +3548,9 @@ element-resize-detector@^1.2.1:
     batch-processor "1.0.0"
 
 elliptic@^6.5.3, elliptic@^6.5.4:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  version "6.5.7"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
+  integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"
@@ -3418,10 +3584,10 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.10.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
-  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
+enhanced-resolve@^5.17.1:
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -3431,6 +3597,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -3460,10 +3631,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-module-lexer@^1.2.1:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
+  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
 
 es6-error@^4.1.1:
   version "4.1.1"
@@ -3480,6 +3651,11 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escalade@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+
 escape-html@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -3591,7 +3767,7 @@ extract-text-webpack-plugin@^3.0.2:
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
-extract-zip@2.0.1:
+extract-zip@2.0.1, extract-zip@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
@@ -3615,7 +3791,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-fifo@^1.1.0, fast-fifo@^1.2.0:
+fast-fifo@^1.1.0, fast-fifo@^1.2.0, fast-fifo@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
   integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
@@ -3942,7 +4118,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4104,6 +4280,14 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
+http-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -4125,6 +4309,14 @@ https-proxy-agent@^7.0.2:
     agent-base "^7.0.2"
     debug "4"
 
+https-proxy-agent@^7.0.3:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -4785,6 +4977,13 @@ magic-string@^0.30.0:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
+magic-string@^0.30.11:
+  version "0.30.11"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954"
+  integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+
 make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -5573,10 +5772,10 @@ node-polyfill-webpack-plugin@^2.0.1:
     util "^0.12.4"
     vm-browserify "^1.1.2"
 
-node-releases@^2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
-  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 nopt@^5.0.0:
   version "5.0.0"
@@ -5814,9 +6013,9 @@ path-parse@^1.0.7:
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24"
+  integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==
   dependencies:
     isarray "0.0.1"
 
@@ -5869,6 +6068,11 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
+picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
+
 picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -6180,6 +6384,15 @@ postcss@^7.0.1:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
+postcss@^8.4.44:
+  version "8.4.45"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.45.tgz#538d13d89a16ef71edbf75d895284ae06b79e603"
+  integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.0.1"
+    source-map-js "^1.2.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6200,7 +6413,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-progress@2.0.3:
+progress@2.0.3, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -6246,6 +6459,20 @@ proxy-agent@6.3.1:
     proxy-from-env "^1.1.0"
     socks-proxy-agent "^8.0.2"
 
+proxy-agent@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.4.0.tgz#b4e2dd51dee2b377748aef8d45604c2d7608652d"
+  integrity sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    http-proxy-agent "^7.0.1"
+    https-proxy-agent "^7.0.3"
+    lru-cache "^7.14.1"
+    pac-proxy-agent "^7.0.1"
+    proxy-from-env "^1.1.0"
+    socks-proxy-agent "^8.0.2"
+
 proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
@@ -6303,17 +6530,16 @@ puppeteer-core@^21.3.8:
     devtools-protocol "0.0.1179426"
     ws "8.14.2"
 
-"puppeteer@npm:puppeteer-core":
-  version "21.3.8"
-  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-21.3.8.tgz#7ac4879c9f73e8426431d8ca4c58680e517a4b08"
-  integrity sha512-yv12E/+zZ7Lei5tJB4sUkSrsuqKibuYpYxLGbmtLUjjYIqGE5HKz9OUI2I/RFHEvF+pHi2bTbv5bWydeCGJ6Mw==
+"puppeteer@npm:puppeteer-core@^22.15.0":
+  version "22.15.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-22.15.0.tgz#c76926cce5dbc177572797a9dacc325c313fa91a"
+  integrity sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==
   dependencies:
-    "@puppeteer/browsers" "1.7.1"
-    chromium-bidi "0.4.31"
-    cross-fetch "4.0.0"
-    debug "4.3.4"
-    devtools-protocol "0.0.1179426"
-    ws "8.14.2"
+    "@puppeteer/browsers" "2.3.0"
+    chromium-bidi "0.6.3"
+    debug "^4.3.6"
+    devtools-protocol "0.0.1312386"
+    ws "^8.18.0"
 
 qs@^6.9.6:
   version "6.11.2"
@@ -6933,10 +7159,10 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
@@ -6974,6 +7200,11 @@ semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.6.3:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+
 serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
@@ -7111,6 +7342,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+source-map-js@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
+
 source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
@@ -7172,6 +7408,17 @@ streamx@^2.15.0:
     fast-fifo "^1.1.0"
     queue-tick "^1.0.1"
 
+streamx@^2.18.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.18.0.tgz#5bc1a51eb412a667ebfdcd4e6cf6a6fc65721ac7"
+  integrity sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==
+  dependencies:
+    fast-fifo "^1.3.2"
+    queue-tick "^1.0.1"
+    text-decoder "^1.1.0"
+  optionalDependencies:
+    bare-events "^2.2.0"
+
 string-splice@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string-splice/-/string-splice-1.3.0.tgz#ef14cddfc6dc42f9b574132b48f9dc184953847a"
@@ -7303,6 +7550,17 @@ tar-fs@3.0.4:
     pump "^3.0.0"
     tar-stream "^3.1.5"
 
+tar-fs@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.6.tgz#eaccd3a67d5672f09ca8e8f9c3d2b89fa173f217"
+  integrity sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==
+  dependencies:
+    pump "^3.0.0"
+    tar-stream "^3.1.5"
+  optionalDependencies:
+    bare-fs "^2.1.1"
+    bare-path "^2.1.0"
+
 tar-stream@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
@@ -7335,27 +7593,34 @@ tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.7"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7"
-  integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.1"
-    terser "^5.16.5"
+    terser "^5.26.0"
 
-terser@^5.16.5:
-  version "5.16.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5"
-  integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==
+terser@^5.26.0:
+  version "5.31.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1"
+  integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+text-decoder@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.1.1.tgz#5df9c224cebac4a7977720b9f083f9efa1aefde8"
+  integrity sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==
+  dependencies:
+    b4a "^1.6.4"
+
 text-segmentation@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
@@ -7552,7 +7817,7 @@ typed-styles@^0.0.7:
   resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
   integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==
 
-unbzip2-stream@1.4.3:
+unbzip2-stream@1.4.3, unbzip2-stream@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
   integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
@@ -7663,13 +7928,13 @@ universalify@^0.2.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
   integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
-update-browserslist-db@^1.0.10:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -7699,6 +7964,11 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
+urlpattern-polyfill@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec"
+  integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==
+
 urlpattern-polyfill@9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz#bc7e386bb12fd7898b58d1509df21d3c29ab3460"
@@ -7848,16 +8118,16 @@ vue3-perfect-scrollbar@^1.6.1:
     perfect-scrollbar "^1.5.5"
     postcss-import "^12.0.0"
 
-vue@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"
-  integrity sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==
+vue@^3.0.0, vue@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.5.4.tgz#0e5935e8b1e5505d484aee732b72c6e77c7567fd"
+  integrity sha512-3yAj2gkmiY+i7+22A1PWM+kjOVXjU74UPINcTiN7grIVPyFFI0lpGwHlV/4xydDmobaBn7/xmi+YG8HeSlCTcg==
   dependencies:
-    "@vue/compiler-dom" "3.3.4"
-    "@vue/compiler-sfc" "3.3.4"
-    "@vue/runtime-dom" "3.3.4"
-    "@vue/server-renderer" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-dom" "3.5.4"
+    "@vue/compiler-sfc" "3.5.4"
+    "@vue/runtime-dom" "3.5.4"
+    "@vue/server-renderer" "3.5.4"
+    "@vue/shared" "3.5.4"
 
 vuedraggable@^4.1.0:
   version "4.1.0"
@@ -7887,10 +8157,10 @@ warning@^4.0.1, warning@^4.0.2, warning@^4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
-watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -7976,34 +8246,33 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.64.4:
-  version "5.77.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.77.0.tgz#dea3ad16d7ea6b84aa55fa42f4eac9f30e7eb9b4"
-  integrity sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==
+webpack@^5.64.4, webpack@^5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.17.1"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.4.0"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 whatwg-encoding@^1.0.5:
@@ -8105,6 +8374,11 @@ ws@^7.4.5:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
+ws@^8.18.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
@@ -8158,6 +8432,19 @@ yargs@17.7.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
@@ -8175,6 +8462,11 @@ zip-stream@^4.1.0:
     compress-commons "^4.1.2"
     readable-stream "^3.6.0"
 
+zod@3.23.8:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
+
 zwitch@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"