One PR consolidated with all the UI changes for Sanitation Worker and TQM

API-CONTRACTS/pqm/PQM_API_ANOMALY_Contract.yaml

@@ -14,18 +14,18 @@ paths:
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/PqmAnomalySearchRequest"
+              $ref: '#/components/schemas/PqmAnomalySearchRequest'
       responses:
-        "200":
+        '200':
           description: Search test response
           content:
-            "*/*":
+            '*/*':
               schema:
-                $ref: "#/components/schemas/PqmAnomalyResponse"
-        "400":
+                $ref: '#/components/schemas/PqmAnomalyResponse'
+        '400':
           description: Invalid search parameters
           content:
-            "*/*":
+            '*/*':
               schema:
                 $ref: >-
                   https://raw.githubusercontent.com/egovernments/DIGIT-OSS/master/core-services/docs/common-contract_v1-1.yml#/components/schemas/ErrorRes
@@ -41,16 +41,16 @@ paths:
               type: object
               properties:
                 requestInfoWrapper:
-                  $ref: "#/components/schemas/RequestInfoWrapper"
+                  $ref: '#/components/schemas/RequestInfoWrapper'
                 criteria:
-                  $ref: "#/components/schemas/PqmAnomalySearchCriteria"
+                  $ref: '#/components/schemas/PqmAnomalySearchCriteria'
       responses:
-        "200":
+        '200':
           description: default response
           content:
-            "*/*":
+            '*/*':
               schema:
-                $ref: "#/components/schemas/PqmAnomalyResponse"
+                $ref: '#/components/schemas/PqmAnomalyResponse'
 components:
   schemas:
     PqmAnomaly:
@@ -77,7 +77,7 @@ components:
           minLength: 2
           maxLength: 1000
         description:
-          description: "Description for the anomaly. "
+          description: 'Description for the anomaly. '
           example: description
           type: string
           minLength: 2
@@ -145,7 +145,7 @@ components:
         pqmAnomalys:
           type: array
           items:
-            $ref: "#/components/schemas/PqmAnomaly"
+            $ref: '#/components/schemas/PqmAnomaly'
         totalCount:
           type: object
           allOf:
@@ -156,7 +156,7 @@ components:
       type: object
       properties:
         RequestInfo:
-          $ref: "#/components/schemas/RequestInfo"
+          $ref: '#/components/schemas/RequestInfo'
     RequestInfo:
       type: object
       properties:
@@ -180,9 +180,9 @@ components:
         correlationId:
           type: string
         plainAccessRequest:
-          $ref: "#/components/schemas/PlainAccessRequest"
+          $ref: '#/components/schemas/PlainAccessRequest'
         userInfo:
-          $ref: "#/components/schemas/User"
+          $ref: '#/components/schemas/User'
     Role:
       type: object
       properties:
@@ -230,7 +230,7 @@ components:
         roles:
           type: array
           items:
-            $ref: "#/components/schemas/Role"
+            $ref: '#/components/schemas/Role'
         tenantId:
           maxLength: 256
           minLength: 0
@@ -294,7 +294,7 @@ components:
           $ref: >-
             https://raw.githubusercontent.com/egovernments/DIGIT-OSS/master/core-services/docs/common-contract_v1-1.yml#/components/schemas/RequestInfo
         PqmAnomalySearchCriteria:
-          $ref: "#/components/schemas/PqmAnomalySearchCriteria"
+          $ref: '#/components/schemas/PqmAnomalySearchCriteria'
       required:
         - requestInfo
         - pqmAnomalySearchCriteria
@@ -306,4 +306,4 @@ components:
         plainRequestFields:
           type: array
           items:
-            type: string
+            type: string

frontend/micro-ui/web/micro-ui-internals/example/devpackage.json

@@ -9,10 +9,11 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries":"^1.4.0",
+    "@egovernments/digit-ui-libraries":"1.6.0-fsm.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",
+    "@egovernments/digit-ui-module-fsm":"1.6.1",
+    "@egovernments/digit-ui-module-tqm": "1.0.1",
     "@egovernments/digit-ui-module-mcollect":"^1.4.0",
     "@egovernments/digit-ui-module-noc":"^1.4.0",
     "@egovernments/digit-ui-module-obps":"^1.4.0",

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

@@ -9,16 +9,17 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "^1.6.1",
+    "@egovernments/digit-ui-libraries": "1.6.0-fsm.1.4.0",
     "@egovernments/digit-ui-fsm-libraries": "1.5.0",
     "@egovernments/digit-ui-module-common": "1.5.30",
-    "@egovernments/digit-ui-module-dss": "1.5.32",
+    "@egovernments/digit-ui-module-dss": "1.8.0-beta.1",
     "@egovernments/digit-ui-module-pgr": "1.5.0",
     "@egovernments/digit-ui-module-hrms": "1.5.20",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
-    "@egovernments/digit-ui-module-core": "1.5.37",
-    "@egovernments/digit-ui-react-components": "^1.5.8",
-    "@egovernments/digit-ui-module-fsm": "^1.6.0",
+    "@egovernments/digit-ui-module-core": "1.8.0-beta.13",
+    "@egovernments/digit-ui-react-components": "1.6.0-fsm.1.4.0",
+    "@egovernments/digit-ui-module-fsm": "1.6.1",
+    "@egovernments/digit-ui-module-tqm": "1.0.1",
     "@egovernments/digit-ui-module-utilities":"0.0.8",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",

frontend/micro-ui/web/micro-ui-internals/example/public/index.html

@@ -10,11 +10,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>Sanitation</title>
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.2.154/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-fsm-css@0.0.25/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-beta.14/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-fsm-css@0.1.18/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/globalConfigsFSM.js"></script>
+  <script src="https://egov-dev-assets.s3.ap-south-1.amazonaws.com/globalConfigsFSMpg.js"></script>
   <script src="%REACT_APP_GLOBAL%"></script>
 
 </head>

frontend/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js

@@ -34,6 +34,7 @@ export const UICustomizations = {
       const tenantId = Digit.ULBService.getCurrentTenantId();
       data.body.inbox.tenantId = tenantId;
       data.body.inbox.processSearchCriteria.tenantId = tenantId;
+      data.body.inbox.moduleSearchCriteria.tenantId = tenantId;
       // // deleting them for now(assignee-> need clarity from pintu,ward-> static for now,not implemented BE side)
       // const assignee = _.clone(data.body.inbox.moduleSearchCriteria.assignee);
       // delete data.body.inbox.moduleSearchCriteria.assignee;
@@ -52,7 +53,7 @@ export const UICustomizations = {
 
       states = Object.keys(states)
         ?.filter((key) => states[key])
-        .flatMap((i) => i.split(","));
+        .flatMap((i) => i.split(", "));
       locality = locality?.map((row) => row?.code);
       states.length > 0 ? (data.body.inbox.moduleSearchCriteria.status = states) : delete data.body.inbox.moduleSearchCriteria.status;
       locality.length > 0 ? (data.body.inbox.moduleSearchCriteria.locality = locality) : delete data.body.inbox.moduleSearchCriteria.locality;
@@ -157,12 +158,7 @@ export const UICustomizations = {
               { name: "CITIZEN_FEEDBACK_PENDING" },
               { name: "DISPOSAL_IN_PROGRESS" },
             ];
-            const allowedStatusForDSO = [
-              { name: "PENDING_DSO_APPROVAL" },
-              { name: "DSO_INPROGRESS" },
-              { name: "COMPLETED" },
-              { name: "DSO_REJECTED" },
-            ];
+            const allowedStatusForDSO = [{ name: "PENDING_DSO_APPROVAL" }, { name: "DSO_INPROGRESS" }, { name: "COMPLETED" }, { name: "DSO_REJECTED" }];
 
             return DSO ? allowedStatusForDSO : workflowOrder;
           },
@@ -182,4 +178,21 @@ export const UICustomizations = {
       return false;
     },
   },
+  SearchVendor: {
+    populateReqCriteria: () => {
+      const tenantId = Digit.ULBService.getCurrentTenantId();
+
+      return {
+        url: "/vendor/v1/_search",
+        params: { tenantId, sortBy: "name", status: "ACTIVE" },
+        body: {},
+        config: {
+          enabled: true,
+          select: (data) => {
+            return data?.vendor;
+          },
+        },
+      };
+    },
+  },
 };

frontend/micro-ui/web/micro-ui-internals/example/src/index.js

@@ -7,9 +7,10 @@ import { PaymentModule, PaymentLinks, paymentConfigs } from "@egovernments/digit
 import { initDSSComponents } from "@egovernments/digit-ui-module-dss";
 import { initFSMComponents } from "@egovernments/digit-ui-module-fsm";
 import { initEngagementComponents } from "@egovernments/digit-ui-module-engagement";
-import { DigitUI } from "@egovernments/digit-ui-module-core";
+import { DigitUI,initCoreComponents } from "@egovernments/digit-ui-module-core";
 import { HRMSModule, initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
 import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
+import { initTQMComponents } from '@egovernments/digit-ui-module-tqm'
 import { UICustomizations } from "./UICustomizations";
 import "@egovernments/digit-ui-fsm-css/example/index.css";
 
@@ -22,6 +23,7 @@ const enabledModules = [
   "Payment",
   "FSM",
   "Utilities",
+  "Tqm",
   // "Engagement"
 ];
 
@@ -65,14 +67,15 @@ const initDigitUI = () => {
   });
 
   // initPGRComponents();
+  initCoreComponents();
   initDSSComponents();
   initEngagementComponents();
   // initWorksComponents();
   initHRMSComponents();
   initFSMComponents();
   initUtilitiesComponents();
+
   const moduleReducers = (initData) => initData;
-
   window.Digit.Customizations = {
     TL: {
       customiseCreateFormData: (formData, licenceObject) => licenceObject,
@@ -82,6 +85,9 @@ const initDigitUI = () => {
     commonUiConfig: UICustomizations,
   };
 
+  //calling it here so that UICustomizations inside tqm gets added after the common Customizations are added
+  initTQMComponents();
+
   const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pb";
   initTokens(stateCode);
 

frontend/micro-ui/web/micro-ui-internals/example/src/setupProxy.js

@@ -43,6 +43,7 @@ module.exports = function (app) {
     "/tl-services/v1/_create",
     "/tl-services/v1/_search",
     "/egov-url-shortening/shortener",
+    "/eus/shortener",
     "/inbox/v1/_search",
     "/tl-services",
     "/tl-calculator",
@@ -63,6 +64,10 @@ module.exports = function (app) {
     "/inbox/v1/elastic/_search",
     "/fsm-calculator",
     "/inbox/v2/_search",
+    "/mdms-v2/",
+    "/pqm/",
+    "/pqm-service/",
+    "/individual/",
   ].forEach((location) => app.use(location, createProxy));
   ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
 };

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

@@ -28,12 +28,14 @@
     "dev:fsmlibraries": "cd packages/fsm-libraries && yarn start",
     "dev:components": "cd packages/react-components && yarn start",
     "dev:fsm": "cd packages/modules/fsm && yarn start",
+    "dev:tqm": "cd packages/modules/tqm && yarn start",
     "dev:example": "cd example && yarn start",
     "build": "run-p build:**",
     "build:libraries": "cd packages/libraries && yarn build",
     "build:fsmlibraries": "cd packages/fsm-libraries && yarn build",
     "build:components": "cd packages/react-components && yarn build",
     "build:fsm": "cd packages/modules/fsm && yarn build",
+    "build:tqm": "cd packages/modules/tqm && yarn build",
     "deploy:jenkins": "./scripts/jenkins.sh"
   },
   "devDependencies": {

frontend/micro-ui/web/micro-ui-internals/packages/fsm-css/README.md

@@ -44,6 +44,17 @@ frontend/micro-ui/web/public/index.html
 # Changelog
 
 ```bash
+0.0.36 dropdown style fixes
+0.0.35 sla css fixes
+0.0.34 pop up css fixes
+0.0.33 ui ux fixes
+0.0.32 added styles for tqm home
+0.0.31 added styles for tqm view test screen
+0.0.30 added styles for tqm test wf actions and pop up screen
+0.0.29 added styles for tqm test and response screen
+0.0.28 Added Home screen card styles for plant operator home screen
+0.0.27 Added TQM Home Card and Notification component.  
+0.0.26 Added TQM and Summary and enhancements.  
 0.0.25 Added support fixes for inbox v2 component.  
 0.0.24 Added min-height for mobile reponive  
 0.0.23 Dropdown width fixes