From 3b1c194fba596f6f4c5c255fbe769b2958fa5f1f Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Mon, 23 Aug 2021 13:20:44 +0300
Subject: [PATCH] Dynamic Table Columns Cleanup for view-cache

---
 .../dossier-overview-screen.component.scss         |  2 +-
 .../dossier-overview-screen.component.ts           | 14 ++++++++------
 apps/red-ui/src/assets/i18n/en.json                |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss
index 446abc67b..a9f7fa903 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.scss
@@ -2,7 +2,7 @@
 @import '../../../../../assets/styles/red-mixins';
 
 :root {
-    --dynamic-columns: '';
+    --dynamic-columns: '0';
 }
 
 .file-upload-input {
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 e87571067..18d49231c 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
@@ -62,7 +62,7 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
             hide: !this.currentUser.isManager
         }
     ];
-    tableColumnConfigs: readonly TableColumnConfig<FileStatusWrapper>[] = [
+    private readonly _defaultTableConfigs: readonly TableColumnConfig<FileStatusWrapper>[] = [
         {
             label: _('dossier-overview.table-col-names.name'),
             sortByKey: 'filename'
@@ -89,6 +89,8 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
             sortByKey: 'statusSort'
         }
     ];
+
+    tableColumnConfigs: readonly TableColumnConfig<FileStatusWrapper>[] = [];
     collapsedDetails = false;
     dossierAttributes: DossierAttributeWithValue[] = [];
     fileAttributeConfigs: FileAttributeConfig[];
@@ -159,7 +161,7 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
 
             this.dossierAttributes = await this._dossierAttributesService.getValues(this.currentDossier);
             this.searchService.setSearchKey('filename');
-            this._addDynamicColumns();
+            this._configureTableColumns();
         } catch (e) {
         } finally {
             this._loadingService.stop();
@@ -261,14 +263,14 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
     recentlyModifiedChecker = (file: FileStatusWrapper) =>
         moment(file.lastUpdated).add(this._appConfigService.getConfig(AppConfigKey.RECENT_PERIOD_IN_HOURS), 'hours').isAfter(moment());
 
-    private _addDynamicColumns() {
+    private _configureTableColumns() {
         const dynamicColumns: TableColumnConfig<FileStatusWrapper>[] = [];
         for (const config of this.displayedInFileListAttributes) {
             if (config.displayedInFileList) {
                 dynamicColumns.push({ label: config.label, notTranslatable: true });
             }
         }
-        this.tableColumnConfigs = [this.tableColumnConfigs[0], ...dynamicColumns, ...this.tableColumnConfigs.slice(1)];
+        this.tableColumnConfigs = [this._defaultTableConfigs[0], ...dynamicColumns, ...this._defaultTableConfigs.slice(1)];
         this.dynamicColumnsCount = dynamicColumns.length;
         (this._elementRef.nativeElement as HTMLElement).style.setProperty('--dynamic-columns', `${this.dynamicColumnsCount}`);
     }
@@ -318,8 +320,8 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
                     }
                     let filterValue = file.fileAttributes?.attributeIdToValue[config.id];
                     if (!filterValue) {
-                        filterValue = 'Empty';
-                        file.fileAttributes.attributeIdToValue[config.id] = filterValue;
+                        filterValue = this._translateService.instant('filters.empty');
+                        file.fileAttributes.attributeIdToValue[config.id] = '-';
                     }
                     filters.add(filterValue);
                 }
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 8c1710754..6be48809b 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1044,7 +1044,8 @@
     "filter-by": "Filter:",
     "needs-work": "Workload",
     "people": "Dossier Member(s)",
-    "status": "Status"
+    "status": "Status",
+    "empty": "Empty"
   },
   "general-config-screen": {
     "actions": {