From b93e228e93f950416f480b72a2d86694a9c7fab5 Mon Sep 17 00:00:00 2001 From: Pedro Braga Date: Sat, 20 Apr 2024 01:45:16 -0300 Subject: [PATCH 1/3] Update editAccountRequest parameter type to AccountRequestUpdateRequest --- .../account-request-table.component.ts | 13 ++++++++----- src/web/services/account.service.ts | 11 +---------- 2 files changed, 9 insertions(+), 15 deletions(-) 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 07ba413d77b..feb2c0fc75c 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 @@ -13,6 +13,7 @@ import { AccountService } from '../../../services/account.service'; import { SimpleModalService } from '../../../services/simple-modal.service'; import { StatusMessageService } from '../../../services/status-message.service'; import { AccountRequest, MessageOutput } from '../../../types/api-output'; +import { AccountRequestUpdateRequest } from '../../../types/api-request'; import { ErrorMessageOutput } from '../../error-message-output'; import { SimpleModalType } from '../simple-modal/simple-modal-type'; import { collapseAnim } from '../teammates-common/collapse-anim'; @@ -70,11 +71,13 @@ export class AccountRequestTableComponent { modalRef.result.then((res: EditRequestModalComponentResult) => { this.accountService.editAccountRequest( accountRequest.id, - res.accountRequestName, - res.accountRequestEmail, - res.accountRequestInstitution, - accountRequest.status, - res.accountRequestComment) + ({ + name :res.accountRequestName, + email :res.accountRequestEmail, + institute :res.accountRequestInstitution, + status :accountRequest.status, + comments :res.accountRequestComment}) + ) .subscribe({ next: (resp: AccountRequest) => { accountRequest.comments = resp.comments ?? ''; diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 35c9c238111..6b153143bdc 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -118,20 +118,11 @@ export class AccountService { /** * Edits an account request by calling API. */ - editAccountRequest(id: string, name: string, email: string, institute: string, - status: AccountRequestStatus, comments: string) + editAccountRequest(id: string, accountReqUpdateRequest: AccountRequestUpdateRequest) : Observable { const paramMap: Record = { id, }; - const accountReqUpdateRequest : AccountRequestUpdateRequest = { - name, - email, - institute, - status, - comments, - }; - return this.httpRequestService.put(ResourceEndpoints.ACCOUNT_REQUEST, paramMap, accountReqUpdateRequest); } From a715d912c15e31b779efbccda4c1f6476f92f2c4 Mon Sep 17 00:00:00 2001 From: Pedro Braga Date: Sun, 21 Apr 2024 19:09:19 -0300 Subject: [PATCH 2/3] Fixing the lint --- .../account-request-table.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 feb2c0fc75c..3e7fc957730 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 @@ -72,11 +72,12 @@ export class AccountRequestTableComponent { this.accountService.editAccountRequest( accountRequest.id, ({ - name :res.accountRequestName, - email :res.accountRequestEmail, - institute :res.accountRequestInstitution, - status :accountRequest.status, - comments :res.accountRequestComment}) + name: res.accountRequestName, + email: res.accountRequestEmail, + institute: res.accountRequestInstitution, + status: accountRequest.status, + comments: res.accountRequestComment, + }), ) .subscribe({ next: (resp: AccountRequest) => { From 8854c634e192ea74e9873ce09e28dd8487d63695 Mon Sep 17 00:00:00 2001 From: Pedro Henrique Braga de Morais Date: Mon, 22 Apr 2024 12:36:36 -0300 Subject: [PATCH 3/3] Refatoring editAccountRequest method --- src/web/services/account.service.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/web/services/account.service.ts b/src/web/services/account.service.ts index 6b153143bdc..343b28dae72 100644 --- a/src/web/services/account.service.ts +++ b/src/web/services/account.service.ts @@ -118,8 +118,7 @@ export class AccountService { /** * Edits an account request by calling API. */ - editAccountRequest(id: string, accountReqUpdateRequest: AccountRequestUpdateRequest) - : Observable { + editAccountRequest(id: string, accountReqUpdateRequest: AccountRequestUpdateRequest): Observable { const paramMap: Record = { id, };