From ea36549dbeff566d6377844cff787c23e241dbfa Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Sat, 10 Aug 2024 23:01:31 -0700
Subject: [PATCH] fix stack service routing page - works with updates

---
 .../src/components/resources/stack/services.tsx  |  2 +-
 frontend/src/pages/stack-service/index.tsx       | 16 +++++++++++++++-
 frontend/src/router.tsx                          |  8 ++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/resources/stack/services.tsx b/frontend/src/components/resources/stack/services.tsx
index 3dc98fd8c..28141ea6f 100644
--- a/frontend/src/components/resources/stack/services.tsx
+++ b/frontend/src/components/resources/stack/services.tsx
@@ -50,7 +50,7 @@ export const StackServices = ({
                 );
                 return (
                   <Link
-                    to={`/stacks/${id}/${row.original.service}`}
+                    to={`/stacks/${id}/service/${row.original.service}`}
                     onClick={(e) => e.stopPropagation()}
                   >
                     <Button
diff --git a/frontend/src/pages/stack-service/index.tsx b/frontend/src/pages/stack-service/index.tsx
index 60e11bcd7..8d604264d 100644
--- a/frontend/src/pages/stack-service/index.tsx
+++ b/frontend/src/pages/stack-service/index.tsx
@@ -34,10 +34,24 @@ const Actions: { [action: string]: IdServiceComponent } = {
 };
 
 export const StackServicePage = () => {
-  const { id: stack_id, service } = useParams() as {
+  const { type, id, service } = useParams() as {
+    type: string;
     id: string;
     service: string;
   };
+  if (type !== "stacks") {
+    return <div>This resource type does not have any services.</div>;
+  }
+  return <StackServicePageInner stack_id={id} service={service} />;
+};
+
+const StackServicePageInner = ({
+  stack_id,
+  service,
+}: {
+  stack_id: string;
+  service: string;
+}) => {
   const stack = useStack(stack_id);
   useSetTitle(`${stack?.name} | ${service}`);
   const nav = useNavigate();
diff --git a/frontend/src/router.tsx b/frontend/src/router.tsx
index 0174f091a..47aeb0d51 100644
--- a/frontend/src/router.tsx
+++ b/frontend/src/router.tsx
@@ -38,10 +38,6 @@ const ROUTER = createBrowserRouter([
           { path: ":id", element: <UserPage /> },
         ],
       },
-      {
-        path: "stacks/:id/:service",
-        element: <StackServicePage />,
-      },
       {
         path: ":type",
         children: [
@@ -50,6 +46,10 @@ const ROUTER = createBrowserRouter([
           { path: ":id/stats", element: <ResourceStats /> },
           { path: ":id/updates", element: <Updates /> },
           { path: ":id/alerts", element: <Alerts /> },
+          {
+            path: ":id/service/:service",
+            element: <StackServicePage />,
+          },
         ],
       },
     ],