@conduction/nextcloud-vue 2.78.0 → 2.80.0

package/src/components/CnObjectSidebar/CnFilesTab.vue

@@ -7,7 +7,9 @@
 		<CnFilesBrowser
 			v-if="browserRoot !== null"
 			:rootPath="browserRoot"
-			:rootLabel="browserRootLabel"
+			:rootLabel="effectiveBrowserRootLabel"
+			:source="browserSource"
+			:deleteLabel="deleteLabel"
 			:uploadButton="uploadButton"
 			:dropOverlay="dropOverlay"
 			:dropHint="dropHint"
@@ -238,7 +240,8 @@ import CnFilePreview from '../CnFilePreview/CnFilePreview.vue'
 import CnFilesBrowser from '../CnFilesBrowser/CnFilesBrowser.vue'
 import { useFileOpener } from '../../composables/useFileOpener.js'
 import { buildHeaders, prefixUrl } from '../../utils/index.js'
-import { resolveObjectFolder } from '../CnFilesBrowser/filesBrowser.js'
+import { objectDisplayName, resolveObjectFolderInfo } from '../CnFilesBrowser/filesBrowser.js'
+import { createOpenRegisterSource } from '../CnFilesBrowser/openRegisterSource.js'
 
 /**
  * The mime types Nextcloud Office opens by default for the current person.
@@ -308,8 +311,22 @@ export default {
 		openInOfficeLabel: { type: String, default: () => t('nextcloud-vue', 'Open in Office') },
 		/** Label for the delete action */
 		deleteLabel: { type: String, default: () => t('nextcloud-vue', 'Delete') },
-		/** What the files browser's root crumb reads; null shows the folder's own name, as the Files app does. */
+		/** What the files browser's root crumb reads; null shows the object's name, else the folder's own name. */
 		browserRootLabel: { type: String, default: null },
+		/**
+		 * Where the files browser reads the object's folder from.
+		 * `openregister` (the default) goes through OpenRegister's files API under
+		 * the object's access rule, so anyone who may read the object sees its
+		 * files, without a share. `webdav` is the earlier behaviour: the folder is
+		 * looked up in the person's own Files over WebDAV and the browser shows
+		 * only when it is shared with them.
+		 */
+		source: {
+			type: String,
+			default: 'openregister',
+			validator: (value) => ['openregister', 'webdav'].includes(value),
+		},
+
 		/** Forwarded to CnFilesBrowser: a primary "Add files" button beside the New menu. */
 		uploadButton: { type: Boolean, default: false },
 		/** Forwarded to CnFilesBrowser: the drop state drawn over the list ("Drop to add") and announced. */
@@ -385,6 +402,9 @@ export default {
 			share: false,
 			/** The object's folder as a user-relative path, or null while unresolved or absent. */
 			browserRoot: null,
+			/** The browser's data source for `source: 'openregister'`, or null for WebDAV. */
+			browserSource: null,
+			browserObjectName: null,
 			linkedItems: [],
 			/** File ids whose preview request failed, so the row falls back to the mime icon. */
 			previewFailed: {},
@@ -403,6 +423,19 @@ export default {
 		}
 	},
 
+	computed: {
+		/**
+		 * The root crumb: the host's label, else the object's name (its folder
+		 * on disk is called after its uuid), else the folder's own name.
+		 *
+		 * @return {string|null}
+		 * @spec openspec/changes/dutch-library-strings-and-files-crumb/specs/dutch-library-strings-and-files-crumb/spec.md#requirement-the-files-browser-names-the-object-in-its-root-crumb
+		 */
+		effectiveBrowserRootLabel() {
+			return this.browserRootLabel || this.browserObjectName || null
+		},
+	},
+
 	watch: {
 		// Match every other CnObjectSidebar tab — a single immediate
 		// `objectId` watcher drives all initial loads. Folding the
@@ -423,6 +456,10 @@ export default {
 		linkedItemsUrl() {
 			this.fetchLinkedItems()
 		},
+
+		source() {
+			this.resolveBrowserRoot()
+		},
 	},
 
 	methods: {
@@ -483,16 +520,22 @@ export default {
 
 		async resolveBrowserRoot() {
 			this.browserRoot = null
+			this.browserSource = null
+			this.browserObjectName = null
 			if (!this.objectId || !this.register || !this.schema) {
 				return
 			}
+			if (this.source === 'openregister') {
+				await this.resolveOpenRegisterSource()
+				return
+			}
 			let remoteUrl
 			try {
 				remoteUrl = generateRemoteUrl('dav')
 			} catch {
 				return
 			}
-			this.browserRoot = await resolveObjectFolder({
+			const info = await resolveObjectFolderInfo({
 				apiBase: this.apiBase,
 				register: this.register,
 				schema: this.schema,
@@ -500,6 +543,62 @@ export default {
 				uid: getCurrentUser()?.uid || '',
 				remoteUrl,
 			})
+			this.browserRoot = info === null ? null : info.path
+			this.browserObjectName = info === null ? null : info.name
+		},
+
+		/**
+		 * Use OpenRegister's files API for the browser, when this person may read
+		 * the object's folder through it. A listing that fails (no read on the
+		 * object, or an OpenRegister without the folder endpoints) leaves the
+		 * legacy list, as an unresolved WebDAV folder did.
+		 *
+		 * @return {Promise<void>}
+		 * @spec openspec/changes/files-browser-openregister-source/specs/files-browser/spec.md
+		 */
+		async resolveOpenRegisterSource() {
+			const objectId = this.objectId
+			const source = createOpenRegisterSource({
+				apiBase: this.apiBase,
+				register: this.register,
+				schema: this.schema,
+				objectId,
+			})
+			try {
+				await source.list('/')
+			} catch {
+				return
+			}
+			if (objectId !== this.objectId) {
+				return
+			}
+			this.browserSource = source
+			this.browserRoot = '/'
+			this.fetchObjectName()
+		},
+
+		/**
+		 * Read the object's name for the root crumb, by the same rule the WebDAV
+		 * path uses (`objectDisplayName`: never the uuid). The OpenRegister path
+		 * has no folder lookup to piggyback on, so this is its one object read.
+		 * A failure keeps the crumb on its default.
+		 *
+		 * @return {Promise<void>}
+		 */
+		async fetchObjectName() {
+			const objectId = this.objectId
+			try {
+				const { data } = await axios.get(generateUrl(`${this.apiBase}/objects/{register}/{schema}/{objectId}`, {
+					register: this.register,
+					schema: this.schema,
+					objectId,
+				}))
+				if (objectId === this.objectId) {
+					this.browserObjectName = objectDisplayName(data, objectId)
+				}
+			} catch {
+				// The crumb keeps its default.
+			}
 		},
 
 		async fetchFiles(append = false) {

package/src/components/CnPageRenderer/CnPageRenderer.vue

@@ -305,6 +305,7 @@ import { pageHasSplitView, pageIdForRoute, splitIdForRoute, splitRouteName } fro
 import { reportDiagnostic, reportDiagnosticOnce } from '../../utils/diagnostics.js'
 import { openRowTarget } from '../../utils/linkNavigation.js'
 import { listContextFromRoute, listContextToQuery } from '../../utils/listNavigation.js'
+import { applyQueryPreset, matchQueryPreset } from '../../utils/queryPresets.js'
 import { resolveRouteSentinels } from '../../utils/resolveRouteSentinels.js'
 import { parseSortKeys } from '../../utils/routeFilters.js'
 import { buildRouteParams, routePathFor } from '../../utils/routeParams.js'
@@ -1050,7 +1051,25 @@ export default {
 				return 'none'
 			}
 			const cfg = (page.config && typeof page.config === 'object' && !Array.isArray(page.config)) ? page.config : {}
-			return [page.id, cfg.register || '', cfg.schema || ''].join(':')
+			// A query preset swaps the lenses and columns, so it remounts the
+			// page: the active lens index belongs to the lenses it indexes.
+			const preset = this.activeQueryPresetIndex >= 0 ? `:preset-${this.activeQueryPresetIndex}` : ''
+			return [page.id, cfg.register || '', cfg.schema || ''].join(':') + preset
+		},
+
+		/**
+		 * The index of the current index page's query preset that the route
+		 * query matches, or -1.
+		 *
+		 * @return {number}
+		 * @spec openspec/changes/screens-index-query-presets/specs/index-query-presets/spec.md#requirement-a-query-preset-overlays-lenses-columns-and-copy
+		 */
+		activeQueryPresetIndex() {
+			const page = this.currentPage
+			if (!page || page.type !== 'index' || !page.config || !Array.isArray(page.config.queryPresets)) {
+				return -1
+			}
+			return matchQueryPreset(page.config.queryPresets, this.$route?.query || {})
 		},
 
 		/**
@@ -1297,6 +1316,15 @@ export default {
 			// container before forwarding — CnIndexPage has no
 			// `actionToggles` prop.
 			const isIndex = page?.type === 'index'
+			// A query preset (`config.queryPresets`): the menu entry's query
+			// brings its own lenses, columns and copy to the same page.
+			if (isIndex && Array.isArray(config.queryPresets)) {
+				const preset = config.queryPresets[this.activeQueryPresetIndex] || null
+				config = applyQueryPreset(config, preset)
+				if (preset && typeof preset.title === 'string' && preset.title !== '') {
+					topLevel.title = preset.title
+				}
+			}
 			// When an index page has somewhere to open a row, make a row click
 			// go there: set `rowClickToView` so the row body emits `row-click`
 			// (→ onRowOpen navigates) even though the page is selectable.

package/src/components/CnQuickFilterBar/CnQuickFilterBar.vue

@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import { translate as t } from '@nextcloud/l10n'
+import { translatePlural as n, translate as t } from '@nextcloud/l10n'
 import { NcPopover, NcSelect } from '@nextcloud/vue'
 import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
 import CnIcon from '../CnIcon/CnIcon.vue'
@@ -354,7 +354,8 @@ export default {
 			if (this.overflowLabel) {
 				return t('nextcloud-vue', '{label} — show the other filters', { label: this.overflowLabel })
 			}
-			return t('nextcloud-vue', '{count} more filters', { count: this.overflowEntries.length })
+			const count = this.overflowEntries.length
+			return n('nextcloud-vue', '{count} more filter', '{count} more filters', count, { count })
 		},
 
 		/** @return {string} Heading above the hidden chips in the panel. */