diff --git a/src/app/base/components/node/NodeLogs/NodeLogs.test.tsx b/src/app/base/components/node/NodeLogs/NodeLogs.test.tsx
index 479a89eea9..6affab278e 100644
--- 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
index 1556bd7612..ec8db8c5d8 100644
--- 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 (
<>
@@ -55,10 +57,17 @@ const NodeLogs = ({ node, urls }: Props): JSX.Element => {
}
- path={urls.installationOutput(null)}
+ path={getRelativeRoute(
+ urls.installationOutput(null),
+ urls.index(null)
+ )}
/>
{[urls.index(null), urls.events(null)].map((path) => (
- } key={path} path={path} />
+ }
+ key={path}
+ path={getRelativeRoute(path, urls.index(null))}
+ />
))}
>
diff --git a/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx b/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx
index 528293c156..ff4c41c781 100644
--- a/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx
+++ b/src/app/controllers/views/ControllerDetails/ControllerDetails.tsx
@@ -160,24 +160,10 @@ const ControllerDetails = (): JSX.Element => {
/>
}
- path={getRelativeRoute(
+ path={`${getRelativeRoute(
urls.controllers.controller.logs.index(null),
base
- )}
- />
- }
- path={getRelativeRoute(
- urls.controllers.controller.logs.events(null),
- base
- )}
- />
- }
- path={getRelativeRoute(
- urls.controllers.controller.logs.installationOutput(null),
- base
- )}
+ )}/*`}
/>
}
diff --git a/src/app/controllers/views/ControllerDetails/ControllerLogs/ControllerLogs.test.tsx b/src/app/controllers/views/ControllerDetails/ControllerLogs/ControllerLogs.test.tsx
index f1c04f11ae..7be2351ad0 100644
--- 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(, {
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
index 43c9ed2ac0..59469a086e 100644
--- 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(, {
route: path,
state,
+ routePattern: `${urls.machines.machine.logs.index(null)}/*`,
});
expect(screen.getByLabelText(label)).toBeInTheDocument();
});