types fixes

Author: mpcgrid

apps/webapp/app/components/logs/LogDetailView.tsx

@@ -21,7 +21,7 @@ import { useEnvironment } from "~/hooks/useEnvironment";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import type { LogEntry } from "~/presenters/v3/LogsListPresenter.server";
-import { getLevelColor } from "~/utils/logUtils";
+import { getLevelColor, getKindColor, getKindLabel } from "~/utils/logUtils";
 import { v3RunSpanPath, v3RunsPath, v3DeploymentVersionPath } from "~/utils/pathBuilder";
 import type { loader as logDetailLoader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.$logId";
 import { TaskRunStatusCombo, descriptionForTaskRunStatus } from "~/components/runs/v3/TaskRunStatus";
@@ -54,46 +54,6 @@ type LogAttributes = Record<string, unknown> & {
   };
 };
 
-// Event kind badge color styles
-function getKindColor(kind: string): string {
-  if (kind === "SPAN") {
-    return "text-purple-400 bg-purple-500/10 border-purple-500/20";
-  }
-  if (kind === "SPAN_EVENT") {
-    return "text-amber-400 bg-amber-500/10 border-amber-500/20";
-  }
-  if (kind.startsWith("LOG_")) {
-    return "text-blue-400 bg-blue-500/10 border-blue-500/20";
-  }
-  return "text-charcoal-400 bg-charcoal-700 border-charcoal-600";
-}
-
-// Get human readable kind label
-function getKindLabel(kind: string): string {
-  switch (kind) {
-    case "SPAN":
-      return "Span";
-    case "SPAN_EVENT":
-      return "Event";
-    case "LOG_DEBUG":
-      return "Log";
-    case "LOG_INFO":
-      return "Log";
-    case "LOG_WARN":
-      return "Log";
-    case "LOG_ERROR":
-      return "Log";
-    case "LOG_LOG":
-      return "Log";
-    case "DEBUG_EVENT":
-      return "Debug";
-    case "ANCESTOR_OVERRIDE":
-      return "Override";
-    default:
-      return kind;
-  }
-}
-
 function formatStringJSON(str: string): string {
   return str
     .replace(/\\n/g, "\n") // Converts literal "\n" to newline

apps/webapp/app/components/logs/LogsTable.tsx

@@ -28,7 +28,6 @@ import { PopoverMenuItem } from "~/components/primitives/Popover";
 type LogsTableProps = {
   logs: LogEntry[];
   hasFilters: boolean;
-  filters: LogsListAppliedFilters;
   searchTerm?: string;
   isLoading?: boolean;
   isLoadingMore?: boolean;

apps/webapp/app/components/primitives/Table.tsx

@@ -22,7 +22,10 @@ const variants = {
   },
   "bright/no-hover": {
     header: "bg-transparent",
+    headerCell: "px-3 py-2.5 pb-3 text-sm",
     cell: "group-hover/table-row:bg-transparent",
+    cellSize: "px-3 py-3",
+    cellText: "text-xs",
     stickyCell: "bg-background-bright",
     menuButton: "bg-background-bright",
     menuButtonDivider: "",

apps/webapp/app/presenters/RunFilters.server.ts

@@ -1,3 +1,4 @@
+import { type TaskRunStatus } from "@trigger.dev/database";
 import {
   getRunFiltersFromSearchParams,
   TaskRunListSearchFilters,
@@ -39,7 +40,7 @@ export async function getRunFiltersFromRequest(request: Request): Promise<Filter
   return {
     tasks,
     versions,
-    statuses,
+    statuses: statuses as TaskRunStatus[] | undefined,
     tags,
     period,
     bulkId,

apps/webapp/app/presenters/v3/LogsListPresenter.server.ts

@@ -1,11 +1,19 @@
+import { z } from "zod";
 import { type ClickHouse, type LogsListResult } from "@internal/clickhouse";
 import { MachinePresetName } from "@trigger.dev/core/v3";
 import {
   type PrismaClient,
   type PrismaClientOrTransaction,
   type TaskRunStatus,
+  TaskRunStatus as TaskRunStatusEnum,
   TaskTriggerSource,
 } from "@trigger.dev/database";
+
+// Create a schema that validates TaskRunStatus enum values
+const TaskRunStatusSchema = z.array(z.string()).refine(
+  (val) => val.every((v) => Object.values(TaskRunStatusEnum).includes(v)),
+  { message: "Invalid TaskRunStatus values" }
+) as unknown as z.ZodSchema<TaskRunStatus[]>;
 import parseDuration from "parse-duration";
 import { type Direction } from "~/components/ListPagination";
 import { timeFilters } from "~/components/runs/v3/SharedFilters";
@@ -57,6 +65,32 @@ export type LogsListOptions = {
   pageSize?: number;
 };
 
+export const LogsListOptionsSchema = z.object({
+  userId: z.string().optional(),
+  projectId: z.string(),
+  tasks: z.array(z.string()).optional(),
+  versions: z.array(z.string()).optional(),
+  statuses: TaskRunStatusSchema.optional(),
+  tags: z.array(z.string()).optional(),
+  scheduleId: z.string().optional(),
+  period: z.string().optional(),
+  bulkId: z.string().optional(),
+  from: z.number().int().nonnegative().optional(),
+  to: z.number().int().nonnegative().optional(),
+  isTest: z.boolean().optional(),
+  rootOnly: z.boolean().optional(),
+  batchId: z.string().optional(),
+  runId: z.array(z.string()).optional(),
+  queues: z.array(z.string()).optional(),
+  machines: z.array(z.string()).optional(),
+  levels: z.array(z.enum(["TRACE", "DEBUG", "INFO", "WARN", "ERROR", "CANCELLED"])).optional(),
+  search: z.string().max(1000).optional(),
+  includeDebugLogs: z.boolean().optional(),
+  direction: z.enum(["forward", "backward"]).optional(),
+  cursor: z.string().optional(),
+  pageSize: z.number().int().positive().max(1000).optional(),
+});
+
 const DEFAULT_PAGE_SIZE = 50;
 const MAX_RUN_IDS = 5000;
 

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.ts

@@ -5,7 +5,7 @@ import { EnvironmentParamSchema } from "~/utils/pathBuilder";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { getRunFiltersFromRequest } from "~/presenters/RunFilters.server";
-import { LogsListPresenter, type LogLevel } from "~/presenters/v3/LogsListPresenter.server";
+import { LogsListPresenter, type LogLevel, LogsListOptionsSchema } from "~/presenters/v3/LogsListPresenter.server";
 import { $replica } from "~/db.server";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
 
@@ -44,16 +44,19 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const levels = parseLevelsFromUrl(url);
   const showDebug = url.searchParams.get("showDebug") === "true";
 
-  const presenter = new LogsListPresenter($replica, clickhouseClient);
-  const result = await presenter.call(project.organizationId, environment.id, {
+
+  const options = LogsListOptionsSchema.parse({
     userId,
     projectId: project.id,
     ...filters,
     search,
     cursor,
     levels,
     includeDebugLogs: isAdmin && showDebug,
-  });
+  }) as any; // Validated by LogsListOptionsSchema at runtime
+
+  const presenter = new LogsListPresenter($replica, clickhouseClient);
+  const result = await presenter.call(project.organizationId, environment.id, options);
 
   return json({
     logs: result.logs,

apps/webapp/app/utils/logUtils.ts

@@ -107,3 +107,43 @@ export function getLevelColor(level: LogLevel): string {
       return "text-text-dimmed bg-charcoal-750 border-charcoal-700";
   }
 }
+
+// Event kind badge color styles
+export function getKindColor(kind: string): string {
+  if (kind === "SPAN") {
+    return "text-purple-400 bg-purple-500/10 border-purple-500/20";
+  }
+  if (kind === "SPAN_EVENT") {
+    return "text-amber-400 bg-amber-500/10 border-amber-500/20";
+  }
+  if (kind.startsWith("LOG_")) {
+    return "text-blue-400 bg-blue-500/10 border-blue-500/20";
+  }
+  return "text-charcoal-400 bg-charcoal-700 border-charcoal-600";
+}
+
+// Get human readable kind label
+export function getKindLabel(kind: string): string {
+  switch (kind) {
+    case "SPAN":
+      return "Span";
+    case "SPAN_EVENT":
+      return "Event";
+    case "LOG_DEBUG":
+      return "Log";
+    case "LOG_INFO":
+      return "Log";
+    case "LOG_WARN":
+      return "Log";
+    case "LOG_ERROR":
+      return "Log";
+    case "LOG_LOG":
+      return "Log";
+    case "DEBUG_EVENT":
+      return "Debug";
+    case "ANCESTOR_OVERRIDE":
+      return "Override";
+    default:
+      return kind;
+  }
+}