Merge pull request #946 from egovernments/develop

Develop
egovernments · Sep 13, 2024 · bf7902c · bf7902c
2 parents 7c80d63 + b087198
commit bf7902c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js
@@ -4,7 +4,7 @@ import CitizenApp from "./pages/citizen";
 import EmployeeApp from "./pages/employee";
 import CommonApp from "./pages/common";
 
-export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, initData, defaultLanding = "citizen" }) => {
+export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, initData, defaultLanding = "employee" }) => {
   const history = useHistory();
   const { pathname } = useLocation();
   const innerWidth = window.innerWidth;
@@ -65,13 +65,22 @@ export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, initData, de
     pathname,
     initData,
   };
+
+  // Do not redirect if it's a payment route under citizen
+  const shouldRedirectToEmployee = () => {
+    if (pathname.startsWith(`/${window?.contextPath}/citizen/payment`)) {
+      return false;
+    }
+    return true;
+  };
+
   return (
     <Switch>
       <Route path={`/${window?.contextPath}/employee`}>
         <EmployeeApp {...commonProps} />
       </Route>
       <Route path={`/${window?.contextPath}/citizen`}>
-        <CitizenApp {...commonProps} />
+        {shouldRedirectToEmployee() ? <Redirect to={`/${window?.contextPath}/employee`} /> : <CitizenApp {...commonProps} />}
       </Route>
       <Route path={`/${window?.contextPath}/common`}>
         <CommonApp {...commonProps} />

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,