Skip to content

Commit 5a3386e

Browse files
committed
fix: update filter handling to use visibleFiltersCount for button state
1 parent c58fd90 commit 5a3386e

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

adminforth/spa/src/components/Filters.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136

137137
<div class="flex justify-end gap-2">
138138
<button
139-
:disabled="!filtersStore.filters.length"
139+
:disabled="!filtersStore.visibleFiltersCount"
140140
type="button"
141141
class="flex items-center py-1 px-3 text-sm font-medium text-lightFiltersClearAllButtonText focus:outline-none bg-lightFiltersClearAllButtonBackground rounded border border-lightFiltersClearAllButtonBorder hover:bg-lightFiltersClearAllButtonBackgroundHover hover:text-lightFiltersClearAllButtonTextHover focus:z-10 focus:ring-4 focus:ring-lightFiltersClearAllButtonFocus dark:focus:ring-darkFiltersClearAllButtonFocus dark:bg-darkFiltersClearAllButtonBackground dark:text-darkFiltersClearAllButtonText dark:border-darkFiltersClearAllButtonBorder dark:hover:text-darkFiltersClearAllButtonTextHover dark:hover:bg-darkFiltersClearAllButtonBackgroundHover disabled:opacity-50 disabled:cursor-not-allowed"
142142
@click="clear">{{ $t('Clear all') }}</button>

adminforth/spa/src/stores/filters.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,10 @@ export const useFiltersStore = defineStore('filters', () => {
1414
return sort.value;
1515
}
1616
const setFilter = (filter: any) => {
17-
const shouldHide = shouldFilterBeHidden(filter.field);
18-
filters.value.push({
19-
...filter,
20-
countInBadge: !shouldHide
21-
});
17+
filters.value.push(filter);
2218
}
2319
const setFilters = (f: any) => {
24-
filters.value = f.map((filter: any) => {
25-
if (filter.countInBadge === undefined) {
26-
const shouldHide = shouldFilterBeHidden(filter.field);
27-
return { ...filter, countInBadge: !shouldHide };
28-
}
29-
return filter;
30-
});
20+
filters.value = f;
3121
}
3222
const getFilters = () => {
3323
return filters.value;
@@ -47,7 +37,7 @@ export const useFiltersStore = defineStore('filters', () => {
4737
}
4838

4939
const visibleFiltersCount = computed(() => {
50-
return filters.value.filter(f => f.countInBadge !== false).length;
40+
return filters.value.filter(f => !shouldFilterBeHidden(f.field)).length;
5141
});
5242

5343
return {

0 commit comments

Comments
 (0)