feat: redirect v2 urls to somewhere sensible (#3624) (#3521)

Author: ciyer

client/src/features/rootV2/RootV2.tsx

@@ -18,7 +18,14 @@
 
 import cx from "classnames";
 import { useEffect, useState } from "react";
-import { Route, Routes, useNavigate } from "react-router";
+import {
+  Navigate,
+  Route,
+  Routes,
+  generatePath,
+  useMatch,
+  useNavigate,
+} from "react-router";
 
 import ContainerWrap from "../../components/container/ContainerWrap";
 import LazyNotFound from "../../not-found/LazyNotFound";
@@ -48,6 +55,39 @@ import LazyShowSessionPage from "../sessionsV2/LazyShowSessionPage";
 import LazyUserRedirect from "../usersV2/LazyUserRedirect";
 import LazyUserShow from "../usersV2/LazyUserShow";
 
+function BetaV2Redirect() {
+  const navigate = useNavigate();
+  const betaProjectsMatch = useMatch(ABSOLUTE_ROUTES.v2.projects.beta.splat);
+  const betaGroupsMatch = useMatch(ABSOLUTE_ROUTES.v2.groups.beta.splat);
+
+  useEffect(() => {
+    if (
+      betaProjectsMatch?.params.namespace != null &&
+      betaProjectsMatch?.params.slug != null
+    ) {
+      navigate(
+        generatePath(ABSOLUTE_ROUTES.v2.projects.show.root, {
+          namespace: betaProjectsMatch.params.namespace,
+          slug: betaProjectsMatch.params.slug,
+        }),
+        { replace: true }
+      );
+    }
+  }, [navigate, betaProjectsMatch?.params]);
+
+  useEffect(() => {
+    if (betaGroupsMatch?.params.slug != null) {
+      navigate(
+        generatePath(ABSOLUTE_ROUTES.v2.groups.show.root, {
+          slug: betaGroupsMatch.params.slug,
+        }),
+        { replace: true }
+      );
+    }
+  }, [navigate, betaGroupsMatch?.params]);
+  return <Navigate to={generatePath(ABSOLUTE_ROUTES.v2.root)} replace={true} />;
+}
+
 export default function RootV2() {
   const navigate = useNavigate();
 
@@ -85,6 +125,10 @@ export default function RootV2() {
               </ContainerWrap>
             }
           />
+          <Route
+            path={RELATIVE_ROUTES.v2.betaRoot}
+            element={<BetaV2Redirect />}
+          />
           <Route
             path={RELATIVE_ROUTES.v2.user}
             element={<LazyUserRedirect />}

client/src/routing/routes.constants.ts

@@ -59,6 +59,7 @@ export const ABSOLUTE_ROUTES = {
         settings: "/g/:slug/settings",
         splat: "/g/:slug/*",
       },
+      beta: { splat: "/v2/groups/:slug/*" },
     },
     help: {
       root: "/help",
@@ -79,6 +80,7 @@ export const ABSOLUTE_ROUTES = {
         },
       },
       showById: "/p/:id",
+      beta: { splat: "/v2/projects/:namespace/:slug/*" },
     },
     search: "/search",
     secrets: "/secrets",
@@ -111,6 +113,7 @@ export const RELATIVE_ROUTES = {
   },
   v2: {
     root: "/*",
+    betaRoot: "/v2/*",
     integrations: "integrations",
     groups: {
       root: "g/*",

tests/cypress/e2e/groupV2.spec.ts

@@ -138,6 +138,19 @@ describe("Edit v2 group", () => {
     cy.contains("public-storage").should("be.visible");
   });
 
+  it("shows a group by old URL", () => {
+    fixtures
+      .readGroupV2()
+      .readGroupV2Namespace()
+      .listGroupV2Members()
+      .listProjectV2ByNamespace()
+      .listDataConnectors({ namespace: "test-2-group-v2" });
+    cy.visit("/v2/groups/test-2-group-v2");
+    cy.wait("@readGroupV2");
+    cy.contains("test 2 group-v2").should("be.visible");
+    cy.contains("public-storage").should("be.visible");
+  });
+
   it("allows editing group metadata", () => {
     fixtures
       .readGroupV2()

tests/cypress/e2e/projectV2.spec.ts

@@ -142,6 +142,11 @@ describe("Navigate to project", () => {
     cy.location("pathname").should("contain", "/user1-uuid/test-2-v2-project");
   });
 
+  it("shows projects by old URL", () => {
+    cy.visit("/v2/projects/user1-uuid/test-2-v2-project");
+    cy.contains("test 2 v2-project").should("be.visible");
+  });
+
   it("shows project members", () => {
     fixtures.listProjectV2Members().readProjectV2();
     cy.visit("/p/user1-uuid/test-2-v2-project");