From dc757598f146d70db29ab14716c796a8eb910a54 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 12 Apr 2024 13:38:51 +0530
Subject: [PATCH] fix: Disable clear filter button in add filter dropdown
 (#9226)

---
 .../reports/components/Filters/v3/ActiveFilterChip.vue      | 1 +
 .../reports/components/Filters/v3/FilterDropdownSearch.vue  | 6 +++++-
 .../reports/components/Filters/v3/FilterListDropdown.vue    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue
index 7a6bd1f82..67046acc4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/ActiveFilterChip.vue
@@ -60,6 +60,7 @@ const closeDropdown = () => emit('closeDropdown');
       <filter-list-dropdown
         v-if="options"
         v-on-clickaway="closeDropdown"
+        show-clear-filter
         :list-items="options"
         :active-filter-id="id"
         :input-placeholder="placeholder"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterDropdownSearch.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterDropdownSearch.vue
index 6a8d10724..558816deb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterDropdownSearch.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterDropdownSearch.vue
@@ -8,6 +8,10 @@ defineProps({
     type: String,
     default: '',
   },
+  showClearFilter: {
+    type: Boolean,
+    default: false,
+  },
 });
 </script>
 <template>
@@ -30,7 +34,7 @@ defineProps({
     </div>
     <!-- Clear filter button -->
     <woot-button
-      v-if="!inputValue"
+      v-if="!inputValue && showClearFilter"
       size="small"
       variant="clear"
       color-scheme="primary"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterListDropdown.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterListDropdown.vue
index c6508229a..1a0543af3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterListDropdown.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/Filters/v3/FilterListDropdown.vue
@@ -22,6 +22,10 @@ const props = defineProps({
     type: Number,
     default: null,
   },
+  showClearFilter: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const searchTerm = ref('');
@@ -54,6 +58,7 @@ const isFilterActive = id => {
         v-if="enableSearch && listItems.length"
         :input-value="searchTerm"
         :input-placeholder="inputPlaceholder"
+        :show-clear-filter="showClearFilter"
         @input="onSearch"
         @click="$emit('removeFilter')"
       />