@evergis/react 4.0.62 → 4.0.63

package/dist/components/Dashboard/componentTypes.d.ts

@@ -416,7 +416,7 @@ export interface TabsContainerConfig extends Omit<ConfigContainerChild, "options
 export interface TabsContainerProps extends Omit<ContainerProps, "elementConfig"> {
     elementConfig?: TabsContainerConfig;
 }
-export type TaskContainerOptions = Pick<ConfigOptions, "title" | "relatedResources" | "center" | "icon" | "statusColors" | "responseFilters">;
+export type TaskContainerOptions = Pick<ConfigOptions, "title" | "relatedResources" | "center" | "icon" | "statusColors" | "responseFilters" | "useNotifications">;
 export interface TaskContainerConfig extends Omit<ConfigContainerChild, "options" | "templateName"> {
     templateName?: ContainerTemplate.Task;
     options?: TaskContainerOptions;

package/dist/components/Dashboard/containers/TaskContainer/useTaskNotifications.d.ts

@@ -0,0 +1,9 @@
+import { RemoteTaskStatus } from '@evergis/api';
+interface UseTaskNotificationsParams {
+    enabled: boolean;
+    status: RemoteTaskStatus;
+    lastMessage: string | null;
+    openLog: () => void;
+}
+export declare const useTaskNotifications: ({ enabled, status, lastMessage, openLog, }: UseTaskNotificationsParams) => void;
+export {};

package/dist/components/Dashboard/hooks/useGlobalContext.d.ts

@@ -5,4 +5,11 @@ export declare const useGlobalContext: () => {
     themeName: import('../../..').ThemeName;
     api: import('@evergis/api').Api;
     ewktGeometry: string;
+    notification: {
+        add: (item: import('@evergis/uilib-gl').INotificationItem) => void;
+        update: (patch: Partial<import('@evergis/uilib-gl').INotificationItem> & {
+            id: string;
+        }) => void;
+        close: (id: string) => void;
+    };
 };

package/dist/components/Dashboard/types.d.ts

@@ -262,6 +262,7 @@ export interface ConfigMiscOptions {
     tabId?: string;
     downloadById?: string;
     parentResourceId?: string;
+    useNotifications?: boolean;
 }
 /**
  * Flat-объединение всех доменных миксинов. Существующие места, использующие

package/dist/contexts/GlobalContext/types.d.ts

@@ -1,6 +1,7 @@
 import { PropsWithChildren } from 'react';
 import { i18n } from 'i18next';
 import { Api } from '@evergis/api';
+import { INotificationItem } from '@evergis/uilib-gl';
 import { ThemeName } from '../../types';
 export type GlobalContextProps = PropsWithChildren<{
     t?: i18n["t"];
@@ -8,4 +9,11 @@ export type GlobalContextProps = PropsWithChildren<{
     ewktGeometry?: string;
     themeName?: ThemeName;
     api?: Api;
+    notification?: {
+        add: (item: INotificationItem) => void;
+        update: (patch: Partial<INotificationItem> & {
+            id: string;
+        }) => void;
+        close: (id: string) => void;
+    };
 }>;

package/dist/hooks/task/usePythonTask.d.ts

@@ -11,6 +11,7 @@ export declare const usePythonTask: () => {
     stopTask: () => Promise<void>;
     openLog: () => void;
     log: string;
+    lastMessage: string;
     error: Error;
     status: RemoteTaskStatus;
     loading: boolean;

package/dist/index.js

@@ -4217,7 +4217,7 @@ const useAttachmentItems = ({ type, elementConfig, valueOverride, }) => {
 };
 
 const useGlobalContext = () => {
-    const { t, language, themeName, api, ewktGeometry } = React.useContext(GlobalContext) || {};
+    const { t, language, themeName, api, ewktGeometry, notification } = React.useContext(GlobalContext) || {};
     const translate = React.useCallback((value, options) => {
         if (t)
             return t(value, options);
@@ -4229,7 +4229,8 @@ const useGlobalContext = () => {
         themeName,
         api,
         ewktGeometry,
-    }), [language, translate, api, ewktGeometry, themeName]);
+        notification,
+    }), [language, translate, api, ewktGeometry, themeName, notification]);
 };
 
 const GRID_TILE_SIZE = "4.5rem";
@@ -5622,6 +5623,7 @@ const usePythonTask = () => {
     const { preparePythonSandbox } = usePythonSandbox();
     const [status, setStatus] = React.useState(api.RemoteTaskStatus.Unknown);
     const [log, setLog] = React.useState(null);
+    const [lastMessage, setLastMessage] = React.useState(null);
     const [error, setError] = React.useState(null);
     const [loading, setLoading] = React.useState(false);
     const [executionTime, setExecutionTime] = React.useState(null);
@@ -5643,6 +5645,7 @@ const usePythonTask = () => {
         reset();
         setStatus(api.RemoteTaskStatus.Process);
         setLog(null);
+        setLastMessage(null);
         setLoading(true);
         const start = Date.now();
         let prototypeId = await api$1.remoteTaskManager.createTaskPrototype({
@@ -5683,6 +5686,8 @@ const usePythonTask = () => {
                 const isFinished = [api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status);
                 setStatus(data.status);
                 setLog([logRef.current, data.log].filter(Boolean).join("\n"));
+                if (data.log)
+                    setLastMessage(data.log);
                 setExecutionTime(Date.now() - start);
                 setLoading(false);
                 setTaskId(isFinished ? null : newTaskId);
@@ -5735,6 +5740,7 @@ const usePythonTask = () => {
         stopTask,
         openLog,
         log,
+        lastMessage,
         error,
         status,
         loading,
@@ -7708,14 +7714,93 @@ const buildFiltersFromResponse = (responseFilters, result) => {
     return Object.keys(filters).length ? filters : null;
 };
 
+const RUN_ID_RADIX = 36;
+const RUN_ID_LENGTH = 8;
+const generateRunId = () => `task-${Date.now()}-${Math.random().toString(RUN_ID_RADIX).slice(2, RUN_ID_LENGTH)}`;
+const useTaskNotifications = ({ enabled, status, lastMessage, openLog, }) => {
+    const { t, notification } = useGlobalContext();
+    const runIdRef = React.useRef(null);
+    const prevStatusRef = React.useRef(api.RemoteTaskStatus.Unknown);
+    React.useEffect(() => {
+        if (!enabled) {
+            if (runIdRef.current) {
+                notification?.close(runIdRef.current);
+                runIdRef.current = null;
+            }
+            prevStatusRef.current = status;
+            return;
+        }
+        if (status === api.RemoteTaskStatus.Unknown) {
+            prevStatusRef.current = status;
+            return;
+        }
+        const isFreshRun = status === api.RemoteTaskStatus.Process && prevStatusRef.current !== api.RemoteTaskStatus.Process;
+        if (isFreshRun) {
+            runIdRef.current = generateRunId();
+        }
+        if (!runIdRef.current) {
+            runIdRef.current = generateRunId();
+        }
+        const id = runIdRef.current;
+        const description = lastMessage || t("taskStarted", { ns: "dashboard", defaultValue: "Запуск задачи…" });
+        const button = t("details", { ns: "dashboard", defaultValue: "Подробнее" });
+        const base = {
+            id,
+            title: "",
+            description,
+            duration: Number.MAX_SAFE_INTEGER,
+            button,
+            buttonIcon: "info",
+            buttonColor: "primary",
+            onButtonClick: openLog,
+        };
+        if (status === api.RemoteTaskStatus.Process) {
+            const item = {
+                ...base,
+                title: t("taskInProgress", { ns: "dashboard", defaultValue: "Выполняется" }),
+                progress: true,
+            };
+            if (isFreshRun) {
+                notification?.add(item);
+            }
+            else {
+                notification?.update(item);
+            }
+        }
+        else if (status === api.RemoteTaskStatus.Completed) {
+            notification?.update({
+                ...base,
+                title: t("taskCompleted", { ns: "dashboard", defaultValue: "Выполнено" }),
+                success: true,
+                progress: false,
+            });
+        }
+        else if (status === api.RemoteTaskStatus.Error) {
+            notification?.update({
+                ...base,
+                title: t("taskError", { ns: "dashboard", defaultValue: "Ошибка" }),
+                error: true,
+                progress: false,
+            });
+        }
+        prevStatusRef.current = status;
+    }, [enabled, status, lastMessage, openLog, t, notification]);
+};
+
 const TaskContainer = React.memo(({ type, elementConfig, renderElement }) => {
     const { t, ewktGeometry } = useGlobalContext();
     const { dataSources, filters: selectedFilters, attributes, layerInfo, changeFilters, } = useWidgetContext(type);
     const { dataSources: projectDataSources } = useWidgetContext(exports.WidgetType.Dashboard);
     const { currentPage } = useWidgetPage(type);
-    const { taskId, runTask, stopTask, status, openLog, loading, isLogDialogOpen, closeLog, log, result, } = usePythonTask();
+    const { taskId, runTask, stopTask, status, openLog, loading, isLogDialogOpen, closeLog, log, lastMessage, result, } = usePythonTask();
     const { options } = elementConfig || {};
-    const { title, relatedResources, center, icon, statusColors, responseFilters } = options || {};
+    const { title, relatedResources, center, icon, statusColors, responseFilters, useNotifications, } = options || {};
+    useTaskNotifications({
+        enabled: !!useNotifications,
+        status,
+        lastMessage,
+        openLog,
+    });
     React.useEffect(() => {
         const filtersToApply = buildFiltersFromResponse(responseFilters, result);
         if (filtersToApply)