@opencrvs/mosip 1.7.0-alpha.23 → 1.7.0-alpha.25

package/build/forms.d.ts

@@ -162,7 +162,7 @@ export declare const verified: (event: string, sectionId: string, mapping: any,
     mapping: any;
 };
 type VerificationStatus = "verified" | "failed" | "authenticated";
-export declare const idVerificationBanner: (event: string, sectionId: string, status: VerificationStatus) => {
+export declare const idVerificationBanner: (event: string, sectionId: string, status: VerificationStatus, conditionals?: any[]) => {
     name: string;
     type: string;
     fieldId: string;
@@ -175,10 +175,7 @@ export declare const idVerificationBanner: (event: string, sectionId: string, st
         defaultMessage: string;
     };
     validator: never[];
-    conditionals: {
-        action: string;
-        expression: string;
-    }[];
+    conditionals: any[];
 };
 export declare function esignetLoaderField({ event, section, fieldName, esignetCallbackFieldName, }: {
     event: "birth" | "death";
@@ -209,7 +206,7 @@ export declare const getInitialValueFromIDReader: (fieldNameInReader: string) =>
     expression: string;
 };
 export declare const idReaderFields: (event: "birth" | "death", section: "informant" | "mother" | "father" | "spouse" | "deceased", qrConfig: QRConfig, esignetConfig: ESignetConfig | undefined, verifiedCustomFieldMapping: any, conditionals?: any[]) => any[];
-export declare const idVerificationFields: (event: string, sectionId: string, mapping: any, esignetConfig?: ESignetConfig) => ({
+export declare const idVerificationFields: (event: string, sectionId: string, mapping: any, conditionals?: any[], esignetConfig?: ESignetConfig) => ({
     name: string;
     fieldId: string;
     customQuestionMappingId: string;
@@ -238,9 +235,6 @@ export declare const idVerificationFields: (event: string, sectionId: string, ma
         defaultMessage: string;
     };
     validator: never[];
-    conditionals: {
-        action: string;
-        expression: string;
-    }[];
+    conditionals: any[];
 })[];
 export {};

package/build/forms.js

@@ -177,7 +177,7 @@ exports.verified = verified;
 function capitalize(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
-const idVerificationBanner = (event, sectionId, status) => {
+const idVerificationBanner = (event, sectionId, status, conditionals = []) => {
     const fieldName = "verified";
     const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
     return {
@@ -187,18 +187,18 @@ const idVerificationBanner = (event, sectionId, status) => {
         hideInPreview: true,
         custom: true,
         bannerType: status,
-        idFieldName: "idReader",
+        idFieldName: status === "authenticated" ? "esignetCallback" : "idReader",
         label: {
             id: "form.field.label.empty",
             defaultMessage: "",
         },
         validator: [],
-        conditionals: [
+        conditionals: conditionals.concat([
             {
                 action: "hide",
                 expression: `$form?.verified !== "${status}"`,
             },
-        ],
+        ]),
     };
 };
 exports.idVerificationBanner = idVerificationBanner;
@@ -256,21 +256,21 @@ const idReaderFields = (event, section, qrConfig, esignetConfig, verifiedCustomF
         }
         return [
             ...fields,
-            ...(0, exports.idVerificationFields)(event, section, verifiedCustomFieldMapping, esignetConfig),
+            ...(0, exports.idVerificationFields)(event, section, verifiedCustomFieldMapping, conditionals, esignetConfig),
         ];
     }
     return [
         ...fields,
-        ...(0, exports.idVerificationFields)(event, section, verifiedCustomFieldMapping),
+        ...(0, exports.idVerificationFields)(event, section, verifiedCustomFieldMapping, conditionals),
     ];
 };
 exports.idReaderFields = idReaderFields;
-const idVerificationFields = (event, sectionId, mapping, esignetConfig) => {
+const idVerificationFields = (event, sectionId, mapping, conditionals = [], esignetConfig) => {
     return [
         (0, exports.verified)(event, sectionId, mapping, esignetConfig),
-        (0, exports.idVerificationBanner)(event, sectionId, "verified"),
-        (0, exports.idVerificationBanner)(event, sectionId, "failed"),
-        (0, exports.idVerificationBanner)(event, sectionId, "authenticated"),
+        (0, exports.idVerificationBanner)(event, sectionId, "verified", conditionals),
+        (0, exports.idVerificationBanner)(event, sectionId, "failed", conditionals),
+        (0, exports.idVerificationBanner)(event, sectionId, "authenticated", conditionals),
     ];
 };
 exports.idVerificationFields = idVerificationFields;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/mosip",
-  "version": "1.7.0-alpha.23",
+  "version": "1.7.0-alpha.25",
   "license": "MPL-2.0",
   "main": "./build/index.js",
   "exports": {

package/src/forms.ts

@@ -243,6 +243,7 @@ export const idVerificationBanner = (
   event: string,
   sectionId: string,
   status: VerificationStatus,
+  conditionals: any[] = [],
 ) => {
   const fieldName = "verified";
   const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
@@ -253,18 +254,18 @@ export const idVerificationBanner = (
     hideInPreview: true,
     custom: true,
     bannerType: status,
-    idFieldName: "idReader",
+    idFieldName: status === "authenticated" ? "esignetCallback" : "idReader",
     label: {
       id: "form.field.label.empty",
       defaultMessage: "",
     },
     validator: [],
-    conditionals: [
+    conditionals: conditionals.concat([
       {
         action: "hide",
         expression: `$form?.verified !== "${status}"`,
       },
-    ],
+    ]),
   };
 };
 
@@ -362,25 +363,32 @@ export const idReaderFields = (
         event,
         section,
         verifiedCustomFieldMapping,
+        conditionals,
         esignetConfig,
       ),
     ];
   }
   return [
     ...fields,
-    ...idVerificationFields(event, section, verifiedCustomFieldMapping),
+    ...idVerificationFields(
+      event,
+      section,
+      verifiedCustomFieldMapping,
+      conditionals,
+    ),
   ];
 };
 export const idVerificationFields = (
   event: string,
   sectionId: string,
   mapping: any,
+  conditionals: any[] = [],
   esignetConfig?: ESignetConfig,
 ) => {
   return [
     verified(event, sectionId, mapping, esignetConfig),
-    idVerificationBanner(event, sectionId, "verified"),
-    idVerificationBanner(event, sectionId, "failed"),
-    idVerificationBanner(event, sectionId, "authenticated"),
+    idVerificationBanner(event, sectionId, "verified", conditionals),
+    idVerificationBanner(event, sectionId, "failed", conditionals),
+    idVerificationBanner(event, sectionId, "authenticated", conditionals),
   ];
 };