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] 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"