From abb284a2d607707c16f28f258a5024a19ca0033c Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Thu, 21 Mar 2024 16:33:32 +0100
Subject: [PATCH] [DURACOM-237] Fix tests

---
 src/app/shared/form/chips/chips.component.html    | 2 +-
 src/app/shared/form/chips/chips.component.spec.ts | 8 ++++----
 src/app/shared/form/chips/chips.component.ts      | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
index 4f77a5fa3b..927ca426ef 100644
--- a/src/app/shared/form/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -14,7 +14,7 @@
            (mouseout)="t.close()">
         <a class="flex-sm-fill text-sm-center nav-link active bg-info"
            cdkDrag
-           (cdkDragStarted)="onDrag($event)"
+           (cdkDragStarted)="onDrag(i)"
            href="javascript:void(0);"
            [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
            (click)="chipsSelected($event, i);">
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index bdc92370c1..d53d173d0b 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -134,18 +134,18 @@ describe('ChipsComponent test suite', () => {
     }));
 
     it('should save chips item index when drag and drop start', fakeAsync(() => {
-      const de = chipsFixture.debugElement.query(By.css('div.nav-item'));
+      const de = chipsFixture.debugElement.query(By.css('a'));
 
-      de.triggerEventHandler('dragstart', null);
+      de.triggerEventHandler('cdkDragStarted', null);
 
       expect(chipsComp.dragged).toBe(0);
     }));
 
     it('should update chips item order when drag and drop end', fakeAsync(() => {
       spyOn(chipsComp.chips, 'updateOrder');
-      const de = chipsFixture.debugElement.query(By.css('div.nav-item'));
+      const de = chipsFixture.debugElement.query(By.css('div[role="list"]'));
 
-      de.triggerEventHandler('dragend', null);
+      de.triggerEventHandler('cdkDropListDropped', { previousIndex: 0, currentIndex: 1 });
 
       expect(chipsComp.dragged).toBe(-1);
       expect(chipsComp.chips.updateOrder).toHaveBeenCalled();
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
index ae428127a8..1171e17753 100644
--- a/src/app/shared/form/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -1,7 +1,6 @@
 import {
   CdkDrag,
   CdkDragDrop,
-  CdkDragStart,
   CdkDropList,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
@@ -101,14 +100,18 @@ export class ChipsComponent implements OnChanges {
     }
   }
 
-  onDrag(event: CdkDragStart<ChipsItem[]>) {
+  onDrag(index) {
     this.isDragging.next(true);
+    this.dragged = index;
   }
+
   onDrop(event: CdkDragDrop<ChipsItem[]>) {
+    console.log('onDrop', event);
     moveItemInArray(this.chips.chipsItems.getValue(), event.previousIndex, event.currentIndex);
     this.chips.updateOrder();
     this.isDragging.next(false);
   }
+
   showTooltip(tooltip: NgbTooltip, index, field?) {
     tooltip.close();
     if (this.isDragging.value) {