Merge pull request #753 from egovernments/develop

Develop HRMS
egovernments · Mar 14, 2024 · 5cd5281 · 5cd5281
2 parents 4769a97 + 1669e19
commit 5cd5281
Show file tree

Hide file tree

Showing 237 changed files with 17,036 additions and 3,003 deletions.
diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile
@@ -1,5 +1,4 @@
-# FROM egovio/alpine-node-builder-14:yarn AS build
-FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build
+FROM egovio/alpine-node-builder-14:yarn AS build
 RUN apk update && apk upgrade
 RUN apk add --no-cache git>2.30.0
 ARG WORK_DIR
@@ -13,7 +12,7 @@ RUN ls -lah
 RUN cd web/ \
     &&  ./install-deps.sh \
     && yarn install \
-    && yarn build 
+    && yarn build:webpack 
 
 FROM nginx:mainline-alpine
 #FROM ghcr.io/egovernments/nginx:mainline-alpine

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json
@@ -4,12 +4,12 @@
   "main": "index.js",
   "license": "MIT",
   "private": true,
-  "homepage": "digit-ui/",
+  "homepage": "mgramseva-web/",
   "scripts": {
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries":"^1.5.7",
+    "@egovernments/digit-ui-libraries":"^1.4.0",
     "@egovernments/digit-ui-module-common":"^1.4.0",
     "@egovernments/digit-ui-module-engagement":"^1.4.0",
     "@egovernments/digit-ui-module-fsm":"^1.4.0",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/maspackage.json b/frontend/micro-ui/web/micro-ui-internals/example/maspackage.json
@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "private": true,
-  "homepage": "digit-ui/",
+  "homepage": "mgramseva-web/",
   "scripts": {
     "start": "react-scripts start"
   },

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -4,23 +4,18 @@
   "main": "index.js",
   "license": "MIT",
   "private": true,
-  "homepage": "digit-ui",
+  "homepage": "mgramseva-web",
   "scripts": {
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-module-dss": "1.5.37",
-    "@egovernments/digit-ui-module-core": "1.5.42",
-    "@egovernments/digit-ui-module-common": "1.5.30",
-    "@egovernments/digit-ui-module-hrms": "1.5.25",
-    "@egovernments/digit-ui-module-utilities": "0.0.8",
+    "@egovernments/digit-ui-libraries": "1.5.7",
+    "@egovernments/digit-ui-module-dss": "1.5.34",
+    "@egovernments/digit-ui-module-core": "1.5.46",
+    "@egovernments/digit-ui-module-hrms": "1.5.27",
+    "@egovernments/digit-ui-module-pgr": "1.7.0",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
-    "@egovernments/digit-ui-react-components": "1.5.28",
-    "@egovernments/digit-ui-svg-components": "0.0.1",
-    "@egovernments/digit-ui-libraries": "1.5.7", 
-    "@egovernments/digit-ui-module-sample": "0.0.1",
-    "@egovernments/digit-ui-module-workbench":"0.0.3",
-    "@egovernments/digit-ui-customisation-mukta": "0.0.1",
+    "@egovernments/digit-ui-react-components": "1.5.26",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",
@@ -40,4 +35,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
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
@@ -9,24 +9,31 @@
     rel='stylesheet' type='text/css'>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
-  <title>mSeva</title>
-
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
-
-
-  <!-- <link rel="stylesheet" href="https://unpkg.com/@upyog-niua/[email protected]/dist/index.css" /> -->
+  <title>mGramSeva</title>
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
   <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
   <script src="%REACT_APP_GLOBAL%"></script>
-
+  <style type="text/css">
+    #logo-img-container{
+      display: none;
+    }
+    .selector-button-primary > h2{
+      margin: 0
+    }
+    .menu-wrap > div > p {
+      margin: 0
+    }
+    .selector-button-primary-disabled > h2 {
+      margin: 0;
+    }
+    </style>
 </head>
 
 <body>
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
 </body>
 
-</html>
+</html>
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js
@@ -2,34 +2,26 @@ import React from "react";
 import ReactDOM from "react-dom";
 
 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 { initSampleComponents } from "@egovernments/digit-ui-module-sample";
-import {initWorkbenchComponents} from "@egovernments/digit-ui-module-workbench";
-
-import { initMuktaCustomisations } from "@egovernments/digit-ui-customisation-mukta";
-
-import "@egovernments/digit-ui-custom-css/example/index.css";
+import { initPGRComponents, PGRReducers } from "@egovernments/digit-ui-module-pgr";
+import "@egovernments/digit-ui-css/example/index.css";
 
 import { pgrCustomizations } from "./pgr";
 import { UICustomizations } from "./UICustomizations";
 
 var Digit = window.Digit || {};
 
 const enabledModules = [
+  "DSS",
   "HRMS",
+  "PGR",
   //  "Engagement", "NDSS","QuickPayLinks", "Payment",
-  "Utilities",
+  // "Utilities",
   //added to check fsm
   // "FSM"
-  "Mukta",
-  "Sample",
-  // "Workbench"
-
 ];
 
 const initTokens = (stateCode) => {
@@ -59,35 +51,32 @@ const initTokens = (stateCode) => {
 };
 
 const initDigitUI = () => {
-  window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH") || "digit-ui";
+  window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH") || "mgramseva-web";
 
-  window?.Digit.ComponentRegistryService.setupRegistry({
-    PaymentModule,
-    ...paymentConfigs,
-    PaymentLinks,
-  });
+  // window?.Digit.ComponentRegistryService.setupRegistry({
+  //   PaymentModule,
+  //   ...paymentConfigs,
+  //   PaymentLinks,
+  // });
 
   initDSSComponents();
   initHRMSComponents();
   initEngagementComponents();
-  initUtilitiesComponents();
-  initSampleComponents();
-  initWorkbenchComponents();
+  initPGRComponents();
 
-  const moduleReducers = (initData) => initData;
+  const moduleReducers = (initData) => ({
+    pgr: PGRReducers(initData),
+  });
 
   window.Digit.Customizations = {
     PGR: pgrCustomizations,
     commonUiConfig: UICustomizations,
   };
 
-  const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pg";
+  const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pb";
   initTokens(stateCode);
-  initMuktaCustomisations();
-  ReactDOM.render(
-    <DigitUI stateCode={stateCode} enabledModules={enabledModules} moduleReducers={moduleReducers} defaultLanding="employee" />,
-    document.getElementById("root")
-  );
+
+  ReactDOM.render(<DigitUI stateCode={stateCode} enabledModules={enabledModules} moduleReducers={moduleReducers} />, document.getElementById("root"));
 };
 
 initLibraries().then(() => {

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js b/frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js
@@ -5,21 +5,16 @@ const createProxy = createProxyMiddleware({
   // target: process.env.REACT_APP_PROXY_API || "https://qa.digit.org",
   target: process.env.REACT_APP_PROXY_API || "https://works-dev.digit.org",
   changeOrigin: true,
-  secure:false
+  secure: true,
 });
 const assetsProxy = createProxyMiddleware({
   target: process.env.REACT_APP_PROXY_ASSETS || "https://works-dev.digit.org",
   changeOrigin: true,
-  secure:false
-});
-const mdmsProxy = createProxyMiddleware({
-  target: process.env.REACT_APP_PROXY_ASSETS || "http://localhost:8080",
-  changeOrigin: true,
-  secure:false
+  secure: true,
 });
 module.exports = function (app) {
-  ["/mdms-v2/v2/_create"].forEach((location) => app.use(location, mdmsProxy));
-   [ "/access/v1/actions/mdms",
+  [
+    "/access/v1/actions/mdms",
     "/egov-mdms-service",
     "/egov-location",
     "/localization",
@@ -76,7 +71,7 @@ module.exports = function (app) {
     "/egov-pdf/download/WORKSESTIMATE/estimatepdf",
     "/muster-roll",
     "/individual",
-    "/mdms-v2"
+    "/mdms-v2",
   ].forEach((location) => app.use(location, createProxy));
   ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
 };
diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -5,10 +5,9 @@
   "workspaces": [
     "packages/libraries",
     "example",
-    "packages/custom-css",
+    "packages/css",
     "packages/react-components",
-    "packages/modules/*",
-    "packages/Mukta"
+    "packages/modules/*"
   ],
   "author": "JaganKumar <[email protected]>",
   "license": "MIT",
@@ -21,24 +20,29 @@
     "sprint": "SKIP_PREFLIGHT_CHECK=true run-s start:script",
     "start:dev": "run-p dev:**",
     "start:script": "./scripts/create.sh",
-    "dev:css": "cd packages/custom-css && yarn start",
-    "publish:css": "cd packages/custom-css && yarn publish --access public",
+    "dev:css": "cd packages/css && yarn start",
+    "publish:css": "cd packages/css && yarn publish --access public",
     "dev:libraries": "cd packages/libraries && yarn start",
     "dev:components": "cd packages/react-components && yarn start",
+    "dev:pgr": "cd packages/modules/pgr && yarn start",
+    "dev:hrms": "cd packages/modules/hrms && yarn start",
+    "dev:core": "cd packages/modules/core && yarn start",
     "dev:example": "cd example && yarn start",
-    "dev:sample": "cd packages/modules/sample && yarn start",
-    "dev:mukta": "cd packages/Mukta && yarn start",
     "build": "run-p build:**",
+    "build:css": "cd packages/css && yarn build:prod",
     "build:libraries": "cd packages/libraries && yarn build",
     "build:components": "cd packages/react-components && yarn build",
-    "build:mukta": "cd packages/Mukta && yarn build",
+    "build:pgr": "cd packages/modules/pgr && yarn build",
+    "build:hrms": "cd packages/modules/hrms && yarn build",
+    "build:core": "cd packages/modules/core && yarn build",
     "build:sample": "cd packages/modules/sample && yarn build",
     "deploy:jenkins": "./scripts/jenkins.sh",
     "clean": "rm -rf node_modules"
   },
   "resolutions": {
     "**/@babel/runtime": "7.20.1",
-    "**/babel-preset-react-app": "10.0.0"
+    "**/babel-preset-react-app": "10.0.0",
+    "**/polished": "4.2.2"
   },
   "devDependencies": {
     "husky": "7.0.4",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/package.json