Applying new fix

ProcessMaker · Dec 24, 2024 · f137c04 · f137c04
1 parent a1abe93
commit f137c04
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/resources/js/inbox-rules/components/InboxRuleButtons.vue b/resources/js/inbox-rules/components/InboxRuleButtons.vue
@@ -3,7 +3,7 @@
     <b-button size="sm"
               variant="light"
               class="inbox-rule-buttons-border inbox-rule-buttons-font"
-              @click="callResetFilters">
+              @click="$emit('reset-filters')">
       <img src="/img/eraser-fill.svg" :alt="$t('Clear unsaved filters')"/>
       {{ $t('Clear unsaved filters') }}
     </b-button>
@@ -106,12 +106,8 @@
       });
     },
     methods: {
-      callResetFilters() {
-        this.$emit('reset-filters');
-      },
       onSelect(option) {
         this.selectedOption = option;
-        this.callResetFilters();
         this.$emit('saved-search-id-changed', option.value);
         this.showMenu(false);
       },

diff --git a/resources/js/inbox-rules/components/InboxRuleFilters.vue b/resources/js/inbox-rules/components/InboxRuleFilters.vue
@@ -144,6 +144,9 @@
       resetFilters() {
         this.savedSearchAdvancedFilter = _.cloneDeep(this.originalSavedSearchAdvancedFilter);
       },
+      resetSavedSearch() {
+        this.loadSavedSearch();
+      },
       defaultTaskFilters() {
         return {
           order: {by: 'id', direction: 'desc'},
@@ -199,6 +202,7 @@
         } else {
           filter.filters = [this.userIdFilter()];
         }
+
         return filter;
       },
       userIdFilter() {
@@ -238,12 +242,15 @@
                     this.columns = _.cloneDeep(cols);
                     this.defaultColumns = _.cloneDeep(cols);
                   }
-
+                  
+                  const advancedFilter = response.data.advanced_filter ?? this.defaultSavedSearchFilters();
+                  const processedFilter = this.addRequiredSavedSearchFilters(advancedFilter);
+                  
                   if (this.savedSearchAdvancedFilter === null) {
-                    const advancedFilter = response.data.advanced_filter ?? this.defaultSavedSearchFilters();
-                    this.originalSavedSearchAdvancedFilter = _.cloneDeep(this.savedSearchAdvancedFilter);
-                    this.savedSearchAdvancedFilter = this.addRequiredSavedSearchFilters(advancedFilter);
+                    this.originalSavedSearchAdvancedFilter = _.cloneDeep(processedFilter);
                   }
+                  
+                  this.savedSearchAdvancedFilter = processedFilter;
 
                   this.ready = true;
                 });