Apply some good 🐰 suggestions

Author: myftija

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

@@ -594,7 +594,7 @@ function CancelDeploymentDialog({
 }: RollbackDeploymentDialogProps) {
   const navigation = useNavigation();
 
-  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/promote`;
+  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/cancel`;
   const isLoading = navigation.formAction === formAction;
 
   return (
@@ -605,10 +605,7 @@ function CancelDeploymentDialog({
         <DialogClose asChild>
           <Button variant="tertiary/medium">Back</Button>
         </DialogClose>
-        <Form
-          action={`/resources/${projectId}/deployments/${deploymentShortCode}/cancel`}
-          method="post"
-        >
+        <Form action={formAction} method="post">
           <Button
             type="submit"
             name="redirectUrl"

apps/webapp/app/routes/api.v1.deployments.$deploymentId.cancel.ts

@@ -1,5 +1,5 @@
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
-import { CancelDeploymentRequestBody } from "@trigger.dev/core/v3";
+import { CancelDeploymentRequestBody, tryCatch } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { authenticateRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
@@ -34,8 +34,8 @@ export async function action({ request, params }: ActionFunctionArgs) {
   const { environment: authenticatedEnv } = authenticationResult.result;
   const { deploymentId } = parsedParams.data;
 
-  const rawBody = await request.json();
-  const body = CancelDeploymentRequestBody.safeParse(rawBody);
+  const [, rawBody] = await tryCatch(request.json());
+  const body = CancelDeploymentRequestBody.safeParse(rawBody ?? {});
 
   if (!body.success) {
     return json({ error: "Invalid request body", issues: body.error.issues }, { status: 400 });
@@ -55,6 +55,8 @@ export async function action({ request, params }: ActionFunctionArgs) {
         switch (error.type) {
           case "deployment_not_found":
             return json({ error: "Deployment not found" }, { status: 404 });
+          case "failed_to_delete_deployment_timeout":
+            return new Response(null, { status: 204 }); // not a critical error, ignore
           case "deployment_cannot_be_cancelled":
             return json(
               { error: "Deployment is already in a final state and cannot be canceled" },

apps/webapp/app/routes/api.v1.deployments.$deploymentId.progress.ts

@@ -1,5 +1,5 @@
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
-import { ProgressDeploymentRequestBody } from "@trigger.dev/core/v3";
+import { ProgressDeploymentRequestBody, tryCatch } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { authenticateRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
@@ -34,8 +34,8 @@ export async function action({ request, params }: ActionFunctionArgs) {
   const { environment: authenticatedEnv } = authenticationResult.result;
   const { deploymentId } = parsedParams.data;
 
-  const rawBody = await request.json();
-  const body = ProgressDeploymentRequestBody.safeParse(rawBody);
+  const [, rawBody] = await tryCatch(request.json());
+  const body = ProgressDeploymentRequestBody.safeParse(rawBody ?? {});
 
   if (!body.success) {
     return json({ error: "Invalid request body", issues: body.error.issues }, { status: 400 });

apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts

@@ -8,7 +8,7 @@ import { logger } from "~/services/logger.server";
 import { requireUserId } from "~/services/session.server";
 import { DeploymentService } from "~/v3/services/deployment.server";
 
-export const promoteSchema = z.object({
+export const cancelSchema = z.object({
   redirectUrl: z.string(),
 });
 
@@ -22,7 +22,7 @@ export const action: ActionFunction = async ({ request, params }) => {
   const { projectId, deploymentShortCode } = ParamSchema.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: promoteSchema });
+  const submission = parse(formData, { schema: cancelSchema });
 
   if (!submission.value) {
     return json(submission);
@@ -84,7 +84,7 @@ export const action: ActionFunction = async ({ request, params }) => {
 
   if (result.isErr()) {
     logger.error(
-      `Failed to promote deployment: ${result.error.type}`,
+      `Failed to cancel deployment: ${result.error.type}`,
       result.error.type === "other"
         ? {
             cause: result.error.cause,
@@ -105,7 +105,14 @@ export const action: ActionFunction = async ({ request, params }) => {
         return redirectWithErrorMessage(
           submission.value.redirectUrl,
           request,
-          "Deployment not found"
+          "Deployment is already in a final state and cannot be canceled"
+        );
+      case "failed_to_delete_deployment_timeout":
+        // not a critical error, ignore
+        return redirectWithSuccessMessage(
+          submission.value.redirectUrl,
+          request,
+          `Canceled deployment ${deploymentShortCode}.`
         );
       case "other":
       default:

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

@@ -212,11 +212,23 @@ export class DeploymentService extends BaseService {
           type: "other" as const,
           cause: error,
         })
-      );
+      ).andThen((result) => {
+        if (result.count === 0) {
+          return errAsync({ type: "deployment_cannot_be_cancelled" as const });
+        }
+        return okAsync({ id: deployment.id });
+      });
+
+    const deleteTimeout = (deployment: Pick<WorkerDeployment, "id">) =>
+      fromPromise(TimeoutDeploymentService.dequeue(deployment.id, this._prisma), (error) => ({
+        type: "failed_to_delete_deployment_timeout" as const,
+        cause: error,
+      }));
 
     return getDeployment()
       .andThen(validateDeployment)
       .andThen(cancelDeployment)
+      .andThen(deleteTimeout)
       .map(() => undefined);
   }
 }