This commit is contained in:
Alex Holliday committed 2026-02-04 22:55:54 +00:00
1 parent dc0e198a8e
commit f0b152fc8f
10 files changed
+142 -72

No files matched your search

+70 -14
View File
@@ -19,25 +19,32 @@ import type { MaintenanceWindow } from "@/Types/MaintenanceWindow";
import type { MaintenanceWindowFormData } from "@/Validation/maintenanceWindow";
import { repeatOptions, durationUnitOptions } from "@/Validation/maintenanceWindow";
import { useMaintenanceWindowForm } from "@/Hooks/useMaintenanceWindowForm";
import { useGet } from "@/Hooks/UseApi";
import { useParams } from "react-router-dom";
import { useGet, usePost, usePatch } from "@/Hooks/UseApi";
import { useParams, useNavigate } from "react-router-dom";
import type { Monitor } from "@/Types/Monitor";
import { useForm, Controller } from "react-hook-form";
import { useEffect } from "react";
import { zodResolver } from "@hookform/resolvers/zod/dist/zod.js";
import { Trash2 } from "lucide-react";
const CreateMaintenanceWindowPage = () => {
const theme = useTheme();
const { t } = useTranslation();
const navigate = useNavigate();
const { maintenanceWindowId } = useParams<{ maintenanceWindowId: string }>();
const isEditMode = Boolean(maintenanceWindowId);
const { data: existingMaintenanceWindow } = useGet<MaintenanceWindow>(
isEditMode ? `/maintenance-window/${maintenanceWindowId}` : null
isEditMode ? `/maintenance-window/${maintenanceWindowId}` : null,
{},
{ keepPreviousData: false }
);
const { data: monitors } = useGet<Monitor[]>("/monitors/team");
const { post, loading: isPosting } = usePost();
const { patch, loading: isPatching } = usePatch();
const { schema, defaults } = useMaintenanceWindowForm({
data: existingMaintenanceWindow,
});
@@ -47,14 +54,61 @@ const CreateMaintenanceWindowPage = () => {
defaultValues: defaults,
});
const { control, handleSubmit } = form;
const { control, handleSubmit, trigger } = form;
useEffect(() => {
if (existingMaintenanceWindow) {
form.reset(defaults);
}
}, [existingMaintenanceWindow, defaults, form]);
const onSubmit = (data: MaintenanceWindowFormData) => {
console.log("Form submitted with data:", data);
const buildPayload = (data: MaintenanceWindowFormData) => {
const startDateTime = dayjs(data.startDate)
.set("hour", parseInt(data.startTime.split(":")[0], 10))
.set("minute", parseInt(data.startTime.split(":")[1], 10));
const durationUnit = durationUnitOptions.find((o) => o.id === data.durationUnit);
const durationInMs = data.duration * (durationUnit?.multiplier ?? 1000);
const endDateTime = startDateTime.add(durationInMs, "milliseconds");
const repeatOption = repeatOptions.find((o) => o.id === data.repeat);
const repeat = repeatOption?.value ?? 0;
const payload: Record<string, unknown> = {
name: data.name,
duration: data.duration,
durationUnit: data.durationUnit,
monitors: data.monitors,
start: startDateTime.toISOString(),
end: endDateTime.toISOString(),
repeat,
};
if (repeat === 0) {
payload.expiry = endDateTime.toISOString();
}
return payload;
};
const onSubmit = async (data: MaintenanceWindowFormData) => {
const payload = buildPayload(data);
let result;
if (isEditMode && maintenanceWindowId) {
result = await patch(`/maintenance-window/${maintenanceWindowId}`, payload);
} else {
result = await post("/maintenance-window", payload);
}
if (result?.success) {
navigate("/maintenance");
}
};
const isLoading = isPosting || isPatching;
const onError = (errors: any) => {
console.log("Form errors:", errors);
console.error("Form submission errors:", errors);
};
return (
@@ -121,7 +175,7 @@ const CreateMaintenanceWindowPage = () => {
name="startDate"
control={control}
defaultValue={defaults.startDate}
render={({ field }) => (
render={({ field, fieldState }) => (
<DatePicker
fieldLabel={t(
"pages.maintenanceWindow.form.startDate.option.startDate.label"
@@ -130,6 +184,8 @@ const CreateMaintenanceWindowPage = () => {
onChange={(date) => {
field.onChange(date ? date.format("YYYY-MM-DD") : "");
}}
error={!!fieldState.error}
helperText={fieldState.error?.message}
/>
)}
/>
@@ -152,7 +208,7 @@ const CreateMaintenanceWindowPage = () => {
)}
value={field.value ? dayjs(field.value, "HH:mm") : null}
onChange={(time) => {
field.onChange(time ? time.format("HH:mm") : "");
field.onChange(time ? time.format("HH:mm") : ""); trigger("startDate");
}}
/>
)}
@@ -241,7 +297,9 @@ const CreateMaintenanceWindowPage = () => {
{...params}
placeholder={
selectedMonitors.length === 0
? t("pages.maintenanceWindow.form.startTime.monitors.option.addMonitors.label")
? t(
"pages.maintenanceWindow.form.startTime.monitors.option.addMonitors.label"
)
: ""
}
error={!!fieldState.error}
@@ -269,9 +327,7 @@ const CreateMaintenanceWindowPage = () => {
size="small"
onClick={() => {
field.onChange(
field.value.filter(
(id: string) => id !== monitor.id
)
field.value.filter((id: string) => id !== monitor.id)
);
}}
aria-label="Remove monitor"
@@ -294,7 +350,7 @@ const CreateMaintenanceWindowPage = () => {
spacing={theme.spacing(2)}
>
<Button
// loading={isSubmitting || isPatching}
loading={isLoading}
type="submit"
variant="contained"
color="primary"