Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: no apprenticeship information should be required for applicant without pay subsidy (HL-1257) #2909

Merged
merged 2 commits into from
Apr 4, 2024
Merged

fix: no apprenticeship information should be required for applicant without pay subsidy (HL-1257) #2909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94b864
chore: remove old comission-based effect
sirtawast Apr 3, 2024
7a4e34b
fix: force apprenticeship to null if applicannt has no granted pay su…
sirtawast Apr 3, 2024
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
2 changes: 0 additions & 2 deletions ...it/applicant/src/components/applications/forms/application/step2/ApplicationFormStep2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ const ApplicationFormStep2: React.FC<DynamicFormStepComponentProps> = ({

useDependentFieldsEffect(
{
apprenticeshipProgram: formik.values.apprenticeshipProgram,
benefitType: formik.values.benefitType,
paySubsidyGranted: formik.values.paySubsidyGranted,
associationHasBusinessActivities:
formik.values.associationHasBusinessActivities,
Expand Down
9 changes: 8 additions & 1 deletion .../applicant/src/components/applications/forms/application/step5/useApplicationFormStep5.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import useFormActions from 'benefit/applicant/hooks/useFormActions';
import useUpdateApplicationQuery from 'benefit/applicant/hooks/useUpdateApplicationQuery';
import { useTranslation } from 'benefit/applicant/i18n';
import { getApplicationStepString } from 'benefit/applicant/utils/common';
import { APPLICATION_STATUSES } from 'benefit-shared/constants';
import {
APPLICATION_STATUSES,
PAY_SUBSIDY_GRANTED,
} from 'benefit-shared/constants';
import { Application, ApplicationData } from 'benefit-shared/types/application';
import { useRouter } from 'next/router';
import { TFunction } from 'next-i18next';
Expand Down Expand Up @@ -99,6 +102,10 @@ const useApplicationFormStep5 = (
{
...application,
...submitFields,
apprenticeshipProgram:
application?.paySubsidyGranted === PAY_SUBSIDY_GRANTED.NOT_GRANTED
? null
: application?.apprenticeshipProgram,
calculation: application.calculation
? {
...application.calculation,
Expand Down
5 changes: 5 additions & 0 deletions .../applicant/src/components/applications/forms/application/step6/useApplicationFormStep6.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import useUpdateApplicationQuery from 'benefit/applicant/hooks/useUpdateApplicat
import { useTranslation } from 'benefit/applicant/i18n';
import {
APPLICATION_STATUSES,
PAY_SUBSIDY_GRANTED,
VALIDATION_MESSAGE_KEYS,
} from 'benefit-shared/constants';
import {
Expand Down Expand Up @@ -92,6 +93,10 @@ const useApplicationFormStep6 = (
(consent) => consent.id
),
},
apprenticeshipProgram:
application?.paySubsidyGranted === PAY_SUBSIDY_GRANTED.NOT_GRANTED
? null
: application?.apprenticeshipProgram,
status:
application.status === APPLICATION_STATUSES.DRAFT
? APPLICATION_STATUSES.RECEIVED
Expand Down
13 changes: 1 addition & 12 deletions frontend/benefit/applicant/src/hooks/useDependentFieldsEffect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { BENEFIT_TYPES, PAY_SUBSIDY_GRANTED } from 'benefit-shared/constants';
import { PAY_SUBSIDY_GRANTED } from 'benefit-shared/constants';
import React from 'react';

interface FieldValues {
useAlternativeAddress?: boolean | null;
apprenticeshipProgram?: boolean | null;
benefitType?: BENEFIT_TYPES | '';
paySubsidyGranted?: PAY_SUBSIDY_GRANTED | null;
associationHasBusinessActivities?: boolean | null;
startDate?: string;
Expand Down Expand Up @@ -46,8 +44,6 @@ type State = EFFECTS[];
export const useDependentFieldsEffect = (
{
useAlternativeAddress,
apprenticeshipProgram,
benefitType,
paySubsidyGranted,
associationHasBusinessActivities,
startDate,
Expand Down Expand Up @@ -119,13 +115,6 @@ export const useDependentFieldsEffect = (
}
}, [paySubsidyGranted]);

// Effects when apprenticeshipProgram changes
React.useEffect(() => {
if (benefitType === BENEFIT_TYPES.COMMISSION && apprenticeshipProgram) {
dispatch(createUpdateAction([EFFECTS.CLEAR_BENEFIT_VALUES]));
}
}, [apprenticeshipProgram, benefitType]);

// Effects when associationHasBusinessActivities changes
React.useEffect(() => {
if (associationHasBusinessActivities === false) {
Expand Down
Loading