Merge branch 'develop' into develop_temp

Signed-off-by: Santhosh <[email protected]>
mosip · Dec 10, 2024 · 391b706 · 391b706
2 parents 9eaecae + 012aa72
commit 391b706
Show file tree

Hide file tree

Showing 258 changed files with 9,393 additions and 1,880 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -54,20 +54,20 @@ jobs:
   sonar-analysis-pmp-ui:
     needs: build-maven-pmp-ui
     if: "${{ github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master
+    uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@develop
     with:
       SERVICE_LOCATION: pmp-ui
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       ORG_KEY: ${{ secrets.ORG_KEY }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
-  build-dockers-pmp-reactjs-ui:
+  build-dockers-pmp-revamp-ui:
     strategy:
       matrix:
         include:
-          - SERVICE_LOCATION: 'pmp-reactjs-ui'
-            SERVICE_NAME: 'pmp-reactjs-ui'
+          - SERVICE_LOCATION: 'pmp-revamp-ui'
+            SERVICE_NAME: 'pmp-revamp-ui'
       fail-fast: false
     name: ${{ matrix.SERVICE_NAME }}
     uses: mosip/kattu/.github/workflows/docker-build.yml@master

diff --git a/deploy/pmp-ui/delete.sh b/deploy/pmp-ui/delete.sh
@@ -13,7 +13,7 @@ function deleting_pmp_ui() {
       if [ $yn = "Y" ]
         then
           helm -n $NS delete pmp-ui
-          helm -n $NS delete pmp-reactjs-ui
+          helm -n $NS delete pmp-revamp-ui
           break
         else
           break

diff --git a/deploy/pmp-ui/install.sh b/deploy/pmp-ui/install.sh
@@ -25,16 +25,16 @@ function installing_pmp_ui() {
 
   INTERNAL_API_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-api-internal-host})
   PMP_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-pmp-host})
-  PMP_NEW_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-pmp-reactjs-ui-new-host})
+  PMP_NEW_HOST=$(kubectl get cm global -o jsonpath={.data.mosip-pmp-revamp-ui-new-host})
 
   PARTNER_MANAGER_SERVICE_NAME="pms-partner"
   POLICY_MANAGER_SERVICE_NAME="pms-policy"
 
   echo Installing pmp-ui
   helm -n $NS install pmp-ui mosip/pmp-ui  --set pmp.apiUrl=https://$INTERNAL_API_HOST/ --set istio.hosts=["$PMP_HOST"] --version $CHART_VERSION
 
-  echo Installing pmp-reactjs-ui-new
-  helm -n $NS install pmp-reactjs-ui mosip/pmp-reactjs-ui \
+  echo Installing pmp-revamp-ui-new
+  helm -n $NS install pmp-revamp-ui mosip/pmp-revamp-ui \
   --set pmp_new.react_app_partner_manager_api_base_url="https://$INTERNAL_API_HOST/v1/partnermanager" \
   --set pmp_new.react_app_policy_manager_api_base_url="https://$INTERNAL_API_HOST/v1/policymanager" \
   --set pmp_new.pms_partner_manager_internal_service_url="http://$PARTNER_MANAGER_SERVICE_NAME.$NS/v1/partnermanager" \

diff --git a/helm/pmp-reactjs-ui/Chart.yaml b/helm/pmp-reactjs-ui/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: pmp-reactjs-ui
+name: pmp-revamp-ui
 description: A Helm chart for MOSIP pmp reactJS UI module
 type: application
 version: 0.0.1-develop

diff --git a/helm/pmp-reactjs-ui/README.md b/helm/pmp-reactjs-ui/README.md
@@ -6,7 +6,7 @@ Helm chart for installing MOSIP pmp reactJS UI module
 
 ```console
 $ helm repo add mosip https://mosip.github.io
-$ helm install my-release mosip/pmp-reactjs-ui
+$ helm install my-release mosip/pmp-revamp-ui
 ```
 
 ## Prerequisites
@@ -18,10 +18,10 @@ $ helm install my-release mosip/pmp-reactjs-ui
 
 ## Installing the Chart
 
-To install the chart with the release name `pmp-reactjs-ui`.
+To install the chart with the release name `pmp-revamp-ui`.
 
 ```console
-helm install my-release mosip/pmp-reactjs-ui
+helm install my-release mosip/pmp-revamp-ui
 ```
 
 > **Tip**: List all releases using `helm list`

diff --git a/helm/pmp-reactjs-ui/templates/_helpers.tpl b/helm/pmp-reactjs-ui/templates/_helpers.tpl
@@ -1,28 +1,28 @@
 {{/*
 Return the proper  image name
 */}}
-{{- define "pmp-reactjs-ui.image" -}}
+{{- define "pmp-revamp-ui.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
 Return the proper image name (for the init container volume-permissions image)
 */}}
-{{- define "pmp-reactjs-ui.volumePermissions.image" -}}
+{{- define "pmp-revamp-ui.volumePermissions.image" -}}
 {{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global ) -}}
 {{- end -}}
 
 {{/*
 Return the proper Docker Image Registry Secret Names
 */}}
-{{- define "pmp-reactjs-ui.imagePullSecrets" -}}
+{{- define "pmp-revamp-ui.imagePullSecrets" -}}
 {{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.volumePermissions.image) "global" .Values.global) -}}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "pmp-reactjs-ui.serviceAccountName" -}}
+{{- define "pmp-revamp-ui.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
     {{ default (printf "%s-foo" (include "common.names.fullname" .)) .Values.serviceAccount.name }}
 {{- else -}}
@@ -33,10 +33,10 @@ Create the name of the service account to use
 {{/*
 Compile all warnings into a single message.
 */}}
-{{- define "pmp-reactjs-ui.validateValues" -}}
+{{- define "pmp-revamp-ui.validateValues" -}}
 {{- $messages := list -}}
-{{- $messages := append $messages (include "pmp-reactjs-ui.validateValues.foo" .) -}}
-{{- $messages := append $messages (include "pmp-reactjs-ui.validateValues.bar" .) -}}
+{{- $messages := append $messages (include "pmp-revamp-ui.validateValues.foo" .) -}}
+{{- $messages := append $messages (include "pmp-revamp-ui.validateValues.bar" .) -}}
 {{- $messages := without $messages "" -}}
 {{- $message := join "\n" $messages -}}
 
@@ -48,7 +48,7 @@ Compile all warnings into a single message.
 {{/*
 Return podAnnotations
 */}}
-{{- define "pmp-reactjs-ui.podAnnotations" -}}
+{{- define "pmp-revamp-ui.podAnnotations" -}}
 {{- if .Values.podAnnotations }}
 {{ include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) }}
 {{- end }}

diff --git a/helm/pmp-reactjs-ui/templates/deployment.yaml b/helm/pmp-reactjs-ui/templates/deployment.yaml
@@ -21,15 +21,15 @@ spec:
     metadata:
       annotations:
         {{- if or .Values.podAnnotations .Values.metrics.enabled }}
-        {{- include "pmp-reactjs-ui.podAnnotations" . | nindent 8 }}
+        {{- include "pmp-revamp-ui.podAnnotations" . | nindent 8 }}
         {{- end }}
       labels: {{- include "common.labels.standard" . | nindent 8 }}
         {{- if .Values.podLabels }}
         {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
         {{- end }}
     spec:
-      serviceAccountName: {{ template "pmp-reactjs-ui.serviceAccountName" . }}
-      {{- include "pmp-reactjs-ui.imagePullSecrets" . | nindent 6 }}
+      serviceAccountName: {{ template "pmp-revamp-ui.serviceAccountName" . }}
+      {{- include "pmp-revamp-ui.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}
@@ -56,7 +56,7 @@ spec:
       initContainers:
         {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
         - name: volume-permissions
-          image: {{ include "pmp-reactjs-ui.volumePermissions.image" . }}
+          image: {{ include "pmp-revamp-ui.volumePermissions.image" . }}
           imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
           command:
             - %%commands%%
@@ -73,8 +73,8 @@ spec:
           {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
         {{- end }}
       containers:
-        - name: pmp-reactjs-ui
-          image: {{ template "pmp-reactjs-ui.image" . }}
+        - name: pmp-revamp-ui
+          image: {{ template "pmp-revamp-ui.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.lifecycleHooks }}
           lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 12 }}

diff --git a/helm/pmp-reactjs-ui/templates/service-account.yaml b/helm/pmp-reactjs-ui/templates/service-account.yaml
@@ -5,7 +5,7 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "pmp-reactjs-ui.serviceAccountName" . }}
+  name: {{ template "pmp-revamp-ui.serviceAccountName" . }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}

diff --git a/helm/pmp-reactjs-ui/values.yaml b/helm/pmp-reactjs-ui/values.yaml
@@ -51,7 +51,7 @@ service:
 
 image:
   registry: docker.io
-  repository: mosipqa/pmp-reactjs-ui
+  repository: mosipqa/pmp-revamp-ui
   tag: develop
 
   ## Specify a imagePullPolicy