Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEMO UI Bug fixes #1665

Merged
merged 6 commits into from
Oct 25, 2024
Merged

DEMO UI Bug fixes #1665

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d95f9f
DEMO UI Bug fixes
Ramkrishna-egov Oct 25, 2024
5b72bfd
Removed console logs
Ramkrishna-egov Oct 25, 2024
bc498ce
Sort default by lastModifiedTime for hrms search
Ramkrishna-egov Oct 25, 2024
45a2ed0
Merge branch 'console' into ui-demo-1-bug-fixes-rk
nipunarora-eGov Oct 25, 2024
8acbe13
Added sort params in example UI Customizations
Ramkrishna-egov Oct 25, 2024
0d2643c
Merge branch 'ui-demo-1-bug-fixes-rk' of https://github.com/egovernme…
Ramkrishna-egov Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ return (
<Stepper
customSteps={ruleConfigurationCategories.map(category => category.category)}
currentStep={formulaInternalKey}
onStepClick={handleStepClick}
onStepClick={() => null}
direction={"vertical"}
/>
</Card>
Expand Down
2 changes: 1 addition & 1 deletion ...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/HypothesisWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...o-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UploadDataCustom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
/>
</Card>
</div>
Expand Down
3 changes: 3 additions & 0 deletions ...icro-ui-internals/packages/modules/microplan/src/components/UserAccessMgmtTableWrapper.js
View file
Open in desktop
Original file line number Diff 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;
}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
else {
return(
<Card>
Expand Down
2 changes: 1 addition & 1 deletion ...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccessWrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"} />
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
</Card>
</div>

Expand Down
2 changes: 2 additions & 0 deletions ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/configs/UICustomizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ export const UICustomizations = {
}

data.params.names = name;
data.params.sortOrder = "DESC";
Ramkrishna-egov marked this conversation as resolved.
Show resolved Hide resolved
data.params.sortBy = "lastModifiedTime";
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved

data.params.phone = phone;

Expand Down
2 changes: 1 addition & 1 deletion ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ const PlanInbox = () => {
customStyles={tableCustomStyle}
paginationTotalRows={totalRows}
paginationPerPage={rowsPerPage}
paginationRowsPerPageOptions={[5, 10, 15, 20, 25]}
paginationRowsPerPageOptions={[10, 20, 50, 100]}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
// selectableRowsComponent={SimpleCheckbox}
// selectableRowsComponent={SimpleCheckbox}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
/>
Expand Down
2 changes: 1 addition & 1 deletion ...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/SetupMicroplan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@ useEffect(() => {
"ROLE_ACCESS_CONFIGURATION",
"SUMMARY",
]}
onStepClick={() => null}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
currentStep={currentStep + 1}
onStepClick={onStepClick}
activeSteps={active}
/>
<FormComposerV2
Expand Down