misc

tareq89 · tareq89 · commit c64a8d7f98b2 · 2025-10-07T16:15:44.000+06:00
diff --git a/src/api/certificates/handler.ts b/src/api/certificates/handler.ts
@@ -9,9 +9,11 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
+import { conditionals } from '@countryconfig/form/common/custom-validation-conditionals/custom-conditionals'
 import { Event } from '@countryconfig/form/types/types'
 import { Request, ResponseToolkit } from '@hapi/hapi'
 import { ActionType, event, field } from '@opencrvs/toolkit/events'
+import { x } from 'joi'
 
 type FontFamilyTypes = {
   normal: string
@@ -419,5 +421,5 @@ export async function certificateHandler(request: Request, h: ResponseToolkit) {
       }
     }
   ]
-  return certificateConfigs
+  return certificateConfigs.map((x) => ({ ...x, conditionals: [] }))
 }
diff --git a/src/api/certificates/source/v2.birth-certificate-certified-copy.svg b/src/api/certificates/source/v2.birth-certificate-certified-copy.svg
@@ -378,16 +378,16 @@
       font-size="8" letter-spacing="0px">
       <!-- NOTE: Since we are using intl-lookup, we need to use informant.relation as actual value
       rather than as stringified one. Hence we opt for native lookup over $lookup  -->
-      {{#ifCond (lookup $originalDeclaration 'informant.relation') '===' 'MOTHER' }}
+      {{#ifCond (lookup $declaration 'informant.relation') '===' 'MOTHER' }}
         <tspan x="307" y="518.104">{{$lookup $declaration 'mother.name.fullname'}}</tspan>
       {{ else }}
-        {{#ifCond (lookup $originalDeclaration 'informant.relation') '===' 'FATHER'}}
+        {{#ifCond (lookup $declaration 'informant.relation') '===' 'FATHER'}}
           <tspan x="307" y="518.104">{{$lookup $declaration 'father.name.fullname'}}</tspan>
         {{ else }}
           <tspan x="307" y="518.104">{{$lookup $declaration 'informant.name.fullname'}}</tspan>
         {{/ifCond}}
       {{/ifCond}}
-      <tspan x="307" y="528.104">{{lookup $declaration 'informant.relation'}}{{#ifCond (lookup $originalDeclaration 'informant.relation') '===' 'OTHER'}} ({{lookup $declaration 'informant.other.relation'}}) {{/ifCond}}</tspan>
+      <tspan x="307" y="528.104">{{$lookup $declaration 'informant.relation'}}{{#ifCond (lookup $declaration 'informant.relation') '===' 'OTHER'}} ({{$lookup $declaration 'informant.other.relation'}}) {{/ifCond}}</tspan>
     </text>
   </g>
   <line x1="65" y1="536.5" x2="533" y2="536.5" stroke="#ECECEC" />
diff --git a/src/api/certificates/source/v2.death-certificate-certified-copy.svg b/src/api/certificates/source/v2.death-certificate-certified-copy.svg
@@ -171,12 +171,12 @@
   </text>
   <g clip-path="url(#clip8_948_2918)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      {{#ifCond (lookup $originalDeclaration "informant.relation") '!==' "SPOUSE" }}
+      {{#ifCond (lookup $declaration "informant.relation") '!==' "SPOUSE" }}
       <tspan x="312" y="372.104">{{$lookup $declaration "informant.name.fullname"}}</tspan>
       {{else}}
       <tspan x="312" y="372.104">{{$lookup $declaration "spouse.name.fullname"}}</tspan>
       {{/ifCond}}
-      <tspan x="312" y="384.104">{{$lookup $declaration "informant.relation"}}{{#ifCond (lookup $originalDeclaration 'informant.relation') '===' 'OTHER'}} ({{lookup $declaration 'informant.other.relation'}}) {{/ifCond}}</tspan>
+      <tspan x="312" y="384.104">{{$lookup $declaration "informant.relation"}}{{#ifCond (lookup $declaration 'informant.relation') '===' 'OTHER'}} ({{$lookup $declaration 'informant.other.relation'}}) {{/ifCond}}</tspan>
     </text>
   </g>
   <line x1="70" y1="390.5" x2="514" y2="390.5" stroke="#ECECEC" />

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,11 @@`
`9`	`9`	`* Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.`
`10`	`10`	`*/`
`11`	`11`
	`12`	`+import { conditionals } from '@countryconfig/form/common/custom-validation-conditionals/custom-conditionals'`
`12`	`13`	`import { Event } from '@countryconfig/form/types/types'`
`13`	`14`	`import { Request, ResponseToolkit } from '@hapi/hapi'`
`14`	`15`	`import { ActionType, event, field } from '@opencrvs/toolkit/events'`
	`16`	`+import { x } from 'joi'`
`15`	`17`
`16`	`18`	`type FontFamilyTypes = {`
`17`	`19`	`normal: string`
`@@ -419,5 +421,5 @@ export async function certificateHandler(request: Request, h: ResponseToolkit) {`
`419`	`421`	`}`
`420`	`422`	`}`
`421`	`423`	`]`
`422`		`- return certificateConfigs`
	`424`	`+ return certificateConfigs.map((x) => ({ ...x, conditionals: [] }))`
`423`	`425`	`}`