From dbedac3a9b40b57db62f014974be6a1b8b6f6a99 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Wed, 20 Dec 2023 14:02:09 +0100
Subject: [PATCH 001/115] Add omniauth_openid_connect gem, implement basic
 sign-in flow [SCI-9578] (#6666)

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  | 40 ++++++++++++
 .../users/omniauth_callbacks_controller.rb    | 63 ++++++++++++++++++-
 app/helpers/application_helper.rb             |  4 ++
 app/views/users/shared/_links.html.erb        |  8 +++
 config/initializers/extends.rb                |  2 +-
 config/initializers/omniauth.rb               | 28 +++++++++
 config/locales/en.yml                         |  7 +++
 8 files changed, 151 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6559d7435..4937dca18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ gem 'omniauth', '~> 2.1'
 gem 'omniauth-azure-activedirectory-v2'
 gem 'omniauth-linkedin-oauth2'
 gem 'omniauth-okta', git: 'https://github.com/scinote-eln/omniauth-okta', branch: 'org_auth_server_support'
+gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 
 # Gems for API implementation
diff --git a/Gemfile.lock b/Gemfile.lock
index 871e20634..ac89a2868 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,6 +141,7 @@ GEM
       railties (>= 3.1)
     aspector (0.14.0)
     ast (2.4.2)
+    attr_required (1.0.1)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
     awesome_print (1.9.2)
@@ -474,6 +475,22 @@ GEM
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
+    omniauth_openid_connect (0.7.1)
+      omniauth (>= 1.9, < 3)
+      openid_connect (~> 2.2)
+    openid_connect (2.2.0)
+      activemodel
+      attr_required (>= 1.0.0)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.16)
+      net-smtp
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (~> 2.0)
     orm_adapter (0.5.0)
     overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
@@ -514,6 +531,13 @@ GEM
       rack (>= 1.0, < 3)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
+    rack-oauth2 (2.2.0)
+      activesupport
+      attr_required
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
     rack-protection (3.0.6)
       rack
     rack-test (2.1.0)
@@ -660,6 +684,11 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stream (0.5.5)
+    swd (2.0.2)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     sys-uname (1.2.3)
       ffi (~> 1.1)
     tailwindcss-rails (2.0.29)
@@ -685,6 +714,12 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.15)
+      activemodel (>= 3.0.0)
+      public_suffix
     version_gem (1.1.3)
     view_component (3.2.0)
       activesupport (>= 5.2.0, < 8.0)
@@ -692,6 +727,10 @@ GEM
       method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
+    webfinger (2.1.2)
+      activesupport
+      faraday (~> 2.0)
+      faraday-follow_redirects
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -776,6 +815,7 @@ DEPENDENCIES
   omniauth-linkedin-oauth2
   omniauth-okta!
   omniauth-rails_csrf_protection (~> 1.0)
+  omniauth_openid_connect
   overcommit
   pg (~> 1.5)
   pg_search
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 1803b6cb0..058da755d 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)
+    before_action :check_sso_status, only: %i(customazureactivedirectory okta openid_connect)
 
     # You should configure your model like this:
     # devise :omniauthable, omniauth_providers: [:twitter]
@@ -176,6 +176,67 @@ module Users
       end
     end
 
+    def openid_connect
+      auth = request.env['omniauth.auth']
+      settings = ApplicationSettings.instance
+      provider_conf = settings.values['openid_connect']
+      raise StandardError, 'No matching OpenID Connect AD provider config found' if provider_conf.blank?
+
+      return redirect_to connected_accounts_path if current_user
+
+      email = auth.info.email
+      email ||= auth.dig(:extra, :raw_info, :id_token_claims, :emails)&.first
+      user = User.from_omniauth(auth)
+
+      # User found in database so just signing in
+      return sign_in_and_redirect(user) if user.present?
+
+      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')
+        return redirect_to after_omniauth_failure_path_for(resource_name)
+      end
+
+      user = User.find_by(email: email.downcase)
+
+      if user.blank?
+        # Create new user and identity
+        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)
+        end
+
+        sign_in_and_redirect(user)
+      elsif provider_conf['auto_link_on_sign_in']
+        # 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)
+      else
+        # Cannot do anything with it, so just return an error
+        error_message = I18n.t('devise.openid_connect.errors.no_local_user_map')
+        redirect_to after_omniauth_failure_path_for(resource_name)
+      end
+    rescue StandardError => e
+      Rails.logger.error e.message
+      Rails.logger.error e.backtrace.join("\n")
+      error_message = I18n.t('devise.openid_connect.errors.failed_to_save') if e.is_a?(ActiveRecord::RecordInvalid)
+      error_message ||= I18n.t('devise.openid_connect.errors.generic')
+      redirect_to after_omniauth_failure_path_for(resource_name)
+    ensure
+      if 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'))
+      end
+    end
+
     # More info at:
     # https://github.com/plataformatec/devise#omniauth
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 22eb85297..79bcd1522 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -205,6 +205,10 @@ module ApplicationHelper
     ApplicationSettings.instance.values['azure_ad_apps'].present?
   end
 
+  def openid_connect_configured?
+    ApplicationSettings.instance.values['openid_connect'].present?
+  end
+
   def wopi_enabled?
     ENV['WOPI_ENABLED'] == 'true'
   end
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 0ed2a0ee0..1172c7341 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -47,5 +47,13 @@
         <%= render partial: "users/shared/azure_sign_in_links", locals: { resource_name: resource_name } %>
       </div>
     <% end %>
+
+    <%- if sso_enabled? && openid_connect_configured? %>
+      <div class="azure-sign-in-actions">
+        <%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
+          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
 </div>
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index bdfbea5dd..62c703ef8 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -162,7 +162,7 @@ class Extends
                                         'RepositoryStatusValue' => 'status',
                                         'RepositoryStockValue' => 'stock' }
 
-  OMNIAUTH_PROVIDERS = %i(linkedin customazureactivedirectory okta)
+  OMNIAUTH_PROVIDERS = %i(linkedin customazureactivedirectory okta openid_connect)
 
   INITIAL_USER_OPTIONS = {}
 
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index b00568bd2..40dea52de 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -32,6 +32,30 @@ AZURE_SETUP_PROC = lambda do |env|
   env['omniauth.strategy'].options[:base_azure_url] = "#{conf_uri.scheme || 'https'}://#{conf_uri.host}"
 end
 
+OPENID_CONNECT_SETUP_PROC = lambda do |env|
+  settings = ApplicationSettings.instance
+  provider_conf = settings.values['openid_connect']
+  raise StandardError, 'No OpenID Connect config available for sign in' if provider_conf.blank?
+
+  client_options = {
+    identifier: provider_conf['client_id'],
+    secret: provider_conf['client_secret'],
+    redirect_uri: Rails.application.routes.url_helpers.user_openid_connect_omniauth_callback_url
+  }
+
+  unless provider_conf['discovery']
+    client_options[:authorize_url] = provider_conf['authorize_url'] if provider_conf['authorize_url']
+    client_options[:token_url] = provider_conf['token_url'] if provider_conf['token_url']
+    client_options[:user_info_url] = provider_conf['authorize_url'] if provider_conf['user_info_url']
+  end
+
+  env['omniauth.strategy'].options[:name] = 'openid_connect'
+  env['omniauth.strategy'].options[:scope] = %i(openid email profile)
+  env['omniauth.strategy'].options[:issuer] = provider_conf['issuer_url']
+  env['omniauth.strategy'].options[:discovery] = provider_conf['discovery'] == true
+  env['omniauth.strategy'].options[:client_options] = client_options
+end
+
 OKTA_SETUP_PROC = lambda do |env|
   settings = ApplicationSettings.instance
   provider_conf = settings.values['okta']
@@ -67,6 +91,10 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider OmniAuth::Strategies::CustomAzureActiveDirectory, setup: AZURE_SETUP_PROC
 end
 
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider OmniAuth::Strategies::OpenIDConnect, setup: OPENID_CONNECT_SETUP_PROC
+end
+
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider OmniAuth::Strategies::Okta, setup: OKTA_SETUP_PROC
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index af7fd26b6..20f8ee5f3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -86,6 +86,13 @@ en:
         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"
       sign_in_label: "Sign in with Okta"

From 3de2f6d0f1a4719c132c17a5e0e92e4d1515069e Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Wed, 20 Dec 2023 17:52:33 +0100
Subject: [PATCH 002/115] Add generic SAML SSO strategy implementation
 [SCI-9579] (#6775)

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   7 ++
 .../users/omniauth_callbacks_controller.rb    | 113 +++++++++++++-----
 app/helpers/application_helper.rb             |   4 +
 app/views/users/shared/_links.html.erb        |   8 ++
 config/initializers/extends.rb                |   2 +-
 config/initializers/omniauth.rb               |  15 +++
 config/locales/en.yml                         |   8 ++
 8 files changed, 125 insertions(+), 33 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4937dca18..ef04a2e4d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'omniauth-linkedin-oauth2'
 gem 'omniauth-okta', git: 'https://github.com/scinote-eln/omniauth-okta', branch: 'org_auth_server_support'
 gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
+gem 'omniauth-saml'
 
 # Gems for API implementation
 gem 'active_model_serializers', '~> 0.10.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index ac89a2868..0c60f75a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -478,6 +478,9 @@ GEM
     omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 2.2)
+    omniauth-saml (2.1.0)
+      omniauth (~> 2.0)
+      ruby-saml (~> 1.12)
     openid_connect (2.2.0)
       activemodel
       attr_required (>= 1.0.0)
@@ -646,6 +649,9 @@ GEM
       rubocop (>= 1.33.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
+    ruby-saml (1.16.0)
+      nokogiri (>= 1.13.10)
+      rexml
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
@@ -815,6 +821,7 @@ DEPENDENCIES
   omniauth-linkedin-oauth2
   omniauth-okta!
   omniauth-rails_csrf_protection (~> 1.0)
+  omniauth-saml
   omniauth_openid_connect
   overcommit
   pg (~> 1.5)
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 058da755d..7481f06c5 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -46,17 +46,7 @@ module Users
 
       if user.blank?
         # Create new user and identity
-        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)
-        end
-
+        user = create_user_from_auth(email, auth)
         sign_in_and_redirect(user)
       elsif provider_conf['auto_link_on_sign_in']
         # Link to existing local account
@@ -146,16 +136,7 @@ module Users
       user = User.find_by(email: auth.info.email.downcase)
 
       if user.blank?
-        # Create new user and identity
-        user = User.new(full_name: auth.info.name,
-                        initials: generate_initials(auth.info.name),
-                        email: auth.info.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)
-        end
+        user = create_user_from_auth(email, auth)
       else
         # Link to existing local account
         user.user_identities.create!(provider: auth.provider, uid: auth.uid)
@@ -201,17 +182,7 @@ module Users
 
       if user.blank?
         # Create new user and identity
-        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)
-        end
-
+        user = create_user_from_auth(email, auth)
         sign_in_and_redirect(user)
       elsif provider_conf['auto_link_on_sign_in']
         # Link to existing local account
@@ -237,6 +208,56 @@ module Users
       end
     end
 
+    def saml
+      auth = request.env['omniauth.auth']
+
+      settings = ApplicationSettings.instance
+      provider_conf = settings.values['saml']
+      raise StandardError, 'No matching SAML provider config found' if provider_conf.blank?
+
+      return redirect_to connected_accounts_path if current_user
+
+      email = auth.info.email
+      user = User.from_omniauth(auth)
+
+      # User found in database so just signing in
+      return sign_in_and_redirect(user) if user.present?
+
+      if email.blank?
+        # No email in the token so can not link or create user
+        error_message = I18n.t('devise.saml.errors.no_email')
+        return redirect_to after_omniauth_failure_path_for(resource_name)
+      end
+
+      user = User.find_by(email: email.downcase)
+
+      if user.blank?
+        user = create_user_from_auth(email, auth)
+        sign_in_and_redirect(user)
+      elsif provider_conf['auto_link_on_sign_in']
+        # 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)
+      else
+        # Cannot do anything with it, so just return an error
+        error_message = I18n.t('devise.saml.errors.no_local_user_map')
+        redirect_to after_omniauth_failure_path_for(resource_name)
+      end
+    rescue StandardError => e
+      Rails.logger.error e.message
+      Rails.logger.error e.backtrace.join("\n")
+      error_message = I18n.t('devise.saml.errors.failed_to_save') if e.is_a?(ActiveRecord::RecordInvalid)
+      error_message ||= I18n.t('devise.saml.errors.generic')
+      redirect_to after_omniauth_failure_path_for(resource_name)
+    ensure
+      if 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'))
+      end
+    end
+
     # More info at:
     # https://github.com/plataformatec/devise#omniauth
 
@@ -273,5 +294,33 @@ module Users
       initials = initials.strip.blank? ? 'PLCH' : initials[0..3]
       initials
     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)
+      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)
+      end
+      user
+    end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 79bcd1522..528e7718e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -209,6 +209,10 @@ module ApplicationHelper
     ApplicationSettings.instance.values['openid_connect'].present?
   end
 
+  def saml_configured?
+    ApplicationSettings.instance.values['saml'].present?
+  end
+
   def wopi_enabled?
     ENV['WOPI_ENABLED'] == 'true'
   end
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 1172c7341..2395bc310 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -55,5 +55,13 @@
         <% end %>
       </div>
     <% end %>
+
+    <% if sso_enabled? && saml_configured? %>
+      <div class="azure-sign-in-actions">
+        <%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
+          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
 </div>
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index 62c703ef8..0dad6a835 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -162,7 +162,7 @@ class Extends
                                         'RepositoryStatusValue' => 'status',
                                         'RepositoryStockValue' => 'stock' }
 
-  OMNIAUTH_PROVIDERS = %i(linkedin customazureactivedirectory okta openid_connect)
+  OMNIAUTH_PROVIDERS = %i(linkedin customazureactivedirectory okta openid_connect saml)
 
   INITIAL_USER_OPTIONS = {}
 
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 40dea52de..7beca1549 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -87,6 +87,17 @@ OKTA_SETUP_PROC = lambda do |env|
   env['omniauth.strategy'].options[:client_options] = client_options
 end
 
+SAML_SETUP_PROC = lambda do |env|
+  settings = ApplicationSettings.instance
+  provider_conf = settings.values['saml']
+  raise StandardError, 'No SAML config available for sign in' if provider_conf.blank?
+
+  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'
+end
+
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider OmniAuth::Strategies::CustomAzureActiveDirectory, setup: AZURE_SETUP_PROC
 end
@@ -99,4 +110,8 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider OmniAuth::Strategies::Okta, setup: OKTA_SETUP_PROC
 end
 
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider OmniAuth::Strategies::SAML, setup: SAML_SETUP_PROC
+end
+
 OmniAuth.config.logger = Rails.logger
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 20f8ee5f3..faf773a62 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,6 +34,7 @@ en:
         remember_me: "Remember me"
         submit: "Log in"
         azure_ad_submit: "Sign in with Azure AD"
+        saml_submit: "Sign in with SAML"
       2fa:
         title: "Two-factor authentication"
         description: "Enter the one-time code found in your authenticator app to log in to SciNote."
@@ -100,6 +101,13 @@ en:
         generic: "Failed to sign in user"
         no_local_user_map: "No local user record found"
         failed_to_save: "Failed to create new user"
+    saml:
+      provider_name: "SAML"
+      sign_in_label: "Sign in with SAML"
+      errors:
+        generic: "Failed to sign in user"
+        no_local_user_map: "No local user record found"
+        failed_to_save: "Failed to create new user"
 
   doorkeeper:
     errors:

From c1453a1fe51efe6e9ed9899893b76cfbbf5d1f25 Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Wed, 10 Jan 2024 17:20:39 +0100
Subject: [PATCH 003/115] Add form for OpenID [SCI-9937] (#6918)

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index faf773a62..c058e0798 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,6 +34,7 @@ en:
         remember_me: "Remember me"
         submit: "Log in"
         azure_ad_submit: "Sign in with Azure AD"
+        openid_connect_submit: "Sign in with OpenID Connect"
         saml_submit: "Sign in with SAML"
       2fa:
         title: "Two-factor authentication"

From 8dcd00c433dd301bd2ae1da87968281316225136 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Thu, 1 Feb 2024 13:14:31 +0100
Subject: [PATCH 004/115] Add support of server side session store [SCI-9960]
 (#6974)

---
 Gemfile                                         |  1 +
 Gemfile.lock                                    |  9 +++++++++
 config/application.rb                           |  2 ++
 config/initializers/session_store.rb            |  4 +++-
 db/migrate/20240118094253_add_sessions_table.rb | 14 ++++++++++++++
 db/schema.rb                                    | 11 ++++++++++-
 6 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20240118094253_add_sessions_table.rb

diff --git a/Gemfile b/Gemfile
index ef04a2e4d..4641eff64 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ source 'http://rubygems.org'
 
 ruby '3.2.2'
 
+gem 'activerecord-session_store'
 gem 'bootsnap', require: false
 gem 'devise', '~> 4.8.1'
 gem 'devise_invitable'
diff --git a/Gemfile.lock b/Gemfile.lock
index 92c6dd47b..24ca45a43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -120,6 +120,13 @@ GEM
       activesupport (= 7.0.5.1)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
+    activerecord-session_store (2.1.0)
+      actionpack (>= 6.1)
+      activerecord (>= 6.1)
+      cgi (>= 0.3.6)
+      multi_json (~> 1.11, >= 1.11.2)
+      rack (>= 2.0.8, < 4)
+      railties (>= 6.1)
     activestorage (7.0.5.1)
       actionpack (= 7.0.5.1)
       activejob (= 7.0.5.1)
@@ -219,6 +226,7 @@ GEM
       mail
     case_transform (0.2)
       activesupport
+    cgi (0.4.1)
     childprocess (4.1.0)
     chunky_png (1.4.0)
     coderay (1.1.3)
@@ -763,6 +771,7 @@ PLATFORMS
 DEPENDENCIES
   active_model_serializers (~> 0.10.7)
   activerecord-import
+  activerecord-session_store
   acts_as_list
   ajax-datatables-rails (~> 0.3.1)
   aspector
diff --git a/config/application.rb b/config/application.rb
index 8c24b28c3..9e09f0b9d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -82,5 +82,7 @@ module Scinote
     config.action_view.field_error_proc = Proc.new { |html_tag, instance|
       "<div class=\"field_with_errors sci-input-container\">#{html_tag}</div>".html_safe
     }
+
+    ActiveRecord::SessionStore::Session.serializer = :json
   end
 end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index b64e189d7..6d628d0f3 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_scinote_session'
+session_store = ENV['SCINOTE_SERVERSIDE_SESSIONS'] == 'true' ? :active_record_store : :cookie_store
+
+Rails.application.config.session_store session_store, key: '_scinote_session'
diff --git a/db/migrate/20240118094253_add_sessions_table.rb b/db/migrate/20240118094253_add_sessions_table.rb
new file mode 100644
index 000000000..96c01f4af
--- /dev/null
+++ b/db/migrate/20240118094253_add_sessions_table.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddSessionsTable < ActiveRecord::Migration[7.0]
+  def change
+    create_table :sessions do |t|
+      t.string :session_id, null: false
+      t.jsonb :data
+      t.timestamps
+    end
+
+    add_index :sessions, :session_id, unique: true
+    add_index :sessions, :updated_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d3da2504d..54138aaad 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_01_15_114821) do
+ActiveRecord::Schema[7.0].define(version: 2024_01_18_094253) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gist"
   enable_extension "pg_trgm"
@@ -981,6 +981,15 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_15_114821) do
     t.index ["user_id"], name: "index_results_on_user_id"
   end
 
+  create_table "sessions", force: :cascade do |t|
+    t.string "session_id", null: false
+    t.jsonb "data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["session_id"], name: "index_sessions_on_session_id", unique: true
+    t.index ["updated_at"], name: "index_sessions_on_updated_at"
+  end
+
   create_table "settings", force: :cascade do |t|
     t.text "type", null: false
     t.jsonb "values", default: {}, null: false

From 24278c287f018f674bb98e358905d3b33c0e0462 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Fri, 2 Feb 2024 12:06:22 +0100
Subject: [PATCH 005/115] Fix sign in with OpenID Connect with disabled
 discovery [SCI-9578] (#7046)

---
 config/initializers/omniauth.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 7beca1549..da22ac831 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -44,9 +44,11 @@ OPENID_CONNECT_SETUP_PROC = lambda do |env|
   }
 
   unless provider_conf['discovery']
-    client_options[:authorize_url] = provider_conf['authorize_url'] if provider_conf['authorize_url']
-    client_options[:token_url] = provider_conf['token_url'] if provider_conf['token_url']
-    client_options[:user_info_url] = provider_conf['authorize_url'] if provider_conf['user_info_url']
+    client_options[:host] = provider_conf['host']
+    client_options[:authorization_endpoint] = provider_conf['authorization_endpoint']
+    client_options[:token_endpoint] = provider_conf['token_endpoint']
+    client_options[:userinfo_endpoint] = provider_conf['userinfo_endpoint']
+    client_options[:jwks_uri] = provider_conf['jwks_uri']
   end
 
   env['omniauth.strategy'].options[:name] = 'openid_connect'

From 57c5140267ce52fe8e92b5181f7b1f6ed2bf7dca Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 23 Feb 2024 14:08:51 +0100
Subject: [PATCH 006/115] Add quick filter flyout [SCI-10248]

---
 app/controllers/search_controller.rb          |  16 ++
 .../vue/navigation/quick_search.vue           | 228 ++++++++++++++++++
 app/javascript/vue/navigation/top_menu.vue    |  12 +-
 .../vue/shared/general_dropdown.vue           |  12 +-
 .../vue/shared/string_with_ellipsis.vue       |  26 ++
 .../concerns/breadcrumbs_helper.rb            |  67 +++++
 app/serializers/notification_serializer.rb    |  59 +----
 app/serializers/quick_search_serializer.rb    |  28 +++
 app/views/shared/navigation/_top.html.erb     |   1 +
 config/locales/en.yml                         |   8 +
 config/routes.rb                              |   5 +
 11 files changed, 396 insertions(+), 66 deletions(-)
 create mode 100644 app/javascript/vue/navigation/quick_search.vue
 create mode 100644 app/javascript/vue/shared/string_with_ellipsis.vue
 create mode 100644 app/serializers/concerns/breadcrumbs_helper.rb
 create mode 100644 app/serializers/quick_search_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 09cfc4e51..fc2407543 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -42,6 +42,22 @@ class SearchController < ApplicationController
   def new
   end
 
+  def quick
+    results = [
+      Project.first,
+      Experiment.first,
+      MyModule.first,
+      Protocol.first,
+      RepositoryRow.first,
+      Result.first,
+      Step.first,
+      Report.first,
+      LabelTemplate.first
+    ].compact
+
+    render json: results, each_serializer: QuickSearchSerializer
+  end
+
   private
 
   def load_vars
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
new file mode 100644
index 000000000..6a363e3ab
--- /dev/null
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -0,0 +1,228 @@
+<template>
+  <GeneralDropdown ref="container" :canOpen="canOpen" :fieldOnlyOpen="true">
+    <template v-slot:field>
+      <div class="sci--navigation--top-menu-search left-icon sci-input-container-v2" :class="{'disabled' : !currentTeam}" :title="i18n.t('nav.search')">
+        <input ref="searchField" type="text" class="!pr-9" v-model="searchQuery" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
+        <i class="sn-icon sn-icon-search"></i>
+        <i v-if="this.searchQuery.length > 0" class="sn-icon sn-icon-close absolute right-1 top-0.5" @click="this.searchQuery = ''"></i>
+      </div>
+    </template>
+    <template v-slot:flyout >
+      <div v-if="showHistory" class="max-w-[600px]">
+        <div v-for="(query, i) in previousQueries.reverse()" @click="setQuery(query)" :key="i"
+             class="flex px-3 h-11 items-center gap-2 hover:bg-sn-super-light-grey cursor-pointer">
+          <i class="sn-icon sn-icon-history-search"></i>
+          {{ query }}
+        </div>
+      </div>
+      <div v-else class="max-w-[600px]">
+        <div class="flex items-center gap-2">
+          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('experiments')">
+            {{ i18n.t('search.quick_search.experiments') }}
+          </button>
+          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('my_modules')">
+            {{ i18n.t('search.quick_search.tasks') }}
+          </button>
+          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('results')">
+            {{ i18n.t('search.quick_search.results') }}
+          </button>
+          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('repository_rows')">
+            {{ i18n.t('search.quick_search.inventory_items') }}
+          </button>
+        </div>
+        <hr class="my-2">
+        <a v-if="!loading" v-for="(result, i) in results" :key="i"
+           :href="getUrl(result.attributes)"
+           class="px-3 py-2 hover:bg-sn-super-light-grey cursor-pointer
+                  text-sn-black hover:no-underline active:no-underline hover:text-black block"
+        >
+          <div class="flex items-center gap-2">
+            <i class="sn-icon shrink-0" :class="getIcon(result.type)"></i>
+            <span v-if="result.attributes.archived">(A)</span>
+            <StringWithEllipsis class="grow max-w-[400px]" :text="getName(result.attributes)"></StringWithEllipsis>
+            <div class="ml-auto pl-4 text-sn-grey text-xs shrink-0">
+              {{ result.attributes.updated_at }}
+            </div>
+          </div>
+          <div class="text-sn-grey text-xs flex items-center gap-1 pl-8">
+            <div v-for="(breadcrumb, i) in getBreadcrumb(result.attributes)" :key="i"
+                class="flex items-center gap-1"
+            >
+              <span v="if" v-if="i !== 0">/</span>
+              <span :title="breadcrumb" class="truncate max-w-[130px]">{{ breadcrumb }}</span>
+            </div>
+          </div>
+        </a>
+        <div v-else v-for="i in Array(5).fill(5)" class="px-3 py-2">
+          <div class="flex items-center gap-2 mb-2">
+            <div class="h-6 w-6 bg-sn-light-grey rounded shrink-0"></div>
+            <div class="h-6 grow max-w-[200px] bg-sn-light-grey rounded shrink-0"></div>
+            <div class="h-6 w-12 bg-sn-light-grey rounded shrink-0 ml-auto"></div>
+          </div>
+          <div class="flex items-center gap-2 pl-8">
+            <div class="h-3 grow max-w-[200px] bg-sn-light-grey rounded shrink-0"></div>
+          </div>
+        </div>
+        <div v-if="!loading && results.length === 0" class="p-2 flex items-center gap-6">
+          <i class="sn-icon sn-icon-search text-sn-sleepy-grey" style="font-size: 64px !important;"></i>
+          <div>
+            <b>{{ i18n.t('search.quick_search.empty_title') }}</b>
+            <div class="text-xs text-sn-dark-grey">
+              {{ i18n.t('search.quick_search.empty_description', {query: searchQuery}) }}
+            </div>
+          </div>
+        </div>
+        <hr class="my-2">
+        <div class="btn btn-light" @click="searchValue">
+          {{ i18n.t('search.quick_search.all_results', {query: searchQuery}) }}
+        </div>
+      </div>
+    </template>
+  </GeneralDropdown>
+</template>
+
+<script>
+import GeneralDropdown from '../shared/general_dropdown.vue';
+import StringWithEllipsis from '../shared/string_with_ellipsis.vue';
+import axios from '../../packs/custom_axios.js';
+
+export default {
+  name: 'QuickSearch',
+  props: {
+    quickSearchUrl: {
+      type: String,
+      required: true
+    },
+    currentTeam: {
+      type: Number
+    },
+    searchUrl: {
+      type: String,
+      required: true
+    }
+  },
+  components: {
+    GeneralDropdown,
+    StringWithEllipsis
+  },
+  computed: {
+    canOpen() {
+      return this.previousQueries.length > 0 || this.searchQuery.length > 1;
+    },
+    showHistory() {
+      return this.searchQuery.length < 2;
+    }
+  },
+  watch: {
+    searchQuery() {
+      this.$refs.container.isOpen = this.canOpen;
+
+      if (this.searchQuery.length > 1) {
+        this.fetchQuickSearchResults();
+      }
+    }
+  },
+  data() {
+    return {
+      searchQuery: '',
+      previousQueries: [],
+      quickFilter: null,
+      results: [],
+      loading: false
+    };
+  },
+  mounted() {
+    this.previousQueries = JSON.parse(localStorage.getItem('quickSearchHistory') || '[]');
+  },
+  methods: {
+    getIcon(type) {
+      switch (type) {
+        case 'projects':
+          return 'sn-icon-projects';
+        case 'experiments':
+          return 'sn-icon-experiment';
+        case 'my_modules':
+          return 'sn-icon-task';
+        case 'project_folders':
+          return 'sn-icon-folder';
+        case 'protocols':
+          return 'sn-icon-protocols-templates';
+        case 'results':
+          return 'sn-icon-results';
+        case 'repository_rows':
+          return 'sn-icon-inventory';
+        case 'reports':
+          return 'sn-icon-reports';
+        case 'steps':
+          return 'sn-icon-steps';
+        case 'label-templates':
+          return 'sn-icon-label-templates';
+        default:
+          return null;
+      }
+    },
+    getName(attributes) {
+      return attributes.breadcrumbs[attributes.breadcrumbs.length - 1].name;
+    },
+    getUrl(attributes) {
+      return attributes.breadcrumbs[attributes.breadcrumbs.length - 1].url;
+    },
+    getBreadcrumb(attributes) {
+      const breadcrumbs = attributes.breadcrumbs.map((breadcrumb) => breadcrumb.name);
+      breadcrumbs.pop();
+      breadcrumbs.shift();
+      breadcrumbs.push(`ID: ${attributes.code}`);
+      return breadcrumbs;
+    },
+    setQuery(query) {
+      this.searchQuery = query;
+      this.$nextTick(() => {
+        this.$refs.searchField.focus();
+      });
+    },
+    saveQuery() {
+      if (this.searchQuery.length > 0) {
+        this.previousQueries.push(this.searchQuery);
+
+        if (this.previousQueries.length > 5) {
+          this.previousQueries.shift();
+        }
+
+        localStorage.setItem('quickSearchHistory', JSON.stringify(this.previousQueries));
+
+        this.searchValue();
+      }
+    },
+    setQuickFilter(filter) {
+      this.quickFilter = this.quickFilter === filter ? null : filter;
+      this.fetchQuickSearchResults();
+    },
+    fetchQuickSearchResults() {
+      if (this.loading) return;
+
+      this.loading = true;
+
+      const params = {
+        query: this.searchQuery,
+        filter: this.quickFilter
+      };
+
+      axios.get(this.quickSearchUrl, { params })
+        .then((response) => {
+          this.results = response.data.data;
+          this.loading = false;
+          if (params.query !== this.searchQuery) {
+            this.fetchQuickSearchResults();
+          }
+        })
+        .catch(() => {
+          this.results = [];
+          this.loading = false;
+        });
+    },
+    searchValue() {
+      window.open(`${this.searchUrl}?q=${this.searchQuery}`, '_self');
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index 59082ab97..395d6e154 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="sci--navigation--top-menu-container">
-    <div v-if="user" class="sci--navigation--top-menu-search left-icon sci-input-container-v2" :class="{'disabled' : !currentTeam}" :title="i18n.t('nav.search')">
-      <input type="text" :placeholder="i18n.t('nav.search')" @change="searchValue"/>
-      <i class="sn-icon sn-icon-search"></i>
-    </div>
+    <QuickSearch v-if="user" :quickSearchUrl="quickSearchUrl" :searchUrl="searchUrl" :currentTeam="currentTeam"></QuickSearch>
     <div v-if="currentTeam" class="w-64">
       <SelectDropdown
         :value="currentTeam"
@@ -70,6 +67,7 @@ import DropdownSelector from '../shared/legacy/dropdown_selector.vue';
 import SelectDropdown from '../shared/select_dropdown.vue';
 import MenuDropdown from '../shared/menu_dropdown.vue';
 import GeneralDropdown from '../shared/general_dropdown.vue';
+import QuickSearch from './quick_search.vue';
 
 export default {
   name: 'TopMenuContainer',
@@ -78,12 +76,14 @@ export default {
     NotificationsFlyout,
     SelectDropdown,
     MenuDropdown,
-    GeneralDropdown
+    GeneralDropdown,
+    QuickSearch
   },
   props: {
     url: String,
     notificationsUrl: String,
-    unseenNotificationsUrl: String
+    unseenNotificationsUrl: String,
+    quickSearchUrl: String
   },
   data() {
     return {
diff --git a/app/javascript/vue/shared/general_dropdown.vue b/app/javascript/vue/shared/general_dropdown.vue
index e6f167bd6..286f68e64 100644
--- a/app/javascript/vue/shared/general_dropdown.vue
+++ b/app/javascript/vue/shared/general_dropdown.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="relative" v-click-outside="closeMenu" >
-    <div ref="field" class="cursor-pointer" @click.stop="isOpen = (!isOpen || fieldOnlyOpen)">
+    <div ref="field" class="cursor-pointer" @click.stop="toggleMenu">
       <slot name="field"></slot>
     </div>
     <template v-if="isOpen">
@@ -36,7 +36,8 @@ export default {
     caret: { type: Boolean, default: false },
     alwaysShow: { type: Boolean, default: false },
     closeDropdown: { type: Boolean, default: false },
-    fieldOnlyOpen: { type: Boolean, default: false }
+    fieldOnlyOpen: { type: Boolean, default: false },
+    canOpen: { type: Boolean, default: true }
   },
   data() {
     return {
@@ -60,6 +61,13 @@ export default {
     }
   },
   methods: {
+    toggleMenu() {
+      if (this.canOpen && (!this.isOpen || this.fieldOnlyOpen)) {
+        this.isOpen = true;
+      } else if (this.isOpen && !this.fieldOnlyOpen) {
+        this.isOpen = false;
+      }
+    },
     closeMenu(e) {
       if (e && e.target.closest('.sn-dropdown, .sn-select-dropdown, .sn-menu-dropdown, .dp__instance_calendar')) return;
       this.isOpen = false;
diff --git a/app/javascript/vue/shared/string_with_ellipsis.vue b/app/javascript/vue/shared/string_with_ellipsis.vue
new file mode 100644
index 000000000..b846b30fd
--- /dev/null
+++ b/app/javascript/vue/shared/string_with_ellipsis.vue
@@ -0,0 +1,26 @@
+<template>
+<div :title="text" class="flex items-center">
+  <div class="truncate">
+    {{ text.slice(0, endCharacters * -1) }}
+  </div>
+  <div class="shrink-0">
+    {{ text.slice(text.length - endCharacters) }}
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  name: 'StringWithEllipsis',
+  props: {
+    text: {
+      type: String,
+      required: true
+    },
+    endCharacters: {
+      type: Number,
+      default: 4
+    }
+  }
+};
+</script>
diff --git a/app/serializers/concerns/breadcrumbs_helper.rb b/app/serializers/concerns/breadcrumbs_helper.rb
new file mode 100644
index 000000000..dc17cdfaa
--- /dev/null
+++ b/app/serializers/concerns/breadcrumbs_helper.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module BreadcrumbsHelper
+  private
+
+  def generate_breadcrumbs(subject, breadcrumbs)
+    return [] if subject.is_a?(NonExistantRecord)
+
+    case subject
+    when Project
+      parent = subject.team
+      url = project_path(subject)
+    when Experiment
+      parent = subject.project
+      url = my_modules_experiment_path(subject)
+    when MyModule
+      parent = subject.experiment
+      url = protocols_my_module_path(subject)
+    when Protocol
+      if subject.in_repository?
+        parent = subject.team
+        url = protocol_path(subject)
+      else
+        parent = subject.my_module
+        url = protocols_my_module_path(subject.my_module)
+      end
+    when Result
+      parent = subject.my_module
+      url = my_module_results_path(subject.my_module)
+    when ProjectFolder
+      parent = subject.team
+      url = project_folder_path(subject)
+    when RepositoryBase
+      parent = subject.team
+      url = repository_path(subject)
+    when RepositoryRow
+      parent = subject.team
+      url = repository_path(subject.repository)
+    when Report
+      parent = subject.team
+
+      url = if object.instance_of?(::Notification)
+              reports_path(
+                preview_report_id: subject.id,
+                preview_type: object.params[:report_type],
+                team_id: subject.team.id
+              )
+            else
+              reports_path(team_id: subject.team.id)
+            end
+    when LabelTemplate
+      parent = subject.team
+      url = label_template_path(subject)
+    when Team
+      parent = nil
+      url = projects_path(team: subject.id)
+    end
+
+    breadcrumbs << { name: subject.name, url: url } if subject.name.present?
+
+    if parent
+      generate_breadcrumbs(parent, breadcrumbs)
+    else
+      breadcrumbs.reverse
+    end
+  end
+end
diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index e55866821..ebb8ef838 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -2,6 +2,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
 
@@ -30,62 +31,4 @@ class NotificationSerializer < ActiveModel::Serializer
     object.read_at.present?
   end
 
-  private
-
-  def generate_breadcrumbs(subject, breadcrumbs)
-    return [] if subject.is_a?(NonExistantRecord)
-
-    case subject
-    when Project
-      parent = subject.team
-      url = project_path(subject)
-    when Experiment
-      parent = subject.project
-      url = my_modules_experiment_path(subject)
-    when MyModule
-      parent = subject.experiment
-      url = protocols_my_module_path(subject)
-    when Protocol
-      if subject.in_repository?
-        parent = subject.team
-        url = protocol_path(subject)
-      else
-        parent = subject.my_module
-        url = protocols_my_module_path(subject.my_module)
-      end
-    when Result
-      parent = subject.my_module
-      url = my_module_results_path(subject.my_module)
-    when ProjectFolder
-      parent = subject.team
-      url = project_folder_path(subject)
-    when RepositoryBase
-      parent = subject.team
-      url = repository_path(subject)
-    when RepositoryRow
-      parent = subject.team
-      url = repository_path(subject.repository)
-    when Report
-      parent = subject.team
-      url = reports_path(
-        preview_report_id: subject.id,
-        preview_type: object.params[:report_type],
-        team_id: subject.team.id
-      )
-    when LabelTemplate
-      parent = subject.team
-      url = label_template_path(subject)
-    when Team
-      parent = nil
-      url = projects_path(team: subject.id)
-    end
-
-    breadcrumbs << { name: subject.name, url: url } if subject.name.present?
-
-    if parent
-      generate_breadcrumbs(parent, breadcrumbs)
-    else
-      breadcrumbs.reverse
-    end
-  end
 end
diff --git a/app/serializers/quick_search_serializer.rb b/app/serializers/quick_search_serializer.rb
new file mode 100644
index 000000000..bb7faa2a9
--- /dev/null
+++ b/app/serializers/quick_search_serializer.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class QuickSearchSerializer < ActiveModel::Serializer
+  include Rails.application.routes.url_helpers
+  include BreadcrumbsHelper
+
+  attributes :updated_at, :archived, :breadcrumbs, :code
+
+  def archived
+    @object.archived?
+  rescue StandardError
+    false
+  end
+
+  def code
+    @object.code
+  rescue StandardError
+    @object.id
+  end
+
+  def updated_at
+    I18n.l(@object.updated_at, format: :full_date)
+  end
+
+  def breadcrumbs
+    generate_breadcrumbs(@object, [])
+  end
+end
diff --git a/app/views/shared/navigation/_top.html.erb b/app/views/shared/navigation/_top.html.erb
index 5cd942190..a99be29b2 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 %>"
+      quick-search-url="<%= quick_search_path %>"
       unseen-notifications-url="<%= unseen_counter_user_notifications_path %>" />
   </div>
 <% else %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ae724212c..1b8f842e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -426,6 +426,14 @@ en:
       list_html: "List"
 
   search:
+    quick_search:
+      experiments: "Experiments"
+      tasks: "Tasks"
+      results: "Results"
+      inventory_items: "Inventory items"
+      all_results: "All search results for \"%{query}\""
+      empty_title: "No quick search results found."
+      empty_description: "Quick search only checks titles. Press enter or click \"All search results for '%{query}'\" to find all available matches."
     whole_word: "Match any whole word"
     whole_phrase: "Match whole phrase"
     match_case: "Match case sensitive"
diff --git a/config/routes.rb b/config/routes.rb
index 5b59f5d6c..e62944375 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -802,6 +802,11 @@ Rails.application.routes.draw do
 
     get 'search' => 'search#index'
     get 'search/new' => 'search#new', as: :new_search
+    resource :search, only: [], controller: :search do
+      collection do
+        get :quick
+      end
+    end
 
     # We cannot use 'resources :assets' because assets is a reserved route
     # in Rails (assets pipeline) and causes funky behavior

From 19dd06e24678af2a668b043009d316c0d6184d4b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 19 Mar 2024 14:20:30 +0100
Subject: [PATCH 007/115] Update buttons focus and active state [SCI-10249]

---
 app/assets/stylesheets/tailwind/buttons.css | 24 +++++++++++++++++++--
 app/views/design_elements/_button.html.erb  |  3 +++
 config/tailwind.config.js                   |  6 ++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/tailwind/buttons.css b/app/assets/stylesheets/tailwind/buttons.css
index 1dd96b8c8..4b115eb66 100644
--- a/app/assets/stylesheets/tailwind/buttons.css
+++ b/app/assets/stylesheets/tailwind/buttons.css
@@ -4,7 +4,7 @@
   }
 
   .btn {
-    @apply relative inline-flex items-center text-sm shrink-0 gap-2 justify-center px-4 rounded border border-solid appearance-none whitespace-nowrap cursor-pointer h-[40px] focus:outline-none;
+    @apply relative inline-flex items-center text-sm shrink-0 gap-2 justify-center px-4 rounded border border-solid appearance-none whitespace-nowrap cursor-pointer h-[40px];
     border-color: transparent;
   }
 
@@ -41,7 +41,7 @@
   }
 
   .btn:focus {
-    @apply no-underline outline-none text-sn-white;
+    @apply no-underline outline outline-4 outline-sn-science-blue-hover text-sn-white;
   }
 
   .btn:active {
@@ -58,6 +58,11 @@
     @apply bg-sn-blue text-sn-white;
   }
 
+  .btn.btn-primary:active,
+  .btn.btn-primary.active {
+    @apply bg-sn-blue-click;
+  }
+
   .btn.btn-primary:hover,
   .btn.btn-success:hover{
     @apply bg-sn-blue-hover text-sn-white;
@@ -79,6 +84,11 @@
     @apply bg-sn-science-blue text-sn-white border-sn-white;
   }
 
+  .btn.btn-secondary:active,
+  .btn.btn-secondary.active {
+    @apply bg-sn-super-light-blue;
+  }
+
   .btn.btn-secondary:hover,
   .btn.btn-default:hover {
     @apply  border-sn-blue-hover;
@@ -120,6 +130,11 @@
     @apply bg-sn-super-light-grey;
   }
 
+  .btn.btn-light:active,
+  .btn.btn-light.active {
+    @apply bg-sn-grey-100;
+  }
+
   .btn.btn-light:disabled,
   .btn.btn-light.disabled {
     @apply text-sn-sleepy-grey;
@@ -133,6 +148,11 @@
     @apply bg-sn-delete-red-hover;
   }
 
+  .btn.btn-danger:active,
+  .btn.btn-danger.active {
+    @apply bg-sn-delete-red-click;
+  }
+
   .btn.btn-danger:disabled,
   .btn.btn-danger.disabled {
     @apply bg-sn-delete-red-disabled;
diff --git a/app/views/design_elements/_button.html.erb b/app/views/design_elements/_button.html.erb
index 53f654145..7ae942be7 100644
--- a/app/views/design_elements/_button.html.erb
+++ b/app/views/design_elements/_button.html.erb
@@ -40,6 +40,9 @@
             <button class="btn <%= type_class %> <%= size_class %>" disabled="true">
               Button
             </button>
+            <button class="btn active <%= type_class %> <%= size_class %>">
+              Active
+            </button>
             <button class="btn <%= type_class %> <%= size_class %> icon-btn">
               <i class="sn-icon sn-icon-<%= icons_list.sample %>"></i>
             </button>
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
index 4c7d00be5..422718409 100644
--- a/config/tailwind.config.js
+++ b/config/tailwind.config.js
@@ -27,11 +27,16 @@ module.exports = {
         'sn-sleepy-grey': '#D0D5DD',
         'sn-grey': '#98A2B3',
         'sn-dark-grey': '#475467',
+        'sn-grey-100': '#F0F2F4',
+        'sn-grey-300': '#DDE0E6',
+        'sn-grey-500': '#BCC3CF',
+        'sn-grey-700': '#647081',
         'sn-black': '#1D2939',
         'sn-blue': '#104DA9',
         'sn-science-blue': '#3B99FD',
         'sn-super-light-blue': '#F0F8FF',
         'sn-blue-hover': '#2D5FAA',
+        'sn-blue-click': '#056AD7',
         'sn-science-blue-hover': '#79B4F3',
         'sn-alert-green': '#5EC66F',
         'sn-alert-violet': '#6F2DC1',
@@ -49,6 +54,7 @@ module.exports = {
         'sn-delete-red': '#CE0C24',
         'sn-delete-red-hover': '#AD0015',
         'sn-delete-red-disabled': '#F5D7DB',
+        'sn-delete-red-click': '#E9001D',
         'sn-coral': '#FB565B',
         'sn-background-blue': '#DBE4F2',
         'sn-background-green': '#E7F7E9',

From fe1aee4f23416aa0c24197b2d22cd2bcdf8ceb19 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 21 Mar 2024 15:56:35 +0100
Subject: [PATCH 008/115] Add general layout for global search [SCI-10468]

---
 app/controllers/search_controller.rb          |  61 +--
 app/javascript/packs/vue/global_search.js     |  10 +
 .../vue/global_search/container.vue           | 114 ++++++
 .../vue/global_search/groups/assets.vue       |  14 +
 .../vue/global_search/groups/experiments.vue  |  14 +
 .../vue/global_search/groups/folders.vue      |  14 +
 .../global_search/groups/label_templates.vue  |  14 +
 .../groups/my_module_protocols.vue            |  14 +
 .../vue/global_search/groups/my_modules.vue   |  14 +
 .../vue/global_search/groups/projects.vue     |  14 +
 .../vue/global_search/groups/protocols.vue    |  14 +
 .../vue/global_search/groups/reports.vue      |  14 +
 .../global_search/groups/repository_rows.vue  |  14 +
 .../vue/global_search/groups/results.vue      |  14 +
 app/javascript/vue/navigation/top_menu.vue    |   9 +-
 app/views/search/index.html.erb               | 355 +-----------------
 config/initializers/extends.rb                |   1 +
 config/locales/en.yml                         |  56 +--
 config/webpack/webpack.config.js              |   3 +-
 19 files changed, 341 insertions(+), 422 deletions(-)
 create mode 100644 app/javascript/packs/vue/global_search.js
 create mode 100644 app/javascript/vue/global_search/container.vue
 create mode 100644 app/javascript/vue/global_search/groups/assets.vue
 create mode 100644 app/javascript/vue/global_search/groups/experiments.vue
 create mode 100644 app/javascript/vue/global_search/groups/folders.vue
 create mode 100644 app/javascript/vue/global_search/groups/label_templates.vue
 create mode 100644 app/javascript/vue/global_search/groups/my_module_protocols.vue
 create mode 100644 app/javascript/vue/global_search/groups/my_modules.vue
 create mode 100644 app/javascript/vue/global_search/groups/projects.vue
 create mode 100644 app/javascript/vue/global_search/groups/protocols.vue
 create mode 100644 app/javascript/vue/global_search/groups/reports.vue
 create mode 100644 app/javascript/vue/global_search/groups/repository_rows.vue
 create mode 100644 app/javascript/vue/global_search/groups/results.vue

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index fc2407543..27ae5e1e5 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -4,38 +4,45 @@ class SearchController < ApplicationController
   before_action :load_vars, only: :index
 
   def index
-    redirect_to new_search_path unless @search_query
+    respond_to do |format|
+      format.html do
+        redirect_to new_search_path unless @search_query
+      end
+      format.json do
+        redirect_to new_search_path unless @search_query
 
-    @search_id = params[:search_id] ? params[:search_id] : generate_search_id
+        @search_id = params[:search_id] ? params[:search_id] : generate_search_id
 
-    count_search_results
+        count_search_results
 
-    search_projects if @search_category == :projects
-    search_project_folders if @search_category == :project_folders
-    search_experiments if @search_category == :experiments
-    search_modules if @search_category == :modules
-    search_results if @search_category == :results
-    search_tags if @search_category == :tags
-    search_reports if @search_category == :reports
-    search_protocols if @search_category == :protocols
-    search_steps if @search_category == :steps
-    search_checklists if @search_category == :checklists
-    if @search_category == :repositories && params[:repository]
-      search_repository
-    end
-    search_assets if @search_category == :assets
-    search_tables if @search_category == :tables
-    search_comments if @search_category == :comments
+        search_projects if @search_category == :projects
+        search_project_folders if @search_category == :project_folders
+        search_experiments if @search_category == :experiments
+        search_modules if @search_category == :modules
+        search_results if @search_category == :results
+        search_tags if @search_category == :tags
+        search_reports if @search_category == :reports
+        search_protocols if @search_category == :protocols
+        search_steps if @search_category == :steps
+        search_checklists if @search_category == :checklists
+        if @search_category == :repositories && params[:repository]
+          search_repository
+        end
+        search_assets if @search_category == :assets
+        search_tables if @search_category == :tables
+        search_comments if @search_category == :comments
 
-    @search_pages = (@search_count.to_f / Constants::SEARCH_LIMIT.to_f).ceil
-    @start_page = @search_page - 2
-    @start_page = 1 if @start_page < 1
-    @end_page = @start_page + 4
+        @search_pages = (@search_count.to_f / Constants::SEARCH_LIMIT.to_f).ceil
+        @start_page = @search_page - 2
+        @start_page = 1 if @start_page < 1
+        @end_page = @start_page + 4
 
-    if @end_page > @search_pages
-      @end_page = @search_pages
-      @start_page = @end_page - 4
-      @start_page = 1 if @start_page < 1
+        if @end_page > @search_pages
+          @end_page = @search_pages
+          @start_page = @end_page - 4
+          @start_page = 1 if @start_page < 1
+        end
+      end
     end
   end
 
diff --git a/app/javascript/packs/vue/global_search.js b/app/javascript/packs/vue/global_search.js
new file mode 100644
index 000000000..d315a598e
--- /dev/null
+++ b/app/javascript/packs/vue/global_search.js
@@ -0,0 +1,10 @@
+import { createApp } from 'vue/dist/vue.esm-bundler.js';
+import PerfectScrollbar from 'vue3-perfect-scrollbar';
+import GlobalSearch from '../../vue/global_search/container.vue';
+import { mountWithTurbolinks } from './helpers/turbolinks.js';
+
+const app = createApp();
+app.component('global_search', GlobalSearch);
+app.config.globalProperties.i18n = window.I18n;
+app.use(PerfectScrollbar);
+mountWithTurbolinks(app, '#GlobalSearch');
diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
new file mode 100644
index 000000000..8652967a6
--- /dev/null
+++ b/app/javascript/vue/global_search/container.vue
@@ -0,0 +1,114 @@
+<template>
+  <div class="content-pane flexible with-grey-background">
+    <div class="content-header">
+      <div class="title-row">
+        <h1 class="mt-0">
+          {{ i18n.t('search.index.results_title_html', { query: localQuery }) }}
+        </h1>
+      </div>
+    </div>
+    <div class="bg-white rounded p-4 flex gap-2.5 items-center mb-4">
+      <div class="left-icon sci-input-container-v2 w-72 input-sm" :title="i18n.t('nav.search')">
+        <input ref="searchField" type="text" class="!pr-9" v-model="localQuery" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
+        <i class="sn-icon sn-icon-search"></i>
+        <i v-if="localQuery.length > 0" class="sn-icon cursor-pointer sn-icon-close absolute right-0 -top-0.5" @click="localQuery = ''"></i>
+      </div>
+      <div class="flex items-center gap-2.5">
+        <button class="btn btn-secondary btn-sm" :class="{'active': activeGroup == 'ExperimentsComponent'}" @click="setActiveGroup('ExperimentsComponent')">
+          {{ i18n.t('search.index.experiments') }}
+        </button>
+        <button class="btn btn-secondary btn-sm" :class="{'active': activeGroup == 'MyModulesComponent'}" @click="setActiveGroup('MyModulesComponent')">
+          {{ i18n.t('search.index.tasks') }}
+        </button>
+        <button class="btn btn-secondary btn-sm" :class="{'active': activeGroup == 'ResultsComponent'}" @click="setActiveGroup('ResultsComponent')">
+          {{ i18n.t('search.index.task_results') }}
+        </button>
+      </div>
+      <button class="btn btn-light btn-sm">
+        <i class="sn-icon sn-icon-search-options"></i>
+        {{ i18n.t('search.index.more_search_options') }}
+      </button>
+      <template v-if="activeGroup">
+        <div class="h-4 w-[1px] bg-sn-grey"></div>
+        <button class="btn btn-light btn-sm" @click="activeGroup = null">
+          <i class="sn-icon sn-icon-close"></i>
+          {{ i18n.t('search.index.clear_filters') }}
+        </button>
+      </template>
+    </div>
+    <template v-for="group in searchGroups">
+      <component
+        :key="group"
+        :is="group"
+        v-if="activeGroup === group || !activeGroup"
+        :selected="activeGroup === group"
+        :query="localQuery"
+      />
+    </template>
+  </div>
+</template>
+
+<script>
+import FoldersComponent from './groups/folders.vue';
+import ProjectsComponent from './groups/projects.vue';
+import ExperimentsComponent from './groups/experiments.vue';
+import MyModulesComponent from './groups/my_modules.vue';
+import MyModuleProtocolsComponent from './groups/my_module_protocols.vue';
+import ResultsComponent from './groups/results.vue';
+import AssetsComponent from './groups/assets.vue';
+import RepositoryRowsComponent from './groups/repository_rows.vue';
+import ProtocolsComponent from './groups/protocols.vue';
+import LabelTemplatesComponent from './groups/label_templates.vue';
+import ReportsComponent from './groups/reports.vue';
+
+export default {
+  name: 'GlobalSearch',
+  props: {
+    query: {
+      type: String,
+      required: true
+    }
+  },
+  components: {
+    FoldersComponent,
+    ProjectsComponent,
+    ExperimentsComponent,
+    MyModulesComponent,
+    MyModuleProtocolsComponent,
+    ResultsComponent,
+    AssetsComponent,
+    RepositoryRowsComponent,
+    ProtocolsComponent,
+    LabelTemplatesComponent,
+    ReportsComponent
+  },
+  data() {
+    return {
+      localQuery: this.query,
+      activeGroup: null,
+      searchGroups: [
+        'FoldersComponent',
+        'ProjectsComponent',
+        'ExperimentsComponent',
+        'MyModulesComponent',
+        'MyModuleProtocolsComponent',
+        'ResultsComponent',
+        'AssetsComponent',
+        'RepositoryRowsComponent',
+        'ProtocolsComponent',
+        'LabelTemplatesComponent',
+        'ReportsComponent'
+      ]
+    };
+  },
+  methods: {
+    setActiveGroup(group) {
+      if (group === this.activeGroup) {
+        this.activeGroup = null;
+      } else {
+        this.activeGroup = group;
+      }
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
new file mode 100644
index 000000000..7ce54c19c
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-files"></i>
+      {{ i18n.t('search.index.files') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AssetsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
new file mode 100644
index 000000000..f97db8fa4
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-experiment"></i>
+      {{ i18n.t('search.index.experiments') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExperimentsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
new file mode 100644
index 000000000..15ea2f7f0
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-folder"></i>
+      {{ i18n.t('search.index.folders') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FoldersComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
new file mode 100644
index 000000000..17e71f21f
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-label-templates"></i>
+      {{ i18n.t('search.index.label_templates') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'LabelTemplatesComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
new file mode 100644
index 000000000..de27d4bbb
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-protocols-templates"></i>
+      {{ i18n.t('search.index.task_protocols') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MyModuleProtocolsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
new file mode 100644
index 000000000..393a825ea
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-task"></i>
+      {{ i18n.t('search.index.tasks') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'MyModulesComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
new file mode 100644
index 000000000..365c3aa18
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-projects"></i>
+      {{ i18n.t('search.index.projects') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ProjectsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
new file mode 100644
index 000000000..8055dc1de
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-protocols-templates"></i>
+      {{ i18n.t('search.index.protocol_templates') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ProtocolsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
new file mode 100644
index 000000000..a6c72d74a
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-reports"></i>
+      {{ i18n.t('search.index.reports') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ReportsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
new file mode 100644
index 000000000..7b37e4b5e
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-inventory"></i>
+      {{ i18n.t('search.index.inventory_items') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RepositoryRowsComponent'
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
new file mode 100644
index 000000000..10cf91848
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -0,0 +1,14 @@
+<template>
+  <div class="bg-white rounded p-4 mb-4">
+    <h2 class="flex items-center gap-2 mt-0 mb-4">
+      <i class="sn-icon sn-icon-results"></i>
+      {{ i18n.t('search.index.task_results') }}
+    </h2>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ResultsComponent'
+};
+</script>
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index bc8c70f24..9e7dfc9ea 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="sci--navigation--top-menu-container">
-    <QuickSearch v-if="user" :quickSearchUrl="quickSearchUrl" :searchUrl="searchUrl" :currentTeam="currentTeam"></QuickSearch>
     <div v-if="currentTeam" class="w-64">
       <SelectDropdown
         :value="currentTeam"
@@ -8,6 +7,7 @@
         @change="switchTeam"
       ></SelectDropdown>
     </div>
+    <QuickSearch v-if="user && !hideSearch" :quickSearchUrl="quickSearchUrl" :searchUrl="searchUrl" :currentTeam="currentTeam"></QuickSearch>
     <MenuDropdown
       class="ml-auto"
       v-if="settingsMenu && settingsMenu.length > 0"
@@ -97,7 +97,8 @@ export default {
       helpMenu: null,
       settingsMenu: null,
       userMenu: null,
-      unseenNotificationsCount: 0
+      unseenNotificationsCount: 0,
+      hideSearch: false,
     };
   },
   created() {
@@ -108,11 +109,15 @@ export default {
       this.notificationsOpened = false;
       this.checkUnseenNotifications();
       this.refreshCurrentTeam();
+      this.hideSearch = !!document.getElementById('GlobalSearch');
     });
 
     // Track name update in user profile settings
     $(document).on('inlineEditing::updated', '.inline-editing-container[data-field-to-update="full_name"]', this.fetchData);
   },
+  mounted() {
+    this.hideSearch = !!document.getElementById('GlobalSearch');
+  },
   beforeUnmount() {
     clearTimeout(this.unseenNotificationsTimeout);
   },
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index a01b86909..15d967f0d 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,354 +1,9 @@
 <% provide(:head_title, t("search.index.head_title")) %>
-<div class="content-pane">
-  <div class="page-header">
-    <h1><%= t('search.index.results_title_html', query: @display_query) %></h1>
-    <br>
-    <!-- search form -->
-    <div class="row">
-      <div class="col-xs-12 col-sm-8 col-md-6">
-        <%= form_tag search_path,
-                     method: :get,
-                     role: 'search' do %>
-          <div class="form-group">
-            <div class="input-group">
-              <input class="form-control min-h-[2.5rem]"
-                     type="text"
-                     name="q"
-                     placeholder="<%= t('nav.search') %>"
-                     value="<%= @display_query %>">
-               <span class="input-group-btn">
-                <button class="btn btn-secondary" type="submit">
-                  <span class="sn-icon sn-icon-search"></span>
-                </button>
-              </span>
-            </div>
-            <label class="checkbox-inline">
-              <input id="search_whole_word" type="checkbox" name="whole_word" value="true" <%= 'checked' if @search_whole_word %>><%= I18n.t('search.whole_word') %>
-            </label>
-            <label class="checkbox-inline">
-              <input id="search_whole_phrase" type="checkbox" name="whole_phrase" value="true" <%= 'checked' if @search_whole_phrase %>><%= I18n.t('search.whole_phrase') %>
-            </label>
-            <label class="checkbox-inline">
-              <input id="search_match_case" type="checkbox" name="match_case" value="true" <%= 'checked' if @search_case %>><%= I18n.t('search.match_case') %>
-            </label>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
 
-  <%= form_tag search_path, method: :get do %>
-    <%= hidden_field_tag :q, @search_query %>
-    <%= hidden_field_tag :category, @search_category %>
-
-    <div class="row">
-      <div class="col-xs-12 col-sm-3 col-md-3" id="search-menu">
-        <ul class="nav nav-pills nav-stacked nav-stacked-arrow nav-search">
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :projects %>
-            <%= "disabled" if @project_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'projects', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @project_search_count %></span>
-              <span class="sn-icon sn-icon-projects"></span>
-              <%= t'Projects' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :project_folders %>
-            <%= "disabled" if @project_folder_search_count == 0 %>"
-          >
-            <a href="?<%= { category: 'project_folders', q: @search_query,
-                            whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                            match_case: @search_case, utf8: '✓',
-                            search_id: @search_id }.to_query %>">
-              <span class="badge pull-right"><%= @project_folder_search_count %></span>
-              <span class="sn-icon sn-icon-folder"></span>
-              <%= t('ProjectFolders') %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :experiments %>
-            <%= "disabled" if @experiment_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'experiments', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @experiment_search_count %></span>
-              <i class="sn-icon sn-icon-experiment"></i>
-              <%= t'Experiments' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :modules %>
-            <%= "disabled" if @module_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'modules', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @module_search_count %></span>
-              <span class="sn-icon sn-icon-task"></span>
-              <%= t'Modules' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :results %>
-            <%= "disabled" if @result_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'results', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @result_search_count %></span>
-              <span class="sn-icon sn-icon sn-icon-reports"></span>
-              <%= t'Results' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :tags %>
-            <%= "disabled" if @tag_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'tags', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @tag_search_count %></span>
-              <span class="sn-icon sn-icon-tag"></span>
-              <%= t'Tags' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :reports %>
-            <%= "disabled" if @report_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'reports', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @report_search_count %></span>
-              <span class="sn-icon sn-icon-reports"></span>
-              <%= t'Reports' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :protocols %>
-            <%= "disabled" if @protocol_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'protocols', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @protocol_search_count %></span>
-              <span class="sn-icon sn-icon-protocols-templates"></span>
-              <%= t'Protocols' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :steps %>
-            <%= "disabled" if @step_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'steps', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @step_search_count %></span>
-              <span class="sn-icon sn-icon-steps"></span>
-              <%= t'Steps' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :checklists %>
-            <%= "disabled" if @checklist_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'checklists', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @checklist_search_count %></span>
-              <span class="sn-icon sn-icon-checkllist"></span>
-              <%= t'Checklists' %>
-            </a>
-          </li>
-
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :assets %>
-            <%= "disabled" if @asset_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'assets', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @asset_search_count %></span>
-              <span class="sn-icon sn-icon-files"></span>
-              <%= t'Assets' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :tables %>
-            <%= "disabled" if @table_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'tables', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @table_search_count %></span>
-              <span class="sn-icon sn-icon-tables"></span>
-              <%= t'Tables' %>
-            </a>
-          </li>
-          <li role="presentation"
-            class="
-            <%= "active" if @search_category.present? and @search_category == :comments %>
-            <%= "disabled" if @comment_search_count == 0 %>"
-          >
-            <a href="?<%= {category: 'comments', q: @search_query,
-                           whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                           match_case: @search_case, utf8: '✓',
-                           search_id: @search_id}.to_query %>">
-              <span class="badge pull-right"><%= @comment_search_count %></span>
-              <span class="sn-icon sn-icon-comments"></span>
-              <%= t'Comments' %>
-            </a>
-          </li>
-
-          <% @repository_search_count.each do |team, results| %>
-            <li class="repositories-team <%= 'active' if results[:count].positive? %>">
-              <i class="sn-icon sn-icon-inventory"></i>
-              <%= t('Repositories_team', team: team) %>
-            </li>
-            <% results[:repositories].each do |repository, values| %>
-              <li role="presentation"
-                  class="
-                  <%= "active" if @search_category == :repositories && @repository.id == values[:id] %>
-                  <%= "disabled" if values[:count] == 0 %> repository-search"
-              >
-                <a href="?<%= {category: 'repositories',
-                               repository: values[:id], q: @search_query,
-                               whole_word: @search_whole_word, whole_phrase: @search_whole_phrase,
-                               match_case: @search_case, utf8: '✓',
-                               search_id: @search_id}.to_query %>">
-                  <span class="badge pull-right"><%= values[:count] %></span>
-                  <%= repository %>
-                  <%= inventory_shared_status_icon(values[:repository], results[:team]) %>
-                </a>
-              </li>
-            <% end %>
-          <% end %>
-        </ul>
-      </div>
-
-      <% if not @search_category.blank? %>
-      <div class="col-xs-12 col-sm-9" id="search-content">
-
-        <div class="container-fluid" id="search-container">
-        <% if @search_results_count == 0 %>
-        <p><%= t'search.index.error.no_results', q: @search_query %></p>
-        <% end %>
-
-        <hr class="visible-xs">
-
-        <% if @search_category == :projects and @project_search_count.positive? %>
-          <%= render 'search/results/projects', search_query: @search_query, results: @project_results %>
-        <% end %>
-        <% if @search_category == :project_folders and @project_folder_search_count.positive? %>
-          <%= render 'search/results/project_folders', search_query: @search_query, results: @project_folder_results %>
-        <% end %>
-        <% if @search_category == :experiments and @experiment_search_count.positive? %>
-          <%= render 'search/results/experiments', search_query: @search_query, results: @experiment_results %>
-        <% end %>
-        <% if @search_category == :modules and @module_search_count.positive? %>
-          <%= render 'search/results/modules', search_query: @search_query, results: @module_results %>
-        <% end %>
-        <% if @search_category == :results and @result_search_count.positive? %>
-          <%= render 'search/results/results', search_query: @search_query, results: @result_results %>
-        <% end %>
-        <% if @search_category == :tags and @tag_search_count.positive? %>
-          <%= render 'search/results/tags', search_query: @search_query, results: @tag_results %>
-        <% end %>
-        <% if @search_category == :reports and @report_search_count.positive? %>
-          <%= render 'search/results/reports', search_query: @search_query, results: @report_results %>
-        <% end %>
-        <% if @search_category == :protocols and @protocol_search_count.positive? %>
-          <%= render 'search/results/protocols', search_query: @search_query, results: @protocol_results %>
-        <% end %>
-        <% if @search_category == :steps and @step_search_count.positive? %>
-          <%= render 'search/results/steps', search_query: @search_query, results: @step_results %>
-        <% end %>
-        <% if @search_category == :checklists and @checklist_search_count.positive? %>
-          <%= render 'search/results/checklists', search_query: @search_query, results: @checklist_results %>
-        <% end %>
-        <% if @search_category == :repositories and @repository_search_count_total.positive? %>
-          <%= render 'search/results/repositories', search_query: @search_query, results: @repository_results, repository: @repository %>
-        <% end %>
-        <% if @search_category == :assets and @asset_search_count.positive? %>
-          <%= render 'search/results/assets', search_query: @search_query, results: @asset_results %>
-        <% end %>
-        <% if @search_category == :tables and @table_search_count.positive? %>
-          <%= render 'search/results/tables', search_query: @search_query, results: @table_results %>
-        <% end %>
-        <% if @search_category == :comments and @comment_search_count.positive? %>
-          <%= render 'search/results/comments', search_query: @search_query, results: @comment_results %>
-        <% end %>
-
-      </div>
-      </div>
-      <% end %>
-    </div>
-
-  <% end %>
-
-  <% if @search_pages > 1 %>
-  <% params = { q: @search_query,
-                category: @search_category,
-                utf8: '✓',
-                search_id: @search_id } %>
-  <% if @search_category == :repositories %>
-    <% params[:repository] = @repository.id %>
-  <% end %>
-  <nav class="text-center">
-    <ul class="pagination">
-      <% if @search_page > 1 %>
-      <% params[:page] = @search_page - 1 %>
-      <li>
-        <a href="?<%= params.to_query %>" aria-label="Previous">
-          <span aria-hidden="true">&laquo;</span>
-        </a>
-      </li>
-      <% end %>
-      <% (@start_page..@end_page).each do |page_i| %>
-      <% params[:page] = page_i %>
-      <li <% if @search_page == page_i %>class="active"<% end %>>
-        <a href="?<%= params.to_query %>"><%= page_i %></a>
-      </li>
-      <% end %>
-      <% if @search_page < @search_pages %>
-      <% params[:page] = @search_page + 1 %>
-      <li>
-        <a href="?<%= params.to_query %>" aria-label="Next">
-          <span aria-hidden="true">&raquo;</span>
-        </a>
-      </li>
-      <% end %>
-    </ul>
-  </nav>
-  <% end %>
+<div id="GlobalSearch" class="contents">
+  <global_search
+    :query="'<%= @display_query %>'"
+  />
 </div>
 
-<%= javascript_include_tag('search') %>
+<%= javascript_include_tag "vue_global_search" %>
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index 5604e3274..ca9b86ddb 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -615,6 +615,7 @@ class Extends
     protocols/show
     preferences/index
     addons/index
+    search/index
   )
 
   DEFAULT_USER_NOTIFICATION_SETTINGS = {
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5cd17d3da..649f66ce7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -441,48 +441,20 @@ en:
     index:
       head_title: "Search"
       page_title: "Search"
-      results_title_html: "Search Results for '<em>%{query}</em>'"
-      public: "Public"
-      private: "Private"
-      archived: "Archived"
-      in_repository: "Protocol templates"
-      created_by: "Created by: "
-      created_at: "Created at: "
-      last_modified_by: "Last modified by: "
-      last_modified_at: "Last modified at: "
-      keywords: "Keywords: "
-      authors: "Authors: "
-      description: "Description: "
-      no_description: "No description"
-      text: "Text"
-      team: "Team: "
-      folder: "Folders: "
-      repository: "Inventory: "
-      repository_row: "Inventory item: "
-      project: "Project: "
-      experiment: "Experiment: "
-      protocol: "Protocol: "
-      modules: "Tasks: "
-      tag_no_modules: "not added to any tasks"
-      module: "Task: "
-      step: "Step: "
-      result: "Result: "
-      report: "Report: "
-      no_name: "(no name)"
-      error:
-        no_results: "No results for %{q}."
-      repositories:
-        repository_row: "Inventory item: "
-        added_on: "Added on: "
-        added_by: "Added by: "
-        custom_column: "%{column}: "
-        no_modules: "not assigned to any task"
-      comments:
-        project: "Project comment"
-        my_module: "Task comment"
-        step: "Step comment"
-        result: "Result comment"
-
+      results_title_html: "Search Results for '%{query}'"
+      experiments: "Experiments"
+      tasks: "Tasks"
+      task_results: "Task results"
+      folders: "Folders"
+      projects: "Projects"
+      task_protocols: "Task protocols"
+      files: "Files"
+      inventory_items: "Inventory items"
+      protocol_templates: "Protocol templates"
+      label_templates: "Label templates"
+      reports: "Reports"
+      more_search_options: "More search options"
+      clear_filters: "Clear filters"
   comments:
     save_changes: "Save changes"
     empty_state:
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 593146fae..07ac72a33 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -59,9 +59,10 @@ const entryList = {
   vue_open_locally_menu: './app/javascript/packs/vue/open_locally_menu.js',
   vue_scinote_edit_download: './app/javascript/packs/vue/scinote_edit_download.js',
   vue_design_system_modals: './app/javascript/packs/vue/design_system/modals.js',
+  vue_global_search: './app/javascript/packs/vue/global_search.js',
   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_legacy_repository_menu_dropdown: './app/javascript/packs/vue/legacy/repository_menu_dropdown.js',
 };
 
 // Engine pack loading based on https://github.com/rails/webpacker/issues/348#issuecomment-635480949

From 478da522721976ee105532c9e2404088ad89b141 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 22 Mar 2024 16:37:59 +0100
Subject: [PATCH 009/115] Add projects search results component [SCI-10469]

---
 app/controllers/search_controller.rb          | 73 ++++++++++------
 .../vue/global_search/container.vue           | 13 ++-
 .../vue/global_search/groups/projects.vue     | 47 +++++++++-
 .../vue/global_search/groups/search_mixin.js  | 87 +++++++++++++++++++
 .../global_search/project_serializer.rb       | 31 +++++++
 app/views/search/index.html.erb               |  1 +
 config/locales/en.yml                         |  4 +
 7 files changed, 226 insertions(+), 30 deletions(-)
 create mode 100644 app/javascript/vue/global_search/groups/search_mixin.js
 create mode 100644 app/serializers/global_search/project_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 27ae5e1e5..5b55c1536 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -11,37 +11,56 @@ class SearchController < ApplicationController
       format.json do
         redirect_to new_search_path unless @search_query
 
-        @search_id = params[:search_id] ? params[:search_id] : generate_search_id
+        case params[:group]
+        when 'projects'
+          @project_search_count = fetch_cached_count Project
+          search_projects
+          if params[:preview] == 'true'
+            results = @project_results.limit(4)
+          else
+            results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+          end
 
-        count_search_results
-
-        search_projects if @search_category == :projects
-        search_project_folders if @search_category == :project_folders
-        search_experiments if @search_category == :experiments
-        search_modules if @search_category == :modules
-        search_results if @search_category == :results
-        search_tags if @search_category == :tags
-        search_reports if @search_category == :reports
-        search_protocols if @search_category == :protocols
-        search_steps if @search_category == :steps
-        search_checklists if @search_category == :checklists
-        if @search_category == :repositories && params[:repository]
-          search_repository
+          render json: results,
+                 each_serializer: GlobalSearch::ProjectSerializer,
+                 meta: {
+                  total: @search_count,
+                  next_page: (results.next_page if results.respond_to?(:next_page)),
+                }
+          return
         end
-        search_assets if @search_category == :assets
-        search_tables if @search_category == :tables
-        search_comments if @search_category == :comments
 
-        @search_pages = (@search_count.to_f / Constants::SEARCH_LIMIT.to_f).ceil
-        @start_page = @search_page - 2
-        @start_page = 1 if @start_page < 1
-        @end_page = @start_page + 4
+        #@search_id = params[:search_id] ? params[:search_id] : generate_search_id
+        #
+        #count_search_results
+        #
+        #search_projects if @search_category == :projects
+        #search_project_folders if @search_category == :project_folders
+        #search_experiments if @search_category == :experiments
+        #search_modules if @search_category == :modules
+        #search_results if @search_category == :results
+        #search_tags if @search_category == :tags
+        #search_reports if @search_category == :reports
+        #search_protocols if @search_category == :protocols
+        #search_steps if @search_category == :steps
+        #search_checklists if @search_category == :checklists
+        #if @search_category == :repositories && params[:repository]
+        #  search_repository
+        #end
+        #search_assets if @search_category == :assets
+        #search_tables if @search_category == :tables
+        #search_comments if @search_category == :comments
 
-        if @end_page > @search_pages
-          @end_page = @search_pages
-          @start_page = @end_page - 4
-          @start_page = 1 if @start_page < 1
-        end
+        #@search_pages = (@search_count.to_f / Constants::SEARCH_LIMIT.to_f).ceil
+        #@start_page = @search_page - 2
+        #@start_page = 1 if @start_page < 1
+        #@end_page = @start_page + 4
+
+        #if @end_page > @search_pages
+        #  @end_page = @search_pages
+        #  @start_page = @end_page - 4
+        #  @start_page = 1 if @start_page < 1
+        #end
       end
     end
   end
diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index 8652967a6..be302d1b1 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -7,9 +7,9 @@
         </h1>
       </div>
     </div>
-    <div class="bg-white rounded p-4 flex gap-2.5 items-center mb-4">
+    <div class="bg-white rounded p-4 flex gap-2.5 items-center mb-4 sticky top-0">
       <div class="left-icon sci-input-container-v2 w-72 input-sm" :title="i18n.t('nav.search')">
-        <input ref="searchField" type="text" class="!pr-9" v-model="localQuery" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
+        <input ref="searchField" type="text" class="!pr-9" :value="localQuery" @change="changeQuery" :placeholder="i18n.t('nav.search')"/>
         <i class="sn-icon sn-icon-search"></i>
         <i v-if="localQuery.length > 0" class="sn-icon cursor-pointer sn-icon-close absolute right-0 -top-0.5" @click="localQuery = ''"></i>
       </div>
@@ -43,6 +43,8 @@
         v-if="activeGroup === group || !activeGroup"
         :selected="activeGroup === group"
         :query="localQuery"
+        :searchUrl="searchUrl"
+        @selectGroup="setActiveGroup"
       />
     </template>
   </div>
@@ -67,6 +69,10 @@ export default {
     query: {
       type: String,
       required: true
+    },
+    searchUrl: {
+      type: String,
+      required: true
     }
   },
   components: {
@@ -108,6 +114,9 @@ export default {
       } else {
         this.activeGroup = group;
       }
+    },
+    changeQuery(event) {
+      this.localQuery = event.target.value;
     }
   }
 };
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 365c3aa18..f98dbf54a 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -3,12 +3,57 @@
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-projects"></i>
       {{ i18n.t('search.index.projects') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <template v-if="row.attributes.folder">
+              <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+                <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
+                <a :href="row.attributes.folder.url" class="shrink-0 overflow-hidden">
+                  <StringWithEllipsis class="w-full" :text="row.attributes.folder.name"></StringWithEllipsis>
+                </a>
+              </div>
+            </template>
+          </div>
+        </template>
+      </div>
+      <div v-if="!selected && total > 4" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'ProjectsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'ProjectsComponent'
+  name: 'ProjectsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'projects'
+    };
+  }
 };
 </script>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
new file mode 100644
index 000000000..6e8a3fa70
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -0,0 +1,87 @@
+import axios from '../../../packs/custom_axios.js';
+import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
+
+export default {
+  props: {
+    searchUrl: String,
+    query: String,
+    selected: Boolean
+  },
+  components: {
+    StringWithEllipsis
+  },
+  data() {
+    return {
+      results: [],
+      total: 0,
+      loading: false,
+      page: 1,
+      fullDataLoaded: false
+    };
+  },
+  watch: {
+    selected() {
+      if (this.selected) {
+        if (!this.fullDataLoaded) {
+          this.results = [];
+          this.loadData();
+        }
+      }
+    },
+    query() {
+      this.results = [];
+      this.page = 1;
+      this.fullDataLoaded = false;
+      this.loadData();
+    }
+  },
+  mounted() {
+    this.loadData();
+    window.addEventListener('scroll', this.handleScroll);
+  },
+  unmounted() {
+    window.removeEventListener('scroll', this.handleScroll);
+  },
+  computed: {
+    preparedResults() {
+      if (this.selected) {
+        return this.results;
+      }
+      return this.results.slice(0, 4);
+    }
+  },
+  methods: {
+    handleScroll() {
+      if (this.loading) return;
+
+      if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
+        if (this.results.length < this.total) {
+          this.loadData();
+        }
+      }
+    },
+    loadData() {
+      if (this.loading && this.page) return;
+
+      this.loading = true;
+      axios.get(this.searchUrl, {
+        params: {
+          q: this.query,
+          group: this.group,
+          preview: !this.selected,
+          page: this.page
+        }
+      })
+        .then((response) => {
+          if (this.selected) this.fullDataLoaded = true;
+          this.results = this.results.concat(response.data.data);
+          this.total = response.data.meta.total;
+          this.loading = false;
+          this.page = response.data.meta.next_page;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    }
+  }
+};
diff --git a/app/serializers/global_search/project_serializer.rb b/app/serializers/global_search/project_serializer.rb
new file mode 100644
index 000000000..bd94e4b56
--- /dev/null
+++ b/app/serializers/global_search/project_serializer.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class GlobalSearch::ProjectSerializer < ActiveModel::Serializer
+  include Rails.application.routes.url_helpers
+
+  attributes :id, :name, :code, :created_at, :team, :folder, :archived, :url
+
+  def team
+    {
+      name: object.team.name,
+      url: projects_path(team: object.team)
+    }
+  end
+
+  def created_at
+    I18n.l(object.created_at, format: :full_date)
+  end
+
+  def url
+    project_path(object)
+  end
+
+  def folder
+    if object.project_folder
+      {
+        name: object.project_folder.name,
+        url: project_folder_path(object.project_folder)
+      }
+    end
+  end
+end
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 15d967f0d..70db91ef7 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -3,6 +3,7 @@
 <div id="GlobalSearch" class="contents">
   <global_search
     :query="'<%= @display_query %>'"
+    :search-url="'<%= search_path(format: :json) %>'"
   />
 </div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 649f66ce7..3aa90769e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -455,6 +455,10 @@ en:
       reports: "Reports"
       more_search_options: "More search options"
       clear_filters: "Clear filters"
+      id: "ID"
+      created_at: "Created on"
+      team: "Team"
+      folder: "Folder"
   comments:
     save_changes: "Save changes"
     empty_state:

From 9c6dac339e4343623028758f729bed8267df545e Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 26 Mar 2024 16:42:36 +0100
Subject: [PATCH 010/115] Implement global search results component for
 Protocol templates [SCI-10477]

---
 app/controllers/search_controller.rb          | 20 +++++++-
 .../vue/global_search/groups/protocols.vue    | 46 ++++++++++++++++++-
 .../global_search/protocol_serializer.rb      | 35 ++++++++++++++
 config/locales/en.yml                         |  2 +
 4 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/global_search/protocol_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 5b55c1536..7ba3e1e47 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -13,10 +13,10 @@ class SearchController < ApplicationController
 
         case params[:group]
         when 'projects'
-          @project_search_count = fetch_cached_count Project
+          @project_search_count = fetch_cached_count(Project)
           search_projects
           if params[:preview] == 'true'
-            results = @project_results.limit(4)
+            results = @project_results&.limit(4) || []
           else
             results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
           end
@@ -28,6 +28,22 @@ class SearchController < ApplicationController
                   next_page: (results.next_page if results.respond_to?(:next_page)),
                 }
           return
+        when 'protocols'
+          @protocol_search_count = fetch_cached_count(Protocol)
+          search_protocols
+          results = if params[:preview] == 'true'
+                      @protocol_results&.limit(4) || []
+                    else
+                      @protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+
+          render json: results,
+                 each_serializer: GlobalSearch::ProtocolSerializer,
+                 meta: {
+                          total: @search_count,
+                          next_page: (results.next_page if results.respond_to?(:next_page)),
+                        }
+          return
         end
 
         #@search_id = params[:search_id] ? params[:search_id] : generate_search_id
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index 8055dc1de..6b6d8dc43 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -3,12 +3,56 @@
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-protocols-templates"></i>
       {{ i18n.t('search.index.protocol_templates') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
+            <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+        </template>
+      </div>
+      <div v-if="!selected && total > 4" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'ProtocolsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'ProtocolsComponent'
+  name: 'ProtocolsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'protocols'
+    };
+  }
 };
 </script>
diff --git a/app/serializers/global_search/protocol_serializer.rb b/app/serializers/global_search/protocol_serializer.rb
new file mode 100644
index 000000000..feac6d3fd
--- /dev/null
+++ b/app/serializers/global_search/protocol_serializer.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class ProtocolSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :updated_at, :created_by, :team, :archived, :url
+
+    def team
+      {
+        name: object.team.name,
+        url: protocols_path(team: object.team)
+      }
+    end
+
+    def created_by
+      {
+        name: object.created_by.name,
+        avatar_url: avatar_path(object.created_by, :icon_small)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def url
+      protocol_path(object)
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3aa90769e..faf6df1c0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -457,6 +457,8 @@ en:
       clear_filters: "Clear filters"
       id: "ID"
       created_at: "Created on"
+      created_by: "Created by"
+      updated_at: "Updated on"
       team: "Team"
       folder: "Folder"
   comments:

From 1f7566ae73c423b3636159a354333d2329ab599c Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 27 Mar 2024 11:44:52 +0100
Subject: [PATCH 011/115] Add project folders group to global search page
 [SCI-10470]

---
 .../javascripts/sitewide/constants.js.erb     |  1 +
 app/controllers/search_controller.rb          | 21 +++++++--
 .../vue/global_search/groups/folders.vue      | 45 ++++++++++++++++++-
 .../vue/global_search/groups/projects.vue     |  2 +-
 .../vue/global_search/groups/search_mixin.js  |  4 ++
 .../project_folder_serializer.rb              | 33 ++++++++++++++
 config/initializers/constants.rb              |  2 +
 7 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 app/serializers/global_search/project_folder_serializer.rb

diff --git a/app/assets/javascripts/sitewide/constants.js.erb b/app/assets/javascripts/sitewide/constants.js.erb
index 6d3eeff90..b88b22bd5 100644
--- a/app/assets/javascripts/sitewide/constants.js.erb
+++ b/app/assets/javascripts/sitewide/constants.js.erb
@@ -18,4 +18,5 @@ const GLOBAL_CONSTANTS = {
   SLOW_STATUS_POLLING_INTERVAL: <%= Constants::SLOW_STATUS_POLLING_INTERVAL %>,
   ASSET_POLLING_INTERVAL: <%= Constants::ASSET_POLLING_INTERVAL %>,
   ASSET_SYNC_URL: '<%= Constants::ASSET_SYNC_URL %>',
+  GLOBAL_SEARCH_PREVIEW_LIMIT: <%= Constants::GLOBAL_SEARCH_PREVIEW_LIMIT %>
 };
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 7ba3e1e47..a7d8c6cfb 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -21,12 +21,27 @@ class SearchController < ApplicationController
             results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
           end
 
-          render json: results,
+          render json: results.includes(:team, :project_folder),
                  each_serializer: GlobalSearch::ProjectSerializer,
                  meta: {
                   total: @search_count,
                   next_page: (results.next_page if results.respond_to?(:next_page)),
                 }
+        when 'project_folders'
+          @project_folder_search_count = fetch_cached_count ProjectFolder
+          search_project_folders
+          results = if params[:preview] == 'true'
+                      @project_folder_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @project_folder_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+          render json: results.includes(:team, :parent_folder),
+                 each_serializer: GlobalSearch::ProjectFolderSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: results.try(:next_page)
+                 }
+        else
           return
         when 'protocols'
           @protocol_search_count = fetch_cached_count(Protocol)
@@ -267,13 +282,13 @@ class SearchController < ApplicationController
   end
 
   def search_projects
-    @project_results = []
+    @project_results = Project.none
     @project_results = search_by_name(Project) if @project_search_count.positive?
     @search_count = @project_search_count
   end
 
   def search_project_folders
-    @project_folder_results = []
+    @project_folder_results = ProjectFolder.none
     @project_folder_results = search_by_name(ProjectFolder) if @project_folder_search_count.positive?
     @search_count = @project_folder_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index 15ea2f7f0..3b1a441c4 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -1,14 +1,55 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-folder"></i>
       {{ i18n.t('search.index.folders') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
+          <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <template v-if="row.attributes.parent_folder">
+              <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+                <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
+                <a :href="row.attributes.parent_folder.url" target="_blank" class="shrink-0 overflow-hidden">
+                  <StringWithEllipsis class="w-full" :text="row.attributes.parent_folder.name"></StringWithEllipsis>
+                </a>
+              </div>
+            </template>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'FoldersComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'FoldersComponent'
+  name: 'FoldersComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'project_folders'
+    };
+  }
 };
 </script>
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index f98dbf54a..e30786e65 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-projects"></i>
       {{ i18n.t('search.index.projects') }}
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 6e8a3fa70..bf638ee92 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -1,5 +1,6 @@
 import axios from '../../../packs/custom_axios.js';
 import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
+/* global GLOBAL_CONSTANTS */
 
 export default {
   props: {
@@ -48,6 +49,9 @@ export default {
         return this.results;
       }
       return this.results.slice(0, 4);
+    },
+    viewAll() {
+      return !this.selected && this.total > GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
     }
   },
   methods: {
diff --git a/app/serializers/global_search/project_folder_serializer.rb b/app/serializers/global_search/project_folder_serializer.rb
new file mode 100644
index 000000000..c818ee2bd
--- /dev/null
+++ b/app/serializers/global_search/project_folder_serializer.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class ProjectFolderSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :team, :parent_folder, :archived, :url
+
+    def team
+      {
+        name: object.team.name,
+        url: projects_path(project_folder_id: object.id)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def url
+      project_folder_path(object)
+    end
+
+    def parent_folder
+      if object.parent_folder_id?
+        {
+          name: object.parent_folder.name,
+          url: project_folder_path(object.parent_folder.id)
+        }
+      end
+    end
+  end
+end
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 8dfaec831..7e4dc582b 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -52,6 +52,8 @@ class Constants
 
   # General limited/unlimited query/display elements for pages
   SEARCH_LIMIT = 20
+  # General global search limit for object groups
+  GLOBAL_SEARCH_PREVIEW_LIMIT = 4
   SEARCH_NO_LIMIT = -1
   # General limited query/display elements for popup modals
   MODAL_SEARCH_LIMIT = 5

From d6a98b76fd2d409820b9930374ab30187ccddf4f Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 27 Mar 2024 16:11:06 +0100
Subject: [PATCH 012/115] Rebase work [SCI-10470]

---
 app/controllers/search_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a7d8c6cfb..eb15dc698 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -41,7 +41,6 @@ class SearchController < ApplicationController
                    total: @search_count,
                    next_page: results.try(:next_page)
                  }
-        else
           return
         when 'protocols'
           @protocol_search_count = fetch_cached_count(Protocol)

From 230f180f18b4cb87a23333a518e3a7a811c75e1d Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Fri, 29 Mar 2024 08:34:13 +0100
Subject: [PATCH 013/115] Add experiment group to global search page
 [SCI-10471]

---
 app/controllers/search_controller.rb          | 17 ++++++-
 .../vue/global_search/groups/experiments.vue  | 47 ++++++++++++++++++-
 .../global_search/experiment_serializer.rb    | 31 ++++++++++++
 config/locales/en.yml                         |  1 +
 4 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/global_search/experiment_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eb15dc698..f7f281563 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -42,6 +42,21 @@ class SearchController < ApplicationController
                    next_page: results.try(:next_page)
                  }
           return
+        when 'experiments'
+          @experiment_search_count = fetch_cached_count Experiment
+          search_experiments
+          results = if params[:preview] == 'true'
+                      @experiment_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @experiment_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+          render json: results.includes(project: :team),
+                 each_serializer: GlobalSearch::ExperimentSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: results.try(:next_page)
+                 }
+          return
         when 'protocols'
           @protocol_search_count = fetch_cached_count(Protocol)
           search_protocols
@@ -293,7 +308,7 @@ class SearchController < ApplicationController
   end
 
   def search_experiments
-    @experiment_results = []
+    @experiment_results = Experiment.none
     @experiment_results = search_by_name(Experiment) if @experiment_search_count.positive?
     @search_count = @experiment_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index f97db8fa4..74231b487 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -1,14 +1,57 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-experiment"></i>
       {{ i18n.t('search.index.experiments') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[220px]">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+              <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
+              <a :href="row.attributes.project.url" target="_blank" class="shrink-0 overflow-hidden">
+                <StringWithEllipsis class="w-full" :text="row.attributes.project.name"></StringWithEllipsis>
+              </a>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'ExperimentsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'ExperimentsComponent'
+  name: 'ExperimentsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'experiments'
+    };
+  }
 };
 </script>
diff --git a/app/serializers/global_search/experiment_serializer.rb b/app/serializers/global_search/experiment_serializer.rb
new file mode 100644
index 000000000..e1ac156e5
--- /dev/null
+++ b/app/serializers/global_search/experiment_serializer.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class ExperimentSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :team, :project, :archived, :url
+
+    def team
+      {
+        name: object.project.team.name,
+        url: projects_path(team_id: object.project.team.id)
+      }
+    end
+
+    def project
+      {
+        name: object.project.name,
+        url: project_experiments_path(project_id: object.project.id)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def url
+      my_modules_experiment_path(object.id)
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index faf6df1c0..62e92ba04 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -461,6 +461,7 @@ en:
       updated_at: "Updated on"
       team: "Team"
       folder: "Folder"
+      project: "Project"
   comments:
     save_changes: "Save changes"
     empty_state:

From 7eb3cff06e3521da42d34ae7a5e148b5d551ce0a Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Tue, 2 Apr 2024 13:38:21 +0100
Subject: [PATCH 014/115] Add check for different sso providers [SCI-10214]

---
 app/helpers/application_helper.rb      | 17 +++++++++--------
 app/views/users/shared/_links.html.erb |  8 ++++----
 config/initializers/omniauth.rb        |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 31ed891a6..c2b85bf77 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -199,20 +199,21 @@ module ApplicationHelper
     ENV['SSO_ENABLED'] == 'true'
   end
 
-  def okta_configured?
-    ApplicationSettings.instance.values['okta'].present?
+  def okta_enabled?
+    ApplicationSettings.instance.values.dig('okta', 'enabled')
   end
 
-  def azure_ad_configured?
-    ApplicationSettings.instance.values['azure_ad_apps'].present?
+  def azure_ad_enabled?
+    provider_conf = ApplicationSettings.instance.values['azure_ad_apps']
+    provider_conf.present? && provider_conf[0]['enabled']
   end
 
-  def openid_connect_configured?
-    ApplicationSettings.instance.values['openid_connect'].present?
+  def saml_enabled?
+    ApplicationSettings.instance.values.dig('saml', 'enabled')
   end
 
-  def saml_configured?
-    ApplicationSettings.instance.values['saml'].present?
+  def openid_connect_enabled?
+    ApplicationSettings.instance.values.dig('openid_connect', 'enabled')
   end
 
   def wopi_enabled?
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 2395bc310..85126b0c1 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -28,7 +28,7 @@
   <% end -%>
 
   <% if controller_name != 'passwords'%>
-    <%- if sso_enabled? && okta_configured? %>
+    <%- if sso_enabled? && okta_enabled? %>
       <div class="okta-sign-in-actions">
         <%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
           <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-okta' %>
@@ -42,13 +42,13 @@
       <% end -%>
     <% end -%>
 
-    <% if sso_enabled? && azure_ad_configured? %>
+    <% if sso_enabled? && azure_ad_enabled? %>
       <div class="azure-sign-in-actions">
         <%= render partial: "users/shared/azure_sign_in_links", locals: { resource_name: resource_name } %>
       </div>
     <% end %>
 
-    <%- if sso_enabled? && openid_connect_configured? %>
+    <%- if sso_enabled? && openid_connect_enabled? %>
       <div class="azure-sign-in-actions">
         <%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
           <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
@@ -56,7 +56,7 @@
       </div>
     <% end %>
 
-    <% if sso_enabled? && saml_configured? %>
+    <% if sso_enabled? && saml_enabled? %>
       <div class="azure-sign-in-actions">
         <%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
           <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index da22ac831..85e3e4d59 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -5,7 +5,7 @@ require 'omniauth/strategies/custom_azure_active_directory'
 AZURE_SETUP_PROC = lambda do |env|
   settings = ApplicationSettings.instance
   providers = settings.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }
-  raise StandardError, 'No Azure AD config available for sign in' if providers.blank?
+  raise StandardError, 'No Azure AD config available for sign in' unless providers.present? && providers[0]['enabled']
 
   req = Rack::Request.new(env)
 
@@ -61,7 +61,7 @@ end
 OKTA_SETUP_PROC = lambda do |env|
   settings = ApplicationSettings.instance
   provider_conf = settings.values['okta']
-  raise StandardError, 'No Okta config available for sign in' if provider_conf.blank?
+  raise StandardError, 'No Okta config available for sign in' unless provider_conf.present? && provider_conf['enabled']
 
   oauth2_base_url =
     if provider_conf['auth_server_id'].blank?

From 84dd5eaa70d996be2834ee6fd42a97ccaf94e018 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 3 Apr 2024 00:55:09 +0200
Subject: [PATCH 015/115] Implement global search results component for
 inventory items [SCI-10476]

---
 app/controllers/search_controller.rb          | 22 +++++++++
 .../global_search/groups/repository_rows.vue  | 48 ++++++++++++++++++-
 app/models/repository_row.rb                  | 29 +++++++++++
 .../repository_row_serializer.rb              | 39 +++++++++++++++
 config/locales/en.yml                         |  1 +
 5 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 app/serializers/global_search/repository_row_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f7f281563..ceb4377c6 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -73,6 +73,22 @@ class SearchController < ApplicationController
                           next_page: (results.next_page if results.respond_to?(:next_page)),
                         }
           return
+        when 'repository_rows'
+          @repository_row_search_count = fetch_cached_count(RepositoryRow)
+          search_repository_rows
+          results = if params[:preview] == 'true'
+                      @repository_row_results.take(4)
+                    else
+                      @repository_row_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+
+          render json: results,
+                 each_serializer: GlobalSearch::RepositoryRowSerializer,
+                 meta: {
+                          total: @search_count,
+                          next_page: (results.next_page if results.respond_to?(:next_page))
+                        }
+          return
         end
 
         #@search_id = params[:search_id] ? params[:search_id] : generate_search_id
@@ -372,6 +388,12 @@ class SearchController < ApplicationController
     @search_count = current_repository_search_count
   end
 
+  def search_repository_rows
+    @repository_row_results = []
+    @repository_row_results = search_by_name(RepositoryRow) if @repository_row_search_count.positive?
+    @search_count = @repository_row_search_count
+  end
+
   def search_assets
     @asset_results = []
     @asset_results = search_by_name(Asset) if @asset_search_count.positive?
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index 7b37e4b5e..e7bbf34e6 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -3,12 +3,58 @@
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-inventory"></i>
       {{ i18n.t('search.index.inventory_items') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
+            <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.repository') }}:</b>
+            <a :href="row.attributes.repository.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.repository.name"></StringWithEllipsis>
+            </a>
+          </div>
+        </template>
+      </div>
+      <div v-if="!selected && total > 4" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'RepositoryRowsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'RepositoryRowsComponent'
+  name: 'RepositoryRowsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'repository_rows'
+    };
+  }
 };
 </script>
diff --git a/app/models/repository_row.rb b/app/models/repository_row.rb
index 0c38d7f2f..624175566 100644
--- a/app/models/repository_row.rb
+++ b/app/models/repository_row.rb
@@ -120,6 +120,35 @@ class RepositoryRow < ApplicationRecord
     where(repository: Repository.viewable_by_user(user, teams))
   end
 
+  def self.search(user,
+                  include_archived,
+                  query = nil,
+                  page = 1,
+                  _current_team = nil,
+                  options = {})
+
+    searchable_row_fields = [RepositoryRow::PREFIXED_ID_SQL, 'repository_rows.name', 'users.full_name']
+    repositories = Repository.search(user).pluck(:id)
+
+    new_query =
+      RepositoryRow
+      .joins(:repository, :created_by)
+      .where(repository_id: repositories)
+      .distinct
+      .where_attributes_like(
+        searchable_row_fields, query, options
+      )
+
+    new_query = new_query.active unless include_archived
+
+    # Show all results if needed
+    if page == Constants::SEARCH_NO_LIMIT
+      new_query
+    else
+      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
+    end
+  end
+
   def self.filter_by_teams(teams = [])
     return self if teams.blank?
 
diff --git a/app/serializers/global_search/repository_row_serializer.rb b/app/serializers/global_search/repository_row_serializer.rb
new file mode 100644
index 000000000..49011ff90
--- /dev/null
+++ b/app/serializers/global_search/repository_row_serializer.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class RepositoryRowSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :created_by, :team, :repository, :archived, :url
+
+    def team
+      {
+        name: object.team.name,
+        url: repository_path(object.repository)
+      }
+    end
+
+    def created_by
+      {
+        name: object.created_by.name,
+        avatar_url: avatar_path(object.created_by, :icon_small)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def repository
+      {
+        name: object.repository.name,
+        url: repository_path(object.repository)
+      }
+    end
+
+    def url
+      # switch to repository_repository_rows_path when inventory items page is implemented
+      repository_path(object.repository)
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 62e92ba04..e9d881f53 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -453,6 +453,7 @@ en:
       protocol_templates: "Protocol templates"
       label_templates: "Label templates"
       reports: "Reports"
+      repository: "Inventory"
       more_search_options: "More search options"
       clear_filters: "Clear filters"
       id: "ID"

From da19a79851590e399d3a89eb89b6fb77682f8c87 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 27 Mar 2024 12:41:30 +0100
Subject: [PATCH 016/115] Implement global search results component for Label
 templates [SCI-10478]

---
 app/controllers/search_controller.rb          | 32 ++++++++--
 .../global_search/groups/label_templates.vue  | 59 ++++++++++++++++++-
 .../vue/global_search/groups/search_mixin.js  |  2 +
 app/models/label_template.rb                  | 22 +++++++
 .../label_template_serializer.rb              | 39 ++++++++++++
 config/locales/en.yml                         |  1 +
 6 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 app/serializers/global_search/label_template_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f7f281563..7b2ba3618 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -16,7 +16,7 @@ class SearchController < ApplicationController
           @project_search_count = fetch_cached_count(Project)
           search_projects
           if params[:preview] == 'true'
-            results = @project_results&.limit(4) || []
+            results = @project_results.take(4) || []
           else
             results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
           end
@@ -61,7 +61,7 @@ class SearchController < ApplicationController
           @protocol_search_count = fetch_cached_count(Protocol)
           search_protocols
           results = if params[:preview] == 'true'
-                      @protocol_results&.limit(4) || []
+                      @protocol_results.take(4) || []
                     else
                       @protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
                     end
@@ -70,8 +70,26 @@ class SearchController < ApplicationController
                  each_serializer: GlobalSearch::ProtocolSerializer,
                  meta: {
                           total: @search_count,
-                          next_page: (results.next_page if results.respond_to?(:next_page)),
-                        }
+                          next_page: (results.next_page if results.respond_to?(:next_page))
+                       }
+          return
+        when 'label_templates'
+          return render json: [], meta: { disabled: true }, status: :ok unless LabelTemplate.enabled?
+
+          @label_template_search_count = fetch_cached_count(LabelTemplate)
+          search_label_templates
+          results = if params[:preview] == 'true'
+                      @label_template_results.take(4) || []
+                    else
+                      @label_template_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+
+          render json: results,
+                 each_serializer: GlobalSearch::LabelTemplateSerializer,
+                 meta: {
+                          total: @search_count,
+                          next_page: (results.next_page if results.respond_to?(:next_page))
+                       }
           return
         end
 
@@ -343,6 +361,12 @@ class SearchController < ApplicationController
     @search_count = @protocol_search_count
   end
 
+  def search_label_templates
+    @label_template_results = []
+    @label_template_results = search_by_name(LabelTemplate) if @label_template_search_count.positive?
+    @search_count = @label_template_search_count
+  end
+
   def search_steps
     @step_results = []
     @step_results = search_by_name(Step) if @step_search_count.positive?
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index 17e71f21f..311068190 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -1,14 +1,69 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div class="bg-white rounded p-4 mb-4" v-if="!disabled">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-label-templates"></i>
       {{ i18n.t('search.index.label_templates') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.format') }}:</b>
+            <span class="shrink-0">{{ row.attributes.format }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
+            <img v-if="row.attributes.created_by.avatar_url" :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+        </template>
+      </div>
+      <div v-if="!selected && total > 4" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'LabelTemplatesComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'LabelTemplatesComponent'
+  name: 'LabelTemplatesComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'label_templates',
+      enabled: false,
+    };
+  },
+  created() {
+    this.checkEnabled();
+  },
+  methods: {
+    checkEnabled() {
+      if (!this.enabled) {
+        this.$emit('selectGroup', 'LabelTemplatesComponent');
+      }
+    }
+  }
 };
 </script>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index bf638ee92..00f87e79f 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -17,6 +17,7 @@ export default {
       total: 0,
       loading: false,
       page: 1,
+      disabled: false,
       fullDataLoaded: false
     };
   },
@@ -80,6 +81,7 @@ export default {
           if (this.selected) this.fullDataLoaded = true;
           this.results = this.results.concat(response.data.data);
           this.total = response.data.meta.total;
+          this.disabled = response.data.meta.disabled;
           this.loading = false;
           this.page = response.data.meta.next_page;
         })
diff --git a/app/models/label_template.rb b/app/models/label_template.rb
index 21526f31d..bd4836ea1 100644
--- a/app/models/label_template.rb
+++ b/app/models/label_template.rb
@@ -7,6 +7,9 @@ class LabelTemplate < ApplicationRecord
   belongs_to :created_by, class_name: 'User', optional: true
   belongs_to :last_modified_by, class_name: 'User', optional: true
 
+  SEARCHABLE_ATTRIBUTES = ['label_templates.name',
+                           'label_templates.description'].freeze
+
   enum unit: { in: 0, mm: 1 }
 
   validates :name, presence: true, length: { minimum: Constants::NAME_MIN_LENGTH,
@@ -21,6 +24,25 @@ class LabelTemplate < ApplicationRecord
     ApplicationSettings.instance.values['label_templates_enabled'] == true
   end
 
+  def self.search(
+    user = nil,
+    include_archived = nil,
+    query = nil,
+    page = 1,
+    current_team = nil,
+    options = {}
+  )
+
+    new_query = LabelTemplate.where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
+
+    # Show all results if needed
+    if page == Constants::SEARCH_NO_LIMIT
+      new_query
+    else
+      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
+    end
+  end
+
   def icon
     'zpl'
   end
diff --git a/app/serializers/global_search/label_template_serializer.rb b/app/serializers/global_search/label_template_serializer.rb
new file mode 100644
index 000000000..da33cf658
--- /dev/null
+++ b/app/serializers/global_search/label_template_serializer.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class LabelTemplateSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :format, :created_at, :updated_at, :created_by, :team, :url
+
+    def team
+      {
+        name: object.team.name,
+        url: label_templates_path(team: object.team)
+      }
+    end
+
+    def created_by
+      {
+        name: object.created_by ? object.created_by.name : object.created_by_user,
+        avatar_url: object.created_by ? avatar_path(object.created_by, :icon_small) : nil
+      }
+    end
+
+    def format
+      object.label_format
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def url
+      label_template_path(object)
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 62e92ba04..aac6f8ac8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -452,6 +452,7 @@ en:
       inventory_items: "Inventory items"
       protocol_templates: "Protocol templates"
       label_templates: "Label templates"
+      format: "Format"
       reports: "Reports"
       more_search_options: "More search options"
       clear_filters: "Clear filters"

From 31994b643ad66ac1a6bf927f8a64b2a58cc0508c Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 3 Apr 2024 01:04:20 +0200
Subject: [PATCH 017/115] Fix hound [SCI-10478]

---
 app/controllers/search_controller.rb           | 18 +++++++++---------
 .../global_search/groups/label_templates.vue   |  2 +-
 app/models/label_template.rb                   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 7b2ba3618..f58dc4e44 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -16,7 +16,7 @@ class SearchController < ApplicationController
           @project_search_count = fetch_cached_count(Project)
           search_projects
           if params[:preview] == 'true'
-            results = @project_results.take(4) || []
+            results = @project_results.take(4)
           else
             results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
           end
@@ -61,7 +61,7 @@ class SearchController < ApplicationController
           @protocol_search_count = fetch_cached_count(Protocol)
           search_protocols
           results = if params[:preview] == 'true'
-                      @protocol_results.take(4) || []
+                      @protocol_results.take(4)
                     else
                       @protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
                     end
@@ -69,9 +69,9 @@ class SearchController < ApplicationController
           render json: results,
                  each_serializer: GlobalSearch::ProtocolSerializer,
                  meta: {
-                          total: @search_count,
-                          next_page: (results.next_page if results.respond_to?(:next_page))
-                       }
+                   total: @search_count,
+                   next_page: (results.next_page if results.respond_to?(:next_page))
+                 }
           return
         when 'label_templates'
           return render json: [], meta: { disabled: true }, status: :ok unless LabelTemplate.enabled?
@@ -79,7 +79,7 @@ class SearchController < ApplicationController
           @label_template_search_count = fetch_cached_count(LabelTemplate)
           search_label_templates
           results = if params[:preview] == 'true'
-                      @label_template_results.take(4) || []
+                      @label_template_results.take(4)
                     else
                       @label_template_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
                     end
@@ -87,9 +87,9 @@ class SearchController < ApplicationController
           render json: results,
                  each_serializer: GlobalSearch::LabelTemplateSerializer,
                  meta: {
-                          total: @search_count,
-                          next_page: (results.next_page if results.respond_to?(:next_page))
-                       }
+                   total: @search_count,
+                   next_page: (results.next_page if results.respond_to?(:next_page))
+                 }
           return
         end
 
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index 311068190..a8abb1983 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -52,7 +52,7 @@ export default {
   data() {
     return {
       group: 'label_templates',
-      enabled: false,
+      enabled: false
     };
   },
   created() {
diff --git a/app/models/label_template.rb b/app/models/label_template.rb
index bd4836ea1..d6584e0e5 100644
--- a/app/models/label_template.rb
+++ b/app/models/label_template.rb
@@ -25,11 +25,11 @@ class LabelTemplate < ApplicationRecord
   end
 
   def self.search(
-    user = nil,
-    include_archived = nil,
+    _user,
+    _include_archived,
     query = nil,
     page = 1,
-    current_team = nil,
+    _current_team = nil,
     options = {}
   )
 

From b54c4f725bc35c6ecd60b97ad0c832705d8d249e Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 3 Apr 2024 01:23:37 +0200
Subject: [PATCH 018/115] Fix hound [SCI-10476]

---
 app/controllers/search_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index ceb4377c6..b04412be8 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -85,9 +85,9 @@ class SearchController < ApplicationController
           render json: results,
                  each_serializer: GlobalSearch::RepositoryRowSerializer,
                  meta: {
-                          total: @search_count,
-                          next_page: (results.next_page if results.respond_to?(:next_page))
-                        }
+                   total: @search_count,
+                   next_page: (results.next_page if results.respond_to?(:next_page))
+                 }
           return
         end
 

From ae5cebe7d74e9763fec00b0c5dbf0a9782c1acea Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 27 Feb 2024 12:10:27 +0100
Subject: [PATCH 019/115] Implement quick search backend [SCI-10246]

---
 app/controllers/search_controller.rb          | 32 ++++++++++++-------
 .../vue/navigation/quick_search.vue           |  4 ++-
 .../concerns/searchable_by_name_model.rb      |  6 ++--
 app/models/label_template.rb                  | 12 +++++++
 app/models/project_folder.rb                  |  6 ++++
 app/serializers/quick_search_serializer.rb    |  4 +--
 config/initializers/constants.rb              |  6 ++++
 7 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f7f281563..936249958 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -114,23 +114,33 @@ class SearchController < ApplicationController
   end
 
   def quick
-    results = [
-      Project.first,
-      Experiment.first,
-      MyModule.first,
-      Protocol.first,
-      RepositoryRow.first,
-      Result.first,
-      Step.first,
-      Report.first,
-      LabelTemplate.first
-    ].compact
+    results = if params[:filter].present?
+                object_quick_search(params[:filter].singularize,
+                                    search_by_id: Constants::QUICK_SEARCH_SEARCHABLE_BY_NAME
+                                                  .exclude?(params[:filter].singularize))
+              else
+                Constants::QUICK_SEARCH_SEARCHABLE_OBJECTS.filter_map do |object|
+                  next if object == 'label_template' && !LabelTemplate.enabled?
+
+                  object_quick_search(object, search_by_id: Constants::QUICK_SEARCH_SEARCHABLE_BY_NAME.exclude?(object))
+                end.flatten.sort_by(&:updated_at).reverse.take(Constants::QUICK_SEARCH_LIMIT)
+              end
 
     render json: results, each_serializer: QuickSearchSerializer
   end
 
   private
 
+  def object_quick_search(class_name, search_by_id: true)
+    search_method = class_name.to_s.camelize.constantize.method(search_by_id ? :search_by_name_and_id : :search_by_name)
+
+    search_method.call(current_user,
+                       current_team,
+                       params[:query],
+                       limit: Constants::QUICK_SEARCH_LIMIT)
+                 .order(updated_at: :desc)
+  end
+
   def load_vars
     query = (params.fetch(:q) { '' }).strip
     @search_category = params[:category] || ''
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 6a363e3ab..d3064480c 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -171,7 +171,9 @@ export default {
       const breadcrumbs = attributes.breadcrumbs.map((breadcrumb) => breadcrumb.name);
       breadcrumbs.pop();
       breadcrumbs.shift();
-      breadcrumbs.push(`ID: ${attributes.code}`);
+      if (attributes.code) {
+        breadcrumbs.push(`ID: ${attributes.code}`);
+      }
       return breadcrumbs;
     },
     setQuery(query) {
diff --git a/app/models/concerns/searchable_by_name_model.rb b/app/models/concerns/searchable_by_name_model.rb
index 7ac1143e3..6754f7691 100644
--- a/app/models/concerns/searchable_by_name_model.rb
+++ b/app/models/concerns/searchable_by_name_model.rb
@@ -20,10 +20,10 @@ module SearchableByNameModel
 
       sql_q = sql_q.where(id: viewable_by_user(user, teams))
 
-      sql_q.limit(Constants::SEARCH_LIMIT)
+      sql_q.limit(options[:limit] || Constants::SEARCH_LIMIT)
     end
 
-    def self.search_by_name_and_id(user, teams = [], query = nil)
+    def self.search_by_name_and_id(user, teams = [], query = nil, options = {})
       return if user.blank? || teams.blank?
 
       sanitized_query = ActiveRecord::Base.sanitize_sql_like(query.to_s)
@@ -34,7 +34,7 @@ module SearchableByNameModel
         "%#{sanitized_query}%", "%#{sanitized_query}%"
       )
 
-      sql_q.limit(Constants::SEARCH_LIMIT)
+      sql_q.limit(options[:limit] || Constants::SEARCH_LIMIT)
     end
   end
   # rubocop:enable Metrics/BlockLength
diff --git a/app/models/label_template.rb b/app/models/label_template.rb
index 21526f31d..9074364f7 100644
--- a/app/models/label_template.rb
+++ b/app/models/label_template.rb
@@ -2,6 +2,7 @@
 
 class LabelTemplate < ApplicationRecord
   include SearchableModel
+  include SearchableByNameModel
 
   belongs_to :team
   belongs_to :created_by, class_name: 'User', optional: true
@@ -17,6 +18,17 @@ class LabelTemplate < ApplicationRecord
 
   scope :default, -> { where(default: true) }
 
+  def self.viewable_by_user(user, teams)
+    joins("INNER JOIN user_assignments team_user_assignments
+             ON team_user_assignments.assignable_id = label_templates.team_id
+             AND team_user_assignments.assignable_type = 'Team'
+             AND team_user_assignments.user_id = #{user.id}
+           INNER JOIN user_roles team_user_roles
+             ON team_user_roles.id = team_user_assignments.user_role_id
+             AND team_user_roles.permissions @> ARRAY['#{TeamPermissions::LABEL_TEMPLATES_READ}']::varchar[]")
+      .where(team: teams)
+  end
+
   def self.enabled?
     ApplicationSettings.instance.values['label_templates_enabled'] == true
   end
diff --git a/app/models/project_folder.rb b/app/models/project_folder.rb
index 5f68c351b..e52f51e21 100644
--- a/app/models/project_folder.rb
+++ b/app/models/project_folder.rb
@@ -33,6 +33,12 @@ class ProjectFolder < ApplicationRecord
 
   scope :top_level, -> { where(parent_folder: nil) }
 
+  def self.viewable_by_user(user, teams)
+    joins(team: :users)
+      .where(teams: { user_assignments: { user: user } })
+      .where(team: teams)
+  end
+
   def self.search(user, _include_archived, query = nil, page = 1, current_team = nil, options = {})
     new_query = if current_team
                   current_team.project_folders.where_attributes_like(:name, query, options)
diff --git a/app/serializers/quick_search_serializer.rb b/app/serializers/quick_search_serializer.rb
index bb7faa2a9..6cf804966 100644
--- a/app/serializers/quick_search_serializer.rb
+++ b/app/serializers/quick_search_serializer.rb
@@ -13,9 +13,7 @@ class QuickSearchSerializer < ActiveModel::Serializer
   end
 
   def code
-    @object.code
-  rescue StandardError
-    @object.id
+    @object.code unless @object.is_a?(ProjectFolder) || object.is_a?(Result) || object.is_a?(LabelTemplate)
   end
 
   def updated_at
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 00f966099..4d7aa80dd 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -443,6 +443,12 @@ class Constants
   MIN_SCINOTE_EDIT_VERSION = ENV['MIN_SCINOTE_EDIT_VERSION'].freeze
   MAX_SCINOTE_EDIT_VERSION = ENV['MAX_SCINOTE_EDIT_VERSION'].freeze
 
+  # quick search
+  QUICK_SEARCH_LIMIT = 5
+  QUICK_SEARCH_SEARCHABLE_OBJECTS = %w(project experiment my_module protocol repository_row
+                                       report project_folder result label_template).freeze
+  QUICK_SEARCH_SEARCHABLE_BY_NAME = %w(project_folder result label_template).freeze
+
   #                             )       \   /      (
   #                            /|\      )\_/(     /|\
   #   *                       / | \    (/\|/\)   / | \                      *

From c6f5997fdaa7c146e74159fe8101f0e43f429a04 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 26 Mar 2024 15:07:23 +0100
Subject: [PATCH 020/115] Add filter component to quick search [SCI-10305]

---
 app/assets/stylesheets/tailwind/buttons.css   |   2 +-
 app/controllers/teams_controller.rb           |  16 +-
 .../vue/global_search/container.vue           |  33 ++-
 app/javascript/vue/global_search/filters.vue  | 206 ++++++++++++++++++
 .../vue/global_search/filters/date.vue        | 132 +++++++++++
 .../vue/navigation/quick_search.vue           |  55 ++++-
 app/javascript/vue/navigation/top_menu.vue    |  14 +-
 app/javascript/vue/shared/select_dropdown.vue |  13 +-
 app/serializers/team_serializer.rb            |   5 +
 app/views/search/index.html.erb               |   2 +
 app/views/shared/navigation/_top.html.erb     |   5 +-
 config/locales/en.yml                         |   8 +
 config/routes.rb                              |   5 +
 13 files changed, 473 insertions(+), 23 deletions(-)
 create mode 100644 app/javascript/vue/global_search/filters.vue
 create mode 100644 app/javascript/vue/global_search/filters/date.vue
 create mode 100644 app/serializers/team_serializer.rb

diff --git a/app/assets/stylesheets/tailwind/buttons.css b/app/assets/stylesheets/tailwind/buttons.css
index e7052435d..9f7001362 100644
--- a/app/assets/stylesheets/tailwind/buttons.css
+++ b/app/assets/stylesheets/tailwind/buttons.css
@@ -33,7 +33,7 @@
   }
 
   .btn.btn-xs.icon-btn {
-    @apply px-0.5;
+    @apply px-0.5 w-[30px];
   }
 
   .btn:hover {
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 965f079ef..36b9c2c12 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -9,9 +9,23 @@ class TeamsController < ApplicationController
   before_action :load_vars, only: %i(sidebar export_projects export_projects_modal
                                      disable_tasks_sharing_modal shared_tasks_toggle)
   before_action :load_current_folder, only: :sidebar
-  before_action :check_read_permissions, except: :view_type
+  before_action :check_read_permissions, except: %i(view_type visible_teams visible_users)
   before_action :check_export_projects_permissions, only: %i(export_projects_modal export_projects)
 
+  def visible_teams
+    teams = current_user.teams
+    render json: teams, each_serializer: TeamSerializer
+  end
+
+  def visible_users
+    teams = current_user.teams
+    if params[:teams].present?
+      teams = teams.where(id: params[:teams])
+    end
+    users = User.where(id: teams.joins(:users).select('users.id')).order(:full_name)
+    render json: users, each_serializer: UserSerializer, user: current_user
+  end
+
   def sidebar
     render json: {
       html: render_to_string(
diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index be302d1b1..48c1ebd86 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -24,10 +24,21 @@
           {{ i18n.t('search.index.task_results') }}
         </button>
       </div>
-      <button class="btn btn-light btn-sm">
-        <i class="sn-icon sn-icon-search-options"></i>
-        {{ i18n.t('search.index.more_search_options') }}
-      </button>
+      <GeneralDropdown ref="filterFlyout" position="right">
+        <template v-slot:field>
+          <button class="btn btn-light btn-sm">
+            <i class="sn-icon sn-icon-search-options"></i>
+            {{ i18n.t('search.index.more_search_options') }}
+          </button>
+        </template>
+        <template v-slot:flyout >
+          <SearchFilters
+            :teamsUrl="teamsUrl"
+            :usersUrl="usersUrl"
+            @cancel="this.$refs.container.close()"
+          ></SearchFilters>
+        </template>
+      </GeneralDropdown>
       <template v-if="activeGroup">
         <div class="h-4 w-[1px] bg-sn-grey"></div>
         <button class="btn btn-light btn-sm" @click="activeGroup = null">
@@ -62,6 +73,8 @@ import RepositoryRowsComponent from './groups/repository_rows.vue';
 import ProtocolsComponent from './groups/protocols.vue';
 import LabelTemplatesComponent from './groups/label_templates.vue';
 import ReportsComponent from './groups/reports.vue';
+import SearchFilters from './filters.vue';
+import GeneralDropdown from '../shared/general_dropdown.vue';
 
 export default {
   name: 'GlobalSearch',
@@ -73,6 +86,14 @@ export default {
     searchUrl: {
       type: String,
       required: true
+    },
+    teamsUrl: {
+      type: String,
+      required: true
+    },
+    usersUrl: {
+      type: String,
+      required: true
     }
   },
   components: {
@@ -86,7 +107,9 @@ export default {
     RepositoryRowsComponent,
     ProtocolsComponent,
     LabelTemplatesComponent,
-    ReportsComponent
+    ReportsComponent,
+    SearchFilters,
+    GeneralDropdown
   },
   data() {
     return {
diff --git a/app/javascript/vue/global_search/filters.vue b/app/javascript/vue/global_search/filters.vue
new file mode 100644
index 000000000..fa896c1da
--- /dev/null
+++ b/app/javascript/vue/global_search/filters.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="max-w-[600px] p-3.5">
+    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_type') }}</div>
+    <div class="flex items-center gap-2 flex-wrap mb-6">
+      <template v-for="group in searchGroups" :key="group.value">
+        <button class="btn btn-secondary btn-xs"
+                :class="{'active': activeGroup === group.value}"
+                @click="setActiveGroup(group.value)">
+          {{ group.label }}
+        </button>
+      </template>
+    </div>
+    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_created_date') }}</div>
+    <DateFilter
+      :date="createdAt"
+      ref="createdAtComponent"
+      class="mb-6"
+      @change="(v) => {this.createdAt = v}"
+    ></DateFilter>
+    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_updated_date') }}</div>
+    <DateFilter
+      :date="updatedAt"
+      ref="updatedAtComponent"
+      class="mb-6"
+      @change="(v) => {this.updatedAt = v}"
+    ></DateFilter>
+    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_team') }}</div>
+    <SelectDropdown :options="teams"
+                    class="mb-6"
+                    :with-checkboxes="true"
+                    :clearable="true"
+                    :multiple="true"
+                    :value="selectedTeams"
+                    @change="(v) => {selectedTeams = v}" />
+    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_user') }}</div>
+    <SelectDropdown :options="users"
+                    class="mb-6"
+                    :value="selectedUsers"
+                    :optionRenderer="userRenderer"
+                    :labelRenderer="userRenderer"
+                    :clearable="true"
+                    :with-checkboxes="true"
+                    :multiple="true"
+                    @change="(v) => {selectedUsers = v}" />
+    <div class="flex items-center gap-2">
+      <div class="sci-checkbox-container">
+        <input type="checkbox" v-model="includeArchived" class="sci-checkbox" />
+        <span class="sci-checkbox-label"></span>
+      </div>
+      {{ i18n.t('search.filters.include_archived') }}
+    </div>
+    <hr class="my-6">
+    <div class="flex items-center gap-6">
+      <button class="btn btn-light" @click="clearFilters">{{ i18n.t('search.filters.clear') }}</button>
+      <button class="btn btn-secondary ml-auto" @click="$emit('cancel')">{{ i18n.t('general.cancel') }}</button>
+      <button class="btn btn-primary" @click="search" >{{ i18n.t('general.search') }}</button>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import DateFilter from './filters/date.vue';
+import SelectDropdown from '../shared/select_dropdown.vue';
+import axios from '../../packs/custom_axios.js';
+
+export default {
+  name: 'SearchFilters',
+  props: {
+    teamsUrl: {
+      type: String,
+      required: true
+    },
+    usersUrl: {
+      type: String,
+      required: true
+    },
+    currentTeam: Number,
+    searchUrl: String,
+    searchQuery: String
+  },
+  created() {
+    this.fetchTeams();
+    if (this.currentTeam) {
+      this.selectedTeams = [this.currentTeam];
+    }
+  },
+  watch: {
+    selectedTeams() {
+      this.selectedUsers = [];
+      this.fetchUsers();
+    }
+  },
+  data() {
+    return {
+      activeGroup: null,
+      createdAt: {
+        on: null,
+        from: null,
+        to: null
+      },
+      updatedAt: {
+        on: null,
+        from: null,
+        to: null
+      },
+      selectedTeams: [],
+      selectedUsers: [],
+      includeArchived: true,
+      teams: [],
+      users: [],
+      searchGroups: [
+        { value: 'FoldersComponent', label: this.i18n.t('search.index.folders') },
+        { value: 'ProjectsComponent', label: this.i18n.t('search.index.projects') },
+        { value: 'ExperimentsComponent', label: this.i18n.t('search.index.experiments') },
+        { value: 'MyModulesComponent', label: this.i18n.t('search.index.tasks') },
+        { value: 'MyModuleProtocolsComponent', label: this.i18n.t('search.index.task_protocols') },
+        { value: 'ResultsComponent', label: this.i18n.t('search.index.task_results') },
+        { value: 'AssetsComponent', label: this.i18n.t('search.index.files') },
+        { value: 'RepositoryRowsComponent', label: this.i18n.t('search.index.inventory_items') },
+        { value: 'ProtocolsComponent', label: this.i18n.t('search.index.protocol_templates') },
+        { value: 'LabelTemplatesComponent', label: this.i18n.t('search.index.label_templates') },
+        { value: 'ReportsComponent', label: this.i18n.t('search.index.reports') }
+      ]
+    };
+  },
+  components: {
+    DateFilter,
+    SelectDropdown
+  },
+  methods: {
+    userRenderer(option) {
+      return `<div class="flex items-center gap-2">
+                <img src="${option[2].avatar_url}" class="rounded-full w-6 h-6" />
+                <div title="${option[1]}" class="truncate">${option[1]}</div>
+              </div>`;
+    },
+    setActiveGroup(group) {
+      if (group === this.activeGroup) {
+        this.activeGroup = null;
+      } else {
+        this.activeGroup = group;
+      }
+    },
+    fetchTeams() {
+      axios.get(this.teamsUrl)
+        .then((response) => {
+          this.teams = response.data.data.map((team) => ([parseInt(team.id, 10), team.attributes.name]));
+        });
+    },
+    fetchUsers() {
+      axios.get(this.usersUrl, { params: { teams: this.selectedTeams } })
+        .then((response) => {
+          this.users = response.data.data.map((user) => ([parseInt(user.id, 10), user.attributes.name, { avatar_url: user.attributes.avatar_url }]));
+        });
+    },
+    clearFilters() {
+      this.createdAt = {
+        on: null,
+        from: null,
+        to: null
+      };
+      this.updatedAt = {
+        on: null,
+        from: null,
+        to: null
+      };
+      this.$refs.createdAtComponent.selectedOption = 'on';
+      this.$refs.updatedAtComponent.selectedOption = 'on';
+      this.selectedTeams = [];
+      this.selectedUsers = [];
+      this.includeArchived = false;
+      this.activeGroup = null;
+    },
+    search() {
+      if (this.searchUrl) {
+        this.openSearchPage();
+      }
+    },
+    openSearchPage() {
+      const params = {
+        'created_at[on]': this.createdAt.on || '',
+        'created_at[from]': this.createdAt.from || '',
+        'created_at[to]': this.createdAt.to || '',
+        'updated_at[on]': this.updatedAt.on || '',
+        'updated_at[from]': this.updatedAt.from || '',
+        'updated_at[to]': this.updatedAt.to || '',
+        include_archived: this.includeArchived,
+        group: this.activeGroup || '',
+        q: this.searchQuery
+      };
+      const searchParams = new URLSearchParams(params);
+
+      this.selectedTeams.forEach((team) => {
+        searchParams.append('teams[]', team);
+      });
+
+      this.selectedUsers.forEach((user) => {
+        searchParams.append('users[]', user);
+      });
+
+      window.location.href = `${this.searchUrl}?${searchParams.toString()}`;
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/global_search/filters/date.vue b/app/javascript/vue/global_search/filters/date.vue
new file mode 100644
index 000000000..070efcd56
--- /dev/null
+++ b/app/javascript/vue/global_search/filters/date.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="flex gap-2">
+    <SelectDropdown class="!w-40"
+                    :options="dateOptions"
+                    :value="selectedOption"
+                    @change="(v) => {selectedOption = v}" />
+    <div class="grow">
+      <DateTimePicker
+        v-if="selectedOption === 'on'"
+        @change="setOn"
+        mode="date"
+        size="mb"
+        placeholder="Enter date"
+        :defaultValue="date.on"
+        :clearable="true"/>
+      <DateTimePicker
+        v-if="selectedOption === 'custom'"
+        @change="setFrom"
+        class="mb-2"
+        mode="date"
+        size="mb"
+        placeholder="From date"
+        :defaultValue="date.from"
+        :clearable="true"/>
+      <DateTimePicker
+        v-if="selectedOption === 'custom'"
+        @change="setTo"
+        mode="date"
+        size="mb"
+        placeholder="To date"
+        :defaultValue="date.to"
+        :clearable="true"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import SelectDropdown from '../../shared/select_dropdown.vue';
+import DateTimePicker from '../../shared/date_time_picker.vue';
+
+export default {
+  name: 'DateFilter',
+  props: {
+    date: {
+      type: Object,
+      required: true
+    }
+  },
+  components: {
+    SelectDropdown,
+    DateTimePicker
+  },
+  watch: {
+    selectedOption() {
+      const today = new Date();
+      const yesterday = new Date(new Date().setDate(today.getDate() - 1));
+      const weekDay = today.getDay();
+      const monday = new Date(new Date()
+        .setDate(today.getDate() - weekDay - (weekDay === 0 ? 6 : -1)));
+      const lastWeekStart = new Date(monday.getTime() - (7 * 24 * 60 * 60 * 1000));
+      const lastWeekEnd = new Date(lastWeekStart.getTime() + (6 * 24 * 60 * 60 * 1000));
+      const firstMonthDay = new Date(today.getFullYear(), today.getMonth(), 1);
+      const firstYearDay = new Date(today.getFullYear(), 0, 1);
+      const lastYearEnd = new Date(today.getFullYear(), 0, 0);
+      const lastYearStart = new Date(today.getFullYear() - 1, 0, 1);
+
+      switch (this.selectedOption) {
+        case 'today':
+          this.newDate = { on: today, from: null, to: null };
+          break;
+        case 'yesterday':
+          this.newDate = { on: yesterday, from: null, to: null };
+          break;
+        case 'last_week':
+          this.newDate = { on: null, from: lastWeekStart, to: lastWeekEnd };
+          break;
+        case 'this_month':
+          this.newDate = { on: null, from: firstMonthDay, to: today };
+          break;
+        case 'this_year':
+          this.newDate = { on: null, from: firstYearDay, to: today };
+          break;
+        case 'last_year':
+          this.newDate = { on: null, from: lastYearStart, to: lastYearEnd };
+          break;
+        case 'on':
+          this.newDate = { on: null, from: null, to: null };
+          break;
+        case 'custom':
+          this.newDate = { on: null, from: null, to: null };
+          break;
+        default:
+          break;
+      }
+
+      this.$emit('change', this.newDate);
+    }
+  },
+  data() {
+    return {
+      newDate: this.date,
+      selectedOption: 'on',
+      dateOptions: [
+        ['today', 'Today'],
+        ['yesterday', 'Yesterday'],
+        ['last_week', 'Last week'],
+        ['this_month', 'This month'],
+        ['this_year', 'This year'],
+        ['last_year', 'Last year'],
+        ['on', 'On'],
+        ['custom', 'Custom']
+      ]
+    };
+  },
+  methods: {
+    setOn(v) {
+      this.newDate = { on: v, from: null, to: null };
+      this.$emit('change', this.newDate);
+    },
+    setFrom(v) {
+      this.newDate.on = null;
+      this.newDate.from = v;
+      this.$emit('change', this.newDate);
+    },
+    setTo(v) {
+      this.newDate.on = null;
+      this.newDate.to = v;
+      this.$emit('change', this.newDate);
+    }
+  }
+};
+</script>
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 6a363e3ab..a7c5b90a7 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -1,14 +1,30 @@
 <template>
-  <GeneralDropdown ref="container" :canOpen="canOpen" :fieldOnlyOpen="true">
+  <GeneralDropdown ref="container" :canOpen="canOpen" :fieldOnlyOpen="true" @close="filtersOpened = false">
     <template v-slot:field>
       <div class="sci--navigation--top-menu-search left-icon sci-input-container-v2" :class="{'disabled' : !currentTeam}" :title="i18n.t('nav.search')">
-        <input ref="searchField" type="text" class="!pr-9" v-model="searchQuery" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
+        <input ref="searchField" type="text" class="!pr-20" v-model="searchQuery" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
         <i class="sn-icon sn-icon-search"></i>
-        <i v-if="this.searchQuery.length > 0" class="sn-icon sn-icon-close absolute right-1 top-0.5" @click="this.searchQuery = ''"></i>
+        <div v-if="this.searchQuery.length > 1" class="flex items-center gap-1 absolute right-2 top-1.5">
+          <div class="btn btn-light icon-btn btn-xs" @click="this.searchQuery = ''">
+            <i class="sn-icon sn-icon-close  m-0"></i>
+          </div>
+          <div class="btn btn-light icon-btn btn-xs" :class="{'active': filtersOpened}" @click="filtersOpened = !filtersOpened">
+            <i class="sn-icon sn-icon-search-options m-0"></i>
+          </div>
+        </div>
       </div>
     </template>
     <template v-slot:flyout >
-      <div v-if="showHistory" class="max-w-[600px]">
+      <SearchFilters
+        v-if="filtersOpened"
+        :teamsUrl="teamsUrl"
+        :usersUrl="usersUrl"
+        :currentTeam="currentTeam"
+        :searchUrl="searchUrl"
+        :searchQuery="searchQuery"
+        @cancel="filtersOpened = false"
+      ></SearchFilters>
+      <div v-else-if="showHistory" class="max-w-[600px]">
         <div v-for="(query, i) in previousQueries.reverse()" @click="setQuery(query)" :key="i"
              class="flex px-3 h-11 items-center gap-2 hover:bg-sn-super-light-grey cursor-pointer">
           <i class="sn-icon sn-icon-history-search"></i>
@@ -17,16 +33,24 @@
       </div>
       <div v-else class="max-w-[600px]">
         <div class="flex items-center gap-2">
-          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('experiments')">
+          <button class="btn btn-secondary btn-xs"
+                  :class="{'active': quickFilter === 'experiments'}"
+                  @click="setQuickFilter('experiments')">
             {{ i18n.t('search.quick_search.experiments') }}
           </button>
-          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('my_modules')">
+          <button class="btn btn-secondary btn-xs"
+                  :class="{'active': quickFilter === 'my_modules'}"
+                  @click="setQuickFilter('my_modules')">
             {{ i18n.t('search.quick_search.tasks') }}
           </button>
-          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('results')">
+          <button class="btn btn-secondary btn-xs"
+                  :class="{'active': quickFilter === 'results'}"
+                  @click="setQuickFilter('results')">
             {{ i18n.t('search.quick_search.results') }}
           </button>
-          <button class="btn btn-secondary btn-xs" @click="setQuickFilter('repository_rows')">
+          <button class="btn btn-secondary btn-xs"
+                  :class="{'active': quickFilter === 'repository_rows'}"
+                  @click="setQuickFilter('repository_rows')">
             {{ i18n.t('search.quick_search.inventory_items') }}
           </button>
         </div>
@@ -84,6 +108,7 @@
 <script>
 import GeneralDropdown from '../shared/general_dropdown.vue';
 import StringWithEllipsis from '../shared/string_with_ellipsis.vue';
+import SearchFilters from '../global_search/filters.vue';
 import axios from '../../packs/custom_axios.js';
 
 export default {
@@ -99,11 +124,20 @@ export default {
     searchUrl: {
       type: String,
       required: true
+    },
+    teamsUrl: {
+      type: String,
+      required: true
+    },
+    usersUrl: {
+      type: String,
+      required: true
     }
   },
   components: {
     GeneralDropdown,
-    StringWithEllipsis
+    StringWithEllipsis,
+    SearchFilters
   },
   computed: {
     canOpen() {
@@ -128,7 +162,8 @@ export default {
       previousQueries: [],
       quickFilter: null,
       results: [],
-      loading: false
+      loading: false,
+      filtersOpened: false
     };
   },
   mounted() {
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index 9e7dfc9ea..cc44d690d 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -7,7 +7,15 @@
         @change="switchTeam"
       ></SelectDropdown>
     </div>
-    <QuickSearch v-if="user && !hideSearch" :quickSearchUrl="quickSearchUrl" :searchUrl="searchUrl" :currentTeam="currentTeam"></QuickSearch>
+    <QuickSearch
+      v-if="user"
+      :class="{'hidden': hideSearch}"
+      :quickSearchUrl="quickSearchUrl"
+      :searchUrl="searchUrl"
+      :currentTeam="currentTeam"
+      :teamsUrl="teamsUrl"
+      :usersUrl="usersUrl"
+    ></QuickSearch>
     <MenuDropdown
       class="ml-auto"
       v-if="settingsMenu && settingsMenu.length > 0"
@@ -84,7 +92,9 @@ export default {
     url: String,
     notificationsUrl: String,
     unseenNotificationsUrl: String,
-    quickSearchUrl: String
+    quickSearchUrl: String,
+    teamsUrl: String,
+    usersUrl: String
   },
   data() {
     return {
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index 2335eac52..cbf0d740e 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -29,8 +29,8 @@
              :placeholder="label || placeholder || this.i18n.t('general.select_dropdown.placeholder')"
              class="w-full border-0 outline-none pl-0 placeholder:text-sn-grey" />
       </template>
-      <div v-else class="flex items-center gap-1 flex-wrap max-w-[calc(100%-24px)]">
-        <div v-for="tag in tags" class=" truncate px-2 py-1 rounded-sm bg-sn-super-light-grey flex items-center gap-1">
+      <div v-else class="flex items-center gap-1 flex-wrap">
+        <div v-for="tag in tags" class="px-2 py-1 rounded-sm bg-sn-super-light-grey grid grid-cols-[auto_1fr] items-center gap-1">
           <div class="truncate" v-if="labelRenderer" v-html="tag.label"></div>
           <div class="truncate" v-else>{{ tag.label }}</div>
           <i @click="removeTag(tag.value)" class="sn-icon mini ml-auto sn-icon-close cursor-pointer"></i>
@@ -71,7 +71,7 @@
               <div
                 @click.stop="setValue(option[0])"
                 ref="options"
-                class="py-1.5 px-3 rounded cursor-pointer flex items-center gap-2 shrink-0"
+                class="py-1.5 px-3 rounded cursor-pointer flex items-center gap-2 shrink-0 hover:bg-sn-super-light-grey"
                 :class="[sizeClass, {
                   '!bg-sn-super-light-blue': valueSelected(option[0]) && focusedOption !== i,
                   '!bg-sn-super-light-grey': focusedOption === i ,
@@ -179,6 +179,13 @@ export default {
     tags() {
       if (!this.newValue) return [];
 
+      this.selectAllState = 'indeterminate';
+      if (this.newValue.length === 0) {
+        this.selectAllState = 'unchecked';
+      } else if (this.newValue.length === this.rawOptions.length) {
+        this.selectAllState = 'checked';
+      }
+
       return this.newValue.map((value) => {
         const option = this.rawOptions.find((i) => i[0] === value);
         return {
diff --git a/app/serializers/team_serializer.rb b/app/serializers/team_serializer.rb
new file mode 100644
index 000000000..5ea1af4a0
--- /dev/null
+++ b/app/serializers/team_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class TeamSerializer < ActiveModel::Serializer
+  attributes :id, :name
+end
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 70db91ef7..9a08c3522 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -4,6 +4,8 @@
   <global_search
     :query="'<%= @display_query %>'"
     :search-url="'<%= search_path(format: :json) %>'"
+    teams-url="<%= visible_teams_teams_path %>"
+    users-url="<%= visible_users_teams_path %>"
   />
 </div>
 
diff --git a/app/views/shared/navigation/_top.html.erb b/app/views/shared/navigation/_top.html.erb
index a99be29b2..bda3b37c7 100644
--- a/app/views/shared/navigation/_top.html.erb
+++ b/app/views/shared/navigation/_top.html.erb
@@ -4,7 +4,10 @@
       url="<%= top_menu_navigations_path %>"
       notifications-url="<%= user_notifications_path %>"
       quick-search-url="<%= quick_search_path %>"
-      unseen-notifications-url="<%= unseen_counter_user_notifications_path %>" />
+      unseen-notifications-url="<%= unseen_counter_user_notifications_path %>"
+      teams-url="<%= visible_teams_teams_path %>"
+      users-url="<%= visible_users_teams_path %>"
+    />
   </div>
 <% else %>
   <div class="sci--navigation--top-menu-container">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 175e9320c..f28532c1d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -438,6 +438,14 @@ en:
     whole_phrase: "Match whole phrase"
     match_case: "Match case sensitive"
     object_id: "ID:"
+    filters:
+      by_type: "Filter by type"
+      by_created_date: "Filter by created date"
+      by_updated_date: "Filter by updated date"
+      by_team: "Filter by team"
+      by_user: "Filter by user"
+      include_archived: "Include Archived objects"
+      clear: "Clear filters"
     index:
       head_title: "Search"
       page_title: "Search"
diff --git a/config/routes.rb b/config/routes.rb
index 65fa72e27..1eec7700a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -216,6 +216,11 @@ Rails.application.routes.draw do
         end
       end
 
+      collection do
+        get :visible_users
+        get :visible_teams
+      end
+
       member do
         post 'parse_sheet', defaults: { format: 'json' }
         post 'export_repository', to: 'repositories#export_repository'

From 6483780d33795447e24db2075a923a9fbfc88dda Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 4 Apr 2024 10:51:01 +0100
Subject: [PATCH 021/115] Add asset results to global search page [SCI-10475]

---
 app/controllers/search_controller.rb          | 19 +++++-
 .../vue/global_search/groups/assets.vue       | 54 +++++++++++++++-
 .../global_search/asset_serializer.rb         | 61 +++++++++++++++++++
 config/locales/en.yml                         |  5 ++
 4 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/global_search/asset_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index b04412be8..2cc7326bf 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -89,6 +89,23 @@ class SearchController < ApplicationController
                    next_page: (results.next_page if results.respond_to?(:next_page))
                  }
           return
+        when 'assets'
+          @asset_search_count = fetch_cached_count(Protocol)
+          search_assets
+          includes = [{ step: { protocol: { my_module: :experiment } } }, { result: { my_module: :experiment } }, :team]
+          results = if params[:preview] == 'true'
+                      @asset_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @asset_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+
+          render json: results.includes(includes),
+                 each_serializer: GlobalSearch::AssetSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: (results.next_page if results.respond_to?(:next_page))
+                 }
+          return
         end
 
         #@search_id = params[:search_id] ? params[:search_id] : generate_search_id
@@ -395,7 +412,7 @@ class SearchController < ApplicationController
   end
 
   def search_assets
-    @asset_results = []
+    @asset_results = Asset.none
     @asset_results = search_by_name(Asset) if @asset_search_count.positive?
     @search_count = @asset_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index 7ce54c19c..cd6815673 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -1,14 +1,64 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-files"></i>
       {{ i18n.t('search.index.files') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a target="_blank" :href="row.attributes.parent.url"
+             class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 font-bold border-0 border-b border-solid border-sn-light-grey">
+            <span :class="row.attributes.icon" class="shrink-0"></span>
+            <StringWithEllipsis class="w-full" :text="row.attributes.file_name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="truncate">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="truncate">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a target="_blank" :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t(`search.index.${row.attributes.parent.type}`) }}:</b>
+            <a target="_blank" :href="row.attributes.parent.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.parent.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="s h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey"
+               :class="{ 'invisible': !row.attributes.experiment.name }">
+            <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
+            <a target="_blank" :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+            </a>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'AssetsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'AssetsComponent'
+  name: 'AssetsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'assets'
+    };
+  }
 };
 </script>
diff --git a/app/serializers/global_search/asset_serializer.rb b/app/serializers/global_search/asset_serializer.rb
new file mode 100644
index 000000000..751cc1037
--- /dev/null
+++ b/app/serializers/global_search/asset_serializer.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class AssetSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+    include FileIconsHelper
+    attributes :id, :file_name, :icon, :created_at, :updated_at, :team, :parent, :experiment
+
+    def file_name
+      object.render_file_name
+    end
+
+    def icon
+      file_fa_icon_class(object)
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def team
+      { name: object.team.name }
+    end
+
+    def experiment
+      return { name: '' } unless object.my_module
+
+      {
+        name: object.my_module.experiment.name,
+        url: my_modules_experiment_path(id: object.my_module.experiment.id, search: object.my_module.code)
+      }
+    end
+
+    def parent
+      parent = object.parent
+      if parent.is_a?(Result) && object.my_module
+        parent_type = 'task'
+        parent_name = object.my_module.name
+        parent_url = my_module_results_path(my_module_id: object.my_module.id)
+      elsif parent.is_a?(Step) && object.my_module
+        parent_type = 'task'
+        parent_name = object.my_module.name
+        parent_url = protocols_my_module_path(object.my_module.id)
+      elsif parent.is_a?(Step)
+        parent_type = 'protocol_template'
+        parent_name = parent.protocol.name || I18n.t('search.index.untitled_protocol')
+        parent_url = protocol_path(parent.protocol_id)
+      elsif parent.is_a?(RepositoryCell)
+        parent_type = 'inventory_item'
+        parent_name = parent.repository_row.name
+        parent_url = repository_repository_rows_path(repository_id: parent.repository_row.repository_id)
+      end
+
+      { name: parent_name, url: parent_url, type: parent_type }
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 175e9320c..9be16a9d7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -463,6 +463,11 @@ en:
       team: "Team"
       folder: "Folder"
       project: "Project"
+      experiment: "Experiment"
+      task: "Task"
+      untitled_protocol: 'Untitled protocol'
+      protocol_template: "Protocol template"
+      inventory_item: "Inventory item"
   comments:
     save_changes: "Save changes"
     empty_state:

From d76fbf1eba7b715fb1fc49f5b44b5b057bb59be9 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 4 Apr 2024 07:32:37 +0100
Subject: [PATCH 022/115] Add report results to global search page [SCI-10479]

---
 app/controllers/search_controller.rb          | 17 +++++-
 .../vue/global_search/groups/reports.vue      | 56 ++++++++++++++++++-
 app/javascript/vue/reports/table.vue          |  7 +++
 app/javascript/vue/shared/datatable/table.vue |  4 ++
 .../vue/shared/datatable/toolbar.vue          |  5 ++
 .../global_search/report_serializer.rb        | 42 ++++++++++++++
 app/views/reports/index.html.erb              |  1 +
 7 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/global_search/report_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index b04412be8..48faa3c95 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -42,6 +42,21 @@ class SearchController < ApplicationController
                    next_page: results.try(:next_page)
                  }
           return
+        when 'reports'
+          @report_search_count = fetch_cached_count Report
+          search_reports
+          results = if params[:preview] == 'true'
+                      @report_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @report_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+          render json: results.includes(:team, :project, :user),
+                 each_serializer: GlobalSearch::ReportSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: results.try(:next_page)
+                 }
+          return
         when 'experiments'
           @experiment_search_count = fetch_cached_count Experiment
           search_experiments
@@ -348,7 +363,7 @@ class SearchController < ApplicationController
   end
 
   def search_reports
-    @report_results = []
+    @report_results = Report.none
     @report_results = search_by_name(Report) if @report_search_count.positive?
     @search_count = @report_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index a6c72d74a..31485882e 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -1,14 +1,66 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-reports"></i>
       {{ i18n.t('search.index.reports') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
+            <div class="truncate">
+              <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+              <span class="truncate">{{ row.attributes.created_by.name }}</span>
+            </div>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a target="_blank" :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
+            <a target="_blank" :href="row.attributes.project.url" class="shrink-0 overflow-hidden">
+              <StringWithEllipsis class="w-full" :text="row.attributes.project.name"></StringWithEllipsis>
+            </a>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'ReportsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'ReportsComponent'
+  name: 'ReportsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'reports'
+    };
+  }
 };
 </script>
diff --git a/app/javascript/vue/reports/table.vue b/app/javascript/vue/reports/table.vue
index e6472244c..b9bf950f9 100644
--- a/app/javascript/vue/reports/table.vue
+++ b/app/javascript/vue/reports/table.vue
@@ -48,6 +48,9 @@ import UpdateReportModal from './modals/update.vue';
 
 export default {
   name: 'ReportsTable',
+  provide() {
+    return { initSearchValue: this.initSearchValue };
+  },
   components: {
     DataTable,
     DocxRenderer,
@@ -61,6 +64,10 @@ export default {
       type: String,
       required: true
     },
+    initSearchValue: {
+      type: String,
+      default: ''
+    },
     actionsUrl: {
       type: String,
       required: true
diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 750f7abe5..353f94cfa 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -120,6 +120,7 @@ import RowMenuRenderer from './row_menu_renderer.vue';
 
 export default {
   name: 'App',
+  inject: ['initSearchValue'],
   props: {
     withCheckboxes: {
       type: Boolean,
@@ -334,6 +335,9 @@ export default {
   mounted() {
     this.navigatorCollapsed = document.querySelector('.sci--layout').getAttribute('data-navigator-collapsed') === 'true';
     this.setGridColsClass();
+    if (this.initSearchValue) {
+      this.searchValue = this.initSearchValue;
+    }
 
     window.addEventListener('resize', this.resize);
   },
diff --git a/app/javascript/vue/shared/datatable/toolbar.vue b/app/javascript/vue/shared/datatable/toolbar.vue
index 71e7edfd4..96d9089a8 100644
--- a/app/javascript/vue/shared/datatable/toolbar.vue
+++ b/app/javascript/vue/shared/datatable/toolbar.vue
@@ -174,6 +174,11 @@ export default {
       type: Object
     }
   },
+  mounted() {
+    if (this.searchValue.length > 0) {
+      this.openSearch();
+    }
+  },
   components: {
     MenuDropdown,
     FilterDropdown,
diff --git a/app/serializers/global_search/report_serializer.rb b/app/serializers/global_search/report_serializer.rb
new file mode 100644
index 000000000..3ba4cb59c
--- /dev/null
+++ b/app/serializers/global_search/report_serializer.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class ReportSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :updated_at, :created_by, :team, :project, :url
+
+    def team
+      {
+        name: object.team.name,
+        url: projects_path(team: object.team)
+      }
+    end
+
+    def project
+      {
+        name: object.project.name,
+        url: project_experiments_path(project_id: object.project.id)
+      }
+    end
+
+    def created_by
+      {
+        name: object.created_by.name,
+        avatar_url: avatar_path(object.created_by, :icon_small)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def url
+      reports_path(search: object.code)
+    end
+  end
+end
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index 149eb3772..925444199 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -17,6 +17,7 @@
       available-columns-url="<%= available_asset_type_columns_path %>"
       available-rows-url="<%= available_rows_repositories_path %>"
       data-source="<%= reports_path(format: :json) %>"
+      init-search-value="<%= params[:search] %>"
       create-url="<%= new_report_path if can_create_reports?(current_team) %>"
     />
   </div>

From 3dea7c1e6dcb47baf91bf06f3f84bda9e8f2d121 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 4 Apr 2024 11:16:56 +0100
Subject: [PATCH 023/115] Set table searchValue using table ref [SCI-10479]

---
 app/javascript/vue/reports/table.vue          | 11 ++++++++---
 app/javascript/vue/shared/datatable/table.vue |  4 ----
 app/views/reports/index.html.erb              |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/javascript/vue/reports/table.vue b/app/javascript/vue/reports/table.vue
index b9bf950f9..f68a7b293 100644
--- a/app/javascript/vue/reports/table.vue
+++ b/app/javascript/vue/reports/table.vue
@@ -2,6 +2,7 @@
   <div class="h-full">
     <DataTable :columnDefs="columnDefs"
                :tableId="'ReportTemplates'"
+               ref="table"
                :dataUrl="dataSource"
                :reloadingTable="reloadingTable"
                :toolbarActions="toolbarActions"
@@ -48,8 +49,12 @@ import UpdateReportModal from './modals/update.vue';
 
 export default {
   name: 'ReportsTable',
-  provide() {
-    return { initSearchValue: this.initSearchValue };
+  mounted() {
+    this.$nextTick(() => {
+      if (this.searchValue) {
+        this.$refs.table.searchValue = this.searchValue;
+      }
+    });
   },
   components: {
     DataTable,
@@ -64,7 +69,7 @@ export default {
       type: String,
       required: true
     },
-    initSearchValue: {
+    searchValue: {
       type: String,
       default: ''
     },
diff --git a/app/javascript/vue/shared/datatable/table.vue b/app/javascript/vue/shared/datatable/table.vue
index 353f94cfa..750f7abe5 100644
--- a/app/javascript/vue/shared/datatable/table.vue
+++ b/app/javascript/vue/shared/datatable/table.vue
@@ -120,7 +120,6 @@ import RowMenuRenderer from './row_menu_renderer.vue';
 
 export default {
   name: 'App',
-  inject: ['initSearchValue'],
   props: {
     withCheckboxes: {
       type: Boolean,
@@ -335,9 +334,6 @@ export default {
   mounted() {
     this.navigatorCollapsed = document.querySelector('.sci--layout').getAttribute('data-navigator-collapsed') === 'true';
     this.setGridColsClass();
-    if (this.initSearchValue) {
-      this.searchValue = this.initSearchValue;
-    }
 
     window.addEventListener('resize', this.resize);
   },
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index 925444199..4398814d8 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -17,7 +17,7 @@
       available-columns-url="<%= available_asset_type_columns_path %>"
       available-rows-url="<%= available_rows_repositories_path %>"
       data-source="<%= reports_path(format: :json) %>"
-      init-search-value="<%= params[:search] %>"
+      search-value="<%= params[:search] %>"
       create-url="<%= new_report_path if can_create_reports?(current_team) %>"
     />
   </div>

From cda3ce29dfc0bfb6b0698dca456aed1f0e4ca76f Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Thu, 4 Apr 2024 12:23:21 +0200
Subject: [PATCH 024/115] Fix rufus jobs to release db connections after use
 [SCI-10581]

---
 .rubocop.yml                     |  3 +++
 config/initializers/scheduler.rb | 16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 81760341f..460acb916 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -299,6 +299,9 @@ Naming/VariableName:
 Naming/VariableNumber:
   EnforcedStyle: normalcase
 
+Naming/BlockForwarding:
+  EnforcedStyle: explicit
+
 Style/WordArray:
   EnforcedStyle: percent
   MinSize: 0
diff --git a/config/initializers/scheduler.rb b/config/initializers/scheduler.rb
index d06ed3acb..d9e276192 100644
--- a/config/initializers/scheduler.rb
+++ b/config/initializers/scheduler.rb
@@ -2,12 +2,17 @@
 
 require 'rufus-scheduler'
 
+def schedule_task(scheduler, interval, &block)
+  scheduler.every interval do
+    ActiveRecord::Base.connection_pool.with_connection(&block)
+  end
+end
+
 if ENV['WORKER'].present?
   scheduler = Rufus::Scheduler.singleton
 
   if ENV['ENABLE_TEMPLATES_SYNC'] == 'true'
-    # Templates sync periodic task
-    scheduler.every '12h' do
+    schedule_task(scheduler, '12h') do
       Rails.logger.info('Templates, syncing all template projects')
       updated, total = TemplatesService.new.update_all_templates
       Rails.logger.info(
@@ -18,19 +23,18 @@ if ENV['WORKER'].present?
   end
 
   if ENV['ENABLE_FLUICS_SYNC'] == 'true'
-    scheduler.every '24h' do
+    schedule_task(scheduler, '24h') do
       LabelPrinters::Fluics::SyncService.new.sync_templates! if LabelPrinter.fluics.any?
     end
   end
 
   reminder_job_interval = ENV['REMINDER_JOB_INTERVAL'] || '1h'
-
-  scheduler.every reminder_job_interval do
+  schedule_task(scheduler, reminder_job_interval) do
     MyModules::DueDateReminderJob.perform_now
     RepositoryItemDateReminderJob.perform_now
   end
 
-  scheduler.every '1d' do
+  schedule_task(scheduler, '1d') do
     NotificationCleanupJob.perform_now
   end
 end

From e993964692af6a7490884cbaaa6c780f5254dc8a Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 28 Mar 2024 11:16:49 +0100
Subject: [PATCH 025/115] Add task protocol results to global search page
 [SCI-10473]

---
 app/controllers/search_controller.rb          | 19 +++++++
 .../groups/my_module_protocols.vue            | 57 ++++++++++++++++++-
 .../my_module_protocol_serializer.rb          | 46 +++++++++++++++
 config/locales/en.yml                         |  2 +
 4 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 app/serializers/global_search/my_module_protocol_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 7ad0248e2..b267dc65f 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -57,6 +57,20 @@ class SearchController < ApplicationController
                    next_page: results.try(:next_page)
                  }
           return
+        when 'module_protocols'
+          search_module_protocols
+          results = if params[:preview] == 'true'
+                      @module_protocol_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @module_protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+          render json: results.joins({ my_module: :experiment }, :team),
+                 each_serializer: GlobalSearch::MyModuleProtocolSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: results.try(:next_page)
+                 }
+          return
         when 'experiments'
           @experiment_search_count = fetch_cached_count Experiment
           search_experiments
@@ -385,6 +399,11 @@ class SearchController < ApplicationController
     @search_count = @module_search_count
   end
 
+  def search_module_protocols
+    @module_protocol_results = search_by_name(Protocol)
+    @search_count = @module_protocol_results.joins(:my_module).count
+  end
+
   def search_results
     @result_results = []
     @result_results = search_by_name(Result) if @result_search_count.positive?
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index de27d4bbb..9873a7e19 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -1,14 +1,67 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-protocols-templates"></i>
       {{ i18n.t('search.index.task_protocols') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="truncate">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="truncate">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
+            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
+              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
+                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+              </a>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'MyModuleProtocolsComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'MyModuleProtocolsComponent'
+  name: 'MyModuleProtocolsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'module_protocols'
+    };
+  }
 };
 </script>
diff --git a/app/serializers/global_search/my_module_protocol_serializer.rb b/app/serializers/global_search/my_module_protocol_serializer.rb
new file mode 100644
index 000000000..642d8a588
--- /dev/null
+++ b/app/serializers/global_search/my_module_protocol_serializer.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class MyModuleProtocolSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :updated_at, :team, :experiment, :my_module, :archived, :url
+
+    def name
+      object.name.presence || I18n.t('search.index.untitled_protocol')
+    end
+
+    def team
+      {
+        name: object.team.name,
+        url: protocols_path(team_id: object.team.id)
+      }
+    end
+
+    def experiment
+      {
+        name: object.my_module.experiment.name,
+        url: my_modules_experiment_path(object.my_module.experiment.id)
+      }
+    end
+
+    def my_module
+      {
+        name: object.my_module.name,
+        url: protocols_my_module_path(object.my_module.id)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def url
+      protocols_my_module_path(object.my_module.id)
+    end
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d02ec5491..de35747bc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -471,6 +471,8 @@ en:
       updated_at: "Updated on"
       team: "Team"
       folder: "Folder"
+      task: "Task"
+      untitled_protocol: 'Untitled protocol'
       project: "Project"
       experiment: "Experiment"
       task: "Task"

From a9b624f2553568d7d779e14d443fe830586d8fc6 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 4 Apr 2024 13:19:01 +0100
Subject: [PATCH 026/115] Fix project load error [SCI-10473]

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index b267dc65f..29cfbdf69 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -16,7 +16,7 @@ class SearchController < ApplicationController
           @project_search_count = fetch_cached_count(Project)
           search_projects
           if params[:preview] == 'true'
-            results = @project_results.take(4)
+            results = @project_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
           else
             results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
           end

From 72f496b966f872a4b97789d996213a4549d69b8e Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Fri, 29 Mar 2024 08:47:42 +0100
Subject: [PATCH 027/115] Add task to global search page [SCI-10472]

---
 app/controllers/search_controller.rb          | 17 ++++++-
 .../vue/global_search/groups/my_modules.vue   | 51 ++++++++++++++++++-
 .../global_search/my_module_serializer.rb     | 35 +++++++++++++
 3 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/global_search/my_module_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 7ad0248e2..ad380dddf 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -72,6 +72,21 @@ class SearchController < ApplicationController
                    next_page: results.try(:next_page)
                  }
           return
+        when 'tasks'
+          @module_search_count = fetch_cached_count MyModule
+          search_modules
+          results = if params[:preview] == 'true'
+                      @module_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @module_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+          render json: results.includes(experiment: { project: :team }),
+                 each_serializer: GlobalSearch::MyModuleSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: results.try(:next_page)
+                 }
+          return
         when 'protocols'
           @protocol_search_count = fetch_cached_count(Protocol)
           search_protocols
@@ -380,7 +395,7 @@ class SearchController < ApplicationController
   end
 
   def search_modules
-    @module_results = []
+    @module_results = MyModule.none
     @module_results = search_by_name(MyModule) if @module_search_count.positive?
     @search_count = @module_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index 393a825ea..35209bb0b 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -1,14 +1,61 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-task"></i>
       {{ i18n.t('search.index.tasks') }}
+      [{{ total }}]
     </h2>
+    <div>
+      <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
+            <span class="shrink-0">{{ row.attributes.code }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="truncate">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="truncate">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
+              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
+                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+              </a>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'MyModulesComponent')">View all</button>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'MyModulesComponent'
+  name: 'MyModulesComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'tasks'
+    };
+  }
 };
 </script>
diff --git a/app/serializers/global_search/my_module_serializer.rb b/app/serializers/global_search/my_module_serializer.rb
new file mode 100644
index 000000000..c3089ab5e
--- /dev/null
+++ b/app/serializers/global_search/my_module_serializer.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class MyModuleSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :code, :created_at, :updated_at, :team, :experiment, :archived, :url
+
+    def team
+      {
+        name: object.experiment.project.team.name,
+        url: projects_path(team_id: object.experiment.project.team.id)
+      }
+    end
+
+    def experiment
+      {
+        name: object.experiment.name,
+        url: my_modules_experiment_path(object.experiment.id)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def url
+      protocols_my_module_path(object.id)
+    end
+  end
+end

From e6741a79f525f97eaf1fcc51e1fed137fd02c15f Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Fri, 29 Mar 2024 09:27:33 +0100
Subject: [PATCH 028/115] Add task results to global search page [SCi-10474]

---
 app/controllers/search_controller.rb          | 17 +++++-
 .../vue/global_search/groups/results.vue      | 53 ++++++++++++++++++-
 .../global_search/result_serializer.rb        | 42 +++++++++++++++
 3 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 app/serializers/global_search/result_serializer.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 36abf4712..3905cb3ed 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -101,6 +101,21 @@ class SearchController < ApplicationController
                    next_page: results.try(:next_page)
                  }
           return
+        when 'results'
+          @result_search_count = fetch_cached_count(Result)
+          search_results
+          results = if params[:preview] == 'true'
+                      @result_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                    else
+                      @result_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
+                    end
+          render json: results.includes(my_module: { experiment: { project: :team } }),
+                 each_serializer: GlobalSearch::ResultSerializer,
+                 meta: {
+                   total: @search_count,
+                   next_page: results.try(:next_page)
+                 }
+          return
         when 'protocols'
           @protocol_search_count = fetch_cached_count(Protocol)
           search_protocols
@@ -420,7 +435,7 @@ class SearchController < ApplicationController
   end
 
   def search_results
-    @result_results = []
+    @result_results = Result.none
     @result_results = search_by_name(Result) if @result_search_count.positive?
     @search_count = @result_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 10cf91848..f5f79ecbc 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -1,14 +1,63 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
     <h2 class="flex items-center gap-2 mt-0 mb-4">
       <i class="sn-icon sn-icon-results"></i>
       {{ i18n.t('search.index.task_results') }}
+      [{{ total }}]
     </h2>
   </div>
+  <div>
+      <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+          </a>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="truncate">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="truncate">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
+            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
+              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
+                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+              </a>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
+      </div>
+    </div>
 </template>
 
 <script>
+import searchMixin from './search_mixin';
+
 export default {
-  name: 'ResultsComponent'
+  name: 'ResultsComponent',
+  mixins: [searchMixin],
+  data() {
+    return {
+      group: 'results'
+    };
+  }
 };
 </script>
diff --git a/app/serializers/global_search/result_serializer.rb b/app/serializers/global_search/result_serializer.rb
new file mode 100644
index 000000000..718b47517
--- /dev/null
+++ b/app/serializers/global_search/result_serializer.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module GlobalSearch
+  class ResultSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+
+    attributes :id, :name, :created_at, :updated_at, :team, :experiment, :my_module, :archived, :url
+
+    def team
+      {
+        name: object.my_module.experiment.project.team.name,
+        url: projects_path(team_id: object.my_module.experiment.project.team.id)
+      }
+    end
+
+    def experiment
+      {
+        name: object.my_module.experiment.name,
+        url: my_modules_experiment_path(object.my_module.experiment.id)
+      }
+    end
+
+    def my_module
+      {
+        name: object.my_module.name,
+        url: protocols_my_module_path(object.my_module.id)
+      }
+    end
+
+    def created_at
+      I18n.l(object.created_at, format: :full_date)
+    end
+
+    def updated_at
+      I18n.l(object.updated_at, format: :full_date)
+    end
+
+    def url
+      my_module_results_path(my_module_id: object.my_module.id)
+    end
+  end
+end

From d101f8794cd70ad36407a237e9b913e27f87b855 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 4 Apr 2024 14:30:58 +0200
Subject: [PATCH 029/115] Fix merge issue

---
 .../vue/global_search/groups/label_templates.vue    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index a8abb1983..f5e2cc852 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -51,19 +51,8 @@ export default {
   mixins: [searchMixin],
   data() {
     return {
-      group: 'label_templates',
-      enabled: false
+      group: 'label_templates'
     };
-  },
-  created() {
-    this.checkEnabled();
-  },
-  methods: {
-    checkEnabled() {
-      if (!this.enabled) {
-        this.$emit('selectGroup', 'LabelTemplatesComponent');
-      }
-    }
   }
 };
 </script>

From bad40642883324541d707c68b60a5c7e34d3ff2b Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Thu, 4 Apr 2024 15:10:40 +0200
Subject: [PATCH 030/115] Make sure current_user is set earlier in asset syncs
 controller [SCI-10592]

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

diff --git a/app/controllers/asset_sync_controller.rb b/app/controllers/asset_sync_controller.rb
index 855bfba53..8823fa845 100644
--- a/app/controllers/asset_sync_controller.rb
+++ b/app/controllers/asset_sync_controller.rb
@@ -5,7 +5,7 @@ class AssetSyncController < ApplicationController
 
   skip_before_action :authenticate_user!, only: %i(update download)
   skip_before_action :verify_authenticity_token, only: %i(update download)
-  before_action :authenticate_asset_sync_token!, only: %i(update download)
+  prepend_before_action :authenticate_asset_sync_token!, only: %i(update download)
   before_action :check_asset_sync
 
   def show

From 9f57e8161a80fef0a69a583245c16aafda586dea Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 5 Apr 2024 10:16:23 +0200
Subject: [PATCH 031/115] Fix table freezing [SCI-10596]

---
 app/assets/javascripts/my_modules/protocols.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index ca1f6440c..7d74d1e41 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -329,7 +329,7 @@ function initAccessModal() {
 
 function initWrapTables() {
   const viewMode = new URLSearchParams(window.location.search).get('view_mode');
-  if (['archived', 'locked', 'active'].includes(viewMode)) {
+  if (['archived', 'locked'].includes(viewMode)) {
     setTimeout(() => {
       const notesContainerEl = document.getElementById('notes-container');
       window.wrapTables(notesContainerEl);

From 9ac0dca68a2f55c5c3ecd9533a9f7f8f3b35cd15 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Fri, 5 Apr 2024 11:12:35 +0100
Subject: [PATCH 032/115] Split external services for CSP for script_src and
 connect_src [sci_10572]

---
 config/initializers/content_security_policy.rb |  8 ++++----
 config/initializers/extends.rb                 | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 2217e2721..2ada87feb 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -11,9 +11,9 @@ ActiveSupport::Reloader.to_prepare do
     policy.font_src    :self, :https, :data
     policy.img_src     :self, :https, :data, :blob
     policy.object_src  :none
-    policy.script_src  :self, :unsafe_eval, *Extends::EXTERNAL_SERVICES
+    policy.script_src  :self, :unsafe_eval, *Extends::EXTERNAL_SCRIPT_SERVICES
     policy.style_src   :self, :https, :unsafe_inline, :data
-    policy.connect_src :self, :data, *Extends::EXTERNAL_SERVICES
+    policy.connect_src :self, :data, *Extends::EXTERNAL_CONNECT_SERVICES
 
     # Specify URI for violation reports
     # policy.report_uri "/csp-violation-report-endpoint"
@@ -44,8 +44,8 @@ Rails.application.config.content_security_policy_nonce_directives = %w(script-sr
 Rails.application.configure do
   config.after_initialize do
     if ActiveStorage::Blob.service.name == :amazon
-      Extends::EXTERNAL_SERVICES += [ActiveStorage::Blob.service.bucket.url]
-      Rails.application.config.content_security_policy.connect_src :self, :data, *Extends::EXTERNAL_SERVICES
+      Extends::EXTERNAL_CONNECT_SERVICES += [ActiveStorage::Blob.service.bucket.url]
+      Rails.application.config.content_security_policy.connect_src :self, :data, *Extends::EXTERNAL_CONNECT_SERVICES
     end
   end
 end
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index a96628aed..a7c38f719 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -589,22 +589,25 @@ class Extends
     'FluicsLabelTemplate' => 'Fluics'
   }
 
-  EXTERNAL_SERVICES = %w(
+  EXTERNAL_SCRIPT_SERVICES = %w(
+    https://marvinjs.chemicalize.com/
+    www.recaptcha.net/
+    www.gstatic.com/recaptcha/
+  )
+
+  EXTERNAL_CONNECT_SERVICES = %w(
     https://www.protocols.io/
     http://127.0.0.1:9100/
-    https://marvinjs.chemicalize.com/
     newrelic.com
     *.newrelic.com
     *.nr-data.net
-    www.recaptcha.net/
-    www.gstatic.com/recaptcha/
     extras.scinote.net
     https://www.scinote.net
   )
 
-  if Constants::ASSET_SYNC_URL && EXTERNAL_SERVICES.exclude?(Constants::ASSET_SYNC_URL)
+  if Constants::ASSET_SYNC_URL && EXTERNAL_CONNECT_SERVICES.exclude?(Constants::ASSET_SYNC_URL)
     asset_sync_url = URI.parse(Constants::ASSET_SYNC_URL)
-    EXTERNAL_SERVICES << "#{asset_sync_url.scheme}://#{asset_sync_url.host}:#{asset_sync_url.port}"
+    EXTERNAL_CONNECT_SERVICES << "#{asset_sync_url.scheme}://#{asset_sync_url.host}:#{asset_sync_url.port}"
   end
 
   COLORED_BACKGROUND_ACTIONS = %w(

From 6d069ce2ed089d6ceba5074e83b5a0518358e070 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 5 Apr 2024 12:57:34 +0200
Subject: [PATCH 033/115] Fix task creation duplicates [SCI-10603]

---
 app/assets/javascripts/experiments/show.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/experiments/show.js b/app/assets/javascripts/experiments/show.js
index 650850f7d..be35db24a 100644
--- a/app/assets/javascripts/experiments/show.js
+++ b/app/assets/javascripts/experiments/show.js
@@ -7,7 +7,7 @@
     let myModuleUserSelector = '#my_module_user_ids';
     var myModuleTagsSelector = '#module-tags-selector';
 
-    $(document).on('submit', '#new-my-module-modal form', (event) => {
+    $('#experiment-canvas').on('submit', '#new-my-module-modal form', (event) => {
       event.preventDefault();
 
       $.post({

From 08ad224f8d9c5bb5d42d8704d103b62a7b0b6c95 Mon Sep 17 00:00:00 2001
From: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Date: Fri, 5 Apr 2024 13:51:03 +0200
Subject: [PATCH 034/115] Bump version to 1.32.0.1

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 359c41089..2f0c2a938 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.32.0
+1.32.0.1

From 874c333496cce1ba7ab6161d93ab19302a51ff42 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Sat, 6 Apr 2024 17:26:26 +0200
Subject: [PATCH 035/115] Add openid connect and saml connected accounts
 [SCI-10584]

---
 .../_openid_connect.html.erb                  | 24 +++++++++++++++++
 .../account/connected_accounts/_saml.html.erb | 24 +++++++++++++++++
 .../_openid_connect_modal.html.erb            | 23 ++++++++++++++++
 .../unlink_modals/_saml_modal.html.erb        | 23 ++++++++++++++++
 config/locales/en.yml                         | 26 ++++++++++++++++---
 5 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 app/views/users/settings/account/connected_accounts/_openid_connect.html.erb
 create mode 100644 app/views/users/settings/account/connected_accounts/_saml.html.erb
 create mode 100644 app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb
 create mode 100644 app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb

diff --git a/app/views/users/settings/account/connected_accounts/_openid_connect.html.erb b/app/views/users/settings/account/connected_accounts/_openid_connect.html.erb
new file mode 100644
index 000000000..f75ac0673
--- /dev/null
+++ b/app/views/users/settings/account/connected_accounts/_openid_connect.html.erb
@@ -0,0 +1,24 @@
+<div class="panel panel-default">
+  <div class="panel-body">
+    <div class="col-xs-8 col-sm-9 col-md-9 col-lg-9">
+      <strong><%= t('users.settings.account.connected_accounts.openid_connect.title') %></strong> <br>
+        <p><%= t('users.settings.account.connected_accounts.openid_connect.connect_hint') %></p>
+    </div>
+    <div class="pull-right">
+      <div>
+        <strong>
+          <%= t('users.settings.account.connected_accounts.openid_connect.connected') %>
+          <span class="sn-icon sn-icon-check" aria-hidden="true"></span>
+        </strong>
+      </div>
+      <div>
+        <%= link_to t('users.settings.account.connected_accounts.openid_connect.unlink_button'),
+                    '#unlinkOpenIdConnectModal',
+                    class: 'btn btn-danger',
+                    data: { toggle: 'modal'} %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= render partial: 'users/settings/account/connected_accounts/unlink_modals/openid_connect_modal', locals: { provider: provider } %>
diff --git a/app/views/users/settings/account/connected_accounts/_saml.html.erb b/app/views/users/settings/account/connected_accounts/_saml.html.erb
new file mode 100644
index 000000000..1642890ec
--- /dev/null
+++ b/app/views/users/settings/account/connected_accounts/_saml.html.erb
@@ -0,0 +1,24 @@
+<div class="panel panel-default">
+  <div class="panel-body">
+    <div class="col-xs-8 col-sm-9 col-md-9 col-lg-9">
+      <strong><%= t('users.settings.account.connected_accounts.saml.title') %></strong> <br>
+        <p><%= t('users.settings.account.connected_accounts.saml.connect_hint') %></p>
+    </div>
+    <div class="pull-right">
+      <div>
+        <strong>
+          <%= t('users.settings.account.connected_accounts.saml.connected') %>
+          <span class="sn-icon sn-icon-check" aria-hidden="true"></span>
+        </strong>
+      </div>
+      <div>
+        <%= link_to t('users.settings.account.connected_accounts.saml.unlink_button'),
+                    '#unlinksamlModal',
+                    class: 'btn btn-danger',
+                    data: { toggle: 'modal'} %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= render partial: 'users/settings/account/connected_accounts/unlink_modals/saml_modal', locals: { provider: provider } %>
diff --git a/app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb b/app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb
new file mode 100644
index 000000000..2540763a7
--- /dev/null
+++ b/app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb
@@ -0,0 +1,23 @@
+<div class="modal fade" id="unlinkOpenIdConnectModal" 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="<%= t('general.close') %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <h4 class="modal-title" >
+          <%= t('users.settings.account.connected_accounts.openid_connect.unlink_modal.title') %>
+        </h4>
+      </div>
+      <div class="modal-body">
+          <p><%= t('users.settings.account.connected_accounts.openid_connect.unlink_modal.description_1') %></p>
+      </div>
+      <div class="modal-footer">
+        <%= form_tag(unlink_connected_account_path, method: :delete) do %>
+          <%= hidden_field_tag :provider, provider %>
+          <%= submit_tag t('users.settings.account.connected_accounts.openid_connect.unlink_modal.submit_button'), class: 'btn btn-danger' %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb b/app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb
new file mode 100644
index 000000000..6c81c46d0
--- /dev/null
+++ b/app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb
@@ -0,0 +1,23 @@
+<div class="modal fade" id="unlinksamlModal" 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="<%= t('general.close') %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <h4 class="modal-title" >
+          <%= t('users.settings.account.connected_accounts.saml.unlink_modal.title') %>
+        </h4>
+      </div>
+      <div class="modal-body">
+          <p><%= t('users.settings.account.connected_accounts.saml.unlink_modal.description_1') %></p>
+      </div>
+      <div class="modal-footer">
+        <%= form_tag(unlink_connected_account_path, method: :delete) do %>
+          <%= hidden_field_tag :provider, provider %>
+          <%= submit_tag t('users.settings.account.connected_accounts.saml.unlink_modal.submit_button'), class: 'btn btn-danger' %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b829dca5..1e771b5de 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2898,13 +2898,13 @@ en:
           not_connected: "You have no Connected accounts"
           unlink_success: "Successfully unlinked"
           azure_ad:
-            title: "Your Azure AD Account"
-            connect_hint: "Allows you to sign in with your Azure AD account."
+            title: "Your Microsoft Azure (Active Directory) Account"
+            connect_hint: "Allows you to sign in with your Microsoft Azure (Active Directory) account."
             connected: "Connected"
             unlink_button: "Unlink"
             unlink_modal:
-              title: "Unlink Azure AD account?"
-              description_1: "Are you sure you would like unlink Azure AD and SciNote accounts?"
+              title: "Unlink Microsoft Azure (Active Directory) account?"
+              description_1: "Are you sure you would like unlink Microsoft Azure (Active Directory) and SciNote accounts?"
               submit_button: "Submit"
           okta:
             title: "Your Okta Account"
@@ -2915,6 +2915,24 @@ en:
               title: "Unlink Okta account?"
               description_1: "Are you sure you would like unlink Okta and SciNote accounts?"
               submit_button: "Submit"
+          openid_connect:
+            title: "Your OpenID Connect Account"
+            connect_hint: "Allows you to sign in with your OpenID Connect account."
+            connected: "Connected"
+            unlink_button: "Unlink"
+            unlink_modal:
+              title: "Unlink OpenID Connect account?"
+              description_1: "Are you sure you would like unlink OpenID Connect and SciNote accounts?"
+              submit_button: "Submit"
+          saml:
+            title: "Your SAML Account"
+            connect_hint: "Allows you to sign in with your SAML account."
+            connected: "Connected"
+            unlink_button: "Unlink"
+            unlink_modal:
+              title: "Unlink SAML account?"
+              description_1: "Are you sure you would like unlink SAML and SciNote accounts?"
+              submit_button: "Submit"
           errors:
             not_found: "You have no Connected accounts for this provider"
             generic: "Unable to unlink linked account"

From 01abb78d4ecd7fca6ff69cb5801cdc2329d87f42 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 5 Apr 2024 11:16:58 +0200
Subject: [PATCH 036/115] Connecte filters modal [SCI-10536]

---
 .../vue/global_search/container.vue           | 121 +++++++++++++++---
 app/javascript/vue/global_search/filters.vue  |  27 +++-
 .../vue/global_search/filters/date.vue        |  40 ++++--
 .../vue/global_search/filters_modal.vue       |  49 +++++++
 .../vue/global_search/groups/search_mixin.js  |   6 +-
 .../vue/navigation/quick_search.vue           |   1 +
 app/javascript/vue/shared/select_dropdown.vue |   2 +-
 app/views/search/index.html.erb               |   1 +
 config/locales/en.yml                         |   2 +
 9 files changed, 215 insertions(+), 34 deletions(-)
 create mode 100644 app/javascript/vue/global_search/filters_modal.vue

diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index 48c1ebd86..f34c457cf 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -24,24 +24,19 @@
           {{ i18n.t('search.index.task_results') }}
         </button>
       </div>
-      <GeneralDropdown ref="filterFlyout" position="right">
-        <template v-slot:field>
-          <button class="btn btn-light btn-sm">
-            <i class="sn-icon sn-icon-search-options"></i>
-            {{ i18n.t('search.index.more_search_options') }}
-          </button>
-        </template>
-        <template v-slot:flyout >
-          <SearchFilters
-            :teamsUrl="teamsUrl"
-            :usersUrl="usersUrl"
-            @cancel="this.$refs.container.close()"
-          ></SearchFilters>
-        </template>
-      </GeneralDropdown>
-      <template v-if="activeGroup">
+      <button class="btn btn-light btn-sm" @click="filterModalOpened = true">
+        <i class="sn-icon sn-icon-search-options"></i>
+        {{ i18n.t('search.index.more_search_options') }}
+        <span
+          v-if="activeFilters.length > 0"
+          class="absolute -right-1 -top-1 rounded-full bg-sn-science-blue text-white flex items-center justify-center w-4 h-4 text-[9px]"
+        >
+          {{ activeFilters.length }}
+        </span>
+      </button>
+      <template v-if="activeFilters.length > 0">
         <div class="h-4 w-[1px] bg-sn-grey"></div>
-        <button class="btn btn-light btn-sm" @click="activeGroup = null">
+        <button class="btn btn-light btn-sm" @click="resetFilters">
           <i class="sn-icon sn-icon-close"></i>
           {{ i18n.t('search.index.clear_filters') }}
         </button>
@@ -55,9 +50,21 @@
         :selected="activeGroup === group"
         :query="localQuery"
         :searchUrl="searchUrl"
+        :filters="filters"
         @selectGroup="setActiveGroup"
       />
     </template>
+    <teleport to='body'>
+      <FiltersModal
+        v-if="filterModalOpened"
+        :teamsUrl="teamsUrl"
+        :usersUrl="usersUrl"
+        :filters="filters"
+        :currentTeam="currentTeam"
+        @search="applyFilters"
+        @close="filterModalOpened = false"
+      />
+    </teleport>
   </div>
 </template>
 
@@ -73,10 +80,11 @@ import RepositoryRowsComponent from './groups/repository_rows.vue';
 import ProtocolsComponent from './groups/protocols.vue';
 import LabelTemplatesComponent from './groups/label_templates.vue';
 import ReportsComponent from './groups/reports.vue';
-import SearchFilters from './filters.vue';
+import FiltersModal from './filters_modal.vue';
 import GeneralDropdown from '../shared/general_dropdown.vue';
 
 export default {
+  emits: ['search', 'selectGroup'],
   name: 'GlobalSearch',
   props: {
     query: {
@@ -94,6 +102,10 @@ export default {
     usersUrl: {
       type: String,
       required: true
+    },
+    currentTeam: {
+      type: Number || String,
+      required: true
     }
   },
   components: {
@@ -108,12 +120,14 @@ export default {
     ProtocolsComponent,
     LabelTemplatesComponent,
     ReportsComponent,
-    SearchFilters,
+    FiltersModal,
     GeneralDropdown
   },
   data() {
     return {
+      filters: {},
       localQuery: this.query,
+      filterModalOpened: false,
       activeGroup: null,
       searchGroups: [
         'FoldersComponent',
@@ -130,6 +144,48 @@ export default {
       ]
     };
   },
+  computed: {
+    activeFilters() {
+      return Object.keys(this.filters).filter((key) => {
+        if (key === 'created_at' || key === 'updated_at') {
+          return this.filters[key].on || this.filters[key].from || this.filters[key].to;
+        } if (key === 'teams' || key === 'users') {
+          return this.filters[key].length > 0;
+        }
+        return this.filters[key];
+      });
+    }
+  },
+  created() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.filters = {
+      created_at: {
+        on: null,
+        from: null,
+        to: null
+      },
+      updated_at: {
+        on: null,
+        from: null,
+        to: null
+      },
+      include_archived: urlParams.get('include_archived') === 'true',
+      teams: urlParams.getAll('teams[]').map((team) => parseInt(team, 10)),
+      users: urlParams.getAll('users[]').map((user) => parseInt(user, 10)),
+      group: urlParams.get('group')
+    };
+    ['created_at', 'updated_at'].forEach((key) => {
+      ['on', 'from', 'to', 'mode'].forEach((subKey) => {
+        if (urlParams.get(`${key}[${subKey}]`)) {
+          this.filters[key][subKey] = subKey !== 'mode' ? new Date(urlParams.get(`${key}[${subKey}]`)) : urlParams.get(`${key}[${subKey}]`);
+        }
+      });
+    });
+
+    if (this.filters.group) {
+      this.activeGroup = this.filters.group;
+    }
+  },
   methods: {
     setActiveGroup(group) {
       if (group === this.activeGroup) {
@@ -137,9 +193,36 @@ export default {
       } else {
         this.activeGroup = group;
       }
+
+      this.filters.group = this.activeGroup;
     },
     changeQuery(event) {
       this.localQuery = event.target.value;
+    },
+    applyFilters(filters) {
+      this.filters = filters;
+      this.filterModalOpened = false;
+
+      this.activeGroup = this.filters.group;
+    },
+    resetFilters() {
+      this.filters = {
+        created_at: {
+          on: null,
+          from: null,
+          to: null
+        },
+        updated_at: {
+          on: null,
+          from: null,
+          to: null
+        },
+        include_archived: false,
+        teams: [],
+        users: [],
+        group: null
+      };
+      this.activeGroup = null;
     }
   }
 };
diff --git a/app/javascript/vue/global_search/filters.vue b/app/javascript/vue/global_search/filters.vue
index fa896c1da..04f5e8999 100644
--- a/app/javascript/vue/global_search/filters.vue
+++ b/app/javascript/vue/global_search/filters.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="max-w-[600px] p-3.5">
+  <div class="max-w-[600px] py-3.5">
     <div class="sci-label mb-2">{{ i18n.t('search.filters.by_type') }}</div>
     <div class="flex items-center gap-2 flex-wrap mb-6">
       <template v-for="group in searchGroups" :key="group.value">
@@ -75,7 +75,8 @@ export default {
       type: String,
       required: true
     },
-    currentTeam: Number,
+    filters: Object,
+    currentTeam: Number || String,
     searchUrl: String,
     searchQuery: String
   },
@@ -84,6 +85,17 @@ export default {
     if (this.currentTeam) {
       this.selectedTeams = [this.currentTeam];
     }
+
+    if (this.filters) {
+      this.createdAt = this.filters.created_at;
+      this.updatedAt = this.filters.updated_at;
+      this.selectedTeams = this.filters.teams;
+      this.$nextTick(() => {
+        this.selectedUsers = this.filters.users;
+      });
+      this.includeArchived = this.filters.include_archived;
+      this.activeGroup = this.filters.group;
+    }
   },
   watch: {
     selectedTeams() {
@@ -175,6 +187,15 @@ export default {
     search() {
       if (this.searchUrl) {
         this.openSearchPage();
+      } else {
+        this.$emit('search', {
+          created_at: this.createdAt,
+          updated_at: this.updatedAt,
+          teams: this.selectedTeams,
+          users: this.selectedUsers,
+          include_archived: this.includeArchived,
+          group: this.activeGroup
+        });
       }
     },
     openSearchPage() {
@@ -182,9 +203,11 @@ export default {
         'created_at[on]': this.createdAt.on || '',
         'created_at[from]': this.createdAt.from || '',
         'created_at[to]': this.createdAt.to || '',
+        'created_at[mode]': this.createdAt.mode || '',
         'updated_at[on]': this.updatedAt.on || '',
         'updated_at[from]': this.updatedAt.from || '',
         'updated_at[to]': this.updatedAt.to || '',
+        'updated_at[mode]': this.updatedAt.mode || '',
         include_archived: this.includeArchived,
         group: this.activeGroup || '',
         q: this.searchQuery
diff --git a/app/javascript/vue/global_search/filters/date.vue b/app/javascript/vue/global_search/filters/date.vue
index 070efcd56..2e385fb95 100644
--- a/app/javascript/vue/global_search/filters/date.vue
+++ b/app/javascript/vue/global_search/filters/date.vue
@@ -66,28 +66,44 @@ export default {
 
       switch (this.selectedOption) {
         case 'today':
-          this.newDate = { on: today, from: null, to: null };
+          this.newDate = {
+            on: today, from: null, to: null, mode: 'today'
+          };
           break;
         case 'yesterday':
-          this.newDate = { on: yesterday, from: null, to: null };
+          this.newDate = {
+            on: yesterday, from: null, to: null, mode: 'yesterday'
+          };
           break;
         case 'last_week':
-          this.newDate = { on: null, from: lastWeekStart, to: lastWeekEnd };
+          this.newDate = {
+            on: null, from: lastWeekStart, to: lastWeekEnd, mode: 'last_week'
+          };
           break;
         case 'this_month':
-          this.newDate = { on: null, from: firstMonthDay, to: today };
+          this.newDate = {
+            on: null, from: firstMonthDay, to: today, mode: 'this_month'
+          };
           break;
         case 'this_year':
-          this.newDate = { on: null, from: firstYearDay, to: today };
+          this.newDate = {
+            on: null, from: firstYearDay, to: today, mode: 'this_year'
+          };
           break;
         case 'last_year':
-          this.newDate = { on: null, from: lastYearStart, to: lastYearEnd };
+          this.newDate = {
+            on: null, from: lastYearStart, to: lastYearEnd, mode: 'last_year'
+          };
           break;
         case 'on':
-          this.newDate = { on: null, from: null, to: null };
+          this.newDate = {
+            on: null, from: null, to: null, mode: 'on'
+          };
           break;
         case 'custom':
-          this.newDate = { on: null, from: null, to: null };
+          this.newDate = {
+            on: null, from: null, to: null, mode: 'custom'
+          };
           break;
         default:
           break;
@@ -99,7 +115,7 @@ export default {
   data() {
     return {
       newDate: this.date,
-      selectedOption: 'on',
+      selectedOption: (this.date.mode || 'on'),
       dateOptions: [
         ['today', 'Today'],
         ['yesterday', 'Yesterday'],
@@ -114,15 +130,19 @@ export default {
   },
   methods: {
     setOn(v) {
-      this.newDate = { on: v, from: null, to: null };
+      this.newDate = {
+        on: v, from: null, to: null, mode: 'on'
+      };
       this.$emit('change', this.newDate);
     },
     setFrom(v) {
+      this.newDate.mode = 'custom';
       this.newDate.on = null;
       this.newDate.from = v;
       this.$emit('change', this.newDate);
     },
     setTo(v) {
+      this.newDate.mode = 'custom';
       this.newDate.on = null;
       this.newDate.to = v;
       this.$emit('change', this.newDate);
diff --git a/app/javascript/vue/global_search/filters_modal.vue b/app/javascript/vue/global_search/filters_modal.vue
new file mode 100644
index 000000000..c1a768a8e
--- /dev/null
+++ b/app/javascript/vue/global_search/filters_modal.vue
@@ -0,0 +1,49 @@
+<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" id="edit-project-modal-label">
+              {{ i18n.t('search.filters.title') }}
+            </h4>
+          </div>
+          <div class="modal-body !pb-0">
+            <p class="text-sn-dark-grey">
+              {{ i18n.t('search.filters.sub_title') }}
+            </p>
+            <Filters
+              :teams-url="teamsUrl"
+              :users-url="usersUrl"
+              :filters="filters"
+              :currentTeam="currentTeam"
+              @search="(newFilters) => { this.$emit('search', newFilters); }"
+              @close="close" />
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script>
+import modalMixin from '../shared/modal_mixin';
+import Filters from './filters.vue';
+
+export default {
+  name: 'FiltersModal',
+  props: {
+    teamsUrl: String,
+    usersUrl: String,
+    filters: Object,
+    currentTeam: Number || String
+  },
+  components: {
+    Filters
+  },
+  mixins: [modalMixin]
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 00f87e79f..faa1e51b8 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -6,7 +6,8 @@ export default {
   props: {
     searchUrl: String,
     query: String,
-    selected: Boolean
+    selected: Boolean,
+    filters: Object
   },
   components: {
     StringWithEllipsis
@@ -57,7 +58,7 @@ export default {
   },
   methods: {
     handleScroll() {
-      if (this.loading) return;
+      if (this.loading || !this.selected) return;
 
       if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
         if (this.results.length < this.total) {
@@ -72,6 +73,7 @@ export default {
       axios.get(this.searchUrl, {
         params: {
           q: this.query,
+          filters: this.filters,
           group: this.group,
           preview: !this.selected,
           page: this.page
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index a7c5b90a7..79a622192 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -16,6 +16,7 @@
     </template>
     <template v-slot:flyout >
       <SearchFilters
+        class="px-3.5"
         v-if="filtersOpened"
         :teamsUrl="teamsUrl"
         :usersUrl="usersUrl"
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index cbf0d740e..7b7cb13c9 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -48,7 +48,7 @@
         </div>
       </div>
       <i v-if="canClear" @click="clear" class="sn-icon ml-auto sn-icon-close"></i>
-      <i v-else class="sn-icon ml-auto self-start"
+      <i v-else class="sn-icon ml-auto"
                 :class="{ 'sn-icon-down': !isOpen, 'sn-icon-up': isOpen, 'text-sn-grey': disabled}"></i>
     </div>
     <template v-if="isOpen">
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 9a08c3522..fc84a611f 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -6,6 +6,7 @@
     :search-url="'<%= search_path(format: :json) %>'"
     teams-url="<%= visible_teams_teams_path %>"
     users-url="<%= visible_users_teams_path %>"
+    current-team="<%= current_team.id %>"
   />
 </div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index de35747bc..6e7d6b6b9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -439,6 +439,8 @@ en:
     match_case: "Match case sensitive"
     object_id: "ID:"
     filters:
+      title: "More search options"
+      sub_filters: "Refine your search by applying the filters below."
       by_type: "Filter by type"
       by_created_date: "Filter by created date"
       by_updated_date: "Filter by updated date"

From c2da52a6bb520537e16cc9786c23ab701d2c3053 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 8 Apr 2024 12:54:46 +0200
Subject: [PATCH 037/115] Add sorting to global search [SCI-10528]

---
 .../vue/global_search/groups/assets.vue       | 13 ++-
 .../vue/global_search/groups/experiments.vue  | 13 ++-
 .../vue/global_search/groups/folders.vue      | 13 ++-
 .../global_search/groups/label_templates.vue  | 15 +--
 .../groups/my_module_protocols.vue            | 13 ++-
 .../vue/global_search/groups/my_modules.vue   | 13 ++-
 .../vue/global_search/groups/projects.vue     | 13 ++-
 .../vue/global_search/groups/protocols.vue    | 15 +--
 .../vue/global_search/groups/reports.vue      | 13 ++-
 .../global_search/groups/repository_rows.vue  | 13 ++-
 .../vue/global_search/groups/results.vue      | 91 ++++++++++---------
 .../vue/global_search/groups/search_mixin.js  | 12 ++-
 .../vue/global_search/groups/sort_flyout.vue  | 43 +++++++++
 config/locales/en.yml                         |  4 +
 14 files changed, 186 insertions(+), 98 deletions(-)
 create mode 100644 app/javascript/vue/global_search/groups/sort_flyout.vue

diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index cd6815673..4f8a39f4e 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-files"></i>
-      {{ i18n.t('search.index.files') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-files"></i>
+        {{ i18n.t('search.index.files') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index 74231b487..320226bfd 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-experiment"></i>
-      {{ i18n.t('search.index.experiments') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-experiment"></i>
+        {{ i18n.t('search.index.experiments') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index 3b1a441c4..8694c2aea 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-folder"></i>
-      {{ i18n.t('search.index.folders') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-folder"></i>
+        {{ i18n.t('search.index.folders') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index f5e2cc852..bfe50b597 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -1,10 +1,13 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4" v-if="!disabled">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-label-templates"></i>
-      {{ i18n.t('search.index.label_templates') }}
-      [{{ total }}]
-    </h2>
+  <div class="bg-white rounded p-4 mb-4" v-if="total">
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-label-templates"></i>
+        {{ i18n.t('search.index.label_templates') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index 9873a7e19..466025e87 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-protocols-templates"></i>
-      {{ i18n.t('search.index.task_protocols') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-protocols-templates"></i>
+        {{ i18n.t('search.index.task_protocols') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index 35209bb0b..ac3ca7b28 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-task"></i>
-      {{ i18n.t('search.index.tasks') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-task"></i>
+        {{ i18n.t('search.index.tasks') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index e30786e65..96769b86a 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-projects"></i>
-      {{ i18n.t('search.index.projects') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-projects"></i>
+        {{ i18n.t('search.index.projects') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index 6b6d8dc43..f19fb5e0c 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -1,10 +1,13 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-protocols-templates"></i>
-      {{ i18n.t('search.index.protocol_templates') }}
-      [{{ total }}]
-    </h2>
+  <div v-if="total" class="bg-white rounded p-4 mb-4">
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-protocols-templates"></i>
+        {{ i18n.t('search.index.protocol_templates') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index 31485882e..3e65f0fb6 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -1,10 +1,13 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-reports"></i>
-      {{ i18n.t('search.index.reports') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-reports"></i>
+        {{ i18n.t('search.index.reports') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index e7bbf34e6..e8acfe2a0 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -1,10 +1,13 @@
 <template>
   <div class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-inventory"></i>
-      {{ i18n.t('search.index.inventory_items') }}
-      [{{ total }}]
-    </h2>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-inventory"></i>
+        {{ i18n.t('search.index.inventory_items') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+    </div>
     <div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index f5f79ecbc..d16386cfd 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -1,51 +1,52 @@
 <template>
   <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <h2 class="flex items-center gap-2 mt-0 mb-4">
-      <i class="sn-icon sn-icon-results"></i>
-      {{ i18n.t('search.index.task_results') }}
-      [{{ total }}]
-    </h2>
-  </div>
-  <div>
-      <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
-            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
-      </div>
-      <div v-if="viewAll" class="mt-4">
-        <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
-      </div>
+    <div class="flex items-center">
+      <h2 class="flex items-center gap-2 mt-0 mb-4">
+        <i class="sn-icon sn-icon-results"></i>
+        {{ i18n.t('search.index.task_results') }}
+        [{{ total }}]
+      </h2>
+      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
+    <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
+      <template v-for="row in preparedResults" :key="row.id">
+        <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+          <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+        </a>
+        <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+          <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+          <span class="truncate">{{ row.attributes.created_at }}</span>
+        </div>
+        <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+          <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+          <span class="truncate">{{ row.attributes.updated_at }}</span>
+        </div>
+        <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+          <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+          <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+            <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+          </a>
+        </div>
+        <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+          <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
+          <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
+            <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
+          </a>
+        </div>
+        <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+          <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+            <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
+            <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+            </a>
+          </div>
+        </div>
+      </template>
+    </div>
+    <div v-if="viewAll" class="mt-4">
+      <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
+    </div>
+  </div>
 </template>
 
 <script>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index faa1e51b8..88b344ea9 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -1,5 +1,6 @@
 import axios from '../../../packs/custom_axios.js';
 import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
+import SortFlyout from './sort_flyout.vue';
 /* global GLOBAL_CONSTANTS */
 
 export default {
@@ -10,10 +11,12 @@ export default {
     filters: Object
   },
   components: {
-    StringWithEllipsis
+    StringWithEllipsis,
+    SortFlyout
   },
   data() {
     return {
+      sort: 'created_desc',
       results: [],
       total: 0,
       loading: false,
@@ -66,6 +69,12 @@ export default {
         }
       }
     },
+    changeSort(sort) {
+      this.sort = sort;
+      this.results = [];
+      this.page = 1;
+      this.loadData();
+    },
     loadData() {
       if (this.loading && this.page) return;
 
@@ -73,6 +82,7 @@ export default {
       axios.get(this.searchUrl, {
         params: {
           q: this.query,
+          sort: this.sort,
           filters: this.filters,
           group: this.group,
           preview: !this.selected,
diff --git a/app/javascript/vue/global_search/groups/sort_flyout.vue b/app/javascript/vue/global_search/groups/sort_flyout.vue
new file mode 100644
index 000000000..921ebae89
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/sort_flyout.vue
@@ -0,0 +1,43 @@
+<template>
+  <MenuDropdown
+      class="ml-auto"
+      :listItems="sortOptions"
+      btnClasses="btn btn-light icon-btn btn-black"
+      position="right"
+      @dtEvent="changeSort"
+      btnIcon="sn-icon sn-icon-sort-down"
+    ></MenuDropdown>
+</template>
+
+<script>
+import MenuDropdown from '../../shared/menu_dropdown.vue';
+
+export default {
+  name: 'SortFlyout',
+  props: {
+    sort: {
+      type: String,
+      default: 'created_desc'
+    }
+  },
+  components: {
+    MenuDropdown
+  },
+  computed: {
+    sortOptions() {
+      return ['created_desc', 'created_asc', 'atoz', 'ztoa'].map((sort) => (
+        {
+          emit: sort,
+          text: this.i18n.t(`search.index.${sort}`),
+          active: this.sort === sort
+        }
+      ));
+    }
+  },
+  methods: {
+    changeSort(value) {
+      this.$emit('changeSort', value);
+    }
+  }
+};
+</script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e7d6b6b9..321f844d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -481,6 +481,10 @@ en:
       untitled_protocol: 'Untitled protocol'
       protocol_template: "Protocol template"
       inventory_item: "Inventory item"
+      created_desc: "Created last"
+      created_asc: "Created first"
+      atoz: "Name A to Z"
+      ztoa: "Name Z to A"
   comments:
     save_changes: "Save changes"
     empty_state:

From 7052c767ed9e0c85026b8833a271513e3332de74 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Mon, 8 Apr 2024 14:57:14 +0200
Subject: [PATCH 038/115] Improve handling of tinymce images for pdf reports
 [SCI-10522]

---
 app/models/concerns/tiny_mce_images.rb | 21 ++++++++++++++++++++-
 app/models/tiny_mce_asset.rb           |  8 --------
 config/initializers/constants.rb       |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/models/concerns/tiny_mce_images.rb b/app/models/concerns/tiny_mce_images.rb
index 275eefb42..3a2761f9e 100644
--- a/app/models/concerns/tiny_mce_images.rb
+++ b/app/models/concerns/tiny_mce_images.rb
@@ -29,7 +29,18 @@ module TinyMceImages
         )[0]
         next unless tm_asset_to_update
 
-        tm_asset_to_update.attributes['src'].value = tm_asset.convert_to_base64
+        tm_asset = tm_asset.image.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT).processed
+
+        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
+        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
@@ -221,5 +232,13 @@ module TinyMceImages
       end
     end
   end
+
+  def convert_to_base64(image)
+    encoded_data = Base64.strict_encode64(image.download)
+    "data:#{image.blob.content_type};base64,#{encoded_data}"
+  rescue StandardError => e
+    Rails.logger.error e.message
+    "data:#{image.blob.content_type};base64,"
+  end
   # rubocop:enable Metrics/BlockLength:
 end
diff --git a/app/models/tiny_mce_asset.rb b/app/models/tiny_mce_asset.rb
index 69435f53c..0c123bc51 100644
--- a/app/models/tiny_mce_asset.rb
+++ b/app/models/tiny_mce_asset.rb
@@ -203,14 +203,6 @@ class TinyMceAsset < ApplicationRecord
     image&.blob
   end
 
-  def convert_to_base64
-    encoded_data = Base64.strict_encode64(image.download)
-    "data:#{image.blob.content_type};base64,#{encoded_data}"
-  rescue StandardError => e
-    Rails.logger.error e.message
-    "data:#{image.blob.content_type};base64,"
-  end
-
   def duplicate_file(to_asset)
     return unless image.attached?
 
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 7eebf696b..82be35fb9 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -435,7 +435,7 @@ class Constants
   ASSET_SYNC_URL = ENV['ASSET_SYNC_URL'].freeze
 
   # Grover timeout in ms
-  GROVER_TIMEOUT_MS = 300000
+  GROVER_TIMEOUT_MS = 450000
 
   # SciNote Edit supported versions
   MIN_SCINOTE_EDIT_VERSION = ENV['MIN_SCINOTE_EDIT_VERSION'].freeze

From ed3701e5ecec43158bdd1f22149f7266fe0a11d5 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Sun, 7 Apr 2024 19:34:54 +0100
Subject: [PATCH 039/115] Update icons [SCI-10480]

---
 .../assets/stylesheets/fonts/SN-icon-font.eot | Bin 32770 -> 34214 bytes
 .../assets/stylesheets/fonts/SN-icon-font.svg |  18 ++++++---
 .../assets/stylesheets/fonts/SN-icon-font.ttf | Bin 32584 -> 34028 bytes
 .../stylesheets/fonts/SN-icon-font.woff       | Bin 32660 -> 34104 bytes
 .../stylesheets/fonts/SN-icon-font.woff2      | Bin 13920 -> 14472 bytes
 vendor/assets/stylesheets/sn-icon-font.css    |  38 ++++++++++++++----
 6 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.eot b/vendor/assets/stylesheets/fonts/SN-icon-font.eot
index 7a20b74eb868233e4e880b8442cdd3a54226e7a4..e0d4dda31416d5ed277ff2d0008a1d86162b2be0 100644
GIT binary patch
delta 2719
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
X)rg$MI;4hLD>qFp43oaye<l74k&Z2-

delta 1268
zcmZ`&e@Gi=82;Y7%OyGWl4!hB6HP7`lNir<cQF@D?HOz=t?M5{x-9mO&DdJ3#8y}l
z6){ejjICu#Tq#BBC{{MsjbTbD?gvg}(86Hs2b8XebY-wn%Gg*Z(uRFe7;LbE<9nWa
zpZ9sc_r331d7GG-CTL<Bp(ELOTBD9rnZ$hjqHP@^^cjBpP7bF>_~duK`7LLb_~XZS
z5P~s;Mi&ML(x?0$6NS)NDb{I&_=9nU8o)e(xp#2*{MbwgBQ!RM5HXiIcQU>6`TZ*h
zP3&Ng?&0*<2-*Z1p~<4&eKtKj@IlGNPcc7*^<R#hd+j_Ti}~3=F^)(wHx6-F%B{f*
zu#~3>lJG5&>!<|rNJdAnr^gp*(ZVWMX{SjKU1{gSsupSSkvWBuvxNCzDs@m#rF2Qx
zr6yf(iVexi(VCj0iaZpHol)fO>gsM;ITPy~k7_**M~@aA?>scFMT<D9jYDNh-?spy
zOHxONB<Y0@-ELP>izMAH4BW|xmc*dZSMM8$cMRaAh&tjJ<sVW%nX(*eLa0L34g%h&
zVC18IBQJR9TEKfX{Db}#-(c8;3b~B1vLa*(!(Dx43<NTTyGo*rVc3RR(Dp*G$TH1J
zS4OzLEM(G&W`;Fqx@4ItD`RA5Fe5Bq7mztGvGb<vOL%A!>cs;Kfzd--z$V)KA@KWX
zBMW>TxIpH3P7TK(szV3p5Y>GCa7EodwS{e1!>bw&;;d$nePRei54~r_f|2HU5xybK
zl)+5(22+&TU@(ys2|!U(1|X;|f}jBZyeWzTASvkkf9ZdeU?oW~P$?q%{7!DE-WdRG
z-?#Vq9U_{ditePzfa^}-asUKO?N`sG`O3V9_nQn>B%pZiwpd?R2Nq!QzJ1Mr+s2&~
zJH>~`Rcw>b@!s0xFGhl1-ZLbpC+Tt%rWc4}J5=^vy4*<o;II^s)#0!b$l_>J#RBrG
zs+T~bdLM_sCJiJxc?Bn7@)1R0vW5xDZ@T_^Sp<Bhq4AAGhC2SLrTtG-f-e$&9$JnS
zBYSJ^m8mE!=Pymo5xK*!+p;NGgvaCw@+mc87&2_oG(AT@Gun+OOg_`3d4h2=$C&S#
zLP?<HZ0S(hXxT2?&wjx^w!CQBv})E%)>}5+wr+b;ZY@7uzFHBhxLomV#Up#%{+|7o
z{jPnhGEw;n=j4K154Xx~^D|Y}s$|u6^>R&n&9o!sRI|>*&VJ`=ZFy~b?bW*Wx(!#S
zYu0to_0%o7XN8n7Dl7;$gk4YEb6aG@esMwkSo})7=XH8z?}hrs`d#18{z3m%fC;F9
zt%hL3LPH_Q1*PE4;FHFo#v6^h5-SCp=%%@*XCZH>Jv7?<yS$~Olo4fCxvJb$4n0!a
z)dyiN+!tO6@3eHbEVev|NRgSyuUe<}X7pNXY3u3MwbtL-*fy!HyKSg#JEq6pid{Qk
RI?#<LS{&<g{{5K(@i%%79i;#O

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.svg b/vendor/assets/stylesheets/fonts/SN-icon-font.svg
index d1edcf652..8a3557bdd 100644
--- a/vendor/assets/stylesheets/fonts/SN-icon-font.svg
+++ b/vendor/assets/stylesheets/fonts/SN-icon-font.svg
@@ -29,7 +29,7 @@
 <glyph unicode="&#xe900;" glyph-name="info" data-tags="info" d="M865.707 576.427c-20.053 46.507-47.36 87.467-81.92 122.027s-75.093 61.867-122.027 81.92c-46.933 20.053-96.853 30.293-149.76 30.293s-102.827-10.24-149.76-30.293c-46.507-20.053-87.467-47.36-122.027-81.92s-61.867-75.093-81.92-122.027c-20.053-46.933-30.293-96.853-30.293-149.76s10.24-102.827 30.293-149.76 47.36-87.467 81.92-122.027c34.56-34.56 75.093-61.867 122.027-81.92s96.853-30.293 149.76-30.293 102.827 10.24 149.76 30.293c46.507 20.053 87.467 47.36 122.027 81.92s61.867 75.093 81.92 122.027c20.053 46.933 30.293 96.853 30.293 149.76s-10.24 102.827-30.293 149.76zM753.92 184.32c-66.133-66.133-146.773-99.413-241.92-99.413s-175.787 33.28-241.92 99.413-99.413 146.773-99.413 241.92 33.28 175.787 99.413 241.92c66.133 66.133 146.773 99.413 241.92 99.413s175.787-32.853 241.92-99.413c66.133-66.133 99.413-146.773 99.413-241.92s-33.28-175.787-99.413-241.92zM490.667 469.334h42.667v-234.667h-42.667v234.667zM512 597.334c-7.253 0-13.653-2.56-18.773-7.68s-7.68-11.093-7.68-18.773 2.56-13.653 7.68-18.773 11.093-7.68 18.773-7.68 13.653 2.56 18.773 7.68 7.68 11.093 7.68 18.773-2.56 13.653-7.68 18.773c-5.12 5.12-11.093 7.68-18.773 7.68z" />
 <glyph unicode="&#xe901;" glyph-name="arrow-left" data-tags="arrow-left" d="M222.293 456.96l211.2 211.2 29.867-30.293-189.867-189.867h558.507v-42.667h-558.507l189.867-189.867-29.867-29.867-211.2 211.2-30.293 29.867 30.293 30.293z" />
 <glyph unicode="&#xe902;" glyph-name="arrow-right" data-tags="arrow-right" d="M801.707 456.534l-211.2 211.2-29.867-30.293 189.867-189.867h-558.507v-42.667h558.507l-189.867-189.867 29.867-29.867 211.2 211.2 30.293 29.867-30.293 30.293z" />
-<glyph unicode="&#xe903;" glyph-name="visibility-show" data-tags="visibility-show" d="M521.387 277.334c-82.347 0-149.333 66.987-149.333 149.333s66.987 149.333 149.333 149.333 149.333-66.987 149.333-149.333-66.987-149.333-149.333-149.333zM521.387 533.334c-58.88 0-106.667-47.787-106.667-106.667s47.787-106.667 106.667-106.667 106.667 47.787 106.667 106.667-47.787 106.667-106.667 106.667zM521.387 192c76.8 0 147.627 21.333 212.053 63.573s113.493 99.413 147.627 171.093c-34.133 71.68-83.2 128.853-147.627 171.093s-134.827 63.573-212.053 63.573-147.627-21.333-212.053-63.573c-64.427-42.24-113.493-99.413-147.627-171.093 34.133-71.68 83.2-128.853 147.627-171.093s134.827-63.573 212.053-63.573zM521.387 149.334c-88.32 0-168.96 25.173-241.92 75.093-72.96 50.347-127.147 117.333-163.413 202.24 36.267 84.48 90.453 151.893 163.413 202.24 72.96 49.92 153.6 75.093 241.92 75.093s168.96-25.173 241.92-75.093c72.96-50.347 127.147-117.333 163.413-202.24-36.267-84.48-90.453-151.893-163.413-202.24-72.96-49.92-153.6-75.093-241.92-75.093z" />
+<glyph unicode="&#xe903;" glyph-name="visibility-show" data-tags="visibility-show" d="M490.667 320c-82.347 0-149.333 66.987-149.333 149.333s66.987 149.333 149.333 149.333c82.347 0 149.333-66.987 149.333-149.333s-66.987-149.333-149.333-149.333zM490.667 576c-58.88 0-106.667-47.787-106.667-106.667s47.787-106.667 106.667-106.667c58.88 0 106.667 47.787 106.667 106.667s-47.787 106.667-106.667 106.667zM490.667 234.667c76.8 0 147.627 21.333 212.053 63.573s113.493 99.413 147.627 171.093c-34.133 71.68-83.2 128.853-147.627 171.093s-134.827 63.573-212.053 63.573c-77.227 0-147.627-21.333-212.053-63.573s-113.493-99.413-147.627-171.093c34.133-71.68 83.2-128.853 147.627-171.093s134.827-63.573 212.053-63.573zM490.667 192c-88.32 0-168.96 25.173-241.92 75.093-72.96 50.347-127.147 117.333-163.413 202.24 36.267 84.48 90.453 151.893 163.413 202.24 72.96 49.92 153.6 75.093 241.92 75.093s168.96-25.173 241.92-75.093c72.96-50.347 127.147-117.333 163.413-202.24-36.267-84.48-90.453-151.893-163.413-202.24-72.96-49.92-153.6-75.093-241.92-75.093z" />
 <glyph unicode="&#xe904;" glyph-name="visibility-hide" data-tags="visibility-hide" d="M490.667 341.76c-80.64 3.413-154.453 28.587-221.867 74.667-6.827 4.693-13.227 9.813-19.627 14.933l-82.347-82.347-30.293 30.293 81.493 81.493c-47.36 49.92-84.48 116.053-111.36 179.2h46.080c34.133-71.68 82.347-150.187 146.347-192.427 64.427-42.24 134.827-63.573 212.053-63.573s147.627 21.333 212.053 63.573c64.427 42.24 114.347 120.747 148.48 192.427h46.080c-26.027-61.013-62.293-124.16-107.52-173.227l87.467-87.467-30.293-30.293-87.893 87.893c-8.533-7.253-17.067-14.080-26.453-20.48-66.56-45.653-139.947-70.827-219.733-74.667v-128.427h-42.667v128.427z" />
 <glyph unicode="&#xe905;" glyph-name="versions" data-tags="versions" d="M170.667 554.667l85.333-426.667h512l85.333 426.667h-682.667zM733.867 170.667h-443.733l-68.267 341.333h580.267l-68.267-341.333zM618.667 384h-213.333c-11.947 0-21.333-9.387-21.333-21.333s9.387-21.333 21.333-21.333h213.333c11.947 0 21.333 9.387 21.333 21.333s-9.387 21.333-21.333 21.333zM704 640h-384c-11.947 0-21.333-9.387-21.333-21.333s9.387-21.333 21.333-21.333h384c11.947 0 21.333 9.387 21.333 21.333s-9.387 21.333-21.333 21.333zM618.667 725.334h-213.333c-11.947 0-21.333-9.387-21.333-21.333s9.387-21.333 21.333-21.333h213.333c11.947 0 21.333 9.387 21.333 21.333s-9.387 21.333-21.333 21.333z" />
 <glyph unicode="&#xe906;" glyph-name="users" data-tags="users" d="M966.827 424.534c-8.107 10.667-18.347 19.627-31.147 26.027-28.16 13.653-55.467 23.040-83.2 29.867-28.16 6.827-56.747 10.24-84.907 10.24s-56.747-3.413-84.907-10.24v-44.373c3.413 0.853 6.827 2.133 10.24 2.987 24.747 5.973 49.92 8.96 75.093 8.96s50.347-2.987 75.093-8.96 49.067-14.507 72.96-26.027c7.253-3.84 12.8-8.533 16.64-13.653 3.84-5.547 5.973-11.52 5.973-18.347v-18.347h-128v-42.667h170.667v61.013c0 15.787-5.12 30.72-14.507 43.52zM512 320.427c37.547 0 75.093-4.267 112.64-13.227 37.12-8.96 73.813-21.76 109.227-38.827 10.667-5.547 19.2-12.8 25.173-20.907s8.96-17.493 8.96-27.307v-27.733h-512v27.733c0 9.813 2.987 19.2 8.96 27.307s14.507 14.933 25.173 20.907c35.413 17.067 72.107 30.293 109.227 38.827 37.12 8.96 74.667 13.227 112.64 13.227zM512 363.094c-40.96 0-81.92-4.693-122.453-14.507-40.107-9.387-79.787-23.893-117.76-42.24-17.92-9.387-31.147-20.48-40.96-34.133-11.52-15.36-17.493-33.707-17.493-52.48v-70.4h597.333v70.4c0 18.773-5.973 37.12-17.067 52.48-9.813 13.227-23.040 24.32-39.253 33.28-39.68 19.2-79.36 33.28-119.467 43.093-40.533 9.813-81.493 14.507-122.453 14.507h-0.427zM512 661.334c46.933 0 85.333-38.4 85.333-85.333s-38.4-85.333-85.333-85.333-85.333 38.4-85.333 85.333 38.4 85.333 85.333 85.333zM512 704c-70.4 0-128-57.6-128-128s57.6-128 128-128 128 57.6 128 128-57.6 128-128 128zM768 661.334c12.373 0 21.333-3.84 29.867-12.373 8.533-8.96 12.8-18.347 12.8-30.293s-3.84-21.76-12.373-30.293c-8.533-8.533-17.92-12.373-30.293-12.373s-21.76 3.84-30.293 12.373c-8.533 8.533-12.373 17.92-12.373 30.293s3.84 21.333 12.8 30.293c8.533 8.533 17.92 12.373 29.867 12.373zM768 704c-23.893 0-43.947-8.533-60.587-25.173s-24.747-36.693-24.747-60.16 8.107-43.947 24.747-60.587 36.693-24.747 60.587-24.747 43.947 8.107 60.587 24.747 24.747 36.693 24.747 60.587-8.107 43.093-24.747 60.16c-16.64 16.64-36.693 25.173-60.587 25.173zM256 661.334c12.373 0 21.333-3.84 29.867-12.373 8.533-8.96 12.8-18.347 12.8-30.293s-3.84-21.76-12.373-30.293c-8.533-8.533-17.92-12.373-30.293-12.373s-21.76 3.84-30.293 12.373c-8.533 8.533-12.373 17.92-12.373 30.293s3.84 21.333 12.8 30.293c8.533 8.533 17.92 12.373 29.867 12.373zM256 704c-23.893 0-43.947-8.533-60.587-25.173s-24.747-36.693-24.747-60.16 8.107-43.947 24.747-60.587 36.693-24.747 60.587-24.747 43.947 8.107 60.587 24.747 24.747 36.693 24.747 60.587-8.107 43.093-24.747 60.16c-16.64 16.64-36.693 25.173-60.587 25.173zM85.333 363.094v18.347c0 6.827 2.133 12.8 5.973 18.347s9.387 10.24 16.64 13.653c23.893 11.52 48.213 20.053 72.96 26.027s49.92 8.96 75.093 8.96 50.347-2.987 75.093-8.96c3.413-0.853 6.827-2.133 10.24-2.987v44.373h-0.427c-28.16 6.827-56.747 10.24-84.907 10.24s-56.747-3.413-84.907-10.24c-27.733-6.4-55.040-16.213-81.493-29.013-14.507-7.68-24.747-16.213-32.427-26.88-9.387-12.8-14.507-27.733-14.507-43.52v-61.013h170.667v42.667h-128z" />
@@ -37,17 +37,17 @@
 <glyph unicode="&#xe908;" glyph-name="updates" data-tags="updates" d="M896 489.814l-20.053 44.8-43.947 20.907 43.947 20.907 20.053 44.8 20.48-44.8 43.52-20.907-43.52-20.907-20.48-44.8zM768 674.987l-30.72 67.84-66.133 32 66.133 32 30.72 67.84 31.147-67.84 66.133-32-66.133-32-31.147-67.84zM341.333-21.333c-20.053 0-37.12 6.827-51.2 20.48s-22.613 30.293-25.6 49.92h153.6c-2.987-19.627-11.52-36.267-25.6-49.92s-31.147-20.48-51.2-20.48zM192 126.72v43.947h298.667v-43.947h-298.667zM194.133 248.32c-39.68 26.88-71.253 61.44-94.72 103.253s-35.413 87.893-35.413 138.24c0 79.787 26.88 147.2 80.64 202.24s119.467 82.773 196.693 82.773 142.933-27.733 196.693-82.773c53.76-55.040 80.64-122.88 80.64-202.24 0-50.347-11.947-96.427-34.987-138.24-23.467-41.813-55.040-75.947-95.147-103.253h-294.4zM206.933 292.267h268.8c32 23.467 56.747 52.48 74.24 86.613 17.493 34.56 26.027 71.253 26.027 110.933 0 67.413-22.613 124.16-68.267 171.093s-101.12 70.4-166.4 70.4-120.747-23.467-166.4-70.4c-45.653-46.933-68.267-103.68-68.267-171.093 0-39.68 8.533-76.373 26.027-110.933s42.24-63.147 74.24-86.613z" />
 <glyph unicode="&#xe909;" glyph-name="teams" data-tags="teams" d="M128 149.334v59.733c0 20.053 5.12 37.12 15.36 51.2s23.893 25.6 40.96 34.133c37.12 17.92 73.813 32 110.507 42.24s80.64 15.36 131.84 15.36 95.147-5.12 131.84-15.36c36.693-10.24 73.387-24.32 110.507-42.24 17.067-8.533 30.72-20.053 40.96-34.133s15.36-31.147 15.36-51.2v-59.733h-597.333zM426.667 448c-35.413 0-65.707 12.373-90.453 37.547-24.747 24.747-37.547 55.040-37.547 90.453s12.373 64.853 37.547 90.027c24.747 25.173 55.040 37.973 90.453 37.973s64.853-12.8 90.027-37.973c25.173-25.173 37.973-55.467 37.973-90.027s-12.8-65.707-37.973-90.453c-25.173-24.747-55.467-37.547-90.027-37.547zM736.853 576c0-35.413-12.8-65.707-37.973-90.453s-55.467-37.547-90.027-37.547c-2.133 0-4.693 0-7.253 0.427-2.987 0-5.12 0.427-6.4 0.427 14.080 17.92 25.173 37.547 33.28 59.307 7.68 21.76 11.52 44.373 11.52 67.84s-4.267 44.8-12.373 66.133c-8.107 21.333-19.2 41.387-32.427 59.733 2.133 0.853 4.267 1.28 6.4 1.707 2.133 0 4.693 0.427 7.253 0.427 34.987 0 64.853-12.8 90.027-37.973s37.973-55.467 37.973-90.027zM170.667 192h512v17.067c0 9.813-2.56 18.773-7.68 26.027-5.12 7.68-13.653 14.933-26.453 21.76-32 17.067-65.707 29.867-100.693 38.827-35.413 8.96-75.52 13.227-121.173 13.227s-85.76-4.267-121.173-13.227c-35.413-8.96-68.693-21.76-100.693-38.827-12.8-7.253-21.76-14.507-26.453-21.76-5.12-7.253-7.253-16.213-7.253-26.027v-17.067zM426.667 490.667c23.467 0 43.52 8.533 60.16 25.173s25.173 36.693 25.173 60.16-8.533 43.52-25.173 60.16c-16.64 16.64-36.693 25.173-60.16 25.173s-43.52-8.533-60.16-25.173c-16.64-16.64-25.173-36.693-25.173-60.16s8.533-43.52 25.173-60.16c16.64-16.64 36.693-25.173 60.16-25.173zM780.8 226.987v-77.653h115.2v77.653c0 18.347-5.12 34.987-14.933 50.773-9.813 15.36-23.893 28.16-41.813 38.4-18.347 9.813-37.12 19.2-55.893 27.307-18.773 8.533-38.4 14.933-58.027 19.2 17.92-16.64 31.573-36.693 40.96-60.587 9.387-23.467 14.507-48.64 14.507-75.093z" />
 <glyph unicode="&#xe90a;" glyph-name="task" data-tags="task" d="M467.2 218.454l211.2 212.48-29.867 29.867-181.333-180.48-91.733 90.453-29.867-29.867 121.6-122.88zM282.88 42.667c-20.053 0-36.267 6.4-49.493 19.627s-19.627 29.867-19.627 49.493v629.76c0 20.053 6.4 36.267 19.627 49.493s29.867 19.627 49.493 19.627h336.213l192-192v-506.88c0-20.053-6.4-36.267-19.627-49.493s-29.867-19.627-49.493-19.627h-459.52zM597.76 597.334v170.667h-314.88c-7.253 0-13.227-2.56-18.773-8.107-5.547-5.12-8.107-11.52-8.107-18.773v-629.333c0-7.253 2.56-13.227 8.107-18.773 5.12-5.547 11.52-8.107 18.773-8.107h458.667c7.253 0 13.227 2.56 18.773 8.107 5.547 5.12 8.107 11.52 8.107 18.773v485.547h-170.667z" />
-<glyph unicode="&#xe90b;" glyph-name="task-status-flow" data-tags="task-status-flow" d="M194.207 412.22c13.261 0 24.011 10.748 24.011 24.009v47.083c0 64.97 51.318 118.171 117.701 118.171h403.482l-108.288-108.285 32.956-33.425 166.195 164.78-166.195 164.782-32.956-33.427 108.288-108.285h-403.482c-91.336 0-165.252-74.387-165.252-164.31v-47.552c0-13.001 10.54-23.539 23.54-23.539zM489.873 402.803l108.284-108.284-309.789 0.939c-66.383 0-117.701-52.727-117.701-117.7v-47.552c0-13.001 10.54-23.539 23.54-23.539s23.54 10.539 23.54 23.539v47.552c0 38.135 31.073 70.622 70.621 70.622h309.789l-108.284-108.288 32.956-33.425 166.195 164.783-166.195 164.779-32.956-33.425z" />
+<glyph unicode="&#xe90b;" glyph-name="task-status-flow" data-tags="task-status-flow" d="M218.218 436.228v47.083c0 64.97 51.318 118.171 117.701 118.171h403.482l-108.288-108.285 32.956-33.425 166.195 164.78-166.195 164.782-32.956-33.427 108.288-108.285h-403.482c-91.336 0-165.252-74.387-165.252-164.31v-47.552l47.551 0.469zM489.873 402.803l108.284-108.284-309.789 0.939c-66.383 0-117.701-52.727-117.701-117.7v-47.552h47.081v47.552c0 38.135 31.073 70.622 70.621 70.622h309.789l-108.284-108.288 32.956-33.425 166.195 164.783-166.195 164.779-32.956-33.425z" />
 <glyph unicode="&#xe90c;" glyph-name="task-data-display" data-tags="task-data-display" d="M789.333 175.787v501.76c0 20.053-6.4 36.267-19.627 49.493s-29.867 19.627-49.493 19.627h-416.427c-20.053 0-36.267-6.4-49.493-19.627s-19.627-29.867-19.627-49.493v-501.76c0-20.053 6.4-36.267 19.627-49.493s29.867-19.627 49.493-19.627h416.427c20.053 0 36.267 6.4 49.493 19.627s19.627 29.867 19.627 49.493zM746.667 175.787c0-7.253-2.56-13.227-8.107-18.773-5.12-5.547-11.52-8.107-18.773-8.107h-416c-7.253 0-13.227 2.56-18.773 8.107-5.547 5.12-8.107 11.52-8.107 18.773v501.76c0 7.253 2.56 13.227 8.107 18.773 5.12 5.547 11.52 8.107 18.773 8.107h416.427c7.253 0 13.227-2.56 18.773-8.107 5.547-5.12 8.107-11.52 8.107-18.773v-501.76h-0.427zM192 192h-42.667v-170.667h170.667v42.667h-128v128zM618.667 320h-213.333v-42.667h213.333v42.667zM618.667 448h-213.333v-42.667h213.333v42.667zM192 789.334h128v42.667h-170.667v-170.667h42.667v128zM618.667 576h-213.333v-42.667h213.333v42.667zM832 64h-128v-42.667h170.667v170.667h-42.667v-128zM704 789.334h128v-128h42.667v170.667h-170.667v-42.667z" />
 <glyph unicode="&#xe90d;" glyph-name="tag" data-tags="tag" d="M578.56 55.467c-7.68-8.533-17.92-12.8-29.867-12.8s-22.613 4.267-31.147 12.8l-375.467 375.467c-4.267 4.267-7.68 8.96-10.24 14.507-2.56 5.12-3.84 11.093-3.84 17.493v305.067c0 11.52 4.267 21.333 12.8 29.867s18.347 12.8 29.867 12.8h305.067c5.547 0 11.093-1.28 16.64-3.413 5.12-2.133 10.24-5.12 14.507-9.387l375.893-375.467c8.533-8.533 12.8-19.2 13.227-31.573 0-12.373-3.84-22.613-12.373-30.293l-305.067-305.067zM547.413 85.334l306.347 305.067-377.6 377.6h-305.067v-305.067l376.747-377.6zM277.333 618.667c11.947 0 22.187 4.267 30.293 12.373s12.373 18.347 12.373 30.293-4.267 22.187-12.373 30.293c-8.107 8.107-18.347 12.373-30.293 12.373s-22.187-4.267-30.293-12.373c-8.107-8.107-12.373-18.347-12.373-30.293s4.267-22.187 12.373-30.293c8.107-8.107 18.347-12.373 30.293-12.373z" />
-<glyph unicode="&#xe90e;" glyph-name="tag-color" data-tags="tag-color" d="M640 426.667c0-70.692-57.308-128-128-128s-128 57.308-128 128c0 70.692 57.308 128 128 128s128-57.308 128-128z" />
+<glyph unicode="&#xe90e;" glyph-name="alert-dot" data-tags="alert-dot" d="M640 426.667c0-70.692-57.308-128-128-128s-128 57.308-128 128c0 70.692 57.308 128 128 128s128-57.308 128-128z" />
 <glyph unicode="&#xe90f;" glyph-name="tables" data-tags="tables" d="M810.667 768h-597.333c-23.467 0-42.667-19.2-42.667-42.667v-597.333c0-23.467 19.2-42.667 42.667-42.667h597.333c23.467 0 42.667 19.2 42.667 42.667v597.333c0 23.467-19.2 42.667-42.667 42.667zM213.333 725.334h597.333v-170.667h-597.333v170.667zM384 128h-170.667v170.667h170.667v-170.667zM384 341.334h-170.667v170.667h170.667v-170.667zM597.333 128h-170.667v170.667h170.667v-170.667zM597.333 341.334h-170.667v170.667h170.667v-170.667zM810.667 128h-170.667v170.667h170.667v-170.667zM810.667 341.334h-170.667v170.667h170.667v-170.667z" />
 <glyph unicode="&#xe910;" glyph-name="support" data-tags="support" d="M512 42.667c-53.333 0-103.253 10.24-149.76 30.293-46.507 20.48-87.040 47.787-121.6 82.347s-61.867 75.093-82.347 121.6c-20.053 46.507-30.293 96.427-30.293 149.76s10.24 103.253 30.293 149.76c20.48 46.507 47.787 87.040 82.347 121.6s75.093 61.867 121.6 82.347c46.507 20.053 96.427 30.293 149.76 30.293s103.253-10.24 149.76-30.293c46.507-20.48 87.040-47.787 121.6-82.347s61.867-75.093 81.92-121.6c20.053-46.507 30.293-96.427 30.293-149.76s-10.24-103.253-30.293-149.76c-20.48-46.507-47.787-87.040-81.92-121.6s-75.093-61.867-121.6-82.347c-46.507-20.053-96.427-30.293-149.76-30.293zM388.267 108.8l74.667 168.533c-23.467 7.68-43.947 20.48-61.013 37.547s-29.867 37.547-38.4 61.013l-171.52-70.4c17.067-45.653 42.667-85.333 76.8-119.467s73.813-59.733 119.467-76.8zM363.52 477.867c7.253 23.467 19.2 43.52 36.693 59.733s37.547 28.587 60.16 37.547l-70.4 171.52c-46.080-17.92-86.187-43.947-120.32-77.653-34.133-34.133-60.16-74.24-77.653-120.32l171.52-70.4zM512 311.467c32 0 59.307 11.093 81.493 33.707s33.707 49.493 33.707 81.493-11.093 59.307-33.707 81.493c-22.613 22.187-49.493 33.707-81.493 33.707s-59.307-11.093-81.493-33.707c-22.613-22.613-33.707-49.493-33.707-81.493s11.093-59.307 33.707-81.493c22.187-22.613 49.493-33.707 81.493-33.707zM635.733 108.8c44.8 17.067 84.053 42.667 117.76 76.373s59.307 72.96 76.373 117.76l-168.533 74.667c-7.253-22.613-19.2-42.667-36.267-59.733s-37.12-30.293-59.733-39.68l70.4-169.813zM660.48 480l169.813 70.4c-17.067 44.8-42.667 84.053-76.373 117.76s-72.96 59.307-117.76 76.373l-70.4-170.667c21.333-8.533 40.107-20.907 56.32-36.693 16.213-16.213 29.013-34.987 38.4-57.173z" />
 <glyph unicode="&#xe911;" glyph-name="steps" data-tags="steps" d="M426.667 597.334h-170.667v42.667h170.667v-42.667zM426.667 469.334h-170.667v42.667h170.667v-42.667zM426.667 341.334h-170.667v42.667h170.667v-42.667zM426.667 213.334h-170.667v42.667h170.667v-42.667zM622.933 328.107l-68.267 68.267 30.293 30.293 37.973-38.4 123.733 123.733 30.293-30.293-154.027-153.6zM810.667 725.334c23.467 0 42.667-19.2 42.667-42.667v-512c0-23.467-19.2-42.667-42.667-42.667h-597.333c-23.467 0-42.667 19.2-42.667 42.667v512c0 23.467 19.2 42.667 42.667 42.667h597.333zM213.333 768c-46.933 0-85.333-38.4-85.333-85.333v-512c0-46.933 38.4-85.333 85.333-85.333h597.333c46.933 0 85.333 38.4 85.333 85.333v512c0 46.933-38.4 85.333-85.333 85.333h-597.333z" />
 <glyph unicode="&#xe912;" glyph-name="status-not-started" data-tags="status-not-started" d="M852.48 410.027v-0.853c0.853 7.68 0.853 14.933 0.853 22.613s-0.853 15.36-0.853 22.613l-40.107-2.56c0.853-6.4 0.853-13.227 0.853-19.627s-0.853-13.227-0.853-19.627l40.107-2.56zM835.413 541.44c-4.693 14.507-10.667 28.16-17.067 41.387l-36.267-17.493c5.973-11.947 11.093-23.893 15.36-36.267l37.973 12.8zM768.853 656.214v0c-9.813 11.093-20.48 21.76-31.573 31.573l-26.453-29.867c9.813-8.533 18.773-17.92 27.733-27.733l30.293 26.453zM663.040 738.134c-13.227 6.827-27.307 12.373-41.387 17.067l-12.8-37.973c12.8-4.693 25.173-9.813 36.693-15.36l17.493 36.267zM621.653 110.080c14.507 4.693 28.16 10.667 41.387 17.067l-17.493 36.267c-12.373-5.973-24.32-11.093-36.693-15.36l12.8-37.973zM736.853 176.214v0c11.093 9.813 21.76 20.48 31.573 31.573l-30.293 26.453c-8.533-9.813-17.493-18.773-27.733-27.733l26.453-29.867zM817.92 281.6c6.827 13.227 12.373 27.307 17.067 41.387l-37.973 12.8c-4.693-12.8-9.813-24.747-15.36-36.267l36.267-17.493zM171.52 454.827v0.853c-0.853-7.68-0.853-14.933-0.853-22.613s0.853-15.36 0.853-22.613l40.107 2.56c-0.853 6.4-0.853 13.227-0.853 19.627s0.853 13.227 0.853 19.627l-40.107 2.56zM188.587 323.414c4.693-14.507 10.667-28.16 17.067-41.387l36.267 17.493c-5.973 11.947-11.093 23.893-15.36 36.267l-37.973-12.8zM255.147 208.64v0c9.813-11.093 20.48-21.76 31.573-31.573l26.453 29.867c-9.813 8.533-18.773 17.92-27.733 27.733l-30.293-26.453zM360.96 127.147c13.227-6.827 27.307-12.373 41.387-17.067l12.8 37.973c-12.8 4.693-25.173 9.813-36.693 15.36l-17.493-36.267zM402.347 754.774c-14.507-4.693-28.16-10.667-41.387-17.067l17.493-36.267c12.373 5.973 24.32 11.093 36.693 15.36l-12.8 37.973zM287.147 688.64v0c-11.093-9.813-21.76-20.48-31.573-31.573l30.293-26.453c8.533 9.813 17.493 18.773 27.733 27.733l-26.453 29.867zM205.653 583.254c-6.827-13.227-12.373-27.307-17.067-41.387l37.973-12.8c4.693 12.8 9.813 24.747 15.36 36.267l-36.267 17.493zM489.813 767.147l2.987-40.107c13.227 0.853 26.453 0.853 39.253 0l2.987 40.107c-14.933 0.853-29.867 0.853-44.373 0v0zM534.613 86.187l-2.987 40.107c-13.227-0.853-26.453-0.853-39.253 0l-2.987-40.107c14.933-0.853 29.867-0.853 44.373 0v0z" />
 <glyph unicode="&#xe913;" glyph-name="status-in-progress" data-tags="status-in-progress" d="M512 768c-188.587 0-341.333-152.747-341.333-341.333s152.747-341.333 341.333-341.333c120.747 0 226.56 62.72 287.147 157.013v0s0.427 0.853 0.427 0.853c5.547 8.533 10.667 17.493 15.36 26.453 0.427 0.853 0.853 1.707 1.28 2.56 4.267 8.533 8.533 17.067 11.947 26.027 0.853 1.707 1.28 3.84 2.133 5.973 2.987 8.107 5.973 16.213 8.533 24.32 0.853 3.413 1.707 6.827 2.56 10.24 1.707 6.827 3.84 14.080 5.12 20.907 1.28 5.547 1.707 11.52 2.56 17.067 0.853 5.12 1.707 10.24 2.133 15.787 1.28 11.093 1.707 22.613 1.707 34.133 0.427 188.587-152.32 341.333-340.907 341.333zM573.867 134.4c-8.533-1.707-17.493-2.987-26.027-4.267-1.707 0-2.987-0.427-4.693-0.853-10.24-1.28-20.907-1.707-31.147-1.707-165.12 0-298.667 133.547-298.667 298.667s133.547 298.667 298.667 298.667v-298.667l216.747-203.947c-2.56-2.56-4.693-5.12-7.253-7.68-6.4-6.4-13.227-12.8-20.48-18.773-5.12-4.267-10.667-8.107-15.787-11.947-7.253-5.12-14.080-10.24-21.76-14.507-6.827-4.267-14.080-7.253-21.333-11.093-6.827-3.413-13.227-6.827-20.053-9.813-14.507-5.973-29.867-10.667-45.227-14.080-0.853 0-1.28 0-2.133-0.427z" />
 <glyph unicode="&#xe914;" glyph-name="status-done" data-tags="status-done" d="M853.333 426.667c0-188.513-152.82-341.333-341.333-341.333s-341.333 152.82-341.333 341.333c0 188.513 152.82 341.333 341.333 341.333s341.333-152.82 341.333-341.333z" />
-<glyph unicode="&#xe915;" glyph-name="sort" data-tags="sort" d="M463.787 271.787c-4.267 4.267-9.813 6.4-16.213 5.547s-12.373-3.84-17.92-9.387l-88.32-88.32v567.040h-42.667v-567.040l-87.893 87.893c-5.547 5.547-11.52 8.533-17.92 9.387s-11.947-0.853-16.213-5.547c-4.267-4.267-6.4-9.813-5.547-16.213s3.84-12.373 9.387-17.92l125.44-125.44s4.267-2.987 6.4-3.84c2.133-0.853 4.693-1.28 7.68-1.28s5.12 0 7.253 1.28c2.56 0.853 4.693 2.133 6.4 3.84l125.867 125.867c5.547 5.547 8.533 11.52 9.387 17.92s-0.853 11.947-5.547 16.213h0.427zM560.213 581.547c4.267-4.267 9.813-6.4 16.213-5.547s12.373 3.84 17.92 9.387l88.32 88.32v-567.040h42.667v567.040l87.893-87.893c5.547-5.547 11.52-8.533 17.92-9.387s11.947 0.853 16.213 5.547c4.267 4.267 6.4 9.813 5.547 16.213s-3.84 12.373-9.387 17.92l-125.44 125.44s-4.267 2.987-6.4 3.84c-2.133 0.853-4.693 1.28-7.68 1.28s-5.12 0-7.253-1.28c-2.56-0.853-4.693-2.133-6.4-3.84l-125.867-125.867c-5.547-5.547-8.533-11.52-9.387-17.92s0.853-11.947 5.547-16.213h-0.427z" />
+<glyph unicode="&#xe915;" glyph-name="sort" data-tags="sort" d="M585.758 572.541l88.457 88.32v-567.046h42.731v567.046l88.030-87.893 30.34 30.293-139.426 139.425-140.045-139.852 29.914-30.293zM421.375 255.087l-88.455-88.32v567.046h-42.732v-567.046l-88.028 87.893-30.34-30.293c46.212-46.144 139.52-139.52 139.52-139.52s93.902 93.973 139.949 139.947l-29.914 30.293z" />
 <glyph unicode="&#xe916;" glyph-name="sort-up" data-tags="sort-up" d="M896 149.333h-426.667v42.667h426.667v-42.667zM768 277.333h-298.667v42.667h298.667v-42.667zM640 405.333h-170.667v42.667h170.667v-42.667zM290.462 149.333v559.671l-90.42-90.174-29.375 29.374 141.129 141.129 141.129-141.129-29.375-29.374-90.42 90.174v-559.671h-42.667z" />
 <glyph unicode="&#xe917;" glyph-name="sort-down" data-tags="sort-down" d="M896 704h-426.667v42.667h426.667v-42.667zM768 576h-298.667v42.667h298.667v-42.667zM640 448h-170.667v42.667h170.667v-42.667zM333.129 746.667v-559.671l90.42 90.176 29.375-29.376-141.129-141.129-141.129 141.129 29.375 29.372 90.42-90.172v559.671h42.667z" />
 <glyph unicode="&#xe918;" glyph-name="sign-out" data-tags="sign-out" d="M242.347 114.774c-5.12 5.12-8.107 11.52-8.107 18.773v586.667c0 7.253 2.56 13.227 8.107 18.773 5.12 5.547 11.093 8.107 17.493 8.107h273.067v42.24h-273.067c-19.2 0-35.413-6.4-48.213-19.627-13.227-13.227-19.627-29.867-19.627-49.493v-586.667c0-20.053 6.4-36.267 19.627-49.493s29.44-19.627 48.213-19.627h273.067v42.667h-273.067c-6.4 0-12.373 2.56-17.493 8.107v0zM651.52 545.28l98.133-98.133h-344.32v-41.813h344.32l-98.133-98.133 29.867-30.293 150.613 149.333-150.613 149.333-29.867-30.293z" />
@@ -57,7 +57,7 @@
 <glyph unicode="&#xe91c;" glyph-name="send-solid" data-tags="send-solid" d="M772.267 741.974l-471.040-186.453c-33.707-13.227-36.267-60.16-4.267-77.227l154.88-81.92 110.080 110.080c8.107 8.107 21.76 8.107 30.293 0 8.107-8.107 8.107-21.76 0-30.293l-110.080-110.080 81.92-154.88c17.067-32 64-29.44 77.227 4.267l186.027 471.040c13.653 34.56-20.48 69.12-55.467 55.467h0.427zM350.72 295.254l-120.747-120.747c-8.533-8.533-8.533-21.76 0-30.293s21.76-8.533 30.293 0l120.747 120.747c8.533 8.533 8.533 21.76 0 30.293s-21.76 8.533-30.293 0zM290.56 385.707c-8.107 8.107-21.76 8.107-30.293 0l-60.16-60.16c-8.107-8.107-8.107-21.76 0-30.293 8.107-8.107 21.76-8.107 30.293 0l60.16 60.16c8.107 8.107 8.107 21.76 0 30.293zM440.747 204.8l-60.16-60.16c-8.533-8.533-8.533-21.76 0-30.293s21.76-8.533 30.293 0l60.16 60.16c8.533 8.533 8.533 21.76 0 30.293s-21.76 8.533-30.293 0z" />
 <glyph unicode="&#xe91d;" glyph-name="search" data-tags="search" d="M823.040 85.334l-260.267 260.693c-20.907-17.493-44.8-30.72-71.68-40.533s-54.187-14.507-81.067-14.507c-67.413 0-124.16 23.040-170.24 69.12s-69.12 102.827-69.12 169.387 23.040 123.307 69.12 169.387c46.080 46.080 102.4 69.12 168.96 69.12s123.307-23.040 169.813-69.12c46.507-46.080 69.547-102.827 69.547-169.387 0-29.013-5.12-57.173-15.787-84.48-10.24-27.307-23.893-49.92-40.533-68.693l261.12-261.547-30.293-29.013zM410.027 332.374c54.613 0 101.12 18.773 139.52 56.747 37.973 37.973 57.173 84.48 57.173 140.373s-19.2 102.4-57.173 140.373c-37.973 37.973-84.48 56.747-139.52 56.747s-102.4-18.773-140.373-56.747c-37.973-37.973-57.173-84.48-57.173-140.373s19.2-102.4 57.173-140.373c37.973-37.973 84.907-56.747 140.373-56.747z" />
 <glyph unicode="&#xe91e;" glyph-name="search-options" data-tags="search-options" d="M597.333 682.667h42.667v-213.333h-42.667v213.333zM597.333 597.334h213.333v-42.667h-213.333v42.667zM213.333 597.334h298.667v-42.667h-298.667v42.667zM469.333 298.667h341.333v-42.667h-341.333v42.667zM213.333 298.667h170.667v-42.667h-170.667v42.667zM341.333 384h42.667v-213.333h-42.667v213.333z" />
-<glyph unicode="&#xe91f;" glyph-name="results" data-tags="results" d="M762.027 725.334c29.013 0 48.213-21.76 48.213-42.667v-512c0-20.907-18.773-42.667-48.213-42.667h-500.48c-29.013 0-48.213 21.76-48.213 42.667v512c0 20.907 18.773 42.667 48.213 42.667h500.907zM261.973 768c-50.347 0-90.88-38.4-90.88-85.333v-512c0-46.933 40.96-85.333 90.88-85.333h500.48c50.347 0 90.88 38.4 90.88 85.333v512c0 46.933-40.96 85.333-90.88 85.333h-500.907zM750.507 549.974c9.813-7.68 11.093-21.76 3.413-31.147l-163.84-204.8c-3.84-4.693-9.813-8.107-16.213-8.107s-12.373 1.707-17.067 6.4l-127.573 124.16-124.587-154.027c-7.68-9.387-21.76-11.093-31.147-3.413s-11.093 21.76-3.413 31.147l139.52 172.8c3.84 4.693 9.813 7.68 16.213 8.107 6.4 0 12.373-1.707 17.067-6.4l127.573-124.16 148.48 186.027c7.68 9.387 21.76 11.093 31.147 3.413z" />
+<glyph unicode="&#xe91f;" glyph-name="results" data-tags="results" d="M762.313 746.667c29.342 0 48.354-21.655 48.354-42.667v-512c0-21.013-19.012-42.667-48.354-42.667h-500.624c-29.341 0-48.355 21.653-48.355 42.667v512c0 21.012 19.014 42.667 48.355 42.667h500.624zM261.689 789.333c-50.27 0-91.022-38.205-91.022-85.333v-512c0-47.13 40.752-85.333 91.022-85.333h500.624c50.27 0 91.021 38.204 91.021 85.333v512c0 47.128-40.751 85.333-91.021 85.333h-500.624zM754.010 539.855l-178.854-221.622-145.818 138.807-124.392-153.98-34.608 27.955 154.829 192.149c49.223-46.421 145.419-141.333 145.419-141.333l148.689 185.82 34.735-27.797z" />
 <glyph unicode="&#xe920;" glyph-name="result-text" data-tags="result-text" d="M234.667 42.667c-29.867 0-55.040 10.24-75.947 31.147-20.48 20.48-30.72 45.653-30.72 75.52v554.667c0 29.867 10.24 55.040 30.72 75.947 20.48 20.48 46.080 30.72 75.947 30.72h554.667c29.867 0 55.040-10.24 75.52-30.72s31.147-46.080 31.147-75.947v-554.667c0-29.867-10.24-55.040-31.147-75.52-20.48-20.48-45.653-31.147-75.52-31.147h-554.667zM234.667 85.334h554.667c17.92 0 32.853 6.4 45.227 18.773s18.773 27.733 18.773 45.227v554.667c0 17.92-6.4 32.853-18.773 45.227s-27.733 18.773-45.227 18.773h-554.667c-17.92 0-32.853-6.4-45.227-18.773s-18.773-27.733-18.773-45.227v-554.667c0-17.92 6.4-32.853 18.773-45.227s27.733-18.773 45.227-18.773zM512 213.334v341.333h42.667v-341.333h-42.667zM469.333 213.334v341.333h42.667v-341.333h-42.667zM682.667 554.667h-341.333s0 42.667 0 42.667h341.333v-42.667zM682.667 512h-341.333v42.667h341.333s0-42.667 0-42.667z" />
 <glyph unicode="&#xe921;" glyph-name="result-image" data-tags="result-image" d="M234.667 42.667c-29.867 0-55.040 10.24-75.947 31.147-20.48 20.48-30.72 45.653-30.72 75.52v554.667c0 29.867 10.24 55.040 30.72 75.947 20.48 20.48 46.080 30.72 75.947 30.72h554.667c29.867 0 55.040-10.24 75.52-30.72s31.147-46.080 31.147-75.947v-554.667c0-29.867-10.24-55.040-31.147-75.52-20.48-20.48-45.653-31.147-75.52-31.147h-554.667zM234.667 85.334h554.667c17.92 0 32.853 6.4 45.227 18.773s18.773 27.733 18.773 45.227v554.667c0 17.92-6.4 32.853-18.773 45.227s-27.733 18.773-45.227 18.773h-554.667c-17.92 0-32.853-6.4-45.227-18.773s-18.773-27.733-18.773-45.227v-554.667c0-17.92 6.4-32.853 18.773-45.227s27.733-18.773 45.227-18.773zM298.667 213.334l128 213.333 85.333-128 85.333 213.333 125.867-298.667h-424.533zM384 597.334c0-23.467-19.2-42.667-42.667-42.667s-42.667 19.2-42.667 42.667 19.2 42.667 42.667 42.667 42.667-19.2 42.667-42.667z" />
 <glyph unicode="&#xe922;" glyph-name="restore" data-tags="restore" d="M512 768c-128.853 0-240.64-71.68-298.667-176.64v91.307h-42.667v-170.667h170.667v42.667h-98.987c48.213 100.693 150.613 170.667 269.653 170.667 164.693 0 298.667-133.973 298.667-298.667s-133.973-298.667-298.667-298.667c-134.827 0-249.173 90.027-286.293 213.333h-43.947c37.973-147.2 171.093-256 330.24-256 188.587 0 341.333 152.747 341.333 341.333s-152.747 341.333-341.333 341.333z" />
@@ -186,4 +186,12 @@
 <glyph unicode="&#xe99d;" glyph-name="corner-gripper" data-tags="corner-gripper" d="M996.416 262.246l-298.667-298.667-30.17 30.17 298.667 298.667 30.17-30.17zM838.246-6.251l128 128 30.17-30.17-128-128-30.17 30.17z" />
 <glyph unicode="&#xe99e;" glyph-name="Stock" data-tags="Stock" d="M298.667 490.667l234.667-93.867v-264.533l-234.667-89.6-234.667 93.867v264.533l234.667 89.6zM106.667 354.133v-187.733l170.667-68.267v187.733l-170.667 68.267zM320 93.867l170.667 68.267v187.733l-170.667-68.267v-187.733zM298.667 320l157.867 64-157.867 64-157.867-64 157.867-64zM512 810.667l234.667-93.867v-264.533l-234.667-89.6-234.667 93.867v260.267l234.667 93.867zM320 674.133v-187.733l170.667-68.267v187.733l-170.667 68.267zM533.333 413.867l170.667 68.267v192l-170.667-68.267v-192zM512 640l157.867 64-157.867 64-157.867-64 157.867-64zM729.6 490.667l234.667-93.867v-264.533l-234.667-93.867-234.667 93.867v264.533l234.667 93.867zM537.6 349.867v-187.733l170.667-68.267v187.733l-170.667 68.267zM750.933 93.867l170.667 68.267v187.733l-170.667-68.267v-187.733zM729.6 320l157.867 64-157.867 64-157.867-64 157.867-64z" />
 <glyph unicode="&#xe99f;" glyph-name="Publish" data-tags="Publish" d="M178.377 738.956c5.123 5.123 11.527 8.112 18.785 8.112h587.025c7.258 0 13.235-2.562 18.786-8.112 5.547-5.123 8.111-11.1 8.111-17.504v-145.155h42.266v145.155c0 19.212-6.404 35.435-19.639 48.243-13.235 13.235-29.884 19.639-49.523 19.639h-587.025c-20.066 0-36.289-6.404-49.524-19.639s-19.639-29.458-19.639-48.243v-145.155h42.693v145.155c0 6.404 2.562 12.381 8.112 17.504h-0.427zM371.348 438.387l98.194 98.195v-429.916h41.839v429.916l98.193-98.195 30.31 29.888-149.423 150.704-149.425-150.704 30.312-29.888z" />
+<glyph unicode="&#xe9a0;" glyph-name="protocols-templates-mini" data-tags="protocols-templates-mini" d="M512 790.7l256-93.091v-249.61c0-33.434-3.217-66.15-16.785-100.467-13.551-34.266-36.817-68.638-74.795-106.615-37.931-37.931-76.642-65.57-105.865-83.742-14.63-9.101-26.944-15.863-35.678-20.386-4.369-2.261-7.846-3.964-10.274-5.124-1.216-0.576-2.167-1.020-2.842-1.327l-1.028-0.469-0.077-0.034c-0.004 0-0.047-0.021-8.657 19.499-8.913-19.379-8.917-19.379-8.922-19.379l-0.111 0.051-0.23 0.111-0.802 0.375c-0.678 0.324-1.651 0.789-2.889 1.399-2.475 1.22-6.025 3.008-10.475 5.367-8.896 4.71-21.423 11.708-36.186 20.954-29.46 18.449-68.181 46.080-104.804 82.705-36.717 36.715-59.908 71.057-73.751 105.502-13.865 34.5-17.83 67.823-17.83 101.581v249.61l256 93.091zM512 149.333l-8.922-19.379 8.738-4.019 8.794 3.878-8.61 19.52zM512.137 173.082c0.969 0.491 2.010 1.020 3.119 1.596 7.863 4.070 19.196 10.287 32.772 18.731 27.196 16.913 63.147 42.603 98.219 77.679 35.025 35.021 54.421 64.649 65.289 92.134 10.846 27.43 13.798 54.212 13.798 84.779v219.725l-213.333 77.576-213.333-77.576v-219.725c0-30.238 3.535-57.754 14.753-85.67 11.24-27.968 30.715-57.626 64.332-91.243 33.711-33.711 69.655-59.413 97.282-76.715 13.777-8.627 25.395-15.113 33.51-19.409 1.289-0.683 2.487-1.31 3.593-1.882zM640 618.667v-42.667h-256v42.667h256zM640 510.669v-42.667h-256v42.667h256zM640 405.333v-42.667h-256v42.667h256z" />
+<glyph unicode="&#xe9a1;" glyph-name="projects-mini" data-tags="projects-mini" d="M426.667 661.333v-128h-128v128h128zM725.231 362.667v-128h-128v128h128zM298.667 704c-23.564 0-42.667-19.103-42.667-42.667v-128c0-23.565 19.103-42.667 42.667-42.667h128c23.565 0 42.667 19.102 42.667 42.667v128c0 23.564-19.102 42.667-42.667 42.667h-128zM597.231 405.333c-23.565 0-42.667-19.102-42.667-42.667v-128c0-23.565 19.102-42.667 42.667-42.667h128c23.561 0 42.667 19.102 42.667 42.667v128c0 23.565-19.106 42.667-42.667 42.667h-128zM362.667 234.667c-35.346 0-64 28.655-64 64s28.654 64 64 64c35.346 0 64-28.655 64-64s-28.654-64-64-64zM362.667 192c58.91 0 106.667 47.757 106.667 106.667s-47.756 106.667-106.667 106.667c-58.91 0-106.667-47.757-106.667-106.667s47.756-106.667 106.667-106.667zM661.333 533.333c-35.345 0-64 28.654-64 64s28.655 64 64 64c35.345 0 64-28.654 64-64s-28.655-64-64-64zM661.333 490.667c58.91 0 106.667 47.756 106.667 106.667s-47.757 106.667-106.667 106.667c-58.91 0-106.667-47.756-106.667-106.667s47.757-106.667 106.667-106.667z" />
+<glyph unicode="&#xe9a2;" glyph-name="Project" data-tags="Project" d="M196.923 106.667c-19.637 0-36.034 6.579-49.19 19.733s-19.733 29.551-19.733 49.19v416.82c0 19.637 6.578 36.034 19.733 49.19s29.552 19.733 49.19 19.733h187.077v59.078c0 19.637 6.578 36.034 19.733 49.189s29.551 19.733 49.19 19.733h118.153c19.639 0 36.036-6.578 49.19-19.733s19.733-29.552 19.733-49.189v-59.078h187.076c19.639 0 36.036-6.578 49.19-19.733s19.733-29.552 19.733-49.19v-416.82c0-19.639-6.579-36.036-19.733-49.19s-29.551-19.733-49.19-19.733h-630.153zM426.667 661.333h170.667v59.078c0 6.564-2.735 12.581-8.205 18.051s-11.486 8.205-18.052 8.205h-118.153c-6.566 0-12.582-2.735-18.052-8.205s-8.205-11.487-8.205-18.051v-59.078zM853.333 426.667l-256-85.333v-64h-170.667v64l-256 85.333v-251.076c0-6.566 2.735-12.582 8.205-18.052s11.488-8.205 18.051-8.205h630.153c6.566 0 12.582 2.735 18.052 8.205s8.205 11.486 8.205 18.052v251.076zM469.333 320h85.333v85.333h-85.333v-85.333zM170.667 469.333l256-85.333v64h170.667v-64l256 85.333v123.077c0 6.564-2.735 12.581-8.205 18.051s-11.486 8.205-18.052 8.205h-630.153c-6.564 0-12.581-2.735-18.051-8.205s-8.205-11.488-8.205-18.051v-123.077z" />
+<glyph unicode="&#xe9a3;" glyph-name="Project-mini" data-tags="Project-mini" d="M177.28 164.48c15.786-15.785 35.463-23.68 59.027-23.68h551.384c23.567 0 43.244 7.895 59.028 23.68s23.68 35.461 23.68 59.028v346.584c0 23.565-7.895 43.241-23.68 59.027s-35.461 23.68-59.028 23.68h-70.892v70.893c0 23.565-7.895 43.24-23.68 59.027s-35.461 23.68-59.028 23.68h-244.184c-23.565 0-43.241-7.894-59.027-23.68s-23.68-35.462-23.68-59.027v-70.893h-70.893c-23.565 0-43.241-7.894-59.027-23.68s-23.68-35.463-23.68-59.027v-346.584c0-23.567 7.894-43.244 23.68-59.028zM665.6 652.8h-307.2v70.893c0 7.877 3.282 15.097 9.846 21.661s13.785 9.846 21.662 9.846h244.184c7.88 0 15.099-3.282 21.663-9.846s9.846-13.784 9.846-21.661v-70.893zM563.2 345.6l256 102.4v-224.492c0-7.88-3.282-15.099-9.846-21.663s-13.783-9.846-21.663-9.846h-551.384c-7.877 0-15.097 3.282-21.662 9.846-6.564 6.564-9.846 13.783-9.846 21.663v224.492l256-102.4v-51.2h102.4v51.2zM460.8 396.8l-256 102.4v70.893c0 7.877 3.282 15.097 9.846 21.662 6.565 6.564 13.785 9.846 21.662 9.846h551.384c7.88 0 15.099-3.282 21.663-9.846s9.846-13.785 9.846-21.662v-70.893l-256-102.4v51.2h-102.4v-51.2z" />
+<glyph unicode="&#xe9a4;" glyph-name="folder-mini" data-tags="folder-mini" d="M768 601.6h-217.088l-102.4 102.4h-192.512c-28.277 0-51.2-22.923-51.2-51.2v-409.6c0-28.278 22.923-51.2 51.2-51.2h512c28.278 0 51.2 22.922 51.2 51.2v307.2c0 28.277-22.922 51.2-51.2 51.2zM768 243.2h-512v409.6h171.008l102.4-102.4h238.592v-307.2z" />
+<glyph unicode="&#xe9a5;" glyph-name="experiment-mini" data-tags="experiment-mini" d="M307.929 140.8c-22.141 0-37.673 9.815-46.598 29.44-8.958 19.625-6.625 37.545 7 53.76l141.471 257.28v222.72h-70.255c-7.664 0-13.847 2.56-18.547 7.68-4.667 5.12-7 11.094-7 17.92 0 7.68 2.333 13.875 7 18.586 4.701 4.676 10.883 7.014 18.547 7.014h344.89c7.665 0 13.844-2.56 18.545-7.68 4.669-5.12 6.999-11.094 6.999-17.92 0-7.68-2.33-13.858-6.999-18.534-4.7-4.71-10.88-7.066-18.545-7.066h-70.257v-222.72l141.471-257.28c13.624-16.215 15.974-34.135 7.050-53.76-8.955-19.625-24.509-29.44-46.648-29.44h-408.124zM307.929 192h408.124l-152.965 271.36v240.64h-102.191v-240.64l-152.968-271.36z" />
+<glyph unicode="&#xe9a6;" glyph-name="task-mini" data-tags="task-mini" d="M339.2 140.8c-23.894 0-43.725 7.885-59.494 23.654-15.804 15.805-23.706 35.651-23.706 59.546v448c0 23.894 7.902 43.742 23.706 59.546 15.77 15.77 35.601 23.654 59.494 23.654h249.6l179.2-179.2v-352c0-23.895-7.885-43.74-23.654-59.546-15.805-15.77-35.651-23.654-59.546-23.654h-345.6zM563.2 550.4v153.6h-224c-8.534 0-15.991-3.209-22.374-9.626-6.417-6.383-9.626-13.841-9.626-22.374v-448c0-8.535 3.209-15.99 9.626-22.374 6.383-6.415 13.841-9.626 22.374-9.626h345.6c8.535 0 15.99 3.21 22.374 9.626 6.415 6.385 9.626 13.839 9.626 22.374v326.4h-153.6zM652.984 468.48l-171.313-228.413-123.272 123.269 36.204 36.209 81.528-81.531 135.892 181.187 40.96-30.72z" />
+<glyph unicode="&#xe9a7;" glyph-name="flag" data-tags="flag" d="M256 128v661.333h306.871l17.067-85.333h230.729v-341.333h-221.538l-17.067 85.333h-273.395v-320h-42.667zM625.067 405.333h142.933v256h-224l-17.067 85.333h-228.267v-256h309.333l17.067-85.333z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.ttf b/vendor/assets/stylesheets/fonts/SN-icon-font.ttf
index f27f9b19abe4996557e3de34581860a1097826dd..6f3a6b27e56f84d71d0e2a73e4a7a5a03dff9b98 100644
GIT binary patch
delta 2628
zcmZ8je{2)i9e?l6cec-towIYkoPXPg?ZkEx+h_Yif{n|sth8t)EUuM}mWX0P>Oj^q
z6xM9^Dux(^E~^VFpjFjG(>3r%r*sGbs?v%{rDD>=MAub_MiuMUA6naqY7EF_-#cfd
z?CIV6e!rjhecyNQ^S<A+-&ODzzaXjzBZN$-hDen7?xwDk)kePy$OU+|Y#kjM<BNap
zL<qaV{@(VXr^i4xgRM%#_R8M!cfL7s8SHU{CJe*dhMtJ*oa{m9CpDPQ4g;W{(v5<B
z7VKriqr1m{1JS^~h7j>aW!Ki_LzgVCe}Yi$5Cj<<9U31)mobgd&;9{k{+&ak+g>*v
zK9A6|23YX+*siB{!;3=OcllRm`|xWo;D_*QGY?~uXsVI3$czM(LJuKSH%A0QWa~d7
z6IBs^o-dX1xl$<?U%4_K&*$UIN0N#4g0Mc3+|koBl1M)2bUv6&jP$JDo0T`Z-5cfX
z-qox2%GrLGt3NC6U4;v!Tq6cXjR^6T$|=9kU(95SK0h>HF`Fp@5DSOG+g28~fl#%=
z%55`2-QNtGStKH4&!n?bK+nq&Js$|t9xPFda%tkjH7Q)L1g53}6=ihomM+{}QQk|g
z>1y}jtOnyZyOL`wfmcrkDno0!0+qFi#LPs~3Bx0+fdC`ofk&B@SZxzh&x&kB@5RYP
zR*n$sOR<voxkKJpRT<nd67&+e()=YtE_n|f@+$9?2zmZe$rs$QL-Zmv<KtHt3|8bv
zF^E~e#rii<`iMRvLpYfyZaZ8qhhkR8a3&MRH`P%w<1c1jm=I5dMqd<(&t1(5YIeDr
z2^ga(Q9)uVB@!_H=lXNU-LvAzIrogi|L;euaN`TJB!Ux2NJfL`akLd}hg~VIh1Of}
zQm2EQm`sEt7QCDg!@)=={&vsd5UbLg%F20sujg<?&$T#sFJA196mRDOnScieG88CU
z73djenaADDnd~%4V@zO@))N>SL6Lg9$sxPk%NUa$BO^3`X_je8J6&F*fx3E?HW+<^
zAaM+<hpE~ER8`|4`OUY5l;F&`J?$1fLlSC8%3`6^z=V#`TiV^OOjU47!tKrTKeg+0
zF^owg-4t;;J6pJR{@R8O*Z3&MbqGSFiDpPx_f{-ciN!{uQMC}DE*6<1ksh_8Hk3vW
zpbfww!kn1V9yQfk9KAS|&Ea$yHn<-Usrs%_o{+FAsuDg`!_zh8eVZWIYOElzH5}E1
z3MfZip^(cN4m;I4>d5Cia8$KaRJBx;I8uY<wHhAyUjUn+T!lD`5vLmgT%lOQzax(a
z8WEh~XtfbFo>vb?X@^rQJC1UwA3cgH2+6@P+<AsgtC!r1p>#BvQZE=vN|PL`<&7Ay
zOPRFl9)mMO7I|=!%1Ee@4pKl%lpLm{jL3zkjKqbi4Sx~pQ}h3WwUyCYtMxp{R_h)O
zIKKqXAN*umr_&j!J(Lk7o?bxEHH2tDO08H_-p6PfH{kh$n&*>@krAx;6{`SBuQoEq
zDnPy3gtA40h-fc(Q#$BIs`s;Ep-{ZD1l)OYVBp9=p)l~w67~!*r_-1#-(wDn3F>z7
zz`$LDlmFvJgfmwy7|3(*P#X6WO9E*sCBTfj7)ax!OeECsg1`;>DIoH9W-m*$v0k&;
zWHN)^XEvKXwwpE&$i77wf2v%jD9S|Nq)i~VV+12Z&wo&*8PG5)mlqlk(WW5_sC*Kl
znao}r9=tEqy&aS(o7ap#?bH0VaDB=j%X8WWV4CQ;ayl)Q`<8&dvLvZ_MrdqFz!qEo
zpu_zDiT+xCoAY`(0;!{dPL;nT2Fsw8RU1nVuW}3@-`-eA+|g)GArt~?!dcm#ssFm*
zs&aO(`sEVgOG5%JIL-2Unq;0|M?;>FB%}<DOQ3^Bg1+u~20l4Fs|@3pj+GBvEmoHq
z<BuSb3^c`%-~(Qi=KqnhV0M9ngsoqHjnrSn#cu$Qx=^<99-WS*8sYDiLq@FE%v{xq
zBQh`Zc$3DYc0adgG@(q*eTy+XsF77TH4)l)p#5-z{#l^eWS&u8(Ih^0oT7AQS}D+G
z9nh@mcwPUEXF~nI_ub<*1{5*K4zI=rc<KAB7zwZ<mOzRCU<B&lud~XRG5o_{&apS(
z)oa9&0p-+yGK)EkiVLWyUX=Q01;>8=7te3Qk6TxKgG`X;&_2#gs((;4Sx=11`1H*1
z_#{!E9QW66{g|x|;+OG1$sdrnbQ4sCx=7un_tXE<Gx|piZo^Z?F~-KMVs<hwG4GfR
zW?fTr(~C`aEhWo-%X`+m^^NA{=0x*Zwuc>N53+N%xb025&Hk|cG5fg|XG@}GO-rfe
zEiTF(<xX;!9dXB?<1T-Y|5NLr;1$jYx1Cp9r>m}6*EM(CeaL;r)9N|nUE#gpL%x3B
zm~YCD{8#*61uTJZV0YkLFcsVvye3-2HnAY~i$}%jWpv09+8y2!{y0*K?2DXkE47_$
zx3rJ9Pqt4*JEOzV8?kU~ckDpyWW3hFbnNMPx#LX7S6!7vDRCw7SrR2%lby*;k0sBf
zimA!ehmv1<O1hACq>JgP^xe!8nG0D$cFX(ax$boLNcVy6sqTy2H<k}BKii}0arZpi
fbFp_z@7#)soGsUrJCM7cSNT>i;q=V<35EDCG<+m4

delta 1283
zcmZ`&eMlQ;7=NF;%OyF@r}5%PG`XB6F`mgKF&9naDK>7a6E<v@orN)DtF;naS&LIq
z<AljJI%XF)MiCt)6~?+TOev-Nz)2ZvVKBD+Q92RX%3woeY^)P$!`|o^Y_J!O=l6S`
z-}A}6+piK|<{^y$AykBB5Q)U6j{1WJGrfjyKEYq_iQ(jkHSw(rA+TY7>{RmH2)0Jd
z3s!R~H9kQ6{{0)6k0CU=Fxa0w>2_);gvN@oUmC<0>J_RV^El=;gTv>?W_=i;u|b50
z`PA7H&B@(Q?_EM@Vizar98Qjnpj$vAG+796oJkJ%zgP77$C#hQ0iTbYJ$D{Aici{e
z@y6q@{3bjJ%egKf3D+{YhUc&%5j}xZIbGpKDHLQ&Ei~z*OD$|DD1{qcWadRuOcUA`
zMQM>0MHXaPXprTG=#UsVQc-avAPz;NrvqYVd3mQ8I2~;tk4W8>mEBTgy#4UF6e-|{
zG!CVTe2@Z=EC{Wwf*|MLcR1_`DV%WFF>oZpQUZf|SFNkRt+gMU0%~o;DCePm)TCL|
zfKW+LY609Rr?y7iYAffYs{r?^`Um~Xzs~66LCB=Il@%_PAMWVYG2lt%?*!sHhSAqm
zfwb>}MLpvWbfmZ|SuT}~`x(79)gg+EPREEgZ;H!a;gB}>g6^Uw{S023fO_!4e4uvH
z1~Bm^w-4MdTCE3bHP}I9t!yw9g@_ETAVWlQxkDw@2h<cYVU0B?VJD9AgXrRYz&q*v
zRC-X;td)naNiC()QaxUU(yCM%k|F^pYFY&Zl_m%Z2$GnlC;*az-v5{WM+ruf1Qn$a
zkw>?cgJ@Et!eyp#b^rpVaWP6uf^<->=h1B<qELmR2fFEkj`>@NyUHD9V;Yqaai}em
zch*){g8}q-7MCCJD)4lL>G2O`FN|)@JjYkre^wK8c0U_AGfA5@m|h?XBU0(NXtO%A
z#8=wxVel2HBFV{1*p0~t6otu6Oi+%o|M@Imcz;m;ay&&Hd)^TH0~O)tgU=6!u7YRZ
zX0lTe$mTYt=84RO8B<z;Mc5{flMko~)sSkPrs;Y5q1vK8u5oE5wG)hu>0-WP@<pDa
zGsQ!?QQe-tPyd;I+wipEmQgakZM<%hO>3qdv(Y?YUM-21yi@W`$$d+k<z35l%N@&R
zX}t6!*2a3-Zg!R3vd)$n%MxW<<=Ki@#Z0AQ3#M(4+4^j&RpzQ#)lzk=dfnb`pR?b!
zKX3?+IZok5xdrYjx94ng-ryO&k6++F<iFtW*4S#qnhUjywR^6g+=K2-590}XHtW1~
z3w3!f>lM7$ygT(n^;hfn1ij#Gpd02J9{Os0G2f{FH*qtd1V#dLfu+E;z~TGBSa2i6
zhI&IQq20#z#>K{sun?XN|01<ZuS7046*mnu-E8``S>G%)cQy|-Z$;(kYthSxG>1Cz
OMhk1r=5}7n6Mq4L85=MF

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.woff b/vendor/assets/stylesheets/fonts/SN-icon-font.woff
index b6f9b715ed91bc8124d9703e8f82245e8f5b3db5..198b0c4dda9f9457f054119c057710da54c63256 100644
GIT binary patch
delta 2720
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
WlS?>>HHh3U<PG`XS*uO{jrt$C3o}vx

delta 1297
zcmZ`(e@Gi=82;Y7%OyFRn3#C+M>M&dCNZAzE-@EP(^ITU>x2&Jva|n8?X*^6D^#3z
z&WKPMrDIC$C`IZhsZiF9Vx*LAE6&NFg~8bNhjc|`D}$9%%Er1P*6q7E1{>_);d`Iw
zeZS}Z-jCzEeV&;A6N=tC($<Cm;V(6h@^b4T%&lqeoPAEPrB;s*^$a5f12}b5gCp^s
z_e9SbP5TUU!{4x+NRIboZ5^S}c@4yGKfFKC*YhSqV=AtZHTXORY5<E^o5j3BgMNwX
z8yFfH!`cc$1lEb!=^#SM)5me0@^%Y0ZP)PP^9PrQdd6_$32n1GhjpM&^$hi4?Izy%
zg@)^S?|nLa`pgKPXk>2Z2rQ;M;1yWRUILQvE|RNwN(U0rA?)e#M(X5nh%L0!q=zoF
zv*C~&sq>QQFG(>)7!RoG0Yz06K~aPnMX8AmiqhedlEacX7>k{h#P;Iic2PPRYaWlv
zou#Fna&)};;J6&s;;1|hg{rb=0Z0*q#zsL<c0Y2vT?sjoaJz8ePDJDc4ywJC-oB>B
zKD=mAV-t?DBh*iZ6pLyQvW4UWfDg*)9Z{d&!FlL1z-QI{6a6c{#+X||kWO+-OI&hy
zsI}X~fIqo=UurQijJc`|<Xj3C%uKD+n&hr!xMWXDEn_w&TSbvEnHbR-NOGBL95QC_
zn&u3t*YKqYs0&|M5cD28AFRC97X+V|)|<gm4lWQ`2OA2<AgVwkC=ivszOb!)k6Oc4
zT;mAIIEi=Fg6QRgz<cPNl^OIj>)_!V(n#ryR98Tyj5?ixq(}gYn$!V7wGspc1W8O%
z6aYy<_y3pvrxGkA2|7w8qA%~IrAntC<UQZ6m-mRMN@?z-L5KTJ;&uQ8Ozw5hF0yfh
z&Vo49ly2uM%gZ4j%=paSTEHXYDYPl^kK@utbfmBIWv*ZJ1f9v5ky8_NfdSJCgf<G5
zx=0u3(~tR5=K~ykP3lN;;xbNS@-anWat9NXO}PGeod^6^L-o0qBz5$S{P^!EkHP{%
zKjwF6ncSLw_D&QsS^wlLk=~fHrc_vfC*(2mIdxVys9U3HdY0bN+x5o`Uc-d(EaPN4
znD3e0Jb&J)eS@Y^)3&+SeAoOW|JD3;i){J8a?7e%SFKMAECu}q%eI*9lI>gDBYTtm
zL;EfJefwr%OW{q{$p+X?cA4FBOcz;-5=C3ZnUZ+PRH^C=rJQZfUgvUIL0P=)N_o6|
z&DHFhac#Jsy9M_Qr*fm*Ja>cJ_B45J^9<k1&-0(~U-26i&I+;OLghl`w)bb>fN#^!
z_(T59szB9z)oy?d2!WNr)9S(M8`ax_SqRk7HM2E4!HQr!I9mIwxGAa9urwoGkyfOG
zk3#X#!!R4}4ljjY)HT;F)IE#{k?F`|xmkWUdbNIEeSiI(`ezO12BD$7VX$E<ro_(2
TuI@MN$InXc>C0qe)4Rl96$&G6

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.woff2 b/vendor/assets/stylesheets/fonts/SN-icon-font.woff2
index 5b095a456756954699b6b0dba36e340caee84e1f..ed0f4ee8b1355fc06a3001ab4d85a3ec01e4eb41 100644
GIT binary patch
literal 14472
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
a7vzx+SKhMs7Z?g?tkz_$3Y+OOj)MazQ#(EY

literal 13920
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

diff --git a/vendor/assets/stylesheets/sn-icon-font.css b/vendor/assets/stylesheets/sn-icon-font.css
index e5c37c861..4d1d665b8 100644
--- a/vendor/assets/stylesheets/sn-icon-font.css
+++ b/vendor/assets/stylesheets/sn-icon-font.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'SN-icon-font';
-  src:  url('fonts/SN-icon-font.eot?ipmaca');
-  src:  url('fonts/SN-icon-font.eot?ipmaca#iefix') format('embedded-opentype'),
-    url('fonts/SN-icon-font.woff2?ipmaca') format('woff2'),
-    url('fonts/SN-icon-font.ttf?ipmaca') format('truetype'),
-    url('fonts/SN-icon-font.woff?ipmaca') format('woff'),
-    url('fonts/SN-icon-font.svg?ipmaca#SN-icon-font') format('svg');
+  src:  url('fonts/SN-icon-font.eot?o0xor4');
+  src:  url('fonts/SN-icon-font.eot?o0xor4#iefix') format('embedded-opentype'),
+    url('fonts/SN-icon-font.woff2?o0xor4') format('woff2'),
+    url('fonts/SN-icon-font.ttf?o0xor4') format('truetype'),
+    url('fonts/SN-icon-font.woff?o0xor4') format('woff'),
+    url('fonts/SN-icon-font.svg?o0xor4#SN-icon-font') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -68,7 +68,7 @@
 .sn-icon-tag:before {
   content: "\e90d";
 }
-.sn-icon-tag-color:before {
+.sn-icon-alert-dot:before {
   content: "\e90e";
 }
 .sn-icon-tables:before {
@@ -506,3 +506,27 @@
 .sn-icon-Publish:before {
   content: "\e99f";
 }
+.sn-icon-protocols-templates-mini:before {
+  content: "\e9a0";
+}
+.sn-icon-projects-mini:before {
+  content: "\e9a1";
+}
+.sn-icon-Project:before {
+  content: "\e9a2";
+}
+.sn-icon-Project-mini:before {
+  content: "\e9a3";
+}
+.sn-icon-folder-mini:before {
+  content: "\e9a4";
+}
+.sn-icon-experiment-mini:before {
+  content: "\e9a5";
+}
+.sn-icon-task-mini:before {
+  content: "\e9a6";
+}
+.sn-icon-flag:before {
+  content: "\e9a7";
+}

From cc9007821953eef03e616c0a7099194d70dec15e Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Sun, 7 Apr 2024 19:36:02 +0100
Subject: [PATCH 040/115] Implement skeleton loading for object groups in
 global search page [SCI-10480]

---
 .../javascripts/sitewide/constants.js.erb     |  3 +-
 .../stylesheets/application.tailwind.css      | 12 +++
 app/controllers/search_controller.rb          |  6 +-
 .../vue/global_search/groups/assets.vue       | 28 +++---
 .../vue/global_search/groups/experiments.vue  | 28 +++---
 .../vue/global_search/groups/folders.vue      | 28 +++---
 .../global_search/groups/label_templates.vue  | 30 +++---
 .../groups/my_module_protocols.vue            | 14 ++-
 .../vue/global_search/groups/my_modules.vue   | 14 ++-
 .../vue/global_search/groups/projects.vue     | 30 +++---
 .../vue/global_search/groups/protocols.vue    | 30 +++---
 .../vue/global_search/groups/reports.vue      | 28 +++---
 .../global_search/groups/repository_rows.vue  | 30 +++---
 .../vue/global_search/groups/results.vue      | 96 ++++++++++---------
 .../vue/global_search/groups/search_mixin.js  | 23 ++++-
 app/javascript/vue/global_search/loader.vue   | 43 +++++++++
 config/locales/en.yml                         |  1 +
 17 files changed, 295 insertions(+), 149 deletions(-)
 create mode 100644 app/javascript/vue/global_search/loader.vue

diff --git a/app/assets/javascripts/sitewide/constants.js.erb b/app/assets/javascripts/sitewide/constants.js.erb
index b88b22bd5..ff1416e1e 100644
--- a/app/assets/javascripts/sitewide/constants.js.erb
+++ b/app/assets/javascripts/sitewide/constants.js.erb
@@ -18,5 +18,6 @@ const GLOBAL_CONSTANTS = {
   SLOW_STATUS_POLLING_INTERVAL: <%= Constants::SLOW_STATUS_POLLING_INTERVAL %>,
   ASSET_POLLING_INTERVAL: <%= Constants::ASSET_POLLING_INTERVAL %>,
   ASSET_SYNC_URL: '<%= Constants::ASSET_SYNC_URL %>',
-  GLOBAL_SEARCH_PREVIEW_LIMIT: <%= Constants::GLOBAL_SEARCH_PREVIEW_LIMIT %>
+  GLOBAL_SEARCH_PREVIEW_LIMIT: <%= Constants::GLOBAL_SEARCH_PREVIEW_LIMIT %>,
+  SEARCH_LIMIT: <%= Constants::SEARCH_LIMIT %>
 };
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
index 500094825..400c99bdf 100644
--- a/app/assets/stylesheets/application.tailwind.css
+++ b/app/assets/stylesheets/application.tailwind.css
@@ -60,3 +60,15 @@ html {
 .ag-theme-alpine {
   --ag-font-family: "SN Inter", "Open Sans", Arial, Helvetica, sans-serif !important;
 }
+
+.animate-skeleton {
+  background-image: linear-gradient(90deg, #ddd 0px, #e8e8e8 40px, #ddd 80px);
+  background-size: 500px;
+  animation: shine-lines 1.6s infinite linear
+}
+
+@keyframes shine-lines {
+  0% { background-position: -150px }
+  
+  40%, 100% { background-position: 320px }
+}
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 3905cb3ed..6180275de 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -453,13 +453,13 @@ class SearchController < ApplicationController
   end
 
   def search_protocols
-    @protocol_results = []
+    @protocol_results = Protocol.none
     @protocol_results = search_by_name(Protocol) if @protocol_search_count.positive?
     @search_count = @protocol_search_count
   end
 
   def search_label_templates
-    @label_template_results = []
+    @label_template_results = LabelTemplate.none
     @label_template_results = search_by_name(LabelTemplate) if @label_template_search_count.positive?
     @search_count = @label_template_search_count
   end
@@ -494,7 +494,7 @@ class SearchController < ApplicationController
   end
 
   def search_repository_rows
-    @repository_row_results = []
+    @repository_row_results = RepositoryRow.none
     @repository_row_results = search_by_name(RepositoryRow) if @repository_row_search_count.positive?
     @search_count = @repository_row_search_count
   end
diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index 4f8a39f4e..244ecc472 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-files"></i>
-        {{ i18n.t('search.index.files') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-files"></i>
+          {{ i18n.t('search.index.files') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a target="_blank" :href="row.attributes.parent.url"
@@ -48,16 +48,22 @@
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'AssetsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'AssetsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'assets'
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index 320226bfd..0456971b9 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-experiment"></i>
-        {{ i18n.t('search.index.experiments') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-experiment"></i>
+          {{ i18n.t('search.index.experiments') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -41,15 +41,21 @@
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ExperimentsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ExperimentsComponent',
+  components: {
+    Loader
+  },
   mixins: [searchMixin],
   data() {
     return {
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index 8694c2aea..19602c053 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-folder"></i>
-        {{ i18n.t('search.index.folders') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-folder"></i>
+          {{ i18n.t('search.index.folders') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
           <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -39,16 +39,22 @@
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'FoldersComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'FoldersComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'project_folders'
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index bfe50b597..647fe1db8 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -1,14 +1,14 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4" v-if="total">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-label-templates"></i>
-        {{ i18n.t('search.index.label_templates') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="!disabled && total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-label-templates"></i>
+          {{ i18n.t('search.index.label_templates') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -39,19 +39,25 @@
           </div>
         </template>
       </div>
-      <div v-if="!selected && total > 4" class="mt-4">
+      <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'LabelTemplatesComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'LabelTemplatesComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'label_templates'
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index 466025e87..d748f480e 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -1,6 +1,7 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
       <h2 class="flex items-center gap-2 mt-0 mb-4">
         <i class="sn-icon sn-icon-protocols-templates"></i>
         {{ i18n.t('search.index.task_protocols') }}
@@ -8,7 +9,6 @@
       </h2>
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
-    <div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -51,16 +51,22 @@
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModuleProtocolsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'MyModuleProtocolsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'module_protocols'
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index ac3ca7b28..59ed95443 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -1,6 +1,7 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
       <h2 class="flex items-center gap-2 mt-0 mb-4">
         <i class="sn-icon sn-icon-task"></i>
         {{ i18n.t('search.index.tasks') }}
@@ -8,7 +9,6 @@
       </h2>
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
-    <div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -45,15 +45,21 @@
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModulesComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'MyModulesComponent',
+  components: {
+    Loader
+  },
   mixins: [searchMixin],
   data() {
     return {
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 96769b86a..af714c099 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-projects"></i>
-        {{ i18n.t('search.index.projects') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-projects"></i>
+          {{ i18n.t('search.index.projects') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -40,19 +40,25 @@
           </div>
         </template>
       </div>
-      <div v-if="!selected && total > 4" class="mt-4">
+      <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProjectsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ProjectsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'projects'
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index f19fb5e0c..dd14bab90 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-protocols-templates"></i>
-        {{ i18n.t('search.index.protocol_templates') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-protocols-templates"></i>
+          {{ i18n.t('search.index.protocol_templates') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -39,19 +39,25 @@
           </div>
         </template>
       </div>
-      <div v-if="!selected && total > 4" class="mt-4">
+      <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProtocolsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ProtocolsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'protocols'
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index 3e65f0fb6..27363a00e 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -1,14 +1,14 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-reports"></i>
-        {{ i18n.t('search.index.reports') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-reports"></i>
+          {{ i18n.t('search.index.reports') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -50,16 +50,22 @@
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ReportsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ReportsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'reports'
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index e8acfe2a0..a67852771 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -1,14 +1,14 @@
 <template>
-  <div class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-inventory"></i>
-        {{ i18n.t('search.index.inventory_items') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-inventory"></i>
+          {{ i18n.t('search.index.inventory_items') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
@@ -41,19 +41,25 @@
           </div>
         </template>
       </div>
-      <div v-if="!selected && total > 4" class="mt-4">
+      <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'RepositoryRowsComponent')">View all</button>
       </div>
-    </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'RepositoryRowsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'repository_rows'
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index d16386cfd..231c10614 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -1,60 +1,68 @@
 <template>
-  <div v-if="total" class="bg-white rounded p-4 mb-4">
-    <div class="flex items-center">
-      <h2 class="flex items-center gap-2 mt-0 mb-4">
-        <i class="sn-icon sn-icon-results"></i>
-        {{ i18n.t('search.index.task_results') }}
-        [{{ total }}]
-      </h2>
-      <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
-    </div>
-    <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
-      <template v-for="row in preparedResults" :key="row.id">
-        <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-          <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
-        </a>
-        <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-          <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-          <span class="truncate">{{ row.attributes.created_at }}</span>
-        </div>
-        <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-          <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-          <span class="truncate">{{ row.attributes.updated_at }}</span>
-        </div>
-        <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-          <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-          <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-            <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
+    <template v-if="total">
+      <div class="flex items-center">
+        <h2 class="flex items-center gap-2 mt-0 mb-4">
+          <i class="sn-icon sn-icon-results"></i>
+          {{ i18n.t('search.index.task_results') }}
+          [{{ total }}]
+        </h2>
+        <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
+      </div>
+      <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
+        <template v-for="row in preparedResults" :key="row.id">
+          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
+            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
           </a>
-        </div>
-        <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-          <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
-          <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-            <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
-          </a>
-        </div>
-        <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-          <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-            <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-            <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
+            <span class="truncate">{{ row.attributes.created_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
+            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
+            <span class="truncate">{{ row.attributes.updated_at }}</span>
+          </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
+            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
             </a>
           </div>
-        </div>
-      </template>
-    </div>
-    <div v-if="viewAll" class="mt-4">
-      <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
-    </div>
+          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
+            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
+            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
+              <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
+            </a>
+          </div>
+          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
+            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
+              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
+              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
+                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+              </a>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-if="viewAll" class="mt-4">
+        <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
+      </div>
+    </template>
+    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
+              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
   </div>
 </template>
 
 <script>
+import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ResultsComponent',
   mixins: [searchMixin],
+  components: {
+    Loader
+  },
   data() {
     return {
       group: 'results'
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 88b344ea9..07605fc2a 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -22,13 +22,17 @@ export default {
       loading: false,
       page: 1,
       disabled: false,
-      fullDataLoaded: false
+      fullDataLoaded: false,
+      loaderHeight: 24,
+      loaderGap: 10,
+      loaderYPadding: 10
     };
   },
   watch: {
     selected() {
       if (this.selected) {
         if (!this.fullDataLoaded) {
+          this.total = 0;
           this.results = [];
           this.loadData();
         }
@@ -37,6 +41,7 @@ export default {
     query() {
       this.results = [];
       this.page = 1;
+      this.total = 0;
       this.fullDataLoaded = false;
       this.loadData();
     }
@@ -57,6 +62,22 @@ export default {
     },
     viewAll() {
       return !this.selected && this.total > GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
+    },
+    loaderRows() {
+      // h-[24px] gap-y-[10px] py-[10px]
+      if (this.loading && (!this.selected || this.total)) return GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
+      if (this.selected && this.loading) {
+        const availableHeight = window.innerHeight - this.$refs.content.getBoundingClientRect().top;
+        // loaderHeight + loaderGap +  headerLoaderHeight + headerContentGap
+        const offSet = this.loaderHeight + this.loaderGap + 32 + 20;
+
+        return Math.floor((availableHeight - offSet) / (this.loaderHeight + this.loaderGap + (2 * this.loaderYPadding)));
+      }
+
+      return 0;
+    },
+    reachedEnd() {
+      return Math.ceil(this.total / GLOBAL_CONSTANTS.SEARCH_LIMIT) === this.page;
     }
   },
   methods: {
diff --git a/app/javascript/vue/global_search/loader.vue b/app/javascript/vue/global_search/loader.vue
new file mode 100644
index 000000000..d420f83a1
--- /dev/null
+++ b/app/javascript/vue/global_search/loader.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="flex flex-col gap-6">
+    <div v-if="!total" class="grid grid-cols-[32px_auto] gap-2.5">
+      <div class="h-8 w-8 animate-skeleton rounded"></div>
+      <div class="h-8 w-40 animate-skeleton rounded"></div>
+    </div>
+    <div class="flex flex-col" :class="[`gap-[${loaderGap}px]`]">
+      <div v-for="_count in loaderRows"
+          class="flex items-center no-wrap border-0 border-b border-solid border-sn-light-grey gap-x-8"
+          :class="[`gap-y-[${loaderGap}px]`, `py-[${loaderYPadding}px]`, { 'first:border-t': total }]">
+        <div class="w-[500px] grow-1" :class="`h-[${loaderHeight}px]`">
+          <div class="h-full w-80 animate-skeleton rounded mr-auto"></div>
+        </div>
+        <div :class="`h-[${loaderHeight}px]`" class="w-24 max-w-24 animate-skeleton rounded"></div>
+        <div :class="`h-[${loaderHeight}px]`" class="w-44 max-w-44 animate-skeleton rounded"></div>
+        <div :class="`h-[${loaderHeight}px]`" class="w-44 max-w-44 animate-skeleton rounded"></div>
+        <div :class="`h-[${loaderHeight}px]`" class="w-56 max-w-56 animate-skeleton rounded"></div>
+        <div :class="`h-[${loaderHeight}px]`" class="w-96 max-w-96 animate-skeleton rounded"></div>
+      </div>
+    </div>
+    <div v-if="reachedEnd" class="flex items-center">
+      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
+        <span class="sn-icon sn-icon-flag"></span>
+        <span>{{ i18n.t('search.index.reached_end') }}</span>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Loader',
+  props: {
+    total: { type: Number, default: 0 },
+    loaderRows: { type: Number, default: 0 },
+    loaderHeight: { type: Number, required: true },
+    loaderGap: { type: Number, required: true },
+    loaderYPadding: { type: Number, required: true },
+    reachedEnd: { type: Boolean }
+  }
+};
+</script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 321f844d5..b8390dca1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -485,6 +485,7 @@ en:
       created_asc: "Created first"
       atoz: "Name A to Z"
       ztoa: "Name Z to A"
+      reached_end: "You’ve reached the end of the list"
   comments:
     save_changes: "Save changes"
     empty_state:

From 6104daf687937c47f9ec96477e3a479493292f34 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 9 Apr 2024 08:48:23 +0200
Subject: [PATCH 041/115] Upgrade taiwindcss-rails gem [SCI-10590]

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1a5697f6a..23dc2b2ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ gem 'graphviz'
 gem 'cssbundling-rails'
 gem 'jsbundling-rails'
 
-gem 'tailwindcss-rails', '~> 2.0'
+gem 'tailwindcss-rails', '~> 2.4'
 
 gem 'base62' # Used for smart annotations
 gem 'newrelic_rpm'
diff --git a/Gemfile.lock b/Gemfile.lock
index efd1e9e15..42ab8193a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -483,12 +483,12 @@ GEM
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth_openid_connect (0.7.1)
-      omniauth (>= 1.9, < 3)
-      openid_connect (~> 2.2)
     omniauth-saml (2.1.0)
       omniauth (~> 2.0)
       ruby-saml (~> 1.12)
+    omniauth_openid_connect (0.7.1)
+      omniauth (>= 1.9, < 3)
+      openid_connect (~> 2.2)
     openid_connect (2.2.0)
       activemodel
       attr_required (>= 1.0.0)
@@ -705,11 +705,11 @@ GEM
       faraday-follow_redirects
     sys-uname (1.2.3)
       ffi (~> 1.1)
-    tailwindcss-rails (2.0.29)
+    tailwindcss-rails (2.4.0)
       railties (>= 6.0.0)
-    tailwindcss-rails (2.0.29-arm64-darwin)
+    tailwindcss-rails (2.4.0-arm64-darwin)
       railties (>= 6.0.0)
-    tailwindcss-rails (2.0.29-x86_64-linux)
+    tailwindcss-rails (2.4.0-x86_64-linux)
       railties (>= 6.0.0)
     thor (1.2.2)
     tilt (2.2.0)
@@ -866,7 +866,7 @@ DEPENDENCIES
   simplecov
   sneaky-save!
   sprockets-rails
-  tailwindcss-rails (~> 2.0)
+  tailwindcss-rails (~> 2.4)
   timecop
   turbolinks (~> 5.2.0)
   tzinfo-data

From 8e94cd5ce67249f68a9db5cc4591462d92b079c2 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 4 Apr 2024 16:15:18 +0200
Subject: [PATCH 042/115] Enable leave for team owners for yourself [SCI-9957]

---
 .../javascripts/users/settings/teams/show.js  | 16 ++--
 .../users/settings/user_teams_controller.rb   | 86 ++++---------------
 .../settings/teams/_user_dropdown.html.erb    |  2 +-
 .../_destroy_user_team_modal.html.erb         | 12 ---
 .../_destroy_user_team_modal_body.html.erb    | 43 ++++++----
 .../_leave_user_team_modal_body.html.erb      | 15 +---
 config/locales/en.yml                         | 25 +++---
 7 files changed, 68 insertions(+), 131 deletions(-)

diff --git a/app/assets/javascripts/users/settings/teams/show.js b/app/assets/javascripts/users/settings/teams/show.js
index 8d3b65104..051677128 100644
--- a/app/assets/javascripts/users/settings/teams/show.js
+++ b/app/assets/javascripts/users/settings/teams/show.js
@@ -110,10 +110,9 @@
       function(e, data) {
         // Populate the modal heading & body
         var modal = $('#destroy-user-team-modal');
-        var modalHeading = modal.find('.modal-header').find('.modal-title');
-        var modalBody = modal.find('.modal-body');
-        modalHeading.text($('<div>').html(data.heading).text());
-        modalBody.html(data.html);
+        const modalContent = modal.find('.modal-content');
+
+        modalContent.html(data.html);
 
         // Show the modal
         modal.modal('show');
@@ -122,13 +121,14 @@
       'ajax:error',
       "[data-action='destroy-user-team']",
       function() {
-        // TODO
+        HelperModule.flashAlertMsg(I18n.t('users.settings.user_teams.general_error'), 'danger');
       }
     );
 
     // Also, bind the click action on the modal
     $('#destroy-user-team-modal')
       .on('click', "[data-action='submit']", function() {
+        animateSpinner();
         var btn = $(this);
         var form = btn
           .closest('.modal')
@@ -154,14 +154,16 @@
         // Hide the modal
         modal.modal('hide');
 
+        animateSpinner(null, false);
         // Reload the whole table
-        usersDatatable.ajax.reload();
+        location.reload();
       }
     ).on(
       'ajax:error',
       "[data-id='destroy-user-team-form']",
       function() {
-        // TODO
+        animateSpinner(null, false);
+        HelperModule.flashAlertMsg(I18n.t('users.settings.user_teams.general_error'), 'danger');
       }
     );
   }
diff --git a/app/controllers/users/settings/user_teams_controller.rb b/app/controllers/users/settings/user_teams_controller.rb
index 9118f81d4..536dac21b 100644
--- a/app/controllers/users/settings/user_teams_controller.rb
+++ b/app/controllers/users/settings/user_teams_controller.rb
@@ -48,14 +48,9 @@ module Users
         render json: {
           html: render_to_string(
             partial: 'users/settings/user_teams/' \
-                      'destroy_user_team_modal_body',
+                     'destroy_user_team_modal_body',
             locals: { user_assignment: @user_assignment },
             formats: :html
-          ),
-          heading: I18n.t(
-            'users.settings.user_teams.destroy_uo_heading',
-            user: escape_input(@user_assignment.user.full_name),
-            team: escape_input(@user_assignment.assignable.name)
           )
         }
       end
@@ -63,29 +58,12 @@ module Users
       def destroy
         # If user is last administrator of team,
         # he/she cannot be deleted from it.
-        invalid =
-          managing_team_user_roles_collection.include?(@user_assignment.user_role) &&
-          @user_assignment
-          .assignable
-          .user_assignments
-          .where(user_role: managing_team_user_roles_collection)
-          .count <= 1
+        invalid = @user_assignment.last_with_permission?(TeamPermissions::USERS_MANAGE)
 
         unless invalid
           begin
             @user_assignment.transaction do
-              # If user leaves on his/her own accord,
-              # new owner for projects is the first
-              # administrator of team
               if params[:leave]
-                new_owner =
-                  @user_assignment
-                  .assignable
-                  .user_assignments
-                  .where(user_role: managing_team_user_roles_collection)
-                  .where.not(id: @user_assignment.id)
-                  .first
-                  .user
                 Activities::CreateActivityService
                   .call(activity_type: :user_leave_team,
                         owner: current_user,
@@ -95,10 +73,6 @@ module Users
                           team: @user_assignment.assignable.id
                         })
               else
-                # Otherwise, the new owner for projects is
-                # the current user (= an administrator removing
-                # the user from the team)
-                new_owner = current_user
                 Activities::CreateActivityService
                   .call(activity_type: :remove_user_from_team,
                         owner: current_user,
@@ -110,8 +84,7 @@ module Users
                         })
               end
               reset_user_current_team(@user_assignment)
-
-              remove_user_from_team!(@user_assignment, new_owner)
+              @user_assignment.destroy!
             end
           rescue StandardError => e
             Rails.logger.error e.message
@@ -119,21 +92,27 @@ module Users
           end
         end
 
-        if !invalid
-          if params[:leave]
-            flash[:notice] = I18n.t(
-              'users.settings.user_teams.leave_flash',
-              team: @user_assignment.assignable.name
-            )
-            flash.keep(:notice)
-          end
+        if invalid
+          render json: @user_assignment.errors, status: :unprocessable_entity
+        else
+          flash[:success] = if params[:leave]
+                              I18n.t(
+                                'users.settings.user_teams.leave_flash',
+                                team: @user_assignment.assignable.name
+                              )
+                            else
+                              I18n.t(
+                                'users.settings.user_teams.remove_flash',
+                                user: @user_assignment.user.full_name,
+                                team: @user_assignment.assignable.name
+                              )
+                            end
+
           generate_notification(current_user,
                                 @user_assignment.user,
                                 @user_assignment.assignable,
                                 false)
           render json: { status: :ok }
-        else
-          render json: @user_assignment.errors, status: :unprocessable_entity
         end
       end
 
@@ -165,33 +144,6 @@ module Users
         user_assignment.user.current_team_id = ids.first
         user_assignment.user.save
       end
-
-      def remove_user_from_team!(user_assignment, new_owner)
-        return user_assignment.destroy! unless new_owner
-
-        # Also, make new owner author of all protocols that belong
-        # to the departing user and belong to this team.
-        p_ids = user_assignment.user.added_protocols.where(team: user_assignment.assignable).pluck(:id)
-        Protocol.where(id: p_ids).find_each do |protocol|
-          protocol.record_timestamps = false
-          protocol.added_by = new_owner
-          protocol.archived_by = new_owner if protocol.archived_by == user_assignment.user
-          protocol.restored_by = new_owner if protocol.restored_by == user_assignment.user
-          protocol.save!(validate: false)
-          protocol.user_assignments.find_by(user: new_owner)&.destroy!
-          protocol.user_assignments.create!(
-            user: new_owner,
-            user_role: UserRole.find_predefined_owner_role,
-            assigned: :manually
-          )
-        end
-
-        # Make new owner author of all inventory items that were added
-        # by departing user and belong to this team.
-        RepositoryRow.change_owner(user_assignment.assignable, user_assignment.user, new_owner)
-
-        user_assignment.destroy!
-      end
     end
   end
 end
diff --git a/app/views/users/settings/teams/_user_dropdown.html.erb b/app/views/users/settings/teams/_user_dropdown.html.erb
index 587e5c096..b4c1a25eb 100644
--- a/app/views/users/settings/teams/_user_dropdown.html.erb
+++ b/app/views/users/settings/teams/_user_dropdown.html.erb
@@ -1,5 +1,5 @@
 <% if user_assignment.user == user %>
-  <button class="btn btn-light btn-xs icon-btn" type="button" disabled="disabled">
+  <button class="btn btn-light btn-xs icon-btn" id="leave-team-btn" type="button" disabled="disabled">
     <span class="sn-icon sn-icon-down"></span>
   </button>
 <% else %>
diff --git a/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb b/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
index 7d686a3c1..f857ddeda 100644
--- a/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
+++ b/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
@@ -5,18 +5,6 @@
      aria-labelledby="destroy-user-team-modal-label">
   <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" id="destroy-user-team-modal-label">
-        </h4>
-      </div>
-      <div class="modal-body"></div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
-        <button type="button"
-                class="btn btn-danger"
-                data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %></button>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
index fe336e059..44da504d5 100644
--- a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
@@ -1,21 +1,28 @@
-<%= form_with model: user_assignment,
-              url: destroy_user_team_path(user_assignment, format: :json),
-              data: { remote: true, id: 'destroy-user-team-form' },
-              method: :delete do |f| %>
-  <p><%= t("users.settings.user_teams.destroy_uo_message",
+<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="destroy-user-team-modal-label">
+    <%= t('users.settings.user_teams.destroy_uo_heading',
            user: user_assignment.user.full_name,
-           team: user_assignment.assignable.name) %></p>
-  <% if user_assignment.user.confirmed? %>
-    <div class="alert alert-danger" role="alert">
-      <span class="fas fa-exclamation-triangle"></span>
-      &nbsp;
-      <%= t("users.settings.user_teams.destroy_uo_alert_heading") %>
-      <ul>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_1") %></li>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_2").html_safe %></li>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_3") %></li>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_4") %></li>
-      </ul>
+           team: user_assignment.assignable.name,
+           role: user_assignment.user_role.name.downcase) %>
+  </h4>
+  </div>
+<div class="modal-body">
+  <%= form_with model: user_assignment,
+                url: destroy_user_team_path(user_assignment, format: :json),
+                data: { remote: true, id: 'destroy-user-team-form' },
+                method: :delete do |f| %>
+    <div class='flex flex-col gap-6'>
+      <div><%= t("users.settings.user_teams.destroy_message", role: user_assignment.user_role.name.downcase) %></div>
+      <div><%= t("users.settings.user_teams.message_owner") %></div>
+      <div><%= t("users.settings.user_teams.message_alert") %></div>
     </div>
   <% end %>
-<% end %>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
+  <button type="button"
+          class="btn btn-danger"
+          data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %>
+  </button>
+</div>
diff --git a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
index 93170c5c7..4d6e0f85a 100644
--- a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
@@ -4,16 +4,9 @@
               method: :delete,
               data: { id: 'leave-user-team-form' } do |f| %>
   <%= hidden_field_tag :leave, true %>
-  <p><%= t("users.settings.user_teams.leave_uo_message", team: @user_assignment.team.name) %></p>
-  <div class="alert alert-danger" role="alert">
-    <span class="fas fa-exclamation-triangle"></span>
-    &nbsp;
-    <%= t("users.settings.user_teams.leave_uo_alert_heading") %>
-    <ul>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_1") %></li>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_2").html_safe %></li>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_3")%></li>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_4")%></li>
-    </ul>
+  <div class='flex flex-col gap-6'>
+    <div><%= t("users.settings.user_teams.leave_message") %></div>
+    <div><%= t("users.settings.user_teams.message_owner") %></div>
+    <div><%= t("users.settings.user_teams.message_alert") %></div>
   </div>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b829dca5..bbebe8cdf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2988,22 +2988,17 @@ en:
             flash_success: "Team %{team} was successfully deleted."
       user_teams:
         leave_uo_heading: "Leave team %{team}"
-        leave_uo_message: "Are you sure you wish to leave team %{team}? This action is irreversible."
-        leave_uo_alert_heading: "Leaving team has following consequences:"
-        leave_uo_alert_line_1: "you will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
-        leave_uo_alert_line_2: "all projects in the team where you were the sole <b>Owner</b> will receive a new owner from the team administrators;"
-        leave_uo_alert_line_3: "all repository protocols in the team belonging to you will be reassigned onto a new owner from team administrators;"
-        leave_uo_alert_line_4: "all inventory items in the team added by you will be reassigned onto a new owner from team administrators."
-        leave_uo_confirm: "Leave"
-        destroy_uo_heading: "Remove user %{user} from team %{team}"
-        destroy_uo_message: "Are you sure you wish to remove user %{user} from team %{team}?"
-        destroy_uo_alert_heading: "Removing user from team has following consequences:"
-        destroy_uo_alert_line_1: "user will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
-        destroy_uo_alert_line_2: "all projects in the team where user was the sole <b>Owner</b> will be reassigned onto you as a new owner;"
-        destroy_uo_alert_line_3: "all repository protocols in the team belonging to user will be reassigned onto you;"
-        destroy_uo_alert_line_4: "all inventory items in the team added by user will be reassigned onto you."
+        leave_message: "You will lose access to all content associated with the team, including projects, inventories, and protocol templates."
+        destroy_message: 'Removing a team %{role} will revoke their access to all content associated with the team, including projects, inventories, and protocol templates.'
+        leave_uo_confirm: "Leave team"
+        destroy_uo_heading: "Remove team %{role} %{user} from team %{team}"
+        message_owner: "Other team owner(s) will be able to view and manage access to the content."
+        message_alert: "This action cannot be undone."
+        destroy_uo_alert_line_3: "This action cannot be undone."
         destroy_uo_confirm: "Remove"
-        leave_flash: "Successfully left team %{team}."
+        leave_flash: "You have left %{team}."
+        remove_flash: "%{user} has been successfully removed from the team %{team}"
+        general_error: "Something went wrong"
 
   user_roles:
     predefined:

From dde28a2f12f325bd1d86152e91a8907d8b772742 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 9 Apr 2024 14:30:34 +0200
Subject: [PATCH 043/115] Fix folder selection [SCI-10611]

---
 app/serializers/lists/project_and_folder_serializer.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/serializers/lists/project_and_folder_serializer.rb b/app/serializers/lists/project_and_folder_serializer.rb
index 2a21833a5..7d513dd3f 100644
--- a/app/serializers/lists/project_and_folder_serializer.rb
+++ b/app/serializers/lists/project_and_folder_serializer.rb
@@ -31,7 +31,11 @@ module Lists
     end
 
     def code
-      object.code if project?
+      if project?
+        object.code
+      else
+        "F#{object.id}" # We don't have proper code for folders, but we need to correct selection
+      end
     end
 
     def created_at

From e6bda25c8211cd61bbc11f33d5df4a5809df5f2c Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 9 Apr 2024 14:39:49 +0200
Subject: [PATCH 044/115] Add inventory name to label templates [SCI-10611]

---
 app/services/label_templates/repository_row_service.rb | 2 ++
 app/services/label_templates/tag_service.rb            | 1 +
 config/locales/en.yml                                  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/app/services/label_templates/repository_row_service.rb b/app/services/label_templates/repository_row_service.rb
index ea0282478..b83edf266 100644
--- a/app/services/label_templates/repository_row_service.rb
+++ b/app/services/label_templates/repository_row_service.rb
@@ -52,6 +52,8 @@ module LabelTemplates
         end
 
         fetch_custom_column_value(name)
+      when 'INVENTORY_NAME'
+        @repository_row.repository.name
       when 'ITEM_ID'
         @repository_row.code
       when 'NAME'
diff --git a/app/services/label_templates/tag_service.rb b/app/services/label_templates/tag_service.rb
index 8cdd241cb..a76d8a01c 100644
--- a/app/services/label_templates/tag_service.rb
+++ b/app/services/label_templates/tag_service.rb
@@ -3,6 +3,7 @@
 module LabelTemplates
   class TagService
     DEFAULT_COLUMNS = [
+      { key: 'inventory_name', tag: '{{INVENTORY_NAME}}' },
       { key: 'item_id', tag: '{{ITEM_ID}}' },
       { key: 'name', tag: '{{NAME}}' },
       { key: 'added_on', tag: '{{ADDED_ON}}' },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1e771b5de..0e7b27721 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1059,6 +1059,7 @@ en:
         refresh: 'Refresh preview'
         save: 'Save template code'
     default_columns:
+      inventory_name: 'Inventory name'
       item_id: 'Item ID'
       name: 'Name'
       added_on: 'Added On'

From 9f3cf70ad55d5794e0b653acbc2762ff60021567 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 9 Apr 2024 14:59:30 +0200
Subject: [PATCH 045/115] Fix item card dropdown options list [SCI-10593]

---
 .../repository_columns/list_columns_controller.rb   | 13 ++++++++-----
 .../repository_values/RepositoryListValue.vue       |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb
index 79d87de78..c836f9bc4 100644
--- a/app/controllers/repository_columns/list_columns_controller.rb
+++ b/app/controllers/repository_columns/list_columns_controller.rb
@@ -32,11 +32,14 @@ module RepositoryColumns
     end
 
     def items
-      column_list_items = @repository_column.repository_list_items
-                                            .where('data ILIKE ?',
-                                                   "%#{search_params[:query]}%")
-                                            .limit(Constants::SEARCH_LIMIT)
-                                            .select(:id, :data)
+      column_list_items = if params[:all_options]
+                            @repository_column.repository_list_items.select(:id, :data)
+                          else
+                            @repository_column.repository_list_items
+                                              .where('data ILIKE ?', "%#{search_params[:query]}%")
+                                              .limit(Constants::SEARCH_LIMIT)
+                                              .select(:id, :data)
+                          end
 
       render json: column_list_items.map { |i| { value: i.id, label: escape_input(i.data) } }, status: :ok
     end
diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue
index 55a172ccc..fd7b76cb5 100644
--- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue
+++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue
@@ -66,7 +66,7 @@ export default {
   mounted() {
     this.isLoading = true;
 
-    $.get(this.optionsPath, (data) => {
+    $.get(this.optionsPath, { all_options: true }, (data) => {
       if (Array.isArray(data)) {
         this.options = data.map((option) => {
           const { value, label } = option;
@@ -75,6 +75,7 @@ export default {
         return false;
       }
       this.options = [];
+      return true;
     }).always(() => {
       this.isLoading = false;
       this.selected = this.id;

From 2bddac06b88c51cedc44dd912af2b056db8e02ac Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 10 Apr 2024 11:25:59 +0200
Subject: [PATCH 046/115] Fix draft creation to prevent dupciates [SCI-10598]

---
 app/controllers/protocols_controller.rb          |  6 +++++-
 app/javascript/vue/protocol/protocolMetadata.vue | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index b86cd8ce0..b0ade7fb4 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -371,7 +371,11 @@ class ProtocolsController < ApplicationController
 
   def save_as_draft
     Protocol.transaction do
-      draft = @protocol.save_as_draft(current_user)
+      draft = nil
+
+      @protocol.with_lock do
+        draft = @protocol.save_as_draft(current_user)
+      end
 
       if draft.invalid?
         render json: { error: draft.errors.messages.map { |_, value| value }.join(' ') }, status: :unprocessable_entity
diff --git a/app/javascript/vue/protocol/protocolMetadata.vue b/app/javascript/vue/protocol/protocolMetadata.vue
index f6645a258..54bf6fad2 100644
--- a/app/javascript/vue/protocol/protocolMetadata.vue
+++ b/app/javascript/vue/protocol/protocolMetadata.vue
@@ -25,7 +25,7 @@
                 @click="$emit('publish')" class="btn btn-primary">
           {{ i18n.t("protocols.header.publish") }}</button>
         <button v-if="protocol.attributes.urls.save_as_draft_url"
-                v-bind:disabled="protocol.attributes.has_draft"
+                :disabled="protocol.attributes.has_draft || creatingDraft"
                 @click="saveAsdraft" class="btn btn-secondary">
           {{ i18n.t("protocols.header.save_as_draft") }}
         </button>
@@ -121,7 +121,8 @@ export default {
   },
   data() {
     return {
-      VersionsModalObject: null
+      VersionsModalObject: null,
+      creatingDraft: false
     };
   },
   computed: {
@@ -141,8 +142,18 @@ export default {
   },
   methods: {
     saveAsdraft() {
+      if (this.creatingDraft) {
+        return;
+      }
+
+      this.creatingDraft = true;
+
       $.post(this.protocol.attributes.urls.save_as_draft_url, (result) => {
+        this.creatingDraft = false;
         window.location.replace(result.url);
+      }).error(() => {
+        this.creatingDraft = false;
+        HelperModule.flashAlertMsg(this.i18n.t('errors.general'));
       });
     },
     updateAuthors(authors) {

From 271702e2a898ef560349889770b16ccecc605e1b Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 10 Apr 2024 01:21:35 +0200
Subject: [PATCH 047/115] prevent reviving the session if the page is being
 reloaded after signing a task [SCI-10515]

---
 app/assets/javascripts/session_end.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/session_end.js b/app/assets/javascripts/session_end.js
index 8b64049b3..45f7ab456 100644
--- a/app/assets/javascripts/session_end.js
+++ b/app/assets/javascripts/session_end.js
@@ -36,7 +36,7 @@
     timeoutID = setTimeout(functionCallback, timeoutTime);
   }
 
-  function toogleDocumentTitle(timeString = null) {
+  function toggleDocumentTitle(timeString = null) {
     var sleepEmoticon = String.fromCodePoint(0x1F62A);
     var originalTitle = document.title.split(sleepEmoticon).pop().trim();
 
@@ -70,21 +70,21 @@
 
   function reviveSession() {
     $.post($('meta[name=\'revive-url\']').attr('content'));
-    toogleDocumentTitle();
+    toggleDocumentTitle();
     window.localStorage.removeItem('sessionEnd');
     setSessionTimeout(initializeSessionCountdown, oneSecondTimeout);
   }
 
   function initializeSessionReviveCallbacks() {
     $('#session-expire').modal().off('hide.bs.modal').on('hide.bs.modal', function() {
-      if (sessionExpireIn() > 0) {
+      if (sessionExpireIn() > 0 && sessionExpireIn() < expireLimit) {
         reviveSession();
       }
     });
 
     // for manual page reload
     $(window).off('beforeunload').on('beforeunload', function() {
-      if (sessionExpireIn() > 0) {
+      if (sessionExpireIn() > 0 && sessionExpireIn() < expireLimit) {
         reviveSession();
       }
     });
@@ -98,7 +98,7 @@
       initializeSessionCountdown();
     } else if (expireIn > 0 && expireIn <= expireLimit) {
       timeString = newTimerStr(expireIn / 1000);
-      toogleDocumentTitle(timeString);
+      toggleDocumentTitle(timeString);
       $('.expiring').text(I18n.t('devise.sessions.expire_modal.session_end_in.header', { time: timeString }));
 
       if (!$('#session-expire').hasClass('in')) {
@@ -107,7 +107,7 @@
 
       setSessionTimeout(sessionCountdown, oneSecondTimeout);
     } else if (expireIn <= 0) {
-      toogleDocumentTitle();
+      toggleDocumentTitle();
       $('#session-expire').modal('hide');
       $('#session-finished').modal();
     }
@@ -130,7 +130,7 @@
         }
         setSessionTimeout(initializeSessionCountdown, oneSecondTimeout);
       } else if (expireOn && !event.originalEvent.newValue) {
-        toogleDocumentTitle();
+        toggleDocumentTitle();
       }
 
       expireOn = event.originalEvent.newValue;

From 0c97ebfafb8e7cac8ca3970d586765c7c5a28c2b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 10 Apr 2024 18:51:23 +0200
Subject: [PATCH 048/115] Fix lost formatting-for-exp-desc [SCI-10614]

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

diff --git a/app/javascript/vue/experiments/modals/description.vue b/app/javascript/vue/experiments/modals/description.vue
index d2d581334..1b3377e59 100644
--- a/app/javascript/vue/experiments/modals/description.vue
+++ b/app/javascript/vue/experiments/modals/description.vue
@@ -10,7 +10,7 @@
             {{ experiment.name }}
           </h4>
         </div>
-        <div class="modal-body" v-html="experiment.sa_description"></div>
+        <div class="modal-body whitespace-pre-wrap" v-html="experiment.sa_description"></div>
         <div class="modal-footer">
           <button type="button" class="btn btn-primary" data-dismiss="modal">{{ i18n.t('general.close') }}</button>
         </div>

From 70beec648adc9a7d0243b6f402098e3d2b06b4b9 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 10 Apr 2024 11:25:59 +0200
Subject: [PATCH 049/115] Fix draft creation to prevent dupciates [SCI-10598]

---
 app/controllers/protocols_controller.rb          |  6 +++++-
 app/javascript/vue/protocol/protocolMetadata.vue | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index b86cd8ce0..b0ade7fb4 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -371,7 +371,11 @@ class ProtocolsController < ApplicationController
 
   def save_as_draft
     Protocol.transaction do
-      draft = @protocol.save_as_draft(current_user)
+      draft = nil
+
+      @protocol.with_lock do
+        draft = @protocol.save_as_draft(current_user)
+      end
 
       if draft.invalid?
         render json: { error: draft.errors.messages.map { |_, value| value }.join(' ') }, status: :unprocessable_entity
diff --git a/app/javascript/vue/protocol/protocolMetadata.vue b/app/javascript/vue/protocol/protocolMetadata.vue
index f6645a258..54bf6fad2 100644
--- a/app/javascript/vue/protocol/protocolMetadata.vue
+++ b/app/javascript/vue/protocol/protocolMetadata.vue
@@ -25,7 +25,7 @@
                 @click="$emit('publish')" class="btn btn-primary">
           {{ i18n.t("protocols.header.publish") }}</button>
         <button v-if="protocol.attributes.urls.save_as_draft_url"
-                v-bind:disabled="protocol.attributes.has_draft"
+                :disabled="protocol.attributes.has_draft || creatingDraft"
                 @click="saveAsdraft" class="btn btn-secondary">
           {{ i18n.t("protocols.header.save_as_draft") }}
         </button>
@@ -121,7 +121,8 @@ export default {
   },
   data() {
     return {
-      VersionsModalObject: null
+      VersionsModalObject: null,
+      creatingDraft: false
     };
   },
   computed: {
@@ -141,8 +142,18 @@ export default {
   },
   methods: {
     saveAsdraft() {
+      if (this.creatingDraft) {
+        return;
+      }
+
+      this.creatingDraft = true;
+
       $.post(this.protocol.attributes.urls.save_as_draft_url, (result) => {
+        this.creatingDraft = false;
         window.location.replace(result.url);
+      }).error(() => {
+        this.creatingDraft = false;
+        HelperModule.flashAlertMsg(this.i18n.t('errors.general'));
       });
     },
     updateAuthors(authors) {

From 52fd3ff801c1d675506b8b8ef7eee46f02a74604 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 9 Apr 2024 14:59:30 +0200
Subject: [PATCH 050/115] Fix item card dropdown options list [SCI-10593]

---
 .../repository_columns/list_columns_controller.rb   | 13 ++++++++-----
 .../repository_values/RepositoryListValue.vue       |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb
index 79d87de78..c836f9bc4 100644
--- a/app/controllers/repository_columns/list_columns_controller.rb
+++ b/app/controllers/repository_columns/list_columns_controller.rb
@@ -32,11 +32,14 @@ module RepositoryColumns
     end
 
     def items
-      column_list_items = @repository_column.repository_list_items
-                                            .where('data ILIKE ?',
-                                                   "%#{search_params[:query]}%")
-                                            .limit(Constants::SEARCH_LIMIT)
-                                            .select(:id, :data)
+      column_list_items = if params[:all_options]
+                            @repository_column.repository_list_items.select(:id, :data)
+                          else
+                            @repository_column.repository_list_items
+                                              .where('data ILIKE ?', "%#{search_params[:query]}%")
+                                              .limit(Constants::SEARCH_LIMIT)
+                                              .select(:id, :data)
+                          end
 
       render json: column_list_items.map { |i| { value: i.id, label: escape_input(i.data) } }, status: :ok
     end
diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue
index 55a172ccc..fd7b76cb5 100644
--- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue
+++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryListValue.vue
@@ -66,7 +66,7 @@ export default {
   mounted() {
     this.isLoading = true;
 
-    $.get(this.optionsPath, (data) => {
+    $.get(this.optionsPath, { all_options: true }, (data) => {
       if (Array.isArray(data)) {
         this.options = data.map((option) => {
           const { value, label } = option;
@@ -75,6 +75,7 @@ export default {
         return false;
       }
       this.options = [];
+      return true;
     }).always(() => {
       this.isLoading = false;
       this.selected = this.id;

From 4110e966c8eff6fb8d50179eec62e72bf713ff97 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 9 Apr 2024 14:39:49 +0200
Subject: [PATCH 051/115] Add inventory name to label templates [SCI-10611]

---
 app/services/label_templates/repository_row_service.rb | 2 ++
 app/services/label_templates/tag_service.rb            | 1 +
 config/locales/en.yml                                  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/app/services/label_templates/repository_row_service.rb b/app/services/label_templates/repository_row_service.rb
index ea0282478..b83edf266 100644
--- a/app/services/label_templates/repository_row_service.rb
+++ b/app/services/label_templates/repository_row_service.rb
@@ -52,6 +52,8 @@ module LabelTemplates
         end
 
         fetch_custom_column_value(name)
+      when 'INVENTORY_NAME'
+        @repository_row.repository.name
       when 'ITEM_ID'
         @repository_row.code
       when 'NAME'
diff --git a/app/services/label_templates/tag_service.rb b/app/services/label_templates/tag_service.rb
index 8cdd241cb..a76d8a01c 100644
--- a/app/services/label_templates/tag_service.rb
+++ b/app/services/label_templates/tag_service.rb
@@ -3,6 +3,7 @@
 module LabelTemplates
   class TagService
     DEFAULT_COLUMNS = [
+      { key: 'inventory_name', tag: '{{INVENTORY_NAME}}' },
       { key: 'item_id', tag: '{{ITEM_ID}}' },
       { key: 'name', tag: '{{NAME}}' },
       { key: 'added_on', tag: '{{ADDED_ON}}' },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f60307158..cb51d86a5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1043,6 +1043,7 @@ en:
         refresh: 'Refresh preview'
         save: 'Save template code'
     default_columns:
+      inventory_name: 'Inventory name'
       item_id: 'Item ID'
       name: 'Name'
       added_on: 'Added On'

From d24f3b76a88276750b62ca00b20b28429317acef Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 11 Apr 2024 08:22:50 +0100
Subject: [PATCH 052/115] Add no search results page to Global search page
 [SCI-10481]

---
 .../vue/global_search/groups/assets.vue       |  9 ++----
 .../vue/global_search/groups/experiments.vue  |  9 ++----
 .../vue/global_search/groups/folders.vue      |  9 ++----
 .../global_search/groups/label_templates.vue  |  9 ++----
 .../groups/my_module_protocols.vue            |  9 ++----
 .../vue/global_search/groups/my_modules.vue   |  9 ++----
 .../vue/global_search/groups/projects.vue     |  9 ++----
 .../vue/global_search/groups/protocols.vue    |  9 ++----
 .../vue/global_search/groups/reports.vue      |  9 ++----
 .../global_search/groups/repository_rows.vue  |  9 ++----
 .../vue/global_search/groups/results.vue      |  9 ++----
 .../vue/global_search/groups/search_mixin.js  | 16 +++++++++--
 app/javascript/vue/global_search/loader.vue   |  2 +-
 .../vue/global_search/no_search_result.vue    | 28 +++++++++++++++++++
 config/locales/en.yml                         |  2 ++
 15 files changed, 78 insertions(+), 69 deletions(-)
 create mode 100644 app/javascript/vue/global_search/no_search_result.vue

diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index 244ecc472..f8210800e 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-files"></i>
@@ -51,19 +51,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+   <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'AssetsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'assets'
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index 0456971b9..f1cdffce5 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-experiment"></i>
@@ -44,18 +44,15 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ExperimentsComponent',
-  components: {
-    Loader
-  },
   mixins: [searchMixin],
   data() {
     return {
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index 19602c053..586176842 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-folder"></i>
@@ -42,19 +42,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'FoldersComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'project_folders'
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index 647fe1db8..520e6e7af 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="!disabled && total">
+  <div v-if="!disabled" ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-label-templates"></i>
@@ -45,19 +45,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'LabelTemplatesComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'label_templates'
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index d748f480e..464c83906 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
       <h2 class="flex items-center gap-2 mt-0 mb-4">
         <i class="sn-icon sn-icon-protocols-templates"></i>
@@ -54,19 +54,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'MyModuleProtocolsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'module_protocols'
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index 59ed95443..a5cd97738 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
       <h2 class="flex items-center gap-2 mt-0 mb-4">
         <i class="sn-icon sn-icon-task"></i>
@@ -48,18 +48,15 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'MyModulesComponent',
-  components: {
-    Loader
-  },
   mixins: [searchMixin],
   data() {
     return {
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index af714c099..efe96ee41 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-projects"></i>
@@ -46,19 +46,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
             :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ProjectsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'projects'
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index dd14bab90..83daa2c63 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-protocols-templates"></i>
@@ -45,19 +45,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
               :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ProtocolsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'protocols'
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index 27363a00e..2c3467b4f 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-reports"></i>
@@ -53,19 +53,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
               :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ReportsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'reports'
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index a67852771..079141c7d 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-inventory"></i>
@@ -47,19 +47,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
               :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'RepositoryRowsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'repository_rows'
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 231c10614..6f92bd1ce 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -1,6 +1,6 @@
 <template>
-  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': total || loading }">
-    <template v-if="total">
+  <div ref="content" class="bg-white rounded" :class="{ 'p-4 mb-4': results.length || loading }">
+    <template v-if="total && results.length">
       <div class="flex items-center">
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-results"></i>
@@ -50,19 +50,16 @@
     </template>
     <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
               :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
   </div>
 </template>
 
 <script>
-import Loader from '../loader.vue';
 import searchMixin from './search_mixin';
 
 export default {
   name: 'ResultsComponent',
   mixins: [searchMixin],
-  components: {
-    Loader
-  },
   data() {
     return {
       group: 'results'
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 07605fc2a..1d2a8c615 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -1,6 +1,8 @@
 import axios from '../../../packs/custom_axios.js';
 import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
 import SortFlyout from './sort_flyout.vue';
+import Loader from '../loader.vue';
+import NoSearchResult from '../no_search_result.vue';
 /* global GLOBAL_CONSTANTS */
 
 export default {
@@ -12,7 +14,9 @@ export default {
   },
   components: {
     StringWithEllipsis,
-    SortFlyout
+    SortFlyout,
+    Loader,
+    NoSearchResult
   },
   data() {
     return {
@@ -25,7 +29,8 @@ export default {
       fullDataLoaded: false,
       loaderHeight: 24,
       loaderGap: 10,
-      loaderYPadding: 10
+      loaderYPadding: 10,
+      noSearchResultHeight: 0
     };
   },
   watch: {
@@ -78,6 +83,9 @@ export default {
     },
     reachedEnd() {
       return Math.ceil(this.total / GLOBAL_CONSTANTS.SEARCH_LIMIT) === this.page;
+    },
+    showNoSearchResult() {
+      return this.selected && !this.loading && !this.results.length;
     }
   },
   methods: {
@@ -117,6 +125,10 @@ export default {
           this.disabled = response.data.meta.disabled;
           this.loading = false;
           this.page = response.data.meta.next_page;
+          if (this.results.length === 0 && this.selected) {
+            const availableHeight = window.innerHeight - this.$refs.content.getBoundingClientRect().top;
+            this.noSearchResultHeight = availableHeight - 20;
+          }
         })
         .finally(() => {
           this.loading = false;
diff --git a/app/javascript/vue/global_search/loader.vue b/app/javascript/vue/global_search/loader.vue
index d420f83a1..886eab3a8 100644
--- a/app/javascript/vue/global_search/loader.vue
+++ b/app/javascript/vue/global_search/loader.vue
@@ -18,7 +18,7 @@
         <div :class="`h-[${loaderHeight}px]`" class="w-96 max-w-96 animate-skeleton rounded"></div>
       </div>
     </div>
-    <div v-if="reachedEnd" class="flex items-center">
+    <div v-if="reachedEnd" class="flex items-center mb-6">
       <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
         <span class="sn-icon sn-icon-flag"></span>
         <span>{{ i18n.t('search.index.reached_end') }}</span>
diff --git a/app/javascript/vue/global_search/no_search_result.vue b/app/javascript/vue/global_search/no_search_result.vue
new file mode 100644
index 000000000..afe2a2cf5
--- /dev/null
+++ b/app/javascript/vue/global_search/no_search_result.vue
@@ -0,0 +1,28 @@
+<template>
+  <div ref="noSearchResult">
+    <div class="flex flex-col gap-6 bg-sn-white text-center relative top-1/4">
+       <div><span class=" inline-block sn-icon sn-icon-search"></span></div>
+       <div class="">
+         <p class="text-sn-black text-2xl font-semibold">
+           {{ i18n.t('search.index.no_results_text') }}
+         </p>
+         <p class="text-sn-dark-grey text-base">
+           {{ i18n.t('search.index.adjust_search_text') }}
+         </p>
+       </div>
+     </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'NoSearchResult',
+  props: {
+    noSearchResultHeight: { type: Number, default: 0 }
+  },
+  mounted() {
+    this.$refs.noSearchResult.style.height = `${this.noSearchResultHeight}px`;
+  }
+};
+</script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b8390dca1..15ae3b7cd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -486,6 +486,8 @@ en:
       atoz: "Name A to Z"
       ztoa: "Name Z to A"
       reached_end: "You’ve reached the end of the list"
+      no_results_text: "No search results found"
+      adjust_search_text: "Try adjusting your search or filter to find what you are looking for."
   comments:
     save_changes: "Save changes"
     empty_state:

From d2ace74d757c48b588840fb6d19544eda68f5de7 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 4 Apr 2024 16:15:18 +0200
Subject: [PATCH 053/115] Enable leave for team owners for yourself [SCI-9957]

---
 .../javascripts/users/settings/teams/show.js  | 16 ++--
 .../users/settings/user_teams_controller.rb   | 86 ++++---------------
 .../settings/teams/_user_dropdown.html.erb    |  2 +-
 .../_destroy_user_team_modal.html.erb         | 12 ---
 .../_destroy_user_team_modal_body.html.erb    | 43 ++++++----
 .../_leave_user_team_modal_body.html.erb      | 15 +---
 config/locales/en.yml                         | 25 +++---
 7 files changed, 68 insertions(+), 131 deletions(-)

diff --git a/app/assets/javascripts/users/settings/teams/show.js b/app/assets/javascripts/users/settings/teams/show.js
index 8d3b65104..051677128 100644
--- a/app/assets/javascripts/users/settings/teams/show.js
+++ b/app/assets/javascripts/users/settings/teams/show.js
@@ -110,10 +110,9 @@
       function(e, data) {
         // Populate the modal heading & body
         var modal = $('#destroy-user-team-modal');
-        var modalHeading = modal.find('.modal-header').find('.modal-title');
-        var modalBody = modal.find('.modal-body');
-        modalHeading.text($('<div>').html(data.heading).text());
-        modalBody.html(data.html);
+        const modalContent = modal.find('.modal-content');
+
+        modalContent.html(data.html);
 
         // Show the modal
         modal.modal('show');
@@ -122,13 +121,14 @@
       'ajax:error',
       "[data-action='destroy-user-team']",
       function() {
-        // TODO
+        HelperModule.flashAlertMsg(I18n.t('users.settings.user_teams.general_error'), 'danger');
       }
     );
 
     // Also, bind the click action on the modal
     $('#destroy-user-team-modal')
       .on('click', "[data-action='submit']", function() {
+        animateSpinner();
         var btn = $(this);
         var form = btn
           .closest('.modal')
@@ -154,14 +154,16 @@
         // Hide the modal
         modal.modal('hide');
 
+        animateSpinner(null, false);
         // Reload the whole table
-        usersDatatable.ajax.reload();
+        location.reload();
       }
     ).on(
       'ajax:error',
       "[data-id='destroy-user-team-form']",
       function() {
-        // TODO
+        animateSpinner(null, false);
+        HelperModule.flashAlertMsg(I18n.t('users.settings.user_teams.general_error'), 'danger');
       }
     );
   }
diff --git a/app/controllers/users/settings/user_teams_controller.rb b/app/controllers/users/settings/user_teams_controller.rb
index 9118f81d4..536dac21b 100644
--- a/app/controllers/users/settings/user_teams_controller.rb
+++ b/app/controllers/users/settings/user_teams_controller.rb
@@ -48,14 +48,9 @@ module Users
         render json: {
           html: render_to_string(
             partial: 'users/settings/user_teams/' \
-                      'destroy_user_team_modal_body',
+                     'destroy_user_team_modal_body',
             locals: { user_assignment: @user_assignment },
             formats: :html
-          ),
-          heading: I18n.t(
-            'users.settings.user_teams.destroy_uo_heading',
-            user: escape_input(@user_assignment.user.full_name),
-            team: escape_input(@user_assignment.assignable.name)
           )
         }
       end
@@ -63,29 +58,12 @@ module Users
       def destroy
         # If user is last administrator of team,
         # he/she cannot be deleted from it.
-        invalid =
-          managing_team_user_roles_collection.include?(@user_assignment.user_role) &&
-          @user_assignment
-          .assignable
-          .user_assignments
-          .where(user_role: managing_team_user_roles_collection)
-          .count <= 1
+        invalid = @user_assignment.last_with_permission?(TeamPermissions::USERS_MANAGE)
 
         unless invalid
           begin
             @user_assignment.transaction do
-              # If user leaves on his/her own accord,
-              # new owner for projects is the first
-              # administrator of team
               if params[:leave]
-                new_owner =
-                  @user_assignment
-                  .assignable
-                  .user_assignments
-                  .where(user_role: managing_team_user_roles_collection)
-                  .where.not(id: @user_assignment.id)
-                  .first
-                  .user
                 Activities::CreateActivityService
                   .call(activity_type: :user_leave_team,
                         owner: current_user,
@@ -95,10 +73,6 @@ module Users
                           team: @user_assignment.assignable.id
                         })
               else
-                # Otherwise, the new owner for projects is
-                # the current user (= an administrator removing
-                # the user from the team)
-                new_owner = current_user
                 Activities::CreateActivityService
                   .call(activity_type: :remove_user_from_team,
                         owner: current_user,
@@ -110,8 +84,7 @@ module Users
                         })
               end
               reset_user_current_team(@user_assignment)
-
-              remove_user_from_team!(@user_assignment, new_owner)
+              @user_assignment.destroy!
             end
           rescue StandardError => e
             Rails.logger.error e.message
@@ -119,21 +92,27 @@ module Users
           end
         end
 
-        if !invalid
-          if params[:leave]
-            flash[:notice] = I18n.t(
-              'users.settings.user_teams.leave_flash',
-              team: @user_assignment.assignable.name
-            )
-            flash.keep(:notice)
-          end
+        if invalid
+          render json: @user_assignment.errors, status: :unprocessable_entity
+        else
+          flash[:success] = if params[:leave]
+                              I18n.t(
+                                'users.settings.user_teams.leave_flash',
+                                team: @user_assignment.assignable.name
+                              )
+                            else
+                              I18n.t(
+                                'users.settings.user_teams.remove_flash',
+                                user: @user_assignment.user.full_name,
+                                team: @user_assignment.assignable.name
+                              )
+                            end
+
           generate_notification(current_user,
                                 @user_assignment.user,
                                 @user_assignment.assignable,
                                 false)
           render json: { status: :ok }
-        else
-          render json: @user_assignment.errors, status: :unprocessable_entity
         end
       end
 
@@ -165,33 +144,6 @@ module Users
         user_assignment.user.current_team_id = ids.first
         user_assignment.user.save
       end
-
-      def remove_user_from_team!(user_assignment, new_owner)
-        return user_assignment.destroy! unless new_owner
-
-        # Also, make new owner author of all protocols that belong
-        # to the departing user and belong to this team.
-        p_ids = user_assignment.user.added_protocols.where(team: user_assignment.assignable).pluck(:id)
-        Protocol.where(id: p_ids).find_each do |protocol|
-          protocol.record_timestamps = false
-          protocol.added_by = new_owner
-          protocol.archived_by = new_owner if protocol.archived_by == user_assignment.user
-          protocol.restored_by = new_owner if protocol.restored_by == user_assignment.user
-          protocol.save!(validate: false)
-          protocol.user_assignments.find_by(user: new_owner)&.destroy!
-          protocol.user_assignments.create!(
-            user: new_owner,
-            user_role: UserRole.find_predefined_owner_role,
-            assigned: :manually
-          )
-        end
-
-        # Make new owner author of all inventory items that were added
-        # by departing user and belong to this team.
-        RepositoryRow.change_owner(user_assignment.assignable, user_assignment.user, new_owner)
-
-        user_assignment.destroy!
-      end
     end
   end
 end
diff --git a/app/views/users/settings/teams/_user_dropdown.html.erb b/app/views/users/settings/teams/_user_dropdown.html.erb
index 587e5c096..b4c1a25eb 100644
--- a/app/views/users/settings/teams/_user_dropdown.html.erb
+++ b/app/views/users/settings/teams/_user_dropdown.html.erb
@@ -1,5 +1,5 @@
 <% if user_assignment.user == user %>
-  <button class="btn btn-light btn-xs icon-btn" type="button" disabled="disabled">
+  <button class="btn btn-light btn-xs icon-btn" id="leave-team-btn" type="button" disabled="disabled">
     <span class="sn-icon sn-icon-down"></span>
   </button>
 <% else %>
diff --git a/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb b/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
index 7d686a3c1..f857ddeda 100644
--- a/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
+++ b/app/views/users/settings/user_teams/_destroy_user_team_modal.html.erb
@@ -5,18 +5,6 @@
      aria-labelledby="destroy-user-team-modal-label">
   <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" id="destroy-user-team-modal-label">
-        </h4>
-      </div>
-      <div class="modal-body"></div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
-        <button type="button"
-                class="btn btn-danger"
-                data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %></button>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
index fe336e059..44da504d5 100644
--- a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
@@ -1,21 +1,28 @@
-<%= form_with model: user_assignment,
-              url: destroy_user_team_path(user_assignment, format: :json),
-              data: { remote: true, id: 'destroy-user-team-form' },
-              method: :delete do |f| %>
-  <p><%= t("users.settings.user_teams.destroy_uo_message",
+<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="destroy-user-team-modal-label">
+    <%= t('users.settings.user_teams.destroy_uo_heading',
            user: user_assignment.user.full_name,
-           team: user_assignment.assignable.name) %></p>
-  <% if user_assignment.user.confirmed? %>
-    <div class="alert alert-danger" role="alert">
-      <span class="fas fa-exclamation-triangle"></span>
-      &nbsp;
-      <%= t("users.settings.user_teams.destroy_uo_alert_heading") %>
-      <ul>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_1") %></li>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_2").html_safe %></li>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_3") %></li>
-        <li><%= t("users.settings.user_teams.destroy_uo_alert_line_4") %></li>
-      </ul>
+           team: user_assignment.assignable.name,
+           role: user_assignment.user_role.name.downcase) %>
+  </h4>
+  </div>
+<div class="modal-body">
+  <%= form_with model: user_assignment,
+                url: destroy_user_team_path(user_assignment, format: :json),
+                data: { remote: true, id: 'destroy-user-team-form' },
+                method: :delete do |f| %>
+    <div class='flex flex-col gap-6'>
+      <div><%= t("users.settings.user_teams.destroy_message", role: user_assignment.user_role.name.downcase) %></div>
+      <div><%= t("users.settings.user_teams.message_owner") %></div>
+      <div><%= t("users.settings.user_teams.message_alert") %></div>
     </div>
   <% end %>
-<% end %>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t 'general.cancel' %></button>
+  <button type="button"
+          class="btn btn-danger"
+          data-action="submit"><%=t 'users.settings.user_teams.destroy_uo_confirm' %>
+  </button>
+</div>
diff --git a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
index 93170c5c7..4d6e0f85a 100644
--- a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
@@ -4,16 +4,9 @@
               method: :delete,
               data: { id: 'leave-user-team-form' } do |f| %>
   <%= hidden_field_tag :leave, true %>
-  <p><%= t("users.settings.user_teams.leave_uo_message", team: @user_assignment.team.name) %></p>
-  <div class="alert alert-danger" role="alert">
-    <span class="fas fa-exclamation-triangle"></span>
-    &nbsp;
-    <%= t("users.settings.user_teams.leave_uo_alert_heading") %>
-    <ul>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_1") %></li>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_2").html_safe %></li>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_3")%></li>
-      <li><%= t("users.settings.user_teams.leave_uo_alert_line_4")%></li>
-    </ul>
+  <div class='flex flex-col gap-6'>
+    <div><%= t("users.settings.user_teams.leave_message") %></div>
+    <div><%= t("users.settings.user_teams.message_owner") %></div>
+    <div><%= t("users.settings.user_teams.message_alert") %></div>
   </div>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cb51d86a5..a542bd3aa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2973,22 +2973,17 @@ en:
             flash_success: "Team %{team} was successfully deleted."
       user_teams:
         leave_uo_heading: "Leave team %{team}"
-        leave_uo_message: "Are you sure you wish to leave team %{team}? This action is irreversible."
-        leave_uo_alert_heading: "Leaving team has following consequences:"
-        leave_uo_alert_line_1: "you will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
-        leave_uo_alert_line_2: "all projects in the team where you were the sole <b>Owner</b> will receive a new owner from the team administrators;"
-        leave_uo_alert_line_3: "all repository protocols in the team belonging to you will be reassigned onto a new owner from team administrators;"
-        leave_uo_alert_line_4: "all inventory items in the team added by you will be reassigned onto a new owner from team administrators."
-        leave_uo_confirm: "Leave"
-        destroy_uo_heading: "Remove user %{user} from team %{team}"
-        destroy_uo_message: "Are you sure you wish to remove user %{user} from team %{team}?"
-        destroy_uo_alert_heading: "Removing user from team has following consequences:"
-        destroy_uo_alert_line_1: "user will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
-        destroy_uo_alert_line_2: "all projects in the team where user was the sole <b>Owner</b> will be reassigned onto you as a new owner;"
-        destroy_uo_alert_line_3: "all repository protocols in the team belonging to user will be reassigned onto you;"
-        destroy_uo_alert_line_4: "all inventory items in the team added by user will be reassigned onto you."
+        leave_message: "You will lose access to all content associated with the team, including projects, inventories, and protocol templates."
+        destroy_message: 'Removing a team %{role} will revoke their access to all content associated with the team, including projects, inventories, and protocol templates.'
+        leave_uo_confirm: "Leave team"
+        destroy_uo_heading: "Remove team %{role} %{user} from team %{team}"
+        message_owner: "Other team owner(s) will be able to view and manage access to the content."
+        message_alert: "This action cannot be undone."
+        destroy_uo_alert_line_3: "This action cannot be undone."
         destroy_uo_confirm: "Remove"
-        leave_flash: "Successfully left team %{team}."
+        leave_flash: "You have left %{team}."
+        remove_flash: "%{user} has been successfully removed from the team %{team}"
+        general_error: "Something went wrong"
 
   user_roles:
     predefined:

From 0d9024afffc33235932aae2c95ff25963ecec18a Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 9 Apr 2024 14:30:34 +0200
Subject: [PATCH 054/115] Fix folder selection [SCI-10611]

---
 app/serializers/lists/project_and_folder_serializer.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/serializers/lists/project_and_folder_serializer.rb b/app/serializers/lists/project_and_folder_serializer.rb
index 2a21833a5..7d513dd3f 100644
--- a/app/serializers/lists/project_and_folder_serializer.rb
+++ b/app/serializers/lists/project_and_folder_serializer.rb
@@ -31,7 +31,11 @@ module Lists
     end
 
     def code
-      object.code if project?
+      if project?
+        object.code
+      else
+        "F#{object.id}" # We don't have proper code for folders, but we need to correct selection
+      end
     end
 
     def created_at

From 5ab1b4eeadad48a75baaee20371216e6309830f4 Mon Sep 17 00:00:00 2001
From: Klemen Benedicic <klemen.benedicic@scinote.net>
Date: Thu, 11 Apr 2024 12:45:00 +0200
Subject: [PATCH 055/115] Add data-e2e attributes [SCI-10571]

---
 .../javascripts/repository_columns/index.js   | 15 +++++----
 app/javascript/vue/navigation/top_menu.vue    |  4 +--
 .../vue/repositories/modals/duplicate.vue     | 13 ++++----
 .../vue/repositories/modals/new.vue           | 13 ++++----
 .../RepositoryItemSidebar.vue                 | 32 +++++++++----------
 .../vue/shareable_links/container.vue         |  1 +
 .../content/attachments/context_menu.vue      | 22 +++++++++----
 .../vue/shared/datatable/modals/columns.vue   | 18 +++++------
 .../shared/datatable/row_menu_renderer.vue    |  3 +-
 .../vue/shared/datatable/tableHeader.js       |  8 ++---
 .../vue/shared/datatable/toolbar.vue          | 29 +++++++++++++----
 app/views/experiments/canvas.html.erb         |  4 +--
 .../status_flow/_task_flow_button.html.erb    |  1 +
 .../repositories/_toolbar_buttons.html.erb    |  2 +-
 app/views/repositories/index.html.erb         |  2 +-
 .../_manage_column_modal.html.erb             |  2 +-
 app/views/shared/navigation/_top.html.erb     |  2 +-
 17 files changed, 101 insertions(+), 70 deletions(-)

diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index d20a124df..d17ad503c 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -285,12 +285,15 @@ var RepositoryColumns = (function() {
         let editUrl = $(el).attr('data-edit-column-url');
         let destroyUrl = $(el).attr('data-destroy-column-url');
         let thederName;
+        
         if ($(el).find('.modal-tooltiptext').length > 0) {
           thederName = $(el).find('.modal-tooltiptext').text();
         } else {
           thederName = el.innerText;
         }
         thederName = _.escape(thederName);
+        
+        const e2eName = thederName.toLowerCase().replace(' ', '_');
 
         if (['row-name', 'archived-by', 'archived-on'].includes(el.id)) {
           visClass = '';
@@ -303,24 +306,24 @@ var RepositoryColumns = (function() {
           destroyButton = `<button class="btn icon-btn btn-light btn-xs delete-repo-column manage-repo-column"
                               data-action="destroy"
                               data-modal-url="${destroyUrl}">
-                              <span class="sn-icon sn-icon-delete" title="Delete"></span>
+                              <span class="sn-icon sn-icon-delete" title="Delete" data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-delete"></span>
                           </button>`;
         }
 
         let listItem = `<li class="col-list-el ${visLi} ${customColumn} ${editableRow}" data-position="${colIndex}" data-id="${colId}">
-          <i class="grippy sn-icon sn-icon-drag"></i>
+          <i class="grippy sn-icon sn-icon-drag" data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-drag"></i>
           <span class="vis-controls">
-            <span class="vis sn-icon ${visClass}" title="${visText}"></span>
+            <span class="vis sn-icon ${visClass}" title="${visText}"  data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-visibility"></span>
           </span>
-          <div class="text truncate" title="${thederName}">${thederName}</div>
+          <div class="text truncate" title="${thederName}"  data-e2e="e2e-TX-invItems-manageColumnsModal-${e2eName}-columnName">${thederName}</div>
           <span class="column-type pull-right shrink-0">${
-            getColumnTypeText(el, colId) || '<i class="sn-icon sn-icon-locked-task"></i>'
+            getColumnTypeText(el, colId) || `<i class="sn-icon sn-icon-locked-task"  data-e2e="e2e-IC-invItems-manageColumnsModal-${e2eName}-locked"></i>`
           }</span>
           <span class="sci-btn-group manage-controls pull-right" data-view-mode="active">
             <button class="btn icon-btn btn-light btn-xs edit-repo-column manage-repo-column"
                     data-action="edit"
                     data-modal-url="${editUrl}">
-              <span class="sn-icon sn-icon-edit" title="Edit"></span>
+              <span class="sn-icon sn-icon-edit" title="Edit"  data-e2e="e2e-BT-invItems-manageColumnsModal-${e2eName}-edit"></span>
             </button>
             ${destroyButton}
           </span>
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index 4464cb416..108f1af76 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="sci--navigation--top-menu-container">
     <div v-if="user" class="sci--navigation--top-menu-search left-icon sci-input-container-v2" :class="{'disabled' : !currentTeam}" :title="i18n.t('nav.search')">
-      <input type="text" :placeholder="i18n.t('nav.search')" @change="searchValue"/>
+      <input type="text" :placeholder="i18n.t('nav.search')" @change="searchValue" :data-e2e="'e2e-IF-topMenu-search'"/>
       <i class="sn-icon sn-icon-search"></i>
     </div>
-    <div v-if="currentTeam" class="w-64">
+    <div v-if="currentTeam" class="w-64" :data-e2e="'e2e-DD-topMenu-teams'">
       <SelectDropdown
         :value="currentTeam"
         :options="teams"
diff --git a/app/javascript/vue/repositories/modals/duplicate.vue b/app/javascript/vue/repositories/modals/duplicate.vue
index db2f5c644..f5c211def 100644
--- a/app/javascript/vue/repositories/modals/duplicate.vue
+++ b/app/javascript/vue/repositories/modals/duplicate.vue
@@ -2,28 +2,29 @@
   <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-content" data-e2e="e2e-MD-duplicateInventory">
           <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-duplicateInventoryModal-close">
               <i class="sn-icon sn-icon-close"></i>
             </button>
-            <h4 class="modal-title truncate !block" id="edit-project-modal-label" :title="repository.name">
+            <h4 class="modal-title truncate !block" id="edit-project-modal-label" data-e2e="e2e-TX-duplicateInventoryModal-title" :title="repository.name">
               {{ i18n.t('repositories.index.modal_copy.title_html', {name: repository.name }) }}
             </h4>
           </div>
           <div class="modal-body">
             <div class="mb-6">
-              <label class="sci-label">{{ i18n.t("repositories.index.modal_copy.name") }}</label>
+              <label class="sci-label" data-e2e="e2e-TX-duplicateInventoryModal-inputLabel">{{ i18n.t("repositories.index.modal_copy.name") }}</label>
               <div class="sci-input-container-v2" :class="{'error': error}" :data-error="error">
                 <input type="text" v-model="name" class="sci-input-field"
                        autofocus="true" ref="input"
+                       data-e2e="e2e-IF-duplicateInventoryModal-name"
                        :placeholder="i18n.t('repositories.index.modal_copy.name_placeholder')" />
               </div>
             </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" type="submit">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal" data-e2e="e2e-BT-duplicateInventoryModal-cancel">{{ i18n.t('general.cancel') }}</button>
+            <button class="btn btn-primary" type="submit" data-e2e="e2e-BT-duplicateInventoryModal-create">
               {{ i18n.t('repositories.index.modal_copy.copy') }}
             </button>
           </div>
diff --git a/app/javascript/vue/repositories/modals/new.vue b/app/javascript/vue/repositories/modals/new.vue
index 4fae523f7..ae28b32df 100644
--- a/app/javascript/vue/repositories/modals/new.vue
+++ b/app/javascript/vue/repositories/modals/new.vue
@@ -2,29 +2,30 @@
   <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-content" data-e2e="e2e-MD-newInventory">
           <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-newInventoryModal-close">
               <i class="sn-icon sn-icon-close"></i>
             </button>
-            <h4 class="modal-title truncate !block" id="edit-project-modal-label">
+            <h4 class="modal-title truncate !block" id="edit-project-modal-label" data-e2e="e2e-TX-newInventoryModal-title">
               {{ i18n.t('repositories.index.modal_create.title') }}
             </h4>
           </div>
           <div class="modal-body">
             <div class="mb-6">
-              <label class="sci-label">{{ i18n.t("repositories.index.modal_create.name_label") }}</label>
+              <label class="sci-label" data-e2e="e2e-TX-newInventoryModal-inputLabel">{{ i18n.t("repositories.index.modal_create.name_label") }}</label>
               <div class="sci-input-container-v2" :class="{'error': error}" :data-error="error">
                 <input type="text" v-model="name"
                        class="sci-input-field"
                        autofocus="true" ref="input"
+                       data-e2e="e2e-IF-newInventoryModal-name"
                        :placeholder="i18n.t('repositories.index.modal_create.name_placeholder')" />
               </div>
             </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" type="submit">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal" data-e2e="e2e-BT-newInventoryModal-cancel">{{ i18n.t('general.cancel') }}</button>
+            <button class="btn btn-primary" type="submit" data-e2e="e2e-BT-newInventoryModal-create">
               {{ i18n.t('repositories.index.modal_create.submit') }}
             </button>
           </div>
diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
index df6c923b7..4c38848f9 100644
--- a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
+++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
@@ -7,7 +7,7 @@
     <div ref="wrapper" v-show="isShowing" id="repository-item-sidebar-wrapper"
       class='items-sidebar-wrapper bg-white gap-2.5 self-stretch rounded-tl-4 rounded-bl-4 sn-shadow-menu-lg h-full w-[565px]'>
 
-      <div id="repository-item-sidebar" class="w-full h-full pl-6 bg-white flex flex-col">
+      <div id="repository-item-sidebar" data-e2e="e2e-CO-itemCard" class="w-full h-full pl-6 bg-white flex flex-col">
 
         <div ref="stickyHeaderRef" id="sticky-header-wrapper"
           class="sticky top-0 right-0 bg-white flex z-50 flex-col h-[78px] pt-6">
@@ -17,9 +17,9 @@
               :name="defaultColumns.name"
               :archived="defaultColumns.archived"
               @update="update"
-              data-e2e="e2e-TX-repoItemSB-title">
+              data-e2e="e2e-TX-itemCard-title">
             </repository-item-sidebar-title>
-            <i id="close-icon" @click="toggleShowHideSidebar(null)"
+            <i id="close-icon" data-e2e="e2e-BT-itemCard-close" @click="toggleShowHideSidebar(null)"
               class="sn-icon sn-icon-close ml-auto cursor-pointer my-auto mx-0"></i>
           </div>
           <div id="divider" class="w-500 bg-sn-light-grey flex items-center self-stretch h-px mt-6 mr-6"></div>
@@ -56,7 +56,7 @@
                     <div class="flex flex-col ">
                       <span class="inline-block font-semibold pb-[6px]">{{
                         i18n.t('repositories.item_card.default_columns.repository_name') }}</span>
-                      <span class="repository-name text-sn-dark-grey line-clamp-3" :title="repository?.name" data-e2e="e2e-TX-repoItemSBinformation-inventory">
+                      <span class="repository-name text-sn-dark-grey line-clamp-3" :title="repository?.name" data-e2e="e2e-TX-itemCard-inventory">
                         {{ repository?.name }}
                       </span>
                     </div>
@@ -68,7 +68,7 @@
                       <span class="inline-block font-semibold pb-[6px]">{{
                         i18n.t('repositories.item_card.default_columns.id')
                       }}</span>
-                      <span class="inline-block text-sn-dark-grey line-clamp-3" :title="defaultColumns?.code" data-e2e="e2e-TX-repoItemSBinformation-itemID">
+                      <span class="inline-block text-sn-dark-grey line-clamp-3" :title="defaultColumns?.code" data-e2e="e2e-TX-itemCard-itemID">
                         {{ defaultColumns?.code }}
                       </span>
                     </div>
@@ -80,7 +80,7 @@
                       <span class="inline-block font-semibold pb-[6px]">{{
                         i18n.t('repositories.item_card.default_columns.added_on')
                       }}</span>
-                      <span class="inline-block text-sn-dark-grey" :title="defaultColumns?.added_on" data-e2e="e2e-TX-repoItemSBinformation-addedOn">
+                      <span class="inline-block text-sn-dark-grey" :title="defaultColumns?.added_on" data-e2e="e2e-TX-itemCard-addedOn">
                         {{ defaultColumns?.added_on }}
                       </span>
                     </div>
@@ -92,7 +92,7 @@
                       <span class="inline-block font-semibold pb-[6px]">{{
                         i18n.t('repositories.item_card.default_columns.added_by')
                       }}</span>
-                      <span class="inline-block text-sn-dark-grey line-clamp-3" :title="defaultColumns?.added_by" data-e2e="e2e-TX-repoItemSBinformation-addedBy">
+                      <span class="inline-block text-sn-dark-grey line-clamp-3" :title="defaultColumns?.added_by" data-e2e="e2e-TX-itemCard-addedBy">
                         {{ defaultColumns?.added_by }}
                       </span>
                     </div>
@@ -103,7 +103,7 @@
                       <span class="inline-block font-semibold pb-[6px]">{{
                         i18n.t('repositories.item_card.default_columns.archived_on')
                       }}</span>
-                      <span class="inline-block text-sn-dark-grey" :title="defaultColumns.archived_on" data-e2e="e2e-TX-repoItemSBinformation-archivedOn">
+                      <span class="inline-block text-sn-dark-grey" :title="defaultColumns.archived_on" data-e2e="e2e-TX-itemCard-archivedOn">
                         {{ defaultColumns.archived_on }}
                       </span>
                     </div>
@@ -114,7 +114,7 @@
                       <span class="inline-block font-semibold pb-[6px]">{{
                         i18n.t('repositories.item_card.default_columns.archived_by')
                       }}</span>
-                      <span class="inline-block text-sn-dark-grey" :title="defaultColumns.archived_by.full_name" data-e2e="e2e-TX-repoItemSBinformation-archivedBy">
+                      <span class="inline-block text-sn-dark-grey" :title="defaultColumns.archived_by.full_name" data-e2e="e2e-TX-itemCard-archivedBy">
                         {{ defaultColumns.archived_by.full_name }}
                       </span>
                     </div>
@@ -148,14 +148,14 @@
                   </div>
                   <div class="font-inter text-sm leading-5 w-full">
                     <div class="flex flex-row justify-between mb-4">
-                      <div class="font-semibold" data-e2e="e2e-TX-repoItemSBrelationships-parents">
+                      <div class="font-semibold" data-e2e="e2e-TX-itemCard-parents">
                         {{ i18n.t('repositories.item_card.relationships.parents.count', { count: parentsCount || 0 }) }}
                       </div>
                       <a
                         v-if="permissions.can_connect_rows"
                         class="relationships-add-link btn-text-link font-normal"
                         @click="handleOpenAddRelationshipsModal($event, 'parent')"
-                        data-e2e="e2e-TL-repoItemSBrelationships-addParents"
+                        data-e2e="e2e-BT-itemCard-addParent"
                         >
                         {{ i18n.t('repositories.item_card.add_relationship_button_text') }}
                       </a>
@@ -196,14 +196,14 @@
 
                   <div class="font-inter text-sm leading-5 w-full">
                     <div class="flex flex-row justify-between" :class="{ 'mb-4': childrenCount }">
-                      <div class="font-semibold" data-e2e="e2e-TX-repoItemSBrelationships-children">
+                      <div class="font-semibold" data-e2e="e2e-TX-itemCard-children">
                         {{ i18n.t('repositories.item_card.relationships.children.count', { count: childrenCount || 0 }) }}
                       </div>
                       <a
                         v-if="permissions.can_connect_rows"
                         class="relationships-add-link btn-text-link font-normal"
                         @click="handleOpenAddRelationshipsModal($event, 'child')"
-                        data-e2e="e2e-TL-repoItemSBrelationships-addChildren"
+                        data-e2e="e2e-BT-itemCard-addChild"
                         >
                         {{ i18n.t('repositories.item_card.add_relationship_button_text') }}
                       </a>
@@ -249,7 +249,7 @@
                     class="flex flex-row text-lg font-semibold w-[350px] mb-6 leading-7 items-center justify-between transition-colors duration-300"
                     ref="assigned-label"
                     id="assigned-label"
-                    data-e2e="e2e-TX-repoItemSB-assigned"
+                    data-e2e="e2e-TX-itemCard-assigned"
                     >
                     {{ i18n.t('repositories.item_card.section.assigned', {
                       count: assignedModules ?
@@ -261,7 +261,7 @@
                         'disabled': actions?.assign_repository_row && actions.assign_repository_row.disabled
                       }"
                       :data-assign-url="actions?.assign_repository_row ? actions.assign_repository_row.assign_url : ''"
-                      :data-repository-row-id="repositoryRowId" @click="showRepositoryAssignModal" data-e2e="e2e-TL-repoItemSBassigned-assignToTask">
+                      :data-repository-row-id="repositoryRowId" @click="showRepositoryAssignModal" data-e2e="e2e-TL-repoItemSB-assignToTask">
                       {{ i18n.t('repositories.item_card.assigned.assign') }}
                     </a>
                   </div>
@@ -320,7 +320,7 @@
             :class="{ 'pb-6': customColumns?.length }">
             <div id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px mb-6"></div>
             <div id="bottom-button-wrapper" class="flex h-10 justify-end">
-              <button type="button" class="btn btn-primary print-label-button" data-e2e="e2e-BT-repoItemSB-print"
+              <button type="button" class="btn btn-primary print-label-button" data-e2e="e2e-BT-itemCard-print"
                 :data-rows="JSON.stringify([repositoryRowId])"
                 :data-repository-id="repository?.id">
                 {{ i18n.t('repositories.item_card.print_label') }}
diff --git a/app/javascript/vue/shareable_links/container.vue b/app/javascript/vue/shareable_links/container.vue
index 4588b3db5..3ea6f30c9 100644
--- a/app/javascript/vue/shareable_links/container.vue
+++ b/app/javascript/vue/shareable_links/container.vue
@@ -3,6 +3,7 @@
     <button class="ml-2 btn"
             id="share-button"
             type="button"
+            data-e2e="e2e-BT-tasks-shareTask"
             :class="shareClass"
             :title="shareValue"
             @click="openModal">
diff --git a/app/javascript/vue/shared/content/attachments/context_menu.vue b/app/javascript/vue/shared/content/attachments/context_menu.vue
index 040f30a4e..ebc967842 100644
--- a/app/javascript/vue/shared/content/attachments/context_menu.vue
+++ b/app/javascript/vue/shared/content/attachments/context_menu.vue
@@ -106,19 +106,22 @@ export default {
         menu.push({
           text: this.attachment.attributes.wopi_context.button_text,
           url: this.attachment.attributes.urls.edit_asset,
-          url_target: '_blank'
+          url_target: '_blank',
+          data_e2e: 'e2e-BT-attachmentOptions-openInWopi'
         });
       }
       if (this.attachment.attributes.asset_type === 'gene_sequence' && this.attachment.attributes.urls.open_vector_editor_edit) {
         menu.push({
           text: this.i18n.t('open_vector_editor.edit_sequence'),
-          emit: 'open_ove_editor'
+          emit: 'open_ove_editor',
+          data_e2e: 'e2e-BT-attachmentOptions-openInOve'
         });
       }
       if (this.attachment.attributes.asset_type === 'marvinjs' && this.attachment.attributes.urls.marvin_js_start_edit) {
         menu.push({
           text: this.i18n.t('assets.file_preview.edit_in_marvinjs'),
-          emit: 'open_marvinjs_editor'
+          emit: 'open_marvinjs_editor',
+          data_e2e: 'e2e-BT-attachmentOptions-openInMarvin'
         });
       }
       if (this.attachment.attributes.asset_type !== 'marvinjs'
@@ -126,7 +129,8 @@ export default {
           && this.attachment.attributes.urls.start_edit_image) {
         menu.push({
           text: this.i18n.t('assets.file_preview.edit_in_scinote'),
-          emit: 'open_scinote_editor'
+          emit: 'open_scinote_editor',
+          data_e2e: 'e2e-BT-attachmentOptions-openInImageEditor'
         });
       }
       if (this.canOpenLocally) {
@@ -143,18 +147,21 @@ export default {
       menu.push({
         text: this.i18n.t('Download'),
         url: this.attachment.attributes.urls.download,
-        url_target: '_blank'
+        url_target: '_blank',
+        data_e2e: 'e2e-BT-attachmentOptions-download'
       });
       if (this.attachment.attributes.urls.move_targets) {
         menu.push({
           text: this.i18n.t('assets.context_menu.move'),
-          emit: 'move'
+          emit: 'move',
+          data_e2e: 'e2e-BT-attachmentOptions-move'
         });
       }
       if (this.attachment.attributes.urls.delete) {
         menu.push({
           text: this.i18n.t('assets.context_menu.delete'),
-          emit: 'delete'
+          emit: 'delete',
+          data_e2e: 'e2e-BT-attachmentOptions-delete'
         });
       }
       if (this.attachment.attributes.urls.toggle_view_mode) {
@@ -164,6 +171,7 @@ export default {
             text: this.i18n.t(`assets.context_menu.${viewMode}_html`),
             emit: 'viewMode',
             params: viewMode,
+            data_e2e: `e2e-BT-attachmentOptions-${viewMode}`,
             dividerBefore: i === 0
           });
         });
diff --git a/app/javascript/vue/shared/datatable/modals/columns.vue b/app/javascript/vue/shared/datatable/modals/columns.vue
index 3854bbaf4..5f2302bf2 100644
--- a/app/javascript/vue/shared/datatable/modals/columns.vue
+++ b/app/javascript/vue/shared/datatable/modals/columns.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-manageColumns">
         <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-manageColumnsModal-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-manageColumnsModal-title">
             {{ i18n.t('experiments.table.column_display_modal.title') }}
           </h4>
         </div>
@@ -30,18 +30,18 @@
                 >
                   <div v-if="element.field == 'pinnedSeparator'" class="h-[1px] w-full bg-sn-sleepy-grey"></div>
                   <template v-else>
-                    <div class="opacity-0 group-hover/column:!opacity-100 element-grip cursor-pointer">
+                    <div class="opacity-0 group-hover/column:!opacity-100 element-grip cursor-pointer" :data-e2e="'e2e-BT-manageColumnsModal-'+element.field+'-drag'">
                       <i class="sn-icon sn-icon-drag"></i>
                     </div>
                     <div v-if="element.field === 'name'" class="w-6 h-6"></div>
                     <template v-else>
                       <i v-if="columnVisbile(element)" @click="toggleColumn(element, true)"
-                        class="sn-icon sn-icon-visibility-show cursor-pointer"></i>
+                        class="sn-icon sn-icon-visibility-show cursor-pointer" :data-e2e="'e2e-BT-manageColumnsModal-'+element.field+'-hide'"></i>
                       <i v-else @click="toggleColumn(element, false)"
-                        class="sn-icon sn-icon-visibility-hide cursor-pointer"></i>
+                        class="sn-icon sn-icon-visibility-hide cursor-pointer" :data-e2e="'e2e-BT-manageColumnsModal-'+element.field+'-show'"></i>
                     </template>
-                    <div class="truncate">{{ element.headerName }}</div>
-                    <div class="ml-auto cursor-pointer">
+                    <div class="truncate" :data-e2e="'e2e-TX-manageColumnsModal-'+element.field+'-columnName'">{{ element.headerName }}</div>
+                    <div class="ml-auto cursor-pointer" :data-e2e="'e2e-BT-manageColumnsModal-'+element.field+'-pin'">
                       <i v-if="columnPinned(element)" @click="unPinColumn(element)" class="sn-icon sn-icon-pinned"></i>
                       <i v-else @click="pinColumn(element)" class="sn-icon sn-icon-pin"></i>
                     </div>
@@ -52,7 +52,7 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-secondary mr-auto" @click="resetToDefault">
+          <button type="button" class="btn btn-secondary mr-auto" @click="resetToDefault" data-e2e="e2e-BT-manageColumnsModal-resetToDefault">
             {{ i18n.t('experiments.table.column_display_modal.reset_to_default') }}
           </button>
         </div>
diff --git a/app/javascript/vue/shared/datatable/row_menu_renderer.vue b/app/javascript/vue/shared/datatable/row_menu_renderer.vue
index e56b5b208..138a814c4 100644
--- a/app/javascript/vue/shared/datatable/row_menu_renderer.vue
+++ b/app/javascript/vue/shared/datatable/row_menu_renderer.vue
@@ -41,9 +41,8 @@ export default {
         if (item.type === 'link') {
           newItem.url = item.path;
         }
-
+        newItem.data_e2e = `e2e-BT-cardActions-${item.name}`;
         newItem.params = item;
-
         return newItem;
       });
     },
diff --git a/app/javascript/vue/shared/datatable/tableHeader.js b/app/javascript/vue/shared/datatable/tableHeader.js
index d77c4a5e7..0c3ba0e4b 100644
--- a/app/javascript/vue/shared/datatable/tableHeader.js
+++ b/app/javascript/vue/shared/datatable/tableHeader.js
@@ -2,17 +2,17 @@ export default {
   template: `
     <div class="w-full grid items-center group gap-2 grid-cols-[auto_1.5rem]"
          :class="{'cursor-pointer': params.enableSorting}"
-         :data-e2e="'e2e-CO-TableHeader-' + params.column.colId "
+         :data-e2e="'e2e-CO-tableHeader-' + params.column.colId "
          @click="onSortRequested((activeSort == 'asc' ? 'desc' : 'asc'), $event)">
       <div v-if="params.html" class="customHeaderLabel truncate" v-html="params.html"></div>
       <div v-else class="customHeaderLabel truncate">{{ params.displayName }}</div>
-      <div v-if="activeSort == 'asc'" class="customSortDownLabel text-sn-black">
+      <div v-if="activeSort == 'asc'" class="customSortDownLabel text-sn-black" data-e2e="e2e-BT-tableHeader-sortedAsc">
         <i class="sn-icon sn-icon-sort-up"></i>
       </div>
-      <div v-if="activeSort == 'desc'" class="customSortUpLabel text-sn-black">
+      <div v-if="activeSort == 'desc'" class="customSortUpLabel text-sn-black" data-e2e="e2e-BT-tableHeader-sortedDesc">
         <i class="sn-icon sn-icon-sort-down"></i>
       </div>
-      <div v-if="activeSort == null && params.enableSorting" class="text-sn-black tw-hidden group-hover:block">
+      <div v-if="activeSort == null && params.enableSorting" class="text-sn-black tw-hidden group-hover:block" data-e2e="e2e-BT-tableHeader-sortUpDown">
         <i class="sn-icon sn-icon-sort"></i>
       </div>
     </div>
diff --git a/app/javascript/vue/shared/datatable/toolbar.vue b/app/javascript/vue/shared/datatable/toolbar.vue
index 71e7edfd4..c51859633 100644
--- a/app/javascript/vue/shared/datatable/toolbar.vue
+++ b/app/javascript/vue/shared/datatable/toolbar.vue
@@ -31,6 +31,7 @@
           :btnText="i18n.t(`toolbar.${currentViewRender}_view`)"
           :caret="true"
           :position="'right'"
+          :data-e2e="'e2e-DD-topToolbar-viewDropdown'"
           @setCardsView="$emit('setCardsView')"
           @setTableView="$emit('setTableView')"
         ></MenuDropdown>
@@ -41,6 +42,7 @@
           :btnText="i18n.t(`toolbar.${currentViewMode}_state`)"
           :caret="true"
           :position="'right'"
+          :data-e2e="'e2e-DD-topToolbar-stateDropdown'"
         ></MenuDropdown>
       </div>
     </div>
@@ -53,7 +55,8 @@
         {{ action.label }}
       </a>
       <div class="sci-input-container-v2"
-           :class="{'w-48': showSearch, 'w-11': !showSearch}">
+           :class="{'w-48': showSearch, 'w-11': !showSearch}"
+           :data-e2e="'e2e-BT-topToolbar-search'">
         <input
           ref="searchInput"
           class="sci-input-field !pr-9"
@@ -62,16 +65,18 @@
           @blur="hideSearch"
           :value="searchValue"
           :placeholder="'Search...'"
+          :data-e2e="'e2e-IF-topToolbar-search'"
           @change="$emit('search:change', $event.target.value)"
         />
         <i v-if="searchValue.length === 0" class="sn-icon sn-icon-search !m-2.5 !ml-auto right-0"></i>
         <i v-else class="sn-icon sn-icon-close !m-2.5 !ml-auto right-0 cursor-pointer z-10"
                   @click="$emit('search:change', '')"></i>
       </div>
-      <FilterDropdown v-if="filters.length" :filters="filters" @applyFilters="applyFilters" />
+      <FilterDropdown v-if="filters.length" :filters="filters" @applyFilters="applyFilters" :data-e2e="'e2e-BT-topToolbar-filters'"/>
       <button
         v-if="currentViewRender === 'table'"
         @click="showColumnsModal = true"
+        :data-e2e="'e2e-BT-topToolbar-manageColumns'"
         :title="i18n.t('experiments.table.column_display_modal.title')"
         class="btn btn-light icon-btn btn-black"
       >
@@ -187,12 +192,14 @@ export default {
         {
           text: this.i18n.t('toolbar.active_state'),
           url: this.activePageUrl,
-          active: this.currentViewMode === 'active'
+          active: this.currentViewMode === 'active',
+          data_e2e: 'e2e-BT-topToolbar-viewState-active'
         },
         {
           text: this.i18n.t('toolbar.archived_state'),
           url: this.archivedPageUrl,
-          active: this.currentViewMode === 'archived'
+          active: this.currentViewMode === 'archived',
+          data_e2e: 'e2e-BT-topToolbar-viewState-archived'
         }
       ];
     },
@@ -202,9 +209,19 @@ export default {
         const active = this.currentViewRender === type;
         switch (type) {
           case 'cards':
-            return { text: this.i18n.t('toolbar.cards_view'), emit: 'setCardsView', active };
+            return {
+              text: this.i18n.t('toolbar.cards_view'),
+              emit: 'setCardsView',
+              active,
+              data_e2e: 'e2e-BT-topToolbar-view-cards'
+            };
           case 'table':
-            return { text: this.i18n.t('toolbar.table_view'), emit: 'setTableView', active };
+            return {
+              text: this.i18n.t('toolbar.table_view'),
+              emit: 'setTableView',
+              active,
+              data_e2e: 'e2e-BT-topToolbar-view-table'
+            };
           case 'custom':
             return { text: view.name, url: view.url, active };
           default:
diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb
index 8656d9ebe..dbc00f278 100644
--- a/app/views/experiments/canvas.html.erb
+++ b/app/views/experiments/canvas.html.erb
@@ -17,7 +17,7 @@
                     title: t('experiments.canvas.new_my_module_tooltip'),
                     data: { view_mode: 'active' },
                     remote: true do %>
-                <span class="sn-icon sn-icon-new-task"></span>
+                <span class="sn-icon sn-icon-new-task" data-e2e="e2e-BT-canvasToolbar-createTask"></span>
                 <span class="hidden-sm hidden-xs"><%= t('experiments.canvas.new_my_module') %></span>
         <% end %>
         <%=link_to canvas_edit_experiment_url(@experiment),
@@ -27,7 +27,7 @@
               title: t('experiments.canvas.canvas_edit'),
               data: { action: 'edit' },
               class: 'ajax btn btn-light' do %>
-                <span class="sn-icon sn-icon-edit"></span>
+                <span class="sn-icon sn-icon-edit" data-e2e="e2e-BT-canvasToolbar-editWorkflow"></span>
                 <span class="hidden-sm hidden-xs"><%= t('experiments.canvas.canvas_edit') %></span>
               <% end %>
       <% end %>
diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb
index 1c5b7cb81..1d20e37a2 100644
--- a/app/views/my_modules/status_flow/_task_flow_button.html.erb
+++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb
@@ -29,6 +29,7 @@
             data-toggle="dropdown"
             aria-haspopup="true"
             aria-expanded="true"
+            data-e2e="e2e-DD-tasks-taskStatus"
             style="<%= "background-color: #{status.color}" %>;">
       <span>
         <% if my_module.status_changing %>
diff --git a/app/views/repositories/_toolbar_buttons.html.erb b/app/views/repositories/_toolbar_buttons.html.erb
index 79deeff36..6324d6887 100644
--- a/app/views/repositories/_toolbar_buttons.html.erb
+++ b/app/views/repositories/_toolbar_buttons.html.erb
@@ -19,7 +19,7 @@
           <span class="button-text"><%= t("repositories.add_new_record") %></span>
         </button>
         <button type="button" data-toggle="tooltip" data-placement="bottom" title="<%= t('repositories.show.button_tooltip.import') %>"
-                class="btn btn-light editImport auto-shrink-button"
+                class="btn btn-light editImport auto-shrink-button" data-e2e="e2e-BT-topToolbar-importInventoryItems"
                 id="importRecordsButton" data-view-mode="active">
           <span class="sn-icon sn-icon-import"></span>
           <span class="button-text"><%= t('repositories.index.options_dropdown.import_items') %></span>
diff --git a/app/views/repositories/index.html.erb b/app/views/repositories/index.html.erb
index 0f18b5e2d..b407e6adf 100644
--- a/app/views/repositories/index.html.erb
+++ b/app/views/repositories/index.html.erb
@@ -10,7 +10,7 @@
         <h1 data-view-mode="archived"><span><%= t('labels.archived')%></span>&nbsp;<%= t('libraries.index.head_title_archived') %></h1>
       </div>
     </div>
-    <div class="content-body" data-e2e="e2e-inventories-container">
+    <div class="content-body" data-e2e="e2e-CO-inventories">
       <div id="repositoriesTable" class="fixed-content-body">
         <repositories-table
           actions-url="<%= actions_toolbar_team_repositories_path(current_team) %>"
diff --git a/app/views/repository_columns/_manage_column_modal.html.erb b/app/views/repository_columns/_manage_column_modal.html.erb
index 5f5e7ee2a..05193fe09 100644
--- a/app/views/repository_columns/_manage_column_modal.html.erb
+++ b/app/views/repository_columns/_manage_column_modal.html.erb
@@ -3,7 +3,7 @@
      tabindex="-1"
      role="dialog"
      aria-labelledby="manangeRepositoryColumnLabel" data-task-page="<%= my_module_page ? 'true' : '' %>">
-  <div class="modal-dialog" role="document" data-e2e="e2e-MD-invInventoryRT-manageColumns">
+  <div class="modal-dialog" role="document" data-e2e="e2e-MD-invItems-manageColumns">
     <div class="modal-content">
     </div>
   </div>
diff --git a/app/views/shared/navigation/_top.html.erb b/app/views/shared/navigation/_top.html.erb
index 5cd942190..5397ce482 100644
--- a/app/views/shared/navigation/_top.html.erb
+++ b/app/views/shared/navigation/_top.html.erb
@@ -1,5 +1,5 @@
 <% if user_signed_in? %>
-  <div id="sciNavigationTopMenuContainer" data-turbolinks-permanent data-behaviour="vue">
+  <div id="sciNavigationTopMenuContainer" data-turbolinks-permanent data-behaviour="vue" data-e2e="e2e-CO-topMenu">
     <top-menu-container
       url="<%= top_menu_navigations_path %>"
       notifications-url="<%= user_notifications_path %>"

From 83dbd89f042e83287116538775133e1e6dee5e21 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 11 Apr 2024 12:45:29 +0100
Subject: [PATCH 056/115] Add archived tag to global search result object names
 [SCI-10585]

---
 app/controllers/search_controller.rb              |  2 +-
 .../vue/global_search/groups/assets.vue           |  4 ++--
 .../vue/global_search/groups/experiments.vue      |  6 ++++--
 .../vue/global_search/groups/folders.vue          |  6 ++++--
 .../global_search/groups/my_module_protocols.vue  |  8 +++++---
 .../vue/global_search/groups/my_modules.vue       |  6 ++++--
 .../vue/global_search/groups/projects.vue         |  6 ++++--
 .../vue/global_search/groups/protocols.vue        |  4 +++-
 .../vue/global_search/groups/reports.vue          |  2 +-
 .../vue/global_search/groups/repository_rows.vue  |  6 ++++--
 .../vue/global_search/groups/results.vue          |  8 +++++---
 .../vue/global_search/groups/search_mixin.js      |  7 ++++++-
 app/serializers/global_search/asset_serializer.rb | 15 +++++++++++----
 .../global_search/experiment_serializer.rb        |  3 ++-
 .../my_module_protocol_serializer.rb              |  6 ++++--
 .../global_search/my_module_serializer.rb         |  3 ++-
 .../global_search/project_folder_serializer.rb    |  3 ++-
 .../global_search/project_serializer.rb           |  3 ++-
 .../global_search/report_serializer.rb            |  3 ++-
 .../global_search/repository_row_serializer.rb    |  3 ++-
 .../global_search/result_serializer.rb            |  6 ++++--
 21 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 6180275de..53afca804 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -167,7 +167,7 @@ class SearchController < ApplicationController
                  }
           return
         when 'assets'
-          @asset_search_count = fetch_cached_count(Protocol)
+          @asset_search_count = fetch_cached_count(Asset)
           search_assets
           includes = [{ step: { protocol: { my_module: :experiment } } }, { result: { my_module: :experiment } }, :team]
           results = if params[:preview] == 'true'
diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index f8210800e..f5ccd786c 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -33,14 +33,14 @@
           <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t(`search.index.${row.attributes.parent.type}`) }}:</b>
             <a target="_blank" :href="row.attributes.parent.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.parent.name"></StringWithEllipsis>
+              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent)"></StringWithEllipsis>
             </a>
           </div>
           <div class="s h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey"
                :class="{ 'invisible': !row.attributes.experiment.name }">
             <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
             <a target="_blank" :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
             </a>
           </div>
         </template>
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index f1cdffce5..d58e43aff 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@@ -32,7 +34,7 @@
             <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
               <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
               <a :href="row.attributes.project.url" target="_blank" class="shrink-0 overflow-hidden">
-                <StringWithEllipsis class="w-full" :text="row.attributes.project.name"></StringWithEllipsis>
+                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
               </a>
             </div>
           </div>
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index 586176842..bc08b895c 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
           <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
@@ -29,7 +31,7 @@
               <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
                 <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
                 <a :href="row.attributes.parent_folder.url" target="_blank" class="shrink-0 overflow-hidden">
-                  <StringWithEllipsis class="w-full" :text="row.attributes.parent_folder.name"></StringWithEllipsis>
+                  <StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent_folder)"></StringWithEllipsis>
                 </a>
               </div>
             </template>
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index 464c83906..fcc60a5d9 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@@ -35,14 +37,14 @@
           <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
             <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
+              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
             </a>
           </div>
           <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
             <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
               <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
               <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
               </a>
             </div>
           </div>
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index a5cd97738..3c0c875fc 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@@ -36,7 +38,7 @@
             <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
               <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
               <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
               </a>
             </div>
           </div>
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index efe96ee41..a73d1ecf3 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@@ -33,7 +35,7 @@
               <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
                 <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
                 <a :href="row.attributes.folder.url" class="shrink-0 overflow-hidden">
-                  <StringWithEllipsis class="w-full" :text="row.attributes.folder.name"></StringWithEllipsis>
+                  <StringWithEllipsis class="w-full" :text="labelName(row.attributes.folder)"></StringWithEllipsis>
                 </a>
               </div>
             </template>
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index 83daa2c63..9df4b0b7a 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index 2c3467b4f..d36cd14d5 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -42,7 +42,7 @@
           <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
             <a target="_blank" :href="row.attributes.project.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.project.name"></StringWithEllipsis>
+              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
             </a>
           </div>
         </template>
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index 079141c7d..34932ebd8 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@@ -36,7 +38,7 @@
           <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.repository') }}:</b>
             <a :href="row.attributes.repository.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.repository.name"></StringWithEllipsis>
+              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.repository)"></StringWithEllipsis>
             </a>
           </div>
         </template>
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 6f92bd1ce..064a6ee53 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -12,7 +12,9 @@
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
         <template v-for="row in preparedResults" :key="row.id">
           <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
+            <StringWithEllipsis class="w-full"
+              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
+            </StringWithEllipsis>
           </a>
           <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
             <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
@@ -31,14 +33,14 @@
           <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
             <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
             <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
+              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
             </a>
           </div>
           <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
             <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
               <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
               <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
+                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
               </a>
             </div>
           </div>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 1d2a8c615..3fa527e06 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -3,7 +3,7 @@ import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
 import SortFlyout from './sort_flyout.vue';
 import Loader from '../loader.vue';
 import NoSearchResult from '../no_search_result.vue';
-/* global GLOBAL_CONSTANTS */
+/* global GLOBAL_CONSTANTS I18n */
 
 export default {
   props: {
@@ -89,6 +89,11 @@ export default {
     }
   },
   methods: {
+    labelName(object) {
+      if (!object.archived) return object.name;
+
+      return `${I18n.t('labels.archived')} ${object.name}`;
+    },
     handleScroll() {
       if (this.loading || !this.selected) return;
 
diff --git a/app/serializers/global_search/asset_serializer.rb b/app/serializers/global_search/asset_serializer.rb
index 751cc1037..68741626d 100644
--- a/app/serializers/global_search/asset_serializer.rb
+++ b/app/serializers/global_search/asset_serializer.rb
@@ -31,7 +31,8 @@ module GlobalSearch
 
       {
         name: object.my_module.experiment.name,
-        url: my_modules_experiment_path(id: object.my_module.experiment.id, search: object.my_module.code)
+        url: my_modules_experiment_path(id: object.my_module.experiment.id, search: object.my_module.code),
+        archived: object.my_module.experiment.archived?
       }
     end
 
@@ -40,22 +41,28 @@ module GlobalSearch
       if parent.is_a?(Result) && object.my_module
         parent_type = 'task'
         parent_name = object.my_module.name
-        parent_url = my_module_results_path(my_module_id: object.my_module.id)
+        parent_archived = parent.archived?
+        view_mode = parent_archived ? 'archived' : 'active'
+        parent_url = my_module_results_path(my_module_id: object.my_module.id, view_mode: view_mode)
       elsif parent.is_a?(Step) && object.my_module
         parent_type = 'task'
         parent_name = object.my_module.name
+        parent_archived = object.my_module.archived?
         parent_url = protocols_my_module_path(object.my_module.id)
       elsif parent.is_a?(Step)
         parent_type = 'protocol_template'
         parent_name = parent.protocol.name || I18n.t('search.index.untitled_protocol')
         parent_url = protocol_path(parent.protocol_id)
+        parent_archived = parent.protocol.archived?
       elsif parent.is_a?(RepositoryCell)
         parent_type = 'inventory_item'
         parent_name = parent.repository_row.name
-        parent_url = repository_repository_rows_path(repository_id: parent.repository_row.repository_id)
+        parent_archived = parent.repository_row.archived?
+        parent_url =
+          repository_path(id: parent.repository_row.repository_id, repository_row_id: parent.repository_row.id)
       end
 
-      { name: parent_name, url: parent_url, type: parent_type }
+      { name: parent_name, url: parent_url, type: parent_type, archived: parent_archived }
     end
   end
 end
diff --git a/app/serializers/global_search/experiment_serializer.rb b/app/serializers/global_search/experiment_serializer.rb
index e1ac156e5..76b3089ba 100644
--- a/app/serializers/global_search/experiment_serializer.rb
+++ b/app/serializers/global_search/experiment_serializer.rb
@@ -16,7 +16,8 @@ module GlobalSearch
     def project
       {
         name: object.project.name,
-        url: project_experiments_path(project_id: object.project.id)
+        url: project_experiments_path(project_id: object.project.id),
+        archived: object.project.archived?
       }
     end
 
diff --git a/app/serializers/global_search/my_module_protocol_serializer.rb b/app/serializers/global_search/my_module_protocol_serializer.rb
index 642d8a588..66f8a4075 100644
--- a/app/serializers/global_search/my_module_protocol_serializer.rb
+++ b/app/serializers/global_search/my_module_protocol_serializer.rb
@@ -20,14 +20,16 @@ module GlobalSearch
     def experiment
       {
         name: object.my_module.experiment.name,
-        url: my_modules_experiment_path(object.my_module.experiment.id)
+        url: my_modules_experiment_path(object.my_module.experiment.id),
+        archived: object.my_module.experiment.archived?
       }
     end
 
     def my_module
       {
         name: object.my_module.name,
-        url: protocols_my_module_path(object.my_module.id)
+        url: protocols_my_module_path(object.my_module.id),
+        archived: object.my_module.archived?
       }
     end
 
diff --git a/app/serializers/global_search/my_module_serializer.rb b/app/serializers/global_search/my_module_serializer.rb
index c3089ab5e..8a1cff46c 100644
--- a/app/serializers/global_search/my_module_serializer.rb
+++ b/app/serializers/global_search/my_module_serializer.rb
@@ -16,7 +16,8 @@ module GlobalSearch
     def experiment
       {
         name: object.experiment.name,
-        url: my_modules_experiment_path(object.experiment.id)
+        url: my_modules_experiment_path(object.experiment.id),
+        archived: object.experiment.archived?
       }
     end
 
diff --git a/app/serializers/global_search/project_folder_serializer.rb b/app/serializers/global_search/project_folder_serializer.rb
index c818ee2bd..628076555 100644
--- a/app/serializers/global_search/project_folder_serializer.rb
+++ b/app/serializers/global_search/project_folder_serializer.rb
@@ -25,7 +25,8 @@ module GlobalSearch
       if object.parent_folder_id?
         {
           name: object.parent_folder.name,
-          url: project_folder_path(object.parent_folder.id)
+          url: project_folder_path(object.parent_folder.id),
+          archived: object.parent_folder.archived?
         }
       end
     end
diff --git a/app/serializers/global_search/project_serializer.rb b/app/serializers/global_search/project_serializer.rb
index bd94e4b56..cd32cbbfa 100644
--- a/app/serializers/global_search/project_serializer.rb
+++ b/app/serializers/global_search/project_serializer.rb
@@ -24,7 +24,8 @@ class GlobalSearch::ProjectSerializer < ActiveModel::Serializer
     if object.project_folder
       {
         name: object.project_folder.name,
-        url: project_folder_path(object.project_folder)
+        url: project_folder_path(object.project_folder),
+        archived: object.project_folder.archived?
       }
     end
   end
diff --git a/app/serializers/global_search/report_serializer.rb b/app/serializers/global_search/report_serializer.rb
index 3ba4cb59c..673695a38 100644
--- a/app/serializers/global_search/report_serializer.rb
+++ b/app/serializers/global_search/report_serializer.rb
@@ -16,7 +16,8 @@ module GlobalSearch
     def project
       {
         name: object.project.name,
-        url: project_experiments_path(project_id: object.project.id)
+        url: project_experiments_path(project_id: object.project.id),
+        archived: object.project.archived?
       }
     end
 
diff --git a/app/serializers/global_search/repository_row_serializer.rb b/app/serializers/global_search/repository_row_serializer.rb
index 49011ff90..a597cfcd4 100644
--- a/app/serializers/global_search/repository_row_serializer.rb
+++ b/app/serializers/global_search/repository_row_serializer.rb
@@ -27,7 +27,8 @@ module GlobalSearch
     def repository
       {
         name: object.repository.name,
-        url: repository_path(object.repository)
+        url: repository_path(object.repository),
+        archived: object.repository.archived
       }
     end
 
diff --git a/app/serializers/global_search/result_serializer.rb b/app/serializers/global_search/result_serializer.rb
index 718b47517..a2839453a 100644
--- a/app/serializers/global_search/result_serializer.rb
+++ b/app/serializers/global_search/result_serializer.rb
@@ -16,14 +16,16 @@ module GlobalSearch
     def experiment
       {
         name: object.my_module.experiment.name,
-        url: my_modules_experiment_path(object.my_module.experiment.id)
+        url: my_modules_experiment_path(object.my_module.experiment.id),
+        archived: object.my_module.experiment.archived?
       }
     end
 
     def my_module
       {
         name: object.my_module.name,
-        url: protocols_my_module_path(object.my_module.id)
+        url: protocols_my_module_path(object.my_module.id),
+        archived: object.my_module.archived?
       }
     end
 

From f29c10720837fb7b4395fbde5ae1852c9480df84 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 11 Apr 2024 15:23:59 +0200
Subject: [PATCH 057/115] Fix quick search memory leak

---
 app/javascript/vue/navigation/quick_search.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 79a622192..c46cf4685 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -26,7 +26,7 @@
         @cancel="filtersOpened = false"
       ></SearchFilters>
       <div v-else-if="showHistory" class="max-w-[600px]">
-        <div v-for="(query, i) in previousQueries.reverse()" @click="setQuery(query)" :key="i"
+        <div v-for="(query, i) in reversedPreviousQueries" @click="setQuery(query)" :key="i"
              class="flex px-3 h-11 items-center gap-2 hover:bg-sn-super-light-grey cursor-pointer">
           <i class="sn-icon sn-icon-history-search"></i>
           {{ query }}
@@ -141,6 +141,9 @@ export default {
     SearchFilters
   },
   computed: {
+    reversedPreviousQueries() {
+      return this.previousQueries.reverse();
+    },
     canOpen() {
       return this.previousQueries.length > 0 || this.searchQuery.length > 1;
     },

From 4aa4b69608f20b68497d51a7142c02febebc897b Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 11 Apr 2024 18:57:42 +0100
Subject: [PATCH 058/115] Rename Azure AD SSO to Microsoft Entra ID [SCI-10616]

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 23ccc7677..6c415f110 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2899,13 +2899,13 @@ en:
           not_connected: "You have no Connected accounts"
           unlink_success: "Successfully unlinked"
           azure_ad:
-            title: "Your Microsoft Azure (Active Directory) Account"
-            connect_hint: "Allows you to sign in with your Microsoft Azure (Active Directory) account."
+            title: "Your Microsoft Entra ID Account"
+            connect_hint: "Allows you to sign in with your Microsoft Entra ID account."
             connected: "Connected"
             unlink_button: "Unlink"
             unlink_modal:
-              title: "Unlink Microsoft Azure (Active Directory) account?"
-              description_1: "Are you sure you would like unlink Microsoft Azure (Active Directory) and SciNote accounts?"
+              title: "Unlink Microsoft Entra ID account?"
+              description_1: "Are you sure you would like unlink Microsoft Entra ID and SciNote accounts?"
               submit_button: "Submit"
           okta:
             title: "Your Okta Account"

From 7b3e5a06e01bcb0c743bb72c1e40909cb88e24d4 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Fri, 12 Apr 2024 11:17:09 +0200
Subject: [PATCH 059/115] Fix label templates seelctor in print modal
 [SCI-10632]

---
 app/controllers/label_templates_controller.rb           | 6 +++++-
 app/javascript/vue/repository_print_modal/container.vue | 2 +-
 app/views/label_printers/_label_printer_modal.html.erb  | 2 +-
 config/routes.rb                                        | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb
index 8727edcce..32d9bbc23 100644
--- a/app/controllers/label_templates_controller.rb
+++ b/app/controllers/label_templates_controller.rb
@@ -5,7 +5,7 @@ class LabelTemplatesController < ApplicationController
   include TeamsHelper
 
   before_action :check_feature_enabled, except: %i(index zpl_preview)
-  before_action :load_label_templates, only: %i(index datatable)
+  before_action :load_label_templates, only: %i(index datatable list)
   before_action :load_label_template, only: %i(show set_default update template_tags)
   before_action :check_view_permissions, except: %i(create duplicate set_default delete update)
   before_action :check_manage_permissions, only: %i(create duplicate set_default delete update)
@@ -29,6 +29,10 @@ class LabelTemplatesController < ApplicationController
     end
   end
 
+  def list
+    render json: @label_templates, each_serializer: LabelTemplateSerializer, user: current_user
+  end
+
   def show
     respond_to do |format|
       format.json { render json: @label_template, serializer: LabelTemplateSerializer, user: current_user }
diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue
index ac721d6ec..49d6b3f1b 100644
--- a/app/javascript/vue/repository_print_modal/container.vue
+++ b/app/javascript/vue/repository_print_modal/container.vue
@@ -272,7 +272,7 @@ export default {
     templateOption(option) {
       return `
           <div class="label-template-option" data-toggle="tooltip" data-placement="right" title="${option.params.description}">
-            ${option.params.icon}
+            <img src="${option.params.icon}"></img>
             ${option.label}
           </div>
         `;
diff --git a/app/views/label_printers/_label_printer_modal.html.erb b/app/views/label_printers/_label_printer_modal.html.erb
index 68579dc8b..23316e8d1 100644
--- a/app/views/label_printers/_label_printer_modal.html.erb
+++ b/app/views/label_printers/_label_printer_modal.html.erb
@@ -2,7 +2,7 @@
   data-print-url="<%= print_repositories_path %>"
   data-zebra-progress-url="<%= print_zpl_repositories_path %>"
   data-printers-url="<%= label_printers_path(format: :json) %>"
-  data-label-templates-url="<%= label_templates_path(format: :json) %>"
+  data-label-templates-url="<%= list_label_templates_path(format: :json) %>"
   data-rows-url="<%= rows_to_print_repositories_path %>"
   data-print-validation-url="<%= validate_label_template_columns_repositories_path %>"
   data-label-preview-url="<%= zpl_preview_label_templates_path %>"
diff --git a/config/routes.rb b/config/routes.rb
index 0d24122b4..cd0d9ab73 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -53,6 +53,7 @@ Rails.application.routes.draw do
         post :set_default
       end
       collection do
+        get :list
         post :duplicate
         delete :delete
         get :datatable

From 055421c6a320a11ca8eff116fd27a190c7d89b9b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 15 Apr 2024 10:25:59 +0200
Subject: [PATCH 060/115] Improve for tags modal [SCI-10587]

---
 app/assets/javascripts/my_modules.js          |  4 +-
 app/javascript/vue/my_modules/modals/tags.vue | 50 ++++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js
index bdb85372f..586ca8b7d 100644
--- a/app/assets/javascripts/my_modules.js
+++ b/app/assets/javascripts/my_modules.js
@@ -112,8 +112,8 @@
       },
       optionLabel: (data) => {
         if (data.value > 0) {
-          return `<span class="my-module-tags-color" style="background:${data.params.color}"></span>
-                  ${data.label}`;
+          return `<span class="h-6 px-1.5 flex items-center max-w-80 truncate text-sn-white rounded"
+                        style="background:${data.params.color}">${data.label}</span>`;
         }
         return `<span class="my-module-tags-color new"><i class="sn-icon sn-icon-new-task"></i></span>
                   ${data.label + ' '}
diff --git a/app/javascript/vue/my_modules/modals/tags.vue b/app/javascript/vue/my_modules/modals/tags.vue
index e1710acec..9a6ae0f3f 100644
--- a/app/javascript/vue/my_modules/modals/tags.vue
+++ b/app/javascript/vue/my_modules/modals/tags.vue
@@ -37,7 +37,7 @@
                   <label class="sci-checkbox-label"></label>
                 </div>
                 <div v-if="!tag.editing" @click="startEditMode(tag)"
-                     class="h-6 px-1.5 flex items-center max-w-80 truncate text-sn-white rounded"
+                     class="h-6 px-1.5 flex items-center max-w-80 truncate text-sn-white cursor-text rounded"
                      :class="{
                        'cursor-pointer': canManage
                      }"
@@ -64,15 +64,12 @@
                     </template>
                   </GeneralDropdown>
                   <input type="text" :value="tag.attributes.name" class="border-0 grow focus:outline-none bg-transparent" @change="updateTagName($event.target.value, tag)"/>
-                  <i @click.stop="finishEditMode($event, tag)" class="sn-icon sn-icon-check cursor-pointer ml-auto"></i>
+                  <i @click.stop="finishEditMode($event, tag)" class="sn-icon sn-icon-check cursor-pointer ml-auto opacity-50 hover:opacity-100" ></i>
                 </template>
-                <i  v-if="canManage" @click.stop="deleteTag(tag)"
-                   class="tw-hidden sn-icon sn-icon-delete cursor-pointer group-hover:block"
-                   :class="{
-                     'ml-auto': !tag.editing,
-                     '!block': tag.editing
-                   }"
-                ></i>
+                <i v-if="canManage && !tag.editing" @click="startEditMode(tag)"
+                   class="sn-icon sn-icon-edit cursor-pointer ml-auto tw-hidden group-hover:block opacity-50 hover:opacity-100" ></i>
+                <i v-if="canManage" @click.stop="deleteTag(tag)"
+                   class="sn-icon sn-icon-delete cursor-pointer tw-hidden group-hover:block opacity-50 hover:opacity-100"></i>
               </div>
             </template>
           </div>
@@ -80,13 +77,20 @@
             <div class="mb-4 mt-4">
               {{ i18n.t('experiments.canvas.modal_manage_tags.create_new') }}
             </div>
-            <div class="flex gap-2">
+            <div @click="startCreating"
+                 v-click-outside="cancelCreating"
+                 class="flex gap-2 cursor-pointer hover:bg-sn-super-light-grey
+                        rounded px-3 py-2.5 group"
+                 :class="{
+                   '!bg-sn-super-light-blue': creatingTag
+                 }"
+            >
               <GeneralDropdown>
                 <template v-slot:field>
                   <div
                     class="h-6 w-6 border border-solid border-transparent rounded relative flex items-center justify-center text-sn-white"
                     :style="{ backgroundColor: newTag.color }"
-                    :class="{'!border-sn-grey !text-sn-grey': !newTag.color}"
+                    :class="{'!border-sn-grey !text-sn-grey bg-sn-white': !newTag.color}"
                   >
                     a
                   </div>
@@ -104,11 +108,13 @@
                 </template>
               </GeneralDropdown>
               <input type="text" v-model="newTag.name"
+                     ref="newTagNameInput"
                      :placeholder="i18n.t('experiments.canvas.modal_manage_tags.new_tag_name')"
                      class="border-0 focus:outline-none bg-transparent" />
+              <i v-if="!creatingTag" class="sn-icon sn-icon-edit opacity-0 group-hover:opacity-50 ml-auto"></i>
               <i v-if="validNewTag" @click.stop="createTag" class="sn-icon sn-icon-check cursor-pointer ml-auto"></i>
-              <i @click.stop="newTag = { name: null, color: null }"
-                   class="tw-hidden sn-icon sn-icon-delete cursor-pointer "
+              <i @click.stop="cancelCreating"
+                   class="tw-hidden sn-icon sn-icon-close cursor-pointer "
                    :class="{
                      'ml-auto': !validNewTag,
                      '!block': newTag.name || newTag.color
@@ -175,6 +181,7 @@ export default {
       },
       loadingTags: false,
       tagToUpdate: null,
+      creatingTag: false,
       query: ''
     };
   },
@@ -198,6 +205,7 @@ export default {
 
       this.finishEditMode();
 
+      tag.initialName = tag.attributes.name;
       tag.editing = true;
       this.tagToUpdate = tag;
       this.$nextTick(() => {
@@ -210,6 +218,9 @@ export default {
       const tagToFinish = tag || this.allTags.find((t) => t.editing);
 
       if (tagToFinish) {
+        if (this.tagToUpdate.attributes.name.length === 0) {
+          this.tagToUpdate.attributes.name = this.tagToUpdate.initialName;
+        }
         tagToFinish.editing = false;
         this.updateTag(this.tagToUpdate);
       }
@@ -283,6 +294,7 @@ export default {
       }).then(() => {
         this.newTag = { name: null, color: null };
         this.loadAlltags();
+        this.creatingTag = false;
       });
     },
     async deleteTag(tag) {
@@ -299,6 +311,18 @@ export default {
       } else {
         document.body.style.overflow = 'hidden';
       }
+    },
+    startCreating() {
+      this.creatingTag = true;
+      this.$nextTick(() => {
+        this.$refs.newTagNameInput.focus();
+      });
+    },
+    cancelCreating(e) {
+      if (e && e.target.closest('.sn-dropdown')) return;
+
+      this.creatingTag = false;
+      this.newTag = { name: null, color: null };
     }
   }
 };

From 83477a461a5fde321dc24305dbea9b1cab6ac209 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 15 Apr 2024 10:29:28 +0200
Subject: [PATCH 061/115] Properly set warden session in asset syncs controller
 [SCI-10637]

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

diff --git a/app/controllers/asset_sync_controller.rb b/app/controllers/asset_sync_controller.rb
index 8823fa845..7f9e9561e 100644
--- a/app/controllers/asset_sync_controller.rb
+++ b/app/controllers/asset_sync_controller.rb
@@ -117,7 +117,8 @@ class AssetSyncController < ApplicationController
     render_error(:unauthorized) and return unless @asset_sync_token&.token_valid?
 
     @asset = @asset_sync_token.asset
-    @current_user = @asset_sync_token.user
+
+    sign_in(@asset_sync_token.user)
 
     render_error(:forbidden, @asset.file.filename) and return unless can_manage_asset?(@asset)
   end

From 96ebe450c9204e2b8eb7c906eface7ccdd2b7488 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 15 Apr 2024 12:12:13 +0200
Subject: [PATCH 062/115] Fix file icon rendering for all-caps file extesions
 [SCI-10638]

---
 app/helpers/file_icons_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/file_icons_helper.rb b/app/helpers/file_icons_helper.rb
index b119d078b..7c01548d3 100644
--- a/app/helpers/file_icons_helper.rb
+++ b/app/helpers/file_icons_helper.rb
@@ -62,7 +62,7 @@ module FileIconsHelper
 
   # For showing in view/edit icon url (WOPI)
   def file_application_url(asset)
-    file_ext = asset.file_name.split('.').last
+    file_ext = asset.file_name.split('.').last&.downcase
     if Constants::FILE_TEXT_FORMATS.include?(file_ext)
       'icon_small/docx_file.svg'
     elsif Constants::FILE_TABLE_FORMATS.include?(file_ext)
@@ -73,7 +73,7 @@ module FileIconsHelper
   end
 
   def sn_icon_for(asset)
-    file_ext = asset.file_name.split('.').last
+    file_ext = asset.file_name.split('.').last&.downcase
     if Constants::FILE_TEXT_FORMATS.include?(file_ext)
       'file-word'
     elsif Constants::FILE_TABLE_FORMATS.include?(file_ext)
@@ -95,7 +95,7 @@ module FileIconsHelper
 
   # Shows correct WOPI application text (Word Online/Excel ..)
   def wopi_button_text(asset, action)
-    file_ext = asset.file_name.split('.').last
+    file_ext = asset.file_name.split('.').last&.downcase
     if Constants::FILE_TEXT_FORMATS.include?(file_ext)
       app = I18n.t('result_assets.wopi_word')
     elsif Constants::FILE_TABLE_FORMATS.include?(file_ext)

From 5d552cb7131ba87991173f542ce2ed04d77f6fbb Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 15 Apr 2024 11:35:48 +0200
Subject: [PATCH 063/115] Small css fixes for table [SCI-10600]

---
 app/assets/stylesheets/shared/datetime_picker.scss  | 13 ++++++++++++-
 app/assets/stylesheets/tailwind/inputs.css          |  4 ++--
 .../vue/my_modules/renderers/due_date.vue           |  1 +
 .../vue/shared/datatable/renderers/comments.vue     |  6 ++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/shared/datetime_picker.scss b/app/assets/stylesheets/shared/datetime_picker.scss
index 40db129ee..561a5e147 100644
--- a/app/assets/stylesheets/shared/datetime_picker.scss
+++ b/app/assets/stylesheets/shared/datetime_picker.scss
@@ -116,6 +116,10 @@
 
   .dp__input {
     line-height: unset;
+
+    &::placeholder {
+      color: var(--sn-grey);
+    }
   }
 }
 
@@ -147,6 +151,13 @@
       height: 36px;
     }
   }
+
+  &.borderless-input {
+    .dp__input {
+      background-color: transparent;
+      border-color: transparent;
+    }
+  }
 }
 
 .dp__theme_light {
@@ -182,7 +193,7 @@
   &:hover {
     border-color: var(--sn-science-blue);
   }
-  border-color: var(--sn-science-blue);
+  border-color: var(--sn-science-blue) !important;
 }
 
 :root {
diff --git a/app/assets/stylesheets/tailwind/inputs.css b/app/assets/stylesheets/tailwind/inputs.css
index 16389a085..35f4a3609 100644
--- a/app/assets/stylesheets/tailwind/inputs.css
+++ b/app/assets/stylesheets/tailwind/inputs.css
@@ -21,7 +21,7 @@
   }
 
   .sci-input-container-v2 input::placeholder {
-    @apply text-sn-sleepy-grey;
+    @apply text-sn-grey;
   }
 
   .sci-input-container-v2 .error {
@@ -83,7 +83,7 @@
   }
 
   .sci-input-container-v2 textarea::placeholder {
-    @apply text-sn-sleepy-grey;
+    @apply text-sn-grey;
   }
 
   .sci-input-container-v2 textarea:focus {
diff --git a/app/javascript/vue/my_modules/renderers/due_date.vue b/app/javascript/vue/my_modules/renderers/due_date.vue
index e58384c30..b6bee83a1 100644
--- a/app/javascript/vue/my_modules/renderers/due_date.vue
+++ b/app/javascript/vue/my_modules/renderers/due_date.vue
@@ -2,6 +2,7 @@
   <div class="flex relative items-center gap-2">
     <DateTimePicker
       v-if="this.params.data.urls.update_due_date"
+      class="borderless-input -mt-[1px]"
       :defaultValue="dueDate"
       @change="updateDueDate"
       mode="datetime"
diff --git a/app/javascript/vue/shared/datatable/renderers/comments.vue b/app/javascript/vue/shared/datatable/renderers/comments.vue
index bf4985072..a00a88ec7 100644
--- a/app/javascript/vue/shared/datatable/renderers/comments.vue
+++ b/app/javascript/vue/shared/datatable/renderers/comments.vue
@@ -3,7 +3,7 @@
     <span v-if="!params.data.permissions.create_comments && params.data.comments.count === 0">0</span>
     <a v-else
       href="#"
-      class="open-comments-sidebar" tabindex=0 :id="'comment-count-' + params.data.id"
+      class="open-comments-sidebar relative px-1" tabindex=0 :id="'comment-count-' + params.data.id"
       :data-object-type="objectType" :data-object-id="params.data.id">
       <template v-if="params.data.comments.count > 0">
         {{ params.data.comments.count }}
@@ -12,7 +12,9 @@
         +
       </template>
       <span v-if="params.data.comments.count_unseen > 0"
-            class="unseen-comments inline-flex align-super text-xs rounded-[0.875rem] px-1 bg-sn-science-blue text-sn-white h-4 items-center justify-center">
+            class="unseen-comments flex align-super text-xs rounded-lg  bg-sn-science-blue
+                 text-sn-white h-4 min-w-[1rem] items-center justify-center
+                   absolute -top-1.5 left-[100%] px-1">
         {{params.data.comments.count_unseen }}
       </span>
     </a>

From a51d63a3883ee0a78fb22aeb4dc9c63c414c17de Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Mon, 15 Apr 2024 14:52:24 +0100
Subject: [PATCH 064/115] Fix SSO button CSS [SCI-9621]

---
 app/assets/stylesheets/themes/scinote.scss    | 20 -------------------
 .../shared/_azure_sign_in_links.html.erb      |  2 +-
 app/views/users/shared/_links.html.erb        | 14 ++++++-------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 2af25c1d2..398b56ae4 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -382,26 +382,6 @@ mark,.mark {
   width: 100%;
 }
 
-.azure-sign-in-actions {
-  margin-bottom: 10px;
-  margin-top: 10px;
-
-  .btn-azure-ad {
-    background-color: $office-ms-word;
-    color: $color-white;
-  }
-}
-
-.okta-sign-in-actions {
-  margin-bottom: 10px;
-  margin-top: 10px;
-
-  .btn-okta {
-    background-color: #00297a;
-    color: $color-white;
-  }
-}
-
 .navbar-secondary {
   min-height: 77px;
   transition: .4s $timing-function-sharp;
diff --git a/app/views/users/shared/_azure_sign_in_links.html.erb b/app/views/users/shared/_azure_sign_in_links.html.erb
index 5a2b59d56..09b1cb9ae 100644
--- a/app/views/users/shared/_azure_sign_in_links.html.erb
+++ b/app/views/users/shared/_azure_sign_in_links.html.erb
@@ -1,7 +1,7 @@
 <% ApplicationSettings.instance.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }.each do |config| %>
   <div class="form-group">
     <%= form_tag user_customazureactivedirectory_omniauth_authorize_path(provider: config['provider_name']), method: :post, class: "azureAdForm" do %>
-      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-azure-ad' %>
+      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary w-full text-base' %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 85126b0c1..3c569fdd1 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -29,9 +29,9 @@
 
   <% if controller_name != 'passwords'%>
     <%- if sso_enabled? && okta_enabled? %>
-      <div class="okta-sign-in-actions">
+      <div class="my-2.5">
         <%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
-          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-okta' %>
+          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary w-full text-base' %>
         <% end %>
       </div>
     <% end %>
@@ -43,23 +43,23 @@
     <% end -%>
 
     <% if sso_enabled? && azure_ad_enabled? %>
-      <div class="azure-sign-in-actions">
+      <div class="my-2.5">
         <%= render partial: "users/shared/azure_sign_in_links", locals: { resource_name: resource_name } %>
       </div>
     <% end %>
 
     <%- if sso_enabled? && openid_connect_enabled? %>
-      <div class="azure-sign-in-actions">
+      <div class="my-2.5">
         <%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
-          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
+          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary w-full text-base' %>
         <% end %>
       </div>
     <% end %>
 
     <% if sso_enabled? && saml_enabled? %>
-      <div class="azure-sign-in-actions">
+      <div class="my-2.5">
         <%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
-          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
+          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary w-full text-base' %>
         <% end %>
       </div>
     <% end %>

From c24bb3201cf08ea73520b5f714ee72a186f7a4a4 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 16 Apr 2024 09:14:44 +0200
Subject: [PATCH 065/115] Add missing file extension downcasing for WOPI
 [SCI-10638]

---
 app/helpers/application_helper.rb | 2 +-
 app/models/asset.rb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e84f9a003..6b12b084a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -213,7 +213,7 @@ module ApplicationHelper
 
   # Check whether the wopi file can be edited and return appropriate response
   def wopi_file_edit_button_status(asset)
-    file_ext = asset.file_name.split('.').last
+    file_ext = asset.file_name.split('.').last&.downcase
     if Constants::WOPI_EDITABLE_FORMATS.include?(file_ext)
       edit_supported = true
       title = ''
diff --git a/app/models/asset.rb b/app/models/asset.rb
index c55830499..8e641c816 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -324,7 +324,7 @@ class Asset < ApplicationRecord
   end
 
   def get_action_url(user, action, with_tokens = true)
-    file_ext = file_name.split('.').last
+    file_ext = file_name.split('.').last&.downcase
     action = get_action(file_ext, action)
     if !action.nil?
       action_url = action[:urlsrc]

From 63b7a864f0f7b7abc5849c3896a4a4a765ba7047 Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Tue, 16 Apr 2024 08:52:31 +0100
Subject: [PATCH 066/115] Revert "Fix SSO button CSS [SCI-9621]"

---
 app/assets/stylesheets/themes/scinote.scss    | 20 +++++++++++++++++++
 .../shared/_azure_sign_in_links.html.erb      |  2 +-
 app/views/users/shared/_links.html.erb        | 14 ++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 398b56ae4..2af25c1d2 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -382,6 +382,26 @@ mark,.mark {
   width: 100%;
 }
 
+.azure-sign-in-actions {
+  margin-bottom: 10px;
+  margin-top: 10px;
+
+  .btn-azure-ad {
+    background-color: $office-ms-word;
+    color: $color-white;
+  }
+}
+
+.okta-sign-in-actions {
+  margin-bottom: 10px;
+  margin-top: 10px;
+
+  .btn-okta {
+    background-color: #00297a;
+    color: $color-white;
+  }
+}
+
 .navbar-secondary {
   min-height: 77px;
   transition: .4s $timing-function-sharp;
diff --git a/app/views/users/shared/_azure_sign_in_links.html.erb b/app/views/users/shared/_azure_sign_in_links.html.erb
index 09b1cb9ae..5a2b59d56 100644
--- a/app/views/users/shared/_azure_sign_in_links.html.erb
+++ b/app/views/users/shared/_azure_sign_in_links.html.erb
@@ -1,7 +1,7 @@
 <% ApplicationSettings.instance.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }.each do |config| %>
   <div class="form-group">
     <%= form_tag user_customazureactivedirectory_omniauth_authorize_path(provider: config['provider_name']), method: :post, class: "azureAdForm" do %>
-      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary w-full text-base' %>
+      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-azure-ad' %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 3c569fdd1..85126b0c1 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -29,9 +29,9 @@
 
   <% if controller_name != 'passwords'%>
     <%- if sso_enabled? && okta_enabled? %>
-      <div class="my-2.5">
+      <div class="okta-sign-in-actions">
         <%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
-          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary w-full text-base' %>
+          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-okta' %>
         <% end %>
       </div>
     <% end %>
@@ -43,23 +43,23 @@
     <% end -%>
 
     <% if sso_enabled? && azure_ad_enabled? %>
-      <div class="my-2.5">
+      <div class="azure-sign-in-actions">
         <%= render partial: "users/shared/azure_sign_in_links", locals: { resource_name: resource_name } %>
       </div>
     <% end %>
 
     <%- if sso_enabled? && openid_connect_enabled? %>
-      <div class="my-2.5">
+      <div class="azure-sign-in-actions">
         <%= form_tag user_openid_connect_omniauth_authorize_path, method: :post do %>
-          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary w-full text-base' %>
+          <%= submit_tag t('devise.sessions.new.openid_connect_submit'), class: 'btn btn-primary' %>
         <% end %>
       </div>
     <% end %>
 
     <% if sso_enabled? && saml_enabled? %>
-      <div class="my-2.5">
+      <div class="azure-sign-in-actions">
         <%= form_tag user_saml_omniauth_authorize_path, method: :post do %>
-          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary w-full text-base' %>
+          <%= submit_tag t('devise.sessions.new.saml_submit'), class: 'btn btn-primary' %>
         <% end %>
       </div>
     <% end %>

From b29ebc40059c16a96e732df36a35192fdbea3743 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 16 Apr 2024 10:11:08 +0200
Subject: [PATCH 067/115] Fix Rack::Attack deprication message [SCI-10623]

---
 config/initializers/rack_attack.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index a5605e726..245e110fa 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -10,8 +10,8 @@ Rack::Attack.throttle('api requests by ip',
   request.ip if request.path.match?(%r{^\/api\/})
 end
 
-Rack::Attack.throttled_response = lambda do |env|
-  match_data = env['rack.attack.match_data']
+Rack::Attack.throttled_responder = lambda do |request|
+  match_data = request.env['rack.attack.match_data']
   now = match_data[:epoch_time]
 
   headers = {

From 6240608678a2e7adb57c5d2cbc82af8da51b8cde Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 3 Apr 2024 12:58:58 +0200
Subject: [PATCH 068/115] Fix for smart annotation in experiments description
 [SCI-10519]

---
 app/javascript/vue/experiments/modals/description.vue    | 4 +++-
 app/javascript/vue/experiments/renderers/description.vue | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/experiments/modals/description.vue b/app/javascript/vue/experiments/modals/description.vue
index d2d581334..31b05ca0e 100644
--- a/app/javascript/vue/experiments/modals/description.vue
+++ b/app/javascript/vue/experiments/modals/description.vue
@@ -10,7 +10,9 @@
             {{ experiment.name }}
           </h4>
         </div>
-        <div class="modal-body" v-html="experiment.sa_description"></div>
+        <div class="modal-body">
+          <div class="[&_.atwho-user-container]:!whitespace-normal" 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>
diff --git a/app/javascript/vue/experiments/renderers/description.vue b/app/javascript/vue/experiments/renderers/description.vue
index e118c4fe6..f938ac3f4 100644
--- a/app/javascript/vue/experiments/renderers/description.vue
+++ b/app/javascript/vue/experiments/renderers/description.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="group relative flex items-center group-hover:marker text-xs h-full w-full"
        :style="{ lineHeight: 'unset' }">
-    <div class="flex gap-2"
+    <div class="flex gap-2 w-full"
         :style="{ lineHeight: 'unset' }"
         :class="{
                   'items-center text-sm': params.dtComponent.currentViewRender === 'table',

From 9e887db01d9125fbeb01c475220e39c11aec5627 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 16 Apr 2024 11:17:42 +0200
Subject: [PATCH 069/115] Disable azure authentication for giot [SCI-10631]

---
 config/initializers/extends.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index a7c38f719..35faaff99 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -146,7 +146,7 @@ class Extends
   API_VERSIONS = ['v1']
 
   # Array used for injecting names of additional authentication methods for API
-  API_PLUGABLE_AUTH_METHODS = [:azure_jwt_auth]
+  API_PLUGABLE_AUTH_METHODS = []
 
   API_REPOSITORY_DATA_TYPE_MAPPINGS = { 'RepositoryTextValue' => 'text',
                                         'RepositoryDateValue' => 'date',

From 910f2d4a4978c33440659e4daa77691f45b3c692 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 16 Apr 2024 11:25:37 +0200
Subject: [PATCH 070/115] Save due date when creating task from canvas
 [SCI-10642]

---
 app/assets/javascripts/experiments/show.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/experiments/show.js b/app/assets/javascripts/experiments/show.js
index be35db24a..cd7bdc0e2 100644
--- a/app/assets/javascripts/experiments/show.js
+++ b/app/assets/javascripts/experiments/show.js
@@ -16,7 +16,7 @@
           my_module: {
             name: $('#new-my-module-modal input[name="my_module[name]"]').val(),
             view_mode: $('#new-my-module-modal input[name="my_module[view_mode]"]').val(),
-            due_date: $('#new-my-module-modal input[name="my_module[due-date]"]').val(),
+            due_date: $('#new-my-module-modal input[name="my_module[due_date]"]').val(),
             tag_ids: dropdownSelector.getValues(myModuleTagsSelector),
             user_ids: dropdownSelector.getValues(myModuleUserSelector)
           }

From 8f9ea0e7497fabd60c07b18ed48295234fd2d9ad Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 20 Mar 2024 09:30:39 +0100
Subject: [PATCH 071/115] Add inventory items landing page [SCI-9506]

---
 .../sitewide/repository_row_card.js           |  4 ++
 app/controllers/repositories_controller.rb    |  8 +++
 app/controllers/repository_rows_controller.rb |  2 +
 .../vue/repository_item_error_sidebar.js      | 14 +++++
 .../RepositoryItemErrorSidebar.vue            | 51 +++++++++++++++++++
 app/views/repositories/show.html.erb          | 10 ++++
 config/locales/en.yml                         |  2 +
 config/webpack/webpack.config.js              |  1 +
 8 files changed, 92 insertions(+)
 create mode 100644 app/javascript/packs/vue/repository_item_error_sidebar.js
 create mode 100644 app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue

diff --git a/app/assets/javascripts/sitewide/repository_row_card.js b/app/assets/javascripts/sitewide/repository_row_card.js
index d575a8814..18fa9cc9d 100644
--- a/app/assets/javascripts/sitewide/repository_row_card.js
+++ b/app/assets/javascripts/sitewide/repository_row_card.js
@@ -104,4 +104,8 @@
       }
     }
   });
+
+  $(document).on('turbolinks:load', () => {
+    $('#itemLandingPagelink').trigger('click');
+  });
 }());
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 2f28cb65e..eeef99cdd 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -25,6 +25,7 @@ class RepositoriesController < ApplicationController
   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)
+  before_action :load_repository_row, only: %i(show)
   before_action :set_breadcrumbs_items, only: %i(index show)
 
   layout 'fluid'
@@ -470,6 +471,13 @@ class RepositoriesController < ApplicationController
     @repositories = current_team.repositories.archived.where(id: params[:repository_ids])
   end
 
+  def load_repository_row
+    @repository_row = nil
+    return if params[:row_id].blank?
+
+    @repository_row = @repository.repository_rows.find_by(id: params[:row_id])
+  end
+
   def set_inline_name_editing
     return unless can_manage_repository?(@repository)
 
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index a9c8b11e1..236001f8a 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -45,6 +45,8 @@ class RepositoryRowsController < ApplicationController
   def show
     respond_to do |format|
       format.html do
+        return redirect_to repository_path(@repository, row_id: @repository_row.id) if params[:show_card].present?
+
         redirect_to repository_path(@repository)
       end
 
diff --git a/app/javascript/packs/vue/repository_item_error_sidebar.js b/app/javascript/packs/vue/repository_item_error_sidebar.js
new file mode 100644
index 000000000..b300655c9
--- /dev/null
+++ b/app/javascript/packs/vue/repository_item_error_sidebar.js
@@ -0,0 +1,14 @@
+/* global */
+
+import PerfectScrollbar from 'vue3-perfect-scrollbar';
+import { createApp } from 'vue/dist/vue.esm-bundler.js';
+import { vOnClickOutside } from '@vueuse/components';
+import { mountWithTurbolinks } from './helpers/turbolinks.js';
+import RepositoryItemErrorSidebar from '../../vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue';
+
+const app = createApp({});
+app.component('RepositoryItemErrorSidebar', RepositoryItemErrorSidebar);
+app.use(PerfectScrollbar);
+app.directive('click-outside', vOnClickOutside);
+app.config.globalProperties.i18n = window.I18n;
+mountWithTurbolinks(app, '#repositoryItemErrorSidebar');
diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue
new file mode 100644
index 000000000..178a0a0f8
--- /dev/null
+++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue
@@ -0,0 +1,51 @@
+<template>
+  <transition enter-from-class="translate-x-full w-0"
+              enter-active-class="transition-all ease-sharp duration-[588ms]"
+              leave-active-class="transition-all ease-sharp duration-[588ms]"
+              leave-to-class="translate-x-full w-0"
+              v-click-outside="close">
+    <div ref="wrapper" v-if="isShowing"
+      class='items-sidebar-wrapper bg-white gap-2.5 self-stretch rounded-tl-4 rounded-bl-4 sn-shadow-menu-lg h-full w-[565px]'>
+
+      <div class="w-full h-full pl-6 bg-white flex flex-col">
+        <div class="sticky top-0 right-0 bg-white flex z-50 flex-col h-[78px] pt-6">
+          <div class="header flex w-full h-[30px] pr-6">
+            <i id="close-icon" @click="close"
+              class="sn-icon sn-icon-close ml-auto cursor-pointer my-auto mx-0"></i>
+          </div>
+          <div id="divider" class="w-500 bg-sn-light-grey flex items-center self-stretch h-px mt-6 mr-6"></div>
+        </div>
+        <div class="flex flex-col flex-1 justify-center items-center gap-1">
+          <i class="sn-icon sn-icon-alert-warning text-sn-alert-passion"></i>
+          <span class="font-semibold leading-5">{{ i18n.t('repositories.item_card_errors.item_not_found') }}</span>
+        </div>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+import { vOnClickOutside } from '@vueuse/components';
+
+export default {
+  name: 'RepositoryItemErrorSidebar',
+  directives: {
+    'click-outside': vOnClickOutside
+  },
+  data() {
+    return {
+      isShowing: false
+    };
+  },
+  mounted() {
+    this.isShowing = true;
+  },
+  methods: {
+    close() {
+      this.$nextTick(() => {
+        this.isShowing = false;
+      });
+    }
+  }
+};
+</script>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 53c02ff6f..677f9d774 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -50,6 +50,15 @@
   <div class="toolbar-filter-buttons" style="display:none">
   </div>
 
+  <!-- Inventory Item landing page link-->
+  <% if @repository_row %>
+    <a id="itemLandingPagelink" href="<%= repository_repository_row_path(@repository, @repository_row) %>" class="hidden record-info-link"></a>
+  <% else %>
+    <div id="repositoryItemErrorSidebar" data-behaviour="vue" class="fixed top-0 right-0 h-full z-[2039]">
+      <repository-item-error-sidebar />
+    </div>
+  <% end %>
+
 
 
   <%= render partial: "repositories/repository_table",
@@ -84,6 +93,7 @@
 <%= javascript_include_tag 'vue_repository_search' %>
 <%= javascript_include_tag 'repositories/repository_datatable' %>
 <%= javascript_include_tag "repositories/show" %>
+<%= javascript_include_tag "vue_components_repository_item_error_sidebar" %>
 <%= javascript_include_tag 'inputmask' %>
 <%= javascript_include_tag 'emoji_button' %>
 <%= javascript_include_tag 'pdf_js' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15ae3b7cd..a69032d00 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2267,6 +2267,8 @@ en:
       invalid_arguments: "Can't find %{key}"
     my_module_assigned_snapshot_service:
       invalid_arguments: "Can't find %{key}"
+    item_card_errors:
+      item_not_found: "Inventory item you're looking for was deleted."
     item_card:
       add_relationship_button_text: "Add"
       repository_item_relationships_modal:
diff --git a/config/webpack/webpack.config.js b/config/webpack/webpack.config.js
index 07ac72a33..71e970e2b 100644
--- a/config/webpack/webpack.config.js
+++ b/config/webpack/webpack.config.js
@@ -39,6 +39,7 @@ const entryList = {
   vue_navigation_top_menu: './app/javascript/packs/vue/navigation/top_menu.js',
   vue_navigation_navigator: './app/javascript/packs/vue/navigation/navigator.js',
   vue_components_repository_item_sidebar: './app/javascript/packs/vue/repository_item_sidebar.js',
+  vue_components_repository_item_error_sidebar: './app/javascript/packs/vue/repository_item_error_sidebar.js',
   vue_components_action_toolbar: './app/javascript/packs/vue/action_toolbar.js',
   vue_components_open_vector_editor: './app/javascript/packs/vue/open_vector_editor.js',
   vue_navigation_breadcrumbs: './app/javascript/packs/vue/navigation/breadcrumbs.js',

From d3e5b66d67cedf5926dc46c0185b101690bca0bf Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 16 Apr 2024 11:51:04 +0200
Subject: [PATCH 072/115] Change error message wording and update logic
 [SCI-9506]

- Landing page is /repositories/:repository_id?landing_page=true&row_id=:repository_row_id
---
 app/controllers/repositories_controller.rb           |  1 +
 app/controllers/repository_rows_controller.rb        |  2 --
 .../packs/vue/repository_item_error_sidebar.js       |  2 --
 .../RepositoryItemErrorSidebar.vue                   |  4 ++--
 .../RepositoryItemSidebar.vue                        | 12 ++++++------
 app/views/repositories/show.html.erb                 |  4 ++--
 config/locales/en.yml                                |  2 +-
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index eeef99cdd..113f5e80d 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -473,6 +473,7 @@ class RepositoriesController < ApplicationController
 
   def load_repository_row
     @repository_row = nil
+    @repository_row_landing_page = true if params[:landing_page].present?
     return if params[:row_id].blank?
 
     @repository_row = @repository.repository_rows.find_by(id: params[:row_id])
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index 236001f8a..a9c8b11e1 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -45,8 +45,6 @@ class RepositoryRowsController < ApplicationController
   def show
     respond_to do |format|
       format.html do
-        return redirect_to repository_path(@repository, row_id: @repository_row.id) if params[:show_card].present?
-
         redirect_to repository_path(@repository)
       end
 
diff --git a/app/javascript/packs/vue/repository_item_error_sidebar.js b/app/javascript/packs/vue/repository_item_error_sidebar.js
index b300655c9..ebe9a4c41 100644
--- a/app/javascript/packs/vue/repository_item_error_sidebar.js
+++ b/app/javascript/packs/vue/repository_item_error_sidebar.js
@@ -2,13 +2,11 @@
 
 import PerfectScrollbar from 'vue3-perfect-scrollbar';
 import { createApp } from 'vue/dist/vue.esm-bundler.js';
-import { vOnClickOutside } from '@vueuse/components';
 import { mountWithTurbolinks } from './helpers/turbolinks.js';
 import RepositoryItemErrorSidebar from '../../vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue';
 
 const app = createApp({});
 app.component('RepositoryItemErrorSidebar', RepositoryItemErrorSidebar);
 app.use(PerfectScrollbar);
-app.directive('click-outside', vOnClickOutside);
 app.config.globalProperties.i18n = window.I18n;
 mountWithTurbolinks(app, '#repositoryItemErrorSidebar');
diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue
index 178a0a0f8..989b08331 100644
--- a/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue
+++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemErrorSidebar.vue
@@ -13,11 +13,11 @@
             <i id="close-icon" @click="close"
               class="sn-icon sn-icon-close ml-auto cursor-pointer my-auto mx-0"></i>
           </div>
-          <div id="divider" class="w-500 bg-sn-light-grey flex items-center self-stretch h-px mt-6 mr-6"></div>
+          <div id="divider" class="bg-sn-light-grey flex items-center self-stretch h-px mt-6 mr-6"></div>
         </div>
         <div class="flex flex-col flex-1 justify-center items-center gap-1">
           <i class="sn-icon sn-icon-alert-warning text-sn-alert-passion"></i>
-          <span class="font-semibold leading-5">{{ i18n.t('repositories.item_card_errors.item_not_found') }}</span>
+          <h4 class="font-semibold text-lg">{{ i18n.t('repositories.item_card_errors.item_not_found') }}</h4>
         </div>
       </div>
     </div>
diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
index df6c923b7..353555ac2 100644
--- a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
+++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue
@@ -22,7 +22,7 @@
             <i id="close-icon" @click="toggleShowHideSidebar(null)"
               class="sn-icon sn-icon-close ml-auto cursor-pointer my-auto mx-0"></i>
           </div>
-          <div id="divider" class="w-500 bg-sn-light-grey flex items-center self-stretch h-px mt-6 mr-6"></div>
+          <div id="divider" class="bg-sn-light-grey flex items-center self-stretch h-px mt-6 mr-6"></div>
         </div>
 
         <div ref="bodyWrapper" id="body-wrapper" class="overflow-y-auto overflow-x-hidden h-[calc(100%-78px)] pt-6 ">
@@ -122,7 +122,7 @@
                 </div>
               </section>
 
-              <div id="divider" class="w-500 bg-sn-light-grey flex items-center self-stretch h-px "></div>
+              <div id="divider" class="bg-sn-light-grey flex items-center self-stretch h-px "></div>
 
               <!-- CUSTOM COLUMNS, RELATIONSHIPS, ASSIGNED, QR CODE -->
               <div id="custom-col-assigned-qr-wrapper" class="flex flex-col gap-6">
@@ -138,7 +138,7 @@
                     :permissions="permissions" :updatePath="updatePath" :actions="actions" @update="update" />
                 </section>
 
-                <div id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px"></div>
+                <div id="divider" class="bg-sn-light-grey flex px-8 items-center self-stretch h-px"></div>
 
                 <!-- RELATIONSHIPS -->
                 <section v-if="!repository?.is_snapshot" id="relationships-section" class="flex flex-col" ref="relationshipsSectionRef">
@@ -241,7 +241,7 @@
                   </div>
                 </section>
 
-                <div v-if="!repository?.is_snapshot" id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px"></div>
+                <div v-if="!repository?.is_snapshot" id="divider" class="bg-sn-light-grey flex px-8 items-center self-stretch h-px"></div>
 
                 <!-- ASSIGNED -->
                 <section v-if="!repository?.is_snapshot" id="assigned-section" class="flex flex-col" ref="assignedSectionRef">
@@ -292,7 +292,7 @@
                   </div>
                 </section>
 
-                <div v-if="!repository?.is_snapshot" id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px  "></div>
+                <div v-if="!repository?.is_snapshot" id="divider" class="bg-sn-light-grey flex px-8 items-center self-stretch h-px  "></div>
 
                 <!-- QR -->
                 <section id="qr-section" ref="QR-label">
@@ -318,7 +318,7 @@
           <!-- BOTTOM -->
           <div id="bottom" v-show="!dataLoading && !loadingError" class="h-[100px] flex flex-col justify-end mt-4 mr-6"
             :class="{ 'pb-6': customColumns?.length }">
-            <div id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px mb-6"></div>
+            <div id="divider" class="bg-sn-light-grey flex px-8 items-center self-stretch h-px mb-6"></div>
             <div id="bottom-button-wrapper" class="flex h-10 justify-end">
               <button type="button" class="btn btn-primary print-label-button" data-e2e="e2e-BT-repoItemSB-print"
                 :data-rows="JSON.stringify([repositoryRowId])"
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 677f9d774..78699964e 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -51,9 +51,9 @@
   </div>
 
   <!-- Inventory Item landing page link-->
-  <% if @repository_row %>
+  <% if @repository_row && @repository_row_landing_page %>
     <a id="itemLandingPagelink" href="<%= repository_repository_row_path(@repository, @repository_row) %>" class="hidden record-info-link"></a>
-  <% else %>
+  <% elsif @repository_row_landing_page %>
     <div id="repositoryItemErrorSidebar" data-behaviour="vue" class="fixed top-0 right-0 h-full z-[2039]">
       <repository-item-error-sidebar />
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a69032d00..a14fb99d1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2268,7 +2268,7 @@ en:
     my_module_assigned_snapshot_service:
       invalid_arguments: "Can't find %{key}"
     item_card_errors:
-      item_not_found: "Inventory item you're looking for was deleted."
+      item_not_found: "Inventory item you're looking for doesn't exist."
     item_card:
       add_relationship_button_text: "Add"
       repository_item_relationships_modal:

From d00fb4ae579af44b6e3633a8efe9b0efc2c68243 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 16 Apr 2024 13:33:36 +0200
Subject: [PATCH 073/115] Unify global search page [SCI-10636]

---
 .../vue/global_search/groups/assets.vue       | 50 +++++------------
 .../vue/global_search/groups/experiments.vue  | 43 ++++-----------
 .../vue/global_search/groups/folders.vue      | 41 ++++----------
 .../groups/helpers/cell_template.vue          | 33 +++++++++++
 .../groups/helpers/link_template.vue          | 24 ++++++++
 .../global_search/groups/helpers/list_end.vue | 17 ++++++
 .../{ => groups/helpers}/no_search_result.vue | 10 +---
 .../groups/{ => helpers}/sort_flyout.vue      |  2 +-
 .../global_search/groups/label_templates.vue  | 43 ++++-----------
 .../groups/my_module_protocols.vue            | 55 +++++--------------
 .../vue/global_search/groups/my_modules.vue   | 48 ++++------------
 .../vue/global_search/groups/projects.vue     | 47 +++++-----------
 .../vue/global_search/groups/protocols.vue    | 45 ++++-----------
 .../vue/global_search/groups/reports.vue      | 52 +++++-------------
 .../global_search/groups/repository_rows.vue  | 47 ++++------------
 .../vue/global_search/groups/results.vue      | 50 ++++-------------
 .../vue/global_search/groups/search_mixin.js  | 36 +++++-------
 app/javascript/vue/global_search/loader.vue   | 39 ++++---------
 18 files changed, 235 insertions(+), 447 deletions(-)
 create mode 100644 app/javascript/vue/global_search/groups/helpers/cell_template.vue
 create mode 100644 app/javascript/vue/global_search/groups/helpers/link_template.vue
 create mode 100644 app/javascript/vue/global_search/groups/helpers/list_end.vue
 rename app/javascript/vue/global_search/{ => groups/helpers}/no_search_result.vue (70%)
 rename app/javascript/vue/global_search/groups/{ => helpers}/sort_flyout.vue (92%)

diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index f5ccd786c..32e9a79a7 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -10,48 +10,24 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a target="_blank" :href="row.attributes.parent.url"
-             class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 font-bold border-0 border-b border-solid border-sn-light-grey">
-            <span :class="row.attributes.icon" class="shrink-0"></span>
-            <StringWithEllipsis class="w-full" :text="row.attributes.file_name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a target="_blank" :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t(`search.index.${row.attributes.parent.type}`) }}:</b>
-            <a target="_blank" :href="row.attributes.parent.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent)"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="s h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey"
-               :class="{ 'invisible': !row.attributes.experiment.name }">
-            <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-            <a target="_blank" :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.parent.url" :icon="row.attributes.icon" :value="row.attributes.file_name"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label=" i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :url="row.attributes.parent.url" :value="labelName(row.attributes.parent)"/>
+          <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :visible="!!row.attributes.experiment.name"
+                        :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'AssetsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-   <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+   <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index d58e43aff..c0546ec13 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -10,43 +10,22 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[220px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
-              <a :href="row.attributes.project.url" target="_blank" class="shrink-0 overflow-hidden">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-5 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ExperimentsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index bc08b895c..b62329176 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -10,41 +10,22 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
-          <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <template v-if="row.attributes.parent_folder">
-              <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-                <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
-                <a :href="row.attributes.parent_folder.url" target="_blank" class="shrink-0 overflow-hidden">
-                  <StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent_folder)"></StringWithEllipsis>
-                </a>
-              </div>
-            </template>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-4 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url"  :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.floler')" :visible="row.attributes.parent_folder"
+                        :url="row.attributes.parent_folder?.url" :value="labelName(row.attributes.parent_folder)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'FoldersComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/helpers/cell_template.vue b/app/javascript/vue/global_search/groups/helpers/cell_template.vue
new file mode 100644
index 000000000..724b04084
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/helpers/cell_template.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] min-w-[8rem] items-center gap-1 text-xs group-hover:bg-sn-super-light-grey">
+      <template v-if="visible">
+        <b class="shrink-0">{{ label }}:</b>
+        <a v-if="url" :href="url" class="shrink-0 overflow-hidden hover:no-underline">
+          <img v-if="avatar" :src="avatar" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+          <StringWithEllipsis class="w-full" :text="value"></StringWithEllipsis>
+        </a>
+        <div v-else class="grid grid-cols-[auto_1fr] items-center gap-1 overflow-hidden">
+          <img v-if="avatar" :src="avatar" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+          <span class="shrink-0 truncate" :title="value">{{ value }}</span>
+        </div>
+      </template>
+    </div>
+</template>
+
+<script>
+import StringWithEllipsis from '../../../shared/string_with_ellipsis.vue';
+
+export default {
+  name: 'CellTemplate',
+  props: {
+    label: { type: String, default: '' },
+    value: { type: String, default: '' },
+    url: { type: String, default: '' },
+    avatar: { type: String, default: '' },
+    visible: { type: Boolean, default: true }
+  },
+  components: {
+    StringWithEllipsis
+  }
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/helpers/link_template.vue b/app/javascript/vue/global_search/groups/helpers/link_template.vue
new file mode 100644
index 000000000..3de291e45
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/helpers/link_template.vue
@@ -0,0 +1,24 @@
+<template>
+    <a target="_blank" :href="url" class="h-full py-2 px-4 overflow-hidden font-bold flex gap-1 items-center group-hover:bg-sn-super-light-grey hover:no-underline">
+      <span v-if="icon" :class="icon" class="sn-icon shrink-0"></span>
+      <StringWithEllipsis class="w-full"
+        :text="value">
+      </StringWithEllipsis>
+    </a>
+</template>
+
+<script>
+import StringWithEllipsis from '../../../shared/string_with_ellipsis.vue';
+
+export default {
+  name: 'LinkTemplate',
+  props: {
+    value: { type: String, default: '' },
+    url: { type: String, default: '' },
+    icon: { type: String, default: '' }
+  },
+  components: {
+    StringWithEllipsis
+  }
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/helpers/list_end.vue b/app/javascript/vue/global_search/groups/helpers/list_end.vue
new file mode 100644
index 000000000..88a9e53f8
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/helpers/list_end.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="flex flex-col gap-6 mt-6">
+    <div class="flex items-center mb-6">
+      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
+        <span class="sn-icon sn-icon-flag"></span>
+        <span>{{ i18n.t('search.index.reached_end') }}</span>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'ListEnd'
+};
+</script>
diff --git a/app/javascript/vue/global_search/no_search_result.vue b/app/javascript/vue/global_search/groups/helpers/no_search_result.vue
similarity index 70%
rename from app/javascript/vue/global_search/no_search_result.vue
rename to app/javascript/vue/global_search/groups/helpers/no_search_result.vue
index afe2a2cf5..6a89405c3 100644
--- a/app/javascript/vue/global_search/no_search_result.vue
+++ b/app/javascript/vue/global_search/groups/helpers/no_search_result.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="noSearchResult">
+  <div ref="noSearchResult" class="h-[60vh]">
     <div class="flex flex-col gap-6 bg-sn-white text-center relative top-1/4">
        <div><span class=" inline-block sn-icon sn-icon-search"></span></div>
        <div class="">
@@ -17,12 +17,6 @@
 <script>
 
 export default {
-  name: 'NoSearchResult',
-  props: {
-    noSearchResultHeight: { type: Number, default: 0 }
-  },
-  mounted() {
-    this.$refs.noSearchResult.style.height = `${this.noSearchResultHeight}px`;
-  }
+  name: 'NoSearchResult'
 };
 </script>
diff --git a/app/javascript/vue/global_search/groups/sort_flyout.vue b/app/javascript/vue/global_search/groups/helpers/sort_flyout.vue
similarity index 92%
rename from app/javascript/vue/global_search/groups/sort_flyout.vue
rename to app/javascript/vue/global_search/groups/helpers/sort_flyout.vue
index 921ebae89..cb4a8e26d 100644
--- a/app/javascript/vue/global_search/groups/sort_flyout.vue
+++ b/app/javascript/vue/global_search/groups/helpers/sort_flyout.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import MenuDropdown from '../../shared/menu_dropdown.vue';
+import MenuDropdown from '../../../shared/menu_dropdown.vue';
 
 export default {
   name: 'SortFlyout',
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index 520e6e7af..9b3ce17c0 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -10,42 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.format') }}:</b>
-            <span class="shrink-0">{{ row.attributes.format }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <img v-if="row.attributes.created_by.avatar_url" :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="row.attributes.name"/>
+          <CellTemplate :label="i18n.t('search.index.format')" :value="row.attributes.format"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'LabelTemplatesComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index fcc60a5d9..2bbe8aff9 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -10,53 +10,24 @@
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
-            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-7 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
+          <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModuleProtocolsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index 3c0c875fc..f62f690e8 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -10,47 +10,23 @@
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModulesComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index a73d1ecf3..6b6d93eae 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -10,49 +10,28 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <template v-if="row.attributes.folder">
-              <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-                <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
-                <a :href="row.attributes.folder.url" class="shrink-0 overflow-hidden">
-                  <StringWithEllipsis class="w-full" :text="labelName(row.attributes.folder)"></StringWithEllipsis>
-                </a>
-              </div>
-            </template>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-5 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.folder"
+                        :url="row.attributes.folder?.url" :value="labelName(row.attributes.folder)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProjectsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
 <script>
+import Link_template from './helpers/link_template.vue';
 import searchMixin from './search_mixin';
 
 export default {
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index 9df4b0b7a..fb3e06b52 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -10,44 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProtocolsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index d36cd14d5..3b1186c11 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -10,50 +10,24 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <div class="truncate">
-              <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-              <span class="truncate">{{ row.attributes.created_by.name }}</span>
-            </div>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a target="_blank" :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
-            <a target="_blank" :href="row.attributes.project.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-7 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="row.attributes.name"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ReportsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index 34932ebd8..20555fe52 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -10,46 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.repository') }}:</b>
-            <a :href="row.attributes.repository.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.repository)"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.repository')" :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'RepositoryRowsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 064a6ee53..11029c48a 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -10,49 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
-            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
+          <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 3fa527e06..634c7cded 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -1,8 +1,11 @@
 import axios from '../../../packs/custom_axios.js';
 import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
-import SortFlyout from './sort_flyout.vue';
+import SortFlyout from './helpers/sort_flyout.vue';
 import Loader from '../loader.vue';
-import NoSearchResult from '../no_search_result.vue';
+import ListEnd from './helpers/list_end.vue';
+import NoSearchResult from './helpers/no_search_result.vue';
+import CellTemplate from './helpers/cell_template.vue';
+import LinkTemplate from './helpers/link_template.vue';
 /* global GLOBAL_CONSTANTS I18n */
 
 export default {
@@ -16,7 +19,10 @@ export default {
     StringWithEllipsis,
     SortFlyout,
     Loader,
-    NoSearchResult
+    NoSearchResult,
+    ListEnd,
+    CellTemplate,
+    LinkTemplate
   },
   data() {
     return {
@@ -27,10 +33,6 @@ export default {
       page: 1,
       disabled: false,
       fullDataLoaded: false,
-      loaderHeight: 24,
-      loaderGap: 10,
-      loaderYPadding: 10,
-      noSearchResultHeight: 0
     };
   },
   watch: {
@@ -69,20 +71,10 @@ export default {
       return !this.selected && this.total > GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
     },
     loaderRows() {
-      // h-[24px] gap-y-[10px] py-[10px]
-      if (this.loading && (!this.selected || this.total)) return GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
-      if (this.selected && this.loading) {
-        const availableHeight = window.innerHeight - this.$refs.content.getBoundingClientRect().top;
-        // loaderHeight + loaderGap +  headerLoaderHeight + headerContentGap
-        const offSet = this.loaderHeight + this.loaderGap + 32 + 20;
-
-        return Math.floor((availableHeight - offSet) / (this.loaderHeight + this.loaderGap + (2 * this.loaderYPadding)));
-      }
-
-      return 0;
+      return !this.selected ? 4 : 20;
     },
     reachedEnd() {
-      return Math.ceil(this.total / GLOBAL_CONSTANTS.SEARCH_LIMIT) === this.page;
+      return !this.page && this.selected;
     },
     showNoSearchResult() {
       return this.selected && !this.loading && !this.results.length;
@@ -90,6 +82,8 @@ export default {
   },
   methods: {
     labelName(object) {
+      if (!object) return '';
+
       if (!object.archived) return object.name;
 
       return `${I18n.t('labels.archived')} ${object.name}`;
@@ -130,10 +124,6 @@ export default {
           this.disabled = response.data.meta.disabled;
           this.loading = false;
           this.page = response.data.meta.next_page;
-          if (this.results.length === 0 && this.selected) {
-            const availableHeight = window.innerHeight - this.$refs.content.getBoundingClientRect().top;
-            this.noSearchResultHeight = availableHeight - 20;
-          }
         })
         .finally(() => {
           this.loading = false;
diff --git a/app/javascript/vue/global_search/loader.vue b/app/javascript/vue/global_search/loader.vue
index 886eab3a8..a11f038d6 100644
--- a/app/javascript/vue/global_search/loader.vue
+++ b/app/javascript/vue/global_search/loader.vue
@@ -1,28 +1,16 @@
 <template>
-  <div class="flex flex-col gap-6">
-    <div v-if="!total" class="grid grid-cols-[32px_auto] gap-2.5">
-      <div class="h-8 w-8 animate-skeleton rounded"></div>
-      <div class="h-8 w-40 animate-skeleton rounded"></div>
-    </div>
-    <div class="flex flex-col" :class="[`gap-[${loaderGap}px]`]">
-      <div v-for="_count in loaderRows"
-          class="flex items-center no-wrap border-0 border-b border-solid border-sn-light-grey gap-x-8"
-          :class="[`gap-y-[${loaderGap}px]`, `py-[${loaderYPadding}px]`, { 'first:border-t': total }]">
-        <div class="w-[500px] grow-1" :class="`h-[${loaderHeight}px]`">
-          <div class="h-full w-80 animate-skeleton rounded mr-auto"></div>
-        </div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-24 max-w-24 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-44 max-w-44 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-44 max-w-44 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-56 max-w-56 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-96 max-w-96 animate-skeleton rounded"></div>
+  <div class="flex flex-col">
+    <div v-for="_count in loaderRows"
+        class="flex items-center no-wrap border-0 gap-2 py-2 border-b border-solid border-sn-light-grey gap-x-8"
+      >
+      <div class="w-[500px] grow-1 h-6">
+        <div class="h-full w-80 animate-skeleton rounded mr-auto"></div>
       </div>
-    </div>
-    <div v-if="reachedEnd" class="flex items-center mb-6">
-      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
-        <span class="sn-icon sn-icon-flag"></span>
-        <span>{{ i18n.t('search.index.reached_end') }}</span>
-      </p>
+      <div class="w-24 max-w-24 animate-skeleton rounded h-6"></div>
+      <div class="w-44 max-w-44 animate-skeleton rounded h-6"></div>
+      <div class="w-44 max-w-44 animate-skeleton rounded h-6"></div>
+      <div class="w-56 max-w-56 animate-skeleton rounded h-6"></div>
+      <div class="w-96 max-w-96 animate-skeleton rounded h-6"></div>
     </div>
   </div>
 </template>
@@ -32,12 +20,7 @@
 export default {
   name: 'Loader',
   props: {
-    total: { type: Number, default: 0 },
     loaderRows: { type: Number, default: 0 },
-    loaderHeight: { type: Number, required: true },
-    loaderGap: { type: Number, required: true },
-    loaderYPadding: { type: Number, required: true },
-    reachedEnd: { type: Boolean }
   }
 };
 </script>

From 57c138f54f2c90fb923a477c3d1b5339db6d23e5 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 16 Apr 2024 13:33:36 +0200
Subject: [PATCH 074/115] Unify global search page [SCI-10636]

---
 .../vue/global_search/groups/assets.vue       | 50 +++++------------
 .../vue/global_search/groups/experiments.vue  | 43 ++++-----------
 .../vue/global_search/groups/folders.vue      | 41 ++++----------
 .../groups/helpers/cell_template.vue          | 33 +++++++++++
 .../groups/helpers/link_template.vue          | 24 ++++++++
 .../global_search/groups/helpers/list_end.vue | 17 ++++++
 .../{ => groups/helpers}/no_search_result.vue | 10 +---
 .../groups/{ => helpers}/sort_flyout.vue      |  2 +-
 .../global_search/groups/label_templates.vue  | 43 ++++-----------
 .../groups/my_module_protocols.vue            | 55 +++++--------------
 .../vue/global_search/groups/my_modules.vue   | 48 ++++------------
 .../vue/global_search/groups/projects.vue     | 46 ++++------------
 .../vue/global_search/groups/protocols.vue    | 45 ++++-----------
 .../vue/global_search/groups/reports.vue      | 52 +++++-------------
 .../global_search/groups/repository_rows.vue  | 47 ++++------------
 .../vue/global_search/groups/results.vue      | 50 ++++-------------
 .../vue/global_search/groups/search_mixin.js  | 36 +++++-------
 app/javascript/vue/global_search/loader.vue   | 39 ++++---------
 18 files changed, 234 insertions(+), 447 deletions(-)
 create mode 100644 app/javascript/vue/global_search/groups/helpers/cell_template.vue
 create mode 100644 app/javascript/vue/global_search/groups/helpers/link_template.vue
 create mode 100644 app/javascript/vue/global_search/groups/helpers/list_end.vue
 rename app/javascript/vue/global_search/{ => groups/helpers}/no_search_result.vue (70%)
 rename app/javascript/vue/global_search/groups/{ => helpers}/sort_flyout.vue (92%)

diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index f5ccd786c..32e9a79a7 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -10,48 +10,24 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a target="_blank" :href="row.attributes.parent.url"
-             class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 font-bold border-0 border-b border-solid border-sn-light-grey">
-            <span :class="row.attributes.icon" class="shrink-0"></span>
-            <StringWithEllipsis class="w-full" :text="row.attributes.file_name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a target="_blank" :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t(`search.index.${row.attributes.parent.type}`) }}:</b>
-            <a target="_blank" :href="row.attributes.parent.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent)"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="s h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey"
-               :class="{ 'invisible': !row.attributes.experiment.name }">
-            <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-            <a target="_blank" :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.parent.url" :icon="row.attributes.icon" :value="row.attributes.file_name"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label=" i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :url="row.attributes.parent.url" :value="labelName(row.attributes.parent)"/>
+          <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :visible="!!row.attributes.experiment.name"
+                        :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'AssetsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-   <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+   <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index d58e43aff..c0546ec13 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -10,43 +10,22 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[220px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
-              <a :href="row.attributes.project.url" target="_blank" class="shrink-0 overflow-hidden">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-5 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ExperimentsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index bc08b895c..b62329176 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -10,41 +10,22 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
-          <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <template v-if="row.attributes.parent_folder">
-              <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-                <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
-                <a :href="row.attributes.parent_folder.url" target="_blank" class="shrink-0 overflow-hidden">
-                  <StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent_folder)"></StringWithEllipsis>
-                </a>
-              </div>
-            </template>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-4 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url"  :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.floler')" :visible="row.attributes.parent_folder"
+                        :url="row.attributes.parent_folder?.url" :value="labelName(row.attributes.parent_folder)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'FoldersComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/helpers/cell_template.vue b/app/javascript/vue/global_search/groups/helpers/cell_template.vue
new file mode 100644
index 000000000..724b04084
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/helpers/cell_template.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] min-w-[8rem] items-center gap-1 text-xs group-hover:bg-sn-super-light-grey">
+      <template v-if="visible">
+        <b class="shrink-0">{{ label }}:</b>
+        <a v-if="url" :href="url" class="shrink-0 overflow-hidden hover:no-underline">
+          <img v-if="avatar" :src="avatar" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+          <StringWithEllipsis class="w-full" :text="value"></StringWithEllipsis>
+        </a>
+        <div v-else class="grid grid-cols-[auto_1fr] items-center gap-1 overflow-hidden">
+          <img v-if="avatar" :src="avatar" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
+          <span class="shrink-0 truncate" :title="value">{{ value }}</span>
+        </div>
+      </template>
+    </div>
+</template>
+
+<script>
+import StringWithEllipsis from '../../../shared/string_with_ellipsis.vue';
+
+export default {
+  name: 'CellTemplate',
+  props: {
+    label: { type: String, default: '' },
+    value: { type: String, default: '' },
+    url: { type: String, default: '' },
+    avatar: { type: String, default: '' },
+    visible: { type: Boolean, default: true }
+  },
+  components: {
+    StringWithEllipsis
+  }
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/helpers/link_template.vue b/app/javascript/vue/global_search/groups/helpers/link_template.vue
new file mode 100644
index 000000000..3de291e45
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/helpers/link_template.vue
@@ -0,0 +1,24 @@
+<template>
+    <a target="_blank" :href="url" class="h-full py-2 px-4 overflow-hidden font-bold flex gap-1 items-center group-hover:bg-sn-super-light-grey hover:no-underline">
+      <span v-if="icon" :class="icon" class="sn-icon shrink-0"></span>
+      <StringWithEllipsis class="w-full"
+        :text="value">
+      </StringWithEllipsis>
+    </a>
+</template>
+
+<script>
+import StringWithEllipsis from '../../../shared/string_with_ellipsis.vue';
+
+export default {
+  name: 'LinkTemplate',
+  props: {
+    value: { type: String, default: '' },
+    url: { type: String, default: '' },
+    icon: { type: String, default: '' }
+  },
+  components: {
+    StringWithEllipsis
+  }
+};
+</script>
diff --git a/app/javascript/vue/global_search/groups/helpers/list_end.vue b/app/javascript/vue/global_search/groups/helpers/list_end.vue
new file mode 100644
index 000000000..88a9e53f8
--- /dev/null
+++ b/app/javascript/vue/global_search/groups/helpers/list_end.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="flex flex-col gap-6 mt-6">
+    <div class="flex items-center mb-6">
+      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
+        <span class="sn-icon sn-icon-flag"></span>
+        <span>{{ i18n.t('search.index.reached_end') }}</span>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'ListEnd'
+};
+</script>
diff --git a/app/javascript/vue/global_search/no_search_result.vue b/app/javascript/vue/global_search/groups/helpers/no_search_result.vue
similarity index 70%
rename from app/javascript/vue/global_search/no_search_result.vue
rename to app/javascript/vue/global_search/groups/helpers/no_search_result.vue
index afe2a2cf5..6a89405c3 100644
--- a/app/javascript/vue/global_search/no_search_result.vue
+++ b/app/javascript/vue/global_search/groups/helpers/no_search_result.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="noSearchResult">
+  <div ref="noSearchResult" class="h-[60vh]">
     <div class="flex flex-col gap-6 bg-sn-white text-center relative top-1/4">
        <div><span class=" inline-block sn-icon sn-icon-search"></span></div>
        <div class="">
@@ -17,12 +17,6 @@
 <script>
 
 export default {
-  name: 'NoSearchResult',
-  props: {
-    noSearchResultHeight: { type: Number, default: 0 }
-  },
-  mounted() {
-    this.$refs.noSearchResult.style.height = `${this.noSearchResultHeight}px`;
-  }
+  name: 'NoSearchResult'
 };
 </script>
diff --git a/app/javascript/vue/global_search/groups/sort_flyout.vue b/app/javascript/vue/global_search/groups/helpers/sort_flyout.vue
similarity index 92%
rename from app/javascript/vue/global_search/groups/sort_flyout.vue
rename to app/javascript/vue/global_search/groups/helpers/sort_flyout.vue
index 921ebae89..cb4a8e26d 100644
--- a/app/javascript/vue/global_search/groups/sort_flyout.vue
+++ b/app/javascript/vue/global_search/groups/helpers/sort_flyout.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import MenuDropdown from '../../shared/menu_dropdown.vue';
+import MenuDropdown from '../../../shared/menu_dropdown.vue';
 
 export default {
   name: 'SortFlyout',
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index 520e6e7af..9b3ce17c0 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -10,42 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.format') }}:</b>
-            <span class="shrink-0">{{ row.attributes.format }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <img v-if="row.attributes.created_by.avatar_url" :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="row.attributes.name"/>
+          <CellTemplate :label="i18n.t('search.index.format')" :value="row.attributes.format"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'LabelTemplatesComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index fcc60a5d9..2bbe8aff9 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -10,53 +10,24 @@
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
-            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-7 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
+          <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModuleProtocolsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index 3c0c875fc..f62f690e8 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -10,47 +10,23 @@
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModulesComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index a73d1ecf3..2f08e645b 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -10,45 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <template v-if="row.attributes.folder">
-              <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-                <b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
-                <a :href="row.attributes.folder.url" class="shrink-0 overflow-hidden">
-                  <StringWithEllipsis class="w-full" :text="labelName(row.attributes.folder)"></StringWithEllipsis>
-                </a>
-              </div>
-            </template>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-5 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.folder"
+                        :url="row.attributes.folder?.url" :value="labelName(row.attributes.folder)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProjectsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-            :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index 9df4b0b7a..fb3e06b52 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -10,44 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProtocolsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index d36cd14d5..3b1186c11 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -10,50 +10,24 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <div class="truncate">
-              <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-              <span class="truncate">{{ row.attributes.created_by.name }}</span>
-            </div>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a target="_blank" :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
-            <a target="_blank" :href="row.attributes.project.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-7 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="row.attributes.name"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ReportsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index 34932ebd8..20555fe52 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -10,46 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
-            <span class="shrink-0">{{ row.attributes.code }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="shrink-0">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.created_by') }}:</b>
-            <img :src="row.attributes.created_by.avatar_url" class="w-5 h-5 border border-sn-super-light-grey rounded-full mx-1" />
-            <span class="shrink-0">{{ row.attributes.created_by.name }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.repository') }}:</b>
-            <a :href="row.attributes.repository.url" class="shrink-0 overflow-hidden">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.repository)"></StringWithEllipsis>
-            </a>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.repository')" :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'RepositoryRowsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 064a6ee53..11029c48a 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -10,49 +10,23 @@
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
       <div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
-        <template v-for="row in preparedResults" :key="row.id">
-          <a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
-            <StringWithEllipsis class="w-full"
-              :text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
-            </StringWithEllipsis>
-          </a>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
-            <span class="truncate">{{ row.attributes.created_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
-            <b class="shrink-0">{{ i18n.t('search.index.updated_at') }}:</b>
-            <span class="truncate">{{ row.attributes.updated_at }}</span>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.team') }}:</b>
-            <a :href="row.attributes.team.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="row.attributes.team.name"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
-            <b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
-            <a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
-              <StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
-            </a>
-          </div>
-          <div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
-            <div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
-              <b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
-              <a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
-                <StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
-              </a>
-            </div>
-          </div>
-        </template>
+        <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
+          <hr class="col-span-6 w-full m-0" v-if="index > 0">
+          <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
+          <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
+          <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
+          <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
+          <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+        </div>
       </div>
       <div v-if="viewAll" class="mt-4">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
       </div>
     </template>
-    <Loader v-if="loading" :total="total" :loaderRows="loaderRows" :loaderYPadding="loaderYPadding"
-              :loaderHeight="loaderHeight" :loaderGap="loaderGap" :reachedEnd="reachedEnd" />
-    <NoSearchResult v-else-if="showNoSearchResult" :noSearchResultHeight="noSearchResultHeight"  />
+    <Loader v-if="loading" :loaderRows="loaderRows" />
+    <ListEnd v-if="reachedEnd" />
+    <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
 
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 3fa527e06..634c7cded 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -1,8 +1,11 @@
 import axios from '../../../packs/custom_axios.js';
 import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
-import SortFlyout from './sort_flyout.vue';
+import SortFlyout from './helpers/sort_flyout.vue';
 import Loader from '../loader.vue';
-import NoSearchResult from '../no_search_result.vue';
+import ListEnd from './helpers/list_end.vue';
+import NoSearchResult from './helpers/no_search_result.vue';
+import CellTemplate from './helpers/cell_template.vue';
+import LinkTemplate from './helpers/link_template.vue';
 /* global GLOBAL_CONSTANTS I18n */
 
 export default {
@@ -16,7 +19,10 @@ export default {
     StringWithEllipsis,
     SortFlyout,
     Loader,
-    NoSearchResult
+    NoSearchResult,
+    ListEnd,
+    CellTemplate,
+    LinkTemplate
   },
   data() {
     return {
@@ -27,10 +33,6 @@ export default {
       page: 1,
       disabled: false,
       fullDataLoaded: false,
-      loaderHeight: 24,
-      loaderGap: 10,
-      loaderYPadding: 10,
-      noSearchResultHeight: 0
     };
   },
   watch: {
@@ -69,20 +71,10 @@ export default {
       return !this.selected && this.total > GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
     },
     loaderRows() {
-      // h-[24px] gap-y-[10px] py-[10px]
-      if (this.loading && (!this.selected || this.total)) return GLOBAL_CONSTANTS.GLOBAL_SEARCH_PREVIEW_LIMIT;
-      if (this.selected && this.loading) {
-        const availableHeight = window.innerHeight - this.$refs.content.getBoundingClientRect().top;
-        // loaderHeight + loaderGap +  headerLoaderHeight + headerContentGap
-        const offSet = this.loaderHeight + this.loaderGap + 32 + 20;
-
-        return Math.floor((availableHeight - offSet) / (this.loaderHeight + this.loaderGap + (2 * this.loaderYPadding)));
-      }
-
-      return 0;
+      return !this.selected ? 4 : 20;
     },
     reachedEnd() {
-      return Math.ceil(this.total / GLOBAL_CONSTANTS.SEARCH_LIMIT) === this.page;
+      return !this.page && this.selected;
     },
     showNoSearchResult() {
       return this.selected && !this.loading && !this.results.length;
@@ -90,6 +82,8 @@ export default {
   },
   methods: {
     labelName(object) {
+      if (!object) return '';
+
       if (!object.archived) return object.name;
 
       return `${I18n.t('labels.archived')} ${object.name}`;
@@ -130,10 +124,6 @@ export default {
           this.disabled = response.data.meta.disabled;
           this.loading = false;
           this.page = response.data.meta.next_page;
-          if (this.results.length === 0 && this.selected) {
-            const availableHeight = window.innerHeight - this.$refs.content.getBoundingClientRect().top;
-            this.noSearchResultHeight = availableHeight - 20;
-          }
         })
         .finally(() => {
           this.loading = false;
diff --git a/app/javascript/vue/global_search/loader.vue b/app/javascript/vue/global_search/loader.vue
index 886eab3a8..a11f038d6 100644
--- a/app/javascript/vue/global_search/loader.vue
+++ b/app/javascript/vue/global_search/loader.vue
@@ -1,28 +1,16 @@
 <template>
-  <div class="flex flex-col gap-6">
-    <div v-if="!total" class="grid grid-cols-[32px_auto] gap-2.5">
-      <div class="h-8 w-8 animate-skeleton rounded"></div>
-      <div class="h-8 w-40 animate-skeleton rounded"></div>
-    </div>
-    <div class="flex flex-col" :class="[`gap-[${loaderGap}px]`]">
-      <div v-for="_count in loaderRows"
-          class="flex items-center no-wrap border-0 border-b border-solid border-sn-light-grey gap-x-8"
-          :class="[`gap-y-[${loaderGap}px]`, `py-[${loaderYPadding}px]`, { 'first:border-t': total }]">
-        <div class="w-[500px] grow-1" :class="`h-[${loaderHeight}px]`">
-          <div class="h-full w-80 animate-skeleton rounded mr-auto"></div>
-        </div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-24 max-w-24 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-44 max-w-44 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-44 max-w-44 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-56 max-w-56 animate-skeleton rounded"></div>
-        <div :class="`h-[${loaderHeight}px]`" class="w-96 max-w-96 animate-skeleton rounded"></div>
+  <div class="flex flex-col">
+    <div v-for="_count in loaderRows"
+        class="flex items-center no-wrap border-0 gap-2 py-2 border-b border-solid border-sn-light-grey gap-x-8"
+      >
+      <div class="w-[500px] grow-1 h-6">
+        <div class="h-full w-80 animate-skeleton rounded mr-auto"></div>
       </div>
-    </div>
-    <div v-if="reachedEnd" class="flex items-center mb-6">
-      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
-        <span class="sn-icon sn-icon-flag"></span>
-        <span>{{ i18n.t('search.index.reached_end') }}</span>
-      </p>
+      <div class="w-24 max-w-24 animate-skeleton rounded h-6"></div>
+      <div class="w-44 max-w-44 animate-skeleton rounded h-6"></div>
+      <div class="w-44 max-w-44 animate-skeleton rounded h-6"></div>
+      <div class="w-56 max-w-56 animate-skeleton rounded h-6"></div>
+      <div class="w-96 max-w-96 animate-skeleton rounded h-6"></div>
     </div>
   </div>
 </template>
@@ -32,12 +20,7 @@
 export default {
   name: 'Loader',
   props: {
-    total: { type: Number, default: 0 },
     loaderRows: { type: Number, default: 0 },
-    loaderHeight: { type: Number, required: true },
-    loaderGap: { type: Number, required: true },
-    loaderYPadding: { type: Number, required: true },
-    reachedEnd: { type: Boolean }
   }
 };
 </script>

From c253d0ffcf7b8b155cb7eb17b23b595d6265bc90 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 16 Apr 2024 13:52:53 +0200
Subject: [PATCH 075/115] Clean quick search [SCI-10246]

---
 app/controllers/search_controller.rb | 11 +++++------
 config/initializers/constants.rb     |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 2fb83f949..8038e033f 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -225,14 +225,12 @@ class SearchController < ApplicationController
 
   def quick
     results = if params[:filter].present?
-                object_quick_search(params[:filter].singularize,
-                                    search_by_id: Constants::QUICK_SEARCH_SEARCHABLE_BY_NAME
-                                                  .exclude?(params[:filter].singularize))
+                object_quick_search(params[:filter].singularize)
               else
                 Constants::QUICK_SEARCH_SEARCHABLE_OBJECTS.filter_map do |object|
                   next if object == 'label_template' && !LabelTemplate.enabled?
 
-                  object_quick_search(object, search_by_id: Constants::QUICK_SEARCH_SEARCHABLE_BY_NAME.exclude?(object))
+                  object_quick_search(object)
                 end.flatten.sort_by(&:updated_at).reverse.take(Constants::QUICK_SEARCH_LIMIT)
               end
 
@@ -241,8 +239,9 @@ class SearchController < ApplicationController
 
   private
 
-  def object_quick_search(class_name, search_by_id: true)
-    search_method = class_name.to_s.camelize.constantize.method(search_by_id ? :search_by_name_and_id : :search_by_name)
+  def object_quick_search(class_name)
+    search_model = class_name.to_s.camelize.constantize
+    search_method = search_model.method(search_model.respond_to?(:code) ? :search_by_name_and_id : :search_by_name)
 
     search_method.call(current_user,
                        current_team,
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 4d7aa80dd..bdbeb7812 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -447,7 +447,6 @@ class Constants
   QUICK_SEARCH_LIMIT = 5
   QUICK_SEARCH_SEARCHABLE_OBJECTS = %w(project experiment my_module protocol repository_row
                                        report project_folder result label_template).freeze
-  QUICK_SEARCH_SEARCHABLE_BY_NAME = %w(project_folder result label_template).freeze
 
   #                             )       \   /      (
   #                            /|\      )\_/(     /|\

From 3ffda603d32ed27749e28d509b49801d1eaf7a28 Mon Sep 17 00:00:00 2001
From: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Date: Wed, 17 Apr 2024 10:25:34 +0200
Subject: [PATCH 076/115] Bump version to 1.32.0.2

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 2f0c2a938..e64f8c8aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.32.0.1
+1.32.0.2

From ef3ef8bb7b6a3c44d9b2a222a47e9fb5ce657cfe Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 17 Apr 2024 10:20:58 +0100
Subject: [PATCH 077/115] Disable click events when duplicating content for
 protocol step and result [SCI-10609]

---
 app/javascript/vue/protocol/step.vue                  | 4 +++-
 app/javascript/vue/results/result.vue                 | 4 +++-
 app/javascript/vue/shared/content/mixins/duplicate.js | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index ee3f6383c..b7c99d821 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -5,7 +5,7 @@
        @dragenter.prevent="dragEnter($event)"
        @dragover.prevent
        :data-id="step.id"
-       :class="{ 'draging-file': dragingFile, 'editing-name': editingName, 'locked': !urls.update_url }"
+       :class="{ 'draging-file': dragingFile, 'editing-name': editingName, 'locked': !urls.update_url, 'pointer-events-none': addingContent }"
   >
     <div class="drop-message" @dragleave.prevent="!showFileModal ? dragingFile = false : null">
       {{ i18n.t('protocols.steps.drop_message', { position: step.attributes.position + 1 }) }}
@@ -116,6 +116,7 @@
           :reorderElementUrl="elements.length > 1 ? urls.reorder_elements_url : ''"
           :assignableMyModuleId="assignableMyModuleId"
           :isNew="element.isNew"
+          @component:adding-content="($event) => addingContent = $event"
           @component:delete="deleteElement"
           @update="updateElement"
           @reorder="openReorderModal"
@@ -201,6 +202,7 @@
         attachments: [],
         attachmentsReady: false,
         confirmingDelete: false,
+        addingContent: false,
         showFileModal: false,
         showCommentsSidebar: false,
         dragingFile: false,
diff --git a/app/javascript/vue/results/result.vue b/app/javascript/vue/results/result.vue
index 63b03d209..515252228 100644
--- a/app/javascript/vue/results/result.vue
+++ b/app/javascript/vue/results/result.vue
@@ -5,7 +5,7 @@
        @dragenter.prevent="dragEnter($event)"
        @dragover.prevent
        :data-id="result.id"
-       :class="{ 'bg-sn-super-light-blue': dragingFile, 'bg-white': !dragingFile, 'locked': locked }"
+       :class="{ 'bg-sn-super-light-blue': dragingFile, 'bg-white': !dragingFile, 'locked': locked, 'pointer-events-none': addingContent }"
   >
     <div class="text-xl items-center flex flex-col text-sn-blue h-full justify-center left-0 absolute top-0 w-full"
          v-if="dragingFile"
@@ -110,6 +110,7 @@
             :reorderElementUrl="elements.length > 1 ? urls.reorder_elements_url : ''"
             :assignableMyModuleId="result.attributes.my_module_id"
             :isNew="element.isNew"
+            @component:adding-content="($event) => addingContent = $event"
             @component:delete="deleteElement"
             @update="updateElement"
             @reorder="openReorderModal"
@@ -164,6 +165,7 @@ export default {
       elements: [],
       attachments: [],
       attachmentsReady: false,
+      addingContent: false,
       showFileModal: false,
       dragingFile: false,
       wellPlateOptions: [
diff --git a/app/javascript/vue/shared/content/mixins/duplicate.js b/app/javascript/vue/shared/content/mixins/duplicate.js
index 19187e28f..02c6ea823 100644
--- a/app/javascript/vue/shared/content/mixins/duplicate.js
+++ b/app/javascript/vue/shared/content/mixins/duplicate.js
@@ -3,11 +3,14 @@
 export default {
   methods: {
     duplicateElement() {
+      this.$emit('component:adding-content', true);
       $.post(this.element.attributes.orderable.urls.duplicate_url, (result) => {
         this.$emit('component:insert', result.data);
         HelperModule.flashAlertMsg(this.i18n.t('protocols.steps.component_duplicated'), 'success');
       }).fail(() => {
         HelperModule.flashAlertMsg(this.i18n.t('protocols.steps.component_duplication_failed'), 'danger');
+      }).always(() => {
+        this.$emit('component:adding-content', false);
       });
     }
   }

From c426ee27c4cb9bc47f9c8edabad975d9c3c820ca Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 17 Apr 2024 12:00:46 +0200
Subject: [PATCH 078/115] Fix various css issues for experiment canvas
 [SCI-10568]

---
 app/assets/stylesheets/experiment/canvas.scss | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/assets/stylesheets/experiment/canvas.scss b/app/assets/stylesheets/experiment/canvas.scss
index 9009dffcf..5099d877d 100644
--- a/app/assets/stylesheets/experiment/canvas.scss
+++ b/app/assets/stylesheets/experiment/canvas.scss
@@ -12,6 +12,12 @@
 
   .panel-heading {
     padding: 7px 30px 7px 15px;
+
+    .panel-title {
+      align-items: center;
+      display: flex;
+      height: 100%;
+    }
   }
 
   .panel-body {
@@ -97,4 +103,18 @@
       grid-template-columns: 1fr;
     }
   }
+
+  .bootstrap-select .dropdown-toggle:focus {
+    outline: none !important;
+  }
+
+  .filter-option-inner {
+    height: 100%;
+
+    .filter-option-inner-inner {
+      align-items: center;
+      display: flex;
+      height: 100%;
+    }
+  }
 }

From ba47c75ee45c36908b4b40aa65f28bd986665f12 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 17 Apr 2024 17:08:33 +0200
Subject: [PATCH 079/115] Fix various css issues for experiment canvas and
 table [SCI-10568]

---
 .../vue/my_modules/renderers/tags.vue           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/javascript/vue/my_modules/renderers/tags.vue b/app/javascript/vue/my_modules/renderers/tags.vue
index 9a0fb86f9..51665405a 100644
--- a/app/javascript/vue/my_modules/renderers/tags.vue
+++ b/app/javascript/vue/my_modules/renderers/tags.vue
@@ -1,15 +1,16 @@
 <template>
   <div class="flex items-center gap-1.5 h-9 mt-0.5">
     <template v-if="params.data.tags.length > 0 || params.data.permissions.manage_tags">
-      <div v-if="params.data.tags.length > 0"
-           class="h-6 px-1.5 flex items-center rounded text-white max-w-[150px]"
-           :style="{'background': params.data.tags[0].color}">
-        <div class="truncate">{{ params.data.tags[0].name }}</div>
-      </div>
-      <GeneralDropdown v-if="params.data.tags.length > 1" >
+      <GeneralDropdown v-if="params.data.tags.length > 0">
         <template v-slot:field>
-          <div class="h-6 min-w-[24px] text-sn-dark-grey flex items-center justify-center rounded-full text-[.625rem]
-                    bg-sn-light-grey border !border-sn-sleepy-grey cursor-pointer">
+          <div
+              class="h-6 px-1.5 inline-flex items-center rounded text-white max-w-[150px]"
+              :style="{'background': params.data.tags[0].color}">
+            <div class="truncate">{{ params.data.tags[0].name }}</div>
+          </div>
+          <div v-if="params.data.tags.length > 1"
+               class="h-6 min-w-[24px] text-sn-dark-grey inline-flex items-center justify-center rounded-full text-[.625rem]
+                      ml-1.5 bg-sn-light-grey border !border-sn-sleepy-grey cursor-pointer">
             <span>+{{ params.data.tags.length - 1 }}</span>
           </div>
         </template>

From 9bd64104f39ee4d1cbd7f5bc6a2a1caa784792ac Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 17 Apr 2024 17:01:58 +0200
Subject: [PATCH 080/115] Small css fixes and microinteractions [SCI-10630]

---
 .../vue/global_search/container.vue           |  6 +-
 .../vue/global_search/filters_modal.vue       |  2 +-
 .../vue/global_search/groups/search_mixin.js  | 14 ++--
 .../vue/navigation/quick_search.vue           | 78 ++++++++++++++++---
 app/serializers/quick_search_serializer.rb    |  2 +-
 config/locales/en.yml                         | 13 +++-
 6 files changed, 97 insertions(+), 18 deletions(-)

diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index f34c457cf..9bdc434b8 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -8,7 +8,8 @@
       </div>
     </div>
     <div class="bg-white rounded p-4 flex gap-2.5 items-center mb-4 sticky top-0">
-      <div class="left-icon sci-input-container-v2 w-72 input-sm" :title="i18n.t('nav.search')">
+      <div class="left-icon sci-input-container-v2 w-72 input-sm"
+           :title="i18n.t('nav.search')" :class="{'error': invalidQuery}">
         <input ref="searchField" type="text" class="!pr-9" :value="localQuery" @change="changeQuery" :placeholder="i18n.t('nav.search')"/>
         <i class="sn-icon sn-icon-search"></i>
         <i v-if="localQuery.length > 0" class="sn-icon cursor-pointer sn-icon-close absolute right-0 -top-0.5" @click="localQuery = ''"></i>
@@ -145,6 +146,9 @@ export default {
     };
   },
   computed: {
+    invalidQuery() {
+      return this.localQuery.length < 2;
+    },
     activeFilters() {
       return Object.keys(this.filters).filter((key) => {
         if (key === 'created_at' || key === 'updated_at') {
diff --git a/app/javascript/vue/global_search/filters_modal.vue b/app/javascript/vue/global_search/filters_modal.vue
index c1a768a8e..027079e53 100644
--- a/app/javascript/vue/global_search/filters_modal.vue
+++ b/app/javascript/vue/global_search/filters_modal.vue
@@ -2,7 +2,7 @@
   <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-content !pb-2.5">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <i class="sn-icon sn-icon-close"></i>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 634c7cded..59c6be24a 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -46,11 +46,13 @@ export default {
       }
     },
     query() {
-      this.results = [];
-      this.page = 1;
-      this.total = 0;
-      this.fullDataLoaded = false;
-      this.loadData();
+      if (this.query.length > 1) {
+        this.results = [];
+        this.page = 1;
+        this.total = 0;
+        this.fullDataLoaded = false;
+        this.loadData();
+      }
     }
   },
   mounted() {
@@ -104,6 +106,8 @@ export default {
       this.loadData();
     },
     loadData() {
+      if (this.query.length < 2) return;
+
       if (this.loading && this.page) return;
 
       this.loading = true;
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 4d66b43ed..1c8d7895f 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -2,13 +2,15 @@
   <GeneralDropdown ref="container" :canOpen="canOpen" :fieldOnlyOpen="true" @close="filtersOpened = false">
     <template v-slot:field>
       <div class="sci--navigation--top-menu-search left-icon sci-input-container-v2" :class="{'disabled' : !currentTeam}" :title="i18n.t('nav.search')">
-        <input ref="searchField" type="text" class="!pr-20" v-model="searchQuery" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
+        <input ref="searchField" type="text" class="!pr-20" v-model="searchQuery" @keydown="focusHistoryItem"
+               @focus="openHistory" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
         <i class="sn-icon sn-icon-search"></i>
         <div v-if="this.searchQuery.length > 1" class="flex items-center gap-1 absolute right-2 top-1.5">
           <div class="btn btn-light icon-btn btn-xs" @click="this.searchQuery = ''">
             <i class="sn-icon sn-icon-close  m-0"></i>
           </div>
-          <div class="btn btn-light icon-btn btn-xs" :class="{'active': filtersOpened}" @click="filtersOpened = !filtersOpened">
+          <div class="btn btn-light icon-btn btn-xs" :title="i18n.t('search.quick_search.search_options')"
+               :class="{'active': filtersOpened}" @click="filtersOpened = !filtersOpened">
             <i class="sn-icon sn-icon-search-options m-0"></i>
           </div>
         </div>
@@ -27,6 +29,10 @@
       ></SearchFilters>
       <div v-else-if="showHistory" class="max-w-[600px]">
         <div v-for="(query, i) in reversedPreviousQueries" @click="setQuery(query)" :key="i"
+             ref="historyItems"
+             tabindex="1"
+             @keydown="focusHistoryItem"
+             @keydown.enter="setQuery(query)"
              class="flex px-3 h-11 items-center gap-2 hover:bg-sn-super-light-grey cursor-pointer">
           <i class="sn-icon sn-icon-history-search"></i>
           {{ query }}
@@ -62,7 +68,7 @@
                   text-sn-black hover:no-underline active:no-underline hover:text-black block"
         >
           <div class="flex items-center gap-2">
-            <i class="sn-icon shrink-0" :class="getIcon(result.type)"></i>
+            <i class="sn-icon shrink-0" :class="getIcon(result.type)" :title="getTitle(result.type)"></i>
             <span v-if="result.attributes.archived">(A)</span>
             <StringWithEllipsis class="grow max-w-[400px]" :text="getName(result.attributes)"></StringWithEllipsis>
             <div class="ml-auto pl-4 text-sn-grey text-xs shrink-0">
@@ -80,9 +86,9 @@
         </a>
         <div v-else v-for="i in Array(5).fill(5)" class="px-3 py-2">
           <div class="flex items-center gap-2 mb-2">
-            <div class="h-6 w-6 bg-sn-light-grey rounded shrink-0"></div>
-            <div class="h-6 grow max-w-[200px] bg-sn-light-grey rounded shrink-0"></div>
-            <div class="h-6 w-12 bg-sn-light-grey rounded shrink-0 ml-auto"></div>
+            <div class="h-5 w-5 bg-sn-light-grey rounded shrink-0"></div>
+            <div class="h-5 grow max-w-[200px] bg-sn-light-grey rounded shrink-0"></div>
+            <div class="h-5 w-12 bg-sn-light-grey rounded shrink-0 ml-auto"></div>
           </div>
           <div class="flex items-center gap-2 pl-8">
             <div class="h-3 grow max-w-[200px] bg-sn-light-grey rounded shrink-0"></div>
@@ -153,7 +159,7 @@ export default {
   },
   watch: {
     searchQuery() {
-      this.$refs.container.isOpen = this.canOpen;
+      this.openHistory();
 
       if (this.searchQuery.length > 1) {
         this.fetchQuickSearchResults();
@@ -167,13 +173,17 @@ export default {
       quickFilter: null,
       results: [],
       loading: false,
-      filtersOpened: false
+      filtersOpened: false,
+      focusedHistoryItem: null
     };
   },
   mounted() {
     this.previousQueries = JSON.parse(localStorage.getItem('quickSearchHistory') || '[]');
   },
   methods: {
+    openHistory() {
+      this.$refs.container.isOpen = this.canOpen;
+    },
     getIcon(type) {
       switch (type) {
         case 'projects':
@@ -194,8 +204,38 @@ export default {
           return 'sn-icon-reports';
         case 'steps':
           return 'sn-icon-steps';
-        case 'label-templates':
+        case 'zebra_label_templates':
           return 'sn-icon-label-templates';
+        case 'fluics_label_templates':
+          return 'sn-icon-label-templates';
+        default:
+          return null;
+      }
+    },
+    getTitle(type) {
+      switch (type) {
+        case 'projects':
+          return this.i18n.t('search.quick_search.project');
+        case 'experiments':
+          return this.i18n.t('search.quick_search.experiment');
+        case 'my_modules':
+          return this.i18n.t('search.quick_search.task');
+        case 'project_folders':
+          return this.i18n.t('search.quick_search.folder');
+        case 'protocols':
+          return this.i18n.t('search.quick_search.protocol');
+        case 'results':
+          return this.i18n.t('search.quick_search.result');
+        case 'repository_rows':
+          return this.i18n.t('search.quick_search.inventory_item');
+        case 'reports':
+          return this.i18n.t('search.quick_search.report');
+        case 'steps':
+          return this.i18n.t('search.quick_search.step');
+        case 'zebra_label_templates':
+          return this.i18n.t('search.quick_search.label_template');
+        case 'fluics_label_templates':
+          return this.i18n.t('search.quick_search.label_template');
         default:
           return null;
       }
@@ -263,6 +303,26 @@ export default {
     },
     searchValue() {
       window.open(`${this.searchUrl}?q=${this.searchQuery}`, '_self');
+    },
+    focusHistoryItem(event) {
+      if (this.focusedHistoryItem === null && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {
+        this.focusedHistoryItem = 0;
+        this.$refs.historyItems[this.focusedHistoryItem].focus();
+      } else if (event.key === 'ArrowDown') {
+        event.preventDefault();
+        this.focusedHistoryItem += 1;
+        if (this.focusedHistoryItem >= this.$refs.historyItems.length) {
+          this.focusedHistoryItem = 0;
+        }
+        this.$refs.historyItems[this.focusedHistoryItem].focus();
+      } else if (event.key === 'ArrowUp') {
+        event.preventDefault();
+        this.focusedHistoryItem -= 1;
+        if (this.focusedHistoryItem < 0) {
+          this.focusedHistoryItem = this.$refs.historyItems.length - 1;
+        }
+        this.$refs.historyItems[this.focusedHistoryItem].focus();
+      }
     }
   }
 };
diff --git a/app/serializers/quick_search_serializer.rb b/app/serializers/quick_search_serializer.rb
index 6cf804966..b0ad88cb7 100644
--- a/app/serializers/quick_search_serializer.rb
+++ b/app/serializers/quick_search_serializer.rb
@@ -13,7 +13,7 @@ class QuickSearchSerializer < ActiveModel::Serializer
   end
 
   def code
-    @object.code unless @object.is_a?(ProjectFolder) || object.is_a?(Result) || object.is_a?(LabelTemplate)
+    @object.respond_to?(:code) ? @object.code : @object.id
   end
 
   def updated_at
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15ae3b7cd..0460a057c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -434,13 +434,24 @@ en:
       all_results: "All search results for \"%{query}\""
       empty_title: "No quick search results found."
       empty_description: "Quick search only checks titles. Press enter or click \"All search results for '%{query}'\" to find all available matches."
+      search_options: "Search options"
+      project: "Project"
+      experiment: "Experiment"
+      task: "Task"
+      result: "Result"
+      inventory_item: "Inventory item"
+      protocol: "Protocol"
+      label_template: "Label template"
+      report: "Report"
+      step: "Step"
+      result: "Result"
     whole_word: "Match any whole word"
     whole_phrase: "Match whole phrase"
     match_case: "Match case sensitive"
     object_id: "ID:"
     filters:
       title: "More search options"
-      sub_filters: "Refine your search by applying the filters below."
+      sub_title: "Refine your search by applying the filters below."
       by_type: "Filter by type"
       by_created_date: "Filter by created date"
       by_updated_date: "Filter by updated date"

From be093c9302434f2dce5015a6a0a8e0549cb1017a Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 18 Apr 2024 10:43:07 +0100
Subject: [PATCH 081/115] Add helper method for checking user 2fa enabled
 [SCI-10634]

---
 app/controllers/users/passwords_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
index 30df7aaa9..6bac88f13 100644
--- a/app/controllers/users/passwords_controller.rb
+++ b/app/controllers/users/passwords_controller.rb
@@ -21,7 +21,7 @@ class Users::PasswordsController < Devise::PasswordsController
 
     if resource.errors.blank?
       resource.unlock_access! if unlockable?(resource)
-      if !resource.two_factor_auth_enabled?
+      if !two_factor_auth_enabled_for(resource)
         flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
         set_flash_message!(:notice, flash_message)
         resource.after_database_authentication
@@ -39,7 +39,11 @@ class Users::PasswordsController < Devise::PasswordsController
   protected
 
   def after_resetting_password_path_for(resource)
-    resource.two_factor_auth_enabled? ? new_session_path(resource_name) : after_sign_in_path_for(resource)
+    two_factor_auth_enabled_for(resource) ? new_session_path(resource_name) : after_sign_in_path_for(resource)
+  end
+
+  def two_factor_auth_enabled_for(user)
+    user.two_factor_auth_enabled?
   end
 
   # The path used after sending reset password instructions

From b554eed8eeb4dc350e53b2dadcbb365da745337c Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 18 Apr 2024 11:56:39 +0200
Subject: [PATCH 082/115] Fix assigned item table styles in reports [SCI-10229]

In report, we are missing columns in assigned item to task table due to long inventory names.
---
 app/assets/stylesheets/reports_pdf.sass.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/assets/stylesheets/reports_pdf.sass.scss b/app/assets/stylesheets/reports_pdf.sass.scss
index f811678e9..193fff54d 100644
--- a/app/assets/stylesheets/reports_pdf.sass.scss
+++ b/app/assets/stylesheets/reports_pdf.sass.scss
@@ -28,3 +28,13 @@ thead {
   display: table-row-group;
 }
 
+.report-module-repository-element {
+  .report-element-header {
+    .repository-name {
+      max-width: 100vw;
+      padding-bottom: 4px;
+      white-space: normal !important;
+    }
+  }
+}
+

From 50df1e153db785e0dcea4e457a6ab222797da1f2 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Thu, 18 Apr 2024 12:47:04 +0100
Subject: [PATCH 083/115] Remove limit from inventory column dropdown list
 items query [SCI-10640]

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

diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb
index 79d87de78..30450ed56 100644
--- a/app/controllers/repository_columns/list_columns_controller.rb
+++ b/app/controllers/repository_columns/list_columns_controller.rb
@@ -35,7 +35,7 @@ module RepositoryColumns
       column_list_items = @repository_column.repository_list_items
                                             .where('data ILIKE ?',
                                                    "%#{search_params[:query]}%")
-                                            .limit(Constants::SEARCH_LIMIT)
+                                            .order(data: :asc)
                                             .select(:id, :data)
 
       render json: column_list_items.map { |i| { value: i.id, label: escape_input(i.data) } }, status: :ok

From 2b29012a816646dfb5a51e7349e5736b87e314e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:03:14 +0000
Subject: [PATCH 084/115] Bump axios from 0.21.4 to 1.6.8

Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.8.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.4...v1.6.8)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 562d1c31f..db5293d5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2255,11 +2255,11 @@ axios@^0.21.1:
     follow-redirects "^1.14.0"
 
 axios@^1.6.0:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
-  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
   dependencies:
-    follow-redirects "^1.15.4"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -3716,7 +3716,7 @@ focus-trap@^5.1.0:
     tabbable "^4.0.0"
     xtend "^4.0.1"
 
-follow-redirects@^1.14.0, follow-redirects@^1.15.4:
+follow-redirects@^1.14.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==

From c36e2277fa9471c13474ac492f644a0654565151 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 18 Apr 2024 16:19:18 +0200
Subject: [PATCH 085/115] Fix various issues with archived labels in
 reporsitories [SCI-10531]

---
 app/controllers/repositories_controller.rb   | 4 ++--
 app/javascript/vue/repositories/table.vue    | 2 +-
 app/javascript/vue/repository/state_menu.vue | 5 ++++-
 app/views/repositories/index.html.erb        | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 2f28cb65e..16b73b83e 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -563,11 +563,11 @@ class RepositoriesController < ApplicationController
 
   def set_breadcrumbs_items
     @breadcrumbs_items = []
-    archived_branch = @repository&.archived? || (!@repository && params[:archived] == 'true')
+    archived_branch = @repository&.archived? || (!@repository && params[:view_mode] == 'archived')
 
     @breadcrumbs_items.push({
                               label: t('breadcrumbs.inventories'),
-                              url: archived_branch ? repositories_path(archived: true) : repositories_path,
+                              url: archived_branch ? repositories_path(view_mode: 'archived') : repositories_path,
                               archived: archived_branch
                             })
 
diff --git a/app/javascript/vue/repositories/table.vue b/app/javascript/vue/repositories/table.vue
index 58f38de38..ed3fe33f8 100644
--- a/app/javascript/vue/repositories/table.vue
+++ b/app/javascript/vue/repositories/table.vue
@@ -175,7 +175,7 @@ export default {
     },
     toolbarActions() {
       const left = [];
-      if (this.createUrl) {
+      if (this.createUrl && this.currentViewMode !== 'archived') {
         left.push({
           name: 'create',
           icon: 'sn-icon sn-icon-new-task',
diff --git a/app/javascript/vue/repository/state_menu.vue b/app/javascript/vue/repository/state_menu.vue
index 53d8ad620..7e798ccdb 100644
--- a/app/javascript/vue/repository/state_menu.vue
+++ b/app/javascript/vue/repository/state_menu.vue
@@ -1,7 +1,7 @@
 <template>
   <MenuDropdown
     :listItems="viewModesMenu"
-    :btnClasses="'btn btn-secondary !border-sn-light-grey px-3'"
+    :btnClasses="'btn btn-secondary !border-sn-light-grey px-3 prevent-shrink' + disabled"
     :btnText="btnText"
     :caret="true"
     position='right'>
@@ -26,6 +26,9 @@ export default {
     delete window.initRepositoryStateMenu;
   },
   computed: {
+    disabled() {
+      return this.viewMode === 'archived' ? ' disabled' : '';
+    },
     btnText() {
       return I18n.t(`toolbar.${this.viewMode}_state`);
     },
diff --git a/app/views/repositories/index.html.erb b/app/views/repositories/index.html.erb
index 0f18b5e2d..a39cec6db 100644
--- a/app/views/repositories/index.html.erb
+++ b/app/views/repositories/index.html.erb
@@ -3,7 +3,7 @@
 
 <% if current_team %>
   <% provide(:sidebar_url, sidebar_repositories_path) %>
-  <div class="content-pane flexible <%= params[:archived] ? :archived : :active %> repositories-index">
+  <div class="content-pane flexible <%= params[:view_mode] ? :archived : :active %> repositories-index">
     <div class="content-header">
       <div class="title-row">
         <h1 data-view-mode="active"><%= t('libraries.index.head_title') %></h1>

From abb4232dfd39644b7326ec787eb2e2913b53a439 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Fri, 19 Apr 2024 00:58:55 +0100
Subject: [PATCH 086/115] Remove paragraph bottom margin in repository text
 value renderer [SCI-10618]

---
 app/assets/javascripts/repositories/renderers/view_renderers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js
index fd928fb26..6d205771b 100644
--- a/app/assets/javascripts/repositories/renderers/view_renderers.js
+++ b/app/assets/javascripts/repositories/renderers/view_renderers.js
@@ -32,7 +32,7 @@ $.fn.dataTable.render.defaultRepositoryAssetValue = function() {
 };
 
 $.fn.dataTable.render.RepositoryTextValue = function(data) {
-  var text = $(`<span class="text-value">${data.value.view}</span>`);
+  const text = $(`<span class="text-value [&>p]:mb-0">${data.value.view}</span>`);
   text.attr('data-edit-value', data.value.edit);
   return text.prop('outerHTML');
 };

From fb03698e279e1c330ccaaf84243836b3459f8e4b Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Fri, 19 Apr 2024 14:04:58 +0200
Subject: [PATCH 087/115] Fix assignment modal in protocol templates
 [SCI-10647]

---
 app/javascript/vue/protocols/table.vue       |  2 +-
 app/serializers/lists/protocol_serializer.rb | 22 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/javascript/vue/protocols/table.vue b/app/javascript/vue/protocols/table.vue
index 72ef552ad..d7209e57c 100644
--- a/app/javascript/vue/protocols/table.vue
+++ b/app/javascript/vue/protocols/table.vue
@@ -51,7 +51,7 @@ import VersionsRenderer from './renderers/versions.vue';
 import VersionsModal from './modals/versions.vue';
 
 export default {
-  name: 'LabelTemplatesTable',
+  name: 'ProtocolTemplatesTable',
   components: {
     DataTable,
     UsersRenderer,
diff --git a/app/serializers/lists/protocol_serializer.rb b/app/serializers/lists/protocol_serializer.rb
index 4518c0bb6..555fa848c 100644
--- a/app/serializers/lists/protocol_serializer.rb
+++ b/app/serializers/lists/protocol_serializer.rb
@@ -6,13 +6,25 @@ module Lists
     include Rails.application.routes.url_helpers
 
     attributes :name, :code, :keywords, :linked_tasks, :nr_of_versions, :assigned_users, :published_by,
-               :published_on, :updated_at, :archived_by, :archived_on, :urls, :default_public_user_role_id,
-               :hidden, :top_level_assignable, :has_draft, :team, :permissions
+               :published_on, :updated_at, :archived_by, :archived_on, :urls,
+               :top_level_assignable, :has_draft, :team, :permissions
+    attribute :hidden
+    attribute :default_public_user_role_id
 
     def code
       object.parent&.code || object.code
     end
 
+    def hidden
+      return object.parent.hidden? if object.parent.present?
+
+      object.hidden?
+    end
+
+    def default_public_user_role_id
+      object.parent&.default_public_user_role_id || object.default_public_user_role_id
+    end
+
     def keywords
       object.protocol_keywords.map(&:name)
     end
@@ -63,12 +75,6 @@ module Lists
       I18n.l(object.archived_on, format: :full) if object.archived_on
     end
 
-    delegate :default_public_user_role_id, to: :object
-
-    def hidden
-      object.hidden?
-    end
-
     def top_level_assignable
       true
     end

From 62f0e76e3e1af6696ebc789e4909c495b1ef5135 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 22 Apr 2024 13:31:40 +0200
Subject: [PATCH 088/115] CSS fixes for global search filters [SCI-10635]

---
 app/javascript/vue/global_search/filters.vue  | 101 +++++++++---------
 .../vue/global_search/filters/date.vue        |  16 +--
 .../vue/global_search/groups/projects.vue     |   1 -
 app/javascript/vue/shared/select_dropdown.vue |   1 +
 config/locales/en.yml                         |  14 +++
 5 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/app/javascript/vue/global_search/filters.vue b/app/javascript/vue/global_search/filters.vue
index 04f5e8999..b23f288a7 100644
--- a/app/javascript/vue/global_search/filters.vue
+++ b/app/javascript/vue/global_search/filters.vue
@@ -1,55 +1,60 @@
 <template>
   <div class="max-w-[600px] py-3.5">
-    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_type') }}</div>
-    <div class="flex items-center gap-2 flex-wrap mb-6">
-      <template v-for="group in searchGroups" :key="group.value">
-        <button class="btn btn-secondary btn-xs"
-                :class="{'active': activeGroup === group.value}"
-                @click="setActiveGroup(group.value)">
-          {{ group.label }}
-        </button>
-      </template>
-    </div>
-    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_created_date') }}</div>
-    <DateFilter
-      :date="createdAt"
-      ref="createdAtComponent"
-      class="mb-6"
-      @change="(v) => {this.createdAt = v}"
-    ></DateFilter>
-    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_updated_date') }}</div>
-    <DateFilter
-      :date="updatedAt"
-      ref="updatedAtComponent"
-      class="mb-6"
-      @change="(v) => {this.updatedAt = v}"
-    ></DateFilter>
-    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_team') }}</div>
-    <SelectDropdown :options="teams"
-                    class="mb-6"
-                    :with-checkboxes="true"
-                    :clearable="true"
-                    :multiple="true"
-                    :value="selectedTeams"
-                    @change="(v) => {selectedTeams = v}" />
-    <div class="sci-label mb-2">{{ i18n.t('search.filters.by_user') }}</div>
-    <SelectDropdown :options="users"
-                    class="mb-6"
-                    :value="selectedUsers"
-                    :optionRenderer="userRenderer"
-                    :labelRenderer="userRenderer"
-                    :clearable="true"
-                    :with-checkboxes="true"
-                    :multiple="true"
-                    @change="(v) => {selectedUsers = v}" />
-    <div class="flex items-center gap-2">
-      <div class="sci-checkbox-container">
-        <input type="checkbox" v-model="includeArchived" class="sci-checkbox" />
-        <span class="sci-checkbox-label"></span>
+    <div class="flex flex-col pb-6 overflow-y-auto max-h-[75vh]">
+      <div class="sci-label mb-2">{{ i18n.t('search.filters.by_type') }}</div>
+      <div class="flex items-center gap-2 flex-wrap mb-6">
+        <template v-for="group in searchGroups" :key="group.value">
+          <button class="btn btn-secondary btn-xs"
+                  :class="{'active': activeGroup === group.value}"
+                  @click="setActiveGroup(group.value)">
+            {{ group.label }}
+          </button>
+        </template>
+      </div>
+      <div class="sci-label mb-2">{{ i18n.t('search.filters.by_created_date') }}</div>
+      <DateFilter
+        :date="createdAt"
+        ref="createdAtComponent"
+        class="mb-6"
+        @change="(v) => {this.createdAt = v}"
+      ></DateFilter>
+      <div class="sci-label mb-2">{{ i18n.t('search.filters.by_updated_date') }}</div>
+      <DateFilter
+        :date="updatedAt"
+        ref="updatedAtComponent"
+        class="mb-6"
+        @change="(v) => {this.updatedAt = v}"
+      ></DateFilter>
+      <div class="sci-label mb-2">{{ i18n.t('search.filters.by_team') }}</div>
+      <SelectDropdown :options="teams"
+                      class="mb-6"
+                      :with-checkboxes="true"
+                      :clearable="true"
+                      :multiple="true"
+                      :value="selectedTeams"
+                      @change="(v) => {selectedTeams = v}" />
+      <div class="sci-label mb-2 flex items-center gap-2">
+        {{ i18n.t('search.filters.by_user') }}
+        <i class="sn-icon sn-icon-info" :title="i18n.t('search.filters.by_user_info')"></i>
+      </div>
+      <SelectDropdown :options="users"
+                      class="mb-6"
+                      :value="selectedUsers"
+                      :optionRenderer="userRenderer"
+                      :labelRenderer="userRenderer"
+                      :clearable="true"
+                      :with-checkboxes="true"
+                      :multiple="true"
+                      @change="(v) => {selectedUsers = v}" />
+      <div class="flex items-center gap-2">
+        <div class="sci-checkbox-container">
+          <input type="checkbox" v-model="includeArchived" class="sci-checkbox" />
+          <span class="sci-checkbox-label"></span>
+        </div>
+        {{ i18n.t('search.filters.include_archived') }}
       </div>
-      {{ i18n.t('search.filters.include_archived') }}
     </div>
-    <hr class="my-6">
+    <hr class="mb-6">
     <div class="flex items-center gap-6">
       <button class="btn btn-light" @click="clearFilters">{{ i18n.t('search.filters.clear') }}</button>
       <button class="btn btn-secondary ml-auto" @click="$emit('cancel')">{{ i18n.t('general.cancel') }}</button>
diff --git a/app/javascript/vue/global_search/filters/date.vue b/app/javascript/vue/global_search/filters/date.vue
index 2e385fb95..d716d0458 100644
--- a/app/javascript/vue/global_search/filters/date.vue
+++ b/app/javascript/vue/global_search/filters/date.vue
@@ -117,14 +117,14 @@ export default {
       newDate: this.date,
       selectedOption: (this.date.mode || 'on'),
       dateOptions: [
-        ['today', 'Today'],
-        ['yesterday', 'Yesterday'],
-        ['last_week', 'Last week'],
-        ['this_month', 'This month'],
-        ['this_year', 'This year'],
-        ['last_year', 'Last year'],
-        ['on', 'On'],
-        ['custom', 'Custom']
+        ['today', this.i18n.t('search.filters.date.today')],
+        ['yesterday', this.i18n.t('search.filters.date.yesterday')],
+        ['last_week', this.i18n.t('search.filters.date.last_week'), { tooltip: this.i18n.t('search.filters.date.last_week_tooltip') }],
+        ['this_month', this.i18n.t('search.filters.date.this_month'), { tooltip: this.i18n.t('search.filters.date.this_month_tooltip') }],
+        ['this_year', this.i18n.t('search.filters.date.this_year'), { tooltip: this.i18n.t('search.filters.date.this_year_tooltip') }],
+        ['last_year', this.i18n.t('search.filters.date.last_year'), { tooltip: this.i18n.t('search.filters.date.last_year_tooltip') }],
+        ['on', this.i18n.t('search.filters.date.on')],
+        ['custom', this.i18n.t('search.filters.date.custom')]
       ]
     };
   },
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 6b6d93eae..2f08e645b 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -31,7 +31,6 @@
 </template>
 
 <script>
-import Link_template from './helpers/link_template.vue';
 import searchMixin from './search_mixin';
 
 export default {
diff --git a/app/javascript/vue/shared/select_dropdown.vue b/app/javascript/vue/shared/select_dropdown.vue
index 7b7cb13c9..e706149f9 100644
--- a/app/javascript/vue/shared/select_dropdown.vue
+++ b/app/javascript/vue/shared/select_dropdown.vue
@@ -71,6 +71,7 @@
               <div
                 @click.stop="setValue(option[0])"
                 ref="options"
+                :title="option[2]?.tooltip || option[1]"
                 class="py-1.5 px-3 rounded cursor-pointer flex items-center gap-2 shrink-0 hover:bg-sn-super-light-grey"
                 :class="[sizeClass, {
                   '!bg-sn-super-light-blue': valueSelected(option[0]) && focusedOption !== i,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e9bdcbb7c..4ab5b22e4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -473,8 +473,22 @@ en:
       by_updated_date: "Filter by updated date"
       by_team: "Filter by team"
       by_user: "Filter by user"
+      by_user_info: "The 'Filter by user' option will refine search results based on records where the selected user is the creator, modifier, or is assigned to the entry."
       include_archived: "Include Archived objects"
       clear: "Clear filters"
+      date:
+        today: "Today"
+        yesterday: "Yesterday"
+        last_week: "Last week"
+        last_week_tooltip: "The previous calendar week beginning of Monday to end of Sunday."
+        this_month: "This month"
+        this_month_tooltip: "The current calendar month."
+        this_year: "This year"
+        this_year_tooltip: "The current calendar year."
+        last_year: "Last year"
+        last_year_tooltip: "The previous calendar year."
+        custom: "Custom"
+        "on": "On"
     index:
       head_title: "Search"
       page_title: "Search"

From b78e028e1b445e5597077455e3d368c3b95eae0a Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 23 Apr 2024 11:16:10 +0200
Subject: [PATCH 089/115] Small css table fixes [SCI-10599]

---
 .../shared_styles/elements/checkboxes.scss    |  2 +-
 app/javascript/vue/experiments/card.vue       | 12 ++++++++----
 .../experiments/renderers/completed_tasks.vue |  3 ++-
 .../vue/global_search/groups/projects.vue     |  1 -
 app/javascript/vue/projects/card.vue          | 19 ++++++++++++-------
 .../vue/projects/renderers/users.vue          |  2 +-
 .../shared/datatable/row_menu_renderer.vue    |  2 +-
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/shared_styles/elements/checkboxes.scss b/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
index abf80f66f..f2a7850fe 100644
--- a/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
+++ b/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
@@ -35,7 +35,7 @@ input[type="checkbox"].sci-checkbox {
     &::before {
       @include font-awesome;
       animation-timing-function: $timing-function-sharp;
-      background: $color-white;
+      background: transparent;
       border: 1px solid var(--sn-black);
       border-radius: 1px;
       color: $color-white;
diff --git a/app/javascript/vue/experiments/card.vue b/app/javascript/vue/experiments/card.vue
index 0a1be59ab..ebfb3f9c6 100644
--- a/app/javascript/vue/experiments/card.vue
+++ b/app/javascript/vue/experiments/card.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col"
-       :class="{ 'bg-sn-light-grey': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true}">
+  <div class="px-3 pt-3 pb-4 rounded border-solid border border-sn-grey-300 flex flex-col"
+       :class="{ 'bg-sn-grey-100': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true}">
     <div class="flex items-center gap-4 mb-2">
       <div class="sci-checkbox-container">
         <input
@@ -16,7 +16,10 @@
     </div>
     <a :href="params.urls.show"
        :title="params.name"
-       :class="{'pointer-events-none text-sn-grey': !params.urls.show}"
+       :class="{
+        'pointer-events-none !text-sn-grey': !params.urls.show,
+        '!text-sn-black': dtComponent.currentViewMode === 'archived'
+      }"
        class="font-bold mb-4 shrink-0 text-sn-blue hover:no-underline line-clamp-2 hover:text-sn-blue h-10">
       {{ params.name }}
     </a>
@@ -89,7 +92,8 @@ export default {
     progress() {
       const { completed_tasks: completedTasks, total_tasks: totalTasks } = this.params;
 
-      if (totalTasks === 0) return 0;
+      if (totalTasks === 0) return 3;
+      if (completedTasks === 0) return 3;
 
       return (completedTasks / totalTasks) * 100;
     },
diff --git a/app/javascript/vue/experiments/renderers/completed_tasks.vue b/app/javascript/vue/experiments/renderers/completed_tasks.vue
index c44859e20..bc63741a9 100644
--- a/app/javascript/vue/experiments/renderers/completed_tasks.vue
+++ b/app/javascript/vue/experiments/renderers/completed_tasks.vue
@@ -33,7 +33,8 @@ export default {
     progress() {
       const { completed_tasks: completedTasks, total_tasks: totalTasks } = this.params.data;
 
-      if (totalTasks === 0) return 0;
+      if (totalTasks === 0) return 3;
+      if (completedTasks === 0) return 3;
 
       return (completedTasks / totalTasks) * 100;
     }
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 6b6d93eae..2f08e645b 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -31,7 +31,6 @@
 </template>
 
 <script>
-import Link_template from './helpers/link_template.vue';
 import searchMixin from './search_mixin';
 
 export default {
diff --git a/app/javascript/vue/projects/card.vue b/app/javascript/vue/projects/card.vue
index 27f3482a2..b86303e5b 100644
--- a/app/javascript/vue/projects/card.vue
+++ b/app/javascript/vue/projects/card.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="!params.folder"
-       :class="{ 'bg-sn-light-grey': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true }"
-       class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col" >
+       :class="{ 'bg-sn-grey-100': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true }"
+       class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray-300 flex flex-col" >
     <div class="flex items-center gap-4 mb-2">
       <div class="sci-checkbox-container">
         <input
@@ -17,7 +17,10 @@
     </div>
     <a :href="params.urls.show"
        :title="params.name"
-       :class="{'pointer-events-none text-sn-grey': !params.urls.show}"
+       :class="{
+        'pointer-events-none !text-sn-grey': !params.urls.show,
+        '!text-sn-black': dtComponent.currentViewMode === 'archived',
+      }"
        class="font-bold mb-4 text-sn-blue shrink-0 hover:no-underline line-clamp-3 hover:text-sn-blue h-[60px]">
       {{ params.name }}
     </a>
@@ -40,7 +43,7 @@
   <div v-else
     class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col h-56"
     :class="{
-      'bg-sn-light-grey': dtComponent.currentViewMode === 'archived',
+      'bg-sn-grey-100': dtComponent.currentViewMode === 'archived',
       'bg-sn-super-light-grey': dtComponent.currentViewMode !== 'archived',
       [cardMinWidth]: true
     }"
@@ -58,15 +61,17 @@
       <RowMenuRenderer :params="{data: params, dtComponent: dtComponent}" class="ml-auto"/>
     </div>
     <div
-      class="flex flex-col items-center justify-center"
+      class="flex flex-col items-center justify-center pt-4"
       :class="{
         'text-sn-black hover:text-sn-black': dtComponent.currentViewMode === 'archived',
         'text-sn-blue hover:text-sn-blue': dtComponent.currentViewMode !== 'archived'
       }"
      >
-      <i class="sn-icon sn-icon-folder " style="font-size: 56px !important"></i>
+      <i class="sn-icon sn-icon-folder mb-2" style="font-size: 56px !important"></i>
       <a :href="params.urls.show"
-        class="line-clamp-2 font-bold mb-2 text-inherit text-center hover:no-underline ">
+        class="line-clamp-2 font-bold mb-2 text-inherit text-center hover:no-underline "
+        :class="{'!text-sn-black': dtComponent.currentViewMode === 'archived'}"
+      >
         {{ params.name }}
       </a>
       <div class="flex items-center justify-center text-sn-dark-grey">
diff --git a/app/javascript/vue/projects/renderers/users.vue b/app/javascript/vue/projects/renderers/users.vue
index 1f4ae1cc6..451693696 100644
--- a/app/javascript/vue/projects/renderers/users.vue
+++ b/app/javascript/vue/projects/renderers/users.vue
@@ -8,7 +8,7 @@
       +{{ hiddenUsers.length }}
     </div>
     <div v-if="params.data.permissions['manage_users_assignments']"
-        class="flex items-center shrink-0 justify-center w-7 h-7 rounded-full bg-sn-light-grey text-sn-dark-grey">
+        class="flex items-center shrink-0 justify-center w-7 h-7 rounded-full border-dashed bg-sn-white text-sn-sleepy-grey border-sn-sleepy-grey">
       <i class="sn-icon sn-icon-new-task"></i>
     </div>
   </div>
diff --git a/app/javascript/vue/shared/datatable/row_menu_renderer.vue b/app/javascript/vue/shared/datatable/row_menu_renderer.vue
index 138a814c4..3f1cc83e3 100644
--- a/app/javascript/vue/shared/datatable/row_menu_renderer.vue
+++ b/app/javascript/vue/shared/datatable/row_menu_renderer.vue
@@ -2,7 +2,7 @@
   <div>
     <MenuDropdown
       :listItems="this.formattedList"
-      btnClasses="bg-transparent w-6 h-6 border-0 p-0 flex"
+      btnClasses="btn btn-light icon-btn"
       :position="'right'"
       :alwaysShow="true"
       :btnIcon="'sn-icon sn-icon-more-hori'"

From 77f09e5e3c8a5cb0a21a590beb07c392dcfb163c Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 23 Apr 2024 14:07:46 +0200
Subject: [PATCH 090/115] Fix label printing and experiment description
 [SCI-10662]

---
 app/controllers/label_templates_controller.rb |  2 +-
 .../vue/experiments/renderers/description.vue | 44 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb
index 32d9bbc23..ebd32e464 100644
--- a/app/controllers/label_templates_controller.rb
+++ b/app/controllers/label_templates_controller.rb
@@ -4,7 +4,7 @@ class LabelTemplatesController < ApplicationController
   include InputSanitizeHelper
   include TeamsHelper
 
-  before_action :check_feature_enabled, except: %i(index zpl_preview)
+  before_action :check_feature_enabled, except: %i(index zpl_preview list)
   before_action :load_label_templates, only: %i(index datatable list)
   before_action :load_label_template, only: %i(show set_default update template_tags)
   before_action :check_view_permissions, except: %i(create duplicate set_default delete update)
diff --git a/app/javascript/vue/experiments/renderers/description.vue b/app/javascript/vue/experiments/renderers/description.vue
index f938ac3f4..5b694b478 100644
--- a/app/javascript/vue/experiments/renderers/description.vue
+++ b/app/javascript/vue/experiments/renderers/description.vue
@@ -1,32 +1,32 @@
 <template>
-  <div class="group relative flex items-center group-hover:marker text-xs h-full w-full"
-       :style="{ lineHeight: 'unset' }">
-    <div class="flex gap-2 w-full"
-        :style="{ lineHeight: 'unset' }"
-        :class="{
-                  'items-center text-sm': params.dtComponent.currentViewRender === 'table',
-                  'items-end text-xs': params.dtComponent.currentViewRender === 'cards'
-                }">
-      <span v-if="shouldTruncateText"
-            class="cursor-pointer grow"
-            :class="{
-              'line-clamp-1': params.dtComponent.currentViewRender === 'table',
-              'line-clamp-2': params.dtComponent.currentViewRender === 'cards'
-            }"
+  <template v-if="params.dtComponent.currentViewRender === 'table'">
+  <div 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 v-else class="grow" v-html="params.data.sa_description"></span>
-      <span v-if="shouldTruncateText" @click.stop="showDescriptionModal" class="text-sn-blue cursor-pointer shrink-0 inline-block"
-            :style="{ lineHeight: 'unset' }"
-            :class="{
-                      'text-xs': params.dtComponent.currentViewRender === 'cards',
-                      'text-sm': params.dtComponent.currentViewRender === 'table'
-                    }">
+      <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>
+  <template v-else>
+    <div class="group relative flex items-center group-hover:marker text-xs h-full w-full">
+      <div class="flex gap-2 w-full items-end text-xs">
+        <span v-if="shouldTruncateText"
+              class="cursor-pointer grow line-clamp-2"
+              @click.stop="showDescriptionModal"
+              v-html="params.data.sa_description">
+        </span>
+        <span v-else class="grow" v-html="params.data.sa_description"></span>
+        <span v-if="shouldTruncateText" @click.stop="showDescriptionModal" class="text-sn-blue cursor-pointer shrink-0 inline-block text-xs">
+          {{ i18n.t('experiments.card.more') }}
+        </span>
+      </div>
+    </div>
+  </template>
 </template>
 
 <script>
@@ -39,7 +39,7 @@ export default {
   },
   computed: {
     shouldTruncateText() {
-      return this.params.data.description?.length > 80;
+      return this.params.data.description?.length > 60;
     }
   },
   methods: {

From 091c0612e3f672d89803d7a035616a04575a3eb2 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 24 Apr 2024 12:40:29 +0200
Subject: [PATCH 091/115] Small fixes [SCI-10381][SCI-10665][SCI-10666]

---
 .../javascripts/shared/inline_editing.js      |  1 +
 .../vue/shared/access_modal/edit.vue          | 76 +++++++++----------
 .../vue/shared/string_with_ellipsis.vue       | 19 +++--
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js
index 657fe46a4..dd8813a5c 100644
--- a/app/assets/javascripts/shared/inline_editing.js
+++ b/app/assets/javascripts/shared/inline_editing.js
@@ -155,6 +155,7 @@ let inlineEditing = (function() {
       if (inputField(container).attr('disabled')) {
         saveAllEditFields();
         let input = inputField(container);
+        input.val(container.attr('data-original-name'));
         input.attr('disabled', false)
           .removeClass('hidden')
           .focus();
diff --git a/app/javascript/vue/shared/access_modal/edit.vue b/app/javascript/vue/shared/access_modal/edit.vue
index e85655a5c..71ead9411 100644
--- a/app/javascript/vue/shared/access_modal/edit.vue
+++ b/app/javascript/vue/shared/access_modal/edit.vue
@@ -1,44 +1,44 @@
 <template>
   <div>
-    <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">
-      </div>
-      <div>
-        {{ 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>
-        </template>
-        <template v-slot:flyout>
-          <perfect-scrollbar class="flex flex-col max-h-96 max-w-[280px] relative pr-4 gap-y-px">
-            <div v-for="user in this.autoAssignedUsers"
-                :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>
-            </div>
-          </perfect-scrollbar>
-        </template>
-      </GeneralDropdown>
-      <MenuDropdown
-        v-if="params.object.top_level_assignable && params.object.urls.update_access"
-        class="ml-auto"
-        :listItems="rolesFromatted(default_role)"
-        :btnText="this.roles.find((role) => role[0] == default_role)[1]"
-        :position="'right'"
-        :caret="true"
-        @setRole="(...args) => this.changeDefaultRole(...args)"
-        @removeRole="() => this.changeDefaultRole()"
-      ></MenuDropdown>
-      <div class="ml-auto btn btn-light pointer-events-none" v-else>
-        {{ this.roles.find((role) => role[0] == default_role)[1] }}
-        <div class="h-6 w-6"></div>
-      </div>
-    </div>
     <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">
+        </div>
+        <div>
+          {{ 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>
+          </template>
+          <template v-slot:flyout>
+            <perfect-scrollbar class="flex flex-col max-h-96 max-w-[280px] relative pr-4 gap-y-px">
+              <div v-for="user in this.autoAssignedUsers"
+                  :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>
+              </div>
+            </perfect-scrollbar>
+          </template>
+        </GeneralDropdown>
+        <MenuDropdown
+          v-if="params.object.top_level_assignable && params.object.urls.update_access"
+          class="ml-auto"
+          :listItems="rolesFromatted(default_role)"
+          :btnText="this.roles.find((role) => role[0] == default_role)[1]"
+          :position="'right'"
+          :caret="true"
+          @setRole="(...args) => this.changeDefaultRole(...args)"
+          @removeRole="() => this.changeDefaultRole()"
+        ></MenuDropdown>
+        <div class="ml-auto btn btn-light pointer-events-none" v-else>
+          {{ this.roles.find((role) => role[0] == default_role)[1] }}
+          <div class="h-6 w-6"></div>
+        </div>
+      </div>
       <div v-for="userAssignment in manuallyAssignedUsers"
             :key="userAssignment.id"
             class="p-2 flex items-center gap-2">
diff --git a/app/javascript/vue/shared/string_with_ellipsis.vue b/app/javascript/vue/shared/string_with_ellipsis.vue
index b846b30fd..801979ce3 100644
--- a/app/javascript/vue/shared/string_with_ellipsis.vue
+++ b/app/javascript/vue/shared/string_with_ellipsis.vue
@@ -1,11 +1,18 @@
 <template>
 <div :title="text" class="flex items-center">
-  <div class="truncate">
-    {{ text.slice(0, endCharacters * -1) }}
-  </div>
-  <div class="shrink-0">
-    {{ text.slice(text.length - endCharacters) }}
-  </div>
+  <template v-if="text.length <= endCharacters">
+    <div class="shrink-0">
+      {{ text }}
+    </div>
+  </template>
+  <template v-else>
+    <div class="truncate">
+      {{ text.slice(0, endCharacters * -1) }}
+    </div>
+    <div class="shrink-0">
+      {{ text.slice(text.length - endCharacters) }}
+    </div>
+  </template>
 </div>
 </template>
 

From 67ba0c1c85a56925b986b0bf74513df997252a62 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 24 Apr 2024 15:47:25 +0200
Subject: [PATCH 092/115] Disable toolbar state button only for archived
 inventories [SCI-10531]

---
 app/javascript/vue/repository/state_menu.vue     | 5 +++--
 app/views/repositories/_toolbar_buttons.html.erb | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/repository/state_menu.vue b/app/javascript/vue/repository/state_menu.vue
index 7e798ccdb..015a1cf81 100644
--- a/app/javascript/vue/repository/state_menu.vue
+++ b/app/javascript/vue/repository/state_menu.vue
@@ -20,14 +20,15 @@ export default {
   props: {
     viewMode: { type: String, required: true },
     activeUrl: { type: String, required: true },
-    archivedUrl: { type: String, required: true }
+    archivedUrl: { type: String, required: true },
+    disabled: { type: String, default: 'false' }
   },
   beforeDestroy() {
     delete window.initRepositoryStateMenu;
   },
   computed: {
     disabled() {
-      return this.viewMode === 'archived' ? ' disabled' : '';
+      return this.disabled === 'true' ? ' disabled' : '';
     },
     btnText() {
       return I18n.t(`toolbar.${this.viewMode}_state`);
diff --git a/app/views/repositories/_toolbar_buttons.html.erb b/app/views/repositories/_toolbar_buttons.html.erb
index 6324d6887..39408b711 100644
--- a/app/views/repositories/_toolbar_buttons.html.erb
+++ b/app/views/repositories/_toolbar_buttons.html.erb
@@ -58,6 +58,7 @@
     <div id='repositoryStateMenu' data-behaviour="vue">
       <repository-state-menu
         view-mode="<%= view_mode %>"
+        disabled="<%= @repository.archived? %>"
         active-url="<%= repository_url(@repository) %>"
         archived-url="<%= repository_url(@repository, params: { archived: true }) %>">
       </repository-state-menu>

From e806cc9ccac24d8ad6b650df3d08f02da2f3b7d0 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 24 Apr 2024 15:58:42 +0200
Subject: [PATCH 093/115] Fix the style of Okta an MS Entra btns on login page
 [SCI-10668]

---
 app/views/users/shared/_azure_sign_in_links.html.erb | 2 +-
 app/views/users/shared/_links.html.erb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/shared/_azure_sign_in_links.html.erb b/app/views/users/shared/_azure_sign_in_links.html.erb
index 5a2b59d56..d1d28c392 100644
--- a/app/views/users/shared/_azure_sign_in_links.html.erb
+++ b/app/views/users/shared/_azure_sign_in_links.html.erb
@@ -1,7 +1,7 @@
 <% ApplicationSettings.instance.values['azure_ad_apps'].select { |v| v['enable_sign_in'] }.each do |config| %>
   <div class="form-group">
     <%= form_tag user_customazureactivedirectory_omniauth_authorize_path(provider: config['provider_name']), method: :post, class: "azureAdForm" do %>
-      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-azure-ad' %>
+      <%= submit_tag config['sign_in_label'] || t('devise.sessions.new.azure_ad_submit'), class: 'btn btn-primary' %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 85126b0c1..3ad61a52b 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -31,7 +31,7 @@
     <%- if sso_enabled? && okta_enabled? %>
       <div class="okta-sign-in-actions">
         <%= form_tag user_okta_omniauth_authorize_path, method: :post, id: 'oktaForm' do %>
-          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-okta' %>
+          <%= submit_tag t('devise.okta.sign_in_label'), class: 'btn btn-primary' %>
         <% end %>
       </div>
     <% end %>

From 85b5f9260fda0b85fc75274c88c3e4a8d743b913 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 25 Apr 2024 15:01:45 +0200
Subject: [PATCH 094/115] CSS fixes for global search [SCI-10657][SCI-10658]

---
 app/assets/stylesheets/tailwind/inputs.css     |  3 ++-
 app/javascript/vue/global_search/container.vue |  4 ++--
 .../vue/global_search/filters_modal.vue        | 10 +++++-----
 .../vue/global_search/groups/assets.vue        |  7 ++++---
 .../vue/global_search/groups/experiments.vue   |  7 ++++---
 .../vue/global_search/groups/folders.vue       |  7 ++++---
 .../global_search/groups/helpers/list_end.vue  |  2 +-
 .../global_search/groups/label_templates.vue   |  7 ++++---
 .../groups/my_module_protocols.vue             |  7 ++++---
 .../vue/global_search/groups/my_modules.vue    |  7 ++++---
 .../vue/global_search/groups/projects.vue      |  7 ++++---
 .../vue/global_search/groups/protocols.vue     |  7 ++++---
 .../vue/global_search/groups/reports.vue       |  7 ++++---
 .../global_search/groups/repository_rows.vue   |  7 ++++---
 .../vue/global_search/groups/results.vue       |  7 ++++---
 app/javascript/vue/navigation/quick_search.vue | 18 +++++++++---------
 16 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/app/assets/stylesheets/tailwind/inputs.css b/app/assets/stylesheets/tailwind/inputs.css
index 35f4a3609..23a799bf2 100644
--- a/app/assets/stylesheets/tailwind/inputs.css
+++ b/app/assets/stylesheets/tailwind/inputs.css
@@ -40,7 +40,8 @@
     width: 100%;
   }
 
-  .sci-input-container-v2 input:focus {
+  .sci-input-container-v2 input:focus,
+  .sci-input-container-v2 input.active {
     @apply border-sn-science-blue shadow-none;
   }
 
diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index 9bdc434b8..2e9951f29 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -27,7 +27,7 @@
       </div>
       <button class="btn btn-light btn-sm" @click="filterModalOpened = true">
         <i class="sn-icon sn-icon-search-options"></i>
-        {{ i18n.t('search.index.more_search_options') }}
+        <span class="tw-hidden lg:inline">{{ i18n.t('search.index.more_search_options') }}</span>
         <span
           v-if="activeFilters.length > 0"
           class="absolute -right-1 -top-1 rounded-full bg-sn-science-blue text-white flex items-center justify-center w-4 h-4 text-[9px]"
@@ -39,7 +39,7 @@
         <div class="h-4 w-[1px] bg-sn-grey"></div>
         <button class="btn btn-light btn-sm" @click="resetFilters">
           <i class="sn-icon sn-icon-close"></i>
-          {{ i18n.t('search.index.clear_filters') }}
+          <span class="tw-hidden lg:inline">{{ i18n.t('search.index.clear_filters') }}</span>
         </button>
       </template>
     </div>
diff --git a/app/javascript/vue/global_search/filters_modal.vue b/app/javascript/vue/global_search/filters_modal.vue
index 027079e53..454ceb2aa 100644
--- a/app/javascript/vue/global_search/filters_modal.vue
+++ b/app/javascript/vue/global_search/filters_modal.vue
@@ -3,18 +3,18 @@
     <div class="modal-dialog" role="document">
       <form @submit.prevent="submit">
         <div class="modal-content !pb-2.5">
-          <div class="modal-header">
+          <div class="modal-header flex-wrap">
             <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">
               {{ i18n.t('search.filters.title') }}
             </h4>
-          </div>
-          <div class="modal-body !pb-0">
-            <p class="text-sn-dark-grey">
+            <div class="basis-full">
               {{ i18n.t('search.filters.sub_title') }}
-            </p>
+            </div>
+          </div>
+          <div class="modal-body !pb-0 !pt-2.5">
             <Filters
               :teams-url="teamsUrl"
               :users-url="usersUrl"
diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index 32e9a79a7..78bb0feb9 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-files"></i>
           {{ i18n.t('search.index.files') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -21,12 +21,13 @@
                         :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'AssetsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
    <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index c0546ec13..17dd99acf 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-experiment"></i>
           {{ i18n.t('search.index.experiments') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -19,12 +19,13 @@
           <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ExperimentsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index b62329176..3bcc9bb72 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-folder"></i>
           {{ i18n.t('search.index.folders') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -19,12 +19,13 @@
                         :url="row.attributes.parent_folder?.url" :value="labelName(row.attributes.parent_folder)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'FoldersComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/helpers/list_end.vue b/app/javascript/vue/global_search/groups/helpers/list_end.vue
index 88a9e53f8..262d9c06b 100644
--- a/app/javascript/vue/global_search/groups/helpers/list_end.vue
+++ b/app/javascript/vue/global_search/groups/helpers/list_end.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col gap-6 mt-6">
     <div class="flex items-center mb-6">
-      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto">
+      <p class="text-sm text-sn-blue flex items-center gap-3 m-auto px-4 py-2 rounded bg-sn-super-light-blue">
         <span class="sn-icon sn-icon-flag"></span>
         <span>{{ i18n.t('search.index.reached_end') }}</span>
       </p>
diff --git a/app/javascript/vue/global_search/groups/label_templates.vue b/app/javascript/vue/global_search/groups/label_templates.vue
index 9b3ce17c0..39070f8eb 100644
--- a/app/javascript/vue/global_search/groups/label_templates.vue
+++ b/app/javascript/vue/global_search/groups/label_templates.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-label-templates"></i>
           {{ i18n.t('search.index.label_templates') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -20,12 +20,13 @@
           <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'LabelTemplatesComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index 2bbe8aff9..fce68f048 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -5,7 +5,7 @@
       <h2 class="flex items-center gap-2 mt-0 mb-4">
         <i class="sn-icon sn-icon-protocols-templates"></i>
         {{ i18n.t('search.index.task_protocols') }}
-        [{{ total }}]
+        <span class="text-base" >[{{ total }}]</span>
       </h2>
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
@@ -21,12 +21,13 @@
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModuleProtocolsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index f62f690e8..1d2673fb5 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -5,7 +5,7 @@
       <h2 class="flex items-center gap-2 mt-0 mb-4">
         <i class="sn-icon sn-icon-task"></i>
         {{ i18n.t('search.index.tasks') }}
-        [{{ total }}]
+        <span class="text-base" >[{{ total }}]</span>
       </h2>
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
@@ -20,12 +20,13 @@
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'MyModulesComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 2f08e645b..20cf216f4 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-projects"></i>
           {{ i18n.t('search.index.projects') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -20,12 +20,13 @@
                         :url="row.attributes.folder?.url" :value="labelName(row.attributes.folder)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProjectsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/protocols.vue b/app/javascript/vue/global_search/groups/protocols.vue
index fb3e06b52..e269d8a9c 100644
--- a/app/javascript/vue/global_search/groups/protocols.vue
+++ b/app/javascript/vue/global_search/groups/protocols.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-protocols-templates"></i>
           {{ i18n.t('search.index.protocol_templates') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -20,12 +20,13 @@
           <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ProtocolsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index 3b1186c11..fba043808 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-reports"></i>
           {{ i18n.t('search.index.reports') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -21,12 +21,13 @@
           <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ReportsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index 20555fe52..f3b8d25fe 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-inventory"></i>
           {{ i18n.t('search.index.inventory_items') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -20,12 +20,13 @@
           <CellTemplate :label="i18n.t('search.index.repository')" :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'RepositoryRowsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult"  />
   </div>
 </template>
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 11029c48a..9a21ff8fb 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -5,7 +5,7 @@
         <h2 class="flex items-center gap-2 mt-0 mb-4">
           <i class="sn-icon sn-icon-results"></i>
           {{ i18n.t('search.index.task_results') }}
-          [{{ total }}]
+          <span class="text-base" >[{{ total }}]</span>
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
@@ -20,12 +20,13 @@
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
         </div>
       </div>
-      <div v-if="viewAll" class="mt-4">
+      <div v-if="viewAll">
+        <hr class="w-full mb-4 mt-0">
         <button class="btn btn-light" @click="$emit('selectGroup', 'ResultsComponent')">View all</button>
       </div>
     </template>
     <Loader v-if="loading" :loaderRows="loaderRows" />
-    <ListEnd v-if="reachedEnd" />
+    <ListEnd v-if="reachedEnd && preparedResults.length > 0" />
     <NoSearchResult v-else-if="showNoSearchResult" />
   </div>
 </template>
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 1c8d7895f..d5e57f026 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -1,8 +1,9 @@
 <template>
-  <GeneralDropdown ref="container" :canOpen="canOpen" :fieldOnlyOpen="true" @close="filtersOpened = false">
+  <GeneralDropdown ref="container" :canOpen="canOpen" :fieldOnlyOpen="true" @close="filtersOpened = false; flyoutOpened = false" @open="flyoutOpened = true">
     <template v-slot:field>
       <div class="sci--navigation--top-menu-search left-icon sci-input-container-v2" :class="{'disabled' : !currentTeam}" :title="i18n.t('nav.search')">
         <input ref="searchField" type="text" class="!pr-20" v-model="searchQuery" @keydown="focusHistoryItem"
+               :class="{'active': flyoutOpened}"
                @focus="openHistory" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
         <i class="sn-icon sn-icon-search"></i>
         <div v-if="this.searchQuery.length > 1" class="flex items-center gap-1 absolute right-2 top-1.5">
@@ -38,7 +39,7 @@
           {{ query }}
         </div>
       </div>
-      <div v-else class="max-w-[600px]">
+      <div v-else class="w-[600px]">
         <div class="flex items-center gap-2">
           <button class="btn btn-secondary btn-xs"
                   :class="{'active': quickFilter === 'experiments'}"
@@ -55,11 +56,6 @@
                   @click="setQuickFilter('results')">
             {{ i18n.t('search.quick_search.results') }}
           </button>
-          <button class="btn btn-secondary btn-xs"
-                  :class="{'active': quickFilter === 'repository_rows'}"
-                  @click="setQuickFilter('repository_rows')">
-            {{ i18n.t('search.quick_search.inventory_items') }}
-          </button>
         </div>
         <hr class="my-2">
         <a v-if="!loading" v-for="(result, i) in results" :key="i"
@@ -75,7 +71,10 @@
               {{ result.attributes.updated_at }}
             </div>
           </div>
-          <div class="text-sn-grey text-xs flex items-center gap-1 pl-8">
+          <div
+            class="text-sn-grey text-xs flex items-center gap-1 pl-8"
+            :class="{'opacity-0': result.type.includes('label_templates')}"
+          >
             <div v-for="(breadcrumb, i) in getBreadcrumb(result.attributes)" :key="i"
                 class="flex items-center gap-1"
             >
@@ -174,7 +173,8 @@ export default {
       results: [],
       loading: false,
       filtersOpened: false,
-      focusedHistoryItem: null
+      focusedHistoryItem: null,
+      flyoutOpened: false
     };
   },
   mounted() {

From f9a060e5dd7045b582c72e4373cd533bcc987ceb Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 25 Apr 2024 17:04:05 +0200
Subject: [PATCH 095/115] Fix typo in unlink connected accounts modal
 [SCI-10671]

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6c415f110..147ed9d07 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2905,7 +2905,7 @@ en:
             unlink_button: "Unlink"
             unlink_modal:
               title: "Unlink Microsoft Entra ID account?"
-              description_1: "Are you sure you would like unlink Microsoft Entra ID and SciNote accounts?"
+              description_1: "Are you sure you would like to unlink Microsoft Entra ID and SciNote accounts?"
               submit_button: "Submit"
           okta:
             title: "Your Okta Account"
@@ -2914,7 +2914,7 @@ en:
             unlink_button: "Unlink"
             unlink_modal:
               title: "Unlink Okta account?"
-              description_1: "Are you sure you would like unlink Okta and SciNote accounts?"
+              description_1: "Are you sure you would like to unlink Okta and SciNote accounts?"
               submit_button: "Submit"
           openid_connect:
             title: "Your OpenID Connect Account"
@@ -2923,7 +2923,7 @@ en:
             unlink_button: "Unlink"
             unlink_modal:
               title: "Unlink OpenID Connect account?"
-              description_1: "Are you sure you would like unlink OpenID Connect and SciNote accounts?"
+              description_1: "Are you sure you would like unlink to OpenID Connect and SciNote accounts?"
               submit_button: "Submit"
           saml:
             title: "Your SAML Account"
@@ -2932,7 +2932,7 @@ en:
             unlink_button: "Unlink"
             unlink_modal:
               title: "Unlink SAML account?"
-              description_1: "Are you sure you would like unlink SAML and SciNote accounts?"
+              description_1: "Are you sure you would like to unlink SAML and SciNote accounts?"
               submit_button: "Submit"
           errors:
             not_found: "You have no Connected accounts for this provider"

From 3c4184c73e84692b50cfd5df8d57161f1ac600ac Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 18 Apr 2024 15:45:34 +0200
Subject: [PATCH 096/115] Implement global search backend [SCI-10573]

---
 .../dashboard/quick_start_controller.rb       |   8 +-
 app/controllers/results_controller.rb         |   4 +-
 app/controllers/search_controller.rb          | 305 ++++++------------
 app/models/asset.rb                           |  84 +----
 app/models/checklist.rb                       |  22 --
 app/models/comment.rb                         |  39 ---
 app/models/concerns/searchable_model.rb       | 108 ++++++-
 app/models/experiment.rb                      |  18 +-
 app/models/label_template.rb                  |  17 +-
 app/models/my_module.rb                       |  22 +-
 app/models/project.rb                         |  16 +-
 app/models/project_folder.rb                  |  21 +-
 app/models/protocol.rb                        |  46 ++-
 app/models/report.rb                          |  25 +-
 app/models/repository.rb                      |  30 --
 app/models/repository_row.rb                  |  30 +-
 app/models/result.rb                          |  35 +-
 app/models/step.rb                            |  27 +-
 app/models/table.rb                           |  76 -----
 app/models/tag.rb                             |  22 --
 .../label_template_serializer.rb              |   2 +-
 21 files changed, 308 insertions(+), 649 deletions(-)

diff --git a/app/controllers/dashboard/quick_start_controller.rb b/app/controllers/dashboard/quick_start_controller.rb
index 1f05571c6..1ab24d631 100644
--- a/app/controllers/dashboard/quick_start_controller.rb
+++ b/app/controllers/dashboard/quick_start_controller.rb
@@ -21,7 +21,9 @@ module Dashboard
 
     def project_filter
       projects = Project.readable_by_user(current_user)
-                        .search(current_user, false, params[:query], 1, current_team)
+                        .search(current_user, false, params[:query], current_team)
+                        .page(1)
+                        .per(Constants::SEARCH_LIMIT)
                         .select(:id, :name)
       projects = projects.map { |i| { value: i.id, label: escape_input(i.name) } }
       if (projects.map { |i| i[:label] }.exclude? params[:query]) && params[:query].present?
@@ -36,7 +38,9 @@ module Dashboard
       elsif @project
         experiments = @project.experiments
                               .managable_by_user(current_user)
-                              .search(current_user, false, params[:query], 1, current_team)
+                              .search(current_user, false, params[:query], current_team)
+                              .page(1)
+                              .per(Constants::SEARCH_LIMIT)
                               .select(:id, :name)
         experiments = experiments.map { |i| { value: i.id, label: escape_input(i.name) } }
         if (experiments.map { |i| i[:label] }.exclude? params[:query]) &&
diff --git a/app/controllers/results_controller.rb b/app/controllers/results_controller.rb
index 645d2acaa..f0f8f829c 100644
--- a/app/controllers/results_controller.rb
+++ b/app/controllers/results_controller.rb
@@ -165,7 +165,9 @@ class ResultsController < ApplicationController
 
   def apply_filters!
     if params[:query].present?
-      @results = @results.search(current_user, params[:view_mode] == 'archived', params[:query], params[:page] || 1)
+      @results = @results.search(current_user, params[:view_mode] == 'archived', params[:query])
+                         .page(params[:page] || 1)
+                         .per(Constants::SEARCH_LIMIT)
     end
 
     @results = @results.where('results.created_at >= ?', params[:created_at_from]) if params[:created_at_from]
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 8038e033f..1f61b2a6c 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -117,7 +117,6 @@ class SearchController < ApplicationController
                  }
           return
         when 'protocols'
-          @protocol_search_count = fetch_cached_count(Protocol)
           search_protocols
           results = if params[:preview] == 'true'
                       @protocol_results.take(4)
@@ -184,38 +183,6 @@ class SearchController < ApplicationController
                  }
           return
         end
-
-        #@search_id = params[:search_id] ? params[:search_id] : generate_search_id
-        #
-        #count_search_results
-        #
-        #search_projects if @search_category == :projects
-        #search_project_folders if @search_category == :project_folders
-        #search_experiments if @search_category == :experiments
-        #search_modules if @search_category == :modules
-        #search_results if @search_category == :results
-        #search_tags if @search_category == :tags
-        #search_reports if @search_category == :reports
-        #search_protocols if @search_category == :protocols
-        #search_steps if @search_category == :steps
-        #search_checklists if @search_category == :checklists
-        #if @search_category == :repositories && params[:repository]
-        #  search_repository
-        #end
-        #search_assets if @search_category == :assets
-        #search_tables if @search_category == :tables
-        #search_comments if @search_category == :comments
-
-        #@search_pages = (@search_count.to_f / Constants::SEARCH_LIMIT.to_f).ceil
-        #@start_page = @search_page - 2
-        #@start_page = 1 if @start_page < 1
-        #@end_page = @start_page + 4
-
-        #if @end_page > @search_pages
-        #  @end_page = @search_pages
-        #  @start_page = @end_page - 4
-        #  @start_page = 1 if @start_page < 1
-        #end
       end
     end
   end
@@ -252,46 +219,35 @@ class SearchController < ApplicationController
 
   def load_vars
     query = (params.fetch(:q) { '' }).strip
-    @search_category = params[:category] || ''
-    @search_category = @search_category.to_sym
-    @search_page = params[:page].to_i || 1
-    @search_case = params[:match_case] == 'true'
-    @search_whole_word = params[:whole_word] == 'true'
-    @search_whole_phrase = params[:whole_phrase] == 'true'
+    @filters = params[:filters]
+    @include_archived = if @filters.present?
+                          @filters[:include_archived] == 'true'
+                        else
+                          true
+                        end
+    @teams = if @filters.present?
+               @filters[:teams]&.values || current_user.teams
+             else
+               current_user.teams
+             end
     @display_query = query
 
-    if @search_whole_phrase || query.count(' ').zero?
-      if query.length < Constants::NAME_MIN_LENGTH
-        flash[:error] = t('general.query.length_too_short',
-                          min_length: Constants::NAME_MIN_LENGTH)
-        redirect_back(fallback_location: root_path)
-      elsif query.length > Constants::TEXT_MAX_LENGTH
-        flash[:error] = t('general.query.length_too_long',
-                          max_length: Constants::TEXT_MAX_LENGTH)
-        redirect_back(fallback_location: root_path)
-      else
-        @search_query = query
-      end
-    else
-      # splits the search query to validate all entries
-      splited_query = query.split
-      @search_query = ''
-      splited_query.each_with_index do |w, i|
-        if w.length >= Constants::NAME_MIN_LENGTH &&
-           w.length <= Constants::TEXT_MAX_LENGTH
-          @search_query += "#{splited_query[i]} "
-        end
-      end
-      if @search_query.blank?
-        flash[:error] = t('general.query.wrong_query',
-                          min_length: Constants::NAME_MIN_LENGTH,
-                          max_length: Constants::TEXT_MAX_LENGTH)
-        redirect_back(fallback_location: root_path)
-      else
-        @search_query.strip!
+    splited_query = query.split
+    @search_query = ''
+    splited_query.each_with_index do |w, i|
+      if w.length >= Constants::NAME_MIN_LENGTH &&
+         w.length <= Constants::TEXT_MAX_LENGTH
+        @search_query += "#{splited_query[i]} "
       end
     end
-    @search_page = 1 if @search_page < 1
+    if @search_query.blank?
+      flash[:error] = t('general.query.wrong_query',
+                        min_length: Constants::NAME_MIN_LENGTH,
+                        max_length: Constants::TEXT_MAX_LENGTH)
+      redirect_back(fallback_location: root_path)
+    else
+      @search_query.strip!
+    end
   end
 
   protected
@@ -300,109 +256,27 @@ class SearchController < ApplicationController
     SecureRandom.urlsafe_base64(32)
   end
 
-  def search_by_name(model)
+  def search_by_name(model, options={})
+    records = model.search(current_user,
+                           @include_archived,
+                           @search_query,
+                           nil,
+                           teams: @teams,
+                           users: @users,
+                           options: options)
+
+    records = filter_records(records, model) if @filters.present?
+    sort_records(records)
+  end
+
+  def count_by_name(model, options = {})
     model.search(current_user,
-                 true,
+                 @include_archived,
                  @search_query,
-                 @search_page,
                  nil,
-                 match_case: @search_case,
-                 whole_word: @search_whole_word,
-                 whole_phrase: @search_whole_phrase)
-         .order(created_at: :desc)
-  end
-
-  def count_by_name(model)
-    model.search(current_user,
-                 true,
-                 @search_query,
-                 Constants::SEARCH_NO_LIMIT,
-                 nil,
-                 match_case: @search_case,
-                 whole_word: @search_whole_word,
-                 whole_phrase: @search_whole_phrase).size
-  end
-
-  def count_by_repository
-    @repository_search_count =
-      Rails.cache.fetch("#{@search_id}/repository_search_count",
-                        expires_in: 5.minutes) do
-        search_count = {}
-        search_results = Repository.search(current_user,
-                                           @search_query,
-                                           Constants::SEARCH_NO_LIMIT,
-                                           nil,
-                                           match_case: @search_case,
-                                           whole_word: @search_whole_word,
-                                           whole_phrase: @search_whole_phrase)
-
-        current_user.teams.includes(:repositories).each do |team|
-          team_results = {}
-          team_results[:team] = team
-          team_results[:count] = 0
-          team_results[:repositories] = {}
-          Repository.accessible_by_teams(team).each do |repository|
-            repository_results = {}
-            repository_results[:id] = repository.id
-            repository_results[:repository] = repository
-            repository_results[:count] = 0
-            search_results.each do |result|
-              repository_results[:count] += result.counter if repository.id == result.id
-            end
-            team_results[:repositories][repository.name] = repository_results
-            team_results[:count] += repository_results[:count]
-          end
-          search_count[team.name] = team_results
-        end
-        search_count
-      end
-
-    count_total = 0
-    @repository_search_count.each_value do |team_results|
-      count_total += team_results[:count]
-    end
-    count_total
-  end
-
-  def current_repository_search_count
-    @repository_search_count.each_value do |counter|
-      res = counter[:repositories].values.detect do |rep|
-        rep[:id] == @repository.id
-      end
-      return res[:count] if res && res[:count]
-    end
-  end
-
-  def count_search_results
-    @project_search_count = fetch_cached_count Project
-    @project_folder_search_count = fetch_cached_count ProjectFolder
-    @experiment_search_count = fetch_cached_count Experiment
-    @module_search_count = fetch_cached_count MyModule
-    @result_search_count = fetch_cached_count Result
-    @tag_search_count = fetch_cached_count Tag
-    @report_search_count = fetch_cached_count Report
-    @protocol_search_count = fetch_cached_count Protocol
-    @step_search_count = fetch_cached_count Step
-    @checklist_search_count = fetch_cached_count Checklist
-    @repository_search_count_total = count_by_repository
-    @asset_search_count = fetch_cached_count Asset
-    @table_search_count = fetch_cached_count Table
-    @comment_search_count = fetch_cached_count Comment
-
-    @search_results_count = @project_search_count
-    @search_results_count += @project_folder_search_count
-    @search_results_count += @experiment_search_count
-    @search_results_count += @module_search_count
-    @search_results_count += @result_search_count
-    @search_results_count += @tag_search_count
-    @search_results_count += @report_search_count
-    @search_results_count += @protocol_search_count
-    @search_results_count += @step_search_count
-    @search_results_count += @checklist_search_count
-    @search_results_count += @repository_search_count_total
-    @search_results_count += @asset_search_count
-    @search_results_count += @table_search_count
-    @search_results_count += @comment_search_count
+                 teams: @teams,
+                 users: @users,
+                 options: options).size
   end
 
   def fetch_cached_count(type)
@@ -410,7 +284,7 @@ class SearchController < ApplicationController
     Rails.cache.fetch(
       "#{@search_id}/#{type.name.underscore}_search_count", expires_in: exp
     ) do
-      count_by_name type
+      count_by_name(type)
     end
   end
 
@@ -439,8 +313,8 @@ class SearchController < ApplicationController
   end
 
   def search_module_protocols
-    @module_protocol_results = search_by_name(Protocol)
-    @search_count = @module_protocol_results.joins(:my_module).count
+    @module_protocol_results = search_by_name(Protocol, { in_repository: false })
+    @search_count = @module_protocol_results.count
   end
 
   def search_results
@@ -449,12 +323,6 @@ class SearchController < ApplicationController
     @search_count = @result_search_count
   end
 
-  def search_tags
-    @tag_results = []
-    @tag_results = search_by_name(Tag) if @tag_search_count.positive?
-    @search_count = @tag_search_count
-  end
-
   def search_reports
     @report_results = Report.none
     @report_results = search_by_name(Report) if @report_search_count.positive?
@@ -462,9 +330,8 @@ class SearchController < ApplicationController
   end
 
   def search_protocols
-    @protocol_results = Protocol.none
-    @protocol_results = search_by_name(Protocol) if @protocol_search_count.positive?
-    @search_count = @protocol_search_count
+    @protocol_results = search_by_name(Protocol, { in_repository: true })
+    @search_count = @protocol_results.count
   end
 
   def search_label_templates
@@ -479,29 +346,6 @@ class SearchController < ApplicationController
     @search_count = @step_search_count
   end
 
-  def search_checklists
-    @checklist_results = []
-    @checklist_results = search_by_name(Checklist) if @checklist_search_count.positive?
-    @search_count = @checklist_search_count
-  end
-
-  def search_repository
-    @repository = Repository.find_by(id: params[:repository])
-    unless current_user.teams.include?(@repository.team) || @repository.private_shared_with?(current_user.teams)
-      render_403
-    end
-    @repository_results = []
-    if @repository_search_count_total.positive?
-      @repository_results =
-        Repository.search(current_user, @search_query, @search_page,
-                          @repository,
-                          match_case: @search_case,
-                          whole_word: @search_whole_word,
-                          whole_phrase: @search_whole_phrase)
-    end
-    @search_count = current_repository_search_count
-  end
-
   def search_repository_rows
     @repository_row_results = RepositoryRow.none
     @repository_row_results = search_by_name(RepositoryRow) if @repository_row_search_count.positive?
@@ -514,15 +358,52 @@ class SearchController < ApplicationController
     @search_count = @asset_search_count
   end
 
-  def search_tables
-    @table_results = []
-    @table_results = search_by_name(Table) if @table_search_count.positive?
-    @search_count = @table_search_count
+  def filter_records(records, model)
+    model_name = model.model_name.collection
+    if @filters[:created_at].present?
+      if @filters[:created_at][:on].present?
+        from_date = Time.zone.parse(@filters[:created_at][:on]).beginning_of_day.utc
+        to_date = Time.zone.parse(@filters[:created_at][:on]).end_of_day.utc
+      else
+        from_date = Time.zone.parse(@filters[:created_at][:from])
+        to_date = Time.zone.parse(@filters[:created_at][:to])
+      end
+
+      records = records.where("#{model_name}.created_at >= ?", from_date)
+      records = records.where("#{model_name}.created_at <= ?", to_date)
+    end
+
+    if @filters[:updated_at].present?
+      if @filters[:updated_at][:on].present?
+        from_date = Time.zone.parse(@filters[:updated_at][:on]).beginning_of_day.utc
+        to_date = Time.zone.parse(@filters[:updated_at][:on]).end_of_day.utc
+      else
+        from_date = Time.zone.parse(@filters[:updated_at][:from])
+        to_date = Time.zone.parse(@filters[:updated_at][:to])
+      end
+
+      records = records.where("#{model_name}.updated_at >= ?", from_date)
+      records = records.where("#{model_name}.updated_at <= ?", to_date)
+    end
+
+    if @filters[:users].present?
+      records = records.joins("INNER JOIN activities ON #{model_name}.id = activities.subject_id
+                              AND activities.subject_type= '#{model.name}'")
+                       .where('activities.owner_id': @filters[:users]&.values)
+    end
+    records
   end
 
-  def search_comments
-    @comment_results = []
-    @comment_results = search_by_name(Comment) if @comment_search_count.positive?
-    @search_count = @comment_search_count
+  def sort_records(records)
+    case params[:sort]
+    when 'atoz'
+      records.order(name: :asc)
+    when 'ztoa'
+      records.order(name: :desc)
+    when 'created_asc'
+      records.order(created_at: :asc)
+    else
+      records.order(created_at: :desc)
+    end
   end
 end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 8e641c816..327959fbe 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -11,6 +11,7 @@ class Asset < ApplicationRecord
   require 'tempfile'
   # Lock duration set to 30 minutes
   LOCK_DURATION = 60 * 30
+  SEARCHABLE_ATTRIBUTES = ['active_storage_blobs.filename', 'asset_text_data.data_vector'].freeze
 
   enum view_mode: { thumbnail: 0, list: 1, inline: 2 }
 
@@ -58,101 +59,36 @@ class Asset < ApplicationRecord
     user,
     include_archived,
     query = nil,
-    page = 1,
-    _current_team = nil,
+    current_team = nil,
     options = {}
   )
 
-    teams = user.teams.select(:id)
+    teams = options[:teams] || current_team || user.teams.select(:id)
 
     assets_in_steps = Asset.joins(:step).where(
       'steps.id IN (?)',
-      Step.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
+      Step.search(user, include_archived, nil, teams)
           .select(:id)
     ).pluck(:id)
 
     assets_in_results = Asset.joins(:result).where(
       'results.id IN (?)',
-      Result.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-            .select(:id)
+      Result.search(user, include_archived, nil, teams).select(:id)
     ).pluck(:id)
 
     assets_in_inventories = Asset.joins(
       repository_cell: { repository_column: :repository }
-    ).where('repositories.team_id IN (?)', teams).pluck(:id)
+    ).where(repositories: { team_id: teams }).pluck(:id)
 
     assets =
       Asset.distinct
            .where('assets.id IN (?) OR assets.id IN (?) OR assets.id IN (?)',
                   assets_in_steps, assets_in_results, assets_in_inventories)
 
-    new_query = Asset.left_outer_joins(:asset_text_datum)
-                     .joins(file_attachment: :blob)
-                     .from(assets, 'assets')
-
-    a_query = s_query = ''
-
-    if options[:whole_word].to_s == 'true' ||
-       options[:whole_phrase].to_s == 'true'
-      like = options[:match_case].to_s == 'true' ? '~' : '~*'
-      s_query = query.gsub(/[!()&|:]/, ' ')
-                     .strip
-                     .split(/\s+/)
-                     .map { |t| t + ':*' }
-      if options[:whole_word].to_s == 'true'
-        a_query = query.split
-                       .map { |a| Regexp.escape(a) }
-                       .join('|')
-        s_query = s_query.join('|')
-      else
-        a_query = Regexp.escape(query)
-        s_query = s_query.join('&')
-      end
-      a_query = '\\y(' + a_query + ')\\y'
-      s_query = s_query.tr('\'', '"')
-
-      new_query = new_query.where(
-        "(active_storage_blobs.filename #{like} ? " \
-        "OR asset_text_data.data_vector @@ plainto_tsquery(?))",
-        a_query,
-        s_query
-      )
-    else
-      like = options[:match_case].to_s == 'true' ? 'LIKE' : 'ILIKE'
-      a_query = query.split.map { |a| "%#{sanitize_sql_like(a)}%" }
-
-      # Trim whitespace and replace it with OR character. Make prefixed
-      # wildcard search term and escape special characters.
-      # For example, search term 'demo project' is transformed to
-      # 'demo:*|project:*' which makes word inclusive search with postfix
-      # wildcard.
-      s_query = query.gsub(/[!()&|:]/, ' ')
-                     .strip
-                     .split(/\s+/)
-                     .map { |t| t + ':*' }
-                     .join('|')
-                     .tr('\'', '"')
-      new_query = new_query.where(
-        "(active_storage_blobs.filename #{like} ANY (array[?]) " \
-        "OR asset_text_data.data_vector @@ plainto_tsquery(?))",
-        a_query,
-        s_query
-      )
-    end
-
-    # Show all results if needed
-    if page != Constants::SEARCH_NO_LIMIT
-      new_query = new_query.select('assets.*, asset_text_data.data AS data')
-                           .limit(Constants::SEARCH_LIMIT)
-                           .offset((page - 1) * Constants::SEARCH_LIMIT)
-      Asset.select(
-        "assets_search.*, " \
-        "ts_headline(assets_search.data, plainto_tsquery('#{sanitize_sql_for_conditions(s_query)}'), " \
-        "'StartSel=<mark>, StopSel=</mark>') AS headline"
-      ).from(new_query, 'assets_search')
-    else
-      new_query
-    end
+    Asset.left_outer_joins(:asset_text_datum)
+         .joins(file_attachment: :blob)
+         .from(assets, 'assets')
+         .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
   end
 
   def blob
diff --git a/app/models/checklist.rb b/app/models/checklist.rb
index e63015f82..15580506f 100644
--- a/app/models/checklist.rb
+++ b/app/models/checklist.rb
@@ -31,28 +31,6 @@ class Checklist < ApplicationRecord
 
   scope :asc, -> { order('checklists.created_at ASC') }
 
-  def self.search(user,
-                  include_archived,
-                  query = nil,
-                  page = 1,
-                  _current_team = nil,
-                  options = {})
-    step_ids = Step.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                   .pluck(:id)
-
-    new_query = Checklist.distinct
-                         .where(checklists: { step_id: step_ids })
-                         .left_outer_joins(:checklist_items)
-                         .where_attributes_like(['checklists.name', 'checklist_items.text'], query, options)
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
-  end
-
   def duplicate(step, user, position = nil)
     ActiveRecord::Base.transaction do
       new_checklist = step.checklists.create!(
diff --git a/app/models/comment.rb b/app/models/comment.rb
index e31a5b04f..889c71291 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -12,45 +12,6 @@ class Comment < ApplicationRecord
 
   scope :unseen_by, ->(user) { where('? = ANY (unseen_by)', user.id) }
 
-  def self.search(
-    user,
-    include_archived,
-    query = nil,
-    page = 1,
-    _current_team = nil,
-    options = {}
-  )
-    project_ids = Project.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                         .pluck(:id)
-    my_module_ids = MyModule.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                            .pluck(:id)
-    step_ids = Step.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                   .pluck(:id)
-    result_ids = Result.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                       .pluck(:id)
-
-    new_query = Comment.distinct
-                       .joins(:user)
-                       .where(
-                         '(comments.associated_id IN (?) AND comments.type = ?) OR ' \
-                         '(comments.associated_id IN (?) AND comments.type = ?) OR ' \
-                         '(comments.associated_id IN (?) AND comments.type = ?) OR ' \
-                         '(comments.associated_id IN (?) AND comments.type = ?)',
-                         project_ids, 'ProjectComment',
-                         my_module_ids, 'TaskComment',
-                         step_ids, 'StepComment',
-                         result_ids, 'ResultComment'
-                       )
-                       .where_attributes_like(['message', 'users.full_name'], query, options)
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
-  end
-
   def self.mark_as_seen_by(user, commentable)
     # rubocop:disable Rails/SkipsModelValidations
     all.where('? = ANY (unseen_by)', user.id).update_all("unseen_by = array_remove(unseen_by, #{user.id.to_i}::bigint)")
diff --git a/app/models/concerns/searchable_model.rb b/app/models/concerns/searchable_model.rb
index f61c7b9d2..45a93a954 100644
--- a/app/models/concerns/searchable_model.rb
+++ b/app/models/concerns/searchable_model.rb
@@ -10,18 +10,7 @@ module SearchableModel
     scope :where_attributes_like, lambda { |attributes, query, options = {}|
       return unless query
 
-      attrs = []
-      if attributes.blank?
-        # Do nothing in this case
-      elsif attributes.is_a? Symbol
-        attrs = [attributes.to_s]
-      elsif attributes.is_a? String
-        attrs = [attributes]
-      elsif attributes.is_a? Array
-        attrs = attributes.collect(&:to_s)
-      else
-        raise ArgumentError, ':attributes must be an array, symbol or string'
-      end
+      attrs = convert_input(attributes)
 
       if options[:whole_word].to_s == 'true' ||
          options[:whole_phrase].to_s == 'true' ||
@@ -109,5 +98,100 @@ module SearchableModel
         end
       end
     }
+
+    scope :where_attributes_like_boolean, lambda { |attributes, query, options = {}|
+      return unless query
+
+      attrs = convert_input(attributes)
+      where_array = []
+      value_array = {}
+      current_phrase = ''
+      exact_match = false
+      negate = false
+      index = 0
+
+      query.split.each do |phrase|
+        phrase = phrase.strip
+        if phrase.start_with?('"') && phrase.ends_with?('"')
+          create_query(attrs, index, negate, where_array, value_array, phrase[1..-2], true)
+          negate = false
+        elsif phrase.start_with?('"')
+          exact_match = true
+          current_phrase = phrase[1..]
+        elsif exact_match && phrase.ends_with?('"')
+          exact_match = false
+          create_query(attrs, index, negate, where_array, value_array, "#{current_phrase} #{phrase[0..-2]}", true)
+          current_phrase = ''
+          negate = false
+        elsif exact_match
+          current_phrase = "#{current_phrase} #{phrase}"
+        elsif phrase.casecmp('and').zero?
+          next
+        elsif phrase.casecmp('not').zero?
+          negate = true
+        elsif phrase.casecmp('or').zero?
+          where_array[-1] = "#{where_array.last[0..-5]} OR "
+        else
+          create_query(attrs, index, negate, where_array, value_array, "%#{phrase}%")
+          negate = false
+        end
+        index += 1
+      end
+
+      if current_phrase.present?
+        current_phrase = current_phrase[0..-2] if current_phrase.ends_with?('"')
+        create_query(attrs, index, negate, where_array, value_array, current_phrase, true)
+      end
+
+      where(where_array.join[0..-5], value_array)
+    }
+
+    def self.convert_input(attributes)
+      attrs = []
+      if attributes.blank?
+        # Do nothing in this case
+      elsif attributes.is_a? Symbol
+        attrs = [attributes.to_s]
+      elsif attributes.is_a? String
+        attrs = [attributes]
+      elsif attributes.is_a? Array
+        attrs = attributes.collect(&:to_s)
+      else
+        raise ArgumentError, ':attributes must be an array, symbol or string'
+      end
+
+      attrs
+    end
+
+    def self.create_query(attrs, index, negate, where_array, value_array, phrase, exact_match=false)
+      like = exact_match ? '~' : 'ILIKE'
+      phrase = "\\m#{phrase}\\M" if exact_match
+
+      where_clause = (attrs.map.with_index do |a, i|
+        i = (index * attrs.count) + i
+        if %w(repository_rows.id repository_number_values.data).include?(a)
+          "#{a} IS NOT NULL AND (((#{a})::text) #{like} :t#{i}) OR "
+        elsif defined?(model::PREFIXED_ID_SQL) && a == model::PREFIXED_ID_SQL
+          "#{a} IS NOT NULL AND (#{a} #{like} :t#{i}) OR "
+        elsif a == 'asset_text_data.data_vector'
+          "asset_text_data.data_vector @@ plainto_tsquery(:t#{i})) OR"
+        else
+          "#{a} IS NOT NULL AND ((trim_html_tags(#{a})) #{like} :t#{i}) OR "
+        end
+      end).join[0..-5]
+
+      where_array << if negate
+                       "NOT (#{where_clause}) AND "
+                     else
+                       "(#{where_clause}) AND "
+                     end
+
+      value_array.merge!(
+        (attrs.map.with_index do |_, i|
+          i = (index * attrs.count) + i
+          ["t#{i}".to_sym, phrase]
+        end).to_h
+      )
+    end
   end
 end
diff --git a/app/models/experiment.rb b/app/models/experiment.rb
index 0aded1e47..1fac3f4d8 100644
--- a/app/models/experiment.rb
+++ b/app/models/experiment.rb
@@ -64,24 +64,18 @@ class Experiment < ApplicationRecord
     user,
     include_archived,
     query = nil,
-    page = 1,
     current_team = nil,
     options = {}
   )
-    viewable_projects = Project.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT, current_team)
-                               .pluck(:id)
-    new_query = Experiment.with_granted_permissions(user, ExperimentPermissions::READ)
-                          .where(project: viewable_projects)
-                          .where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
+    teams = options[:teams] || current_team || user.teams.select(:id)
+
+    new_query = distinct.with_granted_permissions(user, ExperimentPermissions::READ)
+                        .where(user_assignments: { team: teams })
+                        .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
 
     new_query = new_query.active unless include_archived
 
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    new_query
   end
 
   def self.viewable_by_user(user, teams)
diff --git a/app/models/label_template.rb b/app/models/label_template.rb
index faf4dc7c2..fb0ccd549 100644
--- a/app/models/label_template.rb
+++ b/app/models/label_template.rb
@@ -37,22 +37,15 @@ class LabelTemplate < ApplicationRecord
   end
 
   def self.search(
-    _user,
+    user,
     _include_archived,
     query = nil,
-    page = 1,
-    _current_team = nil,
+    current_team = nil,
     options = {}
   )
-
-    new_query = LabelTemplate.where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    teams = options[:teams] || current_team || user.teams.select(:id)
+    distinct.viewable_by_user(user, teams)
+            .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
   end
 
   def icon
diff --git a/app/models/my_module.rb b/app/models/my_module.rb
index f6edc799d..9ab70a638 100644
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@@ -3,7 +3,8 @@
 class MyModule < ApplicationRecord
   ID_PREFIX = 'TA'
   include PrefixedIdModel
-  SEARCHABLE_ATTRIBUTES = ['my_modules.name', 'my_modules.description', PREFIXED_ID_SQL].freeze
+  SEARCHABLE_ATTRIBUTES = ['my_modules.name', 'my_modules.description', PREFIXED_ID_SQL,
+                           'comments.message', 'tags.name', 'users.full_name', 'users.email'].freeze
 
   include ArchivableModel
   include SearchableModel
@@ -108,25 +109,18 @@ class MyModule < ApplicationRecord
     user,
     include_archived,
     query = nil,
-    page = 1,
     current_team = nil,
     options = {}
   )
-    viewable_experiments = Experiment.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT, current_team)
-                                     .pluck(:id)
+    teams = options[:teams] || current_team || user.teams.select(:id)
 
-    new_query = MyModule.with_granted_permissions(user, MyModulePermissions::READ)
-                        .where(experiment: viewable_experiments)
-                        .where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
+    new_query = distinct.left_joins(:task_comments, my_module_tags: :tag, user_my_modules: :user)
+                        .with_granted_permissions(user, MyModulePermissions::READ)
+                        .where(user_assignments: { team: teams })
+                        .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
 
     new_query = new_query.active unless include_archived
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    new_query
   end
 
   def self.viewable_by_user(user, teams)
diff --git a/app/models/project.rb b/app/models/project.rb
index ab5d8b0a7..0d04cb56b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -3,7 +3,7 @@
 class Project < ApplicationRecord
   ID_PREFIX = 'PR'
   include PrefixedIdModel
-  SEARCHABLE_ATTRIBUTES = ['projects.name', PREFIXED_ID_SQL].freeze
+  SEARCHABLE_ATTRIBUTES = ['projects.name', PREFIXED_ID_SQL, 'comments.message'].freeze
 
   include ArchivableModel
   include SearchableModel
@@ -84,21 +84,17 @@ class Project < ApplicationRecord
     user,
     include_archived,
     query = nil,
-    page = 1,
     current_team = nil,
     options = {}
   )
+    teams = options[:teams] || current_team || user.teams.select(:id)
+    new_query = distinct.viewable_by_user(user, teams)
+                        .left_joins(:project_comments)
+                        .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
 
-    new_query = Project.viewable_by_user(user, current_team || user.teams)
-                       .where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
     new_query = new_query.active unless include_archived
 
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    new_query
   end
 
   def self.viewable_by_user(user, teams)
diff --git a/app/models/project_folder.rb b/app/models/project_folder.rb
index e52f51e21..ca5befafb 100644
--- a/app/models/project_folder.rb
+++ b/app/models/project_folder.rb
@@ -39,21 +39,14 @@ class ProjectFolder < ApplicationRecord
       .where(team: teams)
   end
 
-  def self.search(user, _include_archived, query = nil, page = 1, current_team = nil, options = {})
-    new_query = if current_team
-                  current_team.project_folders.where_attributes_like(:name, query, options)
-                else
-                  distinct.joins(team: :users)
-                          .where(teams: { user_assignments: { user: user } })
-                          .where_attributes_like('project_folders.name', query, options)
-                end
+  def self.search(user, include_archived, query = nil, current_team = nil, options = {})
+    teams = options[:teams] || current_team || user.teams.select(:id)
 
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    new_query = distinct.viewable_by_user(user, teams)
+                        .where_attributes_like_boolean('project_folders.name', query, options)
+    new_query = new_query.active unless include_archived
+
+    new_query
   end
 
   def self.inner_folders(team, project_folder = nil)
diff --git a/app/models/protocol.rb b/app/models/protocol.rb
index 061259a98..4cdf2cee5 100644
--- a/app/models/protocol.rb
+++ b/app/models/protocol.rb
@@ -6,7 +6,8 @@ class Protocol < ApplicationRecord
   include ArchivableModel
   include PrefixedIdModel
   SEARCHABLE_ATTRIBUTES = ['protocols.name', 'protocols.description',
-                           'protocols.authors', 'protocol_keywords.name', PREFIXED_ID_SQL].freeze
+                           'step_texts.name', 'step_texts.text', 'tables.name',
+                           'checklists.name', 'checklist_items.text', PREFIXED_ID_SQL].freeze
   REPOSITORY_TYPES = %i(in_repository_published_original in_repository_draft in_repository_published_version).freeze
 
   include SearchableModel
@@ -165,34 +166,27 @@ class Protocol < ApplicationRecord
   def self.search(user,
                   include_archived,
                   query = nil,
-                  page = 1,
-                  _current_team = nil,
+                  current_team = nil,
                   options = {})
-    repository_protocols = latest_available_versions(user.teams)
-                           .with_granted_permissions(user, ProtocolPermissions::READ)
-                           .select(:id)
-    repository_protocols = repository_protocols.active unless include_archived
+    teams = options[:teams] || current_team || user.teams.select(:id)
+    new_query = if options[:options][:in_repository]
+                  latest_available_versions(teams)
+                    .with_granted_permissions(user, ProtocolPermissions::READ)
+                else
+                  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)
+                end
 
-    module_ids = MyModule.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT).pluck(:id)
+    new_query = new_query.active unless include_archived
 
-    new_query = Protocol
-                .where(
-                  '(protocol_type IN (?) AND my_module_id IN (?)) OR (protocols.id IN (?))',
-                  [Protocol.protocol_types[:unlinked], Protocol.protocol_types[:linked]],
-                  module_ids,
-                  repository_protocols
-                )
-
-    new_query = new_query.left_outer_joins(:protocol_keywords)
-                         .where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
-                         .distinct
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    new_query.left_outer_joins(steps: [:step_texts, { step_tables: :table },
+                                       { checklists: :checklist_items }, :step_comments])
+             .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
+             .distinct
   end
 
   def self.latest_available_versions(teams)
diff --git a/app/models/report.rb b/app/models/report.rb
index b9989bbdb..35ddf5729 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -68,26 +68,15 @@ class Report < ApplicationRecord
 
   def self.search(
     user,
-    include_archived,
+    _include_archived,
     query = nil,
-    page = 1,
-    _current_team = nil,
+    current_team = nil,
     options = {}
-  )
-
-    project_ids = Project.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                         .pluck(:id)
-
-    new_query = Report.distinct
-                      .where(reports: { project_id: project_ids })
-                      .where_attributes_like(SEARCHABLE_ATTRIBUTES, query, options)
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+  ) 
+    teams = options[:teams] || current_team || user.teams.select(:id)
+    distinct.with_granted_permissions(user, ReportPermissions::READ)
+            .where(team: teams)
+            .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
   end
 
   def self.viewable_by_user(user, teams)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index a76e2be54..2bb385926 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -78,36 +78,6 @@ class Repository < RepositoryBase
     team.repositories.count < Rails.configuration.x.team_repositories_limit
   end
 
-  def self.search(
-    user,
-    query = nil,
-    page = 1,
-    repository = nil,
-    options = {}
-  )
-    serchable_row_fields = [RepositoryRow::PREFIXED_ID_SQL, 'repository_rows.name', 'users.full_name']
-
-    repositories = repository&.id || Repository.accessible_by_teams(user.teams).pluck(:id)
-
-    readable_rows = RepositoryRow.joins(:repository, :created_by).where(repository_id: repositories)
-
-    repository_rows = readable_rows.where_attributes_like(serchable_row_fields, query, options)
-
-    Extends::REPOSITORY_EXTRA_SEARCH_ATTR.each do |_data_type, config|
-      custom_cell_matches = readable_rows.joins(config[:includes])
-                                         .where_attributes_like(config[:field], query, options)
-      repository_rows = repository_rows.or(readable_rows.where(id: custom_cell_matches))
-    end
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      repository_rows.select('repositories.id AS id, COUNT(DISTINCT repository_rows.id) AS counter')
-                     .group('repositories.id')
-    else
-      repository_rows.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
-  end
-
   def self.filter_by_teams(teams = [])
     teams.blank? ? self : where(team: teams)
   end
diff --git a/app/models/repository_row.rb b/app/models/repository_row.rb
index 624175566..e24a7247c 100644
--- a/app/models/repository_row.rb
+++ b/app/models/repository_row.rb
@@ -123,30 +123,28 @@ class RepositoryRow < ApplicationRecord
   def self.search(user,
                   include_archived,
                   query = nil,
-                  page = 1,
                   _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']
-    repositories = Repository.search(user).pluck(:id)
 
-    new_query =
-      RepositoryRow
-      .joins(:repository, :created_by)
-      .where(repository_id: repositories)
-      .distinct
-      .where_attributes_like(
-        searchable_row_fields, query, options
-      )
+    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 })
 
-    new_query = new_query.active unless include_archived
+    readable_rows = readable_rows.active unless include_archived
+    repository_rows = readable_rows.where_attributes_like_boolean(searchable_row_fields, query, options)
 
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
+    Extends::REPOSITORY_EXTRA_SEARCH_ATTR.each do |_data_type, config|
+      custom_cell_matches = readable_rows.joins(config[:includes])
+                                         .where_attributes_like_boolean(config[:field], query, options)
+      repository_rows = repository_rows.or(readable_rows.where(id: custom_cell_matches))
     end
+
+    repository_rows
   end
 
   def self.filter_by_teams(teams = [])
diff --git a/app/models/result.rb b/app/models/result.rb
index af4ba9ab8..cc31167c4 100644
--- a/app/models/result.rb
+++ b/app/models/result.rb
@@ -9,6 +9,9 @@ class Result < ApplicationRecord
   auto_strip_attributes :name, nullify: false
   validates :name, length: { maximum: Constants::NAME_MAX_LENGTH }
 
+  SEARCHABLE_ATTRIBUTES = ['results.name', 'result_texts.name', 'result_texts.text',
+                           'tables.name', 'comments.message'].freeze
+
   enum assets_view_mode: { thumbnail: 0, list: 1, inline: 2 }
 
   belongs_to :user, inverse_of: :results
@@ -35,33 +38,21 @@ class Result < ApplicationRecord
   def self.search(user,
                   include_archived,
                   query = nil,
-                  page = 1,
-                  _current_team = nil,
+                  current_team = nil,
                   options = {})
-    module_ids = MyModule.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT).pluck(:id)
+    teams = options[:teams] || current_team || user.teams.select(:id)
 
-    new_query =
-      Result
-      .distinct
-      .left_outer_joins(:result_texts, result_tables: :table)
-      .where(results: { my_module_id: module_ids })
-      .where_attributes_like(
-        [
-          'results.name',
-          'result_texts.name',
-          'result_texts.text',
-          'tables.name'
-        ], query, options
-      )
+    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 })
+                        .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
 
     new_query = new_query.active unless include_archived
 
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    new_query
   end
 
   def duplicate(my_module, user, result_name: nil)
diff --git a/app/models/step.rb b/app/models/step.rb
index 8fa1ae7d3..c92a6f21d 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -61,23 +61,22 @@ class Step < ApplicationRecord
   def self.search(user,
                   include_archived,
                   query = nil,
-                  page = 1,
-                  _current_team = nil,
+                  current_team = nil,
                   options = {})
-    protocol_ids = Protocol.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
+
+    teams = options[:teams] || current_team || user.teams.select(:id)
+    protocol_ids = Protocol.search(user, include_archived, nil, teams,
+                                   options: { in_repository: false })
                            .pluck(:id)
+    my_module_ids = Protocol.search(user, include_archived, nil, teams,
+                                    options: { in_repository: true })
+                            .pluck(:id)
 
-    new_query = Step.distinct
-                    .left_outer_joins(:step_texts)
-                    .where(steps: { protocol_id: protocol_ids })
-                    .where_attributes_like(['steps.name', 'step_texts.text'], query, options)
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
+    Step.distinct
+        .where(protocol_id: protocol_ids + my_module_ids)
+        .left_outer_joins(:step_texts)
+        .where(steps: { protocol_id: protocol_ids })
+        .where_attributes_like_boolean(['steps.name', 'step_texts.text'], query, options)
   end
 
   def self.filter_by_teams(teams = [])
diff --git a/app/models/table.rb b/app/models/table.rb
index 88b7ce47e..4d7dcddbf 100644
--- a/app/models/table.rb
+++ b/app/models/table.rb
@@ -29,82 +29,6 @@ class Table < ApplicationRecord
   after_save :update_ts_index
   after_save { result&.touch; step&.touch }
 
-  def self.search(user,
-                  include_archived,
-                  query = nil,
-                  page = 1,
-                  _current_team = nil,
-                  options = {})
-    step_ids = Step.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                   .joins(:step_tables)
-                   .distinct
-                   .pluck('step_tables.id')
-
-    result_ids = Result.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                       .joins(:result_tables)
-                       .distinct
-                       .pluck('result_tables.id')
-
-    table_query = Table.distinct
-                       .left_outer_joins(:step_table, :result_table, :result)
-                       .where('step_tables.id IN (?) OR result_tables.id IN (?)', step_ids, result_ids)
-
-    if options[:whole_word].to_s == 'true' ||
-       options[:whole_phrase].to_s == 'true'
-      like = options[:match_case].to_s == 'true' ? '~' : '~*'
-      s_query = query.gsub(/[!()&|:]/, ' ')
-                     .strip
-                     .split(/\s+/)
-                     .map { |t| t + ':*' }
-      if options[:whole_word].to_s == 'true'
-        a_query = query.split
-                       .map { |a| Regexp.escape(a) }
-                       .join('|')
-        s_query = s_query.join('|')
-      else
-        a_query = Regexp.escape(query)
-        s_query = s_query.join('&')
-      end
-      a_query = '\\y(' + a_query + ')\\y'
-      s_query = s_query.tr('\'', '"')
-
-      new_query = table_query.where(
-        "(trim_html_tags(tables.name) #{like} ?" \
-        "OR tables.data_vector @@ to_tsquery(?))",
-        a_query,
-        s_query
-      )
-    else
-      like = options[:match_case].to_s == 'true' ? 'LIKE' : 'ILIKE'
-      a_query = query.split.map { |a| "%#{sanitize_sql_like(a)}%" }
-
-      # Trim whitespace and replace it with OR character. Make prefixed
-      # wildcard search term and escape special characters.
-      # For example, search term 'demo project' is transformed to
-      # 'demo:*|project:*' which makes word inclusive search with postfix
-      # wildcard.
-      s_query = query.gsub(/[!()&|:]/, ' ')
-                     .strip
-                     .split(/\s+/)
-                     .map { |t| t + ':*' }
-                     .join('|')
-                     .tr('\'', '"')
-      new_query = table_query.where(
-        "(trim_html_tags(tables.name) #{like} ANY (array[?])" \
-        "OR tables.data_vector @@ to_tsquery(?))",
-        a_query,
-        s_query
-      )
-    end
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
-  end
-
   def metadata
     attributes['metadata'].is_a?(String) ? JSON.parse(attributes['metadata']) : attributes['metadata']
   end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 7855e3fa9..11929fa03 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -17,26 +17,4 @@ class Tag < ApplicationRecord
   belongs_to :project
   has_many :my_module_tags, inverse_of: :tag, dependent: :destroy
   has_many :my_modules, through: :my_module_tags, dependent: :destroy
-
-  def self.search(user,
-                  include_archived,
-                  query = nil,
-                  page = 1,
-                  _current_team = nil,
-                  options = {})
-    project_ids = Project.search(user, include_archived, nil, Constants::SEARCH_NO_LIMIT)
-                         .pluck(:id)
-
-    new_query = Tag
-                .distinct
-                .where(tags: { project_id: project_ids })
-                .where_attributes_like(:name, query, options)
-
-    # Show all results if needed
-    if page == Constants::SEARCH_NO_LIMIT
-      new_query
-    else
-      new_query.limit(Constants::SEARCH_LIMIT).offset((page - 1) * Constants::SEARCH_LIMIT)
-    end
-  end
 end
diff --git a/app/serializers/global_search/label_template_serializer.rb b/app/serializers/global_search/label_template_serializer.rb
index da33cf658..b74a2c1fe 100644
--- a/app/serializers/global_search/label_template_serializer.rb
+++ b/app/serializers/global_search/label_template_serializer.rb
@@ -15,7 +15,7 @@ module GlobalSearch
 
     def created_by
       {
-        name: object.created_by ? object.created_by.name : object.created_by_user,
+        name: object.type == 'FluicsLabelTemplate' ? object.created_by_user : object.created_by&.name,
         avatar_url: object.created_by ? avatar_path(object.created_by, :icon_small) : nil
       }
     end

From 574c45b2c868075c3a0fe842b7aa7079d12d514c Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Fri, 26 Apr 2024 11:14:42 +0200
Subject: [PATCH 097/115] Fix global search backend [SCI-10573]

---
 .../dashboard/quick_start_controller.rb       |   4 +-
 app/controllers/search_controller.rb          | 275 +++++++-----------
 app/models/asset.rb                           |   2 +-
 app/models/concerns/searchable_model.rb       |   6 +-
 app/models/step.rb                            |   2 +-
 5 files changed, 117 insertions(+), 172 deletions(-)

diff --git a/app/controllers/dashboard/quick_start_controller.rb b/app/controllers/dashboard/quick_start_controller.rb
index 1ab24d631..277ce4fa5 100644
--- a/app/controllers/dashboard/quick_start_controller.rb
+++ b/app/controllers/dashboard/quick_start_controller.rb
@@ -22,7 +22,7 @@ module Dashboard
     def project_filter
       projects = Project.readable_by_user(current_user)
                         .search(current_user, false, params[:query], current_team)
-                        .page(1)
+                        .page(params[:page] || 1)
                         .per(Constants::SEARCH_LIMIT)
                         .select(:id, :name)
       projects = projects.map { |i| { value: i.id, label: escape_input(i.name) } }
@@ -39,7 +39,7 @@ module Dashboard
         experiments = @project.experiments
                               .managable_by_user(current_user)
                               .search(current_user, false, params[:query], current_team)
-                              .page(1)
+                              .page(params[:page] || 1)
                               .per(Constants::SEARCH_LIMIT)
                               .select(:id, :name)
         experiments = experiments.map { |i| { value: i.id, label: escape_input(i.name) } }
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 1f61b2a6c..c4c11da67 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -15,120 +15,87 @@ class SearchController < ApplicationController
         when 'projects'
           @project_search_count = fetch_cached_count(Project)
           search_projects
-          if params[:preview] == 'true'
-            results = @project_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-          else
-            results = @project_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-          end
-
-          render json: results.includes(:team, :project_folder),
+          paginate_records
+          render json: @records.includes(:team, :project_folder),
                  each_serializer: GlobalSearch::ProjectSerializer,
                  meta: {
                   total: @search_count,
-                  next_page: (results.next_page if results.respond_to?(:next_page)),
+                  next_page: (@records.next_page if @records.respond_to?(:next_page)),
                 }
         when 'project_folders'
           @project_folder_search_count = fetch_cached_count ProjectFolder
           search_project_folders
-          results = if params[:preview] == 'true'
-                      @project_folder_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @project_folder_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
-          render json: results.includes(:team, :parent_folder),
+          paginate_records
+          render json: @records.includes(:team, :parent_folder),
                  each_serializer: GlobalSearch::ProjectFolderSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: results.try(:next_page)
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'reports'
           @report_search_count = fetch_cached_count Report
           search_reports
-          results = if params[:preview] == 'true'
-                      @report_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @report_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
-          render json: results.includes(:team, :project, :user),
+          paginate_records
+          render json: @records.includes(:team, :project, :user),
                  each_serializer: GlobalSearch::ReportSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: results.try(:next_page)
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'module_protocols'
           search_module_protocols
-          results = if params[:preview] == 'true'
-                      @module_protocol_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @module_protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
-          render json: results.joins({ my_module: :experiment }, :team),
+          paginate_records
+          render json: @records.joins({ my_module: :experiment }, :team),
                  each_serializer: GlobalSearch::MyModuleProtocolSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: results.try(:next_page)
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'experiments'
           @experiment_search_count = fetch_cached_count Experiment
           search_experiments
-          results = if params[:preview] == 'true'
-                      @experiment_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @experiment_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
-          render json: results.includes(project: :team),
+          paginate_records
+          render json: @records.includes(project: :team),
                  each_serializer: GlobalSearch::ExperimentSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: results.try(:next_page)
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'tasks'
           @module_search_count = fetch_cached_count MyModule
           search_modules
-          results = if params[:preview] == 'true'
-                      @module_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @module_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
-          render json: results.includes(experiment: { project: :team }),
+          paginate_records
+          render json: @records.includes(experiment: { project: :team }),
                  each_serializer: GlobalSearch::MyModuleSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: results.try(:next_page)
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'results'
           @result_search_count = fetch_cached_count(Result)
           search_results
-          results = if params[:preview] == 'true'
-                      @result_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @result_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
-          render json: results.includes(my_module: { experiment: { project: :team } }),
+          paginate_records
+          render json: @records.includes(my_module: { experiment: { project: :team } }),
                  each_serializer: GlobalSearch::ResultSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: results.try(:next_page)
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'protocols'
           search_protocols
-          results = if params[:preview] == 'true'
-                      @protocol_results.take(4)
-                    else
-                      @protocol_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
+          paginate_records
 
-          render json: results,
+          render json: @records,
                  each_serializer: GlobalSearch::ProtocolSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: (results.next_page if results.respond_to?(:next_page))
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'label_templates'
@@ -136,50 +103,38 @@ class SearchController < ApplicationController
 
           @label_template_search_count = fetch_cached_count(LabelTemplate)
           search_label_templates
-          results = if params[:preview] == 'true'
-                      @label_template_results.take(4)
-                    else
-                      @label_template_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
+          paginate_records
 
-          render json: results,
+          render json: @records,
                  each_serializer: GlobalSearch::LabelTemplateSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: (results.next_page if results.respond_to?(:next_page))
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'repository_rows'
           @repository_row_search_count = fetch_cached_count(RepositoryRow)
           search_repository_rows
-          results = if params[:preview] == 'true'
-                      @repository_row_results.take(4)
-                    else
-                      @repository_row_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
+          paginate_records
 
-          render json: results,
+          render json: @records,
                  each_serializer: GlobalSearch::RepositoryRowSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: (results.next_page if results.respond_to?(:next_page))
+                   next_page: @records.try(:next_page)
                  }
           return
         when 'assets'
           @asset_search_count = fetch_cached_count(Asset)
           search_assets
           includes = [{ step: { protocol: { my_module: :experiment } } }, { result: { my_module: :experiment } }, :team]
-          results = if params[:preview] == 'true'
-                      @asset_results.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
-                    else
-                      @asset_results.page(params[:page]).per(Constants::SEARCH_LIMIT)
-                    end
+          paginate_records
 
-          render json: results.includes(includes),
+          render json: @records.includes(includes),
                  each_serializer: GlobalSearch::AssetSerializer,
                  meta: {
                    total: @search_count,
-                   next_page: (results.next_page if results.respond_to?(:next_page))
+                   next_page: @records.try(:next_page)
                  }
           return
         end
@@ -220,16 +175,8 @@ class SearchController < ApplicationController
   def load_vars
     query = (params.fetch(:q) { '' }).strip
     @filters = params[:filters]
-    @include_archived = if @filters.present?
-                          @filters[:include_archived] == 'true'
-                        else
-                          true
-                        end
-    @teams = if @filters.present?
-               @filters[:teams]&.values || current_user.teams
-             else
-               current_user.teams
-             end
+    @include_archived = @filters.blank? || @filters[:include_archived] == 'true'
+    @teams = (@filters.present? && @filters[:teams]&.values) || current_user.teams
     @display_query = query
 
     splited_query = query.split
@@ -257,16 +204,16 @@ class SearchController < ApplicationController
   end
 
   def search_by_name(model, options={})
-    records = model.search(current_user,
-                           @include_archived,
-                           @search_query,
-                           nil,
-                           teams: @teams,
-                           users: @users,
-                           options: options)
+    @records = model.search(current_user,
+                            @include_archived,
+                            @search_query,
+                            nil,
+                            teams: @teams,
+                            users: @users,
+                            options: options)
 
-    records = filter_records(records, model) if @filters.present?
-    sort_records(records)
+    filter_records(model) if @filters.present?
+    sort_records
   end
 
   def count_by_name(model, options = {})
@@ -289,121 +236,119 @@ class SearchController < ApplicationController
   end
 
   def search_projects
-    @project_results = Project.none
-    @project_results = search_by_name(Project) if @project_search_count.positive?
+    @records = Project.none
+    search_by_name(Project) if @project_search_count.positive?
     @search_count = @project_search_count
   end
 
   def search_project_folders
-    @project_folder_results = ProjectFolder.none
-    @project_folder_results = search_by_name(ProjectFolder) if @project_folder_search_count.positive?
+    @records = ProjectFolder.none
+    @records = search_by_name(ProjectFolder) if @project_folder_search_count.positive?
     @search_count = @project_folder_search_count
   end
 
   def search_experiments
-    @experiment_results = Experiment.none
-    @experiment_results = search_by_name(Experiment) if @experiment_search_count.positive?
+    @records = Experiment.none
+    @records = search_by_name(Experiment) if @experiment_search_count.positive?
     @search_count = @experiment_search_count
   end
 
   def search_modules
-    @module_results = MyModule.none
-    @module_results = search_by_name(MyModule) if @module_search_count.positive?
+    @records = MyModule.none
+    @records = search_by_name(MyModule) if @module_search_count.positive?
     @search_count = @module_search_count
   end
 
   def search_module_protocols
-    @module_protocol_results = search_by_name(Protocol, { in_repository: false })
-    @search_count = @module_protocol_results.count
+    @records = search_by_name(Protocol, { in_repository: false })
+    @search_count = @records.count
   end
 
   def search_results
-    @result_results = Result.none
-    @result_results = search_by_name(Result) if @result_search_count.positive?
+    @records = Result.none
+    @records = search_by_name(Result) if @result_search_count.positive?
     @search_count = @result_search_count
   end
 
   def search_reports
-    @report_results = Report.none
-    @report_results = search_by_name(Report) if @report_search_count.positive?
+    @records = Report.none
+    @records = search_by_name(Report) if @report_search_count.positive?
     @search_count = @report_search_count
   end
 
   def search_protocols
-    @protocol_results = search_by_name(Protocol, { in_repository: true })
-    @search_count = @protocol_results.count
+    @records = search_by_name(Protocol, { in_repository: true })
+    @search_count = @records.count
   end
 
   def search_label_templates
-    @label_template_results = LabelTemplate.none
-    @label_template_results = search_by_name(LabelTemplate) if @label_template_search_count.positive?
+    @records = LabelTemplate.none
+    @records = search_by_name(LabelTemplate) if @label_template_search_count.positive?
     @search_count = @label_template_search_count
   end
 
   def search_steps
-    @step_results = []
-    @step_results = search_by_name(Step) if @step_search_count.positive?
+    @records = []
+    @records = search_by_name(Step) if @step_search_count.positive?
     @search_count = @step_search_count
   end
 
   def search_repository_rows
-    @repository_row_results = RepositoryRow.none
-    @repository_row_results = search_by_name(RepositoryRow) if @repository_row_search_count.positive?
+    @records = RepositoryRow.none
+    @records = search_by_name(RepositoryRow) if @repository_row_search_count.positive?
     @search_count = @repository_row_search_count
   end
 
   def search_assets
-    @asset_results = Asset.none
-    @asset_results = search_by_name(Asset) if @asset_search_count.positive?
+    @records = Asset.none
+    @records = search_by_name(Asset) if @asset_search_count.positive?
     @search_count = @asset_search_count
   end
 
-  def filter_records(records, model)
-    model_name = model.model_name.collection
-    if @filters[:created_at].present?
-      if @filters[:created_at][:on].present?
-        from_date = Time.zone.parse(@filters[:created_at][:on]).beginning_of_day.utc
-        to_date = Time.zone.parse(@filters[:created_at][:on]).end_of_day.utc
-      else
-        from_date = Time.zone.parse(@filters[:created_at][:from])
-        to_date = Time.zone.parse(@filters[:created_at][:to])
-      end
-
-      records = records.where("#{model_name}.created_at >= ?", from_date)
-      records = records.where("#{model_name}.created_at <= ?", to_date)
-    end
-
-    if @filters[:updated_at].present?
-      if @filters[:updated_at][:on].present?
-        from_date = Time.zone.parse(@filters[:updated_at][:on]).beginning_of_day.utc
-        to_date = Time.zone.parse(@filters[:updated_at][:on]).end_of_day.utc
-      else
-        from_date = Time.zone.parse(@filters[:updated_at][:from])
-        to_date = Time.zone.parse(@filters[:updated_at][:to])
-      end
-
-      records = records.where("#{model_name}.updated_at >= ?", from_date)
-      records = records.where("#{model_name}.updated_at <= ?", to_date)
-    end
-
-    if @filters[:users].present?
-      records = records.joins("INNER JOIN activities ON #{model_name}.id = activities.subject_id
-                              AND activities.subject_type= '#{model.name}'")
-                       .where('activities.owner_id': @filters[:users]&.values)
-    end
-    records
+  def filter_records(model)
+    filter_datetime!(model, :created_at) if @filters[:created_at].present?
+    filter_datetime!(model, :updated_at) if @filters[:updated_at].present?
+    filter_users!(model) if @filters[:users].present?
   end
 
-  def sort_records(records)
-    case params[:sort]
-    when 'atoz'
-      records.order(name: :asc)
-    when 'ztoa'
-      records.order(name: :desc)
-    when 'created_asc'
-      records.order(created_at: :asc)
-    else
-      records.order(created_at: :desc)
+  def sort_records
+    @records = case params[:sort]
+               when 'atoz'
+                 @records.order(name: :asc)
+               when 'ztoa'
+                 @records.order(name: :desc)
+               when 'created_asc'
+                 @records.order(created_at: :asc)
+               else
+                 @records.order(created_at: :desc)
+               end
+  end
+
+  def paginate_records
+    @records = if params[:preview] == 'true'
+                 @records.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+               else
+                 @records.page(params[:page]).per(Constants::SEARCH_LIMIT)
+               end
+  end
+
+  def filter_datetime!(model, attribute)
+    model_name = model.model_name.collection
+    if @filters[attribute][:on].present?
+      from_date = Time.zone.parse(@filters[attribute][:on]).beginning_of_day.utc
+      to_date = Time.zone.parse(@filters[attribute][:on]).end_of_day.utc
+    elsif @filters[attribute][:from].present? && @filters[attribute][:to].present?
+      from_date = Time.zone.parse(@filters[attribute][:from])
+      to_date = Time.zone.parse(@filters[attribute][:to])
     end
+
+    @records = @records.where("#{model_name}.#{attribute} >= ?", from_date) if from_date.present?
+    @records = @records.where("#{model_name}.#{attribute} <= ?", to_date) if to_date.present?
+  end
+
+  def filter_users!(model)
+    @records = @records.joins("INNER JOIN activities ON #{model.model_name.collection}.id = activities.subject_id
+                               AND activities.subject_type= '#{model.name}'")
+                       .where('activities.owner_id': @filters[:users]&.values)
   end
 end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 327959fbe..7edf2e072 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -78,7 +78,7 @@ class Asset < ApplicationRecord
 
     assets_in_inventories = Asset.joins(
       repository_cell: { repository_column: :repository }
-    ).where(repositories: { team_id: teams }).pluck(:id)
+    ).where(repositories: { team: teams }).pluck(:id)
 
     assets =
       Asset.distinct
diff --git a/app/models/concerns/searchable_model.rb b/app/models/concerns/searchable_model.rb
index 45a93a954..4af1a7262 100644
--- a/app/models/concerns/searchable_model.rb
+++ b/app/models/concerns/searchable_model.rb
@@ -10,7 +10,7 @@ module SearchableModel
     scope :where_attributes_like, lambda { |attributes, query, options = {}|
       return unless query
 
-      attrs = convert_input(attributes)
+      attrs = normalized_attributes(attributes)
 
       if options[:whole_word].to_s == 'true' ||
          options[:whole_phrase].to_s == 'true' ||
@@ -102,7 +102,7 @@ module SearchableModel
     scope :where_attributes_like_boolean, lambda { |attributes, query, options = {}|
       return unless query
 
-      attrs = convert_input(attributes)
+      attrs = normalized_attributes(attributes)
       where_array = []
       value_array = {}
       current_phrase = ''
@@ -146,7 +146,7 @@ module SearchableModel
       where(where_array.join[0..-5], value_array)
     }
 
-    def self.convert_input(attributes)
+    def self.normalized_attributes(attributes)
       attrs = []
       if attributes.blank?
         # Do nothing in this case
diff --git a/app/models/step.rb b/app/models/step.rb
index c92a6f21d..56e15862b 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -73,8 +73,8 @@ class Step < ApplicationRecord
                             .pluck(:id)
 
     Step.distinct
-        .where(protocol_id: protocol_ids + my_module_ids)
         .left_outer_joins(:step_texts)
+        .where(protocol_id: protocol_ids + my_module_ids)
         .where(steps: { protocol_id: protocol_ids })
         .where_attributes_like_boolean(['steps.name', 'step_texts.text'], query, options)
   end

From c2eb0f18c7907f00e145f9b07e8e261ae0a9bf05 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 23 Apr 2024 13:09:05 +0200
Subject: [PATCH 098/115] Remove name validation flash errors in inline-editing
 [SCI-10338]

---
 app/assets/javascripts/shared/inline_editing.js | 6 ++++--
 app/controllers/experiments_controller.rb       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js
index 657fe46a4..66e9c73ad 100644
--- a/app/assets/javascripts/shared/inline_editing.js
+++ b/app/assets/javascripts/shared/inline_editing.js
@@ -108,8 +108,10 @@ let inlineEditing = (function() {
         if (response.status === 403) {
           HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger');
         } else if (response.status === 422) {
-          HelperModule.flashAlertMsg(response.responseJSON.errors
-            ? Object.values(response.responseJSON.errors).join(', ') : I18n.t('errors.general'), 'danger');
+          const errors = response.responseJSON.errors || response.responseJSON;
+          if (!errors) {
+            HelperModule.flashAlertMsg(I18n.t('errors.general'), 'danger');
+          }
         }
         if (!error) error = response.responseJSON.errors[fieldToUpdate];
         container.addClass('error');
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 96c6e3d1e..5d4046fc7 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -116,7 +116,7 @@ class ExperimentsController < ApplicationController
 
       render json: { message: t('experiments.update.success_flash', experiment: @experiment.name) }, status: :ok
     else
-      render json: { message: @experiment.errors.full_messages }, status: :unprocessable_entity
+      render json: { errors: @experiment.errors }, status: :unprocessable_entity
     end
   end
 

From c5d7353d68da5fa8a36c50693c7b03d0b4eedb39 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 29 Apr 2024 15:26:08 +0200
Subject: [PATCH 099/115] Fix filters modal [SCI-10656]

---
 .../vue/global_search/filters_modal.vue       |  2 +-
 .../vue/global_search/groups/search_mixin.js  | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/javascript/vue/global_search/filters_modal.vue b/app/javascript/vue/global_search/filters_modal.vue
index 454ceb2aa..420e8bf00 100644
--- a/app/javascript/vue/global_search/filters_modal.vue
+++ b/app/javascript/vue/global_search/filters_modal.vue
@@ -21,7 +21,7 @@
               :filters="filters"
               :currentTeam="currentTeam"
               @search="(newFilters) => { this.$emit('search', newFilters); }"
-              @close="close" />
+              @cancel="close" />
           </div>
         </div>
       </form>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 59c6be24a..fd3eca6a6 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -36,6 +36,9 @@ export default {
     };
   },
   watch: {
+    filters() {
+      this.reloadData();
+    },
     selected() {
       if (this.selected) {
         if (!this.fullDataLoaded) {
@@ -46,13 +49,7 @@ export default {
       }
     },
     query() {
-      if (this.query.length > 1) {
-        this.results = [];
-        this.page = 1;
-        this.total = 0;
-        this.fullDataLoaded = false;
-        this.loadData();
-      }
+      this.reloadData();
     }
   },
   mounted() {
@@ -105,6 +102,15 @@ export default {
       this.page = 1;
       this.loadData();
     },
+    reloadData() {
+      if (this.query.length > 1) {
+        this.results = [];
+        this.page = 1;
+        this.total = 0;
+        this.fullDataLoaded = false;
+        this.loadData();
+      }
+    },
     loadData() {
       if (this.query.length < 2) return;
 

From 5409d993eece577c89e08d2f5cdf7e8098753df6 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 30 Apr 2024 09:27:15 +0200
Subject: [PATCH 100/115] Improve global search loading [SCI-10655]

---
 app/controllers/search_controller.rb | 193 ++++++---------------------
 app/models/asset.rb                  |  21 ++-
 app/models/protocol.rb               |  40 +++---
 app/models/step.rb                   |  21 ---
 4 files changed, 76 insertions(+), 199 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index c4c11da67..c0d57f0e3 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -13,128 +13,115 @@ class SearchController < ApplicationController
 
         case params[:group]
         when 'projects'
-          @project_search_count = fetch_cached_count(Project)
-          search_projects
-          paginate_records
+          search_by_name(Project)
+
           render json: @records.includes(:team, :project_folder),
                  each_serializer: GlobalSearch::ProjectSerializer,
                  meta: {
-                  total: @search_count,
-                  next_page: (@records.next_page if @records.respond_to?(:next_page)),
-                }
+                   total: @records.total_count,
+                   next_page: (@records.next_page if @records.respond_to?(:next_page)),
+                 }
         when 'project_folders'
-          @project_folder_search_count = fetch_cached_count ProjectFolder
-          search_project_folders
-          paginate_records
+          search_by_name(ProjectFolder)
+
           render json: @records.includes(:team, :parent_folder),
                  each_serializer: GlobalSearch::ProjectFolderSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'reports'
-          @report_search_count = fetch_cached_count Report
-          search_reports
-          paginate_records
+          search_by_name(Report)
+
           render json: @records.includes(:team, :project, :user),
                  each_serializer: GlobalSearch::ReportSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'module_protocols'
-          search_module_protocols
-          paginate_records
+          search_by_name(Protocol, { in_repository: false })
+
           render json: @records.joins({ my_module: :experiment }, :team),
                  each_serializer: GlobalSearch::MyModuleProtocolSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'experiments'
-          @experiment_search_count = fetch_cached_count Experiment
-          search_experiments
-          paginate_records
+          search_by_name(Experiment)
+
           render json: @records.includes(project: :team),
                  each_serializer: GlobalSearch::ExperimentSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'tasks'
-          @module_search_count = fetch_cached_count MyModule
-          search_modules
-          paginate_records
+          search_by_name(MyModule)
+
           render json: @records.includes(experiment: { project: :team }),
                  each_serializer: GlobalSearch::MyModuleSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'results'
-          @result_search_count = fetch_cached_count(Result)
-          search_results
-          paginate_records
+          search_by_name(Result)
+
           render json: @records.includes(my_module: { experiment: { project: :team } }),
                  each_serializer: GlobalSearch::ResultSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'protocols'
-          search_protocols
-          paginate_records
+          search_by_name(Protocol, { in_repository: true })
 
           render json: @records,
                  each_serializer: GlobalSearch::ProtocolSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'label_templates'
           return render json: [], meta: { disabled: true }, status: :ok unless LabelTemplate.enabled?
 
-          @label_template_search_count = fetch_cached_count(LabelTemplate)
-          search_label_templates
-          paginate_records
+          search_by_name(LabelTemplate)
 
           render json: @records,
                  each_serializer: GlobalSearch::LabelTemplateSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'repository_rows'
-          @repository_row_search_count = fetch_cached_count(RepositoryRow)
-          search_repository_rows
-          paginate_records
+          search_by_name(RepositoryRow)
 
           render json: @records,
                  each_serializer: GlobalSearch::RepositoryRowSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         when 'assets'
-          @asset_search_count = fetch_cached_count(Asset)
-          search_assets
+          search_by_name(Asset)
           includes = [{ step: { protocol: { my_module: :experiment } } }, { result: { my_module: :experiment } }, :team]
-          paginate_records
 
           render json: @records.includes(includes),
                  each_serializer: GlobalSearch::AssetSerializer,
                  meta: {
-                   total: @search_count,
-                   next_page: @records.try(:next_page)
+                   total: @records.total_count,
+                   next_page: @records.next_page
                  }
           return
         end
@@ -199,11 +186,7 @@ class SearchController < ApplicationController
 
   protected
 
-  def generate_search_id
-    SecureRandom.urlsafe_base64(32)
-  end
-
-  def search_by_name(model, options={})
+  def search_by_name(model, options = {})
     @records = model.search(current_user,
                             @include_archived,
                             @search_query,
@@ -214,95 +197,7 @@ class SearchController < ApplicationController
 
     filter_records(model) if @filters.present?
     sort_records
-  end
-
-  def count_by_name(model, options = {})
-    model.search(current_user,
-                 @include_archived,
-                 @search_query,
-                 nil,
-                 teams: @teams,
-                 users: @users,
-                 options: options).size
-  end
-
-  def fetch_cached_count(type)
-    exp = 5.minutes
-    Rails.cache.fetch(
-      "#{@search_id}/#{type.name.underscore}_search_count", expires_in: exp
-    ) do
-      count_by_name(type)
-    end
-  end
-
-  def search_projects
-    @records = Project.none
-    search_by_name(Project) if @project_search_count.positive?
-    @search_count = @project_search_count
-  end
-
-  def search_project_folders
-    @records = ProjectFolder.none
-    @records = search_by_name(ProjectFolder) if @project_folder_search_count.positive?
-    @search_count = @project_folder_search_count
-  end
-
-  def search_experiments
-    @records = Experiment.none
-    @records = search_by_name(Experiment) if @experiment_search_count.positive?
-    @search_count = @experiment_search_count
-  end
-
-  def search_modules
-    @records = MyModule.none
-    @records = search_by_name(MyModule) if @module_search_count.positive?
-    @search_count = @module_search_count
-  end
-
-  def search_module_protocols
-    @records = search_by_name(Protocol, { in_repository: false })
-    @search_count = @records.count
-  end
-
-  def search_results
-    @records = Result.none
-    @records = search_by_name(Result) if @result_search_count.positive?
-    @search_count = @result_search_count
-  end
-
-  def search_reports
-    @records = Report.none
-    @records = search_by_name(Report) if @report_search_count.positive?
-    @search_count = @report_search_count
-  end
-
-  def search_protocols
-    @records = search_by_name(Protocol, { in_repository: true })
-    @search_count = @records.count
-  end
-
-  def search_label_templates
-    @records = LabelTemplate.none
-    @records = search_by_name(LabelTemplate) if @label_template_search_count.positive?
-    @search_count = @label_template_search_count
-  end
-
-  def search_steps
-    @records = []
-    @records = search_by_name(Step) if @step_search_count.positive?
-    @search_count = @step_search_count
-  end
-
-  def search_repository_rows
-    @records = RepositoryRow.none
-    @records = search_by_name(RepositoryRow) if @repository_row_search_count.positive?
-    @search_count = @repository_row_search_count
-  end
-
-  def search_assets
-    @records = Asset.none
-    @records = search_by_name(Asset) if @asset_search_count.positive?
-    @search_count = @asset_search_count
+    paginate_records
   end
 
   def filter_records(model)
@@ -326,7 +221,7 @@ class SearchController < ApplicationController
 
   def paginate_records
     @records = if params[:preview] == 'true'
-                 @records.limit(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
+                 @records.page(params[:page]).per(Constants::GLOBAL_SEARCH_PREVIEW_LIMIT)
                else
                  @records.page(params[:page]).per(Constants::SEARCH_LIMIT)
                end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index 7edf2e072..0eb401e19 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -65,25 +65,20 @@ class Asset < ApplicationRecord
 
     teams = options[:teams] || current_team || user.teams.select(:id)
 
-    assets_in_steps = Asset.joins(:step).where(
-      'steps.id IN (?)',
-      Step.search(user, include_archived, nil, teams)
-          .select(:id)
-    ).pluck(:id)
+    assets_in_steps = Asset.joins(:step)
+                           .where(steps: { protocol: Protocol.search(user, include_archived, nil, teams) })
+                           .pluck(:id)
 
-    assets_in_results = Asset.joins(:result).where(
-      'results.id IN (?)',
-      Result.search(user, include_archived, nil, teams).select(:id)
-    ).pluck(:id)
+    assets_in_results = Asset.joins(:result)
+                             .where(results: { id: Result.search(user, include_archived, nil, teams) })
+                             .pluck(:id)
 
     assets_in_inventories = Asset.joins(
       repository_cell: { repository_column: :repository }
     ).where(repositories: { team: teams }).pluck(:id)
 
-    assets =
-      Asset.distinct
-           .where('assets.id IN (?) OR assets.id IN (?) OR assets.id IN (?)',
-                  assets_in_steps, assets_in_results, assets_in_inventories)
+    assets = distinct.where('assets.id IN (?) OR assets.id IN (?) OR assets.id IN (?)',
+                            assets_in_steps, assets_in_results, assets_in_inventories)
 
     Asset.left_outer_joins(:asset_text_datum)
          .joins(file_attachment: :blob)
diff --git a/app/models/protocol.rb b/app/models/protocol.rb
index 4cdf2cee5..b15588292 100644
--- a/app/models/protocol.rb
+++ b/app/models/protocol.rb
@@ -169,24 +169,32 @@ class Protocol < ApplicationRecord
                   current_team = nil,
                   options = {})
     teams = options[:teams] || current_team || user.teams.select(:id)
-    new_query = if options[:options][:in_repository]
-                  latest_available_versions(teams)
-                    .with_granted_permissions(user, ProtocolPermissions::READ)
-                else
-                  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)
-                end
 
-    new_query = new_query.active unless include_archived
+    protocol_templates = if options[:options]&.dig(:in_repository).present? || options[:options].blank?
+                           templates = latest_available_versions(teams)
+                                       .with_granted_permissions(user, ProtocolPermissions::READ)
+                                       .select(:id)
+                           templates = templates.active unless include_archived
+                           templates
+                         end || []
 
-    new_query.left_outer_joins(steps: [:step_texts, { step_tables: :table },
-                                       { checklists: :checklist_items }, :step_comments])
-             .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
-             .distinct
+    protocol_my_modules = if options[:options]&.dig(:in_repository).blank?
+                            protocols = 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)
+                            protocols = protocols.active unless include_archived
+                            protocols.pluck(:id)
+                          end || []
+
+    distinct.where('(protocols.protocol_type IN (?) AND protocols.my_module_id IN (?)) OR (protocols.id IN (?))',
+                   [Protocol.protocol_types[:unlinked], Protocol.protocol_types[:linked]],
+                   protocol_my_modules, protocol_templates)
+            .left_outer_joins(steps: [:step_texts, { step_tables: :table },
+                                      { checklists: :checklist_items }, :step_comments])
+            .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
   end
 
   def self.latest_available_versions(teams)
diff --git a/app/models/step.rb b/app/models/step.rb
index 56e15862b..253b9c0b3 100644
--- a/app/models/step.rb
+++ b/app/models/step.rb
@@ -58,27 +58,6 @@ class Step < ApplicationRecord
   scope :in_order, -> { order(position: :asc) }
   scope :desc_order, -> { order(position: :desc) }
 
-  def self.search(user,
-                  include_archived,
-                  query = nil,
-                  current_team = nil,
-                  options = {})
-
-    teams = options[:teams] || current_team || user.teams.select(:id)
-    protocol_ids = Protocol.search(user, include_archived, nil, teams,
-                                   options: { in_repository: false })
-                           .pluck(:id)
-    my_module_ids = Protocol.search(user, include_archived, nil, teams,
-                                    options: { in_repository: true })
-                            .pluck(:id)
-
-    Step.distinct
-        .left_outer_joins(:step_texts)
-        .where(protocol_id: protocol_ids + my_module_ids)
-        .where(steps: { protocol_id: protocol_ids })
-        .where_attributes_like_boolean(['steps.name', 'step_texts.text'], query, options)
-  end
-
   def self.filter_by_teams(teams = [])
     return self if teams.blank?
 

From 66e2bed6e6fc067ff325a08f231ff9e9347d4777 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Fri, 3 May 2024 15:48:19 +0200
Subject: [PATCH 101/115] Add unique constraint to viewable states [SCI-10669]

---
 ...630_add_unique_constraint_to_view_states.rb | 18 ++++++++++++++++++
 db/schema.rb                                   |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 db/migrate/20240503131630_add_unique_constraint_to_view_states.rb

diff --git a/db/migrate/20240503131630_add_unique_constraint_to_view_states.rb b/db/migrate/20240503131630_add_unique_constraint_to_view_states.rb
new file mode 100644
index 000000000..c00a21fe7
--- /dev/null
+++ b/db/migrate/20240503131630_add_unique_constraint_to_view_states.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddUniqueConstraintToViewStates < ActiveRecord::Migration[7.0]
+  def up
+    # delete the duplicates
+    execute 'WITH uniq AS
+      (SELECT DISTINCT ON (user_id, viewable_id, viewable_type) * FROM view_states)
+      DELETE FROM view_states WHERE view_states.id NOT IN
+        (SELECT id FROM uniq)'
+
+    # add index
+    add_index :view_states, %i(user_id viewable_id viewable_type), unique: true
+  end
+
+  def down
+    remove_index :view_states, columns: %i(user_id viewable_id viewable_type)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 758512996..4c04d2527 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1294,6 +1294,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_01_18_094253) do
     t.bigint "viewable_id"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.index ["user_id", "viewable_id", "viewable_type"], name: "index_view_states_on_user_id_and_viewable_id_and_viewable_type", unique: true
     t.index ["user_id"], name: "index_view_states_on_user_id"
     t.index ["viewable_type", "viewable_id"], name: "index_view_states_on_viewable_type_and_viewable_id"
   end

From 0963e576fc4e08afb5261d70b0cb955274dae1ac Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Mon, 6 May 2024 10:44:23 +0200
Subject: [PATCH 102/115] Add missing fields for global search for protocols
 [SCI-10655]

---
 app/models/protocol.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/protocol.rb b/app/models/protocol.rb
index b15588292..6e03acb75 100644
--- a/app/models/protocol.rb
+++ b/app/models/protocol.rb
@@ -5,9 +5,9 @@ class Protocol < ApplicationRecord
 
   include ArchivableModel
   include PrefixedIdModel
-  SEARCHABLE_ATTRIBUTES = ['protocols.name', 'protocols.description',
+  SEARCHABLE_ATTRIBUTES = ['protocols.name', 'protocols.description', PREFIXED_ID_SQL, 'steps.name',
                            'step_texts.name', 'step_texts.text', 'tables.name',
-                           'checklists.name', 'checklist_items.text', PREFIXED_ID_SQL].freeze
+                           'checklists.name', 'checklist_items.text', 'comments.message'].freeze
   REPOSITORY_TYPES = %i(in_repository_published_original in_repository_draft in_repository_published_version).freeze
 
   include SearchableModel
@@ -189,11 +189,11 @@ class Protocol < ApplicationRecord
                             protocols.pluck(:id)
                           end || []
 
-    distinct.where('(protocols.protocol_type IN (?) AND protocols.my_module_id IN (?)) OR (protocols.id IN (?))',
+    distinct.left_joins(steps: [:step_texts, { step_tables: :table },
+                                { checklists: :checklist_items }, :step_comments])
+            .where('(protocols.protocol_type IN (?) AND protocols.my_module_id IN (?)) OR (protocols.id IN (?))',
                    [Protocol.protocol_types[:unlinked], Protocol.protocol_types[:linked]],
                    protocol_my_modules, protocol_templates)
-            .left_outer_joins(steps: [:step_texts, { step_tables: :table },
-                                      { checklists: :checklist_items }, :step_comments])
             .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
   end
 

From 496d3fe62805d87eadbe3c8dfa16e859b6ef91e3 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 6 May 2024 13:05:49 +0200
Subject: [PATCH 103/115] Fix OpenID unlink translation [SCI-10671]

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 147ed9d07..db31f23e4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2923,7 +2923,7 @@ en:
             unlink_button: "Unlink"
             unlink_modal:
               title: "Unlink OpenID Connect account?"
-              description_1: "Are you sure you would like unlink to OpenID Connect and SciNote accounts?"
+              description_1: "Are you sure you would like to unlink OpenID Connect and SciNote accounts?"
               submit_button: "Submit"
           saml:
             title: "Your SAML Account"

From 12c4e1ca1014595a10bda7a81ac7a6ee179ba87a Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 6 May 2024 15:13:08 +0200
Subject: [PATCH 104/115] Small fixes for global search [SCI-10676]

---
 .../vue/global_search/container.vue           | 21 +++++++++++++++++--
 .../vue/global_search/groups/experiments.vue  |  2 +-
 .../groups/my_module_protocols.vue            |  2 +-
 .../vue/global_search/groups/my_modules.vue   |  2 +-
 .../vue/global_search/groups/projects.vue     |  2 +-
 .../vue/global_search/groups/search_mixin.js  |  1 +
 .../vue/navigation/quick_search.vue           |  2 +-
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index 2e9951f29..d866f4771 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -7,7 +7,7 @@
         </h1>
       </div>
     </div>
-    <div class="bg-white rounded p-4 flex gap-2.5 items-center mb-4 sticky top-0">
+    <div class="bg-white rounded p-4 flex gap-2.5 z-10 items-center mb-4 sticky top-0">
       <div class="left-icon sci-input-container-v2 w-72 input-sm"
            :title="i18n.t('nav.search')" :class="{'error': invalidQuery}">
         <input ref="searchField" type="text" class="!pr-9" :value="localQuery" @change="changeQuery" :placeholder="i18n.t('nav.search')"/>
@@ -45,6 +45,7 @@
     </div>
     <template v-for="group in searchGroups">
       <component
+        ref="groupComponents"
         :key="group"
         :is="group"
         v-if="activeGroup === group || !activeGroup"
@@ -53,8 +54,12 @@
         :searchUrl="searchUrl"
         :filters="filters"
         @selectGroup="setActiveGroup"
+        @updated="calculateTotalElements"
       />
     </template>
+    <div v-if="totalElements === 0 && !loading" class="bg-white rounded p-4">
+      <NoSearchResult />
+    </div>
     <teleport to='body'>
       <FiltersModal
         v-if="filterModalOpened"
@@ -83,6 +88,7 @@ import LabelTemplatesComponent from './groups/label_templates.vue';
 import ReportsComponent from './groups/reports.vue';
 import FiltersModal from './filters_modal.vue';
 import GeneralDropdown from '../shared/general_dropdown.vue';
+import NoSearchResult from './groups/helpers/no_search_result.vue';
 
 export default {
   emits: ['search', 'selectGroup'],
@@ -122,7 +128,8 @@ export default {
     LabelTemplatesComponent,
     ReportsComponent,
     FiltersModal,
-    GeneralDropdown
+    GeneralDropdown,
+    NoSearchResult
   },
   data() {
     return {
@@ -130,6 +137,7 @@ export default {
       localQuery: this.query,
       filterModalOpened: false,
       activeGroup: null,
+      totalElements: 0,
       searchGroups: [
         'FoldersComponent',
         'ProjectsComponent',
@@ -191,6 +199,15 @@ export default {
     }
   },
   methods: {
+    calculateTotalElements() {
+      let total = 0;
+      if (this.$refs.groupComponents) {
+        this.$refs.groupComponents.forEach((group) => {
+          total += group.total;
+        });
+      }
+      this.totalElements = total;
+    },
     setActiveGroup(group) {
       if (group === this.activeGroup) {
         this.activeGroup = null;
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index 17dd99acf..7ef501bca 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -9,7 +9,7 @@
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
-      <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto] items-center">
         <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
           <hr class="col-span-5 w-full m-0" v-if="index > 0">
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index fce68f048..b82fb4603 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -9,7 +9,7 @@
       </h2>
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
-      <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto_auto] items-center">
         <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
           <hr class="col-span-7 w-full m-0" v-if="index > 0">
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index 1d2673fb5..a33653f9a 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -9,7 +9,7 @@
       </h2>
       <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
     </div>
-      <div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
         <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
           <hr class="col-span-6 w-full m-0" v-if="index > 0">
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 20cf216f4..3bfef616d 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -9,7 +9,7 @@
         </h2>
         <SortFlyout v-if="selected" :sort="sort" @changeSort="changeSort"></SortFlyout>
       </div>
-      <div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
+      <div class="grid grid-cols-[auto_110px_auto_auto_auto] items-center">
         <div v-for="(row, index) in preparedResults" :key="row.id" class="contents group">
           <hr class="col-span-5 w-full m-0" v-if="index > 0">
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index fd3eca6a6..790d46903 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -137,6 +137,7 @@ export default {
         })
         .finally(() => {
           this.loading = false;
+          this.$emit('updated');
         });
     }
   }
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index d5e57f026..1594a71fa 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -302,7 +302,7 @@ export default {
         });
     },
     searchValue() {
-      window.open(`${this.searchUrl}?q=${this.searchQuery}`, '_self');
+      window.open(`${this.searchUrl}?q=${this.searchQuery}&teams[]=${this.currentTeam}`, '_self');
     },
     focusHistoryItem(event) {
       if (this.focusedHistoryItem === null && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {

From 6a3e3526105be61a23dc60ce755738d05cee18c5 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 7 May 2024 10:18:56 +0200
Subject: [PATCH 105/115] Fix loading global search  data for full view
 [SCI-10677]

---
 app/javascript/vue/global_search/groups/folders.vue     | 2 +-
 app/javascript/vue/global_search/groups/search_mixin.js | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index 3bcc9bb72..c75c66000 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -15,7 +15,7 @@
           <LinkTemplate :url="row.attributes.url"  :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
-          <CellTemplate :label="i18n.t('search.index.floler')" :visible="row.attributes.parent_folder"
+          <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.parent_folder"
                         :url="row.attributes.parent_folder?.url" :value="labelName(row.attributes.parent_folder)"/>
         </div>
       </div>
diff --git a/app/javascript/vue/global_search/groups/search_mixin.js b/app/javascript/vue/global_search/groups/search_mixin.js
index 790d46903..fed580c6d 100644
--- a/app/javascript/vue/global_search/groups/search_mixin.js
+++ b/app/javascript/vue/global_search/groups/search_mixin.js
@@ -40,12 +40,8 @@ export default {
       this.reloadData();
     },
     selected() {
-      if (this.selected) {
-        if (!this.fullDataLoaded) {
-          this.total = 0;
-          this.results = [];
-          this.loadData();
-        }
+      if (this.selected && !this.fullDataLoaded) {
+        this.reloadData();
       }
     },
     query() {

From ed65f06e0c5ea5afadbddc1ca1615efb7e4d75a5 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 7 May 2024 10:45:07 +0200
Subject: [PATCH 106/115] Fix spaces in search results [SCI-10678]

---
 app/javascript/vue/shared/string_with_ellipsis.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/shared/string_with_ellipsis.vue b/app/javascript/vue/shared/string_with_ellipsis.vue
index 801979ce3..cecc59de9 100644
--- a/app/javascript/vue/shared/string_with_ellipsis.vue
+++ b/app/javascript/vue/shared/string_with_ellipsis.vue
@@ -6,10 +6,10 @@
     </div>
   </template>
   <template v-else>
-    <div class="truncate">
+    <div class="truncate whitespace-pre">
       {{ text.slice(0, endCharacters * -1) }}
     </div>
-    <div class="shrink-0">
+    <div class="shrink-0 whitespace-pre">
       {{ text.slice(text.length - endCharacters) }}
     </div>
   </template>

From af549443470539678bdced60e2d015a8a1fa7ebc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 10:57:49 +0000
Subject: [PATCH 107/115] Bump pdfjs-dist from 2.16.105 to 4.2.67

Bumps [pdfjs-dist](https://github.com/mozilla/pdfjs-dist) from 2.16.105 to 4.2.67.
- [Commits](https://github.com/mozilla/pdfjs-dist/commits)

---
updated-dependencies:
- dependency-name: pdfjs-dist
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 53 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index b5acfa65c..6cf2eaf91 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "momentjs": "^2.0.0",
     "node-gyp": "9.3.1",
     "node-polyfill-webpack-plugin": "^2.0.1",
-    "pdfjs-dist": "^2.5.207",
+    "pdfjs-dist": "^4.2.67",
     "postcss": "8.4.31",
     "postcss-loader": "5.3.0",
     "puppeteer": "npm:puppeteer-core",
diff --git a/yarn.lock b/yarn.lock
index 562d1c31f..e0affb7c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2604,6 +2604,15 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912"
   integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
 
+canvas@^2.11.2:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.2.tgz#553d87b1e0228c7ac0fc72887c3adbac4abbd860"
+  integrity sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.0"
+    nan "^2.17.0"
+    simple-get "^3.0.3"
+
 canvas@^2.6.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.0.tgz#7f0c3e9ae94cf469269b5d3a7963a7f3a9936434"
@@ -3350,11 +3359,6 @@ domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
-dommatrix@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dommatrix/-/dommatrix-1.0.3.tgz#e7c18e8d6f3abdd1fef3dd4aa74c4d2e620a0525"
-  integrity sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==
-
 domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -5825,6 +5829,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+path2d@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/path2d/-/path2d-0.2.0.tgz#28bb0e8e6298b2a1adb75ab1b4ffd8c263c28c19"
+  integrity sha512-KdPAykQX6kmLSOO6Jpu2KNcCED7CKjmaBNGGNuctOsG0hgYO1OdYQaan6cYXJiG0WmXOwZZPILPBimu5QAIw3A==
+
 paths-js@^0.4.11:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/paths-js/-/paths-js-0.4.11.tgz#b2a9d5f94ee9949aa8fee945f78a12abff44599e"
@@ -5841,13 +5850,13 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pdfjs-dist@^2.5.207:
-  version "2.16.105"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.16.105.tgz#937b9c4a918f03f3979c88209d84c1ce90122c2a"
-  integrity sha512-J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A==
-  dependencies:
-    dommatrix "^1.0.3"
-    web-streams-polyfill "^3.2.1"
+pdfjs-dist@^4.2.67:
+  version "4.2.67"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-4.2.67.tgz#dd2a65a4b00d95cd4bc2c1f6a27c5e9eb31d512a"
+  integrity sha512-rJmuBDFpD7cqC8WIkQUEClyB4UAH05K4AsyewToMTp2gSy3Rrx8c1ydAVqlJlGv3yZSOrhEERQU/4ScQQFlLHA==
+  optionalDependencies:
+    canvas "^2.11.2"
+    path2d "^0.2.0"
 
 pend@~1.2.0:
   version "1.2.0"
@@ -6309,8 +6318,19 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-puppeteer-core@^21.3.8, "puppeteer@npm:puppeteer-core":
-  name puppeteer
+puppeteer-core@^21.3.8:
+  version "21.3.8"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-21.3.8.tgz#7ac4879c9f73e8426431d8ca4c58680e517a4b08"
+  integrity sha512-yv12E/+zZ7Lei5tJB4sUkSrsuqKibuYpYxLGbmtLUjjYIqGE5HKz9OUI2I/RFHEvF+pHi2bTbv5bWydeCGJ6Mw==
+  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@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==
@@ -7902,11 +7922,6 @@ watchpack@^2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
-web-streams-polyfill@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
-  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

From 290b91feaff8cdaeba1bc1b772ed8bf7412aa2e0 Mon Sep 17 00:00:00 2001
From: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Date: Tue, 7 May 2024 13:43:04 +0200
Subject: [PATCH 108/115] Revert "Bump pdfjs-dist from 2.16.105 to 4.2.67"

---
 package.json |  2 +-
 yarn.lock    | 53 +++++++++++++++++++---------------------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 6cf2eaf91..b5acfa65c 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "momentjs": "^2.0.0",
     "node-gyp": "9.3.1",
     "node-polyfill-webpack-plugin": "^2.0.1",
-    "pdfjs-dist": "^4.2.67",
+    "pdfjs-dist": "^2.5.207",
     "postcss": "8.4.31",
     "postcss-loader": "5.3.0",
     "puppeteer": "npm:puppeteer-core",
diff --git a/yarn.lock b/yarn.lock
index e0affb7c9..562d1c31f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2604,15 +2604,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912"
   integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
 
-canvas@^2.11.2:
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.2.tgz#553d87b1e0228c7ac0fc72887c3adbac4abbd860"
-  integrity sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==
-  dependencies:
-    "@mapbox/node-pre-gyp" "^1.0.0"
-    nan "^2.17.0"
-    simple-get "^3.0.3"
-
 canvas@^2.6.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.0.tgz#7f0c3e9ae94cf469269b5d3a7963a7f3a9936434"
@@ -3359,6 +3350,11 @@ domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
+dommatrix@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dommatrix/-/dommatrix-1.0.3.tgz#e7c18e8d6f3abdd1fef3dd4aa74c4d2e620a0525"
+  integrity sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==
+
 domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -5829,11 +5825,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-path2d@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/path2d/-/path2d-0.2.0.tgz#28bb0e8e6298b2a1adb75ab1b4ffd8c263c28c19"
-  integrity sha512-KdPAykQX6kmLSOO6Jpu2KNcCED7CKjmaBNGGNuctOsG0hgYO1OdYQaan6cYXJiG0WmXOwZZPILPBimu5QAIw3A==
-
 paths-js@^0.4.11:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/paths-js/-/paths-js-0.4.11.tgz#b2a9d5f94ee9949aa8fee945f78a12abff44599e"
@@ -5850,13 +5841,13 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pdfjs-dist@^4.2.67:
-  version "4.2.67"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-4.2.67.tgz#dd2a65a4b00d95cd4bc2c1f6a27c5e9eb31d512a"
-  integrity sha512-rJmuBDFpD7cqC8WIkQUEClyB4UAH05K4AsyewToMTp2gSy3Rrx8c1ydAVqlJlGv3yZSOrhEERQU/4ScQQFlLHA==
-  optionalDependencies:
-    canvas "^2.11.2"
-    path2d "^0.2.0"
+pdfjs-dist@^2.5.207:
+  version "2.16.105"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.16.105.tgz#937b9c4a918f03f3979c88209d84c1ce90122c2a"
+  integrity sha512-J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A==
+  dependencies:
+    dommatrix "^1.0.3"
+    web-streams-polyfill "^3.2.1"
 
 pend@~1.2.0:
   version "1.2.0"
@@ -6318,19 +6309,8 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-puppeteer-core@^21.3.8:
-  version "21.3.8"
-  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-21.3.8.tgz#7ac4879c9f73e8426431d8ca4c58680e517a4b08"
-  integrity sha512-yv12E/+zZ7Lei5tJB4sUkSrsuqKibuYpYxLGbmtLUjjYIqGE5HKz9OUI2I/RFHEvF+pHi2bTbv5bWydeCGJ6Mw==
-  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@npm:puppeteer-core":
+puppeteer-core@^21.3.8, "puppeteer@npm:puppeteer-core":
+  name puppeteer
   version "21.3.8"
   resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-21.3.8.tgz#7ac4879c9f73e8426431d8ca4c58680e517a4b08"
   integrity sha512-yv12E/+zZ7Lei5tJB4sUkSrsuqKibuYpYxLGbmtLUjjYIqGE5HKz9OUI2I/RFHEvF+pHi2bTbv5bWydeCGJ6Mw==
@@ -7922,6 +7902,11 @@ watchpack@^2.4.0:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
+web-streams-polyfill@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
+  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

From 6bcff084fd3722119f2ec9faefcdb2059ec10ee2 Mon Sep 17 00:00:00 2001
From: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Date: Wed, 8 May 2024 09:59:48 +0200
Subject: [PATCH 109/115] Bump version to 1.33.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index e64f8c8aa..7aa332e41 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.32.0.2
+1.33.0

From 78cd3efad3e679901a8bdc747211121262168631 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 8 May 2024 11:52:01 +0200
Subject: [PATCH 110/115] Small fixes for global search [SCI-10681]

---
 .../vue/global_search/container.vue           |  89 ++++++++++++++++--
 .../groups/helpers/link_template.vue          |  10 +-
 .../vue/navigation/quick_search.vue           |  13 ++-
 app/views/layouts/application.html.erb        |   1 +
 config/locales/en.yml                         |   3 +-
 .../assets/stylesheets/fonts/SN-icon-font.eot | Bin 34214 -> 34334 bytes
 .../assets/stylesheets/fonts/SN-icon-font.svg |   1 +
 .../assets/stylesheets/fonts/SN-icon-font.ttf | Bin 34028 -> 34148 bytes
 .../stylesheets/fonts/SN-icon-font.woff       | Bin 34104 -> 34224 bytes
 .../stylesheets/fonts/SN-icon-font.woff2      | Bin 14472 -> 14536 bytes
 vendor/assets/stylesheets/sn-icon-font.css    |  15 +--
 11 files changed, 108 insertions(+), 24 deletions(-)

diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index d866f4771..3490165c2 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -8,12 +8,36 @@
       </div>
     </div>
     <div class="bg-white rounded p-4 flex gap-2.5 z-10 items-center mb-4 sticky top-0">
-      <div class="left-icon sci-input-container-v2 w-72 input-sm"
-           :title="i18n.t('nav.search')" :class="{'error': invalidQuery}">
-        <input ref="searchField" type="text" class="!pr-9" :value="localQuery" @change="changeQuery" :placeholder="i18n.t('nav.search')"/>
-        <i class="sn-icon sn-icon-search"></i>
-        <i v-if="localQuery.length > 0" class="sn-icon cursor-pointer sn-icon-close absolute right-0 -top-0.5" @click="localQuery = ''"></i>
-      </div>
+      <GeneralDropdown ref="historyContainer" :canOpen="canOpenHistory" :fieldOnlyOpen="true" >
+        <template v-slot:field>
+          <div class="left-icon sci-input-container-v2 w-72 input-sm"
+              :title="i18n.t('nav.search')" :class="{'error': invalidQuery}">
+            <input ref="searchField"
+              type="text"
+              class="!pr-9"
+              :value="localQuery"
+              @change="changeQuery"
+              @keydown.enter="changeQuery"
+              @blur="changeQuery"
+              :placeholder="i18n.t('nav.search')"
+            />
+            <i class="sn-icon sn-icon-search"></i>
+            <i v-if="localQuery.length > 0"
+              class="sn-icon cursor-pointer sn-icon-close absolute right-0 -top-0.5"
+              @click="localQuery = ''; $refs.searchField.focus()"></i>
+          </div>
+        </template>
+        <template v-slot:flyout >
+          <div v-for="(query, i) in reversedPreviousQueries" @click="setQuery(query)" :key="i"
+              ref="historyItems"
+              tabindex="1"
+              @keydown.enter="setQuery(query)"
+              class="flex px-3 h-11 items-center gap-2 hover:bg-sn-super-light-grey cursor-pointer">
+            <i class="sn-icon sn-icon-history-search"></i>
+            {{ query }}
+          </div>
+        </template>
+      </GeneralDropdown>
       <div class="flex items-center gap-2.5">
         <button class="btn btn-secondary btn-sm" :class="{'active': activeGroup == 'ExperimentsComponent'}" @click="setActiveGroup('ExperimentsComponent')">
           {{ i18n.t('search.index.experiments') }}
@@ -42,6 +66,10 @@
           <span class="tw-hidden lg:inline">{{ i18n.t('search.index.clear_filters') }}</span>
         </button>
       </template>
+      <button v-if="activeGroup" class="btn btn-light btn-sm" @click="resetGroup">
+        <i class="sn-icon sn-icon-undo"></i>
+        <span class="tw-hidden lg:inline">{{ i18n.t('search.index.all_results') }}</span>
+      </button>
     </div>
     <template v-for="group in searchGroups">
       <component
@@ -57,7 +85,7 @@
         @updated="calculateTotalElements"
       />
     </template>
-    <div v-if="totalElements === 0 && !loading" class="bg-white rounded p-4">
+    <div v-if="totalElements === 0" class="bg-white rounded p-4">
       <NoSearchResult />
     </div>
     <teleport to='body'>
@@ -136,6 +164,8 @@ export default {
       filters: {},
       localQuery: this.query,
       filterModalOpened: false,
+      previousQueries: [],
+      invalidQuery: false,
       activeGroup: null,
       totalElements: 0,
       searchGroups: [
@@ -154,9 +184,6 @@ export default {
     };
   },
   computed: {
-    invalidQuery() {
-      return this.localQuery.length < 2;
-    },
     activeFilters() {
       return Object.keys(this.filters).filter((key) => {
         if (key === 'created_at' || key === 'updated_at') {
@@ -166,6 +193,12 @@ export default {
         }
         return this.filters[key];
       });
+    },
+    canOpenHistory() {
+      return this.previousQueries.length > 0 && this.localQuery.length === 0;
+    },
+    reversedPreviousQueries() {
+      return [...this.previousQueries].reverse();
     }
   },
   created() {
@@ -197,6 +230,8 @@ export default {
     if (this.filters.group) {
       this.activeGroup = this.filters.group;
     }
+
+    this.previousQueries = JSON.parse(localStorage.getItem('quickSearchHistory') || '[]');
   },
   methods: {
     calculateTotalElements() {
@@ -217,8 +252,38 @@ export default {
 
       this.filters.group = this.activeGroup;
     },
+    setQuery(query) {
+      this.localQuery = query;
+      this.invalidQuery = false;
+      this.$refs.historyContainer.isOpen = false;
+    },
     changeQuery(event) {
+      if (event.target.value === this.localQuery) {
+        return;
+      }
+
       this.localQuery = event.target.value;
+
+      if (event.target.value.length < 2) {
+        this.invalidQuery = true;
+        return;
+      }
+
+      this.invalidQuery = false;
+      this.saveQuery();
+    },
+    saveQuery() {
+      if (this.localQuery.length > 1) {
+        if (this.previousQueries[this.previousQueries.length - 1] === this.localQuery) return;
+
+        this.previousQueries.push(this.localQuery);
+
+        if (this.previousQueries.length > 5) {
+          this.previousQueries.shift();
+        }
+        localStorage.setItem('quickSearchHistory', JSON.stringify(this.previousQueries));
+        this.$refs.historyContainer.isOpen = false;
+      }
     },
     applyFilters(filters) {
       this.filters = filters;
@@ -226,6 +291,10 @@ export default {
 
       this.activeGroup = this.filters.group;
     },
+    resetGroup() {
+      this.activeGroup = null;
+      this.filters.group = null;
+    },
     resetFilters() {
       this.filters = {
         created_at: {
diff --git a/app/javascript/vue/global_search/groups/helpers/link_template.vue b/app/javascript/vue/global_search/groups/helpers/link_template.vue
index 3de291e45..831cdd1c7 100644
--- a/app/javascript/vue/global_search/groups/helpers/link_template.vue
+++ b/app/javascript/vue/global_search/groups/helpers/link_template.vue
@@ -1,7 +1,13 @@
 <template>
-    <a target="_blank" :href="url" class="h-full py-2 px-4 overflow-hidden font-bold flex gap-1 items-center group-hover:bg-sn-super-light-grey hover:no-underline">
+    <a target="_blank" :href="url"
+       class="h-full py-2 px-4 flex gap-1 items-center font-bold overflow-hidden group-hover:bg-sn-super-light-grey hover:no-underline"
+    >
       <span v-if="icon" :class="icon" class="sn-icon shrink-0"></span>
-      <StringWithEllipsis class="w-full"
+      <StringWithEllipsis
+        :class="{
+          'w-full': !icon,
+          'w-[calc(100%-2rem)]': icon
+        }"
         :text="value">
       </StringWithEllipsis>
     </a>
diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 1594a71fa..dd4f0375f 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -7,7 +7,7 @@
                @focus="openHistory" :placeholder="i18n.t('nav.search')" @keyup.enter="saveQuery"/>
         <i class="sn-icon sn-icon-search"></i>
         <div v-if="this.searchQuery.length > 1" class="flex items-center gap-1 absolute right-2 top-1.5">
-          <div class="btn btn-light icon-btn btn-xs" @click="this.searchQuery = ''">
+          <div class="btn btn-light icon-btn btn-xs" @click="this.searchQuery = ''; $refs.searchField.focus()">
             <i class="sn-icon sn-icon-close  m-0"></i>
           </div>
           <div class="btn btn-light icon-btn btn-xs" :title="i18n.t('search.quick_search.search_options')"
@@ -96,7 +96,7 @@
         <div v-if="!loading && results.length === 0" class="p-2 flex items-center gap-6">
           <i class="sn-icon sn-icon-search text-sn-sleepy-grey" style="font-size: 64px !important;"></i>
           <div>
-            <b>{{ i18n.t('search.quick_search.empty_title') }}</b>
+            <b>{{ i18n.t('search.quick_search.empty_title', {team: currentTeamName}) }}</b>
             <div class="text-xs text-sn-dark-grey">
               {{ i18n.t('search.quick_search.empty_description', {query: searchQuery}) }}
             </div>
@@ -147,13 +147,16 @@ export default {
   },
   computed: {
     reversedPreviousQueries() {
-      return this.previousQueries.reverse();
+      return [...this.previousQueries].reverse();
     },
     canOpen() {
       return this.previousQueries.length > 0 || this.searchQuery.length > 1;
     },
     showHistory() {
       return this.searchQuery.length < 2;
+    },
+    currentTeamName() {
+      return document.querySelector('body').dataset.currentTeamName;
     }
   },
   watch: {
@@ -262,11 +265,11 @@ export default {
       });
     },
     saveQuery() {
-      if (this.searchQuery.length > 0) {
+      if (this.searchQuery.length > 1) {
         this.previousQueries.push(this.searchQuery);
 
         if (this.previousQueries.length > 5) {
-          this.previousQueries.shift();
+          this.previousQueries = this.previousQueries.slice(1);
         }
 
         localStorage.setItem('quickSearchHistory', JSON.stringify(this.previousQueries));
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6dd517da9..5ac9b0d9b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -67,6 +67,7 @@
     class="<%= yield :body_class %> <%= 'navigator-collapsed' if !@navigator || session[:navigator_collapsed] %> <%= 'w-[98%]' if params[:controller] == 'label_templates' && params[:action] == 'show'%>"
     <% if user_signed_in? && current_team.present? %>
     data-current-team-id="<%= current_team.id %>"
+    data-current-team-name="<%= current_team.name %>"
     data-atwho-users-url="<%= atwho_users_team_path(current_team) %>"
     data-atwho-task-url="<%= atwho_my_modules_team_path(current_team) %>"
     data-atwho-project-url="<%= atwho_projects_team_path(current_team) %>"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9b809da8a..be6c85584 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -448,7 +448,7 @@ en:
       results: "Results"
       inventory_items: "Inventory items"
       all_results: "All search results for \"%{query}\""
-      empty_title: "No quick search results found."
+      empty_title: "No quick search results found in %{team}."
       empty_description: "Quick search only checks titles. Press enter or click \"All search results for '%{query}'\" to find all available matches."
       search_options: "Search options"
       project: "Project"
@@ -508,6 +508,7 @@ en:
       repository: "Inventory"
       more_search_options: "More search options"
       clear_filters: "Clear filters"
+      all_results: "All results"
       id: "ID"
       created_at: "Created on"
       created_by: "Created by"
diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.eot b/vendor/assets/stylesheets/fonts/SN-icon-font.eot
index e0d4dda31416d5ed277ff2d0008a1d86162b2be0..37c6bc796727c5cbf08760590f15f6911c75ba33 100644
GIT binary patch
delta 370
zcmZ41%`~rviA}DJfgz=JBAXdY!FSJ)i4MJjCm9$R_5g80a&BUQc-UqAiT7mc+1M*0
z85kHV7#M15GEx&$)Q@_<VPL5J0#s*~0Tf_g#*)XtP^Sart7PPsR4mg2vKZ<D7#Ntg
z<m4wOp5%L>!obkT0yHBgH?g9C;VdH?14B~+P?17jVs7e6?%v%%egjbb!Giqa5(Z|V
z3`466NS=Y2d2%JA1LKOxyBNJ0S8QfuvZ$&5e}LJB`2d451B0rmqLG=o9iyp<nz|mN
zvZ6S<y16*JqLG-m9HXcR8#^CRjM0YCRLMd@90(*Vl>Tk2m*2EWzMj!b%R^394v0Lo
z{+&LcEha8*p`d6XCN5Sd2b8aqm6dhV(sTz>KxZ(5uy$*R=l6nmejCxR4BSA^0Kub#
kw_joO<hVL>#<iQL)oozf?9>>?$YEy(*0*-^il%=|00a(UMgRZ+

delta 253
zcmbQ&!?diMiEUXc1H+q^iEL&pYAa-~Pju)NJi)-gum^|}l5-Oa#KSJ@O}r;l@9}l^
z83qQ%3I>K6j*QgA6!p9bRtyZa4M25f89)K{Wh}Ws{th5tB_p?_Vv!z@#ZY^Pfq`j5
zPJVLYNxqfO7#JFQfM!JHCRP+MoMB{RU}$^+RHTrXn47wiyLUGOLlXy3{lS9#;t~dC
zkp32+oeT;L%*>N3866mxPu|7o&A5Cs8<Rzi0t2IV>vh=`YVrIwUm3VrK&lxYnNE;_
i(UULLnKQ20%vHaEY4g6uC`O>k42(d$X0t-`KPCX%{7H@g

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.svg b/vendor/assets/stylesheets/fonts/SN-icon-font.svg
index 8a3557bdd..a49503eba 100644
--- a/vendor/assets/stylesheets/fonts/SN-icon-font.svg
+++ b/vendor/assets/stylesheets/fonts/SN-icon-font.svg
@@ -194,4 +194,5 @@
 <glyph unicode="&#xe9a5;" glyph-name="experiment-mini" data-tags="experiment-mini" d="M307.929 140.8c-22.141 0-37.673 9.815-46.598 29.44-8.958 19.625-6.625 37.545 7 53.76l141.471 257.28v222.72h-70.255c-7.664 0-13.847 2.56-18.547 7.68-4.667 5.12-7 11.094-7 17.92 0 7.68 2.333 13.875 7 18.586 4.701 4.676 10.883 7.014 18.547 7.014h344.89c7.665 0 13.844-2.56 18.545-7.68 4.669-5.12 6.999-11.094 6.999-17.92 0-7.68-2.33-13.858-6.999-18.534-4.7-4.71-10.88-7.066-18.545-7.066h-70.257v-222.72l141.471-257.28c13.624-16.215 15.974-34.135 7.050-53.76-8.955-19.625-24.509-29.44-46.648-29.44h-408.124zM307.929 192h408.124l-152.965 271.36v240.64h-102.191v-240.64l-152.968-271.36z" />
 <glyph unicode="&#xe9a6;" glyph-name="task-mini" data-tags="task-mini" d="M339.2 140.8c-23.894 0-43.725 7.885-59.494 23.654-15.804 15.805-23.706 35.651-23.706 59.546v448c0 23.894 7.902 43.742 23.706 59.546 15.77 15.77 35.601 23.654 59.494 23.654h249.6l179.2-179.2v-352c0-23.895-7.885-43.74-23.654-59.546-15.805-15.77-35.651-23.654-59.546-23.654h-345.6zM563.2 550.4v153.6h-224c-8.534 0-15.991-3.209-22.374-9.626-6.417-6.383-9.626-13.841-9.626-22.374v-448c0-8.535 3.209-15.99 9.626-22.374 6.383-6.415 13.841-9.626 22.374-9.626h345.6c8.535 0 15.99 3.21 22.374 9.626 6.415 6.385 9.626 13.839 9.626 22.374v326.4h-153.6zM652.984 468.48l-171.313-228.413-123.272 123.269 36.204 36.209 81.528-81.531 135.892 181.187 40.96-30.72z" />
 <glyph unicode="&#xe9a7;" glyph-name="flag" data-tags="flag" d="M256 128v661.333h306.871l17.067-85.333h230.729v-341.333h-221.538l-17.067 85.333h-273.395v-320h-42.667zM625.067 405.333h142.933v256h-224l-17.067 85.333h-228.267v-256h309.333l17.067-85.333z" />
+<glyph unicode="&#xe9a8;" glyph-name="undo" data-tags="undo" d="M315.893 192v42.667h309.506c44.25 0 81.954 15.181 113.109 45.538 31.142 30.357 46.72 67.413 46.72 111.177s-15.578 80.687-46.72 110.775c-31.155 30.084-68.86 45.129-113.109 45.129h-330.338l126.517-126.528-30.197-30.199-178.048 178.061 178.048 178.048 30.197-30.197-126.517-126.517h330.338c55.851 0 103.561-19.257 143.134-57.771 39.573-38.507 59.362-85.44 59.362-140.8 0-55.351-19.789-102.421-59.362-141.205s-87.283-58.176-143.134-58.176h-309.506z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.ttf b/vendor/assets/stylesheets/fonts/SN-icon-font.ttf
index 6f3a6b27e56f84d71d0e2a73e4a7a5a03dff9b98..4adfce87ca8accb55eec7cab3d33d3238ecede02 100644
GIT binary patch
delta 390
zcmaFU$@HX)sh)w6fq{XWp@D&!!N5OQ--us`?IciS4-h9L=Oz}2hh5fZU|^I1@<Y-S
ziwl6X0FV!&Inr|~)7aQ6B7yu028NoNjMT&w^`qWz7#M250OidxfCB8xSn?Pc>U4m7
zm5khyie-907DHVC0|V2Rocv_V#FKn4R2Uc<S%8Mb<R(@WFq~y%V_;}X0IE{ROUzAO
z$=$mf$Zr5@I9QNhTmp0`5VX2X+~Ll+ViKb_<BH8bj21QZ{|_+RFdtx0W?)b?RWvd)
zw_`LlQB&7rR8|ycS2q`DS2Pk6mtzzaVPoe5iZR+SnkrdHhy#Iyh0?!m_41oG$=5S_
zX?e)W$^nsw*1yvSw8g~5Eff?j#Kgtw<bd*Zva+&nTAJ=a3g`q-z%gpKhIoE2i08Kv
x{mQ@%^aBt)N_hJfMo(T+YtFcK^PSoaOq1$ZHup3{F>=`1fwivP{I2mI69CK`VzdAN

delta 284
zcmaFT#q_3=sh)w6fq{XWp@D&!!N5OQ--us`?F3L{4-h9L=Oz}2hh5fVU|^I1@<Y-S
ziwl6X0FV!&Inr|~(>%V;J_F=eFfi0`WTYmhsOL?vVqmCk0Lq(X00r2WvE%~zJAizZ
zjNFonML^Sl{5uQ`OdE3YlPwcZ@~wQvz|hbGG$blFv7&(C3?mx@L*omeDuukn+|-ra
zy}KD0nmB+O4i@AWmjE3K1TAMK?r>*ZK8ewrartH+MvEE+21f1H>#{4<;`wd9GH|ni
z6frz9od9w;n4T<AXU@20b3ok&rp+vkQH(-Bagg8FFtRYngA_3^O%7}o-rU^ukO=^k
CyhzFb

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.woff b/vendor/assets/stylesheets/fonts/SN-icon-font.woff
index 198b0c4dda9f9457f054119c057710da54c63256..f8bbe69f9292f32acbde17894e2deb5906f93b79 100644
GIT binary patch
delta 429
zcmdnd#k8TDNuu1}&5ePP0SH<*FmQwE6d+%4vSO>qL>=M!lgYV>1q=*~89=EJ5Ec)+
zte>7(3=-P|<a0o=KzdGP8c^&A14B&>2(z(QL}sKWrZ6znIRMp|fw1~f?>8AhL7-R#
zkgo#5?8{j4GIC3R{JJ>|3`|=<c$pppLr#7&P@P?40MO7F5I)KGLM1n`0%&p58lXl6
zFh0x3mY0~D3KTm7)OZktS9166F32w~0s3gd#6SLwD<=CedNZ!rJcH4qrvCo{W*g=M
z49W})s-}uYX6AN`rY36YdW_17;_T|?;_Qk>V&Za)q9SbUd_XZq8%9$l3kh)`kg!nt
zx2;}&(<b?PMlUT7IaxU%^3eKs`hd2WxVVLaqJ@~aSe+bDzD`zF)=f*(9Y_J4$OyvP
zts$P@3*z~0M87g{vj9aH7#=0O{R*Qef2cKQT)SDLZUfWgfI61VHyWZCIqdAfde?5Y
IYWl|n0Fm-*6951J

delta 300
zcmdnc&9tM7Nu=E0&5ePP0SH<x7`Q=n%bSTJ+Vv-ra}x^~7#K5vA|W6w9(GwTJ+T-h
zwg<@PfMS94oXRwy*bxSX8lYGWhsW31XEIU~Qy3U(&j8h!fv|es1gi|7AOk}k3y`k@
z!tBdfax-#EDu7}d3=B*gKzNZJ14B-JGEkje!wsOJQ6PMhZ{@Sx#0sFrO(sB%3SfMO
zku5JVHx(!bbR5$`5MIgMySpI2xCH1EiHU#w8JAD?Vf1EPzIg_tMU4Ujqju|c*%fN>
w{5D@1xIvC!V0dIYK?X)oPN_3zT(fyj-3F%30gX|NAn!2(@tVz>n*K2X0L|)5UjP6A

diff --git a/vendor/assets/stylesheets/fonts/SN-icon-font.woff2 b/vendor/assets/stylesheets/fonts/SN-icon-font.woff2
index ed0f4ee8b1355fc06a3001ab4d85a3ec01e4eb41..c68de5ac3bc6c9c0e9b93f3b4b909247682d0e47 100644
GIT binary patch
literal 14536
zcmV;(I5)?4Pew8T0RR91065413jhEB0EJip062C40V{<700000000000000000000
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

literal 14472
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
a7vzx+SKhMs7Z?g?tkz_$3Y+OOj)MazQ#(EY

diff --git a/vendor/assets/stylesheets/sn-icon-font.css b/vendor/assets/stylesheets/sn-icon-font.css
index 4d1d665b8..3d1d209c4 100644
--- a/vendor/assets/stylesheets/sn-icon-font.css
+++ b/vendor/assets/stylesheets/sn-icon-font.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'SN-icon-font';
-  src:  url('fonts/SN-icon-font.eot?o0xor4');
-  src:  url('fonts/SN-icon-font.eot?o0xor4#iefix') format('embedded-opentype'),
-    url('fonts/SN-icon-font.woff2?o0xor4') format('woff2'),
-    url('fonts/SN-icon-font.ttf?o0xor4') format('truetype'),
-    url('fonts/SN-icon-font.woff?o0xor4') format('woff'),
-    url('fonts/SN-icon-font.svg?o0xor4#SN-icon-font') format('svg');
+  src:  url('fonts/SN-icon-font.eot?m1g5fz');
+  src:  url('fonts/SN-icon-font.eot?m1g5fz#iefix') format('embedded-opentype'),
+    url('fonts/SN-icon-font.woff2?m1g5fz') format('woff2'),
+    url('fonts/SN-icon-font.ttf?m1g5fz') format('truetype'),
+    url('fonts/SN-icon-font.woff?m1g5fz') format('woff'),
+    url('fonts/SN-icon-font.svg?m1g5fz#SN-icon-font') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -530,3 +530,6 @@
 .sn-icon-flag:before {
   content: "\e9a7";
 }
+.sn-icon-undo:before {
+  content: "\e9a8";
+}

From c40ebc1e7d5bfa6a7308bbd943bdb6edc6dd2d5e Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 9 May 2024 13:25:15 +0200
Subject: [PATCH 111/115] Fix links for global search results [SCI-10682]

---
 app/controllers/dashboards_controller.rb      |  4 +++
 app/controllers/experiments_controller.rb     |  3 ++
 .../global_search/asset_serializer.rb         | 36 +++++++++++++------
 .../global_search/experiment_serializer.rb    | 19 +++++++---
 .../label_template_serializer.rb              |  2 +-
 .../my_module_protocol_serializer.rb          | 24 +++++++++----
 .../global_search/my_module_serializer.rb     | 19 +++++++---
 .../project_folder_serializer.rb              | 15 +++++---
 .../global_search/project_serializer.rb       | 15 +++++---
 .../global_search/protocol_serializer.rb      |  2 +-
 .../global_search/report_serializer.rb        |  9 ++---
 .../repository_row_serializer.rb              | 16 ++++++---
 .../global_search/result_serializer.rb        | 21 +++++++----
 13 files changed, 136 insertions(+), 49 deletions(-)

diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
index bbc91737d..347836601 100644
--- a/app/controllers/dashboards_controller.rb
+++ b/app/controllers/dashboards_controller.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class DashboardsController < ApplicationController
+  include TeamsHelper
+
+  before_action :switch_team_with_param, only: :show
+
   def show
     @my_module_status_flows = MyModuleStatusFlow.all.preload(my_module_statuses: :my_module_status_consequences)
   end
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 5d4046fc7..11b26bfda 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -452,6 +452,9 @@ class ExperimentsController < ApplicationController
     @project = Project.find_by(id: params[:project_id])
 
     render_404 unless @project
+
+    current_team_switch(@project.team) if current_team != @project.team
+
     render_403 unless can_read_project?(@project)
   end
 
diff --git a/app/serializers/global_search/asset_serializer.rb b/app/serializers/global_search/asset_serializer.rb
index 68741626d..07f2acca1 100644
--- a/app/serializers/global_search/asset_serializer.rb
+++ b/app/serializers/global_search/asset_serializer.rb
@@ -23,16 +23,20 @@ module GlobalSearch
     end
 
     def team
-      { name: object.team.name }
+      {
+        name: object.team.name,
+        url: dashboard_path(team: object.team)
+      }
     end
 
     def experiment
       return { name: '' } unless object.my_module
 
+      archived = object.my_module.experiment.archived_branch?
       {
         name: object.my_module.experiment.name,
-        url: my_modules_experiment_path(id: object.my_module.experiment.id, search: object.my_module.code),
-        archived: object.my_module.experiment.archived?
+        url: my_modules_experiment_path(id: object.my_module.experiment.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
@@ -41,14 +45,14 @@ module GlobalSearch
       if parent.is_a?(Result) && object.my_module
         parent_type = 'task'
         parent_name = object.my_module.name
-        parent_archived = parent.archived?
-        view_mode = parent_archived ? 'archived' : 'active'
-        parent_url = my_module_results_path(my_module_id: object.my_module.id, view_mode: view_mode)
+        parent_archived = parent.my_module.archived_branch?
+        parent_url = my_module_results_path(my_module_id: object.my_module.id, view_mode: view_mode(parent.archived?))
       elsif parent.is_a?(Step) && object.my_module
         parent_type = 'task'
         parent_name = object.my_module.name
-        parent_archived = object.my_module.archived?
-        parent_url = protocols_my_module_path(object.my_module.id)
+        parent_archived = object.my_module.archived_branch?
+        parent_url = protocols_my_module_path(object.my_module.id,
+                                              view_mode: view_mode(parent_archived))
       elsif parent.is_a?(Step)
         parent_type = 'protocol_template'
         parent_name = parent.protocol.name || I18n.t('search.index.untitled_protocol')
@@ -58,11 +62,23 @@ module GlobalSearch
         parent_type = 'inventory_item'
         parent_name = parent.repository_row.name
         parent_archived = parent.repository_row.archived?
-        parent_url =
-          repository_path(id: parent.repository_row.repository_id, repository_row_id: parent.repository_row.id)
+
+        params = {
+          id: parent.repository_row.repository_id,
+          landing_page: true,
+          row_id: parent.repository_row.id
+        }
+        params[:archived] = true if parent_archived
+        parent_url = repository_path(params)
       end
 
       { name: parent_name, url: parent_url, type: parent_type, archived: parent_archived }
     end
+
+    private
+
+    def view_mode(archived)
+      archived ? 'archived' : 'active'
+    end
   end
 end
diff --git a/app/serializers/global_search/experiment_serializer.rb b/app/serializers/global_search/experiment_serializer.rb
index 76b3089ba..819abf15f 100644
--- a/app/serializers/global_search/experiment_serializer.rb
+++ b/app/serializers/global_search/experiment_serializer.rb
@@ -9,24 +9,35 @@ module GlobalSearch
     def team
       {
         name: object.project.team.name,
-        url: projects_path(team_id: object.project.team.id)
+        url: dashboard_path(team: object.team)
       }
     end
 
     def project
+      archived = object.project.archived?
       {
         name: object.project.name,
-        url: project_experiments_path(project_id: object.project.id),
-        archived: object.project.archived?
+        url: project_experiments_path(project_id: object.project.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
+    def archived
+      object.archived_branch?
+    end
+
     def created_at
       I18n.l(object.created_at, format: :full_date)
     end
 
     def url
-      my_modules_experiment_path(object.id)
+      my_modules_experiment_path(object.id, view_mode: view_mode(archived))
+    end
+
+    private
+
+    def view_mode(archived)
+      archived ? 'archived' : 'active'
     end
   end
 end
diff --git a/app/serializers/global_search/label_template_serializer.rb b/app/serializers/global_search/label_template_serializer.rb
index b74a2c1fe..546e504c4 100644
--- a/app/serializers/global_search/label_template_serializer.rb
+++ b/app/serializers/global_search/label_template_serializer.rb
@@ -9,7 +9,7 @@ module GlobalSearch
     def team
       {
         name: object.team.name,
-        url: label_templates_path(team: object.team)
+        url: dashboard_path(team: object.team)
       }
     end
 
diff --git a/app/serializers/global_search/my_module_protocol_serializer.rb b/app/serializers/global_search/my_module_protocol_serializer.rb
index 66f8a4075..03bc63448 100644
--- a/app/serializers/global_search/my_module_protocol_serializer.rb
+++ b/app/serializers/global_search/my_module_protocol_serializer.rb
@@ -13,23 +13,25 @@ module GlobalSearch
     def team
       {
         name: object.team.name,
-        url: protocols_path(team_id: object.team.id)
+        url: dashboard_path(team: object.team)
       }
     end
 
     def experiment
+      archived = object.my_module.experiment.archived_branch?
       {
         name: object.my_module.experiment.name,
-        url: my_modules_experiment_path(object.my_module.experiment.id),
-        archived: object.my_module.experiment.archived?
+        url: my_modules_experiment_path(object.my_module.experiment.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
     def my_module
+      archived = object.my_module.archived_branch?
       {
         name: object.my_module.name,
-        url: protocols_my_module_path(object.my_module.id),
-        archived: object.my_module.archived?
+        url: protocols_my_module_path(object.my_module.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
@@ -37,12 +39,22 @@ module GlobalSearch
       I18n.l(object.created_at, format: :full_date)
     end
 
+    def archived
+      object.my_module.archived_branch?
+    end
+
     def updated_at
       I18n.l(object.updated_at, format: :full_date)
     end
 
     def url
-      protocols_my_module_path(object.my_module.id)
+      protocols_my_module_path(object.my_module.id, view_mode: view_mode(archived))
+    end
+
+    private
+
+    def view_mode(archived)
+      archived ? 'archived' : 'active'
     end
   end
 end
diff --git a/app/serializers/global_search/my_module_serializer.rb b/app/serializers/global_search/my_module_serializer.rb
index 8a1cff46c..220ed9b95 100644
--- a/app/serializers/global_search/my_module_serializer.rb
+++ b/app/serializers/global_search/my_module_serializer.rb
@@ -9,15 +9,16 @@ module GlobalSearch
     def team
       {
         name: object.experiment.project.team.name,
-        url: projects_path(team_id: object.experiment.project.team.id)
+        url: dashboard_path(team: object.team)
       }
     end
 
     def experiment
+      archived = object.experiment.archived_branch?
       {
         name: object.experiment.name,
-        url: my_modules_experiment_path(object.experiment.id),
-        archived: object.experiment.archived?
+        url: my_modules_experiment_path(object.experiment.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
@@ -29,8 +30,18 @@ module GlobalSearch
       I18n.l(object.updated_at, format: :full_date)
     end
 
+    def archived
+      object.archived_branch?
+    end
+
     def url
-      protocols_my_module_path(object.id)
+      protocols_my_module_path(object.id, view_mode: view_mode(archived))
+    end
+
+    private
+
+    def view_mode(archived)
+      archived ? 'archived' : 'active'
     end
   end
 end
diff --git a/app/serializers/global_search/project_folder_serializer.rb b/app/serializers/global_search/project_folder_serializer.rb
index 628076555..62ea6943a 100644
--- a/app/serializers/global_search/project_folder_serializer.rb
+++ b/app/serializers/global_search/project_folder_serializer.rb
@@ -9,7 +9,7 @@ module GlobalSearch
     def team
       {
         name: object.team.name,
-        url: projects_path(project_folder_id: object.id)
+        url: dashboard_path(team: object.team)
       }
     end
 
@@ -18,17 +18,24 @@ module GlobalSearch
     end
 
     def url
-      project_folder_path(object)
+      project_folder_path(object, team: object.team, view_mode: view_mode(object.archived?))
     end
 
     def parent_folder
       if object.parent_folder_id?
+        archived = object.parent_folder.archived?
         {
           name: object.parent_folder.name,
-          url: project_folder_path(object.parent_folder.id),
-          archived: object.parent_folder.archived?
+          url: project_folder_path(object.parent_folder.id, team: object.team, view_mode: view_mode(archived)),
+          archived: archived
         }
       end
     end
+
+    private
+
+    def view_mode(archived)
+      archived ? 'archived' : 'active'
+    end
   end
 end
diff --git a/app/serializers/global_search/project_serializer.rb b/app/serializers/global_search/project_serializer.rb
index cd32cbbfa..c818c6cfe 100644
--- a/app/serializers/global_search/project_serializer.rb
+++ b/app/serializers/global_search/project_serializer.rb
@@ -8,7 +8,7 @@ class GlobalSearch::ProjectSerializer < ActiveModel::Serializer
   def team
     {
       name: object.team.name,
-      url: projects_path(team: object.team)
+      url: dashboard_path(team: object.team)
     }
   end
 
@@ -17,16 +17,23 @@ class GlobalSearch::ProjectSerializer < ActiveModel::Serializer
   end
 
   def url
-    project_path(object)
+    project_path(object, team: object.team, view_mode: view_mode(object.archived?))
   end
 
   def folder
     if object.project_folder
+      archived = object.project_folder.archived?
       {
         name: object.project_folder.name,
-        url: project_folder_path(object.project_folder),
-        archived: object.project_folder.archived?
+        url: project_folder_path(object.project_folder, team: object.team, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
   end
+
+  private
+
+  def view_mode(archived)
+    archived ? 'archived' : 'active'
+  end
 end
diff --git a/app/serializers/global_search/protocol_serializer.rb b/app/serializers/global_search/protocol_serializer.rb
index feac6d3fd..b5f4d1054 100644
--- a/app/serializers/global_search/protocol_serializer.rb
+++ b/app/serializers/global_search/protocol_serializer.rb
@@ -9,7 +9,7 @@ module GlobalSearch
     def team
       {
         name: object.team.name,
-        url: protocols_path(team: object.team)
+        url: dashboard_path(team: object.team)
       }
     end
 
diff --git a/app/serializers/global_search/report_serializer.rb b/app/serializers/global_search/report_serializer.rb
index 673695a38..80515f687 100644
--- a/app/serializers/global_search/report_serializer.rb
+++ b/app/serializers/global_search/report_serializer.rb
@@ -9,15 +9,16 @@ module GlobalSearch
     def team
       {
         name: object.team.name,
-        url: projects_path(team: object.team)
+        url: dashboard_path(team: object.team)
       }
     end
 
     def project
+      archived = object.project.archived?
       {
         name: object.project.name,
-        url: project_experiments_path(project_id: object.project.id),
-        archived: object.project.archived?
+        url: project_experiments_path(project_id: object.project.id, view_mode: archived ? 'archived' : 'active'),
+        archived: archived
       }
     end
 
@@ -37,7 +38,7 @@ module GlobalSearch
     end
 
     def url
-      reports_path(search: object.code)
+      reports_path(search: object.code, team: object.team)
     end
   end
 end
diff --git a/app/serializers/global_search/repository_row_serializer.rb b/app/serializers/global_search/repository_row_serializer.rb
index a597cfcd4..8cbf8ce2a 100644
--- a/app/serializers/global_search/repository_row_serializer.rb
+++ b/app/serializers/global_search/repository_row_serializer.rb
@@ -9,7 +9,7 @@ module GlobalSearch
     def team
       {
         name: object.team.name,
-        url: repository_path(object.repository)
+        url: dashboard_path(team: object.team)
       }
     end
 
@@ -25,16 +25,22 @@ module GlobalSearch
     end
 
     def repository
+      archived = object.repository.archived
       {
         name: object.repository.name,
-        url: repository_path(object.repository),
-        archived: object.repository.archived
+        url: repository_path(object.repository, view_mode: archived ? 'archived' : 'active'),
+        archived: archived
       }
     end
 
     def url
-      # switch to repository_repository_rows_path when inventory items page is implemented
-      repository_path(object.repository)
+      params = {
+        id: object.repository_id,
+        landing_page: true,
+        row_id: object.id
+      }
+      params[:archived] = true if object.archived
+      repository_path(params)
     end
   end
 end
diff --git a/app/serializers/global_search/result_serializer.rb b/app/serializers/global_search/result_serializer.rb
index a2839453a..534ed55c2 100644
--- a/app/serializers/global_search/result_serializer.rb
+++ b/app/serializers/global_search/result_serializer.rb
@@ -9,23 +9,25 @@ module GlobalSearch
     def team
       {
         name: object.my_module.experiment.project.team.name,
-        url: projects_path(team_id: object.my_module.experiment.project.team.id)
+        url: dashboard_path(team: object.team)
       }
     end
 
     def experiment
+      archived = object.my_module.experiment.archived_branch?
       {
         name: object.my_module.experiment.name,
-        url: my_modules_experiment_path(object.my_module.experiment.id),
-        archived: object.my_module.experiment.archived?
+        url: my_modules_experiment_path(object.my_module.experiment.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
     def my_module
+      archived = object.my_module.archived_branch?
       {
         name: object.my_module.name,
-        url: protocols_my_module_path(object.my_module.id),
-        archived: object.my_module.archived?
+        url: protocols_my_module_path(object.my_module.id, view_mode: view_mode(archived)),
+        archived: archived
       }
     end
 
@@ -38,7 +40,14 @@ module GlobalSearch
     end
 
     def url
-      my_module_results_path(my_module_id: object.my_module.id)
+      my_module_results_path(my_module_id: object.my_module.id,
+                             view_mode: view_mode(object.archived?))
+    end
+
+    private
+
+    def view_mode(archived)
+      archived ? 'archived' : 'active'
     end
   end
 end

From 40397a5a43f637c3a20b07f9f49964fd92294c28 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Thu, 9 May 2024 15:00:56 +0200
Subject: [PATCH 112/115] Fix global search for assets [SCI-10684]

---
 app/javascript/vue/global_search/groups/assets.vue | 2 +-
 app/models/protocol.rb                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index 78bb0feb9..93d869eb1 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -17,7 +17,7 @@
           <CellTemplate :label=" i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
           <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :url="row.attributes.parent.url" :value="labelName(row.attributes.parent)"/>
-          <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :visible="!!row.attributes.experiment.name"
+          <CellTemplate :label="i18n.t('search.index.experiment')" :visible="!!row.attributes.experiment.name"
                         :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
         </div>
       </div>
diff --git a/app/models/protocol.rb b/app/models/protocol.rb
index 6e03acb75..f658e9e59 100644
--- a/app/models/protocol.rb
+++ b/app/models/protocol.rb
@@ -191,7 +191,7 @@ class Protocol < ApplicationRecord
 
     distinct.left_joins(steps: [:step_texts, { step_tables: :table },
                                 { checklists: :checklist_items }, :step_comments])
-            .where('(protocols.protocol_type IN (?) AND protocols.my_module_id IN (?)) OR (protocols.id IN (?))',
+            .where('(protocols.protocol_type IN (?) AND protocols.id IN (?)) OR (protocols.id IN (?))',
                    [Protocol.protocol_types[:unlinked], Protocol.protocol_types[:linked]],
                    protocol_my_modules, protocol_templates)
             .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)

From fcccf5885c5d843c9c99cb91bb11afea1ba54420 Mon Sep 17 00:00:00 2001
From: Gregor Lasnibat <gregor@scinote.net>
Date: Fri, 10 May 2024 10:31:51 +0200
Subject: [PATCH 113/115] (fix) No error message at create new task modal from
 canvas [SCI-10686]

---
 app/assets/javascripts/experiments/show.js      | 17 +++++++++++++++++
 app/views/my_modules/modals/_new_modal.html.erb |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/experiments/show.js b/app/assets/javascripts/experiments/show.js
index cd7bdc0e2..b7d438aaa 100644
--- a/app/assets/javascripts/experiments/show.js
+++ b/app/assets/javascripts/experiments/show.js
@@ -23,6 +23,23 @@
         }
       });
     });
+
+    $('#experiment-canvas').on('shown.bs.modal', () => {
+      // disable the submit button by default
+      $('#new-modal-submit-btn').prop('disabled', true);
+
+      // listen for input event on the my_module_name input field
+      $(`${newMyModuleModal} #my_module_name`).on('input', function () {
+        if ($(this).val().trim() !== '') {
+          // enable the submit button if the input field is populated
+          $('#new-modal-submit-btn').prop('disabled', false);
+        } else {
+          // otherwise, disable it
+          $('#new-modal-submit-btn').prop('disabled', true);
+        }
+      });
+    });
+
     // Modal's submit handler function
     $(experimentWrapper)
       .on('ajax:success', newMyModuleModal, function() {
diff --git a/app/views/my_modules/modals/_new_modal.html.erb b/app/views/my_modules/modals/_new_modal.html.erb
index ac5e5ed17..ef672eefe 100644
--- a/app/views/my_modules/modals/_new_modal.html.erb
+++ b/app/views/my_modules/modals/_new_modal.html.erb
@@ -71,7 +71,7 @@
           <button type="button" class="btn btn-secondary" data-dismiss="modal">
             <%= t('general.cancel') %>
           </button>
-          <%= f.submit t('experiments.canvas.new_my_module_modal.create'), class: "btn btn-primary" %>
+          <%= f.submit t('experiments.canvas.new_my_module_modal.create'), class: "btn btn-primary", id: "new-modal-submit-btn" %>
         </div>
       </div>
     </div>

From 9eec4681c7701e8e82b57f390855855d46962774 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 9 May 2024 14:50:40 +0200
Subject: [PATCH 114/115] Change global results order [SCI-10685]

---
 .../vue/global_search/groups/assets.vue          |  7 +++++--
 .../vue/global_search/groups/experiments.vue     |  2 +-
 .../vue/global_search/groups/folders.vue         |  2 +-
 .../global_search/groups/my_module_protocols.vue |  2 +-
 .../vue/global_search/groups/my_modules.vue      |  2 +-
 .../vue/global_search/groups/projects.vue        |  2 +-
 .../vue/global_search/groups/reports.vue         |  2 +-
 .../vue/global_search/groups/repository_rows.vue |  2 +-
 .../vue/global_search/groups/results.vue         |  2 +-
 .../global_search/asset_serializer.rb            | 16 +++++++++++++++-
 10 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/javascript/vue/global_search/groups/assets.vue b/app/javascript/vue/global_search/groups/assets.vue
index 78bb0feb9..6d5475299 100644
--- a/app/javascript/vue/global_search/groups/assets.vue
+++ b/app/javascript/vue/global_search/groups/assets.vue
@@ -15,10 +15,13 @@
           <LinkTemplate :url="row.attributes.parent.url" :icon="row.attributes.icon" :value="row.attributes.file_name"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label=" i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :url="row.attributes.parent.url" :value="labelName(row.attributes.parent)"/>
-          <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :visible="!!row.attributes.experiment.name"
+          <CellTemplate v-if="row.attributes.repository.name" :label="i18n.t(`search.index.repository`)"
+                        :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
+          <CellTemplate v-else-if="row.attributes.experiment.name" :label="i18n.t(`search.index.experiment`)"
                         :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <div v-else></div>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/experiments.vue b/app/javascript/vue/global_search/groups/experiments.vue
index 7ef501bca..014e45222 100644
--- a/app/javascript/vue/global_search/groups/experiments.vue
+++ b/app/javascript/vue/global_search/groups/experiments.vue
@@ -15,8 +15,8 @@
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/folders.vue b/app/javascript/vue/global_search/groups/folders.vue
index c75c66000..fbb5c1940 100644
--- a/app/javascript/vue/global_search/groups/folders.vue
+++ b/app/javascript/vue/global_search/groups/folders.vue
@@ -14,9 +14,9 @@
           <hr class="col-span-4 w-full m-0" v-if="index > 0">
           <LinkTemplate :url="row.attributes.url"  :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.parent_folder"
                         :url="row.attributes.parent_folder?.url" :value="labelName(row.attributes.parent_folder)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/my_module_protocols.vue b/app/javascript/vue/global_search/groups/my_module_protocols.vue
index b82fb4603..92205366c 100644
--- a/app/javascript/vue/global_search/groups/my_module_protocols.vue
+++ b/app/javascript/vue/global_search/groups/my_module_protocols.vue
@@ -16,9 +16,9 @@
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/my_modules.vue b/app/javascript/vue/global_search/groups/my_modules.vue
index a33653f9a..7f7e00433 100644
--- a/app/javascript/vue/global_search/groups/my_modules.vue
+++ b/app/javascript/vue/global_search/groups/my_modules.vue
@@ -16,8 +16,8 @@
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/projects.vue b/app/javascript/vue/global_search/groups/projects.vue
index 3bfef616d..70a05d49b 100644
--- a/app/javascript/vue/global_search/groups/projects.vue
+++ b/app/javascript/vue/global_search/groups/projects.vue
@@ -15,9 +15,9 @@
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.folder"
                         :url="row.attributes.folder?.url" :value="labelName(row.attributes.folder)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/reports.vue b/app/javascript/vue/global_search/groups/reports.vue
index fba043808..3ff1dcf88 100644
--- a/app/javascript/vue/global_search/groups/reports.vue
+++ b/app/javascript/vue/global_search/groups/reports.vue
@@ -17,8 +17,8 @@
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
           <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/repository_rows.vue b/app/javascript/vue/global_search/groups/repository_rows.vue
index f3b8d25fe..4982438cc 100644
--- a/app/javascript/vue/global_search/groups/repository_rows.vue
+++ b/app/javascript/vue/global_search/groups/repository_rows.vue
@@ -16,8 +16,8 @@
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.repository')" :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/javascript/vue/global_search/groups/results.vue b/app/javascript/vue/global_search/groups/results.vue
index 9a21ff8fb..0cf4c5eba 100644
--- a/app/javascript/vue/global_search/groups/results.vue
+++ b/app/javascript/vue/global_search/groups/results.vue
@@ -15,9 +15,9 @@
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">
diff --git a/app/serializers/global_search/asset_serializer.rb b/app/serializers/global_search/asset_serializer.rb
index 07f2acca1..0e8a627ad 100644
--- a/app/serializers/global_search/asset_serializer.rb
+++ b/app/serializers/global_search/asset_serializer.rb
@@ -4,7 +4,7 @@ module GlobalSearch
   class AssetSerializer < ActiveModel::Serializer
     include Rails.application.routes.url_helpers
     include FileIconsHelper
-    attributes :id, :file_name, :icon, :created_at, :updated_at, :team, :parent, :experiment
+    attributes :id, :file_name, :icon, :created_at, :updated_at, :team, :parent, :experiment, :repository
 
     def file_name
       object.render_file_name
@@ -40,6 +40,20 @@ module GlobalSearch
       }
     end
 
+    def repository
+      parent = object.parent
+
+      return { name: '' } unless parent.is_a?(RepositoryCell)
+
+      archived = parent.repository_row.archived?
+
+      {
+        name: parent.repository_row.repository.name,
+        url: repository_path(id: parent.repository_row.repository_id, archived: archived),
+        archived: archived
+      }
+    end
+
     def parent
       parent = object.parent
       if parent.is_a?(Result) && object.my_module

From ec2e70ae3aa2fc4fd7d7af866cc8951f765f7aa6 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Mon, 13 May 2024 10:31:00 +0200
Subject: [PATCH 115/115] Fix links for repository row global search results
 [SCI-10690]

---
 app/models/concerns/permission_checkable_model.rb          | 2 +-
 app/serializers/global_search/repository_row_serializer.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/permission_checkable_model.rb b/app/models/concerns/permission_checkable_model.rb
index aaaf769e9..04a84777d 100644
--- a/app/models/concerns/permission_checkable_model.rb
+++ b/app/models/concerns/permission_checkable_model.rb
@@ -7,7 +7,7 @@ module PermissionCheckableModel
     include PermissionExtends
 
     scope :with_granted_permissions, lambda { |user, permissions|
-      left_outer_joins(user_assignments: :user_role)
+      joins(user_assignments: :user_role)
         .where(user_assignments: { user: user })
         .where('user_roles.permissions @> ARRAY[?]::varchar[]', permissions)
     }
diff --git a/app/serializers/global_search/repository_row_serializer.rb b/app/serializers/global_search/repository_row_serializer.rb
index 8cbf8ce2a..0ee467a3d 100644
--- a/app/serializers/global_search/repository_row_serializer.rb
+++ b/app/serializers/global_search/repository_row_serializer.rb
@@ -7,9 +7,10 @@ module GlobalSearch
     attributes :id, :name, :code, :created_at, :created_by, :team, :repository, :archived, :url
 
     def team
+      team = object.repository.shared_with?(current_user.current_team) ? current_user.current_team : object.team
       {
-        name: object.team.name,
-        url: dashboard_path(team: object.team)
+        name: team.name,
+        url: dashboard_path(team: team)
       }
     end