@evergis/react 3.1.50 → 3.1.51

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

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { ContainerProps } from '../../types';
+export declare const TaskContainer: FC<ContainerProps>;

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

@@ -0,0 +1,2 @@
+export declare const UploaderContainer: import('styled-components').StyledComponent<any, any, object, string | number | symbol>;
+export declare const UploaderTitle: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;

package/dist/components/Dashboard/containers/UploadContainer/index.d.ts

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { ContainerProps } from '../../types';
+export declare const UploadContainer: FC<ContainerProps>;

package/dist/components/Dashboard/containers/UploadContainer/styled.d.ts

@@ -0,0 +1,2 @@
+export declare const UploaderContainer: import('styled-components').StyledComponent<any, any, object, string | number | symbol>;
+export declare const UploaderTitle: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;

package/dist/components/Dashboard/containers/index.d.ts

@@ -19,3 +19,4 @@ export * from './SlideshowContainer';
 export * from './TabsContainer';
 export * from './TitleContainer';
 export * from './TwoColumnContainer';
+export * from './UploadContainer';

package/dist/components/Dashboard/containers/registry.d.ts

@@ -27,5 +27,7 @@ export declare const containerComponents: {
     readonly AddFeature: import('react').FC<import('../types').ContainerProps>;
     readonly Divider: import('react').FC<import('../types').ContainerProps>;
     readonly ExportPdf: import('react').FC<import('../types').ContainerProps>;
+    readonly Upload: import('react').FC<import('../types').ContainerProps>;
+    readonly Task: import('react').FC<import('../types').ContainerProps>;
     readonly default: import('react').FC<import('../types').ContainerProps>;
 };

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

@@ -27,6 +27,11 @@ export interface ConfigRelatedDataSource {
     hideAxis?: boolean;
     filterName?: string;
 }
+export interface ConfigRelatedResource {
+    resourceId: string;
+    parameters: Record<string, unknown>;
+    script?: string;
+}
 export interface BaseMapSettings {
     opacity?: number;
     showBuildings?: boolean;
@@ -38,10 +43,13 @@ export interface ConfigOptions {
     themeName?: ThemeName;
     relatedDataSources?: ConfigRelatedDataSource[];
     relatedAttributes?: ConfigRelatedAttribute[];
+    relatedResources?: ConfigRelatedResource[];
     chartType?: "bar" | "line" | "pie" | "stack";
     layerNames?: string[];
     layerName?: string;
     geometryType?: GeometryType | EditGeometryType;
+    fileExtensions?: string;
+    parentResourceId?: string;
     srid?: string;
     title?: string;
     label?: string;
@@ -253,6 +261,8 @@ export declare enum ContainerTemplate {
     AddFeature = "AddFeature",
     Slideshow = "Slideshow",
     ExportPdf = "ExportPdf",
+    Upload = "Upload",
+    Task = "Task",
     Divider = "Divider"
 }
 export declare enum HeaderTemplate {

package/dist/hooks/index.d.ts

@@ -1,5 +1,6 @@
 export * from './map';
 export * from './serverNotifications';
+export * from './task';
 export * from './useAppHeight';
 export * from './useDebouncedCallback';
 export * from './useToggle';

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

@@ -0,0 +1,4 @@
+export declare const SERVER_NOTIFICATION_EVENT: {
+    ReceiveFeaturesUpdate: string;
+    PythonProgressNotification: string;
+};

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

@@ -0,0 +1,3 @@
+export * from './constants';
+export * from './usePythonTask';
+export * from './types';

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

@@ -0,0 +1,16 @@
+import { RemoteTaskStatus } from '@evergis/api';
+export interface PythonTaskProgressSubscription {
+    tag: "python_task_progress_event";
+    taskId: string;
+}
+export interface PythonTaskProgressNotification {
+    data: {
+        log: string;
+        progress: number;
+        status: RemoteTaskStatus;
+        subTaskId?: string;
+        taskId: string;
+    };
+    tag: string;
+    createdAt: string;
+}

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

@@ -0,0 +1,12 @@
+export declare const usePythonTask: () => {
+    runTask: ({ resourceId, parameters, script, }: {
+        resourceId: string;
+        parameters: Record<string, unknown>;
+        script: string;
+    }) => Promise<void>;
+    stopTask: () => Promise<void>;
+    result: string;
+    error: Error;
+    loading: boolean;
+    executionTime: number;
+};

package/dist/index.js

@@ -3382,6 +3382,8 @@ exports.ContainerTemplate = void 0;
     ContainerTemplate["AddFeature"] = "AddFeature";
     ContainerTemplate["Slideshow"] = "Slideshow";
     ContainerTemplate["ExportPdf"] = "ExportPdf";
+    ContainerTemplate["Upload"] = "Upload";
+    ContainerTemplate["Task"] = "Task";
     ContainerTemplate["Divider"] = "Divider";
 })(exports.ContainerTemplate || (exports.ContainerTemplate = {}));
 exports.HeaderTemplate = void 0;
@@ -4994,6 +4996,88 @@ const useServerNotificationsContext = () => {
     return React.useContext(ServerNotificationsContext);
 };
 
+const SERVER_NOTIFICATION_EVENT = {
+    ReceiveFeaturesUpdate: "ReceiveFeaturesUpdateNotification",
+    PythonProgressNotification: "ReceivePythonProgressNotification",
+};
+
+const usePythonTask = () => {
+    const { api: api$1, t } = useGlobalContext();
+    const { addSubscription, connection, unsubscribeById } = useServerNotificationsContext();
+    const [result, setResult] = React.useState(null);
+    const [error, setError] = React.useState(null);
+    const [loading, setLoading] = React.useState(false);
+    const [executionTime, setExecutionTime] = React.useState(null);
+    const [taskId, setTaskId] = React.useState(null);
+    const [subscriptionId, setSubscriptionId] = React.useState(null);
+    const reset = React.useCallback(() => {
+        setResult(null);
+        setError(null);
+        setLoading(true);
+        setExecutionTime(null);
+        setTaskId(null);
+        setSubscriptionId(null);
+    }, []);
+    const runTask = React.useCallback(async ({ resourceId, parameters, script, }) => {
+        reset();
+        const start = Date.now();
+        let prototypeId = await api$1.remoteTaskManager.createTaskPrototype({
+            enabled: true,
+            startIfPreviousError: true,
+            startIfPreviousNotFinished: true,
+            subTaskSettings: [
+                {
+                    type: "pythonService",
+                    startParameters: {
+                        resourceId,
+                        parameters,
+                        script,
+                        method: "pythonrunner/run",
+                    },
+                },
+            ],
+        });
+        prototypeId = prototypeId.replace(/["']+/g, "");
+        const { id: newTaskId, success } = await api$1.remoteTaskManager.startTask1(prototypeId);
+        if (!success) {
+            setResult(t("taskRunFail", { ns: "devMode", defaultValue: "Не удалось запустить задачу" }));
+            setExecutionTime(Date.now() - start);
+            setLoading(false);
+        }
+        const newSubscriptionId = await addSubscription({
+            tag: "python_task_progress_event",
+            taskId: newTaskId,
+        });
+        setTaskId(newTaskId);
+        setSubscriptionId(newSubscriptionId);
+        const onNotification = ({ data }) => {
+            if (data?.taskId === newTaskId) {
+                setResult(`${data ? `${data}\n` : ""}${data.log || ""}`);
+                setError(null);
+                setExecutionTime(Date.now() - start);
+                setLoading(false);
+                setTaskId([api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status)
+                    ? undefined
+                    : newTaskId);
+                setSubscriptionId([api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status)
+                    ? undefined
+                    : newSubscriptionId);
+                if ([api.RemoteTaskStatus.Completed, api.RemoteTaskStatus.Error].includes(data.status)) {
+                    unsubscribeById(newSubscriptionId);
+                    connection.off(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
+                }
+            }
+        };
+        connection.on(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
+    }, [api$1, connection, addSubscription, unsubscribeById, reset]);
+    const stopTask = React.useCallback(async () => {
+        await api$1.remoteTaskManager.stop(taskId);
+        reset();
+        unsubscribeById(subscriptionId);
+    }, [api$1, reset, unsubscribeById, taskId, subscriptionId]);
+    return { runTask, stopTask, result, error, loading, executionTime };
+};
+
 const useAppHeight = () => {
     React.useEffect(() => {
         const setAppHeight = () => {
@@ -6637,6 +6721,98 @@ const ExportPdfContainer = React.memo(({ type, elementConfig }) => {
     return (jsxRuntime.jsx(Container, { id: id, style: style, children: jsxRuntime.jsx(uilibGl.IconButton, { kind: icon || "download", primary: true, disabled: loading, onClick: onExport, children: title ?? t("downloadPdf", { ns: "dashboard", defaultValue: "Скачать PDF" }) }) }));
 });
 
+const UploaderContainer = styled(Container) `
+  ${uilibGl.UploaderItemArea} {
+    overflow: visible;
+    padding-top: 1rem;
+    padding-bottom: 1rem;
+  }
+  
+  ${uilibGl.UploaderTitleWrapper} {
+    top: 0;
+    padding-top: 0;
+    border: 0;
+  }
+`;
+const UploaderTitle = styled(uilibGl.Flex) `
+  flex-direction: column;
+  align-items: center;
+  width: 11rem;
+  margin: 0 auto;
+  text-align: center;
+  font-size: 0.625rem;
+  color: ${({ theme: { palette } }) => palette.textSecondary};
+  
+  span[kind] {
+    width: 1.5rem;
+    height: 1.5rem;
+    margin-bottom: 0.75rem;
+    
+    :after {
+      font-size: 1.5rem;
+      color: ${({ theme: { palette } }) => palette.textSecondary};
+      opacity: 0.12;
+    }
+  }
+`;
+
+const DEFAULT_FILE_EXTENSIONS = ".txt,.csv,.py";
+const UploadContainer = React.memo(({ type, elementConfig, renderElement }) => {
+    const { t, api } = useGlobalContext();
+    const { changeFilters } = useWidgetContext(type);
+    const [files, setFiles] = React.useState([]);
+    const refInput = React.useRef();
+    const { id, style, options } = elementConfig || {};
+    const { icon, title, filterName, fileExtensions = DEFAULT_FILE_EXTENSIONS, parentResourceId, multiSelect } = options || {};
+    const onUpload = React.useCallback(async (input) => {
+        const files = Array.isArray(input) ? input : [input];
+        const response = await Promise.all(files.map(file => {
+            return api.file.upload(file, true, parentResourceId);
+        }));
+        const uploadedFiles = response.map(item => ({
+            name: item.name,
+            id: item.resourceId,
+            done: true,
+        }));
+        setFiles(currentFiles => ([...uploadedFiles, ...currentFiles]));
+    }, [parentResourceId]);
+    const onDelete = React.useCallback(async (id) => {
+        const index = files.findIndex(file => file.id === id);
+        if (index === -1)
+            return;
+        const resourceId = files[index].id;
+        await api.file.deleteResource(resourceId);
+        setFiles(currentFiles => currentFiles.filter(({ id }) => id !== resourceId));
+    }, [files]);
+    const renderTitle = React.useMemo(() => {
+        if (files.length)
+            return null;
+        return (jsxRuntime.jsxs(UploaderTitle, { children: [jsxRuntime.jsx(uilibGl.Icon, { kind: icon || "upload" }), jsxRuntime.jsx("div", { children: title ?? t("uploadTitle", {
+                        ns: "dashboard",
+                        defaultValue: "Перетащите файл сюда или нажмите, чтобы выбрать",
+                    }) })] }));
+    }, [icon, t, title, files.length]);
+    React.useEffect(() => {
+        if (!filterName)
+            return;
+        changeFilters({ [filterName]: { value: files.map(({ id }) => id) } });
+    }, [files]);
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), jsxRuntime.jsx(UploaderContainer, { id: id, style: style, children: jsxRuntime.jsx(uilibGl.Uploader, { title: renderTitle, accept: fileExtensions, fileItems: files, currentRef: refInput, isMultiple: multiSelect, onUpload: onUpload, onDelete: onDelete }) })] }));
+});
+
+const TaskContainer = React.memo(({ elementConfig }) => {
+    const { t } = useGlobalContext();
+    const { runTask, error, result, executionTime, loading } = usePythonTask();
+    const { options } = elementConfig || {};
+    const { title, relatedResources } = options || {};
+    const onClick = React.useCallback(async () => {
+        await Promise.all(relatedResources.map(({ resourceId, parameters, script }) => {
+            return runTask({ resourceId, parameters, script });
+        }));
+    }, [relatedResources, runTask]);
+    return (jsxRuntime.jsx(uilibGl.WaitingButton, { primary: true, isWaiting: loading, disabled: !relatedResources?.length, onClick: onClick, children: title || t("run", { ns: "dashboard", defaultValue: "Запуск" }) }));
+});
+
 const containerComponents = {
     [exports.ContainerTemplate.DefaultAttributes]: DefaultAttributesContainer,
     [exports.ContainerTemplate.Pages]: PagesContainer,
@@ -6658,6 +6834,8 @@ const containerComponents = {
     [exports.ContainerTemplate.AddFeature]: AddFeatureContainer,
     [exports.ContainerTemplate.Divider]: DividerContainer,
     [exports.ContainerTemplate.ExportPdf]: ExportPdfContainer,
+    [exports.ContainerTemplate.Upload]: UploadContainer,
+    [exports.ContainerTemplate.Task]: TaskContainer,
     default: ContainersGroupContainer,
 };
 
@@ -10699,6 +10877,7 @@ exports.PresentationPanelWrapper = PresentationPanelWrapper;
 exports.PresentationWrapper = PresentationWrapper;
 exports.ProgressContainer = ProgressContainer;
 exports.RoundedBackgroundContainer = RoundedBackgroundContainer;
+exports.SERVER_NOTIFICATION_EVENT = SERVER_NOTIFICATION_EVENT;
 exports.ServerNotificationsContext = ServerNotificationsContext;
 exports.ServerNotificationsProvider = ServerNotificationsProvider;
 exports.SlideshowContainer = SlideshowContainer;
@@ -10717,6 +10896,7 @@ exports.TitleContainer = TitleContainer;
 exports.TopContainer = TopContainer;
 exports.TopContainerButtons = TopContainerButtons;
 exports.TwoColumnContainer = TwoColumnContainer;
+exports.UploadContainer = UploadContainer;
 exports.addDataSource = addDataSource;
 exports.addDataSources = addDataSources;
 exports.applyFiltersToCondition = applyFiltersToCondition;
@@ -10825,6 +11005,7 @@ exports.useLayerParams = useLayerParams;
 exports.useMapContext = useMapContext;
 exports.useMapDraw = useMapDraw;
 exports.useProjectDashboardInit = useProjectDashboardInit;
+exports.usePythonTask = usePythonTask;
 exports.useRedrawLayer = useRedrawLayer;
 exports.useRelatedDataSourceAttributes = useRelatedDataSourceAttributes;
 exports.useRenderElement = useRenderElement;