From 61cac20ab3b1a76069dcfbfbe37619126d4b51ab Mon Sep 17 00:00:00 2001
From: Vito <vito.albano@alfresco.com>
Date: Fri, 7 Aug 2020 09:37:40 +0100
Subject: [PATCH] Readded column key as key parameter (#5960)

* Readded column key as key parameter

* Fixed failing unit test
---
 .../src/app/components/files/filtered-search.component.ts     | 2 +-
 .../lib/document-list/components/document-list.component.ts   | 2 +-
 .../components/datatable/datatable.component.spec.ts          | 3 ++-
 .../datatable/components/datatable/datatable.component.ts     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/demo-shell/src/app/components/files/filtered-search.component.ts b/demo-shell/src/app/components/files/filtered-search.component.ts
index dec485f60e..af94304c0a 100644
--- a/demo-shell/src/app/components/files/filtered-search.component.ts
+++ b/demo-shell/src/app/components/files/filtered-search.component.ts
@@ -48,7 +48,7 @@ export class FilteredSearchComponent {
     }
 
     onSortingChanged(event) {
-        this.filterSorting = event.detail.column + '-' + event.detail.direction;
+        this.filterSorting = event.detail.key + '-' + event.detail.direction;
     }
 
 }
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts
index c33d39cbe4..a10f09bac7 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts
@@ -702,7 +702,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     }
 
     onSortingChanged(event: CustomEvent) {
-        this.orderBy = this.buildOrderByArray(event.detail.key, event.detail.direction);
+        this.orderBy = this.buildOrderByArray(event.detail.sortingKey, event.detail.direction);
         this.reload();
     }
 
diff --git a/lib/core/datatable/components/datatable/datatable.component.spec.ts b/lib/core/datatable/components/datatable/datatable.component.spec.ts
index 9a017f03db..27bee108b4 100644
--- a/lib/core/datatable/components/datatable/datatable.component.spec.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.spec.ts
@@ -290,7 +290,8 @@ describe('DataTable', () => {
         dataTable.data.setSorting(new DataSorting('name', 'desc'));
 
         fixture.nativeElement.addEventListener('sorting-changed', (event: CustomEvent) => {
-            expect(event.detail.key).toBe('displayName');
+            expect(event.detail.key).toBe('name');
+            expect(event.detail.sortingKey).toBe('displayName');
             expect(event.detail.direction).toBe('asc');
             done();
         });
diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts
index f426b62e87..2c187e9337 100644
--- a/lib/core/datatable/components/datatable/datatable.component.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.ts
@@ -771,11 +771,11 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
         this.elementRef.nativeElement.dispatchEvent(domEvent);
     }
 
-    private emitSortingChangedEvent(column: string, key: string, direction: string) {
+    private emitSortingChangedEvent(key: string, sortingKey: string, direction: string) {
         const domEvent = new CustomEvent('sorting-changed', {
             detail: {
-                column,
                 key,
+                sortingKey,
                 direction
             },
             bubbles: true