fix: Fix empty sections appearing in search results

Signed-off-by: Christopher Ng <chrng8@gmail.com>

diff --git a/apps/settings/lib/Search/SectionSearch.php b/apps/settings/lib/Search/SectionSearch.php
index 321534581b53ed4fae33df543ad93866c307dc57..15d98fbd1b946d54d37ea2f212ef4d75efcf2abe 100644 (file)
--- a/apps/settings/lib/Search/SectionSearch.php
+++ b/apps/settings/lib/Search/SectionSearch.php
@@ -74,9 +74,25 @@ class SectionSearch implements IProvider {
        public function search(IUser $user, ISearchQuery $query): SearchResult {
                $isAdmin = $this->groupManager->isAdmin($user->getUID());
 
+               $personalSections = $this->settingsManager->getPersonalSections();
+               foreach ($personalSections as $priority => $sections) {
+                       $personalSections[$priority] = array_values(array_filter(
+                               $sections,
+                               fn (IIconSection $section) => !empty($this->settingsManager->getPersonalSettings($section->getID())),
+                       ));
+               }
+
+               $adminSections = $this->settingsManager->getAdminSections();
+               foreach ($adminSections as $priority => $sections) {
+                       $adminSections[$priority] = array_values(array_filter(
+                               $sections,
+                               fn (IIconSection $section) => !empty($this->settingsManager->getAllowedAdminSettings($section->getID(), $user)),
+                       ));
+               }
+
                $result = $this->searchSections(
                        $query,
-                       $this->settingsManager->getPersonalSections(),
+                       $personalSections,
                        $isAdmin ? $this->l->t('Personal') : '',
                        'settings.PersonalSettings.index'
                );
@@ -84,7 +100,7 @@ class SectionSearch implements IProvider {
                if ($this->groupManager->isAdmin($user->getUID())) {
                        $result = array_merge($result, $this->searchSections(
                                $query,
-                               $this->settingsManager->getAdminSections(),
+                               $adminSections,
                                $this->l->t('Administration'),
                                'settings.AdminSettings.index'
                        ));