WIP stripping right back to waitpoints just having a URL associated with them…

Author: matt-aitken

apps/webapp/app/assets/icons/HttpCallbackIcon.tsx

@@ -36,7 +36,6 @@ import { TextLink } from "./primitives/TextLink";
 import { InitCommandV3, PackageManagerProvider, TriggerDevStepV3 } from "./SetupCommands";
 import { StepContentContainer } from "./StepContentContainer";
 import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
-import { HttpCallbackIcon } from "~/assets/icons/HttpCallbackIcon";
 
 export function HasNoTasksDev() {
   return (
@@ -432,33 +431,6 @@ export function NoWaitpointTokens() {
   );
 }
 
-export function NoHttpCallbacks() {
-  return (
-    <InfoPanel
-      title="You don't have any HTTP callbacks"
-      icon={HttpCallbackIcon}
-      iconClassName="text-teal-500"
-      panelClassName="max-w-md"
-      accessory={
-        <LinkButton
-          to={docsPath("wait-for-http-callback")}
-          variant="docs/small"
-          LeadingIcon={BookOpenIcon}
-        >
-          Waitpoint docs
-        </LinkButton>
-      }
-    >
-      <Paragraph spacing variant="small">
-        HTTP callbacks are used to pause runs until an HTTP request is made to a provided URL.
-      </Paragraph>
-      <Paragraph spacing variant="small">
-        They are useful when using APIs that provide a callback URL. You can send the URL to them
-        and when they callback your run will continue.
-      </Paragraph>
-    </InfoPanel>
-  );
-}
 function SwitcherPanel() {
   const organization = useOrganization();
   const project = useProject();

apps/webapp/app/components/BlankStatePanels.tsx

@@ -54,7 +54,6 @@ import {
   v3SchedulesPath,
   v3TestPath,
   v3UsagePath,
-  v3WaitpointHttpCallbacksPath,
   v3WaitpointTokensPath,
 } from "~/utils/pathBuilder";
 import { useKapaWidget } from "../../hooks/useKapaWidget";
@@ -247,12 +246,6 @@ export function SideMenu({
               activeIconColor="text-sky-500"
               to={v3WaitpointTokensPath(organization, project, environment)}
             />
-            <SideMenuItem
-              name="HTTP callbacks"
-              icon={HttpCallbackIcon}
-              activeIconColor="text-teal-500"
-              to={v3WaitpointHttpCallbacksPath(organization, project, environment)}
-            />
           </SideMenuSection>
 
           <SideMenuSection title="Manage">

apps/webapp/app/components/navigation/SideMenu.tsx

@@ -19,7 +19,6 @@ import { FunctionIcon } from "~/assets/icons/FunctionIcon";
 import { TriggerIcon } from "~/assets/icons/TriggerIcon";
 import { PythonLogoIcon } from "~/assets/icons/PythonLogoIcon";
 import { TraceIcon } from "~/assets/icons/TraceIcon";
-import { HttpCallbackIcon } from "~/assets/icons/HttpCallbackIcon";
 import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
 
 type TaskIconProps = {
@@ -77,8 +76,6 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
       return <TriggerIcon className={cn(className, "text-orange-500")} />;
     case "python":
       return <PythonLogoIcon className={className} />;
-    case "wait-http-callback":
-      return <HttpCallbackIcon className={cn(className, "text-teal-500")} />;
     case "wait-token":
       return <WaitpointTokenIcon className={cn(className, "text-sky-500")} />;
     case "function":

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

@@ -7,19 +7,11 @@ import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { type WaitpointDetail } from "~/presenters/v3/WaitpointPresenter.server";
 import { ForceTimeout } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route";
-import {
-  v3WaitpointHttpCallbackPath,
-  v3WaitpointTokenPath,
-  v3WaitpointTokensPath,
-} from "~/utils/pathBuilder";
+import { v3WaitpointTokenPath, v3WaitpointTokensPath } from "~/utils/pathBuilder";
 import { PacketDisplay } from "./PacketDisplay";
 import { WaitpointStatusCombo } from "./WaitpointStatus";
 import { RunTag } from "./RunTag";
-import { CopyableText } from "~/components/primitives/CopyableText";
 import { ClipboardField } from "~/components/primitives/ClipboardField";
-import { WaitpointResolver } from "@trigger.dev/database";
-import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
-import { HttpCallbackIcon } from "~/assets/icons/HttpCallbackIcon";
 
 export function WaitpointDetailTable({
   waitpoint,
@@ -48,15 +40,9 @@ export function WaitpointDetailTable({
         <Property.Value className="whitespace-pre-wrap">
           {linkToList ? (
             <TextLink
-              to={
-                waitpoint.resolver === "TOKEN"
-                  ? v3WaitpointTokenPath(organization, project, environment, waitpoint, {
-                      id: waitpoint.id,
-                    })
-                  : v3WaitpointHttpCallbackPath(organization, project, environment, waitpoint, {
-                      id: waitpoint.id,
-                    })
-              }
+              to={v3WaitpointTokenPath(organization, project, environment, waitpoint, {
+                id: waitpoint.id,
+              })}
             >
               {waitpoint.id}
             </TextLink>
@@ -66,19 +52,11 @@ export function WaitpointDetailTable({
         </Property.Value>
       </Property.Item>
       <Property.Item>
-        <Property.Label>Type</Property.Label>
-        <Property.Value>
-          <WaitpointResolverCombo resolver={waitpoint.resolver} />
+        <Property.Label>Callback URL</Property.Label>
+        <Property.Value className="my-1">
+          <ClipboardField value={waitpoint.callbackUrl} variant={"secondary/small"} />
         </Property.Value>
       </Property.Item>
-      {waitpoint.callbackUrl && (
-        <Property.Item>
-          <Property.Label>Callback URL</Property.Label>
-          <Property.Value className="my-1">
-            <ClipboardField value={waitpoint.callbackUrl} variant={"secondary/small"} />
-          </Property.Value>
-        </Property.Item>
-      )}
       <Property.Item>
         <Property.Label>Idempotency key</Property.Label>
         <Property.Value>
@@ -157,22 +135,3 @@ export function WaitpointDetailTable({
     </Property.Table>
   );
 }
-
-export function WaitpointResolverCombo({ resolver }: { resolver: WaitpointResolver }) {
-  switch (resolver) {
-    case "TOKEN":
-      return (
-        <div className="flex items-center gap-1">
-          <WaitpointTokenIcon className="size-4" />
-          <span>Token</span>
-        </div>
-      );
-    case "HTTP_CALLBACK":
-      return (
-        <div className="flex items-center gap-1">
-          <HttpCallbackIcon className="size-4" />
-          <span>HTTP Callback</span>
-        </div>
-      );
-  }
-}

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

@@ -70,13 +70,11 @@ export class ApiWaitpointListPresenter extends BasePresenter {
       };
       apiKey: string;
     },
-    resolver: WaitpointResolver,
     searchParams: ApiWaitpointListSearchParams
   ) {
     return this.trace("call", async (span) => {
       const options: WaitpointListOptions = {
         environment,
-        resolver,
       };
 
       if (searchParams["page[size]"]) {

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

@@ -26,7 +26,6 @@ export type WaitpointListOptions = {
     };
     apiKey: string;
   };
-  resolver: WaitpointResolver;
   // filters
   id?: string;
   statuses?: WaitpointTokenStatus[];
@@ -70,7 +69,6 @@ type Result =
 export class WaitpointListPresenter extends BasePresenter {
   public async call({
     environment,
-    resolver,
     id,
     statuses,
     idempotencyKey,
@@ -170,8 +168,8 @@ export class WaitpointListPresenter extends BasePresenter {
       ${sqlDatabaseSchema}."Waitpoint" w
     WHERE
       w."environmentId" = ${environment.id}
-      AND w.resolver = ${resolver}::"WaitpointResolver"
-      -- cursor
+    AND w.type = 'MANUAL'      
+    -- cursor
       ${
         cursor
           ? direction === "forward"
@@ -255,7 +253,7 @@ export class WaitpointListPresenter extends BasePresenter {
       const firstToken = await this._replica.waitpoint.findFirst({
         where: {
           environmentId: environment.id,
-          resolver,
+          type: "MANUAL",
         },
       });
 

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

@@ -39,7 +39,6 @@ export class WaitpointPresenter extends BasePresenter {
         completedAfter: true,
         completedAt: true,
         createdAt: true,
-        resolver: true,
         connectedRuns: {
           select: {
             friendlyId: true,
@@ -93,11 +92,7 @@ export class WaitpointPresenter extends BasePresenter {
     return {
       id: waitpoint.friendlyId,
       type: waitpoint.type,
-      resolver: waitpoint.resolver,
-      callbackUrl:
-        waitpoint.resolver === "HTTP_CALLBACK"
-          ? generateHttpCallbackUrl(waitpoint.id, waitpoint.environment.apiKey)
-          : undefined,
+      callbackUrl: generateHttpCallbackUrl(waitpoint.id, waitpoint.environment.apiKey),
       status: waitpointStatusToApiStatus(waitpoint.status, waitpoint.outputIsError),
       idempotencyKey: waitpoint.idempotencyKey,
       userProvidedIdempotencyKey: waitpoint.userProvidedIdempotencyKey,