@opencrvs/mosip 1.8.0-beta.1 → 1.8.0-beta.11

package/build/forms.d.ts

@@ -93,7 +93,7 @@ export declare const esignetHidden: () => {
     name: string;
     type: string;
 };
-export declare const idReader: (event: string, sectionId: string, conditionals: any[], readers: any[]) => {
+export declare const idReader: (event: string, sectionId: string, conditionals: any[], readers: any[], esignetCallbackFieldName?: string) => {
     name: string;
     customQuestionMappingId: string;
     custom: boolean;
@@ -104,7 +104,10 @@ export declare const idReader: (event: string, sectionId: string, conditionals:
         defaultMessage: string;
     };
     hideInPreview: boolean;
-    initialValue: string;
+    initialValue: string | {
+        dependsOn: string[];
+        expression: string;
+    };
     validator: never[];
     conditionals: any[];
     dividerLabel: {
@@ -210,7 +213,12 @@ export declare const getInitialValueFromIDReader: (fieldNameInReader: string) =>
     dependsOn: 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[];
+type IDReaderParams = {
+    (event: "birth" | "death", section: "informant" | "mother" | "father" | "spouse" | "deceased", qrConfig: QRConfig, esignetConfig: ESignetConfig, verifiedCustomFieldMapping: any, conditionals?: any[]): any[];
+    (event: "birth" | "death", section: "informant" | "mother" | "father" | "spouse" | "deceased", qrConfig: QRConfig, esignetConfig: undefined, verifiedCustomFieldMapping: any, conditionals?: any[]): any[];
+    (event: "birth" | "death", section: "informant" | "mother" | "father" | "spouse" | "deceased", qrConfig: undefined, esignetConfig: ESignetConfig, verifiedCustomFieldMapping: any, conditionals?: any[]): any[];
+};
+export declare const idReaderFields: IDReaderParams;
 export declare const idVerificationFields: (event: string, sectionId: string, mapping: any, conditionals?: any[], esignetConfig?: ESignetConfig) => ({
     name: string;
     fieldId: string;

package/build/forms.js

@@ -113,9 +113,17 @@ const esignetHidden = () => {
     };
 };
 exports.esignetHidden = esignetHidden;
-const idReader = (event, sectionId, conditionals, readers) => {
+const idReader = (event, sectionId, conditionals, readers, 
+/** E-Signet callback field name */
+esignetCallbackFieldName) => {
     const fieldName = "idReader";
     const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
+    const initialValue = esignetCallbackFieldName
+        ? {
+            dependsOn: [esignetCallbackFieldName],
+            expression: "''",
+        }
+        : "";
     return {
         name: fieldName,
         customQuestionMappingId: fieldId,
@@ -127,7 +135,7 @@ const idReader = (event, sectionId, conditionals, readers) => {
             defaultMessage: "ID verification",
         },
         hideInPreview: true,
-        initialValue: "",
+        initialValue,
         validator: [],
         conditionals,
         dividerLabel: {
@@ -242,12 +250,15 @@ const getInitialValueFromIDReader = (fieldNameInReader) => ({
 });
 exports.getInitialValueFromIDReader = getInitialValueFromIDReader;
 const idReaderFields = (event, section, qrConfig, esignetConfig, verifiedCustomFieldMapping, conditionals = []) => {
-    const readers = [(0, exports.qr)(qrConfig)];
+    const readers = [];
+    if (qrConfig) {
+        readers.push((0, exports.qr)(qrConfig));
+    }
     const fields = [
         (0, exports.idReader)(event, section, conditionals.concat({
             action: "hide",
             expression: "$form?.verified === 'verified' || $form?.verified === 'authenticated' || $form?.verified === 'failed' || $form?.verified === 'failedFetchIdDetails' || !!$form?.esignetCallback?.loading",
-        }), readers),
+        }), readers, esignetConfig?.callback.fieldName),
     ];
     if (esignetConfig) {
         readers.push((0, exports.esignet)(esignetConfig.esignetAuthUrl, esignetConfig.openIdProviderClientId, esignetConfig.openIdProviderClaims, esignetConfig.fieldName, esignetConfig.callback.fieldName));

package/build/transform.d.ts

@@ -24,6 +24,7 @@ export interface MOSIPPayload {
         email: string;
         phone: string;
         guardianOrParentBirthCertificateNumber: string;
+        deathCertificateNumber: string;
         birthCertificateNumber: string;
         addressLine1: string;
         addressLine2: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/mosip",
-  "version": "1.8.0-beta.1",
+  "version": "1.8.0-beta.11",
   "license": "MPL-2.0",
   "main": "./build/index.js",
   "exports": {

package/src/forms.ts

@@ -139,9 +139,17 @@ export const idReader = (
   sectionId: string,
   conditionals: any[],
   readers: any[],
+  /** E-Signet callback field name */
+  esignetCallbackFieldName?: string,
 ) => {
   const fieldName: string = "idReader";
   const fieldId: string = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
+  const initialValue = esignetCallbackFieldName
+    ? {
+        dependsOn: [esignetCallbackFieldName],
+        expression: "''",
+      }
+    : "";
   return {
     name: fieldName,
     customQuestionMappingId: fieldId,
@@ -153,7 +161,7 @@ export const idReader = (
       defaultMessage: "ID verification",
     },
     hideInPreview: true,
-    initialValue: "",
+    initialValue,
     validator: [],
     conditionals,
     dividerLabel: {
@@ -323,15 +331,47 @@ export const getInitialValueFromIDReader = (fieldNameInReader: string) => ({
   expression: `$form?.idReader?.${fieldNameInReader} || $form?.esignetCallback?.data?.${fieldNameInReader} || ""`,
 });
 
-export const idReaderFields = (
+// Define a type def so that a country implementor cannot
+// provide both QR and E-Signet config undefined at the same time
+type IDReaderParams = {
+  (
+    event: "birth" | "death",
+    section: "informant" | "mother" | "father" | "spouse" | "deceased",
+    qrConfig: QRConfig,
+    esignetConfig: ESignetConfig,
+    verifiedCustomFieldMapping: any,
+    conditionals?: any[],
+  ): any[];
+  (
+    event: "birth" | "death",
+    section: "informant" | "mother" | "father" | "spouse" | "deceased",
+    qrConfig: QRConfig,
+    esignetConfig: undefined,
+    verifiedCustomFieldMapping: any,
+    conditionals?: any[],
+  ): any[];
+  (
+    event: "birth" | "death",
+    section: "informant" | "mother" | "father" | "spouse" | "deceased",
+    qrConfig: undefined,
+    esignetConfig: ESignetConfig,
+    verifiedCustomFieldMapping: any,
+    conditionals?: any[],
+  ): any[];
+};
+
+export const idReaderFields: IDReaderParams = (
   event: "birth" | "death",
   section: "informant" | "mother" | "father" | "spouse" | "deceased",
-  qrConfig: QRConfig,
+  qrConfig: QRConfig | undefined,
   esignetConfig: ESignetConfig | undefined,
   verifiedCustomFieldMapping: any,
   conditionals: any[] = [],
 ) => {
-  const readers: any[] = [qr(qrConfig)];
+  const readers: any[] = [];
+  if (qrConfig) {
+    readers.push(qr(qrConfig));
+  }
   const fields: any[] = [
     idReader(
       event,
@@ -342,6 +382,7 @@ export const idReaderFields = (
           "$form?.verified === 'verified' || $form?.verified === 'authenticated' || $form?.verified === 'failed' || $form?.verified === 'failedFetchIdDetails' || !!$form?.esignetCallback?.loading",
       }),
       readers,
+      esignetConfig?.callback.fieldName,
     ),
   ];
   if (esignetConfig) {

package/src/transform.ts

@@ -22,6 +22,7 @@ export interface MOSIPPayload {
     email: string;
     phone: string;
     guardianOrParentBirthCertificateNumber: string;
+    deathCertificateNumber: string;
     birthCertificateNumber: string;
     addressLine1: string;
     addressLine2: string;