@conduction/nextcloud-vue 2.61.0 → 2.63.0

package/src/components/CnObjectListWidget/CnObjectListWidget.vue

@@ -268,6 +268,9 @@
 			ref="createDialog"
 			:schema="createSchema"
 			:item="null"
+			:register="content.register || ''"
+			:initialData="createInitialData"
+			:lockedFields="createLockedFields"
 			:size="formSize"
 			:columns="formColumns"
 			:includeFields="formIncludeFields"
@@ -293,6 +296,7 @@ import { followLinkClick, openRowTarget, resolveHref } from '../../utils/linkNav
 import { objectFieldValue } from '../../utils/objectName.js'
 import { dropOptionalUnresolved, hasUnresolvedTokens, resolveFilterTokens } from '../../utils/resolveFilterTokens.js'
 import { markNewTabHandled } from '../../utils/rowAuxClick.js'
+import { dispatchObjectCreated } from '../../utils/walkthroughSignals.js'
 import { CnRowActions } from '../CnRowActions/index.js'
 
 /**
@@ -1010,6 +1014,39 @@ export default {
 			return Array.isArray(c.formExcludeFields) ? c.formExcludeFields : []
 		},
 
+		/**
+		 * Create-form seed values: the list's scalar filter values (the parent
+		 * this list is scoped to, e.g. `{ lead: '<uuid>' }`), limited to keys
+		 * the schema declares, so the new row shows its parent already chosen.
+		 *
+		 * @spec openspec/changes/form-pickers-from-schema/specs/schema-utilities/spec.md
+		 * @return {object}
+		 */
+		createInitialData() {
+			const props = (this.createSchema && this.createSchema.properties) || {}
+			const out = {}
+			for (const [key, value] of Object.entries(this.resolvedFilter || {})) {
+				if (!(key in props) || value === null || value === undefined || value === '' || typeof value === 'object') {
+					continue
+				}
+				if (typeof value === 'string' && value.charAt(0) === '@') {
+					continue
+				}
+				out[key] = value
+			}
+			return out
+		},
+
+		/**
+		 * The seeded parent keys are locked: a row added to this list belongs
+		 * to the record the list is scoped to.
+		 *
+		 * @return {string[]}
+		 */
+		createLockedFields() {
+			return Object.keys(this.createInitialData)
+		},
+
 		/** Per-field overrides for the create dialog (`content.formFieldOverrides`). */
 		formFieldOverrides() {
 			const c = this.content || {}
@@ -1358,7 +1395,8 @@ export default {
 					}
 				}
 				const url = generateUrl('/apps/openregister/api/objects/{register}/{schema}', { register: c.register, schema: c.schema })
-				await axios.post(url, payload)
+				const response = await axios.post(url, payload)
+				dispatchObjectCreated({ register: c.register, schema: c.schema, object: (response && response.data) || payload })
 				if (this.$refs.createDialog) {
 					this.$refs.createDialog.setResult({ success: true })
 				}

package/src/components/CnObjectSidebar/CnFilesTab.vue

@@ -130,6 +130,18 @@
 							</template>
 							{{ openLabel }}
 						</NcActionButton>
+						<!-- OpenRegister's Office page applies the object rule:
+						     update edits, read views, no read is a 404. -->
+						<NcActionLink
+							v-if="officeOpens(file)"
+							:href="officeUrlFor(file)"
+							target="_blank"
+							:closeAfterClick="true">
+							<template #icon>
+								<FileDocumentEditOutline :size="20" />
+							</template>
+							{{ openInOfficeLabel }}
+						</NcActionLink>
 						<NcActionLink
 							v-if="file.id"
 							:href="downloadUrlFor(file)"
@@ -194,6 +206,7 @@
 <script>
 import { getCurrentUser } from '@nextcloud/auth'
 import axios from '@nextcloud/axios'
+import { getCapabilities } from '@nextcloud/capabilities'
 import { translate as t } from '@nextcloud/l10n'
 import { generateRemoteUrl, generateUrl } from '@nextcloud/router'
 import {
@@ -209,6 +222,7 @@ import {
 } from '@nextcloud/vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import Download from 'vue-material-design-icons/Download.vue'
+import FileDocumentEditOutline from 'vue-material-design-icons/FileDocumentEditOutline.vue'
 import FileOutline from 'vue-material-design-icons/FileOutline.vue'
 import FolderOutline from 'vue-material-design-icons/FolderOutline.vue'
 import InformationOutline from 'vue-material-design-icons/InformationOutline.vue'
@@ -221,6 +235,23 @@ import { buildHeaders, prefixUrl } from '../../utils/index.js'
 import { safeHref } from '../../utils/safeHref.js'
 import { resolveObjectFolder } from '../CnFilesBrowser/filesBrowser.js'
 
+/**
+ * The mime types Nextcloud Office opens by default for the current person.
+ *
+ * richdocuments publishes its capabilities only to a person it lets use
+ * Office, so an empty list means no Office here, or none for them.
+ *
+ * @return {Array<string>} The mime types, or an empty list.
+ */
+function readOfficeMimetypes() {
+	try {
+		const mimetypes = getCapabilities()?.richdocuments?.mimetypes
+		return Array.isArray(mimetypes) ? mimetypes.filter((mime) => typeof mime === 'string') : []
+	} catch {
+		return []
+	}
+}
+
 export default {
 	name: 'CnFilesTab',
 
@@ -237,6 +268,7 @@ export default {
 		NcLoadingIcon,
 		Delete,
 		Download,
+		FileDocumentEditOutline,
 		FileOutline,
 		FolderOutline,
 		InformationOutline,
@@ -261,6 +293,13 @@ export default {
 		noFilesLabel: { type: String, default: () => t('nextcloud-vue', 'No files attached') },
 		/** Label for the open/view file action */
 		openLabel: { type: String, default: () => t('nextcloud-vue', 'Open') },
+		/**
+		 * Label of the action that opens a document in Nextcloud Office through
+		 * OpenRegister's Office page. Shown only when Office is there for this
+		 * person and opens the file's type; the page opens it for editing or
+		 * read-only by the object's own rule.
+		 */
+		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. */
@@ -346,6 +385,8 @@ export default {
 			 * @type {HTMLInputElement|null}
 			 */
 			fileInputEl: null,
+			/** The mime types Nextcloud Office opens for this person; empty without Office. */
+			officeMimetypes: readOfficeMimetypes(),
 		}
 	},
 
@@ -702,6 +743,30 @@ export default {
 			return `${this.apiBase}/files/${encodeURIComponent(String(file.id))}/download`
 		},
 
+		/**
+		 * Whether Nextcloud Office opens this file for this person.
+		 *
+		 * @param {object} file The file row.
+		 * @return {boolean} true when the Office action applies.
+		 */
+		officeOpens(file) {
+			const mime = file.type || file.mimetype || file.mimeType || ''
+			return Boolean(file.id) && mime !== '' && this.officeMimetypes.includes(mime)
+		},
+
+		/**
+		 * OpenRegister's Office page for a file of this object, which checks the
+		 * object rule and opens the document editable or read-only.
+		 *
+		 * @param {object} file The file row.
+		 * @return {string} The url.
+		 */
+		officeUrlFor(file) {
+			const appBase = /\/api\/?$/.test(this.apiBase) ? this.apiBase.replace(/\/api\/?$/, '') : '/apps/openregister'
+			const segments = [this.register, this.schema, this.objectId, String(file.id)].map((part) => encodeURIComponent(String(part)))
+			return prefixUrl(`${appBase}/office/${segments.join('/')}`)
+		},
+
 		/**
 		 * The Files app's permalink for a file: opens the Files app at the
 		 * file's folder with the file selected.

package/src/components/CnReportsPage/CnReportsPage.vue

@@ -436,6 +436,13 @@ export default {
 	padding: 16px;
 }
 
+/* Clear the Nextcloud navigation toggle button (44px wide, absolutely
+   positioned at the left edge of .app-content) plus 12px breathing room, as
+   CnPageHeader does. Only the header shifts; the body keeps the full width. */
+.cn-reports-page__header {
+	padding-inline-start: 56px;
+}
+
 .cn-reports-page__title {
 	margin: 0 0 4px;
 }

package/src/components/CnResourceSelect/CnResourceSelect.vue

@@ -13,6 +13,8 @@
 		:disabled="disabled"
 		:placeholder="placeholder"
 		:filterable="false"
+		:multiple="multiple"
+		:keepOpen="multiple"
 		label="label"
 		@search="onSearch"
 		@update:modelValue="onInput">
@@ -93,12 +95,21 @@ export default {
 			required: true,
 		},
 
-		/** Currently-selected object id (v-model). */
+		/** Currently-selected object id (v-model), or an array of ids when `multiple`. */
 		modelValue: {
-			type: [String, Number],
+			type: [String, Number, Array],
 			default: '',
 		},
 
+		/**
+		 * Pick several objects. `modelValue` is then an array of ids, and a
+		 * create adds the new object to the selection.
+		 */
+		multiple: {
+			type: Boolean,
+			default: false,
+		},
+
 		/** Object field used as the option label AND written on create. */
 		labelField: {
 			type: String,
@@ -219,6 +230,9 @@ export default {
 			// The selected option object kept locally so the label shows even
 			// before/without a matching search result (e.g. a pre-set modelValue).
 			localSelected: null,
+			// Options seen so far, keyed by value, so a multiple selection
+			// keeps its labels when the search results move on.
+			known: {},
 		}
 	},
 
@@ -232,6 +246,19 @@ export default {
 			}
 		},
 
+		/**
+		 * The selected ids as strings (multiple mode).
+		 *
+		 * @return {string[]}
+		 */
+		selectedIds() {
+			const value = this.modelValue
+			if (Array.isArray(value)) {
+				return value.filter((v) => v !== null && v !== undefined && v !== '').map((v) => String(v))
+			}
+			return value ? [String(value)] : []
+		},
+
 		/** The `${register}-${schema}` object-type slug used by the store. */
 		typeSlug() {
 			return `${this.register}-${this.schema}`
@@ -239,6 +266,11 @@ export default {
 
 		/** The currently-selected option, for NcSelect's model-value. */
 		selectedOption() {
+			if (this.multiple) {
+				return this.selectedIds.map((id) => this.known[id]
+					|| this.options.find((o) => o.value === id)
+					|| { value: id, label: id })
+			}
 			if (this.localSelected && this.localSelected.value === this.modelValue) {
 				return this.localSelected
 			}
@@ -310,9 +342,9 @@ export default {
 			// The scope moved, so anything already selected may no longer be
 			// in it. Drop the stale options + selection, then re-seed.
 			this.options = []
-			if (this.modelValue) {
+			if (this.selectedIds.length > 0) {
 				this.localSelected = null
-				this.$emit('update:modelValue', '')
+				this.$emit('update:modelValue', this.multiple ? [] : '')
 			}
 			if (this.search.trim().length >= this.minChars) {
 				this.onSearch(this.search)
@@ -347,7 +379,7 @@ export default {
 				const items = Array.isArray(collection)
 					? collection
 					: (this.objectStore.collections[this.typeSlug] || [])
-				this.options = items.map((o) => this.toOption(o))
+				this.options = this.remember(items.map((o) => this.toOption(o)))
 			} catch {
 				this.options = []
 			} finally {
@@ -392,7 +424,7 @@ export default {
 				const items = Array.isArray(collection)
 					? collection
 					: (this.objectStore.collections[this.typeSlug] || [])
-				this.options = items.map((o) => this.toOption(o))
+				this.options = this.remember(items.map((o) => this.toOption(o)))
 			} catch {
 				this.options = []
 			} finally {
@@ -408,6 +440,10 @@ export default {
 		 * @return {Promise<void>}
 		 */
 		async onInput(option) {
+			if (this.multiple) {
+				await this.onMultipleInput(Array.isArray(option) ? option : (option ? [option] : []))
+				return
+			}
 			if (!option) {
 				this.localSelected = null
 				/**
@@ -425,19 +461,58 @@ export default {
 			this.$emit('update:modelValue', option.value)
 		},
 
+		/**
+		 * Handle a change of a multiple selection. A synthetic create option
+		 * creates the object and adds it; the rest emit their ids.
+		 *
+		 * @param {Array<object>} chosen The selected options.
+		 * @return {Promise<void>}
+		 */
+		async onMultipleInput(chosen) {
+			const createOption = chosen.find((o) => o && o.__create)
+			const ids = chosen.filter((o) => o && !o.__create).map((o) => String(o.value))
+			this.remember(chosen.filter((o) => o && !o.__create))
+			if (!createOption) {
+				this.$emit('update:modelValue', ids)
+				return
+			}
+			const created = await this.createFromTerm(createOption.label, ids)
+			if (!created) {
+				this.$emit('update:modelValue', ids)
+			}
+		},
+
+		/**
+		 * Cache options by value so their labels survive a new search.
+		 *
+		 * @param {Array<object>} options Options to remember.
+		 * @return {Array<object>} The same options.
+		 */
+		remember(options) {
+			const next = { ...this.known }
+			for (const o of options) {
+				if (o && o.value) {
+					next[o.value] = o
+				}
+			}
+			this.known = next
+			return options
+		},
+
 		/**
 		 * Create a new object from the typed term and select it.
 		 *
 		 * @param {string} term The term to write to `labelField`.
-		 * @return {Promise<void>}
+		 * @param {string[]} [keep] Multiple mode: the ids already selected, which the new id joins.
+		 * @return {Promise<object|null>} The created object, or null.
 		 */
-		async createFromTerm(term) {
+		async createFromTerm(term, keep = []) {
 			if (!this.objectStore && !this.createHandler) {
-				return
+				return null
 			}
 			const name = (term || '').trim()
 			if (!name) {
-				return
+				return null
 			}
 			this.loading = true
 			try {
@@ -456,20 +531,26 @@ export default {
 					created = await this.objectStore.saveObject(this.typeSlug, payload)
 				}
 				if (!created) {
-					return
+					return null
 				}
 				const option = this.toOption(created)
+				this.remember([option])
 				this.options = [option, ...this.options.filter((o) => o.value !== option.value)]
 				this.localSelected = option
-				this.$emit('update:modelValue', option.value)
+				this.search = ''
+				this.$emit('update:modelValue', this.multiple
+					? [...keep.filter((id) => id !== option.value), option.value]
+					: option.value)
 				/**
 				 * @event create A new object was created from the search term.
 				 * @type {object} The created OpenRegister object.
 				 */
 				this.$emit('create', created)
+				return created
 			} catch (e) {
 				// eslint-disable-next-line no-console
 				console.warn('[CnResourceSelect] create failed', e)
+				return null
 			} finally {
 				this.loading = false
 			}
@@ -508,6 +589,10 @@ export default {
 		 * @return {Promise<void>}
 		 */
 		async ensureSelectedLoaded() {
+			if (this.multiple) {
+				await this.ensureManyLoaded()
+				return
+			}
 			if (!this.modelValue || this.selectedOption || !this.objectStore) {
 				return
 			}
@@ -524,6 +609,32 @@ export default {
 				// Leave the id un-labelled rather than crash.
 			}
 		},
+
+		/**
+		 * Multiple mode: fetch each selected id whose label is not known yet.
+		 *
+		 * @return {Promise<void>}
+		 */
+		async ensureManyLoaded() {
+			if (!this.objectStore || typeof this.objectStore.fetchObject !== 'function') {
+				return
+			}
+			const missing = this.selectedIds.filter((id) => !this.known[id] && !this.options.some((o) => o.value === id))
+			if (missing.length === 0) {
+				return
+			}
+			this.ensureRegistered()
+			for (const id of missing) {
+				try {
+					const obj = await this.objectStore.fetchObject(this.typeSlug, id)
+					if (obj) {
+						this.remember([this.toOption(obj)])
+					}
+				} catch {
+					// Leave the id un-labelled rather than crash.
+				}
+			}
+		},
 	},
 }
 </script>