From 60f4b4c15940def29890c06c3848854a2083b75c Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Fri, 8 May 2026 13:28:17 +0200
Subject: [PATCH] fix(settings): use proper component structure to make
 navigation work

`NcAppNavigation` is only allowed in `NcContent` but we were not using
it because the content was rendered by the server as templates.
This is now fixed by moving the content inside the `NcContent` once
mounted.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 apps/settings/src/main-settings.ts            |  6 ++---
 apps/settings/src/main-users-management.ts    |  8 +++----
 apps/settings/src/router/routes.ts            |  9 +-------
 apps/settings/src/views/SettingsApp.vue       | 17 ++++++++++----
 .../src/views/SettingsContentWrapper.vue      | 22 +++++++++++++++++++
 apps/settings/src/views/UserManagement.vue    | 17 +++++++++-----
 apps/settings/templates/settings/frame.php    |  6 ++---
 7 files changed, 58 insertions(+), 27 deletions(-)
 create mode 100644 apps/settings/src/views/SettingsContentWrapper.vue

diff --git a/apps/settings/src/main-settings.ts b/apps/settings/src/main-settings.ts
index b47dc9062c1..9cd32138e05 100644
--- a/apps/settings/src/main-settings.ts
+++ b/apps/settings/src/main-settings.ts
@@ -5,9 +5,9 @@
 
 import { getCSPNonce } from '@nextcloud/auth'
 import Vue from 'vue'
-import SettingsNavigation from './views/SettingsNavigation.vue'
+import SettingsApp from './views/SettingsApp.vue'
 
 __webpack_nonce__ = getCSPNonce()
 
-const app = new Vue(SettingsNavigation)
-app.$mount('#app-navigation')
+const app = new Vue(SettingsApp)
+app.$mount('#settings-app')
diff --git a/apps/settings/src/main-users-management.ts b/apps/settings/src/main-users-management.ts
index 95c84bc1ca0..efbde800482 100644
--- a/apps/settings/src/main-users-management.ts
+++ b/apps/settings/src/main-users-management.ts
@@ -12,7 +12,7 @@ import VTooltipPlugin from 'v-tooltip'
 import Vue from 'vue'
 import Vuex from 'vuex'
 import { sync } from 'vuex-router-sync'
-import SettingsApp from './views/SettingsApp.vue'
+import UserManagement from './views/UserManagement.vue'
 import router from './router/index.ts'
 import { useStore } from './store/index.js'
 
@@ -37,10 +37,10 @@ const pinia = createPinia()
 // Migrate legacy local storage settings to the database
 store.dispatch('migrateLocalStorage')
 
-export default new Vue({
+const App = Vue.extend(UserManagement)
+const app = new App({
 	router,
 	store,
 	pinia,
-	render: (h) => h(SettingsApp),
-	el: '#content',
 })
+app.$mount('#content')
diff --git a/apps/settings/src/router/routes.ts b/apps/settings/src/router/routes.ts
index 0742553220a..6be6c4b11b3 100644
--- a/apps/settings/src/router/routes.ts
+++ b/apps/settings/src/router/routes.ts
@@ -1,21 +1,14 @@
-/**
+/*
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 import type { RouteConfig } from 'vue-router'
 
-const UserManagement = () => import(/* webpackChunkName: 'settings-users' */'../views/UserManagement.vue')
-const UserManagementNavigation = () => import(/* webpackChunkName: 'settings-users' */'../views/UserManagementNavigation.vue')
-
 const routes: RouteConfig[] = [
 	{
 		name: 'users',
 		path: '/:index(index.php/)?settings/users',
-		components: {
-			default: UserManagement,
-			navigation: UserManagementNavigation,
-		},
 		props: true,
 		children: [
 			{
diff --git a/apps/settings/src/views/SettingsApp.vue b/apps/settings/src/views/SettingsApp.vue
index 7e135175ef6..a1a6e2df700 100644
--- a/apps/settings/src/views/SettingsApp.vue
+++ b/apps/settings/src/views/SettingsApp.vue
@@ -4,13 +4,22 @@
 -->
 
 <template>
-	<NcContent app-name="settings">
-		<router-view name="navigation" />
-		<router-view />
-		<router-view name="sidebar" />
+	<NcContent :class="$style.settingsApp" appName="settings">
+		<SettingsNavigation />
+		<SettingsContentWrapper />
 	</NcContent>
 </template>
 
 <script setup lang="ts">
 import NcContent from '@nextcloud/vue/components/NcContent'
+import SettingsContentWrapper from './SettingsContentWrapper.vue'
+import SettingsNavigation from './SettingsNavigation.vue'
 </script>
+
+<style module>
+:global(#content):has(.settingsApp) {
+	margin: 0;
+	width: 100%;
+	height: 100%;
+}
+</style>
diff --git a/apps/settings/src/views/SettingsContentWrapper.vue b/apps/settings/src/views/SettingsContentWrapper.vue
new file mode 100644
index 00000000000..6ad01239366
--- /dev/null
+++ b/apps/settings/src/views/SettingsContentWrapper.vue
@@ -0,0 +1,22 @@
+<!--
+ - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<template>
+	<NcAppContent>
+		<div ref="contentMain" />
+	</NcAppContent>
+</template>
+
+<script setup lang="ts">
+import { NcAppContent } from '@nextcloud/vue'
+import { onMounted, ref } from 'vue'
+
+const contentMain = ref<HTMLDivElement>()
+onMounted(() => {
+	const realElement = document.getElementById('original-settings-content')!
+	contentMain.value!.replaceChildren(...realElement.childNodes)
+	realElement.parentNode!.removeChild(realElement)
+})
+</script>
diff --git a/apps/settings/src/views/UserManagement.vue b/apps/settings/src/views/UserManagement.vue
index 7d4545e72f2..c4aebd93630 100644
--- a/apps/settings/src/views/UserManagement.vue
+++ b/apps/settings/src/views/UserManagement.vue
@@ -4,11 +4,14 @@
 -->
 
 <template>
-	<NcAppContent :page-heading="pageHeading">
-		<UserList
-			:selected-group="selectedGroupDecoded"
-			:external-actions="externalActions" />
-	</NcAppContent>
+	<NcContent app-name="settings">
+		<UserManagementNavigation />
+		<NcAppContent :page-heading="pageHeading">
+			<UserList
+				:selected-group="selectedGroupDecoded"
+				:external-actions="externalActions" />
+		</NcAppContent>
+	</NcContent>
 </template>
 
 <script>
@@ -16,14 +19,18 @@ import { emit } from '@nextcloud/event-bus'
 import { translate as t } from '@nextcloud/l10n'
 import { defineComponent } from 'vue'
 import NcAppContent from '@nextcloud/vue/components/NcAppContent'
+import NcContent from '@nextcloud/vue/components/NcContent'
 import UserList from '../components/UserList.vue'
+import UserManagementNavigation from './UserManagementNavigation.vue'
 
 export default defineComponent({
 	name: 'UserManagement',
 
 	components: {
+		NcContent,
 		NcAppContent,
 		UserList,
+		UserManagementNavigation,
 	},
 
 	data() {
diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php
index 4ad142f3c58..b638561c910 100644
--- a/apps/settings/templates/settings/frame.php
+++ b/apps/settings/templates/settings/frame.php
@@ -7,7 +7,7 @@
 style('settings', 'settings');
 ?>
 
-<div id="app-navigation"></div>
-<main id="app-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>>
+<div id="settings-app"></div>
+<div class="hidden-visually" id="original-settings-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>>
 	<?php print_unescaped($_['content']); ?>
-</main>
+</div>