Fix conflict

.github/workflows/deploy-prod.yml

@@ -13,7 +13,7 @@ on:
       core-image-tag:
         description: Core DockerHub image tag
         required: true
-        default: 'v1.3.0'
+        default: 'v1.3.1'
       countryconfig-image-tag:
         description: Your Country Config DockerHub image tag
         required: true

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ on:
       core-image-tag:
         description: Core DockerHub image tag
         required: true
-        default: 'v1.3.0'
+        default: 'v1.3.1'
       countryconfig-image-tag:
         description: Your Country Config DockerHub image tag
         required: true

infrastructure/docker-compose.deploy.yml

@@ -283,6 +283,10 @@ services:
       - '/data/minio:/data'
     command: server --console-address ":9001" /data
     deploy:
+      replicas: 1
+      placement:
+        constraints:
+          - node.labels.data1 == true
       labels:
         - 'traefik.enable=true'
         - 'traefik.docker.network=opencrvs_overlay_net'
@@ -321,7 +325,7 @@ services:
       options:
         gelf-address: 'udp://127.0.0.1:12201'
         tag: 'minio'
-  
+
   setup-elasticsearch-users:
     image: ubuntu:bionic
     entrypoint: ['bash', '/usr/app/setup.sh']
@@ -725,6 +729,9 @@ services:
       - HEARTH_MONGO_URL=mongodb://hearth:${HEARTH_MONGODB_PASSWORD}@mongo1/hearth-dev?replicaSet=rs0
       - DASHBOARD_MONGO_URL=mongodb://performance:${PERFORMANCE_MONGODB_PASSWORD}@mongo1/performance?replicaSet=rs0
     deploy:
+      placement:
+        constraints:
+          - node.labels.data1 == true
       labels:
         - 'traefik.enable=false'
       replicas: 1

infrastructure/emergency-backup-metadata.sh

@@ -286,14 +286,19 @@ else
 fi
 
 echo "Creating a backup for Minio"
-cd $ROOT_PATH/minio && tar -zcvf $ROOT_PATH/backups/minio/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz . && cd /
+
+LOCAL_MINIO_BACKUP=$ROOT_PATH/backups/minio/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz
+cd $ROOT_PATH/minio && tar -zcvf $LOCAL_MINIO_BACKUP . && cd /
 
 echo "Creating a backup for Metabase"
 
-cd $ROOT_PATH/metabase && tar -zcvf $ROOT_PATH/backups/metabase/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz . && cd /
+LOCAL_METABASE_BACKUP=$ROOT_PATH/backups/metabase/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz
+cd $ROOT_PATH/metabase && tar -zcvf $LOCAL_METABASE_BACKUP . && cd /
 
 echo "Creating a backup for VSExport"
-cd $ROOT_PATH/vsexport && tar -zcvf $ROOT_PATH/backups/vsexport/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz . && cd /
+
+LOCAL_VSEXPORT_BACKUP=$ROOT_PATH/backups/vsexport/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz
+cd $ROOT_PATH/vsexport && tar -zcvf $LOCAL_VSEXPORT_BACKUP . && cd /
 
 if [[ "$IS_LOCAL" = true ]]; then
   echo $WORKING_DIR
@@ -305,8 +310,8 @@ fi
 #----------------------------------------------------
 if [[ "$OWN_IP" = "$PRODUCTION_IP" || "$OWN_IP" = "$(dig $PRODUCTION_IP +short)" ]]; then
   script -q -c "rsync -a -r --progress --rsh='ssh -p$SSH_PORT' $ROOT_PATH/backups/elasticsearch/ $SSH_USER@$SSH_HOST:$REMOTE_DIR/elasticsearch" && echo "Copied elasticsearch backup files to remote server."
-  script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $ROOT_PATH/backups/minio/${LABEL:-$BACKUP_DATE} $SSH_USER@$SSH_HOST:$REMOTE_DIR/minio" && echo "Copied minio backup files to remote server."
-  script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $ROOT_PATH/backups/metabase/${LABEL:-$BACKUP_DATE} $SSH_USER@$SSH_HOST:$REMOTE_DIR/metabase" && echo "Copied Metabase backup files to remote server."
+  script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $LOCAL_MINIO_BACKUP $SSH_USER@$SSH_HOST:$REMOTE_DIR/minio" && echo "Copied minio backup files to remote server."
+  script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $LOCAL_METABASE_BACKUP $SSH_USER@$SSH_HOST:$REMOTE_DIR/metabase" && echo "Copied Metabase backup files to remote server."
   script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $ROOT_PATH/backups/influxdb/${LABEL:-$BACKUP_DATE} $SSH_USER@$SSH_HOST:$REMOTE_DIR/influxdb" && echo "Copied influx backup files to remote server."
   script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $ROOT_PATH/backups/mongo/hearth-dev-${LABEL:-$BACKUP_DATE}.gz $SSH_USER@$SSH_HOST:$REMOTE_DIR/mongo" && echo "Copied hearth backup files to remote server."
   script -q -c "rsync -a -r --ignore-existing --progress --rsh='ssh -p$SSH_PORT' $ROOT_PATH/backups/mongo/user-mgnt-${LABEL:-$BACKUP_DATE}.gz $SSH_USER@$SSH_HOST:$REMOTE_DIR/mongo" && echo "Copied user backup files to remote server."

infrastructure/server-setup/playbook-1.yml

@@ -66,6 +66,11 @@
         name: python3-pip
         state: present
 
+    - name: 'Install jq'
+      apt:
+        name: jq
+        state: present
+
     - name: 'Install pexpect python module for ansible expect commands'
       pip:
         name: pexpect

infrastructure/server-setup/playbook-3.yml

@@ -74,6 +74,11 @@
         name: python3-pip
         state: present
 
+    - name: 'Install jq'
+      apt:
+        name: jq
+        state: present
+
     - name: 'Install pexpect python module for ansible expect commands'
       pip:
         name: pexpect
@@ -366,7 +371,7 @@
       apt:
         name: fail2ban
         state: present
-        
+
     - name: 'Copy fail2ban jail.local'
       copy:
         src: ../jail.local

infrastructure/server-setup/playbook-5.yml

@@ -64,6 +64,11 @@
         name: python3-pip
         state: present
 
+    - name: 'Install jq'
+      apt:
+        name: jq
+        state: present
+
     - name: 'Install pexpect python module for ansible expect commands'
       pip:
         name: pexpect
@@ -350,12 +355,12 @@
       ufw:
         rule: allow
         name: OpenSSH
-    
+
     - name: 'Install Fail2Ban'
       apt:
         name: fail2ban
         state: present
-        
+
     - name: 'Copy fail2ban jail.local'
       copy:
         src: ../jail.local

package.json

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

postman/Location.postman_collection.json

@@ -239,7 +239,7 @@
 					}
 				],
 				"url": {
-					"raw": "{{gateway}}/location?name=Ibombo",
+					"raw": "{{gateway}}/location?name=Ibombo&type=ADMIN_STRUCTURE",
 					"host": [
 						"{{gateway}}"
 					],
@@ -250,6 +250,10 @@
 						{
 							"key": "name",
 							"value": "Ibombo"
+						},
+						{
+							"key": "type",
+							"value": "ADMIN_STRUCTURE"
 						}
 					]
 				}
@@ -386,4 +390,4 @@
 			"response": []
 		}
 	]
-}
+}

src/api/application/application-config-default.ts

@@ -2,9 +2,6 @@ import { countryLogo } from '@countryconfig/api/application/country-logo'
 
 export const defaultApplicationConfig = {
   APPLICATION_NAME: 'Farajaland CRS',
-  FIELD_AGENT_AUDIT_LOCATIONS: 'DISTRICT',
-  DECLARATION_AUDIT_LOCATIONS: 'DISTRICT',
-  EXTERNAL_VALIDATION_WORKQUEUE: false,
   BIRTH: {
     REGISTRATION_TARGET: 30,
     LATE_REGISTRATION_TARGET: 365,
@@ -41,12 +38,17 @@ export const defaultApplicationConfig = {
     },
     PRINT_IN_ADVANCE: true
   },
+  // Following constants aren't configurable via UI
+  FIELD_AGENT_AUDIT_LOCATIONS: 'DISTRICT',
+  DECLARATION_AUDIT_LOCATIONS: 'DISTRICT',
+  EXTERNAL_VALIDATION_WORKQUEUE: false,
   MARRIAGE_REGISTRATION: true,
   DATE_OF_BIRTH_UNKNOWN: false,
   INFORMANT_SIGNATURE: true,
   INFORMANT_SIGNATURE_REQUIRED: true,
   USER_NOTIFICATION_DELIVERY_METHOD: 'email', // or 'sms', or '' ... You can use 'sms' for WhatsApp
-  INFORMANT_NOTIFICATION_DELIVERY_METHOD: 'email' // or 'sms', or '' ... You can use 'sms' for WhatsApp
+  INFORMANT_NOTIFICATION_DELIVERY_METHOD: 'email', // or 'sms', or '' ... You can use 'sms' for WhatsApp
+  SIGNATURE_REQUIRED_FOR_ROLES: ['LOCAL_REGISTRAR', 'NATIONAL_REGISTRAR']
 }
 
 export const COUNTRY_WIDE_CRUDE_DEATH_RATE = 10

src/api/content/client/client.json

@@ -86,6 +86,7 @@
         "certificate.parent.details.label.nationality": "Nationality",
         "certificate.parent.details.label.number": "Number",
         "certificate.parent.details.label.typeOfID": "Type of ID",
+        "certificate.parent.details.label.age": "Age",
         "certificate.receipt.amount": "Amount paid:",
         "certificate.receipt.amountDue": "Fee",
         "certificate.receipt.birthService.after": "Birth registration after {target} days of date of birth",
@@ -374,12 +375,12 @@
         "constants.registrationNumber": "Reg no.",
         "constants.issueCertificate": "Issue Certificate",
         "constants.collectorDetails": "Collector Details",
-        "constants.issueToMother": "Issue to informant (Mother)",
-        "constants.issueToFather": "Issue to informant (Father)",
-        "constants.issueToGroom": "Issue to informant (Groom)",
-        "constants.issueToBride": "Issue to informant (Bride)",
+        "constants.issueToMother": "Issue to mother",
+        "constants.issueToFather": "Issue to father",
+        "constants.issueToGroom": "Issue to groom",
+        "constants.issueToBride": "Issue to bride",
         "constants.issueToSomeoneElse": "Issue to someone else",
-        "constants.issueToInformant": "Issue to informant",
+        "constants.issueToInformant": "Issue to informant ({informant})",
         "constants.issueConfirmationMessage": "Please confirm that the certificate has been issued to the informant or collector.",
         "constants.idCheckWithoutVerify": "Continue without proof of ID?",
         "constants.requestReason": "Reason for request",
@@ -447,7 +448,7 @@
         "constants.requireUpdatesLoading": "Checking your declarations",
         "constants.integrations": "Integrations",
         "constants.assignRecord": "Assign record",
-        "correction.certificate.corrector.idCheck": "Check proof of ID",
+        "correction.certificate.corrector.idCheck": "Verify their identity",
         "constants.noConnection": "No connection",
         "constants.totalFileSizeExceed": "Total size of documents exceeds {fileSize}. Please reduce file size of your uploads",
         "constants.skipToMainContent": "Skip to main content",
@@ -484,7 +485,7 @@
         "correction.corrector.idCheck": "Check proof of ID",
         "correction.corrector.idCheckVerify": "Yes",
         "correction.corrector.idCheckWithoutVerify": "No",
-        "correction.corrector.informant": "Informant",
+        "correction.corrector.informant": "Informant ({informant})",
         "correction.corrector.legalGuardian": "Legal guardian",
         "correction.corrector.me": "Me",
         "correction.corrector.mother": "Mother",
@@ -873,8 +874,9 @@
         "form.field.label.app.whoContDet.grandSon": "Grandson",
         "form.field.label.app.whoContDet.legalGuardian": "Legal guardian",
         "form.field.label.app.whoContDet.mother": "Mother",
-        "form.field.label.app.certifyRecordTo.mother": "Print and issue to informant (Mother)",
-        "form.field.label.app.certifyRecordTo.father": "Print and issue to informant (Father)",
+        "form.field.label.app.certifyRecordTo.informant": "Print and issue to informant ({informant})",
+        "form.field.label.app.certifyRecordTo.mother": "Print and issue to mother",
+        "form.field.label.app.certifyRecordTo.father": "Print and issue to father",
         "form.field.label.app.whoContDet.other": "Other",
         "form.field.label.app.whoContDet.sister": "Sister",
         "form.field.label.app.whoContDet.sonInLaw": "Son in law",
@@ -1295,6 +1297,8 @@
         "home.header.advancedSearch": "Advanced Search",
         "home.header.typePhone": "Phone no.",
         "home.header.nationalId": "National ID",
+        "home.header.email": "Email",
+        "home.header.placeHolderEmail": "Search for an email.",
         "imageUploadOption.upload.documentType": "Please select the type of document first",
         "imageUploadOption.upload.error": "File format not supported. Please upload a .png or .jpg (max 5mb)",
         "imageUploadOption.upload.imageFormat": "File format not supported. Please upload a .png or .jpg (max 5mb)",
@@ -1378,9 +1382,9 @@
         "form.field.label.informantRelation.groomAndBride": "Groom & Bride",
         "form.field.label.informantRelation.groom": "Groom",
         "form.field.label.informantRelation.bride": "Bride",
-        "form.section.groom.name": "Groom",
+        "form.section.groom.name": "Print and issue to groom",
         "form.section.groom.title": "Groom's details",
-        "form.section.bride.name": "Bride",
+        "form.section.bride.name": "Print and issue to bride",
         "form.section.bride.title": "Bride's details",
         "form.section.groom.headOfGroomFamily": "Head of groom's family",
         "form.section.bride.headOfBrideFamily": "Head of bride's family",
@@ -2188,6 +2192,7 @@
         "certificate.parent.details.label.nationality": "Nationalité",
         "certificate.parent.details.label.number": "Numéro",
         "certificate.parent.details.label.typeOfID": "Type de carte d'identité",
+        "certificate.parent.details.label.age": "L'âge",
         "certificate.receipt.amount": "Montant payé :",
         "certificate.receipt.amountDue": "Droits d'inscription",
         "certificate.receipt.birthService.after": "Enregistrement de la naissance après {target} jours de la date de naissance",
@@ -2573,7 +2578,7 @@
         "verifyCertificate.toastMessage": "Après avoir vérifié le certificat, veuillez fermer la fenêtre du navigateur.",
         "verifyCertificate.sexFemale": "Femme",
         "verifyCertificate.sexMale": "Homme",
-        "correction.certificate.corrector.idCheck": "Vérifiez la preuve d'identité. Correspond-elle aux détails suivants ?",
+        "correction.certificate.corrector.idCheck": "Vérifier leur identité",
         "correction.certificate.corrector.idCheckVerify": "Oui",
         "correction.certificate.corrector.idCheckWithoutVerify": "Non",
         "correction.certificate.corrector.otherIdCheck": "Avez-vous vérifié leur preuve d'identification ?",
@@ -2971,8 +2976,9 @@
         "form.field.label.app.whoContDet.grandSon": "Petit-fils",
         "form.field.label.app.whoContDet.legalGuardian": "Tuteur légal",
         "form.field.label.app.whoContDet.mother": "Mère",
-        "form.field.label.app.certifyRecordTo.mother": "Imprimer et délivrer à l'informateur (Mère)",
-        "form.field.label.app.certifyRecordTo.father": "Imprimer et délivrer à l'informateur (Père)",
+        "form.field.label.app.certifyRecordTo.informant": "Imprimer et remettre à l'informateur ({informant})",
+        "form.field.label.app.certifyRecordTo.mother": "Imprimer et remettre à la mère",
+        "form.field.label.app.certifyRecordTo.father": "Imprimer et remettre au père",
         "form.field.label.app.whoContDet.other": "Autre",
         "form.field.label.app.whoContDet.sister": "Sœur",
         "form.field.label.app.whoContDet.sonInLaw": "Beau-fils ou belle-fille",
@@ -3393,6 +3399,8 @@
         "home.header.advancedSearch": "Recherche avancée",
         "home.header.typePhone": "N° de téléphone",
         "home.header.nationalId": "Carte d'identité nationale",
+        "home.header.email": "E-mail",
+        "home.header.placeHolderEmail": "Recherchez un e-mail.",
         "imageUploadOption.upload.documentType": "Veuillez d'abord sélectionner le type de document",
         "imageUploadOption.upload.error": "Format de fichier non pris en charge. Veuillez joindre un png, jpg (max 5mb)",
         "imageUploadOption.upload.imageFormat": "Le format d'image n'est pas supporté. Veuillez joindre un png ou un jpg (max 5mb)",
@@ -3476,9 +3484,9 @@
         "form.field.label.informantRelation.groomAndBride": "Le marié et la mariée",
         "form.field.label.informantRelation.groom": "Marié",
         "form.field.label.informantRelation.bride": "Mariée",
-        "form.section.groom.name": "Marié",
+        "form.section.groom.name": "Imprimer et envoyer au marié",
         "form.section.groom.title": "Détails du marié",
-        "form.section.bride.name": "Mariée",
+        "form.section.bride.name": "Imprimer et envoyer à la mariée",
         "form.section.bride.title": "Détails de la mariée",
         "form.section.groom.headOfGroomFamily": "Chef de la famille du marié",
         "form.section.bride.headOfBrideFamily": "Chef de la famille de la mariée",

src/api/content/client/descriptions.json

@@ -470,6 +470,7 @@
     "print.certificate.manualPaymentMethod": "The label for select option for manual payment method",
     "print.certificate.collector.mother": "The label for select value when mother is the collector of certificate",
     "certificate.parent.details.label.nationality": "Parent Nationality",
+    "certificate.parent.details.label.age": "Person age",
     "certificate.parent.details.label.number": "Parent number",
     "print.certificate.collector.other": "The label for select value when the collector of certificate is other person",
     "print.certificate.payment": "The title for payment section",
@@ -714,13 +715,15 @@
     "duplicates.content.notDuplicateConfirmationTitle": "Not a duplicate content confirmation title message",
     "duplicates.compare.title": "Duplicate compare page title message",
     "duplicates.compare.supportingDocuments": "Supporting documents header for duplicates comparison",
+    "home.header.email": "Search email type",
     "home.header.typeRN": "Search menu brn drn type",
     "home.header.typePhone": "Search menu phone no type",
     "home.header.nationalId": "Search menu national ID type",
     "home.header.placeHolderTrackingId": "Search menu tracking id place holder",
     "home.header.placeHolderBrnDrn": "Search menu brn drn place holder",
     "home.header.placeHolderPhone": "Search menu phone no place holder",
     "home.header.placeHolderNationalId": "Search menu national ID place holder",
+    "home.header.placeHolderEmail": "Search menu email place holder",
     "home.header.systemTitle": "System title",
     "home.header.settingsTitle": "settings title",
     "home.header.helpTitle": "Help title",