@conduction/nextcloud-vue 2.110.0 → 2.112.0

package/src/components/CnObjectCard/CnObjectCard.vue

@@ -24,7 +24,11 @@
 					class="cn-object-card__record-pill"
 					:label="recordHeadPill.label"
 					:variant="recordHeadPill.variant"
-					data-testid="cn-object-card-head-pill" />
+					data-testid="cn-object-card-head-pill">
+					<template v-if="recordHeadPill.icon" #icon>
+						<CnIcon :name="recordHeadPill.icon" :size="14" />
+					</template>
+				</CnStatusBadge>
 				<span v-if="recordNumber" class="cn-object-card__record-number" data-testid="cn-object-card-number">{{ recordNumber }}</span>
 				<div
 					v-if="$slots.actions"
@@ -63,7 +67,11 @@
 					:key="chip.field"
 					class="cn-object-card__record-pill"
 					:label="chip.label"
-					:variant="chip.variant" />
+					:variant="chip.variant">
+					<template v-if="chip.icon" #icon>
+						<CnIcon :name="chip.icon" :size="14" />
+					</template>
+				</CnStatusBadge>
 			</div>
 			<div v-if="$slots.badges" class="cn-object-card__badges">
 				<slot name="badges" :object="object" />
@@ -74,7 +82,11 @@
 					class="cn-object-card__record-pill"
 					:label="recordFootPill.label"
 					:variant="recordFootPill.variant"
-					data-testid="cn-object-card-foot-pill" />
+					data-testid="cn-object-card-foot-pill">
+					<template v-if="recordFootPill.icon" #icon>
+						<CnIcon :name="recordFootPill.icon" :size="14" />
+					</template>
+				</CnStatusBadge>
 				<span
 					v-if="recordDate"
 					class="cn-object-card__record-date"
@@ -207,6 +219,7 @@ import { normalizeLook } from '../../composables/useLook.js'
 import { isBadgeVariant } from '../../utils/badgeVariants.js'
 import { formatBoardDate } from '../../utils/boardDate.js'
 import { resolveDateVariant } from '../../utils/dateVariant.js'
+import { pillLook } from '../../utils/detailActionModel.js'
 import { resolveDue } from '../../utils/dueText.js'
 import { readPath } from '../../utils/readPath.js'
 import { resolveImageUrl } from '../../utils/resolveImageUrl.js'
@@ -375,6 +388,20 @@ export default {
 			default: null,
 		},
 
+		/**
+		 * The referenced records' colour and icon names, by field and id
+		 * (`{ [field]: { [id]: { color, icon } } }`, CnIndexPage reads them).
+		 * A record layout pill with `resolve: { colorField?, iconField? }` takes
+		 * its record's tone and icon from here.
+		 *
+		 * @type {object}
+		 * @spec openspec/changes/pill-color-field/specs/pill-color-field/spec.md#requirement-a-card-pill-takes-its-tone-and-icon-from-the-referenced-record
+		 */
+		pillLooks: {
+			type: Object,
+			default: () => ({}),
+		},
+
 		/**
 		 * The property keys the facts list shows, in order (manifest key
 		 * `config.cardFields`). Without it the card shows the first
@@ -588,7 +615,7 @@ export default {
 					const labels = def.labels && typeof def.labels === 'object' ? def.labels : {}
 					const shown = typeof labels[String(raw)] === 'string' ? this.cnTranslate(labels[String(raw)]) : label
 					const variant = mapped || def.variant
-					return { field: def.field, label: shown, variant: isBadgeVariant(variant) ? variant : 'default' }
+					return this.withLook({ field: def.field, label: shown, variant: isBadgeVariant(variant) ? variant : 'default' }, def)
 				})
 				.filter(Boolean)
 		},
@@ -838,7 +865,26 @@ export default {
 			const colorMap = def.colorMap && typeof def.colorMap === 'object' ? def.colorMap : {}
 			const key = Object.keys(colorMap).find((k) => k.toLowerCase() === value.toLowerCase())
 			const variant = key !== undefined ? colorMap[key] : def.variant
-			return { label, variant: isBadgeVariant(variant) ? variant : 'default' }
+			return this.withLook({ label, variant: isBadgeVariant(variant) ? variant : 'default' }, def)
+		},
+
+		/**
+		 * Lay the referenced record's tone and icon over a layout pill that
+		 * declares `resolve` (see `pillLooks`).
+		 *
+		 * @param {{label: string, variant: string}} pill The pill as declared.
+		 * @param {object} def The pill's definition.
+		 * @return {{label: string, variant: string, icon?: string}} The pill.
+		 * @spec openspec/changes/pill-color-field/specs/pill-color-field/spec.md#requirement-a-card-pill-takes-its-tone-and-icon-from-the-referenced-record
+		 */
+		withLook(pill, def) {
+			if (!def || !def.resolve || !this.pillLooks || typeof this.pillLooks !== 'object') {
+				return pill
+			}
+			const looks = this.pillLooks[def.field]
+			const raw = readPath(this.object, def.field)
+			const look = pillLook(looks && raw !== null && raw !== undefined ? looks[String(raw)] : null)
+			return { ...pill, ...(look.variant ? { variant: look.variant } : {}), ...(look.icon ? { icon: look.icon } : {}) }
 		},
 
 		/**

package/src/components/CnPartyPicker/CnPartyPicker.vue

@@ -3,24 +3,39 @@
   - SPDX-License-Identifier: EUPL-1.2
 -->
 <template>
-	<CnSearchSelect
-		class="cn-party-picker"
-		:modelValue="selectedOption"
-		:options="options"
-		:inputLabel="inputLabel"
-		:labelOutside="labelOutside"
-		:placeholder="placeholder ? cnTranslate(placeholder) : ''"
-		:loading="searching"
-		:filterable="false"
-		:clearable="clearable"
-		:disabled="disabled"
-		data-testid="cn-party-picker"
-		@search="onSearch"
-		@update:modelValue="onPick" />
+	<div class="cn-party-picker">
+		<CnSearchSelect
+			:modelValue="selectedOption"
+			:options="options"
+			:inputLabel="inputLabel"
+			:labelOutside="labelOutside"
+			:placeholder="placeholder ? cnTranslate(placeholder) : ''"
+			:loading="searching"
+			:filterable="false"
+			:clearable="clearable"
+			:disabled="disabled"
+			data-testid="cn-party-picker"
+			@search="onSearch"
+			@update:modelValue="onPick" />
+		<p v-if="refusal"
+			class="cn-party-picker__refusal"
+			role="alert"
+			data-testid="cn-party-picker-refusal">
+			{{ t('nextcloud-vue', 'This search could not be read.') }} {{ refusal }}
+		</p>
+		<p v-for="name in unavailable"
+			:key="name"
+			class="cn-party-picker__unavailable"
+			role="status"
+			data-testid="cn-party-picker-unavailable">
+			{{ t('nextcloud-vue', '{source} could not be searched, so this list may be incomplete.', { source: name }) }}
+		</p>
+	</div>
 </template>
 
 <script>
 import axios from '@nextcloud/axios'
+import { translate as t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
 import { fillTemplate } from '../../utils/fillTemplate.js'
 import { CnSearchSelect } from '../CnSearchSelect/index.js'
@@ -142,6 +157,8 @@ export default {
 			known: null,
 			timer: null,
 			searchSeq: 0,
+			refusal: '',
+			unavailable: [],
 		}
 	},
 
@@ -185,6 +202,8 @@ export default {
 	},
 
 	methods: {
+		t,
+
 		/**
 		 * A source's row as a picker option.
 		 *
@@ -244,7 +263,9 @@ export default {
 		},
 
 		/**
-		 * Search every source at once; a source that fails adds nothing.
+		 * Search every source at once. A term a source refused (400) is said
+		 * under the field in its words; a source that could not be searched at
+		 * all is named, so an empty list never hides a missing source.
 		 *
 		 * @spec openspec/changes/party-picker/specs/party-picker/spec.md#requirement-one-search-field-over-several-kinds-of-party
 		 * @param {string} term The search term.
@@ -253,6 +274,8 @@ export default {
 		async search(term) {
 			const seq = ++this.searchSeq
 			this.searching = true
+			let refusal = ''
+			const unavailable = []
 			const sets = await Promise.all((this.sources || []).map(async (source) => {
 				try {
 					if (source.type === 'contacts') {
@@ -264,7 +287,16 @@ export default {
 					}
 					const { data } = await axios.get(generateUrl(`/apps/openregister/api/objects/${source.register}/${source.schema}`), { params: { _search: term, _limit: source.limit || 8 } })
 					return (data && Array.isArray(data.results) ? data.results : []).map((row) => this.optionOf(source, row))
-				} catch {
+				} catch (failure) {
+					// OpenRegister refuses a term it cannot parse with a 400 rather
+					// than answering nothing, so that refusal is said, not hidden.
+					const response = failure && failure.response
+					if (response && response.status === 400) {
+						const body = response.data
+						refusal = String((body && (body.message || body.error)) || (typeof body === 'string' ? body : '') || refusal)
+					} else {
+						unavailable.push(source.label ? this.cnTranslate(source.label) : String(source.id || ''))
+					}
 					return []
 				}
 			}))
@@ -272,6 +304,8 @@ export default {
 				return
 			}
 			this.options = sets.flat().filter(Boolean)
+			this.refusal = refusal
+			this.unavailable = unavailable.filter(Boolean)
 			this.searching = false
 		},
 
@@ -315,3 +349,15 @@ export default {
 	},
 }
 </script>
+
+<style scoped>
+.cn-party-picker__refusal {
+	margin: 4px 0 0;
+	color: var(--color-error-text, var(--color-error));
+}
+
+.cn-party-picker__unavailable {
+	margin: 4px 0 0;
+	color: var(--color-text-maxcontrast);
+}
+</style>

package/src/components/CnSearchSelect/CnSearchSelect.vue

@@ -214,6 +214,13 @@ export default {
 	position: relative;
 }
 
+/* The field takes the row: NcSelect is an inline block of at least 260px,
+   which left the magnifier, placed at the row's end, outside the field
+   (DqOverdragen "Nieuw team"). */
+.cn-search-select :deep(.v-select) {
+	width: 100%;
+}
+
 /* The magnifier sits where the chevron was: in the field, at its end. */
 .cn-search-select__magnifier {
 	position: absolute;
@@ -222,6 +229,7 @@ export default {
 	height: var(--default-clickable-area, 34px);
 	display: flex;
 	align-items: center;
+	z-index: 1;
 	color: var(--color-text-maxcontrast);
 	pointer-events: none;
 }

package/src/composables/useRefLabels.js

@@ -65,6 +65,22 @@ export function pickRefLabel(obj, labelField) {
 	return null
 }
 
+/**
+ * Read one field off a referenced object, with no fallback: a colour or an
+ * icon name must not fall back to the title.
+ *
+ * @param {object|null} obj   The referenced object.
+ * @param {string}      field The (possibly nested) property.
+ * @return {string|null} The value as text, or null when it is empty.
+ */
+export function pickRefField(obj, field) {
+	if (!obj || typeof obj !== 'object' || !field) {
+		return null
+	}
+	const text = asText(readPath(obj, field))
+	return text !== '' ? text : null
+}
+
 /**
  * Create a resolver bound to an object store. Labels are cached per register,
  * schema and label field for the lifetime of the resolver.
@@ -91,9 +107,13 @@ export function createRefLabelResolver(getStore) {
 		 * @param {string}   schema     Schema slug of the referenced objects.
 		 * @param {string[]} ids        Ids to resolve (duplicates are dropped).
 		 * @param {string}   labelField Property holding the label (dotted paths allowed).
+		 * @param {{strict?: boolean}} [options] `strict`: read exactly that field, with no
+		 *   fallback to the title or name (a colour or an icon name).
 		 * @return {Promise<Object<string, string|null>>} Label by id.
 		 */
-		async resolve(register, schema, ids, labelField) {
+		async resolve(register, schema, ids, labelField, options = {}) {
+			const strict = options.strict === true
+			const pick = strict ? pickRefField : pickRefLabel
 			const distinct = [...new Set((ids || []).filter((id) => id !== null && id !== undefined && id !== '').map(String))]
 			const out = {}
 			if (distinct.length === 0) {
@@ -115,14 +135,14 @@ export function createRefLabelResolver(getStore) {
 				})
 				return out
 			}
-			const hit = bucket(`${type}::${labelField || ''}`)
+			const hit = bucket(`${type}::${labelField || ''}::${strict ? 'field' : 'label'}`)
 			const missing = []
 			for (const id of distinct) {
 				const stored = store.objects && store.objects[type] && store.objects[type][id]
 				if (hit.has(id)) {
 					continue
 				}
-				const label = stored ? pickRefLabel(stored, labelField) : null
+				const label = stored ? pick(stored, labelField) : null
 				if (label !== null) {
 					hit.set(id, label)
 				} else {
@@ -136,7 +156,7 @@ export function createRefLabelResolver(getStore) {
 					rows = await store.fetchCollectionForOptions(type, {
 						_ids: missing.join(','),
 						_limit: missing.length,
-						_fields: [...new Set([top, 'title', 'name'])].join(','),
+						_fields: (strict ? [top] : [...new Set([top, 'title', 'name'])]).join(','),
 					})
 				} catch {
 					rows = []
@@ -148,7 +168,7 @@ export function createRefLabelResolver(getStore) {
 						byId.set(String(id), row)
 					}
 				})
-				missing.forEach((id) => hit.set(id, pickRefLabel(byId.get(id), labelField)))
+				missing.forEach((id) => hit.set(id, pick(byId.get(id), labelField)))
 			}
 			distinct.forEach((id) => {
 				out[id] = hit.has(id) ? hit.get(id) : null

package/src/css/board.css

@@ -55,10 +55,13 @@
 	margin-inline-start: auto;
 	padding: 1px 8px;
 	border-radius: 10px;
+	--nldesign-color-on-surface: var(--cn-board-text-soft, var(--color-main-text));
 	background-color: var(--color-main-background);
-	color: var(--color-main-text);
+	color: var(--cn-board-text-soft, var(--color-main-text));
 	font-size: 12px;
-	font-weight: 400;
+	font-weight: 700;
+	/* 16px tall on its 1px pad (DqWerkbord's column counts). */
+	line-height: 14px;
 }
 
 /* A column at its limit: the count in the error colour; "full" is said in words too. */

package/src/css/dialog.css

@@ -20,7 +20,7 @@
 	--nldesign-component-dialog-border-radius: var(--cn-board-card-radius, 12px);
 	--cn-dialog-width: 640px;
 	--cn-dialog-danger: var(--color-error);
-	--cn-dialog-eyebrow-color: var(--color-primary-element-text, var(--color-main-text));
+	--cn-dialog-eyebrow-color: var(--color-primary-element-light-text, var(--color-main-text));
 	--cn-dialog-eyebrow-transform: none;
 	--cn-dialog-eyebrow-tracking: 0;
 }
@@ -86,6 +86,7 @@
 }
 
 .cn-dialog-header__eyebrow {
+	--nldesign-color-on-surface: var(--cn-dialog-eyebrow-color, var(--color-main-text));
 	margin-bottom: 4px;
 	font-size: 13px;
 	font-weight: 700;
@@ -101,13 +102,24 @@
 	color: var(--color-main-text);
 }
 
+/* The subtitle is a <p>, which the nldesign theme sizes and inks with
+   `!important` through its paragraph tokens: the board's 14px muted line
+   goes to those tokens too (DqOverdragen, DqDocumentGenereren). */
 .cn-dialog-header__subtitle {
+	--nldesign-component-paragraph-font-size: 14px;
+	--nldesign-component-paragraph-color: var(--color-text-maxcontrast);
+	--nldesign-color-on-surface: var(--color-text-maxcontrast);
 	margin: 4px 0 0;
 	font-size: 14px;
 	color: var(--color-text-maxcontrast);
 }
 
-.cn-dialog-header__close {
+/* The close button is a 36px circle. NcButton sizes an icon-only button by
+   --button-size with `!important`, so the size goes through that; the radius
+   also goes to the nldesign theme's button radius token. */
+.cn-dialog-header .cn-dialog-header__close.button-vue {
+	--button-size: 36px;
+	--nldesign-component-button-border-radius: 50%;
 	flex: 0 0 auto;
 	width: 36px;
 	min-width: 36px;
@@ -147,6 +159,28 @@
 	border-radius: var(--cn-board-control-radius, 8px);
 }
 
+/* The footer buttons set 14px text, 16px in at both sides, and 18px when
+   they carry an icon (DqOverdragen "Annuleren" and "Overdragen"). The padding
+   goes through NcButton's --button-padding. The mask class and the doubled
+   class outrank NcButton's text-only rule, `.button-vue[data-v-…]:has(…:empty)`
+   (four classes, in a stylesheet a spawned dialog loads later), and the board
+   look's general icon-and-label rule.
+   @spec openspec/changes/board-dialog-controls/specs/board-dialog-controls/spec.md#requirement-a-board-dialog-draws-its-controls-as-the-boards-do */
+.modal-mask.cn-dialog-board .dialog__actions .button-vue.button-vue {
+	--button-padding: 16px;
+	font-size: 14px;
+}
+
+.modal-mask.cn-dialog-board .dialog__actions .button-vue.button-vue:has(> .button-vue__wrapper > .button-vue__icon:not(:empty)):has(> .button-vue__wrapper > .button-vue__text:not(:empty)) {
+	--button-padding: 18px;
+}
+
+/* NcButton pads a text-only label 4px a side inside the button's own padding;
+   the board's 16px is the whole inset. */
+.modal-mask.cn-dialog-board .dialog__actions .button-vue .button-vue__text.button-vue__text {
+	padding-inline: 0;
+}
+
 /* Cancel is an outlined secondary, never a text link. */
 .cn-dialog-board .dialog__actions .button-vue--vue-secondary,
 .cn-dialog-board .dialog__actions .button-vue--secondary {
@@ -223,15 +257,31 @@
 	height: calc(var(--cn-field-height, 40px) + 2 * var(--border-width-input-focused, 2px));
 }
 
+/* The board draws the control's edge as a 1px border (DqOverdragen "Waarom de
+   zaak verhuist", DqBesluit); NcInputField and NcTextArea draw it as a shadow.
+   The colour is the one that meets WCAG's 3:1 for a control's edge, as the
+   footer's secondary button. Focus keeps NcInputField's own ring, which
+   carries `!important`. */
 .cn-dialog-board .dialog__content .input-field__input,
 .cn-dialog-board .dialog__content .input-field__input:hover:not([disabled]),
 .cn-dialog-board .dialog__content .textarea__input,
 .cn-dialog-board .dialog__content .textarea__input:hover:not([disabled]) {
+	border: 1px solid var(--color-border-maxcontrast);
 	border-radius: 8px;
-	box-shadow: 0 0 0 1px var(--color-border-dark);
+	box-shadow: none;
 	font-size: var(--cn-field-text-size, 15px);
 }
 
+/* A plain input an app puts in a board dialog (a date, a number) is the same
+   40px control; Nextcloud's core stylesheet makes it 34px. */
+.cn-dialog-board .dialog__content input:not([type=checkbox]):not([type=radio]):not([type=hidden]):not([type=file]):not([type=range]):not([type=color]):not([type=submit]):not([type=button]):not([type=reset]):not([type=image]):not(.input-field__input) {
+	box-sizing: border-box;
+	height: var(--cn-field-height, 40px);
+	min-height: var(--cn-field-height, 40px);
+	border: 1px solid var(--color-border-maxcontrast);
+	border-radius: 8px;
+}
+
 .cn-dialog-board .dialog__content .input-field:has(.input-field__label) .input-field__input:not(:focus)::placeholder,
 .cn-dialog-board .dialog__content .textarea__input:not(:focus)::placeholder {
 	opacity: 1 !important;

package/src/css/index-page.css

@@ -102,11 +102,17 @@
 	overflow-y: auto;
 }
 
+/* The list scrolls inside the side column and the card for the rows without
+   a place stays under it, as the board draws it (DqZakenKaart). Scrolling the
+   column as a whole pushed that card below a page's worth of rows. */
 .cn-index-page__map-list {
 	display: flex;
+	flex: 0 1 auto;
 	flex-direction: column;
+	min-height: 0;
 	margin: 0;
 	padding: 0;
+	overflow-y: auto;
 	border: 1px solid var(--color-border);
 	border-radius: 10px;
 	list-style: none;
@@ -114,6 +120,7 @@
 
 .cn-index-page__map-item {
 	display: flex;
+	flex: none;
 	gap: 12px;
 	padding: 12px 14px;
 }
@@ -152,11 +159,22 @@
 	min-width: 0;
 }
 
-.cn-index-page__map-title {
+/* The title is a button for the keyboard but reads as the row's title text.
+   Nextcloud styles every `button:not(.button-vue, ...)` (specificity 0,2,1)
+   as a 34px tinted pill with a 3px margin, which outranked a single class and
+   turned each title into a blue block (DqZakenKaart rows 111px against 89).
+   Three classes outrank it, and the box properties it sets are reset.
+   @spec openspec/changes/map-list-title-button/specs/map-list-title-button/spec.md#requirement-a-map-list-title-reads-as-text-not-as-a-button */
+.cn-index-page__map-list .cn-index-page__map-item .cn-index-page__map-title {
+	width: auto;
+	height: auto;
+	min-height: 0;
 	margin: 0;
 	padding: 0;
 	border: 0;
+	border-radius: 0;
 	background: none;
+	box-shadow: none;
 	color: var(--color-main-text);
 	font: inherit;
 	font-size: 15px;
@@ -166,6 +184,12 @@
 	cursor: pointer;
 }
 
+.cn-index-page__map-list .cn-index-page__map-item .cn-index-page__map-title:hover,
+.cn-index-page__map-list .cn-index-page__map-item .cn-index-page__map-title:focus {
+	background: none;
+	color: var(--color-main-text);
+}
+
 .cn-index-page__map-sub,
 .cn-index-page__map-due {
 	color: var(--color-text-maxcontrast);
@@ -181,6 +205,7 @@
 
 .cn-index-page__map-missing {
 	display: flex;
+	flex: none;
 	flex-direction: column;
 	align-items: flex-start;
 	gap: 8px;