From e22084012011e64c4e5a73b022be9e6f24865964 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 14 May 2024 11:40:43 +0200
Subject: [PATCH] Small fixes for global search
 [SCI-10702][SCI-10701][SCI-10703]

---
 app/javascript/vue/navigation/quick_search.vue | 2 +-
 app/javascript/vue/navigation/top_menu.vue     | 3 +++
 app/serializers/concerns/breadcrumbs_helper.rb | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/javascript/vue/navigation/quick_search.vue b/app/javascript/vue/navigation/quick_search.vue
index 23dbfc07b..c949ca02b 100644
--- a/app/javascript/vue/navigation/quick_search.vue
+++ b/app/javascript/vue/navigation/quick_search.vue
@@ -305,7 +305,7 @@ export default {
         });
     },
     searchValue() {
-      window.open(`${this.searchUrl}?q=${this.searchQuery}&teams[]=${this.currentTeam}`, '_self');
+      window.open(`${this.searchUrl}?q=${this.searchQuery}&teams[]=${this.currentTeam}&include_archived=true`, '_self');
     },
     focusHistoryItem(event) {
       if (this.focusedHistoryItem === null && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {
diff --git a/app/javascript/vue/navigation/top_menu.vue b/app/javascript/vue/navigation/top_menu.vue
index adfc69b9e..77d92fcde 100644
--- a/app/javascript/vue/navigation/top_menu.vue
+++ b/app/javascript/vue/navigation/top_menu.vue
@@ -9,6 +9,7 @@
     </div>
     <QuickSearch
       v-if="user"
+      :key="globalSearchKey"
       :class="{'hidden': hideSearch}"
       :quickSearchUrl="quickSearchUrl"
       :searchUrl="searchUrl"
@@ -109,6 +110,7 @@ export default {
       userMenu: null,
       unseenNotificationsCount: 0,
       hideSearch: false,
+      globalSearchKey: 0
     };
   },
   created() {
@@ -120,6 +122,7 @@ export default {
       this.checkUnseenNotifications();
       this.refreshCurrentTeam();
       this.hideSearch = !!document.getElementById('GlobalSearch');
+      this.globalSearchKey += 1;
     });
 
     // Track name update in user profile settings
diff --git a/app/serializers/concerns/breadcrumbs_helper.rb b/app/serializers/concerns/breadcrumbs_helper.rb
index dc17cdfaa..664a9b7ff 100644
--- a/app/serializers/concerns/breadcrumbs_helper.rb
+++ b/app/serializers/concerns/breadcrumbs_helper.rb
@@ -26,7 +26,8 @@ module BreadcrumbsHelper
       end
     when Result
       parent = subject.my_module
-      url = my_module_results_path(subject.my_module)
+      view_mode = subject.archived? ? 'archived' : 'active'
+      url = my_module_results_path(subject.my_module, view_mode:)
     when ProjectFolder
       parent = subject.team
       url = project_folder_path(subject)
@@ -56,7 +57,7 @@ module BreadcrumbsHelper
       url = projects_path(team: subject.id)
     end
 
-    breadcrumbs << { name: subject.name, url: url } if subject.name.present?
+    breadcrumbs << { name: subject.name, url: } if subject.name.present?
 
     if parent
       generate_breadcrumbs(parent, breadcrumbs)