@conduction/nextcloud-vue 2.70.0 → 2.72.0

package/src/dialogs/CnFlowNodeEditModal.vue

@@ -40,16 +40,27 @@
 					:placeholder="t('nextcloud-vue', 'GET')"
 					@update:modelValue="setKey(key, $event)" />
 
-				<!-- A `select` field with `optionsFrom` renders as a picker fed
-				     by the URL the OWNING APP declared — never a bare uuid
-				     text box. -->
-				<NcSelect v-else-if="widgetFor(key) === 'select'"
-					:modelValue="selectedOption(key)"
-					:options="selectOptions[key] || []"
-					:inputLabel="labelFor(key)"
-					:loading="selectLoading[key] === true"
-					:placeholder="t('nextcloud-vue', 'Pick one…')"
-					@update:modelValue="setKey(key, $event ? $event.id : '')" />
+				<!-- A `select` field renders as a picker, never a bare text box.
+				     Its choices come from the URL the OWNING APP declared
+				     (`optionsFrom`) or from the form itself (`options`), for a
+				     short fixed vocabulary with no endpoint of its own. -->
+				<template v-else-if="widgetFor(key) === 'select'">
+					<NcSelect :modelValue="selectedOption(key)"
+						class="cn-flow-node-edit__select"
+						:options="selectOptions[key] || []"
+						:inputLabel="labelFor(key)"
+						:loading="selectLoading[key] === true"
+						:placeholder="t('nextcloud-vue', 'Pick one…')"
+						@update:modelValue="setKey(key, $event ? $event.id : '')" />
+					<!-- NcSelect has no helper text of its own, so the help
+					     follows the control, the next thing a screen reader
+					     reads after it. -->
+					<p v-if="hintFor(key)"
+						class="cn-flow-node-edit__field-help"
+						:data-testid="`flow-node-help-${key}`">
+						{{ hintFor(key) }}
+					</p>
+				</template>
 
 				<NcTextArea v-else-if="widgetFor(key) === 'textarea'"
 					:modelValue="String(draft.config[key] ?? '')"
@@ -170,6 +181,7 @@ import {
 } from '@nextcloud/vue'
 import CnCronField from '../components/CnCronField/CnCronField.vue'
 import { useFlowStore } from '../composables/useFlowStore.js'
+import { hasStaticOptions, normaliseSelectOptions } from '../utils/selectOptions.js'
 
 /** The verbs an HTTP-shaped `method` option can take. */
 /**
@@ -287,7 +299,7 @@ export default {
 
 		/**
 		 * The node's per-field declarations from the catalogue's `configForm`
-		 * ({key, label, type, help, required, optionsFrom}), keyed by config
+		 * ({key, label, type, help, required, optionsFrom, options}), keyed by config
 		 * key. `configKeys` is the degraded form. Either way the node's OWNER
 		 * declares the vocabulary — this dialog never invents fields.
 		 *
@@ -398,7 +410,9 @@ export default {
 	created() {
 		// Select fields need their options; everything else is local.
 		for (const [key, spec] of Object.entries(this.fieldSpecs)) {
-			if (spec?.type === 'select' && spec?.optionsFrom) {
+			if (hasStaticOptions(spec)) {
+				this.selectOptions = { ...this.selectOptions, [key]: normaliseSelectOptions(spec.options) }
+			} else if (spec?.type === 'select' && spec?.optionsFrom) {
 				this.loadSelectOptions(key, spec)
 			}
 		}
@@ -634,7 +648,7 @@ export default {
 		 */
 		widgetFor(key) {
 			const spec = this.fieldSpecs[key]
-			if (spec?.type === 'select' && spec?.optionsFrom) {
+			if (spec?.type === 'select' && (spec?.optionsFrom || hasStaticOptions(spec))) {
 				return 'select'
 			}
 			if (spec?.type === 'boolean') {
@@ -730,13 +744,7 @@ export default {
 					? generateUrl(url)
 					: url)
 				const rows = Array.isArray(response.data) ? response.data : (response.data?.results || [])
-				const options = rows.map((row) => {
-					const id = row.id ?? row.value ?? row['@self']?.uuid ?? row.uuid
-					return {
-						id,
-						label: row.label || row.name || row.title || String(id),
-					}
-				}).filter((o) => o.id !== undefined && o.id !== null && o.id !== '')
+				const options = normaliseSelectOptions(rows)
 				this.selectOptions = { ...this.selectOptions, [key]: options }
 			} catch (error) {
 				// A picker that could not load degrades to showing the stored
@@ -930,6 +938,19 @@ export default {
 	color: var(--color-text-maxcontrast);
 }
 
+/* Full width, like the text fields around it: at its natural width the
+   picker cut every option label in half. */
+.cn-flow-node-edit__select {
+	width: 100%;
+}
+
+.cn-flow-node-edit__field-help {
+	margin: 4px 0 0;
+	padding-inline-start: 8px;
+	font-size: 0.85em;
+	color: var(--color-text-maxcontrast);
+}
+
 .cn-flow-node-edit__advanced summary {
 	cursor: pointer;
 	color: var(--color-text-maxcontrast);

package/src/dialogs/CnRunNodeDialog.vue

@@ -88,6 +88,7 @@
 import { translate as t } from '@nextcloud/l10n'
 import { NcButton, NcCheckboxRadioSwitch, NcDialog, NcLoadingIcon, NcNoteCard, NcSelect, NcTextArea, NcTextField } from '@nextcloud/vue'
 import { prefixUrl } from '../utils/headers.js'
+import { hasStaticOptions, normaliseSelectOptions } from '../utils/selectOptions.js'
 
 /**
  * The dialog `run-node` opens to collect a directly-invoked flow node's own
@@ -128,7 +129,9 @@ export default {
 		title: { type: String, default: '' },
 		/**
 		 * The node's declared config form — `IFlowNodeConfigForm::configForm()`'s
-		 * shape, unchanged: `[{key, label, type, help?, required?, optionsFrom?}]`.
+		 * shape, unchanged: `[{key, label, type, help?, required?, optionsFrom?, options?}]`.
+		 * A `select` takes its choices from `optionsFrom` (a url) or `options`
+		 * (strings, or `{value, label}` pairs declared in the form itself).
 		 *
 		 * @type {Array<object>}
 		 */
@@ -177,7 +180,9 @@ export default {
 				}
 				this.values = seed
 				for (const field of (fields || [])) {
-					if (field.type === 'select' && field.optionsFrom) {
+					if (hasStaticOptions(field)) {
+						this.options = { ...this.options, [field.key]: normaliseSelectOptions(field.options, (s) => this.tr(s)) }
+					} else if (field.type === 'select' && field.optionsFrom) {
 						this.loadOptions(field)
 					}
 				}
@@ -274,10 +279,7 @@ export default {
 				const url = prefixUrl(raw)
 				const response = await axios.get(url)
 				const rows = Array.isArray(response.data) ? response.data : (response.data?.results || [])
-				const opts = rows.map((row) => {
-					const id = row.id ?? row.value ?? row['@self']?.uuid ?? row.uuid
-					return { id, label: row.label || row.name || row.title || String(id) }
-				}).filter((o) => o.id !== undefined && o.id !== null && o.id !== '')
+				const opts = normaliseSelectOptions(rows)
 				this.options = { ...this.options, [field.key]: opts }
 			} catch (error) {
 				// A picker that fails to load degrades to an empty list rather

package/src/index.js

@@ -129,6 +129,7 @@ export {
 	CnFlowRunsWidgetForm,
 	CnFlowSidebar,
 	CnFlowsPage,
+	CnFlowStepOutcomes,
 	CnFolderSidebar,
 	CnFolderTree,
 	CnFormBuilder,

package/src/schemas/app-manifest-v2.schema.json

@@ -3,7 +3,7 @@
 	"$id": "https://raw.githubusercontent.com/ConductionNL/nextcloud-vue/main/src/schemas/app-manifest-v2.schema.json",
 	"title": "Conduction App Manifest v2",
 	"description": "v2 schema for the JSON-driven page and navigation manifest consumed by @conduction/nextcloud-vue. Introduces a uniform widgets[] array on every page type with a per-slot grid coordinate system, a typed actions[] discriminator, and the required $schema field for version detection. v1 manifests continue to validate against app-manifest.schema.json (unchanged).",
-	"version": "2.52.0",
+	"version": "2.53.0",
 	"type": "object",
 	"required": ["$schema", "version"],
 	"allOf": [
@@ -64,6 +64,7 @@
 				"enabled": { "type": "boolean", "default": true, "description": "Whether the setup wizard is active for this app." },
 				"version": { "type": "integer", "default": 1, "description": "Setup contract version; bump to re-trigger setup after a breaking change." },
 				"completionConfigKey": { "type": "string", "description": "App-config key storing the completed setup version." },
+				"dismissAction": { "type": "string", "pattern": "^[a-z0-9][a-z0-9-]*$", "description": "Setup action that records a closed or finished setup wizard on the server, so it stays closed in every browser. CnAppRoot posts `/apps/{appId}/api/setup/action/{dismissAction}` with `{ finished }` once when the user closes or finishes the wizard. The app either answers the outstanding optional steps or reports `dismissed` (true, or the setup version it was closed at) in `GET /api/setup/status`. Without it, the close is remembered only in the browser (localStorage), as before." },
 				"steps": {
 					"type": "array",
 					"description": "Ordered setup steps rendered by CnSetupWizard.",

package/src/utils/columnFilters.js

@@ -161,15 +161,65 @@ function referenceTarget(column, prop) {
 	return { schema, register, labelField }
 }
 
+/**
+ * Whether a schema lists its properties. Without that the table knows its
+ * columns but not what backs them.
+ *
+ * @param {object|null} schema The table's schema.
+ * @return {boolean} True when the schema has a properties map.
+ */
+function hasProperties(schema) {
+	return !!(schema && typeof schema === 'object' && schema.properties && typeof schema.properties === 'object')
+}
+
+/**
+ * A filter for a column when the table has no schema to read (a manifest
+ * page whose schema did not resolve, a host-fed table). The column's own
+ * hints decide the kind: an `fkResolve` widget gives a reference filter, a
+ * `type` or `format` on the column gives number, date or yes/no, and every
+ * other plain stored key gets a text filter on contains (`[like]`). A key
+ * that is a path (`a.b`) or a metadata field (`@self`, `_id`) gets none,
+ * because OpenRegister does not filter those by that name.
+ *
+ * @spec openspec/changes/audit-round-lib-fixes/specs/cn-data-table/spec.md
+ * @param {object} column The column definition.
+ * @param {object} base The shared part of the definition.
+ * @return {object|null} The filter definition.
+ */
+function columnHintFilterDef(column, base) {
+	const key = column.key
+	if (key.includes('.') || key.charAt(0) === '@' || key.charAt(0) === '_') {
+		return null
+	}
+	const reference = referenceTarget(column, null)
+	if (reference) {
+		return { ...base, kind: 'reference', reference }
+	}
+	const type = String(column.type || '').toLowerCase()
+	const format = String(column.format || '').toLowerCase()
+	if (type === 'boolean') {
+		return { ...base, kind: 'boolean' }
+	}
+	if (type === 'number' || type === 'integer') {
+		return { ...base, kind: 'number' }
+	}
+	if (type === 'date' || type === 'date-time' || format === 'date' || format === 'date-time') {
+		return { ...base, kind: 'date', dateTime: type === 'date-time' || format === 'date-time' }
+	}
+	return { ...base, kind: 'string' }
+}
+
 /**
  * How a column filters, or null when it does not.
  *
  * Kinds: `enum` (checkbox list), `boolean` (yes, no, any), `reference`
  * (searchable list of the referenced objects), `number` and `date` (from and
  * to), and `string` (contains, through OpenRegister's `[like]`). `filterable: false` on the column turns it
- * off. A column with no schema property behind it only filters when it
- * carries an enum hint (`enum`, or a badge widget's colour map), because the
- * server cannot filter on a value it does not store.
+ * off. When the schema lists its properties, a column with no property
+ * behind it only filters when it carries an enum hint (`enum`, or a badge
+ * widget's colour map), because the server cannot filter on a value it does
+ * not store. When there is no schema to read, the column's own hints decide
+ * (see `columnHintFilterDef`), falling back to a text filter on contains.
  *
  * @param {object} column The column definition.
  * @param {object|null} schema The table's schema.
@@ -191,7 +241,7 @@ export function columnFilterDef(column, schema) {
 		return { ...base, kind: 'enum', options }
 	}
 	if (!prop) {
-		return null
+		return hasProperties(schema) ? null : columnHintFilterDef(column, base)
 	}
 	const reference = referenceTarget(column, prop)
 	if (reference) {

package/src/utils/selectOptions.js

@@ -0,0 +1,54 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * The choices a node's `select` field offers, in the `{id, label}` shape
+ * NcSelect takes.
+ *
+ * A field gets its choices one of two ways. `optionsFrom` names a url the
+ * owning app answers. `options` lists them in the form itself, for a short
+ * fixed vocabulary that has no endpoint of its own. Both dialogs that render a
+ * node's configForm read the same shapes through this module, so the two
+ * cannot come to accept different ones.
+ */
+
+/**
+ * Normalise rows into `{id, label}` options.
+ *
+ * Accepts plain strings and numbers, `{id, label}`, `{value, label}`, and
+ * OpenRegister objects (uuid from `@self`, label from name or title). A row
+ * without an id is dropped rather than shown as a blank option.
+ *
+ * @param {Array<unknown>} rows The raw rows.
+ * @param {(label: string) => string} [translate] Applied to each declared label.
+ * @return {Array<{id: string|number, label: string}>} The options.
+ */
+export function normaliseSelectOptions(rows, translate = (s) => s) {
+	if (!Array.isArray(rows)) {
+		return []
+	}
+
+	return rows.map((row) => {
+		if (typeof row === 'string' || typeof row === 'number') {
+			return { id: row, label: String(row) }
+		}
+		if (!row || typeof row !== 'object') {
+			return { id: undefined, label: '' }
+		}
+
+		const id = row.id ?? row.value ?? row['@self']?.uuid ?? row.uuid
+		const declared = row.label || row.name || row.title
+
+		return { id, label: declared ? String(translate(declared)) : String(id) }
+	}).filter((option) => option.id !== undefined && option.id !== null && option.id !== '')
+}
+
+/**
+ * Whether a field declares its choices in the form itself.
+ *
+ * @param {object} field The field declaration.
+ * @return {boolean} True for a `select` with an `options` list.
+ */
+export function hasStaticOptions(field) {
+	return field?.type === 'select' && Array.isArray(field?.options)
+}

package/src/utils/userAutocomplete.js

@@ -12,9 +12,50 @@
  * @module utils/userAutocomplete
  */
 
+import { getCurrentUser } from '@nextcloud/auth'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 
+/**
+ * The signed-in user as a picker option, or null when nobody is signed in.
+ *
+ * Core autocomplete never returns the person who searches (it is built for
+ * sharing, and you do not share with yourself), so a picker backed by it
+ * alone cannot assign a task to yourself.
+ *
+ * @spec openspec/changes/audit-round-lib-fixes/specs/schema-utilities/spec.md
+ * @return {{id: string, label: string, displayName: string, subline: string}|null} The option.
+ */
+function currentUserOption() {
+	let user
+	try {
+		user = getCurrentUser()
+	} catch {
+		return null
+	}
+	if (!user || !user.uid) {
+		return null
+	}
+	const name = user.displayName || String(user.uid)
+	return { id: String(user.uid), label: name, displayName: name, subline: '' }
+}
+
+/**
+ * Whether the current-user option matches a search term (uid or display
+ * name contains the term, ignoring case). An empty term matches.
+ *
+ * @param {object} option The current-user option.
+ * @param {string} query The search term.
+ * @return {boolean} True when it matches.
+ */
+function matchesQuery(option, query) {
+	const q = String(query || '').trim().toLowerCase()
+	if (q === '') {
+		return true
+	}
+	return option.id.toLowerCase().includes(q) || option.label.toLowerCase().includes(q)
+}
+
 /**
  * Map one autocomplete suggestion to a picker option, keeping only user
  * results. The OCS payload uses `id` for the UID, `label` for the display
@@ -59,10 +100,11 @@ function toUserOption(suggestion) {
  * @param {string} [query] The search term (empty loads an initial page).
  * @param {object} [options] Tuning options.
  * @param {number} [options.limit] Max results (default 25).
+ * @param {boolean} [options.includeCurrentUser] Add the signed-in user when they match (default true; a mention list passes false).
  * @return {Promise<Array<{id: string, label: string, subline: string}>>} Picker options.
  */
 export async function searchNextcloudUsers(query = '', options = {}) {
-	const { limit = 25 } = options
+	const { limit = 25, includeCurrentUser = true } = options
 	try {
 		const url = generateOcsUrl('core/autocomplete/get')
 		const response = await axios.get(url, {
@@ -86,14 +128,32 @@ export async function searchNextcloudUsers(query = '', options = {}) {
 		const list = Array.isArray(data)
 			? data
 			: (Array.isArray(response && response.data) ? response.data : [])
-		return list
+		const found = list
 			.map(toUserOption)
 			.filter((opt) => opt !== null)
+		return includeCurrentUser ? withCurrentUser(found, query) : found
 	} catch {
 		return []
 	}
 }
 
+/**
+ * Put the signed-in user first in a result list when they match the search
+ * and the server left them out.
+ *
+ * @spec openspec/changes/audit-round-lib-fixes/specs/schema-utilities/spec.md
+ * @param {Array<object>} options The server's options.
+ * @param {string} query The search term.
+ * @return {Array<object>} The options, the current user included when they match.
+ */
+function withCurrentUser(options, query) {
+	const me = currentUserOption()
+	if (!me || !matchesQuery(me, query) || options.some((opt) => opt.id === me.id)) {
+		return options
+	}
+	return [me, ...options]
+}
+
 /**
  * Resolve a single user UID to a `{ id, label }` option for edit-mode display.
  * Tries the autocomplete endpoint with the UID as the query and matches the
@@ -108,6 +168,12 @@ export async function resolveNextcloudUser(uid) {
 	if (uid === undefined || uid === null || uid === '') {
 		return fallback
 	}
+	// The server never returns the signed-in user, so their own uid would
+	// otherwise fall back to the bare uid.
+	const me = currentUserOption()
+	if (me && me.id === String(uid)) {
+		return me
+	}
 	const results = await searchNextcloudUsers(String(uid))
 	const match = results.find((opt) => opt.id === String(uid))
 	return match || fallback