Merge pull request #48119 from nextcloud/backport/48090/stable29

[stable29] fix(settings): disable Discover when appstore is disabled
nextcloud · Sep 17, 2024 · 14d75f0 · 14d75f0
2 parents 1ab3441 + f8ce148
commit 14d75f0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/apps/settings/src/router/routes.ts b/apps/settings/src/router/routes.ts
@@ -1,4 +1,7 @@
 import type { RouteConfig } from 'vue-router'
+import { loadState } from '@nextcloud/initial-state'
+
+const appstoreEnabled = loadState<boolean>('settings', 'appstoreEnabled', true)
 
 // Dynamic loading
 const AppStore = () => import(/* webpackChunkName: 'settings-apps-view' */'../views/AppStore.vue')
@@ -27,11 +30,10 @@ const routes: RouteConfig[] = [
 	{
 		path: '/:index(index.php/)?settings/apps',
 		name: 'apps',
-		// redirect to our default route - the app discover section
 		redirect: {
 			name: 'apps-category',
 			params: {
-				category: 'discover',
+				category: appstoreEnabled ? 'discover' : 'installed',
 			},
 		},
 		components: {

diff --git a/apps/settings/src/views/AppStoreNavigation.vue b/apps/settings/src/views/AppStoreNavigation.vue
@@ -2,7 +2,8 @@
 	<!-- Categories & filters -->
 	<NcAppNavigation :aria-label="t('settings', 'Apps')">
 		<template #list>
-			<NcAppNavigationItem id="app-category-discover"
+			<NcAppNavigationItem v-if="appstoreEnabled"
+				id="app-category-discover"
 				:to="{ name: 'apps-category', params: { category: 'discover'} }"
 				:name="APPS_SECTION_ENUM.discover">
 				<template #icon>

diff --git a/dist/settings-apps-view-4529.js b/dist/settings-apps-view-4529.js
diff --git a/dist/settings-apps-view-4529.js.map b/dist/settings-apps-view-4529.js.map
diff --git a/dist/settings-vue-settings-apps-users-management.js b/dist/settings-vue-settings-apps-users-management.js
diff --git a/dist/settings-vue-settings-apps-users-management.js.map b/dist/settings-vue-settings-apps-users-management.js.map