Skip to content

Commit

Permalink
Merge pull request #39194 from nextcloud/fix/stable26/tag-search-shor…
Browse files Browse the repository at this point in the history
…t-circuit-master

[stable26] fix(TagSearchProvider): Short circuit if no tag matches the query
  • Loading branch information
blizzz committed Jul 6, 2023
2 parents 51fda57 + 1b83c63 commit ddfe6cc
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions apps/systemtags/lib/Search/TagSearchProvider.php
Expand Up @@ -113,6 +113,11 @@ public function getOrder(string $route, array $routeParameters): int {
* @inheritDoc
*/
public function search(IUser $user, ISearchQuery $query): SearchResult {
$matchingTags = $this->tagManager->getAllTags(true, $query->getTerm());
if (count($matchingTags) === 0) {
return SearchResult::complete($this->l10n->t('Tags'), []);
}

$userFolder = $this->rootFolder->getUserFolder($user->getUID());
$fileQuery = new SearchQuery(
new SearchBinaryOperator(SearchBinaryOperator::OPERATOR_OR, [
Expand All @@ -133,7 +138,6 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
return $node->getId();
}, $searchResults);
$matchedTags = $this->objectMapper->getTagIdsForObjects($resultIds, 'files');
$relevantTags = $this->tagManager->getTagsByIds(array_unique($this->flattenArray($matchedTags)));

// prepare direct tag results
$tagResults = array_map(function(ISystemTag $tag) {
Expand All @@ -149,9 +153,7 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
'icon-tag'
);
return $searchResultEntry;
}, array_filter($relevantTags, function($tag) use ($query) {
return $tag->isUserVisible() && strpos($tag->getName(), $query->getTerm()) !== false;
}));
}, $matchingTags);

// prepare files results
return SearchResult::paginated(
Expand Down

0 comments on commit ddfe6cc

Please sign in to comment.