feat: simplify logic for conditions

libs/application/templates/health-insurance/project.json

@@ -21,7 +21,7 @@
     "extract-strings": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/health-insurance/src/forms/messages.ts"
+        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/health-insurance/src/lib/messages/*.ts"
       }
     }
   }

libs/application/templates/health-insurance/src/forms/HealthInsuranceForm/formerInsuranceSection.ts

@@ -8,6 +8,7 @@ import {
   buildSection,
   buildSelectField,
   buildTextField,
+  getValueViaPath,
 } from '@island.is/application/core'
 import { m } from '../../lib/messages/messages'
 import { FormValue } from '@island.is/application/types'
@@ -17,6 +18,10 @@ import {
 } from '../../healthInsuranceUtils'
 import { FILE_SIZE_LIMIT } from '../../utils/constants'
 import { countryOptions, getYesNoOptions } from '../../utils/options'
+import {
+  formerInsuranceCondition,
+  getFormerCountryAndCitizenship,
+} from '../../utils/getFormerCountryAndCitizenship'
 
 export const formerInsuranceSection = buildSection({
   id: 'formerInsuranceSection',
@@ -63,16 +68,8 @@ export const formerInsuranceSection = buildSection({
           message: m.waitingPeriodDescription,
           alertType: 'error',
           condition: (answers: FormValue) => {
-            const formerCountry = (
-              answers as {
-                formerInsurance: { country: string }
-              }
-            )?.formerInsurance?.country
-            const citizenship = (
-              answers as {
-                citizenship: string
-              }
-            )?.citizenship
+            const { formerCountry, citizenship } =
+              getFormerCountryAndCitizenship(answers)
             return (
               !!formerCountry &&
               requireWaitingPeriod(formerCountry, citizenship)
@@ -88,11 +85,7 @@ export const formerInsuranceSection = buildSection({
           uploadDescription: m.fileUploadDescription,
           uploadButtonLabel: m.fileUploadButton,
           condition: (answers: FormValue) => {
-            const formerCountry = (
-              answers as {
-                formerInsurance: { country: string }
-              }
-            )?.formerInsurance?.country
+            const { formerCountry } = getFormerCountryAndCitizenship(answers)
             return requireConfirmationOfResidency(formerCountry)
           },
         }),
@@ -105,39 +98,15 @@ export const formerInsuranceSection = buildSection({
           title: '',
           description: m.formerInsuranceEntitlement,
           tooltip: m.formerInsuranceEntitlementTooltip,
-          condition: (answers: FormValue) => {
-            const formerCountry = (
-              answers as {
-                formerInsurance: { country: string }
-              }
-            )?.formerInsurance?.country
-            const citizenship = (
-              answers as {
-                citizenship: string
-              }
-            )?.citizenship
-            return !requireWaitingPeriod(formerCountry, citizenship)
-          },
+          condition: (answers: FormValue) => formerInsuranceCondition(answers),
         }),
         buildRadioField({
           id: 'formerInsurance.entitlement',
           title: '',
           width: 'half',
           largeButtons: true,
           options: getYesNoOptions({}),
-          condition: (answers: FormValue) => {
-            const formerCountry = (
-              answers as {
-                formerInsurance: { country: string }
-              }
-            )?.formerInsurance?.country
-            const citizenship = (
-              answers as {
-                citizenship: string
-              }
-            ).citizenship
-            return !requireWaitingPeriod(formerCountry, citizenship)
-          },
+          condition: (answers: FormValue) => formerInsuranceCondition(answers),
         }),
         buildTextField({
           id: 'formerInsurance.entitlementReason',
@@ -146,19 +115,7 @@ export const formerInsuranceSection = buildSection({
           variant: 'textarea',
           rows: 4,
           backgroundColor: 'blue',
-          condition: (answers: FormValue) => {
-            const formerCountry = (
-              answers as {
-                formerInsurance: { country: string }
-              }
-            )?.formerInsurance?.country
-            const citizenship = (
-              answers as {
-                citizenship: string
-              }
-            )?.citizenship
-            return !requireWaitingPeriod(formerCountry, citizenship)
-          },
+          condition: (answers: FormValue) => formerInsuranceCondition(answers),
         }),
       ],
     }),

libs/application/templates/health-insurance/src/utils/getFormerCountryAndCitizenship.ts

@@ -0,0 +1,17 @@
+import { getValueViaPath } from '@island.is/application/core'
+import { FormValue } from '@island.is/application/types'
+import { requireWaitingPeriod } from '../healthInsuranceUtils'
+
+export const getFormerCountryAndCitizenship = (answers: FormValue) => {
+  const formerCountry = getValueViaPath(
+    answers,
+    'formerInsurance.country',
+  ) as string
+  const citizenship = getValueViaPath(answers, 'citizenship') as string
+  return { formerCountry, citizenship }
+}
+
+export const formerInsuranceCondition = (answers: FormValue) => {
+  const { formerCountry, citizenship } = getFormerCountryAndCitizenship(answers)
+  return !requireWaitingPeriod(formerCountry, citizenship)
+}