From a2b6f770156693b3e09a1bc7374de3c6b7093527 Mon Sep 17 00:00:00 2001
From: nfebe <fenn25.fn@gmail.com>
Date: Tue, 16 Jun 2026 11:13:23 +0100
Subject: [PATCH 1/2] fix(files): Open the sidebar for the current folder, not
 a stale child

When opening the sidebar for a folder, the route still referenced the file id of a previously opened subfolder. Because that subfolder is listed inside the current folder, the sidebar restored its share and details context instead of the current folder's. The active file id is now kept in sync with the route, so a stale id can no longer be restored.

Signed-off-by: nfebe <fenn25.fn@gmail.com>
---
 apps/files/src/store/active.spec.ts | 56 +++++++++++++++++++++++++++++
 apps/files/src/store/active.ts      | 13 +++++--
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 apps/files/src/store/active.spec.ts

diff --git a/apps/files/src/store/active.spec.ts b/apps/files/src/store/active.spec.ts
new file mode 100644
index 0000000000000..70c005ed2b77e
--- /dev/null
+++ b/apps/files/src/store/active.spec.ts
@@ -0,0 +1,56 @@
+/*!
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { Folder } from '@nextcloud/files'
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+import { nextTick } from 'vue'
+import { useActiveStore } from './active.ts'
+
+function buildFolder(id: number, name: string) {
+	return new Folder({
+		id,
+		owner: 'test',
+		source: `http://example.com/remote.php/dav/files/test/${name}`,
+		root: '/files/test',
+	})
+}
+
+describe('Active store syncs the route fileid with the active node', () => {
+	let goToRoute: ReturnType<typeof vi.fn>
+
+	beforeEach(() => {
+		setActivePinia(createPinia())
+		goToRoute = vi.fn()
+		window.OCP = { Files: { Router: { goToRoute, params: {}, query: {} } } } as unknown as typeof window.OCP
+	})
+
+	test('rewrites a stale child fileid when the current folder becomes active', async () => {
+		// The route still deep-links a child (79) left over from a previous
+		// location, while the sidebar is being opened for the current folder (78).
+		window.OCP.Files.Router.params = { fileid: '79' }
+
+		const store = useActiveStore()
+		const folder = buildFolder(78, 'parent')
+		store.activeFolder = folder
+		store.activeNode = folder
+		await nextTick()
+
+		expect(goToRoute).toHaveBeenCalledTimes(1)
+		expect(goToRoute.mock.calls[0][1]).toMatchObject({ fileid: '78' })
+	})
+
+	test('does not touch the route when it already points at the active node', async () => {
+		window.OCP.Files.Router.params = { fileid: '78' }
+
+		const store = useActiveStore()
+		const folder = buildFolder(78, 'parent')
+		store.activeFolder = folder
+		store.activeNode = folder
+		await nextTick()
+
+		expect(goToRoute).not.toHaveBeenCalled()
+	})
+})
diff --git a/apps/files/src/store/active.ts b/apps/files/src/store/active.ts
index 935eee52bf544..12bd3f5136e96 100644
--- a/apps/files/src/store/active.ts
+++ b/apps/files/src/store/active.ts
@@ -47,14 +47,21 @@ export const useActiveStore = defineStore('active', () => {
 
 	// Set the active node on the router params
 	watch(activeNode, () => {
-		if (typeof activeNode.value?.fileid !== 'number' || activeNode.value.fileid === activeFolder.value?.fileid) {
+		if (!activeNode.value?.id) {
 			return
 		}
 
-		logger.debug('Updating active fileid in URL query', { fileid: activeNode.value.fileid })
+		// Sync even when the active node is the current folder: skipping that case
+		// leaves a stale child fileid in the route, which then gets restored into
+		// the sidebar when it reopens.
+		if (activeNode.value.id === String(window.OCP.Files.Router.params?.fileid ?? '')) {
+			return
+		}
+
+		logger.debug('Updating active fileid in URL query', { fileid: activeNode.value.id })
 		window.OCP.Files.Router.goToRoute(
 			null,
-			{ ...window.OCP.Files.Router.params, fileid: String(activeNode.value.fileid) },
+			{ ...window.OCP.Files.Router.params, fileid: activeNode.value.id },
 			{ ...window.OCP.Files.Router.query },
 			true,
 		)

From 8425e2e0181115d5190fde843b0c8a9e3935b639 Mon Sep 17 00:00:00 2001
From: nextcloud-command <nextcloud-command@users.noreply.github.com>
Date: Fri, 19 Jun 2026 21:26:37 +0000
Subject: [PATCH 2/2] chore(assets): Recompile assets

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>