Don't cast the machine preset

Author: matt-aitken

apps/webapp/app/components/runs/v3/TaskRunsTable.tsx

@@ -386,7 +386,7 @@ export function TaskRunsTable({
                   </TableCell>
                 )}
                 <TableCell to={path}>
-                  <MachineLabelCombo preset={run.machinePreset as MachinePresetName} />
+                  <MachineLabelCombo preset={run.machinePreset} />
                 </TableCell>
                 <TableCell to={path}>
                   {run.isTest ? <CheckIcon className="size-4 text-charcoal-400" /> : "–"}

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

@@ -9,6 +9,7 @@ import { timeFilters } from "~/components/runs/v3/SharedFilters";
 import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
 import { getAllTaskIdentifiers } from "~/models/task.server";
 import { RunsRepository } from "~/services/runsRepository.server";
+import { machinePresetFromRun } from "~/v3/machinePresets.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { isCancellableRunStatus, isFinalRunStatus, isPendingRunStatus } from "~/v3/taskStatus";
 
@@ -231,7 +232,7 @@ export class NextRunListPresenter {
           rootTaskRunId: run.rootTaskRunId,
           metadata: run.metadata,
           metadataType: run.metadataType,
-          machinePreset: run.machinePreset,
+          machinePreset: run.machinePreset ? machinePresetFromRun(run)?.name : undefined,
         };
       }),
       pagination: {

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

@@ -8,7 +8,7 @@ import { getMaxDuration } from "@trigger.dev/core/v3/isomorphic";
 import { RUNNING_STATUSES } from "~/components/runs/v3/TaskRunStatus";
 import { logger } from "~/services/logger.server";
 import { eventRepository, rehydrateAttribute } from "~/v3/eventRepository.server";
-import { machinePresetFromName } from "~/v3/machinePresets.server";
+import { machinePresetFromName, machinePresetFromRun } from "~/v3/machinePresets.server";
 import { getTaskEventStoreTableForRun, type TaskEventStoreTable } from "~/v3/taskEventStore.server";
 import { isFailedRunStatus, isFinalRunStatus } from "~/v3/taskStatus";
 import { BasePresenter } from "./basePresenter.server";
@@ -269,6 +269,8 @@ export class SpanPresenter extends BasePresenter {
         })
       : undefined;
 
+    const machine = run.machinePreset ? machinePresetFromRun(run) : undefined;
+
     const context = {
       task: {
         id: run.taskIdentifier,
@@ -307,9 +309,7 @@ export class SpanPresenter extends BasePresenter {
         slug: run.project.slug,
         name: run.project.name,
       },
-      machine: run.machinePreset
-        ? machinePresetFromName(run.machinePreset as MachinePresetName)
-        : undefined,
+      machine,
     };
 
     return {
@@ -372,7 +372,7 @@ export class SpanPresenter extends BasePresenter {
       workerQueue: run.workerQueue,
       spanId: run.spanId,
       isCached: !!span.originalRun,
-      machinePreset: run.machinePreset,
+      machinePreset: machine?.name,
     };
   }
 

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx

@@ -693,7 +693,7 @@ function RunBody({
                     </span>
                   </Property.Label>
                   <Property.Value className="-ml-0.5">
-                    <MachineLabelCombo preset={run.machinePreset as MachinePresetName} />
+                    <MachineLabelCombo preset={run.machinePreset} />
                   </Property.Value>
                 </Property.Item>
                 <Property.Item>

apps/webapp/app/routes/resources.runs.$runParam.ts

@@ -5,7 +5,7 @@ import { RUNNING_STATUSES } from "~/components/runs/v3/TaskRunStatus";
 import { $replica } from "~/db.server";
 import { requireUserId } from "~/services/session.server";
 import { v3RunParamsSchema } from "~/utils/pathBuilder";
-import { machinePresetFromName } from "~/v3/machinePresets.server";
+import { machinePresetFromName, machinePresetFromRun } from "~/v3/machinePresets.server";
 import { FINAL_ATTEMPT_STATUSES, isFinalRunStatus } from "~/v3/taskStatus";
 
 export type RunInspectorData = UseDataFunctionReturn<typeof loader>;
@@ -183,9 +183,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       slug: run.project.slug,
       name: run.project.name,
     },
-    machine: run.machinePreset
-      ? machinePresetFromName(run.machinePreset as MachinePresetName)
-      : undefined,
+    machine: run.machinePreset ? machinePresetFromRun(run) : undefined,
   };
 
   return typedjson({