@evergis/react 4.0.41 → 4.0.43

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

@@ -177,7 +177,7 @@ export interface ConfigOptions {
 export interface ConfigDataSource {
     name: string;
     alias?: string;
-    condition?: string;
+    condition?: string | string[];
     ds?: string;
     layerName?: string;
     limit?: number;
@@ -228,7 +228,7 @@ export interface SelectedFilter {
 export interface ConfigLayer {
     name: string;
     opacity?: number;
-    condition?: string;
+    condition?: string | string[];
     query?: string;
     parameters?: Record<string, any>;
     geometries?: Array<any>;
@@ -241,6 +241,7 @@ export interface ConfigLayer {
     maxZoomTo?: number;
     hiddenAttributes?: string[];
     customFeatureSelect?: CustomFeatureSelect;
+    disableDrag?: boolean;
 }
 export interface ConfigTask {
     name: string;

package/dist/components/Dashboard/utils/formatDataSourceCondition.d.ts

@@ -17,12 +17,15 @@ export declare const applyVarsToCondition: <T extends string | string[]>({ secti
     geometry?: string;
     isSetParams?: boolean;
 }) => T;
-export declare const formatDataSourceCondition: ({ condition, configFilters, filters, attributes, eqlParameters, layerParams, geometry, }: {
-    condition?: string;
+type FormatDataSourceConditionParams = {
     configFilters?: ConfigFilter[];
     filters: SelectedFilters;
     attributes?: ClientFeatureAttribute[];
     eqlParameters?: QueryLayerServiceConfigurationDc["eqlParameters"];
     layerParams?: Record<string, string>;
     geometry?: string;
-}) => string;
+};
+export declare const formatDataSourceCondition: ({ condition, ...rest }: FormatDataSourceConditionParams & {
+    condition?: string | string[];
+}) => string | string[];
+export {};

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

@@ -1,4 +1,5 @@
 import { ProjectContentItemDc } from '@evergis/api';
+import { DraggableTreeNode } from '@evergis/uilib-gl';
 import { ConfigLayer } from '../Dashboard';
 export declare const LayersListWrapper: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
 export declare const LayerListContainer: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
@@ -9,4 +10,5 @@ export interface LayerItemProps {
 export interface LayerTreeProps {
     layers: ConfigLayer[];
     onlyMainTools?: boolean;
+    onUpdate?: (updatedNodes: DraggableTreeNode[]) => void;
 }

package/dist/components/LayerTree/utils/createTreeNode.d.ts

@@ -2,4 +2,8 @@ import { FC } from 'react';
 import { DraggableTreeNode } from '@evergis/uilib-gl';
 import { ProjectContentItemDc } from '@evergis/api';
 import { LayerItemProps } from '../types';
-export declare const createTreeNode: (layer: ProjectContentItemDc, Component: FC<LayerItemProps>, onlyMainTools?: boolean) => DraggableTreeNode;
+type CreateTreeNodeLayer = ProjectContentItemDc & {
+    disableDrag?: boolean;
+};
+export declare const createTreeNode: (layer: CreateTreeNodeLayer, Component: FC<LayerItemProps>, onlyMainTools?: boolean) => DraggableTreeNode;
+export {};

package/dist/components/LayerTree/utils/treeNodesToProjectItems.d.ts

@@ -1,3 +1,3 @@
 import { ProjectContentItemDc } from '@evergis/api';
 import { DraggableTreeNode } from '@evergis/uilib-gl';
-export declare const treeNodesToProjectItems: (currentProjectItems?: ProjectContentItemDc[], treeNodes?: DraggableTreeNode[]) => any;
+export declare const treeNodesToProjectItems: (currentProjectItems?: ProjectContentItemDc[], treeNodes?: DraggableTreeNode[]) => any[];

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

@@ -3,3 +3,5 @@ export declare const SERVER_NOTIFICATION_EVENT: {
     PythonProgressNotification: string;
     PythonSandboxStats: string;
 };
+export declare const POLL_SUBTASK_INTERVAL_MS = 500;
+export declare const POLL_SUBTASK_TIMEOUT_MS = 15000;

package/dist/hooks/task/utils/pollSubtaskCompletion.d.ts

@@ -0,0 +1,15 @@
+import { SubTasksDto } from '@evergis/api';
+interface RemoteTaskManagerLike {
+    get(id: string): Promise<SubTasksDto[]>;
+}
+interface ApiLike {
+    remoteTaskManager: RemoteTaskManagerLike;
+}
+interface PollSubtaskCompletionOptions {
+    taskId: string;
+    api: ApiLike;
+    intervalMs?: number;
+    timeoutMs?: number;
+}
+export declare const pollSubtaskCompletion: ({ taskId, api, intervalMs, timeoutMs, }: PollSubtaskCompletionOptions) => Promise<SubTasksDto | null>;
+export {};

package/dist/index.js

@@ -11,8 +11,7 @@ var color$1 = require('@evergis/color');
 var turf = require('@turf/turf');
 var dateFns = require('date-fns');
 var lodash = require('lodash');
-var ru = require('date-fns/locale/ru');
-var enUS = require('date-fns/locale/en-US');
+var locale = require('date-fns/locale');
 var signalr = require('@microsoft/signalr');
 var findAnd = require('find-and');
 var jspdf = require('jspdf');
@@ -3705,7 +3704,7 @@ exports.ScalingFactor = void 0;
     ScalingFactor[ScalingFactor["Acres"] = 0.01] = "Acres";
     ScalingFactor[ScalingFactor["Hectares"] = 0.0001] = "Hectares";
 })(exports.ScalingFactor || (exports.ScalingFactor = {}));
-const formatDate = (str, isRuLocale) => dateFns.format(Date.now(), str, { locale: isRuLocale ? ru.ru : enUS.enUS });
+const formatDate = (str, isRuLocale) => dateFns.format(Date.now(), str, { locale: isRuLocale ? locale.ru : locale.enUS });
 const timeOptions = [
     {
         text: formatDate("kk:mm:ss"),
@@ -3816,7 +3815,7 @@ const formatDateValue = (stringFormat, dateValue) => {
     const dateOptionValue = dateOption && dateOption.value;
     const dateFormat = value && dateOptionValue
         ? dateFns.format(value, dateOptionValue, {
-            locale: ru.ru,
+            locale: locale.ru,
         })
         : "";
     const timeOption = getValueFromOptions(timeOptions, stringFormat.format);
@@ -4704,10 +4703,7 @@ const applyVarsToCondition = ({ section, configFilters, filters, attributes, lay
     });
     return isSingle ? result?.[0] : result;
 };
-const formatDataSourceCondition = ({ condition, configFilters, filters, attributes, eqlParameters, layerParams, geometry, }) => {
-    if (!condition) {
-        return "";
-    }
+const formatSingleCondition = (condition, { configFilters, filters, attributes, eqlParameters, layerParams, geometry }) => {
     const setParams = condition.match(new RegExp("\\$\\([^)]+\\)", "g"));
     const setParamsSection = applyVarsToCondition({
         section: setParams,
@@ -4736,6 +4732,15 @@ const formatDataSourceCondition = ({ condition, configFilters, filters, attribut
             ? setParamsSection.join("")
             : conditionSection.join(splitter);
 };
+const formatDataSourceCondition = ({ condition, ...rest }) => {
+    if (Array.isArray(condition)) {
+        return condition.map(item => formatSingleCondition(item, rest));
+    }
+    if (!condition) {
+        return "";
+    }
+    return formatSingleCondition(condition, rest);
+};
 
 const DashboardChipsContainer = styled(uilibGl.Flex) `
   flex-wrap: wrap;
@@ -5100,7 +5105,7 @@ const useMapImages = ({ images }) => {
         else {
             // PNG/другие форматы: используем стандартную загрузку Mapbox
             return new Promise((resolve, reject) => {
-                map.current.loadImage(config.url).then((image) => {
+                map.current.loadImage(config.url).then(image => {
                     if (image) {
                         map.current.addImage(config.name, image, {
                             sdf,
@@ -5489,6 +5494,8 @@ const SERVER_NOTIFICATION_EVENT = {
     PythonProgressNotification: "ReceivePythonProgressNotification",
     PythonSandboxStats: "ReceivePythonSandboxStatsNotification",
 };
+const POLL_SUBTASK_INTERVAL_MS = 500;
+const POLL_SUBTASK_TIMEOUT_MS = 15_000;
 
 const usePythonSandbox = () => {
     const { api } = useGlobalContext();
@@ -5500,6 +5507,25 @@ const usePythonSandbox = () => {
     return { preparePythonSandbox };
 };
 
+const FINAL_STATUSES = [
+    api.RemoteTaskStatus.Completed,
+    api.RemoteTaskStatus.Error,
+    api.RemoteTaskStatus.Interrupted,
+    api.RemoteTaskStatus.Timeout,
+];
+const wait = (ms) => new Promise(resolve => window.setTimeout(resolve, ms));
+const pollSubtaskCompletion = async ({ taskId, api, intervalMs = POLL_SUBTASK_INTERVAL_MS, timeoutMs = POLL_SUBTASK_TIMEOUT_MS, }) => {
+    const deadline = Date.now() + timeoutMs;
+    let subTask = (await api.remoteTaskManager.get(taskId))?.[0] ?? null;
+    while (subTask && !FINAL_STATUSES.includes(subTask.status)) {
+        if (Date.now() >= deadline)
+            return null;
+        await wait(intervalMs);
+        subTask = (await api.remoteTaskManager.get(taskId))?.[0] ?? null;
+    }
+    return subTask;
+};
+
 const usePythonTask = () => {
     const { api: api$1, t } = useGlobalContext();
     const { addSubscription, connection, unsubscribeById } = useServerNotificationsContext();
@@ -5576,8 +5602,24 @@ const usePythonTask = () => {
                     connection.off(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
                 }
                 if (data.status === api.RemoteTaskStatus.Completed) {
-                    const subTasks = await api$1.remoteTaskManager.get(newTaskId);
-                    setResult(subTasks?.[0]?.results?.response ?? null);
+                    try {
+                        const subTask = await pollSubtaskCompletion({ taskId: newTaskId, api: api$1 });
+                        if (subTask?.status === api.RemoteTaskStatus.Completed) {
+                            const response = subTask.results?.response;
+                            setResult(typeof response === "object" && response !== null
+                                ? response
+                                : null);
+                        }
+                        else {
+                            setError(new Error(t("taskResultUnavailable", {
+                                ns: "devMode",
+                                defaultValue: "Не удалось получить результат задачи",
+                            })));
+                        }
+                    }
+                    catch (e) {
+                        setError(e instanceof Error ? e : new Error(String(e)));
+                    }
                 }
             }
         };
@@ -5696,6 +5738,7 @@ const createTreeNode = (layer, Component, onlyMainTools) => {
         id: layer.name,
         children: layer.children?.map(child => createTreeNode(child, Component, onlyMainTools)),
         isExpanded: layer.isExpanded,
+        disableDrag: layer.disableDrag,
         render: (node) => {
             return layer.children ? (jsxRuntime.jsx(LayerGroup, { group: {
                     ...layer,
@@ -5710,21 +5753,30 @@ const treeNodesToProjectItems = (currentProjectItems, treeNodes) => {
         return currentProjectItems;
     }
     const combineProjectItems = (nodes) => {
-        return nodes.map(node => {
-            return {
-                ...findAnd.returnFound(currentProjectItems, { name: node.id }),
+        return nodes.reduce((result, node) => {
+            const original = findAnd.returnFound(currentProjectItems, { name: node.id });
+            if (!original) {
+                return result;
+            }
+            result.push({
+                ...original,
                 children: node.children ? combineProjectItems(node.children) : undefined,
-            };
-        });
+            });
+            return result;
+        }, []);
     };
     return combineProjectItems(treeNodes);
 };
 
-const LayerTree = ({ layers, onlyMainTools }) => {
+const LayerTree = ({ layers, onlyMainTools, onUpdate: externalOnUpdate }) => {
     const { projectInfo, updateProject, components: { LayerItem } } = useWidgetContext();
     const { pageIndex } = useWidgetPage();
     const nodes = React.useMemo(() => layers?.map(layer => createTreeNode(layer, LayerItem, onlyMainTools)), [LayerItem, layers, onlyMainTools]);
     const onUpdate = React.useCallback((updatedNodes) => {
+        if (externalOnUpdate) {
+            externalOnUpdate(updatedNodes);
+            return;
+        }
         const newProjectInfo = JSON.parse(JSON.stringify(projectInfo));
         const page = getPagesFromProjectInfo(newProjectInfo)?.[pageIndex - 1];
         if (!page) {
@@ -5732,7 +5784,7 @@ const LayerTree = ({ layers, onlyMainTools }) => {
         }
         page.layers = treeNodesToProjectItems(page.layers, updatedNodes);
         updateProject(newProjectInfo);
-    }, [pageIndex, projectInfo, updateProject]);
+    }, [externalOnUpdate, pageIndex, projectInfo, updateProject]);
     return (jsxRuntime.jsx(uilibGl.DraggableTree, { nodes: nodes, disableDrag: onlyMainTools, options: { pastePlaceholderHeight: "0.025rem" }, onUpdate: onUpdate }));
 };
 
@@ -10983,6 +11035,7 @@ const useDashboardHeader = () => {
 };
 
 /* eslint-disable max-lines */
+const toConditionsArray = (value) => Array.isArray(value) ? value : value ? [value] : [];
 const useDataSources = ({ type: widgetType, config, attributes, filters, layerParams, eqlParameters, }) => {
     const { ewktGeometry, api } = useGlobalContext();
     const { dataSources, layerInfo } = useWidgetContext(widgetType);
@@ -11059,24 +11112,25 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                 attributes: descriptionResponse,
             };
         }
+        const formatted = condition
+            ? formatDataSourceCondition({
+                condition,
+                configFilters,
+                filters: selectedFilters,
+                geometry: ewktGeometry,
+                attributes,
+                layerParams,
+                eqlParameters,
+            })
+            : undefined;
         return api.layers.getFeatures(layerName, {
             offset,
             limit: limit || DEFAULT_DATA_SOURCE_LIMIT,
             withGeom: false,
             parameters: newParams,
             conditions: lodash.isEmpty(parameters) && condition
-                ? [
-                    formatDataSourceCondition({
-                        condition,
-                        configFilters,
-                        filters: selectedFilters,
-                        geometry: ewktGeometry,
-                        attributes,
-                        layerParams,
-                        eqlParameters,
-                    }),
-                ]
-                : [condition, query].filter(Boolean),
+                ? toConditionsArray(formatted)
+                : [...toConditionsArray(condition), query].filter(Boolean),
         });
     }, [
         filters,
@@ -11088,6 +11142,8 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
         api.eql,
         attributes,
         layerParams,
+        layerInfo,
+        projectDataSources,
         eqlParameters,
     ]);
     const getUpdatingDataSources = React.useCallback(() => {
@@ -12547,6 +12603,8 @@ exports.NO_CONTENT_VALUE = NO_CONTENT_VALUE;
 exports.NUMERIC_ATTRIBUTE_TYPES = NUMERIC_ATTRIBUTE_TYPES;
 exports.NoLiveSnapshotContainer = NoLiveSnapshotContainer;
 exports.OneColumnContainer = OneColumnContainer;
+exports.POLL_SUBTASK_INTERVAL_MS = POLL_SUBTASK_INTERVAL_MS;
+exports.POLL_SUBTASK_TIMEOUT_MS = POLL_SUBTASK_TIMEOUT_MS;
 exports.PROVIDER_PREFIX = PROVIDER_PREFIX;
 exports.PageNavigator = PageNavigator;
 exports.PageTitle = PageTitle;