This commit is contained in:
2026-02-28 20:00:21 +03:00
parent 7cf188a55c
commit 73070fe233
3 changed files with 281 additions and 59 deletions

View File

@@ -75,6 +75,8 @@ type RowData = {
device_uuid: string | null;
current_snapshot_uuid: string | null;
snapshot_update_blocked: boolean;
maintenance_mode_on: boolean;
demo_mode_enabled: boolean;
};
function getVehicleTypeLabel(vehicle: Vehicle): string {
@@ -97,14 +99,16 @@ const transformToRows = (vehicles: Vehicle[]): RowData[] => {
type,
model,
tail_number: vehicle.vehicle.tail_number,
online: uuid ? vehicle.device_status?.online ?? false : false,
online: uuid ? (vehicle.device_status?.online ?? false) : false,
lastUpdate: vehicle.device_status?.last_update ?? null,
gps: uuid ? vehicle.device_status?.gps_ok ?? false : false,
media: uuid ? vehicle.device_status?.media_service_ok ?? false : false,
connection: uuid ? vehicle.device_status?.is_connected ?? false : false,
gps: uuid ? (vehicle.device_status?.gps_ok ?? false) : false,
media: uuid ? (vehicle.device_status?.media_service_ok ?? false) : false,
connection: uuid ? (vehicle.device_status?.is_connected ?? false) : false,
device_uuid: uuid ?? null,
current_snapshot_uuid: vehicle.vehicle.current_snapshot_uuid ?? null,
snapshot_update_blocked: vehicle.vehicle.snapshot_update_blocked ?? false,
maintenance_mode_on: vehicle.vehicle.maintenance_mode_on ?? false,
demo_mode_enabled: vehicle.vehicle.demo_mode_enabled ?? false,
};
});
};
@@ -119,17 +123,29 @@ export const DevicesTable = observer(() => {
} = devicesStore;
const { snapshots, getSnapshots } = snapshotStore;
const { getVehicles, vehicles, deleteVehicle } = vehicleStore;
const {
getVehicles,
vehicles,
deleteVehicle,
setMaintenanceMode,
setDemoMode,
} = vehicleStore;
const navigate = useNavigate();
const [selectedIds, setSelectedIds] = useState<number[]>([]);
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [logsModalOpen, setLogsModalOpen] = useState(false);
const [logsModalDeviceUuid, setLogsModalDeviceUuid] = useState<string | null>(
null
null,
);
const [isLoading, setIsLoading] = useState(false);
const [maintenanceLoadingUuids, setMaintenanceLoadingUuids] = useState<
Set<string>
>(new Set());
const [demoLoadingUuids, setDemoLoadingUuids] = useState<Set<string>>(
new Set(),
);
const [collapsedModels, setCollapsedModels] = useState<Set<string>>(
new Set()
new Set(),
);
const [paginationModel, setPaginationModel] = useState({
page: 0,
@@ -146,7 +162,7 @@ export const DevicesTable = observer(() => {
const carriersInSelectedCityIds = new Set(
carrierStore.carriers.ru.data
.filter((carrier) => carrier.city_id === selectedCityId)
.map((carrier) => carrier.id)
.map((carrier) => carrier.id),
);
if (carriersInSelectedCityIds.size === 0) {
@@ -154,17 +170,17 @@ export const DevicesTable = observer(() => {
}
return vehiclesList.filter((vehicle) =>
carriersInSelectedCityIds.has(vehicle.vehicle.carrier_id)
carriersInSelectedCityIds.has(vehicle.vehicle.carrier_id),
);
};
const filteredVehicles = filterVehiclesBySelectedCity(
vehicles.data as Vehicle[]
vehicles.data as Vehicle[],
);
const rows = useMemo(
() => transformToRows(filteredVehicles),
[filteredVehicles]
[filteredVehicles],
);
const groupsByModel = useMemo(() => {
@@ -202,11 +218,70 @@ export const DevicesTable = observer(() => {
(r) =>
selectedIds.includes(r.id) &&
r.device_uuid != null &&
!r.snapshot_update_blocked
!r.snapshot_update_blocked,
)
.map((r) => r.device_uuid as string);
}, [rows, selectedIds]);
const handleToggleMaintenanceMode = async (row: RowData) => {
if (!row.device_uuid) return;
const nextEnabled = !row.maintenance_mode_on;
setMaintenanceLoadingUuids((prev) => {
const next = new Set(prev);
next.add(row.device_uuid!);
return next;
});
try {
await setMaintenanceMode(row.device_uuid, nextEnabled);
await getVehicles();
await getDevices();
toast.success(
nextEnabled ? "Устройство отправлено на ТО" : "Режим ТО отключен",
);
} catch (error) {
console.error(
`Error toggling maintenance mode for ${row.device_uuid}:`,
error,
);
toast.error("Не удалось изменить режим ТО");
} finally {
setMaintenanceLoadingUuids((prev) => {
const next = new Set(prev);
next.delete(row.device_uuid!);
return next;
});
}
};
const handleToggleDemoMode = async (row: RowData) => {
if (!row.device_uuid) return;
const nextEnabled = !row.demo_mode_enabled;
setDemoLoadingUuids((prev) => {
const next = new Set(prev);
next.add(row.device_uuid!);
return next;
});
try {
await setDemoMode(row.device_uuid, nextEnabled);
await getVehicles();
await getDevices();
toast.success(nextEnabled ? "Демо-режим включен" : "Демо-режим отключен");
} catch (error) {
console.error(`Error toggling demo mode for ${row.device_uuid}:`, error);
toast.error("Не удалось изменить демо-режим");
} finally {
setDemoLoadingUuids((prev) => {
const next = new Set(prev);
next.delete(row.device_uuid!);
return next;
});
}
};
const columns: GridColDef[] = useMemo(
() => [
{
@@ -220,7 +295,7 @@ export const DevicesTable = observer(() => {
field: "tail_number",
headerName: "Бортовой номер",
flex: 1,
minWidth: 120,
minWidth: 90,
filterable: true,
},
{
@@ -279,6 +354,65 @@ export const DevicesTable = observer(() => {
</Box>
),
},
{
field: "maintenance_mode_on",
headerName: "Режим ТО",
width: 90,
align: "center",
headerAlign: "center",
type: "boolean",
filterable: true,
renderCell: (params: GridRenderCellParams) => {
const rowData = params.row as RowData;
const isMaintenanceLoading =
!!rowData.device_uuid &&
maintenanceLoadingUuids.has(rowData.device_uuid);
return (
<Box
sx={{ display: "flex", justifyContent: "center", width: "100%" }}
onClick={(e) => e.stopPropagation()}
>
<Checkbox
checked={rowData.maintenance_mode_on}
disabled={!rowData.device_uuid || isMaintenanceLoading}
size="small"
sx={{ p: 0 }}
onChange={() => handleToggleMaintenanceMode(rowData)}
/>
</Box>
);
},
},
{
field: "demo_mode_enabled",
headerName: "Режим Демо",
width: 120,
align: "center",
headerAlign: "center",
type: "boolean",
filterable: true,
renderCell: (params: GridRenderCellParams) => {
const rowData = params.row as RowData;
const isDemoLoading =
!!rowData.device_uuid && demoLoadingUuids.has(rowData.device_uuid);
return (
<Box
sx={{ display: "flex", justifyContent: "center", width: "100%" }}
onClick={(e) => e.stopPropagation()}
>
<Checkbox
checked={rowData.demo_mode_enabled}
disabled={!rowData.device_uuid || isDemoLoading}
size="small"
sx={{ p: 0 }}
onChange={() => handleToggleDemoMode(rowData)}
/>
</Box>
);
},
},
{
field: "lastUpdate",
headerName: "Обновлено",
@@ -338,7 +472,7 @@ export const DevicesTable = observer(() => {
setSelectedDevice(row.device_uuid);
try {
await authInstance.post(
`/devices/${row.device_uuid}/request-status`
`/devices/${row.device_uuid}/request-status`,
);
await getVehicles();
await getDevices();
@@ -346,7 +480,7 @@ export const DevicesTable = observer(() => {
} catch (error) {
console.error(
`Error requesting status for device ${row.device_uuid}:`,
error
error,
);
toast.error("Ошибка сервера");
}
@@ -356,7 +490,7 @@ export const DevicesTable = observer(() => {
<Box
sx={{
display: "flex",
gap: "20px",
gap: "8px",
height: "100%",
alignItems: "center",
justifyContent: "center",
@@ -421,7 +555,13 @@ export const DevicesTable = observer(() => {
snapshots,
setLogsModalDeviceUuid,
setLogsModalOpen,
]
maintenanceLoadingUuids,
demoLoadingUuids,
setMaintenanceMode,
setDemoMode,
handleToggleMaintenanceMode,
handleToggleDemoMode,
],
);
useEffect(() => {
@@ -452,7 +592,7 @@ export const DevicesTable = observer(() => {
selectedDeviceUuids.length - selectedDeviceUuidsAllowed.length;
if (blockedCount > 0) {
toast.info(
`Обновление ПО не отправлено на ${blockedCount} устройств (блокировка)`
`Обновление ПО не отправлено на ${blockedCount} устройств (блокировка)`,
);
}
@@ -460,7 +600,7 @@ export const DevicesTable = observer(() => {
try {
await authInstance.post(
`/devices/${deviceUuid}/force-snapshot-update`,
{ snapshot_id: snapshotId }
{ snapshot_id: snapshotId },
);
toast.success("Обновление ПО отправлено на устройство");
} catch (error) {
@@ -572,7 +712,7 @@ export const DevicesTable = observer(() => {
const isCollapsed = collapsedModels.has(groupModel);
const groupRowIds = groupRows.map((r) => r.id);
const selectedInGroup = selectedIds.filter((id) =>
groupRowIds.includes(id)
groupRowIds.includes(id),
);
return (
@@ -612,7 +752,7 @@ export const DevicesTable = observer(() => {
pageSizeOptions={[50]}
onRowSelectionModelChange={
createSelectionHandler(groupRowIds) as (
ids: unknown
ids: unknown,
) => void
}
rowSelectionModel={{