diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json index 0d36ca5a625..cee9f67fd32 100644 --- a/micro-ui/web/micro-ui-internals/example/package.json +++ b/micro-ui/web/micro-ui-internals/example/package.json @@ -15,7 +15,7 @@ "@egovernments/digit-ui-module-dss": "1.8.1", "@egovernments/digit-ui-module-core": "1.8.2-beta.18", "@egovernments/digit-ui-module-common": "1.8.0", - "@egovernments/digit-ui-module-hrms": "1.8.0", + "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1", "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39", "@egovernments/digit-ui-module-open-payment":"0.0.1", "@egovernments/digit-ui-module-engagement": "1.5.20", diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json index 2eeabaf59ba..c6bc79cd360 100644 --- a/micro-ui/web/micro-ui-internals/package.json +++ b/micro-ui/web/micro-ui-internals/package.json @@ -28,7 +28,7 @@ "dev:example": "cd example && yarn start", "dev:core": "cd packages/modules/core && yarn start", "devD:dss": "cd packages/modules/dss && yarn start", - "devD:hrms": "cd packages/modules/hrms && yarn start", + "dev:hrms": "cd packages/modules/hrms && yarn start", "devD:common": "cd packages/modules/common && yarn start", "devD:utilities": "cd packages/modules/utilities && yarn start", "dev:workbench": "cd packages/modules/workbench && yarn start", diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js index 6ecc8702939..4f2dfdf3c75 100644 --- a/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js +++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/utils/index.js @@ -305,7 +305,7 @@ const receiptsAccess = () => { const RECEIPTS_ACCESS = userRoles?.filter((role) => receiptsRoles?.includes(role)); return RECEIPTS_ACCESS?.length > 0; }; -const hrmsRoles = ["HRMS_ADMIN"]; +const hrmsRoles = ["HRMS_ADMIN","SUPERUSER"]; const hrmsAccess = () => { const userInfo = Digit.UserService.getUser(); const userRoles = userInfo?.info?.roles?.map((roleData) => roleData?.code); 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 e9e8e2df20a..84ac61628aa 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.5.22", + "@egovernments/digit-ui-react-components": "1.8.2-beta.12", "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/Module.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js index 614e1ec816c..a7745f92a14 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/Module.js @@ -31,7 +31,7 @@ export const HRMSModule = ({ stateCode, userType, tenants }) => { const { path, url } = useRouteMatch(); if (!Digit.Utils.hrmsAccess()) { return null; - } + } if (userType === "employee") { return ; } else return null; diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js index ded77d1672a..847fd67388d 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/InboxFilter.js @@ -54,7 +54,7 @@ const Filter = ({ searchParams, onFilterChange, onSearch, removeParam, ...props }); useEffect(() => { - if (tenantId.code) { + if (tenantId?.code) { setSearchParams({ ..._searchParams, tenantId: tenantId.code }); } }, [tenantId]); diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js index 7f0149bf764..e2440e56001 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/Utils/index.js @@ -63,8 +63,8 @@ export const getCityThatUserhasAccess = (cities = []) => { let roleObject = {}; userInfo?.info?.roles.map((roleData) => { roleObject[roleData?.code] = roleObject[roleData?.code] ? [...roleObject[roleData?.code], roleData?.tenantId] : [roleData?.tenantId] }); const tenant = Digit.ULBService.getCurrentTenantId(); - if (roleObject[Digit.Utils?.hrmsRoles?.[0]].includes(Digit.ULBService.getStateId())) { + if (roleObject?.[Digit.Utils?.hrmsRoles?.[0]]?.includes(Digit.ULBService.getStateId())) { return cities; } - return cities.filter(city => roleObject[Digit.Utils?.hrmsRoles?.[0]]?.includes(city?.code)); + return cities?.filter(city => roleObject?.[Digit.Utils?.hrmsRoles?.[0]]?.includes(city?.code)); } \ No newline at end of file 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 649c5ac3c2b..48af9efcda9 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,7 +6,7 @@ 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); diff --git a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js index 9bbc1599732..96d1b317a8b 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/SelectEmployeeGender.js @@ -47,7 +47,7 @@ const SelectEmployeeGender = ({ t, config, onSelect, formData = {}, userType, re