fixup! fix(NavigationManager): only resolve navigations of booted apps

Author: susnux

lib/private/NavigationManager.php

@@ -211,11 +211,6 @@ private function resolveAppNavigationEntries(): void {
 			$this->add($c());
 		}
 
-		// Resolve dynamically added navigation entries via event listeners
-		if ($this->loadedAppInfo === []) {
-			$this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
-		}
-
 		// Resolve classic info.xml based navigation entries
 		if ($this->userSession->isLoggedIn()) {
 			$user = $this->userSession->getUser();
@@ -224,11 +219,12 @@ private function resolveAppNavigationEntries(): void {
 			$apps = $this->appManager->getEnabledApps();
 		}
 
+		if (count($apps) === count($this->loadedAppInfo)) {
+			// All apps that are loaded for the user have already been resolved
+			return;
+		}
+
 		foreach ($apps as $app) {
-			if ($this->appManager->isAppLoaded($app)) {
-				// the app is not yet booted thus its routes do not yet exist
-				continue;
-			}
 			if (in_array($app, $this->loadedAppInfo)) {
 				// the apps navigations were already resolved
 				continue;
@@ -237,8 +233,16 @@ private function resolveAppNavigationEntries(): void {
 			// load plugins and collections from info.xml
 			$info = $this->appManager->getAppInfo($app);
 			if (!isset($info['navigations']['navigation'])) {
+				// this app does not have any navigation entries, skip it
+				$this->loadedAppInfo[] = $app;
+				continue;
+			}
+
+			if (!$this->appManager->isAppLoaded($app)) {
+				// the app is not yet booted thus its routes do not yet exist
 				continue;
 			}
+
 			foreach ($info['navigations']['navigation'] as $key => $nav) {
 				$nav['type'] = $nav['type'] ?? 'link';
 				if (!isset($nav['name'])) {
@@ -298,6 +302,9 @@ private function resolveAppNavigationEntries(): void {
 				));
 			}
 		}
+
+		// Resolve dynamically added navigation entries via event listeners
+		$this->eventDispatcher->dispatchTyped(new LoadAdditionalEntriesEvent());
 	}
 
 	private function isAdmin(): bool {

tests/lib/NavigationManagerTest.php

@@ -233,6 +233,10 @@ public function testWithAppManager($expected, $navigation, $isAdmin = false): vo
 			->method('getAppInfo')
 			->with('test')
 			->willReturn($navigation);
+		$this->appManager->expects($this->any())
+			->method('isAppLoaded')
+			->with('test')
+			->willReturn(true);
 		$this->urlGenerator->expects($this->any())
 			->method('imagePath')
 			->willReturnCallback(function ($appName, $file) {
@@ -259,7 +263,7 @@ public function testWithAppManager($expected, $navigation, $isAdmin = false): vo
 		$this->groupManager->expects($this->any())->method('isAdmin')->willReturn($isAdmin);
 
 		$this->navigationManager->clear();
-		$this->dispatcher->expects($this->once())
+		$this->dispatcher->expects($this->atLeastOnce())
 			->method('dispatchTyped')
 			->willReturnCallback(function ($event): void {
 				$this->assertInstanceOf(LoadAdditionalEntriesEvent::class, $event);
@@ -428,6 +432,7 @@ function (string $userId, string $appName, string $key, mixed $default = '') use
 			->with('theming')
 			->willReturn(true);
 		$this->appManager->expects($this->once())->method('getAppInfo')->with('test')->willReturn($navigation);
+		$this->appManager->expects($this->any())->method('isAppLoaded')->with('test')->willReturn(true);
 		$this->appManager->expects($this->once())->method('getAppIcon')->with('test')->willReturn('/apps/test/img/app.svg');
 		$this->l10nFac->expects($this->any())->method('get')->willReturn($l);
 		$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) {