From 24f3d479467214eaa05fcc3ed439361223ca6a7e Mon Sep 17 00:00:00 2001
From: Dan <dan@ddev.ch>
Date: Sun, 3 Mar 2024 10:48:06 +0100
Subject: [PATCH] Fix Filters

---
 .../app/components/header/header.component.ts |  8 +++--
 .../src/lib/assistant/assistant.component.ts  | 31 +++++++------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts
index 377b429bc..1e14d390f 100644
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/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
diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index 8e8b903de..33cb12d9d 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/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);