Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 28 additions & 6 deletions core/src/components/UnifiedSearch/UnifiedSearchModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -508,20 +508,30 @@ export default defineComponent({

// This block of filter checks should be dynamic somehow and should be handled in
// nextcloud/search lib
const activeFilters = this.filters.filter(filter => {
const contentFilterTypes = this.filters
.filter((f) => f.type !== 'provider')
.map((f) => f.type)
const supportsActiveFilters = contentFilterTypes.length === 0
|| contentFilterTypes.every((type) => this.providerIsCompatibleWithFilters(provider, [type]))

const baseProvider = provider.searchFrom
? this.providers.find((p) => p.id === provider.searchFrom) ?? provider
: provider

const activeFilters = this.filters.filter((filter) => {
return filter.type !== 'provider' && this.providerIsCompatibleWithFilters(provider, [filter.type])
})

activeFilters.forEach(filter => {
activeFilters.forEach((filter) => {
switch (filter.type) {
case 'date':
if (provider.filters?.since && provider.filters?.until) {
if (baseProvider.filters?.since && baseProvider.filters?.until) {
params.since = this.dateFilter.startFrom
params.until = this.dateFilter.endAt
}
break
case 'person':
if (provider.filters?.person) {
if (baseProvider.filters?.person) {
params.person = this.personFilter.user
}
break
Expand Down Expand Up @@ -820,8 +830,20 @@ export default defineComponent({

return flattenedArray
},
async providerIsCompatibleWithFilters(provider, filterIds) {
return filterIds.every(filterId => provider.filters?.[filterId] !== undefined)
providerIsCompatibleWithFilters(provider, filterIds) {
const baseProvider = provider.searchFrom
? this.providers.find((p) => p.id === provider.searchFrom) ?? provider
: provider
return filterIds.every((filterId) => {
switch (filterId) {
case 'date':
return baseProvider.filters?.since !== undefined && baseProvider.filters?.until !== undefined
case 'person':
return baseProvider.filters?.person !== undefined
default:
return baseProvider.filters?.[filterId] !== undefined
}
})
},
async enableAllProviders() {
this.providers.forEach(async (_, index) => {
Expand Down
4 changes: 2 additions & 2 deletions dist/core-unified-search.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unified-search.js.map

Large diffs are not rendered by default.

Loading