From 89210bbd175128dd225bd980fd5c0f82ddec2910 Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Mon, 20 May 2024 10:35:06 +0200
Subject: [PATCH] Fix various quick search bugs [SCI-10714]

---
 app/controllers/teams_controller.rb            | 2 +-
 app/javascript/vue/global_search/container.vue | 8 ++++----
 app/serializers/concerns/breadcrumbs_helper.rb | 4 ++--
 app/serializers/quick_search_serializer.rb     | 2 +-
 config/locales/en.yml                          | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 36b9c2c12..61707f01b 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -13,7 +13,7 @@ class TeamsController < ApplicationController
   before_action :check_export_projects_permissions, only: %i(export_projects_modal export_projects)
 
   def visible_teams
-    teams = current_user.teams
+    teams = current_user.teams.order(:name)
     render json: teams, each_serializer: TeamSerializer
   end
 
diff --git a/app/javascript/vue/global_search/container.vue b/app/javascript/vue/global_search/container.vue
index 5ef2e5af2..c8b927c69 100644
--- a/app/javascript/vue/global_search/container.vue
+++ b/app/javascript/vue/global_search/container.vue
@@ -53,7 +53,7 @@
       </div>
       <button class="btn btn-light btn-sm" @click="filterModalOpened = true">
         <i class="sn-icon sn-icon-search-options"></i>
-        <span class="tw-hidden lg:inline">{{ i18n.t('search.index.more_search_options') }}</span>
+        <span class="tw-hidden xl: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]"
@@ -65,12 +65,12 @@
         <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>
-          <span class="tw-hidden lg:inline">{{ i18n.t('search.index.clear_filters') }}</span>
+          <span class="tw-hidden xl: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>
+        <span class="tw-hidden xl:inline">{{ i18n.t('search.index.all_results') }}</span>
       </button>
     </div>
     <template v-for="group in searchGroups">
@@ -87,7 +87,7 @@
         @updated="calculateTotalElements"
       />
     </template>
-    <div v-if="totalElements === 0" class="bg-white rounded p-4">
+    <div v-if="totalElements === 0 && activeGroup === null" class="bg-white rounded p-4">
       <NoSearchResult />
     </div>
     <teleport to='body'>
diff --git a/app/serializers/concerns/breadcrumbs_helper.rb b/app/serializers/concerns/breadcrumbs_helper.rb
index 664a9b7ff..345a16da0 100644
--- a/app/serializers/concerns/breadcrumbs_helper.rb
+++ b/app/serializers/concerns/breadcrumbs_helper.rb
@@ -35,8 +35,8 @@ module BreadcrumbsHelper
       parent = subject.team
       url = repository_path(subject)
     when RepositoryRow
-      parent = subject.team
-      url = repository_path(subject.repository)
+      parent = subject.repository
+      url = repository_path(subject.repository, landing_page: true, row_id: subject.id)
     when Report
       parent = subject.team
 
diff --git a/app/serializers/quick_search_serializer.rb b/app/serializers/quick_search_serializer.rb
index b0ad88cb7..d5038a62c 100644
--- a/app/serializers/quick_search_serializer.rb
+++ b/app/serializers/quick_search_serializer.rb
@@ -7,7 +7,7 @@ class QuickSearchSerializer < ActiveModel::Serializer
   attributes :updated_at, :archived, :breadcrumbs, :code
 
   def archived
-    @object.archived?
+    @object.respond_to?(:archived_branch?) ? @object.archived_branch? : @object.archived?
   rescue StandardError
     false
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 81805ec7f..e61677c6b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -508,6 +508,7 @@ en:
       protocol_templates: "Protocol templates"
       label_templates: "Label templates"
       format: "Format"
+      archived: "Archived"
       reports: "Reports"
       repository: "Inventory"
       more_search_options: "More search options"