feat(dav): hide search providers if their respective app is not activated

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>

diff --git a/apps/dav/lib/Search/ContactsSearchProvider.php b/apps/dav/lib/Search/ContactsSearchProvider.php
index 265f4958efbfd35a2f514a7a704dc937a872684b..2a0e70bf045cc0df688039ee1aa411cd7f9df94f 100644 (file)
--- a/apps/dav/lib/Search/ContactsSearchProvider.php
+++ b/apps/dav/lib/Search/ContactsSearchProvider.php
@@ -83,11 +83,12 @@ class ContactsSearchProvider implements IFilteringProvider {
                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
index 0cf01742672c36e756df6fa32cd02fe516b52c1a..dd87f486a1d3e9e1968ce6dd8b9fa52ac8e3d540 100644 (file)
--- a/apps/dav/lib/Search/EventsSearchProvider.php
+++ b/apps/dav/lib/Search/EventsSearchProvider.php
@@ -89,11 +89,12 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
        /**
         * @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
index 91692ea1c2ab749af4575eb3dc8fe847858c1db6..5cb64556457eb6bb907f13a19c482e0592a03847 100644 (file)
--- a/apps/dav/lib/Search/TasksSearchProvider.php
+++ b/apps/dav/lib/Search/TasksSearchProvider.php
@@ -77,11 +77,12 @@ class TasksSearchProvider extends ACalendarSearchProvider {
        /**
         * @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;
        }
 
        /**