URC Changes merged in Frontend SANITATION

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

@@ -21,6 +21,7 @@
     "@egovernments/digit-ui-module-fsm": "1.6.1",
     "@egovernments/digit-ui-module-tqm": "1.0.2",
     "@egovernments/digit-ui-module-utilities":"0.0.8",
+    "@egovernments/digit-ui-components": "0.0.2-beta.47",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

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

@@ -12,6 +12,7 @@
   <title>Sanitation</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://egov-dev-assets.s3.ap-south-1.amazonaws.com/globalConfigsFSMpg.js"></script>

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

@@ -69,6 +69,7 @@ module.exports = function (app) {
     "/pqm-service/",
     "/individual/",
     "/trackingservice/",
+    "/fsm-calculator/v1/_advancebalancecalculate",
   ].forEach((location) => app.use(location, createProxy));
   ["/pb-egov-assets"].forEach((location) => app.use(location, assetsProxy));
 };

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

@@ -45,7 +45,8 @@
     "prettier": "2.1.2"
   },
   "resolutions": {
-    "**/styled-components": "5.0.0"
+    "**/styled-components": "5.0.0",
+    "**/@babel/traverse":"7.25.9"
   },
   "husky": {},
   "lint-staged": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.2.154",
+  "version": "1.5.9",
   "license": "MIT",
   "main": "dist/index.css",
   "engines": {

frontend/micro-ui/web/micro-ui-internals/packages/fsm-libraries/src/hooks/fsm/useInbox.js

@@ -1,88 +1,114 @@
-import React from "react"
-import useInbox from '@egovernments/digit-ui-libraries/src/hooks/useInbox';
+import React from "react";
+import useInbox from "@egovernments/digit-ui-libraries/src/hooks/useInbox";
 
 const useFSMInbox = (tenantId, filters, config = {}, overRideUUID = false) => {
-
-  const { applicationNos, mobileNumber, limit, offset, sortBy, sortOrder } = filters;
+  const {
+    applicationNos,
+    mobileNumber,
+    limit,
+    offset,
+    sortBy,
+    sortOrder,
+    dsoUUID,
+  } = filters;
   const _filters = {
     tenantId,
     processSearchCriteria: {
-      businessService: ["FSM", "FSM_POST_PAY_SERVICE","PAY_LATER_SERVICE", "FSM_ADVANCE_PAY_SERVICE", "FSM_ZERO_PAY_SERVICE"],
-      ...(filters?.applicationStatus?.length > 0 ? { status: getIds(filters.applicationStatus) } : {}),
+      businessService: [
+        "FSM",
+        "FSM_POST_PAY_SERVICE",
+        "PAY_LATER_SERVICE",
+        "FSM_ADVANCE_PAY_SERVICE",
+        "FSM_ZERO_PAY_SERVICE",
+      ],
+      ...(filters?.applicationStatus?.length > 0
+        ? { status: getIds(filters.applicationStatus) }
+        : {}),
       moduleName: "fsm",
+      assignee: dsoUUID,
     },
     moduleSearchCriteria: {
       tenantId,
       ...(mobileNumber ? { mobileNumber } : {}),
       ...(applicationNos ? { applicationNos } : {}),
       ...(sortBy ? { sortBy } : {}),
       ...(sortOrder ? { sortOrder } : {}),
-      ...(filters?.locality?.length > 0 ? { locality: filters.locality.map((item) => item.code.split("_").pop()) } : {}),
+      ...(filters?.locality?.length > 0
+        ? {
+            locality: filters.locality.map((item) =>
+              item.code.split("_").pop()
+            ),
+          }
+        : {}),
     },
     limit,
     offset,
-  }
+  };
   const appList = useInbox({
-    tenantId, filters: _filters, config: {
+    tenantId,
+    filters: _filters,
+    config: {
       select: (data) => ({
         totalCount: data.totalCount,
         nearingSlaCount: data.nearingSlaCount,
         statuses: data.statusMap,
-        table: tableData(data)
+        table: tableData(data),
       }),
-      ...config
-    }
-  })
+      ...config,
+    },
+  });
+
   if (filters?.uuid?.code === "ASSIGNED_TO_ME" && !overRideUUID) {
     return {
       data: {
         totalCount: 0,
         statuses: [],
-        table: []
+        table: [],
       },
-      isLoading: false
-    }
+      isLoading: false,
+    };
   }
-  return { ...appList }
-}
+  return { ...appList };
+};
 
 const getIds = (status) => {
-  let ids = []
+  let ids = [];
   status?.map((data) => {
-    let temp = data.id.split(',')
-    ids.push(...temp)
-  })
-  return ids
-}
+    let temp = data.id.split(",");
+    ids.push(...temp);
+  });
+  return ids;
+};
 
 const tableData = (data) => {
   let result = [];
   if (data && data.items && data.items.length) {
     data.items.map((application) => {
       result.push({
-        tenantId: application?.businessObject?.tenantId || '',
-        totalCount: application?.businessObject?.totalCount || '',
-        applicationNo: application?.businessObject?.applicationNo || '',
+        tenantId: application?.businessObject?.tenantId || "",
+        totalCount: application?.businessObject?.totalCount || "",
+        applicationNo: application?.businessObject?.applicationNo || "",
         createdTime: application?.businessObject?.auditDetails?.createdTime
           ? new Date(application.businessObject.auditDetails.createdTime)
           : new Date(),
-        locality: application?.businessObject?.address?.locality?.code || '',
-        status: application?.businessObject?.applicationStatus || '',
+        locality: application?.businessObject?.address?.locality?.code || "",
+        status: application?.businessObject?.applicationStatus || "",
         citizen: {
-          name: application?.ProcessInstance?.assigner?.name || '',
-          mobileNumber: application?.ProcessInstance?.assigner?.mobileNumber || ''
+          name: application?.ProcessInstance?.assigner?.name || "",
+          mobileNumber:
+            application?.ProcessInstance?.assigner?.mobileNumber || "",
         },
-        propertyUsage: application?.businessObject?.propertyUsage || '',
+        propertyUsage: application?.businessObject?.propertyUsage || "",
         sla:
           Math.round(
             application?.ProcessInstance?.businesssServiceSla /
-            (24 * 60 * 60 * 1000)
+              (24 * 60 * 60 * 1000)
           ) || "-",
-        mathsla: application?.ProcessInstance?.businesssServiceSla || ''
+        mathsla: application?.ProcessInstance?.businesssServiceSla || "",
       });
     });
   }
   return result;
 };
 
-export default useFSMInbox
+export default useFSMInbox;

frontend/micro-ui/web/micro-ui-internals/packages/fsm-libraries/src/hooks/fsm/useMDMS.js

@@ -5,90 +5,175 @@ const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => {
   const queryConfig = { staleTime: Infinity, ...config };
 
   const useSanitationType = () => {
-    return useQuery("FSM_SANITATION_TYPE", () => MdmsService.getSanitationType(tenantId, moduleCode), queryConfig);
+    return useQuery(
+      "FSM_SANITATION_TYPE",
+      () => MdmsService.getSanitationType(tenantId, moduleCode),
+      queryConfig
+    );
   };
 
   const usePitType = () => {
-    return useQuery("FSM_PIT_TYPE", () => MdmsService.getPitType(tenantId, moduleCode, queryConfig));
+    return useQuery("FSM_PIT_TYPE", () =>
+      MdmsService.getPitType(tenantId, moduleCode, queryConfig)
+    );
   };
 
   const useApplicationChannel = () => {
-    return useQuery("FSM_APPLICATION_NEW_APPLICATION_CHANNEL", () => MdmsService.getApplicationChannel(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_APPLICATION_NEW_APPLICATION_CHANNEL",
+      () => MdmsService.getApplicationChannel(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useEmployeeApplicationChannel = () => {
     async function onlyEmployeeChannels() {
-      const allApplicationChannels = await MdmsService.getApplicationChannel(tenantId, moduleCode, type);
+      const allApplicationChannels = await MdmsService.getApplicationChannel(
+        tenantId,
+        moduleCode,
+        type
+      );
       return allApplicationChannels.filter((type) => !type.citizenOnly);
     }
-    return useQuery("FSM_APPLICATION_EDIT_APPLICATION_CHANNEL", () => onlyEmployeeChannels(), queryConfig);
+    return useQuery(
+      "FSM_APPLICATION_EDIT_APPLICATION_CHANNEL",
+      () => onlyEmployeeChannels(),
+      queryConfig
+    );
   };
 
   const usePropertyType = () => {
-    return useQuery("FSM_PROPERTY_TYPE", () => MdmsService.getPropertyType(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_PROPERTY_TYPE",
+      () => MdmsService.getPropertyType(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const usePropertySubType = () => {
-    return useQuery("FSM_PROPERTY_SUBTYPE", () => MdmsService.getPropertyType(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_PROPERTY_SUBTYPE",
+      () => MdmsService.getPropertyType(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useChecklist = () => {
-    return useQuery("FSM_CHECKLIST", () => MdmsService.getChecklist(tenantId, moduleCode), queryConfig);
+    return useQuery(
+      "FSM_CHECKLIST",
+      () => MdmsService.getChecklist(tenantId, moduleCode),
+      queryConfig
+    );
   };
 
   const useVehicleType = () => {
-    return useQuery("FSM_VEHICLE_TYPE", () => MdmsService.getVehicleType(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_VEHICLE_TYPE",
+      () => MdmsService.getVehicleType(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useSlumLocality = () => {
-    return useQuery(["SLUM_LOCALITY_MAPPING", tenantId, moduleCode], () => MdmsService.getSlumLocalityMapping(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      ["SLUM_LOCALITY_MAPPING", tenantId, moduleCode],
+      () => MdmsService.getSlumLocalityMapping(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useReason = () => {
-    return useQuery("CANCELLATION_REASON", () => MdmsService.getReason(tenantId, moduleCode, type, payload), queryConfig);
+    return useQuery(
+      "CANCELLATION_REASON",
+      () => MdmsService.getReason(tenantId, moduleCode, type, payload),
+      queryConfig
+    );
   };
 
   const useRoleStatusMapping = () => {
-    return useQuery("ROLE_STATUS_MAPPING", () => MdmsService.getRoleStatus(tenantId, moduleCode, type));
+    return useQuery("ROLE_STATUS_MAPPING", () =>
+      MdmsService.getRoleStatus(tenantId, moduleCode, type)
+    );
   };
   const useCommonFieldsConfig = () => {
-    return useQuery("COMMON_FIELDS", () => MdmsService.getCommonFieldsConfig(tenantId, moduleCode, type, payload));
+    return useQuery("COMMON_FIELDS", () =>
+      MdmsService.getCommonFieldsConfig(tenantId, moduleCode, type, payload)
+    );
   };
 
   const usePreFieldsConfig = () => {
-    return useQuery("PRE_FIELDS", () => MdmsService.getPreFieldsConfig(tenantId, moduleCode, type, payload));
+    return useQuery("PRE_FIELDS", () =>
+      MdmsService.getPreFieldsConfig(tenantId, moduleCode, type, payload)
+    );
   };
 
   const usePostFieldsConfig = () => {
-    return useQuery("POST_FIELDS", () => MdmsService.getPostFieldsConfig(tenantId, moduleCode, type, payload));
+    return useQuery("POST_FIELDS", () =>
+      MdmsService.getPostFieldsConfig(tenantId, moduleCode, type, payload)
+    );
   };
 
   const useGenderDetails = () => {
-    return useQuery("FSM_GENDER_DETAILS", () => MdmsService.getFSMGenderType(tenantId, moduleCode, type), config);
+    return useQuery(
+      "FSM_GENDER_DETAILS",
+      () => MdmsService.getFSMGenderType(tenantId, moduleCode, type),
+      config
+    );
+  };
+  const useUrcConfig = () => {
+    return useQuery(
+      "FSM_APPLICATION_NEW_URC_CONFIG",
+      () => MdmsService.getUrcConfig(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useFSTPORejectionReason = () => {
-    return useQuery("FSM_FSTPO_REJECTION", () => MdmsService.getFSTPORejectionReason(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_FSTPO_REJECTION",
+      () => MdmsService.getFSTPORejectionReason(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const usePaymentType = () => {
-    return useQuery("FSM_PAYMENT_TYPE", () => MdmsService.getFSMPaymentType(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_PAYMENT_TYPE",
+      () => MdmsService.getFSMPaymentType(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useTripNumber = () => {
-    return useQuery("FSM_TRIP_NUMBER", () => MdmsService.getFSMTripNumber(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_TRIP_NUMBER",
+      () => MdmsService.getFSMTripNumber(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useReceivedPaymentType = () => {
-    return useQuery("FSM_RECEIVED_PAYMENT_TYPE", () => MdmsService.getFSMReceivedPaymentType(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_RECEIVED_PAYMENT_TYPE",
+      () => MdmsService.getFSMReceivedPaymentType(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useWSTaxHeadMaster = () => {
-    return useQuery("FSM_RECEIVED_PAYMENT_TYPE", () => MdmsService.getWSTaxHeadMaster(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      "FSM_RECEIVED_PAYMENT_TYPE",
+      () => MdmsService.getWSTaxHeadMaster(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   const useCheckVehicleTracking = () => {
-    return useQuery(["VEHICLE_TRACKING_CHECK", tenantId, moduleCode], () => MdmsService.getVehicleTrackingCheck(tenantId, moduleCode, type), queryConfig);
+    return useQuery(
+      ["VEHICLE_TRACKING_CHECK", tenantId, moduleCode],
+      () => MdmsService.getVehicleTrackingCheck(tenantId, moduleCode, type),
+      queryConfig
+    );
   };
 
   switch (type) {
@@ -148,6 +233,8 @@ const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => {
       return useWSTaxHeadMaster();
     case "VehicleTracking":
       return useCheckVehicleTracking();
+    case "UrcConfig":
+      return useUrcConfig();
     default:
       return null;
   }