From 4464b85f5e85e601eef461163f8c3c0ba9bcdb91 Mon Sep 17 00:00:00 2001
From: Aleksander Sklorz <Aleksander.Sklorz@hyland.com>
Date: Thu, 7 Dec 2023 15:49:45 +0100
Subject: [PATCH] ACS-6323 Unit tests and function renaming

---
 .../datatable/datatable.component.html        |  2 +-
 .../datatable/datatable.component.spec.ts     | 35 ++++++++++++++++++-
 .../datatable/datatable.component.ts          |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.html b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
index a3069b2874c..a97c6427796 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.html
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
@@ -10,7 +10,7 @@
         <adf-datatable-row
             cdkDropList
             cdkDropListOrientation="horizontal"
-            [cdkDropListSortPredicate]="sortPredicate"
+            [cdkDropListSortPredicate]="filterDisabledColumns"
             data-automation-id="datatable-row-header"
             [disabled]="!isHeaderVisible()"
             class="adf-datatable-row"
diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts
index 256d9f10e7b..17c5ae6f1dd 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts
@@ -30,7 +30,7 @@ import { DataColumnComponent } from '../../data-column/data-column.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { domSanitizerMock } from '../../../mock/dom-sanitizer-mock';
 import { matIconRegistryMock } from '../../../mock/mat-icon-registry-mock';
-import { CdkDragDrop } from '@angular/cdk/drag-drop';
+import { CdkDrag, CdkDragDrop, CdkDropList } from '@angular/cdk/drag-drop';
 import { take } from 'rxjs/operators';
 import { By } from '@angular/platform-browser';
 import { mockCarsData, mockCarsSchemaDefinition } from '../mocks/datatable.mock';
@@ -213,6 +213,13 @@ describe('DataTable', () => {
     describe('Header modes', () => {
         const newData = new ObjectDataTableAdapter([{ name: '1' }, { name: '2' }], [new ObjectDataColumn({ key: 'name' })]);
         const emptyData = new ObjectDataTableAdapter();
+        const getDropList = (): CdkDropList => {
+            dataTable.showHeader = ShowHeaderMode.Data;
+            dataTable.loading = false;
+            dataTable.data = newData;
+            fixture.detectChanges();
+            return fixture.debugElement.query(By.directive(CdkDropList)).injector.get(CdkDropList);
+        };
 
         it('should show the header if showHeader is `Data` and there is data', () => {
             dataTable.showHeader = ShowHeaderMode.Data;
@@ -285,6 +292,32 @@ describe('DataTable', () => {
             dataTable.loading = true;
             testNotShownHeader(emptyData);
         });
+
+        it('should have assigned filterDisabledColumns to sortPredicate of CdkDropList', () => {
+            expect(getDropList().sortPredicate).toBeDefined();
+        });
+
+        it('should sortPredicate from CdkDropList return true if column is enabled', () => {
+            const dropList = getDropList();
+            spyOn(dropList, 'getSortedItems').and.returnValue([{
+                disabled: true
+            }, {
+                disabled: false
+            }] as CdkDrag[]);
+
+            expect(dropList.sortPredicate(1, undefined, dropList)).toBeTrue();
+        });
+
+        it('should sortPredicate from CdkDropList return false if column is disabled', () => {
+            const dropList = getDropList();
+            spyOn(dropList, 'getSortedItems').and.returnValue([{
+                disabled: true
+            }, {
+                disabled: true
+            }] as CdkDrag[]);
+
+            expect(dropList.sortPredicate(1, undefined, dropList)).toBeFalse();
+        });
     });
 
     it('should emit "sorting-changed" DOM event', (done) => {
diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts
index 391a60a9dc3..b76d6ec6858 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.ts
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.ts
@@ -975,7 +975,7 @@ export class DataTableComponent implements OnInit, AfterContentInit, OnChanges,
         return `0 1 ${width < DataTableComponent.MINIMUM_COLUMN_SIZE ? DataTableComponent.MINIMUM_COLUMN_SIZE : width}px`;
     }
 
-    sortPredicate(index: number, _drag: CdkDrag, drop: CdkDropList): boolean {
+    filterDisabledColumns(index: number, _drag: CdkDrag, drop: CdkDropList): boolean {
         return !drop.getSortedItems()[index].disabled;
     }