From 6811739c7967a5f9fd8bb62f2b62e47e14ce0430 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 10 Aug 2021 17:20:16 +0300
Subject: [PATCH] remove withSort property

---
 src/lib/tables/models/table-column-config.model.ts            | 3 +--
 .../tables/table-column-name/table-column-name.component.html | 4 ++--
 .../tables/table-column-name/table-column-name.component.ts   | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/tables/models/table-column-config.model.ts b/src/lib/tables/models/table-column-config.model.ts
index 4100bb0..b88940e 100644
--- a/src/lib/tables/models/table-column-config.model.ts
+++ b/src/lib/tables/models/table-column-config.model.ts
@@ -2,8 +2,7 @@ import { KeysOf } from '../../utils/types/utility-types';
 
 export interface TableColumnConfig<T extends object> {
     readonly label: string;
-    readonly column?: KeysOf<T>;
-    readonly withSort?: boolean;
+    readonly sortByKey?: KeysOf<T>;
     readonly class?: string;
     readonly leftIcon?: string;
     readonly rightIcon?: string;
diff --git a/src/lib/tables/table-column-name/table-column-name.component.html b/src/lib/tables/table-column-name/table-column-name.component.html
index 0e43b6e..b9331ee 100644
--- a/src/lib/tables/table-column-name/table-column-name.component.html
+++ b/src/lib/tables/table-column-name/table-column-name.component.html
@@ -1,4 +1,4 @@
-<div (click)="withSort && sortingService?.toggleSort(column)" [class.pointer]="withSort" [ngClass]="class">
+<div (click)="!!sortByKey && sortingService?.toggleSort(sortByKey)" [class.pointer]="!!sortByKey" [ngClass]="class">
     <mat-icon *ngIf="!!leftIcon" [svgIcon]="leftIcon"></mat-icon>
 
     <span class="all-caps-label">{{ label }}</span>
@@ -6,7 +6,7 @@
     <mat-icon *ngIf="!!rightIcon" [matTooltip]="rightIconTooltip" [svgIcon]="rightIcon" matTooltipPosition="above"></mat-icon>
 
     <ng-container *ngIf="sortingService?.sortingOption$ | async as sortingOption">
-        <div *ngIf="withSort" [class.force-display]="sortingOption.column === column" class="sort-arrows-container">
+        <div *ngIf="!!sortByKey" [class.force-display]="sortingOption.column === sortByKey" class="sort-arrows-container">
             <mat-icon *ngIf="sortingOption.order === sortingOrders.asc" svgIcon="iqser:sort-asc"></mat-icon>
             <mat-icon *ngIf="sortingOption.order === sortingOrders.desc" svgIcon="iqser:sort-desc"></mat-icon>
         </div>
diff --git a/src/lib/tables/table-column-name/table-column-name.component.ts b/src/lib/tables/table-column-name/table-column-name.component.ts
index f003baf..0414bac 100644
--- a/src/lib/tables/table-column-name/table-column-name.component.ts
+++ b/src/lib/tables/table-column-name/table-column-name.component.ts
@@ -4,7 +4,6 @@ import { Required } from '../../utils/decorators/required.decorator';
 import { KeysOf } from '../../utils/types/utility-types';
 import { SortingService } from '../../sorting/sorting.service';
 
-const ifNeedsSort = <T extends object>(thisArg: TableColumnNameComponent<T>) => thisArg.withSort;
 const ifHasRightIcon = <T extends object>(thisArg: TableColumnNameComponent<T>) => !!thisArg.rightIcon;
 
 @Component({
@@ -17,8 +16,7 @@ export class TableColumnNameComponent<T extends object> {
     readonly sortingOrders = SortingOrders;
 
     @Input() @Required() label!: string;
-    @Input() @Required(ifNeedsSort) column?: KeysOf<T>;
-    @Input() withSort = false;
+    @Input() sortByKey?: KeysOf<T>;
     @Input() class?: string;
     @Input() leftIcon?: string;
     @Input() rightIcon?: string;