From 57ab9e2830950a63c25960863dba844cd4610ee3 Mon Sep 17 00:00:00 2001
From: "andy.lee" <andy.lee@suse.com>
Date: Mon, 13 Jan 2025 16:07:32 +0800
Subject: [PATCH 1/2] fix: filter schedule style and functionality

Signed-off-by: andy.lee <andy.lee@suse.com>
---
 pkg/harvester/components/FilterVMSchedule.vue | 32 +++++++++++--------
 .../list/harvesterhci.io.vmsnapshot.vue       |  2 ++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkg/harvester/components/FilterVMSchedule.vue b/pkg/harvester/components/FilterVMSchedule.vue
index e8570401..a64675e2 100644
--- a/pkg/harvester/components/FilterVMSchedule.vue
+++ b/pkg/harvester/components/FilterVMSchedule.vue
@@ -64,22 +64,22 @@ export default {
 
 <template>
   <div class="vm-schedule-filter">
-    <template>
-      <span
-        v-if="selected"
-        class="banner-item bg-warning"
-      >
-        {{ t('harvester.tableHeaders.vmSchedule') }}{{ selected ? ` = ${selected}`: '' }}<i
-          class="icon icon-close ml-5"
-          @click="remove"
-        />
-      </span>
-    </template>
-
+    <span
+      v-if="selected"
+      class="banner-item bg-warning"
+    >
+      {{ t('harvester.tableHeaders.vmSchedule') }}{{ selected ? ` = ${selected}`: '' }}
+      <i
+        class="icon icon-close ml-5"
+        @click="remove"
+      />
+    </span>
     <v-dropdown
+      popper-class="vm-schedule-dropdown"
       :triggers="scheduleOptions.length ? ['click'] : []"
       placement="bottom-end"
       offset="1"
+      :distance="20"
     >
       <button
         ref="actionDropDown"
@@ -98,7 +98,7 @@ export default {
             name="model"
             :options="scheduleOptions"
             :labels="scheduleOptions"
-            @input="onSelect"
+            @update:value="onSelect"
           />
         </div>
       </template>
@@ -106,6 +106,12 @@ export default {
   </div>
 </template>
 
+<style lang="scss">
+.vm-schedule-dropdown .v-popper__arrow-container {
+  display: none;
+}
+</style>
+
 <style lang="scss" scoped>
 .vm-schedule-filter {
   display: inline-block;
diff --git a/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue b/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
index 8509170c..c9968760 100644
--- a/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
+++ b/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
@@ -120,6 +120,8 @@ export default {
 
   methods: {
     changeRows(filteredRows, searchSchedule) {
+      console.log('🚀 ~ changeRows ~ searchSchedule:', searchSchedule);
+      console.log('🚀 ~ changeRows ~ filteredRows:', filteredRows);
       this['searchSchedule'] = searchSchedule;
       this['snapshots'] = filteredRows;
     },

From d72857f374911ebe7faf70679a59abd89ffc9890 Mon Sep 17 00:00:00 2001
From: "andy.lee" <andy.lee@suse.com>
Date: Mon, 13 Jan 2025 16:26:22 +0800
Subject: [PATCH 2/2] chore: disable filter button if all rows do not have
 sourceSchedule

Signed-off-by: andy.lee <andy.lee@suse.com>
---
 pkg/harvester/components/FilterVMSchedule.vue     | 8 +++++++-
 pkg/harvester/list/harvesterhci.io.vmsnapshot.vue | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/harvester/components/FilterVMSchedule.vue b/pkg/harvester/components/FilterVMSchedule.vue
index a64675e2..9a02489d 100644
--- a/pkg/harvester/components/FilterVMSchedule.vue
+++ b/pkg/harvester/components/FilterVMSchedule.vue
@@ -25,6 +25,9 @@ export default {
 
       return Array.from(new Set(options));
     },
+    enableFilterButton() {
+      return this.rows.some((r) => r.sourceSchedule !== undefined);
+    }
   },
 
   methods: {
@@ -63,7 +66,9 @@ export default {
 </script>
 
 <template>
-  <div class="vm-schedule-filter">
+  <div
+    class="vm-schedule-filter"
+  >
     <span
       v-if="selected"
       class="banner-item bg-warning"
@@ -84,6 +89,7 @@ export default {
       <button
         ref="actionDropDown"
         class="btn bg-primary mr-10"
+        :disabled="!enableFilterButton"
       >
         <slot name="title">
           {{ t('harvester.fields.filterSchedule') }}
diff --git a/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue b/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
index c9968760..8509170c 100644
--- a/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
+++ b/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
@@ -120,8 +120,6 @@ export default {
 
   methods: {
     changeRows(filteredRows, searchSchedule) {
-      console.log('🚀 ~ changeRows ~ searchSchedule:', searchSchedule);
-      console.log('🚀 ~ changeRows ~ filteredRows:', filteredRows);
       this['searchSchedule'] = searchSchedule;
       this['snapshots'] = filteredRows;
     },