update branch and resolve conflicts

egovernments · Jan 23, 2025 · 8ec10c9 · 8ec10c9
2 parents 4b87c9b + 3f117db
commit 8ec10c9
Show file tree

Hide file tree

Showing 21 changed files with 80 additions and 57 deletions.
diff --git a/health/micro-ui/web/console/App.js b/health/micro-ui/web/console/App.js
@@ -11,9 +11,6 @@ import { initLibraries } from "@egovernments/digit-ui-libraries";
 import { DigitUI } from "@egovernments/digit-ui-module-core";
 // import { initHRMSComponents } from "@egovernments/digit-ui-module-hrms";
 import { UICustomizations } from "./Customisations/UICustomizations";
-import { initWorkbenchComponents } from "@egovernments/digit-ui-module-workbench";
-import { initUtilitiesComponents } from "@egovernments/digit-ui-module-utilities";
-import { initWorkbenchHCMComponents } from "@egovernments/digit-ui-module-hcmworkbench";
 import { initCampaignComponents } from "@egovernments/digit-ui-module-campaign-manager"
 
 window.contextPath = window?.globalConfigs?.getConfig("CONTEXT_PATH");

diff --git a/health/micro-ui/web/console/package.json b/health/micro-ui/web/console/package.json
@@ -12,13 +12,10 @@
   ],
   "homepage": "/console",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-workbench": "1.0.11",
-    "@egovernments/digit-ui-module-core": "1.8.14",
-    "@egovernments/digit-ui-module-utilities": "1.0.10",
-    "@egovernments/digit-ui-components": "0.0.2-beta.58",
-    "@egovernments/digit-ui-react-components": "1.8.12",
-    "@egovernments/digit-ui-module-hcmworkbench":"0.1.0",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-core": "1.8.17",
+    "@egovernments/digit-ui-components": "0.0.2-beta.64",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/health/micro-ui/web/core/package.json b/health/micro-ui/web/core/package.json
@@ -12,12 +12,12 @@
   ],
   "homepage": "/core-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-workbench": "1.0.11",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-workbench": "1.0.12",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
     "@egovernments/digit-ui-components":"0.0.2-beta.56",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-hcmworkbench":"0.1.0",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "react": "17.0.2",

diff --git a/health/micro-ui/web/health-payments/package.json b/health/micro-ui/web/health-payments/package.json
@@ -15,7 +15,7 @@
     "@egovernments/digit-ui-libraries": "1.8.6",
     "@egovernments/digit-ui-module-core": "1.8.12",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "@egovernments/digit-ui-module-health-payments": "0.0.1",
     "babel-loader": "8.1.0",

diff --git a/health/micro-ui/web/micro-ui-internals/example/package.json b/health/micro-ui/web/micro-ui-internals/example/package.json
@@ -9,12 +9,12 @@
     "start": "react-scripts start"
   },
   "devDependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-workbench": "1.0.11",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-workbench": "1.0.12",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.3",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-hcmworkbench": "0.1.0",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "@egovernments/digit-ui-module-microplan": "0.0.1",

diff --git a/health/micro-ui/web/micro-ui-internals/example/public/index.html b/health/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].3/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].12/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" />
 

diff --git a/health/micro-ui/web/micro-ui-internals/package.json b/health/micro-ui/web/micro-ui-internals/package.json
@@ -53,7 +53,7 @@
     "*.{js,css,md}": "prettier --write"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "ajv": "8.12.0",
     "lodash": "4.17.21",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss b/health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
@@ -5,6 +5,14 @@
 @import "./villageView.scss";
 @import "./facility.scss";
 
+.results-table-wrapper{
+  margin-bottom: 2rem;
+
+  .pagination{
+    margin-bottom: 2rem;
+  }
+}
+
 .digit-topbar-container {
   width: 100%;
 }

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@cyntler/react-doc-viewer": "1.10.3",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "react-data-table-component": "7.6.2",
     "styled-components": "5.0.0",
     "@rjsf/core": "5.10.0",

diff --git a/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
@@ -31,6 +31,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
   const [executionCount, setExecutionCount] = useState(0);
   const [isError, setIsError] = useState(false);
   const [isSuccess, setIsSuccess] = useState(false);
+  const [notValid, setNotValid] = useState(0);
   const [apiError, setApiError] = useState(null);
   const [isValidation, setIsValidation] = useState(false);
   const [fileName, setFileName] = useState(null);
@@ -854,10 +855,21 @@ const UploadData = ({ formData, onSelect, ...props }) => {
       downloadExcelWithCustomName({ fileStoreId: file?.filestoreId, customName: fileNameWithoutExtension });
     }
   };
+  useEffect(() =>{
+    if(totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId == "not-validated" ||
+      totalData?.HCM_CAMPAIGN_UPLOAD_USER_DATA?.uploadUser?.uploadedFile?.[0]?.resourceId == "not-validated" || 
+      totalData?.HCM_CAMPAIGN_UPLOAD_BOUNDARY_DATA?.uploadBoundary?.uploadedFile?.[0]?.resourceId == "not-validated"
+    ){
+      setNotValid(1);
+  }
+  },[totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId ,
+  totalData?.HCM_CAMPAIGN_UPLOAD_USER_DATA?.uploadUser?.uploadedFile?.[0]?.resourceId,
+  totalData?.HCM_CAMPAIGN_UPLOAD_BOUNDARY_DATA?.uploadBoundary?.uploadedFile?.[0]?.resourceId
+])
+
   useEffect(() => {
     const fetchData = async () => {
-      if (!errorsType[type] && uploadedFile?.length > 0 && !isSuccess) {
-        // setShowToast({ key: "info", label: t("HCM_VALIDATION_IN_PROGRESS") });
+      if ((!errorsType[type] && uploadedFile?.length > 0 && !isSuccess) || notValid==1) {
         setIsValidation(true);
         setIsError(true);
         setLoader(true);
@@ -878,7 +890,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
             setShowToast({ key: "error", label: errorMessage, transitionTime: 5000000 });
             setIsError(true);
             setApiError(errorMessage);
-
+            setNotValid(2);
             return;
           }
           if (temp?.status === "completed") {
@@ -976,7 +988,7 @@ const UploadData = ({ formData, onSelect, ...props }) => {
     };
 
     fetchData();
-  }, [errorsType]);
+  }, [errorsType , notValid]);
 
   const Template = {
     url: "/project-factory/v1/data/_download",

diff --git a/...o-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js b/...o-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js
@@ -8,7 +8,7 @@ export const useProductList = (tenantId,projectType) => {
     config: {
       enabled: true,
       select: (data) => {
-        if (projectType === "Co-delivery") {
+        if (projectType === "DEFAULT") {
           return data?.ProductVariant;
         }
         const filteredData = data?.ProductVariant?.filter(item => 

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/health-payments/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/health-payments/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",

diff --git a/...ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js b/...ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js
@@ -110,7 +110,7 @@ const InboxFilterWrapper = (props) => {
       }
     },
     config: {
-      enabled: true,
+      enabled: props?.isPlanInbox ? props?.isPlanInbox: false,
       select: (data) => {
         if (!data?.PlanFacility || !Array.isArray(data.PlanFacility)) return [];
 
@@ -126,7 +126,9 @@ const InboxFilterWrapper = (props) => {
     }  
   };
 
-  const { isLoading: isPlanFacilityLoading,error:planFacilityerror, data: planFacility }=Digit.Hooks.useCustomAPIHook(planFacilitySearchConfig);
+  const { isLoading: isPlanFacilityLoading, error: planFacilityError, data: planFacility } = Digit.Hooks.useCustomAPIHook(planFacilitySearchConfig);
+
+
 
   if(isPlanFacilityLoading){
     return <Loader/>
@@ -172,6 +174,7 @@ const InboxFilterWrapper = (props) => {
             select={(value) => handleDropdownChange("onRoadCondition", value)}
             t={t}
             disabled={false}
+            showToolTip={true}
           />
         </LabelFieldPair>
 
@@ -184,6 +187,7 @@ const InboxFilterWrapper = (props) => {
             select={(value) => handleDropdownChange("terrain", value)}
             t={t}
             disabled={false}
+            showToolTip={true}
           />
         </LabelFieldPair>
 
@@ -196,6 +200,7 @@ const InboxFilterWrapper = (props) => {
             select={(value) => handleDropdownChange("facilityId", value)}
             t={t}
             disabled={false}
+            showToolTip={true}
           />
         </LabelFieldPair>   
 
@@ -224,6 +229,7 @@ const InboxFilterWrapper = (props) => {
                 select={(value) => handleDropdownChange(`securityQ${questionNumber}`, value)}
                 t={t}
                 disabled={false}
+                showToolTip={true}
               />
             </LabelFieldPair>
           );

diff --git a/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js b/...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js
@@ -301,6 +301,7 @@ function UserAccess({ category, setData, nationalRoles }) {
 
   useEffect(()=>{
     setShowToast(null);
+    setSearchQuery("");
   },[category])
 
   return (

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js b/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
@@ -188,15 +188,10 @@ const PlanInbox = () => {
     },
     changeQueryName:"count"
   });
-
-  useEffect(() => {
-    if (planWithCensusCount) {
-      setAssignedToMeCount(planWithCensusCount?.TotalCount);
-    }
-  }, [planWithCensusCount]);
-
-
-
+
+
+
+
   const {
     isLoading: isPlanWithCensusLoading,
     data: planWithCensus,
@@ -248,7 +243,7 @@ const PlanInbox = () => {
               acc[field.key] = field.value; // Set `key` as property name and `value` as property value
               return acc;
             }, {});
-
+            
           return {
             original: item,
             censusOriginal: filteredCensus,
@@ -295,7 +290,7 @@ const PlanInbox = () => {
       setDefaultBoundaries(selectedBoundaries);
       // Extract the list of codes from the selectedBoundaries array
       const boundaryCodes = selectedBoundaries.map((boundary) => boundary.code);
-
+      
       // Set census jurisdiction with the list of boundary codes
       setCensusJurisdiction(boundaryCodes);
     }
@@ -388,7 +383,7 @@ const PlanInbox = () => {
     if (workflowData) {
       // Assume selectedFilter.filterValue maps to applicationStatus or state
       const selectedState = workflowData?.states?.find((state) => state.state === selectedFilter?.status);
-
+      
       // Filter actions based on the selected state
       const availableActions = selectedState?.actions?.filter((action) => action.roles.some((role) => userRoles.includes(role)));
 
@@ -439,14 +434,14 @@ const PlanInbox = () => {
       const uniqueAssignees = [...new Set(planWithCensus?.planData?.flatMap((item) => item.assignee || []))];
       setAssigneeUuids(uniqueAssignees.join(","));
     }
-  }, [planWithCensus, selectedFilter?.status, activeLink]);
+  }, [planWithCensus, selectedFilter, activeLink]);
 
   useEffect(() => {
     if (censusJurisdiction?.length > 0) {
       refetchPlanWithCensus(); // Trigger the API call again after activeFilter changes
     }
-  }, [selectedFilter?.status, activeLink, censusJurisdiction, limitAndOffset]);
-
+  }, [selectedFilter, activeLink, censusJurisdiction, limitAndOffset]);
+  
   const reqCri = {
     url: `/${hrms_context_path}/employees/_search`,
     params: {
@@ -457,6 +452,13 @@ const PlanInbox = () => {
       enabled: assigneeUuids?.length > 0 ? true : false,
     },
   };
+
+  useEffect(() => {
+    if (planWithCensusCount) {
+      setAssignedToMeCount(planWithCensusCount?.TotalCount);
+      setAssignedToAllCount(planWithCensusCount?.TotalCount);
+    }
+  }, [planWithCensusCount]);
 
   const { isLoading: isEmployeeLoading, data: employeeData, refetch: refetchHrms } = Digit.Hooks.useCustomAPIHook(reqCri);
 

diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/workbench-hcm/package.json b/health/micro-ui/web/micro-ui-internals/packages/modules/workbench-hcm/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.0-beta.2",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",
     "@rjsf/validator-ajv8": "5.10.0",

diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json
@@ -13,10 +13,10 @@
   ],
   "homepage": "/microplan-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.23",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-hcmmicroplanning": "0.0.2",
     "@egovernments/digit-ui-module-microplan": "0.0.1",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",

diff --git a/health/micro-ui/web/package.json b/health/micro-ui/web/package.json
@@ -16,9 +16,9 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.8",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.7",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-hrms": "1.8.0-beta.2",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
     "@egovernments/digit-ui-module-dss": "1.8.0-beta",
     "@egovernments/digit-ui-module-common": "1.8.0-beta",

diff --git a/health/micro-ui/web/public/index.html b/health/micro-ui/web/public/index.html
@@ -7,7 +7,7 @@
   <link
     href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
     rel="stylesheet" type="text/css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].3/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].12/dist/index.css" />
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
   <!-- added below css for hcm-workbench module inclusion-->
   <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />

diff --git a/health/micro-ui/web/workbench/package.json b/health/micro-ui/web/workbench/package.json
@@ -12,12 +12,12 @@
   ],
   "homepage": "/workbench-ui",
   "dependencies": {
-    "@egovernments/digit-ui-libraries": "1.8.6",
-    "@egovernments/digit-ui-module-workbench": "1.0.11",
-    "@egovernments/digit-ui-module-core": "1.8.14",
+    "@egovernments/digit-ui-libraries": "1.8.8",
+    "@egovernments/digit-ui-module-workbench": "1.0.12",
+    "@egovernments/digit-ui-module-core": "1.8.15",
     "@egovernments/digit-ui-module-utilities": "1.0.10",
     "@egovernments/digit-ui-components": "0.0.2-beta.58",
-    "@egovernments/digit-ui-react-components": "1.8.12",
+    "@egovernments/digit-ui-react-components": "1.8.14",
     "@egovernments/digit-ui-module-hcmworkbench":"0.1.0",
     "@egovernments/digit-ui-module-campaign-manager": "0.3.0",
     "react": "17.0.2",