diff --git a/src/pages/Article/ArticleListPage/index.tsx b/src/pages/Article/ArticleListPage/index.tsx index 99aa2ef..60b1510 100644 --- a/src/pages/Article/ArticleListPage/index.tsx +++ b/src/pages/Article/ArticleListPage/index.tsx @@ -113,6 +113,7 @@ export const ArticleListPage = observer(() => { columns={columns} checkboxSelection={canWriteArticles} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Carrier/CarrierListPage/index.tsx b/src/pages/Carrier/CarrierListPage/index.tsx index 4ebea1b..5cf0647 100644 --- a/src/pages/Carrier/CarrierListPage/index.tsx +++ b/src/pages/Carrier/CarrierListPage/index.tsx @@ -168,6 +168,7 @@ export const CarrierListPage = observer(() => { columns={columns} checkboxSelection={canWriteCarriers} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/City/CityListPage/index.tsx b/src/pages/City/CityListPage/index.tsx index a759f49..b1349dc 100644 --- a/src/pages/City/CityListPage/index.tsx +++ b/src/pages/City/CityListPage/index.tsx @@ -162,6 +162,7 @@ export const CityListPage = observer(() => { columns={columns} checkboxSelection={canWriteCities} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Country/CountryListPage/index.tsx b/src/pages/Country/CountryListPage/index.tsx index 0bd0a84..efdfd9c 100644 --- a/src/pages/Country/CountryListPage/index.tsx +++ b/src/pages/Country/CountryListPage/index.tsx @@ -115,6 +115,7 @@ export const CountryListPage = observer(() => { columns={columns} checkboxSelection={canWriteCountries} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Media/MediaListPage/index.tsx b/src/pages/Media/MediaListPage/index.tsx index dede83a..df2c99f 100644 --- a/src/pages/Media/MediaListPage/index.tsx +++ b/src/pages/Media/MediaListPage/index.tsx @@ -129,6 +129,7 @@ export const MediaListPage = observer(() => { columns={columns} checkboxSelection={canWriteMedia} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Route/RouteListPage/index.tsx b/src/pages/Route/RouteListPage/index.tsx index 3adb476..c18634c 100644 --- a/src/pages/Route/RouteListPage/index.tsx +++ b/src/pages/Route/RouteListPage/index.tsx @@ -230,6 +230,7 @@ export const RouteListPage = observer(() => { onRowDoubleClick={(params) => canWriteRoutes && navigate(`/route/${params.row.id}/edit`)} checkboxSelection={canWriteRoutes} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Sight/SightListPage/index.tsx b/src/pages/Sight/SightListPage/index.tsx index 5968885..f647ca9 100644 --- a/src/pages/Sight/SightListPage/index.tsx +++ b/src/pages/Sight/SightListPage/index.tsx @@ -185,6 +185,7 @@ export const SightListPage = observer(() => { onRowDoubleClick={(params) => canWriteSights && navigate(`/sight/${params.row.id}/edit`)} checkboxSelection={canWriteSights} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Station/StationListPage/index.tsx b/src/pages/Station/StationListPage/index.tsx index 6d1e217..c27768a 100644 --- a/src/pages/Station/StationListPage/index.tsx +++ b/src/pages/Station/StationListPage/index.tsx @@ -226,6 +226,7 @@ export const StationListPage = observer(() => { onRowDoubleClick={(params) => canWriteStations && navigate(`/station/${params.row.id}/edit`)} checkboxSelection={canWriteStations} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/User/UserListPage/index.tsx b/src/pages/User/UserListPage/index.tsx index c16c1d9..71cc130 100644 --- a/src/pages/User/UserListPage/index.tsx +++ b/src/pages/User/UserListPage/index.tsx @@ -153,6 +153,7 @@ export const UserListPage = observer(() => { columns={columns} checkboxSelection={canWriteUsers} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/pages/Vehicle/VehicleListPage/index.tsx b/src/pages/Vehicle/VehicleListPage/index.tsx index ae09710..d362084 100644 --- a/src/pages/Vehicle/VehicleListPage/index.tsx +++ b/src/pages/Vehicle/VehicleListPage/index.tsx @@ -188,6 +188,7 @@ export const VehicleListPage = observer(() => { columns={columns} checkboxSelection={canWriteVehicles} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/widgets/DevicesTable/index.tsx b/src/widgets/DevicesTable/index.tsx index b59b1d3..a7fb6c6 100644 --- a/src/widgets/DevicesTable/index.tsx +++ b/src/widgets/DevicesTable/index.tsx @@ -903,6 +903,7 @@ export const DevicesTable = observer(() => { columns={columns} checkboxSelection={canWriteDevices} disableRowSelectionExcludeModel + disableRowSelectionOnClick loading={isLoading} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} diff --git a/src/widgets/SightTabs/CreateRightTab/index.tsx b/src/widgets/SightTabs/CreateRightTab/index.tsx index 1d7ca53..af81f17 100644 --- a/src/widgets/SightTabs/CreateRightTab/index.tsx +++ b/src/widgets/SightTabs/CreateRightTab/index.tsx @@ -3,8 +3,6 @@ import { Button, Paper, Typography, - Menu, - MenuItem, TextField, } from "@mui/material"; import { @@ -12,7 +10,6 @@ import { createSightStore, editSightStore, languageStore, - SelectArticleModal, TabPanel, SelectMediaDialog, UploadMediaDialog, @@ -43,7 +40,6 @@ type MediaItemShared = { export const CreateRightTab = observer( ({ value, index }: { value: number; index: number }) => { - const [anchorEl, setAnchorEl] = useState(null); const { sight, createNewRightArticle, @@ -54,7 +50,6 @@ export const CreateRightTab = observer( deleteRightArticleMedia, unlinkRightAritcle, deleteRightArticle, - linkExistingRightArticle, createSight, clearCreateSight, updateRightArticles, @@ -63,8 +58,6 @@ export const CreateRightTab = observer( const { setFileToUpload, setUploadMediaOpen, uploadMediaOpen } = editSightStore; - const [selectArticleDialogOpen, setSelectArticleDialogOpen] = - useState(false); const [activeArticleIndex, setActiveArticleIndex] = useState( null ); @@ -100,14 +93,6 @@ export const CreateRightTab = observer( } }, [language, sight[language].right, activeArticleIndex]); - const openMenu = Boolean(anchorEl); - const handleClickMenu = (event: React.MouseEvent) => { - setAnchorEl(event.currentTarget); - }; - const handleCloseMenu = () => { - setAnchorEl(null); - }; - const handleSave = async () => { try { await createSight(language); @@ -127,7 +112,6 @@ export const CreateRightTab = observer( }; const handleCreateNewLocalArticle = async () => { - handleCloseMenu(); try { const newArticleId = await createNewRightArticle(); @@ -146,26 +130,6 @@ export const CreateRightTab = observer( } }; - const handleSelectExistingArticleAndLink = async ( - selectedArticleId: number - ) => { - try { - const linkedArticleId = await linkExistingRightArticle( - selectedArticleId - ); - setSelectArticleDialogOpen(false); - const newIndex = sight[language].right.findIndex( - (a) => a.id === linkedArticleId - ); - if (newIndex > -1) { - setActiveArticleIndex(newIndex); - setType("article"); - } - } catch (error) { - toast.error("Не удалось привязать существующую статью."); - } - }; - const currentRightArticle = activeArticleIndex !== null && sight[language].right[activeArticleIndex] ? sight[language].right[activeArticleIndex] @@ -317,33 +281,10 @@ export const CreateRightTab = observer( - - - Создать новую - - { - setSelectArticleDialogOpen(true); - handleCloseMenu(); - }} - > - Выбрать существующую статью - - {type === "article" && currentRightArticle ? ( @@ -501,7 +442,7 @@ export const CreateRightTab = observer( - {type === "article" && activeArticleIndex !== null && ( + {type === "article" && activeArticleIndex !== null && sight[language].right[activeArticleIndex] && ( - setSelectArticleDialogOpen(false)} - onSelectArticle={handleSelectExistingArticleAndLink} - linkedArticleIds={sight[language].right.map((article) => article.id)} - /> { @@ -716,6 +651,7 @@ export const CreateRightTab = observer( onDelete={async () => { try { await deleteRightArticle(currentRightArticle?.id || 0); + setIsDeleteModalOpen(false); setActiveArticleIndex(null); setType("media"); toast.success("Статья удалена"); diff --git a/src/widgets/SightTabs/RightWidgetTab/index.tsx b/src/widgets/SightTabs/RightWidgetTab/index.tsx index 3e7f0da..97f72b5 100644 --- a/src/widgets/SightTabs/RightWidgetTab/index.tsx +++ b/src/widgets/SightTabs/RightWidgetTab/index.tsx @@ -2,8 +2,6 @@ import { Box, Button, Typography, - Menu, - MenuItem, TextField, Slider, Stack, @@ -13,7 +11,6 @@ import { BackButton, editSightStore, languageStore, - SelectArticleModal, SelectMediaDialog, TabPanel, UploadMediaDialog, @@ -40,8 +37,6 @@ import { SightFramePreview } from "./SightFramePreview"; export const RightWidgetTab = observer( ({ value, index }: { value: number; index: number }) => { - const [anchorEl, setAnchorEl] = useState(null); - const { sight, updateRightArticleInfo, @@ -52,7 +47,6 @@ export const RightWidgetTab = observer( linkPreviewMedia, unlinkRightArticle, deleteRightArticle, - linkArticle, deleteRightArticleMedia, createLinkWithRightArticle, setFileToUpload, @@ -94,24 +88,15 @@ export const RightWidgetTab = observer( const [activeArticleIndex, setActiveArticleIndex] = useState( null ); - const [isSelectModalOpen, setIsSelectModalOpen] = useState(false); const [isSelectMediaModalOpen, setIsSelectMediaModalOpen] = useState(false); const [isDeleteArticleModalOpen, setIsDeleteArticleModalOpen] = useState(false); - const open = Boolean(anchorEl); const handleDeleteArticle = () => { deleteRightArticle(sight[language].right[activeArticleIndex || 0].id); setActiveArticleIndex(null); }; - const handleClick = (event: React.MouseEvent) => { - setAnchorEl(event.currentTarget); - }; - const handleClose = () => { - setAnchorEl(null); - }; - const handleSelectArticle = (index: number) => { setActiveArticleIndex(index); }; @@ -119,7 +104,6 @@ export const RightWidgetTab = observer( const handleCreateNew = async () => { try { const newArticleId = await createNewRightArticle(); - handleClose(); const newIndex = sight[language].right.findIndex( (article) => article.id === newArticleId @@ -133,32 +117,6 @@ export const RightWidgetTab = observer( } }; - const handleSelectExisting = () => { - setIsSelectModalOpen(true); - handleClose(); - }; - - const handleCloseSelectModal = () => { - setIsSelectModalOpen(false); - }; - - const handleArticleSelect = async (id: number) => { - try { - const linkedArticleId = await linkArticle(id); - handleCloseSelectModal(); - - const newIndex = sight[language].right.findIndex( - (article) => article.id === linkedArticleId - ); - if (newIndex > -1) { - setActiveArticleIndex(newIndex); - setType("article"); - } - } catch (error) { - console.error("Error linking article:", error); - } - }; - const handleMediaSelected = async (media: { id: string; filename: string; @@ -276,27 +234,10 @@ export const RightWidgetTab = observer( - - - Создать новую - - - Выбрать существующую статью - - {type === "article" && ( @@ -557,12 +498,6 @@ export const RightWidgetTab = observer( }} /> - article.id)} - /> setIsSelectMediaModalOpen(false)}