Merge pull request #1048 from opencrvs/ocrvs-10578

cibelius · web-flow · commit 87dcdfa7eb54 · 2025-10-02T14:03:17.000+03:00
Simplify conditionals
diff --git a/src/form/v2/birth/forms/pages/father.ts b/src/form/v2/birth/forms/pages/father.ts
@@ -360,7 +360,7 @@ export const father = defineFormPage({
         {
           type: ConditionalType.SHOW,
           conditional: and(
-            not(field('mother.detailsNotAvailable').isEqualTo(true)),
+            field('mother.detailsNotAvailable').isFalsy(),
             field('father.detailsNotAvailable').isFalsy()
           )
         },
@@ -385,10 +385,7 @@ export const father = defineFormPage({
           type: ConditionalType.SHOW,
           conditional: and(
             requireFatherDetails,
-            or(
-              field('mother.detailsNotAvailable').isEqualTo(true),
-              field('father.addressSameAs').isEqualTo(YesNoTypes.NO)
-            )
+            not(field('father.addressSameAs').isEqualTo(YesNoTypes.YES))
           )
         }
       ],

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ export const father = defineFormPage({`
`360`	`360`	`{`
`361`	`361`	`type: ConditionalType.SHOW,`
`362`	`362`	`conditional: and(`
`363`		`- not(field('mother.detailsNotAvailable').isEqualTo(true)),`
	`363`	`+ field('mother.detailsNotAvailable').isFalsy(),`
`364`	`364`	`field('father.detailsNotAvailable').isFalsy()`
`365`	`365`	`)`
`366`	`366`	`},`
`@@ -385,10 +385,7 @@ export const father = defineFormPage({`
`385`	`385`	`type: ConditionalType.SHOW,`
`386`	`386`	`conditional: and(`
`387`	`387`	`requireFatherDetails,`
`388`		`- or(`
`389`		`- field('mother.detailsNotAvailable').isEqualTo(true),`
`390`		`- field('father.addressSameAs').isEqualTo(YesNoTypes.NO)`
`391`		`- )`
	`388`	`+ not(field('father.addressSameAs').isEqualTo(YesNoTypes.YES))`
`392`	`389`	`)`
`393`	`390`	`}`
`394`	`391`	`],`