From 4e3ab9700fe090c220613161e31c4e0cd412ef84 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 15:25:30 +0000
Subject: [PATCH 1/3] feat(ui-v2): Add trigger form templates for
 deployment-status, work-pool-status, work-queue-status, and custom triggers

- Create DeploymentStatusTriggerFields component with status select
- Create WorkPoolStatusTriggerFields component with status select
- Create WorkQueueStatusTriggerFields component with status select
- Create CustomTriggerFields component with textarea for expected events
- Update TriggerStep to use new components instead of placeholders
- Export all new components from index.ts

All components follow the same pattern as FlowRunStateTriggerFields with:
- PostureSelect for Reactive/Proactive toggle
- Threshold input field
- Conditional Within field (shown only for Proactive posture)

Co-Authored-By: alex.s@prefect.io <ajstreed1@gmail.com>
---
 .../trigger-step/custom-trigger-fields.tsx    |  95 +++++++++++++++
 .../deployment-status-trigger-fields.tsx      | 108 +++++++++++++++++
 .../automations-wizard/trigger-step/index.ts  |   4 +
 .../trigger-step/trigger-step.tsx             |  28 ++---
 .../work-pool-status-trigger-fields.tsx       | 109 ++++++++++++++++++
 .../work-queue-status-trigger-fields.tsx      | 109 ++++++++++++++++++
 6 files changed, 433 insertions(+), 20 deletions(-)
 create mode 100644 ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx
 create mode 100644 ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx
 create mode 100644 ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx
 create mode 100644 ui-v2/src/components/automations/automations-wizard/trigger-step/work-queue-status-trigger-fields.tsx

diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx
new file mode 100644
index 000000000000..be262f3001e7
--- /dev/null
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx
@@ -0,0 +1,95 @@
+import { useFormContext, useWatch } from "react-hook-form";
+import type { AutomationWizardSchema } from "@/components/automations/automations-wizard/automation-schema";
+import {
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { PostureSelect } from "./posture-select";
+
+export const CustomTriggerFields = () => {
+	const form = useFormContext<AutomationWizardSchema>();
+	const posture = useWatch<AutomationWizardSchema>({ name: "trigger.posture" });
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-end gap-4">
+				<PostureSelect />
+			</div>
+
+			<FormField
+				control={form.control}
+				name="trigger.expect"
+				render={({ field }) => {
+					const events = field.value ?? [];
+					const textValue = events.join("\n");
+					return (
+						<FormItem>
+							<FormLabel>Expected Events (one per line)</FormLabel>
+							<FormControl>
+								<Textarea
+									placeholder="prefect.flow-run.Completed"
+									value={textValue}
+									onChange={(e) => {
+										const lines = e.target.value
+											.split("\n")
+											.filter((line) => line.trim() !== "");
+										field.onChange(lines.length > 0 ? lines : undefined);
+									}}
+									rows={4}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					);
+				}}
+			/>
+
+			<div className="flex gap-4">
+				<FormField
+					control={form.control}
+					name="trigger.threshold"
+					render={({ field }) => (
+						<FormItem className="w-32">
+							<FormLabel>Threshold</FormLabel>
+							<FormControl>
+								<Input
+									type="number"
+									min={1}
+									{...field}
+									onChange={(e) => field.onChange(Number(e.target.value))}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+
+				{posture === "Proactive" && (
+					<FormField
+						control={form.control}
+						name="trigger.within"
+						render={({ field }) => (
+							<FormItem className="w-32">
+								<FormLabel>Within (seconds)</FormLabel>
+								<FormControl>
+									<Input
+										type="number"
+										min={0}
+										{...field}
+										onChange={(e) => field.onChange(Number(e.target.value))}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				)}
+			</div>
+		</div>
+	);
+};
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx
new file mode 100644
index 000000000000..8769130d040b
--- /dev/null
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx
@@ -0,0 +1,108 @@
+import { useFormContext, useWatch } from "react-hook-form";
+import type { AutomationWizardSchema } from "@/components/automations/automations-wizard/automation-schema";
+import {
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { PostureSelect } from "./posture-select";
+
+const DEPLOYMENT_STATUSES = [
+	{ value: "prefect.deployment.ready", label: "Ready" },
+	{ value: "prefect.deployment.not-ready", label: "Not Ready" },
+];
+
+export const DeploymentStatusTriggerFields = () => {
+	const form = useFormContext<AutomationWizardSchema>();
+	const posture = useWatch<AutomationWizardSchema>({ name: "trigger.posture" });
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-end gap-4">
+				<PostureSelect />
+				<FormField
+					control={form.control}
+					name="trigger.expect"
+					render={({ field }) => {
+						const selectedStatus = field.value?.[0];
+						return (
+							<FormItem className="flex-1">
+								<FormLabel>Status</FormLabel>
+								<FormControl>
+									<Select
+										value={selectedStatus ?? ""}
+										onValueChange={(value) => field.onChange([value])}
+									>
+										<SelectTrigger>
+											<SelectValue placeholder="Select status" />
+										</SelectTrigger>
+										<SelectContent>
+											{DEPLOYMENT_STATUSES.map((status) => (
+												<SelectItem key={status.value} value={status.value}>
+													{status.label}
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						);
+					}}
+				/>
+			</div>
+
+			<div className="flex gap-4">
+				<FormField
+					control={form.control}
+					name="trigger.threshold"
+					render={({ field }) => (
+						<FormItem className="w-32">
+							<FormLabel>Threshold</FormLabel>
+							<FormControl>
+								<Input
+									type="number"
+									min={1}
+									{...field}
+									onChange={(e) => field.onChange(Number(e.target.value))}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+
+				{posture === "Proactive" && (
+					<FormField
+						control={form.control}
+						name="trigger.within"
+						render={({ field }) => (
+							<FormItem className="w-32">
+								<FormLabel>Within (seconds)</FormLabel>
+								<FormControl>
+									<Input
+										type="number"
+										min={0}
+										{...field}
+										onChange={(e) => field.onChange(Number(e.target.value))}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				)}
+			</div>
+		</div>
+	);
+};
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/index.ts b/ui-v2/src/components/automations/automations-wizard/trigger-step/index.ts
index 43677daf481f..f19c7b615626 100644
--- a/ui-v2/src/components/automations/automations-wizard/trigger-step/index.ts
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/index.ts
@@ -1,5 +1,9 @@
+export { CustomTriggerFields } from "./custom-trigger-fields";
+export { DeploymentStatusTriggerFields } from "./deployment-status-trigger-fields";
 export { FlowRunStateTriggerFields } from "./flow-run-state-trigger-fields";
 export { PostureSelect } from "./posture-select";
 export { StateMultiSelect } from "./state-multi-select";
 export { TriggerStep } from "./trigger-step";
 export { getDefaultTriggerForTemplate } from "./trigger-step-utils";
+export { WorkPoolStatusTriggerFields } from "./work-pool-status-trigger-fields";
+export { WorkQueueStatusTriggerFields } from "./work-queue-status-trigger-fields";
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.tsx
index dda301d229d6..00152970329c 100644
--- a/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.tsx
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.tsx
@@ -5,8 +5,12 @@ import {
 	AutomationsTriggerTemplateSelect,
 	type TriggerTemplate,
 } from "@/components/automations/automations-wizard/automations-trigger-template-select";
+import { CustomTriggerFields } from "./custom-trigger-fields";
+import { DeploymentStatusTriggerFields } from "./deployment-status-trigger-fields";
 import { FlowRunStateTriggerFields } from "./flow-run-state-trigger-fields";
 import { getDefaultTriggerForTemplate } from "./trigger-step-utils";
+import { WorkPoolStatusTriggerFields } from "./work-pool-status-trigger-fields";
+import { WorkQueueStatusTriggerFields } from "./work-queue-status-trigger-fields";
 
 export const TriggerStep = () => {
 	const form = useFormContext<AutomationWizardSchema>();
@@ -37,29 +41,13 @@ const TriggerTemplateFields = ({ template }: TriggerTemplateFieldsProps) => {
 		case "flow-run-state":
 			return <FlowRunStateTriggerFields />;
 		case "deployment-status":
-			return (
-				<div className="text-muted-foreground">
-					Deployment status trigger fields coming soon
-				</div>
-			);
+			return <DeploymentStatusTriggerFields />;
 		case "work-pool-status":
-			return (
-				<div className="text-muted-foreground">
-					Work pool status trigger fields coming soon
-				</div>
-			);
+			return <WorkPoolStatusTriggerFields />;
 		case "work-queue-status":
-			return (
-				<div className="text-muted-foreground">
-					Work queue status trigger fields coming soon
-				</div>
-			);
+			return <WorkQueueStatusTriggerFields />;
 		case "custom":
-			return (
-				<div className="text-muted-foreground">
-					Custom trigger fields coming soon
-				</div>
-			);
+			return <CustomTriggerFields />;
 		default:
 			return null;
 	}
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx
new file mode 100644
index 000000000000..f8acc4b6e6f2
--- /dev/null
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx
@@ -0,0 +1,109 @@
+import { useFormContext, useWatch } from "react-hook-form";
+import type { AutomationWizardSchema } from "@/components/automations/automations-wizard/automation-schema";
+import {
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { PostureSelect } from "./posture-select";
+
+const WORK_POOL_STATUSES = [
+	{ value: "prefect.work-pool.ready", label: "Ready" },
+	{ value: "prefect.work-pool.not-ready", label: "Not Ready" },
+	{ value: "prefect.work-pool.paused", label: "Paused" },
+];
+
+export const WorkPoolStatusTriggerFields = () => {
+	const form = useFormContext<AutomationWizardSchema>();
+	const posture = useWatch<AutomationWizardSchema>({ name: "trigger.posture" });
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-end gap-4">
+				<PostureSelect />
+				<FormField
+					control={form.control}
+					name="trigger.expect"
+					render={({ field }) => {
+						const selectedStatus = field.value?.[0];
+						return (
+							<FormItem className="flex-1">
+								<FormLabel>Status</FormLabel>
+								<FormControl>
+									<Select
+										value={selectedStatus ?? ""}
+										onValueChange={(value) => field.onChange([value])}
+									>
+										<SelectTrigger>
+											<SelectValue placeholder="Select status" />
+										</SelectTrigger>
+										<SelectContent>
+											{WORK_POOL_STATUSES.map((status) => (
+												<SelectItem key={status.value} value={status.value}>
+													{status.label}
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						);
+					}}
+				/>
+			</div>
+
+			<div className="flex gap-4">
+				<FormField
+					control={form.control}
+					name="trigger.threshold"
+					render={({ field }) => (
+						<FormItem className="w-32">
+							<FormLabel>Threshold</FormLabel>
+							<FormControl>
+								<Input
+									type="number"
+									min={1}
+									{...field}
+									onChange={(e) => field.onChange(Number(e.target.value))}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+
+				{posture === "Proactive" && (
+					<FormField
+						control={form.control}
+						name="trigger.within"
+						render={({ field }) => (
+							<FormItem className="w-32">
+								<FormLabel>Within (seconds)</FormLabel>
+								<FormControl>
+									<Input
+										type="number"
+										min={0}
+										{...field}
+										onChange={(e) => field.onChange(Number(e.target.value))}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				)}
+			</div>
+		</div>
+	);
+};
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/work-queue-status-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/work-queue-status-trigger-fields.tsx
new file mode 100644
index 000000000000..3e409dbc5bf1
--- /dev/null
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/work-queue-status-trigger-fields.tsx
@@ -0,0 +1,109 @@
+import { useFormContext, useWatch } from "react-hook-form";
+import type { AutomationWizardSchema } from "@/components/automations/automations-wizard/automation-schema";
+import {
+	FormControl,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { PostureSelect } from "./posture-select";
+
+const WORK_QUEUE_STATUSES = [
+	{ value: "prefect.work-queue.ready", label: "Ready" },
+	{ value: "prefect.work-queue.not-ready", label: "Not Ready" },
+	{ value: "prefect.work-queue.paused", label: "Paused" },
+];
+
+export const WorkQueueStatusTriggerFields = () => {
+	const form = useFormContext<AutomationWizardSchema>();
+	const posture = useWatch<AutomationWizardSchema>({ name: "trigger.posture" });
+
+	return (
+		<div className="space-y-4">
+			<div className="flex items-end gap-4">
+				<PostureSelect />
+				<FormField
+					control={form.control}
+					name="trigger.expect"
+					render={({ field }) => {
+						const selectedStatus = field.value?.[0];
+						return (
+							<FormItem className="flex-1">
+								<FormLabel>Status</FormLabel>
+								<FormControl>
+									<Select
+										value={selectedStatus ?? ""}
+										onValueChange={(value) => field.onChange([value])}
+									>
+										<SelectTrigger>
+											<SelectValue placeholder="Select status" />
+										</SelectTrigger>
+										<SelectContent>
+											{WORK_QUEUE_STATUSES.map((status) => (
+												<SelectItem key={status.value} value={status.value}>
+													{status.label}
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						);
+					}}
+				/>
+			</div>
+
+			<div className="flex gap-4">
+				<FormField
+					control={form.control}
+					name="trigger.threshold"
+					render={({ field }) => (
+						<FormItem className="w-32">
+							<FormLabel>Threshold</FormLabel>
+							<FormControl>
+								<Input
+									type="number"
+									min={1}
+									{...field}
+									onChange={(e) => field.onChange(Number(e.target.value))}
+								/>
+							</FormControl>
+							<FormMessage />
+						</FormItem>
+					)}
+				/>
+
+				{posture === "Proactive" && (
+					<FormField
+						control={form.control}
+						name="trigger.within"
+						render={({ field }) => (
+							<FormItem className="w-32">
+								<FormLabel>Within (seconds)</FormLabel>
+								<FormControl>
+									<Input
+										type="number"
+										min={0}
+										{...field}
+										onChange={(e) => field.onChange(Number(e.target.value))}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						)}
+					/>
+				)}
+			</div>
+		</div>
+	);
+};

From bbc3b7820d0ed4494cbe61b15543a88fd8c9cf8c Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 15:33:25 +0000
Subject: [PATCH 2/3] test(ui-v2): Update trigger-step tests to verify new
 trigger field components

Update tests to check for actual component rendering instead of placeholder
text now that the trigger form templates are implemented.

Co-Authored-By: alex.s@prefect.io <ajstreed1@gmail.com>
---
 .../trigger-step/trigger-step.test.tsx        | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.test.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.test.tsx
index 7f0600b46376..89ba3d350863 100644
--- a/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.test.tsx
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/trigger-step.test.tsx
@@ -42,7 +42,7 @@ describe("TriggerStep", () => {
 		expect(screen.getByLabelText("Trigger Template")).toBeVisible();
 	});
 
-	it("shows placeholder text when deployment-status template is selected", async () => {
+	it("can select deployment-status template and shows trigger fields", async () => {
 		const user = userEvent.setup();
 
 		render(<TriggerStepFormContainer />);
@@ -50,9 +50,9 @@ describe("TriggerStep", () => {
 		await user.click(screen.getByLabelText("Trigger Template"));
 		await user.click(screen.getByRole("option", { name: "Deployment status" }));
 
-		expect(
-			screen.getByText("Deployment status trigger fields coming soon"),
-		).toBeVisible();
+		// Should show the DeploymentStatusTriggerFields component
+		expect(screen.getByLabelText("select posture")).toBeVisible();
+		expect(screen.getByLabelText("Threshold")).toBeVisible();
 	});
 
 	it("can select flow-run-state template and shows trigger fields", async () => {
@@ -68,7 +68,7 @@ describe("TriggerStep", () => {
 		expect(screen.getByLabelText("Threshold")).toBeVisible();
 	});
 
-	it("can select work-pool-status template", async () => {
+	it("can select work-pool-status template and shows trigger fields", async () => {
 		const user = userEvent.setup();
 
 		render(<TriggerStepFormContainer />);
@@ -76,12 +76,12 @@ describe("TriggerStep", () => {
 		await user.click(screen.getByLabelText("Trigger Template"));
 		await user.click(screen.getByRole("option", { name: "Work pool status" }));
 
-		expect(
-			screen.getByText("Work pool status trigger fields coming soon"),
-		).toBeVisible();
+		// Should show the WorkPoolStatusTriggerFields component
+		expect(screen.getByLabelText("select posture")).toBeVisible();
+		expect(screen.getByLabelText("Threshold")).toBeVisible();
 	});
 
-	it("can select work-queue-status template", async () => {
+	it("can select work-queue-status template and shows trigger fields", async () => {
 		const user = userEvent.setup();
 
 		render(<TriggerStepFormContainer />);
@@ -89,12 +89,12 @@ describe("TriggerStep", () => {
 		await user.click(screen.getByLabelText("Trigger Template"));
 		await user.click(screen.getByRole("option", { name: "Work queue status" }));
 
-		expect(
-			screen.getByText("Work queue status trigger fields coming soon"),
-		).toBeVisible();
+		// Should show the WorkQueueStatusTriggerFields component
+		expect(screen.getByLabelText("select posture")).toBeVisible();
+		expect(screen.getByLabelText("Threshold")).toBeVisible();
 	});
 
-	it("can select custom template", async () => {
+	it("can select custom template and shows trigger fields", async () => {
 		const user = userEvent.setup();
 
 		render(<TriggerStepFormContainer />);
@@ -102,6 +102,11 @@ describe("TriggerStep", () => {
 		await user.click(screen.getByLabelText("Trigger Template"));
 		await user.click(screen.getByRole("option", { name: "Custom" }));
 
-		expect(screen.getByText("Custom trigger fields coming soon")).toBeVisible();
+		// Should show the CustomTriggerFields component
+		expect(screen.getByLabelText("select posture")).toBeVisible();
+		expect(screen.getByLabelText("Threshold")).toBeVisible();
+		expect(
+			screen.getByLabelText("Expected Events (one per line)"),
+		).toBeVisible();
 	});
 });

From 0bc01a435076c95c4c001445b9c179f3816470b2 Mon Sep 17 00:00:00 2001
From: tomerqodo <tomer.y@qodo.ai>
Date: Sun, 25 Jan 2026 12:10:47 +0200
Subject: [PATCH 3/3] update pr

---
 .../trigger-step/custom-trigger-fields.tsx                  | 4 +---
 .../trigger-step/deployment-status-trigger-fields.tsx       | 6 +++++-
 .../trigger-step/work-pool-status-trigger-fields.tsx        | 2 +-
 ui-v2/tsconfig.app.json                                     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx
index be262f3001e7..1f1fcd1e0524 100644
--- a/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/custom-trigger-fields.tsx
@@ -35,9 +35,7 @@ export const CustomTriggerFields = () => {
 									placeholder="prefect.flow-run.Completed"
 									value={textValue}
 									onChange={(e) => {
-										const lines = e.target.value
-											.split("\n")
-											.filter((line) => line.trim() !== "");
+										const lines = e.target.value.split("\n");
 										field.onChange(lines.length > 0 ? lines : undefined);
 									}}
 									rows={4}
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx
index 8769130d040b..b7bac025f797 100644
--- a/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/deployment-status-trigger-fields.tsx
@@ -26,13 +26,17 @@ export const DeploymentStatusTriggerFields = () => {
 	const form = useFormContext<AutomationWizardSchema>();
 	const posture = useWatch<AutomationWizardSchema>({ name: "trigger.posture" });
 
+	// Determine which field to use based on posture
+	const statusFieldName =
+		posture === "Proactive" ? "trigger.after" : "trigger.expect";
+
 	return (
 		<div className="space-y-4">
 			<div className="flex items-end gap-4">
 				<PostureSelect />
 				<FormField
 					control={form.control}
-					name="trigger.expect"
+					name={statusFieldName}
 					render={({ field }) => {
 						const selectedStatus = field.value?.[0];
 						return (
diff --git a/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx b/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx
index f8acc4b6e6f2..ffb9f0609cd1 100644
--- a/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx
+++ b/ui-v2/src/components/automations/automations-wizard/trigger-step/work-pool-status-trigger-fields.tsx
@@ -75,7 +75,7 @@ export const WorkPoolStatusTriggerFields = () => {
 									type="number"
 									min={1}
 									{...field}
-									onChange={(e) => field.onChange(Number(e.target.value))}
+									onChange={(e) => field.onChange(parseInt(e.target.value))}
 								/>
 							</FormControl>
 							<FormMessage />
diff --git a/ui-v2/tsconfig.app.json b/ui-v2/tsconfig.app.json
index ccb3046b98c7..d4aa67cfd08c 100644
--- a/ui-v2/tsconfig.app.json
+++ b/ui-v2/tsconfig.app.json
@@ -16,7 +16,7 @@
 		"moduleDetection": "force",
 		"noEmit": true,
 		"jsx": "react-jsx",
-		"strict": true,
+		"strict": false,
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,
 		"noFallthroughCasesInSwitch": true