fix: fixed routing

equinor · Nov 22, 2023 · c808afc · c808afc
1 parent db7d9c5
commit c808afc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/components/Table.tsx b/src/components/Table.tsx
@@ -82,7 +82,7 @@ export const Table = ({ refetchKey }: { refetchKey: number }) => {
             cell: ({ row }) => (
               <Button
                 onClick={() => {
-                  navigate(`/model/${row.original.analogueModelId}/details`);
+                  navigate(`/${row.original.analogueModelId}/details`);
                 }}
               >
                 Go to model

diff --git a/src/features/AppBar/Navigation/Navigation.tsx b/src/features/AppBar/Navigation/Navigation.tsx
@@ -1,5 +1,4 @@
 import { Tabs } from '@equinor/eds-core-react';
-import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { tabs } from '../../../router';
 import * as Styled from './Navigation.styled';
@@ -11,11 +10,6 @@ export const Navigation = () => {
     (tab) => `/${tab.path}` === window.location.pathname,
   );
 
-  useEffect(() => {
-    const currentURL = window.location.pathname;
-    if (currentURL === '/') navigate('models');
-  }, [navigate]);
-
   function clickTab(tab: number) {
     navigate(tabs[tab].path);
   }

diff --git a/src/router.tsx b/src/router.tsx
@@ -15,17 +15,26 @@ interface Tab extends Required<Pick<NonIndexRouteObject, 'path' | 'element'>> {
 }
 
 const tabs: Tab[] = [
-  {
-    title: 'Models',
-    path: 'models',
-    element: <Browse />,
-  },
+  { title: 'Models', path: '/', element: <Browse /> },
   { title: 'API', path: 'api', element: <Api /> },
   { title: 'About', path: 'about', element: <About /> },
 ];
-const appRoutes = (tabs as NonIndexRouteObject[]).concat([
+
+const appRoutes = [
+  {
+    index: true,
+    element: <Browse />,
+  },
   {
-    path: 'model/:modelId/',
+    path: 'api',
+    element: <Api />,
+  },
+  {
+    path: 'about',
+    element: <About />,
+  },
+  {
+    path: ':modelId/',
     element: <Model />,
     children: [
       {
@@ -48,7 +57,7 @@ const appRoutes = (tabs as NonIndexRouteObject[]).concat([
       },
     ],
   },
-]);
+];
 
 const router = createBrowserRouter([
   {