From e7403332b9984752a43ddd4615c1dae2a45ea625 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Sun, 30 Aug 2026 13:13:20 +0200
Subject: [PATCH 1/3] fix(sidebar): render the manifest page's sidebar
 alongside our own (#3103)

* fix(sidebar): render the manifest page's sidebar alongside our own

This app fills CnAppRoot's `#sidebar` slot, and Vue only renders a slot's
fallback when the slot is ABSENT. So filling it suppressed
`pages[].sidebarComponent` silently: no warning, no error, no sidebar. The
ADR-110 flow sidebar was declared in the manifest, registered in registry.js
and present in the bundle, and still never rendered.

Nine apps in the fleet fill this slot and all nine were affected. The five that
do not fill it rendered the flow sidebar correctly, which is what identified
the cause.

CnAppRoot now passes the resolved component to the slot (nextcloud-vue#857), so
this renders both: our own rail, and whatever the routed manifest page asks
for.

Verified: npm run build exits 0.

* chore(deps): @conduction/nextcloud-vue 2.24.3, which carries the sidebar slot prop

2.24.3 is the release that passes the resolved `pages[].sidebarComponent` into
CnAppRoot's `#sidebar` slot. Without it the App.vue change in this branch is a
no-op, because the slot prop it reads does not exist yet.

Verified on filinq in the browser against the dev instance: the flow rail
(Flow, Steps, Runs, Version, Publish, the trigger list) now renders next to the
canvas, and the app's own sidebar still mounts alongside it.
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 src/App.vue       | 8 +++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1bbcd38d9..39ca5aaadd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "EUPL-1.2",
       "dependencies": {
         "@codemirror/lang-json": "^6.0.1",
-        "@conduction/nextcloud-vue": "^2.24.2",
+        "@conduction/nextcloud-vue": "^2.24.3",
         "@nextcloud/auth": "^2.6.0",
         "@nextcloud/axios": "^2.6.0",
         "@nextcloud/capabilities": "^1.2.1",
@@ -2173,9 +2173,9 @@
       }
     },
     "node_modules/@conduction/nextcloud-vue": {
-      "version": "2.24.2",
-      "resolved": "https://registry.npmjs.org/@conduction/nextcloud-vue/-/nextcloud-vue-2.24.2.tgz",
-      "integrity": "sha512-BGvyJpRhzvLraZuyRB3ETJ6IESV27XZvL5vdvLd5kEvettFo+QWIo6JcHJhQk9np8QYGHBQ9gRHCp3v6y7Y2gw==",
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/@conduction/nextcloud-vue/-/nextcloud-vue-2.24.3.tgz",
+      "integrity": "sha512-Hflys+AxGNNSkDxuMf04RdFzijhWDKtcRJAHtmtYLj6ntwoIT51k0rfRju6S5GuTNF+daJDUv9tHDVVXb9ZIWw==",
       "license": "EUPL-1.2",
       "dependencies": {
         "@ckpack/vue-color": "^1.6.0",
diff --git a/package.json b/package.json
index 5212a456ed..71ed5a18e2 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@codemirror/lang-json": "^6.0.1",
-    "@conduction/nextcloud-vue": "^2.24.2",
+    "@conduction/nextcloud-vue": "^2.24.3",
     "@nextcloud/auth": "^2.6.0",
     "@nextcloud/axios": "^2.6.0",
     "@nextcloud/capabilities": "^1.2.1",
diff --git a/src/App.vue b/src/App.vue
index 7b81c44693..01e02dd3ed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,7 +25,7 @@
 			path: it reads OCA.OpenRegister.integrations and renders one inner
 			tab per provider (built-ins + xwiki + the bespoke leaves). See ADR-019.
 		-->
-		<template #sidebar>
+		<template #sidebar="{ pageSidebarComponent }">
 			<SideBars />
 			<CnObjectSidebar
 				v-if="objectSidebarState.active"
@@ -39,6 +39,12 @@
 				:hiddenTabs="objectSidebarState.hiddenTabs"
 				:open="objectSidebarState.open"
 				@update:open="objectSidebarState.open = $event" />
+			<!-- The manifest page's own sidebar (pages[].sidebarComponent). Passed in
+			     as a slot prop because filling this slot suppresses CnAppRoot's
+			     fallback, which is what hid the flow sidebar. -->
+			<component
+				:is="pageSidebarComponent"
+				v-if="pageSidebarComponent" />
 		</template>
 		<!-- Global modal and dialog hosts, mounted below the router-view. -->
 		<template #footer>

From 40015106dc5597b3c8490bb80f9f92418299d50b Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Sun, 30 Aug 2026 14:56:10 +0200
Subject: [PATCH 2/3] style: run Prettier over the sidebar change (#3107)

The 'render the manifest page's sidebar alongside our own' commit landed
unformatted, and quality / Frontend Check (format) has been red on
development ever since:

  prettier --check "**/*.{js,ts,vue,css,scss}"
  [warn] src/App.vue

Eight apps took the same change and eight went red together. This is
prettier --write over the affected files and nothing else.

Verified: npm run format exits 0.
---
 src/App.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 01e02dd3ed..ebc510a2af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,7 @@
 			<!-- The manifest page's own sidebar (pages[].sidebarComponent). Passed in
 			     as a slot prop because filling this slot suppresses CnAppRoot's
 			     fallback, which is what hid the flow sidebar. -->
-			<component
-				:is="pageSidebarComponent"
-				v-if="pageSidebarComponent" />
+			<component :is="pageSidebarComponent" v-if="pageSidebarComponent" />
 		</template>
 		<!-- Global modal and dialog hosts, mounted below the router-view. -->
 		<template #footer>

From a3dc97c48b4b89887a6b027cc3a94261b42f8415 Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Sun, 30 Aug 2026 15:21:09 +0200
Subject: [PATCH 3/3] fix(sidebar): render the flow sidebar once, not twice
 (#3109)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

E2E went red on development with

  strict mode violation: locator('.cn-flow-sidebar') resolved to 2 elements
  Error: the flow sidebar did not render — the controls are unreachable again

#3103 fixed the real problem: CnAppRoot only offered the manifest's
`sidebarComponent` as the DEFAULT content of its #sidebar slot, and this
app fills that slot, so the manifest key was live config that rendered
nothing. #3103 passes the component through as a slot prop instead, so
App.vue can render it.

What it did not do is remove the workaround that existed BECAUSE the
manifest key rendered nothing — a hardcoded <FlowDetailSidebar> in
SideBars.vue, whose own comment explains it was there for exactly that
reason. With the manifest route working, both rendered.

So this deletes the workaround, not the fix. The manifest is now the
single source of truth for a page's sidebar, and the comment left behind
says so, because adding a route here for a page that declares
`sidebarComponent` will duplicate it again.

The unused import and components entry go with it — a registration left
behind after its template use is removed is the next reader's puzzle.

src/App.vue is Prettier-formatted here too; the same one-file fix is in
#3107, and whichever lands first makes the other a no-op.

Verified: eslint exits 0, webpack build compiles, npm run format exits 0.
---
 src/sidebars/SideBars.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/sidebars/SideBars.vue b/src/sidebars/SideBars.vue
index e41f957e50..e7c96f5dc8 100644
--- a/src/sidebars/SideBars.vue
+++ b/src/sidebars/SideBars.vue
@@ -8,23 +8,24 @@
 	<AuditTrailSideBar v-else-if="$route.path.startsWith('/audit-trails')" />
 	<SearchTrailSideBar v-else-if="$route.path.startsWith('/search-trails')" />
 	<!--
-		The flow canvas's controls — step palette, Save, Run, run history.
+		The flow canvas's controls are NOT listed here. They are declared on the
+		manifest page as `sidebarComponent: FlowDetailSidebar`, and #3103 made
+		CnAppRoot hand that component to this app through the #sidebar slot
+		prop, so App.vue renders it directly.
 
-		These are declared on the manifest page as `sidebarComponent:
-		FlowDetailSidebar`, and CnAppRoot does resolve that key. It could never
-		render here, though: CnAppRoot only falls back to it as the DEFAULT
-		content of its #sidebar slot, and this app fills that slot itself, so
-		consumer content wins by Vue's ordinary slot mechanic. The manifest key
-		was live config that rendered nothing.
+		A hardcoded <FlowDetailSidebar> used to sit here as a workaround from
+		when the manifest key rendered nothing. Once #3103 made the manifest
+		route work, BOTH rendered, and the e2e caught it exactly as it should:
 
-		The symptom was a flow page with no way to save, run, or add a step —
-		while its own empty state said "Add a step from the sidebar".
+		  strict mode violation: locator('.cn-flow-sidebar') resolved to 2 elements
+
+		The manifest is the single source of truth for a page's sidebar. Adding
+		a route here for a page that declares `sidebarComponent` will duplicate
+		it again.
 	-->
-	<FlowDetailSidebar v-else-if="/^\/flows\/.+/.test($route.path)" />
 </template>
 
 <script>
-import FlowDetailSidebar from '../views/flows/FlowDetailSidebar.vue'
 import DashboardSideBar from './dashboard/DashboardSideBar.vue'
 import DeletedSideBar from './deleted/DeletedSideBar.vue'
 import EntitiesSideBar from './entities/EntitiesSideBar.vue'
@@ -45,7 +46,6 @@ export default {
 		EntitiesSideBar,
 		AuditTrailSideBar,
 		SearchTrailSideBar,
-		FlowDetailSidebar,
 	},
 }
 </script>