tqm react compont update

egovernments · Jul 5, 2024 · ab74b7b · ab74b7b
1 parent 5554d42
commit ab74b7b
Show file tree

Hide file tree

Showing 130 changed files with 12,882 additions and 98 deletions.
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,19 +9,21 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-module-bills": "1.7.24",
-    "@egovernments/digit-ui-module-common": "1.7.24",
-    "@egovernments/digit-ui-module-engagement": "1.7.24",
-    "@egovernments/digit-ui-module-fsm": "1.7.28",
-    "@egovernments/digit-ui-module-mcollect": "1.7.24",
-    "@egovernments/digit-ui-module-noc": "1.7.24",
+    "@egovernments/digit-ui-module-bills": "1.7.25",
+    "@egovernments/digit-ui-module-common": "1.7.25",
+    "@egovernments/digit-ui-module-engagement": "1.7.25",
+    "@egovernments/digit-ui-module-fsm": "1.7.31",
+    "@egovernments/digit-ui-module-mcollect": "1.7.25",
+    "@egovernments/digit-ui-module-noc": "1.7.25",
     "@egovernments/digit-ui-module-obps": "1.7.25",
     "@egovernments/digit-ui-module-pgr": "1.7.27",
-    "@egovernments/digit-ui-module-pt": "1.7.24",
-    "@egovernments/digit-ui-module-receipts": "1.7.24",
-    "@egovernments/digit-ui-module-tl": "1.7.24",
-    "@egovernments/digit-ui-module-ws": "1.7.24",
-    "@egovernments/digit-ui-module-commonpt": "1.7.24",
+    "@egovernments/digit-ui-module-pt": "1.7.25",
+    "@egovernments/digit-ui-module-receipts": "1.7.25",
+    "@egovernments/digit-ui-module-tl": "1.7.25",
+    "@egovernments/digit-ui-module-ws": "1.7.25",
+    "@egovernments/digit-ui-module-commonpt": "1.7.25",
+    "@egovernments/digit-ui-module-tqm": "1.7.25",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "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/src/index.js b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js
@@ -23,6 +23,7 @@ import { initWSComponents } from "@egovernments/digit-ui-module-ws";
 import { DigitUI } from "@egovernments/digit-ui-module-core";
 import { initCommonPTComponents } from "@egovernments/digit-ui-module-commonpt";
 import { initBillsComponents, BillsModule } from "@egovernments/digit-ui-module-bills";
+// import { initTQMComponents } from '@egovernments/digit-ui-module-tqm'
 
 // import {initCustomisationComponents} from "./customisations";
 
@@ -60,7 +61,8 @@ const enabledModules = [
   "BillAmendment",
   "FireNoc",
   "Birth",
-  "Death"
+  "Death",
+  // "Tqm"
 ];
 
 const initTokens = (stateCode) => {
@@ -122,6 +124,8 @@ const initDigitUI = () => {
   initWSComponents();
   initCommonPTComponents();
   initBillsComponents();
+  //calling it here so that UICustomizations inside tqm gets added after the common Customizations are added
+  // initTQMComponents();
 
   // initCustomisationComponents();
 

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -29,6 +29,7 @@
     "dev:core": "cd packages/modules/core && yarn start",
     "dev:pgr": "cd packages/modules/pgr && yarn start",
     "dev:fsm": "cd packages/modules/fsm && yarn start",
+    "dev:tqm": "cd packages/modules/tqm && yarn start",
     "dev:dss": "cd packages/modules/dss && yarn start",
     "dev:mcollect": "cd packages/modules/mCollect && yarn start",
     "dev:receipts": "cd packages/modules/receipts && yarn start",
@@ -50,6 +51,7 @@
     "buildD:core": "cd packages/modules/core && yarn build",
     "buildD:pgr": "cd packages/modules/pgr && yarn build",
     "buildD:fsm": "cd packages/modules/fsm && yarn build",
+    "build:tqm": "cd packages/modules/tqm && yarn build",
     "buildD:dss": "cd packages/modules/dss && yarn build",
     "buildD:mcollect": "cd packages/modules/mCollect && yarn build",
     "buildD:receipts": "cd packages/modules/receipts && yarn build",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-libraries",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
   "source": "src/index.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-bills",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "description": "BILLS",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-common",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "license": "MIT",
   "description": "Digit Common Payment Module",
   "main": "dist/index.js",
@@ -15,8 +15,8 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.7.24",
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-libraries": "1.7.25",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-commonpt",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "license": "MIT",
   "description": "Digit PT Light weight Module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "^0.13.11",
     "lodash.merge": "^4.6.2",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-core",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -14,7 +14,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-dss",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "license": "MIT",
   "description": "Digit Dashboard Module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "^0.13.11",
     "lodash": "4.17.21",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-engagement",
-    "version": "1.7.24",
+    "version": "1.7.25",
     "license": "MIT",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",
@@ -18,7 +18,7 @@
         "react-router-dom": "5.3.0"
     },
     "dependencies": {
-        "@egovernments/digit-ui-react-components": "1.7.24",
+        "@egovernments/digit-ui-react-components": "1.7.25",
         "microbundle-crl": "^0.13.11",
         "react": "17.0.2",
         "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-fsm",
-  "version": "1.7.28",
+  "version": "1.7.31",
   "license": "MIT",
   "main": "dist/index.js",
   "description": "Digit FSM Module",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js b/...icro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/ApplicationTimeline.js
@@ -2,15 +2,15 @@ import React, { Fragment, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useParams } from "react-router-dom";
 import {
-  // Header,
+  Header,
   ActionLinks,
-  // Card,
+  Card,
   CardSectionHeader,
   ConnectingCheckPoints,
   CheckPoint,
-  // KeyNote,
+  KeyNote,
   SubmitBar,
-  // LinkButton,
+  LinkButton,
   Loader,
   Rating,
 } from "@egovernments/digit-ui-react-components";
@@ -85,15 +85,15 @@ export const ApplicationTimeline = (props) => {
       if (checkpoint?.numberOfTrips) caption.comment = `${t("NUMBER_OF_TRIPS")}: ${checkpoint?.numberOfTrips}`;
       return <TLCaption data={caption} />;
     }
-    /* else if (checkpoint.status === "PENDING_PAYYY") {
+    else if (checkpoint.status === "PENDING_PAYYY") {
       const caption = {
         name: checkpoint?.assigner,
         mobileNumber: checkpoint?.assigner?.mobileNumber,
         date: `${t("CS_FSM_EXPECTED_DATE")} ${Digit.DateUtils.ConvertTimestampToDate(props.application?.possibleServiceDate)}`,
       };
-      return <TLCaption data={caption} />; */
+      return <TLCaption data={caption} />;
   };
-// }
+}
 
   const showNextActions = (nextAction) => {
     switch (nextAction?.action) {
@@ -106,7 +106,7 @@ export const ApplicationTimeline = (props) => {
                 state: { tenantId: props.application.tenantId },
               }}
             >
-              <SubmitBar label={t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")} />
+              {window.location.href.includes("citizen/fsm/") && <SubmitBar label={t("CS_APPLICATION_DETAILS_MAKE_PAYMENT")} />}
             </Link>
           </div>
         );
@@ -124,8 +124,10 @@ export const ApplicationTimeline = (props) => {
   if (isLoading) {
     return <Loader />;
   }
+  const toggleTimeline=()=>{
+    setShowAllTimeline((prev)=>!prev);
+  }
 
-/*
   let deepCopy = _.cloneDeep( data )
 let index1 =0
 deepCopy?.timeline.map((check,index) => {
@@ -137,7 +139,7 @@ deepCopy?.timeline.map((check,index) => {
       data.timeline[index].status ="ASSING_DSO_PAY"
       data.timeline.splice(index, 0, obj);
   }
-}) */
+})
   return (
     <React.Fragment>
       {!isLoading && (
@@ -148,8 +150,7 @@ deepCopy?.timeline.map((check,index) => {
             </CardSectionHeader>
           )}
           {data?.timeline && data?.timeline?.length === 1 ? (
-            <CheckPoint isCompleted={true} label={t("CS_COMMON_" + data?.timeline[0]?.status)} customChild={getTimelineCaptions(data?.timeline[0])} />
-
+            <CheckPoint isCompleted={true} label={t("CS_COMMON_FSM_" + `${data?.timeline[0]?.performedAction === "UPDATE" ? "UPDATE_" : ""}` + data?.timeline[0]?.status)} customChild={getTimelineCaptions(data?.timeline[0])} />            
           ) : (
             <ConnectingCheckPoints>
               {data?.timeline &&
@@ -159,7 +160,7 @@ deepCopy?.timeline.map((check,index) => {
                       <CheckPoint
                         keyValue={index}
                         isCompleted={index === 0}
-                        label={t("CS_COMMON_" + checkpoint.status)}
+                        label={t("CS_COMMON_" +  `${checkpoint?.performedAction === "UPDATE" ? "UPDATE_" : ""}` + checkpoint.status)}
                         customChild={getTimelineCaptions(checkpoint)}
                       />
                     </React.Fragment>

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/FsmCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/components/FsmCard.js
@@ -81,7 +81,7 @@ const FSMCard = () => {
   const moduleForSomeFSMAdmin = FSM_ADMIN
     ? [
         {
-          link: "/digit-ui/employee/fsm/registry",
+          link: "/digit-ui/employee/fsm/registry?selectedTabs=VENDOR",
           label: t("ES_TITLE_FSM_REGISTRY"),
           icon: <AddNewIcon />,
         },

diff --git a/...eb/micro-ui-internals/packages/modules/fsm/src/pages/employee/EditApplication/EditForm.js b/...eb/micro-ui-internals/packages/modules/fsm/src/pages/employee/EditApplication/EditForm.js
@@ -213,7 +213,7 @@ const EditForm = ({ tenantId, applicationData, channelMenu, vehicleMenu, sanitat
           longitude: data?.address?.longitude ? data?.address?.longitude : applicationData.address.geoLocation.longitude,
         },
         additionalDetails: {
-          boundaryType: propertyLocation === "FROM_GRAM_PANCHAYAT" ? (village?.code ? "Village" : "GP") : "Locality",
+          boundaryType: propertyLocation === "FROM_GRAM_PANCHAYAT" ? "GP" : "Locality",
           gramPanchayat: {
             code: gramPanchayat?.code,
             name: gramPanchayat?.name,

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/src/pages/employee/index.js
@@ -61,7 +61,7 @@ export const FsmBreadCrumb = ({ location }) => {
       show: isFsm,
     },
     {
-      path: isRegistry ? "/digit-ui/employee/fsm/registry" : FSTPO ? "/digit-ui/employee/fsm/fstp-inbox" : "/digit-ui/employee",
+      path: isRegistry ? "/digit-ui/employee/fsm/registry?selectedTabs=VENDOR" : FSTPO ? "/digit-ui/employee/fsm/fstp-inbox" : "/digit-ui/employee",
       content: isVehicleLog ? t("ES_TITLE_INBOX") : "FSM",
       show: isFsm,
     },

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-hrms",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "description": "Digit HRMS Module",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-mcollect",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "license": "MIT",
   "description": "Digit Misc Collections Module",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "lodash.merge": "^4.6.2",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/noc/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/noc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-noc",
-  "version": "1.7.24",
+  "version": "1.7.25",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "^0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "0.13.11",
     "react": "17.0.2",
     "react-dom": "17.0.2",

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
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": { 
-    "@egovernments/digit-ui-react-components": "1.7.24",
+    "@egovernments/digit-ui-react-components": "1.7.25",
     "microbundle-crl": "0.13.11",
     "lodash.merge": "^4.6.2",
     "react": "17.0.2",