Browse Source

Fix Filters

pull/5027/head
Dan 1 year ago
parent
commit
24f3d47946
  1. 8
      apps/client/src/app/components/header/header.component.ts
  2. 19
      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'; filtersType = 'tags';
} }
userSetting[`filters.${filtersType}`] = filters let userFilters = filters
.filter((f) => f.type === filter.type) .filter((f) => f.type === filter.type && filter.id)
.map((f) => f.id); .map((f) => f.id);
userSetting[`filters.${filtersType}`] = userFilters.length
? userFilters
: null;
} }
this.dataService this.dataService

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

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

Loading…
Cancel
Save