Elhadj pre reg

.github/workflows/prereg-ui-build-manual.yml

@@ -0,0 +1,54 @@
+name: Pre-registration UI build
+
+on: workflow_dispatch
+
+jobs:
+  build-pre-registration-ui:
+
+    runs-on: ubuntu-latest
+    env:
+      NAMESPACE: ${{ secrets.dev_namespace_docker_hub }}
+      SERVICE_NAME: pre-registration-ui
+      SERVICE_LOCATION: pre-registration-ui
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+
+      - name: npm install
+        run: cd ${{ env.SERVICE_LOCATION }} && npm install --ignore-scripts
+
+      - name: npm build
+        run: cd ${{ env.SERVICE_LOCATION }} && npm run-script build -- --prod --base-href . --output-path=dist
+      - name: Setup branch and env
+        run: |
+          # Strip git ref prefix from version
+          echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV
+          echo "GPG_TTY=$(tty)" >> $GITHUB_ENV
+      - name: setup environment
+        run: |
+          # Strip git ref prefix from version
+          echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV
+
+      - name: Build image
+        run: |
+          cd "./${{env.SERVICE_LOCATION}}"
+          docker build . --file Dockerfile --tag ${{ env.SERVICE_NAME }}
+
+      - name: Log into registry
+        run: echo "${{ secrets.release_docker_hub }}" | docker login -u ${{ secrets.actor_docker_hub }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=$NAMESPACE/$SERVICE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+          VERSION=$BRANCH_NAME
+          echo "push version $VERSION"
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+          docker tag $SERVICE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/push_trigger.yml

@@ -44,21 +44,6 @@ jobs:
         run: |
           # Strip git ref prefix from version
           echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV
-
-      - name: run sonar analysis
-        run: |
-          cd "./${{env.SERVICE_LOCATION}}"
-          echo "sonar.host.url=https://sonarcloud.io/
-               sonar.login=${{ secrets.SONAR_TOKEN }}
-               sonar.projectKey=mosip_pre-registration-ui
-               sonar.organization=${{ secrets.ORG_KEY }}
-               sonar.sourceEncoding=UTF-8
-               sonar.sources=src
-               sonar.exclusions=**/node_modules/**
-               sonar.tests=src
-               sonar.test.inclusions=**/*.spec.ts
-               sonar.typescript.lcov.reportPaths=coverage/lcov.info" >> sonar-project.properties
-          npm install sonar-scanner && npm run sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -110,6 +95,8 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
 
       - name: npm install
         run: cd ${{ env.SERVICE_LOCATION }} && npm install --ignore-scripts

.github/workflows/release_changes.yml

@@ -27,8 +27,13 @@ jobs:
         echo "BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_ENV
         echo "GPG_TTY=$(tty)" >> $GITHUB_ENV
 
-    - name: Mannualy changing the pom versions
-      run: find . -type f -name "*pom.xml" -print0 | xargs -0 sed -i "s/${{ github.event.inputs.snapshotTags }}/${{ github.event.inputs.releaseTags }}/g"
+    - name: update Branch name in badges
+      run: |
+        sed -i 's/branch=.*)]/branch=${{ env.BRANCH_NAME }}\)]/g'  README.md
+        sed -i 's/branch=.*\&/branch=${{ env.BRANCH_NAME }}\&/g'  README.md
+
+#    - name: Mannualy changing the pom versions
+#      run: find . -type f -name "*pom.xml" -print0 | xargs -0 sed -i "s/${{ github.event.inputs.snapshotTags }}/${{ github.event.inputs.releaseTags }}/g"
 
     - name: Updating the Release URL in POM 
       run: |
@@ -48,7 +53,7 @@ jobs:
       uses: peter-evans/create-pull-request@v3
       with:
         token: ${{ secrets.ACTION_PAT }}
-        commit-message: Updated Pom versions for release changes
+        commit-message: Release Bot Pre-release changes
         title: Release changes
         body: Automated PR for ${{ github.event.inputs.releaseTags }} release.
         branch: release-branch

.github/workflows/tag.yaml

@@ -0,0 +1,43 @@
+name: Tagging of repos
+
+env:
+  tag: v1.2.3
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to be published'
+        required: true
+        default: 'v1.2.3'
+        type: string
+      body:
+        description: 'Release body message'
+        required: true
+        default: 'Changes in this Release'
+        type: string
+      pre-release:
+        description: 'Pre-release? True/False'
+        required: true
+        default: False
+        type: string
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          release_name: ${{ github.event.inputs.tag }}
+          body: |
+            ${{ github.event.inputs.body }}
+          draft: false
+          prerelease: ${{fromJSON(github.event.inputs.pre-release)}}

README.md

@@ -1,5 +1,5 @@
-[![Maven Package upon a push](https://github.com/mosip/pre-registration-ui/actions/workflows/push_trigger.yml/badge.svg?branch=develop)](https://github.com/mosip/pre-registration-ui/actions/workflows/push_trigger.yml)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=develop&project=mosip_pre-registration-ui&metric=alert_status)](https://sonarcloud.io/dashboard?branch=develop&id=mosip_pre-registration-ui)
+[![Maven Package upon a push](https://github.com/mosip/pre-registration-ui/actions/workflows/push_trigger.yml/badge.svg?branch=release-1.2.0.1)](https://github.com/mosip/pre-registration-ui/actions/workflows/push_trigger.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=release-1.2.0.1&project=mosip_pre-registration-ui&metric=alert_status)](https://sonarcloud.io/dashboard?branch=release-1.2.0.1&id=mosip_pre-registration-ui)
 
 # Pre-Registration Portal
 
@@ -8,31 +8,59 @@ This repository contains UI code for Pre-Registration portal. Refer [here](https
 ## Build & Deployment Guide
 
 The code is written in Angular JS. 
-
-To start off we will be needing a Virtual Machine (VM) of at least 1 core processor and 4 GB memory with Red Hat OS installed. Please follow the following steps after the pre-requisites are met.
-
-- Install GIT – GIT is a version control software, we will be using it to download the source code on our system. Follow the following steps to install GIT on your system.
-  - yum update (to update all the RHEL packages)
-  - yum install git (to install git)
-  - git --version (to verify if git is installed or not)
-- Install Docker – Dockeris thesoftware used to create a runnable image from the existing source code. Follow the following steps to install Docker on your system.
-  - yum install docker (to install docker)
-  - docker --version (to verify if docker is installed on your system)
-- Install node.js – To build the angular code using angular cli that runs on node. Follow the following steps to install node.js on your system.
-  - yum install rh-nodejs8 (to install node )
-  - scl enable rh-nodejs8 bash (to add node.js to environment)
-  - node --version (to verify node.js is working)
+
+- Install node.js – To build the angular code using angular cli that runs on node. 
+  We recommend Node: 14.17.3, Package Manager: npm 6.14.13
+
 - Install angular cli – To install angular cli for building the code into deployable artifacts. Follow the following steps to install angular cli on your system.
-  - npm install -g @angular/cli (to install angular cli)
-  - ng --version (to verify angular is installed in system)
+  - <code>npm install -g @angular/cli</code> (to install angular cli)
+  - <code>ng --version</code> (to verify angular is installed in system)
+  We recommend Angular CLI: 13.3.2
+
 - Check out the source code from GIT – To download the source code from git. Follow the following steps to download source code on your system.
-  - git clone https://github.com/mosip/mosip.git (to clone the source code repository from git)
+  - <code>git clone https://github.com/mosip/pre-registration-ui.git</code> (to clone the source code repository from git)
+
+### For Production build:
+
 - Build the code – Follow the following steps to build the source code on your system.
   - Navigate to the pre-registration-ui directory inside the cloned repository. Then run the following command in that directory
-  - ng build --prod --base-href . (to build the code)
+  - <code>ng build "--prod" "--base-href" "." "--output-path=dist" </code>(to build the code)
+
 - Build Docker Image – Follow the following steps to build docker image on your system.
-  - docker build -t \&lt;name\&gt; . (to build the docker image, replace \&lt;name\&gt; with the name of the image you want, &quot;.&quot; Signifies the current directory from where the docker file has to be read.
+  - <code>docker build -t name . </code>(to build the docker image, replace <code>name</code> with the name of the image you want, &quot;.&quot; Signifies the current directory from where the docker file has to be read.
+  - Example: <code>docker build -t preregui .</code>
 - Run the docker image – Follow the following steps to build docker image on your system.
-  - docker run –d –p 80:80 --name \&lt;container name\&gt; \&lt;image name\&gt; (to run the docker image created with the previous step,-d signifies to run the container in detached mode, -p signifies the port mapping left side of the&quot;:&quot; is the external port that will be exposed to the outside world and right side is the internal port of the container that is mapped with the external port. Replace \&lt;container name\&gt; with the name of your choice for the container, replace \&lt;image name\&gt; with the name of the image specified in .the previous step)
-
-Now you can access the user interface over the internet by accessing the public IP of VM via browser.
+  - <code>docker run –d –p 80:80 --name container-name image-name</code> (to run the docker image created with the previous step,-d signifies to run the container in detached mode, -p signifies the port mapping left side of the&quot;:&quot; is the external port that will be exposed to the outside world and right side is the internal port of the container that is mapped with the external port. Replace <code>container-name</code> with the name of your choice for the container, replace <code>image-name</code> with the name of the image specified in .the previous step)
+  - Example: <code>docker run -d -p 8080:8080 --name nginx preregui</code>
+- Now you can access the user interface over the internet via browser.
+  - Example: <code>http://localhost:8080/pre-registration-ui/#/eng</code>
+
+### For Local build:
+- Build & deploy the code locally – Follow the following steps to build the source code on your system.
+  - Navigate to the pre-registration-ui directory inside the cloned repository. Then run the following command in that directory
+  - <code>ng serve</code>
+- Now you can access the user interface via browser.
+  - Example: <code>http://localhost:4200</code>
+- But this will give you CORS issue in accessing backend prereg services. To get around the CORS issue, angular CLI proxy can be used.
+  - Update the API services BASE_URL in config.json
+  ```
+  {  
+	"BASE_URL": "https://localhost:4200/proxyapi/",    
+	"PRE_REG_URL": "preregistration/v1/"  
+	}
+  ```
+  - Create a new file named proxy.conf.json. Replace ${servicesUrl} with correct url.
+  ```
+  {
+    "/proxyapi": {
+      "target": ${servicesUrl},
+      "secure": true,
+      "changeOrigin": true,
+      "pathRewrite": {
+        "^/proxyapi": ""
+      }
+    }    
+  }
+  ```
+  - Now start the server by typing <code>ng serve --proxy-config proxy.conf.json --ssl true</code>
+  - Open the browser, load the app with <code>https://localhost:4200</code>

pre-registration-ui/.gitignore

@@ -30,4 +30,4 @@ dist/*
 coverage/*
 .editorconfig
 e2e/*
-proxy.conf.json
+proxy.confold.json