From 01c3870b22d22a9d208d942cab8e3103ba43218f Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 3 Jun 2026 20:15:01 +0530
Subject: [PATCH 1/3] feat(client): enable step wizard on infrastructure and
 pagespeed create pages

---
 client/src/Pages/CreateMonitor/index.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/Pages/CreateMonitor/index.tsx b/client/src/Pages/CreateMonitor/index.tsx
index f34876359..98510b57c 100644
--- a/client/src/Pages/CreateMonitor/index.tsx
+++ b/client/src/Pages/CreateMonitor/index.tsx
@@ -234,6 +234,9 @@ const CreateMonitorPage = () => {
 	}, [location.pathname]);
 
 	const showTypeSelector = pageType === "uptime" && !isEditMode;
+	// The multi-step wizard applies to every create flow; only the monitor-type
+	// radio is uptime-specific. Edit mode keeps the flat form.
+	const isWizard = !isEditMode;
 	const defaultType: MonitorType =
 		pageType === "pagespeed"
 			? "pagespeed"
@@ -267,7 +270,7 @@ const CreateMonitorPage = () => {
 	// Multi-step wizard, uptime create only (showTypeSelector). Other flows
 	// keep the flat form, where showStep() is always true.
 	const [currentStep, setCurrentStep] = useState(0);
-	const showStep = (step: number) => !showTypeSelector || currentStep === step;
+	const showStep = (step: number) => !isWizard || currentStep === step;
 
 	const watchedType = watch("type") as MonitorType;
 	const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
@@ -362,7 +365,7 @@ const CreateMonitorPage = () => {
 				refetch={refetchMonitor}
 				onDelete={handleDeleteClick}
 			/>
-			{showTypeSelector && (
+			{isWizard && (
 				<StepProgress
 					steps={totalSteps}
 					current={currentStep}
@@ -1335,9 +1338,9 @@ const CreateMonitorPage = () => {
 
 			<Stack
 				direction="row"
-				justifyContent={showTypeSelector ? "space-between" : "flex-end"}
+				justifyContent={isWizard ? "space-between" : "flex-end"}
 			>
-				{showTypeSelector && (
+				{isWizard && (
 					<Button
 						type="button"
 						variant="outlined"
@@ -1348,7 +1351,7 @@ const CreateMonitorPage = () => {
 						{t("common.buttons.back")}
 					</Button>
 				)}
-				{showTypeSelector && currentStep < totalSteps - 1 ? (
+				{isWizard && currentStep < totalSteps - 1 ? (
 					<Button
 						key="wizard-next"
 						type="button"

From 8572065ef7e4cc6681b3c188b1ef59a47c1f9c8b Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 3 Jun 2026 20:16:10 +0530
Subject: [PATCH 2/3] fix(client): validate hardware alert thresholds on the
 wizard's second step

---
 client/src/Validation/monitor.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/Validation/monitor.ts b/client/src/Validation/monitor.ts
index 5d7ed93af..80d0d77c4 100644
--- a/client/src/Validation/monitor.ts
+++ b/client/src/Validation/monitor.ts
@@ -128,19 +128,23 @@ const hardwareSchema = baseSchema.extend({
 	cpuAlertThreshold: z
 		.number()
 		.min(0, "CPU threshold must be at least 0")
-		.max(100, "CPU threshold must be at most 100"),
+		.max(100, "CPU threshold must be at most 100")
+		.register(monitorStepRegistry, { step: 1 }),
 	memoryAlertThreshold: z
 		.number()
 		.min(0, "Memory threshold must be at least 0")
-		.max(100, "Memory threshold must be at most 100"),
+		.max(100, "Memory threshold must be at most 100")
+		.register(monitorStepRegistry, { step: 1 }),
 	diskAlertThreshold: z
 		.number()
 		.min(0, "Disk threshold must be at least 0")
-		.max(100, "Disk threshold must be at most 100"),
+		.max(100, "Disk threshold must be at most 100")
+		.register(monitorStepRegistry, { step: 1 }),
 	tempAlertThreshold: z
 		.number()
 		.min(0, "Temperature threshold must be at least 0")
-		.max(150, "Temperature threshold must be at most 150"),
+		.max(150, "Temperature threshold must be at most 150")
+		.register(monitorStepRegistry, { step: 1 }),
 	selectedDisks: z.array(z.string()),
 });
 

From 7872b18108d534b8ad27b700e475feaff3dffdd8 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Thu, 4 Jun 2026 11:09:09 +0530
Subject: [PATCH 3/3] refactor(client): inline isEditMode instead of shadowing
 it with isWizard

---
 client/src/Pages/CreateMonitor/index.tsx | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/client/src/Pages/CreateMonitor/index.tsx b/client/src/Pages/CreateMonitor/index.tsx
index 98510b57c..94bed9355 100644
--- a/client/src/Pages/CreateMonitor/index.tsx
+++ b/client/src/Pages/CreateMonitor/index.tsx
@@ -234,9 +234,6 @@ const CreateMonitorPage = () => {
 	}, [location.pathname]);
 
 	const showTypeSelector = pageType === "uptime" && !isEditMode;
-	// The multi-step wizard applies to every create flow; only the monitor-type
-	// radio is uptime-specific. Edit mode keeps the flat form.
-	const isWizard = !isEditMode;
 	const defaultType: MonitorType =
 		pageType === "pagespeed"
 			? "pagespeed"
@@ -267,10 +264,10 @@ const CreateMonitorPage = () => {
 		reset(defaults);
 	}, [defaults, reset]);
 
-	// Multi-step wizard, uptime create only (showTypeSelector). Other flows
-	// keep the flat form, where showStep() is always true.
+	// Multi-step wizard on every create flow; edit mode keeps the flat form
+	// where showStep() is always true.
 	const [currentStep, setCurrentStep] = useState(0);
-	const showStep = (step: number) => !isWizard || currentStep === step;
+	const showStep = (step: number) => isEditMode || currentStep === step;
 
 	const watchedType = watch("type") as MonitorType;
 	const watchedUseAdvancedMatching = watch("useAdvancedMatching") as boolean;
@@ -365,7 +362,7 @@ const CreateMonitorPage = () => {
 				refetch={refetchMonitor}
 				onDelete={handleDeleteClick}
 			/>
-			{isWizard && (
+			{!isEditMode && (
 				<StepProgress
 					steps={totalSteps}
 					current={currentStep}
@@ -1338,9 +1335,9 @@ const CreateMonitorPage = () => {
 
 			<Stack
 				direction="row"
-				justifyContent={isWizard ? "space-between" : "flex-end"}
+				justifyContent={!isEditMode ? "space-between" : "flex-end"}
 			>
-				{isWizard && (
+				{!isEditMode && (
 					<Button
 						type="button"
 						variant="outlined"
@@ -1351,7 +1348,7 @@ const CreateMonitorPage = () => {
 						{t("common.buttons.back")}
 					</Button>
 				)}
-				{isWizard && currentStep < totalSteps - 1 ? (
+				{!isEditMode && currentStep < totalSteps - 1 ? (
 					<Button
 						key="wizard-next"
 						type="button"