diff --git a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
index 36d6594dc..e2265c9e0 100644
--- a/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
+++ b/client/src/Pages/Maintenance/CreateMaintenance/Components/MonitorList/index.jsx
@@ -1,41 +1,21 @@
// 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 MonitorListItem = ({ monitor, onDelete }) => {
const theme = useTheme();
return (
-
- {monitor.name}
+ {monitor.name}
{
- onDelete(monitor);
- }}
+ sx={{ cursor: "pointer" }}
+ onClick={() => onDelete(monitor)}
/>
);
@@ -48,59 +28,22 @@ const MonitorList = ({ selectedMonitors, setSelectedMonitors }) => {
);
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);
- };
+ const theme = useTheme();
return (
-
-
- {(provided, snapshot) => (
-
- {selectedMonitors?.map((monitor, index) => (
-
- {(provided, snapshot) => (
-
- )}
-
- ))}
- {provided.placeholder}
-
- )}
-
-
+
+ {selectedMonitors?.map((monitor) => (
+
+ ))}
+
);
};
diff --git a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
index 19cb5b16d..519cb0818 100644
--- a/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
+++ b/client/src/Pages/Maintenance/CreateMaintenance/index.jsx
@@ -131,7 +131,6 @@ const CreateMaintenance = () => {
monitors: [],
});
const [errors, setErrors] = useState({});
- const [selectedMonitors, setSelectedMonitors] = useState([]);
useEffect(() => {
const fetchMonitors = async () => {
@@ -168,7 +167,6 @@ const CreateMaintenance = () => {
durationUnit,
monitors: monitor ? [monitor] : [],
});
- setSelectedMonitors(monitor ? [monitor] : []);
} catch (error) {
createToast({ body: "Failed to fetch data" });
logger.error("Failed to fetch monitors", error);
@@ -179,11 +177,6 @@ const CreateMaintenance = () => {
fetchMonitors();
}, [user]);
- // Sync form.monitors with selectedMonitors
- useEffect(() => {
- setForm((prev) => ({ ...prev, monitors: selectedMonitors }));
- }, [selectedMonitors]);
-
const handleSearch = (value) => {
setSearch(value);
};
@@ -222,14 +215,9 @@ const CreateMaintenance = () => {
};
const handleMonitorsChange = (selected) => {
- // Ensure all are objects
- const selectedObjs = selected
- .map((sel) => (typeof sel === "string" ? monitors.find((m) => m._id === sel) : sel))
- .filter(Boolean);
- setSelectedMonitors(selectedObjs);
-
+ setForm((prev) => ({ ...prev, monitors: selected }));
const { error } = maintenanceWindowValidation.validate(
- { monitors: selectedObjs },
+ { monitors: selected },
{ abortEarly: false }
);
setErrors((prev) => {
@@ -555,15 +543,17 @@ const CreateMaintenance = () => {
filteredBy="name"
secondaryLabel={"type"}
inputValue={search}
- value={selectedMonitors}
+ value={form.monitors}
handleInputChange={setSearch}
handleChange={handleMonitorsChange}
error={errors["monitors"]}
disabled={form.isAllMonitors}
/>
+ setForm((prev) => ({ ...prev, monitors }))
+ }
/>