From eb8cf516b9a42f9054cd4e3506e8b8e5950bbfc1 Mon Sep 17 00:00:00 2001 From: tahmidrahman-dsi Date: Fri, 7 Mar 2025 15:39:03 +0600 Subject: [PATCH 1/2] fix: pass id readers fields conditionals to the banner fields --- packages/country-config/src/forms.ts | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/country-config/src/forms.ts b/packages/country-config/src/forms.ts index 5d993ab..0382ba3 100644 --- a/packages/country-config/src/forms.ts +++ b/packages/country-config/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}`; @@ -259,12 +260,12 @@ export const idVerificationBanner = ( 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), ]; }; From 5c6e73d252ac4d8e05c3d28b60bb855694004969 Mon Sep 17 00:00:00 2001 From: tahmidrahman-dsi Date: Fri, 7 Mar 2025 15:41:07 +0600 Subject: [PATCH 2/2] chore: bump package version --- package.json | 2 +- packages/country-config/package.json | 2 +- packages/esignet-mock/package.json | 2 +- packages/mosip-api/package.json | 2 +- packages/mosip-mock/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index dcff43f..96ba440 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opencrvs/mosip", - "version": "1.7.0-alpha.24", + "version": "1.7.0-alpha.25", "license": "MPL-2.0", "private": true, "packageManager": "yarn@1.22.13", diff --git a/packages/country-config/package.json b/packages/country-config/package.json index a4735c9..8d999a8 100644 --- a/packages/country-config/package.json +++ b/packages/country-config/package.json @@ -1,6 +1,6 @@ { "name": "@opencrvs/mosip", - "version": "1.7.0-alpha.24", + "version": "1.7.0-alpha.25", "license": "MPL-2.0", "main": "./build/index.js", "exports": { diff --git a/packages/esignet-mock/package.json b/packages/esignet-mock/package.json index 75e8d3a..9fd1d5d 100644 --- a/packages/esignet-mock/package.json +++ b/packages/esignet-mock/package.json @@ -1,7 +1,7 @@ { "name": "@opencrvs/esignet-mock", "license": "MPL-2.0", - "version": "1.7.0-alpha.24", + "version": "1.7.0-alpha.25", "main": "index.js", "scripts": { "dev": "NODE_ENV=development tsx watch src/index.ts", diff --git a/packages/mosip-api/package.json b/packages/mosip-api/package.json index 8cc9a30..e41603a 100644 --- a/packages/mosip-api/package.json +++ b/packages/mosip-api/package.json @@ -1,6 +1,6 @@ { "name": "@opencrvs/mosip-api", - "version": "1.7.0-alpha.24", + "version": "1.7.0-alpha.25", "license": "MPL-2.0", "scripts": { "dev": "NODE_ENV=development tsx watch src/index.ts", diff --git a/packages/mosip-mock/package.json b/packages/mosip-mock/package.json index dcd7f75..ff71d24 100644 --- a/packages/mosip-mock/package.json +++ b/packages/mosip-mock/package.json @@ -1,6 +1,6 @@ { "name": "@opencrvs/mosip-mock", - "version": "1.7.0-alpha.24", + "version": "1.7.0-alpha.25", "license": "MPL-2.0", "scripts": { "dev": "NODE_ENV=development tsx watch src/index.ts",