@conduction/nextcloud-vue 2.79.0 → 2.81.0

package/src/utils/resolveManifestTokens.js

@@ -54,6 +54,8 @@ export const SENTINEL_RESOLVERS = Object.freeze({
 	declarative: 'fetchAggregate (OpenRegister server-side)',
 	visibleWhen: 'evaluateVisibleWhen (utils/visibleWhen.js)',
 	answer: 'resolveAssignValue (utils/formAssign.js)',
+	row: 'CnFieldListWidget (rowActions request)',
+	subject: 'CnBannerWidget (action route)',
 })
 
 /**

package/src/utils/schema.js

@@ -1050,12 +1050,33 @@ export function fieldsFromSchema(schema, options = {}) {
 		if (overrides[key]) {
 			Object.assign(field, overrides[key])
 			applyPickerOverride(field, overrides[key])
+			translateOverrideText(field, overrides[key], tr)
 		}
 
 		return field
 	})
 }
 
+/**
+ * Run an override's display text through the translate function, as the
+ * schema's own title and description are. A manifest writes `label`,
+ * `description` and `placeholder` in its source language; without this a
+ * form showed "Requester" to a Dutch user whose catalogue holds "Aanvrager".
+ *
+ * @param {object} field The field, with the override already merged in.
+ * @param {object} override The per-key override.
+ * @param {(text: string) => string} tr The translate function (identity when none).
+ * @return {void}
+ * @spec openspec/changes/screens-form-override-labels-parity/specs/form-override-labels/spec.md#requirement-override-text-reads-in-the-users-language
+ */
+function translateOverrideText(field, override, tr) {
+	for (const name of ['label', 'description', 'placeholder']) {
+		if (typeof override[name] === 'string' && override[name] !== '') {
+			field[name] = tr(override[name])
+		}
+	}
+}
+
 /**
  * Generate faceted filter definitions from a schema's facetable properties.
  *

package/src/utils/sentinelTokens.js

@@ -26,7 +26,7 @@
  * A token is valid only in the context whose resolver runs on it:
  *
  *  - **filter**       — `resolveFilterTokens`, resolved at fetch time:
- *                       `@me`, `@myGroups`, `@now`, `@today`, `@today±Nd`, `@monthStart`,
+ *                       `@me`, `@myGroups`, `@now`, `@today`, `@today±Nd`, `@monthStart`, `@monthEnd`, `@nextMonthStart`,
  *                       `@quarterStart`, `@yearStart`.
  *  - **config**       — `IAppConfig`-sourced: `@resolve:<key>`, `@config.<key>`
  *                       (trailing `?` marks optional).
@@ -67,7 +67,7 @@
  * @type {Readonly<Record<string, string>>}
  */
 export const SENTINEL_TOKEN_PATTERNS = Object.freeze({
-	filter: '^@(?:me(?:\\.(?:displayName|email))?|myGroups|now|today|monthStart|quarterStart|yearStart)$|^@today[+-][0-9]+d$',
+	filter: '^@(?:me(?:\\.(?:displayName|email))?|myGroups|now|today|monthStart|monthEnd|nextMonthStart|quarterStart|yearStart)$|^@today[+-][0-9]+d$',
 	config: '^@resolve:[a-z][a-z0-9_-]*$|^@config\\.[A-Za-z][A-Za-z0-9_.]*\\??$',
 	object: '^@objectId$|^@object\\.[A-Za-z][A-Za-z0-9_]*$',
 	workspace: '^@workspace\\.[A-Za-z][A-Za-z0-9_]*\\??$',
@@ -83,6 +83,12 @@ export const SENTINEL_TOKEN_PATTERNS = Object.freeze({
 	visibleWhen: '^@total$',
 	// form-live-values: another answer in the same form, read by a field's `assign` rule.
 	answer: '^@answer\\.[A-Za-z][A-Za-z0-9_]*$',
+	// A field of the row a row action is run on (`@row.<field>`, dot path), read by the
+	// field-list widget's `rowActions` request URL and payload.
+	row: '^@row\\.[A-Za-z][A-Za-z0-9_.@]*$',
+	// A field of the record a start-here attention card names (`@subject.<field>`, dot path),
+	// read by the banner widget's action routes.
+	subject: '^@subject\\.[A-Za-z][A-Za-z0-9_.]*$',
 	// Deprecated-but-not-yet-removed tokens. Kept in the schema union so
 	// deployed manifests still validate during the migration window; the gate
 	// downgrades them to a WARN (see SENTINEL_DEPRECATIONS).
@@ -90,7 +96,7 @@ export const SENTINEL_TOKEN_PATTERNS = Object.freeze({
 })
 
 /**
- * The eight canonical context names (excludes `deprecated`, which is a
+ * The nine canonical context names (excludes `deprecated`, which is a
  * transitional overlay, not a resolution context).
  *
  * @type {string[]}
@@ -104,6 +110,8 @@ export const SENTINEL_CONTEXTS = Object.freeze([
 	'declarative',
 	'visibleWhen',
 	'answer',
+	'row',
+	'subject',
 ])
 
 /**
@@ -117,7 +125,7 @@ export const SENTINEL_VOCABULARY = Object.freeze({
 	filter: {
 		resolver: 'resolveFilterTokens',
 		description: 'Relative fetch-time tokens (current user, the current user\'s groups as an IN list, relative dates).',
-		members: ['@me', '@me.displayName', '@me.email', '@myGroups', '@now', '@today', '@today±Nd', '@monthStart', '@quarterStart', '@yearStart'],
+		members: ['@me', '@me.displayName', '@me.email', '@myGroups', '@now', '@today', '@today±Nd', '@monthStart', '@monthEnd', '@nextMonthStart', '@quarterStart', '@yearStart'],
 	},
 	config: {
 		resolver: 'resolveManifestSentinels / resolveFilterTokens',
@@ -154,6 +162,16 @@ export const SENTINEL_VOCABULARY = Object.freeze({
 		description: 'Another answer in the same form, read by a field\'s `assign` rule.',
 		members: ['@answer.<field>'],
 	},
+	row: {
+		resolver: 'CnFieldListWidget (rowActions request url and payload)',
+		description: 'A field of the row a row action runs on, read by the field-list widget when it sends the action\'s request. Dot paths are allowed (`@row.owner.id`).',
+		members: ['@row.<field>'],
+	},
+	subject: {
+		resolver: 'CnBannerWidget (action route params and query)',
+		description: 'A field of the record an attention card names (the first row of its ordered `visibleWhen` source query), read when the card builds an action\'s route. Dot paths are allowed (`@subject.owner.id`).',
+		members: ['@subject.<field>'],
+	},
 })
 
 /**

package/src/utils/userGroupsPeek.js

@@ -0,0 +1,87 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V.
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * The synchronous, reactive read of the current user's group ids, without
+ * the request that loads them.
+ *
+ * `resolveFilterTokens` (and through it `visibleWhen`) needs the groups for
+ * `@myGroups`, and those utilities are used on public, signed-out pages too.
+ * Importing `widgetVisibility.js` statically pulled `@nextcloud/axios` and
+ * `@nextcloud/router` into every bundle that resolves a filter token: a public
+ * site bundle broke its size budget, and node specs crashed because axios
+ * reads the request token when it is imported. This module imports no
+ * `@nextcloud/*` package. It loads `widgetVisibility.js` lazily, only the
+ * first time a signed-in user's groups are actually peeked.
+ *
+ * @module utils/userGroupsPeek
+ */
+
+import { reactive } from 'vue'
+
+/**
+ * Reactive mirror of the group cache, keyed by user id. A computed that reads
+ * a missing key tracks it, so it re-runs when the groups arrive.
+ *
+ * @type {{ byUser: Record<string, string[]> }}
+ */
+const _peek = reactive({ byUser: {} })
+
+/** User ids whose groups a peek already asked for (not reactive on purpose). */
+const _peekRequested = new Set()
+
+/**
+ * Get the current Nextcloud user ID from OC.currentUser.
+ *
+ * @return {string|null} The current user ID, or null if not logged in
+ */
+export function getCurrentUserId() {
+	return window.OC?.currentUser?.uid
+		|| window.OC?.currentUser
+		|| null
+}
+
+/**
+ * Synchronous, reactive read of the current user's group ids, for code that
+ * cannot await (the `@myGroups` filter token). Returns the ids once they are
+ * loaded, `null` while the first request is in flight (and starts that
+ * request on first use), and `[]` when nobody is signed in. Read inside a
+ * computed, the computed re-runs when the groups arrive.
+ *
+ * @spec openspec/changes/nextcloud-group-surfaces/specs/schema-utilities/spec.md#requirement-mygroups-resolves-to-the-current-users-group-ids
+ * @return {string[]|null} The group ids, or null while loading.
+ */
+export function peekCurrentUserGroups() {
+	const userId = getCurrentUserId()
+	if (!userId) {
+		return []
+	}
+	const known = _peek.byUser[userId]
+	if (Array.isArray(known)) {
+		return known
+	}
+	if (!_peekRequested.has(userId)) {
+		_peekRequested.add(userId)
+		import('./widgetVisibility.js')
+			.then((module) => module.getCurrentUserGroups())
+			.then((groups) => {
+				_peek.byUser[userId] = Array.isArray(groups) ? [...groups] : []
+			})
+			.catch(() => {
+				_peek.byUser[userId] = []
+			})
+	}
+	return null
+}
+
+/**
+ * Forget every peeked group list. `resetVisibilityCache()` calls this.
+ *
+ * @spec exclude test helper behind resetVisibilityCache, no behaviour of its own
+ */
+export function resetGroupsPeek() {
+	_peekRequested.clear()
+	for (const key of Object.keys(_peek.byUser)) {
+		delete _peek.byUser[key]
+	}
+}