From faf38e0d8a4beeb6386f1544b8d68f0d72390fde Mon Sep 17 00:00:00 2001 From: Katelyn Grimes Date: Fri, 8 May 2026 13:47:16 -0400 Subject: [PATCH] Remove extra pending statuses in ASR --- .../additionalSalaryRequest/index.page.tsx | 4 --- .../AdditionalSalaryRequest.graphql | 4 --- .../AdditionalSalaryRequest.test.tsx | 10 ++---- .../MainPages/EligibleDisplay.test.tsx | 12 +++---- .../Shared/AdditionalSalaryRequestContext.tsx | 7 +--- .../Shared/Helper/getDotColor.test.ts | 10 ++---- .../Shared/Helper/getDotVariant.test.ts | 12 +++---- .../SharedComponents/CurrentRequest.test.tsx | 35 +++++++------------ 8 files changed, 25 insertions(+), 69 deletions(-) diff --git a/pages/accountLists/[accountListId]/hrTools/additionalSalaryRequest/index.page.tsx b/pages/accountLists/[accountListId]/hrTools/additionalSalaryRequest/index.page.tsx index fd412a3eff..522f682cae 100644 --- a/pages/accountLists/[accountListId]/hrTools/additionalSalaryRequest/index.page.tsx +++ b/pages/accountLists/[accountListId]/hrTools/additionalSalaryRequest/index.page.tsx @@ -64,10 +64,6 @@ const AdditionalSalaryRequestRouter: React.FC = () => { switch (requestData.latestAdditionalSalaryRequest?.status) { case AsrStatusEnum.ActionRequired: case AsrStatusEnum.Pending: - case AsrStatusEnum.PendingDivisionHeadApproval: - case AsrStatusEnum.PendingVpApproval: - case AsrStatusEnum.PendingManagementApproval: - case AsrStatusEnum.PendingBoardApproval: case AsrStatusEnum.ApprovedNotPaid: // ActionRequired normally returns the component accept when pageType is View or Edit return pageType === PageEnum.Edit || pageType === PageEnum.View ? ( diff --git a/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.graphql b/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.graphql index 1f1b81e1a1..75046686f1 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.graphql +++ b/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.graphql @@ -56,10 +56,6 @@ query AdditionalSalaryRequest($isSpouse: Boolean) { IN_PROGRESS ACTION_REQUIRED PENDING - PENDING_DIVISION_HEAD_APPROVAL - PENDING_VP_APPROVAL - PENDING_MANAGEMENT_APPROVAL - PENDING_BOARD_APPROVAL APPROVED_NOT_PAID APPROVED_AND_PAID ] diff --git a/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.test.tsx b/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.test.tsx index 162d2be6aa..7faa9fabfb 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.test.tsx +++ b/src/components/HrTools/AdditionalSalaryRequest/AdditionalSalaryRequest.test.tsx @@ -148,16 +148,10 @@ describe('AdditionalSalaryRequest', () => { expect(queryByText(/currently has a pending request/i)).toBeNull(); }); - it.each([ - AsrStatusEnum.Pending, - AsrStatusEnum.PendingDivisionHeadApproval, - AsrStatusEnum.PendingVpApproval, - AsrStatusEnum.PendingManagementApproval, - AsrStatusEnum.PendingBoardApproval, - ])('displays pending request message when status is %s', async (status) => { + it('displays pending request message when status is Pending', async () => { const pendingRequest = { ...mockRequest, - status, + status: AsrStatusEnum.Pending, submittedAt: '2024-01-15T00:00:00Z', }; diff --git a/src/components/HrTools/AdditionalSalaryRequest/MainPages/EligibleDisplay.test.tsx b/src/components/HrTools/AdditionalSalaryRequest/MainPages/EligibleDisplay.test.tsx index 29021050d8..56433433ab 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/MainPages/EligibleDisplay.test.tsx +++ b/src/components/HrTools/AdditionalSalaryRequest/MainPages/EligibleDisplay.test.tsx @@ -70,14 +70,10 @@ const TestWrapper: React.FC = ({ }; describe('EligibleDisplay', () => { - it.each([ - AsrStatusEnum.Pending, - AsrStatusEnum.PendingDivisionHeadApproval, - AsrStatusEnum.PendingVpApproval, - AsrStatusEnum.PendingManagementApproval, - AsrStatusEnum.PendingBoardApproval, - ])('renders relevant pending messages - %s', async (status) => { - const { findByText } = render(); + it('renders relevant pending messages', async () => { + const { findByText } = render( + , + ); expect( await findByText('Your Additional Salary Request'), diff --git a/src/components/HrTools/AdditionalSalaryRequest/Shared/AdditionalSalaryRequestContext.tsx b/src/components/HrTools/AdditionalSalaryRequest/Shared/AdditionalSalaryRequestContext.tsx index a3829527d1..9fef2bc182 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/Shared/AdditionalSalaryRequestContext.tsx +++ b/src/components/HrTools/AdditionalSalaryRequest/Shared/AdditionalSalaryRequestContext.tsx @@ -186,12 +186,7 @@ export const AdditionalSalaryRequestProvider: React.FC = ({ }); const status = requestData?.latestAdditionalSalaryRequest?.status; - const isPending = - status === AsrStatusEnum.Pending || - status === AsrStatusEnum.PendingDivisionHeadApproval || - status === AsrStatusEnum.PendingVpApproval || - status === AsrStatusEnum.PendingManagementApproval || - status === AsrStatusEnum.PendingBoardApproval; + const isPending = status === AsrStatusEnum.Pending; const isApproved = status === AsrStatusEnum.ApprovedNotPaid || status === AsrStatusEnum.ApprovedAndPaid; diff --git a/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotColor.test.ts b/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotColor.test.ts index 2cf58cd1fc..135903e2dc 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotColor.test.ts +++ b/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotColor.test.ts @@ -3,14 +3,8 @@ import { getDotColor } from './getDotColor'; describe('getDotColor', () => { describe('submitted step', () => { - it.each([ - AsrStatusEnum.Pending, - AsrStatusEnum.PendingDivisionHeadApproval, - AsrStatusEnum.PendingVpApproval, - AsrStatusEnum.PendingManagementApproval, - AsrStatusEnum.PendingBoardApproval, - ])('returns success.main when status is not InProgress - %s', (status) => { - expect(getDotColor(status, 'submitted', true, false)).toBe( + it('returns success.main when status is Pending', () => { + expect(getDotColor(AsrStatusEnum.Pending, 'submitted', true, false)).toBe( 'success.main', ); }); diff --git a/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotVariant.test.ts b/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotVariant.test.ts index e98ccd8790..b121ef4340 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotVariant.test.ts +++ b/src/components/HrTools/AdditionalSalaryRequest/Shared/Helper/getDotVariant.test.ts @@ -57,14 +57,10 @@ describe('getDotVariant', () => { }); }); describe('with Pending status', () => { - it.each([ - AsrStatusEnum.Pending, - AsrStatusEnum.PendingDivisionHeadApproval, - AsrStatusEnum.PendingVpApproval, - AsrStatusEnum.PendingManagementApproval, - AsrStatusEnum.PendingBoardApproval, - ])('returns filled with step submitted - %s', (status) => { - expect(getDotVariant(status, 'submitted', true, false)).toBe('filled'); + it('returns filled with step submitted', () => { + expect( + getDotVariant(AsrStatusEnum.Pending, 'submitted', true, false), + ).toBe('filled'); }); it('returns filled with step processed', () => { diff --git a/src/components/HrTools/AdditionalSalaryRequest/SharedComponents/CurrentRequest.test.tsx b/src/components/HrTools/AdditionalSalaryRequest/SharedComponents/CurrentRequest.test.tsx index ce68c2823f..52d0b16ff8 100644 --- a/src/components/HrTools/AdditionalSalaryRequest/SharedComponents/CurrentRequest.test.tsx +++ b/src/components/HrTools/AdditionalSalaryRequest/SharedComponents/CurrentRequest.test.tsx @@ -161,29 +161,18 @@ describe('CurrentRequest', () => { }); describe('timeline status - Pending', () => { - it.each([ - AsrStatusEnum.Pending, - AsrStatusEnum.PendingDivisionHeadApproval, - AsrStatusEnum.PendingVpApproval, - AsrStatusEnum.PendingManagementApproval, - AsrStatusEnum.PendingBoardApproval, - ])( - 'displays "Requested on:" with date for submitted requests - %s', - (status) => { - const pendingRequest: RequestType = { - ...mockRequest, - status, - submittedAt: '2025-06-10T00:00:00.000Z', - }; - - const { getByText } = render( - , - ); - - expect(getByText('Requested on:')).toBeInTheDocument(); - expect(getByText(/Jun 10, 2025/)).toBeInTheDocument(); - }, - ); + it('displays "Requested on:" with date for submitted requests', () => { + const pendingRequest: RequestType = { + ...mockRequest, + status: AsrStatusEnum.Pending, + submittedAt: '2025-06-10T00:00:00.000Z', + }; + + const { getByText } = render(); + + expect(getByText('Requested on:')).toBeInTheDocument(); + expect(getByText(/Jun 10, 2025/)).toBeInTheDocument(); + }); it('displays "Request In Process" for pending status', () => { const pendingRequest: RequestType = {