fix(core): restore backport hunks that did not apply on stable34

The lexicon entry, the gridItems gate, the initial state and the
stateFor test helper were dropped by the cherry-pick, leaving a config
key that nothing reads.

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>

Author: pringelmann

core/AppInfo/ConfigLexicon.php

@@ -103,6 +103,16 @@ public function getAppConfigs(): array {
 				defaultRaw: true,
 				definition: 'Whether on demand preview migration is enabled.'
 			),
+			new Entry(
+				key: self::APPSTORE_LINK_SHOWN,
+				type: ValueType::BOOL,
+				defaultRaw: fn (Preset $p): bool => match ($p) {
+					Preset::NONE, Preset::PRIVATE, Preset::FAMILY, Preset::CLUB => true,
+					default => false,
+				},
+				definition: 'Show the app store link in the app menu to accounts without admin rights',
+				note: 'When this key is not set, the link is also hidden while a valid subscription is available or while "appstoreenabled" is disabled. Setting this key explicitly takes precedence over both.',
+			),
 		];
 	}
 

core/src/components/AppMenu.vue

@@ -196,8 +196,13 @@ export default defineComponent({
 		// "App store" (apps.nextcloud.com) for everyone else when
 		// appstore_link_shown allows it.
 		gridItems(): INavigationEntry[] {
-			const tail = this.isAdmin ? this.moreAppsEntry : this.appStoreEntry
-			return [...this.appList, tail]
+			const tail: INavigationEntry[] = []
+			if (this.isAdmin) {
+				tail.push(this.moreAppsEntry)
+			} else if (this.appStoreLinkShown) {
+				tail.push(this.appStoreEntry)
+			}
+			return [...this.appList, ...tail]
 		},
 	},
 

core/src/tests/components/AppMenu.spec.ts

@@ -75,6 +75,13 @@ function eightApps(activeIndex: number = -1): INavigationEntry[] {
 	}))
 }
 
+// AppMenu hides the app store tile when the state is absent, so a default
+// instance has to supply it.
+function stateFor(states: Record<string, unknown>) {
+	const all: Record<string, unknown> = { appStoreLinkShown: true, ...states }
+	return (_app: string, key: string, fallback: unknown) => key in all ? all[key] : fallback
+}
+
 // Import AFTER mocks are registered. Static `import` would hoist above
 // vi.mock() and break the wiring; dynamic import in beforeAll/await is the
 // idiomatic Vitest workaround when you need to control mock state per test.
@@ -142,6 +149,23 @@ describe('core: AppMenu', () => {
 		expect(moreApps).toBeTruthy()
 	})
 
+	it('omits the "App store" tile when the instance does not offer it', async () => {
+		initialState.loadState.mockImplementation(stateFor({ apps: fakeApps(), appStoreLinkShown: false }))
+		const wrapper = mount(AppMenu, { attachTo: document.body })
+		await openPopover(wrapper)
+
+		expect(gridLabels()).toEqual(['Files', 'Mail', 'Calendar'])
+	})
+
+	it('keeps the "More apps" tile for admins when the app store link is hidden', async () => {
+		initialState.loadState.mockImplementation(stateFor({ apps: fakeApps(), appStoreLinkShown: false }))
+		auth.getCurrentUser.mockReturnValue({ isAdmin: true })
+		const wrapper = mount(AppMenu, { attachTo: document.body })
+		await openPopover(wrapper)
+
+		expect(gridLabels()).toEqual(['Files', 'Mail', 'Calendar', 'More apps'])
+	})
+
 	it('ArrowRight moves the roving stop from index 0 to index 1 and focuses it', async () => {
 		initialState.loadState.mockImplementation(stateFor({ apps: eightApps() }))
 		const wrapper = mount(AppMenu, { attachTo: document.body })

lib/private/TemplateLayout.php

@@ -83,6 +83,7 @@ public function getPageTemplate(string $renderAs, string $appId): ITemplate {
 
 				$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
 				$this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll()));
+				$this->initialState->provideInitialState('core', 'appStoreLinkShown', Server::get(AppStoreLinkVisibility::class)->isShownToUsers());
 
 				$this->initialState->provideInitialState('unified-search', 'min-search-length', $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::UNIFIED_SEARCH_MIN_SEARCH_LENGTH));
 				if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) {