BSR

Author: oharsta

client/src/locale/en.js

@@ -113,7 +113,8 @@ const en = {
         joins: "Join Requests",
         invitations: "Invitations",
         home: "Home",
-        feedback: "Feedback"
+        feedback: "Feedback",
+        profile: "Profile"
     },
     welcome: {
         greeting: "Welcome {{name}}",

client/src/pages/Profile.jsx

@@ -24,7 +24,7 @@ const Profile = ({setIsAuthenticated}) => {
         useAppStore.setState({
             breadcrumbPaths: [
                 {path: "/home", value: I18n.t("profile.title"), menuItemName: mainMenuItems.home},
-                {value: I18n.t("breadCrumb.applications")}
+                {value: I18n.t("breadCrumb.profile")}
             ]
         });
     }, []);

client/src/utils/MenuItems.js

@@ -116,20 +116,13 @@ export const allMenuGroups = [
 ]
 
 export const activeMenuItem = currentLocation => {
-    let path = currentLocation.pathname;
-    if (path === "/") {
-        path = "/home"
-    } else if (path.startsWith("/users/")) {
-        path = path.substring(0, 7)
-    } else if (path.startsWith("/organization/")) {
-        path = path.substring(0, 13)
-    } else if (path.startsWith("/idp/")) {
-        path = path.substring(0, 5)
-    }
+    const path = currentLocation.pathname;
+    const secondSlash = path.indexOf('/', 1);
+    const strippedPath = secondSlash === -1 ? path : path.substring(0, secondSlash);
     const activeItem = allMenuGroups
         .map(group => group.items)
         .flat()
-        .find(item => item.path.startsWith(path));
+        .find(item => item.path.startsWith(strippedPath));
     return activeItem?.name || mainMenuItems.home;
 }