@danikokonn/yarik-frontend-lib 2.0.57-test → 2.0.57

package/dist/http.d.ts

@@ -6,8 +6,8 @@ interface BaseCallParamsPOST extends BaseCallParams {
     headers?: HeadersInit;
 }
 interface ExtraCallParams<T, P> {
-    successHandler?: (resp?: T) => void;
-    errorHandler?: (resp?: P & {
+    successHandler?: (resp: T) => void;
+    errorHandler?: (resp: P & {
         status: number;
     }) => void;
 }

package/dist/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAAA,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,UAAU,kBAAmB,SAAQ,cAAc;IACjD,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,UAAU,eAAe,CAAC,CAAC,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACxD;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,cAAc,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,kBAAkB,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AA2BvE,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,EAC5C,GAAG,EACH,IAAI,GACL,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAkBxD;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,EAC7C,GAAG,EACH,IAAI,EACJ,OAAO,GACR,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAkB5D;AAED,wBAAsB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,EACrC,GAAG,EACH,IAAI,EACJ,cAAc,EACd,YAAY,GACb,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBlC;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,EACtC,GAAG,EACH,IAAI,EACJ,OAAO,EACP,cAAc,EACd,YAAY,GACb,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,iBAqBtB"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAAA,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,UAAU,kBAAmB,SAAQ,cAAc;IACjD,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,UAAU,eAAe,CAAC,CAAC,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACvD;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,cAAc,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,kBAAkB,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AA2BvE,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,EAC5C,GAAG,EACH,IAAI,GACL,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAYxD;AAED,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,EAC7C,GAAG,EACH,IAAI,EACJ,OAAO,GACR,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAY5D;AAED,wBAAsB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,EACrC,GAAG,EACH,IAAI,EACJ,cAAc,EACd,YAAY,GACb,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBlC;AAED,wBAAsB,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,EACtC,GAAG,EACH,IAAI,EACJ,OAAO,EACP,cAAc,EACd,YAAY,GACb,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,iBActB"}

package/dist/http.js

@@ -20,13 +20,7 @@ async function _postRequest({ url, data, headers }) {
 }
 export async function getRequestPromise({ url, data, }) {
     const resp = await _getRequest({ url, data });
-    if (resp.redirected) {
-        // #NOTE
-        // На данный момент редирект - признак просроченной сессии,
-        // так как на json запрос нет явного ответа редиректом, только через декоратор логина,
-        // если же в будущем будет добавлен какой-то иной редирект в ответ за json запрос,
-        // то нужно будет поменять код в данном блоке
-        // location.reload();
+    if (resp.status === 401) {
         console.log("Session expired");
     }
     if (resp.ok) {
@@ -38,13 +32,7 @@ export async function getRequestPromise({ url, data, }) {
 }
 export async function postRequestPromise({ url, data, headers, }) {
     const resp = await _postRequest({ url, data, headers });
-    if (resp.redirected) {
-        // #NOTE
-        // На данный момент редирект - признак просроченной сессии,
-        // так как на json запрос нет явного ответа редиректом, только через декоратор логина,
-        // если же в будущем будет добавлен какой-то иной редирект в ответ за json запрос,
-        // то нужно будет поменять код в данном блоке
-        // location.reload();
+    if (resp.status === 401) {
         console.log("Session expired");
     }
     if (resp.ok) {
@@ -56,13 +44,7 @@ export async function postRequestPromise({ url, data, headers, }) {
 }
 export async function getRequest({ url, data, successHandler, errorHandler, }) {
     const resp = await _getRequest({ url, data });
-    if (resp.redirected) {
-        // #NOTE
-        // На данный момент редирект - признак просроченной сессии,
-        // так как на json запрос нет явного ответа редиректом, только через декоратор логина,
-        // если же в будущем будет добавлен какой-то иной редирект в ответ за json запрос,
-        // то нужно будет поменять код в данном блоке
-        // location.reload();
+    if (resp.status === 401) {
         console.log("Session expired");
     }
     if (resp.ok) {
@@ -78,14 +60,7 @@ export async function getRequest({ url, data, successHandler, errorHandler, }) {
 }
 export async function postRequest({ url, data, headers, successHandler, errorHandler, }) {
     const resp = await _postRequest({ url, data, headers });
-    if (resp.redirected) {
-        // #NOTE
-        // На данный момент редирект - признак просроченной сессии,
-        // так как на json запрос нет явного ответа редиректом, только через декоратор логина,
-        // если же в будущем будет добавлен какой-то иной редирект в ответ за json запрос,
-        // то нужно будет поменять код в данном блоке
-        // location.reload();
-        // Надо продумать этот вопрос получше
+    if (resp.status === 401) {
         console.log("Session expired");
     }
     if (resp.ok) {

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from "./components";
-export * from "./providers";
-export * from "./utils";
 export * from "./http";
+export * from "./providers";
 export * from "./types";
+export * from "./utils";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -1,5 +1,5 @@
 export * from "./components";
-export * from "./providers";
-export * from "./utils";
 export * from "./http";
+export * from "./providers";
 export * from "./types";
+export * from "./utils";

package/dist/providers/AirflowProvider.d.ts

@@ -1,13 +1,14 @@
 import React from "react";
 interface AirflowProviderProps {
     children?: React.ReactNode;
-    dagId: string;
+    dagId?: string | null;
+    onUnauthorized(): void;
 }
-export declare const AirflowProvider: ({ children, dagId: _dagId, }: AirflowProviderProps) => React.JSX.Element;
+export declare const AirflowProvider: ({ children, dagId: _dagId, onUnauthorized, }: AirflowProviderProps) => import("react/jsx-runtime").JSX.Element;
 export declare const useAirflowContext: () => {
+    dagId?: string | null;
     airflowAvailable: boolean;
-    dagId: string;
-    onChangeDagId(dagId: string): void;
+    onChangeDagId(dagId: string | null): void;
     onLostConnection(): void;
 };
 export default AirflowProvider;

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

@@ -1 +1 @@
-{"version":3,"file":"AirflowProvider.d.ts","sourceRoot":"","sources":["../../src/providers/AirflowProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAgBf,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,eAAe,GAAI,8BAG7B,oBAAoB,sBAuFtB,CAAC;AAEF,eAAO,MAAM,iBAAiB;sBA5GV,OAAO;WAClB,MAAM;yBACQ,MAAM,GAAG,IAAI;wBACd,IAAI;CA2GzB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"AirflowProvider.d.ts","sourceRoot":"","sources":["../../src/providers/AirflowProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2D,MAAM,OAAO,CAAC;AAgBhF,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,IAAI,IAAI,CAAC;CACxB;AAED,eAAO,MAAM,eAAe,GAAI,8CAI7B,oBAAoB,4CAyEtB,CAAC;AAEF,eAAO,MAAM,iBAAiB;YAhGpB,MAAM,GAAG,IAAI;sBACH,OAAO;yBACJ,MAAM,GAAG,IAAI,GAAG,IAAI;wBACrB,IAAI;CA+FzB,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/providers/AirflowProvider.js

@@ -1,78 +1,64 @@
-import React, { createContext, useCallback, useContext, useEffect, useState, } from "react";
-import { getRequest } from "../http";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useCallback, useContext, useState } from "react";
+import useSWR from "swr";
 import { useSnackbarContext } from "./SnackBarProvider";
 const AirflowContext = createContext({
-    airflowAvailable: false,
     dagId: "",
+    airflowAvailable: false,
     onChangeDagId: () => { },
     onLostConnection: () => { },
 });
-export const AirflowProvider = ({ children, dagId: _dagId, }) => {
-    const [airflowAvailable, setAirflowAvailable] = useState(false);
+export const AirflowProvider = ({ children, dagId: _dagId, onUnauthorized, }) => {
+    const fetcher = async (url) => {
+        const res = await fetch(url);
+        if (res.status === 401) {
+            onUnauthorized();
+        }
+        if (!res.ok && res.status !== 404) {
+            const error = new Error("An error occurred while fetching the data.");
+            throw { ...error, info: await res.json(), status: res.status };
+        }
+        return res.json();
+    };
+    const { enqueueSnackbar } = useSnackbarContext();
     const [dagId, setDagId] = useState(_dagId);
     const [firstRun, setFirstRun] = useState(true);
-    const { enqueueSnackbar } = useSnackbarContext();
-    const [channelBusy, setChannelBusy] = useState(false);
+    const [previousAirflowAvailable, setPreviousAirflowAvailable] = useState(false);
+    const { error, mutate } = useSWR("airflow/check_connection", fetcher, {
+        refreshInterval: 10000,
+        onSuccess: () => {
+            if (firstRun) {
+                setFirstRun(false);
+            }
+            else if (!previousAirflowAvailable) {
+                enqueueSnackbar("Соединение с Airflow установлено!", "info");
+            }
+            setPreviousAirflowAvailable(true);
+        },
+        onError: () => {
+            if (firstRun) {
+                enqueueSnackbar(`Не удалось установить соединение с Airflow!`, "warning");
+                setFirstRun(false);
+            }
+            else if (previousAirflowAvailable) {
+                enqueueSnackbar(`Потеряно соединение с Airflow!`, "warning");
+            }
+            setPreviousAirflowAvailable(false);
+        },
+    });
+    const airflowAvailable = error == null;
     const setContext = useCallback((dagId) => {
         setDagId(dagId);
     }, [dagId, setDagId]);
-    const checkConnection = () => {
-        setChannelBusy(true);
-        getRequest({
-            url: "airflow/check_connection",
-            data: {},
-            successHandler: (_resp) => {
-                if (!airflowAvailable) {
-                    setAirflowAvailable(true);
-                    if (firstRun) {
-                        setFirstRun(false);
-                        setChannelBusy(false);
-                        return;
-                    }
-                    enqueueSnackbar("Соединение с Airflow установлено!", "info");
-                }
-                setChannelBusy(false);
-            },
-            errorHandler: (resp) => {
-                if (!airflowAvailable && firstRun) {
-                    setFirstRun(false);
-                    enqueueSnackbar(`Не удалось установить соединение с Airflow!${(resp?.status == 401 && " Ошибка авторизации.") || ""}`, "warning");
-                }
-                if (airflowAvailable) {
-                    setAirflowAvailable(false);
-                    enqueueSnackbar(`Потеряно соединение с Airflow!${(resp?.status == 401 && " Ошибка авторизации.") || ""}`, "warning");
-                }
-                setChannelBusy(false);
-            },
-        }).catch((e) => {
-            if (e)
-                console.log(e);
-            setChannelBusy(false);
-        });
-    };
-    useEffect(() => {
-        if (firstRun) {
-            checkConnection();
-        }
-        const interval = setInterval(() => {
-            if (channelBusy)
-                return;
-            checkConnection();
-        }, 10000);
-        return () => {
-            clearInterval(interval);
-        };
-    }, [firstRun, airflowAvailable, dagId, channelBusy]);
     const onLostConnection = () => {
-        setAirflowAvailable(false);
-        enqueueSnackbar("Потеряно соединение с Airflow!", "warning");
+        mutate();
     };
-    return (React.createElement(AirflowContext.Provider, { value: {
+    return (_jsx(AirflowContext.Provider, { value: {
             airflowAvailable,
             dagId,
             onChangeDagId: setContext,
             onLostConnection,
-        } }, children));
+        }, children: children }));
 };
 export const useAirflowContext = () => {
     return useContext(AirflowContext);

package/dist/providers/DagStateProvider.d.ts

@@ -5,21 +5,23 @@ interface DagRunStateProviderProps {
     dagRun?: DagRun;
     autorun?: boolean;
     poolingByUser?: boolean;
-    autorunHandler?(dagRun: DagRun | null, autorun: boolean): void;
     taskInstances?: TaskInstances;
-    scanInterval?: number;
+    autorunHandler?(dagRun: DagRun | null, autorun: boolean): void;
+    onUnauthorized(): void;
 }
-export declare const DagRunStateProvider: ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, taskInstances: _taskInstances, autorunHandler, scanInterval, }: DagRunStateProviderProps) => React.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;
     dagRun: DagRun | null;
     taskInstances: TaskInstances | null;
-    onUpdateState(isActive: boolean, dagRun: DagRun, taskInstances: TaskInstances): void;
+    dagStartedOnce: boolean;
+    onUpdateState(isActive: boolean, dagRun: DagRun | null, taskInstances: TaskInstances | null): void;
+    error: boolean;
+    onDagStarted: () => void;
     activate(): void;
     fetchState(): void;
     setAutorun(autorun: boolean): void;
-    scanInterval: number;
 };
 export default DagRunStateProvider;
 //# sourceMappingURL=DagStateProvider.d.ts.map

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;AACf,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA+BjD,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,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,mBAAmB,GAAI,+HAQjC,wBAAwB,sBA2H1B,CAAC;AAEF,eAAO,MAAM,qBAAqB;cAxKtB,OAAO;aACR,OAAO;YACR,MAAM,GAAG,IAAI;mBACN,aAAa,GAAG,IAAI;4BAEvB,OAAO,UACT,MAAM,iBACC,aAAa,GAC3B,IAAI;gBACK,IAAI;kBACF,IAAI;wBACE,OAAO,GAAG,IAAI;kBACpB,MAAM;CA8JrB,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,5 +1,6 @@
-import React, { createContext, useCallback, useContext, useEffect, useState, } from "react";
-import { getRequest } from "../http";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useCallback, useContext, useEffect, useEffectEvent, useState, } from "react";
+import useSWR from "swr";
 import { useAirflowContext } from "./AirflowProvider";
 import { useSnackbarContext } from "./SnackBarProvider";
 const DagRunStateContext = createContext({
@@ -7,107 +8,117 @@ const DagRunStateContext = createContext({
     autorun: false,
     dagRun: null,
     taskInstances: null,
+    dagStartedOnce: false,
+    error: false,
     onUpdateState: () => { },
+    onDagStarted: () => { },
     fetchState: () => { },
     activate: () => { },
     setAutorun: () => { },
-    scanInterval: 300,
 });
-export const DagRunStateProvider = ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, taskInstances: _taskInstances, autorunHandler, scanInterval, }) => {
+const DagRunStateProvider = ({ children, dagRun: _dagRun, autorun: _autorun, poolingByUser, autorunHandler, onUnauthorized, }) => {
     const { airflowAvailable, dagId, onLostConnection } = useAirflowContext();
-    const [isActive, setIsActive] = useState(_dagRun ? ["queued", "running"].includes(_dagRun.state) : 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();
-    useEffect(() => {
-        setDagRun(null);
-        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 !== 404) {
-                    enqueueSnackbar(`Ошибка при обновлении состояния задачи${(dagId && " ") || ""}${dagId || ""}!`, "error");
-                }
-                if (resp?.status === 503) {
-                    onLostConnection();
-                }
-                else {
-                    setIsActive(false);
-                }
-                setChannelBusy(false);
-            },
-        }).catch((e) => {
-            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();
     };
+    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(() => {
-        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]);
-    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, dagRun, taskInstances) => {
-        setIsActive(isActive);
-        setDagRun(dagRun);
-        setTaskInstances(taskInstances);
+        }
+    });
+    // Если задача всё ещё выполняется, то есть смысл в ревалидации
+    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)
+            mutate();
+    };
+    /**Вызывать сразу после запуска дага*/
+    const onDagStarted = () => {
+        // setIsActive(true);
+        setDagRunId(null);
+        // setTaskInstances(null);
+        setShouldRevalidate(true);
+        setDagStartedOnce(true);
     };
-    return (React.createElement(DagRunStateContext.Provider, { value: {
-            isActive,
+    const updateState = () => mutate();
+    return (_jsx(DagRunStateContext.Provider, { value: {
+            isActive: shouldRevalidate,
             autorun,
             dagRun,
             taskInstances,
+            dagStartedOnce,
             onUpdateState,
+            onDagStarted,
             activate,
+            error: Boolean(error),
             fetchState: updateState,
             setAutorun: (autorun) => setAutorun(autorun),
-            scanInterval: scanInterval || 1,
-        } }, children));
+        }, children: children }));
 };
 export const useDagRunStateContext = () => {
     return useContext(DagRunStateContext);

package/dist/providers/SessionProvider.d.ts

@@ -2,8 +2,10 @@ import React from "react";
 interface SessionProviderProps {
     children?: React.ReactNode;
     pollingInterval: number;
+    autoRedirect?: boolean;
+    onUnauthorized?(): void;
 }
-export declare const SessionProvider: ({ children, pollingInterval, }: SessionProviderProps) => React.JSX.Element;
+declare const SessionProvider: ({ children, pollingInterval, autoRedirect, onUnauthorized, }: SessionProviderProps) => import("react/jsx-runtime").JSX.Element;
 export declare const useSessionContext: () => {
     expiresIn: number;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"SessionProvider.d.ts","sourceRoot":"","sources":["../../src/providers/SessionProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAU9E,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,eAAe,GAAI,gCAG7B,oBAAoB,sBAwCtB,CAAC;AAEF,eAAO,MAAM,iBAAiB;eAvDjB,MAAM;CAyDlB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"SessionProvider.d.ts","sourceRoot":"","sources":["../../src/providers/SessionProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAU9E,UAAU,oBAAoB;IAC5B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,IAAI,IAAI,CAAC;CACzB;AAED,QAAA,MAAM,eAAe,GAAI,8DAKtB,oBAAoB,4CA8CtB,CAAC;AAEF,eAAO,MAAM,iBAAiB;eAjEjB,MAAM;CAmElB,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/providers/SessionProvider.js

@@ -1,21 +1,28 @@
-import React, { createContext, useContext, useEffect, useState } from "react";
-import { useSnackbarContext } from "./SnackBarProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useContext, useEffect, useState } from "react";
 import { getRequest } from "../http";
+import { useSnackbarContext } from "./SnackBarProvider";
 const SessionContext = createContext({
     expiresIn: 0,
 });
-export const SessionProvider = ({ children, pollingInterval, }) => {
+const SessionProvider = ({ children, pollingInterval, autoRedirect, onUnauthorized, }) => {
     const { enqueueSnackbar } = useSnackbarContext();
     const [expires, setExpires] = useState(false);
     const alertExpire = () => enqueueSnackbar("Сессия завершилась, перезагрузите страницу!", "default");
     const fetchSessionExpiryAge = () => getRequest({
         url: "base/check_session",
         successHandler: (_resp) => { },
-        errorHandler: (_resp) => {
+        errorHandler: (e) => {
+            if (e?.status === 401 && autoRedirect && onUnauthorized) {
+                onUnauthorized();
+            }
             setExpires(true);
             alertExpire();
         },
-    }).catch(() => {
+    }).catch((e) => {
+        if (e?.status === 401 && autoRedirect && onUnauthorized) {
+            onUnauthorized();
+        }
         setExpires(true);
         alertExpire();
     });
@@ -27,9 +34,9 @@ export const SessionProvider = ({ children, pollingInterval, }) => {
         }, pollingInterval * 1000);
         return () => clearInterval(interval);
     }, [expires]);
-    return (React.createElement(SessionContext.Provider, { value: {
+    return (_jsx(SessionContext.Provider, { value: {
             expiresIn: pollingInterval,
-        } }, children));
+        }, children: children }));
 };
 export const useSessionContext = () => {
     return useContext(SessionContext);

package/dist/providers/SnackBarProvider.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
 interface SnackBarProps {
-    children?: React.ReactNode;
+    children?: React.ReactNode | React.ReactNode[];
 }
-export declare const SnackBarProvider: ({ children }: SnackBarProps) => React.JSX.Element;
+declare const SnackBarProvider: ({ children }: SnackBarProps) => import("react/jsx-runtime").JSX.Element;
 export declare const useSnackbarContext: () => {
     enqueueSnackbar(message: string, variant: "default" | "error" | "success" | "warning" | "info"): void;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"SnackBarProvider.d.ts","sourceRoot":"","sources":["../../src/providers/SnackBarProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AAezD,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AA8CD,eAAO,MAAM,gBAAgB,GAAI,cAAc,aAAa,sBAM3D,CAAC;AAEF,eAAO,MAAM,kBAAkB;6BA/DlB,MAAM,WACN,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAC5D,IAAI;CA+DR,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"SnackBarProvider.d.ts","sourceRoot":"","sources":["../../src/providers/SnackBarProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AAezD,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;CAChD;AA8CD,QAAA,MAAM,gBAAgB,GAAI,cAAc,aAAa,4CAMpD,CAAC;AAEF,eAAO,MAAM,kBAAkB;6BA/DlB,MAAM,WACN,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAC5D,IAAI;CA+DR,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/providers/SnackBarProvider.js

@@ -1,4 +1,5 @@
-import React, { createContext, useContext } from "react";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { createContext, useContext } from "react";
 import Button from "@mui/material/Button";
 import { SnackbarProvider, useSnackbar } from "notistack";
 const SnackBarContext = createContext({
@@ -6,10 +7,9 @@ const SnackBarContext = createContext({
 });
 const SnackBarProviderUtilities = ({ children }) => {
     const { enqueueSnackbar, closeSnackbar } = useSnackbar();
-    const action = (snackbarId) => (React.createElement(React.Fragment, null,
-        React.createElement(Button, { size: "small", variant: "text", color: "inherit", onClick: () => {
+    const action = (snackbarId) => (_jsx(_Fragment, { children: _jsx(Button, { size: "small", variant: "text", color: "inherit", onClick: () => {
                 closeSnackbar(snackbarId);
-            } }, "\u0417\u0430\u043A\u0440\u044B\u0442\u044C")));
+            }, children: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C" }) }));
     function handleEnqueueSnackbar(message, variant) {
         enqueueSnackbar(message, {
             variant: variant,
@@ -21,13 +21,12 @@ const SnackBarProviderUtilities = ({ children }) => {
             },
         });
     }
-    return (React.createElement(SnackBarContext.Provider, { value: {
+    return (_jsx(SnackBarContext.Provider, { value: {
             enqueueSnackbar: handleEnqueueSnackbar,
-        } }, children));
+        }, children: children }));
 };
-export const SnackBarProvider = ({ children }) => {
-    return (React.createElement(SnackbarProvider, { maxSnack: 5, autoHideDuration: 5000, preventDuplicate: true },
-        React.createElement(SnackBarProviderUtilities, null, children)));
+const SnackBarProvider = ({ children }) => {
+    return (_jsx(SnackbarProvider, { maxSnack: 5, autoHideDuration: 5000, preventDuplicate: true, children: _jsx(SnackBarProviderUtilities, { children: children }) }));
 };
 export const useSnackbarContext = () => {
     return useContext(SnackBarContext);

package/dist/providers/index.d.ts

@@ -1,9 +1,9 @@
-export { default as DagStateProvider } from "./DagStateProvider";
 export * from "./DagStateProvider";
-export { default as SessionProvider } from "./SessionProvider";
+export { default as DagStateProvider } from "./DagStateProvider";
 export * from "./SessionProvider";
-export { default as SnackBarProvider } from "./SnackBarProvider";
+export { default as SessionProvider } from "./SessionProvider";
 export * from "./SnackBarProvider";
-export { default as AirflowProvider } from "./AirflowProvider";
+export { default as SnackBarProvider } from "./SnackBarProvider";
 export * from "./AirflowProvider";
+export { default as AirflowProvider } from "./AirflowProvider";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,cAAc,mBAAmB,CAAC;AAElC,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC/D,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE/D,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC"}