From 72d41b9dd4c9b93ad87810673a36165200aa8c51 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Fri, 8 Aug 2025 14:45:13 +0530 Subject: [PATCH 001/298] digit-ui-module-pgr --- .../web/micro-ui-internals/packages/modules/pgr/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json index b1597bc13..b5fddb9a4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json @@ -1,5 +1,5 @@ { - "name": "@egovernments/digit-ui-module-health-pgr", + "name": "@egovernments/digit-ui-module-pgr", "version": "0.0.1", "description": "PGR Module UI", "main": "dist/index.js", From b3deb5ade586f438654ffcca84a3a01e9d224749 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Fri, 8 Aug 2025 15:12:02 +0530 Subject: [PATCH 002/298] digit-ui-module-ccrs --- .../web/micro-ui-internals/packages/modules/pgr/package.json | 2 +- frontend/micro-ui/web/src/App.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json index b5fddb9a4..6d4fa7580 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json @@ -1,5 +1,5 @@ { - "name": "@egovernments/digit-ui-module-pgr", + "name": "@egovernments/digit-ui-module-ccrs", "version": "0.0.1", "description": "PGR Module UI", "main": "dist/index.js", diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js index 30190c3a9..a68e78316 100644 --- a/frontend/micro-ui/web/src/App.js +++ b/frontend/micro-ui/web/src/App.js @@ -11,7 +11,7 @@ import { initLibraries } from "@egovernments/digit-ui-libraries"; // import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms"; import { UICustomizations } from "./Customisations/UICustomizations"; import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities"; -import { initPGRComponents,PGRReducers, } from "@egovernments/digit-ui-module-health-pgr"; +import { initPGRComponents,PGRReducers, } from "@egovernments/digit-ui-module-ccrs"; import { Loader } from "@egovernments/digit-ui-components"; import { initWorkbenchComponents } from "@egovernments/digit-ui-module-workbench"; import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms"; From 31c03c25ee57bc4377432162dfc21fa349f06004 Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Fri, 8 Aug 2025 17:11:55 +0530 Subject: [PATCH 003/298] update tag for business services --- .../charts/urban/default-data-handler/values.yaml | 2 +- devops/deploy-as-code/charts/urban/digit-ui/values.yaml | 2 +- devops/deploy-as-code/charts/urban/pgr-services/values.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/deploy-as-code/charts/urban/default-data-handler/values.yaml b/devops/deploy-as-code/charts/urban/default-data-handler/values.yaml index 6af383204..8ce620163 100644 --- a/devops/deploy-as-code/charts/urban/default-data-handler/values.yaml +++ b/devops/deploy-as-code/charts/urban/default-data-handler/values.yaml @@ -29,7 +29,7 @@ initContainers: # Container Configs image: repository: "default-data-handler" - tag: develop-87e7d70-27 + tag: v0.0.1-87e7d70-28 replicas: "1" healthChecks: enabled: true diff --git a/devops/deploy-as-code/charts/urban/digit-ui/values.yaml b/devops/deploy-as-code/charts/urban/digit-ui/values.yaml index 042293745..a703dd2c1 100644 --- a/devops/deploy-as-code/charts/urban/digit-ui/values.yaml +++ b/devops/deploy-as-code/charts/urban/digit-ui/values.yaml @@ -14,7 +14,7 @@ initContainers: {} # Container Configs image: repository: "digit-ui" - tag: "PGR_JULY_21-d0c152d-46" + tag: "v0.0.1-598b000-73" replicas: "1" httpPort: 80 healthChecks: diff --git a/devops/deploy-as-code/charts/urban/pgr-services/values.yaml b/devops/deploy-as-code/charts/urban/pgr-services/values.yaml index a8336a913..525c7aa9f 100644 --- a/devops/deploy-as-code/charts/urban/pgr-services/values.yaml +++ b/devops/deploy-as-code/charts/urban/pgr-services/values.yaml @@ -17,7 +17,7 @@ initContainers: schemaTable: "pgr_services_schema" image: repository: "pgr-services-db" - tag: "develop-de5dc8c-3" + tag: "v2.9.0-8b3aa24-4" env: | {{- if index .Values "pgr-ismultischema-enabled" }} - name: SCHEMA_NAME @@ -49,7 +49,7 @@ initContainers: # Container Configs image: repository: "pgr-services" - tag: "develop-de5dc8c-3" + tag: "v2.9.0-8b3aa24-4" replicas: "1" healthChecks: enabled: true From 079f76ed2a6a2bda843cce510db88578120ae99a Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Mon, 11 Aug 2025 00:07:44 +0530 Subject: [PATCH 004/298] Added read.me for pgr-service and default-data-handler services --- backend/pgr-services/README.md | 7 +- .../egov-mdms-service/Chart.lock | 6 - .../egov-mdms-service/Chart.yaml | 26 --- .../egov-mdms-service/charts/common-0.0.5.tgz | Bin 7764 -> 0 bytes .../ispirit-mdms-service-values.yaml | 70 ------- .../templates/deployment.yaml | 2 - .../egov-mdms-service/templates/ingress.yaml | 2 - .../egov-mdms-service/templates/service.yaml | 2 - .../egov-mdms-service/tenant-a-mdms-data.yaml | 70 ------- .../egov-mdms-service/tenant-b-mdms-data.yaml | 70 ------- .../egov-mdms-service/values.yaml | 71 ------- .../core-services/egov-pg-service/Chart.lock | 6 - .../core-services/egov-pg-service/Chart.yaml | 26 --- .../egov-pg-service/charts/common-0.0.5.tgz | Bin 7765 -> 0 bytes .../egov-pg-service/templates/deployment.yaml | 2 - .../egov-pg-service/templates/ingress.yaml | 2 - .../egov-pg-service/templates/service.yaml | 2 - .../core-services/egov-pg-service/values.yaml | 196 ------------------ utilities/default-data-handler/README.md | 38 +++- 19 files changed, 34 insertions(+), 564 deletions(-) delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.lock delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/charts/common-0.0.5.tgz delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/ispirit-mdms-service-values.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/templates/deployment.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/templates/ingress.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/templates/service.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/tenant-a-mdms-data.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/tenant-b-mdms-data.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-mdms-service/values.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/Chart.lock delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/Chart.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/charts/common-0.0.5.tgz delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/templates/deployment.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/templates/ingress.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/templates/service.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-pg-service/values.yaml diff --git a/backend/pgr-services/README.md b/backend/pgr-services/README.md index f574f122a..321499982 100644 --- a/backend/pgr-services/README.md +++ b/backend/pgr-services/README.md @@ -9,7 +9,7 @@ the citizen and will be updated by notifications whenever the status of the comp - egov-user - egov-localization - egov-idgen -- egov-mdms +- mdms-v2 - egov-persister - egov-notification-sms - egov-notification-mail @@ -73,3 +73,8 @@ the citizen and will be updated by notifications whenever the status of the comp - Following are the Producer topic. - **save-pgr-request** :- This topic is used to create new complaint in the system. - **update-pgr-request** :- This topic is used to update the existing complaint in the systen. + +### note +all master data, localisation data, boundary data, users, employees, workflow config will be update by a service in utilities/default-data-handler which update all these data which is maintained in resource folder. + +and all the configs which are required for pgr are maintained in configs folder. \ No newline at end of file diff --git a/devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.lock b/devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.lock deleted file mode 100644 index eaeec8815..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../common - version: 0.0.5 -digest: sha256:5ecdd1fdad744b1a0d5873f42283e09223272e4c8717a0679c27d8e215bdbc85 -generated: "2025-07-04T17:59:37.387412307+05:30" diff --git a/devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.yaml b/devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.yaml deleted file mode 100644 index 812bc70b8..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-mdms-service/Chart.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v2 -name: egov-mdms-service -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 - -dependencies: -- name: common - version: 0.0.5 - repository: file://../../common diff --git a/devops/deploy-as-code/charts/core-services/egov-mdms-service/charts/common-0.0.5.tgz b/devops/deploy-as-code/charts/core-services/egov-mdms-service/charts/common-0.0.5.tgz deleted file mode 100644 index e452e60b1d0ce592396de521bf67593d07a61861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7764 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 ach~OPUAybWU;jS<0RR6#%Dc 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 bmAh+q?XKPR;;;W700960wt+Bc0KNbK+vEQg diff --git a/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/deployment.yaml b/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/deployment.yaml deleted file mode 100644 index 3455c0005..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/deployment.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# deployment.yaml -{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/ingress.yaml b/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/ingress.yaml deleted file mode 100644 index 9a573c0d7..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/ingress.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# ingress.yaml -{{- template "common.ingress" . -}} \ No newline at end of file diff --git a/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/service.yaml b/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/service.yaml deleted file mode 100644 index 735644576..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-pg-service/templates/service.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# service.yaml -{{- template "common.service" . -}} \ No newline at end of file diff --git a/devops/deploy-as-code/charts/core-services/egov-pg-service/values.yaml b/devops/deploy-as-code/charts/core-services/egov-pg-service/values.yaml deleted file mode 100644 index b863efb5c..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-pg-service/values.yaml +++ /dev/null @@ -1,196 +0,0 @@ -# Common Labels -labels: - app: "egov-pg-service" - group: "core" - -# Ingress Configs -ingress: - enabled: true - zuul: true - context: "pg-service" - -# Init Containers Configs -initContainers: - dbMigration: - enabled: true - schemaTable: "egov_pg_service_schema" - image: - repository: "egov-pg-service-db" - tag: v2.9.2-4a60f20 - -# Container Configs -image: - repository: "egov-pg-service" - tag: v2.9.2-4a60f20 -replicas: "1" -healthChecks: - enabled: true - livenessProbePath: "/pg-service/health" - readinessProbePath: "/pg-service/health" -appType: "java-spring" -tracing-enabled: true -axis: true -payu-url: "" -payu-url-status: "" -ccavenue-status-access-code: "" -ccavenue-redirect-access-code: "" -ccavenue-url: "" -ccavenue-url-status: "" -ccavenue-url-redirect: "" -ccavenue-url-cancel: "" -memory_limits: "512Mi" -heap: "-Xmx256m -Xms256m" -java-args: "-Dspring.profiles.active=monitoring" -java-debug: "true" - -# Additional Container Envs -env: | - - name: SPRING_KAFKA_CONSUMER_GROUP_ID - value: egov-pg-service - - name: SPRING_KAFKA_PRODUCER_KEY_SERIALIZER - value: org.apache.kafka.common.serialization.StringSerializer - - name: SPRING_KAFKA_PRODUCER_VALUE_SERIALIZER - value: org.springframework.kafka.support.serializer.JsonSerializer - - name: EGOV_IDGEN_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: egov-idgen - - name: EGOV_MDMS_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: egov-mdms-service - - name: EGOV_BILLINGSERVICE_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: billing-service - - name: EGOV_COLLECTIONSERVICE_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: collection-services - - name: NOTIFICATION_URL - valueFrom: - configMapKeyRef: - name: egov-config - key: egov-services-fqdn-name - - name: EGOV_BANKACCOUNTSERVICE_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: egf-master - - name: EGOV_BUSINESSDETAILSSERVICE_HOST - valueFrom: - configMapKeyRef: - name: egov-service-host - key: egov-common-masters - {{- if .Values.axis }} - - name: AXIS_ACTIVE - value: "true" - - name: AXIS_CURRENCY - value: "INR" - - name: AXIS_MERCHANT_VPC_VERSION - value: "1" - - name: AXIS_MERCHANT_VPC_COMMAND_PAY - value: "pay" - - name: AXIS_MERCHANT_VPC_COMMAND_STATUS - value: "queryDR" - - name: AXIS_LOCALE - value: "en_IN" - - name: AXIS_URL_DEBIT - value: "https://migs.mastercard.co.in/vpcpay" - - name: AXIS_URL_STATUS - value: "https://migs.mastercard.co.in/vpcdps" - - name: AXIS_MERCHANT_ID - valueFrom: - secretKeyRef: - name: egov-pg-service - key: axismerchantid - - name: AXIS_MERCHANT_SECRET_KEY - valueFrom: - secretKeyRef: - name: egov-pg-service - key: axismerchantsecret - - name: AXIS_MERCHANT_USER - valueFrom: - secretKeyRef: - name: egov-pg-service - key: axismerchantuser - - name: AXIS_MERCHANT_PWD - valueFrom: - secretKeyRef: - name: egov-pg-service - key: axismerchantpwd - - name: AXIS_MERCHANT_ACCESS_CODE - valueFrom: - secretKeyRef: - name: egov-pg-service - key: axismerchantaccesscode - {{- end }} - {{- if index .Values "payu-url" }} - - name: PAYU_ACTIVE - value: "true" - - name: PAYU_URL - value: {{ index .Values "payu-url" | quote }} - - name: PAYU_URL_STATUS - value: {{ index .Values "payu-url-status" | quote }} - - name: PAYU_MERCHANT_KEY - valueFrom: - secretKeyRef: - name: egov-pg-service - key: payumerchantkey - - name: PAYU_MERCHANT_SALT - valueFrom: - secretKeyRef: - name: egov-pg-service - key: payumerchantsalt - {{- end }} - {{- if .Values.ccavenue }} - - name: CCAVENUE_ACTIVE - value: "true" - - name: CCAVENUE_MERCHANT_ID - valueFrom: - secretKeyRef: - name: egov-pg-service - key: ccavenue-merchant-id - - name: CCAVENUE_STATUS_WORKING_KEY - valueFrom: - secretKeyRef: - name: egov-pg-service - key: ccavenue-status-working-key - - name: CCAVENUE_REDIRECT_WORKING_KEY - valueFrom: - secretKeyRef: - name: egov-pg-service - key: ccavenue-redirect-working-key - - name: CCAVENUE_STATUS_ACCESS_CODE - value: {{ index .Values "ccavenue-status-access-code" | quote }} - - name: CCAVENUE_REDIRECT_ACCESS_CODE - value: {{ index .Values "ccavenue-redirect-access-code" | quote }} - - name: CCAVENUE_GATEWAY_URL - value: {{ index .Values "ccavenue-url" | quote }} - - name: CCAVENUE_GATEWAY_STATUS_URL - value: {{ index .Values "ccavenue-url-status" | quote }} - - name: CCAVENUE_REDIRECT_URL - value: {{ index .Values "ccavenue-url-redirect" | quote }} - - name: CCAVENUE_CANCEL_URL - value: {{ index .Values "ccavenue-url-cancel" | quote }} - {{- end }} - - name: JAVA_OPTS - value: {{ index .Values "heap" | quote }} - - name: JAVA_ARGS - value: {{ index .Values "java-args" | quote }} - - name: JAVA_ENABLE_DEBUG - value: {{ index .Values "java-debug" | quote }} - - name: SERVER_PORT - value: "8080" - - name: SECURITY_BASIC_ENABLED - value: "false" - - name: MANAGEMENT_SECURITY_ENABLED - value: "false" - {{- if index .Values "tracing-enabled" }} - - name: TRACER_OPENTRACING_ENABLED - value: "true" - {{- end }} diff --git a/utilities/default-data-handler/README.md b/utilities/default-data-handler/README.md index e9ff6d6ea..7691a2c7b 100644 --- a/utilities/default-data-handler/README.md +++ b/utilities/default-data-handler/README.md @@ -3,29 +3,47 @@ This service adds default data for new tenant in the Digit suite of services. -### DB UML Diagram - +### Overview +The Default Data Handler service listens to the create-tenant Kafka topic and automatically provisions all required master data and configuration for the target tenant. +It ensures that the new tenant is fully set up with: +MDMS schema & MDMS data +Localization data +Boundary data +User creation with credentials +Employee creation +Workflow configurations -### Service Dependencies +### How It Works +Trigger: The service starts after detecting a create-tenant event from Kafka. -### Swagger API Contract +# Wait Mechanism: +Waits 10 seconds after startup until dependent services are running: +mdms-v2 +boundary-service +localisation service +# Execution Cycle: +Initializes StartupSchemaAndMasterDataInitializer after the 10-second wait. +Then, runs StartupUserAndEmployeeInitializer 4 times at 4-minute intervals. -## Service Details +Within 20 minutes of service initialization, all master data, localization data, workflow data, users, and employees are created or updated. -Default data handler service listens to create-tenant kafka topic and adds default data for the tenantId received. +### Service Dependencies -### API Details +mdms-v2 +boundary-service +localisation service +user service +employee service +workflow service -Default data handler service picks the target tenantId from the kafka topic, mdms schema codes from application.properties, localization locale and modules from application.properties, then creates the default data for the target tenantId in both mdms and localization. +### DB UML Diagram -### Kafka Consumers -### Kafka Producers From fddb2514945fdb51a27252b4c10704478d72baeb Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 10:20:35 +0530 Subject: [PATCH 005/298] locale-fix --- .../web/micro-ui-internals/packages/modules/pgr/src/Module.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js index b78cb120f..3f0a5a4a6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js @@ -31,7 +31,7 @@ export const PGRModule = ({ stateCode, userType, tenants }) => { const hierarchyType = window?.globalConfigs?.getConfig("HIERARCHY_TYPE") || "HIERARCHYTEST"; const moduleCode = ["pgr", `boundary-${hierarchyType?.toString().toLowerCase()}`]; - const modulePrefix = "hcm"; + const modulePrefix = "pgr"; const language = Digit.StoreData.getCurrentLanguage(); const { isLoading, data: store } = Digit.Services.useStore({ stateCode, From 122b7bf60d1215c23781faa71e03bb1855bec4fe Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 10:48:42 +0530 Subject: [PATCH 006/298] rainmaker --- .../web/micro-ui-internals/packages/modules/pgr/src/Module.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js index 3f0a5a4a6..8721b56b5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js @@ -31,7 +31,7 @@ export const PGRModule = ({ stateCode, userType, tenants }) => { const hierarchyType = window?.globalConfigs?.getConfig("HIERARCHY_TYPE") || "HIERARCHYTEST"; const moduleCode = ["pgr", `boundary-${hierarchyType?.toString().toLowerCase()}`]; - const modulePrefix = "pgr"; + const modulePrefix = "rainmaker"; const language = Digit.StoreData.getCurrentLanguage(); const { isLoading, data: store } = Digit.Services.useStore({ stateCode, From 0911a42ea4cf3300d0e6622cb771c57eafcdcdbe Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 11:53:00 +0530 Subject: [PATCH 007/298] validation fix --- .../packages/modules/pgr/src/configs/CreateComplaintConfig.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js index fd8033a03..f2ab58e4b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js @@ -36,7 +36,7 @@ export const CreateComplaintConfig = { name: "ComplainantName", error: "CORE_COMMON_REQUIRED_ERRMSG", validation: { - pattern: /^[A-Za-z]+$/i, + pattern:/^(?!.*[ _-]{2})(?!^[\s_-])(?!.*[\s_-]$)(?=^[A-Za-z][A-Za-z0-9 _\-\(\)]{4,29}$)^.*$/, error: "CORE_COMMON_REQUIRED_ERRMSG" } }, @@ -208,6 +208,7 @@ export const CreateComplaintConfig = { maxLength: 1000, validation: { required: true, + pattern:/^(?!\s*$).+/, }, error: "CORE_COMMON_REQUIRED_ERRMSG", }, From 522601185f58abedbe7e8b031bd2e03d99d88251 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 13:27:10 +0530 Subject: [PATCH 008/298] PIN code validated , --- .../pgr/src/configs/CreateComplaintConfig.js | 57 ++++++++++--------- .../CreateComplaint/createComplaintForm.js | 4 -- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js index f2ab58e4b..49fc82fec 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js @@ -1,13 +1,13 @@ export const CreateComplaintConfig = { tenantId: Digit.ULBService.getCurrentTenantId(), moduleName: "RAINMAKER-PGR", - CreateComplaintConfig : [ + CreateComplaintConfig: [ { form: [ - { + { head: "ES_CREATECOMPLAINT_PROVIDE_COMPLAINANT_DETAILS", body: [ - { + { inline: true, label: "COMPLAINTS_COMPLAINANT_CONTACT_NUMBER", isMandatory: true, @@ -36,15 +36,15 @@ export const CreateComplaintConfig = { name: "ComplainantName", error: "CORE_COMMON_REQUIRED_ERRMSG", validation: { - pattern:/^(?!.*[ _-]{2})(?!^[\s_-])(?!.*[\s_-]$)(?=^[A-Za-z][A-Za-z0-9 _\-\(\)]{4,29}$)^.*$/, - error: "CORE_COMMON_REQUIRED_ERRMSG" + required: true, + pattern: /^(?!.*[ _-]{2})(?!^[\s_-])(?!.*[\s_-]$)(?=^[A-Za-z][A-Za-z0-9 _\-\(\)]{4,29}$)^.*$/, } }, }, - + ], }, - { + { head: "CS_COMPLAINT_DETAILS_COMPLAINT_DETAILS", body: [ { @@ -53,8 +53,8 @@ export const CreateComplaintConfig = { type: "dropdown", label: "CS_COMPLAINT_DETAILS_COMPLAINT_TYPE", disable: false, - preProcess : { - updateDependent : ["populators.options"] + preProcess: { + updateDependent: ["populators.options"] }, populators: { name: "SelectComplaintType", @@ -68,8 +68,8 @@ export const CreateComplaintConfig = { type: "dropdown", label: "CS_COMPLAINT_DETAILS_SUB_COMPLAINT_TYPE", disable: false, - preProcess : { - updateDependent : ["populators.options"] + preProcess: { + updateDependent: ["populators.options"] }, populators: { name: "SelectSubComplaintType", @@ -77,7 +77,7 @@ export const CreateComplaintConfig = { error: "CORE_COMMON_REQUIRED_ERRMSG", }, }, - + ], }, // { @@ -130,32 +130,35 @@ export const CreateComplaintConfig = { // ], // }, - { + { head: "CS_COMPLAINT_LOCATION_DETAILS", body: [ - { + { inline: true, label: "CS_COMPLAINT_POSTALCODE__DETAILS", - isMandatory: false, type: "number", disable: false, populators: { name: "postalCode", - maxlength: 6, + required: true, validation: { + minLength: 6, + maxLength: 6, pattern: /^[1-9][0-9]{5}$/i, + }, + error: "CORE_COMMON_REQUIRED_ERRMSG", }, }, - { + { isMandatory: true, key: "SelectCity", type: "dropdown", label: "CS_COMPLAINT_SELECT_CITY", disable: false, - preProcess : { - updateDependent : ["populators.options"] + preProcess: { + updateDependent: ["populators.options"] }, populators: { name: "SelectCity", @@ -164,15 +167,15 @@ export const CreateComplaintConfig = { }, }, - - { + + { isMandatory: true, key: "SelectLocality", type: "dropdown", label: "CS_COMPLAINT_LOCALITY", disable: false, - preProcess : { - updateDependent : ["populators.options"] + preProcess: { + updateDependent: ["populators.options"] }, populators: { name: "SelectLocality", @@ -191,10 +194,10 @@ export const CreateComplaintConfig = { maxLength: 1000, }, }, - + ], }, - + { head: "CS_COMPLAINT_DETAILS_ADDITIONAL_DETAILS", body: [ @@ -208,14 +211,14 @@ export const CreateComplaintConfig = { maxLength: 1000, validation: { required: true, - pattern:/^(?!\s*$).+/, + pattern: /^(?!\s*$).+/, }, error: "CORE_COMMON_REQUIRED_ERRMSG", }, }, ], }, - + ], } ], diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js index ce84cf519..56f311ddd 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js @@ -289,8 +289,6 @@ const CreateComplaintForm = ({ message: t("CORE_COMMON_APPLICANT_NAME_INVALID") }, { shouldFocus: false }); } - } else if (formState.errors.ComplainantName) { - clearErrors("ComplainantName"); } // Validate mobile number @@ -304,8 +302,6 @@ const CreateComplaintForm = ({ message: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID") }, { shouldFocus: false }); } - } else if (formState.errors.ComplainantContactNumber) { - clearErrors("ComplainantContactNumber"); } // Only update if complaint user selection has changed From 848d4f5ef2833cae695f73cd97aac02006122b62 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 16:18:28 +0530 Subject: [PATCH 009/298] master-code-rewrite --- .../packages/modules/pgr/src/Module.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js index 8721b56b5..8b710752a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js @@ -19,8 +19,10 @@ import { ComplaintsList } from "./pages/citizen/ComplaintsList"; import ComplaintDetailsPage from "./pages/citizen/ComplaintDetails"; import SelectRating from "./pages/citizen/Rating/SelectRating"; import ResponseCitizen from "./pages/citizen/Response"; - - +import GeoLocations from "./components/GeoLocations"; +import SelectAddress from "../../pgr/src/pages/citizen/Create/Steps/SelectAddress"; +import SelectImages from "../../pgr/src/pages/citizen/Create/Steps/SelectImages"; +import CreatePGRFlow from "./pages/citizen/Create/FormExplorer"; export const PGRReducers = getRootReducer; @@ -29,7 +31,7 @@ export const PGRModule = ({ stateCode, userType, tenants }) => { const { path, url } = useRouteMatch(); const tenantId = Digit.ULBService.getCurrentTenantId(); - const hierarchyType = window?.globalConfigs?.getConfig("HIERARCHY_TYPE") || "HIERARCHYTEST"; + const hierarchyType = window?.globalConfigs?.getConfig("HIERARCHY_TYPE") || "ADMIN"; const moduleCode = ["pgr", `boundary-${hierarchyType?.toString().toLowerCase()}`]; const modulePrefix = "rainmaker"; const language = Digit.StoreData.getCurrentLanguage(); @@ -98,7 +100,11 @@ const componentsToRegister = { PGRComplaintsList : ComplaintsList, PGRComplaintDetailsPage : ComplaintDetailsPage, PGRSelectRating : SelectRating, - PGRResponseCitzen : ResponseCitizen + PGRResponseCitzen : ResponseCitizen, + GeoLocations, + SelectAddress, + SelectImages, + CreatePGRFlow:CreatePGRFlow, }; export const initPGRComponents = () => { From 48541a722844fb207651091a6fca07a26029a239 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 18:44:59 +0530 Subject: [PATCH 010/298] validation changes --- .../pgr/src/configs/CreateComplaintConfig.js | 3 +- .../CreateComplaint/createComplaintForm.js | 47 ++++++++++--------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js index 49fc82fec..d6db76d8e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/configs/CreateComplaintConfig.js @@ -18,6 +18,7 @@ export const CreateComplaintConfig = { error: "CORE_COMMON_MOBILE_ERROR", componentInFront: "+91", validation: { + required: true, minLength: 10, maxLength: 10, min: 6000000000, @@ -63,7 +64,7 @@ export const CreateComplaintConfig = { }, }, { - isMandatory: false, + isMandatory: true, key: "SelectSubComplaintType", type: "dropdown", label: "CS_COMPLAINT_DETAILS_SUB_COMPLAINT_TYPE", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js index 56f311ddd..dd693d4dc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js @@ -276,33 +276,37 @@ const CreateComplaintForm = ({ } - const ComplainantName = formData?.ComplainantName; - const ComplainantContactNumber = formData?.ComplainantContactNumber; + // const ComplainantName = formData?.ComplainantName; + // const ComplainantContactNumber = formData?.ComplainantContactNumber; const selectedUser = formData?.complaintUser?.code; const prevSelectedUser = sessionFormData?.complaintUser?.code; // Validate name - if (ComplainantName && !ComplainantName.match(Digit.Utils.getPattern("Name"))) { - if (!formState.errors.ComplainantName) { - setError("ComplainantName", { - type: "custom", - message: t("CORE_COMMON_APPLICANT_NAME_INVALID") - }, { shouldFocus: false }); - } - } + // if (ComplainantName && !ComplainantName.match(Digit.Utils.getPattern("Name"))) { + // if (!formState.errors.ComplainantName) { + // setError("ComplainantName", { + // type: "custom", + // message: t("CORE_COMMON_APPLICANT_NAME_INVALID") + // }, { shouldFocus: false }); + // } + // } else if (formState.errors.ComplainantName) { + // clearErrors("ComplainantName"); + // } // Validate mobile number - const contactFieldConfig = updatedConfig?.form?.flatMap(section => section?.body || []) - .find(field => field?.populators?.name === "ComplainantContactNumber"); - - if (ComplainantContactNumber && !validatePhoneNumber(ComplainantContactNumber, contactFieldConfig)) { - if (!formState.errors.ComplainantContactNumber) { - setError("ComplainantContactNumber", { - type: "custom", - message: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID") - }, { shouldFocus: false }); - } - } + // const contactFieldConfig = updatedConfig?.form?.flatMap(section => section?.body || []) + // .find(field => field?.populators?.name === "ComplainantContactNumber"); + + // if (ComplainantContactNumber && !validatePhoneNumber(ComplainantContactNumber, contactFieldConfig)) { + // if (!formState.errors.ComplainantContactNumber) { + // setError("ComplainantContactNumber", { + // type: "custom", + // message: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID") + // }, { shouldFocus: false }); + // } + // } else if (formState.errors.ComplainantContactNumber) { + // clearErrors("ComplainantContactNumber"); + // } // Only update if complaint user selection has changed if (selectedUser !== prevSelectedUser) { @@ -360,6 +364,7 @@ const CreateComplaintForm = ({ ); clearSessionFormData(); } + clearSessionFormData(); }, }); }; From d986918b06bb8355f9103b8b2a1093ce03e36506 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 19:00:59 +0530 Subject: [PATCH 011/298] CCSD-627,CCSD-629 --- .../packages/modules/pgr/src/pages/employee/PGRDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js index 3fbca9514..6edac9346 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js @@ -266,7 +266,7 @@ const PGRDetails = () => { service: { ...pgrData?.ServiceWrappers[0].service }, workflow: { action: selectedAction.action, - assignes: [_data?.SelectedAssignee?.uuid], + assignes: _data?.SelectedAssignee?.uuid ? [_data?.SelectedAssignee?.uuid] : null, hrmsAssignes: _data?.SelectedAssignee?.uuid ? [_data?.SelectedAssignee?.uuid] : null, comments: _data?.SelectedComments || "", }, From 7d42bc7a5ef137efa2d3d57d399bf401201e36a0 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Mon, 11 Aug 2025 19:24:59 +0530 Subject: [PATCH 012/298] code rabit changes --- .../CreateComplaint/createComplaintForm.js | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js index dd693d4dc..b05350106 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/createComplaintForm.js @@ -276,37 +276,11 @@ const CreateComplaintForm = ({ } - // const ComplainantName = formData?.ComplainantName; - // const ComplainantContactNumber = formData?.ComplainantContactNumber; + const selectedUser = formData?.complaintUser?.code; const prevSelectedUser = sessionFormData?.complaintUser?.code; - // Validate name - // if (ComplainantName && !ComplainantName.match(Digit.Utils.getPattern("Name"))) { - // if (!formState.errors.ComplainantName) { - // setError("ComplainantName", { - // type: "custom", - // message: t("CORE_COMMON_APPLICANT_NAME_INVALID") - // }, { shouldFocus: false }); - // } - // } else if (formState.errors.ComplainantName) { - // clearErrors("ComplainantName"); - // } - - // Validate mobile number - // const contactFieldConfig = updatedConfig?.form?.flatMap(section => section?.body || []) - // .find(field => field?.populators?.name === "ComplainantContactNumber"); - - // if (ComplainantContactNumber && !validatePhoneNumber(ComplainantContactNumber, contactFieldConfig)) { - // if (!formState.errors.ComplainantContactNumber) { - // setError("ComplainantContactNumber", { - // type: "custom", - // message: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID") - // }, { shouldFocus: false }); - // } - // } else if (formState.errors.ComplainantContactNumber) { - // clearErrors("ComplainantContactNumber"); - // } + // Only update if complaint user selection has changed if (selectedUser !== prevSelectedUser) { From 415053d261790807ab738a88a07078bc912fc99d Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Tue, 12 Aug 2025 10:48:00 +0530 Subject: [PATCH 013/298] updated the tag for ui --- devops/deploy-as-code/charts/urban/digit-ui/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/deploy-as-code/charts/urban/digit-ui/values.yaml b/devops/deploy-as-code/charts/urban/digit-ui/values.yaml index a703dd2c1..6161e6c86 100644 --- a/devops/deploy-as-code/charts/urban/digit-ui/values.yaml +++ b/devops/deploy-as-code/charts/urban/digit-ui/values.yaml @@ -14,7 +14,7 @@ initContainers: {} # Container Configs image: repository: "digit-ui" - tag: "v0.0.1-598b000-73" + tag: "v0.0.1-7d42bc7-80" replicas: "1" httpPort: 80 healthChecks: From acc9a54802f3cba66256cc6d92a86bfa509ef09a Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Tue, 12 Aug 2025 11:42:36 +0530 Subject: [PATCH 014/298] CCSD-474 --- .../micro-ui/web/micro-ui-internals/example/public/index.html | 3 ++- frontend/micro-ui/web/public/index.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html index 388d60e67..7b794c2cd 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html @@ -11,9 +11,10 @@ DIGIT - + + diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index dba214032..70c62ade4 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -7,9 +7,10 @@ - + + DIGIT From df51b6d4d1f87a505df79c3de3df48103b64f9dc Mon Sep 17 00:00:00 2001 From: Shivam Upadhyay <145538335+shivam-eGov@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:36:57 +0530 Subject: [PATCH 015/298] fixed k8s provider --- .../infra-as-code/terraform/sample-aws/main.tf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/devops/infra-as-code/terraform/sample-aws/main.tf b/devops/infra-as-code/terraform/sample-aws/main.tf index 82b423090..b8c02bd6b 100644 --- a/devops/infra-as-code/terraform/sample-aws/main.tf +++ b/devops/infra-as-code/terraform/sample-aws/main.tf @@ -13,6 +13,10 @@ terraform { source = "gavinbunney/kubectl" version = "~> 1.14.0" } + kubernetes = { + source = "hashicorp/kubernetes" + version = "2.37.1" + } } } @@ -320,12 +324,14 @@ resource "aws_eks_addon" "kube_proxy" { addon_name = "kube-proxy" resolve_conflicts_on_create = "OVERWRITE" } + resource "aws_eks_addon" "core_dns" { depends_on = [module.eks_managed_node_group] cluster_name = var.cluster_name addon_name = "coredns" resolve_conflicts_on_create = "OVERWRITE" } + resource "aws_eks_addon" "aws_ebs_csi_driver" { depends_on = [module.eks_managed_node_group] cluster_name = var.cluster_name @@ -334,9 +340,13 @@ resource "aws_eks_addon" "aws_ebs_csi_driver" { } provider "kubernetes" { - host = data.aws_eks_cluster.cluster.endpoint - cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data) - token = data.aws_eks_cluster_auth.cluster.token + host = module.eks.cluster_endpoint + cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data) + exec { + api_version = "client.authentication.k8s.io/v1beta1" + args = ["eks", "get-token", "--cluster-name", var.cluster_name] + command = "aws" + } } resource "kubernetes_storage_class" "ebs_csi_encrypted_gp3_storage_class" { From 8f0a6e0ffdf7a98649c48530871b2f19139abc08 Mon Sep 17 00:00:00 2001 From: Shivam Upadhyay <145538335+shivam-eGov@users.noreply.github.com> Date: Tue, 12 Aug 2025 15:44:55 +0530 Subject: [PATCH 016/298] Update variables.tf --- .../terraform/sample-aws/variables.tf | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/devops/infra-as-code/terraform/sample-aws/variables.tf b/devops/infra-as-code/terraform/sample-aws/variables.tf index a868c24f0..43dacd23f 100644 --- a/devops/infra-as-code/terraform/sample-aws/variables.tf +++ b/devops/infra-as-code/terraform/sample-aws/variables.tf @@ -32,7 +32,11 @@ variable "kubernetes_version" { variable "instance_types" { description = "Arry of instance types for SPOT instances" default = ["m5a.xlarge"] - +} + +variable "instance_reservation" { + description = "instance reservation SPOT or ON_DEMAND" + default = "ON_DEMAND" } variable "min_worker_nodes" { @@ -50,6 +54,15 @@ variable "max_worker_nodes" { default = "5" #REPLACE IF NEEDED } +variable "db_version" { + description = "postgres version" + default = "15.8" +} + +variable "db_instance_type" { + description = "Instance type for RDS instance" + default = "db.t4g.medium" +} variable "db_name" { description = "RDS DB name. Make sure there are no hyphens or other special characters in the DB name. Else, DB creation will fail" From 7cb7d43502ce1537dfd2b65a5e51f9d0ec1cf7e6 Mon Sep 17 00:00:00 2001 From: Shivam Upadhyay <145538335+shivam-eGov@users.noreply.github.com> Date: Tue, 12 Aug 2025 15:48:15 +0530 Subject: [PATCH 017/298] changed default reservation to ON-DEMAND --- devops/infra-as-code/terraform/sample-aws/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devops/infra-as-code/terraform/sample-aws/main.tf b/devops/infra-as-code/terraform/sample-aws/main.tf index b8c02bd6b..a11e0cb22 100644 --- a/devops/infra-as-code/terraform/sample-aws/main.tf +++ b/devops/infra-as-code/terraform/sample-aws/main.tf @@ -198,8 +198,8 @@ module "db" { subnet_ids = "${module.network.private_subnets}" vpc_security_group_ids = ["${module.network.rds_db_sg_id}"] availability_zone = "${element(var.availability_zones, 0)}" - instance_class = "db.t4g.medium" ## postgres db instance type - engine_version = "15.8" ## postgres version + instance_class = "${var.db_instance_type}" + engine_version = "${var.db_version}" storage_type = "gp3" storage_gb = "20" ## postgres disk size backup_retention_days = "7" @@ -280,7 +280,7 @@ module "eks_managed_node_group" { max_size = var.max_worker_nodes desired_size = var.desired_worker_nodes instance_types = var.instance_types - capacity_type = "SPOT" + capacity_type = "${var.instance_reservation}" ebs_optimized = "true" enable_monitoring = "true" iam_role_additional_policies = { From 5a225eb7cb62e6cf4315a451e210148d149e8434 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Tue, 12 Aug 2025 17:47:15 +0530 Subject: [PATCH 018/298] CCSD - 622 474 458 --- .../micro-ui/web/micro-ui-internals/example/public/index.html | 2 +- frontend/micro-ui/web/public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html index 7b794c2cd..8a2e7e7cc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html @@ -14,7 +14,7 @@ - + diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index 70c62ade4..0ccc8909d 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -9,7 +9,7 @@ rel="stylesheet" type="text/css" /> - + From ccc37eb4bd176dac863c57047eda88915f8a0799 Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Wed, 13 Aug 2025 11:01:11 +0530 Subject: [PATCH 019/298] update helmfile for core-services --- .../charts/core-services/coreservices-helmfile.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml b/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml index 2e87facac..758497cf6 100644 --- a/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml +++ b/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml @@ -112,10 +112,6 @@ releases: - name: gateway installed: true <<: *default - - - name: egov-pg-service - installed: true - <<: *default - name: boundary-bulk-bff installed: true From eb6461bc8dd85e0f16d9472a99d8a29214f82b37 Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Wed, 13 Aug 2025 11:10:46 +0530 Subject: [PATCH 020/298] update db-url --- devops/deploy-as-code/charts/common/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/deploy-as-code/charts/common/values.yaml b/devops/deploy-as-code/charts/common/values.yaml index 6ca59baa1..8a264f9ab 100644 --- a/devops/deploy-as-code/charts/common/values.yaml +++ b/devops/deploy-as-code/charts/common/values.yaml @@ -43,7 +43,7 @@ initContainers: valueFrom: configMapKeyRef: name: egov-config - key: db-otel-url + key: db-url - name: "SCHEMA_TABLE" value: {{ .Values.initContainers.dbMigration.schemaTable | quote }} - name: "FLYWAY_USER" @@ -128,7 +128,7 @@ extraEnv: valueFrom: configMapKeyRef: name: egov-config - key: db-url + key: db-otel-url - name: FLYWAY_ENABLED value: "false" - name: SPRING_FLYWAY_ENABLED From 617d63472c7981bdc93a30b2c0225cd7005464fe Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Wed, 13 Aug 2025 15:15:10 +0530 Subject: [PATCH 021/298] override flyway datasource db-url --- devops/deploy-as-code/charts/analytics/inbox/values.yaml | 5 +++++ .../charts/common-services/egov-hrms/values.yaml | 5 +++++ .../charts/common/templates/_deployment.yaml | 8 ++++---- .../charts/core-services/egov-user/values.yaml | 5 +++++ .../deploy-as-code/charts/urban/pgr-services/values.yaml | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/devops/deploy-as-code/charts/analytics/inbox/values.yaml b/devops/deploy-as-code/charts/analytics/inbox/values.yaml index f67af497e..9b1a20597 100644 --- a/devops/deploy-as-code/charts/analytics/inbox/values.yaml +++ b/devops/deploy-as-code/charts/analytics/inbox/values.yaml @@ -37,6 +37,11 @@ env: | configMapKeyRef: name: egov-service-host key: egov-workflow-v2 + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + name: egov-config + key: db-url - name: EGOV_VEHICLE_HOST valueFrom: configMapKeyRef: diff --git a/devops/deploy-as-code/charts/common-services/egov-hrms/values.yaml b/devops/deploy-as-code/charts/common-services/egov-hrms/values.yaml index d7e56ed05..60c664a54 100644 --- a/devops/deploy-as-code/charts/common-services/egov-hrms/values.yaml +++ b/devops/deploy-as-code/charts/common-services/egov-hrms/values.yaml @@ -75,6 +75,11 @@ env: | configMapKeyRef: name: egov-service-host key: egov-idgen + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + name: egov-config + key: db-url - name: EGOV_SERVICES_EGOV_IDGEN_CREATEPATH value: /egov-idgen/id/_generate - name: EGOV_SERVICES_EGOV_IDGEN_EMP_CODE_NAME diff --git a/devops/deploy-as-code/charts/common/templates/_deployment.yaml b/devops/deploy-as-code/charts/common/templates/_deployment.yaml index abb912629..cd4cdc4f2 100644 --- a/devops/deploy-as-code/charts/common/templates/_deployment.yaml +++ b/devops/deploy-as-code/charts/common/templates/_deployment.yaml @@ -146,12 +146,12 @@ spec: {{- end }} {{- if or .Values.env (eq .Values.appType "java-spring") (index .Values "global" "tracing-enabled") }} env: - {{- if .Values.env }} - {{- tpl .Values.env . | nindent 12 }} - {{- end -}} {{- if eq .Values.appType "java-spring" }} {{- tpl .Values.extraEnv.java . | nindent 12 }} - {{- end -}} + {{- end -}} + {{- if .Values.env }} + {{- tpl .Values.env . | nindent 12 }} + {{- end -}} {{- if or (index .Values "global" "tracing-enabled") (index .Values "tracing-enabled") }} {{- tpl .Values.extraEnv.jaeger . | nindent 12 }} {{- end }} diff --git a/devops/deploy-as-code/charts/core-services/egov-user/values.yaml b/devops/deploy-as-code/charts/core-services/egov-user/values.yaml index 65bf74f06..df5bac54a 100644 --- a/devops/deploy-as-code/charts/core-services/egov-user/values.yaml +++ b/devops/deploy-as-code/charts/core-services/egov-user/values.yaml @@ -96,6 +96,11 @@ env: | configMapKeyRef: name: egov-config key: egov-state-level-tenant-id + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + name: egov-config + key: db-url - name: DECRYPTION_ABAC_ENABLED value: {{ index .Values "decryption-abac-enabled" | quote }} - name: KAFKA_TOPIC_AUDIT diff --git a/devops/deploy-as-code/charts/urban/pgr-services/values.yaml b/devops/deploy-as-code/charts/urban/pgr-services/values.yaml index 525c7aa9f..d29718705 100644 --- a/devops/deploy-as-code/charts/urban/pgr-services/values.yaml +++ b/devops/deploy-as-code/charts/urban/pgr-services/values.yaml @@ -184,6 +184,11 @@ env: | configMapKeyRef: name: egov-config key: egov-state-level-tenant-id + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + name: egov-config + key: db-url {{- if index .Values "tracing-enabled" }} - name: TRACER_OPENTRACING_ENABLED value: "true" From 279f11b109e47a9cce3531e0c2fb389ef9299729 Mon Sep 17 00:00:00 2001 From: Lokendra Tyagi Date: Wed, 13 Aug 2025 15:21:28 +0530 Subject: [PATCH 022/298] override flyway datasource db-url --- .../egov-user-event/values.yaml | 5 ++ .../core-services/coreservices-helmfile.yaml | 4 - .../core-services/egov-location/Chart.lock | 6 -- .../core-services/egov-location/Chart.yaml | 26 ------- .../egov-location/charts/common-0.0.5.tgz | Bin 7765 -> 0 bytes .../egov-location/templates/deployment.yaml | 2 - .../egov-location/templates/ingress.yaml | 2 - .../egov-location/templates/service.yaml | 2 - .../core-services/egov-location/values.yaml | 72 ------------------ .../charts/core-services/egov-otp/values.yaml | 5 ++ 10 files changed, 10 insertions(+), 114 deletions(-) delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/Chart.lock delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/Chart.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/charts/common-0.0.5.tgz delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/templates/deployment.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/templates/ingress.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/templates/service.yaml delete mode 100644 devops/deploy-as-code/charts/core-services/egov-location/values.yaml diff --git a/devops/deploy-as-code/charts/common-services/egov-user-event/values.yaml b/devops/deploy-as-code/charts/common-services/egov-user-event/values.yaml index 171ea544a..8dab769b5 100644 --- a/devops/deploy-as-code/charts/common-services/egov-user-event/values.yaml +++ b/devops/deploy-as-code/charts/common-services/egov-user-event/values.yaml @@ -40,6 +40,11 @@ env: | configMapKeyRef: name: egov-service-host key: egov-mdms-service + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + name: egov-config + key: db-url - name: EGOV_MDMS_SEARCH_ENDPOINT value: /egov-mdms-service/v1/_search - name: SPRING_KAFKA_CONSUMER_GROUP_ID diff --git a/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml b/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml index 2e87facac..88ef3acea 100644 --- a/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml +++ b/devops/deploy-as-code/charts/core-services/coreservices-helmfile.yaml @@ -53,10 +53,6 @@ releases: installed: true <<: *default - - name: egov-location - installed: true - <<: *default - - name: egov-indexer installed: true <<: *default diff --git a/devops/deploy-as-code/charts/core-services/egov-location/Chart.lock b/devops/deploy-as-code/charts/core-services/egov-location/Chart.lock deleted file mode 100644 index 277f97a6b..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-location/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../common - version: 0.0.5 -digest: sha256:5ecdd1fdad744b1a0d5873f42283e09223272e4c8717a0679c27d8e215bdbc85 -generated: "2025-07-04T17:59:29.202642692+05:30" diff --git a/devops/deploy-as-code/charts/core-services/egov-location/Chart.yaml b/devops/deploy-as-code/charts/core-services/egov-location/Chart.yaml deleted file mode 100644 index 8f00c9c19..000000000 --- a/devops/deploy-as-code/charts/core-services/egov-location/Chart.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v2 -name: egov-location -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 - -dependencies: -- name: common - version: 0.0.5 - repository: file://../../common diff --git a/devops/deploy-as-code/charts/core-services/egov-location/charts/common-0.0.5.tgz b/devops/deploy-as-code/charts/core-services/egov-location/charts/common-0.0.5.tgz deleted file mode 100644 index 9b5c2b74944346bf3fd73528e8badddb8b9a0fac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7765 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 Date: Wed, 13 Aug 2025 17:44:15 +0530 Subject: [PATCH 023/298] Update values.yaml --- devops/deploy-as-code/charts/urban/digit-ui/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/deploy-as-code/charts/urban/digit-ui/values.yaml b/devops/deploy-as-code/charts/urban/digit-ui/values.yaml index 6161e6c86..f74fbf53e 100644 --- a/devops/deploy-as-code/charts/urban/digit-ui/values.yaml +++ b/devops/deploy-as-code/charts/urban/digit-ui/values.yaml @@ -14,7 +14,7 @@ initContainers: {} # Container Configs image: repository: "digit-ui" - tag: "v0.0.1-7d42bc7-80" + tag: "v0.0.1-5a225eb-85" replicas: "1" httpPort: 80 healthChecks: From 2939b0321ad02d411a40faaae20b63b5f239d010 Mon Sep 17 00:00:00 2001 From: Gurjeet-eGov <104003507+Gurjeet-eGov@users.noreply.github.com> Date: Wed, 20 Aug 2025 16:25:39 +0530 Subject: [PATCH 024/298] Update HRMS.json with updated roles --- .../src/main/resources/HRMS.json | 486 ++++++++---------- 1 file changed, 203 insertions(+), 283 deletions(-) diff --git a/utilities/default-data-handler/src/main/resources/HRMS.json b/utilities/default-data-handler/src/main/resources/HRMS.json index 6594ae88e..223ccd1a8 100644 --- a/utilities/default-data-handler/src/main/resources/HRMS.json +++ b/utilities/default-data-handler/src/main/resources/HRMS.json @@ -1,65 +1,25 @@ [ - { - "tenantId": "{tenantid}.citya", - "employeeStatus": "EMPLOYED", - "assignments": [ - { - "fromDate": 1725494400000, - "isCurrentAssignment": true, - "department": "DEPT_2", - "designation": "DESIG_04" - } - ], - "code": "ADMIN", - "dateOfAppointment": 1718841600000, - "employeeType": "PERMANENT", - "jurisdictions": [ - { - "hierarchy": "ADMIN", - "boundaryType": "City", - "boundary": "{tenantid}", - "tenantId": "{tenantid}.citya", - "roles": [ - { - "name": "SUPER USER", - "code": "SUPERUSER", - "tenantId": "{tenantid}.citya" - }, - { - "code": "LOC_ADMIN", - "name": "Localisation admin", - "tenantId": "{tenantid}.citya" - }, - { - "code": "MDMS_ADMIN", - "name": "MDMS ADMIN", - "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" - }, - { - "code": "HRMS_ADMIN", - "name": "HRMS Admin", - "tenantId": "{tenantid}.citya" - } - ] - } - ], - "user": { - "name": "ADMIN", - "gender": null, - "mobileNumber": "9307816401", - "active": true, - "type": "EMPLOYEE", + { + "tenantId": "{tenantid}.citya", + "employeeStatus": "EMPLOYED", + "assignments": [ + { + "fromDate": 1725494400000, + "isCurrentAssignment": true, + "department": "DEPT_2", + "designation": "DESIG_04" + } + ], + "code": "ADMIN", + "dateOfAppointment": 1718841600000, + "employeeType": "PERMANENT", + "jurisdictions": [ + { + "hierarchy": "ADMIN", + "boundaryType": "City", + "boundary": "{tenantid}", + "tenantId": "{tenantid}.citya", "roles": [ - { - "name": "SUPER USER", - "code": "SUPERUSER", - "tenantId": "{tenantid}.citya" - }, { "code": "LOC_ADMIN", "name": "Localisation admin", @@ -71,262 +31,222 @@ "tenantId": "{tenantid}.citya" }, { - "code": "EMPLOYEE", - "name": "Employee", + "code": "HRMS_ADMIN", + "name": "HRMS Admin", "tenantId": "{tenantid}.citya" }, + { + "code": "LOC_ADMIN", + "name": "Localisation admin", + "tenantId": "{tenantid}" + }, + { + "code": "MDMS_ADMIN", + "name": "MDMS ADMIN", + "tenantId": "{tenantid}" + }, { "code": "HRMS_ADMIN", "name": "HRMS Admin", - "tenantId": "{tenantid}.citya" + "tenantId": "{tenantid}" } - ], - "password": "eGov@123", - "otpReference": "12345", - "tenantId": "{tenantid}.citya" - }, - "serviceHistory": [], - "education": [], - "tests": [] - }, - { - "tenantId": "{tenantid}.citya", - "employeeStatus": "EMPLOYED", - "assignments": [ + ] + } + ], + "user": { + "name": "ADMIN User", + "gender": null, + "mobileNumber": "9999999904", + "active": true, + "type": "EMPLOYEE", + "roles": [ { - "fromDate": 1725494400000, - "isCurrentAssignment": true, - "department": "DEPT_2", - "designation": "DESIG_04" - } - ], - "code": "SUPERUSER", - "dateOfAppointment": 1718841600000, - "employeeType": "PERMANENT", - "jurisdictions": [ + "code": "LOC_ADMIN", + "name": "Localisation admin", + "tenantId": "{tenantid}.citya" + }, { - "hierarchy": "ADMIN", - "boundaryType": "City", - "boundary": "{tenantid}", - "tenantId": "{tenantid}.citya", - "roles": [ - { - "name": "SUPER USER", - "code": "SUPERUSER", - "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" - } - ] - } - ], - "user": { - "name": "demo111", - "gender": null, - "mobileNumber": "9307817402", - "active": true, - "type": "EMPLOYEE", - "roles": [ - { - "name": "SUPER USER", - "code": "SUPERUSER", - "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" - } - ], - "password": "eGov@123", - "otpReference": "12345", - "tenantId": "{tenantid}.citya" - }, - "serviceHistory": [], - "education": [], - "tests": [] - }, - { - "tenantId": "{tenantid}.citya", - "employeeStatus": "EMPLOYED", - "assignments": [ + "code": "MDMS_ADMIN", + "name": "MDMS ADMIN", + "tenantId": "{tenantid}.citya" + }, { - "fromDate": 1725494400000, - "isCurrentAssignment": true, - "department": "DEPT_2", - "designation": "DESIG_04" - } - ], - "code": "LME", - "dateOfAppointment": 1718841600000, - "employeeType": "PERMANENT", - "jurisdictions": [ + "code": "HRMS_ADMIN", + "name": "HRMS Admin", + "tenantId": "{tenantid}.citya" + }, { - "hierarchy": "ADMIN", - "boundaryType": "City", - "boundary": "{tenantid}", - "tenantId": "{tenantid}.citya", - "roles": [ - { - "name": "PGR Last Mile Employee", - "code": "PGR_LME", - "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" - } - ] + "code": "LOC_ADMIN", + "name": "Localisation admin", + "tenantId": "{tenantid}" + }, + { + "code": "MDMS_ADMIN", + "name": "MDMS ADMIN", + "tenantId": "{tenantid}" + }, + { + "code": "HRMS_ADMIN", + "name": "HRMS Admin", + "tenantId": "{tenantid}" } ], - "user": { - "name": "demo111", - "gender": null, - "mobileNumber": "9307817403", - "active": true, - "type": "EMPLOYEE", + "password": "eGov@123", + "otpReference": "12345", + "tenantId": "{tenantid}.citya" + }, + "serviceHistory": [], + "education": [], + "tests": [] + }, + { + "tenantId": "{tenantid}.citya", + "employeeStatus": "EMPLOYED", + "assignments": [ + { + "fromDate": 1725494400000, + "isCurrentAssignment": true, + "department": "DEPT_1", + "designation": "DESIG_04" + } + ], + "code": "LME", + "dateOfAppointment": 1718841600000, + "employeeType": "PERMANENT", + "jurisdictions": [ + { + "hierarchy": "ADMIN", + "boundaryType": "City", + "boundary": "{tenantid}", + "tenantId": "{tenantid}.citya", "roles": [ { "name": "PGR Last Mile Employee", "code": "PGR_LME", "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" } - ], - "password": "eGov@123", - "otpReference": "12345", - "tenantId": "{tenantid}.citya" - }, - "serviceHistory": [], - "education": [], - "tests": [] - }, - { - "tenantId": "{tenantid}.citya", - "employeeStatus": "EMPLOYED", - "assignments": [ + ] + } + ], + "user": { + "name": "LME User", + "gender": null, + "mobileNumber": "9999999903", + "active": true, + "type": "EMPLOYEE", + "roles": [ { - "fromDate": 1725494400000, - "isCurrentAssignment": true, - "department": "DEPT_2", - "designation": "DESIG_04" + "name": "PGR Last Mile Employee", + "code": "PGR_LME", + "tenantId": "{tenantid}.citya" } ], - "code": "CSR", - "dateOfAppointment": 1718841600000, - "employeeType": "PERMANENT", - "jurisdictions": [ - { - "hierarchy": "ADMIN", - "boundaryType": "City", - "boundary": "{tenantid}", - "tenantId": "{tenantid}.citya", - "roles": [ - { - "name": "Customer Support Representative", - "code": "CSR", - "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" - } - ] - } - ], - "user": { - "name": "demo111", - "gender": null, - "mobileNumber": "9307817404", - "active": true, - "type": "EMPLOYEE", + "password": "eGov@123", + "otpReference": "12345", + "tenantId": "{tenantid}.citya" + }, + "serviceHistory": [], + "education": [], + "tests": [] + }, + { + "tenantId": "{tenantid}.citya", + "employeeStatus": "EMPLOYED", + "assignments": [ + { + "fromDate": 1725494400000, + "isCurrentAssignment": true, + "department": "DEPT_2", + "designation": "DESIG_04" + } + ], + "code": "CSR", + "dateOfAppointment": 1718841600000, + "employeeType": "PERMANENT", + "jurisdictions": [ + { + "hierarchy": "ADMIN", + "boundaryType": "City", + "boundary": "{tenantid}", + "tenantId": "{tenantid}.citya", "roles": [ { "name": "Customer Support Representative", "code": "CSR", "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" } - ], - "password": "eGov@123", - "otpReference": "12345", - "tenantId": "{tenantid}.citya" - }, - "serviceHistory": [], - "education": [], - "tests": [] - }, - { - "tenantId": "{tenantid}.citya", - "employeeStatus": "EMPLOYED", - "assignments": [ + ] + } + ], + "user": { + "name": "CSR USER", + "gender": null, + "mobileNumber": "9999999901", + "active": true, + "type": "EMPLOYEE", + "roles": [ { - "fromDate": 1725494400000, - "isCurrentAssignment": true, - "department": "DEPT_2", - "designation": "DESIG_04" + "name": "Customer Support Representative", + "code": "CSR", + "tenantId": "{tenantid}.citya" } ], - "code": "GRO", - "dateOfAppointment": 1718841600000, - "employeeType": "PERMANENT", - "jurisdictions": [ - { - "hierarchy": "ADMIN", - "boundaryType": "City", - "boundary": "{tenantid}", - "tenantId": "{tenantid}.citya", - "roles": [ - { - "name": "Grievance Routing Officer", - "code": "GRO", - "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" - } - ] - } - ], - "user": { - "name": "demo111", - "gender": null, - "mobileNumber": "9307817405", - "active": true, - "type": "EMPLOYEE", + "password": "eGov@123", + "otpReference": "12345", + "tenantId": "{tenantid}.citya" + }, + "serviceHistory": [], + "education": [], + "tests": [] + }, + { + "tenantId": "{tenantid}.citya", + "employeeStatus": "EMPLOYED", + "assignments": [ + { + "fromDate": 1725494400000, + "isCurrentAssignment": true, + "department": "DEPT_1", + "designation": "DESIG_04" + } + ], + "code": "GRO", + "dateOfAppointment": 1718841600000, + "employeeType": "PERMANENT", + "jurisdictions": [ + { + "hierarchy": "ADMIN", + "boundaryType": "City", + "boundary": "{tenantid}", + "tenantId": "{tenantid}.citya", "roles": [ { "name": "Grievance Routing Officer", "code": "GRO", "tenantId": "{tenantid}.citya" - }, - { - "code": "EMPLOYEE", - "name": "Employee", - "tenantId": "{tenantid}.citya" } - ], - "password": "eGov@123", - "otpReference": "12345", - "tenantId": "{tenantid}.citya" - }, - "serviceHistory": [], - "education": [], - "tests": [] - } -] \ No newline at end of file + ] + } + ], + "user": { + "name": "GRO User", + "gender": null, + "mobileNumber": "9999999902", + "active": true, + "type": "EMPLOYEE", + "roles": [ + { + "name": "Grievance Routing Officer", + "code": "GRO", + "tenantId": "{tenantid}.citya" + } + ], + "password": "eGov@123", + "otpReference": "12345", + "tenantId": "{tenantid}.citya" + }, + "serviceHistory": [], + "education": [], + "tests": [] + } +] From 7286e0724cce885f03fefb55cbc90ad91113fe89 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Fri, 22 Aug 2025 16:31:47 +0530 Subject: [PATCH 025/298] PG_VIEWER role added CSR action Card rendereing changes --- .../modules/pgr/src/components/PGRCard.js | 2 +- .../pgr/src/pages/employee/PGRDetails.js | 93 +++++++++++++------ 2 files changed, 66 insertions(+), 29 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js index 9b8832c84..bd383891f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js @@ -34,7 +34,7 @@ const PGRCard = () => { } let links = [ - generateLink("ACTION_TEST_CREATE_COMPLAINT", "create-complaint"), + generateLink("ACTION_TEST_CREATE_COMPLAINT", "create-complaint", ["CSR"]), generateLink("ACTION_TEST_SEARCH_COMPLAINT", "inbox-v2"), ]; const hasRequiredRoles = (link) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js index 6edac9346..6c349c25f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/PGRDetails.js @@ -338,6 +338,41 @@ const PGRDetails = () => { : []; }; + // Check if action button should be visible based on user roles + const shouldShowActionButton = () => { + const userRoles = userInfo?.info?.roles?.map((role) => role.code) || []; + + // Get current state from ProcessInstances[0] + const currentState = workflowData?.ProcessInstances?.[0]?.state; + + if (!currentState?.actions) { + return false; + } + + // Get all roles from current state actions + const allActionRoles = []; + currentState.actions.forEach(action => { + if (action.roles) { + allActionRoles.push(...action.roles); + } + }); + + // Check if user has PGR_VIEWER role + const hasViewerRole = userRoles.includes("PGR_VIEWER"); + + // Get user roles excluding PGR_VIEWER + const userNonViewerRoles = userRoles.filter(role => role !== "PGR_VIEWER"); + + // Check if any non-viewer user role matches with action roles + const hasMatchingRole = userNonViewerRoles.some(userRole => + allActionRoles.includes(userRole) + ); + + + // Show button only if user has BOTH PGR_VIEWER AND other matching roles + return hasViewerRole && hasMatchingRole; + }; + // Display loader until required data loads if (isLoading || isMDMSLoading || isWorkflowLoading) return ; @@ -430,34 +465,36 @@ const PGRDetails = () => { {/* Footer Action Bar */} -