Skip to content

Commit 23abcc9

Browse files
authored
Merge pull request #1084 from opencrvs/ocrvs-10547
fix street level address validation
2 parents d72c7c0 + 200eb4e commit 23abcc9

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

src/form/street-address-configuration.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,33 @@ export function getNestedFieldValidators(
4343
[fieldId]: {
4444
type: 'object',
4545
properties: {
46-
[field.id]: {
47-
minLength: 1
46+
addressType: {
47+
type: 'string',
48+
enum: ['INTERNATIONAL', 'DOMESTIC']
49+
},
50+
streetLevelDetails: {
51+
type: 'object',
52+
properties: {
53+
[field.id]: { minLength: 1 }
54+
}
55+
}
56+
},
57+
if: {
58+
properties: {
59+
addressType: { const: 'INTERNATIONAL' }
60+
}
61+
},
62+
then: {
63+
required: ['streetLevelDetails'],
64+
properties: {
65+
streetLevelDetails: {
66+
required: [field.id]
67+
}
4868
}
4969
}
5070
}
51-
}
71+
},
72+
required: [fieldId]
5273
})
5374
}))
5475
}

0 commit comments

Comments
 (0)