Browse Source

fix(lib): resolve typescript errors

pull/6358/head
KenTandrian 1 month ago
parent
commit
699cadb19d
  1. 22
      libs/ui/src/lib/activities-filter/activities-filter.component.ts

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

@ -66,7 +66,7 @@ export class GfActivitiesFilterComponent implements OnChanges, OnDestroy {
public filterGroups$: Subject<FilterGroup[]> = new BehaviorSubject([]); public filterGroups$: Subject<FilterGroup[]> = new BehaviorSubject([]);
public filters$: Subject<Filter[]> = new BehaviorSubject([]); public filters$: Subject<Filter[]> = new BehaviorSubject([]);
public filters: Observable<Filter[]> = this.filters$.asObservable(); public filters: Observable<Filter[]> = this.filters$.asObservable();
public searchControl = new FormControl<Filter | string>(undefined); public searchControl = new FormControl<Filter | string | null>(null);
public selectedFilters: Filter[] = []; public selectedFilters: Filter[] = [];
public separatorKeysCodes: number[] = [ENTER, COMMA]; public separatorKeysCodes: number[] = [ENTER, COMMA];
@ -107,7 +107,7 @@ export class GfActivitiesFilterComponent implements OnChanges, OnDestroy {
input.value = ''; input.value = '';
} }
this.searchControl.setValue(undefined); this.searchControl.setValue(null);
} }
public onRemoveFilter(aFilter: Filter) { public onRemoveFilter(aFilter: Filter) {
@ -119,14 +119,16 @@ export class GfActivitiesFilterComponent implements OnChanges, OnDestroy {
} }
public onSelectFilter(event: MatAutocompleteSelectedEvent) { public onSelectFilter(event: MatAutocompleteSelectedEvent) {
this.selectedFilters.push( const filter = this.allFilters.find((f) => {
this.allFilters.find((filter) => { return f.id === event.option.value;
return filter.id === event.option.value; });
})
); if (filter) {
this.selectedFilters.push(filter);
}
this.updateFilters(); this.updateFilters();
this.searchInput.nativeElement.value = ''; this.searchInput.nativeElement.value = '';
this.searchControl.setValue(undefined); this.searchControl.setValue(null);
} }
public ngOnDestroy() { public ngOnDestroy() {
@ -147,13 +149,13 @@ export class GfActivitiesFilterComponent implements OnChanges, OnDestroy {
if (searchTerm) { if (searchTerm) {
// Filter by search term // Filter by search term
return filter.label return filter.label
.toLowerCase() ?.toLowerCase()
.includes(searchTerm.toLowerCase()); .includes(searchTerm.toLowerCase());
} }
return filter; return filter;
}) })
.sort((a, b) => a.label?.localeCompare(b.label)), .sort((a, b) => (a.label ?? '').localeCompare(b.label ?? '')),
(filter) => { (filter) => {
return filter.type; return filter.type;
} }

Loading…
Cancel
Save