KRBL/WhiteNightsAdminPanel
11
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update map, admin to and cache

Browse Source
This commit is contained in:
Илья Куприец
2026-05-08 13:33:41 +03:00
parent 4bda233b63
commit 193f53c029
22 changed files with 191 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pages/Vehicle/VehicleCreatePage/index.tsx
View File

@@ -12,6 +12,8 @@ import {
VEHICLE_TYPES,
carrierStore,
languageStore,
cityStore,
selectedCityStore,
} from "@shared";
import { observer } from "mobx-react-lite";
import { ArrowLeft, Save } from "lucide-react";
@@ -26,11 +28,13 @@ export const VehicleCreatePage = observer(() => {
const [type, setType] = useState("");
const [carrierId, setCarrierId] = useState<number | null>(null);
const [model, setModel] = useState("");
const [cityId, setCityId] = useState<number | null>(selectedCityStore.selectedCityId);
const [isLoading, setIsLoading] = useState(false);
const { language } = languageStore;
useEffect(() => {
carrierStore.getCarriers(language);
cityStore.getCities("ru");
}, [language]);
const handleCreate = async () => {
@@ -43,6 +47,7 @@ export const VehicleCreatePage = observer(() => {
?.full_name as string,
carrierId!,
model || undefined,
cityId ?? undefined,
);
toast.success("Транспорт успешно создан");
} catch (error) {
@@ -73,12 +78,11 @@ export const VehicleCreatePage = observer(() => {
onChange={(e) => setTailNumber(e.target.value)}
/>
<FormControl fullWidth>
<FormControl fullWidth required>
<InputLabel>Тип</InputLabel>
<Select
value={type}
label="Тип"
required
onChange={(e) => setType(e.target.value)}
>
{VEHICLE_TYPES.map((type) => (
@@ -89,12 +93,11 @@ export const VehicleCreatePage = observer(() => {
</Select>
</FormControl>
<FormControl fullWidth>
<FormControl fullWidth required>
<InputLabel>Перевозчик</InputLabel>
<Select
value={carrierId || ""}
label="Перевозчик"
required
onChange={(e) => setCarrierId(e.target.value as number)}
>
{carrierStore.carriers[language].data?.map((carrier) => (
@@ -113,12 +116,27 @@ export const VehicleCreatePage = observer(() => {
placeholder="Произвольное название модели"
/>
<FormControl fullWidth required>
<InputLabel>Город</InputLabel>
<Select
value={cityId ?? ""}
label="Город"
onChange={(e) => setCityId(e.target.value ? Number(e.target.value) : null)}
>
{cityStore.cities.ru.data.map((city) => (
<MenuItem key={city.id} value={city.id}>
{city.name}
</MenuItem>
))}
</Select>
</FormControl>
<Button
variant="contained"
className="w-min flex gap-2 items-center"
startIcon={<Save size={20} />}
onClick={handleCreate}
disabled={isLoading || !tailNumber || !type || !carrierId}
disabled={isLoading || !tailNumber || !type || !carrierId || !cityId}
>
{isLoading ? (
<Loader2 size={20} className="animate-spin" />

33
src/pages/Vehicle/VehicleEditPage/index.tsx
View File

@@ -20,6 +20,8 @@ import {
VEHICLE_TYPES,
vehicleStore,
LoadingSpinner,
cityStore,
selectedCityStore,
} from "@shared";
import { toast } from "react-toastify";
@@ -54,6 +56,7 @@ export const VehicleEditPage = observer(() => {
try {
await getVehicle(Number(id));
await getCarriers(language);
await cityStore.getCities("ru");
setEditVehicleData({
tail_number: vehicle[Number(id)]?.vehicle.tail_number ?? "",
@@ -63,6 +66,7 @@ export const VehicleEditPage = observer(() => {
model: vehicle[Number(id)]?.vehicle.model ?? "",
snapshot_update_blocked:
vehicle[Number(id)]?.vehicle.snapshot_update_blocked ?? false,
city_id: vehicle[Number(id)]?.vehicle.city_id ?? selectedCityStore.selectedCityId ?? undefined,
});
} finally {
setIsLoadingData(false);
@@ -125,12 +129,11 @@ export const VehicleEditPage = observer(() => {
}
/>
<FormControl fullWidth>
<FormControl fullWidth required>
<InputLabel>Тип</InputLabel>
<Select
value={editVehicleData.type}
label="Тип"
required
onChange={(e) =>
setEditVehicleData({ ...editVehicleData, type: e.target.value })
}
@@ -143,12 +146,11 @@ export const VehicleEditPage = observer(() => {
</Select>
</FormControl>
<FormControl fullWidth>
<FormControl fullWidth required>
<InputLabel>Перевозчик</InputLabel>
<Select
value={editVehicleData.carrier_id}
label="Перевозчик"
required
onChange={(e) =>
setEditVehicleData({
...editVehicleData,
@@ -177,6 +179,26 @@ export const VehicleEditPage = observer(() => {
placeholder="Произвольное название модели"
/>
<FormControl fullWidth required>
<InputLabel>Город</InputLabel>
<Select
value={editVehicleData.city_id ?? ""}
label="Город"
onChange={(e) =>
setEditVehicleData({
...editVehicleData,
city_id: e.target.value ? Number(e.target.value) : undefined,
})
}
>
{cityStore.cities.ru.data.map((city) => (
<MenuItem key={city.id} value={city.id}>
{city.name}
</MenuItem>
))}
</Select>
</FormControl>
<FormControlLabel
control={
<Checkbox
@@ -202,7 +224,8 @@ export const VehicleEditPage = observer(() => {
isLoading ||
!editVehicleData.tail_number ||
!editVehicleData.type ||
!editVehicleData.carrier_id
!editVehicleData.carrier_id ||
!editVehicleData.city_id
}
>
{isLoading ? (

20
src/pages/Vehicle/VehicleListPage/index.tsx
View File

@@ -1,6 +1,6 @@
import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
import { ruRU } from "@mui/x-data-grid/locales";
import { authStore, carrierStore, languageStore, vehicleStore, SearchInput } from "@shared";
import { authStore, carrierStore, languageStore, vehicleStore, SearchInput, selectedCityStore, cityStore } from "@shared";
import { useEffect, useState, useMemo } from "react";
import { observer } from "mobx-react-lite";
import { Eye, Pencil, Trash2, Minus } from "lucide-react";
@@ -11,7 +11,7 @@ import { Box, CircularProgress } from "@mui/material";
export const VehicleListPage = observer(() => {
const { vehicles, getVehicles, deleteVehicle } = vehicleStore;
const { carriers, getCarriers } = carrierStore;
const { getCarriers } = carrierStore;
const navigate = useNavigate();
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
@@ -31,10 +31,11 @@ export const VehicleListPage = observer(() => {
setIsLoading(true);
await getVehicles();
await getCarriers(language);
await cityStore.getCities("ru");
setIsLoading(false);
};
fetchData();
}, [language]);
}, [language, selectedCityStore.cityVersion]);
const columns: GridColDef[] = [
{
@@ -137,9 +138,13 @@ export const VehicleListPage = observer(() => {
},
];
const { selectedCityId } = selectedCityStore;
const rows = useMemo(() => {
if (!selectedCityId) return [];
const query = searchQuery.trim().toLowerCase();
return (vehicles.data ?? [])
.filter((vehicle) => vehicle.vehicle.city_id === selectedCityId)
.filter(
(vehicle) =>
!query ||
@@ -151,11 +156,9 @@ export const VehicleListPage = observer(() => {
tail_number: vehicle.vehicle.tail_number,
type: vehicle.vehicle.type,
carrier: vehicle.vehicle.carrier,
city: carriers[language].data?.find(
(carrier) => carrier.id === vehicle.vehicle.carrier_id
)?.city,
city: cityStore.cities.ru.data.find((c) => c.id === vehicle.vehicle.city_id)?.name,
}));
}, [vehicles.data, carriers[language].data, searchQuery]);
}, [vehicles.data, selectedCityId, searchQuery]);
return (
<>
@@ -166,6 +169,7 @@ export const VehicleListPage = observer(() => {
<CreateButton
label="Создать транспортное средство"
path="/vehicle/create"
disabled={!selectedCityId}
/>
</div>
@@ -223,6 +227,8 @@ export const VehicleListPage = observer(() => {
<Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
{isLoading ? (
<CircularProgress size={20} />
) : !selectedCityId ? (
"Выберите город"
) : (
"Нет транспортных средств"
)}