Commits

Tim Donohue authored and GitHub committed eee72676691 Merge
Merge pull request #2338 from alexandrevryghem/improve-confirmation-modal_contribute-main

Made ConfirmationModalComponent more generic
No tags
gidlmaster

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

Modified
471 471
472 472 /**
473 473 * Deletes the EPerson from the Repository. The EPerson will be the only that this form is showing.
474 474 * It'll either show a success or error message depending on whether the delete was successful or not.
475 475 */
476 476 delete(): void {
477 477 this.epersonService.getActiveEPerson().pipe(
478 478 take(1),
479 479 switchMap((eperson: EPerson) => {
480 480 const modalRef = this.modalService.open(ConfirmationModalComponent);
481 - modalRef.componentInstance.dso = eperson;
481 + modalRef.componentInstance.name = this.dsoNameService.getName(eperson);
482 482 modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
483 483 modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
484 484 modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
485 485 modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm';
486 486 modalRef.componentInstance.brandColor = 'danger';
487 487 modalRef.componentInstance.confirmIcon = 'fas fa-trash';
488 488
489 489 return modalRef.componentInstance.response.pipe(
490 490 take(1),
491 491 switchMap((confirm: boolean) => {

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut