Merge branch 'table_fix' into 'dev'

table fix

See merge request spatial/postamates_frontend!87

src/Map/Popup/mode-popup/OnApprovalPointPopup.jsx

@@ -100,7 +100,7 @@ export const OnApprovalPointPopup = ({ feature, point }) => {
         <div className="flex justify-center mt-4">
           <div className={"flex flex-col items-center space-y-2"}>
             <Title text="Изменить статус" />
-            <StatusSelect value={status} onChange={handleStatusChange} />
+            <StatusSelect isLoading={isUpdating} disabled={isUpdating} value={status} onChange={handleStatusChange} />
             {needToFillPostamatId && (
               <>
                 <Title text="Укажите id постамата" />

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}

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,
+      refetchOnWindowFocus: false
-      refetchOnMount: false
     }
   );