fix(machines): Broken routes for machine and controller logs lp2060133 (

#5387)
canonical · Apr 4, 2024 · 9d9edb4 · 9d9edb4
1 parent e4c49ba
commit 9d9edb4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/src/app/base/components/node/NodeLogs/NodeLogs.test.tsx b/src/app/base/components/node/NodeLogs/NodeLogs.test.tsx
@@ -48,6 +48,7 @@ describe("NodeLogs", () => {
         {
           route: path,
           state,
+          routePattern: `${urls.machines.machine.logs.index(null)}/*`,
         }
       );
       expect(screen.getByLabelText(label)).toBeInTheDocument();

diff --git a/src/app/base/components/node/NodeLogs/NodeLogs.tsx b/src/app/base/components/node/NodeLogs/NodeLogs.tsx
@@ -8,6 +8,7 @@ import InstallationOutput from "./InstallationOutput";
 import type { ControllerDetails } from "@/app/store/controller/types";
 import type { MachineDetails } from "@/app/store/machine/types";
 import type { Node } from "@/app/store/types/node";
+import { getRelativeRoute } from "@/app/utils";
 
 type GenerateURL = (
   args: { id: Node["system_id"] } | null,
@@ -29,6 +30,7 @@ const NodeLogs = ({ node, urls }: Props): JSX.Element => {
   const showingOutput = pathname.startsWith(
     urls.installationOutput({ id: node.system_id })
   );
+
   return (
     <>
       <div className="u-position--relative">
@@ -55,10 +57,17 @@ const NodeLogs = ({ node, urls }: Props): JSX.Element => {
       <Routes>
         <Route
           element={<InstallationOutput node={node} />}
-          path={urls.installationOutput(null)}
+          path={getRelativeRoute(
+            urls.installationOutput(null),
+            urls.index(null)
+          )}
         />
         {[urls.index(null), urls.events(null)].map((path) => (
-          <Route element={<EventLogs node={node} />} key={path} path={path} />
+          <Route
+            element={<EventLogs node={node} />}
+            key={path}
+            path={getRelativeRoute(path, urls.index(null))}
+          />
         ))}
       </Routes>
     </>

diff --git a/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx b/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx
@@ -160,24 +160,10 @@ const ControllerDetails = (): JSX.Element => {
           />
           <Route
             element={<ControllerLogs systemId={id} />}
-            path={getRelativeRoute(
+            path={`${getRelativeRoute(
               urls.controllers.controller.logs.index(null),
               base
-            )}
-          />
-          <Route
-            element={<ControllerLogs systemId={id} />}
-            path={getRelativeRoute(
-              urls.controllers.controller.logs.events(null),
-              base
-            )}
-          />
-          <Route
-            element={<ControllerLogs systemId={id} />}
-            path={getRelativeRoute(
-              urls.controllers.controller.logs.installationOutput(null),
-              base
-            )}
+            )}/*`}
           />
           <Route
             element={<ControllerConfiguration systemId={id} />}

diff --git a/src/app/controllers/views/ControllerDetails/ControllerLogs/ControllerLogs.test.tsx b/src/app/controllers/views/ControllerDetails/ControllerLogs/ControllerLogs.test.tsx
@@ -50,6 +50,7 @@ describe("ControllerLogs", () => {
       renderWithBrowserRouter(<ControllerLogs systemId="abc123" />, {
         route: path,
         state,
+        routePattern: `${urls.controllers.controller.logs.index(null)}/*`,
       });
       expect(screen.getByLabelText(label)).toBeInTheDocument();
     });

diff --git a/src/app/machines/views/MachineDetails/MachineLogs/MachineLogs.test.tsx b/src/app/machines/views/MachineDetails/MachineLogs/MachineLogs.test.tsx
@@ -48,6 +48,7 @@ describe("MachineLogs", () => {
       renderWithBrowserRouter(<MachineLogs systemId="abc123" />, {
         route: path,
         state,
+        routePattern: `${urls.machines.machine.logs.index(null)}/*`,
       });
       expect(screen.getByLabelText(label)).toBeInTheDocument();
     });