fix(AOSH): Radiofield validation fix and changesupervisor phone valid…

…ation fix (#15065) * initial commit * fixing radio fields and validation for phonenumber * Update libs/application/templates/aosh/change-machine-supervisor/src/lib/dataSchema.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Jun 5, 2024 · 584cf9e · 584cf9e
1 parent ac26fb2
commit 584cf9e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 6 deletions.
diff --git a/...ervisor/src/forms/ChangeMachineSupervisorForm/InformationSection/pickMachineSubSection.ts b/...ervisor/src/forms/ChangeMachineSupervisorForm/InformationSection/pickMachineSubSection.ts
@@ -7,6 +7,7 @@ import {
 } from '@island.is/application/core'
 import { information } from '../../../lib/messages'
 import { MachinesWithTotalCount } from '@island.is/clients/work-machines'
+import { Application } from '@island.is/application/types'
 
 export const pickMachineSubSection = buildSubSection({
   id: 'pickMachine',
@@ -29,7 +30,11 @@ export const pickMachineSubSection = buildSubSection({
 
             return machines.totalCount <= 5
           },
-
+          defaultValue: (application: Application) => {
+            const machineList = application?.externalData.machinesList
+              .data as MachinesWithTotalCount
+            return machineList?.machines[0].id ?? ''
+          },
           options: (application) => {
             const machineList = application?.externalData.machinesList
               .data as MachinesWithTotalCount
@@ -39,6 +44,7 @@ export const pickMachineSubSection = buildSubSection({
                 label: machine?.regNumber || '',
                 subLabel: `${machine.category}: ${machine.type} - ${machine.subType}`,
                 disabled: machine?.disabled || false,
+
                 tag: machine?.disabled
                   ? {
                       label: machine?.status || '',

diff --git a/libs/application/templates/aosh/change-machine-supervisor/src/lib/dataSchema.ts b/libs/application/templates/aosh/change-machine-supervisor/src/lib/dataSchema.ts
@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import * as kennitala from 'kennitala'
+import { isValidNumber } from 'libphonenumber-js'
 
 export const MachineAnswersSchema = z.object({
   machine: z.object({
@@ -54,7 +55,7 @@ export const MachineAnswersSchema = z.object({
     )
     .refine(
       ({ phone, isOwner }) => {
-        return isOwner[0] === 'ownerIsSupervisor' || phone !== ''
+        return isOwner[0] === 'ownerIsSupervisor' || isValidNumber(phone ?? '')
       },
       { path: ['phone'] },
     ),

diff --git a/...ister-machine/src/forms/DeregisterMachineForm/InformationSection/pickMachineSubSection.ts b/...ister-machine/src/forms/DeregisterMachineForm/InformationSection/pickMachineSubSection.ts
@@ -7,6 +7,7 @@ import {
 } from '@island.is/application/core'
 import { information } from '../../../lib/messages'
 import { MachinesWithTotalCount } from '@island.is/clients/work-machines'
+import { Application } from '@island.is/application/types'
 
 export const pickMachineSubSection = buildSubSection({
   id: 'pickMachine',
@@ -28,7 +29,11 @@ export const pickMachineSubSection = buildSubSection({
             ) as MachinesWithTotalCount
             return machines.totalCount <= 5
           },
-
+          defaultValue: (application: Application) => {
+            const machineList = application?.externalData.machinesList
+              .data as MachinesWithTotalCount
+            return machineList?.machines[0].id ?? ''
+          },
           options: (application) => {
             const machineList = application?.externalData.machinesList
               .data as MachinesWithTotalCount

diff --git a/...ion/src/forms/RequestMachineForInspectionForm/InformationSection/pickMachineSubSection.ts b/...ion/src/forms/RequestMachineForInspectionForm/InformationSection/pickMachineSubSection.ts
@@ -8,6 +8,7 @@ import {
 } from '@island.is/application/core'
 import { information } from '../../../lib/messages'
 import { MachinesWithTotalCount } from '@island.is/clients/work-machines'
+import { Application } from '@island.is/application/types'
 
 export const pickMachineSubSection = buildSubSection({
   id: 'pickMachine',
@@ -36,7 +37,11 @@ export const pickMachineSubSection = buildSubSection({
 
             return machines.totalCount <= 5
           },
-
+          defaultValue: (application: Application) => {
+            const machineList = application?.externalData.machinesList
+              .data as MachinesWithTotalCount
+            return machineList?.machines[0].id ?? ''
+          },
           options: (application) => {
             const machineList = application?.externalData.machinesList
               .data as MachinesWithTotalCount

diff --git a/...registration/src/forms/StreetRegistrationForm/InformationSection/pickMachineSubSection.ts b/...registration/src/forms/StreetRegistrationForm/InformationSection/pickMachineSubSection.ts
@@ -9,6 +9,7 @@ import { information } from '../../../lib/messages'
 import { MachinesWithTotalCount } from '@island.is/clients/work-machines'
 import { mustInspectBeforeStreetRegistration } from '../../../utils/getSelectedMachine'
 import { useLocale } from '@island.is/localization'
+import { Application } from '@island.is/application/types'
 
 export const pickMachineSubSection = buildSubSection({
   id: 'pickMachine',
@@ -30,7 +31,11 @@ export const pickMachineSubSection = buildSubSection({
             ) as MachinesWithTotalCount
             return machines.totalCount <= 5
           },
-
+          defaultValue: (application: Application) => {
+            const machineList = application?.externalData.machinesList
+              .data as MachinesWithTotalCount
+            return machineList?.machines[0].id ?? ''
+          },
           options: (application) => {
             const machineList = application?.externalData.machinesList
               .data as MachinesWithTotalCount

diff --git a/...ship/src/forms/TransferOfMachineOwnershipForm/InformationSection/pickMachineSubSection.ts b/...ship/src/forms/TransferOfMachineOwnershipForm/InformationSection/pickMachineSubSection.ts
@@ -7,6 +7,7 @@ import {
 } from '@island.is/application/core'
 import { information } from '../../../lib/messages'
 import { MachinesWithTotalCount } from '@island.is/clients/work-machines'
+import { Application } from '@island.is/application/types'
 
 export const pickMachineSubSection = buildSubSection({
   id: 'pickMachine',
@@ -29,7 +30,11 @@ export const pickMachineSubSection = buildSubSection({
 
             return machines.totalCount <= 5
           },
-
+          defaultValue: (application: Application) => {
+            const machineList = application?.externalData.machinesList
+              .data as MachinesWithTotalCount
+            return machineList?.machines[0].id ?? ''
+          },
           options: (application) => {
             const machineList = application?.externalData.machinesList
               .data as MachinesWithTotalCount