aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings/lib/Search
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings/lib/Search')
-rw-r--r--apps/settings/lib/Search/AppSearch.php68
-rw-r--r--apps/settings/lib/Search/SectionSearch.php76
-rw-r--r--apps/settings/lib/Search/UserSearch.php40
3 files changed, 86 insertions, 98 deletions
diff --git a/apps/settings/lib/Search/AppSearch.php b/apps/settings/lib/Search/AppSearch.php
index 5221fc3d1fd..19c2bce5451 100644
--- a/apps/settings/lib/Search/AppSearch.php
+++ b/apps/settings/lib/Search/AppSearch.php
@@ -3,27 +3,9 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
- *
- * @author Joas Schilling <coding@schilljs.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\Settings\Search;
use OCP\IL10N;
@@ -35,56 +17,43 @@ use OCP\Search\SearchResult;
use OCP\Search\SearchResultEntry;
class AppSearch implements IProvider {
-
- /** @var INavigationManager */
- protected $navigationManager;
-
- /** @var IL10N */
- protected $l;
-
- public function __construct(INavigationManager $navigationManager,
- IL10N $l) {
- $this->navigationManager = $navigationManager;
- $this->l = $l;
+ public function __construct(
+ protected INavigationManager $navigationManager,
+ protected IL10N $l,
+ ) {
}
- /**
- * @inheritDoc
- */
public function getId(): string {
return 'settings_apps';
}
- /**
- * @inheritDoc
- */
public function getName(): string {
return $this->l->t('Apps');
}
- /**
- * @inheritDoc
- */
public function getOrder(string $route, array $routeParameters): int {
- return -50;
+ return $route === 'settings.AppSettings.viewApps' ? -50 : 100;
}
- /**
- * @inheritDoc
- */
public function search(IUser $user, ISearchQuery $query): SearchResult {
$entries = $this->navigationManager->getAll('all');
+ $searchTitle = $this->l->t('Apps');
+ $term = $query->getFilter('term')?->get();
+ if (empty($term)) {
+ return SearchResult::complete($searchTitle, []);
+ }
+
$result = [];
foreach ($entries as $entry) {
if (
- stripos($entry['name'], $query->getTerm()) === false &&
- stripos($entry['id'], $query->getTerm()) === false
+ stripos($entry['name'], $term) === false
+ && stripos($entry['id'], $term) === false
) {
continue;
}
- if (strpos($query->getRoute(), $entry['id'] . '.') === 0) {
+ if (str_starts_with($query->getRoute(), $entry['id'] . '.')) {
// Skip the current app, unlikely this is intended
continue;
}
@@ -103,9 +72,6 @@ class AppSearch implements IProvider {
);
}
- return SearchResult::complete(
- $this->l->t('Apps'),
- $result
- );
+ return SearchResult::complete($searchTitle, $result);
}
}
diff --git a/apps/settings/lib/Search/SectionSearch.php b/apps/settings/lib/Search/SectionSearch.php
index b9a3c491d12..52f0c9b08db 100644
--- a/apps/settings/lib/Search/SectionSearch.php
+++ b/apps/settings/lib/Search/SectionSearch.php
@@ -3,29 +3,9 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
-
namespace OCA\Settings\Search;
use OCP\IGroupManager;
@@ -41,26 +21,12 @@ use OCP\Settings\IManager;
class SectionSearch implements IProvider {
- /** @var IManager */
- protected $settingsManager;
-
- /** @var IGroupManager */
- protected $groupManager;
-
- /** @var IURLGenerator */
- protected $urlGenerator;
-
- /** @var IL10N */
- protected $l;
-
- public function __construct(IManager $settingsManager,
- IGroupManager $groupManager,
- IURLGenerator $urlGenerator,
- IL10N $l) {
- $this->settingsManager = $settingsManager;
- $this->groupManager = $groupManager;
- $this->urlGenerator = $urlGenerator;
- $this->l = $l;
+ public function __construct(
+ protected IManager $settingsManager,
+ protected IGroupManager $groupManager,
+ protected IURLGenerator $urlGenerator,
+ protected IL10N $l,
+ ) {
}
/**
@@ -94,9 +60,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'
);
@@ -104,7 +86,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'
));
@@ -128,8 +110,8 @@ class SectionSearch implements IProvider {
foreach ($sections as $priority => $sectionsByPriority) {
foreach ($sectionsByPriority as $section) {
if (
- stripos($section->getName(), $query->getTerm()) === false &&
- stripos($section->getID(), $query->getTerm()) === false
+ stripos($section->getName(), $query->getTerm()) === false
+ && stripos($section->getID(), $query->getTerm()) === false
) {
continue;
}
@@ -144,7 +126,7 @@ class SectionSearch implements IProvider {
$section->getName(),
$subline,
$this->urlGenerator->linkToRouteAbsolute($routeName, ['section' => $section->getID()]),
- 'icon-settings'
+ 'icon-settings-dark'
);
}
}
diff --git a/apps/settings/lib/Search/UserSearch.php b/apps/settings/lib/Search/UserSearch.php
new file mode 100644
index 00000000000..5326f4cefff
--- /dev/null
+++ b/apps/settings/lib/Search/UserSearch.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Settings\Search;
+
+use OCP\IL10N;
+use OCP\IUser;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+
+class UserSearch implements IProvider {
+ public function __construct(
+ private IL10N $l,
+ ) {
+ }
+
+ public function getId(): string {
+ return 'users';
+ }
+
+ public function getName(): string {
+ return $this->l->t('Users');
+ }
+
+ public function getOrder(string $route, array $routeParameters): ?int {
+ return str_starts_with($route, 'settings.Users.usersList')
+ ? 300
+ : null;
+ }
+
+ public function search(IUser $user, ISearchQuery $query): SearchResult {
+ return SearchResult::complete($this->l->t('Users'), []);
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-16 00:06:38 +0000