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

setup master screen enhancement #1387

Merged
merged 4 commits into from
Sep 13, 2024
Merged

setup master screen enhancement #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5adc4bc
setup master enhancement
NabeelAyubee Sep 12, 2024
0aab2a1
Merge branch 'develop' into SN-138
NabeelAyubee Sep 12, 2024
f747f58
localisation code updated
NabeelAyubee Sep 12, 2024
cedffee
updated components css version
NabeelAyubee Sep 13, 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 micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
<!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].26/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].32/dist/index.css" />
<script src="%REACT_APP_GLOBAL%"></script>

</head>
Expand Down
15 changes: 11 additions & 4 deletions micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,17 @@
margin-bottom: 0;
}
}
.action-bar-wrap{
.menu-wrap{
p{
.action-bar-wrap {
.menu-wrap {
p {
margin: 0 !important;
}
}
}
}
.digit-popup-wrapper.setupMasterPopUp.alert {
.digit-popup-alert-content{
.digit-popup-alert-heading {
color: #00703c;
}
}
}
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const HRMSCard = () => {
let propsForSandbox = [
{
label: t("CONFIGURE_MASTER"),
link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=HRMS`,
link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=HRMS&key=about`,
isOutsideModule: true,
roles: role,
},
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let propsForCSR = [
let propsForSandbox = [
{
label: t("CONFIGURE_MASTER"),
link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=PGR`,
link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=PGR&key=about`,
isOutsideModule : true,
roles: role
}
Expand Down
8 changes: 5 additions & 3 deletions micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/configs/UICustomizations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,17 @@ export const UICustomizations = {
value?.split(".")?.[1]
}`}
>
{t(`SANDBOX_${value?.split(".")?.[0]}`)}
{t(Digit.Utils.workbench.getMDMSLabel(`SCHEMA_` + value))}
{/* {t(`SANDBOX_${value?.split(".")?.[0]}`)} */}
</Link>
</span>
);
case "SANDBOX_MASTER_NAME":
return row?.code?.split(".")?.[1] ? t(`SANDBOX_${row?.code?.split(".")?.[1]}`) : t(`SANDBOX_${row?.code?.split(".")?.[0]}`);
// return row?.code?.split(".")?.[1] ? t(`SANDBOX_${row?.code?.split(".")?.[1]}`) : t(`SANDBOX_${row?.code?.split(".")?.[0]}`);
return t(Digit.Utils.workbench.getMDMSLabel(`SCHEMA_` + row?.code));

case "SANDBOX_MASTER_TYPE":
return t(`SANDBOX_${value}`);
return t(Digit.Utils.locale.getTransformedLocale(`SANDBOX_MASTERTYPE_${value}`));

case "SANDBOX_ACTIONS":
const handleRedirect = (value, type) => {
Expand Down
2 changes: 1 addition & 1 deletion ...-internals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ApplicationHome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const ApplicationHome = () => {
className="sandbox-module-card"
label={t(`SANDBOX_APPLICATION_MODULE_${item?.module}`)}
buttonLabel={t(`SANDBOX_VIEW`)}
onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=${item?.module}`)}
onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=${item?.module}&key=about`)}
// onButtonClick={() => history.push(`/${window?.contextPath}/employee/sandbox/application-management/module?module=${item?.module}`)}
/>
))}
Expand Down
34 changes: 1 addition & 33 deletions ...nternals/packages/modules/sandbox/src/pages/employee/applicationMgmt/ModuleMasterTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Header, InboxSearchComposer } from "@egovernments/digit-ui-react-components";
import { Button, PopUp, Toast } from "@egovernments/digit-ui-components";
import { Button, Toast } from "@egovernments/digit-ui-components";
import { useHistory, useLocation } from "react-router-dom";
import { moduleMasterConfig } from "./config/moduleMasterConfig";

Expand Down Expand Up @@ -63,38 +63,6 @@ const ModuleMasterTable = () => {
}}
></InboxSearchComposer>
</div>
{showPopUp && (
<PopUp
type={"default"}
className={"masterHandlerPopup"}
footerclassName={"masterHandlerPopUpFooter"}
heading={t("SANDBOX_SETUP_MASTER_MODAL_HEADER")}
children={[<div>{t("SANDBOX_SETUP_MASTER_MODAL_TEXT")}</div>]}
onOverlayClick={() => {}}
footerChildren={[
<Button
type={"button"}
size={"large"}
variation={"secondary"}
label={t("SANDBOX_MANNUAL_MASTER_LOAD")}
onClick={() => {
handleMasterData(true);
}}
/>,
<Button
type={"button"}
size={"large"}
variation={"primary"}
label={t("SANDBOX_DEFAULT_MASTER_LOAD")}
onClick={() => {
handleMasterData(false);
}}
/>,
]}
sortFooterChildren={true}
onClose={() => {}}
></PopUp>
)}
{showToast && (
<Toast
type={showToast?.isError ? "error" : "success"}
Expand Down
Loading