Skip to content

Commit 7ff3a63

Browse files
committed
Don't cast the machine preset
1 parent d1ec2ba commit 7ff3a63

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ export function TaskRunsTable({
386386
</TableCell>
387387
)}
388388
<TableCell to={path}>
389-
<MachineLabelCombo preset={run.machinePreset as MachinePresetName} />
389+
<MachineLabelCombo preset={run.machinePreset} />
390390
</TableCell>
391391
<TableCell to={path}>
392392
{run.isTest ? <CheckIcon className="size-4 text-charcoal-400" /> : "–"}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { timeFilters } from "~/components/runs/v3/SharedFilters";
99
import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
1010
import { getAllTaskIdentifiers } from "~/models/task.server";
1111
import { RunsRepository } from "~/services/runsRepository.server";
12+
import { machinePresetFromRun } from "~/v3/machinePresets.server";
1213
import { ServiceValidationError } from "~/v3/services/baseService.server";
1314
import { isCancellableRunStatus, isFinalRunStatus, isPendingRunStatus } from "~/v3/taskStatus";
1415

@@ -231,7 +232,7 @@ export class NextRunListPresenter {
231232
rootTaskRunId: run.rootTaskRunId,
232233
metadata: run.metadata,
233234
metadataType: run.metadataType,
234-
machinePreset: run.machinePreset,
235+
machinePreset: run.machinePreset ? machinePresetFromRun(run)?.name : undefined,
235236
};
236237
}),
237238
pagination: {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { getMaxDuration } from "@trigger.dev/core/v3/isomorphic";
88
import { RUNNING_STATUSES } from "~/components/runs/v3/TaskRunStatus";
99
import { logger } from "~/services/logger.server";
1010
import { eventRepository, rehydrateAttribute } from "~/v3/eventRepository.server";
11-
import { machinePresetFromName } from "~/v3/machinePresets.server";
11+
import { machinePresetFromName, machinePresetFromRun } from "~/v3/machinePresets.server";
1212
import { getTaskEventStoreTableForRun, type TaskEventStoreTable } from "~/v3/taskEventStore.server";
1313
import { isFailedRunStatus, isFinalRunStatus } from "~/v3/taskStatus";
1414
import { BasePresenter } from "./basePresenter.server";
@@ -269,6 +269,8 @@ export class SpanPresenter extends BasePresenter {
269269
})
270270
: undefined;
271271

272+
const machine = run.machinePreset ? machinePresetFromRun(run) : undefined;
273+
272274
const context = {
273275
task: {
274276
id: run.taskIdentifier,
@@ -307,9 +309,7 @@ export class SpanPresenter extends BasePresenter {
307309
slug: run.project.slug,
308310
name: run.project.name,
309311
},
310-
machine: run.machinePreset
311-
? machinePresetFromName(run.machinePreset as MachinePresetName)
312-
: undefined,
312+
machine,
313313
};
314314

315315
return {
@@ -372,7 +372,7 @@ export class SpanPresenter extends BasePresenter {
372372
workerQueue: run.workerQueue,
373373
spanId: run.spanId,
374374
isCached: !!span.originalRun,
375-
machinePreset: run.machinePreset,
375+
machinePreset: machine?.name,
376376
};
377377
}
378378

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ function RunBody({
693693
</span>
694694
</Property.Label>
695695
<Property.Value className="-ml-0.5">
696-
<MachineLabelCombo preset={run.machinePreset as MachinePresetName} />
696+
<MachineLabelCombo preset={run.machinePreset} />
697697
</Property.Value>
698698
</Property.Item>
699699
<Property.Item>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { RUNNING_STATUSES } from "~/components/runs/v3/TaskRunStatus";
55
import { $replica } from "~/db.server";
66
import { requireUserId } from "~/services/session.server";
77
import { v3RunParamsSchema } from "~/utils/pathBuilder";
8-
import { machinePresetFromName } from "~/v3/machinePresets.server";
8+
import { machinePresetFromName, machinePresetFromRun } from "~/v3/machinePresets.server";
99
import { FINAL_ATTEMPT_STATUSES, isFinalRunStatus } from "~/v3/taskStatus";
1010

1111
export type RunInspectorData = UseDataFunctionReturn<typeof loader>;
@@ -183,9 +183,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
183183
slug: run.project.slug,
184184
name: run.project.name,
185185
},
186-
machine: run.machinePreset
187-
? machinePresetFromName(run.machinePreset as MachinePresetName)
188-
: undefined,
186+
machine: run.machinePreset ? machinePresetFromRun(run) : undefined,
189187
};
190188

191189
return typedjson({

0 commit comments

Comments
 (0)