diff --git a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx new file mode 100644 index 000000000..36d6594dc --- /dev/null +++ b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx @@ -0,0 +1,107 @@ +// Components +import { Stack, Typography } from "@mui/material"; +import ReorderRoundedIcon from "@mui/icons-material/ReorderRounded"; +import DeleteIcon from "@mui/icons-material/Delete"; + +// Utils +import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd"; +import { useTheme } from "@emotion/react"; +import Checkbox from "../../../../../Components/Inputs/Checkbox"; +const MonitorListItem = ({ + monitor, + innerRef, + draggableProps, + dragHandleProps, + onDelete, +}) => { + const theme = useTheme(); + return ( + + + {monitor.name} + { + onDelete(monitor); + }} + /> + + ); +}; + +const MonitorList = ({ selectedMonitors, setSelectedMonitors }) => { + const onDelete = (monitorToDelete) => { + const newMonitors = selectedMonitors.filter( + (monitor) => monitor._id !== monitorToDelete._id + ); + setSelectedMonitors(newMonitors); + }; + const reorder = (list, startIndex, endIndex) => { + const result = Array.from(list); + const [removed] = result.splice(startIndex, 1); + result.splice(endIndex, 0, removed); + + return result; + }; + + const onDragEnd = (result) => { + // dropped outside the list + if (!result.destination) { + return; + } + + const reorderedMonitors = reorder( + selectedMonitors, + result.source.index, + result.destination.index + ); + + setSelectedMonitors(reorderedMonitors); + }; + + return ( + + + {(provided, snapshot) => ( + + {selectedMonitors?.map((monitor, index) => ( + + {(provided, snapshot) => ( + + )} + + ))} + {provided.placeholder} + + )} + + + ); +}; + +export default MonitorList; diff --git a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx index e71c7112c..c4e839e02 100644 --- a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -9,6 +9,8 @@ import { DatePicker } from "@mui/x-date-pickers/DatePicker"; import { MobileTimePicker } from "@mui/x-date-pickers/MobileTimePicker"; import { maintenanceWindowValidation } from "../../../Validation/validation"; import { createToast } from "../../../Utils/toastUtils"; +import MonitorList from "./Components/MonitorList"; +import Checkbox from "../../../Components/Inputs/Checkbox"; import dayjs from "dayjs"; import Select from "../../../Components/Inputs/Select"; @@ -129,6 +131,7 @@ const CreateMaintenance = () => { monitors: [], }); const [errors, setErrors] = useState({}); + const [selectedMonitors, setSelectedMonitors] = useState([]); useEffect(() => { const fetchMonitors = async () => { @@ -165,6 +168,7 @@ const CreateMaintenance = () => { durationUnit, monitors: monitor ? [monitor] : [], }); + setSelectedMonitors(monitor ? [monitor] : []); } catch (error) { createToast({ body: "Failed to fetch data" }); logger.error("Failed to fetch monitors", error); @@ -175,6 +179,11 @@ const CreateMaintenance = () => { fetchMonitors(); }, [user]); + // Sync form.monitors with selectedMonitors + useEffect(() => { + setForm((prev) => ({ ...prev, monitors: selectedMonitors })); + }, [selectedMonitors]); + const handleSearch = (value) => { setSearch(value); }; @@ -212,6 +221,33 @@ const CreateMaintenance = () => { }); }; + const handleMonitorsChange = (selected) => { + if (selected.some((m) => m._id === "__all__")) { + if (selectedMonitors.length !== monitors.length) { + setSelectedMonitors(monitors); + } else { + setSelectedMonitors([]); + } + } else { + // Ensure all are objects + const selectedObjs = selected + .map((sel) => + typeof sel === "string" ? monitors.find((m) => m._id === sel) : sel + ) + .filter(Boolean); + setSelectedMonitors(selectedObjs); + } + const { error } = maintenanceWindowValidation.validate( + { monitors: selected }, + { abortEarly: false } + ); + setErrors((prev) => { + return buildErrors(prev, "monitors", error); + }); + }; + + const allSelected = selectedMonitors.length === monitors.length && monitors.length > 0; + const handleSubmit = async () => { if (hasValidationErrors(form, maintenanceWindowValidation, setErrors)) return; // Build timestamp for maintenance window from startDate and startTime @@ -267,6 +303,10 @@ const CreateMaintenance = () => { } }; + // Add Select All option to the dropdown + const selectAllOption = { _id: "__all__", name: "Select All" }; + const monitorOptions = [selectAllOption, ...monitors]; + return ( { label={t("addMonitors")} multiple={true} isAdorned={false} - options={monitors ? monitors : []} + options={monitorOptions} filteredBy="name" secondaryLabel={"type"} inputValue={search} - value={form.monitors} - handleInputChange={handleSearch} - handleChange={handleSelectMonitors} + value={selectedMonitors} + handleInputChange={setSearch} + handleChange={handleMonitorsChange} error={errors["monitors"]} - disabled={maintenanceWindowId !== undefined} + disabled={form.isAllMonitors} + /> + +