Browse Source

Fix filtering

pull/883/head
Thomas 3 years ago
parent
commit
62530c3f2f
  1. 26
      libs/ui/src/lib/activities-filter/activities-filter.component.ts

26
libs/ui/src/lib/activities-filter/activities-filter.component.ts

@ -48,13 +48,22 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
public constructor() { public constructor() {
this.searchControl.valueChanges this.searchControl.valueChanges
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe((currentFilter) => { .subscribe((currentFilter: string) => {
if (currentFilter) { if (currentFilter) {
this.filters$.next( this.filters$.next(
this.allFilters.filter((filter) => filter.id === currentFilter.id) this.allFilters
.filter((filter) => {
// Filter selected filters
return !this.selectedFilters.some((selectedFilter) => {
return selectedFilter.id === filter.id;
});
})
.filter((filter) => {
return filter.label
.toLowerCase()
.startsWith(currentFilter?.toLowerCase());
})
); );
} else {
this.filters$.next(this.allFilters);
} }
}); });
} }
@ -99,7 +108,14 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
} }
private updateFilter() { private updateFilter() {
this.filters$.next(this.allFilters); this.filters$.next(
this.allFilters.filter((filter) => {
// Filter selected filters
return !this.selectedFilters.some((selectedFilter) => {
return selectedFilter.id === filter.id;
});
})
);
// Emit an array with a new reference // Emit an array with a new reference
this.valueChanged.emit([...this.selectedFilters]); this.valueChanged.emit([...this.selectedFilters]);

Loading…
Cancel
Save