merge master to develop (#858)

.github/workflows/deploy-prod.yml

@@ -13,7 +13,7 @@ on:
       core-image-tag:
         description: Core DockerHub image tag
         required: true
-        default: 'v1.3.1'
+        default: 'v1.3.2'
       countryconfig-image-tag:
         description: Your Country Config DockerHub image tag
         required: true
@@ -68,7 +68,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-  
+
       - name: Wait for images to be available
         run: |
           while true; do
@@ -83,7 +83,6 @@ jobs:
             fi
             sleep 10
           done
-  
 
       - name: Deploy to ${{ github.event.inputs.environment }}
         env:

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ on:
       core-image-tag:
         description: Core DockerHub image tag
         required: true
-        default: 'v1.3.1'
+        default: 'v1.3.2'
       countryconfig-image-tag:
         description: Your Country Config DockerHub image tag
         required: true
@@ -71,7 +71,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-  
+
       - name: Wait for images to be available
         run: |
           while true; do

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/countryconfig",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "OpenCRVS country configuration for reference data",
   "license": "MPL-2.0",
   "husky": {

src/api/content/client/descriptions.json

@@ -1063,6 +1063,7 @@
     "misc.title.declarationStatus": "Title for review action component",
     "review.actions.description.confirmComplete": "Description for review action component when complete declaration",
     "review.actions.description.confirmInComplete": "Description for review action component when incomplete declaration",
+    "review.actions.description.hasError": "Description for review action component when declaration has errors on fields",
     "review.actions.title.declarationStatus": "Title for review action component",
     "review.form.section.review.name": "Form section name for Review",
     "review.form.section.review.title": "Form section title for Review",

src/form/birth/index.ts

@@ -59,7 +59,9 @@ import {
   fatherFirstNameConditionals,
   fatherFamilyNameConditionals,
   informantNotMotherOrFather,
-  detailsExistConditional
+  detailsExistConditional,
+  ageOfIndividualConditionals,
+  ageOfParentsConditionals
 } from '../common/default-validation-conditionals'
 import {
   getNationalIDValidators,
@@ -248,7 +250,8 @@ export const birthForm: ISerializedForm = {
               formMessageDescriptors.ageOfInformant,
               exactDateOfBirthUnknownConditional.concat(
                 hideIfInformantMotherOrFather
-              )
+              ),
+              ageOfIndividualConditionals
             ),
             getNationality(
               certificateHandlebars.informantNationality,
@@ -319,7 +322,10 @@ export const birthForm: ISerializedForm = {
             exactDateOfBirthUnknown(detailsExistConditional),
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfMother,
-              exactDateOfBirthUnknownConditional.concat(detailsExistConditional)
+              exactDateOfBirthUnknownConditional.concat(
+                detailsExistConditional
+              ),
+              ageOfParentsConditionals
             ),
             getNationality(
               certificateHandlebars.motherNationality,
@@ -395,7 +401,10 @@ export const birthForm: ISerializedForm = {
             exactDateOfBirthUnknown(detailsExistConditional),
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfFather,
-              exactDateOfBirthUnknownConditional.concat(detailsExistConditional)
+              exactDateOfBirthUnknownConditional.concat(
+                detailsExistConditional
+              ),
+              ageOfParentsConditionals
             ),
             getNationality(
               certificateHandlebars.fatherNationality,

src/form/common/common-optional-fields.ts

@@ -17,6 +17,7 @@ import {
 } from './select-options'
 import { certificateHandlebars } from '../birth/certificate-handlebars'
 import { getFieldMapping } from '@countryconfig/utils/mapping/field-mapping-utils'
+import { Validator } from '../types/validators'
 
 const exactDobConditional: Conditional[] = [
   {
@@ -53,27 +54,15 @@ export const exactDateOfBirthUnknown = (
 
 export const getAgeOfIndividualInYears = (
   label: MessageDescriptor,
-  conditionals: Conditional[]
+  conditionals: Conditional[],
+  validators: Validator[]
 ): SerializedFormField => ({
   name: 'ageOfIndividualInYears',
   type: 'NUMBER',
   label,
   required: true,
   initialValue: '',
-  validator: [
-    {
-      operation: 'range',
-      parameters: [12, 120]
-    },
-    {
-      operation: 'maxLength',
-      parameters: [3]
-    },
-    {
-      operation: 'isValidParentsBirthDate',
-      parameters: [10, true]
-    }
-  ],
+  validator: validators,
   conditionals,
   postfix: 'years',
   inputFieldWidth: '78px'

src/form/common/default-validation-conditionals.ts

@@ -230,6 +230,47 @@ export const brideOrGroomBirthDateValidators = (spouseType: string) => [
   }
 ]
 
+export const brideOrGroomAgeValidators = [
+  {
+    operation: 'range',
+    parameters: [18, 120]
+  },
+  {
+    operation: 'maxLength',
+    parameters: [3]
+  }
+] satisfies Validator[]
+
+export const ageOfIndividualConditionals: Validator[] = [
+  {
+    operation: 'range',
+    parameters: [12, 120]
+  },
+  {
+    operation: 'maxLength',
+    parameters: [3]
+  }
+]
+
+export const ageOfParentsConditionals = [
+  ...ageOfIndividualConditionals,
+  {
+    operation: 'isValidParentsBirthDate',
+    parameters: [10, true]
+  }
+] satisfies Validator[]
+
+export const ageOfDeceasedConditionals = [
+  {
+    operation: 'range',
+    parameters: [0, 120]
+  },
+  {
+    operation: 'maxLength',
+    parameters: [3]
+  }
+] satisfies Validator[]
+
 export const exactDateOfBirthUnknownConditional = [
   {
     action: 'hide',
@@ -286,10 +327,6 @@ export function getNationalIDValidators(configCase: string): Validator[] {
       {
         operation: 'duplicateIDNumber',
         parameters: ['bride.iD']
-      },
-      {
-        operation: 'duplicateIDNumber',
-        parameters: ['informant.informantID']
       }
     ]
   } else if (configCase === 'bride') {
@@ -301,10 +338,6 @@ export function getNationalIDValidators(configCase: string): Validator[] {
       {
         operation: 'duplicateIDNumber',
         parameters: ['groom.iD']
-      },
-      {
-        operation: 'duplicateIDNumber',
-        parameters: ['informant.informantID']
       }
     ]
   } else {

src/form/death/index.ts

@@ -15,8 +15,8 @@ import {
   getMaritalStatus,
   registrationEmail,
   registrationPhone,
-  divider,
-  getOccupation
+  divider
+  // getOccupation
 } from '../common/common-optional-fields'
 import {
   getGender,
@@ -44,6 +44,8 @@ import {
   hideIfNidIntegrationEnabled,
   informantBirthDateConditionals,
   informantFamilyNameConditionals,
+  ageOfIndividualConditionals,
+  ageOfDeceasedConditionals,
   informantFirstNameConditionals,
   exactDateOfBirthUnknownConditional,
   isValidBirthDate /*,
@@ -192,8 +194,9 @@ export const deathForm = {
             ), // Required field.,
             exactDateOfBirthUnknown([]),
             getAgeOfIndividualInYears(
-              formMessageDescriptors.ageOfInformant,
-              exactDateOfBirthUnknownConditional
+              formMessageDescriptors.ageOfDeceased,
+              exactDateOfBirthUnknownConditional,
+              ageOfDeceasedConditionals
             ),
             getNationality(certificateHandlebars.deceasedNationality, []),
             getNationalID(
@@ -274,7 +277,8 @@ export const deathForm = {
             exactDateOfBirthUnknown([]),
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfInformant,
-              exactDateOfBirthUnknownConditional
+              exactDateOfBirthUnknownConditional,
+              ageOfIndividualConditionals
             ),
             getNationality(certificateHandlebars.informantNationality, []),
             getNationalID(

src/form/marriage/index.ts

@@ -41,6 +41,8 @@ import {
 } from './required-fields'
 import { Event, ISerializedForm } from '../types/types'
 import {
+  ageOfIndividualConditionals,
+  brideOrGroomAgeValidators,
   exactDateOfBirthUnknownConditional,
   getNationalIDValidators
 } from '../common/default-validation-conditionals'
@@ -128,7 +130,8 @@ export const marriageForm: ISerializedForm = {
               formMessageDescriptors.ageOfInformant,
               exactDateOfBirthUnknownConditional.concat(
                 hideIfInformantBrideOrGroom
-              )
+              ),
+              ageOfIndividualConditionals
             ),
             getNationality(
               certificateHandlebars.informantNationality,
@@ -183,7 +186,8 @@ export const marriageForm: ISerializedForm = {
             exactDateOfBirthUnknown([]),
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfGroom,
-              exactDateOfBirthUnknownConditional
+              exactDateOfBirthUnknownConditional,
+              brideOrGroomAgeValidators
             ),
             getNationality(certificateHandlebars.groomNationality, []), // Required field
             getNationalID(
@@ -230,12 +234,11 @@ export const marriageForm: ISerializedForm = {
               certificateHandlebars.brideBirthDate
             ), // Required field
             exactDateOfBirthUnknown([]),
-            getAgeOfIndividualInYears(formMessageDescriptors.ageOfBride, [
-              {
-                action: 'hide',
-                expression: '!values.exactDateOfBirthUnknown'
-              }
-            ]),
+            getAgeOfIndividualInYears(
+              formMessageDescriptors.ageOfBride,
+              exactDateOfBirthUnknownConditional,
+              brideOrGroomAgeValidators
+            ),
             getNationality(certificateHandlebars.brideNationality, []), // Required field
             getNationalID(
               'iD',