side bar mobileview and sidebar link order fixes (#1481)

side bar mobile fixes Co-authored-by: nabeelmd-eGov <[email protected]>
egovernments · Oct 9, 2024 · 09463f0 · 09463f0
1 parent 0d0c558
commit 09463f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSideBar.js b/...ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSideBar.js
@@ -107,7 +107,7 @@ export const CitizenSideBar = ({
  let unique = teantsArray.filter((item, i, ar) => ar.indexOf(item) === i);
  unique?.forEach((uniCode) => {
  filteredArray.push({
- label: `TENANT_TENANTS_${stringReplaceAll(uniCode, ".", "_")?.toUpperCase()}`,
+ label: t(`TENANT_TENANTS_${stringReplaceAll(uniCode, ".", "_")?.toUpperCase()}`),
  value: uniCode,
  });
  });
@@ -364,7 +364,8 @@ export const CitizenSideBar = ({
  const transformedLanguageData = languages?.map((language) => ({
  ...language,
  type: "custom",
- key:"language"
+ key:"language",
+ icon:"Language"
  }));
 
  const hamburgerItems = [

diff --git a/...i-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js b/...i-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/EmployeeSideBar.js
@@ -134,9 +134,11 @@ const EmployeeSideBar = () => {
  }
 
  const sortDataByOrderNumber = (data) => {
- // Sort the current level of data by orderNumber
+ // Sort the current level of data by orderNumber, handling cases where orderNumber might be missing
  data.sort((a, b) => {
- return a.orderNumber - b.orderNumber;
+ const aOrder = a.orderNumber !== undefined ? a.orderNumber : Infinity; // Use Infinity if orderNumber is missing
+ const bOrder = b.orderNumber !== undefined ? b.orderNumber : Infinity; // Use Infinity if orderNumber is missing
+ return aOrder - bOrder;
  });
 
  // Recursively sort the children if they exist
@@ -151,7 +153,6 @@ const EmployeeSideBar = () => {
 
  const transformedData = transformData(splitKeyValue(configEmployeeSideBar));
  const sortedTransformedData= sortDataByOrderNumber(transformedData);
-
  if (isLoading) {
  return <Loader />;
  }

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/config/sidebar-menu.js
@@ -8,7 +8,7 @@ const SideBarMenu = (t, closeSidebar, redirectToLoginPage, isEmployee) => [
  element: "HOME",
  text: t("COMMON_BOTTOM_NAVIGATION_HOME"),
  link: isEmployee ? `/${window?.contextPath}/employee` : `/${window?.contextPath}/citizen`,
- icon: "HomeIcon",
+ icon: "Home",
  populators: {
  onClick: closeSidebar,
  },