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(AOSH): Radiofield validation fix and changesupervisor phone validation fix #15065

Merged
merged 5 commits into from
Jun 5, 2024
Merged

fix(AOSH): Radiofield validation fix and changesupervisor phone validation fix #15065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2e6aca
initial commit
davidkef May 31, 2024
8116a0f
fixing radio fields and validation for phonenumber
davidkef Jun 3, 2024
759a9d0
Update libs/application/templates/aosh/change-machine-supervisor/src/…
davidkef Jun 4, 2024
44e11a8
Merge branch 'main' into db/fix/aosh-radio-validation-fix
kodiakhq[bot] Jun 5, 2024
8f196eb
Merge branch 'main' into db/fix/aosh-radio-validation-fix
kodiakhq[bot] Jun 5, 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
8 changes: 7 additions & 1 deletion ...ervisor/src/forms/ChangeMachineSupervisorForm/InformationSection/pickMachineSubSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
davidkef marked this conversation as resolved.
Show resolved Hide resolved

export const pickMachineSubSection = buildSubSection({
id: 'pickMachine',
Expand All @@ -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
Expand All @@ -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 || '',
Expand Down
3 changes: 2 additions & 1 deletion libs/application/templates/aosh/change-machine-supervisor/src/lib/dataSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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({
Expand Down Expand Up @@ -54,7 +55,7 @@ export const MachineAnswersSchema = z.object({
)
.refine(
({ phone, isOwner }) => {
return isOwner[0] === 'ownerIsSupervisor' || phone !== ''
return isOwner[0] === 'ownerIsSupervisor' || isValidNumber(phone ?? '')
davidkef marked this conversation as resolved.
Show resolved Hide resolved
},
{ path: ['phone'] },
),
Expand Down
7 changes: 6 additions & 1 deletion ...ister-machine/src/forms/DeregisterMachineForm/InformationSection/pickMachineSubSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
davidkef marked this conversation as resolved.
Show resolved Hide resolved

export const pickMachineSubSection = buildSubSection({
id: 'pickMachine',
Expand All @@ -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
Expand Down
7 changes: 6 additions & 1 deletion ...ion/src/forms/RequestMachineForInspectionForm/InformationSection/pickMachineSubSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
davidkef marked this conversation as resolved.
Show resolved Hide resolved

export const pickMachineSubSection = buildSubSection({
id: 'pickMachine',
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion ...registration/src/forms/StreetRegistrationForm/InformationSection/pickMachineSubSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
davidkef marked this conversation as resolved.
Show resolved Hide resolved

export const pickMachineSubSection = buildSubSection({
id: 'pickMachine',
Expand All @@ -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
Expand Down
7 changes: 6 additions & 1 deletion ...ship/src/forms/TransferOfMachineOwnershipForm/InformationSection/pickMachineSubSection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
davidkef marked this conversation as resolved.
Show resolved Hide resolved

export const pickMachineSubSection = buildSubSection({
id: 'pickMachine',
Expand All @@ -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 ?? ''
},
davidkef marked this conversation as resolved.
Show resolved Hide resolved
options: (application) => {
const machineList = application?.externalData.machinesList
.data as MachinesWithTotalCount
Expand Down
Loading