From 4188c89b01d63672a5769722348124aeb12db75e Mon Sep 17 00:00:00 2001 From: abishekTa-egov Date: Fri, 10 Jan 2025 13:43:02 +0530 Subject: [PATCH 1/8] BUGFIX/HCMPRE-1584: Disable planSearch for popInbox and CSS for dropdown (#2123) --- .../microplan/src/components/InboxFilterWrapper.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js index dcbb418cb0..3c3136d2cc 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/InboxFilterWrapper.js +++ b/health/micro-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 @@ -172,6 +174,7 @@ const InboxFilterWrapper = (props) => { select={(value) => handleDropdownChange("onRoadCondition", value)} t={t} disabled={false} + showToolTip={true} /> @@ -184,6 +187,7 @@ const InboxFilterWrapper = (props) => { select={(value) => handleDropdownChange("terrain", value)} t={t} disabled={false} + showToolTip={true} /> @@ -196,6 +200,7 @@ const InboxFilterWrapper = (props) => { select={(value) => handleDropdownChange("facilityId", value)} t={t} disabled={false} + showToolTip={true} /> @@ -224,6 +229,7 @@ const InboxFilterWrapper = (props) => { select={(value) => handleDropdownChange(`securityQ${questionNumber}`, value)} t={t} disabled={false} + showToolTip={true} /> ); From 802057a385ecf0f36ab73c3168177a4198a3fab4 Mon Sep 17 00:00:00 2001 From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:21:03 +0530 Subject: [PATCH 2/8] BUGFIX/HCMPRE-1866 : Updated versions (#2128) --- health/micro-ui/web/console/package.json | 4 ++-- health/micro-ui/web/core/package.json | 4 ++-- health/micro-ui/web/health-payments/package.json | 2 +- .../micro-ui/web/micro-ui-internals/example/package.json | 4 ++-- .../web/micro-ui-internals/example/public/index.html | 4 ++-- health/micro-ui/web/micro-ui-internals/package.json | 2 +- .../web/micro-ui-internals/packages/css/package.json | 2 +- .../packages/css/src/pages/employee/index.scss | 8 ++++++++ .../packages/modules/campaign-manager/package.json | 2 +- .../packages/modules/health-payments/package.json | 2 +- .../packages/modules/microplan/package.json | 2 +- .../packages/modules/workbench-hcm/package.json | 2 +- health/micro-ui/web/microplan/package.json | 2 +- health/micro-ui/web/package.json | 2 +- health/micro-ui/web/public/index.html | 4 ++-- health/micro-ui/web/workbench/package.json | 4 ++-- 16 files changed, 29 insertions(+), 21 deletions(-) diff --git a/health/micro-ui/web/console/package.json b/health/micro-ui/web/console/package.json index d18039f5a4..8c890104fb 100644 --- a/health/micro-ui/web/console/package.json +++ b/health/micro-ui/web/console/package.json @@ -13,11 +13,11 @@ "homepage": "/console", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.6", - "@egovernments/digit-ui-module-workbench": "1.0.11", + "@egovernments/digit-ui-module-workbench": "1.0.12", "@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-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/core/package.json b/health/micro-ui/web/core/package.json index 2393463b8d..9800395d7d 100644 --- a/health/micro-ui/web/core/package.json +++ b/health/micro-ui/web/core/package.json @@ -13,11 +13,11 @@ "homepage": "/core-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.6", - "@egovernments/digit-ui-module-workbench": "1.0.11", + "@egovernments/digit-ui-module-workbench": "1.0.12", "@egovernments/digit-ui-module-core": "1.8.14", "@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 index 0962247131..4420830425 100644 --- 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 index 71f104204f..913b5fefd6 100644 --- a/health/micro-ui/web/micro-ui-internals/example/package.json +++ b/health/micro-ui/web/micro-ui-internals/example/package.json @@ -10,11 +10,11 @@ }, "devDependencies": { "@egovernments/digit-ui-libraries": "1.8.6", - "@egovernments/digit-ui-module-workbench": "1.0.11", + "@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-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 index bb1241f61d..627036cce6 100644 --- 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,9 +10,9 @@ DIGIT - + - + diff --git a/health/micro-ui/web/micro-ui-internals/package.json b/health/micro-ui/web/micro-ui-internals/package.json index 3c4e0e7170..da3c46157b 100644 --- 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/package.json b/health/micro-ui/web/micro-ui-internals/packages/css/package.json index 8adddce428..f701aa1ce2 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/health/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-health-css", - "version": "0.2.36", + "version": "0.2.37", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", 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 index 77748b6949..7d81a97288 100644 --- 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 index 9c9faa70b0..4a7de0912d 100644 --- 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/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 index 3cb23556a5..c3254c09fd 100644 --- 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 index d6c3881fd9..62f260a6b4 100644 --- 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/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 index 83838e0257..670f18ea37 100644 --- 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 index 303af6d3bb..f7a92e53e8 100644 --- a/health/micro-ui/web/microplan/package.json +++ b/health/micro-ui/web/microplan/package.json @@ -16,7 +16,7 @@ "@egovernments/digit-ui-libraries": "1.8.6", "@egovernments/digit-ui-module-core": "1.8.14", "@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 index 3bce93e0ee..8a5c576de5 100644 --- a/health/micro-ui/web/package.json +++ b/health/micro-ui/web/package.json @@ -18,7 +18,7 @@ "@egovernments/digit-ui-module-workbench": "1.0.2-beta.7", "@egovernments/digit-ui-module-core": "1.8.14", "@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 index f74d5d5e3c..bb37e6631e 100644 --- a/health/micro-ui/web/public/index.html +++ b/health/micro-ui/web/public/index.html @@ -7,10 +7,10 @@ - + - + DIGIT HCM diff --git a/health/micro-ui/web/workbench/package.json b/health/micro-ui/web/workbench/package.json index 0517f31ca5..5ad37f119f 100644 --- a/health/micro-ui/web/workbench/package.json +++ b/health/micro-ui/web/workbench/package.json @@ -13,11 +13,11 @@ "homepage": "/workbench-ui", "dependencies": { "@egovernments/digit-ui-libraries": "1.8.6", - "@egovernments/digit-ui-module-workbench": "1.0.11", + "@egovernments/digit-ui-module-workbench": "1.0.12", "@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-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", From 90e62bd29a8e4088600ac96d24b2932afdefa58d Mon Sep 17 00:00:00 2001 From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:25:26 +0530 Subject: [PATCH 3/8] FEATURE/HCMPRE-0000 : Fix for serach query in user tagging screen (#2132) --- .../packages/modules/microplan/src/components/UserAccess.js | 1 + 1 file changed, 1 insertion(+) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js index 3b47f70945..7d3f1f84ed 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js +++ b/health/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 ( From 396431ea2a8354edbe6abf0de1cdc9e68c71d949 Mon Sep 17 00:00:00 2001 From: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:58:43 +0530 Subject: [PATCH 4/8] FEATURE/HCMPRE-1826 : Fixed 0 capacity validation from microplan (#2137) * FEATURE/HCMPRE-1826 : Fixed 0 capacity validation from microplan * validation method change --- .../campaign-manager/src/components/UploadData.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js index d39dcb6e38..c8f20cad25 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js @@ -30,6 +30,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); @@ -853,10 +854,14 @@ 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"){ + setNotValid(1); + } + },[totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.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); @@ -877,7 +882,7 @@ const UploadData = ({ formData, onSelect, ...props }) => { setShowToast({ key: "error", label: errorMessage, transitionTime: 5000000 }); setIsError(true); setApiError(errorMessage); - + setNotValid(2); return; } if (temp?.status === "completed") { @@ -975,7 +980,7 @@ const UploadData = ({ formData, onSelect, ...props }) => { }; fetchData(); - }, [errorsType]); + }, [errorsType , notValid]); const Template = { url: "/project-factory/v1/data/_download", From 00cad08c07a72eec079b0ce4e22ef0077f727f12 Mon Sep 17 00:00:00 2001 From: abishekTa-egov Date: Tue, 21 Jan 2025 10:23:51 +0530 Subject: [PATCH 5/8] BUGFIX/HCMPRE-1944: TotalCount UI issue in planIbox (#2138) * useEffect updated * CountAssignToAll issue in planInbox --- .../microplan/src/pages/employee/PlanInbox.js | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js index 6894d59db9..e2fcf32bfc 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js +++ b/health/micro-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); From 8c23bef81e3e2d6a3d9b4fed47b42418310dc7cd Mon Sep 17 00:00:00 2001 From: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:46:32 +0530 Subject: [PATCH 6/8] BUGFIX/HCMPRE-1955 : updated versions of core and libraries (#2144) updated versions of core and libraries --- health/micro-ui/web/console/package.json | 4 ++-- health/micro-ui/web/core/package.json | 4 ++-- health/micro-ui/web/micro-ui-internals/example/package.json | 4 ++-- health/micro-ui/web/microplan/package.json | 4 ++-- health/micro-ui/web/package.json | 2 +- health/micro-ui/web/workbench/package.json | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/health/micro-ui/web/console/package.json b/health/micro-ui/web/console/package.json index 8c890104fb..ef3a1dd6cb 100644 --- a/health/micro-ui/web/console/package.json +++ b/health/micro-ui/web/console/package.json @@ -12,9 +12,9 @@ ], "homepage": "/console", "dependencies": { - "@egovernments/digit-ui-libraries": "1.8.6", + "@egovernments/digit-ui-libraries": "1.8.8", "@egovernments/digit-ui-module-workbench": "1.0.12", - "@egovernments/digit-ui-module-core": "1.8.14", + "@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.14", diff --git a/health/micro-ui/web/core/package.json b/health/micro-ui/web/core/package.json index 9800395d7d..5b7a22f244 100644 --- a/health/micro-ui/web/core/package.json +++ b/health/micro-ui/web/core/package.json @@ -12,9 +12,9 @@ ], "homepage": "/core-ui", "dependencies": { - "@egovernments/digit-ui-libraries": "1.8.6", + "@egovernments/digit-ui-libraries": "1.8.8", "@egovernments/digit-ui-module-workbench": "1.0.12", - "@egovernments/digit-ui-module-core": "1.8.14", + "@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.14", diff --git a/health/micro-ui/web/micro-ui-internals/example/package.json b/health/micro-ui/web/micro-ui-internals/example/package.json index 913b5fefd6..d593c46aca 100644 --- a/health/micro-ui/web/micro-ui-internals/example/package.json +++ b/health/micro-ui/web/micro-ui-internals/example/package.json @@ -9,10 +9,10 @@ "start": "react-scripts start" }, "devDependencies": { - "@egovernments/digit-ui-libraries": "1.8.6", + "@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.14", "@egovernments/digit-ui-module-hcmworkbench": "0.1.0", diff --git a/health/micro-ui/web/microplan/package.json b/health/micro-ui/web/microplan/package.json index f7a92e53e8..0e6534f3e3 100644 --- a/health/micro-ui/web/microplan/package.json +++ b/health/micro-ui/web/microplan/package.json @@ -13,8 +13,8 @@ ], "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.14", "@egovernments/digit-ui-module-hcmmicroplanning": "0.0.2", diff --git a/health/micro-ui/web/package.json b/health/micro-ui/web/package.json index 8a5c576de5..51fd8fa753 100644 --- a/health/micro-ui/web/package.json +++ b/health/micro-ui/web/package.json @@ -16,7 +16,7 @@ "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.14", "@egovernments/digit-ui-components": "0.0.2-beta.58", diff --git a/health/micro-ui/web/workbench/package.json b/health/micro-ui/web/workbench/package.json index 5ad37f119f..56c20bab72 100644 --- a/health/micro-ui/web/workbench/package.json +++ b/health/micro-ui/web/workbench/package.json @@ -12,9 +12,9 @@ ], "homepage": "/workbench-ui", "dependencies": { - "@egovernments/digit-ui-libraries": "1.8.6", + "@egovernments/digit-ui-libraries": "1.8.8", "@egovernments/digit-ui-module-workbench": "1.0.12", - "@egovernments/digit-ui-module-core": "1.8.14", + "@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.14", From 89ab055010a46578f281dece0fe5174c5738b6a7 Mon Sep 17 00:00:00 2001 From: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:55:13 +0530 Subject: [PATCH 7/8] BUGFIX/HCMPRE-1826 : Enhanced microplan validation (#2147) Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> --- .../campaign-manager/src/components/UploadData.js | 11 +++++++++-- .../campaign-manager/src/hooks/useProductList.js | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js index c8f20cad25..7f3a2cf45b 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js @@ -855,10 +855,17 @@ const UploadData = ({ formData, onSelect, ...props }) => { } }; useEffect(() =>{ - if(totalData?.HCM_CAMPAIGN_UPLOAD_FACILITY_DATA?.uploadFacility?.uploadedFile?.[0]?.resourceId == "not-validated"){ + 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_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) || notValid==1) { diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js index db916101e6..42f5be07c5 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useProductList.js +++ b/health/micro-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 => From 3f117db8a231f2738c08fb7bfdc23e10bb283f12 Mon Sep 17 00:00:00 2001 From: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:53:02 +0530 Subject: [PATCH 8/8] FEATURE/HCMPRE-1852 :: Consolidated Common UI removing other modules(#2120) --- health/micro-ui/web/console/App.js | 3 --- health/micro-ui/web/console/package.json | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/health/micro-ui/web/console/App.js b/health/micro-ui/web/console/App.js index 93b15440c5..1f12fc2364 100644 --- 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 index ef3a1dd6cb..8916903908 100644 --- a/health/micro-ui/web/console/package.json +++ b/health/micro-ui/web/console/package.json @@ -13,12 +13,9 @@ "homepage": "/console", "dependencies": { "@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-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-hcmworkbench":"0.1.0", "@egovernments/digit-ui-module-campaign-manager": "0.3.0", "react": "17.0.2", "react-dom": "17.0.2",