[DSC-2424] fix modal name and body missing dso name

Author: Andrea Barbasso

src/app/shared/confirmation-modal/confirmation-modal.component.html

@@ -1,18 +1,18 @@
 <div>
-  <div class="modal-header">{{ headerLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+  <div class="modal-header">{{ headerLabel | translate:{ dsoName: name } }}
     <button type="button" class="close" (click)="close()" aria-label="Close">
       <span aria-hidden="true">×</span>
     </button>
   </div>
   <div class="modal-body">
-    <p>{{ infoLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}</p>
+    <p>{{ infoLabel | translate:{ dsoName: name } }}</p>
   </div>
   <div class="modal-footer">
     <button type="button" class="cancel btn btn-outline-secondary" (click)="cancelPressed()" aria-label="Cancel">
-      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: name } }}
     </button>
     <button type="button" class="confirm btn btn-{{brandColor}}" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
-      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: name } }}
     </button>
   </div>
 </div>

src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts

@@ -132,4 +132,32 @@ describe('ConfirmationModalComponent', () => {
     });
   });
 
+  describe('displaying the name in the modal', () => {
+    const testName = 'Test Name';
+    beforeEach(() => {
+      component.name = testName;
+      component.headerLabel = `Header: ${component.name}`;
+      component.infoLabel = `Info: ${component.name}`;
+      component.cancelLabel = `Cancel: ${component.name}`;
+      component.confirmLabel = `Confirm: ${component.name}`;
+      fixture.detectChanges();
+    });
+    it('should display the name in the header', () => {
+      const header = debugElement.query(By.css('.modal-header')).nativeElement.textContent;
+      expect(header).toContain(testName);
+    });
+    it('should display the name in the body', () => {
+      const body = debugElement.query(By.css('.modal-body')).nativeElement.textContent;
+      expect(body).toContain(testName);
+    });
+    it('should display the name in the cancel button', () => {
+      const cancelBtn = debugElement.query(By.css('button.cancel')).nativeElement.textContent;
+      expect(cancelBtn).toContain(testName);
+    });
+    it('should display the name in the confirm button', () => {
+      const confirmBtn = debugElement.query(By.css('button.confirm')).nativeElement.textContent;
+      expect(confirmBtn).toContain(testName);
+    });
+  });
+
 });

src/app/shared/confirmation-modal/confirmation-modal.component.ts

@@ -8,9 +8,6 @@ import {
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-
 @Component({
   selector: 'ds-confirmation-modal',
   templateUrl: 'confirmation-modal.component.html',
@@ -28,7 +25,7 @@ export class ConfirmationModalComponent {
    */
   @Input() brandColor = 'primary';
 
-  @Input() dso: DSpaceObject;
+  @Input() name: string;
 
   /**
    * An event fired when the cancel or confirm button is clicked, with respectively false or true
@@ -38,7 +35,6 @@ export class ConfirmationModalComponent {
 
   constructor(
     protected activeModal: NgbActiveModal,
-    public dsoNameService: DSONameService,
   ) {
   }
 

src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts

@@ -24,6 +24,7 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import {
   COLLECTION_EXPORT_SCRIPT_NAME,
   ScriptDataService,
@@ -65,7 +66,8 @@ export class ExportMetadataXlsSelectorComponent extends DSOSelectorModalWrapperC
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router,
               protected notificationsService: NotificationsService, protected translationService: TranslateService,
               protected scriptDataService: ScriptDataService,
-              private modalService: NgbModal) {
+              private modalService: NgbModal,
+              private dsoNameService: DSONameService) {
     super(activeModal, route);
   }
 
@@ -76,7 +78,7 @@ export class ExportMetadataXlsSelectorComponent extends DSOSelectorModalWrapperC
   navigate(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Collection) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata-xls.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata-xls.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata-xls.cancel';