remove the drag and drop fuction for list and remove dublicate code

This commit is contained in:
shanika Jayawardane committed 2025-07-14 23:44:50 -06:00
1 parent 39d666df6b
commit 870cd6407e
2 files changed
+27 -94

No files matched your search

@@ -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 (
<Stack
direction={"row"}
{...draggableProps}
{...dragHandleProps}
ref={innerRef}
gap={theme.spacing(4)}
margin={theme.spacing(4)}
padding={theme.spacing(4)}
borderRadius={theme.shape.borderRadius}
alignItems={"center"}
justifyContent={"start"}
border={`1px solid ${theme.palette.primary.lowContrast}`}
gap={theme.spacing(4)}
width="100%"
>
<ReorderRoundedIcon />
<Typography>{monitor.name}</Typography>
<Typography flexGrow={1}>{monitor.name}</Typography>
<DeleteIcon
sx={{ marginLeft: "auto" }}
onClick={() => {
onDelete(monitor);
}}
sx={{ cursor: "pointer" }}
onClick={() => onDelete(monitor)}
/>
</Stack>
);
@@ -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 (
<DragDropContext onDragEnd={onDragEnd}>
<Droppable droppableId="droppable">
{(provided, snapshot) => (
<Stack
{...provided.droppableProps}
ref={provided.innerRef}
>
{selectedMonitors?.map((monitor, index) => (
<Draggable
key={monitor._id}
draggableId={monitor._id}
index={index}
>
{(provided, snapshot) => (
<MonitorListItem
monitor={monitor}
innerRef={provided.innerRef}
draggableProps={provided.draggableProps}
dragHandleProps={provided.dragHandleProps}
onDelete={onDelete}
/>
)}
</Draggable>
))}
{provided.placeholder}
</Stack>
)}
</Droppable>
</DragDropContext>
<Stack
gap={theme.spacing(6)}
width="100%"
>
{selectedMonitors?.map((monitor) => (
<MonitorListItem
key={monitor._id}
monitor={monitor}
onDelete={onDelete}
/>
))}
</Stack>
);
};
@@ -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}
/>
<MonitorList
selectedMonitors={selectedMonitors}
setSelectedMonitors={setSelectedMonitors}
selectedMonitors={form.monitors}
setSelectedMonitors={(monitors) =>
setForm((prev) => ({ ...prev, monitors }))
}
/>
</Stack>
</ConfigBox>