Merge pull request #41738 from nextcloud/feat/hide-dav-search-provide…

…r-if-no-app
nextcloud · Nov 27, 2023 · e416279 · e416279
2 parents 3ccb301 + 2a4465d
commit e416279
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -83,11 +83,12 @@ public function getName(): string {
 		return $this->l10n->t('Contacts');
 	}
 
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'contacts.Page.index') {
-			return -1;
+	public function getOrder(string $route, array $routeParameters): ?int {
+		if ($this->appManager->isEnabledForUser('contacts')) {
+			return $route === 'contacts.Page.index' ? -1 : 25;
 		}
-		return 25;
+
+		return null;
 	}
 
 	public function search(IUser $user, ISearchQuery $query): SearchResult {

diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php
@@ -89,11 +89,12 @@ public function getName(): string {
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'calendar.View.index') {
-			return -1;
+	public function getOrder(string $route, array $routeParameters): ?int {
+		if ($this->appManager->isEnabledForUser('calendar')) {
+			return $route === 'calendar.View.index' ? -1 : 30;
 		}
-		return 30;
+
+		return null;
 	}
 
 	/**

diff --git a/apps/dav/lib/Search/TasksSearchProvider.php b/apps/dav/lib/Search/TasksSearchProvider.php
@@ -77,11 +77,12 @@ public function getName(): string {
 	/**
 	 * @inheritDoc
 	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'tasks.Page.index') {
-			return -1;
+	public function getOrder(string $route, array $routeParameters): ?int {
+		if ($this->appManager->isEnabledForUser('tasks')) {
+			return $route === 'tasks.Page.index' ? -1 : 35;
 		}
-		return 35;
+
+		return null;
 	}
 
 	/**