Skip to content

Change fields not to use _ in id. #1066

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

Merged
cibelius merged 10 commits into from
Oct 8, 2025
Merged

Change fields not to use _ in id. #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9581dfd
fix fields not to use _
cibelius Oct 6, 2025
5ca1406
Merge branch 'develop' into ocrvs-10583
cibelius Oct 7, 2025
ea43110
remove underscores from ids
cibelius Oct 7, 2025
47fcb1e
progress with config
cibelius Oct 7, 2025
d13d166
return old printform
cibelius Oct 7, 2025
df0c912
Merge branch 'develop' into ocrvs-10583
cibelius Oct 7, 2025
4115e1c
fix field ids
cibelius Oct 8, 2025
10e7f2e
update toolkit
cibelius Oct 8, 2025
045e1f6
Merge branch 'develop' into ocrvs-10583
cibelius Oct 8, 2025
534d5eb
fix ids
cibelius Oct 8, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@hapi/boom": "^9.1.1",
"@hapi/hapi": "^20.0.1",
"@hapi/inert": "^6.0.3",
"@opencrvs/toolkit": "1.8.1-rc.4cfe084",
"@opencrvs/toolkit": "1.8.1-rc.a5eecfe",
"@types/chalk": "^2.2.0",
"@types/csv2json": "^1.4.0",
"@types/fhir": "^0.0.30",
Expand Down
6 changes: 3 additions & 3 deletions src/form/tennis-club-membership.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ const TENNIS_CLUB_MEMBERSHIP_CERTIFICATE_COLLECTOR_FORM = defineActionForm({
]
},
{
id: 'collector.DRIVING_LICENSE.details',
id: 'collector.DRIVING-LICENCE.details',
type: 'TEXT',
required: true,
label: {
Expand All @@ -418,7 +418,7 @@ const TENNIS_CLUB_MEMBERSHIP_CERTIFICATE_COLLECTOR_FORM = defineActionForm({
]
},
{
id: 'collector.REFUGEE_NUMBER.details',
id: 'collector.REFUGEE-NUMBER.details',
type: 'TEXT',
required: true,
label: {
Expand All @@ -437,7 +437,7 @@ const TENNIS_CLUB_MEMBERSHIP_CERTIFICATE_COLLECTOR_FORM = defineActionForm({
]
},
{
id: 'collector.ALIEN_NUMBER.details',
id: 'collector.ALIEN-NUMBER.details',
type: 'TEXT',
required: true,
label: {
Expand Down
4 changes: 2 additions & 2 deletions src/form/v2/birth/forms/pages/child.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export const child = defineFormPage({
]
},
{
id: 'child.divider_1',
id: 'child.divider1',
type: FieldType.DIVIDER,
label: emptyMessage
},
Expand Down Expand Up @@ -387,7 +387,7 @@ export const child = defineFormPage({
}
},
{
id: 'child.divider_2',
id: 'child.divider2',
type: FieldType.DIVIDER,
label: emptyMessage
},
Expand Down
2 changes: 1 addition & 1 deletion src/form/v2/birth/forms/pages/father.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ export const father = defineFormPage({
}
},
{
id: 'father.addressDivider_2',
id: 'father.addressDivider2',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down
2 changes: 1 addition & 1 deletion src/form/v2/birth/forms/pages/informant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ export const informant = defineFormPage({
parent: field('informant.relation')
},
{
id: 'informant.addressDivider_1',
id: 'informant.addressDivider1',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down
4 changes: 2 additions & 2 deletions src/form/v2/birth/forms/pages/mother.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export const mother = defineFormPage({
]
},
{
id: 'mother.addressDivider_1',
id: 'mother.addressDivider1',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down Expand Up @@ -380,7 +380,7 @@ export const mother = defineFormPage({
}
},
{
id: 'mother.addressDivider_2',
id: 'mother.addressDivider2',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down
6 changes: 3 additions & 3 deletions src/form/v2/birth/forms/printForm/collector-other.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
validation: [nationalIdValidator('collector.nid')]
},
{
id: 'collector.DRIVING_LICENSE.details',
id: 'collector.DRIVING-LICENCE.details',
type: FieldType.TEXT,
required: true,
label: {
Expand Down Expand Up @@ -196,7 +196,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
]
},
{
id: 'collector.REFUGEE_NUMBER.details',
id: 'collector.REFUGEE-NUMBER.details',
type: FieldType.TEXT,
required: true,
label: {
Expand All @@ -215,7 +215,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
]
},
{
id: 'collector.ALIEN_NUMBER.details',
id: 'collector.ALIEN-NUMBER.details',
type: FieldType.TEXT,
required: true,
label: {
Expand Down
4 changes: 2 additions & 2 deletions src/form/v2/death/forms/pages/eventDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export const eventDetails = defineFormPage({
]
},
{
id: 'eventDetails.divider_1',
id: 'eventDetails.divider1',
type: FieldType.DIVIDER,
label: emptyMessage
},
Expand All @@ -285,7 +285,7 @@ export const eventDetails = defineFormPage({
configuration: { styles: { fontVariant: 'h3' } }
},
{
id: 'eventDetails.divider_2',
id: 'eventDetails.divider2',
type: FieldType.DIVIDER,
label: emptyMessage
},
Expand Down
4 changes: 2 additions & 2 deletions src/form/v2/death/forms/pages/informant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ export const informant = defineFormPage({
]
},
{
id: 'informant.addressDivider_1',
id: 'informant.addressDivider1',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down Expand Up @@ -466,7 +466,7 @@ export const informant = defineFormPage({
parent: field('informant.relation')
},
{
id: 'informant.addressDivider_2',
id: 'informant.addressDivider2',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down
4 changes: 2 additions & 2 deletions src/form/v2/death/forms/pages/spouse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export const spouse = defineFormPage({
]
},
{
id: 'spouse.addressDivider_1',
id: 'spouse.addressDivider1',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down Expand Up @@ -400,7 +400,7 @@ export const spouse = defineFormPage({
}
},
{
id: 'spouse.addressDivider_2',
id: 'spouse.addressDivider2',
type: FieldType.DIVIDER,
label: emptyMessage,
conditionals: [
Expand Down
6 changes: 3 additions & 3 deletions src/form/v2/death/forms/printForm/collector-other.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
validation: [nationalIdValidator('collector.nid')]
},
{
id: 'collector.DRIVING_LICENSE.details',
id: 'collector.DRIVING-LICENSE.details',
type: FieldType.TEXT,
required: true,
label: {
Expand Down Expand Up @@ -202,7 +202,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
]
},
{
id: 'collector.REFUGEE_NUMBER.details',
id: 'collector.REFUGEE-NUMBER.details',
type: FieldType.TEXT,
required: true,
label: {
Expand All @@ -221,7 +221,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
]
},
{
id: 'collector.ALIEN_NUMBER.details',
id: 'collector.ALIEN-NUMBER.details',
type: FieldType.TEXT,
required: true,
label: {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,10 +834,10 @@
dependencies:
"@octokit/openapi-types" "^18.0.0"

"@opencrvs/[email protected].4cfe084":
version "1.8.1-rc.4cfe084"
resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.8.1-rc.4cfe084.tgz#ef7c09bd167d995e87ce4be649fcd2be55b305ea"
integrity sha512-BUCJECF7YFD0m0XfeVC5JzNl60eNZVkJJxx1Ytnz9neEr2JfIQaYSUsAwCnjCswjDLpEMJXJG1VE+VnL7lRPVQ==
"@opencrvs/[email protected].a5eecfe":
version "1.8.1-rc.a5eecfe"
resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.8.1-rc.a5eecfe.tgz#0aa5f0655c0ed5da8a1be6e0ccb8e3f4eac10e41"
integrity sha512-fynKGOtPmFWPtUcU65IaGrJzzL5i8nOWrli5MTHgRaTyMTZa0xD8sR+J5Ot1R4Ak1V+oMTd5eEPz8sJVx0VplQ==
dependencies:
"@trpc/client" "11.4.3"
"@trpc/server" "11.4.3"
Expand Down
Loading