diff --git a/apps/files/src/main.ts b/apps/files/src/main.ts index 7b25c88a6976e..97b3b2f965195 100644 --- a/apps/files/src/main.ts +++ b/apps/files/src/main.ts @@ -1,8 +1,9 @@ -import Vue from 'vue' -import { createPinia, PiniaVuePlugin } from 'pinia' +import { PiniaVuePlugin } from 'pinia' import { getNavigation } from '@nextcloud/files' import { getRequestToken } from '@nextcloud/auth' +import Vue from 'vue' +import { pinia } from './store/index.ts' import router from './router/router' import RouterService from './services/RouterService' import SettingsModel from './models/Setting.js' @@ -30,7 +31,6 @@ Object.assign(window.OCP.Files, { Router }) // Init Pinia store Vue.use(PiniaVuePlugin) -const pinia = createPinia() // Init Navigation Service // This only works with Vue 2 - with Vue 3 this will not modify the source but return just a oberserver diff --git a/apps/files/src/services/Recent.ts b/apps/files/src/services/Recent.ts index 26c4babb5a245..47f31466dd224 100644 --- a/apps/files/src/services/Recent.ts +++ b/apps/files/src/services/Recent.ts @@ -20,17 +20,37 @@ * along with this program. If not, see . * */ -import type { ContentsWithRoot } from '@nextcloud/files' +import type { ContentsWithRoot, Node } from '@nextcloud/files' import type { FileStat, ResponseDataDetailed } from 'webdav' import { getCurrentUser } from '@nextcloud/auth' import { Folder, Permission, davGetRecentSearch, davGetClient, davResultToNode, davRootPath, davRemoteURL } from '@nextcloud/files' +import { useUserConfigStore } from '../store/userconfig.ts' +import { pinia } from '../store/index.ts' const client = davGetClient() const lastTwoWeeksTimestamp = Math.round((Date.now() / 1000) - (60 * 60 * 24 * 14)) +/** + * Get recently changed nodes + * + * This takes the users preference about hidden files into account. + * If hidden files are not shown, then also recently changed files *in* hidden directories are filtered. + * + * @param path Path to search for recent changes + */ export const getContents = async (path = '/'): Promise => { + const store = useUserConfigStore(pinia) + /** + * Filter function that returns only the visible nodes - or hidden if explicitly configured + * @param node The node to check + */ + const filterHidden = (node: Node) => + path !== '/' // We need to hide files from hidden directories in the root if not configured to show + || store.userConfig.show_hidden // If configured to show hidden files we can early return + || !node.dirname.split('/').some((dir) => dir.startsWith('.')) // otherwise only include the file if non of the parent directories is hidden + const contentsResponse = await client.getDirectoryContents(path, { details: true, data: davGetRecentSearch(lastTwoWeeksTimestamp), @@ -53,6 +73,6 @@ export const getContents = async (path = '/'): Promise => { owner: getCurrentUser()?.uid || null, permissions: Permission.READ, }), - contents: contents.map((r) => davResultToNode(r)), + contents: contents.map((r) => davResultToNode(r)).filter(filterHidden), } } diff --git a/apps/files/src/store/index.ts b/apps/files/src/store/index.ts new file mode 100644 index 0000000000000..c97a09122ec28 --- /dev/null +++ b/apps/files/src/store/index.ts @@ -0,0 +1,25 @@ +/** + * @copyright Copyright (c) 2024 Ferdinand Thiessen + * + * @author Ferdinand Thiessen + * + * @license AGPL-3.0-or-later + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +import { createPinia } from 'pinia' + +export const pinia = createPinia() diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 66c8171486041..f5bb45ede1d92 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -214,6 +214,8 @@ export default defineComponent({ loading: true, promise: null, Type, + + _unsubscribeStore: () => {}, } }, @@ -454,10 +456,16 @@ export default defineComponent({ subscribe('files:node:updated', this.onUpdatedNode) subscribe('nextcloud:unified-search.search', this.onSearch) subscribe('nextcloud:unified-search.reset', this.onSearch) + + // reload on settings change + this._unsubscribeStore = this.userConfigStore.$subscribe(() => this.fetchContent(), { deep: true }) }, unmounted() { unsubscribe('files:node:updated', this.onUpdatedNode) + unsubscribe('nextcloud:unified-search.search', this.onSearch) + unsubscribe('nextcloud:unified-search.reset', this.onSearch) + this._unsubscribeStore() }, methods: { diff --git a/apps/files/src/views/Settings.vue b/apps/files/src/views/Settings.vue index cefbdab4eec70..cfb43c5c8f2c6 100644 --- a/apps/files/src/views/Settings.vue +++ b/apps/files/src/views/Settings.vue @@ -20,29 +20,35 @@ - -->