fix data table

This commit is contained in:
natib21
2026-06-20 09:04:01 +00:00
parent baa37968c8
commit 3793d2004f
2 changed files with 71 additions and 35 deletions

View File

@@ -1,5 +1,5 @@
import { MoreHorizontal, Pencil, Trash2, Eye, Copy } from "lucide-react"; import { Edit2, Trash2, Eye, Users } from "lucide-react";
import { ActionIcon, Button, Group, Menu, Tooltip } from "@mantine/core"; import { ActionIcon, Group, Tooltip } from "@mantine/core";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import type { FleetResourceConfig } from "@/pages/fleet/config/resources"; import type { FleetResourceConfig } from "@/pages/fleet/config/resources";
@@ -10,6 +10,7 @@ export interface FleetRecordActionsProps {
config: FleetResourceConfig; config: FleetResourceConfig;
onEdit: (record: FleetRecord) => void; onEdit: (record: FleetRecord) => void;
onRemove: (record: FleetRecord) => void; onRemove: (record: FleetRecord) => void;
onAssignDriver?: (record: FleetRecord) => void;
layout?: "row" | "compact"; layout?: "row" | "compact";
} }
@@ -18,11 +19,13 @@ const FleetRecordActions = ({
config, config,
onEdit, onEdit,
onRemove, onRemove,
onAssignDriver,
layout = "row", layout = "row",
}: FleetRecordActionsProps) => { }: FleetRecordActionsProps) => {
const navigate = useNavigate(); const navigate = useNavigate();
const removeLabel = config.removeActionLabel ?? "Delete"; const removeLabel = config.removeActionLabel ?? "Delete";
const showDetail = Boolean(config.detailPath && "id" in record); const showDetail = Boolean(config.detailPath && "id" in record);
const isVehicle = config.slug === "vehicles";
const handleDetail = () => { const handleDetail = () => {
if (!config.detailPath || !("id" in record)) return; if (!config.detailPath || !("id" in record)) return;
@@ -31,14 +34,25 @@ const FleetRecordActions = ({
if (layout === "compact") { if (layout === "compact") {
return ( return (
<Group gap={6} wrap="nowrap" justify="flex-end"> <Group gap={4} wrap="nowrap" justify="flex-end">
{showDetail ? ( {isVehicle && onAssignDriver ? (
<Tooltip label="View details"> <Tooltip label="Assign Driver">
<ActionIcon <ActionIcon
variant="light" variant="subtle"
color="green" color="blue"
size="md" size="sm"
radius="md" onClick={() => onAssignDriver(record)}
>
<Users size={16} />
</ActionIcon>
</Tooltip>
) : null}
{showDetail ? (
<Tooltip label="View">
<ActionIcon
variant="subtle"
color="gray"
size="sm"
onClick={handleDetail} onClick={handleDetail}
> >
<Eye size={16} /> <Eye size={16} />
@@ -47,21 +61,19 @@ const FleetRecordActions = ({
) : null} ) : null}
<Tooltip label="Edit"> <Tooltip label="Edit">
<ActionIcon <ActionIcon
variant="light" variant="subtle"
color="teal" color="blue"
size="md" size="sm"
radius="md"
onClick={() => onEdit(record)} onClick={() => onEdit(record)}
> >
<Pencil size={16} /> <Edit2 size={16} />
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
<Tooltip label={removeLabel}> <Tooltip label={removeLabel}>
<ActionIcon <ActionIcon
variant="light" variant="subtle"
color="red" color="red"
size="md" size="sm"
radius="md"
onClick={() => onRemove(record)} onClick={() => onRemove(record)}
> >
<Trash2 size={16} /> <Trash2 size={16} />
@@ -73,32 +85,30 @@ const FleetRecordActions = ({
return ( return (
<Group gap={4} wrap="nowrap" justify="flex-end"> <Group gap={4} wrap="nowrap" justify="flex-end">
{isVehicle && onAssignDriver ? (
<Tooltip label="Assign Driver">
<ActionIcon variant="subtle" color="blue" size="sm" onClick={() => onAssignDriver(record)}>
<Users size={16} />
</ActionIcon>
</Tooltip>
) : null}
{showDetail ? ( {showDetail ? (
<Tooltip label="View details"> <Tooltip label="View">
<ActionIcon variant="light" color="green" size="md" radius="md" onClick={handleDetail}> <ActionIcon variant="subtle" color="gray" size="sm" onClick={handleDetail}>
<Eye size={16} /> <Eye size={16} />
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
) : null} ) : null}
<Tooltip label="Edit"> <Tooltip label="Edit">
<ActionIcon variant="light" color="teal" size="md" radius="md" onClick={() => onEdit(record)}> <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => onEdit(record)}>
<Pencil size={16} /> <Edit2 size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label={removeLabel}>
<ActionIcon variant="subtle" color="red" size="sm" onClick={() => onRemove(record)}>
<Trash2 size={16} />
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
<Menu position="bottom-end" withinPortal>
<Menu.Target>
<Tooltip label="More actions">
<ActionIcon variant="light" color="green" size="md" radius="md">
<MoreHorizontal size={16} />
</ActionIcon>
</Tooltip>
</Menu.Target>
<Menu.Dropdown>
<Menu.Item color="red" leftSection={<Trash2 size={14} />} onClick={() => onRemove(record)}>
{removeLabel}
</Menu.Item>
</Menu.Dropdown>
</Menu>
</Group> </Group>
); );
}; };

View File

@@ -48,6 +48,7 @@ const FleetResourcePage = () => {
const [formOpen, setFormOpen] = useState(false); const [formOpen, setFormOpen] = useState(false);
const [editing, setEditing] = useState<FleetRecord | null>(null); const [editing, setEditing] = useState<FleetRecord | null>(null);
const [removeTarget, setRemoveTarget] = useState<FleetRecord | null>(null); const [removeTarget, setRemoveTarget] = useState<FleetRecord | null>(null);
const [assigningDriver, setAssigningDriver] = useState<FleetRecord | null>(null);
const { viewMode, setViewMode } = useFleetViewMode(slug); const { viewMode, setViewMode } = useFleetViewMode(slug);
const serverListFilters = useMemo((): FleetListFilters | undefined => { const serverListFilters = useMemo((): FleetListFilters | undefined => {
@@ -246,6 +247,7 @@ const FleetResourcePage = () => {
setFormOpen(true); setFormOpen(true);
}} }}
onRemove={setRemoveTarget} onRemove={setRemoveTarget}
onAssignDriver={setAssigningDriver}
/> />
</div> </div>
), ),
@@ -478,6 +480,30 @@ const FleetResourcePage = () => {
</Group> </Group>
</Stack> </Stack>
</Modal> </Modal>
<Modal
opened={Boolean(assigningDriver)}
onClose={() => setAssigningDriver(null)}
title={<Text fw={600}>Assign Driver</Text>}
radius="lg"
centered
>
<Stack gap="md">
<Text size="sm">
{assigningDriver && "id" in assigningDriver ?
`Assign a driver to vehicle: ${(assigningDriver as unknown as Record<string, unknown>).plateNumber}`
: "Select a driver to assign"}
</Text>
<Text size="sm" c="dimmed">
Driver assignment feature coming soon
</Text>
<Group justify="flex-end">
<Button variant="default" onClick={() => setAssigningDriver(null)}>
Close
</Button>
</Group>
</Stack>
</Modal>
</Container> </Container>
); );
}; };