From 0d95f9f86ef3e9598f1b53cd066319c5db4441a1 Mon Sep 17 00:00:00 2001 From: Ramkrishna-egov Date: Fri, 25 Oct 2024 10:41:26 +0530 Subject: [PATCH 1/4] DEMO UI Bug fixes --- .../modules/microplan/src/components/FormulaConfigWrapper.js | 2 +- .../modules/microplan/src/components/HypothesisWrapper.js | 2 +- .../modules/microplan/src/components/UploadDataCustom.js | 2 +- .../microplan/src/components/UserAccessMgmtTableWrapper.js | 4 ++++ .../modules/microplan/src/components/UserAccessWrapper.js | 2 +- .../modules/microplan/src/pages/employee/PlanInbox.js | 2 +- .../modules/microplan/src/pages/employee/SetupMicroplan.js | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js index b5c556ad14c..0b78434645e 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js @@ -403,7 +403,7 @@ return ( category.category)} currentStep={formulaInternalKey} - onStepClick={handleStepClick} + onStepClick={() => null} direction={"vertical"} /> diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js index a6acf825e89..eb5a1880977 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js @@ -307,7 +307,7 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => { category.category)} currentStep={internalKey} - onStepClick={handleStepClick} + onStepClick={() => null} direction={"vertical"} /> diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js index b0d54d37472..048076affa3 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js @@ -679,8 +679,8 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => { null} /> diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js index af40d310aa5..500f3444c0b 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js @@ -204,7 +204,11 @@ const UserAccessMgmtTableWrapper = ({ role,}) => { setCurrentPage(page); }; + console.log(planAssignmentData) if (isLoading) return ; + else if(planAssignmentData?.data?.length === 0){ + return null; + } else { return( diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js index ba493b5176f..969f9946262 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js @@ -131,7 +131,7 @@ const UserAccessWrapper = ({ onSelect, props: customProps }) => { - + null} direction={"vertical"} /> 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 1e886e8bb88..aea4607db39 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 @@ -494,7 +494,7 @@ const PlanInbox = () => { customStyles={tableCustomStyle} paginationTotalRows={totalRows} paginationPerPage={rowsPerPage} - paginationRowsPerPageOptions={[5, 10, 15, 20, 25]} + paginationRowsPerPageOptions={[10, 20, 50, 100]} // selectableRowsComponent={SimpleCheckbox} // selectableRowsComponent={SimpleCheckbox} /> diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js index 872ae871696..279113e0743 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js @@ -299,8 +299,8 @@ useEffect(() => { "ROLE_ACCESS_CONFIGURATION", "SUMMARY", ]} + onStepClick={() => null} currentStep={currentStep + 1} - onStepClick={onStepClick} activeSteps={active} /> Date: Fri, 25 Oct 2024 10:42:07 +0530 Subject: [PATCH 2/4] Removed console logs --- .../microplan/src/components/UserAccessMgmtTableWrapper.js | 1 - 1 file changed, 1 deletion(-) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js index 500f3444c0b..10b82957edd 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js @@ -204,7 +204,6 @@ const UserAccessMgmtTableWrapper = ({ role,}) => { setCurrentPage(page); }; - console.log(planAssignmentData) if (isLoading) return ; else if(planAssignmentData?.data?.length === 0){ return null; From bc498ce0628d44cdf7545bf0f92d664d3c1deb2a Mon Sep 17 00:00:00 2001 From: Ramkrishna-egov Date: Fri, 25 Oct 2024 10:46:04 +0530 Subject: [PATCH 3/4] Sort default by lastModifiedTime for hrms search --- .../packages/modules/microplan/src/configs/UICustomizations.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js index 804ee96a5f0..e90aabd1fe2 100644 --- a/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js +++ b/health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js @@ -307,6 +307,8 @@ export const UICustomizations = { } data.params.names = name; + data.params.sortOrder = "DESC"; + data.params.sortBy = "lastModifiedTime"; data.params.phone = phone; From 8acbe130f7365d34894a66ce7351493b203ea739 Mon Sep 17 00:00:00 2001 From: Ramkrishna-egov Date: Fri, 25 Oct 2024 11:26:50 +0530 Subject: [PATCH 4/4] Added sort params in example UI Customizations --- .../web/micro-ui-internals/example/src/UICustomizations.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js b/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js index 433ee232a77..22a6b64d8aa 100644 --- a/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js +++ b/health/micro-ui/web/micro-ui-internals/example/src/UICustomizations.js @@ -1024,6 +1024,8 @@ export const UICustomizations = { data.params.names = name; data.params.phone = phone; + data.params.sortOrder = "DESC"; + data.params.sortBy = "lastModifiedTime"; data.params.roles = rolesString; data.params.tenantId = Digit.ULBService.getCurrentTenantId();