Fixes for CLI redirect routes

Author: matt-aitken

apps/webapp/app/routes/projects.v3.$projectRef.deployments.$deploymentParam.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { requireUserId } from "~/services/session.server";
@@ -35,6 +35,6 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
   // Redirect to the project's runs page
   return redirect(
-    `/orgs/${project.organization.slug}/projects/v3/${project.slug}/deployments/${validatedParams.deploymentParam}`
+    `/orgs/${project.organization.slug}/projects/${project.slug}/deployments/${validatedParams.deploymentParam}`
   );
 }

apps/webapp/app/routes/projects.v3.$projectRef.environment-variables.ts

@@ -34,6 +34,6 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
   // Redirect to the project's runs page
   return redirect(
-    `/orgs/${project.organization.slug}/projects/v3/${project.slug}/environment-variables`
+    `/orgs/${project.organization.slug}/projects/${project.slug}/environment-variables`
   );
 }

apps/webapp/app/routes/projects.v3.$projectRef.runs.ts

@@ -1,7 +1,7 @@
-import { LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
-import { EnvSlug, isEnvSlug } from "~/models/api-key.server";
+import { type EnvSlug, isEnvSlug } from "~/models/api-key.server";
 import { requireUserId } from "~/services/session.server";
 
 const ParamsSchema = z.object({
@@ -41,15 +41,13 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     const env = await getEnvFromSlug(project.id, userId, envSlug);
 
     if (env) {
-      url.searchParams.set("environments", env.id);
+      return redirect(
+        `/orgs/${project.organization.slug}/projects/${project.slug}/env/${envSlug}/runs${url.search}`
+      );
     }
-
-    url.searchParams.delete("envSlug");
   }
 
-  return redirect(
-    `/orgs/${project.organization.slug}/projects/v3/${project.slug}/runs${url.search}`
-  );
+  return redirect(`/orgs/${project.organization.slug}/projects/${project.slug}`);
 }
 
 async function getEnvFromSlug(projectId: string, userId: string, envSlug: EnvSlug) {

apps/webapp/app/routes/projects.v3.$projectRef.test.ts

@@ -2,6 +2,7 @@ import { LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { requireUserId } from "~/services/session.server";
+import { v3ProjectPath, v3TestPath } from "~/utils/pathBuilder";
 
 const ParamsSchema = z.object({
   projectRef: z.string(),
@@ -33,8 +34,13 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   }
 
   const url = new URL(request.url);
+  const environment = url.searchParams.get("environment");
 
-  return redirect(
-    `/orgs/${project.organization.slug}/projects/v3/${project.slug}/test${url.search}`
-  );
+  if (environment) {
+    return redirect(
+      v3TestPath({ slug: project.organization.slug }, { slug: project.slug }, { slug: environment })
+    );
+  }
+
+  return redirect(v3ProjectPath({ slug: project.organization.slug }, { slug: project.slug }));
 }

apps/webapp/app/routes/projects.v3.$projectRef.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { requireUserId } from "~/services/session.server";
@@ -33,5 +33,5 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   }
 
   // Redirect to the project's runs page
-  return redirect(`/orgs/${project.organization.slug}/projects/v3/${project.slug}`);
+  return redirect(`/orgs/${project.organization.slug}/projects/${project.slug}`);
 }