New PENDING_VERSION system which now requires queues to exist at dequeue time

Author: ericallam

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

@@ -21,6 +21,7 @@ import { cn } from "~/utils/cn";
 export const allTaskRunStatuses = [
   "DELAYED",
   "WAITING_FOR_DEPLOY",
+  "PENDING_VERSION",
   "PENDING",
   "EXECUTING",
   "RETRYING_AFTER_FAILURE",
@@ -37,7 +38,7 @@ export const allTaskRunStatuses = [
 ] as const satisfies Readonly<Array<TaskRunStatus>>;
 
 export const filterableTaskRunStatuses = [
-  "WAITING_FOR_DEPLOY",
+  "PENDING_VERSION",
   "DELAYED",
   "PENDING",
   "WAITING_TO_RESUME",
@@ -56,7 +57,10 @@ export const filterableTaskRunStatuses = [
 const taskRunStatusDescriptions: Record<TaskRunStatus, string> = {
   DELAYED: "Task has been delayed and is waiting to be executed.",
   PENDING: "Task is waiting to be executed.",
-  WAITING_FOR_DEPLOY: "Task needs to be deployed first to start executing.",
+  PENDING_VERSION:
+    "Task is waiting for a version update because it cannot execute without additional information (task, queue, etc.).",
+  WAITING_FOR_DEPLOY:
+    "Task is waiting for a version update because it cannot execute without additional information (task, queue, etc.).",
   EXECUTING: "Task is currently being executed.",
   RETRYING_AFTER_FAILURE: "Task is being reattempted after a failure.",
   WAITING_TO_RESUME: `You have used a "wait" function. When the wait is complete, the task will resume execution.`,
@@ -73,6 +77,7 @@ const taskRunStatusDescriptions: Record<TaskRunStatus, string> = {
 
 export const QUEUED_STATUSES = [
   "PENDING",
+  "PENDING_VERSION",
   "WAITING_FOR_DEPLOY",
   "DELAYED",
 ] satisfies TaskRunStatus[];
@@ -120,6 +125,7 @@ export function TaskRunStatusIcon({
       return <ClockIcon className={cn(runStatusClassNameColor(status), className)} />;
     case "PENDING":
       return <RectangleStackIcon className={cn(runStatusClassNameColor(status), className)} />;
+    case "PENDING_VERSION":
     case "WAITING_FOR_DEPLOY":
       return <RectangleStackIcon className={cn(runStatusClassNameColor(status), className)} />;
     case "EXECUTING":
@@ -158,6 +164,7 @@ export function runStatusClassNameColor(status: TaskRunStatus): string {
     case "PENDING":
     case "DELAYED":
       return "text-charcoal-500";
+    case "PENDING_VERSION":
     case "WAITING_FOR_DEPLOY":
       return "text-amber-500";
     case "EXECUTING":
@@ -194,8 +201,9 @@ export function runStatusTitle(status: TaskRunStatus): string {
       return "Delayed";
     case "PENDING":
       return "Queued";
+    case "PENDING_VERSION":
     case "WAITING_FOR_DEPLOY":
-      return "Waiting for deploy";
+      return "Pending version";
     case "EXECUTING":
       return "Executing";
     case "WAITING_TO_RESUME":

apps/webapp/app/database-types.ts

@@ -29,6 +29,7 @@ export const TaskRunAttemptStatus = {
 
 export const TaskRunStatus = {
   PENDING: "PENDING",
+  PENDING_VERSION: "PENDING_VERSION",
   WAITING_FOR_DEPLOY: "WAITING_FOR_DEPLOY",
   EXECUTING: "EXECUTING",
   WAITING_TO_RESUME: "WAITING_TO_RESUME",

apps/webapp/app/hooks/useFilterTasks.ts

@@ -4,7 +4,6 @@ type Task = {
   id: string;
   friendlyId: string;
   taskIdentifier: string;
-  exportName: string;
   filePath: string;
   triggerSource: string;
 };
@@ -17,10 +16,6 @@ export function useFilterTasks<T extends Task>({ tasks }: { tasks: T[] }) {
         return true;
       }
 
-      if (task.exportName.toLowerCase().includes(text.toLowerCase())) {
-        return true;
-      }
-
       if (task.filePath.toLowerCase().includes(text.toLowerCase())) {
         return true;
       }

apps/webapp/app/models/taskQueue.server.ts

@@ -1,4 +1,4 @@
-import { QueueOptions } from "@trigger.dev/core/v3/schemas";
+import { QueueManifest } from "@trigger.dev/core/v3/schemas";
 import { TaskQueue } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
 
@@ -35,7 +35,7 @@ export async function findQueueInEnvironment(
     return;
   }
 
-  const queueConfig = QueueOptions.safeParse(task.queueConfig);
+  const queueConfig = QueueManifest.safeParse(task.queueConfig);
 
   if (queueConfig.success) {
     const taskQueueName = queueConfig.data.name

apps/webapp/app/models/taskRun.server.ts

@@ -125,6 +125,7 @@ export function batchTaskRunItemStatusForRunStatus(
     case TaskRunStatus.TIMED_OUT:
       return BatchTaskRunItemStatus.FAILED;
     case TaskRunStatus.PENDING:
+    case TaskRunStatus.PENDING_VERSION:
     case TaskRunStatus.WAITING_FOR_DEPLOY:
     case TaskRunStatus.WAITING_TO_RESUME:
     case TaskRunStatus.RETRYING_AFTER_FAILURE:

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

@@ -204,6 +204,9 @@ export class ApiRetrieveRunPresenter extends BasePresenter {
       case "DELAYED": {
         return "DELAYED";
       }
+      case "PENDING_VERSION": {
+        return "PENDING_VERSION";
+      }
       case "WAITING_FOR_DEPLOY": {
         return "WAITING_FOR_DEPLOY";
       }
@@ -257,7 +260,11 @@ export class ApiRetrieveRunPresenter extends BasePresenter {
   }
 
   static apiBooleanHelpersFromRunStatus(status: RunStatus) {
-    const isQueued = status === "QUEUED" || status === "WAITING_FOR_DEPLOY" || status === "DELAYED";
+    const isQueued =
+      status === "QUEUED" ||
+      status === "WAITING_FOR_DEPLOY" ||
+      status === "DELAYED" ||
+      status === "PENDING_VERSION";
     const isExecuting = status === "EXECUTING" || status === "REATTEMPTING" || status === "FROZEN";
     const isCompleted =
       status === "COMPLETED" ||

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

@@ -280,6 +280,9 @@ export class ApiRunListPresenter extends BasePresenter {
     switch (status) {
       case "DELAYED":
         return "DELAYED";
+      case "PENDING_VERSION": {
+        return "PENDING_VERSION";
+      }
       case "WAITING_FOR_DEPLOY": {
         return "WAITING_FOR_DEPLOY";
       }

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

@@ -21,7 +21,7 @@ type Task = {
   id: string;
   taskIdentifier: string;
   filePath: string;
-  exportName: string;
+  exportName?: string;
   friendlyId: string;
 };
 
@@ -151,7 +151,6 @@ export class TestTaskPresenter {
       id: task.id,
       taskIdentifier: task.slug,
       filePath: task.filePath,
-      exportName: task.exportName,
       friendlyId: task.friendlyId,
     };
 

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

@@ -507,7 +507,7 @@ function TaskActivityGraph({ activity }: { activity: TaskActivity }) {
           isAnimationActive={false}
         />
         <Bar dataKey="PENDING" fill="#5F6570" stackId="a" strokeWidth={0} barSize={10} />
-        <Bar dataKey="WAITING_FOR_DEPLOY" fill="#F59E0B" stackId="a" strokeWidth={0} barSize={10} />
+        <Bar dataKey="PENDING_VERSION" fill="#F59E0B" stackId="a" strokeWidth={0} barSize={10} />
         <Bar dataKey="EXECUTING" fill="#3B82F6" stackId="a" strokeWidth={0} barSize={10} />
         <Bar
           dataKey="RETRYING_AFTER_FAILURE"

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx

@@ -236,11 +236,6 @@ export default function Page() {
                       <TableRow key={t.slug}>
                         <TableCell>
                           <div className="inline-flex flex-col gap-0.5">
-                            <TaskFunctionName
-                              variant="extra-small"
-                              functionName={t.exportName}
-                              className="-ml-1 inline-flex"
-                            />
                             <Paragraph variant="extra-small" className="text-text-dimmed">
                               {t.slug}
                             </Paragraph>