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] 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')) {