Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ fragment AdditionalSalaryRequestDetailsFields on AdditionalSalaryRequest {
}
}

query AdditionalSalaryRequest {
query AdditionalSalaryRequest($isSpouse: Boolean) {
latestAdditionalSalaryRequest(
status: [IN_PROGRESS, ACTION_REQUIRED, PENDING]
isSpouse: $isSpouse
) {
...AdditionalSalaryRequestDetailsFields
createdAt
Expand All @@ -70,8 +71,11 @@ query AdditionalSalaryRequest {

mutation CreateAdditionalSalaryRequest(
$attributes: AdditionalSalaryRequestAttributesInput
$isSpouse: Boolean
) {
createAdditionalSalaryRequest(input: { attributes: $attributes }) {
createAdditionalSalaryRequest(
input: { attributes: $attributes, isSpouse: $isSpouse }
) {
additionalSalaryRequest {
...AdditionalSalaryRequestDetailsFields
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ jest.mock('notistack', () => ({

interface TestComponentProps {
withSpouse?: boolean;
isSpouse?: boolean;
}

const TestComponent: React.FC<TestComponentProps> = ({
withSpouse = false,
isSpouse = false,
}) => {
const hcmData = {
hcm: withSpouse
Expand Down Expand Up @@ -68,7 +70,13 @@ const TestComponent: React.FC<TestComponentProps> = ({
return (
<ThemeProvider theme={theme}>
<TestRouter
router={{ query: { accountListId: 'account-list-1' }, push: mockPush }}
router={{
query: {
accountListId: 'account-list-1',
...(isSpouse ? { isSpouse: 'true' } : {}),
},
push: mockPush,
}}
>
<SnackbarProvider>
<GqlMockedProvider
Expand Down Expand Up @@ -142,4 +150,24 @@ describe('InProgressDisplay', () => {
);
});
});

describe('isSpouse=true', () => {
it('renders "Switch back to" link text when isSpouse is true', async () => {
const { findByText } = render(<TestComponent withSpouse isSpouse />);

expect(await findByText('Switch back to John')).toBeInTheDocument();
});

it('generates correct link URL without isSpouse query param', async () => {
const { findByRole } = render(<TestComponent withSpouse isSpouse />);

const link = await findByRole('link', {
name: /Switch back to John/,
});
expect(link).toHaveAttribute(
'href',
'/accountLists/account-list-1/reports/additionalSalaryRequest',
);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import {
PanelTypeEnum,
} from '../../../Shared/CalculationReports/Shared/sharedTypes';
import { useAdditionalSalaryRequest } from '../../Shared/AdditionalSalaryRequestContext';

// TODO: Implement spouse request link
import { useSpouseLink } from '../../Shared/useSpouseLink';

const InProgressMainContent: React.FC = () => {
const { t } = useTranslation();

const { handleDeleteRequest, requestId, spouse, setPageType, goToStep } =
useAdditionalSalaryRequest();
const { spouseLinkText, spouseLinkHref } = useSpouseLink();

return (
<>
Expand Down Expand Up @@ -54,9 +54,7 @@ const InProgressMainContent: React.FC = () => {
color: 'rgba(0, 0, 0, 0.54)',
}}
/>
<Link>
{t(`Request additional salary for ${spouse.staffInfo.firstName}`)}
</Link>
<Link href={spouseLinkHref}>{spouseLinkText}</Link>
</Box>
)}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const defaultMockContextValue = {
roth403bPercentage: 0,
isNewAsr: false,
setIsNewAsr: jest.fn(),
isSpouse: false,
};

const router = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,25 @@
trackMutation,
user,
spouse,
isSpouse,
setIsNewAsr,
} = useAdditionalSalaryRequest();

const [createRequest] = useCreateAdditionalSalaryRequestMutation();

const { values, submitForm, validateForm, submitCount, isValid, errors } =
useFormikContext<CompleteFormValues>();

const handleContinue = async () => {
if (requestData?.latestAdditionalSalaryRequest === null) {
await trackMutation(
createRequest({
variables: {
attributes: {
phoneNumber: user?.staffInfo?.primaryPhoneNumber,
emailAddress: user?.staffInfo?.emailAddress,
},
isSpouse: isSpouse || undefined,

Check warning on line 66 in src/components/Reports/AdditionalSalaryRequest/RequestPage/RequestPage.tsx

View check run for this annotation

CodeScene Delta Analysis / CodeScene Code Health Review (main)

❌ Getting worse: Complex Method

MainContent:React.FC increases in cyclomatic complexity from 26 to 27, threshold = 10. This function has many conditional statements (e.g. if, for, while), leading to lower code health. Avoid adding more conditionals and code to it without refactoring.
},
refetchQueries: ['AdditionalSalaryRequest'],
}),
Expand Down
Loading
Loading