From 60c48616df6026f929056143080422b04406693b Mon Sep 17 00:00:00 2001 From: NabeelAyubee Date: Mon, 9 Sep 2024 11:56:39 +0530 Subject: [PATCH] Pr resolve --- .../css/src/pages/employee/sandbox.scss | 7 ++ .../packages/modules/hrms/package.json | 2 +- .../modules/hrms/src/components/hrmscard.js | 76 +++++++++++-------- .../modules/pgr/src/components/PGRCard.js | 15 +++- .../sandbox/src/components/SandboxCard.js | 10 +-- .../src/atoms/EmployeeModuleCard.js | 33 ++++++-- 6 files changed, 96 insertions(+), 47 deletions(-) diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss index 8c5bc4f792a..41fc1cca0a6 100644 --- a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss +++ b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss @@ -333,3 +333,10 @@ margin-bottom: 0; } } +.action-bar-wrap{ + .menu-wrap{ + p{ + margin: 0 !important; + } + } +} \ No newline at end of file diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json index 84ac61628aa..e54496b6890 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/package.json @@ -15,7 +15,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@egovernments/digit-ui-react-components": "1.8.2-beta.12", + "@egovernments/digit-ui-react-components": "1.8.2-beta.13", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js index 48af9efcda9..e1addbad56a 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js @@ -6,40 +6,52 @@ const HRMSCard = () => { const ADMIN = Digit.Utils.hrmsAccess(); if (!ADMIN) { return null; - } - const { t } = useTranslation(); - const tenantId = Digit.ULBService.getCurrentTenantId(); - const { isLoading, isError, error, data, ...rest } = Digit.Hooks.hrms.useHRMSCount(tenantId); + } + const { t } = useTranslation(); + const tenantId = Digit.ULBService.getCurrentTenantId(); + const { isLoading, isError, error, data, ...rest } = Digit.Hooks.hrms.useHRMSCount(tenantId); - const propsForModuleCard = { - Icon : , - moduleName: t("ACTION_TEST_HRMS"), - kpis: [ - { - count: isLoading ? "-" : data?.EmployeCount?.totalEmployee, - label: t("TOTAL_EMPLOYEES"), - link: `/${window?.contextPath}/employee/hrms/inbox` - }, - { - count: isLoading ? "-" : data?.EmployeCount?.activeEmployee, - label: t("ACTIVE_EMPLOYEES"), - link: `/${window?.contextPath}/employee/hrms/inbox` - } - ], - links: [ - { - label: t("HR_HOME_SEARCH_RESULTS_HEADING"), - link: `/${window?.contextPath}/employee/hrms/inbox` - }, - { - label: t("HR_COMMON_CREATE_EMPLOYEE_HEADER"), - link: `/${window?.contextPath}/employee/hrms/create` - } - ] - } + let role = ["SUPERUSER"]; - return + let propsForSandbox = [ + { + label: t("CONFIGURE_MASTER"), + link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=HRMS`, + isOutsideModule: true, + roles: role, + }, + ]; + propsForSandbox = propsForSandbox.filter((link) => (link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true)); + + const propsForModuleCard = { + Icon: , + moduleName: t("ACTION_TEST_HRMS"), + kpis: [ + { + count: isLoading ? "-" : data?.EmployeCount?.totalEmployee, + label: t("TOTAL_EMPLOYEES"), + link: `/${window?.contextPath}/employee/hrms/inbox`, + }, + { + count: isLoading ? "-" : data?.EmployeCount?.activeEmployee, + label: t("ACTIVE_EMPLOYEES"), + link: `/${window?.contextPath}/employee/hrms/inbox`, + }, + ], + links: [ + { + label: t("HR_HOME_SEARCH_RESULTS_HEADING"), + link: `/${window?.contextPath}/employee/hrms/inbox`, + }, + { + label: t("HR_COMMON_CREATE_EMPLOYEE_HEADER"), + link: `/${window?.contextPath}/employee/hrms/create`, + }, + ...propsForSandbox, + ], + }; + + return ; }; export default HRMSCard; - diff --git a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js index 81c870cf485..96c3ee7d32c 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js @@ -35,8 +35,18 @@ let propsForCSR = [ } ]; - propsForCSR = propsForCSR.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true ); +let propsForSandbox = [ + { + label: t("CONFIGURE_MASTER"), + link: `/${window?.contextPath}/employee/sandbox/application-management/setup-master?module=PGR`, + isOutsideModule : true, + roles: role + } +]; + + propsForCSR = propsForCSR.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true ); + propsForSandbox = propsForSandbox.filter(link => link?.roles ? Digit.Utils.didEmployeeHasAtleastOneRole(link.roles) : true ); const propsForModuleCard = { Icon: , moduleName: t("ES_PGR_HEADER_COMPLAINT"), @@ -55,7 +65,8 @@ let propsForCSR = [ label: t("ES_PGR_INBOX"), link: `/${window?.contextPath}/employee/pgr/inbox` }, - ...propsForCSR + ...propsForCSR, + ...propsForSandbox ] } diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js index 5998c89f254..d2b2ac9fcf7 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/src/components/SandboxCard.js @@ -27,11 +27,11 @@ const SandboxCard = () => { link: `/${window?.contextPath}/employee/sandbox/tenant-management/search`, roles: ROLES.SUPERUSER, }, - { - label: t("SANDBOX_APPLICATION_MANAGEMENT_HOMECARD_LABEL"), - link: `/${window?.contextPath}/employee/sandbox/application-management/home`, - roles: ROLES.SUPERUSER, - }, + // { + // label: t("SANDBOX_APPLICATION_MANAGEMENT_HOMECARD_LABEL"), + // link: `/${window?.contextPath}/employee/sandbox/application-management/home`, + // roles: ROLES.SUPERUSER, + // }, ], }; diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js index 21fb1ae0a51..4270312a9d4 100644 --- a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js +++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/EmployeeModuleCard.js @@ -22,17 +22,32 @@ const EmployeeModuleCard = ({ Icon, moduleName, kpis = [], links = [], isCitizen {count || "-"}
- - {link ? history.push(`${link}`,{count})}>{label} : null} + {link ? ( + history.push(`${link}`, { count })}> + {label} + + ) : null}
))} )}
- {links.map(({ count, label, link }, index) => ( + {links.map(({ count, label, link, isOutsideModule }, index) => ( - {link ? (link?.includes(`${window?.contextPath}/`)?{label}:{label}) : null} + {link ? ( + link?.includes(`${window?.contextPath}/`) ? ( + isOutsideModule ? ( + history.push(`${link}`)}> + {label} + + ) : ( + {label} + ) + ) : ( + {label} + ) + ) : null} {count ? ( <> history.push(`${link}`)}>{count || "-"} @@ -50,7 +65,7 @@ const EmployeeModuleCard = ({ Icon, moduleName, kpis = [], links = [], isCitizen ); }; -const ModuleCardFullWidth = ({ moduleName, links = [], isCitizen = false, className, styles, headerStyle, subHeader, subHeaderLink }) => { +const ModuleCardFullWidth = ({ moduleName, links = [], isCitizen = false, className, styles, headerStyle, subHeader, subHeaderLink }) => { return (