From 7483c2b49b32631790772cd78968f2d639dee412 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 10 Aug 2021 17:21:17 +0300
Subject: [PATCH] remove withSort, rename column to sortByKey

---
 .../default-colors-screen.component.ts            |  3 +--
 .../dictionary-listing-screen.component.ts        |  6 ++----
 ...dossier-attributes-listing-screen.component.ts |  6 ++----
 .../dossier-templates-listing-screen.component.ts |  9 +++------
 .../file-attributes-listing-screen.component.ts   |  9 +++------
 .../admin/screens/trash/trash-screen.component.ts |  9 +++------
 .../dossier-listing-screen.component.ts           |  3 +--
 .../dossier-overview-screen.component.ts          | 15 +++++----------
 .../table-header/table-header.component.html      |  3 +--
 libs/common-ui                                    |  2 +-
 10 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
index d3565b06f..aff0306a4 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
@@ -30,8 +30,7 @@ export class DefaultColorsScreenComponent extends ListingComponent<ListItem> imp
     readonly tableColumnConfigs: TableColumnConfig<ListItem>[] = [
         {
             label: _('default-colors-screen.table-col-names.key'),
-            withSort: true,
-            column: 'key'
+            sortByKey: 'key'
         },
         { label: _('default-colors-screen.table-col-names.color'), class: 'flex-center' }
     ];
diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
index b8a099343..763b489b4 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
@@ -34,13 +34,11 @@ export class DictionaryListingScreenComponent extends ListingComponent<TypeValue
     readonly tableColumnConfigs: TableColumnConfig<TypeValueWrapper>[] = [
         {
             label: _('dictionary-listing.table-col-names.type'),
-            withSort: true,
-            column: 'label'
+            sortByKey: 'label'
         },
         {
             label: _('dictionary-listing.table-col-names.order-of-importance'),
-            withSort: true,
-            column: 'rank',
+            sortByKey: 'rank',
             class: 'flex-center'
         },
         {
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts
index b60c10eef..c2ead8d50 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts
@@ -25,14 +25,12 @@ export class DossierAttributesListingScreenComponent extends ListingComponent<Do
     readonly tableColumnConfigs: TableColumnConfig<DossierAttributeConfig>[] = [
         {
             label: _('dossier-attributes-listing.table-col-names.label'),
-            withSort: true,
-            column: 'label'
+            sortByKey: 'label'
         },
         { label: _('dossier-attributes-listing.table-col-names.placeholder') },
         {
             label: _('dossier-attributes-listing.table-col-names.type'),
-            withSort: true,
-            column: 'type'
+            sortByKey: 'type'
         }
     ];
 
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 cd890c435..abda7f33e 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
@@ -24,19 +24,16 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
     tableColumnConfigs: TableColumnConfig<DossierTemplateModelWrapper>[] = [
         {
             label: _('dossier-templates-listing.table-col-names.name'),
-            withSort: true,
-            column: 'name'
+            sortByKey: 'name'
         },
         { label: _('dossier-templates-listing.table-col-names.created-by'), class: 'user-column' },
         {
             label: _('dossier-templates-listing.table-col-names.created-on'),
-            withSort: true,
-            column: 'dateAdded'
+            sortByKey: 'dateAdded'
         },
         {
             label: _('dossier-templates-listing.table-col-names.modified-on'),
-            withSort: true,
-            column: 'dateModified'
+            sortByKey: 'dateModified'
         }
     ];
 
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
index 6f245c474..358e4737b 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
@@ -25,18 +25,15 @@ export class FileAttributesListingScreenComponent extends ListingComponent<FileA
     readonly tableColumnConfigs: TableColumnConfig<FileAttributeConfig>[] = [
         {
             label: _('file-attributes-listing.table-col-names.name'),
-            withSort: true,
-            column: 'label'
+            sortByKey: 'label'
         },
         {
             label: _('file-attributes-listing.table-col-names.type'),
-            withSort: true,
-            column: 'type'
+            sortByKey: 'type'
         },
         {
             label: _('file-attributes-listing.table-col-names.read-only'),
-            withSort: true,
-            column: 'editable',
+            sortByKey: 'editable',
             class: 'flex-center'
         },
         { label: _('file-attributes-listing.table-col-names.csv-column') },
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
index b10ccb54b..2e2da6bce 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
@@ -32,8 +32,7 @@ export class TrashScreenComponent extends ListingComponent<DossierListItem> impl
     readonly tableColumnConfigs: TableColumnConfig<DossierListItem>[] = [
         {
             label: _('trash.table-col-names.name'),
-            withSort: true,
-            column: 'dossierName'
+            sortByKey: 'dossierName'
         },
         {
             label: _('trash.table-col-names.owner'),
@@ -41,13 +40,11 @@ export class TrashScreenComponent extends ListingComponent<DossierListItem> impl
         },
         {
             label: _('trash.table-col-names.deleted-on'),
-            withSort: true,
-            column: 'softDeletedTime'
+            sortByKey: 'softDeletedTime'
         },
         {
             label: _('trash.table-col-names.time-to-restore'),
-            withSort: true,
-            column: 'softDeletedTime'
+            sortByKey: 'softDeletedTime'
         }
     ];
     protected readonly _primaryKey = 'dossierName';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
index fa94e8a2b..cae6b4656 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
@@ -55,8 +55,7 @@ export class DossierListingScreenComponent
     readonly tableColumnConfigs: TableColumnConfig<DossierWrapper>[] = [
         {
             label: _('dossier-listing.table-col-names.name'),
-            withSort: true,
-            column: 'dossierName'
+            sortByKey: 'dossierName'
         },
         {
             label: _('dossier-listing.table-col-names.needs-work')
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 4338f7bc2..0b0686ebc 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
@@ -54,33 +54,28 @@ export class DossierOverviewScreenComponent extends ListingComponent<FileStatusW
     readonly tableColumnConfigs: TableColumnConfig<FileStatusWrapper>[] = [
         {
             label: _('dossier-overview.table-col-names.name'),
-            withSort: true,
-            column: 'filename'
+            sortByKey: 'filename'
         },
         {
             label: _('dossier-overview.table-col-names.added-on'),
-            withSort: true,
-            column: 'added'
+            sortByKey: 'added'
         },
         {
             label: _('dossier-overview.table-col-names.needs-work')
         },
         {
             label: _('dossier-overview.table-col-names.assigned-to'),
-            withSort: true,
             class: 'user-column',
-            column: 'reviewerName'
+            sortByKey: 'reviewerName'
         },
         {
             label: _('dossier-overview.table-col-names.pages'),
-            withSort: true,
-            column: 'pages'
+            sortByKey: 'pages'
         },
         {
             label: _('dossier-overview.table-col-names.status'),
-            withSort: true,
             class: 'flex-end',
-            column: 'statusSort'
+            sortByKey: 'statusSort'
         }
     ];
     collapsedDetails = false;
diff --git a/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html b/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html
index 796907993..9f0d95c9a 100644
--- a/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/table-header/table-header.component.html
@@ -29,12 +29,11 @@
     <iqser-table-column-name
         *ngFor="let config of tableColumnConfigs"
         [class]="config.class"
-        [column]="config.column"
+        [sortByKey]="config.sortByKey"
         [label]="config.label | translate"
         [leftIcon]="config.leftIcon"
         [rightIconTooltip]="config.rightIconTooltip"
         [rightIcon]="config.rightIcon"
-        [withSort]="config.withSort"
     ></iqser-table-column-name>
 
     <div *ngIf="hasEmptyColumn"></div>
diff --git a/libs/common-ui b/libs/common-ui
index c552ed2e2..6811739c7 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit c552ed2e21d3df6fbcfe842ae85ac5a75006ab85
+Subproject commit 6811739c7967a5f9fd8bb62f2b62e47e14ce0430