From 4eef7393f87ef7331351564530cc0869a4598b1f Mon Sep 17 00:00:00 2001
From: TheDiaval <thediavall@gmail.com>
Date: Tue, 8 Oct 2019 13:03:58 +0300
Subject: [PATCH] feature(tenant-management): add abpSort pipe

---
 .../components/tenants/tenants.component.html |  8 ++--
 .../components/tenants/tenants.component.ts   | 48 ++++++++++++-------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
index 2b84c34dea..8c27fe180c 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
@@ -31,7 +31,7 @@
     </div>
     <p-table
       *ngIf="[130, 200] as columnWidths"
-      [value]="data$ | async | abpSort: sortOrder"
+      [value]="data$ | async | abpSort: sortOrder:sortKey"
       [lazy]="true"
       [lazyLoadOnInit]="false"
       [paginator]="true"
@@ -58,11 +58,9 @@
       <ng-template pTemplate="header" let-columns>
         <tr>
           <th>{{ 'AbpTenantManagement::Actions' | abpLocalization }}</th>
-          <th pResizableColumn (click)="changeSortOrder()">
+          <th pResizableColumn (click)="sortByKey('name')">
             {{ 'AbpTenantManagement::TenantName' | abpLocalization }}
-            <span class="float-right"
-              ><i [ngClass]="['fa', sortOrder === 'desc' ? 'fa-sort-desc' : 'fa-sort-asc']"></i
-            ></span>
+            <abp-sort-order-icon key="name" [selectedKey]="sortKey" [order]="sortOrder"></abp-sort-order-icon>
           </th>
         </tr>
       </ng-template>
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
index f9c90764c2..e945cc5e69 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
@@ -10,7 +10,7 @@ import {
   DeleteTenant,
   GetTenants,
   GetTenantById,
-  UpdateTenant
+  UpdateTenant,
 } from '../../actions/tenant-management.actions';
 import { TenantManagementService } from '../../services/tenant-management.service';
 import { TenantManagementState } from '../../states/tenant-management.state';
@@ -23,7 +23,7 @@ interface SelectedModalContent {
 
 @Component({
   selector: 'abp-tenants',
-  templateUrl: './tenants.component.html'
+  templateUrl: './tenants.component.html',
 })
 export class TenantsComponent {
   @Select(TenantManagementState.get)
@@ -50,15 +50,15 @@ export class TenantsComponent {
 
   _useSharedDatabase: boolean;
 
-  pageQuery: ABP.PageQueryParams = {
-    sorting: 'name'
-  };
+  pageQuery: ABP.PageQueryParams = {};
 
   loading = false;
 
   modalBusy = false;
 
-  sortOrder = 'asc';
+  sortOrder: string = '';
+
+  sortKey: string = '';
 
   get useSharedDatabase(): boolean {
     return this.defaultConnectionStringForm.get('useSharedDatabase').value;
@@ -78,7 +78,7 @@ export class TenantsComponent {
     private confirmationService: ConfirmationService,
     private tenantService: TenantManagementService,
     private fb: FormBuilder,
-    private store: Store
+    private store: Store,
   ) {}
 
   onSearch(value) {
@@ -88,14 +88,14 @@ export class TenantsComponent {
 
   private createTenantForm() {
     this.tenantForm = this.fb.group({
-      name: [this.selected.name || '', [Validators.required, Validators.maxLength(256)]]
+      name: [this.selected.name || '', [Validators.required, Validators.maxLength(256)]],
     });
   }
 
   private createDefaultConnectionStringForm() {
     this.defaultConnectionStringForm = this.fb.group({
       useSharedDatabase: this._useSharedDatabase,
-      defaultConnectionString: [this.defaultConnectionString || '']
+      defaultConnectionString: [this.defaultConnectionString || ''],
     });
   }
 
@@ -103,7 +103,7 @@ export class TenantsComponent {
     this.selectedModalContent = {
       title,
       template,
-      type
+      type,
     };
 
     this.isModalVisible = true;
@@ -117,7 +117,7 @@ export class TenantsComponent {
         switchMap(selected => {
           this.selected = selected;
           return this.tenantService.getDefaultConnectionString(id);
-        })
+        }),
       )
       .subscribe(fetchedConnectionString => {
         this._useSharedDatabase = fetchedConnectionString ? false : true;
@@ -158,7 +158,7 @@ export class TenantsComponent {
         .deleteDefaultConnectionString(this.selected.id)
         .pipe(
           take(1),
-          finalize(() => (this.modalBusy = false))
+          finalize(() => (this.modalBusy = false)),
         )
         .subscribe(() => {
           this.isModalVisible = false;
@@ -168,7 +168,7 @@ export class TenantsComponent {
         .updateDefaultConnectionString({ id: this.selected.id, defaultConnectionString: this.connectionString })
         .pipe(
           take(1),
-          finalize(() => (this.modalBusy = false))
+          finalize(() => (this.modalBusy = false)),
         )
         .subscribe(() => {
           this.isModalVisible = false;
@@ -184,7 +184,7 @@ export class TenantsComponent {
       .dispatch(
         this.selected.id
           ? new UpdateTenant({ ...this.tenantForm.value, id: this.selected.id })
-          : new CreateTenant(this.tenantForm.value)
+          : new CreateTenant(this.tenantForm.value),
       )
       .pipe(finalize(() => (this.modalBusy = false)))
       .subscribe(() => {
@@ -195,7 +195,7 @@ export class TenantsComponent {
   delete(id: string, name: string) {
     this.confirmationService
       .warn('AbpTenantManagement::TenantDeletionConfirmationMessage', 'AbpTenantManagement::AreYouSure', {
-        messageLocalizationParams: [name]
+        messageLocalizationParams: [name],
       })
       .subscribe((status: Toaster.Status) => {
         if (status === Toaster.Status.confirm) {
@@ -219,7 +219,21 @@ export class TenantsComponent {
       .subscribe();
   }
 
-  changeSortOrder() {
-    this.sortOrder = this.sortOrder.toLowerCase() === 'asc' ? 'desc' : 'asc';
+  sortByKey(sortKey: string) {
+    this.sortKey = sortKey;
+    switch (this.sortOrder) {
+      case '':
+        this.sortOrder = 'asc';
+        break;
+      case 'asc':
+        this.sortOrder = 'desc';
+        break;
+      case 'desc':
+        this.sortOrder = '';
+        this.sortKey = '';
+        break;
+      default:
+        break;
+    }
   }
 }