[#11878] Fix Rejection Modal (#13059)

TEAMMATES · Apr 19, 2024 · ba6979e · ba6979e
1 parent f8bae93
commit ba6979e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/web/app/components/account-requests-table/account-request-table.component.spec.ts b/src/web/app/components/account-requests-table/account-request-table.component.spec.ts
@@ -315,9 +315,12 @@ describe('AccountRequestTableComponent', () => {
         component.accountRequests = accountRequestResults;
         fixture.detectChanges();
 
-        const modalSpy = jest.spyOn(ngbModal, 'open').mockImplementation(() => {
-          return createMockNgbModalRef({});
-        });
+        const mockModalRef = {
+          componentInstance: {},
+          result: Promise.resolve({}),
+        };
+
+        const modalSpy = jest.spyOn(ngbModal, 'open').mockReturnValue(mockModalRef as any);
 
         const rejectButton: any = fixture.debugElement.nativeElement.querySelector('#reject-request-with-reason-0');
         rejectButton.click();

diff --git a/src/web/app/components/account-requests-table/account-request-table.component.ts b/src/web/app/components/account-requests-table/account-request-table.component.ts
@@ -3,6 +3,9 @@ import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AccountRequestTableRowModel } from './account-request-table-model';
 import { EditRequestModalComponentResult } from './admin-edit-request-modal/admin-edit-request-modal-model';
 import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component';
+import {
+  RejectWithReasonModalComponentResult,
+} from './admin-reject-with-reason-modal/admin-reject-with-reason-modal-model';
 import {
   RejectWithReasonModalComponent,
 } from './admin-reject-with-reason-modal/admin-reject-with-reason-modal.component';
@@ -173,9 +176,9 @@ export class AccountRequestTableComponent {
     modalRef.componentInstance.accountRequestName = accountRequest.name;
     modalRef.componentInstance.accountRequestEmail = accountRequest.email;
 
-    modalRef.result.then(() => {
+    modalRef.result.then((res: RejectWithReasonModalComponentResult) => {
       this.accountService.rejectAccountRequest(accountRequest.id,
-        modalRef.componentInstance.rejectionReasonTitle, modalRef.componentInstance.rejectionReasonBody)
+        res.rejectionReasonTitle, res.rejectionReasonBody)
       .subscribe({
         next: (resp: AccountRequest) => {
           accountRequest.status = resp.status;