fix: no need for paysubsidy attachment when no subsidies (HL-1011) (#…

…2336)
City-of-Helsinki · Oct 12, 2023 · d28703c · d28703c
1 parent e0536a8
commit d28703c
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 48 deletions.
diff --git a/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx b/frontend/benefit/handler/src/components/newApplication/formContent/FormContent.tsx
@@ -10,6 +10,7 @@ import {
   ATTACHMENT_TYPES,
   ORGANIZATION_TYPES,
   PAY_SUBSIDY_GRANTED,
+  TRUTHY_SUBSIDIES,
 } from 'benefit-shared/constants';
 import {
   ApplicationData,
@@ -91,11 +92,6 @@ const FormContent: React.FC<Props> = ({
     getErrorMessage,
   } = useFormContent(formik, fields);
 
-  const truthySubsidies = new Set([
-    PAY_SUBSIDY_GRANTED.GRANTED,
-    PAY_SUBSIDY_GRANTED.GRANTED_AGED,
-  ]);
-
   const theme = useTheme();
   useAlertBeforeLeaving(formik.dirty);
 
@@ -518,7 +514,7 @@ const FormContent: React.FC<Props> = ({
             />
           </SelectionGroup>
         </$GridCell>
-        {truthySubsidies.has(formik.values.paySubsidyGranted) && (
+        {TRUTHY_SUBSIDIES.has(formik.values.paySubsidyGranted) && (
           <$GridCell
             as={$Grid}
             $colSpan={12}
@@ -660,7 +656,7 @@ const FormContent: React.FC<Props> = ({
             />
           </$GridCell>
         )}
-        {truthySubsidies.has(formik.values.paySubsidyGranted) && (
+        {TRUTHY_SUBSIDIES.has(formik.values.paySubsidyGranted) && (
           <$GridCell $colSpan={12}>
             <AttachmentsList
               attachments={attachments}

diff --git a/...efit/handler/src/components/newApplication/review/employmentSection/EmploymentSection.tsx b/...efit/handler/src/components/newApplication/review/employmentSection/EmploymentSection.tsx
@@ -1,4 +1,5 @@
 import { ReviewChildProps } from 'benefit/handler/types/common';
+import { TRUTHY_SUBSIDIES } from 'benefit-shared/constants';
 import camelCase from 'lodash/camelCase';
 import { useTranslation } from 'next-i18next';
 import React from 'react';
@@ -107,11 +108,13 @@ const EmploymentSection: React.FC<ReviewChildProps> = ({
             {t(`${translationsBase}.fields.paySubsidyGranted.review`)}
           </$ViewFieldBold>
           <$ViewField>
-            {t(
-              `${translationsBase}.fields.paySubsidyGranted.${camelCase(
-                data.paySubsidyGranted
-              )}`
-            )}
+            {TRUTHY_SUBSIDIES.has(data.paySubsidyGranted)
+              ? t(
+                  `${translationsBase}.fields.paySubsidyGranted.${camelCase(
+                    data.paySubsidyGranted
+                  )}`
+                )
+              : '-'}
           </$ViewField>
         </$GridCell>
         <$GridCell $colSpan={6}>

diff --git a/frontend/benefit/handler/src/components/newApplication/utils/applicationForm.ts b/frontend/benefit/handler/src/components/newApplication/utils/applicationForm.ts
@@ -13,9 +13,9 @@ import {
 } from 'benefit/handler/types/application';
 import {
   ATTACHMENT_TYPES,
-  BENEFIT_TYPES,
   EMPLOYEE_KEYS,
   PAY_SUBSIDY_OPTIONS,
+  TRUTHY_SUBSIDIES,
 } from 'benefit-shared/constants';
 import { ApplicationData } from 'benefit-shared/types/application';
 import camelcaseKeys from 'camelcase-keys';
@@ -173,48 +173,42 @@ const getSubsidyOptions = (): OptionType[] =>
   }));
 
 const requiredAttachments = (values: Application): boolean => {
-  if (
-    values.benefitType === BENEFIT_TYPES.EMPLOYMENT ||
-    values.benefitType === BENEFIT_TYPES.SALARY
-  ) {
-    const hasWorkContract = !isEmpty(
-      values.attachments?.find(
+  const hasWorkContract = !isEmpty(
+    values.attachments?.find(
+      (att: BenefitAttachment) =>
+        att.attachmentType === ATTACHMENT_TYPES.EMPLOYMENT_CONTRACT
+    )
+  );
+  const hasFullApplication = !isEmpty(
+    values.attachments?.find(
+      (att: BenefitAttachment) =>
+        att.attachmentType === ATTACHMENT_TYPES.FULL_APPLICATION
+    )
+  );
+  let hasPaySubsidyDecision = true;
+  if (TRUTHY_SUBSIDIES.has(values.paySubsidyGranted)) {
+    hasPaySubsidyDecision = !isEmpty(
+      values?.attachments?.find(
         (att: BenefitAttachment) =>
-          att.attachmentType === ATTACHMENT_TYPES.EMPLOYMENT_CONTRACT
+          att.attachmentType === ATTACHMENT_TYPES.PAY_SUBSIDY_CONTRACT
       )
     );
-    const hasFullApplication = !isEmpty(
-      values.attachments?.find(
+  }
+  let hasApprenticeshipProgram = true;
+  if (values.apprenticeshipProgram) {
+    hasApprenticeshipProgram = !isEmpty(
+      values?.attachments?.find(
         (att: BenefitAttachment) =>
-          att.attachmentType === ATTACHMENT_TYPES.FULL_APPLICATION
+          att.attachmentType === ATTACHMENT_TYPES.EDUCATION_CONTRACT
       )
     );
-    let hasPaySubsidyDecision = true;
-    if (values.paySubsidyGranted) {
-      hasPaySubsidyDecision = !isEmpty(
-        values?.attachments?.find(
-          (att: BenefitAttachment) =>
-            att.attachmentType === ATTACHMENT_TYPES.PAY_SUBSIDY_CONTRACT
-        )
-      );
-    }
-    let hasApprenticeshipProgram = true;
-    if (values.apprenticeshipProgram) {
-      hasApprenticeshipProgram = !isEmpty(
-        values?.attachments?.find(
-          (att: BenefitAttachment) =>
-            att.attachmentType === ATTACHMENT_TYPES.EDUCATION_CONTRACT
-        )
-      );
-    }
-    return (
-      hasWorkContract &&
-      hasFullApplication &&
-      hasPaySubsidyDecision &&
-      hasApprenticeshipProgram
-    );
   }
-  return false;
+  return (
+    hasWorkContract &&
+    hasFullApplication &&
+    hasPaySubsidyDecision &&
+    hasApprenticeshipProgram
+  );
 };
 
 export {

diff --git a/frontend/benefit/shared/src/constants.ts b/frontend/benefit/shared/src/constants.ts
@@ -174,4 +174,9 @@ export enum PAY_SUBSIDY_GRANTED {
   NOT_GRANTED = 'not_granted',
 }
 
+export const TRUTHY_SUBSIDIES = new Set([
+  PAY_SUBSIDY_GRANTED.GRANTED,
+  PAY_SUBSIDY_GRANTED.GRANTED_AGED,
+]);
+
 export const APPLICATION_START_DATE = new Date(new Date().getFullYear(), 0, 1);