Browse Source

Merge pull request #74 from dandevaud/feature/Performance-Enhancements

Fix Filters
pull/5027/head
dandevaud 1 year ago
committed by GitHub
parent
commit
29ccce7efd
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      apps/client/src/app/components/header/header.component.ts
  2. 31
      libs/ui/src/lib/assistant/assistant.component.ts

8
apps/client/src/app/components/header/header.component.ts

@ -179,9 +179,13 @@ export class HeaderComponent implements OnChanges {
filtersType = 'tags';
}
userSetting[`filters.${filtersType}`] = filters
.filter((f) => f.type === filter.type)
let userFilters = filters
.filter((f) => f.type === filter.type && filter.id)
.map((f) => f.id);
userSetting[`filters.${filtersType}`] = userFilters.length
? userFilters
: null;
}
this.dataService

31
libs/ui/src/lib/assistant/assistant.component.ts

@ -244,25 +244,18 @@ export class AssistantComponent implements OnChanges, OnDestroy, OnInit {
}
public onApplyFilters() {
let accountFilters =
this.filterForm
.get('account')
.value?.reduce(
(arr, val) => [...arr, { id: val, type: 'ACCOUNT' }],
[]
) ?? [];
let assetClassFilters =
this.filterForm
.get('assetClass')
.value?.reduce(
(arr, val) => [...arr, { id: val, type: 'ASSET_CLASS' }],
[]
) ?? [];
let tagFilters =
this.filterForm
.get('tag')
.value?.reduce((arr, val) => [...arr, { id: val, type: 'TAG' }], []) ??
[];
let accountFilters = this.filterForm
.get('account')
.value?.reduce((arr, val) => [...arr, { id: val, type: 'ACCOUNT' }], []);
let assetClassFilters = this.filterForm
.get('assetClass')
.value?.reduce(
(arr, val) => [...arr, { id: val, type: 'ASSET_CLASS' }],
[]
);
let tagFilters = this.filterForm
.get('tag')
.value?.reduce((arr, val) => [...arr, { id: val, type: 'TAG' }], []);
let filters = [...accountFilters, ...assetClassFilters];
filters = [...filters, ...tagFilters];
this.filtersChanged.emit(filters);

Loading…
Cancel
Save