OHRI-1737: Fix Unique ID number disappearance when the user fills Patient Type at Enrolment information

.github/workflows/ohri-namibia.yml

@@ -0,0 +1,115 @@
+name: OHRI Nambia Distro Container
+
+on:
+  push:
+    branches:
+      - "*" 
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  docker_setup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+  docker_namibia_distro_backend:
+    runs-on: ubuntu-latest
+    needs: docker_setup
+
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/o3-ohri-namibia-backend-distro-2_6:latest,${{ secrets.DOCKERHUB_USERNAME }}/o3-ohri-namibia-backend-distro--2_6:ci_${{ github.run_number }}
+          cache-from: type=inline,ref=user/app:buildcache
+          cache-to: type=inline,ref=user/app:buildcache,mode=max
+
+  docker_namibia_distro_frontend:
+    runs-on: ubuntu-latest
+    needs: docker_setup
+
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: ./frontend
+          file: ./frontend/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/o3-ohri-namibia-frontend-distro:latest,${{ secrets.DOCKERHUB_USERNAME }}/o3-ohri-namibia-frontend-distro:ci_${{ github.run_number }}
+          cache-from: type=inline,ref=user/app:buildcache
+          cache-to: type=inline,ref=user/app:buildcache,mode=max
+
+  docker_namibia_distro_gateway:
+    runs-on: ubuntu-latest
+    needs: docker_setup
+
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Build and push
+        id: build-and-push
+        uses: docker/build-push-action@v4
+        with:
+          context: ./gateway
+          file: ./gateway/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/o3-ohri-namibia-gateaway-distro:latest,${{ secrets.DOCKERHUB_USERNAME }}/o3-ohri-namibia-gateaway-distro:ci_${{ github.run_number }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      - name: Save image digest
+        run: echo "::set-output name=image::${{ steps.build-and-push.output.digest }}"

config/frontmodules_namibia_dev.json

@@ -0,0 +1,21 @@
+{
+    "imports": {
+    "@openmrs/esm-home-app": "./openmrs-esm-home-app-4.2.1-pre.229/openmrs-esm-home-app.js",
+    "@openmrs/esm-login-app": "./openmrs-esm-login-app-4.5.1-pre.804/openmrs-esm-login-app.js",
+    "@openmrs/esm-primary-navigation-app": "./openmrs-esm-primary-navigation-app-4.5.1-pre.804/openmrs-esm-primary-navigation-app.js",
+    "@openmrs/esm-implementer-tools-app": "./openmrs-esm-implementer-tools-app-4.5.1-pre.804/openmrs-esm-implementer-tools-app.js",
+
+    "@openmrs/esm-patient-chart-app": "./openmrs-esm-patient-chart-app-4.6.1-pre.1773/openmrs-esm-patient-chart-app.js",
+    "@openmrs/esm-patient-test-results-app": "./openmrs-esm-patient-test-results-app-4.6.1-pre.1773/openmrs-esm-patient-test-results-app.js",
+    "@openmrs/esm-patient-registration-app": "./openmrs-esm-patient-registration-app-4.5.1-pre.1683/openmrs-esm-patient-registration-app.js",
+    "@openmrs/esm-patient-banner-app": "./openmrs-esm-patient-banner-app-4.6.1-pre.1773/openmrs-esm-patient-banner-app.js",
+    "@openmrs/esm-form-builder-app": "./openmrs-esm-form-builder-app-1.2.1-pre.436/openmrs-esm-form-builder-app.js",
+    "@openmrs/esm-patient-list-app": "./openmrs-esm-patient-list-app-4.5.1-pre.1683/openmrs-esm-patient-list-app.js",
+    "@openmrs/esm-patient-search-app": "./openmrs-esm-patient-search-app-4.5.1-pre.1683/openmrs-esm-patient-search-app.js",
+
+    "@ohri/openmrs-esm-ohri-core-app": "./ohri-openmrs-esm-ohri-core-app-1.0.10-pre.2710/ohri-core-app.js",
+    "@ohri/openmrs-esm-ohri-form-render-app": "./ohri-openmrs-esm-ohri-form-render-app-1.0.10-pre.2710/openmrs-esm-ohri-form-render-app.js",
+    "@ohri/openmrs-esm-ohri-pmtct": "./ohri-openmrs-esm-ohri-pmtct-1.zzw0.10-pre.2710/ohri-pmtct-app.js",
+    "@ohri/esm-namibia-emr-app": "./ohri-esm-namibia-emr-app-1.0.3-pre.40/esm-namibia-emr-app.js"
+    }
+}   

config/namibia_dev_frontend_map.json

@@ -0,0 +1,22 @@
+{
+    "imports": {
+    "@openmrs/esm-home-app": "4.2.1-pre. ",
+    "@openmrs/esm-login-app": "4.5.1-pre. ",
+    "@openmrs/esm-primary-navigation-app": "4.5.1-pre.804",
+    "@openmrs/esm-patient-notes-app": "4.6.1-pre.1773", 
+    "@openmrs/esm-implementer-tools-app": "4.5.1-pre.804",
+    "@openmrs/esm-patient-forms-app": "4.6.1-pre.1773",
+    "@openmrs/esm-patient-chart-app": "4.6.1-pre.1773",
+    "@openmrs/esm-patient-test-results-app": "4.6.1-pre.1773",
+    "@openmrs/esm-patient-registration-app": "4.5.1-pre.1683",
+    "@openmrs/esm-patient-banner-app": "4.6.1-pre.1773",
+    "@openmrs/esm-patient-appointments-app": "4.6.1-pre.1773",
+    "@openmrs/esm-form-builder-app": "1.2.1-pre.436",
+    "@openmrs/esm-patient-list-app": "4.5.1-pre.1683 ",
+    "@ohri/esm-namibia-emr-app": "1.0.3-pre.40/esm- ",
+    "@openmrs/esm-patient-search-app": "4.5.1-pre.1683 ",
+    "@ohri/openmrs-esm-ohri-core-app": "1.0.10-pre.2710",
+    "@ohri/openmrs-esm-ohri-form-render-app": "1.0.10-pre.2710",
+    "@ohri/openmrs-esm-ohri-pmtct": "1.0.10-pre.2710"
+    }
+}

distro/configuration/addresshierarchy/addressConfiguration.xml

@@ -5,13 +5,7 @@
       <field>COUNTRY</field>
       <nameMapping>Location.country</nameMapping>
       <sizeMapping>40</sizeMapping>
-      <elementDefault>Cambodia</elementDefault>
-      <requiredInHierarchy>true</requiredInHierarchy>
-    </addressComponent>
-    <addressComponent>
-      <field>STATE_PROVINCE</field>
-      <nameMapping>Location.province</nameMapping>
-      <sizeMapping>40</sizeMapping>
+      <elementDefault>Namibia</elementDefault>
       <requiredInHierarchy>true</requiredInHierarchy>
     </addressComponent>
     <addressComponent>
@@ -22,21 +16,22 @@
     </addressComponent>
     <addressComponent>
       <field>ADDRESS_1</field>
-      <nameMapping>impl.commune</nameMapping>
+      <nameMapping>Location</nameMapping>
       <sizeMapping>40</sizeMapping>
-      <requiredInHierarchy>true</requiredInHierarchy>
+      <requiredInHierarchy>false</requiredInHierarchy>
     </addressComponent>
     <addressComponent>
-      <field>CITY_VILLAGE</field>
-      <nameMapping>Location.village</nameMapping>
+      <field>ADDRESS_2</field>
+      <nameMapping>Address</nameMapping>
       <sizeMapping>40</sizeMapping>
-      <requiredInHierarchy>true</requiredInHierarchy>
+      <requiredInHierarchy>false</requiredInHierarchy>
     </addressComponent>
   </addressComponents>
   <lineByLineFormat>
-    <string>cityVillage, address1</string>
-    <string>countyDistrict, stateProvince</string>
     <string>country</string>
+    <string>countyDistrict</string>
+    <string>address1</string>
+    <string>address2</string>
   </lineByLineFormat>
   <addressHierarchyFile>
     <filename>addresshierarchy.csv</filename>