Merge pull request #1066 from opencrvs/ocrvs-10583

cibelius · web-flow · commit bbeedd226687 · 2025-10-08T16:38:20.000+03:00
Change fields not to use `_` in id.
diff --git a/package.json b/package.json
@@ -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",
diff --git a/src/form/tennis-club-membership.ts b/src/form/tennis-club-membership.ts
@@ -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: {
@@ -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: {
@@ -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: {
diff --git a/src/form/v2/birth/forms/pages/child.ts b/src/form/v2/birth/forms/pages/child.ts
@@ -265,7 +265,7 @@ export const child = defineFormPage({
       ]
     },
     {
-      id: 'child.divider_1',
+      id: 'child.divider1',
       type: FieldType.DIVIDER,
       label: emptyMessage
     },
@@ -387,7 +387,7 @@ export const child = defineFormPage({
       }
     },
     {
-      id: 'child.divider_2',
+      id: 'child.divider2',
       type: FieldType.DIVIDER,
       label: emptyMessage
     },
diff --git a/src/form/v2/birth/forms/pages/father.ts b/src/form/v2/birth/forms/pages/father.ts
@@ -413,7 +413,7 @@ export const father = defineFormPage({
       }
     },
     {
-      id: 'father.addressDivider_2',
+      id: 'father.addressDivider2',
       type: FieldType.DIVIDER,
       label: emptyMessage,
       conditionals: [
diff --git a/src/form/v2/birth/forms/pages/informant.ts b/src/form/v2/birth/forms/pages/informant.ts
@@ -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: [
diff --git a/src/form/v2/birth/forms/pages/mother.ts b/src/form/v2/birth/forms/pages/mother.ts
@@ -314,7 +314,7 @@ export const mother = defineFormPage({
       ]
     },
     {
-      id: 'mother.addressDivider_1',
+      id: 'mother.addressDivider1',
       type: FieldType.DIVIDER,
       label: emptyMessage,
       conditionals: [
@@ -380,7 +380,7 @@ export const mother = defineFormPage({
       }
     },
     {
-      id: 'mother.addressDivider_2',
+      id: 'mother.addressDivider2',
       type: FieldType.DIVIDER,
       label: emptyMessage,
       conditionals: [
diff --git a/src/form/v2/birth/forms/printForm/collector-other.ts b/src/form/v2/birth/forms/printForm/collector-other.ts
@@ -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: {
@@ -196,7 +196,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
     ]
   },
   {
-    id: 'collector.REFUGEE_NUMBER.details',
+    id: 'collector.REFUGEE-NUMBER.details',
     type: FieldType.TEXT,
     required: true,
     label: {
@@ -215,7 +215,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
     ]
   },
   {
-    id: 'collector.ALIEN_NUMBER.details',
+    id: 'collector.ALIEN-NUMBER.details',
     type: FieldType.TEXT,
     required: true,
     label: {
diff --git a/src/form/v2/death/forms/pages/eventDetails.ts b/src/form/v2/death/forms/pages/eventDetails.ts
@@ -270,7 +270,7 @@ export const eventDetails = defineFormPage({
       ]
     },
     {
-      id: 'eventDetails.divider_1',
+      id: 'eventDetails.divider1',
       type: FieldType.DIVIDER,
       label: emptyMessage
     },
@@ -285,7 +285,7 @@ export const eventDetails = defineFormPage({
       configuration: { styles: { fontVariant: 'h3' } }
     },
     {
-      id: 'eventDetails.divider_2',
+      id: 'eventDetails.divider2',
       type: FieldType.DIVIDER,
       label: emptyMessage
     },
diff --git a/src/form/v2/death/forms/pages/informant.ts b/src/form/v2/death/forms/pages/informant.ts
@@ -389,7 +389,7 @@ export const informant = defineFormPage({
       ]
     },
     {
-      id: 'informant.addressDivider_1',
+      id: 'informant.addressDivider1',
       type: FieldType.DIVIDER,
       label: emptyMessage,
       conditionals: [
@@ -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: [
diff --git a/src/form/v2/death/forms/pages/spouse.ts b/src/form/v2/death/forms/pages/spouse.ts
@@ -304,7 +304,7 @@ export const spouse = defineFormPage({
       ]
     },
     {
-      id: 'spouse.addressDivider_1',
+      id: 'spouse.addressDivider1',
       type: FieldType.DIVIDER,
       label: emptyMessage,
       conditionals: [
@@ -400,7 +400,7 @@ export const spouse = defineFormPage({
       }
     },
     {
-      id: 'spouse.addressDivider_2',
+      id: 'spouse.addressDivider2',
       type: FieldType.DIVIDER,
       label: emptyMessage,
       conditionals: [
diff --git a/src/form/v2/death/forms/printForm/collector-other.ts b/src/form/v2/death/forms/printForm/collector-other.ts
@@ -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: {
@@ -202,7 +202,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
     ]
   },
   {
-    id: 'collector.REFUGEE_NUMBER.details',
+    id: 'collector.REFUGEE-NUMBER.details',
     type: FieldType.TEXT,
     required: true,
     label: {
@@ -221,7 +221,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [
     ]
   },
   {
-    id: 'collector.ALIEN_NUMBER.details',
+    id: 'collector.ALIEN-NUMBER.details',
     type: FieldType.TEXT,
     required: true,
     label: {
diff --git a/yarn.lock b/yarn.lock
@@ -834,10 +834,10 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@opencrvs/toolkit@1.8.1-rc.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/toolkit@1.8.1-rc.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"

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ const TENNIS_CLUB_MEMBERSHIP_CERTIFICATE_COLLECTOR_FORM = defineActionForm({`
`399`	`399`	`]`
`400`	`400`	`},`
`401`	`401`	`{`
`402`		`- id: 'collector.DRIVING_LICENSE.details',`
	`402`	`+ id: 'collector.DRIVING-LICENCE.details',`
`403`	`403`	`type: 'TEXT',`
`404`	`404`	`required: true,`
`405`	`405`	`label: {`
`@@ -418,7 +418,7 @@ const TENNIS_CLUB_MEMBERSHIP_CERTIFICATE_COLLECTOR_FORM = defineActionForm({`
`418`	`418`	`]`
`419`	`419`	`},`
`420`	`420`	`{`
`421`		`- id: 'collector.REFUGEE_NUMBER.details',`
	`421`	`+ id: 'collector.REFUGEE-NUMBER.details',`
`422`	`422`	`type: 'TEXT',`
`423`	`423`	`required: true,`
`424`	`424`	`label: {`
`@@ -437,7 +437,7 @@ const TENNIS_CLUB_MEMBERSHIP_CERTIFICATE_COLLECTOR_FORM = defineActionForm({`
`437`	`437`	`]`
`438`	`438`	`},`
`439`	`439`	`{`
`440`		`- id: 'collector.ALIEN_NUMBER.details',`
	`440`	`+ id: 'collector.ALIEN-NUMBER.details',`
`441`	`441`	`type: 'TEXT',`
`442`	`442`	`required: true,`
`443`	`443`	`label: {`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ export const child = defineFormPage({`
`265`	`265`	`]`
`266`	`266`	`},`
`267`	`267`	`{`
`268`		`- id: 'child.divider_1',`
	`268`	`+ id: 'child.divider1',`
`269`	`269`	`type: FieldType.DIVIDER,`
`270`	`270`	`label: emptyMessage`
`271`	`271`	`},`
`@@ -387,7 +387,7 @@ export const child = defineFormPage({`
`387`	`387`	`}`
`388`	`388`	`},`
`389`	`389`	`{`
`390`		`- id: 'child.divider_2',`
	`390`	`+ id: 'child.divider2',`
`391`	`391`	`type: FieldType.DIVIDER,`
`392`	`392`	`label: emptyMessage`
`393`	`393`	`},`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ export const father = defineFormPage({`
`413`	`413`	`}`
`414`	`414`	`},`
`415`	`415`	`{`
`416`		`- id: 'father.addressDivider_2',`
	`416`	`+ id: 'father.addressDivider2',`
`417`	`417`	`type: FieldType.DIVIDER,`
`418`	`418`	`label: emptyMessage,`
`419`	`419`	`conditionals: [`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ export const informant = defineFormPage({`
`363`	`363`	`parent: field('informant.relation')`
`364`	`364`	`},`
`365`	`365`	`{`
`366`		`- id: 'informant.addressDivider_1',`
	`366`	`+ id: 'informant.addressDivider1',`
`367`	`367`	`type: FieldType.DIVIDER,`
`368`	`368`	`label: emptyMessage,`
`369`	`369`	`conditionals: [`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ export const mother = defineFormPage({`
`314`	`314`	`]`
`315`	`315`	`},`
`316`	`316`	`{`
`317`		`- id: 'mother.addressDivider_1',`
	`317`	`+ id: 'mother.addressDivider1',`
`318`	`318`	`type: FieldType.DIVIDER,`
`319`	`319`	`label: emptyMessage,`
`320`	`320`	`conditionals: [`
`@@ -380,7 +380,7 @@ export const mother = defineFormPage({`
`380`	`380`	`}`
`381`	`381`	`},`
`382`	`382`	`{`
`383`		`- id: 'mother.addressDivider_2',`
	`383`	`+ id: 'mother.addressDivider2',`
`384`	`384`	`type: FieldType.DIVIDER,`
`385`	`385`	`label: emptyMessage,`
`386`	`386`	`conditionals: [`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [`
`156`	`156`	`validation: [nationalIdValidator('collector.nid')]`
`157`	`157`	`},`
`158`	`158`	`{`
`159`		`- id: 'collector.DRIVING_LICENSE.details',`
	`159`	`+ id: 'collector.DRIVING-LICENCE.details',`
`160`	`160`	`type: FieldType.TEXT,`
`161`	`161`	`required: true,`
`162`	`162`	`label: {`
`@@ -196,7 +196,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [`
`196`	`196`	`]`
`197`	`197`	`},`
`198`	`198`	`{`
`199`		`- id: 'collector.REFUGEE_NUMBER.details',`
	`199`	`+ id: 'collector.REFUGEE-NUMBER.details',`
`200`	`200`	`type: FieldType.TEXT,`
`201`	`201`	`required: true,`
`202`	`202`	`label: {`
`@@ -215,7 +215,7 @@ export const printCertificateCollectorOther: FieldConfig[] = [`
`215`	`215`	`]`
`216`	`216`	`},`
`217`	`217`	`{`
`218`		`- id: 'collector.ALIEN_NUMBER.details',`
	`218`	`+ id: 'collector.ALIEN-NUMBER.details',`
`219`	`219`	`type: FieldType.TEXT,`
`220`	`220`	`required: true,`
`221`	`221`	`label: {`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ export const eventDetails = defineFormPage({`
`270`	`270`	`]`
`271`	`271`	`},`
`272`	`272`	`{`
`273`		`- id: 'eventDetails.divider_1',`
	`273`	`+ id: 'eventDetails.divider1',`
`274`	`274`	`type: FieldType.DIVIDER,`
`275`	`275`	`label: emptyMessage`
`276`	`276`	`},`
`@@ -285,7 +285,7 @@ export const eventDetails = defineFormPage({`
`285`	`285`	`configuration: { styles: { fontVariant: 'h3' } }`
`286`	`286`	`},`
`287`	`287`	`{`
`288`		`- id: 'eventDetails.divider_2',`
	`288`	`+ id: 'eventDetails.divider2',`
`289`	`289`	`type: FieldType.DIVIDER,`
`290`	`290`	`label: emptyMessage`
`291`	`291`	`},`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ export const informant = defineFormPage({`
`389`	`389`	`]`
`390`	`390`	`},`
`391`	`391`	`{`
`392`		`- id: 'informant.addressDivider_1',`
	`392`	`+ id: 'informant.addressDivider1',`
`393`	`393`	`type: FieldType.DIVIDER,`
`394`	`394`	`label: emptyMessage,`
`395`	`395`	`conditionals: [`
`@@ -466,7 +466,7 @@ export const informant = defineFormPage({`
`466`	`466`	`parent: field('informant.relation')`
`467`	`467`	`},`
`468`	`468`	`{`
`469`		`- id: 'informant.addressDivider_2',`
	`469`	`+ id: 'informant.addressDivider2',`
`470`	`470`	`type: FieldType.DIVIDER,`
`471`	`471`	`label: emptyMessage,`
`472`	`472`	`conditionals: [`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ export const spouse = defineFormPage({`
`304`	`304`	`]`
`305`	`305`	`},`
`306`	`306`	`{`
`307`		`- id: 'spouse.addressDivider_1',`
	`307`	`+ id: 'spouse.addressDivider1',`
`308`	`308`	`type: FieldType.DIVIDER,`
`309`	`309`	`label: emptyMessage,`
`310`	`310`	`conditionals: [`
`@@ -400,7 +400,7 @@ export const spouse = defineFormPage({`
`400`	`400`	`}`
`401`	`401`	`},`
`402`	`402`	`{`
`403`		`- id: 'spouse.addressDivider_2',`
	`403`	`+ id: 'spouse.addressDivider2',`
`404`	`404`	`type: FieldType.DIVIDER,`
`405`	`405`	`label: emptyMessage,`
`406`	`406`	`conditionals: [`