From 103234c9b07cefce910dec629390b2e67fffb3fe Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Sun, 26 Sep 2021 11:17:05 +0300
Subject: [PATCH] dossier template fixes

---
 .../src/app/models/file/dossier-template.ts   | 28 +++++++++++--------
 ...sier-templates-listing-screen.component.ts | 11 ++++----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/apps/red-ui/src/app/models/file/dossier-template.ts b/apps/red-ui/src/app/models/file/dossier-template.ts
index 38928dd6c..ed27de79f 100644
--- a/apps/red-ui/src/app/models/file/dossier-template.ts
+++ b/apps/red-ui/src/app/models/file/dossier-template.ts
@@ -16,21 +16,25 @@ export class DossierTemplate implements IDossierTemplate, IListable {
     dictionariesCount = 0;
     totalDictionaryEntries = 0;
 
-    constructor(dossierTemplateModel: IDossierTemplate, public fileAttributesConfig: FileAttributesConfig) {
-        this.createdBy = dossierTemplateModel.createdBy;
-        this.dateAdded = dossierTemplateModel.dateAdded;
-        this.dateModified = dossierTemplateModel.dateModified;
-        this.description = dossierTemplateModel.description;
-        this.dossierTemplateId = dossierTemplateModel.dossierTemplateId;
-        this.downloadFileTypes = dossierTemplateModel.downloadFileTypes;
-        this.modifiedBy = dossierTemplateModel.modifiedBy;
-        this.name = dossierTemplateModel.name;
-        this.reportTemplateIds = dossierTemplateModel.reportTemplateIds;
-        this.validFrom = dossierTemplateModel.validFrom;
-        this.validTo = dossierTemplateModel.validTo;
+    constructor(dossierTemplate: IDossierTemplate, public fileAttributesConfig: FileAttributesConfig) {
+        this.createdBy = dossierTemplate.createdBy;
+        this.dateAdded = dossierTemplate.dateAdded;
+        this.dateModified = dossierTemplate.dateModified;
+        this.description = dossierTemplate.description;
+        this.dossierTemplateId = dossierTemplate.dossierTemplateId;
+        this.downloadFileTypes = dossierTemplate.downloadFileTypes;
+        this.modifiedBy = dossierTemplate.modifiedBy;
+        this.name = dossierTemplate.name;
+        this.reportTemplateIds = dossierTemplate.reportTemplateIds;
+        this.validFrom = dossierTemplate.validFrom;
+        this.validTo = dossierTemplate.validTo;
     }
 
     get id(): string {
         return this.dossierTemplateId;
     }
+
+    get searchKey(): string {
+        return this.name;
+    }
 }
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
index a3db5f62a..0497b00c2 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
@@ -32,11 +32,10 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
     readonly currentUser = this._userService.currentUser;
     readonly tableHeaderLabel = _('dossier-templates-listing.table-header.title');
     tableColumnConfigs: TableColumnConfig<DossierTemplate>[];
-    @ViewChild('nameTemplate', { static: true }) nameTemplate: TemplateRef<never>;
-    @ViewChild('userTemplate', { static: true }) userTemplate: TemplateRef<never>;
-    @ViewChild('dateAddedTemplate', { static: true }) dateAddedTemplate: TemplateRef<never>;
-    @ViewChild('dateModifiedTemplate', { static: true }) dateModifiedTemplate: TemplateRef<never>;
-    protected readonly _primaryKey = 'name';
+    @ViewChild('nameTemplate', { static: true }) nameTemplate: TemplateRef<unknown>;
+    @ViewChild('userTemplate', { static: true }) userTemplate: TemplateRef<unknown>;
+    @ViewChild('dateAddedTemplate', { static: true }) dateAddedTemplate: TemplateRef<unknown>;
+    @ViewChild('dateModifiedTemplate', { static: true }) dateModifiedTemplate: TemplateRef<unknown>;
 
     constructor(
         protected readonly _injector: Injector,
@@ -81,7 +80,7 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
         this.tableColumnConfigs = [
             {
                 label: _('dossier-templates-listing.table-col-names.name'),
-                sortByKey: 'name',
+                sortByKey: 'searchKey',
                 template: this.nameTemplate
             },
             {