diff options
| -rw-r--r-- | apps/files/src/eventbus.d.ts | 2 | ||||
| -rw-r--r-- | apps/files/src/store/filters.ts | 6 | ||||
| -rw-r--r-- | apps/files/src/views/FilesList.vue | 14 |
3 files changed, 7 insertions, 15 deletions
diff --git a/apps/files/src/eventbus.d.ts b/apps/files/src/eventbus.d.ts index 3db03d453d7..81422ef5d67 100644 --- a/apps/files/src/eventbus.d.ts +++ b/apps/files/src/eventbus.d.ts @@ -12,6 +12,8 @@ declare module '@nextcloud/event-bus' { 'files:favorites:added': Node 'files:favorites:removed': Node + 'files:filters:changed': undefined + 'files:node:created': Node 'files:node:deleted': Node 'files:node:moved': { node: Node, oldSource: string } diff --git a/apps/files/src/store/filters.ts b/apps/files/src/store/filters.ts index bc57e25a1f8..b5c1b2b6acd 100644 --- a/apps/files/src/store/filters.ts +++ b/apps/files/src/store/filters.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ import type { FilterUpdateChipsEvent, IFileListFilter, IFileListFilterChip } from '@nextcloud/files' -import { subscribe } from '@nextcloud/event-bus' +import { emit, subscribe } from '@nextcloud/event-bus' import { getFileListFilters } from '@nextcloud/files' import { defineStore } from 'pinia' import { computed, ref } from 'vue' @@ -20,7 +20,6 @@ function isFileListFilterWithUi(value: IFileListFilter): value is Required<IFile export const useFiltersStore = defineStore('filters', () => { const chips = ref<Record<string, IFileListFilterChip[]>>({}) const filters = ref<IFileListFilter[]>([]) - const filtersChanged = ref(false) /** * Currently active filter chips @@ -77,7 +76,7 @@ export const useFiltersStore = defineStore('filters', () => { * @private */ function onFilterUpdate() { - filtersChanged.value = true + emit('files:filters:changed') } /** @@ -122,7 +121,6 @@ export const useFiltersStore = defineStore('filters', () => { chips, filters, filtersWithUI, - filtersChanged, // getters / computed activeChips, diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 6999b73b2d9..8dfc2e9a609 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -433,10 +433,6 @@ export default defineComponent({ && this.currentFolder && (this.currentFolder.permissions & Permission.SHARE) !== 0 }, - filtersChanged() { - return this.filtersStore.filtersChanged - }, - showCustomEmptyView() { return !this.loading && this.isEmptyDir && this.currentView?.emptyView !== undefined }, @@ -496,13 +492,6 @@ export default defineComponent({ // Also refresh the filtered content this.filterDirContent() }, - - filtersChanged() { - if (this.filtersChanged) { - this.filterDirContent() - this.filtersStore.filtersChanged = false - } - }, }, async mounted() { @@ -512,6 +501,9 @@ export default defineComponent({ // reload on settings change subscribe('files:config:updated', this.fetchContent) + // filter content if filter were changed + subscribe('files:filters:changed', this.filterDirContent) + // Finally, fetch the current directory contents await this.fetchContent() if (this.fileId) { |