From 95072649abe9d97dd8a1b3ce7d920f84bb292442 Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Thu, 12 Sep 2024 14:46:40 +0530 Subject: [PATCH 1/2] ISTE-415 FIX --- .../packages/modules/hrms/src/components/hrmscard.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js index 4c40da348..0525b7087 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/hrmscard.js @@ -88,9 +88,7 @@ const HRMSCard = () => { category: t("SEARCH_USER_HEADER"), }, - DIV_ADMIN - ? {} - : { + { label: t("HR_STATE_ REPORTS"), link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=state`, category: t("HR_DASHBOARD_HEADER"), @@ -100,6 +98,11 @@ const HRMSCard = () => { link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=rate-master`, category: t("HR_DASHBOARD_HEADER"), }, + { + label: t("HR_ROLLOUT_DASHBOARD"), + link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=rollout`, + category: t("HR_DASHBOARD_HEADER"), + }, ...moduleForSomeDIVAdmin, ...moduleForSomeSTATEUser, ...moduleForDivisionUser, From fdd58ea876b33741cce2466cb39fcd53d95aa44a Mon Sep 17 00:00:00 2001 From: Hari-egov Date: Thu, 12 Sep 2024 15:11:58 +0530 Subject: [PATCH 2/2] ISTE-398 FIX --- .../packages/modules/hrms/src/components/SearchUserForm.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/SearchUserForm.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/SearchUserForm.js index 2ac58f8a5..7f47e97f1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/SearchUserForm.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/SearchUserForm.js @@ -155,11 +155,13 @@ const SearchUserForm = ({ uniqueTenants, setUniqueTenants, roles, setUniqueRoles const filteredResult = filterKeys(result, requiredKeys); const resultInTree = buildTree(filteredResult, hierarchy); const excludeCodes = ["HRMS_ADMIN", "LOC_ADMIN", "MDMS_ADMIN", "EMPLOYEE", "SYSTEM"]; + const DIV_ADMIN = Digit.UserService.hasAccess(["DIV_ADMIN"]); + setRolesOptions( data?.MdmsRes?.["ws-services-masters"]?.["WSServiceRoles"]?.filter( (row) => !excludeCodes.includes(row?.code) && - (row?.name === "Secretary" || row?.name === "Sarpanch" || row?.name === "Revenue Collector" || row?.name === "DIVISION ADMIN") + (row?.name === "Secretary" || row?.name === "Sarpanch" || row?.name === "Revenue Collector" || !DIV_ADMIN && row?.name === "DIVISION ADMIN") ) ); //updating to state roles as requested