@conduction/nextcloud-vue 2.56.0-beta.13 → 2.56.0-beta.14

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.48.0",
+	"version": "2.49.0",
 	"type": "object",
 	"required": ["$schema", "version"],
 	"allOf": [
@@ -98,7 +98,7 @@
 							"suggestMap": { "type": "object", "description": "choice: map of suggestFrom value → suggested option value. Used to auto-suggest a default (e.g. RGS template suggested from organisation type).", "additionalProperties": { "type": "string" } },
 							"multiple": { "type": "boolean", "default": false, "description": "choice: allow multi-select." },
 							"loadAction": { "type": "string", "minLength": 1, "description": "choice with display cards: an actionId each option card loads itself with. Every card except the one whose value is `none` gets its own Load button, which POSTs { dataset: <value> } to /api/setup/action/{loadAction}, spins while it runs and shows the result on that card. A successful load also selects the card. With loadAction the separate run-action step that loaded the picked dataset is no longer needed; manifests that keep it still work." },
-							"requires": { "type": "array", "items": { "type": "string", "minLength": 1 }, "uniqueItems": true, "description": "App ids this step needs. When any of them is not installed and enabled, the wizard skips the step and the summary shows it as skipped, naming the missing apps. Do not combine with required: true; setup status would keep reporting the skipped step as unmet." },
+							"requires": { "type": "array", "items": { "type": "string", "minLength": 1 }, "uniqueItems": true, "description": "App ids this step needs. When any of them is not installed and enabled, the wizard skips the step and the summary shows it as skipped, naming the missing apps. Setup status then counts the step as not applicable, neither met nor unmet, so it never reopens the wizard or gates the app. This holds for a required step too." },
 							"action": { "type": "string", "description": "run-action: actionId POSTed to /api/setup/action/{action}." },
 							"onDemand": { "type": "boolean", "default": false, "description": "run-action: the step runs only when the user clicks Run, never automatically, and is never outstanding work (it does not open the wizard or decide where a resumed wizard starts). The summary ticks it only when its action succeeded in the current session and shows it as not run otherwise, whatever the server reports. For destructive steps an app reports as done on purpose so they never auto-run, such as removing example data." },
 							"healthCheck": { "type": "boolean", "default": false, "description": "summary: render a health recap." },
@@ -236,7 +236,7 @@
 				},
 				"settingsLabel": {
 					"type": "string",
-					"description": "Override label for the settings foldout's gear button. Defaults to 'Settings'."
+					"description": "Override label for the settings foldout's gear button. Defaults to 'Advanced'."
 				},
 				"card": {
 					"type": "object",

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

@@ -50,7 +50,7 @@
 				},
 				"settingsLabel": {
 					"type": "string",
-					"description": "Override label for the settings foldout's gear button. Defaults to 'Settings'."
+					"description": "Override label for the settings foldout's gear button. Defaults to 'Advanced'."
 				},
 				"primaryAction": {
 					"$ref": "#/$defs/primaryAction",

package/src/store/plugins/liveUpdates.js

@@ -432,19 +432,29 @@ export function liveUpdatesPlugin(opts = {}) {
 			const collectionInFlight = new Map()
 
 			const originalFetchCollection = store.fetchCollection.bind(store)
-			store.fetchCollection = async function dedupedFetchCollection(type, params = {}) {
+			store.fetchCollection = async function dedupedFetchCollection(type, params = {}, options = {}) {
 				if (!store.__liveDedupActive) {
-					return originalFetchCollection(type, params)
+					return originalFetchCollection(type, params, options)
 				}
 				const key = collectionDedupKey(type, params)
-				if (collectionInFlight.has(key)) {
-					return collectionInFlight.get(key)
+				let entry = collectionInFlight.get(key)
+				if (!entry) {
+					// The shared request reports into its own sink, copied to
+					// each caller's `options.outcome` below, so a caller that
+					// joined it learns that request's result too.
+					const outcome = {}
+					const promise = originalFetchCollection(type, params, { ...options, outcome }).finally(() => {
+						collectionInFlight.delete(key)
+					})
+					entry = { promise, outcome }
+					collectionInFlight.set(key, entry)
 				}
-				const promise = originalFetchCollection(type, params).finally(() => {
-					collectionInFlight.delete(key)
-				})
-				collectionInFlight.set(key, promise)
-				return promise
+				const results = await entry.promise
+				const sink = options && options.outcome
+				if (sink && typeof sink === 'object' && 'error' in entry.outcome) {
+					sink.error = entry.outcome.error
+				}
+				return results
 			}
 		},
 	}

package/src/store/useObjectStore.js

@@ -656,9 +656,12 @@ const baseActions = {
 	 *
 	 * @param {string} type The registered type slug
 	 * @param {object} [params] Query parameters (_limit, _page, _search, _order, filters)
+	 * @param {object} [options] Call options
+	 * @param {{error?: object|null}} [options.outcome] Opt-in sink for THIS call's own result: `error` is set to the error it records on `errors[type]`, or `null` on success. Unlike `errors[type]`, which every call for the type shares, a later call cannot overwrite it.
 	 * @return {Promise<Array>} The fetched collection (also stored in state)
 	 */
-	async fetchCollection(type, params = {}) {
+	async fetchCollection(type, params = {}, options = {}) {
+		const outcome = (options && typeof options.outcome === 'object' && options.outcome) || null
 		this.loading = { ...this.loading, [type]: true }
 		this.errors = { ...this.errors, [type]: null }
 
@@ -685,9 +688,13 @@ const baseActions = {
 			)
 
 			if (!response.ok) {
-				this.errors = { ...this.errors, [type]: await parseResponseError(response, type) }
+				const failure = await parseResponseError(response, type)
+				this.errors = { ...this.errors, [type]: failure }
+				if (outcome) {
+					outcome.error = failure
+				}
 				// eslint-disable-next-line no-console -- diagnostic for a failure this code already degrades from
-				console.error(`Error fetching ${type} collection:`, this.errors[type])
+				console.error(`Error fetching ${type} collection:`, failure)
 				return []
 			}
 
@@ -711,13 +718,17 @@ const baseActions = {
 				this.facets = { ...this.facets, [type]: transformed }
 			}
 
+			if (outcome) {
+				outcome.error = null
+			}
 			return results
 		} catch (error) {
-			this.errors = {
-				...this.errors,
-				[type]: error.name === 'TypeError'
-					? networkError(error)
-					: genericError(error),
+			const failure = error.name === 'TypeError'
+				? networkError(error)
+				: genericError(error)
+			this.errors = { ...this.errors, [type]: failure }
+			if (outcome) {
+				outcome.error = failure
 			}
 			// eslint-disable-next-line no-console -- diagnostic for a failure this code already degrades from
 			console.error(`Error fetching ${type} collection:`, error)