Merge pull request #4570 from 4Science/DURACOM-383-BatchDeletingOfDSpaceObjects

Angular: Performance issue when deleting Communities, Collections, or Items with many Bitstreams

Author: tdonohue

src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts

@@ -5,31 +5,61 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { DSONameService } from '@dspace/core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '@dspace/core/data/collection-data.service';
-import { RequestService } from '@dspace/core/data/request.service';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { ProcessParameter } from '@dspace/core/processes/process-parameter.model';
 import { DSONameServiceMock } from '@dspace/core/testing/dso-name.service.mock';
+import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '@dspace/core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
+import {
+  DSPACE_OBJECT_DELETION_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
 import { DeleteCollectionPageComponent } from './delete-collection-page.component';
 
 describe('DeleteCollectionPageComponent', () => {
   let comp: DeleteCollectionPageComponent;
   let fixture: ComponentFixture<DeleteCollectionPageComponent>;
+  let scriptService;
+  let notificationService: NotificationsServiceStub;
+  let router;
+
+  const mockCollection: Collection = Object.assign(new Collection(), {
+    uuid: 'test-uuid',
+    id: 'test-uuid',
+    name: 'Test Collection',
+    type: 'collection',
+  });
 
   beforeEach(waitForAsync(() => {
+    notificationService = new NotificationsServiceStub();
+    scriptService = jasmine.createSpyObj('scriptService', {
+      invoke: createSuccessfulRemoteDataObject$({ processId: '123' }),
+    });
+    router = jasmine.createSpyObj('router', ['navigateByUrl', 'navigate']);
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, DeleteCollectionPageComponent],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: CollectionDataService, useValue: {} },
-        { provide: ActivatedRoute, useValue: { data: of({ dso: { payload: {} } }) } },
-        { provide: NotificationsService, useValue: {} },
-        { provide: RequestService, useValue: {} },
+        { provide: ActivatedRoute, useValue: { data: of({ dso: { payload: mockCollection } }) } },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useValue: router },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
@@ -41,9 +71,38 @@ describe('DeleteCollectionPageComponent', () => {
     fixture.detectChanges();
   });
 
-  describe('frontendURL', () => {
-    it('should have the right frontendURL set', () => {
-      expect((comp as any).frontendURL).toEqual('/collections/');
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should have the right frontendURL set', () => {
+    expect((comp as any).frontendURL).toEqual('/collections/');
+  });
+
+  describe('onConfirm', () => {
+    it('should invoke the deletion script with correct params, show success notification and redirect on success', (done) => {
+      const parameterValues: ProcessParameter[] = [
+        Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.uuid }),
+      ];
+      (scriptService.invoke as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ processId: '123' }));
+      comp.onConfirm(mockCollection);
+      setTimeout(() => {
+        expect(scriptService.invoke).toHaveBeenCalledWith(DSPACE_OBJECT_DELETION_SCRIPT_NAME, parameterValues, []);
+        expect(notificationService.success).toHaveBeenCalledWith('collection.delete.notification.success');
+        expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('123'));
+        done();
+      }, 0);
+    });
+
+    it('error notification is shown', (done) => {
+      (scriptService.invoke as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+      comp.onConfirm(mockCollection);
+      setTimeout(() => {
+        expect(notificationService.error).toHaveBeenCalledWith('collection.delete.notification.fail');
+        expect(router.navigate).toHaveBeenCalledWith(['/']);
+        done();
+      }, 0);
     });
   });
+
 });

src/app/collection-page/delete-collection-page/delete-collection-page.component.ts

@@ -13,6 +13,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -41,7 +42,8 @@ export class DeleteCollectionPageComponent extends DeleteComColPageComponent<Col
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
     protected translate: TranslateService,
+    protected scriptDataService: ScriptDataService,
   ) {
-    super(dsoDataService, dsoNameService, router, route, notifications, translate);
+    super(dsoDataService, dsoNameService, router, route, notifications, translate, scriptDataService);
   }
 }

src/app/community-page/delete-community-page/delete-community-page.component.spec.ts

@@ -5,31 +5,61 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { DSONameService } from '@dspace/core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '@dspace/core/data/community-data.service';
-import { RequestService } from '@dspace/core/data/request.service';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { ProcessParameter } from '@dspace/core/processes/process-parameter.model';
 import { DSONameServiceMock } from '@dspace/core/testing/dso-name.service.mock';
+import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '@dspace/core/utilities/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
+import {
+  DSPACE_OBJECT_DELETION_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
+import { Community } from '../../core/shared/community.model';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
 import { DeleteCommunityPageComponent } from './delete-community-page.component';
 
 describe('DeleteCommunityPageComponent', () => {
   let comp: DeleteCommunityPageComponent;
   let fixture: ComponentFixture<DeleteCommunityPageComponent>;
+  let scriptService;
+  let notificationService: NotificationsServiceStub;
+  let router;
+
+  const mockCommunity: Community = Object.assign(new Community(), {
+    uuid: 'test-uuid',
+    id: 'test-uuid',
+    name: 'Test Community',
+    type: 'community',
+  });
 
   beforeEach(waitForAsync(() => {
+    notificationService = new NotificationsServiceStub();
+    scriptService = jasmine.createSpyObj('scriptService', {
+      invoke: createSuccessfulRemoteDataObject$({ processId: '123' }),
+    });
+    router = jasmine.createSpyObj('router', ['navigateByUrl', 'navigate']);
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, DeleteCommunityPageComponent],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: CommunityDataService, useValue: {} },
-        { provide: ActivatedRoute, useValue: { data: of({ dso: { payload: {} } }) } },
-        { provide: NotificationsService, useValue: {} },
-        { provide: RequestService, useValue: {} },
+        { provide: ActivatedRoute, useValue: { data: of({ dso: { payload: mockCommunity } }) } },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useValue: router },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
@@ -41,9 +71,38 @@ describe('DeleteCommunityPageComponent', () => {
     fixture.detectChanges();
   });
 
-  describe('frontendURL', () => {
-    it('should have the right frontendURL set', () => {
-      expect((comp as any).frontendURL).toEqual('/communities/');
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should have the right frontendURL set', () => {
+    expect((comp as any).frontendURL).toEqual('/communities/');
+  });
+
+  describe('onConfirm', () => {
+    it('should invoke the deletion script with correct params, show success notification and redirect on success', (done) => {
+      const parameterValues: ProcessParameter[] = [
+        Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.uuid }),
+      ];
+      (scriptService.invoke as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ processId: '123' }));
+      comp.onConfirm(mockCommunity);
+      setTimeout(() => {
+        expect(scriptService.invoke).toHaveBeenCalledWith(DSPACE_OBJECT_DELETION_SCRIPT_NAME, parameterValues, []);
+        expect(notificationService.success).toHaveBeenCalledWith('community.delete.notification.success');
+        expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('123'));
+        done();
+      }, 0);
+    });
+
+    it('error notification is shown', (done) => {
+      (scriptService.invoke as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Error', 500));
+      comp.onConfirm(mockCommunity);
+      setTimeout(() => {
+        expect(notificationService.error).toHaveBeenCalledWith('community.delete.notification.fail');
+        expect(router.navigate).toHaveBeenCalledWith(['/']);
+        done();
+      }, 0);
     });
   });
+
 });

src/app/community-page/delete-community-page/delete-community-page.component.ts

@@ -13,6 +13,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
 import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -41,8 +42,9 @@ export class DeleteCommunityPageComponent extends DeleteComColPageComponent<Comm
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
     protected translate: TranslateService,
+    protected scriptDataService: ScriptDataService,
   ) {
-    super(dsoDataService, dsoNameService, router, route, notifications, translate);
+    super(dsoDataService, dsoNameService, router, route, notifications, translate, scriptDataService);
   }
 
 }

src/app/core/data/processes/script-data.service.ts

@@ -31,6 +31,7 @@ export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import';
 export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
 export const BATCH_IMPORT_SCRIPT_NAME = 'import';
 export const BATCH_EXPORT_SCRIPT_NAME = 'export';
+export const DSPACE_OBJECT_DELETION_SCRIPT_NAME = 'object-deletion';
 
 @Injectable({ providedIn: 'root' })
 export class ScriptDataService extends IdentifiableDataService<Script> implements FindAllData<Script> {

src/app/item-page/edit-item-page/item-delete/item-delete.component.html

@@ -86,7 +86,7 @@ <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
 
       <div class="space-children-mr">
         <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
-          class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+          class="btn btn-danger perform-action">{{confirmMessage | translate}}
         </button>
         <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
           class="btn btn-outline-secondary cancel">