@conduction/nextcloud-vue 2.56.0-beta.47 → 2.56.0-beta.49

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.111.0",
+	"version": "2.118.0",
 	"type": "object",
 	"required": ["$schema", "version"],
 	"allOf": [
@@ -335,6 +335,11 @@
 						}
 					}
 				},
+				"searchPlaceholder": {
+					"type": "string",
+					"minLength": 1,
+					"description": "i18n key / text for the line on the search field in Nextcloud's header (screens-board-top-bar-search, 2.118.0), naming what the app's search finds, for example \"Search cases, documents or contacts\". Applied by CnAppRoot under `look: \"board\"` on a page with `#header`; it replaces only the text of the resting field. Omitted, the field keeps Nextcloud's own line."
+				},
 				"featureRequestRepo": {
 					"type": "string",
 					"description": "`<owner>/<repo>` slug on the forge that the in-product feature-request deep-link targets (provided to descendants as `cnFeatureRequestRepo`). Falls back to `Conduction/<appId>` when omitted."
@@ -533,6 +538,21 @@
 		}
 	},
 	"$defs": {
+		"breadcrumbCrumb": {
+			"type": "object",
+			"additionalProperties": false,
+			"required": ["label"],
+			"description": "One breadcrumb crumb (config.breadcrumb).",
+			"properties": {
+				"label": { "type": "string", "minLength": 1 },
+				"route": { "type": "string" },
+				"params": { "type": "object", "additionalProperties": true },
+				"href": { "type": "string" },
+				"icon": { "type": "string", "minLength": 1, "description": "Optional MDI icon name (e.g. `Home`) drawn as the first crumb instead of the label, which then becomes its accessible name (zuiddrecht-pixel-gaps-2). Without it the label shows as text." },
+				"currentField": { "type": "string", "minLength": 1, "description": "A field of the record (dotted path, e.g. `identifier`) whose value is the current crumb instead of the display name; an empty value falls back to the display name (zuiddrecht-pixel-gaps-3)." },
+				"separator": { "type": "string", "minLength": 1, "maxLength": 3, "description": "Text drawn between the crumbs (e.g. `/`) instead of the chevron (zuiddrecht-pixel-gaps-3)." }
+			}
+		},
 		"rowIndicator": {
 			"type": "object",
 			"additionalProperties": false,
@@ -4259,7 +4279,7 @@
 						"headerMeta": {
 							"type": "string",
 							"minLength": 1,
-							"description": "type='detail', board look: the meta line on row 2 of the header, after the breadcrumb and a middle dot (screens-detail-page-parity). A field template such as `\"via {channel}\"`: every `{path}` is read from the record, and a line with an empty value is dropped. Maps to CnDetailPage `headerMeta`."
+							"description": "type='detail', board look: the meta line on row 2 of the header, after the breadcrumb and a middle dot (screens-detail-page-parity). A field template such as `\"via {channel}\"`: every `{path}` is read from the record, and a line with an empty value is dropped. Maps to CnDetailPage `headerMeta`. type='index' | 'dashboard' | 'settings' (page-header-breadcrumb): the note after the breadcrumb and a middle dot under the title; on an index page `{total}` and `{shown}` are the list's counts."
 						},
 						"tabsLabel": {
 							"type": "string",
@@ -4499,19 +4519,11 @@
 							"description": "type='detail': `false` drops the type eyebrow (the type label above the record name) once the record resolves, for a header that says the type in a pill instead (zuiddrecht-pixel-gaps). Maps to CnDetailPage `showTypeEyebrow`."
 						},
 						"breadcrumb": {
-							"type": "object",
-							"additionalProperties": false,
-							"required": ["label"],
-							"description": "type='detail': a breadcrumb line above the header (zuiddrecht-pixel-gaps): this crumb names the list the record belongs to (`route` + optional `params`, or `href`), the record's display name follows as the current crumb. Maps to CnDetailPage `breadcrumb`.",
-							"properties": {
-								"label": { "type": "string", "minLength": 1 },
-								"route": { "type": "string" },
-								"params": { "type": "object", "additionalProperties": true },
-								"href": { "type": "string" },
-								"icon": { "type": "string", "minLength": 1, "description": "Optional MDI icon name (e.g. `Home`) drawn as the first crumb instead of the label, which then becomes its accessible name (zuiddrecht-pixel-gaps-2). Without it the label shows as text." },
-								"currentField": { "type": "string", "minLength": 1, "description": "A field of the record (dotted path, e.g. `identifier`) whose value is the current crumb instead of the display name; an empty value falls back to the display name (zuiddrecht-pixel-gaps-3)." },
-								"separator": { "type": "string", "minLength": 1, "maxLength": 3, "description": "Text drawn between the crumbs (e.g. `/`) instead of the chevron (zuiddrecht-pixel-gaps-3)." }
-							}
+							"description": "A breadcrumb line. type='detail' (zuiddrecht-pixel-gaps): one crumb naming the list the record belongs to (`route` + optional `params`, or `href`); the record's display name follows as the current crumb. Maps to CnDetailPage `breadcrumb`. type='index' | 'dashboard' | 'settings' (page-header-breadcrumb): one crumb or a list, drawn under the title in the same row style; the page title follows as the current crumb. Maps to the page's `breadcrumb`.",
+							"anyOf": [
+								{ "$ref": "#/$defs/breadcrumbCrumb" },
+								{ "type": "array", "minItems": 1, "items": { "$ref": "#/$defs/breadcrumbCrumb" } }
+							]
 						},
 						"headerCard": {
 							"type": "boolean",

package/src/utils/dueText.js

@@ -6,7 +6,8 @@
  *
  * "3 dagen te laat" in the danger colour, "Vandaag", the short date for a
  * day still to come ("morgen", "20 okt"), and a configured text when the
- * field is empty ("Geen deadline"). One formatter for record-list rows and
+ * field is empty ("Geen deadline"). A day to come can read as a count instead
+ * ("nog 4 dagen", "nog 8 weken"). One formatter for record-list rows and
  * table cells, built on the relative date (`formatRelativeDate`).
  *
  * @module utils/dueText
@@ -23,8 +24,12 @@ import { parseDateValue } from './dateVariant.js'
  * Config (all optional): `todayLabel` (default "Due today"), `overdueLabel`
  * `{ one, other }` with `{count}` (default "{count} day overdue" / "{count} days
  * overdue"), `emptyText` (shown when the field is empty; without it an empty
- * field reads as nothing). Texts go through `translate` before `{count}` is
- * filled. Tones: `danger` (overdue), `today`, `upcoming`, `empty`.
+ * field reads as nothing), `upcomingLabel` `{ one, other }` with `{count}`
+ * (a day to come reads as the days left instead of the date), and
+ * `upcomingWeeksLabel` `{ one, other }` (from `upcomingWeeksFrom` days left,
+ * default 35, it reads the weeks left, rounded). Texts go through `translate`
+ * before `{count}` is filled. Tones: `danger` (overdue), `today`, `upcoming`,
+ * `empty`.
  *
  * @param {unknown} value A Date, a timestamp or an ISO string.
  * @param {object} [config] The `due` config.
@@ -41,10 +46,9 @@ export function resolveDue(value, config, translate = (text) => text, now = new
 	}
 	const days = ageInDays(date, now)
 	if (days > 0) {
-		const labels = cfg.overdueLabel && typeof cfg.overdueLabel === 'object' ? cfg.overdueLabel : null
-		if (labels && (labels.one || labels.other)) {
-			const template = translate((days === 1 ? labels.one : labels.other) || labels.other || labels.one)
-			return { text: template.replace(/\{count\}/g, String(days)), tone: 'danger' }
+		const overdue = pluralLabel(cfg.overdueLabel, days, translate)
+		if (overdue !== null) {
+			return { text: overdue, tone: 'danger' }
 		}
 		return { text: n('nextcloud-vue', '{count} day overdue', '{count} days overdue', days, { count: days }), tone: 'danger' }
 	}
@@ -52,5 +56,42 @@ export function resolveDue(value, config, translate = (text) => text, now = new
 		const label = typeof cfg.todayLabel === 'string' && cfg.todayLabel !== '' ? translate(cfg.todayLabel) : t('nextcloud-vue', 'Due today')
 		return { text: label, tone: 'today' }
 	}
-	return { text: formatRelativeDate(date, { now }), tone: 'upcoming' }
+	return { text: upcomingText(-days, cfg, translate) ?? formatRelativeDate(date, { now }), tone: 'upcoming' }
+}
+
+/**
+ * The days or weeks left before a date to come, or null without `upcomingLabel`.
+ *
+ * @param {number} left Whole days left, at least 1.
+ * @param {object} cfg The `due` config.
+ * @param {(text: string) => string} translate The host's translate.
+ * @return {string|null} The text, or null.
+ * @spec openspec/changes/due-text-upcoming-count/specs/due-text-upcoming-count/spec.md#requirement-a-due-date-to-come-can-read-as-the-time-left
+ */
+function upcomingText(left, cfg, translate) {
+	const from = Number(cfg.upcomingWeeksFrom)
+	const weeksFrom = Number.isFinite(from) && from > 0 ? from : 35
+	if (left >= weeksFrom) {
+		const weeks = pluralLabel(cfg.upcomingWeeksLabel, Math.round(left / 7), translate)
+		if (weeks !== null) {
+			return weeks
+		}
+	}
+	return pluralLabel(cfg.upcomingLabel, left, translate)
+}
+
+/**
+ * A `{ one, other }` label with `{count}` filled, or null when none is configured.
+ *
+ * @param {unknown} labels The configured label pair.
+ * @param {number} count The count.
+ * @param {(text: string) => string} translate The host's translate.
+ * @return {string|null} The text, or null.
+ */
+function pluralLabel(labels, count, translate) {
+	if (!labels || typeof labels !== 'object' || !(labels.one || labels.other)) {
+		return null
+	}
+	const template = translate((count === 1 ? labels.one : labels.other) || labels.other || labels.one)
+	return template.replace(/\{count\}/g, String(count))
 }

package/src/utils/libraryWidgetKeys.js

@@ -100,6 +100,7 @@ export const DASHBOARD_CATALOG_WIDGET_KEYS = Object.freeze([
 	'countdown',
 	'data',
 	'delta',
+	'device-frames',
 	'divider',
 	'document-review',
 	'facts',