diff --git a/src/Map/Popup/mode-popup/OnApprovalPointPopup.jsx b/src/Map/Popup/mode-popup/OnApprovalPointPopup.jsx index 47c78fa..974a88e 100644 --- a/src/Map/Popup/mode-popup/OnApprovalPointPopup.jsx +++ b/src/Map/Popup/mode-popup/OnApprovalPointPopup.jsx @@ -100,7 +100,7 @@ export const OnApprovalPointPopup = ({ feature, point }) => {
- <StatusSelect value={status} onChange={handleStatusChange} /> + <StatusSelect isLoading={isUpdating} disabled={isUpdating} value={status} onChange={handleStatusChange} /> {needToFillPostamatId && ( <> <Title text="Укажите id постамата" /> diff --git a/src/components/StatusSelect.jsx b/src/components/StatusSelect.jsx index e9448e8..cbdfe46 100644 --- a/src/components/StatusSelect.jsx +++ b/src/components/StatusSelect.jsx @@ -11,7 +11,7 @@ const statusOptions = [ { label: STATUS_LABEL_MAPPER[STATUSES.cancelled], value: STATUSES.cancelled }, ]; -export const StatusSelect = ({ value, onChange, disabled }) => { +export const StatusSelect = ({ value, onChange, disabled, isLoading }) => { const handleClick = (e) => e.stopPropagation(); const handleChange = (value) => { @@ -26,6 +26,7 @@ export const StatusSelect = ({ value, onChange, disabled }) => { value={value} onChange={handleChange} options={statusOptions} + loading={isLoading} disabled={disabled} placeholder="Выберите статус" onClick={handleClick} diff --git a/src/modules/Table/PendingTable/usePendingTableData.js b/src/modules/Table/PendingTable/usePendingTableData.js index d0a52e6..ebfafdd 100644 --- a/src/modules/Table/PendingTable/usePendingTableData.js +++ b/src/modules/Table/PendingTable/usePendingTableData.js @@ -38,14 +38,12 @@ export const usePendingTableData = (page, resetPage, pageSize, setPageSize, sort return await getPoints(params, region, dbTable, signal); }, { - keepPreviousData: true, onError: (err) => { if (err.response.data.detail === "Неправильная страница") { resetPage(); } }, - refetchOnWindowFocus: false, - refetchOnMount: false + refetchOnWindowFocus: false } );