From 79da25c7475c62c7db0c0d2e638e40aaaac51e94 Mon Sep 17 00:00:00 2001
From: Valentin <valentin@devplant.ro>
Date: Mon, 23 Aug 2021 13:07:23 +0300
Subject: [PATCH] - updated dynamic filters to be the last in the list - added
 'Unset' instead of empty string or null

---
 .../dossier-overview-screen.component.ts      | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
index 91011e5ce..e87571067 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
@@ -316,23 +316,16 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
                         dynamicFilters.set(filterKey, new Set<string>());
                         filters = dynamicFilters.get(filterKey);
                     }
-                    filters.add(file.fileAttributes?.attributeIdToValue[config.id]);
+                    let filterValue = file.fileAttributes?.attributeIdToValue[config.id];
+                    if (!filterValue) {
+                        filterValue = 'Empty';
+                        file.fileAttributes.attributeIdToValue[config.id] = filterValue;
+                    }
+                    filters.add(filterValue);
                 }
             });
         });
 
-        dynamicFilters.forEach((filterValue: Set<string>, filterKey: string) => {
-            const id = filterKey.split(':')[0];
-            const key = filterKey.split(':')[1];
-            this.filterService.addFilterGroup({
-                slug: key,
-                label: key,
-                icon: 'red:template',
-                filters: [...filterValue].map<NestedFilter>((value: string) => ({ key: value, label: value })),
-                checker: (input: FileStatusWrapper, filter: NestedFilter) => filter.label === input.fileAttributes.attributeIdToValue[id]
-            });
-        });
-
         const statusFilters = [...allDistinctFileStatusWrapper].map<NestedFilter>(item => ({
             key: item,
             label: this._translateService.instant(fileStatusTranslations[item])
@@ -384,6 +377,18 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
             matchAll: true
         });
 
+        dynamicFilters.forEach((filterValue: Set<string>, filterKey: string) => {
+            const id = filterKey.split(':')[0];
+            const key = filterKey.split(':')[1];
+            this.filterService.addFilterGroup({
+                slug: key,
+                label: key,
+                icon: 'red:template',
+                filters: [...filterValue].map<NestedFilter>((value: string) => ({ key: value, label: value })),
+                checker: (input: FileStatusWrapper, filter: NestedFilter) => filter.label === input.fileAttributes.attributeIdToValue[id]
+            });
+        });
+
         this.filterService.addFilterGroup({
             slug: 'quickFilters',
             filters: this._createQuickFilters(),