Fix reseting record list filter

cortezaproject · Oct 15, 2024 · fc3d64d · fc3d64d
1 parent 2a8682c
commit fc3d64d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/client/web/compose/src/components/Common/RecordListFilter.vue b/client/web/compose/src/components/Common/RecordListFilter.vue
@@ -615,6 +615,10 @@ export default {
     processFilter () {
       return this.componentFilter.map(({ groupCondition, filter = [], name }) => {
         filter = filter.map(({ record, ...f }) => {
+          if (!f.name) {
+            return
+          }
+
           if (record) {
             f.value = record[f.name] || record.values[f.name]
           }
@@ -627,10 +631,10 @@ export default {
           }
 
           return f
-        })
+        }).filter(f => f)
 
         return { groupCondition, filter, name }
-      })
+      }).filter(({ filter }) => filter.length)
     },
 
     onSave (close = true, type = 'filter') {

diff --git a/client/web/compose/src/components/PageBlocks/RecordListBase.vue b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
@@ -1139,11 +1139,16 @@ export default {
     },
 
     onFilter (filter = []) {
-      filter.forEach(f => {
-        f.name = this.$t('recordList.customFilter')
-      })
+      if (filter.length) {
+        filter.forEach(f => {
+          f.name = this.$t('recordList.customFilter')
+        })
+
+        this.activeFilters = [this.$t('recordList.customFilter')]
+      } else {
+        this.activeFilters = []
+      }
 
-      this.activeFilters = [this.$t('recordList.customFilter')]
       this.recordListFilter = filter
       this.setStorageRecordListFilter()
       this.refresh(true)