@conduction/nextcloud-vue 2.66.0 → 2.68.0

package/src/components/CnIndexPage/CnIndexPage.vue

@@ -59,6 +59,7 @@
 			:showSearch="inlineSearch"
 			:searchValue="effectiveSearchValue"
 			:searchPlaceholder="searchPlaceholder"
+			:showCountWithSearch="showCountWithSearch"
 			:refreshing="effectiveRefreshing"
 			:refreshDisabled="refreshDisabled"
 			:addDisabled="addDisabled"
@@ -417,6 +418,21 @@
 					<NcLoadingIcon :size="32" :name="loadingText" />
 				</div>
 
+				<!-- Error state: the latest self-fetch failed (e.g. a search term the server rejects) -->
+				<div v-else-if="selfFetchFailed"
+					class="cn-index-page__empty"
+					role="status"
+					data-testid="cn-index-page-fetch-error">
+					<NcEmptyContent :name="t('nextcloud-vue', 'An error occurred')"
+						:description="effectiveSearchValue
+							? t('nextcloud-vue', 'Change the search or try again.')
+							: t('nextcloud-vue', 'Try again later.')">
+						<template #icon>
+							<AlertCircleOutline :size="64" />
+						</template>
+					</NcEmptyContent>
+				</div>
+
 				<!-- Empty state -->
 				<div v-else-if="effectiveObjects.length === 0" class="cn-index-page__empty">
 					<slot name="empty">
@@ -676,11 +692,11 @@
 					</template>
 				</CnCardGrid>
 
-				<!-- Right-click context menu (positioned at cursor via CSS) -->
+				<!-- Right-click context menu (positioned at cursor via CSS). Same per-row list as the row actions menu, so the two never drift. -->
 				<CnContextMenu
 					v-model:open="contextMenuOpen"
-					:actions="mergedActions"
-					:targetItem="contextMenuRow"
+					:actions="rowActionsFor(contextMenuShownRow)"
+					:targetItem="contextMenuShownRow"
 					@action="onRowAction"
 					@close="closeContextMenu" />
 
@@ -774,6 +790,7 @@ import { getCurrentUser } from '@nextcloud/auth'
 import { translate as t } from '@nextcloud/l10n'
 import { NcActionButton, NcActionCaption, NcActionCheckbox, NcActions, NcButton, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
 import { getCurrentInstance, inject, markRaw, ref } from 'vue'
+import AlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline.vue'
 import Close from 'vue-material-design-icons/Close.vue'
 import Cog from 'vue-material-design-icons/Cog.vue'
 import DatabaseSearch from 'vue-material-design-icons/DatabaseSearch.vue'
@@ -795,8 +812,10 @@ import { resolveClaimedTeams, resolveClaimTokens, splitViewsIntoTabs, viewAsTab,
 import { LIST_SHORTCUTS, listPaletteCommands, shortcutFor } from '../../utils/listShortcuts.js'
 import { multiKeySort } from '../../utils/multiKeySort.js'
 import { resolveDeepTokens, resolveFilterValue } from '../../utils/resolveFilterTokens.js'
+import { resolveRowActions } from '../../utils/resolveRowActions.js'
 import { resolveFilterMap } from '../../utils/routeFilters.js'
 import { availableRowActions, DEFAULT_ROW_ACTION_FIELD, refusalReasonFor, undeclaredRowActions } from '../../utils/rowActionAvailability.js'
+import { isRowActionVisible, rowActionPayload } from '../../utils/rowActionItem.js'
 import { isNewTabClick, isNewTabHandled, isRowMiddleClick, markNewTabHandled, preventMiddleClickAutoscroll } from '../../utils/rowAuxClick.js'
 import { DEFAULT_ROW_INDICATOR_CAP } from '../../utils/rowIndicators.js'
 import { buildRouteQueryFromViewState, buildViewCreatePayload, extractViewState, extractViewStateFromRouteQuery, savedViewScope, viewMatchesScope } from '../../utils/savedViewHelpers.js'
@@ -1054,6 +1073,7 @@ export default {
 		NcActionCaption,
 		NcActionCheckbox,
 		NcButton,
+		AlertCircleOutline,
 		Close,
 		Cog,
 		DatabaseSearch,
@@ -1669,7 +1689,11 @@ export default {
 			default: () => ({}),
 		},
 
-		/** Row action definitions (app-provided, merged with built-in actions) */
+		/**
+		 * Row action definitions, merged with the built-in View / Edit / Copy / Delete.
+		 * Objects are app actions.
+		 * A `"builtin:view"`, `"builtin:edit"`, `"builtin:copy"` or `"builtin:delete"` string places that built-in at its position when its `show*Action` toggle is on; enabled built-ins not placed are appended in that order.
+		 */
 		actions: {
 			type: Array,
 			default: () => [],
@@ -2034,6 +2058,17 @@ export default {
 			default: false,
 		},
 
+		/**
+		 * Keep the "Showing X of Y" counter visible beside the inline search field,
+		 * after any `#after-search` controls (only relevant with `inlineSearch`,
+		 * which otherwise takes the counter's place). Fed from the manifest as
+		 * `pages[].config.showCountWithSearch`.
+		 */
+		showCountWithSearch: {
+			type: Boolean,
+			default: false,
+		},
+
 		/** Placeholder for the inline search field (manifest `config.searchPlaceholder`) */
 		searchPlaceholder: {
 			type: String,
@@ -2732,6 +2767,8 @@ export default {
 			folderRowLayouts: {},
 			/** The row the keyboard is on, or -1. */
 			focusedRowIndex: -1,
+			// The row the context menu shows: set on open, never cleared on close, so a closing menu keeps its entries and a late close cannot null a reopened one.
+			contextMenuShownRow: null,
 			/** The row a quick edit is open on, or null. */
 			quickEditRow: null,
 			/** The row as the server holds it, after a stale save. */
@@ -2934,11 +2971,23 @@ export default {
 			return this.isSelfFetch && !!this.list
 		},
 
+		/**
+		 * Whether the latest self-fetch failed. The store keeps the previous
+		 * rows and pagination on a failed fetch, so while this holds the page
+		 * shows its error state instead of results for an earlier query.
+		 */
+		selfFetchFailed() {
+			return this.isSelfFetchMode && !!this.list.error?.value
+		},
+
 		/** Rows: store collection in self-fetch mode, else the `objects` prop. */
 		effectiveObjects() {
 			if (this.isNamedSource) {
 				return this.namedRows
 			}
+			if (this.selfFetchFailed) {
+				return []
+			}
 			return this.isSelfFetchMode ? (this.list.objects.value || []) : this.objects
 		},
 
@@ -3342,7 +3391,9 @@ export default {
 				s: this.exportSchemaSlug,
 				f: this.filter || null,
 				e: this.countEntries,
-				t: Number(this.effectivePagination?.total ?? 0),
+				// The store's total, not the error override in effectivePagination,
+				// so a failed fetch and its recovery do not refetch the counts.
+				t: Number((this.isSelfFetchMode ? this.list.pagination.value : this.effectivePagination)?.total ?? 0),
 			})
 		},
 
@@ -3430,7 +3481,7 @@ export default {
 			if (this.quickEditFields.length > 0) {
 				handlers['row-quick-edit'] = () => this.focusedRow && this.openQuickEdit(this.focusedRow)
 			}
-			if (this.focusedRow && this.rowActionsFor(this.focusedRow).length > 0) {
+			if (this.focusedRow && this.primaryRowActionFor(this.focusedRow)) {
 				handlers['row-primary'] = () => this.runPrimaryRowAction()
 			}
 			return handlers
@@ -3748,6 +3799,9 @@ export default {
 
 		/** Pagination: store pagination in self-fetch mode, else the `pagination` prop. */
 		effectivePagination() {
+			if (this.selfFetchFailed) {
+				return { ...this.list.pagination.value, total: 0, page: 1, pages: 1 }
+			}
 			return this.isSelfFetchMode ? this.list.pagination.value : this.pagination
 		},
 
@@ -4108,7 +4162,8 @@ export default {
 		},
 
 		/**
-		 * Merged actions: app-provided first, then built-in defaults.
+		 * Merged actions: the declared entries in order, each `"builtin:<id>"` placeholder replaced by that built-in when its toggle is on, then the enabled built-ins not placed.
+		 * See `resolveRowActions`.
 		 *
 		 * REQ-MAD-3 / REQ-MAD-4 / REQ-MAD-5 / REQ-MAD-6 / REQ-MAD-7
 		 * (manifest-actions-dispatch) — for any action whose `handler`
@@ -4124,58 +4179,41 @@ export default {
 				registry: this.effectiveRegistry,
 				customComponents: this.effectiveCustomComponents,
 			}
-			// Drop anything that is not an action OBJECT. A bare string — the
-			// shorthand `"edit"` an author reasonably expects to mean "show the
-			// built-in Edit" — has no `label` and no `icon`, so it rendered as a
-			// full-height NcActionButton with nothing in it: an invisible,
-			// clickable, inert row in the overflow menu. Observed on dossiq,
-			// where `config.actions: ["create", "edit", "delete", {…}]` put three
-			// blank rows above the real ones on four different index pages.
-			//
-			// Named, not silently swallowed: a dropped action is a capability the
-			// author asked for and did not get, and the manifest schema now
-			// rejects the shape at authoring time (`config.actions` is governed by
-			// the same `action` definition as `pages[].actions`). Built-ins are
-			// turned on with the `show*Action` toggles, not by naming them here.
 			// A named source may supply its own row actions, on the same
 			// precedence as its columns: what the manifest declares wins, and the
-			// source is the DEFAULT for a page that declares none. Without this
-			// the source's `rowActions` were declared and never read — the third
-			// field of the same adapter to be wired late, after `columns` and
-			// `addLabel`.
-			//
-			// Note what this still cannot do: these are MERGED with the built-ins
-			// below, so a source can add an action but cannot say "these and no
-			// others". Suppressing a built-in is the `show*Action` toggles' job.
+			// source is the DEFAULT for a page that declares none.
+			// Either list may place built-ins with `"builtin:<id>"`; turning one on or off stays the `show*Action` toggles' job.
 			const manifestDeclared = this.actions && this.actions.length > 0
 			const declaredActions = manifestDeclared
 				? this.actions
 				: ((this.isNamedSource && this.namedSource && this.namedSource.rowActions) || [])
 
-			const declared = []
-			for (const a of declaredActions) {
-				if (a && typeof a === 'object' && !Array.isArray(a)) {
+			const { actions, warnings } = resolveRowActions(declaredActions, this.defaultActions, {
+				prepare: (a) => {
 					// A SOURCE action may say `action: 'open'`: open this row the
 					// way a row click does — the source's own navigation
 					// (`openRow`/`detailRoute`), with `edit-open` emitted so a
 					// host that configured a row target (`config.rowRoute`) wins.
-					// Resolved here because a source is a composable with no
-					// router; the flows source declared exactly this action and
-					// it rendered as a dead menu entry, because `action` was a
-					// key nothing read (dispatch reads `handler` and `type`).
-					// Source-declared actions only: the manifest grammar for
-					// navigation is `type`/`handler`, and stays so.
+					// Resolved here because a source is a composable with no router.
+					// Source-declared actions only: the manifest grammar for navigation is `type`/`handler`, and stays so.
 					if (!manifestDeclared && a.action === 'open' && typeof a.handler !== 'function') {
-						declared.push({ ...a, handler: (row) => this.openSourceRow(row) })
-						continue
+						return { ...a, handler: (row) => this.openSourceRow(row) }
 					}
-					declared.push(dispatchAction(a, ctx))
+					return dispatchAction(a, ctx)
+				},
+			})
+			for (const warning of warnings) {
+				// A toggle turned off at runtime (permissions, readOnly) legitimately silences a placeholder; the validator flags a statically-off one.
+				if (warning.code === 'disabled-placeholder') {
 					continue
 				}
-				// eslint-disable-next-line no-console
-				console.warn(`[CnIndexPage] Ignoring action ${JSON.stringify(a)}: actions must be objects with an id and a label. To show a built-in action use the showViewAction / showEditAction / showCopyAction / showDeleteAction props.`)
+				// A dropped entry is always named; the placement hints are dev-only.
+				if (warning.code === 'invalid-entry' || process.env.NODE_ENV !== 'production') {
+					// eslint-disable-next-line no-console
+					console.warn(`[CnIndexPage] "${this.title}": ${warning.message}`)
+				}
 			}
-			return [...declared, ...this.defaultActions]
+			return actions
 		},
 
 		hasRowActions() {
@@ -5421,9 +5459,20 @@ export default {
 		},
 
 		/**
-		 * Run the first action the focused row offers. "First" is the page's
-		 * order, narrowed by what the server allows on that record, so the
-		 * primary action is never one this caller may not run.
+		 * The first action a row's menu shows and enables: the page's order, narrowed by what the server allows, by `visible` / `visibleWhen`, and by `disabled`.
+		 * The keyboard therefore never runs what the menu hides or greys out.
+		 *
+		 * @param {object} row The row.
+		 * @return {(object|null)} The action, or null.
+		 * @spec openspec/changes/row-action-builtin-placement/specs/index-page/spec.md
+		 */
+		primaryRowActionFor(row) {
+			return this.rowActionsFor(row).find((action) => isRowActionVisible(action, row)
+				&& !(typeof action.disabled === 'function' ? action.disabled(row) : action.disabled)) || null
+		},
+
+		/**
+		 * Run the focused row's primary action (see `primaryRowActionFor`).
 		 *
 		 * @return {void}
 		 * @spec openspec/changes/working-list-row-actions/specs/index-page/spec.md
@@ -5433,14 +5482,14 @@ export default {
 			if (!row) {
 				return
 			}
-			const [first] = this.rowActionsFor(row)
+			const first = this.primaryRowActionFor(row)
 			if (!first) {
 				return
 			}
 			if (typeof first.handler === 'function') {
 				first.handler(row)
 			}
-			this.$emit('action', { action: first.label, row })
+			this.onRowAction(rowActionPayload(first, row))
 		},
 
 		/**
@@ -5757,16 +5806,22 @@ export default {
 		},
 
 		/**
-		 * Intercepts CnRowActions' bubbled `@action` so `handler: "none"`
-		 * actions are dropped before re-emit.
+		 * Intercepts CnRowActions' and CnContextMenu's bubbled `@action` so `handler: "none"` actions are dropped before re-emit.
+		 * A built-in is matched by its id, an app action by its label.
 		 *
-		 * @param {{action: string, row: object}} payload The bubbled action payload.
+		 * @param {{action: string, row: object, id?: string, builtin?: boolean}} payload The bubbled action payload.
 		 */
 		onRowAction(payload) {
-			const matched = this.mergedActions.find((a) => a.label === payload.action)
+			const matched = payload.builtin === true
+				? this.mergedActions.find((a) => a.builtin === true && a.id === payload.id)
+				: this.mergedActions.find((a) => a.builtin !== true && a.label === payload.action)
 			if (matched && matched._dispatchSuppress) {
 				return
 			}
+			/**
+			 * @event action A row action was chosen from a row's actions menu, its right-click menu or the keyboard primary action. Payload: `action` (the label), the row, the action's `id` when it has one, and `builtin: true` for a built-in View / Edit / Copy / Delete. Its handler has already run.
+			 * @type {{ action: string, row: object, id?: string, builtin?: boolean }}
+			 */
 			this.$emit('action', payload)
 		},
 
@@ -6712,6 +6767,7 @@ export default {
 		// --- Context menu handlers ---
 
 		onRowContextMenu({ row, event }) {
+			this.contextMenuShownRow = row
 			this.openContextMenu({ item: row, event })
 		},
 

package/src/components/CnIndexPage/defaultActions.js

@@ -14,9 +14,8 @@ import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
  *   without it, or when it returns null, View is a button.
  * @param {{ onView: (row: object) => void, onEdit: (row: object) => void, onCopy: (row: object) => void, onDelete: (row: object) => void }} opts.handlers
  *   Click handlers bound to each emitted action, in the same order as `flags`.
- * @return {Array<object>} The enabled actions in menu order (view, edit, copy,
- *   delete), each `{label, icon, handler}` — delete additionally `destructive`,
- *   view additionally `to` when `viewTo` is given.
+ * @return {Array<object>} The enabled actions in menu order (view, edit, copy, delete), each `{id, builtin: true, label, icon, handler}`.
+ *   The id is `view`, `edit`, `copy` or `delete`; delete additionally carries `destructive`, view additionally `to` when `viewTo` is given.
  */
 export function buildDefaultActions({ flags, viewIcon, viewTo = null, handlers }) {
 	// t() at BUILD-actions time, not module time: the labels were string
@@ -26,20 +25,20 @@ export function buildDefaultActions({ flags, viewIcon, viewTo = null, handlers }
 	// consuming app's language is already resolved.
 	const out = []
 	if (flags.view) {
-		const view = { label: t('nextcloud-vue', 'View'), icon: viewIcon, handler: handlers.onView }
+		const view = { id: 'view', builtin: true, label: t('nextcloud-vue', 'View'), icon: viewIcon, handler: handlers.onView }
 		if (typeof viewTo === 'function') {
 			view.to = viewTo
 		}
 		out.push(view)
 	}
 	if (flags.edit) {
-		out.push({ label: t('nextcloud-vue', 'Edit'), icon: Pencil, handler: handlers.onEdit })
+		out.push({ id: 'edit', builtin: true, label: t('nextcloud-vue', 'Edit'), icon: Pencil, handler: handlers.onEdit })
 	}
 	if (flags.copy) {
-		out.push({ label: t('nextcloud-vue', 'Copy'), icon: ContentCopy, handler: handlers.onCopy })
+		out.push({ id: 'copy', builtin: true, label: t('nextcloud-vue', 'Copy'), icon: ContentCopy, handler: handlers.onCopy })
 	}
 	if (flags.del) {
-		out.push({ label: t('nextcloud-vue', 'Delete'), icon: TrashCanOutline, destructive: true, handler: handlers.onDelete })
+		out.push({ id: 'delete', builtin: true, label: t('nextcloud-vue', 'Delete'), icon: TrashCanOutline, destructive: true, handler: handlers.onDelete })
 	}
 	return out
 }

package/src/components/CnRowActions/CnRowActions.vue

@@ -3,7 +3,7 @@
 		:primary="primary"
 		:menuName="menuName"
 		data-testid="cn-row-actions">
-		<template v-for="{ action, link } in renderedActions" :key="action.label">
+		<template v-for="{ action, link } in renderedActions" :key="actionKey(action)">
 			<!-- A navigate-only action is a real link, so it can be middle-clicked, opened in a new tab or copied. -->
 			<NcActionLink
 				v-if="link"
@@ -11,7 +11,7 @@
 				:target="link.target"
 				:title="getTitle(action)"
 				:class="{ 'cn-row-action--destructive': action.destructive }"
-				:data-testid="`cn-action-item-${slugifyLabel(action.label)}`"
+				:data-testid="actionTestId(action)"
 				closeAfterClick
 				@click="onLinkAction(action, link, $event)">
 				<template v-if="action.icon" #icon>
@@ -25,7 +25,7 @@
 				:title="getTitle(action)"
 				:disabled="isDisabled(action)"
 				:class="{ 'cn-row-action--destructive': action.destructive }"
-				:data-testid="`cn-action-item-${slugifyLabel(action.label)}`"
+				:data-testid="actionTestId(action)"
 				closeAfterClick
 				@click="onAction(action)">
 				<template v-if="action.icon" #icon>
@@ -42,7 +42,7 @@
 import { NcActionButton, NcActionLink, NcActions } from '@nextcloud/vue'
 import { followItemActionLink, resolveItemActionLink } from '../../utils/actionLink.js'
 import { isModifiedClick } from '../../utils/linkNavigation.js'
-import { evaluateVisibleWhenLocal, isLocallyDecidableVisibleWhen } from '../../utils/visibleWhen.js'
+import { isRowActionVisible, rowActionKey, rowActionPayload, rowActionTestId, slugifyActionLabel } from '../../utils/rowActionItem.js'
 import { CnIcon } from '../CnIcon/index.js'
 
 /**
@@ -103,11 +103,13 @@ export default {
 		 * - `to` (string | object | (row) => string | object) — render the entry as a link to this
 		 *   vue-router location; a plain click routes in place. Ignored when the router cannot resolve it.
 		 * - `linkTarget` (string) — the link's `target`, e.g. `_blank`
+		 * - `id` (string) — the action's id, passed in the `action` payload
+		 * - `builtin` (boolean) — set by CnIndexPage on its built-in View / Edit / Copy / Delete; a built-in's testid is `cn-action-item-<id>` in every locale and its key `builtin:<id>`
 		 *
 		 * A link entry still emits `action`, but its `handler` is not called: the link is the
 		 * navigation. A disabled entry, or a `to` without a resolvable route, stays a button.
 		 *
-		 * @type {Array<{label: string, icon: object | string, handler: (targetItem: object) => void, disabled: boolean | ((targetItem: object) => boolean), visible: boolean | ((targetItem: object) => boolean), title: string | ((targetItem: object) => string), destructive: boolean, href: string | ((targetItem: object) => string), to: string | object | ((targetItem: object) => string | object), linkTarget: string}>}
+		 * @type {Array<{label: string, id: string, builtin: boolean, icon: object | string, handler: (targetItem: object) => void, disabled: boolean | ((targetItem: object) => boolean), visible: boolean | ((targetItem: object) => boolean), title: string | ((targetItem: object) => string), destructive: boolean, href: string | ((targetItem: object) => string), to: string | object | ((targetItem: object) => string | object), linkTarget: string}>}
 		 */
 		actions: {
 			type: Array,
@@ -137,31 +139,13 @@ export default {
 
 	computed: {
 		/**
-		 * Filter actions by their `visible` predicate. An action without a
-		 * `visible` field is always shown (backwards compatible).
+		 * Filter actions by their `visibleWhen` and `visible` gates, with the same rule CnContextMenu uses.
+		 * An action without either always shows.
 		 *
 		 * @return {Array} Visible actions for the current row.
 		 */
 		visibleActions() {
-			return this.actions.filter((action) => {
-				// A manifest is JSON and cannot hold a function, so `visibleWhen` is
-				// the only per-row gate an app configured from one can express. Only
-				// a locally decidable condition is gated on: an endpoint/source one is
-				// not this evaluator's question, and nothing gated a row action at all
-				// before, so answering `false` to it would delete the entry outright.
-				if (action.visibleWhen
-					&& isLocallyDecidableVisibleWhen(action.visibleWhen)
-					&& evaluateVisibleWhenLocal(action.visibleWhen, this.row) === false) {
-					return false
-				}
-				if (action.visible === undefined) {
-					return true
-				}
-				if (typeof action.visible === 'function') {
-					return !!action.visible(this.row)
-				}
-				return !!action.visible
-			})
+			return this.actions.filter((action) => isRowActionVisible(action, this.row))
 		},
 
 		/**
@@ -210,7 +194,7 @@ export default {
 			if (action.handler && typeof action.handler === 'function') {
 				action.handler(this.row)
 			}
-			this.$emit('action', { action: action.label, row: this.row })
+			this.$emit('action', rowActionPayload(action, this.row))
 		},
 
 		/**
@@ -229,26 +213,41 @@ export default {
 			}
 			followItemActionLink(event, link, this.$router)
 			/**
-			 * @event action User picked an entry. Payload: the action's label and the row. A button entry has already run its `handler`; a link entry navigates instead, and a modified (new-tab) click on a link emits nothing.
-			 * @type {{ action: string, row: object|null }}
+			 * @event action User picked an entry. Payload: `action` (the label), the row, the action's `id` when it has one, and `builtin: true` for a CnIndexPage built-in. A button entry has already run its `handler`; a link entry navigates instead, and a modified (new-tab) click on a link emits nothing.
+			 * @type {{ action: string, row: object|null, id?: string, builtin?: boolean }}
 			 */
-			this.$emit('action', { action: action.label, row: this.row })
+			this.$emit('action', rowActionPayload(action, this.row))
 		},
 
 		/**
 		 * Slugify an action label for use in stable `data-testid` selectors.
-		 * Lowercase, kebab-case, strip non-alphanumeric. Used solely by the
-		 * `:data-testid` binding on NcActionButton — does not affect runtime
-		 * behaviour or rendered text.
+		 * Lowercase, kebab-case, strip non-alphanumeric.
 		 *
 		 * @param {string} label - The action's display label
 		 * @return {string} kebab-case slug suitable for a testid suffix.
 		 */
 		slugifyLabel(label) {
-			return String(label || '')
-				.toLowerCase()
-				.replace(/[^a-z0-9]+/g, '-')
-				.replace(/^-+|-+$/g, '')
+			return slugifyActionLabel(label)
+		},
+
+		/**
+		 * The entry's `data-testid`: `cn-action-item-<id>` for a built-in, the label slug otherwise.
+		 *
+		 * @param {object} action The action definition.
+		 * @return {string} The testid.
+		 */
+		actionTestId(action) {
+			return rowActionTestId(action)
+		},
+
+		/**
+		 * The entry's render key: `builtin:<id>` for a built-in, the label otherwise.
+		 *
+		 * @param {object} action The action definition.
+		 * @return {string} The key.
+		 */
+		actionKey(action) {
+			return rowActionKey(action)
 		},
 	},
 }

package/src/components/CnSetupWizard/CnSetupWizard.vue

@@ -199,13 +199,12 @@
 
 <script>
 import { getCurrentUser } from '@nextcloud/auth'
-import { loadState } from '@nextcloud/initial-state'
 import { translate as t } from '@nextcloud/l10n'
 import { NcButton, NcCheckboxRadioSwitch, NcLoadingIcon, NcNoteCard, NcSelect, NcTextField } from '@nextcloud/vue'
 import CnChoiceCards from '../CnChoiceCards/CnChoiceCards.vue'
 import CnLeafDependencySettings from '../CnLeafDependencySettings/CnLeafDependencySettings.vue'
 import CnWizardDialog from '../CnWizardDialog/CnWizardDialog.vue'
-import { checkDependencies, isDependencyResolved } from '../../composables/useDependencyCheck.js'
+import { checkDependencies, isDependencyResolved, missingRequiredApps, readServerAppStatuses } from '../../composables/useDependencyCheck.js'
 import { useSetupStatus } from '../../composables/useSetupStatus.js'
 import { fieldsFromSchema } from '../../utils/schema.js'
 
@@ -474,16 +473,15 @@ export default {
 		 *
 		 * @return {Array<{ step: object, missing: Array<string> }>}
 		 * @spec openspec/changes/setup-wizard-card-load-and-dependency-gate/specs/cn-setup-wizard/spec.md#requirement-the-wizard-checks-dependencies-before-any-step
+		 * @spec openspec/changes/optional-step-requires/specs/cn-setup-wizard/spec.md#requirement-a-step-whose-required-apps-are-absent-is-not-applicable
 		 */
 		skippedSteps() {
 			return this.declaredSteps
 				.filter((s) => Array.isArray(s.requires) && s.requires.length > 0)
 				.map((step) => {
 					const known = Object.fromEntries(this.dependencyRows.map((d) => [d.id, d]))
-					const missing = checkDependencies(step.requires, this.serverAppStatuses)
-						.map((row) => known[row.id] || row)
-						.filter((row) => !isDependencyResolved(row))
-						.map((row) => row.name || row.id)
+					const missing = missingRequiredApps(step.requires, this.serverAppStatuses)
+						.map((row) => (known[row.id] || row).name || row.id)
 					return { step, missing }
 				})
 				.filter((entry) => entry.missing.length > 0)
@@ -523,11 +521,7 @@ export default {
 		 * @return {object}
 		 */
 		serverAppStatuses() {
-			try {
-				return loadState(this.appId, 'dependency_statuses', {}) || {}
-			} catch {
-				return {}
-			}
+			return readServerAppStatuses(this.appId)
 		},
 
 		/**
@@ -647,9 +641,15 @@ export default {
 							value = this.choiceLabel(step, raw)
 						}
 					} else if (step.type === 'config-fields') {
+						// Only the fields the reader filled in: a row of empty
+						// "Name: , KvK: ," reads as broken, not as "not set".
 						value = this.fieldsFor(step)
-							.map((f) => `${f.label}: ${this.configModel[f.key] !== null && this.configModel[f.key] !== undefined ? this.configModel[f.key] : ''}`)
-							.join(', ')
+							.filter((f) => {
+								const v = this.configModel[f.key]
+								return v !== null && v !== undefined && String(v).trim() !== ''
+							})
+							.map((f) => `${f.label}: ${this.configModel[f.key]}`)
+							.join(', ') || t('nextcloud-vue', 'Not set')
 					}
 					if (this.isOnDemand(step)) {
 						const ran = this.ranThisSession(step.id)

package/src/components/CnTimelineWidget/CnTimelineWidget.vue

@@ -53,7 +53,7 @@
 <script>
 import { getLanguage, translate as t } from '@nextcloud/l10n'
 import { NcLoadingIcon, NcNoteCard } from '@nextcloud/vue'
-import { auditEvents, fieldEvents, relatedEvents, sortEvents, timelineEntryEvents } from '../../utils/timelineEvents.js'
+import { auditEvents, fieldEvents, listEvents, relatedEvents, sortEvents, timelineEntryEvents } from '../../utils/timelineEvents.js'
 
 /**
  * CnTimelineWidget — an object's dated events in time order (`timeline`
@@ -193,6 +193,7 @@ export default {
 			const now = new Date()
 			const all = [
 				...fieldEvents(this.resolvedObject || {}, this.fieldsConfig, now),
+				...listEvents(this.resolvedObject || {}, this.content.lists, now),
 				...this.relatedConfig.flatMap((cfg, i) => relatedEvents(this.relatedRows[i] || [], cfg, now)),
 				...auditEvents(this.auditEntries, this.describeAudit, now),
 				...timelineEntryEvents(this.timelineEntries, t('nextcloud-vue', 'Note'), now),
@@ -347,7 +348,7 @@ export default {
 			})
 
 			if (this.content.auditTrail === true) {
-				jobs.push(axios.get(generateUrl(`${base}/audit-trail`), { params: { limit: this.content.auditLimit || 50 } })
+				jobs.push(axios.get(generateUrl(`${base}/audit-trails`), { params: { limit: this.content.auditLimit || 50 } })
 					.then((r) => {
 						const data = r && r.data
 						this.auditEntries = (data && (data.results || data)) || []

package/src/composables/useContextMenu.js

@@ -1,4 +1,5 @@
 import { onBeforeUnmount, ref } from 'vue'
+import { rowActionPayload } from '../utils/rowActionItem.js'
 
 export const CTX_MENU_CSS_VAR_X = '--cn-ctx-menu-x'
 export const CTX_MENU_CSS_VAR_Y = '--cn-ctx-menu-y'
@@ -135,15 +136,16 @@ export function useContextMenu() {
 	 *
 	 * Calls `action.handler(targetItem)` if a handler exists, then returns a
 	 * payload object the caller can pass to `$emit('action', payload)`.
+	 * The payload is the one CnRowActions and CnContextMenu emit: the label as `action`, plus `id` and `builtin: true` when the action carries them.
 	 *
 	 * @param {object} action Action definition with `label` and optional `handler`
-	 * @return {{ action: string, row: object }}
+	 * @return {{ action: string, row: object, id?: string, builtin?: boolean }}
 	 */
 	function triggerAction(action) {
 		if (action.handler && typeof action.handler === 'function') {
 			action.handler(targetItem.value)
 		}
-		return { action: action.label, row: targetItem.value }
+		return rowActionPayload(action, targetItem.value)
 	}
 
 	// Clean up DOM if the consumer unmounts while the menu is open — nothing