From 0e631fb7c4146adbb7a83fb78bf1f09a2fec94d1 Mon Sep 17 00:00:00 2001 From: domoberzin Date: Mon, 1 Apr 2024 13:46:42 +0800 Subject: [PATCH 1/8] add edit and approve functionality --- .../account-request-table.component.html | 8 ++- .../account-request-table.component.ts | 46 ++++++++++++++- .../account-request-table.module.ts | 4 ++ .../admin-edit-request-modal-model.ts | 9 +++ .../admin-edit-request-modal.component.html | 35 ++++++++++++ .../admin-edit-request-modal.component.scss | 0 .../admin-edit-request-modal.component.ts | 40 +++++++++++++ src/web/services/account.service.ts | 57 ++++++++++++++++++- 8 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.scss create mode 100644 src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html index 2959ee3b480..dd35bbb0082 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.html +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -51,6 +51,11 @@
+
+ + + +
@@ -64,7 +69,8 @@
-
+ +
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 index dc3ef132795..b56c0493923 100755 --- 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 @@ -1,6 +1,7 @@ import { Component, Input } from '@angular/core'; -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableRowModel } from './account-request-table-model'; +import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; @@ -31,6 +32,7 @@ export class AccountRequestTableComponent { private statusMessageService: StatusMessageService, private simpleModalService: SimpleModalService, private accountService: AccountService, + private ngbModal: NgbModal, ) {} /** @@ -51,6 +53,48 @@ export class AccountRequestTableComponent { } } + editAccountRequest(accountRequest: AccountRequestTableRowModel): void { + const modalRef: NgbModalRef = this.ngbModal.open(EditRequestModalComponent); + modalRef.componentInstance.accountRequestName = accountRequest.name; + modalRef.componentInstance.accountRequestEmail = accountRequest.email; + modalRef.componentInstance.accountRequestInstitution = accountRequest.instituteAndCountry; + modalRef.componentInstance.accountRequestComment = accountRequest.comments; + + modalRef.result.then(() => { + this.accountService.editAccountRequest( + accountRequest.id, + modalRef.componentInstance.accountRequestName, + modalRef.componentInstance.accountRequestEmail, + modalRef.componentInstance.accountRequestInstitution, + modalRef.componentInstance.accountRequestComment) + .subscribe({ + next: (resp: MessageOutput) => { + this.statusMessageService.showSuccessToast(resp.message); + accountRequest.comments = modalRef.componentInstance.accountRequestComment; + accountRequest.name = modalRef.componentInstance.accountRequestName; + accountRequest.email = modalRef.componentInstance.accountRequestEmail; + accountRequest.instituteAndCountry = modalRef.componentInstance.accountRequestInstitution; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + }); + } + + approveAccountRequest(accountRequest: AccountRequestTableRowModel): void { + this.accountService.approveAccountRequest(accountRequest.id, accountRequest.name, + accountRequest.email, accountRequest.instituteAndCountry, accountRequest.comments) + .subscribe({ + next: () => { + accountRequest.status = 'APPROVED'; + }, + error: (resp: ErrorMessageOutput) => { + this.statusMessageService.showErrorToast(resp.error.message); + }, + }); + } + resetAccountRequest(accountRequest: AccountRequestTableRowModel): void { const modalContent = `Are you sure you want to reset the account request for ${accountRequest.name} with email ${accountRequest.email} from diff --git a/src/web/app/components/account-requests-table/account-request-table.module.ts b/src/web/app/components/account-requests-table/account-request-table.module.ts index 1a05086cc4b..f0177f5fdc2 100644 --- a/src/web/app/components/account-requests-table/account-request-table.module.ts +++ b/src/web/app/components/account-requests-table/account-request-table.module.ts @@ -3,7 +3,9 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { NgbTooltipModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { AccountRequestTableComponent } from './account-request-table.component'; +import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit-request-modal.component'; import { Pipes } from '../../pipes/pipes.module'; +import { RichTextEditorModule } from '../rich-text-editor/rich-text-editor.module'; /** * Module for account requests table. @@ -11,6 +13,7 @@ import { Pipes } from '../../pipes/pipes.module'; @NgModule({ declarations: [ AccountRequestTableComponent, + EditRequestModalComponent, ], exports: [ AccountRequestTableComponent, @@ -21,6 +24,7 @@ import { Pipes } from '../../pipes/pipes.module'; NgbTooltipModule, NgbDropdownModule, Pipes, + RichTextEditorModule, ], }) export class AccountRequestTableModule { } diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts new file mode 100644 index 00000000000..9d5a2ecea2c --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal-model.ts @@ -0,0 +1,9 @@ +/** + * Result of {@link EditRequestModalComponent} + */ +export interface EditRequestModalComponentResult { + accountRequestName: string; + accountRequestEmail: string; + accountRequestInstitution: string; + accountRequestComment: string; +} diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html new file mode 100644 index 00000000000..340901f756c --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html @@ -0,0 +1,35 @@ +
+
+
Edit Account Request for {{ accountRequestName }}
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+
+ +
+
+
+ + +
+ diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.scss b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts new file mode 100644 index 00000000000..95df60a261a --- /dev/null +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts @@ -0,0 +1,40 @@ +import { Component, Input } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { EditRequestModalComponentResult } from './admin-edit-request-modal-model'; + +/** + * Modal to select reject account requests with reason. + */ +@Component({ + selector: 'tm-edit-request-modal', + templateUrl: './admin-edit-request-modal.component.html', + styleUrls: ['./admin-edit-request-modal.component.scss'], +}) + +export class EditRequestModalComponent { + + @Input() + accountRequestName: string = ''; + @Input() + accountRequestEmail: string = ''; + @Input() + accountRequestInstitution: string = ''; + @Input() + accountRequestComment: string = ''; + + constructor(public activeModal: NgbActiveModal) {} + + /** + * Fires the edit event. + */ + edit(): void { + const result: EditRequestModalComponentResult = { + accountRequestName: this.accountRequestName, + accountRequestEmail: this.accountRequestEmail, + accountRequestInstitution: this.accountRequestInstitution, + accountRequestComment: this.accountRequestComment, + }; + + this.activeModal.close(result); + } +} diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 8877da6ec29..47f061e63ef 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -11,7 +11,7 @@ import { MessageOutput, AccountRequestStatus, } from '../types/api-output'; -import { AccountCreateRequest } from '../types/api-request'; +import { AccountCreateRequest, AccountRequestUpdateRequest } from '../types/api-request'; /** * Handles account related logic provision @@ -95,6 +95,61 @@ export class AccountService { return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_RESET, paramMap); } + /** + * Approves account request by calling API + */ + approveAccountRequest(id: string, name: string, email: string, institute: string, comments:string) + : Observable { + const paramMap: Record = { + id, + }; + const accountReqUpdateRequest : AccountRequestUpdateRequest = { + name, + email, + institute, + comments, + status: AccountRequestStatus.APPROVED, + }; + + return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); + } + + /** + * Rejects an account request by calling API. + */ + rejectAccountRequest(name: string, email: string, institute: string, comments:string, + title?: string, reason?: string): Observable { + const accountReqUpdateRequest : AccountRequestUpdateRequest = { + name, + email, + institute, + comments, + status: AccountRequestStatus.REJECTED, + rejectionTitle: title, + rejectionReason: reason, + }; + + return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, {}, accountReqUpdateRequest); + } + + /** + * Edits an account request by calling API. + */ + editAccountRequest(id: string, name: string, email: string, institute: string, comments: string) + : Observable { + const paramMap: Record = { + id, + }; + const accountReqUpdateRequest : AccountRequestUpdateRequest = { + name, + email, + institute, + comments, + }; + + return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); + } + /** * Gets an account by calling API. */ From 1d00670fed586a8a69ac6de8526da1b6b2c7f3e0 Mon Sep 17 00:00:00 2001 From: domoberzin Date: Mon, 1 Apr 2024 13:46:42 +0800 Subject: [PATCH 2/8] remove rejection code --- src/web/services/account.service.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 47f061e63ef..dc742c87311 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -114,24 +114,6 @@ export class AccountService { return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); } - /** - * Rejects an account request by calling API. - */ - rejectAccountRequest(name: string, email: string, institute: string, comments:string, - title?: string, reason?: string): Observable { - const accountReqUpdateRequest : AccountRequestUpdateRequest = { - name, - email, - institute, - comments, - status: AccountRequestStatus.REJECTED, - rejectionTitle: title, - rejectionReason: reason, - }; - - return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, {}, accountReqUpdateRequest); - } - /** * Edits an account request by calling API. */ From 8cf8204d5224521017124259eeba19c78e6ce43d Mon Sep 17 00:00:00 2001 From: domoberzin Date: Mon, 1 Apr 2024 13:46:42 +0800 Subject: [PATCH 3/8] fix snap --- .../admin-search-page.component.spec.ts.snap | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap index 2ffcc3759be..69c6af06b03 100644 --- a/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap +++ b/src/web/app/pages-admin/admin-search-page/__snapshots__/admin-search-page.component.spec.ts.snap @@ -507,6 +507,16 @@ exports[`AdminSearchPageComponent should snap with an expanded account requests
+
+ + + +
@@ -529,6 +539,12 @@ exports[`AdminSearchPageComponent should snap with an expanded account requests />
+
From e6f1f40e3bfb7958bc5361e3516ee3e28214b5b1 Mon Sep 17 00:00:00 2001 From: domoberzin Date: Fri, 5 Apr 2024 21:21:00 +0800 Subject: [PATCH 4/8] integrate endpoint --- .../account-request-table-model.ts | 4 +++- .../account-request-table.component.ts | 18 +++++++++--------- .../admin-edit-request-modal.component.html | 2 +- src/web/services/account.service.ts | 9 +++++---- src/web/services/search.service.ts | 5 +++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/web/app/components/account-requests-table/account-request-table-model.ts b/src/web/app/components/account-requests-table/account-request-table-model.ts index b2a088e8b40..1dc11a3b43c 100644 --- a/src/web/app/components/account-requests-table/account-request-table-model.ts +++ b/src/web/app/components/account-requests-table/account-request-table-model.ts @@ -1,3 +1,5 @@ +import { AccountRequestStatus } from 'src/web/types/api-output'; + /** * Model for the row entries in the account requests table. */ @@ -5,7 +7,7 @@ export interface AccountRequestTableRowModel { id: string; name: string; email: string; - status: string; + status: AccountRequestStatus; instituteAndCountry: string; createdAtText: string; registeredAtText: string; 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 index b56c0493923..29d3d1783de 100755 --- 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 @@ -5,7 +5,7 @@ import { EditRequestModalComponent } from './admin-edit-request-modal/admin-edit import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; -import { MessageOutput } from '../../../types/api-output'; +import { AccountRequest, AccountRequestStatus, MessageOutput } from '../../../types/api-output'; import { ErrorMessageOutput } from '../../error-message-output'; import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { collapseAnim } from '../teammates-common/collapse-anim'; @@ -66,14 +66,14 @@ export class AccountRequestTableComponent { modalRef.componentInstance.accountRequestName, modalRef.componentInstance.accountRequestEmail, modalRef.componentInstance.accountRequestInstitution, + accountRequest.status, modalRef.componentInstance.accountRequestComment) .subscribe({ - next: (resp: MessageOutput) => { - this.statusMessageService.showSuccessToast(resp.message); - accountRequest.comments = modalRef.componentInstance.accountRequestComment; - accountRequest.name = modalRef.componentInstance.accountRequestName; - accountRequest.email = modalRef.componentInstance.accountRequestEmail; - accountRequest.instituteAndCountry = modalRef.componentInstance.accountRequestInstitution; + next: (resp: AccountRequest) => { + accountRequest.comments = resp.comments ?? ''; + accountRequest.name = resp.name; + accountRequest.email = resp.email; + accountRequest.instituteAndCountry = resp.institute; }, error: (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); @@ -84,10 +84,10 @@ export class AccountRequestTableComponent { approveAccountRequest(accountRequest: AccountRequestTableRowModel): void { this.accountService.approveAccountRequest(accountRequest.id, accountRequest.name, - accountRequest.email, accountRequest.instituteAndCountry, accountRequest.comments) + accountRequest.email, accountRequest.instituteAndCountry) .subscribe({ next: () => { - accountRequest.status = 'APPROVED'; + accountRequest.status = AccountRequestStatus.APPROVED; }, error: (resp: ErrorMessageOutput) => { this.statusMessageService.showErrorToast(resp.error.message); diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html index 340901f756c..3111e689e4b 100644 --- a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html @@ -23,7 +23,7 @@
- +
diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index dc742c87311..e6227ab7148 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -98,7 +98,7 @@ export class AccountService { /** * Approves account request by calling API */ - approveAccountRequest(id: string, name: string, email: string, institute: string, comments:string) + approveAccountRequest(id: string, name: string, email: string, institute: string) : Observable { const paramMap: Record = { id, @@ -107,7 +107,6 @@ export class AccountService { name, email, institute, - comments, status: AccountRequestStatus.APPROVED, }; @@ -117,8 +116,9 @@ export class AccountService { /** * Edits an account request by calling API. */ - editAccountRequest(id: string, name: string, email: string, institute: string, comments: string) - : Observable { + editAccountRequest(id: string, name: string, email: string, institute: string, + status: AccountRequestStatus, comments: string) + : Observable { const paramMap: Record = { id, }; @@ -126,6 +126,7 @@ export class AccountService { name, email, institute, + status, comments, }; diff --git a/src/web/services/search.service.ts b/src/web/services/search.service.ts index fbd95617779..be19f3cd277 100644 --- a/src/web/services/search.service.ts +++ b/src/web/services/search.service.ts @@ -11,6 +11,7 @@ import { ResourceEndpoints } from '../types/api-const'; import { AccountRequest, AccountRequests, + AccountRequestStatus, Course, FeedbackSession, FeedbackSessions, Instructor, @@ -307,7 +308,7 @@ export class SearchService { registeredAtText: '', registrationLink: '', showLinks: false, - status: '', + status: AccountRequestStatus.PENDING, comments: '', }; @@ -474,7 +475,7 @@ export interface AccountRequestSearchResult { id: string; name: string; email: string; - status: string; + status: AccountRequestStatus; institute: string; createdAtText: string; registeredAtText: string | null; From d8a8f2b511ea17a7b9b9537f43812d229a8f630e Mon Sep 17 00:00:00 2001 From: domoberzin Date: Fri, 5 Apr 2024 21:36:48 +0800 Subject: [PATCH 5/8] disable approve button for approved requests --- .../account-requests-table/account-request-table.component.html | 2 +- .../admin-edit-request-modal.component.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html index dd35bbb0082..b2dbd871852 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.html +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -69,7 +69,7 @@
- +
diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html index 3111e689e4b..a5a66887899 100644 --- a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html @@ -32,4 +32,3 @@
Save - From 6b65e1dad693eaf6bdb73bfad23137b3d912e829 Mon Sep 17 00:00:00 2001 From: domoberzin Date: Fri, 5 Apr 2024 21:43:45 +0800 Subject: [PATCH 6/8] use comments instead of comment --- .../account-request-table.component.html | 2 +- .../account-requests-table/account-request-table.component.ts | 4 ++-- .../admin-edit-request-modal.component.html | 2 +- .../admin-edit-request-modal.component.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/web/app/components/account-requests-table/account-request-table.component.html b/src/web/app/components/account-requests-table/account-request-table.component.html index b2dbd871852..7da84774a38 100644 --- a/src/web/app/components/account-requests-table/account-request-table.component.html +++ b/src/web/app/components/account-requests-table/account-request-table.component.html @@ -69,7 +69,7 @@
- + 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 index 29d3d1783de..86613fae493 100755 --- 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 @@ -58,7 +58,7 @@ export class AccountRequestTableComponent { modalRef.componentInstance.accountRequestName = accountRequest.name; modalRef.componentInstance.accountRequestEmail = accountRequest.email; modalRef.componentInstance.accountRequestInstitution = accountRequest.instituteAndCountry; - modalRef.componentInstance.accountRequestComment = accountRequest.comments; + modalRef.componentInstance.accountRequestComments = accountRequest.comments; modalRef.result.then(() => { this.accountService.editAccountRequest( @@ -67,7 +67,7 @@ export class AccountRequestTableComponent { modalRef.componentInstance.accountRequestEmail, modalRef.componentInstance.accountRequestInstitution, accountRequest.status, - modalRef.componentInstance.accountRequestComment) + modalRef.componentInstance.accountRequestComments) .subscribe({ next: (resp: AccountRequest) => { accountRequest.comments = resp.comments ?? ''; diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html index a5a66887899..a2f65852529 100644 --- a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.html @@ -23,7 +23,7 @@
- +
diff --git a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts index 95df60a261a..42b4aec7032 100644 --- a/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts +++ b/src/web/app/components/account-requests-table/admin-edit-request-modal/admin-edit-request-modal.component.ts @@ -20,7 +20,7 @@ export class EditRequestModalComponent { @Input() accountRequestInstitution: string = ''; @Input() - accountRequestComment: string = ''; + accountRequestComments: string = ''; constructor(public activeModal: NgbActiveModal) {} @@ -32,7 +32,7 @@ export class EditRequestModalComponent { accountRequestName: this.accountRequestName, accountRequestEmail: this.accountRequestEmail, accountRequestInstitution: this.accountRequestInstitution, - accountRequestComment: this.accountRequestComment, + accountRequestComment: this.accountRequestComments, }; this.activeModal.close(result); From 2c7cc36e9bbd52ada10fe5d03f369a2be164550c Mon Sep 17 00:00:00 2001 From: domoberzin Date: Fri, 5 Apr 2024 22:36:05 +0800 Subject: [PATCH 7/8] use searchString instead of searchQuery --- .../admin-search-page/admin-search-page.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html index e6573dbff76..8084c47362c 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.html @@ -203,4 +203,4 @@
- + From c8a44cd7d2f03d61f3014a23565fca3b4b7e03d1 Mon Sep 17 00:00:00 2001 From: domoberzin Date: Fri, 5 Apr 2024 22:41:08 +0800 Subject: [PATCH 8/8] fix snap --- .../admin-search-page/admin-search-page.component.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts index 9d0be53a7fd..678d0d13976 100644 --- a/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts +++ b/src/web/app/pages-admin/admin-search-page/admin-search-page.component.spec.ts @@ -495,7 +495,7 @@ describe('AdminSearchPageComponent', () => { it('should show account request links when expand all button clicked', () => { const accountRequestResult: AccountRequestTableRowModel = DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT; component.accountRequests = [accountRequestResult]; - component.searchQuery = 'test'; // To show the account request table + component.searchString = 'test'; // To show the account request table fixture.detectChanges(); const button: any = fixture.debugElement.nativeElement.querySelector('#show-account-request-links'); @@ -961,7 +961,7 @@ describe('AdminSearchPageComponent', () => { it('should show error message when resetting account request is unsuccessful', () => { component.accountRequests = [DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT]; component.accountRequests[0].registeredAtText = 'Wed, 09 Feb 2022, 10:23 AM +00:00'; - component.searchQuery = 'test'; + component.searchString = 'test'; fixture.detectChanges(); jest.spyOn(ngbModal, 'open').mockImplementation(() => { @@ -988,7 +988,7 @@ describe('AdminSearchPageComponent', () => { it('should show success message when resetting account request is successful', () => { component.accountRequests = [DEFAULT_ACCOUNT_REQUEST_SEARCH_RESULT]; component.accountRequests[0].registeredAtText = 'Wed, 09 Feb 2022, 10:23 AM +00:00'; - component.searchQuery = 'test'; + component.searchString = 'test'; fixture.detectChanges(); jest.spyOn(ngbModal, 'open').mockImplementation(() => {