Browse Source

Refactoring

pull/883/head
Thomas 3 years ago
parent
commit
313fadb00a
  1. 6
      libs/ui/src/lib/activities-filter/activities-filter.component.html
  2. 8
      libs/ui/src/lib/activities-filter/activities-filter.component.ts

6
libs/ui/src/lib/activities-filter/activities-filter.component.html

@ -2,13 +2,13 @@
<ion-icon class="mr-1" matPrefix name="search-outline"></ion-icon> <ion-icon class="mr-1" matPrefix name="search-outline"></ion-icon>
<mat-chip-list #chipList aria-label="Search keywords"> <mat-chip-list #chipList aria-label="Search keywords">
<mat-chip <mat-chip
*ngFor="let searchKeyword of searchFilters" *ngFor="let filter of selectedFilters"
class="mx-1 my-0 px-2 py-0" class="mx-1 my-0 px-2 py-0"
matChipRemove matChipRemove
[removable]="true" [removable]="true"
(removed)="onRemoveFilter(searchKeyword)" (removed)="onRemoveFilter(filter)"
> >
{{ searchKeyword.label | gfSymbol }} {{ filter.label | gfSymbol }}
<ion-icon class="ml-2" matPrefix name="close-outline"></ion-icon> <ion-icon class="ml-2" matPrefix name="close-outline"></ion-icon>
</mat-chip> </mat-chip>
<input <input

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

@ -40,7 +40,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
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(); public searchControl = new FormControl();
public searchFilters: Filter[] = []; public selectedFilters: Filter[] = [];
public separatorKeysCodes: number[] = [ENTER, COMMA]; public separatorKeysCodes: number[] = [ENTER, COMMA];
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -79,7 +79,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
} }
public onRemoveFilter(aFilter: Filter): void { public onRemoveFilter(aFilter: Filter): void {
this.searchFilters = this.searchFilters.filter((filter) => { this.selectedFilters = this.selectedFilters.filter((filter) => {
return filter.id !== aFilter.id; return filter.id !== aFilter.id;
}); });
@ -87,7 +87,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
} }
public onSelectFilter(event: MatAutocompleteSelectedEvent): void { public onSelectFilter(event: MatAutocompleteSelectedEvent): void {
this.searchFilters.push(event.option.value); this.selectedFilters.push(event.option.value);
this.updateFilter(); this.updateFilter();
this.searchInput.nativeElement.value = ''; this.searchInput.nativeElement.value = '';
this.searchControl.setValue(null); this.searchControl.setValue(null);
@ -102,6 +102,6 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
this.filters$.next(this.allFilters); this.filters$.next(this.allFilters);
// Emit an array with a new reference // Emit an array with a new reference
this.valueChanged.emit([...this.searchFilters]); this.valueChanged.emit([...this.selectedFilters]);
} }
} }

Loading…
Cancel
Save