Post merge fixes

Author: samejr

apps/webapp/app/api.server.ts

@@ -89,7 +89,7 @@ export function PromoteDeploymentDialog({
             name="redirectUrl"
             value={redirectPath}
             variant="primary/medium"
-            LeadingIcon={isLoading ? "spinner-white" : ArrowPathIcon}
+            LeadingIcon={isLoading ? SpinnerWhite : ArrowPathIcon}
             disabled={isLoading}
             shortcut={{ modifiers: ["mod"], key: "enter" }}
           >

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

@@ -1,4 +1,12 @@
-import type { RedactString } from "@trigger.dev/core";
+import { z } from "zod";
+
+export const RedactStringSchema = z.object({
+  __redactedString: z.literal(true),
+  strings: z.array(z.string()),
+  interpolations: z.array(z.string()),
+});
+
+export type RedactString = z.infer<typeof RedactStringSchema>;
 
 // Replaces redacted strings with "******".
 // For example, this object: {"Authorization":{"__redactedString":true,"strings":["Bearer ",""],"interpolations":["sk-1234"]}}

apps/webapp/app/services/sensitiveDataReplacer.ts

@@ -361,3 +361,12 @@ export const SerializedError = z.object({
 });
 
 export type SerializedError = z.infer<typeof SerializedError>;
+
+export const RuntimeEnvironmentTypeSchema = z.enum([
+  "PRODUCTION",
+  "STAGING",
+  "DEVELOPMENT",
+  "PREVIEW",
+]);
+
+export type RuntimeEnvironmentType = z.infer<typeof RuntimeEnvironmentTypeSchema>;

apps/webapp/app/utils/createHttpSourceRequest.ts

@@ -1,7 +1,6 @@
 import { z } from "zod";
-import { RuntimeEnvironmentTypeSchema } from "../../schemas/api.js";
 import { RunStatus } from "./api.js";
-import { TaskRunError } from "./common.js";
+import { RuntimeEnvironmentTypeSchema, TaskRunError } from "./common.js";
 
 /** Represents a failed run alert webhook payload */
 const AlertWebhookRunFailedObject = z.object({