Merge pull request #710 from odisha-muktasoft/UAT-OCT-15

Uat oct 15
odisha-muktasoft · Oct 15, 2024 · e575cd5 · e575cd5
2 parents 67a78ff + ec9fc90
commit e575cd5
Show file tree

Hide file tree

Showing 605 changed files with 51,054 additions and 31,626 deletions.
diff --git a/.github/workflows/publishUIPackages.yml b/.github/workflows/publishUIPackages.yml
@@ -8,16 +8,7 @@ on:
       # Push events to branches matching refs/heads/mona/octocat
       - 'UAT'
       - 'MUKTA-v2.1-Develop'
-    paths:
-      - 'frontend/micro-ui/web/micro-ui-internals/**'
-  pull_request:
-    branches: 
-      # Push events on main branch
-      - 'master'
-      # Push events to branches matching refs/heads/mona/octocat
-      - 'develop'
-      # Push events to branches matching refs/heads/releases/10
-      - 'MUKTA-v2.1-Develop' 
+      - 'MUKTA-DEVELOP-v2.1.1'
     paths:
       - 'frontend/micro-ui/web/micro-ui-internals/**'
 

diff --git a/frontend/micro-ui/web/.babelrc b/frontend/micro-ui/web/.babelrc
@@ -7,4 +7,4 @@
     "@babel/plugin-proposal-optional-chaining",
     "@babel/plugin-proposal-nullish-coalescing-operator"
   ]
-  }
+  }
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -9,20 +9,21 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
+    "@egovernments/digit-ui-react-components": "1.5.12",
+    "@egovernments/digit-ui-components": "0.0.2-beta.47",
     "@egovernments/digit-ui-libraries": "1.5.0",
-    "@egovernments/digit-ui-module-core": "1.5.47",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.20",
     "@egovernments/digit-ui-module-hrms": "1.5.26",
     "@egovernments/digit-ui-module-dss": "1.5.52",
-    "@egovernments/digit-ui-react-components": "^1.5.0",
-    "@egovernments/digit-ui-module-attendencemgmt": "0.4.3",
-    "@egovernments/digit-ui-module-contracts": "0.4.4",
-    "@egovernments/digit-ui-module-measurement":"0.2.0",
-    "@egovernments/digit-ui-module-estimate": "0.4.5",
-    "@egovernments/digit-ui-module-masters": "0.4.5",
-    "@egovernments/digit-ui-module-project": "0.4.1",
-    "@egovernments/digit-ui-module-expenditure": "0.4.1",
-    "@egovernments/digit-ui-customisation-mukta": "0.2.1",
-    "@egovernments/digit-ui-module-rate-analysis": "0.4.0",
+    "@egovernments/digit-ui-module-attendencemgmt": "0.4.13",
+    "@egovernments/digit-ui-module-contracts": "0.4.14",
+    "@egovernments/digit-ui-module-measurement":"0.2.15",
+    "@egovernments/digit-ui-module-estimate": "0.4.20",
+    "@egovernments/digit-ui-module-masters": "0.4.18",
+    "@egovernments/digit-ui-module-project": "0.4.14",
+    "@egovernments/digit-ui-module-expenditure": "0.4.15",
+    "@egovernments/digit-ui-customisation-mukta": "0.2.10",
+    "@egovernments/digit-ui-module-rate-analysis": "0.4.12",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

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
@@ -10,7 +10,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>MUKTASoft</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/@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/globalConfigsWorks.js"></script> -->

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js b/frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js
@@ -194,6 +194,9 @@ export const UICustomizations = {
     if(businessService === businessServiceMap?.["revisedWO"]){
       return action.action.includes("VERIFY_AND_FORWARD")
     }
+    if(businessService === businessServiceMap?.measurement){
+      return action.action.includes("VERIFY_AND_FORWARD") || action.action.includes("SEND_BACK_TO_ORIGINATOR")
+    }
 
     return false;
   },
@@ -648,8 +651,6 @@ export const UICustomizations = {
 
   SearchMeasurementConfig: {
     preProcess: (data) => {
-
-      // console.log(data);
     const mbNumber=data?.body?.Individual?.MBNumber || null;
     const refId= data?.body?.Individual?.MBReference || null;
 
@@ -670,7 +671,6 @@ export const UICustomizations = {
 
     },
     additionalCustomizations: (row, key, column, value, t, searchResult) => {
-      // console.log(key,value);
       //here we can add multiple conditions
       //like if a cell is link then we return link
       //first we can identify which column it belongs to then we can return relevant result
@@ -786,7 +786,7 @@ export const UICustomizations = {
       //checking both to and from date are present
       const { createdFrom, createdTo } = data;
       if ((createdFrom === "" && createdTo !== "") || ( createdFrom!== "" && createdTo === ""))
-        return { warning: true, label: "ES_COMMON_ENTER_DATE_RANGE" };
+        return { type:"warning", label: "ES_COMMON_ENTER_DATE_RANGE" };
 
       return false;
     },
@@ -800,9 +800,6 @@ export const UICustomizations = {
 
     },
     additionalCustomizations: (row, key, column, value, t, searchResult) => {
-      // console.log(key,value);
-      // console.log(row,"qwertyuiop");
-
       //here we can add multiple conditions
       //like if a cell is link then we return link
       //first we can identify which column it belongs to then we can return relevant result

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
@@ -42,6 +42,7 @@ module.exports = function (app) {
     "/egov-searcher/bill-genie/waterbills/_get",
     "/egov-searcher/bill-genie/seweragebills/_get",
     "/egov-pdf/download/UC/mcollect-challan",
+    "/egov-pdf/",
     "/egov-hrms/employees/_count",
     "/tl-services/v1/_create",
     "/tl-services/v1/_search",
@@ -94,8 +95,9 @@ module.exports = function (app) {
     "/mdms-v2/",
     "/egov-idgen/",
     "/rate-analysis/v1/_calculate",
-    "mukta-ifix-adapter",
+    "/mukta-ifix-adapter",
     "/ifms-adapter",
+    "/boundary-service",
 
     //look here
     "/statements/v1/analysis/_create",

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -4,15 +4,10 @@
   "main": "index.js",
   "workspaces": [
     "packages/libraries",
-    "example",
-    "packages/css",
     "packages/react-components",
-    "packages/modules/*",
     "packages/modules/Estimate",
-    "packages/modules/Project",
-    "packages/modules/Expenditure",
-    "packages/Mukta",
-    "packages/modules/RateAnalysis"
+    "packages/modules/RateAnalysis",
+    "packages/Mukta"
   ],
   "author": "JaganKumar <[email protected]>",
   "license": "MIT",
@@ -44,15 +39,15 @@
     "buildD": "run-p buildD:**",
     "build:libraries": "cd packages/libraries && yarn build",
     "build:components": "cd packages/react-components && yarn build",
-    "build:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build",
-    "build:contracts": "cd packages/modules/Contracts && yarn build",
-    "build:masters": "cd packages/modules/Masters && yarn build",
+    "buildD:attendencemgmt": "cd packages/modules/AttendenceMgmt && yarn build",
+    "buildD:contracts": "cd packages/modules/Contracts && yarn build",
+    "buildD:masters": "cd packages/modules/Masters && yarn build",
     "build:estimate": "cd packages/modules/Estimate && yarn build",
-    "build:measurement": "cd packages/modules/Measurement && yarn build",
+    "buildD:measurement": "cd packages/modules/Measurement && yarn build",
     "build:mukta": "cd packages/Mukta && yarn build",
-    "build:project": "cd packages/modules/Project && yarn build",
+    "buildD:project": "cd packages/modules/Project && yarn build",
     "buildD:works": "cd packages/modules/works && yarn build",
-    "build:expenditure": "cd packages/modules/Expenditure && yarn build",
+    "buildD:expenditure": "cd packages/modules/Expenditure && yarn build",
     "build:rateAnalysis":"cd packages/modules/RateAnalysis && yarn build",
     "deploy:jenkins": "./scripts/jenkins.sh",
     "clean": "rm -rf node_modules"

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
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-customisation-mukta",
-    "version": "0.2.1",
+    "version": "0.2.10",
     "description": "MUKTA Customisation of Works UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -19,6 +19,7 @@
     },
     "dependencies": {
       "@egovernments/digit-ui-react-components": "^1.5.0",
+      "@egovernments/digit-ui-components": "0.0.2-beta.47",
       "react": "17.0.2",
       "react-date-range": "^1.4.0",
       "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/components/DSSCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/components/DSSCard.js
@@ -3,7 +3,8 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 
 const ROLES = {
-  MUKTADASHBOARD: ["DASHBOARD_VIEWER"]
+  MUKTADASHBOARD: ["DASHBOARD_VIEWER"],
+  PAYMENT: ["EMPLOYEE_COMMON"],
 };
 
 const DSSCard = () => {
@@ -42,6 +43,12 @@ const DSSCard = () => {
         roles: ROLES.MUKTADASHBOARD,
         target: "_blank"
       },
+      {
+        label: t("PAYMENT_TRACKER"),
+        link: `/${window?.contextPath}/employee/expenditure/payment-tracker`,
+        roles: ROLES.PAYMENT,
+        target: "_blank"
+      },
     ],
   };
 

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/components/WorksCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/Mukta/src/components/WorksCard.js
@@ -12,6 +12,7 @@ const ROLES = {
   MUSTERROLLS: ["MUSTER_ROLL_VERIFIER", "MUSTER_ROLL_APPROVER"],
   MEASUREMENT: ["MB_CREATOR", "MB_VERIFIER", "MB_APPROVER", "MB_VIEWER"],
   WORKBENCH : ["MDMS_ADMIN", "MDMS_STATE_ADMIN", "MDMS_CITY_ADMIN", "MDMS_STATE_VIEW_ADMIN", "MDMS_CITY_VIEW_ADMIN"],
+  REVISIONOFRATES : ["MDMS_ADMIN", "MDMS_CITY_ADMIN", "MDMS_STATE_VIEW_ADMIN", "MDMS_CITY_VIEW_ADMIN"],
   DSS: ["STADMIN"],
   REVISIONOFRATES : ["REVISION_OF_RATES"],
   ESTIMATETEMPLATE : ["MDMS_ADMIN", "MDMS_STATE_ADMIN"],
@@ -23,7 +24,6 @@ const WorksCard = () => {
     return null;
   }
 
-
   const bsEstimate = Digit?.Customizations?.["commonUiConfig"]?.getBusinessService("estimate");
   const bsContract = Digit?.Customizations?.["commonUiConfig"]?.getBusinessService("contract");
   const bsRevisedWO = Digit?.Customizations?.["commonUiConfig"]?.getBusinessService("revisedWO");
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
         "@babel/plugin-proposal-optional-chaining",
         "@babel/plugin-proposal-nullish-coalescing-operator"
       ]
-      }
+      }