fix(ui): logs terminal was still referencing layer.id which doesn't e…

…xist anymore
padok-team · May 17, 2024 · 94ad18a · 94ad18a
1 parent 87d3c2d
commit 94ad18a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -32,7 +32,7 @@ const router = createBrowserRouter([
         element: <Pulls />,
       },
       {
-        path: "logs/:namespace/:layerId?/:runId?",
+        path: "logs/:namespace?/:layerId?/:runId?",
         element: <Logs />,
       },
     ],

diff --git a/ui/src/clients/layers/types.ts b/ui/src/clients/layers/types.ts
@@ -3,7 +3,6 @@ export type Layers = {
 };
 
 export type Layer = {
-  id: string;
   namespace: string;
   name: string;
   state: LayerState;

diff --git a/ui/src/pages/Logs.tsx b/ui/src/pages/Logs.tsx
@@ -22,7 +22,7 @@ import { Layer } from "@/clients/layers/types";
 
 const Logs: React.FC = () => {
   const { theme } = useContext(ThemeContext);
-  const { layerId, runId } = useParams();
+  const { namespace, layerId, runId } = useParams();
   const [searchParams, setSerchParams] = useSearchParams();
   const navigate = useNavigate();
 
@@ -113,7 +113,7 @@ const Logs: React.FC = () => {
         run
           ? `/${run}`
           : layer.latestRuns.length > 0
-          ? `/${layer.lastRun}`
+          ? `/${layer.lastRun.id}`
           : ""
       }`,
       search: searchParams.toString(),
@@ -249,7 +249,7 @@ const Logs: React.FC = () => {
                 <RunCard
                   key={index}
                   variant={theme}
-                  isActive={layerId === layer.id}
+                  isActive={layerId === layer.name}
                   onClick={() => handleActive(layer)}
                   handleActive={handleActive}
                   layer={layer}
@@ -273,7 +273,7 @@ const Logs: React.FC = () => {
         {layersQuery.isSuccess &&
           layersQuery.data.results.length > 0 &&
           (layerId &&
-          layersQuery.data.results.some((layer) => layer.id === layerId) ? (
+          layersQuery.data.results.some((layer) => layer.name === layerId) ? (
             runId ? (
               ((activeLayerObject) =>
                 activeLayerObject && (
@@ -284,7 +284,7 @@ const Logs: React.FC = () => {
                     variant={theme}
                   />
                 ))(
-                layersQuery.data.results.find((layer) => layer.id === layerId)
+                layersQuery.data.results.find((layer) => layer.name === layerId)
               )
             ) : (
               <div className="flex items-center justify-center flex-1 min-w-0 sticky top-0">