From 16aec18c28fd27af1f79a1b40f6ab5bf99e8e88c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 01:48:08 +0000 Subject: [PATCH 01/10] refactor uptime forms' --- client/src/hooks/forms/UseInitMonitorFrom.tsx | 68 +++++++++++++------ .../src/pages/pagespeed/PageSpeedCreate.tsx | 2 +- client/src/pages/uptime/UptimeConfigure.tsx | 33 +++------ client/src/pages/uptime/UptimeCreate.tsx | 15 +--- client/src/pages/uptime/UptimeForm.tsx | 20 ++++-- client/src/types/monitor.ts | 1 + client/src/validation/index.ts | 1 + client/src/validation/monitor.ts | 61 +++++++++++++++++ client/src/validation/zod.ts | 46 +------------ 9 files changed, 137 insertions(+), 110 deletions(-) create mode 100644 client/src/validation/monitor.ts diff --git a/client/src/hooks/forms/UseInitMonitorFrom.tsx b/client/src/hooks/forms/UseInitMonitorFrom.tsx index b57a5df16..e7b12da65 100644 --- a/client/src/hooks/forms/UseInitMonitorFrom.tsx +++ b/client/src/hooks/forms/UseInitMonitorFrom.tsx @@ -1,32 +1,56 @@ -import { monitorSchema } from "@/validation/zod"; -import ms from "ms"; import { useMemo } from "react"; +import humanInterval from "human-interval"; +import type { FormValues, SubmitValues } from "@/pages/uptime/UptimeForm"; +import type { IMonitor } from "@/types/monitor"; + +import ms from "ms"; -import { z } from "zod"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: IMonitor | undefined; }) => { return useMemo(() => { - let humanInterval = "1 minute"; - if (initialData?.interval) { - const parsed = Number(initialData.interval); - if (!isNaN(parsed)) { - humanInterval = ms(parsed, { long: true }); - } - } - - const defaults: z.infer = { - type: initialData?.type || "https", - url: initialData?.url || "", - port: initialData?.port || 80, - n: initialData?.n || 3, - notificationChannels: initialData?.notificationChannels || [], - name: initialData?.name || "", - interval: humanInterval, - rejectUnauthorized: initialData?.rejectUnauthorized ?? true, + const apiToForm = (apiData: IMonitor): FormValues => { + return { + type: apiData.type, + url: apiData.url, + port: apiData.port, + n: apiData.n, + notificationChannels: apiData.notificationChannels, + name: apiData.name, + interval: ms(apiData.interval, { long: true }), + rejectUnauthorized: apiData.rejectUnauthorized, + }; }; - return { defaults }; + + const formToApi = (formData: FormValues): SubmitValues => { + const submitData: SubmitValues = { + type: formData.type, + url: formData.url, + port: formData.type === "port" ? formData.port : undefined, + n: formData.n, + notificationChannels: formData.notificationChannels, + name: formData.name, + interval: humanInterval(formData.interval), + rejectUnauthorized: formData.rejectUnauthorized, + }; + + return submitData; + }; + + const defaults: FormValues = initialData + ? apiToForm(initialData) + : { + type: "https", + url: "", + port: 80, + n: 3, + notificationChannels: [], + name: "", + interval: "1 minute", + rejectUnauthorized: true, + }; + return { defaults, apiToForm, formToApi }; }, [initialData]); }; diff --git a/client/src/pages/pagespeed/PageSpeedCreate.tsx b/client/src/pages/pagespeed/PageSpeedCreate.tsx index e5c395565..744daae7a 100644 --- a/client/src/pages/pagespeed/PageSpeedCreate.tsx +++ b/client/src/pages/pagespeed/PageSpeedCreate.tsx @@ -2,7 +2,7 @@ import { PageSpeedForm } from "@/pages/pagespeed/PageSpeedForm"; import humanInterval from "human-interval"; import { z } from "zod"; -import { monitorSchema } from "@/validation/zod"; +import { monitorSchema } from "@/validation"; import { useGet, usePost } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import { useNavigate } from "react-router"; diff --git a/client/src/pages/uptime/UptimeConfigure.tsx b/client/src/pages/uptime/UptimeConfigure.tsx index 95d04fbf5..2fc411aca 100644 --- a/client/src/pages/uptime/UptimeConfigure.tsx +++ b/client/src/pages/uptime/UptimeConfigure.tsx @@ -1,21 +1,14 @@ -import { monitorSchema } from "@/validation/zod"; import { useGet, usePatch } from "@/hooks/UseApi"; import { UptimeForm } from "@/pages/uptime/UptimeForm"; import { useParams } from "react-router"; import type { ApiResponse } from "@/types/api"; -import humanInterval from "human-interval"; -import { z } from "zod"; import { useNavigate } from "react-router"; import type { INotificationChannel } from "@/types/notification-channel"; import type { IMonitor } from "@/types/monitor"; +import type { SubmitValues } from "@/pages/uptime/UptimeForm"; const UptimeConfigurePage = () => { - type FormValues = z.infer; - type SubmitValues = Omit & { - interval: number | undefined; - }; - const { id } = useParams(); const navigate = useNavigate(); const { response } = useGet>( @@ -24,23 +17,17 @@ const UptimeConfigurePage = () => { const { response: monitorResponse } = useGet>( `/monitors/${id}` ); - const monitor = monitorResponse?.data || {}; + const monitor = monitorResponse?.data; const notificationOptions = response?.data ?? []; const { patch, loading, error } = usePatch, IMonitor>(); - const onSubmit = async (data: FormValues) => { - let interval = humanInterval(data.interval); - if (!interval) interval = 60000; - const submitData = { - type: data.type, - name: data.name, - n: data.n, - notificationChannels: data.notificationChannels, - interval, - rejectUnauthorized: data.rejectUnauthorized, - }; - const result = await patch(`/monitors/${id}`, submitData); + if (!monitor) { + return null; + } + + const onSubmit = async (data: SubmitValues) => { + const result = await patch(`/monitors/${id}`, data); if (result) { navigate(`/uptime/${id}`); } else { @@ -50,9 +37,7 @@ const UptimeConfigurePage = () => { return ( { - type FormValues = z.infer; - type SubmitValues = Omit & { - interval: number | undefined; - }; const navigate = useNavigate(); const { response } = useGet>( "/notification-channels" ); const { post, loading, error } = usePost(); - const onSubmit = async (data: FormValues) => { - let interval = humanInterval(data.interval); - if (!interval) interval = 60000; - const submitData = { ...data, interval }; - const result = await post("/monitors", submitData); + const onSubmit = async (data: SubmitValues) => { + const result = await post("/monitors", data); if (result) { navigate("/uptime"); } else { diff --git a/client/src/pages/uptime/UptimeForm.tsx b/client/src/pages/uptime/UptimeForm.tsx index 3179bf3a2..0904b68c2 100644 --- a/client/src/pages/uptime/UptimeForm.tsx +++ b/client/src/pages/uptime/UptimeForm.tsx @@ -14,7 +14,7 @@ import { Typography } from "@mui/material"; import { useEffect, useRef } from "react"; import { useTranslation } from "react-i18next"; -import { monitorSchema } from "@/validation/zod"; +import { monitorSchema } from "@/validation"; import { z } from "zod"; import { zodResolver } from "@hookform/resolvers/zod"; import { @@ -23,10 +23,14 @@ import { useWatch, type SubmitHandler, } from "react-hook-form"; +import type { IMonitor } from "@/types/monitor"; import { useTheme } from "@mui/material/styles"; import { useInitForm } from "@/hooks/forms/UseInitMonitorFrom"; -type FormValues = z.infer; +export type FormValues = z.infer; +export type SubmitValues = Omit, "interval"> & { + interval: number | undefined; +}; export const UptimeForm = ({ mode = "create", @@ -36,14 +40,14 @@ export const UptimeForm = ({ loading, }: { mode?: "create" | "configure"; - initialData?: Partial; - onSubmit: SubmitHandler; + initialData?: IMonitor; + onSubmit: SubmitHandler; notificationOptions: any[]; loading: boolean; }) => { const { t } = useTranslation(); const theme = useTheme(); - const { defaults } = useInitForm({ initialData: initialData }); + const { defaults, formToApi } = useInitForm({ initialData: initialData }); const urlInputRef = useRef(null); const { @@ -73,6 +77,10 @@ export const UptimeForm = ({ name: "notificationChannels", }); + const submitForm = (formData: FormValues) => { + onSubmit(formToApi(formData)); + }; + useEffect(() => { if (!selectedType) return; @@ -108,7 +116,7 @@ export const UptimeForm = ({ }, [selectedType]); return ( - + {mode === "create" && ( { + // if (!val || val.trim() === "") return; + const ms = humanInterval(val); + + if (!ms || isNaN(ms)) { + ctx.addIssue({ + code: "custom", + message: "Invalid duration format", + }); + } else if (ms < 10000) { + ctx.addIssue({ + code: "custom", + message: "Minimum duration is 10 seconds", + }); + } +}); + +export const monitorSchema = z + .object({ + type: z.string().min(1, "You must select an option"), + url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), + n: z.coerce + .number({ message: "Number required" }) + .min(1, "Minimum value is 1") + .max(25, "Maximum value is 25"), + port: z.coerce.number().optional(), + notificationChannels: z.array(z.string()).optional().default([]), + name: z.string().min(1, "Display name is required"), + interval: durationSchema, + rejectUnauthorized: z.boolean().default(true), + }) + .superRefine((data, ctx) => { + if (data.type === "port") { + if (!data.port) { + ctx.addIssue({ + code: "custom", + message: "Port is required for port monitoring", + path: ["port"], + }); + } + if (isNaN(Number(data.port))) { + ctx.addIssue({ + code: "custom", + message: "Port must be a number", + path: ["port"], + }); + } + if (Number(data.port) < 1 || Number(data.port) > 65535) { + ctx.addIssue({ + code: "custom", + message: "Port must be between 1 and 65535", + path: ["port"], + }); + } + } + }); diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index ce90c5a6a..2a5cd5afb 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -71,51 +71,7 @@ const optionalString = (schema: T) => schema.optional() ); -export const monitorSchema = z - .object({ - type: z.string().min(1, "You must select an option"), - url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), - n: z.coerce - .number({ message: "Number required" }) - .min(1, "Minimum value is 1") - .max(25, "Maximum value is 25"), - port: z.coerce.number().optional(), - notificationChannels: z.array(z.string()).optional().default([]), - name: z.string().min(1, "Display name is required"), - interval: durationSchema, - rejectUnauthorized: z.boolean().default(true), - }) - .superRefine((data, ctx) => { - if (data.type === "port") { - if (!data.port) { - ctx.addIssue({ - code: "custom", - message: "Port is required for port monitoring", - path: ["port"], - }); - } - if (isNaN(Number(data.port))) { - ctx.addIssue({ - code: "custom", - message: "Port must be a number", - path: ["port"], - }); - } - if (Number(data.port) < 1 || Number(data.port) > 65535) { - ctx.addIssue({ - code: "custom", - message: "Port must be between 1 and 65535", - path: ["port"], - }); - } - } - }) - .transform((data) => { - if (data.type !== "port") { - return { ...data, port: undefined }; - } - return data; - }); +// moved to client/src/validation/monitor.ts export const monitorSchemaPageSpeed = z.object({ type: z.string().min(1, "You must select an option"), From df707ab194c487a15f73769824a171eea0ecf194 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 07:05:09 +0000 Subject: [PATCH 02/10] pagespeed cleanup --- .../src/hooks/forms/UseInitPageSpeedForm.tsx | 62 +++++++++++++------ .../src/pages/pagespeed/PageSpeedConfig.tsx | 25 +++----- .../src/pages/pagespeed/PageSpeedCreate.tsx | 15 +---- client/src/pages/pagespeed/PageSpeedForm.tsx | 27 +++++--- client/src/validation/index.ts | 1 + client/src/validation/monitor.ts | 35 ++++++----- client/src/validation/pagespeed.ts | 15 +++++ client/src/validation/zod.ts | 53 +--------------- 8 files changed, 106 insertions(+), 127 deletions(-) create mode 100644 client/src/validation/pagespeed.ts diff --git a/client/src/hooks/forms/UseInitPageSpeedForm.tsx b/client/src/hooks/forms/UseInitPageSpeedForm.tsx index 7c080c608..a26cc67d0 100644 --- a/client/src/hooks/forms/UseInitPageSpeedForm.tsx +++ b/client/src/hooks/forms/UseInitPageSpeedForm.tsx @@ -1,31 +1,53 @@ -import { monitorSchemaPageSpeed } from "@/validation/zod"; +import humanInterval from "human-interval"; +import type { IMonitor } from "@/types/monitor"; import ms from "ms"; import { useMemo } from "react"; +import type { FormValues, SubmitValues } from "@/pages/pagespeed/PageSpeedForm"; -import { z } from "zod"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: IMonitor | undefined; }) => { return useMemo(() => { - let humanInterval = "3 minutes"; - if (initialData?.interval) { - const parsed = Number(initialData.interval); - if (!isNaN(parsed)) { - humanInterval = ms(parsed, { long: true }); - } - } - - const defaults: z.infer = { - type: "pagespeed", - url: initialData?.url || "", - n: initialData?.n || 3, - notificationChannels: initialData?.notificationChannels || [], - name: initialData?.name || "", - interval: humanInterval, - rejectUnauthorized: true, + const apiToForm = (apiData: IMonitor): FormValues => { + console.log(JSON.stringify(apiData)); + return { + type: apiData.type, + url: apiData.url, + n: apiData.n, + notificationChannels: apiData.notificationChannels, + name: apiData.name, + interval: ms(apiData.interval, { long: true }), + rejectUnauthorized: apiData.rejectUnauthorized, + }; }; - return { defaults }; + + const formToApi = (form: FormValues): SubmitValues => { + const submitData: SubmitValues = { + type: form.type, + url: form.url, + n: form.n, + notificationChannels: form.notificationChannels, + name: form.name, + interval: humanInterval(form.interval), + rejectUnauthorized: form.rejectUnauthorized, + }; + return submitData; + }; + + const defaults: FormValues = initialData + ? apiToForm(initialData) + : { + type: "pagespeed", + url: "", + n: 3, + notificationChannels: [], + name: "", + interval: "3 minutes", + rejectUnauthorized: true, + }; + + return { defaults, formToApi }; }, [initialData]); }; diff --git a/client/src/pages/pagespeed/PageSpeedConfig.tsx b/client/src/pages/pagespeed/PageSpeedConfig.tsx index 5a291406b..7f6cb91bc 100644 --- a/client/src/pages/pagespeed/PageSpeedConfig.tsx +++ b/client/src/pages/pagespeed/PageSpeedConfig.tsx @@ -1,21 +1,14 @@ -import { monitorSchemaPageSpeed } from "@/validation/zod"; import { useGet, usePatch } from "@/hooks/UseApi"; import { PageSpeedForm } from "@/pages/pagespeed/PageSpeedForm"; import { useParams } from "react-router"; import type { ApiResponse } from "@/types/api"; -import humanInterval from "human-interval"; -import { z } from "zod"; import { useNavigate } from "react-router"; import type { INotificationChannel } from "@/types/notification-channel"; import type { IMonitor } from "@/types/monitor"; +import type { SubmitValues } from "@/pages/pagespeed/PageSpeedForm"; const PageSpeedConfigurePage = () => { - type FormValues = z.infer; - type SubmitValues = Omit & { - interval: number | undefined; - }; - const { id } = useParams(); const navigate = useNavigate(); const { response } = useGet>( @@ -29,16 +22,12 @@ const PageSpeedConfigurePage = () => { const { patch, loading, error } = usePatch, IMonitor>(); - const onSubmit = async (data: FormValues) => { - let interval = humanInterval(data.interval); - if (!interval) interval = 180000; - const submitData = { - type: data.type, - name: data.name, - notificationChannels: data.notificationChannels, - interval, - }; - const result = await patch(`/monitors/${id}`, submitData); + if (!monitor) { + return null; + } + + const onSubmit = async (data: SubmitValues) => { + const result = await patch(`/monitors/${id}`, data); if (result) { navigate(`/pagespeed/${id}`); } else { diff --git a/client/src/pages/pagespeed/PageSpeedCreate.tsx b/client/src/pages/pagespeed/PageSpeedCreate.tsx index 744daae7a..bc490edac 100644 --- a/client/src/pages/pagespeed/PageSpeedCreate.tsx +++ b/client/src/pages/pagespeed/PageSpeedCreate.tsx @@ -1,28 +1,19 @@ import { PageSpeedForm } from "@/pages/pagespeed/PageSpeedForm"; -import humanInterval from "human-interval"; -import { z } from "zod"; -import { monitorSchema } from "@/validation"; import { useGet, usePost } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import { useNavigate } from "react-router"; import type { INotificationChannel } from "@/types/notification-channel"; +import type { SubmitValues } from "@/pages/pagespeed/PageSpeedForm"; const UptimeCreatePage = () => { - type FormValues = z.infer; - type SubmitValues = Omit & { - interval: number | undefined; - }; const navigate = useNavigate(); const { response } = useGet>( "/notification-channels" ); const { post, loading, error } = usePost(); - const onSubmit = async (data: FormValues) => { - let interval = humanInterval(data.interval); - if (!interval) interval = 60000; - const submitData = { ...data, interval }; - const result = await post("/monitors", submitData); + const onSubmit = async (data: SubmitValues) => { + const result = await post("/monitors", data); if (result) { navigate("/pagespeed"); } else { diff --git a/client/src/pages/pagespeed/PageSpeedForm.tsx b/client/src/pages/pagespeed/PageSpeedForm.tsx index 865c8b65f..9a0c92979 100644 --- a/client/src/pages/pagespeed/PageSpeedForm.tsx +++ b/client/src/pages/pagespeed/PageSpeedForm.tsx @@ -13,7 +13,7 @@ import { Typography } from "@mui/material"; import { useEffect, useState, useRef } from "react"; import { useTranslation } from "react-i18next"; -import { monitorSchemaPageSpeed } from "@/validation/zod"; +import { monitorSchemaPageSpeed } from "@/validation"; import { z } from "zod"; import { zodResolver } from "@hookform/resolvers/zod"; import { @@ -24,8 +24,15 @@ import { } from "react-hook-form"; import { useTheme } from "@mui/material/styles"; import { useInitForm } from "@/hooks/forms/UseInitPageSpeedForm"; +import type { IMonitor } from "@/types/monitor"; -type FormValues = z.infer; +export type FormValues = z.infer; +export type SubmitValues = Omit< + z.infer, + "interval" +> & { + interval: number | undefined; +}; export const PageSpeedForm = ({ mode = "create", @@ -35,14 +42,14 @@ export const PageSpeedForm = ({ loading, }: { mode?: "create" | "configure"; - initialData?: Partial; - onSubmit: SubmitHandler; + initialData?: IMonitor; + onSubmit: SubmitHandler; notificationOptions: any[]; loading: boolean; }) => { const { t } = useTranslation(); const theme = useTheme(); - const { defaults } = useInitForm({ initialData: initialData }); + const { defaults, formToApi } = useInitForm({ initialData: initialData }); const urlInputRef = useRef(null); const [selectedProtocol, setSelectedProtocol] = useState("https"); @@ -92,13 +99,13 @@ export const PageSpeedForm = ({ } }, [selectedProtocol]); - const notificationChannels = useWatch({ - control, - name: "notificationChannels", - }); + const notificationChannels = + useWatch({ control, name: "notificationChannels" }) || []; + + const submitForm = (data: FormValues) => onSubmit(formToApi(data) as any); return ( - + { - // if (!val || val.trim() === "") return; - const ms = humanInterval(val); +export const durationSchema = (minInterval: number) => + z.string().superRefine((val, ctx) => { + const milis = humanInterval(val); - if (!ms || isNaN(ms)) { - ctx.addIssue({ - code: "custom", - message: "Invalid duration format", - }); - } else if (ms < 10000) { - ctx.addIssue({ - code: "custom", - message: "Minimum duration is 10 seconds", - }); - } -}); + if (!milis || isNaN(milis)) { + ctx.addIssue({ + code: "custom", + message: "Invalid duration format", + }); + } else if (milis < minInterval) { + ctx.addIssue({ + code: "custom", + message: `Minimum duration is ${ms(minInterval, { long: true })}`, + }); + } + }); export const monitorSchema = z .object({ @@ -31,7 +32,7 @@ export const monitorSchema = z port: z.coerce.number().optional(), notificationChannels: z.array(z.string()).optional().default([]), name: z.string().min(1, "Display name is required"), - interval: durationSchema, + interval: durationSchema(10000), rejectUnauthorized: z.boolean().default(true), }) .superRefine((data, ctx) => { diff --git a/client/src/validation/pagespeed.ts b/client/src/validation/pagespeed.ts new file mode 100644 index 000000000..bfb3e6df2 --- /dev/null +++ b/client/src/validation/pagespeed.ts @@ -0,0 +1,15 @@ +import { z } from "zod"; +import { urlRegex, durationSchema } from "@/validation"; + +export const monitorSchemaPageSpeed = z.object({ + type: z.string().min(1, "You must select an option"), + url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), + n: z.coerce + .number({ message: "Number required" }) + .min(1, "Minimum value is 1") + .max(25, "Maximum value is 25"), + notificationChannels: z.array(z.string()).optional().default([]), + name: z.string().min(1, "Display name is required"), + interval: durationSchema(180000), + rejectUnauthorized: z.boolean().default(true), +}); diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index 2a5cd5afb..8f8976990 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -6,44 +6,8 @@ import { MaintenanceRepeats } from "@/types/maintenance"; const urlRegex = /^(https?:\/\/)?(localhost|([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}|[a-zA-Z0-9-]+|(\d{1,3}\.){3}\d{1,3})(:\d{1,5})?(\/.*)?$/; -const durationSchema = z - .string() - .optional() - .superRefine((val, ctx) => { - if (!val || val.trim() === "") return; - const ms = humanInterval(val); - - if (!ms || isNaN(ms)) { - ctx.addIssue({ - code: "custom", - message: "Invalid duration format", - }); - } else if (ms < 10000) { - ctx.addIssue({ - code: "custom", - message: "Minimum duration is 10 seconds", - }); - } - }); -const durationSchemaPageSpeed = z - .string() - .optional() - .superRefine((val, ctx) => { - if (!val || val.trim() === "") return; - const ms = humanInterval(val); - - if (!ms || isNaN(ms)) { - ctx.addIssue({ - code: "custom", - message: "Invalid duration format", - }); - } else if (ms < 180000) { - ctx.addIssue({ - code: "custom", - message: "Minimum duration is 3 minutes", - }); - } - }); +// monitor duration schema moved to client/src/validation/monitor.ts +// pagespeed duration schema moved to client/src/validation/pagespeed.ts const durationSchemaInfra = z .string() .optional() @@ -73,18 +37,7 @@ const optionalString = (schema: T) => // moved to client/src/validation/monitor.ts -export const monitorSchemaPageSpeed = z.object({ - type: z.string().min(1, "You must select an option"), - url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), - n: z.coerce - .number({ message: "Number required" }) - .min(1, "Minimum value is 1") - .max(25, "Maximum value is 25"), - notificationChannels: z.array(z.string()).optional().default([]), - name: z.string().min(1, "Display name is required"), - interval: durationSchemaPageSpeed, - rejectUnauthorized: z.boolean().default(true), -}); +// moved to client/src/validation/pagespeed.ts export const monitorSchemaInfra = z.object({ type: z.string().min(1, "You must select an option"), url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), From 4dfeb71a9db05cbeb67b56c98be7b5b62eb8f934 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 18:35:14 +0000 Subject: [PATCH 03/10] infra refactor --- client/src/hooks/forms/UseInitInfraForm.tsx | 83 ++++++++++------ client/src/hooks/forms/UseInitMonitorFrom.tsx | 1 - .../src/pages/infrastructure/InfraConfig.tsx | 28 ++---- .../src/pages/infrastructure/InfraCreate.tsx | 16 +--- client/src/pages/infrastructure/InfraForm.tsx | 24 +++-- .../pages/infrastructure/InfraMonitors.tsx | 4 +- client/src/pages/uptime/UptimeForm.tsx | 1 - client/src/types/monitor.ts | 7 ++ client/src/validation/index.ts | 2 + client/src/validation/infra.ts | 74 +++++++++++++++ client/src/validation/monitor.ts | 22 +---- client/src/validation/pagespeed.ts | 2 +- client/src/validation/utils.ts | 23 +++++ client/src/validation/zod.ts | 95 +------------------ 14 files changed, 195 insertions(+), 187 deletions(-) create mode 100644 client/src/validation/infra.ts create mode 100644 client/src/validation/utils.ts diff --git a/client/src/hooks/forms/UseInitInfraForm.tsx b/client/src/hooks/forms/UseInitInfraForm.tsx index fa95e920f..9a688b382 100644 --- a/client/src/hooks/forms/UseInitInfraForm.tsx +++ b/client/src/hooks/forms/UseInitInfraForm.tsx @@ -1,39 +1,66 @@ -import { monitorSchemaInfra } from "@/validation/zod"; import ms from "ms"; import { useMemo } from "react"; +import type { + FormValues, + SubmitValues, +} from "@/pages/infrastructure/InfraForm"; +import type { IMonitor } from "@/types/monitor"; +import humanInterval from "human-interval"; -import { z } from "zod"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: IMonitor | undefined; }) => { return useMemo(() => { - let humanInterval = "1 minute"; - if (initialData?.interval) { - const parsed = Number(initialData.interval); - if (!isNaN(parsed)) { - humanInterval = ms(parsed, { long: true }); - } - } - - type InfraValues = z.infer; - const defaults: InfraValues = { - type: "infrastructure", - url: initialData?.url || "", - secret: initialData?.secret || "", - n: initialData?.n || 3, - notificationChannels: initialData?.notificationChannels || [], - name: initialData?.name || "", - interval: humanInterval, - rejectUnauthorized: true, - thresholds: initialData?.thresholds ?? { - cpu: 100, - memory: 100, - disk: 100, - temperature: 100, - }, + const apiToForm = (apiData: IMonitor): FormValues => { + const formData: FormValues = { + type: apiData.type, + url: apiData.url, + secret: apiData.secret, + n: apiData.n, + notificationChannels: apiData.notificationChannels, + name: apiData.name, + interval: ms(apiData.interval, { long: true }), + rejectUnauthorized: apiData.rejectUnauthorized, + thresholds: apiData.thresholds, + }; + return formData; }; - return { defaults }; + + const formToApi = (formData: FormValues): SubmitValues => { + const submitData: SubmitValues = { + type: formData.type, + url: formData.url, + secret: formData.secret, + n: formData.n, + notificationChannels: formData.notificationChannels, + name: formData.name, + interval: humanInterval(formData.interval), + rejectUnauthorized: formData.rejectUnauthorized, + thresholds: formData.thresholds, + }; + return submitData; + }; + + const defaults: FormValues = initialData + ? apiToForm(initialData) + : { + type: "infrastructure", + url: "", + secret: "", + n: 3, + notificationChannels: [], + name: "", + interval: "1 minute", + rejectUnauthorized: true, + thresholds: { + cpu: 100, + memory: 100, + disk: 100, + temperature: 100, + }, + }; + return { defaults, apiToForm, formToApi }; }, [initialData]); }; diff --git a/client/src/hooks/forms/UseInitMonitorFrom.tsx b/client/src/hooks/forms/UseInitMonitorFrom.tsx index e7b12da65..8535ed659 100644 --- a/client/src/hooks/forms/UseInitMonitorFrom.tsx +++ b/client/src/hooks/forms/UseInitMonitorFrom.tsx @@ -2,7 +2,6 @@ import { useMemo } from "react"; import humanInterval from "human-interval"; import type { FormValues, SubmitValues } from "@/pages/uptime/UptimeForm"; import type { IMonitor } from "@/types/monitor"; - import ms from "ms"; export const useInitForm = ({ diff --git a/client/src/pages/infrastructure/InfraConfig.tsx b/client/src/pages/infrastructure/InfraConfig.tsx index 7dede1076..0d640e416 100644 --- a/client/src/pages/infrastructure/InfraConfig.tsx +++ b/client/src/pages/infrastructure/InfraConfig.tsx @@ -1,21 +1,15 @@ -import { monitorSchemaInfra } from "@/validation/zod"; +import { monitorSchemaInfra } from "@/validation"; import { useGet, usePatch } from "@/hooks/UseApi"; import { InfraForm } from "@/pages/infrastructure/InfraForm"; import { useParams } from "react-router"; import type { ApiResponse } from "@/types/api"; -import humanInterval from "human-interval"; -import { z } from "zod"; import { useNavigate } from "react-router"; import type { INotificationChannel } from "@/types/notification-channel"; import type { IMonitor } from "@/types/monitor"; +import type { SubmitValues } from "@/pages/infrastructure/InfraForm"; const InfraConfigurePage = () => { - type FormValues = z.infer; - type SubmitValues = Omit & { - interval: number | undefined; - }; - const { id } = useParams(); const navigate = useNavigate(); const { response } = useGet>( @@ -29,20 +23,12 @@ const InfraConfigurePage = () => { const { patch, loading, error } = usePatch, IMonitor>(); - const onSubmit = async (data: FormValues) => { - let interval = humanInterval(data.interval); - if (!interval) interval = 180000; - const submitData = { - type: data.type, - secret: data.secret, - name: data.name, - notificationChannels: data.notificationChannels, - thresholds: data.thresholds, - interval, - }; + if (!monitor) { + return null; + } - - const result = await patch(`/monitors/${id}`, submitData); + const onSubmit = async (data: SubmitValues) => { + const result = await patch(`/monitors/${id}`, data); if (result) { navigate(`/infrastructure/${id}`); } else { diff --git a/client/src/pages/infrastructure/InfraCreate.tsx b/client/src/pages/infrastructure/InfraCreate.tsx index 21b571183..042f065a3 100644 --- a/client/src/pages/infrastructure/InfraCreate.tsx +++ b/client/src/pages/infrastructure/InfraCreate.tsx @@ -1,27 +1,19 @@ import { InfraForm } from "@/pages/infrastructure/InfraForm"; -import humanInterval from "human-interval"; import { useNavigate } from "react-router"; -import { z } from "zod"; -import { monitorSchemaInfra } from "@/validation/zod"; import { useGet, usePost } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import type { INotificationChannel } from "@/types/notification-channel"; +import type { SubmitValues } from "@/pages/infrastructure/InfraForm"; + const InfraCreatePage = () => { - type FormValues = z.infer; - type SubmitValues = Omit & { - interval: number | undefined; - }; const { response } = useGet>( "/notification-channels" ); const { post, loading, error } = usePost(); const navigate = useNavigate(); - const onSubmit = async (data: FormValues) => { - let interval = humanInterval(data.interval); - if (!interval) interval = 60000; - const submitData = { ...data, interval }; - const result = await post("/monitors", submitData); + const onSubmit = async (data: SubmitValues) => { + const result = await post("/monitors", data); if (result) { navigate("/infrastructure"); } else { diff --git a/client/src/pages/infrastructure/InfraForm.tsx b/client/src/pages/infrastructure/InfraForm.tsx index aa50ae177..12d30c8b0 100644 --- a/client/src/pages/infrastructure/InfraForm.tsx +++ b/client/src/pages/infrastructure/InfraForm.tsx @@ -13,7 +13,7 @@ import { Typography } from "@mui/material"; import { useEffect, useState, useRef } from "react"; import { useTranslation } from "react-i18next"; -import { monitorSchemaInfra } from "@/validation/zod"; +import { monitorSchemaInfra } from "@/validation"; import { z } from "zod"; import { zodResolver } from "@hookform/resolvers/zod"; import { @@ -24,8 +24,12 @@ import { } from "react-hook-form"; import { useTheme } from "@mui/material/styles"; import { useInitForm } from "@/hooks/forms/UseInitInfraForm"; +import type { IMonitor } from "@/types/monitor"; -type FormValues = z.infer; +export type FormValues = z.infer; +export type SubmitValues = Omit & { + interval: number | undefined; +}; export const InfraForm = ({ mode = "create", @@ -35,14 +39,14 @@ export const InfraForm = ({ loading, }: { mode?: "create" | "configure"; - initialData?: Partial; - onSubmit: SubmitHandler; + initialData?: IMonitor; + onSubmit: SubmitHandler; notificationOptions: any[]; loading: boolean; }) => { const { t } = useTranslation(); const theme = useTheme(); - const { defaults } = useInitForm({ initialData: initialData }); + const { defaults, formToApi } = useInitForm({ initialData: initialData }); const urlInputRef = useRef(null); const [selectedProtocol, setSelectedProtocol] = useState("https"); @@ -97,8 +101,12 @@ export const InfraForm = ({ name: "notificationChannels", }); + const submitForm = (formData: FormValues) => { + onSubmit(formToApi(formData)); + }; + return ( - + - {notificationChannels.map((notificationId) => { + {notificationChannels.map((notificationId: string) => { const option = notificationOptions.find( (o: any) => o._id === notificationId ); @@ -321,7 +329,7 @@ export const InfraForm = ({ strokeWidth={1.5} onClick={() => { const updated = notificationChannels.filter( - (id) => id !== notificationId + (id: string) => id !== notificationId ); setValue("notificationChannels", updated); }} diff --git a/client/src/pages/infrastructure/InfraMonitors.tsx b/client/src/pages/infrastructure/InfraMonitors.tsx index 80bfb1472..a82d38fb7 100644 --- a/client/src/pages/infrastructure/InfraMonitors.tsx +++ b/client/src/pages/infrastructure/InfraMonitors.tsx @@ -24,7 +24,7 @@ import { useLimitReached } from "@/hooks/UsePlanEntitlements"; const GLOBAL_REFRESH = config.GLOBAL_REFRESH; -const PageSpeedMonitorsPage = () => { +const InfraMonitorsPage = () => { const theme = useTheme(); const { t } = useTranslation(); const isSmall = useMediaQuery(theme.breakpoints.down("md")); @@ -131,4 +131,4 @@ const PageSpeedMonitorsPage = () => { ); }; -export default PageSpeedMonitorsPage; +export default InfraMonitorsPage; diff --git a/client/src/pages/uptime/UptimeForm.tsx b/client/src/pages/uptime/UptimeForm.tsx index 0904b68c2..e4127ecc9 100644 --- a/client/src/pages/uptime/UptimeForm.tsx +++ b/client/src/pages/uptime/UptimeForm.tsx @@ -104,7 +104,6 @@ export const UptimeForm = ({ } else { setValue("url", `${selectedType}://${url}`); } - // eslint-disable-next-line react-hooks/exhaustive-deps }, [selectedType, setValue]); useEffect(() => { diff --git a/client/src/types/monitor.ts b/client/src/types/monitor.ts index b59fa4819..489cef221 100644 --- a/client/src/types/monitor.ts +++ b/client/src/types/monitor.ts @@ -39,6 +39,13 @@ export interface IMonitor { updatedAt: string; updatedBy: string; url: string; + secret: string; + thresholds: { + cpu: number; + memory: number; + disk: number; + temperature: number; + }; __v: number; _id: string; } diff --git a/client/src/validation/index.ts b/client/src/validation/index.ts index 5db3f3e4c..3d3737a96 100644 --- a/client/src/validation/index.ts +++ b/client/src/validation/index.ts @@ -3,3 +3,5 @@ export * from "./login"; export * from "./register"; export * from "./monitor"; export * from "./pagespeed"; +export * from "./infra"; +export * from "./utils"; diff --git a/client/src/validation/infra.ts b/client/src/validation/infra.ts new file mode 100644 index 000000000..4d5bca693 --- /dev/null +++ b/client/src/validation/infra.ts @@ -0,0 +1,74 @@ +import { z } from "zod"; +import { urlRegex, durationSchema } from "@/validation/utils"; + +export const monitorSchemaInfra = z.object({ + type: z.string().min(1, "You must select an option"), + url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), + secret: z.string().min(1, "Secret is required"), + n: z.coerce + .number({ message: "Number required" }) + .min(1, "Minimum value is 1") + .max(25, "Maximum value is 25"), + notificationChannels: z.array(z.string()).optional().default([]), + name: z.string().min(1, "Display name is required"), + interval: durationSchema(60000), + rejectUnauthorized: z.boolean().default(true), + thresholds: z.object({ + cpu: z.preprocess( + (val) => (typeof val === "number" ? String(val) : val), + z + .string() + .trim() + .min(1, { message: "CPU threshold is required" }) + .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { + message: "CPU must be a number", + }) + .transform((v) => Number(v)) + .refine((v) => v >= 0 && v <= 100, { + message: "CPU must be between 0 and 100", + }) + ), + memory: z.preprocess( + (val) => (typeof val === "number" ? String(val) : val), + z + .string() + .trim() + .min(1, { message: "Memory threshold is required" }) + .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { + message: "Memory must be a number", + }) + .transform((v) => Number(v)) + .refine((v) => v >= 0 && v <= 100, { + message: "Memory must be between 0 and 100", + }) + ), + disk: z.preprocess( + (val) => (typeof val === "number" ? String(val) : val), + z + .string() + .trim() + .min(1, { message: "Disk threshold is required" }) + .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { + message: "Disk must be a number", + }) + .transform((v) => Number(v)) + .refine((v) => v >= 0 && v <= 100, { + message: "Disk must be between 0 and 100", + }) + ), + temperature: z.preprocess( + (val) => (typeof val === "number" ? String(val) : val), + z + .string() + .trim() + .min(1, { message: "Temperature threshold is required" }) + .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { + message: "Temperature must be a number", + }) + .transform((v) => Number(v)) + .refine((v) => v >= -50 && v <= 150, { + message: "Temperature must be between -50 and 150", + }) + ), + }), +}); diff --git a/client/src/validation/monitor.ts b/client/src/validation/monitor.ts index 4235cfc92..21278dc7b 100644 --- a/client/src/validation/monitor.ts +++ b/client/src/validation/monitor.ts @@ -1,25 +1,5 @@ import { z } from "zod"; -import humanInterval from "human-interval"; -import ms from "ms"; -export const urlRegex = - /^(https?:\/\/)?(localhost|([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}|[a-zA-Z0-9-]+|(\d{1,3}\.){3}\d{1,3})(:\d{1,5})?(\/.*)?$/; - -export const durationSchema = (minInterval: number) => - z.string().superRefine((val, ctx) => { - const milis = humanInterval(val); - - if (!milis || isNaN(milis)) { - ctx.addIssue({ - code: "custom", - message: "Invalid duration format", - }); - } else if (milis < minInterval) { - ctx.addIssue({ - code: "custom", - message: `Minimum duration is ${ms(minInterval, { long: true })}`, - }); - } - }); +import { urlRegex, durationSchema } from "@/validation/utils"; export const monitorSchema = z .object({ diff --git a/client/src/validation/pagespeed.ts b/client/src/validation/pagespeed.ts index bfb3e6df2..496b69c55 100644 --- a/client/src/validation/pagespeed.ts +++ b/client/src/validation/pagespeed.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import { urlRegex, durationSchema } from "@/validation"; +import { urlRegex, durationSchema } from "@/validation/utils"; export const monitorSchemaPageSpeed = z.object({ type: z.string().min(1, "You must select an option"), diff --git a/client/src/validation/utils.ts b/client/src/validation/utils.ts new file mode 100644 index 000000000..c4dc597c2 --- /dev/null +++ b/client/src/validation/utils.ts @@ -0,0 +1,23 @@ +import { z } from "zod"; +import humanInterval from "human-interval"; +import ms from "ms"; + +export const urlRegex = + /^(https?:\/\/)?(localhost|([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}|[a-zA-Z0-9-]+|(\d{1,3}\.){3}\d{1,3})(:\d{1,5})?(\/.*)?$/; + +export const durationSchema = (minInterval: number) => + z.string().superRefine((val, ctx) => { + const milis = humanInterval(val); + + if (!milis || isNaN(milis)) { + ctx.addIssue({ + code: "custom", + message: "Invalid duration format", + }); + } else if (milis < minInterval) { + ctx.addIssue({ + code: "custom", + message: `Minimum duration is ${ms(minInterval, { long: true })}`, + }); + } + }); diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index 8f8976990..c7378636e 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import humanInterval from "human-interval"; +// humanInterval moved to split schema files import { ChannelTypes } from "@/types/notification-channel"; import { MaintenanceRepeats } from "@/types/maintenance"; @@ -8,25 +8,7 @@ const urlRegex = // monitor duration schema moved to client/src/validation/monitor.ts // pagespeed duration schema moved to client/src/validation/pagespeed.ts -const durationSchemaInfra = z - .string() - .optional() - .superRefine((val, ctx) => { - if (!val || val.trim() === "") return; - const ms = humanInterval(val); - - if (!ms || isNaN(ms)) { - ctx.addIssue({ - code: "custom", - message: "Invalid duration format", - }); - } else if (ms < 60000) { - ctx.addIssue({ - code: "custom", - message: "Minimum duration is 1 minute", - }); - } - }); +// infra duration schema moved to client/src/validation/infra.ts const optionalString = (schema: T) => z.preprocess( @@ -38,78 +20,7 @@ const optionalString = (schema: T) => // moved to client/src/validation/monitor.ts // moved to client/src/validation/pagespeed.ts -export const monitorSchemaInfra = z.object({ - type: z.string().min(1, "You must select an option"), - url: z.string().min(1, "URL is required").regex(urlRegex, "Invalid URL"), - secret: z.string().min(1, "Secret is required"), - n: z.coerce - .number({ message: "Number required" }) - .min(1, "Minimum value is 1") - .max(25, "Maximum value is 25"), - notificationChannels: z.array(z.string()).optional().default([]), - name: z.string().min(1, "Display name is required"), - interval: durationSchemaInfra, - rejectUnauthorized: z.boolean().default(true), - thresholds: z.object({ - // Accept both strings and numbers from the form. Enforce required and ranges with clear messages. - cpu: z.preprocess( - (val) => (typeof val === "number" ? String(val) : val), - z - .string() - .trim() - .min(1, { message: "CPU threshold is required" }) - .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { - message: "CPU must be a number", - }) - .transform((v) => Number(v)) - .refine((v) => v >= 0 && v <= 100, { - message: "CPU must be between 0 and 100", - }) - ), - memory: z.preprocess( - (val) => (typeof val === "number" ? String(val) : val), - z - .string() - .trim() - .min(1, { message: "Memory threshold is required" }) - .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { - message: "Memory must be a number", - }) - .transform((v) => Number(v)) - .refine((v) => v >= 0 && v <= 100, { - message: "Memory must be between 0 and 100", - }) - ), - disk: z.preprocess( - (val) => (typeof val === "number" ? String(val) : val), - z - .string() - .trim() - .min(1, { message: "Disk threshold is required" }) - .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { - message: "Disk must be a number", - }) - .transform((v) => Number(v)) - .refine((v) => v >= 0 && v <= 100, { - message: "Disk must be between 0 and 100", - }) - ), - temperature: z.preprocess( - (val) => (typeof val === "number" ? String(val) : val), - z - .string() - .trim() - .min(1, { message: "Temperature threshold is required" }) - .refine((v) => /^-?\d+(\.\d+)?$/.test(v), { - message: "Temperature must be a number", - }) - .transform((v) => Number(v)) - .refine((v) => v >= -50 && v <= 150, { - message: "Temperature must be between -50 and 150", - }) - ), - }), -}); +// moved to client/src/validation/infra.ts export const teamSchema = z.object({ name: z.string().min(1, "Team name is required"), From e55ae642223ca5bb4c955f49e572974dcf909c5c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 18:59:05 +0000 Subject: [PATCH 04/10] infra and notification --- .../forms/UseInitNotificationsChannelForm.tsx | 2 +- .../src/pages/infrastructure/InfraConfig.tsx | 1 - .../NotificationChannelsConfig.tsx | 2 +- .../NotificationChannelsCreate.tsx | 2 +- .../NotificationChannelsForm.tsx | 3 +- client/src/validation/index.ts | 1 + client/src/validation/notification-channel.ts | 44 ++++++++++++++++++ client/src/validation/zod.ts | 45 +------------------ 8 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 client/src/validation/notification-channel.ts diff --git a/client/src/hooks/forms/UseInitNotificationsChannelForm.tsx b/client/src/hooks/forms/UseInitNotificationsChannelForm.tsx index c0b1ba95c..e215d6f52 100644 --- a/client/src/hooks/forms/UseInitNotificationsChannelForm.tsx +++ b/client/src/hooks/forms/UseInitNotificationsChannelForm.tsx @@ -1,4 +1,4 @@ -import { notificationChannelSchema } from "@/validation/zod"; +import { notificationChannelSchema } from "@/validation"; import { useMemo } from "react"; import { z } from "zod"; diff --git a/client/src/pages/infrastructure/InfraConfig.tsx b/client/src/pages/infrastructure/InfraConfig.tsx index 0d640e416..e0d0956d5 100644 --- a/client/src/pages/infrastructure/InfraConfig.tsx +++ b/client/src/pages/infrastructure/InfraConfig.tsx @@ -1,4 +1,3 @@ -import { monitorSchemaInfra } from "@/validation"; import { useGet, usePatch } from "@/hooks/UseApi"; import { InfraForm } from "@/pages/infrastructure/InfraForm"; diff --git a/client/src/pages/notification-channels/NotificationChannelsConfig.tsx b/client/src/pages/notification-channels/NotificationChannelsConfig.tsx index 5b71fd47a..7cb12d9c4 100644 --- a/client/src/pages/notification-channels/NotificationChannelsConfig.tsx +++ b/client/src/pages/notification-channels/NotificationChannelsConfig.tsx @@ -5,7 +5,7 @@ import { useNavigate } from "react-router"; import { z } from "zod"; import { usePatch, useGet } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { notificationChannelSchema } from "@/validation/zod"; +import { notificationChannelSchema } from "@/validation"; import type { INotificationChannel } from "@/types/notification-channel"; type FormValues = z.infer; diff --git a/client/src/pages/notification-channels/NotificationChannelsCreate.tsx b/client/src/pages/notification-channels/NotificationChannelsCreate.tsx index 0890f410b..bbfc0c0cc 100644 --- a/client/src/pages/notification-channels/NotificationChannelsCreate.tsx +++ b/client/src/pages/notification-channels/NotificationChannelsCreate.tsx @@ -3,7 +3,7 @@ import { NotificationChannelsForm } from "./NotificationChannelsForm"; import { useNavigate } from "react-router"; import { z } from "zod"; import { usePost } from "@/hooks/UseApi"; -import { notificationChannelSchema } from "@/validation/zod"; +import { notificationChannelSchema } from "@/validation"; import type { INotificationChannel } from "@/types/notification-channel"; type FormValues = z.infer; diff --git a/client/src/pages/notification-channels/NotificationChannelsForm.tsx b/client/src/pages/notification-channels/NotificationChannelsForm.tsx index 422c6dd6c..155106b83 100644 --- a/client/src/pages/notification-channels/NotificationChannelsForm.tsx +++ b/client/src/pages/notification-channels/NotificationChannelsForm.tsx @@ -10,7 +10,7 @@ import { ChannelTypes } from "@/types/notification-channel"; import { zodResolver } from "@hookform/resolvers/zod"; import { useTranslation } from "react-i18next"; import { z } from "zod"; -import { notificationChannelSchema } from "@/validation/zod"; +import { notificationChannelSchema } from "@/validation"; import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitNotificationsChannelForm"; @@ -79,6 +79,7 @@ export const NotificationChannelsForm = ({ ( { + const { type, config } = data; + if (!config.url && !config.emailAddress) { + ctx.addIssue({ + code: "custom", + message: "Either a URL or an email address must be provided.", + path: ["config"], + }); + } + + if (type === "email" && !config.emailAddress) { + ctx.addIssue({ + code: "custom", + message: "Email address is required for email-type channels.", + path: ["config", "emailAddress"], + }); + } else if (type !== "email" && !config.url) { + ctx.addIssue({ + code: "custom", + message: "URL is required for non-email-type channels.", + path: ["config", "url"], + }); + } + }); diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index c7378636e..b2e0f17a2 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -1,10 +1,8 @@ import { z } from "zod"; // humanInterval moved to split schema files -import { ChannelTypes } from "@/types/notification-channel"; import { MaintenanceRepeats } from "@/types/maintenance"; -const urlRegex = - /^(https?:\/\/)?(localhost|([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}|[a-zA-Z0-9-]+|(\d{1,3}\.){3}\d{1,3})(:\d{1,5})?(\/.*)?$/; +// urlRegex moved to client/src/validation/utils.ts // monitor duration schema moved to client/src/validation/monitor.ts // pagespeed duration schema moved to client/src/validation/pagespeed.ts @@ -41,46 +39,7 @@ export const inviteSchema = z.object({ orgRoleId: z.string().optional(), }); -export const notificationChannelSchema = z - .object({ - name: z.string().min(1, "Channel name is required"), - type: z.enum(ChannelTypes, { error: "Invalid channel type" }), - config: z.object({ - url: z - .string() - .regex(urlRegex, "Invalid URL") - .or(z.literal("")) - .optional(), - emailAddress: z - .email("Invalid email address") - .or(z.literal("")) - .optional(), - }), - }) - .superRefine((data, ctx) => { - const { type, config } = data; - if (!config.url && !config.emailAddress) { - ctx.addIssue({ - code: "custom", - message: "Either a URL or an email address must be provided.", - path: ["config"], - }); - } - - if (type === "email" && !config.emailAddress) { - ctx.addIssue({ - code: "custom", - message: "Email address is required for email-type channels.", - path: ["config", "emailAddress"], - }); - } else if (type !== "email" && !config.url) { - ctx.addIssue({ - code: "custom", - message: "URL is required for non-email-type channels.", - path: ["config", "url"], - }); - } - }); +// moved to client/src/validation/notification-channel.ts export const maintenanceSchema = z .object({ From 24cbcec2c96bc8ac1269a248a18c8562a516a7f9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 19:12:35 +0000 Subject: [PATCH 05/10] maintenance --- .../hooks/forms/UseInitMaintenanceForm.tsx | 7 ++--- .../pages/maintenance/MaintenanceConfig.tsx | 5 +--- .../pages/maintenance/MaintenanceCreate.tsx | 5 +--- .../src/pages/maintenance/MaintenanceForm.tsx | 4 +-- .../NotificationChannelsConfig.tsx | 5 +--- .../NotificationChannelsCreate.tsx | 5 +--- .../NotificationChannelsForm.tsx | 2 +- client/src/validation/index.ts | 1 + client/src/validation/maintenance.ts | 29 +++++++++++++++++++ client/src/validation/zod.ts | 28 ------------------ 10 files changed, 40 insertions(+), 51 deletions(-) create mode 100644 client/src/validation/maintenance.ts diff --git a/client/src/hooks/forms/UseInitMaintenanceForm.tsx b/client/src/hooks/forms/UseInitMaintenanceForm.tsx index e82d99543..5e2baee03 100644 --- a/client/src/hooks/forms/UseInitMaintenanceForm.tsx +++ b/client/src/hooks/forms/UseInitMaintenanceForm.tsx @@ -1,14 +1,13 @@ -import { maintenanceSchema } from "@/validation/zod"; import { useMemo } from "react"; +import type { FormValues } from "@/pages/maintenance/MaintenanceForm"; -import { z } from "zod"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: Partial | undefined; }) => { return useMemo(() => { - const defaults: z.infer = { + const defaults: FormValues = { name: initialData?.name || "", repeat: initialData?.repeat || "no repeat", startTime: initialData?.startTime diff --git a/client/src/pages/maintenance/MaintenanceConfig.tsx b/client/src/pages/maintenance/MaintenanceConfig.tsx index a35f4a9fa..d4187533b 100644 --- a/client/src/pages/maintenance/MaintenanceConfig.tsx +++ b/client/src/pages/maintenance/MaintenanceConfig.tsx @@ -2,13 +2,10 @@ import { MaintenanceForm } from "@/pages/maintenance/MaintenanceForm"; import { useParams } from "react-router"; import { useNavigate } from "react-router"; -import { z } from "zod"; import { usePatch, useGet } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { maintenanceSchema } from "@/validation/zod"; import type { IMonitor } from "@/types/monitor"; - -type FormValues = z.infer; +import type { FormValues } from "@/pages/maintenance/MaintenanceForm"; const MaintenanceConfigPage = () => { const { id } = useParams<{ id: string }>(); diff --git a/client/src/pages/maintenance/MaintenanceCreate.tsx b/client/src/pages/maintenance/MaintenanceCreate.tsx index dee0c734d..9d754a490 100644 --- a/client/src/pages/maintenance/MaintenanceCreate.tsx +++ b/client/src/pages/maintenance/MaintenanceCreate.tsx @@ -1,14 +1,11 @@ import { MaintenanceForm } from "@/pages/maintenance/MaintenanceForm"; import { useNavigate } from "react-router"; -import { z } from "zod"; import { usePost, useGet } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { maintenanceSchema } from "@/validation/zod"; import type { IMonitor } from "@/types/monitor"; import type { IMaintenance } from "@/types/maintenance"; - -type FormValues = z.infer; +import type { FormValues } from "@/pages/maintenance/MaintenanceForm"; const MaintenanceCreatePage = () => { const navigate = useNavigate(); diff --git a/client/src/pages/maintenance/MaintenanceForm.tsx b/client/src/pages/maintenance/MaintenanceForm.tsx index 9edf6ff28..388deb925 100644 --- a/client/src/pages/maintenance/MaintenanceForm.tsx +++ b/client/src/pages/maintenance/MaintenanceForm.tsx @@ -12,13 +12,13 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { useTranslation } from "react-i18next"; import { z } from "zod"; import { MaintenanceRepeats } from "@/types/maintenance"; -import { maintenanceSchema } from "@/validation/zod"; +import { maintenanceSchema } from "@/validation"; import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitMaintenanceForm"; import type { IMonitor } from "@/types/monitor"; -type FormValues = z.infer; +export type FormValues = z.infer; export const MaintenanceForm = ({ monitorOptions, diff --git a/client/src/pages/notification-channels/NotificationChannelsConfig.tsx b/client/src/pages/notification-channels/NotificationChannelsConfig.tsx index 7cb12d9c4..33eac8818 100644 --- a/client/src/pages/notification-channels/NotificationChannelsConfig.tsx +++ b/client/src/pages/notification-channels/NotificationChannelsConfig.tsx @@ -2,13 +2,10 @@ import { NotificationChannelsForm } from "./NotificationChannelsForm"; import { useParams } from "react-router"; import { useNavigate } from "react-router"; -import { z } from "zod"; import { usePatch, useGet } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { notificationChannelSchema } from "@/validation"; import type { INotificationChannel } from "@/types/notification-channel"; - -type FormValues = z.infer; +import type { FormValues } from "./NotificationChannelsForm"; const NotificationsChannelConfigPage = () => { const navigate = useNavigate(); diff --git a/client/src/pages/notification-channels/NotificationChannelsCreate.tsx b/client/src/pages/notification-channels/NotificationChannelsCreate.tsx index bbfc0c0cc..7137aa170 100644 --- a/client/src/pages/notification-channels/NotificationChannelsCreate.tsx +++ b/client/src/pages/notification-channels/NotificationChannelsCreate.tsx @@ -1,12 +1,9 @@ import { NotificationChannelsForm } from "./NotificationChannelsForm"; import { useNavigate } from "react-router"; -import { z } from "zod"; import { usePost } from "@/hooks/UseApi"; -import { notificationChannelSchema } from "@/validation"; import type { INotificationChannel } from "@/types/notification-channel"; - -type FormValues = z.infer; +import type { FormValues } from "./NotificationChannelsForm"; const NotificationsChannelCreatePage = () => { const { post, loading } = usePost(); diff --git a/client/src/pages/notification-channels/NotificationChannelsForm.tsx b/client/src/pages/notification-channels/NotificationChannelsForm.tsx index 155106b83..bfb1b0aab 100644 --- a/client/src/pages/notification-channels/NotificationChannelsForm.tsx +++ b/client/src/pages/notification-channels/NotificationChannelsForm.tsx @@ -17,7 +17,7 @@ import { useInitForm } from "@/hooks/forms/UseInitNotificationsChannelForm"; import { Typography } from "@mui/material"; import { useTheme } from "@mui/material/styles"; -type FormValues = z.infer; +export type FormValues = z.infer; export const NotificationChannelsForm = ({ initialData, diff --git a/client/src/validation/index.ts b/client/src/validation/index.ts index 156e7f5cb..dc36f74f2 100644 --- a/client/src/validation/index.ts +++ b/client/src/validation/index.ts @@ -6,3 +6,4 @@ export * from "./pagespeed"; export * from "./infra"; export * from "./utils"; export * from "./notification-channel"; +export * from "./maintenance"; diff --git a/client/src/validation/maintenance.ts b/client/src/validation/maintenance.ts new file mode 100644 index 000000000..edbe69103 --- /dev/null +++ b/client/src/validation/maintenance.ts @@ -0,0 +1,29 @@ +import { z } from "zod"; +import { MaintenanceRepeats } from "@/types/maintenance"; + +export const maintenanceSchema = z + .object({ + name: z.string().min(1, "Maintenance name is required"), + repeat: z.enum(MaintenanceRepeats), + startTime: z.date(), + endTime: z.date(), + monitors: z.array(z.string()), + }) + .superRefine((data, ctx) => { + if (data.endTime <= data.startTime) { + ctx.addIssue({ + code: "custom", + path: ["endTime"], + message: "End time must be after start time", + }); + } + + if (data.startTime === data.endTime) { + ctx.addIssue({ + code: "custom", + path: ["endTime"], + message: "Start time and end time cannot be the same", + }); + } + }); + diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index b2e0f17a2..3f1c87374 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -39,34 +39,6 @@ export const inviteSchema = z.object({ orgRoleId: z.string().optional(), }); -// moved to client/src/validation/notification-channel.ts - -export const maintenanceSchema = z - .object({ - name: z.string().min(1, "Maintenance name is required"), - repeat: z.enum(MaintenanceRepeats), - startTime: z.date(), - endTime: z.date(), - monitors: z.array(z.string()), - }) - .superRefine((data, ctx) => { - if (data.endTime <= data.startTime) { - ctx.addIssue({ - code: "custom", - path: ["endTime"], - message: "End time must be after start time", - }); - } - - if (data.startTime === data.endTime) { - ctx.addIssue({ - code: "custom", - path: ["endTime"], - message: "Start time and end time cannot be the same", - }); - } - }); - export const systemSettingsSchema = z.object({ systemEmailHost: optionalString( z.string().trim().min(1, { message: "SMTP host is required" }).max(255, { From 15ceb4af4600b8c587db0a9d50edec28b242bcbc Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 19:20:06 +0000 Subject: [PATCH 06/10] teams --- client/src/hooks/forms/UseInitTeamMemberForm.tsx | 2 +- client/src/hooks/forms/UseInitTeamsForm.tsx | 2 +- client/src/pages/teams/TeamMemberForm.tsx | 2 +- client/src/pages/teams/TeamsConfig.tsx | 2 +- client/src/pages/teams/TeamsCreate.tsx | 2 +- client/src/pages/teams/TeamsForm.tsx | 2 +- client/src/validation/index.ts | 1 + client/src/validation/team.ts | 14 ++++++++++++++ client/src/validation/zod.ts | 14 ++------------ 9 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 client/src/validation/team.ts diff --git a/client/src/hooks/forms/UseInitTeamMemberForm.tsx b/client/src/hooks/forms/UseInitTeamMemberForm.tsx index 3830601b4..e6a7601f5 100644 --- a/client/src/hooks/forms/UseInitTeamMemberForm.tsx +++ b/client/src/hooks/forms/UseInitTeamMemberForm.tsx @@ -1,4 +1,4 @@ -import { teamMemberSchema } from "@/validation/zod"; +import { teamMemberSchema } from "@/validation"; import { useMemo } from "react"; import { z } from "zod"; diff --git a/client/src/hooks/forms/UseInitTeamsForm.tsx b/client/src/hooks/forms/UseInitTeamsForm.tsx index eabc71f45..e800906a7 100644 --- a/client/src/hooks/forms/UseInitTeamsForm.tsx +++ b/client/src/hooks/forms/UseInitTeamsForm.tsx @@ -1,4 +1,4 @@ -import { teamSchema } from "@/validation/zod"; +import { teamSchema } from "@/validation"; import { useMemo } from "react"; import { z } from "zod"; diff --git a/client/src/pages/teams/TeamMemberForm.tsx b/client/src/pages/teams/TeamMemberForm.tsx index ee3636ad7..5595da417 100644 --- a/client/src/pages/teams/TeamMemberForm.tsx +++ b/client/src/pages/teams/TeamMemberForm.tsx @@ -9,7 +9,7 @@ import { useTheme } from "@mui/material/styles"; import { zodResolver } from "@hookform/resolvers/zod"; import { useTranslation } from "react-i18next"; import { z } from "zod"; -import { teamMemberSchema } from "@/validation/zod"; +import { teamMemberSchema } from "@/validation"; import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitTeamMemberForm"; diff --git a/client/src/pages/teams/TeamsConfig.tsx b/client/src/pages/teams/TeamsConfig.tsx index caf1bfa11..6636e79e8 100644 --- a/client/src/pages/teams/TeamsConfig.tsx +++ b/client/src/pages/teams/TeamsConfig.tsx @@ -2,7 +2,7 @@ import { TeamsForm } from "@/pages/teams/TeamsForm"; import { useNavigate, useParams } from "react-router"; import { z } from "zod"; -import { teamSchema } from "@/validation/zod"; +import { teamSchema } from "@/validation"; import { useGet, usePatch, useGetOnDemand } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import type { IUser } from "@/types/user"; diff --git a/client/src/pages/teams/TeamsCreate.tsx b/client/src/pages/teams/TeamsCreate.tsx index 29a4e7597..7138a296d 100644 --- a/client/src/pages/teams/TeamsCreate.tsx +++ b/client/src/pages/teams/TeamsCreate.tsx @@ -2,7 +2,7 @@ import { TeamsForm } from "@/pages/teams/TeamsForm"; import { useNavigate } from "react-router"; import { z } from "zod"; -import { teamSchema } from "@/validation/zod"; +import { teamSchema } from "@/validation"; import { useGet, usePost, useGetOnDemand } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import { mutate } from "swr"; diff --git a/client/src/pages/teams/TeamsForm.tsx b/client/src/pages/teams/TeamsForm.tsx index 541e7ba62..448476c6b 100644 --- a/client/src/pages/teams/TeamsForm.tsx +++ b/client/src/pages/teams/TeamsForm.tsx @@ -9,7 +9,7 @@ import { useTheme } from "@mui/material/styles"; import { zodResolver } from "@hookform/resolvers/zod"; import { useTranslation } from "react-i18next"; import { z } from "zod"; -import { teamSchema } from "@/validation/zod"; +import { teamSchema } from "@/validation"; import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitTeamsForm"; diff --git a/client/src/validation/index.ts b/client/src/validation/index.ts index dc36f74f2..b100f0428 100644 --- a/client/src/validation/index.ts +++ b/client/src/validation/index.ts @@ -7,3 +7,4 @@ export * from "./infra"; export * from "./utils"; export * from "./notification-channel"; export * from "./maintenance"; +export * from "./team"; diff --git a/client/src/validation/team.ts b/client/src/validation/team.ts new file mode 100644 index 000000000..401306ec0 --- /dev/null +++ b/client/src/validation/team.ts @@ -0,0 +1,14 @@ +import { z } from "zod"; + +export const teamSchema = z.object({ + name: z.string().min(1, "Team name is required"), + roleId: z.string().min(1, "Role is required"), + description: z.string().optional(), +}); + +export const teamMemberSchema = z.object({ + userId: z.string().min(1, "User is required"), + roleId: z.string().min(1, "Role is required"), + teamId: z.string().min(1, "Team is required"), +}); + diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index 3f1c87374..7d94befa6 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -1,6 +1,6 @@ import { z } from "zod"; // humanInterval moved to split schema files -import { MaintenanceRepeats } from "@/types/maintenance"; +// MaintenanceRepeats moved to maintenance schema // urlRegex moved to client/src/validation/utils.ts @@ -20,17 +20,7 @@ const optionalString = (schema: T) => // moved to client/src/validation/pagespeed.ts // moved to client/src/validation/infra.ts -export const teamSchema = z.object({ - name: z.string().min(1, "Team name is required"), - roleId: z.string().min(1, "Role is required"), - description: z.string().optional(), -}); - -export const teamMemberSchema = z.object({ - userId: z.string().min(1, "User is required"), - roleId: z.string().min(1, "Role is required"), - teamId: z.string().min(1, "Team is required"), -}); +// moved to client/src/validation/team.ts export const inviteSchema = z.object({ email: z.email("Invalid email address"), From a2454cbab67d4379d2ff6610fab9f036ddc0b770 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 19:25:51 +0000 Subject: [PATCH 07/10] teams --- client/src/pages/teams/TeamMemberConfig.tsx | 3 ++- client/src/pages/teams/TeamMemberCreate.tsx | 3 ++- client/src/pages/teams/TeamMemberForm.tsx | 2 +- client/src/pages/teams/TeamsConfig.tsx | 6 ++---- client/src/pages/teams/TeamsCreate.tsx | 4 +--- client/src/pages/teams/TeamsForm.tsx | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/client/src/pages/teams/TeamMemberConfig.tsx b/client/src/pages/teams/TeamMemberConfig.tsx index 131e79c77..e6def8a64 100644 --- a/client/src/pages/teams/TeamMemberConfig.tsx +++ b/client/src/pages/teams/TeamMemberConfig.tsx @@ -13,6 +13,7 @@ import { mutate } from "swr"; import type { IUser } from "@/types/user"; import { useAppDispatch } from "@/hooks/AppHooks"; import { setUser } from "@/features/authSlice"; +import type { FormValues } from "@/pages/teams/TeamMemberForm"; const TeamMemberConfig = () => { const [dialogOpen, setDialogOpen] = useState(false); @@ -20,7 +21,7 @@ const TeamMemberConfig = () => { const navigate = useNavigate(); const { t } = useTranslation(); const { id, memberId } = useParams(); - const { patch, loading } = usePatch(); + const { patch, loading } = usePatch, any>(); const { get: getOnDemand } = useGetOnDemand(); const dispatch = useAppDispatch(); const { response } = useGet>("/team-members"); diff --git a/client/src/pages/teams/TeamMemberCreate.tsx b/client/src/pages/teams/TeamMemberCreate.tsx index 873c9913c..92b477605 100644 --- a/client/src/pages/teams/TeamMemberCreate.tsx +++ b/client/src/pages/teams/TeamMemberCreate.tsx @@ -9,6 +9,7 @@ import { useGetOnDemand } from "@/hooks/UseApi"; import type { IUser } from "@/types/user"; import { useAppDispatch } from "@/hooks/AppHooks"; import { setUser } from "@/features/authSlice"; +import type { FormValues } from "@/pages/teams/TeamMemberForm"; const TeamMemberCreate = () => { const navigate = useNavigate(); const dispatch = useAppDispatch(); @@ -17,7 +18,7 @@ const TeamMemberCreate = () => { const { response } = useGet>("/team-members?type=org"); const { response: rolesResponse } = useGet>("/roles?type=team"); - const { post } = usePost>(); + const { post } = usePost(); const teamMembers = response?.data || []; const roles = rolesResponse?.data || []; diff --git a/client/src/pages/teams/TeamMemberForm.tsx b/client/src/pages/teams/TeamMemberForm.tsx index 5595da417..fd8faafa3 100644 --- a/client/src/pages/teams/TeamMemberForm.tsx +++ b/client/src/pages/teams/TeamMemberForm.tsx @@ -14,7 +14,7 @@ import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitTeamMemberForm"; -type FormValues = z.infer; +export type FormValues = z.infer; export const TeamMemberForm = ({ mode = "create", diff --git a/client/src/pages/teams/TeamsConfig.tsx b/client/src/pages/teams/TeamsConfig.tsx index 6636e79e8..1d836b003 100644 --- a/client/src/pages/teams/TeamsConfig.tsx +++ b/client/src/pages/teams/TeamsConfig.tsx @@ -1,20 +1,18 @@ import { TeamsForm } from "@/pages/teams/TeamsForm"; import { useNavigate, useParams } from "react-router"; -import { z } from "zod"; -import { teamSchema } from "@/validation"; import { useGet, usePatch, useGetOnDemand } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import type { IUser } from "@/types/user"; import { useAppDispatch } from "@/hooks/AppHooks"; import { setUser } from "@/features/authSlice"; import { mutate } from "swr"; +import type { FormValues } from "@/pages/teams/TeamsForm"; const TeamsConfigPage = () => { - type FormValues = Omit, "roleId">; const navigate = useNavigate(); const { response } = useGet>("/roles?type=team"); - const { patch, loading } = usePatch>(); + const { patch, loading } = usePatch, ApiResponse>(); const { get: getOnDemand } = useGetOnDemand(); const dispatch = useAppDispatch(); diff --git a/client/src/pages/teams/TeamsCreate.tsx b/client/src/pages/teams/TeamsCreate.tsx index 7138a296d..1d351af32 100644 --- a/client/src/pages/teams/TeamsCreate.tsx +++ b/client/src/pages/teams/TeamsCreate.tsx @@ -1,17 +1,15 @@ import { TeamsForm } from "@/pages/teams/TeamsForm"; import { useNavigate } from "react-router"; -import { z } from "zod"; -import { teamSchema } from "@/validation"; import { useGet, usePost, useGetOnDemand } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; import { mutate } from "swr"; import type { IUser } from "@/types/user"; import { useAppDispatch } from "@/hooks/AppHooks"; import { setUser } from "@/features/authSlice"; +import type { FormValues } from "@/pages/teams/TeamsForm"; const TeamsCreatePage = () => { - type FormValues = z.infer; const { response } = useGet>("/roles?type=team"); const { post, loading } = usePost(); const navigate = useNavigate(); diff --git a/client/src/pages/teams/TeamsForm.tsx b/client/src/pages/teams/TeamsForm.tsx index 448476c6b..826953fa0 100644 --- a/client/src/pages/teams/TeamsForm.tsx +++ b/client/src/pages/teams/TeamsForm.tsx @@ -14,7 +14,7 @@ import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitTeamsForm"; -type FormValues = z.infer; +export type FormValues = z.infer; export const TeamsForm = ({ mode = "create", From 8fb13273bf8a52cb721a4dbf939b3393202c0f8a Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 19:36:14 +0000 Subject: [PATCH 08/10] settings --- .../src/hooks/forms/UseInitSettingsForm.tsx | 5 +- client/src/pages/settings/AdminSettings.tsx | 5 +- client/src/pages/settings/SettingsForm.tsx | 4 +- client/src/validation/index.ts | 1 + client/src/validation/system-settings.ts | 55 ++++++++++++++ client/src/validation/utils.ts | 7 ++ client/src/validation/zod.ts | 75 ------------------- 7 files changed, 69 insertions(+), 83 deletions(-) create mode 100644 client/src/validation/system-settings.ts diff --git a/client/src/hooks/forms/UseInitSettingsForm.tsx b/client/src/hooks/forms/UseInitSettingsForm.tsx index 1a98fe48a..5caad8788 100644 --- a/client/src/hooks/forms/UseInitSettingsForm.tsx +++ b/client/src/hooks/forms/UseInitSettingsForm.tsx @@ -1,11 +1,12 @@ -import { systemSettingsSchema } from "@/validation/zod"; +import { systemSettingsSchema } from "@/validation"; import { useMemo } from "react"; +import type { FormValues } from "@/pages/settings/SettingsForm"; import { z } from "zod"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: Partial | undefined; }) => { return useMemo(() => { const defaults: z.infer = { diff --git a/client/src/pages/settings/AdminSettings.tsx b/client/src/pages/settings/AdminSettings.tsx index c2d130d15..f2e7b52cd 100644 --- a/client/src/pages/settings/AdminSettings.tsx +++ b/client/src/pages/settings/AdminSettings.tsx @@ -7,12 +7,9 @@ import {} from "react-i18next"; import { useAppSelector } from "@/hooks/AppHooks"; import { useGet, usePatch, usePost } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { z } from "zod"; -import { systemSettingsSchema } from "@/validation/zod"; +import type { FormValues } from "@/pages/settings/SettingsForm"; const AdminSettingsPage = () => { - type FormValues = z.infer; - const user = useAppSelector((state) => state.auth.user); const orgPermissions = user?.org?.permissions || []; diff --git a/client/src/pages/settings/SettingsForm.tsx b/client/src/pages/settings/SettingsForm.tsx index d2119b4a9..a0be1ca16 100644 --- a/client/src/pages/settings/SettingsForm.tsx +++ b/client/src/pages/settings/SettingsForm.tsx @@ -6,14 +6,14 @@ import { ConfigBox } from "@/components/design-elements"; import { useTheme } from "@mui/material/styles"; import { useTranslation } from "react-i18next"; -import { systemSettingsSchema } from "@/validation/zod"; +import { systemSettingsSchema } from "@/validation"; import { z } from "zod"; import { zodResolver } from "@hookform/resolvers/zod"; import { useForm, Controller, type SubmitHandler } from "react-hook-form"; import { useInitForm } from "@/hooks/forms/UseInitSettingsForm"; import { useEffect } from "react"; -type FormValues = z.infer; +export type FormValues = z.infer; export const SettingsForm = ({ initialData, diff --git a/client/src/validation/index.ts b/client/src/validation/index.ts index b100f0428..5644732eb 100644 --- a/client/src/validation/index.ts +++ b/client/src/validation/index.ts @@ -8,3 +8,4 @@ export * from "./utils"; export * from "./notification-channel"; export * from "./maintenance"; export * from "./team"; +export * from "./system-settings"; diff --git a/client/src/validation/system-settings.ts b/client/src/validation/system-settings.ts new file mode 100644 index 000000000..b3619c3ac --- /dev/null +++ b/client/src/validation/system-settings.ts @@ -0,0 +1,55 @@ +import { z } from "zod"; +import { optionalString } from "@/validation/utils"; + +export const systemSettingsSchema = z.object({ + systemEmailHost: optionalString( + z.string().trim().min(1, { message: "SMTP host is required" }).max(255, { + message: "SMTP host must be 255 characters or fewer", + }) + ), + systemEmailPort: optionalString( + z + .union([z.number().int(), z.string().regex(/^\d+$/)]) + .transform((val) => (typeof val === "string" ? Number(val) : val)) + .refine( + (val) => + val === undefined || + (Number.isInteger(val) && val > 0 && val < 65536), + { + message: "Port must be a number between 1 and 65535", + } + ) + ), + systemEmailAddress: optionalString( + z.string().email({ message: "SMTP email must be valid" }) + ), + systemEmailPassword: optionalString( + z.string().max(255, { + message: "SMTP password must be 255 characters or fewer", + }) + ), + systemEmailUser: optionalString( + z.string().trim().max(255, { + message: "SMTP username must be 255 characters or fewer", + }) + ), + systemEmailConnectionHost: optionalString( + z.string().trim().max(255, { + message: "Connection host must be 255 characters or fewer", + }) + ), + systemEmailTLSServername: optionalString( + z.string().trim().max(255, { + message: "TLS server name must be 255 characters or fewer", + }) + ), + systemEmailSecure: z.boolean().optional(), + systemEmailPool: z.boolean().optional(), + systemEmailIgnoreTLS: z.boolean().optional(), + systemEmailRequireTLS: z.boolean().optional(), + systemEmailRejectUnauthorized: z.boolean().optional(), + checksRetentionDays: z.coerce + .number({ message: "Number required" }) + .min(1, "Retention days must be at least 1") + .max(365, "Retention days cannot exceed 365 days"), +}); diff --git a/client/src/validation/utils.ts b/client/src/validation/utils.ts index c4dc597c2..b1d99991f 100644 --- a/client/src/validation/utils.ts +++ b/client/src/validation/utils.ts @@ -21,3 +21,10 @@ export const durationSchema = (minInterval: number) => }); } }); + +export const optionalString = (schema: T) => + z.preprocess( + (val) => + val === "" || val === null || val === undefined ? undefined : val, + schema.optional() + ); diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index 7d94befa6..b9198315b 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -1,26 +1,4 @@ import { z } from "zod"; -// humanInterval moved to split schema files -// MaintenanceRepeats moved to maintenance schema - -// urlRegex moved to client/src/validation/utils.ts - -// monitor duration schema moved to client/src/validation/monitor.ts -// pagespeed duration schema moved to client/src/validation/pagespeed.ts -// infra duration schema moved to client/src/validation/infra.ts - -const optionalString = (schema: T) => - z.preprocess( - (val) => - val === "" || val === null || val === undefined ? undefined : val, - schema.optional() - ); - -// moved to client/src/validation/monitor.ts - -// moved to client/src/validation/pagespeed.ts -// moved to client/src/validation/infra.ts - -// moved to client/src/validation/team.ts export const inviteSchema = z.object({ email: z.email("Invalid email address"), @@ -29,59 +7,6 @@ export const inviteSchema = z.object({ orgRoleId: z.string().optional(), }); -export const systemSettingsSchema = z.object({ - systemEmailHost: optionalString( - z.string().trim().min(1, { message: "SMTP host is required" }).max(255, { - message: "SMTP host must be 255 characters or fewer", - }) - ), - systemEmailPort: optionalString( - z - .union([z.number().int(), z.string().regex(/^\d+$/)]) - .transform((val) => (typeof val === "string" ? Number(val) : val)) - .refine( - (val) => - val === undefined || - (Number.isInteger(val) && val > 0 && val < 65536), - { - message: "Port must be a number between 1 and 65535", - } - ) - ), - systemEmailAddress: optionalString( - z.string().email({ message: "SMTP email must be valid" }) - ), - systemEmailPassword: optionalString( - z.string().max(255, { - message: "SMTP password must be 255 characters or fewer", - }) - ), - systemEmailUser: optionalString( - z.string().trim().max(255, { - message: "SMTP username must be 255 characters or fewer", - }) - ), - systemEmailConnectionHost: optionalString( - z.string().trim().max(255, { - message: "Connection host must be 255 characters or fewer", - }) - ), - systemEmailTLSServername: optionalString( - z.string().trim().max(255, { - message: "TLS server name must be 255 characters or fewer", - }) - ), - systemEmailSecure: z.boolean().optional(), - systemEmailPool: z.boolean().optional(), - systemEmailIgnoreTLS: z.boolean().optional(), - systemEmailRequireTLS: z.boolean().optional(), - systemEmailRejectUnauthorized: z.boolean().optional(), - checksRetentionDays: z.coerce - .number({ message: "Number required" }) - .min(1, "Retention days must be at least 1") - .max(365, "Retention days cannot exceed 365 days"), -}); - const statusPageUrlRegex = /^[A-Za-z0-9]+$/; export const statusPageSchema = z.object({ From 6dcfb67246b246efdbae21fe3d4c8809dc49467d Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sun, 28 Dec 2025 19:49:36 +0000 Subject: [PATCH 09/10] status page --- client/src/hooks/forms/UseInitStatusPageForm.tsx | 8 +++----- client/src/pages/status-page/StatusPageConfig.tsx | 5 +---- client/src/pages/status-page/StatusPageCreate.tsx | 5 +---- client/src/pages/status-page/StatusPageForm.tsx | 4 ++-- client/src/validation/index.ts | 1 + client/src/validation/status-page.ts | 14 ++++++++++++++ client/src/validation/zod.ts | 13 ------------- 7 files changed, 22 insertions(+), 28 deletions(-) create mode 100644 client/src/validation/status-page.ts diff --git a/client/src/hooks/forms/UseInitStatusPageForm.tsx b/client/src/hooks/forms/UseInitStatusPageForm.tsx index 1a258ee0c..bb7a421a2 100644 --- a/client/src/hooks/forms/UseInitStatusPageForm.tsx +++ b/client/src/hooks/forms/UseInitStatusPageForm.tsx @@ -1,14 +1,12 @@ -import { statusPageSchema } from "@/validation/zod"; import { useMemo } from "react"; - -import { z } from "zod"; +import type { FormValues } from "@/pages/status-page/StatusPageForm"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: Partial | undefined; }) => { return useMemo(() => { - const defaults: z.infer = { + const defaults: FormValues = { name: initialData?.name || "", description: initialData?.description || "", url: initialData?.url || Math.floor(Math.random() * 1000000).toFixed(0), diff --git a/client/src/pages/status-page/StatusPageConfig.tsx b/client/src/pages/status-page/StatusPageConfig.tsx index 8b7b3af59..4ca29a775 100644 --- a/client/src/pages/status-page/StatusPageConfig.tsx +++ b/client/src/pages/status-page/StatusPageConfig.tsx @@ -2,14 +2,11 @@ import { StatusPageForm } from "@/pages/status-page/StatusPageForm"; import { useParams } from "react-router"; import { useNavigate } from "react-router"; -import { z } from "zod"; import { usePatch, useGet } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { statusPageSchema } from "@/validation/zod"; import type { IMonitor } from "@/types/monitor"; import type { IStatusPageWithMonitors } from "@/types/status-page"; - -type FormValues = z.infer; +import type { FormValues } from "@/pages/status-page/StatusPageForm"; const StatusPageConfigPage = () => { const navigate = useNavigate(); diff --git a/client/src/pages/status-page/StatusPageCreate.tsx b/client/src/pages/status-page/StatusPageCreate.tsx index 8ebbeeae3..600de764e 100644 --- a/client/src/pages/status-page/StatusPageCreate.tsx +++ b/client/src/pages/status-page/StatusPageCreate.tsx @@ -1,13 +1,10 @@ import { StatusPageForm } from "@/pages/status-page/StatusPageForm"; import { useNavigate } from "react-router"; -import { z } from "zod"; import { usePost, useGet } from "@/hooks/UseApi"; import type { ApiResponse } from "@/types/api"; -import { statusPageSchema } from "@/validation/zod"; import type { IMonitor } from "@/types/monitor"; - -type FormValues = z.infer; +import type { FormValues } from "@/pages/status-page/StatusPageForm"; const StatusPageCreatePage = () => { const navigate = useNavigate(); diff --git a/client/src/pages/status-page/StatusPageForm.tsx b/client/src/pages/status-page/StatusPageForm.tsx index 9ec694222..64b2f9534 100644 --- a/client/src/pages/status-page/StatusPageForm.tsx +++ b/client/src/pages/status-page/StatusPageForm.tsx @@ -9,7 +9,7 @@ import { useTheme } from "@mui/material/styles"; import { zodResolver } from "@hookform/resolvers/zod"; import { useTranslation } from "react-i18next"; import { z } from "zod"; -import { statusPageSchema } from "@/validation/zod"; +import { statusPageSchema } from "@/validation"; import { useForm, Controller, @@ -20,7 +20,7 @@ import { useEffect } from "react"; import { useInitForm } from "@/hooks/forms/UseInitStatusPageForm"; import type { IMonitor } from "@/types/monitor"; -type FormValues = z.infer; +export type FormValues = z.infer; export const StatusPageForm = ({ initialData, diff --git a/client/src/validation/index.ts b/client/src/validation/index.ts index 5644732eb..2116edbe2 100644 --- a/client/src/validation/index.ts +++ b/client/src/validation/index.ts @@ -9,3 +9,4 @@ export * from "./notification-channel"; export * from "./maintenance"; export * from "./team"; export * from "./system-settings"; +export * from "./status-page"; diff --git a/client/src/validation/status-page.ts b/client/src/validation/status-page.ts new file mode 100644 index 000000000..14e0cd2f1 --- /dev/null +++ b/client/src/validation/status-page.ts @@ -0,0 +1,14 @@ +import { z } from "zod"; + +const statusPageUrlRegex = /^[A-Za-z0-9]+$/; + +export const statusPageSchema = z.object({ + name: z.string().min(1, "Status page name is required"), + description: z.string().optional(), + url: z + .string() + .min(1, "URL is required") + .regex(statusPageUrlRegex, "Invalid URL"), + isPublished: z.boolean().optional(), + monitors: z.array(z.string()), +}); diff --git a/client/src/validation/zod.ts b/client/src/validation/zod.ts index b9198315b..6246fc94c 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/zod.ts @@ -7,19 +7,6 @@ export const inviteSchema = z.object({ orgRoleId: z.string().optional(), }); -const statusPageUrlRegex = /^[A-Za-z0-9]+$/; - -export const statusPageSchema = z.object({ - name: z.string().min(1, "Status page name is required"), - description: z.string().optional(), - url: z - .string() - .min(1, "URL is required") - .regex(statusPageUrlRegex, "Invalid URL"), - isPublished: z.boolean().optional(), - monitors: z.array(z.string()), -}); - export const recoverySchema = z.object({ email: z.email({ message: "Invalid email address" }).trim().toLowerCase(), }); From 18408a6bf63d2a65f4872a88528e78df4cb1feb5 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 29 Dec 2025 18:28:30 +0000 Subject: [PATCH 10/10] finish form extraction --- client/src/hooks/forms/UseInitProfileForm.tsx | 2 +- .../src/hooks/forms/UseInitRecoveryForm.tsx | 7 +++-- client/src/hooks/forms/UseInitResetForm.tsx | 2 +- client/src/pages/auth/Invite.tsx | 2 +- client/src/pages/profile/Profile.tsx | 4 +-- client/src/pages/profile/ProfileForm.tsx | 12 ++++----- client/src/pages/recovery/Recovery.tsx | 9 +++---- client/src/pages/recovery/RecoveryForm.tsx | 12 ++++----- client/src/pages/recovery/Reset.tsx | 7 ++--- client/src/pages/recovery/ResetForm.tsx | 10 +++---- client/src/validation/index.ts | 5 +++- client/src/validation/invite.ts | 9 +++++++ client/src/validation/{zod.ts => profile.ts} | 26 +------------------ client/src/validation/recovery.ts | 6 +++++ client/src/validation/reset.ts | 16 ++++++++++++ 15 files changed, 65 insertions(+), 64 deletions(-) create mode 100644 client/src/validation/invite.ts rename client/src/validation/{zod.ts => profile.ts} (57%) create mode 100644 client/src/validation/recovery.ts create mode 100644 client/src/validation/reset.ts diff --git a/client/src/hooks/forms/UseInitProfileForm.tsx b/client/src/hooks/forms/UseInitProfileForm.tsx index 5be1c3d3b..4fafc2e1e 100644 --- a/client/src/hooks/forms/UseInitProfileForm.tsx +++ b/client/src/hooks/forms/UseInitProfileForm.tsx @@ -1,4 +1,4 @@ -import { profileSchema } from "@/validation/zod"; +import { profileSchema } from "@/validation"; import { useMemo } from "react"; import { z } from "zod"; diff --git a/client/src/hooks/forms/UseInitRecoveryForm.tsx b/client/src/hooks/forms/UseInitRecoveryForm.tsx index 4429d4b5a..7b7fe1577 100644 --- a/client/src/hooks/forms/UseInitRecoveryForm.tsx +++ b/client/src/hooks/forms/UseInitRecoveryForm.tsx @@ -1,14 +1,13 @@ -import { recoverySchema } from "@/validation/zod"; import { useMemo } from "react"; +import type { FormValues } from "@/pages/recovery/RecoveryForm"; -import { z } from "zod"; export const useInitForm = ({ initialData, }: { - initialData: Partial> | undefined; + initialData: FormValues | undefined; }) => { return useMemo(() => { - const defaults: z.infer = { + const defaults: FormValues = { email: initialData?.email || "", }; return { defaults }; diff --git a/client/src/hooks/forms/UseInitResetForm.tsx b/client/src/hooks/forms/UseInitResetForm.tsx index f44f15e4c..9bb2a902c 100644 --- a/client/src/hooks/forms/UseInitResetForm.tsx +++ b/client/src/hooks/forms/UseInitResetForm.tsx @@ -1,4 +1,4 @@ -import { resetSchema } from "@/validation/zod"; +import { resetSchema } from "@/validation"; import { useMemo } from "react"; import { z } from "zod"; diff --git a/client/src/pages/auth/Invite.tsx b/client/src/pages/auth/Invite.tsx index 58f1cee20..2f3ff1aec 100644 --- a/client/src/pages/auth/Invite.tsx +++ b/client/src/pages/auth/Invite.tsx @@ -8,7 +8,7 @@ import { BasePage, ConfigBox } from "@/components/design-elements"; import { useEffect, useState, useMemo } from "react"; import { useTheme } from "@mui/material/styles"; import { useTranslation } from "react-i18next"; -import { inviteSchema } from "@/validation/zod"; +import { inviteSchema } from "@/validation"; import { z } from "zod"; import { useForm, Controller } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; diff --git a/client/src/pages/profile/Profile.tsx b/client/src/pages/profile/Profile.tsx index 331ed5bc4..c540d125a 100644 --- a/client/src/pages/profile/Profile.tsx +++ b/client/src/pages/profile/Profile.tsx @@ -5,12 +5,10 @@ import { useState, useEffect } from "react"; import type { IUser } from "@/types/user"; import type { ApiResponse } from "@/types/api"; import { useGet, usePatch, useGetOnDemand } from "@/hooks/UseApi"; -import { z } from "zod"; -import { profileSchema } from "@/validation/zod"; import { useTranslation } from "react-i18next"; import { useAppDispatch } from "@/hooks/AppHooks"; import { setUser as setUserGlobal } from "@/features/authSlice"; -type FormValues = z.infer; +import type { FormValues } from "@/pages/profile/ProfileForm"; const Profile = () => { const { t } = useTranslation(); diff --git a/client/src/pages/profile/ProfileForm.tsx b/client/src/pages/profile/ProfileForm.tsx index 621a4c9e2..9ba36dc4d 100644 --- a/client/src/pages/profile/ProfileForm.tsx +++ b/client/src/pages/profile/ProfileForm.tsx @@ -12,8 +12,8 @@ import { useTheme } from "@mui/material/styles"; import { useInitForm } from "@/hooks/forms/UseInitProfileForm"; import type { IUser } from "@/types/user"; -import { profileSchema } from "@/validation/zod"; -type FormData = z.infer; +import { profileSchema } from "@/validation"; +export type FormValues = z.infer; export const ProfileForm = ({ user, @@ -23,21 +23,21 @@ export const ProfileForm = ({ }: { user: Partial | null; hasUser?: boolean; - initialData?: Partial; - onSubmit: SubmitHandler; + initialData?: Partial; + onSubmit: SubmitHandler; loading: boolean; }) => { const { t } = useTranslation(); const theme = useTheme(); const { defaults } = useInitForm({ initialData: initialData }); - const resolver = zodResolver(profileSchema) as unknown as Resolver; + const resolver = zodResolver(profileSchema) as Resolver; const { handleSubmit, control, reset, formState: { errors }, - } = useForm({ + } = useForm({ resolver, defaultValues: { firstName: "", diff --git a/client/src/pages/recovery/Recovery.tsx b/client/src/pages/recovery/Recovery.tsx index 61b061cb6..8f681155d 100644 --- a/client/src/pages/recovery/Recovery.tsx +++ b/client/src/pages/recovery/Recovery.tsx @@ -2,19 +2,16 @@ import { AuthBasePage } from "@/components/auth"; import { useTranslation } from "react-i18next"; import { RecoveryForm } from "./RecoveryForm"; -import { recoverySchema } from "@/validation/zod"; -import { z } from "zod"; import { usePost } from "@/hooks/UseApi"; import { useToast } from "@/hooks/UseToast"; - -type FormData = z.infer; +import type { FormValues } from "@/pages/recovery/RecoveryForm"; const Recovery = () => { const { t } = useTranslation(); - const { post, loading } = usePost(); + const { post, loading } = usePost(); const { showToast } = useToast(); - const onSubmit = async (data: FormData) => { + const onSubmit = async (data: FormValues) => { await post("/recovery", data); showToast(t("common.toasts.recoveryEmailSent")); }; diff --git a/client/src/pages/recovery/RecoveryForm.tsx b/client/src/pages/recovery/RecoveryForm.tsx index 85cca8de2..e12bf7b2b 100644 --- a/client/src/pages/recovery/RecoveryForm.tsx +++ b/client/src/pages/recovery/RecoveryForm.tsx @@ -9,18 +9,18 @@ import { useEffect } from "react"; import { z } from "zod"; import { useTranslation } from "react-i18next"; import { useTheme } from "@mui/material/styles"; -import { useInitForm } from "@/hooks/forms/UseInitRegisterForm"; +import { useInitForm } from "@/hooks/forms/UseInitRecoveryForm"; -import { recoverySchema } from "@/validation/zod"; -type FormData = z.infer; +import { recoverySchema } from "@/validation"; +export type FormValues = z.infer; export const RecoveryForm = ({ initialData, onSubmit, loading, }: { - initialData?: Partial; - onSubmit: SubmitHandler; + initialData?: FormValues; + onSubmit: SubmitHandler; loading: boolean; }) => { const { t } = useTranslation(); @@ -32,7 +32,7 @@ export const RecoveryForm = ({ control, reset, formState: { errors }, - } = useForm({ + } = useForm({ resolver: zodResolver(recoverySchema), defaultValues: { email: "", diff --git a/client/src/pages/recovery/Reset.tsx b/client/src/pages/recovery/Reset.tsx index 9f7adfc9a..8acf3f3ef 100644 --- a/client/src/pages/recovery/Reset.tsx +++ b/client/src/pages/recovery/Reset.tsx @@ -3,8 +3,6 @@ import { AuthBasePage } from "@/components/auth"; import { useTranslation } from "react-i18next"; import { useParams } from "react-router"; import { ResetForm } from "@/pages/recovery/ResetForm"; -import { resetSchema } from "@/validation/zod"; -import { z } from "zod"; import { usePost } from "@/hooks/UseApi"; import { useToast } from "@/hooks/UseToast"; import { useNavigate } from "react-router"; @@ -15,8 +13,7 @@ import { setSelectedTeamId, logout, } from "@/features/authSlice"; - -type FormData = z.infer; +import type { FormValues } from "@/pages/recovery/ResetForm"; const Reset = () => { const { t } = useTranslation(); @@ -26,7 +23,7 @@ const Reset = () => { const { toastSuccess } = useToast(); const { id: token } = useParams<{ id: string }>(); - const onSubmit = async (data: FormData) => { + const onSubmit = async (data: FormValues) => { const result = await post(`/recovery/reset`, { password: data.password, token: token || "", diff --git a/client/src/pages/recovery/ResetForm.tsx b/client/src/pages/recovery/ResetForm.tsx index c7ec3b99c..339cce0b5 100644 --- a/client/src/pages/recovery/ResetForm.tsx +++ b/client/src/pages/recovery/ResetForm.tsx @@ -11,8 +11,8 @@ import { useTranslation } from "react-i18next"; import { useTheme } from "@mui/material/styles"; import { useInitForm } from "@/hooks/forms/UseInitResetForm"; -import { resetSchema } from "@/validation/zod"; -type FormData = z.infer; +import { resetSchema } from "@/validation"; +export type FormValues = z.infer; export const ResetForm = ({ initialData, @@ -20,8 +20,8 @@ export const ResetForm = ({ loading, }: { hasUser?: boolean; - initialData?: Partial; - onSubmit: SubmitHandler; + initialData?: Partial; + onSubmit: SubmitHandler; loading: boolean; }) => { const { t } = useTranslation(); @@ -33,7 +33,7 @@ export const ResetForm = ({ control, reset, formState: { errors }, - } = useForm({ + } = useForm({ resolver: zodResolver(resetSchema), defaultValues: { password: "", diff --git a/client/src/validation/index.ts b/client/src/validation/index.ts index 2116edbe2..49dde829e 100644 --- a/client/src/validation/index.ts +++ b/client/src/validation/index.ts @@ -1,4 +1,3 @@ -export * from "./zod"; export * from "./login"; export * from "./register"; export * from "./monitor"; @@ -10,3 +9,7 @@ export * from "./maintenance"; export * from "./team"; export * from "./system-settings"; export * from "./status-page"; +export * from "./invite"; +export * from "./recovery"; +export * from "./reset"; +export * from "./profile"; diff --git a/client/src/validation/invite.ts b/client/src/validation/invite.ts new file mode 100644 index 000000000..2af76084a --- /dev/null +++ b/client/src/validation/invite.ts @@ -0,0 +1,9 @@ +import { z } from "zod"; + +export const inviteSchema = z.object({ + email: z.email("Invalid email address"), + teamId: z.string().min(1, "Team is required"), + teamRoleId: z.string().min(1, "Role is required"), + orgRoleId: z.string().optional(), +}); + diff --git a/client/src/validation/zod.ts b/client/src/validation/profile.ts similarity index 57% rename from client/src/validation/zod.ts rename to client/src/validation/profile.ts index 6246fc94c..8113223a7 100644 --- a/client/src/validation/zod.ts +++ b/client/src/validation/profile.ts @@ -1,30 +1,5 @@ import { z } from "zod"; -export const inviteSchema = z.object({ - email: z.email("Invalid email address"), - teamId: z.string().min(1, "Team is required"), - teamRoleId: z.string().min(1, "Role is required"), - orgRoleId: z.string().optional(), -}); - -export const recoverySchema = z.object({ - email: z.email({ message: "Invalid email address" }).trim().toLowerCase(), -}); - -export const resetSchema = z - .object({ - password: z - .string() - .min(6, { message: "Password must be at least 6 characters" }), - confirmPassword: z - .string() - .min(6, { message: "Confirm Password must be at least 6 characters" }), - }) - .refine((data) => data.password === data.confirmPassword, { - path: ["confirmPassword"], - message: "Passwords must match", - }); - export const profileSchema = z .object({ firstName: z @@ -63,3 +38,4 @@ export const profileSchema = z path: ["confirmPassword"], } ); + diff --git a/client/src/validation/recovery.ts b/client/src/validation/recovery.ts new file mode 100644 index 000000000..f6bd0cfab --- /dev/null +++ b/client/src/validation/recovery.ts @@ -0,0 +1,6 @@ +import { z } from "zod"; + +export const recoverySchema = z.object({ + email: z.email({ message: "Invalid email address" }).trim().toLowerCase(), +}); + diff --git a/client/src/validation/reset.ts b/client/src/validation/reset.ts new file mode 100644 index 000000000..6e4b63ba0 --- /dev/null +++ b/client/src/validation/reset.ts @@ -0,0 +1,16 @@ +import { z } from "zod"; + +export const resetSchema = z + .object({ + password: z + .string() + .min(6, { message: "Password must be at least 6 characters" }), + confirmPassword: z + .string() + .min(6, { message: "Confirm Password must be at least 6 characters" }), + }) + .refine((data) => data.password === data.confirmPassword, { + path: ["confirmPassword"], + message: "Passwords must match", + }); +