more comment changes

island-is · Oct 31, 2024 · c43faab · c43faab
1 parent 25e9e21
commit c43faab
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/libs/application/templates/driving-license/src/fields/AdvancedLicense/AdvancedLicense.tsx b/libs/application/templates/driving-license/src/fields/AdvancedLicense/AdvancedLicense.tsx
@@ -1,6 +1,6 @@
 import React, { FC, useEffect, useState } from 'react'
 
-import { Box, Checkbox, Text } from '@island.is/island-ui/core'
+import { Box, Checkbox, ErrorMessage, Text } from '@island.is/island-ui/core'
 import { FieldBaseProps } from '@island.is/application/types'
 import { useFormContext } from 'react-hook-form'
 import {
@@ -12,20 +12,23 @@ import { m } from '../../lib/messages'
 import { joinWithAnd } from '../../lib/utils'
 
 const AdvancedLicense: FC<React.PropsWithChildren<FieldBaseProps>> = ({
-  application,
+  errors,
 }) => {
   const { formatMessage } = useLocale()
   const { setValue, watch } = useFormContext()
 
+  const requiredMessage = (errors as { advancedLicense?: string })
+    ?.advancedLicense
+    ? formatMessage(m.applicationForAdvancedRequiredError)
+    : ''
+
   const advancedLicenseValue = watch('advancedLicense') ?? []
 
   const [selectedLicenses, setSelectedLicenses] =
     useState<Array<keyof typeof AdvancedLicenseEnum>>(advancedLicenseValue)
 
   useEffect(() => {
-    if (selectedLicenses.length > 0) {
-      setValue('advancedLicense', selectedLicenses)
-    }
+    setValue('advancedLicense', selectedLicenses)
   }, [selectedLicenses, setValue])
 
   return (
@@ -88,9 +91,7 @@ const AdvancedLicense: FC<React.PropsWithChildren<FieldBaseProps>> = ({
                     backgroundColor="blue"
                     labelVariant="medium"
                     checked={advancedLicenseValue.includes(option.code)}
-                    onChange={(e) => {
-                      const checked = e.target.checked
-
+                    onChange={() => {
                       setSelectedLicenses((prev) => {
                         return prev.includes(option.code)
                           ? prev
@@ -102,9 +103,9 @@ const AdvancedLicense: FC<React.PropsWithChildren<FieldBaseProps>> = ({
                       })
                     }}
                   />
-                  {option?.professional && (
+                  {option?.professional?.code && (
                     <Box
-                      key={index}
+                      key={`professional-${option.professional.code}`}
                       marginTop={2}
                       paddingX={3}
                       paddingY={2}
@@ -144,6 +145,11 @@ const AdvancedLicense: FC<React.PropsWithChildren<FieldBaseProps>> = ({
           </Box>
         )
       })}
+      {!selectedLicenses?.length && requiredMessage && (
+        <ErrorMessage>
+          <div>{requiredMessage}</div>
+        </ErrorMessage>
+      )}
     </Box>
   )
 }

diff --git a/libs/application/templates/driving-license/src/forms/prerequisites/getForm.ts b/libs/application/templates/driving-license/src/forms/prerequisites/getForm.ts
@@ -10,13 +10,21 @@ import { sectionExistingApplication } from './sectionExistingApplication'
 import { sectionDigitalLicenseInfo } from './sectionDigitalLicenseInfo'
 import { sectionAdvancedLicenseSelection } from './sectionAdvancedLicenseSelection'
 
+interface DrivingLicenseFormConfig {
+  allowFakeData?: boolean
+  allowPickLicense?: boolean
+  allowBELicense?: boolean
+  allow65Renewal?: boolean
+  allowAdvanced?: boolean
+}
+
 export const getForm = ({
   allowFakeData = false,
   allowPickLicense = false,
   allowBELicense = false,
   allow65Renewal = false,
   allowAdvanced = false,
-}): Form =>
+}: DrivingLicenseFormConfig): Form =>
   buildForm({
     id: 'DrivingLicenseApplicationPrerequisitesForm',
     title: '',

diff --git a/libs/application/templates/driving-license/src/lib/dataSchema.ts b/libs/application/templates/driving-license/src/lib/dataSchema.ts
@@ -48,7 +48,10 @@ export const dataSchema = z.object({
   applicationFor: z.enum([B_FULL, B_TEMP, BE, B_FULL_RENEWAL_65, B_ADVANCED]),
   advancedLicense: z
     .array(z.enum(Object.values(AdvancedLicense) as [string, ...string[]]))
-    .nonempty(),
+    .nonempty()
+    .refine((value) => {
+      return value.length > 0
+    }),
   email: z.string().email(),
   phone: z.string().refine((v) => isValidPhoneNumber(v)),
   drivingInstructor: z.string().min(1),

diff --git a/libs/application/templates/driving-license/src/lib/messages.ts b/libs/application/templates/driving-license/src/lib/messages.ts
@@ -993,6 +993,11 @@ export const m = defineMessages({
     defaultMessage: 'DE lýsing',
     description: 'DE description',
   },
+  applicationForAdvancedRequiredError: {
+    id: 'dl.application:applicationForAdvancedRequiredError',
+    defaultMessage: 'Þú verður að velja að minnsta kosti einn valmöguleika',
+    description: 'You must select at least one option',
+  },
 })
 
 export const requirementsMessages = defineMessages({