Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(unified-search): filteredProviders now inherits all provider props #50592

Merged
merged 3 commits into from
Feb 3, 2025
Merged

fix(unified-search): filteredProviders now inherits all provider props #50592

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2fc45a
fix(unified-search): filteredProviders now inherits all provider props
nfebe Jan 31, 2025
4444014
Merge branch 'master' into fix/noid/in-folder-search
nfebe Feb 3, 2025
61e4cb5
chore(assets): Recompile assets
nextcloud-command Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/src/components/UnifiedSearch/UnifiedSearchModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,11 @@ export default defineComponent({
// If load more result for filter, remove other filters
this.filters = this.filters.filter(filter => filter.id === provider.id)
this.filteredProviders = this.filteredProviders.filter(filteredProvider => filteredProvider.id === provider.id)
// Plugin filters may have extra parameters, so we need to keep them
// See method handlePluginFilter for more details
if (this.filteredProviders.length > 0 && this.filteredProviders[0].isPluginFilter) {
provider = this.filteredProviders[0]
}
this.addProviderFilter(provider, true)
},
addProviderFilter(providerFilter, loadMoreResultsForProvider = false) {
Expand All @@ -531,13 +536,8 @@ export default defineComponent({
this.filters = this.syncProviderFilters(this.filters, this.filteredProviders)
}
this.filteredProviders.push({
id: providerFilter.id,
appId: providerFilter.appId,
searchFrom: providerFilter.searchFrom,
name: providerFilter.name,
icon: providerFilter.icon,
...providerFilter,
type: providerFilter.type || 'provider',
filters: providerFilter.filters,
isPluginFilter: providerFilter.isPluginFilter || false,
})
this.filters = this.syncProviderFilters(this.filters, this.filteredProviders)
Expand Down
Loading