Made the existing waitpoint list presenter more flexible

Author: matt-aitken

apps/webapp/app/presenters/v3/ApiWaitpointTokenListPresenter.server.ts renamed to apps/webapp/app/presenters/v3/ApiWaitpointListPresenter.server.ts

@@ -1,16 +1,12 @@
-import { RuntimeEnvironmentType, WaitpointTokenStatus } from "@trigger.dev/core/v3";
+import { type RuntimeEnvironmentType, WaitpointTokenStatus } from "@trigger.dev/core/v3";
+import { type RunEngineVersion, type WaitpointResolver } from "@trigger.dev/database";
 import { z } from "zod";
-import { BasePresenter } from "./basePresenter.server";
 import { CoercedDate } from "~/utils/zod";
-import { AuthenticatedEnvironment } from "@internal/run-engine";
-import {
-  WaitpointTokenListOptions,
-  WaitpointTokenListPresenter,
-} from "./WaitpointTokenListPresenter.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
-import { RunEngineVersion } from "@trigger.dev/database";
+import { BasePresenter } from "./basePresenter.server";
+import { type WaitpointListOptions, WaitpointListPresenter } from "./WaitpointListPresenter.server";
 
-export const ApiWaitpointTokenListSearchParams = z.object({
+export const ApiWaitpointListSearchParams = z.object({
   "page[size]": z.coerce.number().int().positive().min(1).max(100).optional(),
   "page[after]": z.string().optional(),
   "page[before]": z.string().optional(),
@@ -61,9 +57,9 @@ export const ApiWaitpointTokenListSearchParams = z.object({
   "filter[createdAt][to]": CoercedDate,
 });
 
-type ApiWaitpointTokenListSearchParams = z.infer<typeof ApiWaitpointTokenListSearchParams>;
+type ApiWaitpointListSearchParams = z.infer<typeof ApiWaitpointListSearchParams>;
 
-export class ApiWaitpointTokenListPresenter extends BasePresenter {
+export class ApiWaitpointListPresenter extends BasePresenter {
   public async call(
     environment: {
       id: string;
@@ -73,11 +69,13 @@ export class ApiWaitpointTokenListPresenter extends BasePresenter {
         engine: RunEngineVersion;
       };
     },
-    searchParams: ApiWaitpointTokenListSearchParams
+    resolver: WaitpointResolver,
+    searchParams: ApiWaitpointListSearchParams
   ) {
     return this.trace("call", async (span) => {
-      const options: WaitpointTokenListOptions = {
+      const options: WaitpointListOptions = {
         environment,
+        resolver,
       };
 
       if (searchParams["page[size]"]) {
@@ -118,7 +116,7 @@ export class ApiWaitpointTokenListPresenter extends BasePresenter {
         options.to = searchParams["filter[createdAt][to]"].getTime();
       }
 
-      const presenter = new WaitpointTokenListPresenter();
+      const presenter = new WaitpointListPresenter();
       const result = await presenter.call(options);
 
       if (!result.success) {

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

@@ -3,7 +3,7 @@ import { type RunEngineVersion } from "@trigger.dev/database";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { BasePresenter } from "./basePresenter.server";
 import { WaitpointPresenter } from "./WaitpointPresenter.server";
-import { waitpointStatusToApiStatus } from "./WaitpointTokenListPresenter.server";
+import { waitpointStatusToApiStatus } from "./WaitpointListPresenter.server";
 
 export class ApiWaitpointPresenter extends BasePresenter {
   public async call(

apps/webapp/app/presenters/v3/WaitpointTokenListPresenter.server.ts renamed to apps/webapp/app/presenters/v3/WaitpointListPresenter.server.ts

@@ -1,6 +1,7 @@
 import parse from "parse-duration";
 import {
   Prisma,
+  type WaitpointResolver,
   type RunEngineVersion,
   type RuntimeEnvironmentType,
   type WaitpointStatus,
@@ -14,7 +15,7 @@ import { type WaitpointTokenStatus, type WaitpointTokenItem } from "@trigger.dev
 
 const DEFAULT_PAGE_SIZE = 25;
 
-export type WaitpointTokenListOptions = {
+export type WaitpointListOptions = {
   environment: {
     id: string;
     type: RuntimeEnvironmentType;
@@ -23,6 +24,7 @@ export type WaitpointTokenListOptions = {
       engine: RunEngineVersion;
     };
   };
+  resolver: WaitpointResolver;
   // filters
   id?: string;
   statuses?: WaitpointTokenStatus[];
@@ -63,9 +65,10 @@ type Result =
       filters: undefined;
     };
 
-export class WaitpointTokenListPresenter extends BasePresenter {
+export class WaitpointListPresenter extends BasePresenter {
   public async call({
     environment,
+    resolver,
     id,
     statuses,
     idempotencyKey,
@@ -76,7 +79,7 @@ export class WaitpointTokenListPresenter extends BasePresenter {
     direction = "forward",
     cursor,
     pageSize = DEFAULT_PAGE_SIZE,
-  }: WaitpointTokenListOptions): Promise<Result> {
+  }: WaitpointListOptions): Promise<Result> {
     const engineVersion = await determineEngineVersion({ environment });
     if (engineVersion === "V1") {
       return {
@@ -165,7 +168,7 @@ export class WaitpointTokenListPresenter extends BasePresenter {
       ${sqlDatabaseSchema}."Waitpoint" w
     WHERE
       w."environmentId" = ${environment.id}
-      AND w.resolver = 'TOKEN'
+      AND w.resolver = ${resolver}::"WaitpointResolver"
       -- cursor
       ${
         cursor
@@ -250,7 +253,7 @@ export class WaitpointTokenListPresenter extends BasePresenter {
       const firstToken = await this._replica.waitpoint.findFirst({
         where: {
           environmentId: environment.id,
-          resolver: "TOKEN",
+          resolver,
         },
       });
 

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

@@ -2,7 +2,7 @@ import { isWaitpointOutputTimeout, prettyPrintPacket } from "@trigger.dev/core/v
 import { logger } from "~/services/logger.server";
 import { BasePresenter } from "./basePresenter.server";
 import { type RunListItem, RunListPresenter } from "./RunListPresenter.server";
-import { waitpointStatusToApiStatus } from "./WaitpointTokenListPresenter.server";
+import { waitpointStatusToApiStatus } from "./WaitpointListPresenter.server";
 
 export type WaitpointDetail = NonNullable<Awaited<ReturnType<WaitpointPresenter["call"]>>>;
 

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

@@ -36,7 +36,7 @@ import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
-import { WaitpointTokenListPresenter } from "~/presenters/v3/WaitpointTokenListPresenter.server";
+import { WaitpointListPresenter } from "~/presenters/v3/WaitpointListPresenter.server";
 import { requireUserId } from "~/services/session.server";
 import { docsPath, EnvironmentParamSchema, v3WaitpointTokenPath } from "~/utils/pathBuilder";
 
@@ -84,9 +84,10 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   }
 
   try {
-    const presenter = new WaitpointTokenListPresenter();
+    const presenter = new WaitpointListPresenter();
     const result = await presenter.call({
       environment,
+      resolver: "TOKEN",
       ...searchParams,
     });
 

apps/webapp/app/routes/api.v1.waitpoints.tokens.ts

@@ -6,27 +6,27 @@ import {
 import { WaitpointId } from "@trigger.dev/core/v3/isomorphic";
 import { createWaitpointTag, MAX_TAGS_PER_WAITPOINT } from "~/models/waitpointTag.server";
 import {
-  ApiWaitpointTokenListPresenter,
-  ApiWaitpointTokenListSearchParams,
-} from "~/presenters/v3/ApiWaitpointTokenListPresenter.server";
+  ApiWaitpointListPresenter,
+  ApiWaitpointListSearchParams,
+} from "~/presenters/v3/ApiWaitpointListPresenter.server";
+import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import {
   createActionApiRoute,
   createLoaderApiRoute,
 } from "~/services/routeBuilders/apiBuilder.server";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { parseDelay } from "~/utils/delays";
 import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";
 import { engine } from "~/v3/runEngine.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 
 export const loader = createLoaderApiRoute(
   {
-    searchParams: ApiWaitpointTokenListSearchParams,
+    searchParams: ApiWaitpointListSearchParams,
     findResource: async () => 1, // This is a dummy function, we don't need to find a resource
   },
   async ({ searchParams, authentication }) => {
-    const presenter = new ApiWaitpointTokenListPresenter();
-    const result = await presenter.call(authentication.environment, searchParams);
+    const presenter = new ApiWaitpointListPresenter();
+    const result = await presenter.call(authentication.environment, "TOKEN", searchParams);
 
     return json(result);
   }