From 9d19df9812c368451435f457696d9fd52fa166fd Mon Sep 17 00:00:00 2001
From: jsonBackup <jason.becker@phoenixcontact.com>
Date: Thu, 22 Feb 2024 10:27:13 +0100
Subject: [PATCH] Add prefix to NavPath and remove it from path

---
 .../src/common/components/Menu/RoutingMenuItem.tsx   |  2 +-
 .../src/databases/container/Databases.tsx            |  2 +-
 .../src/modules/container/Modules.tsx                | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Moryx.CommandCenter.Web/src/common/components/Menu/RoutingMenuItem.tsx b/src/Moryx.CommandCenter.Web/src/common/components/Menu/RoutingMenuItem.tsx
index 376445cce..c5ad926b4 100644
--- a/src/Moryx.CommandCenter.Web/src/common/components/Menu/RoutingMenuItem.tsx
+++ b/src/Moryx.CommandCenter.Web/src/common/components/Menu/RoutingMenuItem.tsx
@@ -23,7 +23,7 @@ function RoutingMenuItem(props: MenuItemProps) {
     const navigate = useNavigate();
 
     const isOpened = (location: any): boolean => {
-        return location.pathname.endsWith(`/${props.MenuItem.NavPath}`);
+        return location.pathname.startsWith(props.MenuItem.NavPath);
     };
 
     const [IsOpened, setIsOpened] = React.useState<boolean>(isOpened(location));
diff --git a/src/Moryx.CommandCenter.Web/src/databases/container/Databases.tsx b/src/Moryx.CommandCenter.Web/src/databases/container/Databases.tsx
index c835164fe..3dcc054f1 100644
--- a/src/Moryx.CommandCenter.Web/src/databases/container/Databases.tsx
+++ b/src/Moryx.CommandCenter.Web/src/databases/container/Databases.tsx
@@ -71,7 +71,7 @@ class Database extends React.Component<DatabasesPropsModel & DatabasesDispatchPr
         const namespace = dataModel.targetModel.replace("." + context, "");
         return {
             Name: context,
-            NavPath: dataModel.targetModel,
+            NavPath: "/databases/" + dataModel.targetModel,
             Icon: mdiBriefcase,
             Content: (<p style={{ margin: "inherit", color: "gray", fontSize: "x-small" }}>{namespace}</p>),
             SubMenuItems: [],
diff --git a/src/Moryx.CommandCenter.Web/src/modules/container/Modules.tsx b/src/Moryx.CommandCenter.Web/src/modules/container/Modules.tsx
index 6bec9356d..e2410ca07 100644
--- a/src/Moryx.CommandCenter.Web/src/modules/container/Modules.tsx
+++ b/src/Moryx.CommandCenter.Web/src/modules/container/Modules.tsx
@@ -76,20 +76,20 @@ class Modules extends React.Component<ModulesPropModel & ModulesDispatchPropMode
     private static createMenuItem(moduleModel: ServerModuleModel): MenuItemModel {
         return {
             Name: moduleModel.name,
-            NavPath: moduleModel.name,
+            NavPath: "/modules/" + moduleModel.name,
             Icon: mdiHexagon,
             Content: (<span className="font-small" style={{ float: "right" }}><HealthStateBadge HealthState={moduleModel.healthState} /></span>),
             SubMenuItems:
                 [
                     {
                         Name: "Configuration",
-                        NavPath: moduleModel.name + "/configuration",
+                        NavPath: "/modules/" + moduleModel.name + "/configuration",
                         Icon: mdiCogs,
                         SubMenuItems: [],
                     },
                     {
                         Name: "Console",
-                        NavPath: moduleModel.name + "/console",
+                        NavPath: "/modules/" + moduleModel.name + "/console",
                         Icon: mdiConsoleLine,
                         SubMenuItems: [],
                     },
@@ -104,17 +104,17 @@ class Modules extends React.Component<ModulesPropModel & ModulesDispatchPropMode
         this.state.MenuModel.MenuItems.forEach((menuItem) => {
             const module = this.props.Modules.filter(function (element: ServerModuleModel, index: number, array: ServerModuleModel[]): boolean { return element.name === menuItem.Name; })[0];
             routes.push(
-                <Route key={idx} path={menuItem.NavPath} element={
+                <Route key={idx} path={menuItem.NavPath.replace("/modules/", "")} element={
                     <Module Module={module} RestClient={this.props.RestClient} />} />);
 
             menuItem.SubMenuItems.forEach((subMenuItem) => {
                 if (subMenuItem.NavPath.endsWith("configuration")) {
                     routes.push(
-                        <Route key={idx} path={subMenuItem.NavPath} element={
+                        <Route key={idx} path={subMenuItem.NavPath.replace("/modules/", "")} element={
                             <ModuleConfiguration ModuleName={module.name} RestClient={this.props.RestClient} />} />);
                 } else if (subMenuItem.NavPath.endsWith("console")) {
                     routes.push(
-                        <Route key={idx} path={subMenuItem.NavPath} element={
+                        <Route key={idx} path={subMenuItem.NavPath.replace("/modules/", "")} element={
                             <ModuleConsole ModuleName={module.name} RestClient={this.props.RestClient} />} />);
                 }