fix: Hot bug fix

2025-06-15 20:38:48 +03:00
parent 481385c2f4
commit 32a7cb44d1
24 changed files with 900 additions and 250 deletions
--- a/src/pages/Carrier/CarrierCreatePage/index.tsx
+++ b/src/pages/Carrier/CarrierCreatePage/index.tsx
@ -12,7 +12,7 @@ import { ArrowLeft, Save } from "lucide-react";
 import { Loader2 } from "lucide-react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
-import { carrierStore, cityStore, mediaStore } from "@shared";
+import { carrierStore, cityStore, mediaStore, languageStore } from "@shared";
 import { useState, useEffect } from "react";
 import { ImageUploadCard, LanguageSwitcher } from "@widgets";
 import {
@ -23,11 +23,8 @@ import {

 export const CarrierCreatePage = observer(() => {
  const navigate = useNavigate();
-
-  const [fullName, setFullName] = useState("");
-  const [shortName, setShortName] = useState("");
-  const [cityId, setCityId] = useState<number | null>(null);
-  const [slogan, setSlogan] = useState("");
+  const { createCarrierData, setCreateCarrierData } = carrierStore;
+  const { language } = languageStore;
  const [selectedMediaId, setSelectedMediaId] = useState<string | null>(null);
  const [isLoading, setIsLoading] = useState(false);
  const [isSelectMediaOpen, setIsSelectMediaOpen] = useState(false);
@ -35,7 +32,7 @@ export const CarrierCreatePage = observer(() => {
  const [isPreviewMediaOpen, setIsPreviewMediaOpen] = useState(false);
  const [mediaId, setMediaId] = useState("");
  const [activeMenuType, setActiveMenuType] = useState<
-    "thumbnail" | "watermark_lu" | "watermark_rd" | null
+    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
  >(null);

  useEffect(() => {
@ -46,13 +43,7 @@ export const CarrierCreatePage = observer(() => {
  const handleCreate = async () => {
    try {
      setIsLoading(true);
-      await carrierStore.createCarrier(
-        fullName,
-        shortName,
-        cityId!,
-        slogan,
-        selectedMediaId!
-      );
+      await carrierStore.createCarrier();
      toast.success("Перевозчик успешно создан");
      navigate("/carrier");
    } catch (error) {
@ -69,6 +60,14 @@ export const CarrierCreatePage = observer(() => {
    media_type: number;
  }) => {
    setSelectedMediaId(media.id);
+    setCreateCarrierData(
+      createCarrierData[language].full_name,
+      createCarrierData[language].short_name,
+      createCarrierData.city_id,
+      createCarrierData[language].slogan,
+      media.id,
+      language
+    );
  };

  const selectedMedia = selectedMediaId
@ -89,19 +88,28 @@ export const CarrierCreatePage = observer(() => {
      </div>

      <div className="flex flex-col gap-10 w-full items-end">
-        <div className="flex gap-10 items-center mb-5 max-w-[80%]">
+        <div className="flex gap-10 items-center mb-5 max-w-[80%] self-start">
          <h1 className="text-3xl break-words">Создание перевозчика</h1>
        </div>

        <FormControl fullWidth>
          <InputLabel>Город</InputLabel>
          <Select
-            value={cityId || ""}
+            value={createCarrierData.city_id || ""}
            label="Город"
            required
-            onChange={(e) => setCityId(e.target.value as number)}
+            onChange={(e) =>
+              setCreateCarrierData(
+                createCarrierData[language].full_name,
+                createCarrierData[language].short_name,
+                e.target.value as number,
+                createCarrierData[language].slogan,
+                selectedMediaId || "",
+                language
+              )
+            }
          >
-            {cityStore.cities.ru.data.map((city) => (
+            {cityStore.cities["ru"].data.map((city) => (
              <MenuItem key={city.id} value={city.id}>
                {city.name}
              </MenuItem>
@ -112,24 +120,51 @@ export const CarrierCreatePage = observer(() => {
        <TextField
          fullWidth
          label="Полное название"
-          value={fullName}
+          value={createCarrierData[language].full_name}
          required
-          onChange={(e) => setFullName(e.target.value)}
+          onChange={(e) =>
+            setCreateCarrierData(
+              e.target.value,
+              createCarrierData[language].short_name,
+              createCarrierData.city_id,
+              createCarrierData[language].slogan,
+              selectedMediaId || "",
+              language
+            )
+          }
        />

        <TextField
          fullWidth
          label="Короткое название"
-          value={shortName}
+          value={createCarrierData[language].short_name}
          required
-          onChange={(e) => setShortName(e.target.value)}
+          onChange={(e) =>
+            setCreateCarrierData(
+              createCarrierData[language].full_name,
+              e.target.value,
+              createCarrierData.city_id,
+              createCarrierData[language].slogan,
+              selectedMediaId || "",
+              language
+            )
+          }
        />

        <TextField
          fullWidth
          label="Слоган"
-          value={slogan}
-          onChange={(e) => setSlogan(e.target.value)}
+          value={createCarrierData[language].slogan}
+          onChange={(e) =>
+            setCreateCarrierData(
+              createCarrierData[language].full_name,
+              createCarrierData[language].short_name,
+              createCarrierData.city_id,
+              e.target.value,
+              selectedMediaId || "",
+              language
+            )
+          }
        />

        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
@ -144,14 +179,22 @@ export const CarrierCreatePage = observer(() => {
            onDeleteImageClick={() => {
              setSelectedMediaId(null);
              setActiveMenuType(null);
+              setCreateCarrierData(
+                createCarrierData[language].full_name,
+                createCarrierData[language].short_name,
+                createCarrierData.city_id,
+                createCarrierData[language].slogan,
+                "",
+                language
+              );
            }}
            onSelectFileClick={() => {
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
              setIsSelectMediaOpen(true);
            }}
            setUploadMediaOpen={() => {
              setIsUploadMediaOpen(true);
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
            }}
          />
        </div>
@ -162,7 +205,10 @@ export const CarrierCreatePage = observer(() => {
          startIcon={<Save size={20} />}
          onClick={handleCreate}
          disabled={
-            isLoading || !fullName || !shortName || !cityId || !selectedMediaId
+            isLoading ||
+            !createCarrierData[language].full_name ||
+            !createCarrierData[language].short_name ||
+            !createCarrierData.city_id
          }
        >
          {isLoading ? (
@ -177,7 +223,7 @@ export const CarrierCreatePage = observer(() => {
        open={isSelectMediaOpen}
        onClose={() => setIsSelectMediaOpen(false)}
        onSelectMedia={handleMediaSelect}
-        mediaType={3}
+        mediaType={1}
      />

      <UploadMediaDialog
--- a/src/pages/Carrier/CarrierEditPage/index.tsx
+++ b/src/pages/Carrier/CarrierEditPage/index.tsx
@ -33,7 +33,7 @@ export const CarrierEditPage = observer(() => {
  const [isPreviewMediaOpen, setIsPreviewMediaOpen] = useState(false);
  const [mediaId, setMediaId] = useState("");
  const [activeMenuType, setActiveMenuType] = useState<
-    "thumbnail" | "watermark_lu" | "watermark_rd" | null
+    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
  >(null);

  useEffect(() => {
@ -141,7 +141,7 @@ export const CarrierEditPage = observer(() => {
              )
            }
          >
-            {cityStore.cities[language].data?.map((city) => (
+            {cityStore.cities["ru"].data?.map((city) => (
              <MenuItem key={city.id} value={city.id}>
                {city.name}
              </MenuItem>
@ -220,12 +220,12 @@ export const CarrierEditPage = observer(() => {
              setActiveMenuType(null);
            }}
            onSelectFileClick={() => {
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
              setIsSelectMediaOpen(true);
            }}
            setUploadMediaOpen={() => {
              setIsUploadMediaOpen(true);
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
            }}
          />
        </div>
@ -238,9 +238,7 @@ export const CarrierEditPage = observer(() => {
          disabled={
            isLoading ||
            !editCarrierData[language].full_name ||
-            !editCarrierData[language].short_name ||
-            !editCarrierData.city_id ||
-            !editCarrierData.logo
+            !editCarrierData.city_id
          }
        >
          {isLoading ? (
@ -255,7 +253,7 @@ export const CarrierEditPage = observer(() => {
        open={isSelectMediaOpen}
        onClose={() => setIsSelectMediaOpen(false)}
        onSelectMedia={handleMediaSelect}
-        mediaType={3}
+        mediaType={1}
      />

      <UploadMediaDialog
--- a/src/pages/Carrier/CarrierListPage/index.tsx
+++ b/src/pages/Carrier/CarrierListPage/index.tsx
@ -1,5 +1,5 @@
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
-import { carrierStore, languageStore } from "@shared";
+import { carrierStore, cityStore, languageStore } from "@shared";
 import { useEffect, useState } from "react";
 import { observer } from "mobx-react-lite";
 import { Pencil, Trash2, Minus } from "lucide-react";
@ -8,6 +8,7 @@ import { CreateButton, DeleteModal, LanguageSwitcher } from "@widgets";

 export const CarrierListPage = observer(() => {
  const { carriers, getCarriers, deleteCarrier } = carrierStore;
+  const { getCities, cities } = cityStore;
  const navigate = useNavigate();
  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
  const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
@ -17,6 +18,9 @@ export const CarrierListPage = observer(() => {

  useEffect(() => {
    (async () => {
+      await getCities("ru");
+      await getCities("en");
+      await getCities("zh");
      await getCarriers(language);
    })();
  }, [language]);
@ -55,14 +59,15 @@ export const CarrierListPage = observer(() => {
      },
    },
    {
-      field: "city",
+      field: "city_id",
      headerName: "Город",
      flex: 1,
      renderCell: (params: GridRenderCellParams) => {
        return (
          <div className="w-full h-full flex items-center">
            {params.value ? (
-              params.value
+              cities[language].data.find((city) => city.id == params.value)
+                ?.name
            ) : (
              <Minus size={20} className="text-red-500" />
            )}
@ -103,7 +108,7 @@ export const CarrierListPage = observer(() => {
    id: carrier.id,
    full_name: carrier.full_name,
    short_name: carrier.short_name,
-    city: carrier.city,
+    city_id: carrier.city_id,
  }));

  return (
--- a/src/pages/City/CityCreatePage/index.tsx
+++ b/src/pages/City/CityCreatePage/index.tsx
@ -31,7 +31,7 @@ export const CityCreatePage = observer(() => {
  const [isPreviewMediaOpen, setIsPreviewMediaOpen] = useState(false);
  const [mediaId, setMediaId] = useState("");
  const [activeMenuType, setActiveMenuType] = useState<
-    "thumbnail" | "watermark_lu" | "watermark_rd" | null
+    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
  >(null);
  const { getCountries } = countryStore;
  const { getMedia } = mediaStore;
@ -132,15 +132,9 @@ export const CityCreatePage = observer(() => {
        </FormControl>

        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
-          {!selectedMedia && (
-            <div className="flex items-center gap-2 text-red-500">
-              <Minus size={20} />
-              <span className="text-sm">Герб города не выбран</span>
-            </div>
-          )}
          <ImageUploadCard
            title="Герб города"
-            imageKey="thumbnail"
+            imageKey="image"
            imageUrl={selectedMedia?.id}
            onImageClick={() => {
              setIsPreviewMediaOpen(true);
@ -156,12 +150,22 @@ export const CityCreatePage = observer(() => {
              setActiveMenuType(null);
            }}
            onSelectFileClick={() => {
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
              setIsSelectMediaOpen(true);
            }}
            setUploadMediaOpen={() => {
              setIsUploadMediaOpen(true);
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
+            }}
+            setHardcodeType={(type) => {
+              setActiveMenuType(
+                type as
+                  | "thumbnail"
+                  | "watermark_lu"
+                  | "watermark_rd"
+                  | "image"
+                  | null
+              );
            }}
          />
        </div>
@ -185,14 +189,16 @@ export const CityCreatePage = observer(() => {
        open={isSelectMediaOpen}
        onClose={() => setIsSelectMediaOpen(false)}
        onSelectMedia={handleMediaSelect}
-        mediaType={3} // Тип медиа для иконок
+        mediaType={1} // Тип медиа для иконок
      />

      <UploadMediaDialog
        open={isUploadMediaOpen}
        onClose={() => setIsUploadMediaOpen(false)}
        afterUpload={handleMediaSelect}
-        hardcodeType={activeMenuType}
+        hardcodeType={
+          activeMenuType as "thumbnail" | "watermark_lu" | "watermark_rd" | null
+        }
      />

      <PreviewMediaDialog
--- a/src/pages/City/CityEditPage/index.tsx
+++ b/src/pages/City/CityEditPage/index.tsx
@ -35,7 +35,7 @@ export const CityEditPage = observer(() => {
  const [isPreviewMediaOpen, setIsPreviewMediaOpen] = useState(false);
  const [mediaId, setMediaId] = useState("");
  const [activeMenuType, setActiveMenuType] = useState<
-    "thumbnail" | "watermark_lu" | "watermark_rd" | null
+    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
  >(null);
  const { language } = languageStore;
  const { id } = useParams();
@ -151,7 +151,7 @@ export const CityEditPage = observer(() => {
        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
          <ImageUploadCard
            title="Герб города"
-            imageKey="thumbnail"
+            imageKey="image"
            imageUrl={selectedMedia?.id}
            onImageClick={() => {
              setIsPreviewMediaOpen(true);
@ -167,12 +167,22 @@ export const CityEditPage = observer(() => {
              setActiveMenuType(null);
            }}
            onSelectFileClick={() => {
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
              setIsSelectMediaOpen(true);
            }}
            setUploadMediaOpen={() => {
              setIsUploadMediaOpen(true);
-              setActiveMenuType("thumbnail");
+              setActiveMenuType("image");
+            }}
+            setHardcodeType={(type) => {
+              setActiveMenuType(
+                type as
+                  | "thumbnail"
+                  | "watermark_lu"
+                  | "watermark_rd"
+                  | "image"
+                  | null
+              );
            }}
          />
        </div>
@ -198,14 +208,21 @@ export const CityEditPage = observer(() => {
        open={isSelectMediaOpen}
        onClose={() => setIsSelectMediaOpen(false)}
        onSelectMedia={handleMediaSelect}
-        mediaType={3} // Тип медиа для иконок
+        mediaType={1} // Тип медиа для иконок
      />

      <UploadMediaDialog
        open={isUploadMediaOpen}
        onClose={() => setIsUploadMediaOpen(false)}
        afterUpload={handleMediaSelect}
-        hardcodeType={activeMenuType}
+        hardcodeType={
+          activeMenuType as
+            | "thumbnail"
+            | "watermark_lu"
+            | "watermark_rd"
+            | "image"
+            | null
+        }
      />

      <PreviewMediaDialog
--- a/src/pages/City/CityListPage/index.tsx
+++ b/src/pages/City/CityListPage/index.tsx
@ -11,7 +11,9 @@ export const CityListPage = observer(() => {
  const { cities, getCities, deleteCity } = cityStore;
  const navigate = useNavigate();
  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
  const [rowId, setRowId] = useState<number | null>(null);
+  const [ids, setIds] = useState<number[]>([]);
  const { language } = languageStore;

  useEffect(() => {
@ -57,18 +59,18 @@ export const CityListPage = observer(() => {
      align: "center",
      headerAlign: "center",
      width: 200,
-
      renderCell: (params: GridRenderCellParams) => {
        return (
          <div className="flex h-full gap-7 justify-center items-center">
            <button onClick={() => navigate(`/city/${params.row.id}/edit`)}>
              <Pencil size={20} className="text-blue-500" />
            </button>
-            <button onClick={() => navigate(`/city/${params.row.id}`)}>
+            {/* <button onClick={() => navigate(`/city/${params.row.id}`)}>
              <Eye size={20} className="text-green-500" />
-            </button>
+            </button> */}
            <button
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                setIsDeleteModalOpen(true);
                setRowId(params.row.id);
              }}
@ -96,11 +98,29 @@ export const CityListPage = observer(() => {
          <h1 className="text-2xl">Города</h1>
          <CreateButton label="Создать город" path="/city/create" />
        </div>
+
+        <div
+          className="flex justify-end mb-5 duration-300"
+          style={{ opacity: ids.length > 0 ? 1 : 0 }}
+        >
+          <button
+            className="px-4 py-2 bg-red-500 text-white rounded flex gap-2 items-center"
+            onClick={() => setIsBulkDeleteModalOpen(true)}
+          >
+            <Trash2 size={20} className="text-white" /> Удалить выбранные (
+            {ids.length})
+          </button>
+        </div>
+
        <DataGrid
          rows={rows}
          columns={columns}
          hideFooterPagination
          hideFooter
+          checkboxSelection
+          onRowSelectionModelChange={(newSelection) => {
+            setIds(Array.from(newSelection.ids as unknown as number[]));
+          }}
        />
      </div>

@ -119,6 +139,20 @@ export const CityListPage = observer(() => {
          setRowId(null);
        }}
      />
+
+      <DeleteModal
+        open={isBulkDeleteModalOpen}
+        onDelete={async () => {
+          await Promise.all(ids.map((id) => deleteCity(id.toString())));
+          toast.success("Города успешно удалены");
+          getCities(language);
+          setIsBulkDeleteModalOpen(false);
+          setIds([]);
+        }}
+        onCancel={() => {
+          setIsBulkDeleteModalOpen(false);
+        }}
+      />
    </>
  );
 });
--- a/src/pages/Country/CountryListPage/index.tsx
+++ b/src/pages/Country/CountryListPage/index.tsx
@ -10,7 +10,9 @@ export const CountryListPage = observer(() => {
  const { countries, getCountries, deleteCountry } = countryStore;
  const navigate = useNavigate();
  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
  const [rowId, setRowId] = useState<string | null>(null);
+  const [ids, setIds] = useState<number[]>([]);
  const { language } = languageStore;

  useEffect(() => {
@ -52,7 +54,8 @@ export const CountryListPage = observer(() => {
              <Eye size={20} className="text-green-500" />
            </button> */}
            <button
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                setIsDeleteModalOpen(true);
                setRowId(params.row.code);
              }}
@ -80,14 +83,37 @@ export const CountryListPage = observer(() => {
          <h1 className="text-2xl">Страны</h1>
          <CreateButton label="Создать страну" path="/country/create" />
        </div>
-        <DataGrid rows={rows} columns={columns} hideFooter />
+
+        <div
+          className="flex justify-end mb-5 duration-300"
+          style={{ opacity: ids.length > 0 ? 1 : 0 }}
+        >
+          <button
+            className="px-4 py-2 bg-red-500 text-white rounded flex gap-2 items-center"
+            onClick={() => setIsBulkDeleteModalOpen(true)}
+          >
+            <Trash2 size={20} className="text-white" /> Удалить выбранные (
+            {ids.length})
+          </button>
+        </div>
+
+        <DataGrid
+          rows={rows}
+          columns={columns}
+          hideFooter
+          checkboxSelection
+          onRowSelectionModelChange={(newSelection) => {
+            console.log(newSelection);
+            setIds(Array.from(newSelection.ids as unknown as number[]));
+          }}
+        />
      </div>

      <DeleteModal
        open={isDeleteModalOpen}
        onDelete={async () => {
          if (!rowId) return;
-          await deleteCountry(rowId, language);
+          await deleteCountry(rowId);
          setRowId(null);
          setIsDeleteModalOpen(false);
        }}
@ -96,6 +122,19 @@ export const CountryListPage = observer(() => {
          setIsDeleteModalOpen(false);
        }}
      />
+
+      <DeleteModal
+        open={isBulkDeleteModalOpen}
+        onDelete={async () => {
+          await Promise.all(ids.map((id) => deleteCountry(id.toString())));
+          getCountries(language);
+          setIsBulkDeleteModalOpen(false);
+          setIds([]);
+        }}
+        onCancel={() => {
+          setIsBulkDeleteModalOpen(false);
+        }}
+      />
    </>
  );
 });
--- a/src/pages/MapPage/index.tsx
+++ b/src/pages/MapPage/index.tsx
@ -132,6 +132,8 @@ class MapStore {
      data = {
        route_number: properties.name || "Новый маршрут",
        path: geometry.coordinates,
+        center_latitude: geometry.coordinates[0][1],
+        center_longitude: geometry.coordinates[0][0],
      };
    } else if (featureType === "sight") {
      data = {
@ -192,17 +194,27 @@ class MapStore {
      oldData = this.sights.find((f) => f.id === numericId);
    }

-    console.log(oldData);
-    console.log(data);
-
-    const response = await languageInstance("ru").patch(
-      `/${featureType}/${numericId}`,
-      {
-        ...oldData,
-        latitude: data.latitude,
-        longitude: data.longitude,
-      }
-    );
+    let response;
+    if (featureType !== "route") {
+      response = await languageInstance("ru").patch(
+        `/${featureType}/${numericId}`,
+        {
+          ...oldData,
+          latitude: data.latitude,
+          longitude: data.longitude,
+        }
+      );
+    } else {
+      response = await languageInstance("ru").patch(
+        `/${featureType}/${numericId}`,
+        {
+          ...oldData,
+          path: data.path,
+          center_latitude: data.path[0][1],
+          center_longitude: data.path[0][0],
+        }
+      );
+    }

    if (featureType === "route") {
      const index = this.routes.findIndex((f) => f.id === numericId);
@ -1078,7 +1090,10 @@ class MapService {
      );

    if (!featureAtPixel) {
-      if (!ctrlKey) this.unselect();
+      if (ctrlKey) {
+        // При ctrl + клик вне сущности сбрасываем выбор
+        this.setSelectedIds(new Set());
+      }
      return;
    }

@ -1086,11 +1101,16 @@ class MapService {
    if (featureId === undefined) return;

    if (ctrlKey) {
+      // При ctrl + клик на сущность добавляем/удаляем её из выбора
      const newSet = new Set(this.selectedIds);
-      if (newSet.has(featureId)) newSet.delete(featureId);
-      else newSet.add(featureId);
+      if (newSet.has(featureId)) {
+        newSet.delete(featureId);
+      } else {
+        newSet.add(featureId);
+      }
      this.setSelectedIds(newSet);
    } else {
+      // При обычном клике на сущность выбираем только её
      this.setSelectedIds(new Set([featureId]));
    }
  }
@ -1153,14 +1173,12 @@ class MapService {
    mapStore
      .deleteFeature(recourse, numericId)
      .then(() => {
-        toast.success("Объект успешно удален");
        if (stateBeforeDelete)
          this.addStateToHistory("delete", stateBeforeDelete);
        this.vectorSource.removeFeature(feature);
        this.unselect();
      })
      .catch((err) => {
-        toast.error("Ошибка при удалении объекта");
        console.error("Delete failed:", err);
      });
  }
@ -1196,7 +1214,6 @@ class MapService {
        }
      })
      .catch((err) => {
-        toast.error("Произошла ошибка при массовом удалении");
        console.error("Bulk delete failed:", err);
      });
  }
@ -1307,12 +1324,9 @@ class MapService {

    try {
      await mapStore.updateFeature(featureType, featureGeoJSON);
-      toast.success(`"${feature.get("name")}" успешно обновлен.`);
    } catch (error) {
      console.error("Failed to update feature:", error);
-      toast.error(
-        `Не удалось обновить "${feature.get("name")}". Отмена изменений...`
-      );
+
      this.undo();
    }
  }
@ -1338,7 +1352,6 @@ class MapService {
        featureType === "route"
          ? createdFeatureData.route_number
          : createdFeatureData.name;
-      toast.success(`"${newName}" создано.`);

      const newFeatureId = `${featureType}-${createdFeatureData.id}`;
      feature.setId(newFeatureId);
@ -1507,15 +1520,20 @@ const MapSightbar: React.FC<MapSightbarProps> = ({
  );

  const handleCheckboxChange = useCallback(
-    // @ts-ignore
-    (id) => {
+    (id: string | number | undefined) => {
      if (id === undefined) return;
      const newSet = new Set(selectedIds);
-      if (newSet.has(id)) newSet.delete(id);
-      else newSet.add(id);
+      if (newSet.has(id)) {
+        newSet.delete(id);
+      } else {
+        newSet.add(id);
+      }
      setSelectedIds(newSet);
+      if (mapService) {
+        mapService.setSelectedIds(newSet);
+      }
    },
-    [selectedIds, setSelectedIds]
+    [selectedIds, setSelectedIds, mapService]
  );

  const handleBulkDelete = useCallback(() => {
@ -1990,13 +2008,11 @@ export const MapPage: React.FC = () => {
  );

  const handleMapClick = useCallback(
-    (event: any) => {
-      if (!mapServiceInstance || isLassoActive) return;
-      const ctrlKey =
-        event.originalEvent.ctrlKey || event.originalEvent.metaKey;
-      mapServiceInstance.handleMapClick(event, ctrlKey);
+    (event: MapBrowserEvent<any>) => {
+      if (!mapServiceInstance) return;
+      mapServiceInstance.handleMapClick(event, event.originalEvent.ctrlKey);
    },
-    [mapServiceInstance, isLassoActive]
+    [mapServiceInstance]
  );

  useEffect(() => {
--- a/src/pages/Route/RouteCreatePage/index.tsx
+++ b/src/pages/Route/RouteCreatePage/index.tsx
@ -35,11 +35,49 @@ export const RouteCreatePage = observer(() => {
  const [centerLng, setCenterLng] = useState("");
  const [isLoading, setIsLoading] = useState(false);
  const { language } = languageStore;
+
  useEffect(() => {
    carrierStore.getCarriers(language);
    articlesStore.getArticleList();
  }, [language]);

+  const validateCoordinates = (value: string) => {
+    try {
+      const lines = value.trim().split("\n");
+      const coordinates = lines.map((line) => {
+        const [lat, lon] = line
+          .trim()
+          .split(/[\s,]+/)
+          .map(Number);
+        return [lat, lon];
+      });
+
+      if (coordinates.length === 0) {
+        return "Введите хотя бы одну пару координат";
+      }
+
+      if (
+        !coordinates.every(
+          (point) => Array.isArray(point) && point.length === 2
+        )
+      ) {
+        return "Каждая строка должна содержать две координаты";
+      }
+
+      if (
+        !coordinates.every((point) =>
+          point.every((coord) => !isNaN(coord) && typeof coord === "number")
+        )
+      ) {
+        return "Координаты должны быть числами";
+      }
+
+      return true;
+    } catch {
+      return "Неверный формат координат";
+    }
+  };
+
  const handleCreateRoute = async () => {
    try {
      setIsLoading(true);
@ -52,16 +90,24 @@ export const RouteCreatePage = observer(() => {
      const center_latitude = centerLat ? Number(centerLat) : undefined;
      const center_longitude = centerLng ? Number(centerLng) : undefined;
      const route_direction = direction === "forward";
+
+      const validationResult = validateCoordinates(routeCoords);
+      if (validationResult !== true) {
+        toast.error(validationResult);
+        return;
+      }
+
      // Координаты маршрута как массив массивов чисел
      const path = routeCoords
+        .trim()
        .split("\n")
-        .map((line) =>
-          line
-            .split(" ")
-            .map((coord) => Number(coord.trim()))
-            .filter((n) => !isNaN(n))
-        )
-        .filter((arr) => arr.length === 2);
+        .map((line) => {
+          const [lat, lon] = line
+            .trim()
+            .split(/[\s,]+/)
+            .map(Number);
+          return [lat, lon];
+        });

      // Собираем объект маршрута
      const newRoute: Partial<Route> = {
@ -141,9 +187,33 @@ export const RouteCreatePage = observer(() => {
            className="w-full"
            label="Координаты маршрута"
            multiline
-            minRows={3}
+            minRows={4}
            value={routeCoords}
-            onChange={(e) => setRouteCoords(e.target.value)}
+            onChange={(e) => {
+              const newValue = e.target.value;
+              setRouteCoords(newValue);
+            }}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                const lines = routeCoords.split("\n");
+                const lastLine = lines[lines.length - 1];
+
+                // Если мы на последней строке и она не пустая
+                if (lastLine && lastLine.trim()) {
+                  e.preventDefault();
+                  const newValue = routeCoords + "\n";
+                  setRouteCoords(newValue);
+                }
+              }
+            }}
+            error={validateCoordinates(routeCoords) !== true}
+            helperText={
+              typeof validateCoordinates(routeCoords) === "string"
+                ? validateCoordinates(routeCoords)
+                : "Введите координаты в формате: широта долгота (можно использовать запятые или пробелы)"
+            }
+            placeholder="55.7558 37.6173
+55.7539 37.6208"
          />
          <TextField
            className="w-full"
--- a/src/pages/Route/RouteEditPage/index.tsx
+++ b/src/pages/Route/RouteEditPage/index.tsx
@ -27,6 +27,8 @@ export const RouteEditPage = observer(() => {
  const { editRouteData } = routeStore;
  const [isLoading, setIsLoading] = useState(false);
  const { language } = languageStore;
+  const [coordinates, setCoordinates] = useState<string>("");
+
  useEffect(() => {
    const fetchData = async () => {
      const response = await routeStore.getRoute(Number(id));
@ -37,6 +39,15 @@ export const RouteEditPage = observer(() => {
    fetchData();
  }, [id, language]);

+  useEffect(() => {
+    if (editRouteData.path && editRouteData.path.length > 0) {
+      const formattedPath = editRouteData.path
+        .map((coords) => coords.join(" "))
+        .join("\n");
+      setCoordinates(formattedPath);
+    }
+  }, [editRouteData.path]);
+
  const handleSave = async () => {
    setIsLoading(true);
    await routeStore.editRoute(Number(id));
@ -44,6 +55,43 @@ export const RouteEditPage = observer(() => {
    setIsLoading(false);
  };

+  const validateCoordinates = (value: string) => {
+    try {
+      const lines = value.trim().split("\n");
+      const coordinates = lines.map((line) => {
+        const [lat, lon] = line
+          .trim()
+          .split(/[\s,]+/)
+          .map(Number);
+        return [lat, lon];
+      });
+
+      if (coordinates.length === 0) {
+        return "Введите хотя бы одну пару координат";
+      }
+
+      if (
+        !coordinates.every(
+          (point) => Array.isArray(point) && point.length === 2
+        )
+      ) {
+        return "Каждая строка должна содержать две координаты";
+      }
+
+      if (
+        !coordinates.every((point) =>
+          point.every((coord) => !isNaN(coord) && typeof coord === "number")
+        )
+      ) {
+        return "Координаты должны быть числами";
+      }
+
+      return true;
+    } catch {
+      return "Неверный формат координат";
+    }
+  };
+
  return (
    <Paper className="w-full h-full p-3 flex flex-col gap-10">
      <LanguageSwitcher />
@ -105,15 +153,46 @@ export const RouteEditPage = observer(() => {
            className="w-full"
            label="Координаты маршрута"
            multiline
-            minRows={3}
-            value={editRouteData.path.map((p) => p.join(" ")).join("\n") || ""}
-            onChange={(e) =>
-              routeStore.setEditRouteData({
-                path: e.target.value
-                  .split("\n")
-                  .map((line) => line.split(" ").map(Number)),
-              })
+            minRows={4}
+            value={coordinates}
+            onChange={(e) => {
+              const newValue = e.target.value;
+              setCoordinates(newValue);
+
+              const validationResult = validateCoordinates(newValue);
+              if (validationResult === true) {
+                const lines = newValue.trim().split("\n");
+                const path = lines.map((line) => {
+                  const [lat, lon] = line
+                    .trim()
+                    .split(/[\s,]+/)
+                    .map(Number);
+                  return [lat, lon];
+                });
+                routeStore.setEditRouteData({ path });
+              }
+            }}
+            onKeyDown={(e) => {
+              if (e.key === "Enter") {
+                const lines = coordinates.split("\n");
+                const lastLine = lines[lines.length - 1];
+
+                // Если мы на последней строке и она не пустая
+                if (lastLine && lastLine.trim()) {
+                  e.preventDefault();
+                  const newValue = coordinates + "\n";
+                  setCoordinates(newValue);
+                }
+              }
+            }}
+            error={validateCoordinates(coordinates) !== true}
+            helperText={
+              typeof validateCoordinates(coordinates) === "string"
+                ? validateCoordinates(coordinates)
+                : "Введите координаты в формате: широта долгота (можно использовать запятые или пробелы)"
            }
+            placeholder="55.7558 37.6173
+55.7539 37.6208"
          />
          <TextField
            className="w-full"
--- a/src/pages/Route/RouteListPage/index.tsx
+++ b/src/pages/Route/RouteListPage/index.tsx
@ -1,5 +1,5 @@
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
-import { languageStore, routeStore } from "@shared";
+import { carrierStore, languageStore, routeStore } from "@shared";
 import { useEffect, useState } from "react";
 import { observer } from "mobx-react-lite";
 import { Map, Pencil, Trash2, Minus } from "lucide-react";
@ -9,6 +9,7 @@ import { LanguageSwitcher } from "@widgets";

 export const RouteListPage = observer(() => {
  const { routes, getRoutes, deleteRoute } = routeStore;
+  const { carriers, getCarriers } = carrierStore;
  const navigate = useNavigate();
  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
  const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
@ -17,19 +18,27 @@ export const RouteListPage = observer(() => {
  const { language } = languageStore;

  useEffect(() => {
-    getRoutes();
+    const fetchData = async () => {
+      await getCarriers("ru");
+      await getCarriers("en");
+      await getCarriers("zh");
+      await getRoutes();
+    };
+    fetchData();
  }, [language]);

  const columns: GridColDef[] = [
    {
-      field: "carrier",
+      field: "carrier_id",
      headerName: "Перевозчик",
      width: 250,
      renderCell: (params: GridRenderCellParams) => {
        return (
          <div className="w-full h-full flex items-center">
            {params.value ? (
-              params.value
+              carriers[language].data.find(
+                (carrier) => carrier.id == params.value
+              )?.short_name
            ) : (
              <Minus size={20} className="text-red-500" />
            )}
@ -105,7 +114,7 @@ export const RouteListPage = observer(() => {

  const rows = routes.data.map((route) => ({
    id: route.id,
-    carrier: route.carrier,
+    carrier_id: route.carrier_id,
    route_number: route.route_number,
    route_direction: route.route_direction ? "Прямой" : "Обратный",
  }));
--- a/src/pages/Station/StationCreatePage/index.tsx
+++ b/src/pages/Station/StationCreatePage/index.tsx
@ -8,33 +8,62 @@ import {
  InputLabel,
 } from "@mui/material";
 import { observer } from "mobx-react-lite";
-import { ArrowLeft, Loader2, Save } from "lucide-react";
+import { ArrowLeft, Save } from "lucide-react";
+import { Loader2 } from "lucide-react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
-import { stationsStore } from "@shared";
-import { useState } from "react";
+import { stationsStore, languageStore, cityStore } from "@shared";
+import { useEffect, useState } from "react";
 import { LanguageSwitcher } from "@widgets";

 export const StationCreatePage = observer(() => {
  const navigate = useNavigate();
-  const [name, setName] = useState("");
-  const [systemName, setSystemName] = useState("");
-  const [direction, setDirection] = useState("");
  const [isLoading, setIsLoading] = useState(false);
+  const { language } = languageStore;
+  const {
+    createStationData,
+    setCreateCommonData,
+    createStation,
+    setLanguageCreateStationData,
+  } = stationsStore;
+  const { cities, getCities } = cityStore;
+  const [coordinates, setCoordinates] = useState<string>("");
+
+  useEffect(() => {
+    if (
+      createStationData.common.latitude !== 0 ||
+      createStationData.common.longitude !== 0
+    ) {
+      setCoordinates(
+        `${createStationData.common.latitude}, ${createStationData.common.longitude}`
+      );
+    }
+  }, [createStationData.common.latitude, createStationData.common.longitude]);

  const handleCreate = async () => {
    try {
      setIsLoading(true);
-      await stationsStore.createStation(name, systemName, direction);
+      await createStation();
      toast.success("Станция успешно создана");
      navigate("/station");
    } catch (error) {
+      console.error("Error creating station:", error);
      toast.error("Ошибка при создании станции");
    } finally {
      setIsLoading(false);
    }
  };

+  useEffect(() => {
+    const fetchCities = async () => {
+      await getCities("ru");
+      await getCities("en");
+      await getCities("zh");
+    };
+
+    fetchCities();
+  }, []);
+
  return (
    <Paper className="w-full h-full p-3 flex flex-col gap-10">
      <LanguageSwitcher />
@ -47,44 +76,123 @@ export const StationCreatePage = observer(() => {
          Назад
        </button>
      </div>
+
      <div className="flex flex-col gap-10 w-full items-end">
        <div className="flex gap-10 items-center mb-5 max-w-[80%] self-start">
-          <h1 className="text-3xl break-words">{name}</h1>
+          <h1 className="text-3xl break-words">Создание станции</h1>
        </div>
        <TextField
-          className="w-full"
+          fullWidth
          label="Название"
+          value={createStationData[language].name || ""}
          required
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-        />
-        <TextField
-          className="w-full"
-          label="Системное название"
-          required
-          value={systemName}
-          onChange={(e) => setSystemName(e.target.value)}
+          onChange={(e) =>
+            setLanguageCreateStationData(language, {
+              name: e.target.value,
+            })
+          }
        />
+
        <FormControl fullWidth>
-          <InputLabel>Направление</InputLabel>
+          <InputLabel id="direction-label">Прямой/обратный маршрут</InputLabel>
          <Select
-            value={direction}
-            label="Направление"
-            onChange={(e) => setDirection(e.target.value)}
-            required
+            labelId="direction-label"
+            value={createStationData.common.direction ? "Прямой" : "Обратный"}
+            label="Прямой/обратный маршрут"
+            onChange={(e) =>
+              setCreateCommonData({
+                direction: e.target.value === "Прямой",
+              })
+            }
          >
-            <MenuItem value="forward">Прямое</MenuItem>
-            <MenuItem value="backward">Обратное</MenuItem>
+            <MenuItem value="Прямой">Прямой</MenuItem>
+            <MenuItem value="Обратный">Обратный</MenuItem>
+          </Select>
+        </FormControl>
+
+        <TextField
+          fullWidth
+          label="Описание"
+          value={createStationData[language].description || ""}
+          onChange={(e) =>
+            setLanguageCreateStationData(language, {
+              description: e.target.value,
+            })
+          }
+        />
+
+        <TextField
+          fullWidth
+          label="Адрес"
+          value={createStationData[language].address || ""}
+          onChange={(e) =>
+            setLanguageCreateStationData(language, {
+              address: e.target.value,
+            })
+          }
+        />
+
+        <TextField
+          fullWidth
+          label="Координаты"
+          value={coordinates}
+          onChange={(e) => {
+            const newValue = e.target.value;
+            setCoordinates(newValue);
+
+            const input = newValue.replace(/,/g, " ").trim();
+            const [latStr, lonStr] = input.split(/\s+/);
+
+            const lat = parseFloat(latStr);
+            const lon = parseFloat(lonStr);
+
+            const isValidLat = !isNaN(lat);
+            const isValidLon = !isNaN(lon);
+
+            if (isValidLat && isValidLon) {
+              setCreateCommonData({
+                latitude: lat,
+                longitude: lon,
+              });
+            } else {
+              setCreateCommonData({
+                latitude: 0,
+                longitude: 0,
+              });
+            }
+          }}
+          placeholder="Введите координаты в формате: широта долгота (можно использовать запятые или пробелы)"
+        />
+
+        <FormControl fullWidth>
+          <InputLabel>Город</InputLabel>
+          <Select
+            value={createStationData.common.city_id || ""}
+            label="Город"
+            onChange={(e) => {
+              const selectedCity = cities["ru"].data.find(
+                (city) => city.id === e.target.value
+              );
+              setCreateCommonData({
+                city_id: e.target.value as number,
+                city: selectedCity?.name || "",
+              });
+            }}
+          >
+            {cities["ru"].data.map((city) => (
+              <MenuItem key={city.id} value={city.id}>
+                {city.name}
+              </MenuItem>
+            ))}
          </Select>
        </FormControl>

        <Button
          variant="contained"
-          color="primary"
          className="w-min flex gap-2 items-center"
          startIcon={<Save size={20} />}
          onClick={handleCreate}
-          disabled={isLoading || !name || !systemName || !direction}
+          disabled={isLoading || !createStationData[language]?.name}
        >
          {isLoading ? (
            <Loader2 size={20} className="animate-spin" />
--- a/src/pages/Station/StationEditPage/index.tsx
+++ b/src/pages/Station/StationEditPage/index.tsx
@ -29,6 +29,18 @@ export const StationEditPage = observer(() => {
    setLanguageEditStationData,
  } = stationsStore;
  const { cities, getCities } = cityStore;
+  const [coordinates, setCoordinates] = useState<string>("");
+
+  useEffect(() => {
+    if (
+      editStationData.common.latitude !== 0 ||
+      editStationData.common.longitude !== 0
+    ) {
+      setCoordinates(
+        `${editStationData.common.latitude}, ${editStationData.common.longitude}`
+      );
+    }
+  }, [editStationData.common.latitude, editStationData.common.longitude]);

  const handleEdit = async () => {
    try {
@ -71,7 +83,7 @@ export const StationEditPage = observer(() => {
      </div>

      <div className="flex flex-col gap-10 w-full items-end">
-        <div className="flex gap-10 items-center mb-5 max-w-[80%]">
+        <div className="flex gap-10 items-center mb-5 max-w-[80%] self-start">
          <h1 className="text-3xl break-words">{editStationData.ru.name}</h1>
        </div>
        <TextField
@ -128,16 +140,33 @@ export const StationEditPage = observer(() => {
        <TextField
          fullWidth
          label="Координаты"
-          value={`${editStationData.common.latitude} ${editStationData.common.longitude}`}
+          value={coordinates}
          onChange={(e) => {
-            const [latitude, longitude] = e.target.value.split(" ").map(Number);
-            if (!isNaN(latitude) && !isNaN(longitude)) {
+            const newValue = e.target.value;
+            setCoordinates(newValue);
+
+            const input = newValue.replace(/,/g, " ").trim();
+            const [latStr, lonStr] = input.split(/\s+/);
+
+            const lat = parseFloat(latStr);
+            const lon = parseFloat(lonStr);
+
+            const isValidLat = !isNaN(lat);
+            const isValidLon = !isNaN(lon);
+
+            if (isValidLat && isValidLon) {
              setEditCommonData({
-                latitude: latitude,
-                longitude: longitude,
+                latitude: lat,
+                longitude: lon,
+              });
+            } else {
+              setEditCommonData({
+                latitude: 0,
+                longitude: 0,
              });
            }
          }}
+          placeholder="Введите координаты в формате: широта долгота (можно использовать запятые или пробелы)"
        />

        <FormControl fullWidth>
@ -146,7 +175,7 @@ export const StationEditPage = observer(() => {
            value={editStationData.common.city_id || ""}
            label="Город"
            onChange={(e) => {
-              const selectedCity = cities[language].data.find(
+              const selectedCity = cities["ru"].data.find(
                (city) => city.id === e.target.value
              );
              setEditCommonData({
@ -155,7 +184,7 @@ export const StationEditPage = observer(() => {
              });
            }}
          >
-            {cities[language].data.map((city) => (
+            {cities["ru"].data.map((city) => (
              <MenuItem key={city.id} value={city.id}>
                {city.name}
              </MenuItem>
--- a/src/pages/Station/StationPreviewPage/index.tsx
+++ b/src/pages/Station/StationPreviewPage/index.tsx
@ -21,7 +21,7 @@ export const StationPreviewPage = observer(() => {
  }, [id, language]);

  return (
-    <Paper className="w-full h-full p-3 flex flex-col gap-10">
+    <Paper className="w-full  p-3  py-5 flex flex-col gap-10">
      <LanguageSwitcher />
      <div className="flex justify-between items-center">
        <button