Hlm 5482 bugs

.gitignore

@@ -2,3 +2,4 @@
 accelerators/frontend/micro-ui-internals/node_modules/*
 .idea
 index.lock
+utilities/

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.inlineSuggest.showToolbar": "always"
+}

build/build-config.yml

@@ -49,3 +49,7 @@ config:
         dockerfile: micro-ui/web/core/Dockerfile
         image-name: core-ui
 
+  - name: builds/Digit-Frontend/utilities/egov-bff
+    build:
+      - work-dir: utilities/egov-bff
+        image-name: egov-bff

micro-ui/web/core/App.js

@@ -1,18 +1,11 @@
 import React from "react";
 import { initLibraries } from "@egovernments/digit-ui-libraries";
-import {
-  paymentConfigs,
-  PaymentLinks,
-  PaymentModule,
-} from "@egovernments/digit-ui-module-common";
 import { DigitUI } from "@egovernments/digit-ui-module-core";
-import { initDSSComponents } from "@egovernments/digit-ui-module-dss";
-import { initEngagementComponents } from "@egovernments/digit-ui-module-engagement";
 import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
-import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
 import { UICustomizations } from "./Customisations/UICustomizations";
 import { initWorkbenchComponents } from "@egovernments/digit-ui-module-workbench";
-
+import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
+import { initPGRComponents,PGRReducers } from "@egovernments/digit-ui-module-pgr";
 window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");
 
 const enabledModules = [
@@ -22,29 +15,23 @@ const enabledModules = [
   "HRMS",
   "Engagement",
   "Workbench",
+  "PGR"
 ];
 
 const moduleReducers = (initData) => ({
-  initData,
+  initData, pgr: PGRReducers(initData),
 });
 
 const initDigitUI = () => {
-  window.Digit.ComponentRegistryService.setupRegistry({
-    PaymentModule,
-    ...paymentConfigs,
-    PaymentLinks,
-  });
-
-  initDSSComponents();
-  initHRMSComponents();
-  initEngagementComponents();
-  initUtilitiesComponents();
-  initWorkbenchComponents();
-
+  window.Digit.ComponentRegistryService.setupRegistry({});
   window.Digit.Customizations = {
     PGR: {},
     commonUiConfig: UICustomizations,
   };
+  initHRMSComponents();
+  initUtilitiesComponents();
+  initWorkbenchComponents();
+  initPGRComponents();
 };
 
 initLibraries().then(() => {
@@ -64,9 +51,9 @@ function App() {
       stateCode={stateCode}
       enabledModules={enabledModules}
       moduleReducers={moduleReducers}
-      // defaultLanding="employee"
+      defaultLanding="employee"
     />
   );
 }
 
-export default App;
+export default App;

micro-ui/web/core/inter-package.json

@@ -4,10 +4,9 @@
   "main": "index.js",
   "workspaces": [
     "packages/libraries",
-    "example",
-    "packages/css",
     "packages/react-components",
-    "packages/modules/*"
+    "packages/modules/core",
+    "packages/modules/workbench"
   ],
   "author": "JaganKumar <[email protected]>",
   "license": "MIT",
@@ -28,6 +27,7 @@
     "dev:core": "cd packages/modules/core && yarn start",
     "dev:dss": "cd packages/modules/dss && yarn start",
     "dev:hrms": "cd packages/modules/hrms && yarn start",
+    "dev:pgr": "cd packages/modules/pgr && yarn start",
     "devD:common": "cd packages/modules/common && yarn start",
     "devD:utilities": "cd packages/modules/utilities && yarn start",
     "dev:workbench": "cd packages/modules/workbench && yarn start",
@@ -36,12 +36,13 @@
     "build:libraries": "cd packages/libraries && yarn build",
     "build:components": "cd packages/react-components && yarn build",
     "build:svgcomponents": "cd packages/svg-components && yarn build",
-    "build:dss": "cd packages/modules/dss && yarn build",
+    "buildD:dss": "cd packages/modules/dss && yarn build",
     "build:core": "cd packages/modules/core && yarn build",
-    "build:hrms": "cd packages/modules/hrms && yarn build",
-    "build:common": "cd packages/modules/common && yarn build",
-    "build:utilities": "cd packages/modules/utilities && yarn build",
-    "build:engagement": "cd packages/modules/engagement && yarn build",
+    "buildD:hrms": "cd packages/modules/hrms && yarn build",
+    "buildD:pgr": "cd packages/modules/pgr && yarn build",
+    "buildD:common": "cd packages/modules/common && yarn build",
+    "buildD:utilities": "cd packages/modules/utilities && yarn build",
+    "buildD:engagement": "cd packages/modules/engagement && yarn build",
     "build:workbench": "cd packages/modules/workbench && yarn build",
     "deploy:jenkins": "./scripts/jenkins.sh",
     "clean": "rm -rf node_modules"
@@ -63,7 +64,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
-    "@egovernments/digit-ui-react-components": "1.8.0-beta.1",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.4",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

micro-ui/web/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "micro-ui",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Jagankumar <[email protected]>",
   "license": "MIT",
   "private": true,
@@ -10,37 +10,30 @@
   "workspaces": [
     "micro-ui-internals/packages/libraries",
     "micro-ui-internals/packages/react-components",
-    "micro-ui-internals/packages/modules/*"
+    "micro-ui-internals/packages/modules/core",
+    "micro-ui-internals/packages/modules/workbench"
   ],
   "homepage": "/core-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.0-beta",
-    "@egovernments/digit-ui-module-workbench": "1.0.0-beta",
-    "@egovernments/digit-ui-module-core": "1.8.0-beta.8",
-    "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
-    "@egovernments/digit-ui-react-components": "1.8.0-beta.1",
-    "@egovernments/digit-ui-module-dss": "1.8.0-beta",
-    "@egovernments/digit-ui-module-common": "1.8.0-beta",
-    "@egovernments/digit-ui-module-utilities": "1.0.0-beta",
-    "@egovernments/digit-ui-module-engagement": "1.5.20",
+    "@egovernments/digit-ui-libraries": "1.8.1-beta.1",
+    "@egovernments/digit-ui-module-workbench": "1.0.1-beta.2",
+    "@egovernments/digit-ui-module-core": "1.8.1-beta.6",
+    "@egovernments/digit-ui-module-hrms": "1.8.0",
+    "@egovernments/digit-ui-module-pgr": "1.7.5",
+    "@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.4",
     "babel-loader": "8.1.0",
-    "clean-webpack-plugin": "4.0.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "jsonpath": "^1.1.1",
+    "clean-webpack-plugin": "4.0.0",
     "react-router-dom": "5.3.0",
-    "react-scripts": "4.0.1",
+    "webpack-cli": "4.10.0",
     "web-vitals": "1.1.2",
-    "terser-brunch": "^4.1.0",
     "react-hook-form": "6.15.8",
     "react-i18next": "11.16.2",
-    "react-query": "3.6.1",
-    "css-loader":"5.2.6",
-    "style-loader": "2.0.0",
-    "webpack-cli": "4.10.0"
+    "react-query": "3.6.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "7.21.0",
     "http-proxy-middleware": "1.3.1",
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
@@ -55,13 +48,20 @@
     "npm-run-all": "4.1.5",
     "prettier": "2.1.2"
   },
+  "resolutions": {
+    "**/babel-loader": "8.2.2",
+    "**/@babel/core": "7.14.0",
+    "**/@babel/preset-env": "7.14.0",
+    "**/@babel/plugin-transform-modules-commonjs": "7.14.0",
+    "**/polished": "4.2.2"
+  },
   "scripts": {
     "start": "react-scripts start",
     "build": "GENERATE_SOURCEMAP=false SKIP_PREFLIGHT_CHECK=true react-scripts build",
     "build:prepare": "./build.sh",
     "build:libraries": "cd micro-ui-internals && yarn build",
     "build:prod": "webpack --mode production",
-    "build:webpack":"yarn build:libraries &&cd .. && ls && cd ./web && ls && yarn build:prod",
+    "build:webpack": "yarn build:libraries &&cd .. && ls && cd ./web && ls && yarn build:prod",
     "clean": "rm -rf node_modules"
   },
   "eslintConfig": {
@@ -81,4 +81,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

micro-ui/web/micro-ui-internals/example/.env-workbench-mz-uat

@@ -0,0 +1,8 @@
+SKIP_PREFLIGHT_CHECK=true
+REACT_APP_USER_TYPE=EMPLOYEE
+REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a
+REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c
+REACT_APP_PROXY_API=https://unified-uat.digit.org
+REACT_APP_PROXY_ASSETS=https://unified-uat.digit.org
+REACT_APP_GLOBAL=https://egov-uat-assets.s3.ap-south-1.amazonaws.com/globalConfigsWorkbench.js
+REACT_APP_CONTEXT=works

micro-ui/web/micro-ui-internals/example/package.json

@@ -9,15 +9,16 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.0-beta",
-    "@egovernments/digit-ui-module-workbench": "1.0.0-beta",
-    "@egovernments/digit-ui-module-dss": "1.8.0-beta",
-    "@egovernments/digit-ui-module-core": "1.8.0-beta.8",
-    "@egovernments/digit-ui-module-common": "1.8.0-beta",
-    "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
-    "@egovernments/digit-ui-module-utilities": "1.0.0-beta",
+    "@egovernments/digit-ui-libraries": "1.8.1-beta.1",
+    "@egovernments/digit-ui-module-workbench": "1.0.1-beta.2",
+    "@egovernments/digit-ui-module-pgr": "1.7.5",
+    "@egovernments/digit-ui-module-dss": "1.8.0",
+    "@egovernments/digit-ui-module-core": "1.8.1-beta.6",
+    "@egovernments/digit-ui-module-common": "1.8.0",
+    "@egovernments/digit-ui-module-hrms": "1.8.0",
+    "@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
-    "@egovernments/digit-ui-react-components": "1.8.0-beta.1",
+    "@egovernments/digit-ui-react-components": "1.8.1-beta.4",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",
@@ -37,4 +38,4 @@
       "last 1 safari version"
     ]
   }
-}
+}