responding to pr review

SwissDataScienceCenter · Jan 30, 2025 · 3dbc386 · 3dbc386
1 parent 0c752ed
commit 3dbc386
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 60 deletions.
diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -49,6 +49,7 @@ import LazyNotFound from "./not-found/LazyNotFound";
 import NotificationsManager from "./notifications/NotificationsManager";
 import Cookie from "./privacy/Cookie";
 import LazyProjectView from "./project/LazyProjectView";
+import { ABSOLUTE_ROUTES } from "./routing/routes.constants";
 import AppContext from "./utils/context/appContext";
 import useLegacySelector from "./utils/customHooks/useLegacySelector.hook";
 import { setupWebSocket } from "./websocket";
@@ -117,7 +118,7 @@ function CentralContentContainer({ user, socket }) {
           />
         </CompatRoute>
         <CompatRoute path="/datasets">
-          <Redirect to="/v1/search?type=dataset" />
+          <Redirect to={`${ABSOLUTE_ROUTES.v1.search}?type=dataset`} />
         </CompatRoute>
         <CompatRoute path="/v1">
           <LazyRootV1 user={user} />

diff --git a/client/src/components/navbar/NavBarItems.tsx b/client/src/components/navbar/NavBarItems.tsx
@@ -74,7 +74,7 @@ export function RenkuToolbarItemPlus() {
       <Link
         className="dropdown-item"
         id="navbar-project-new"
-        to="/v1/projects/new"
+        to={ABSOLUTE_ROUTES.v1.projects.new}
       >
         Project
       </Link>

diff --git a/client/src/features/dashboard/components/InactiveKgProjects.tsx b/client/src/features/dashboard/components/InactiveKgProjects.tsx
@@ -18,9 +18,9 @@
 import { Link } from "react-router-dom";
 
 import { WarnAlert } from "../../../components/Alert";
+import { ABSOLUTE_ROUTES } from "../../../routing/routes.constants";
 import useAppSelector from "../../../utils/customHooks/useAppSelector.hook";
 import useLegacySelector from "../../../utils/customHooks/useLegacySelector.hook";
-import { Url } from "../../../utils/helpers/url";
 import { useGetInactiveKgProjectsQuery } from "../../inactiveKgProjects/InactiveKgProjectsApi";
 
 function InactiveProjectsWarning({
@@ -39,7 +39,7 @@ function InactiveProjectsWarning({
     <WarnAlert>
       <div data-cy="inactive-kg-project-alert">
         Metadata indexing is not activated on {totalProjectsText}.{" "}
-        <Link to={Url.get(Url.pages.inactiveKgProjects)}>
+        <Link to={ABSOLUTE_ROUTES.v1.inactiveKGProjects}>
           Activate indexing on your projects
         </Link>{" "}
         to properly integrate them with Renku.

diff --git a/client/src/features/rootV1/LazyProjectRootV1.tsx b/client/src/features/rootV1/LazyProjectRootV1.tsx
diff --git a/client/src/features/rootV1/ProjectRootV1.tsx b/client/src/features/rootV1/ProjectRootV1.tsx
@@ -18,9 +18,10 @@
 
 import { Route, Routes } from "react-router-dom-v5-compat";
 import ContainerWrap from "../../components/container/ContainerWrap";
-import { RELATIVE_ROUTES } from "../../routing/routes.constants";
+import LazyNotFound from "../../not-found/LazyNotFound";
 import LazyProjectList from "../../project/list/LazyProjectList";
 import LazyNewProject from "../../project/new/LazyNewProject";
+import { RELATIVE_ROUTES } from "../../routing/routes.constants";
 
 export default function RootV1() {
   return (
@@ -61,7 +62,7 @@ export default function RootV1() {
         path="*"
         element={
           <ContainerWrap>
-            <LazyProjectList />
+            <LazyNotFound />
           </ContainerWrap>
         }
       />

diff --git a/client/src/features/rootV1/RootV1.tsx b/client/src/features/rootV1/RootV1.tsx
@@ -33,7 +33,7 @@ import LazySearchPage from "../kgSearch/LazySearchPage";
 import LazySecrets from "../secrets/LazySecrets";
 import LazyAnonymousSessionsList from "../session/components/LazyAnonymousSessionsList";
 
-import LazyProjectRootV1 from "./LazyProjectRootV1";
+import ProjectRootV1 from "./ProjectRootV1";
 
 export default function RootV1({
   user,
@@ -107,7 +107,7 @@ export default function RootV1({
             path={RELATIVE_ROUTES.v1.projects.root}
             element={
               <ContainerWrap>
-                <LazyProjectRootV1 />
+                <ProjectRootV1 />
               </ContainerWrap>
             }
           />

diff --git a/client/src/routing/routes.constants.ts b/client/src/routing/routes.constants.ts
@@ -18,6 +18,29 @@
 
 export const ABSOLUTE_ROUTES = {
   root: "/",
+  v1: {
+    root: "/v1",
+    inactiveKGProjects: "/v1/inactive-kg-projects",
+    search: "/v1/search",
+    projects: {
+      root: "/v1/projects",
+      all: "/v1/projects/all",
+      new: "/v1/projects/new",
+      starred: "/v1/projects/starred",
+    },
+    help: {
+      root: "/v1/help",
+      contact: "/v1/help/contact",
+      status: "/v1/help/status",
+      release: "/v1/help/release",
+      tos: "/v1/help/tos",
+      privacy: "/v1/help/privacy",
+    },
+    notifications: "/v1/notifications",
+    styleGuide: "/v1/style-guide",
+    secrets: "/v1/secrets",
+    sessions: "/v1/sessions",
+  },
   v2: {
     root: "/v2",
     user: "/v2/user",
@@ -56,27 +79,6 @@ export const ABSOLUTE_ROUTES = {
     connectedServices: "/v2/connected-services",
     secrets: "/v2/secrets",
   },
-  v1: {
-    root: "/v1",
-    search: "/v1/search",
-    projects: {
-      root: "/v1/projects",
-      all: "/v1/projects/all",
-      starred: "/v1/projects/starred",
-    },
-    help: {
-      root: "/v1/help",
-      contact: "/v1/help/contact",
-      status: "/v1/help/status",
-      release: "/v1/help/release",
-      tos: "/v1/help/tos",
-      privacy: "/v1/help/privacy",
-    },
-    notifications: "/v1/notifications",
-    styleGuide: "/v1/style-guide",
-    secrets: "/v1/secrets",
-    sessions: "/v1/sessions",
-  },
 } as const;
 
 export const RELATIVE_ROUTES = {