From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Wed, 6 Dec 2023 13:39:33 +0000 (+0100)
Subject: enh(NavigationManager): Use ID as fallback for `app` property of entries
X-Git-Tag: v29.0.0beta1~691^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F42055%2Fhead;p=nextcloud-server.git

enh(NavigationManager): Use ID as fallback for `app` property of entries

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---

diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 27963b8a45d..17573d9db86 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -95,7 +95,10 @@ class NavigationManager implements INavigationManager {
 			return;
 		}
 
+		$id = $entry['id'];
+
 		$entry['active'] = false;
+		$entry['unread'] = $this->unreadCounters[$id] ?? 0;
 		if (!isset($entry['icon'])) {
 			$entry['icon'] = '';
 		}
@@ -106,9 +109,12 @@ class NavigationManager implements INavigationManager {
 			$entry['type'] = 'link';
 		}
 
-		$id = $entry['id'];
-		$entry['unread'] = $this->unreadCounters[$id] ?? 0;
 		if ($entry['type'] === 'link') {
+			// app might not be set when using closures, in this case try to fallback to ID
+			if (!isset($entry['app']) && $this->appManager->isEnabledForUser($id)) {
+				$entry['app'] = $id;
+			}
+
 			// This is the default app that will always be shown first
 			$entry['default'] = ($entry['app'] ?? false) === $this->defaultApp;
 			// Set order from user defined app order