@@ -79,17 +112,13 @@ export const CarrierEditPage = observer(() => {
setEditCarrierData(
editCarrierData.full_name,
editCarrierData.short_name,
- editCarrierData.city,
Number(e.target.value),
- editCarrierData.main_color,
- editCarrierData.left_color,
- editCarrierData.right_color,
editCarrierData.slogan,
editCarrierData.logo
)
}
>
- {cityStore.cities.ru.map((city) => (
+ {cityStore.cities.ru.data?.map((city) => (
@@ -106,11 +135,8 @@ export const CarrierEditPage = observer(() => {
setEditCarrierData(
e.target.value,
editCarrierData.short_name,
- editCarrierData.city,
+
editCarrierData.city_id,
- editCarrierData.main_color,
- editCarrierData.left_color,
- editCarrierData.right_color,
editCarrierData.slogan,
editCarrierData.logo
)
@@ -126,104 +152,14 @@ export const CarrierEditPage = observer(() => {
setEditCarrierData(
editCarrierData.full_name,
e.target.value,
- editCarrierData.city,
+
editCarrierData.city_id,
- editCarrierData.main_color,
- editCarrierData.left_color,
- editCarrierData.right_color,
editCarrierData.slogan,
editCarrierData.logo
)
}
/>
-
-
- setEditCarrierData(
- editCarrierData.full_name,
- editCarrierData.short_name,
- editCarrierData.city,
- editCarrierData.city_id,
- e.target.value,
- editCarrierData.left_color,
- editCarrierData.right_color,
- editCarrierData.slogan,
- editCarrierData.logo
- )
- }
- type="color"
- sx={{
- "& input": {
- height: "50px",
- paddingBlock: "14px",
- paddingInline: "14px",
- cursor: "pointer",
- },
- }}
- />
-
- setEditCarrierData(
- editCarrierData.full_name,
- editCarrierData.short_name,
- editCarrierData.city,
- editCarrierData.city_id,
- editCarrierData.main_color,
- e.target.value,
- editCarrierData.right_color,
- editCarrierData.slogan,
- editCarrierData.logo
- )
- }
- type="color"
- sx={{
- "& input": {
- height: "50px",
- paddingBlock: "14px",
- paddingInline: "14px",
- cursor: "pointer",
- },
- }}
- />
-
- setEditCarrierData(
- editCarrierData.full_name,
- editCarrierData.short_name,
- editCarrierData.city,
- editCarrierData.city_id,
- editCarrierData.main_color,
- editCarrierData.left_color,
- e.target.value,
- editCarrierData.slogan,
- editCarrierData.logo
- )
- }
- type="color"
- sx={{
- "& input": {
- height: "50px",
- paddingBlock: "14px",
- paddingInline: "14px",
- cursor: "pointer",
- },
- }}
- />
-
-
{
setEditCarrierData(
editCarrierData.full_name,
editCarrierData.short_name,
- editCarrierData.city,
+
editCarrierData.city_id,
- editCarrierData.main_color,
- editCarrierData.left_color,
- editCarrierData.right_color,
e.target.value,
editCarrierData.logo
)
}
/>
-
-
- Логотип
-
-
- {editCarrierData.logo && (
-
-
-
- )}
+
+ {
+ setIsPreviewMediaOpen(true);
+ setMediaId(selectedMedia?.id ?? "");
+ }}
+ onDeleteImageClick={() => {
+ setEditCarrierData(
+ editCarrierData.full_name,
+ editCarrierData.short_name,
+
+ editCarrierData.city_id,
+ editCarrierData.slogan,
+ ""
+ );
+ setActiveMenuType(null);
+ }}
+ onSelectFileClick={() => {
+ setActiveMenuType("thumbnail");
+ setIsSelectMediaOpen(true);
+ }}
+ setUploadMediaOpen={() => {
+ setIsUploadMediaOpen(true);
+ setActiveMenuType("thumbnail");
+ }}
+ />
+
+ setIsSelectMediaOpen(false)}
+ onSelectMedia={handleMediaSelect}
+ mediaType={3}
+ />
+
+ setIsUploadMediaOpen(false)}
+ afterUpload={handleMediaSelect}
+ hardcodeType={activeMenuType}
+ />
+
+ setIsPreviewMediaOpen(false)}
+ mediaId={mediaId}
+ />
);
});
diff --git a/src/pages/Carrier/CarrierListPage/index.tsx b/src/pages/Carrier/CarrierListPage/index.tsx
index cf5df03..e2a93ad 100644
--- a/src/pages/Carrier/CarrierListPage/index.tsx
+++ b/src/pages/Carrier/CarrierListPage/index.tsx
@@ -2,7 +2,7 @@ import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
import { carrierStore } from "@shared";
import { useEffect, useState } from "react";
import { observer } from "mobx-react-lite";
-import { Eye, Pencil, Trash2 } from "lucide-react";
+import { Eye, Pencil, Trash2, Minus } from "lucide-react";
import { useNavigate } from "react-router-dom";
import { CreateButton, DeleteModal } from "@widgets";
@@ -10,7 +10,9 @@ export const CarrierListPage = observer(() => {
const { carriers, getCarriers, deleteCarrier } = carrierStore;
const navigate = useNavigate();
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
- const [rowId, setRowId] = useState(null); // Lifted state
+ const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
+ const [rowId, setRowId] = useState(null);
+ const [ids, setIds] = useState([]);
useEffect(() => {
getCarriers();
@@ -20,18 +22,50 @@ export const CarrierListPage = observer(() => {
{
field: "full_name",
headerName: "Полное имя",
-
width: 300,
+ renderCell: (params: GridRenderCellParams) => {
+ return (
+
+ {params.value ? (
+ params.value
+ ) : (
+
+ )}
+
+ );
+ },
},
{
field: "short_name",
headerName: "Короткое имя",
width: 200,
+ renderCell: (params: GridRenderCellParams) => {
+ return (
+
+ {params.value ? (
+ params.value
+ ) : (
+
+ )}
+
+ );
+ },
},
{
field: "city",
headerName: "Город",
flex: 1,
+ renderCell: (params: GridRenderCellParams) => {
+ return (
+
+ {params.value ? (
+ params.value
+ ) : (
+
+ )}
+
+ );
+ },
},
{
field: "actions",
@@ -45,9 +79,9 @@ export const CarrierListPage = observer(() => {
- */}
{
setIsDeleteModalOpen(true);
@@ -76,10 +110,28 @@ export const CarrierListPage = observer(() => {
Перевозчики
+
+