Add triggerSource, concurrencyKey and ttl to run templates

Author: myftija

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

@@ -177,6 +177,7 @@ export class TestTaskPresenter {
       where: {
         projectId,
         taskSlug: task.slug,
+        triggerSource: task.triggerSource,
       },
       orderBy: {
         createdAt: "desc",

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx

@@ -67,7 +67,6 @@ import { TaskRunStatusCombo } from "~/components/runs/v3/TaskRunStatus";
 import { ClockRotateLeftIcon } from "~/assets/icons/ClockRotateLeftIcon";
 import { MachinePresetName } from "@trigger.dev/core/v3";
 import { TaskTriggerSourceIcon } from "~/components/runs/v3/TaskTriggerSource";
-import { Callout } from "~/components/primitives/Callout";
 import { TaskRunTemplateService } from "~/v3/services/taskRunTemplate.server";
 import { DeleteTaskRunTemplateService } from "~/v3/services/deleteTaskRunTemplate.server";
 import { DeleteTaskRunTemplateData, RunTemplateData } from "~/v3/taskRunTemplate";
@@ -277,6 +276,7 @@ export default function Page() {
   }, [queueFetcher.data?.queues, defaultTaskQueue]);
 
   const { triggerSource } = result;
+
   switch (triggerSource) {
     case "STANDARD": {
       return (
@@ -345,7 +345,7 @@ function StandardTaskForm({
       ? actionData
       : undefined;
 
-  const lastRun = runs[0];
+  const lastRun = runs.at(0);
 
   const [defaultPayloadJson, setDefaultPayloadJson] = useState<string>(
     lastRun?.payload ?? startingJson
@@ -443,13 +443,13 @@ function StandardTaskForm({
             onTemplateSelected={(template) => {
               setPayload(template.payload ?? "");
               setMetadata(template.metadata ?? "");
-              // setTtlValue(template.ttlSeconds ?? "");
-              // setConcurrencyKeyValue(template.concurrencyKey ?? "");
+              setTtlValue(template.ttlSeconds ?? 0);
+              setConcurrencyKeyValue(template.concurrencyKey ?? "");
               setMaxAttemptsValue(template.maxAttempts ?? undefined);
-              setMaxDurationValue(template.maxDurationSeconds ?? undefined);
-              setMachineValue(template.machinePreset ?? undefined);
+              setMaxDurationValue(template.maxDurationSeconds ?? 0);
+              setMachineValue(template.machinePreset ?? "");
               setTagsValue(template.tags ?? []);
-              setQueueValue(template.queue);
+              setQueueValue(template.queue ?? undefined);
             }}
             showTemplateCreatedSuccessMessage={showTemplateCreatedSuccessMessage}
           />
@@ -806,18 +806,18 @@ function ScheduledTaskForm({
 }) {
   const environment = useEnvironment();
 
-  const lastRun = runs[0];
+  const lastRun = runs.at(0);
 
   const [timestampValue, setTimestampValue] = useState<Date | undefined>(
-    lastRun.payload.timestamp ?? new Date()
+    lastRun?.payload?.timestamp ?? new Date()
   );
   const [lastTimestampValue, setLastTimestampValue] = useState<Date | undefined>(
-    lastRun.payload.lastTimestamp
+    lastRun?.payload?.lastTimestamp
   );
   const [externalIdValue, setExternalIdValue] = useState<string | undefined>(
-    lastRun.payload.externalId
+    lastRun?.payload?.externalId
   );
-  const [timezoneValue, setTimezoneValue] = useState<string>(lastRun.payload.timezone ?? "UTC");
+  const [timezoneValue, setTimezoneValue] = useState<string>(lastRun?.payload?.timezone ?? "UTC");
   const [ttlValue, setTtlValue] = useState<number | undefined>(lastRun?.ttlSeconds);
   const [concurrencyKeyValue, setConcurrencyKeyValue] = useState<string | undefined>(
     lastRun?.concurrencyKey
@@ -908,13 +908,14 @@ function ScheduledTaskForm({
           <RunTemplatesPopover
             templates={templates}
             onTemplateSelected={(template) => {
-              // setTtlValue(template.ttlSeconds ?? "");
-              // setConcurrencyKeyValue(template.concurrencyKey ?? "");
+              setTtlValue(template.ttlSeconds ?? 0);
+              setConcurrencyKeyValue(template.concurrencyKey ?? "");
               setMaxAttemptsValue(template.maxAttempts ?? undefined);
-              setMaxDurationValue(template.maxDurationSeconds ?? undefined);
-              setMachineValue(template.machinePreset ?? undefined);
+              setMaxDurationValue(template.maxDurationSeconds ?? 0);
+              setMachineValue(template.machinePreset ?? "");
               setTagsValue(template.tags ?? []);
-              setQueueValue(template.queue);
+              setQueueValue(template.queue ?? undefined);
+
               setTimestampValue(template.scheduledTaskPayload?.timestamp);
               setLastTimestampValue(template.scheduledTaskPayload?.lastTimestamp);
               setExternalIdValue(template.scheduledTaskPayload?.externalId);
@@ -1413,7 +1414,7 @@ function RunTemplatesPopover({
                     className="flex-1 text-left outline-none focus-custom"
                   >
                     <div className="flex flex-col items-start">
-                      <Paragraph variant="small" className="truncate">
+                      <Paragraph variant="small/bright" className="truncate">
                         {template.label}
                       </Paragraph>
                       <div className="flex items-center gap-2 text-xs text-text-dimmed">

apps/webapp/app/v3/services/taskRunTemplate.server.ts

@@ -30,13 +30,15 @@ export class TaskRunTemplateService extends BaseService {
         const taskRunTemplate = await this._prisma.taskRunTemplate.create({
           data: {
             taskSlug: data.taskIdentifier,
+            triggerSource: "STANDARD",
             label: data.label,
             payload: packet.data,
             payloadType: packet.dataType,
             metadata: metadataPacket?.data,
             metadataType: metadataPacket?.dataType,
-            queue: data.queue ?? "default",
-            delaySeconds: data.delaySeconds,
+            queue: data.queue,
+            ttlSeconds: data.ttlSeconds,
+            concurrencyKey: data.concurrencyKey,
             maxAttempts: data.maxAttempts,
             maxDurationSeconds: data.maxDurationSeconds,
             tags: data.tags ?? [],
@@ -63,11 +65,13 @@ export class TaskRunTemplateService extends BaseService {
         const taskRunTemplate = await this._prisma.taskRunTemplate.create({
           data: {
             taskSlug: data.taskIdentifier,
+            triggerSource: "SCHEDULED",
             label: data.label,
             payload: payloadPacket.data,
             payloadType: payloadPacket.dataType,
-            queue: data.queue ?? "default",
-            delaySeconds: data.delaySeconds,
+            queue: data.queue,
+            ttlSeconds: data.ttlSeconds,
+            concurrencyKey: data.concurrencyKey,
             maxAttempts: data.maxAttempts,
             maxDurationSeconds: data.maxDurationSeconds,
             tags: data.tags ?? [],

internal-packages/database/prisma/migrations/20250707142736_add_task_run_template_model/migration.sql renamed to internal-packages/database/prisma/migrations/20250709162608_add_task_run_template_model/migration.sql

@@ -1,13 +1,15 @@
 CREATE TABLE "TaskRunTemplate" (
     "id" TEXT NOT NULL,
     "taskSlug" TEXT NOT NULL,
+    "triggerSource" "TaskTriggerSource" NOT NULL,
     "label" TEXT NOT NULL,
     "payload" TEXT,
     "payloadType" TEXT NOT NULL DEFAULT 'application/json',
     "metadata" TEXT,
     "metadataType" TEXT NOT NULL DEFAULT 'application/json',
-    "queue" TEXT NOT NULL,
-    "delaySeconds" INTEGER,
+    "queue" TEXT,
+    "concurrencyKey" TEXT,
+    "ttlSeconds" INTEGER,
     "maxAttempts" INTEGER,
     "maxDurationSeconds" INTEGER,
     "tags" TEXT[],
@@ -20,4 +22,4 @@ CREATE TABLE "TaskRunTemplate" (
     CONSTRAINT "TaskRunTemplate_pkey" PRIMARY KEY ("id")
 );
 
-CREATE INDEX "TaskRunTemplate_projectId_taskSlug_createdAt_idx" ON "TaskRunTemplate"("projectId", "taskSlug", "createdAt" DESC);
+CREATE INDEX "TaskRunTemplate_projectId_taskSlug_triggerSource_createdAt_idx" ON "TaskRunTemplate"("projectId", "taskSlug", "triggerSource", "createdAt" DESC);

internal-packages/database/prisma/schema.prisma

@@ -720,15 +720,17 @@ model TaskRunTemplate {
   id String @id @default(cuid())
 
   taskSlug String
+  triggerSource TaskTriggerSource
 
   label String
 
   payload      String?
   payloadType  String @default("application/json")
   metadata        String?
   metadataType    String  @default("application/json")
-  queue String
-  delaySeconds Int?
+  queue String?
+  concurrencyKey String?
+  ttlSeconds Int?
   maxAttempts Int?
   maxDurationSeconds Int?
   tags String[]
@@ -740,7 +742,7 @@ model TaskRunTemplate {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  @@index([projectId, taskSlug, createdAt(sort: Desc)])
+  @@index([projectId, taskSlug, triggerSource, createdAt(sort: Desc)])
 }
 
 enum TaskRunStatus {