Merge branch 'master' into cuppett/migrate-appconfig-keys-to-bool

Author: cuppett

apps/appstore/appinfo/info.xml

@@ -19,4 +19,21 @@
 	<dependencies>
 		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
+
+	<navigations>
+		<navigation role="admin">
+			<name>Appstore</name>
+			<route>appstore.page.viewApps</route>
+			<icon>app.svg</icon>
+			<order>99</order>
+		</navigation>
+
+		<navigation role="admin">
+			<name>Apps</name>
+			<route>appstore.page.viewApps</route>
+			<icon>app.svg</icon>
+			<order>5</order>
+			<type>settings</type>
+		</navigation>
+	</navigations>
 </info>

apps/appstore/lib/Controller/PageController.php

@@ -23,7 +23,6 @@
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
 use OCP\IL10N;
-use OCP\INavigationManager;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\Server;
@@ -41,7 +40,6 @@ public function __construct(
 		private readonly IURLGenerator $urlGenerator,
 		private readonly IInitialState $initialState,
 		private readonly BundleFetcher $bundleFetcher,
-		private readonly INavigationManager $navigationManager,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 	}
@@ -51,8 +49,6 @@ public function __construct(
 	#[FrontpageRoute(verb: 'GET', url: '/settings/apps/{category}', defaults: ['category' => ''], root: '')]
 	#[FrontpageRoute(verb: 'GET', url: '/settings/apps/{category}/{id}', defaults: ['category' => '', 'id' => ''], root: '')]
 	public function viewApps(): TemplateResponse {
-		$this->navigationManager->setActiveEntry('core_apps');
-
 		$this->initialState->provideInitialState('appstoreEnabled', $this->config->getSystemValueBool('appstoreenabled', true));
 		$this->initialState->provideInitialState('appstoreBundles', $this->getBundles());
 		$this->initialState->provideInitialState('appstoreDeveloperDocs', $this->urlGenerator->linkToDocs('developer-manual'));

apps/appstore/tests/Controller/PageControllerTest.php

@@ -17,7 +17,6 @@
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
 use OCP\IL10N;
-use OCP\INavigationManager;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -31,8 +30,6 @@ final class PageControllerTest extends TestCase {
 
 	private IConfig&MockObject $config;
 
-	private INavigationManager&MockObject $navigationManager;
-
 	private IAppManager&MockObject $appManager;
 
 	private BundleFetcher&MockObject $bundleFetcher;
@@ -55,7 +52,6 @@ protected function setUp(): void {
 			->method('t')
 			->willReturnArgument(0);
 		$this->config = $this->createMock(IConfig::class);
-		$this->navigationManager = $this->createMock(INavigationManager::class);
 		$this->appManager = $this->createMock(IAppManager::class);
 		$this->bundleFetcher = $this->createMock(BundleFetcher::class);
 		$this->installer = $this->createMock(Installer::class);
@@ -71,7 +67,6 @@ protected function setUp(): void {
 			$this->urlGenerator,
 			$this->initialState,
 			$this->bundleFetcher,
-			$this->navigationManager,
 		);
 	}
 
@@ -85,10 +80,6 @@ public function testViewApps(): void {
 			->method('getSystemValueBool')
 			->with('appstoreenabled', true)
 			->willReturn(true);
-		$this->navigationManager
-			->expects($this->once())
-			->method('setActiveEntry')
-			->with('core_apps');
 
 		$this->initialState
 			->expects($this->exactly(4))
@@ -118,10 +109,6 @@ public function testViewAppsAppstoreNotEnabled(): void {
 			->method('getSystemValueBool')
 			->with('appstoreenabled', true)
 			->willReturn(false);
-		$this->navigationManager
-			->expects($this->once())
-			->method('setActiveEntry')
-			->with('core_apps');
 
 		$this->initialState
 			->expects($this->exactly(4))