@danikokonn/yarik-frontend-lib 2.0.55 → 2.0.56

package/dist/components/SubtaskItem/SubtaskItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubtaskItem.d.ts","sourceRoot":"","sources":["../../../src/components/SubtaskItem/SubtaskItem.tsx"],"names":[],"mappings":"AAgBA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAiBlD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,uBAAuB,GACxB,EAAE,gBAAgB,2CAwIlB"}
+{"version":3,"file":"SubtaskItem.d.ts","sourceRoot":"","sources":["../../../src/components/SubtaskItem/SubtaskItem.tsx"],"names":[],"mappings":"AAgBA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAmBlD,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,uBAAuB,GACxB,EAAE,gBAAgB,2CAwIlB"}

package/dist/components/SubtaskItem/SubtaskItem.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import AccessTimeSharpIcon from "@mui/icons-material/AccessTimeSharp";
 import BlockSharpIcon from "@mui/icons-material/BlockSharp";
 import CheckCircleOutlineRoundedIcon from "@mui/icons-material/CheckCircleOutlineRounded";
+import CloudOffIcon from "@mui/icons-material/CloudOff";
 import DoneIcon from "@mui/icons-material/Done";
 import ErrorOutlineSharpIcon from "@mui/icons-material/ErrorOutlineSharp";
 import ExpandMore from "@mui/icons-material/ExpandMore";
@@ -10,9 +11,9 @@ import Accordion from "@mui/material/Accordion";
 import AccordionDetails from "@mui/material/AccordionDetails";
 import AccordionSummary from "@mui/material/AccordionSummary";
 import CircularProgress from "@mui/material/CircularProgress";
-import { taskStateText } from "../../utils";
 import moment from "moment";
 import { useState } from "react";
+import { taskStateText } from "../../utils";
 const SubtaskState = ({ state }) => {
     switch (state) {
         case "success":
@@ -23,6 +24,8 @@ const SubtaskState = ({ state }) => {
             return _jsx(AccessTimeSharpIcon, {});
         case "running":
             return _jsx(CircularProgress, { size: 20 });
+        case "connerr":
+            return _jsx(CloudOffIcon, {});
         default:
             return _jsx(BlockSharpIcon, {});
     }

package/dist/components/TaskLoader/TaskLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskLoader.d.ts","sourceRoot":"","sources":["../../../src/components/TaskLoader/TaskLoader.tsx"],"names":[],"mappings":"AAgCA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAqBhD,QAAA,MAAM,UAAU,GAAI,qCAAqC,eAAe,4CA2avE,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"TaskLoader.d.ts","sourceRoot":"","sources":["../../../src/components/TaskLoader/TaskLoader.tsx"],"names":[],"mappings":"AAkCA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAuBhD,QAAA,MAAM,UAAU,GAAI,qCAAqC,eAAe,4CAkbvE,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/components/TaskLoader/TaskLoader.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import AccessTimeSharpIcon from "@mui/icons-material/AccessTimeSharp";
 import BlockSharpIcon from "@mui/icons-material/BlockSharp";
 import CheckCircleOutlineRoundedIcon from "@mui/icons-material/CheckCircleOutlineRounded";
+import CloudOffIcon from "@mui/icons-material/CloudOff";
 import ErrorOutlineSharpIcon from "@mui/icons-material/ErrorOutlineSharp";
 import RestartAltIcon from "@mui/icons-material/RestartAlt";
 import StopRoundedIcon from "@mui/icons-material/StopRounded";
@@ -12,7 +13,8 @@ import IconButton from "@mui/material/IconButton";
 import Switch from "@mui/material/Switch";
 import Typography from "@mui/material/Typography";
 import { useEffect, useEffectEvent, useRef, useState } from "react";
-import { getRequest, postRequest } from "../../http";
+import useSWR from "swr";
+import { postRequest } from "../../http";
 import { useAirflowContext } from "../../providers/AirflowProvider";
 import { useDagRunStateContext } from "../../providers/DagStateProvider";
 import { formatDate, formatDuration, getCSRFToken, taskStateText, useDebounce, } from "../../utils";
@@ -28,13 +30,15 @@ const TaskStateIcon = ({ taskState, }) => {
             return _jsx(AccessTimeSharpIcon, { fontSize: "large" });
         case "running":
             return _jsx(CircularProgress, {});
+        case "connerr":
+            return _jsx(CloudOffIcon, {});
         default:
             return _jsx(BlockSharpIcon, { fontSize: "large" });
     }
 };
 const TaskLoader = ({ style, subTitle, onUnauthorized }) => {
     const { airflowAvailable, onLostConnection } = useAirflowContext();
-    const { isActive, dagRun, taskInstances, onUpdateState, fetchState } = useDagRunStateContext();
+    const { isActive, dagRun, taskInstances, onUpdateState, fetchState, error } = useDagRunStateContext();
     const [activeTask, setActiveTask] = useState(taskInstances?.taskInstances.find((ti) => {
         return ti.state === "running";
     }) || null);
@@ -81,97 +85,83 @@ const TaskLoader = ({ style, subTitle, onUnauthorized }) => {
             clearInterval(interval);
         };
     }, [isActive, taskInstances]);
-    useEffect(() => {
-        const interval = setInterval(() => {
-            if (!airflowAvailable)
-                return;
-            if (!isActive)
+    const defaultFetcher = async ([url, dagId, dagRunId, taskId, tryNum, continuationToken,]) => {
+        const requestUrl = new URL("http://foo/" + url);
+        requestUrl.searchParams.append("dag_id", dagId);
+        if (dagRunId)
+            requestUrl.searchParams.append("dag_run_id", dagRunId);
+        requestUrl.searchParams.append("task_id", taskId);
+        requestUrl.searchParams.append("try_num", tryNum.toString());
+        if (continuationToken)
+            requestUrl.searchParams.append("continuation_token", continuationToken);
+        const resultUrl = requestUrl.pathname.substring(1) + requestUrl.search;
+        const res = await fetch(resultUrl, { signal: AbortSignal.timeout(10000) });
+        if (res.status === 401) {
+            onUnauthorized();
+        }
+        if (!res.ok) {
+            throw { ...(await res.json()), status: res.status };
+        }
+        return res.json();
+    };
+    const taskIndex = taskInstances != null
+        ? taskInstances.taskInstances.findIndex((ti) => activeTask != null && ti.taskId === activeTask.taskId)
+        : -1;
+    const continuationToken = taskIndex >= 0
+        ? logs[taskIndex] != null
+            ? logs[taskIndex].continuationToken
+            : null
+        : null;
+    useSWR(airflowAvailable &&
+        activeTask != null && [
+        "airflow/ti_logs",
+        dagRun?.dagId,
+        dagRun?.dagRunId,
+        activeTask.taskId,
+        activeTask.tryNumber,
+        continuationToken,
+    ], defaultFetcher, {
+        refreshInterval: isActive ? 1000 : 0,
+        keepPreviousData: true,
+        onError: (err) => {
+            if (err?.status == 401) {
+                onUnauthorized();
+            }
+            console.log("Error while fetching logs");
+            if (err && err.status === 503) {
+                onLostConnection();
+            }
+        },
+        onSuccess: (data) => {
+            const newLogs = logs.slice();
+            if (!data)
                 return;
-            if (activeTask == null)
+            if (data.logs.content.length === 0)
                 return;
-            const taskIndex = taskInstances != null
-                ? taskInstances.taskInstances.findIndex((ti) => activeTask != null && ti.taskId === activeTask.taskId)
-                : -1;
-            const continuationToken = taskIndex >= 0
-                ? logs[taskIndex] != null
-                    ? logs[taskIndex].continuationToken
-                    : null
-                : null;
-            getRequest({
-                url: "airflow/ti_logs",
-                data: {
-                    dag_id: dagRun?.dagId,
-                    dag_run_id: dagRun?.dagRunId,
-                    task_id: activeTask.taskId,
-                    try_num: activeTask.tryNumber,
-                    continuation_token: continuationToken,
-                },
-                successHandler: (resp) => {
-                    const newLogs = logs.slice();
-                    if (!resp)
-                        return;
-                    if (resp.logs.content.length === 0)
-                        return;
-                    if (newLogs[taskIndex] != null) {
-                        newLogs[taskIndex].continuationToken = resp.logs.continuationToken;
-                        newLogs[taskIndex].content += resp.logs.content;
-                    }
-                    else {
-                        newLogs[taskIndex] = resp.logs;
-                    }
-                    setLogs(newLogs);
-                },
-                errorHandler: (resp) => {
-                    if (resp?.status == 401) {
-                        onUnauthorized();
-                    }
-                    console.log("Error while fetching logs");
-                    if (resp && resp.status === 503) {
-                        onLostConnection();
-                    }
-                },
-            });
-        }, 500);
-        return () => {
-            clearInterval(interval);
-        };
-    }, [isActive, activeTask, dagRun, taskInstances, logs]);
-    const handleShowLogs = (taskId, tryNum) => {
+            if (newLogs[taskIndex] != null) {
+                newLogs[taskIndex].continuationToken = data.logs.continuationToken;
+                newLogs[taskIndex].content += data.logs.content;
+            }
+            else {
+                newLogs[taskIndex] = data.logs;
+            }
+            setLogs(newLogs);
+        },
+    });
+    const handleShowLogs = (taskId) => {
         if (!airflowAvailable)
             return;
         if (activeTask != null && taskId === activeTask.taskId) {
             setActiveTask(null);
             return;
         }
-        getRequest({
-            url: "airflow/ti_logs",
-            data: {
-                dag_id: dagRun?.dagId,
-                dag_run_id: dagRun?.dagRunId,
-                task_id: taskId,
-                try_num: tryNum,
-                continuation_token: null,
-            },
-            successHandler: (resp) => {
-                if (!resp)
-                    return;
-                const newActiveTaskIdx = taskInstances != null
-                    ? taskInstances.taskInstances.findIndex((ti) => ti.taskId === taskId)
-                    : -1;
-                setActiveTask(taskInstances?.taskInstances[newActiveTaskIdx] || null);
-                const newLogs = logs.slice();
-                newLogs[newActiveTaskIdx] = resp.logs;
-                setLogs(newLogs);
-            },
-            errorHandler: (resp) => {
-                if (resp?.status == 401) {
-                    onUnauthorized();
-                }
-                console.log("Error while getting logs for subtask!");
-                if (resp && resp.status === 503) {
-                    onLostConnection();
-                }
-            },
+        const newActiveTaskIdx = taskInstances != null
+            ? taskInstances.taskInstances.findIndex((ti) => ti.taskId === taskId)
+            : -1;
+        setActiveTask(taskInstances?.taskInstances[newActiveTaskIdx] || null);
+        setLogs((prev) => {
+            const newLogs = prev.filter((_, i) => i === newActiveTaskIdx);
+            return newLogs;
         });
     };
     const handleRestartLoad = () => {
@@ -275,7 +265,7 @@ const TaskLoader = ({ style, subTitle, onUnauthorized }) => {
                                         width: "auto",
                                         whiteSpace: "nowrap",
                                         overflow: "hidden",
-                                    }, children: _jsxs("div", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: [_jsx(TaskStateIcon, { taskState: dagRun?.state }), _jsxs("span", { children: [taskStateText(dagRun?.state), dagRun?.state === "success"
+                                    }, children: _jsxs("div", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: [_jsx(TaskStateIcon, { taskState: error || !airflowAvailable ? "connerr" : dagRun?.state }), _jsxs("span", { children: [taskStateText(error || !airflowAvailable ? "connerr" : dagRun?.state), dagRun?.state === "success"
                                                         ? (formatEndDate.startsWith("вт") ? " во " : " в ") +
                                                             formatEndDate +
                                                             " за " +

package/dist/providers/DagStateProvider.d.ts

@@ -9,7 +9,7 @@ interface DagRunStateProviderProps {
     autorunHandler?(dagRun: DagRun | null, autorun: boolean): void;
     onUnauthorized(): void;
 }
-declare const DagRunStateProvider: ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, taskInstances: _taskInstances, autorunHandler, onUnauthorized, }: DagRunStateProviderProps) => import("react/jsx-runtime").JSX.Element;
+declare const DagRunStateProvider: ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, autorunHandler, onUnauthorized, }: DagRunStateProviderProps) => import("react/jsx-runtime").JSX.Element;
 export declare const useDagRunStateContext: () => {
     isActive: boolean;
     autorun: boolean;
@@ -17,6 +17,7 @@ export declare const useDagRunStateContext: () => {
     taskInstances: TaskInstances | null;
     dagStartedOnce: boolean;
     onUpdateState(isActive: boolean, dagRun: DagRun | null, taskInstances: TaskInstances | null): void;
+    error: boolean;
     onDagStarted: () => void;
     activate(): void;
     fetchState(): void;

package/dist/providers/DagStateProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DagStateProvider.d.ts","sourceRoot":"","sources":["../../src/providers/DagStateProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAgCjD,UAAU,wBAAwB;IAChC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/D,cAAc,IAAI,IAAI,CAAC;CACxB;AAED,QAAA,MAAM,mBAAmB,GAAI,iIAQ1B,wBAAwB,4CAuJ1B,CAAC;AAEF,eAAO,MAAM,qBAAqB;cAtMtB,OAAO;aACR,OAAO;YACR,MAAM,GAAG,IAAI;mBACN,aAAa,GAAG,IAAI;oBACnB,OAAO;4BAEX,OAAO,UACT,MAAM,GAAG,IAAI,iBACN,aAAa,GAAG,IAAI,GAClC,IAAI;kBACO,MAAM,IAAI;gBACZ,IAAI;kBACF,IAAI;wBACE,OAAO,GAAG,IAAI;CA2LnC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"DagStateProvider.d.ts","sourceRoot":"","sources":["../../src/providers/DagStateProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAkCjD,UAAU,wBAAwB;IAChC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/D,cAAc,IAAI,IAAI,CAAC;CACxB;AAED,QAAA,MAAM,mBAAmB,GAAI,kGAO1B,wBAAwB,4CAuJ1B,CAAC;AAEF,eAAO,MAAM,qBAAqB;cAvMtB,OAAO;aACR,OAAO;YACR,MAAM,GAAG,IAAI;mBACN,aAAa,GAAG,IAAI;oBACnB,OAAO;4BAEX,OAAO,UACT,MAAM,GAAG,IAAI,iBACN,aAAa,GAAG,IAAI,GAClC,IAAI;WACA,OAAO;kBACA,MAAM,IAAI;gBACZ,IAAI;kBACF,IAAI;wBACE,OAAO,GAAG,IAAI;CA2LnC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/dist/providers/DagStateProvider.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useContext, useEffect, useState, } from "react";
-import { getRequest } from "../http";
+import { createContext, useCallback, useContext, useEffect, useEffectEvent, useState, } from "react";
+import useSWR from "swr";
 import { useAirflowContext } from "./AirflowProvider";
 import { useSnackbarContext } from "./SnackBarProvider";
 const DagRunStateContext = createContext({
@@ -9,121 +9,105 @@ const DagRunStateContext = createContext({
     dagRun: null,
     taskInstances: null,
     dagStartedOnce: false,
+    error: false,
     onUpdateState: () => { },
     onDagStarted: () => { },
     fetchState: () => { },
     activate: () => { },
     setAutorun: () => { },
 });
-const DagRunStateProvider = ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, taskInstances: _taskInstances, autorunHandler, onUnauthorized, }) => {
+const DagRunStateProvider = ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, autorunHandler, onUnauthorized, }) => {
     const { airflowAvailable, dagId, onLostConnection } = useAirflowContext();
-    const [isActive, setIsActive] = useState(Boolean(_dagRun
-        ? ["queued", "running"].includes(_dagRun.state)
-        : dagId && dagId?.length > 0));
-    const [channelBusy, setChannelBusy] = useState(false);
     const [autorun, setAutorun] = useState(_autorun || false);
-    const activate = useCallback(() => {
-        setIsActive(true);
-    }, [isActive, setIsActive]);
-    const [dagRun, setDagRun] = useState(_dagRun || null);
-    const [taskInstances, setTaskInstances] = useState(_taskInstances || null);
+    const [dagRunId, setDagRunId] = useState(_dagRun?.dagRunId);
     const [dagStartedOnce, setDagStartedOnce] = useState(false);
     const { enqueueSnackbar } = useSnackbarContext();
-    // При изменении пропса dagId надо сбросить текущее состояние
-    useEffect(() => {
-        setDagRun(null);
-        setIsActive(true);
-        setTaskInstances(null);
-    }, [dagId]);
-    // Запрос ревалидации
-    const updateState = () => {
-        setChannelBusy(true);
-        getRequest({
-            url: "airflow/dag_run",
-            data: {
-                dag_id: dagId,
-                dag_run_id: dagRun && dagRun.dagRunId,
-                by_user: Boolean(poolingByUser),
-            },
-            successHandler: (resp) => {
-                if (resp?.dagRun) {
-                    setDagRun(resp.dagRun);
-                    setTaskInstances(resp.taskInstances);
-                    setIsActive(["queued", "running"].includes(resp.dagRun.state));
-                }
-                else {
-                    setIsActive(false);
-                    enqueueSnackbar(`Ошибка при обновлении состояния задачи${(dagId && " ") || ""}${dagId || ""}!`, "error");
-                }
-                setChannelBusy(false);
-            },
-            errorHandler: (resp) => {
-                if (resp?.status === 401) {
-                    onUnauthorized();
-                }
-                if (resp?.status !== 404) {
-                    enqueueSnackbar(`Ошибка при обновлении состояния задачи${(dagId && " ") || ""}${dagId || ""}!`, "error");
-                }
-                if (resp?.status === 503) {
-                    onLostConnection();
-                }
-                else {
-                    setIsActive(false);
-                }
-                setChannelBusy(false);
-            },
-        }).catch((e) => {
-            if (e?.status === 401) {
-                onUnauthorized();
-            }
-            console.log(e);
-            setChannelBusy(false);
-        });
+    const defaultFetcher = async ([url, dagId, dagRunId, poolingByUser]) => {
+        const requestUrl = new URL("http://foo/" + url);
+        requestUrl.searchParams.append("dag_id", dagId);
+        if (dagRunId)
+            requestUrl.searchParams.append("dag_run_id", dagRunId);
+        requestUrl.searchParams.append("by_user", String(poolingByUser));
+        const resultUrl = requestUrl.pathname.substring(1) + requestUrl.search;
+        const res = await fetch(resultUrl, { signal: AbortSignal.timeout(10000) });
+        if (res.status === 401) {
+            onUnauthorized();
+        }
+        if (!res.ok) {
+            throw { ...(await res.json()), status: res.status };
+        }
+        return res.json();
     };
-    // Подписка на ревалидацию
-    useEffect(() => {
-        const interval = setInterval(() => {
-            if (!airflowAvailable && !isActive)
-                setIsActive(true);
-            if (!airflowAvailable || !isActive || !dagId)
-                return;
-            if (channelBusy)
-                return;
-            updateState();
-        }, 1000);
-        return () => {
-            clearInterval(interval);
-        };
-    }, [airflowAvailable, isActive, dagRun, dagId, autorun, channelBusy]);
-    // Вроде как ненужный эффект
-    // useEffect(() => {
-    //   if (dagRun == null) setIsActive(true);
-    // }, [dagRun]);
-    // Запуск autorunHandler при завершении dagRun
+    const [shouldRevalidate, setShouldRevalidate] = useState(true);
+    const activate = useCallback(() => {
+        setShouldRevalidate(true);
+    }, []);
+    const { data, error, mutate } = useSWR(airflowAvailable &&
+        dagId && [
+        "airflow/dag_run",
+        dagId,
+        dagRunId ?? null,
+        Boolean(poolingByUser),
+    ], defaultFetcher, {
+        refreshInterval: shouldRevalidate ? 1000 : 0,
+        onError: (err) => {
+            if (err?.status !== 404) {
+                enqueueSnackbar(`Ошибка при обновлении состояния задачи${(dagId && " ") || ""}${dagId || ""}!`, "error");
+            }
+            if (err?.status === 503) {
+                onLostConnection();
+            }
+            else {
+                setShouldRevalidate(false);
+            }
+        },
+        keepPreviousData: true,
+    });
+    const dagRun = data?.dagRun ?? null;
+    const taskInstances = data?.taskInstances ?? null;
+    const updDagRunIdId = useEffectEvent((newDagRunId) => {
+        if (dagRunId !== newDagRunId) {
+            setDagRunId(newDagRunId);
+        }
+    });
+    // Обновлять идентификатор запуска при изменении
     useEffect(() => {
-        if (!airflowAvailable)
-            return;
-        if (isActive)
-            return;
-        if (autorunHandler)
+        updDagRunIdId(dagRun?.dagRunId ?? null);
+        console.log("effect 1");
+    }, [dagRun?.dagRunId ?? null]);
+    const autorunAction = useEffectEvent((dagRun) => {
+        if (autorunHandler) {
             autorunHandler(dagRun, autorun);
-    }, [airflowAvailable, isActive, dagRun, autorun]);
-    const onUpdateState = (isActive, newDagRun, taskInstances) => {
-        setIsActive(isActive);
-        setDagRun(newDagRun);
+        }
+    });
+    // Если задача всё ещё выполняется, то есть смысл в ревалидации
+    useEffect(() => {
+        if (dagRun) {
+            setShouldRevalidate(["queued", "running"].includes(dagRun.state));
+        }
+        // Запуск действия при success
+        if (dagRun?.state === "success") {
+            autorunAction(dagRun);
+        }
+        console.log("effect 2");
+    }, [dagRun?.state]);
+    const onUpdateState = (isActive, newDagRun, _taskInstances) => {
+        setShouldRevalidate(isActive);
+        setDagRunId(newDagRun?.dagRunId);
         if (newDagRun == null)
-            setIsActive(true);
-        setTaskInstances(taskInstances);
+            mutate();
     };
     /**Вызывать сразу после запуска дага*/
     const onDagStarted = () => {
-        setIsActive(true);
-        setDagRun(null);
-        setTaskInstances(null);
+        // setIsActive(true);
+        setDagRunId(null);
+        // setTaskInstances(null);
+        setShouldRevalidate(true);
         setDagStartedOnce(true);
     };
+    const updateState = () => mutate();
     return (_jsx(DagRunStateContext.Provider, { value: {
-            isActive,
+            isActive: shouldRevalidate,
             autorun,
             dagRun,
             taskInstances,
@@ -131,6 +115,7 @@ const DagRunStateProvider = ({ children, dagRun: _dagRun, autorun: _autorun, poo
             onUpdateState,
             onDagStarted,
             activate,
+            error: Boolean(error),
             fetchState: updateState,
             setAutorun: (autorun) => setAutorun(autorun),
         }, children: children }));

package/dist/utils.d.ts

@@ -5,7 +5,7 @@ import { DagState, TaskState } from "./types";
 export declare function getCSRFToken(): string;
 export declare function setCSRFToken(newToken: string): void;
 export declare function prettyDatetime(datetime?: string | null): string;
-export declare const taskStateText: (taskState: DagState | TaskState | string | null | undefined) => "Завершена" | "Ошибка" | "В очереди" | "Выполняется" | "Нет состояния";
+export declare const taskStateText: (taskState: DagState | TaskState | string | null | undefined) => "Завершена" | "Ошибка" | "В очереди" | "Выполняется" | "Недоступно" | "Нет состояния";
 export declare const formatDate: (date: string) => string;
 export declare const formatDuration: (duration: number) => string;
 export declare const getSlugTableName: (name: string) => string;

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAG1B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,YAAY,WAI3B;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,UAMtD;AAED,eAAO,MAAM,aAAa,GACxB,WAAW,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,2EAc5D,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,WAWtC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,WAK9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WAyC5C,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,OAAO,MAAM,WAkB9D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,EACnB,WAAW,MAAM,EACjB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAU,OAAO,EACjB,aAAa,MAAM,WAWpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,EAAE,WAAW,MAAM,WACR,CAAC;AAEhE,wBAAgB,WAAW,CAAC,IAAI,SAAS,OAAO,EAAE,EAChD,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,EACjC,KAAK,EAAE,MAAM,aAKD,IAAI,UAUjB;AAED,eAAO,MAAM,yBAAyB,GACpC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,MAMzC,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAM3D,CAAC;AACF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,MAM7C,CAAC;AACF,eAAO,MAAM,aAAa,GACxB,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,QAAQ,OAAO,KACd,MAKF,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,YAAY,MAAM,KAAG,MAKhD,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAK3C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAG1B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,YAAY,WAI3B;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,UAMtD;AAED,eAAO,MAAM,aAAa,GACxB,WAAW,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,0FAgB5D,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,WAWtC,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,WAK9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,WAyC5C,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,OAAO,MAAM,WAkB9D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,EACnB,WAAW,MAAM,EACjB,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,UAAU,OAAO,EACjB,aAAa,MAAM,WAWpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,EAAE,WAAW,MAAM,WACR,CAAC;AAEhE,wBAAgB,WAAW,CAAC,IAAI,SAAS,OAAO,EAAE,EAChD,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,EACjC,KAAK,EAAE,MAAM,aAKD,IAAI,UAUjB;AAED,eAAO,MAAM,yBAAyB,GACpC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,WAAW,EACrB,eAAe,MAAM,KAOhB,aACN,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,MAMzC,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,OAAO,MAAM,KAAG,MAM3D,CAAC;AACF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,KACZ,MAMF,CAAC;AACF,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,MAM7C,CAAC;AACF,eAAO,MAAM,aAAa,GACxB,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,QAAQ,OAAO,KACd,MAKF,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,YAAY,MAAM,KAAG,MAKhD,CAAC;AACF,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,MAK3C,CAAC"}

package/dist/utils.js

@@ -28,6 +28,8 @@ export const taskStateText = (taskState) => {
             return "В очереди";
         case "running":
             return "Выполняется";
+        case "connerr":
+            return "Недоступно";
         default:
             return "Нет состояния";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danikokonn/yarik-frontend-lib",
-  "version": "2.0.55",
+  "version": "2.0.56",
   "license": "Apache-2.0",
   "description": "",
   "author": "",