75
75
<template #icon >
76
76
<NcAvatar v-if =" filter.type === 'person'"
77
77
:user =" filter.user"
78
+ :size =" 24"
79
+ :disable-menu =" true"
78
80
:show-user-status =" false"
79
81
:hide-favorite =" false" />
80
82
<CalendarRangeIcon v-else-if =" filter.type === 'date'" />
81
83
<img v-else :src =" filter.icon" alt =" " >
82
84
</template >
83
85
</FilterChip >
84
86
</div >
85
- <div v-if =" searchQuery.length === 0" >
87
+ <div v-if =" searchQuery.length === 0" class = " global-search-modal__no-search " >
86
88
<NcEmptyContent :name =" t('core', 'Start typing in search')" >
87
89
<template #icon >
88
90
<MagnifyIcon />
@@ -257,7 +259,7 @@ export default {
257
259
258
260
if (filters .personFilterIsApplied ) {
259
261
if (provider .filters .person ) {
260
- params .person = this .personFilter .id
262
+ params .person = this .personFilter .user
261
263
} else {
262
264
// Person filter is applied but provider does not support it, no need to search provider
263
265
return
@@ -378,7 +380,7 @@ export default {
378
380
this .providerActionMenuIsOpen = false
379
381
const existingFilter = this .filteredProviders .find (existing => existing .id === providerFilter .id )
380
382
if (! existingFilter) {
381
- this .filteredProviders .push ({ id: providerFilter .id , name: providerFilter .name , icon: providerFilter .icon , type: ' provider' })
383
+ this .filteredProviders .push ({ id: providerFilter .id , name: providerFilter .name , icon: providerFilter .icon , type: ' provider' , filters : providerFilter . filters })
382
384
}
383
385
this .filters = this .syncProviderFilters (this .filters , this .filteredProviders )
384
386
console .debug (' Search filters (newly added)' , this .filters )
@@ -397,9 +399,13 @@ export default {
397
399
398
400
} else {
399
401
for (let i = 0 ; i < this .filters .length ; i++ ) {
400
- if (this .filters [i].id === ' date' ) {
402
+ // Remove date and person filter
403
+ if (this .filters [i].id === ' date' || this .filters [i].id === filter .id ) {
401
404
this .dateFilterIsApplied = false
402
405
this .filters .splice (i, 1 )
406
+ if (filter .type === ' person' ) {
407
+ this .personFilterIsApplied = false
408
+ }
403
409
break
404
410
}
405
411
}
@@ -520,27 +526,28 @@ $margin: 10px;
520
526
521
527
& __filters {
522
528
display : flex ;
523
- padding-top : 5px ;
524
- justify-content : space-between ;
525
-
526
- >* :not (:last-child ) {
527
- // flex: 1;
528
- margin-right : 0.5 m;
529
- }
529
+ padding-top : 4px ;
530
+ justify-content : left ;
530
531
531
532
>* {
532
- button {
533
- min-width : 160px ;
534
- }
533
+ margin-right : 4px ;
534
+
535
535
}
536
536
537
537
}
538
538
539
539
& __filters-applied {
540
+ padding-top : 4px ;
540
541
display : flex ;
541
542
flex-wrap : wrap ;
542
543
}
543
544
545
+ & __no-search {
546
+ display : flex ;
547
+ align-items : center ;
548
+ height : 100% ;
549
+ }
550
+
544
551
& __results {
545
552
padding : 10px ;
546
553
0 commit comments