Merge warning and success modals while taking to work

src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx

@@ -39,7 +39,7 @@ export const PendingPointsFilters = ({ fullRange }) => {
     "prediction",
   ]);
 
-  const clearFilters = () => clear(fullRange?.prediction);
+  const clearFilters = () => clear(fullRange);
 
   const hasActiveFilters =
     filters.region ||

src/modules/Sidebar/PendingPointsFilters/TakeToWorkButton.jsx

@@ -1,4 +1,4 @@
-import { Alert, Button, Modal, Popover } from "antd";
+import { Alert, Button, Modal, Spin } from "antd";
 import { useQueryClient } from "@tanstack/react-query";
 import { usePointSelection } from "../../../stores/usePointSelection";
 import { STATUSES } from "../../../config";
@@ -13,15 +13,15 @@ export const TakeToWorkButton = () => {
   const { prediction, categories, region } = filters;
   const { selection } = usePointSelection();
   const queryClient = useQueryClient();
-  const [popupVisible, setPopupVisible] = useState(false);
+  const [isModalOpened, setIsModalOpened] = useState(false);
 
-  const [isSuccessModalOpened, setIsSuccessModalOpened] = useState(false);
+  const {
-
+    mutate: updateStatus,
-  const { mutate: updateStatus } = useUpdateStatus({
+    isLoading,
+    isSuccess,
+  } = useUpdateStatus({
     onSuccess: () => {
       queryClient.invalidateQueries(["table", 1, filters]);
-      setPopupVisible(false);
-      setIsSuccessModalOpened(true);
     },
   });
 
@@ -47,50 +47,71 @@ export const TakeToWorkButton = () => {
     updateStatus(params);
   };
 
+  const getModalFooter = () => {
+    if (isSuccess) {
+      return [
+        <Button
+          key="ok-button"
+          type="primary"
+          onClick={() => setIsModalOpened(false)}
+        >
+          Хорошо
+        </Button>,
+      ];
+    }
+
+    if (isLoading) return null;
+
+    return (
+      <div className="flex items-center justify-center gap-x-4">
+        <Button onClick={() => setIsModalOpened(false)}>Отмена</Button>
+        <Button type="primary" onClick={takeToWork}>
+          Да
+        </Button>
+      </div>
+    );
+  };
+
   return (
     <>
-      <Popover
+      <Button
-        trigger="click"
+        type="primary"
-        open={popupVisible}
+        block
-        onOpenChange={setPopupVisible}
+        className={"mt-2"}
-        content={
+        onClick={() => setIsModalOpened(true)}
-          <div className="p-2">
-            <Title text="Уверены, что хотите взять отобранные локации в работу?" />
-            <div className="flex items-center justify-center gap-x-4">
-              <Button onClick={() => setPopupVisible(false)}>Отмена</Button>
-              <Button type="primary" onClick={takeToWork}>
-                Да
-              </Button>
-            </div>
-          </div>
-        }
       >
-        <Button type="primary" block className={"mt-2"}>
+        <span className="mr-1">Взять в работу</span>
-          <span className="mr-1">Взять в работу</span>
+        <ArrowRightOutlined />
-          <ArrowRightOutlined />
+      </Button>
-        </Button>
+
-      </Popover>
       <Modal
         title={" "}
         centered
-        open={isSuccessModalOpened}
+        open={isModalOpened}
-        footer={[
+        onCancel={() => setIsModalOpened(false)}
-          <Button
+        closable={true}
-            key="ok-button"
+        footer={getModalFooter()}
-            type="primary"
-            onClick={() => setIsSuccessModalOpened(false)}
-          >
-            Хорошо
-          </Button>,
-        ]}
       >
-        <Alert
+        {isSuccess ? (
-          message="Успешно"
+          <Alert
-          description="Выбранные точки отправлены на согласование. Посмотреть на них можно во второй
+            message="Успешно"
+            description="Выбранные точки отправлены на согласование. Посмотреть на них можно во второй
           вкладке"
-          type="success"
+            type="success"
-          showIcon
+            showIcon
-        />
+          />
+        ) : (
+          <Title
+            text="Уверены, что хотите взять отобранные локации в работу?"
+            className="text-center"
+          />
+        )}
+
+        {isLoading && (
+          <div className="flex justify-center py-2">
+            <Spin tip="Отправляем на согласование..." size="large" />
+          </div>
+        )}
       </Modal>
     </>
   );

src/stores/usePendingPointsFilters.js

@@ -25,16 +25,16 @@ const store = (set) => ({
       state.filters.region = value;
     }),
 
-  clear: (predictionFullRange) =>
+  clear: (fullRange) =>
     set((state) => {
-      if (!predictionFullRange) {
+      if (!fullRange) {
         state.filters = INITIAL;
         return state;
       }
 
       state.filters = {
         ...INITIAL,
-        prediction: [predictionFullRange[0], predictionFullRange[1]],
+        prediction: fullRange.prediction,
       };
     }),
 });

src/stores/useWorkingPointsFilters.js

@@ -41,11 +41,13 @@ const store = (set) => ({
         return state;
       }
 
+      const { deltaTraffic, factTraffic, age } = fullRange;
+
       state.filters = {
         ...INITIAL,
-        deltaTraffic: [fullRange.deltaTraffic[0], fullRange.deltaTraffic[1]],
+        deltaTraffic,
-        factTraffic: [fullRange.factTraffic[0], fullRange.factTraffic[1]],
+        factTraffic,
-        age: [fullRange.age[0], fullRange.age[1]],
+        age,
       };
     }),
 });