Merge pull request #945 from egovernments/ISTE--398-FIX

Iste 398 fix
egovernments · Sep 12, 2024 · b087198 · b087198
2 parents 8d1ce01 + fdd58ea
commit b087198
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...nd/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/components/SearchUserForm.js b/...nd/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

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
@@ -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,