DEMO UI Bug fixes (#1665)

* DEMO UI Bug fixes * Removed console logs * Sort default by lastModifiedTime for hrms search * Added sort params in example UI Customizations --------- Co-authored-by: Nipun Arora <[email protected]>
egovernments · Oct 25, 2024 · 6f2fa8b · 6f2fa8b
1 parent 64b7e14
commit 6f2fa8b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 6 deletions.
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
@@ -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();

diff --git a/.../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js b/.../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js
@@ -403,7 +403,7 @@ return (
                      <Stepper
                         customSteps={ruleConfigurationCategories.map(category => category.category)}
                         currentStep={formulaInternalKey}
-                        onStepClick={handleStepClick}
+                        onStepClick={() => null}
                         direction={"vertical"}
                      />
                   </Card>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js b/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js
@@ -307,7 +307,7 @@ const HypothesisWrapper = ({ onSelect, props: customProps }) => {
                                 <Stepper
                                     customSteps={assumptionCategories.map(category => category.category)}
                                     currentStep={internalKey}
-                                    onStepClick={handleStepClick}
+                                    onStepClick={() => null}
                                     direction={"vertical"}
                                 />
                             </Card>

diff --git a/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js b/...o-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js
@@ -679,8 +679,8 @@ const UploadDataCustom = React.memo(({ formData, onSelect, ...props }) => {
             <Stepper
               customSteps={["HCM_UPLOAD_BOUNDARY_MICROPLAN", "HCM_UPLOAD_FACILITY_MICROPLAN"]}
               currentStep={key - baseKey + 1}
-              onStepClick={onStepClick}
               direction={"vertical"}
+              onStepClick={() => null}
             />
           </Card>
         </div>

diff --git a/...icro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js b/...icro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js
@@ -205,6 +205,9 @@ const UserAccessMgmtTableWrapper = ({ role,}) => {
   };
 
   if (isLoading) return <Loader />;
+  else if(planAssignmentData?.data?.length === 0){
+    return null;
+  }
   else {
   return(
     <Card>

diff --git a/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js b/...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js
@@ -131,7 +131,7 @@ const UserAccessWrapper = ({ onSelect, props: customProps }) => {
               <TextBlock subHeader={t("USER_ACCESS_MANAGEMENT")} subHeaderClasName={"stepper-subheader"} wrapperClassName={"stepper-wrapper"} />
             </Card>
             <Card className="stepper-card">
-              <Stepper customSteps={[...mpRolesArray]} currentStep={internalKey} onStepClick={handleStepClick} direction={"vertical"} />
+              <Stepper customSteps={[...mpRolesArray]} currentStep={internalKey} onStepClick={() => null} direction={"vertical"} />
             </Card>
           </div>
 

diff --git a/...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js b/...icro-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;
 

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
@@ -492,7 +492,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/...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js b/...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}
       />
       <FormComposerV2
-Original file line number
+Diff line change
@@ Expand Up / @@ -205,6 +205,9 @@ const UserAccessMgmtTableWrapper = ({ role,}) => { @@
       };
       if (isLoading) return <Loader />;
+      else if(planAssignmentData?.data?.length === 0){
+        return null;
+      }
       else {
       return(
         <Card>
@@ Expand Down @@