[ACS-8604] Add new param to control undo for deleting nodes (#4308)

* [ACS-8604] Add new param to control undo for deleting nodes * [ACS-8604] Unit test fixes
Alfresco · Dec 19, 2024 · 65763df · 65763df
1 parent 53a1b2c
commit 65763df
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/projects/aca-content/src/lib/services/content-management.service.ts b/projects/aca-content/src/lib/services/content-management.service.ts
@@ -660,7 +660,7 @@ export class ContentManagementService {
       );
   }
 
-  deleteNodes(items: NodeEntry[]): void {
+  deleteNodes(items: NodeEntry[], allowUndo = true): void {
     const batch: Observable<DeletedNodeInfo>[] = [];
 
     items.forEach((node) => {
@@ -671,7 +671,7 @@ export class ContentManagementService {
       const status = this.processStatus(data);
       const message = this.getDeleteMessage(status);
 
-      if (message && status.someSucceeded) {
+      if (message && status.someSucceeded && allowUndo) {
         message.userAction = new SnackbarUserAction('APP.ACTIONS.UNDO', new UndoDeleteNodesAction([...status.success]));
       }
 

diff --git a/projects/aca-content/src/lib/store/effects/node.effects.spec.ts b/projects/aca-content/src/lib/store/effects/node.effects.spec.ts
@@ -218,9 +218,9 @@ describe('NodeEffects', () => {
       const node: any = {};
       store.dispatch(new DeleteNodesAction([node]));
 
-      expect(store.dispatch).toHaveBeenCalledWith(new DeleteNodesAction([node]));
+      expect(store.dispatch).toHaveBeenCalledWith(new DeleteNodesAction([node], true));
       expect(store.dispatch).toHaveBeenCalledWith(new ShowLoaderAction(true));
-      expect(contentService.deleteNodes).toHaveBeenCalledWith([node]);
+      expect(contentService.deleteNodes).toHaveBeenCalledWith([node], true);
     });
 
     it('should delete nodes from the active selection', fakeAsync(() => {
@@ -233,9 +233,9 @@ describe('NodeEffects', () => {
 
       store.dispatch(new DeleteNodesAction(null));
 
-      expect(store.dispatch).toHaveBeenCalledWith(new DeleteNodesAction(null));
+      expect(store.dispatch).toHaveBeenCalledWith(new DeleteNodesAction(null, true));
       expect(store.dispatch).toHaveBeenCalledWith(new ShowLoaderAction(true));
-      expect(contentService.deleteNodes).toHaveBeenCalledWith([node]);
+      expect(contentService.deleteNodes).toHaveBeenCalledWith([node], true);
     }));
 
     it('should do nothing if invoking delete with no data', () => {

diff --git a/projects/aca-content/src/lib/store/effects/node.effects.ts b/projects/aca-content/src/lib/store/effects/node.effects.ts
@@ -163,14 +163,14 @@ export class NodeEffects {
         map((action) => {
           this.store.dispatch(new ShowLoaderAction(true));
           if (action?.payload?.length > 0) {
-            this.contentService.deleteNodes(action.payload);
+            this.contentService.deleteNodes(action.payload, action.allowUndo);
           } else {
             this.store
               .select(getAppSelection)
               .pipe(take(1))
               .subscribe((selection) => {
                 if (selection && selection.count > 0) {
-                  this.contentService.deleteNodes(selection.nodes);
+                  this.contentService.deleteNodes(selection.nodes, action.allowUndo);
                 }
               });
           }

diff --git a/projects/aca-shared/store/src/actions/node.actions.ts b/projects/aca-shared/store/src/actions/node.actions.ts
@@ -60,7 +60,7 @@ export class SetSelectedNodesAction implements Action {
 export class DeleteNodesAction implements Action {
   readonly type = NodeActionTypes.Delete;
 
-  constructor(public payload: NodeEntry[] = []) {}
+  constructor(public payload: NodeEntry[] = [], public allowUndo = true) {}
 }
 
 export class UndoDeleteNodesAction implements Action {