@conduction/nextcloud-vue 2.56.0-beta.3 → 2.56.0-beta.4

package/dist/nextcloud-vue.cjs.js.map

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/nextcloud-vue.cjs.js.map
-size: 33667612 bytes
-sha256: 99d23a886ff7c0e30fbe0745ed20fa6399710f26529d6b8495de7aa1f01e40a1
+size: 33677319 bytes
+sha256: 01032564aced4b648d5ee120b13ec9044a3664bce422f2588379b83ccab9bc63

package/dist/nextcloud-vue.css

@@ -23058,6 +23058,13 @@ a.cn-flow-runs-widget__row-content:hover .cn-flow-runs-widget__name[data-v-75628
 	color: var(--color-main-text);
 }
 
+/* An on-demand step that did not run says so quietly: it is a choice the
+   user did not make, not a failure. */
+.cn-setup-summary__item--not-run .cn-setup-summary__value[data-v-75b2078b] {
+	font-weight: normal;
+	color: var(--color-text-maxcontrast);
+}
+
 
 .cn-admin-settings-shell[data-v-260aa222] {
 	max-width: 900px;

package/l10n/en.json

@@ -354,6 +354,7 @@
     "No widgets configured": "No widgets configured",
     "Not configured": "Not configured",
     "Not set": "Not set",
+    "Not run": "Not run",
     "Notes": "Notes",
     "Number": "Number",
     "Number configuration": "Number configuration",

package/l10n/nl.json

@@ -354,6 +354,7 @@
     "No widgets configured": "Geen widgets geconfigureerd",
     "Not configured": "Niet geconfigureerd",
     "Not set": "Niet ingesteld",
+    "Not run": "Niet uitgevoerd",
     "Notes": "Notities",
     "Number": "Getal",
     "Number configuration": "Nummerconfiguratie",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conduction/nextcloud-vue",
-  "version": "2.56.0-beta.3",
+  "version": "2.56.0-beta.4",
   "description": "Shared Vue component library for Conduction Nextcloud apps — complements @nextcloud/vue with higher-level components, OpenRegister integration, and NL Design System support",
   "homepage": "https://github.com/ConductionNL/nextcloud-vue#readme",
   "bugs": {

package/src/components/CnAppRoot/CnAppRoot.vue

@@ -487,9 +487,18 @@
 			  dismissed the walkthrough remounts and the first-visit tour
 			  starts (or resumes) then. `!== true` keeps apps that opted out
 			  of the support note (`cnSupportVisible` undefined) unaffected.
+
+			  Withheld the same way while the setup status is still loading
+			  and while the non-gating setup wizard is open
+			  (`walkthroughHeldForSetup`). On a first run the wizard and the
+			  first-visit tour both qualify; the tour used to open behind the
+			  wizard, and its window-level ESC listener meant closing the
+			  wizard with ESC also dismissed the tour and recorded it as seen.
+			  Held back, the tour is never mounted, so nothing is recorded; it
+			  starts when the wizard is dismissed or finished.
 			-->
 			<!-- @slot walkthrough Override the gating-free walkthrough overlay. Scope: { manifest, seenVersion }. -->
-			<slot v-if="walkthroughEnabled && walkthroughSeenResolved && cnSupportVisible !== true"
+			<slot v-if="walkthroughEnabled && walkthroughSeenResolved && cnSupportVisible !== true && !walkthroughHeldForSetup"
 				name="walkthrough"
 				:manifest="manifest"
 				:seenVersion="walkthroughSeenVersion">
@@ -2376,6 +2385,10 @@ export default {
 		 * Neither guard subsumes the other — (1) is about steps the server never
 		 * reports, (2) about steps it can never mark done — so both are needed.
 		 *
+		 * 3. On-demand steps (`onDemand: true`) are excluded too: they run only
+		 *    when the user asks (learniq's "Remove the example data"), so they
+		 *    are never outstanding work.
+		 *
 		 * @return {boolean} True when an actionable optional step is genuinely outstanding.
 		 */
 		optionalSetupPending() {
@@ -2395,7 +2408,9 @@ export default {
 			const outstanding = s.completed.value === true
 				? (s.optionalUnmetReported ? s.optionalUnmetReported.value : [])
 				: s.optionalUnmet.value
-			return outstanding.some((st) => st.type !== 'info' && st.type !== 'summary')
+			// On-demand steps (`onDemand: true`) run only when the user asks,
+			// so they are never outstanding and never reason to open the wizard.
+			return outstanding.some((st) => st.type !== 'info' && st.type !== 'summary' && st.onDemand !== true)
 		},
 
 		/**
@@ -2478,6 +2493,20 @@ export default {
 			return (w && typeof w.completionConfigKey === 'string' && w.completionConfigKey) || ''
 		},
 
+		/**
+		 * Whether the setup flow holds the walkthrough back: the setup status
+		 * has not settled yet (an outstanding optional step may still open the
+		 * wizard), or the non-gating setup wizard is open. The gating setup
+		 * phase needs no check here, it replaces the shell (and the tour with
+		 * it) outright. Apps without a `setup` block settle immediately, so
+		 * this is `false` for them from the first render.
+		 *
+		 * @return {boolean} True while the tour must wait for setup.
+		 */
+		walkthroughHeldForSetup() {
+			return !this.setupStatusSettled || this.setupWizardOpen
+		},
+
 		/**
 		 * The user's last-seen app version for walkthrough composition. Resolved
 		 * from the per-user `completionConfigKey` preference (cross-device) with

package/src/components/CnSetupWizard/CnSetupWizard.vue

@@ -133,7 +133,7 @@
 							v-for="item in summaryItems"
 							:key="item.id"
 							class="cn-setup-summary__item"
-							:class="{ 'cn-setup-summary__item--done': item.done }">
+							:class="{ 'cn-setup-summary__item--done': item.done, 'cn-setup-summary__item--not-run': item.notRun }">
 							<span class="cn-setup-summary__mark">{{ item.done ? '✓' : '○' }}</span>
 							<span class="cn-setup-summary__label">{{ item.title }}</span>
 							<span v-if="item.value" class="cn-setup-summary__value">{{ item.value }}</span>
@@ -380,7 +380,14 @@ export default {
 		 * a done marker (info steps always done; choice steps done when picked;
 		 * run-action steps done when the action succeeded).
 		 *
-		 * @return {Array<{ id: string, title: string, value: string, done: boolean }>}
+		 * An on-demand step (`onDemand: true`) is the exception: it is done
+		 * only when its action succeeded in THIS session. Apps report such a
+		 * step as `done` on purpose so it never auto-runs (learniq's "Remove
+		 * the example data"), and reading that flag here ticked a removal
+		 * nobody ran. When it did not run it gets `notRun: true` and the value
+		 * "Not run" instead.
+		 *
+		 * @return {Array<{ id: string, title: string, value: string, done: boolean, notRun: boolean }>}
 		 */
 		summaryItems() {
 			return this.setupSteps
@@ -399,6 +406,16 @@ export default {
 							.map((f) => `${f.label}: ${this.configModel[f.key] !== null && this.configModel[f.key] !== undefined ? this.configModel[f.key] : ''}`)
 							.join(', ')
 					}
+					if (this.isOnDemand(step)) {
+						const ran = this.ranThisSession(step.id)
+						return {
+							id: step.id,
+							title: this.stepTitle(step),
+							value: ran ? '' : t('nextcloud-vue', 'Not run'),
+							done: ran,
+							notRun: !ran,
+						}
+					}
 					let done
 					if (step.type === 'info') {
 						done = true
@@ -407,7 +424,7 @@ export default {
 					} else {
 						done = this.isStepDone(step.id)
 					}
-					return { id: step.id, title: this.stepTitle(step), value, done }
+					return { id: step.id, title: this.stepTitle(step), value, done, notRun: false }
 				})
 		},
 
@@ -427,7 +444,9 @@ export default {
 			if (this.completedStepIds.length === 0) {
 				return ''
 			}
-			const actionable = this.setupSteps.filter((s) => s.type !== 'info' && s.type !== 'summary')
+			// An on-demand step is never outstanding work, so it is never the
+			// step to resume on.
+			const actionable = this.setupSteps.filter((s) => s.type !== 'info' && s.type !== 'summary' && !this.isOnDemand(s))
 			const firstUnmetIndex = actionable.findIndex((s) => {
 				if (s.type === 'choice') {
 					return !(this.hasChoice(s) || this.isServerDone(s.id))
@@ -459,14 +478,16 @@ export default {
 		 * the step has nothing else for the user to decide by then (the
 		 * choice it acts on was already made on an earlier step), so
 		 * requiring a click before showing progress just adds a stall.
-		 * No-ops for any other step type, or one already run/running.
+		 * No-ops for any other step type, or one already run/running, and
+		 * never fires an on-demand step (`onDemand: true`): those run only
+		 * when the user clicks Run.
 		 *
 		 * @param {string} stepId The step id becoming current.
 		 * @return {void}
 		 */
 		maybeAutoRunStep(stepId) {
 			const step = this.setupSteps.find((s) => s.id === stepId)
-			if (step && step.type === 'run-action' && !this.isStepDone(step.id) && !this.running[step.id]) {
+			if (step && step.type === 'run-action' && !this.isOnDemand(step) && !this.isStepDone(step.id) && !this.running[step.id]) {
 				this.runAction(step)
 			}
 		},
@@ -847,6 +868,29 @@ export default {
 			}
 		},
 
+		/**
+		 * Whether a step is marked on-demand (`onDemand: true`): it runs only
+		 * when the user asks, never automatically, and the summary ticks it
+		 * only when it ran in this session.
+		 *
+		 * @param {object} step The manifest step.
+		 * @return {boolean}
+		 */
+		isOnDemand(step) {
+			return !!step && step.onDemand === true
+		},
+
+		/**
+		 * Whether a step's action succeeded in the CURRENT session, ignoring
+		 * whatever the server reports.
+		 *
+		 * @param {string} id Step id.
+		 * @return {boolean}
+		 */
+		ranThisSession(id) {
+			return !!(this.actionResult[id] && this.actionResult[id].success)
+		},
+
 		isStepDone(id) {
 			return this.isServerDone(id) || this.localDone[id] === true || (this.actionResult[id] && this.actionResult[id].success)
 		},
@@ -964,4 +1008,11 @@ export default {
 	font-weight: 600;
 	color: var(--color-main-text);
 }
+
+/* An on-demand step that did not run says so quietly: it is a choice the
+   user did not make, not a failure. */
+.cn-setup-summary__item--not-run .cn-setup-summary__value {
+	font-weight: normal;
+	color: var(--color-text-maxcontrast);
+}
 </style>

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.41.0",
+	"version": "2.42.0",
 	"type": "object",
 	"required": ["$schema", "version"],
 	"allOf": [
@@ -98,6 +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." },
 							"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." },
 							"component": { "type": "string", "description": "component: app-registered component name (or use the #step-<id> slot)." }
 						}