From 90bf6c66c6f63db1f6e237cd074281aa0fe5f196 Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Thu, 18 Dec 2025 18:36:00 +0000
Subject: [PATCH] Run redirect route and link to runs from Query page

---
 .../app/components/code/TSQLResultsTable.tsx  |  8 +++
 .../route.tsx                                 |  2 +-
 apps/webapp/app/routes/runs.$runParam.ts      | 68 +++++++++++++++++++
 apps/webapp/app/utils/pathBuilder.ts          |  6 +-
 apps/webapp/app/v3/querySchemas.ts            |  3 +-
 5 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 apps/webapp/app/routes/runs.$runParam.ts

diff --git a/apps/webapp/app/components/code/TSQLResultsTable.tsx b/apps/webapp/app/components/code/TSQLResultsTable.tsx
index 3442f729e..e71c9e5f9 100644
--- a/apps/webapp/app/components/code/TSQLResultsTable.tsx
+++ b/apps/webapp/app/components/code/TSQLResultsTable.tsx
@@ -17,6 +17,8 @@ import {
   TaskRunStatusCombo,
 } from "~/components/runs/v3/TaskRunStatus";
 import { Paragraph } from "../primitives/Paragraph";
+import { TextLink } from "../primitives/TextLink";
+import { v3RunPathFromFriendlyId } from "~/utils/pathBuilder";
 
 /**
  * Check if a ClickHouse type is a DateTime type
@@ -83,6 +85,12 @@ function CellValue({
   // First check customRenderType for special rendering
   if (column.customRenderType) {
     switch (column.customRenderType) {
+      case "runId": {
+        if (typeof value === "string") {
+          return <TextLink to={v3RunPathFromFriendlyId(value)}>{value}</TextLink>;
+        }
+        break;
+      }
       case "runStatus": {
         // We have mapped the status to a friendly status so we need to map back to render the normal component
         if (isTaskRunStatus(value)) {
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
index 8cd01cd4d..afed660eb 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
@@ -202,7 +202,7 @@ export default function Page() {
               minHeight="200px"
               className="min-h-[200px]"
             />
-            <Form method="post" className="flex items-center justify-end gap-3 px-2">
+            <Form method="post" className="flex items-center justify-end gap-2 px-2">
               <input type="hidden" name="query" value={query} />
               <input type="hidden" name="scope" value={scope} />
               <Select
diff --git a/apps/webapp/app/routes/runs.$runParam.ts b/apps/webapp/app/routes/runs.$runParam.ts
new file mode 100644
index 000000000..4e9ce3d7a
--- /dev/null
+++ b/apps/webapp/app/routes/runs.$runParam.ts
@@ -0,0 +1,68 @@
+import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { redirectWithErrorMessage } from "~/models/message.server";
+import { requireUser } from "~/services/session.server";
+import { rootPath, v3RunPath } from "~/utils/pathBuilder";
+
+const ParamsSchema = z.object({
+  runParam: z.string(),
+});
+
+export async function loader({ params, request }: LoaderFunctionArgs) {
+  const user = await requireUser(request);
+
+  const { runParam } = ParamsSchema.parse(params);
+
+  const run = await prisma.taskRun.findFirst({
+    where: {
+      friendlyId: runParam,
+      project: {
+        organization: {
+          members: {
+            some: {
+              userId: user.id,
+            },
+          },
+        },
+      },
+    },
+    select: {
+      runtimeEnvironment: {
+        select: {
+          slug: true,
+        },
+      },
+      project: {
+        select: {
+          slug: true,
+          organization: {
+            select: {
+              slug: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!run) {
+    return redirectWithErrorMessage(
+      rootPath(),
+      request,
+      "Run either doesn't exist or you don't have permission to view it",
+      {
+        ephemeral: false,
+      }
+    );
+  }
+
+  return redirect(
+    v3RunPath(
+      { slug: run.project.organization.slug },
+      { slug: run.project.slug },
+      { slug: run.runtimeEnvironment.slug },
+      { friendlyId: runParam }
+    )
+  );
+}
diff --git a/apps/webapp/app/utils/pathBuilder.ts b/apps/webapp/app/utils/pathBuilder.ts
index 36582e69d..ebdec3401 100644
--- a/apps/webapp/app/utils/pathBuilder.ts
+++ b/apps/webapp/app/utils/pathBuilder.ts
@@ -306,11 +306,15 @@ export function v3RunPath(
 export function v3RunRedirectPath(
   organization: OrgForPath,
   project: ProjectForPath,
-  run: v3RunForPath,
+  run: v3RunForPath
 ) {
   return `${v3ProjectPath(organization, project)}/runs/${run.friendlyId}`;
 }
 
+export function v3RunPathFromFriendlyId(runId: string) {
+  return `/runs/${runId}`;
+}
+
 export function v3RunDownloadLogsPath(run: v3RunForPath) {
   return `/resources/runs/${run.friendlyId}/logs/download`;
 }
diff --git a/apps/webapp/app/v3/querySchemas.ts b/apps/webapp/app/v3/querySchemas.ts
index 14acbfad0..56ed8ddbf 100644
--- a/apps/webapp/app/v3/querySchemas.ts
+++ b/apps/webapp/app/v3/querySchemas.ts
@@ -35,7 +35,7 @@ export const runsSchema: TableSchema = {
     run_id: {
       name: "run_id",
       clickhouseName: "friendly_id",
-      ...column("String", { description: "Run ID (e.g., run_abc123)" }),
+      ...column("String", { description: "Run ID (e.g., run_abc123)", customRenderType: "runId" }),
     },
     environment_id: {
       name: "environment_id",
@@ -54,6 +54,7 @@ export const runsSchema: TableSchema = {
       ...column("LowCardinality(String)", {
         description: "Environment type",
         allowedValues: [...ENVIRONMENT_TYPES],
+        customRenderType: "environmentType",
       }),
     },
     attempt: {