Fix bug using splice() without specifing the number of elements to re…

…move (#6199) Signed-off-by: Giovanni Ferrari <[email protected]>
opfab · Mar 27, 2024 · 140cec8 · 140cec8
1 parent 9756ed6
commit 140cec8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/node-services/supervisor/src/domain/client-side/configService.ts b/node-services/supervisor/src/domain/client-side/configService.ts
@@ -88,7 +88,7 @@ export default class ConfigService {
             (entity) => entity.entityId === supervisedEntity.entityId
         );
         if (index >= 0) {
-            this.supervisorConfig.entitiesToSupervise.splice(index);
+            this.supervisorConfig.entitiesToSupervise.splice(index, 1);
         }
         this.supervisorConfig.entitiesToSupervise.push(supervisedEntity);
         this.save();
@@ -99,7 +99,7 @@ export default class ConfigService {
 
         const index = this.supervisorConfig.entitiesToSupervise.findIndex((entity) => entity.entityId === entityId);
         if (index >= 0) {
-            this.supervisorConfig.entitiesToSupervise.splice(index);
+            this.supervisorConfig.entitiesToSupervise.splice(index, 1);
         }
         this.save();
     }

diff --git a/node-services/supervisor/src/tests/configService.test.ts b/node-services/supervisor/src/tests/configService.test.ts
@@ -17,21 +17,23 @@ class SupervisorDatabaseServiceStub extends SupervisorDatabaseService {
     public supervisedEntities: any[] = [];
 
     public async getSupervisedEntities(): Promise<any[]> {
-        return this.supervisedEntities;
+        const supervised: any[] = [];
+        this.supervisedEntities.forEach((entity) => supervised.push(entity));
+        return supervised;
     }
 
     public async saveSupervisedEntity(supervisedEntity: any): Promise<void> {
         const index = this.supervisedEntities.findIndex((entity) => entity.entityId === supervisedEntity.entityId);
         if (index >= 0) {
-            this.supervisedEntities.splice(index);
+            this.supervisedEntities.splice(index, 1);
         }
         this.supervisedEntities.push(supervisedEntity);
     }
 
     public async deleteSupervisedEntity(id: string): Promise<void> {
         const index = this.supervisedEntities.findIndex((entity) => entity.entityId === id);
         if (index >= 0) {
-            this.supervisedEntities.splice(index);
+            this.supervisedEntities.splice(index, 1);
         }
     }
 }
@@ -124,9 +126,9 @@ describe('config service', function () {
             {entityId: 'ENTITY3', supervisors: ['ENTITY2']}
         ]);
 
-        await configService.deleteSupervisedEntity('ENTITY3');
+        await configService.deleteSupervisedEntity('ENTITY4');
         expect(configService.getSupervisorConfig().entitiesToSupervise).toEqual([
-            {entityId: 'ENTITY4', supervisors: ['ENTITY1']}
+            {entityId: 'ENTITY3', supervisors: ['ENTITY2']}
         ]);
     });
 });
diff --git a/ui/main/src/app/business/store/lightcards/lightcards-store.ts b/ui/main/src/app/business/store/lightcards/lightcards-store.ts
@@ -282,7 +282,7 @@ export class LightCardsStore {
             const children = this.childCards.get(card.parentCardId);
             if (children) {
                 const childIndex = children.findIndex((child) => child.id === card.id);
-                if (childIndex >= 0) children.splice(childIndex);
+                if (childIndex >= 0) children.splice(childIndex, 1);
                 children.push(card);
             } else {
                 this.childCards.set(card.parentCardId, [card]);
@@ -399,7 +399,7 @@ export class LightCardsStore {
         if (card?.entitiesAcks && entitiesAcksToRemove) {
             entitiesAcksToRemove.forEach((entityToRemove) => {
                 const indexToRemove = card.entitiesAcks.indexOf(entityToRemove);
-                if (indexToRemove >= 0) card.entitiesAcks.splice(indexToRemove);
+                if (indexToRemove >= 0) card.entitiesAcks.splice(indexToRemove, 1);
             });
             card.hasBeenAcknowledged = AcknowledgeService.isLightCardHasBeenAcknowledgedByUserOrByUserEntity(card);
             this.lightCardsEvents.next(this.lightCards);

diff --git a/ui/main/src/app/modules/card/components/card-ack/card-ack.component.ts b/ui/main/src/app/modules/card/components/card-ack/card-ack.component.ts
@@ -100,7 +100,7 @@ export class CardAckComponent implements OnInit, OnChanges, OnDestroy {
         if (lightcard?.entitiesAcks && entitiesAcksToRemove) {
             entitiesAcksToRemove.forEach((entityToRemove) => {
                 const indexToRemove = lightcard.entitiesAcks.indexOf(entityToRemove);
-                if (indexToRemove >= 0) lightcard.entitiesAcks.splice(indexToRemove);
+                if (indexToRemove >= 0) lightcard.entitiesAcks.splice(indexToRemove, 1);
             });
         }
         this.card = {