Merge pull request #942 from egovernments/ISTE-372

Iste 372
egovernments · Sep 11, 2024 · 25c91ea · 25c91ea
2 parents feb53b2 + fa1b329
commit 25c91ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 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
@@ -92,13 +92,12 @@ const HRMSCard = () => {
         ? {}
         : {
             label: t("HR_STATE_ REPORTS"),
-            link: "https://mgramseva-dwss.punjab.gov.in/kibana/app/r/s/JNF2x?auth_provider_hint=anonymous1",
+            link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=state`,
             category: t("HR_DASHBOARD_HEADER"),
           },
       {
         label: t("HR_RATE_DASHBOARD"),
-        link:
-          "https://mgramseva-dwss.punjab.gov.in/kibana/app/dashboards#/view/22ed8660-39cf-11ef-841e-251f7e3bc6c7?[…]!t,value:60000),time:(from:now-15m,to:now))",
+        link: `/${window?.contextPath}/employee/hrms/dashboard?moduleName=dashboard&pageName=rate-master`,
         category: t("HR_DASHBOARD_HEADER"),
       },
       ...moduleForSomeDIVAdmin,

diff --git a/.../micro-ui/web/micro-ui-internals/packages/modules/payment/src/configs/UICustomizations.js b/.../micro-ui/web/micro-ui-internals/packages/modules/payment/src/configs/UICustomizations.js
@@ -178,8 +178,8 @@ export const UICustomizations = {
               }
             });
             result.sort((a, b) => {
-              const nameA = (a.name || "").toLowerCase().trim();
-              const nameB = (b?.name || "").toLowerCase().trim();
+              const nameA = (a.divisionName || "").toLowerCase().trim();
+              const nameB = (b?.divisionName || "").toLowerCase().trim();
               return nameA.localeCompare(nameB);
             });
             return result;