@evergis/react 4.0.41 → 4.0.43

package/dist/react.esm.js

@@ -9,8 +9,7 @@ import { Color as Color$1 } from '@evergis/color';
 import { multiPolygon, polygon, multiLineString, lineString, multiPoint, point as point$1, bbox } from '@turf/turf';
 import { isValid, format, parseJSON, parseISO, toDate } from 'date-fns';
 import { isNil, uniqueId, isEmpty, isEqual, unescape } from 'lodash';
-import { ru } from 'date-fns/locale/ru';
-import { enUS } from 'date-fns/locale/en-US';
+import { ru, enUS } from 'date-fns/locale';
 import { HubConnectionBuilder, HttpTransportType, LogLevel } from '@microsoft/signalr';
 import { changeProps, returnFound } from 'find-and';
 import { jsPDF } from 'jspdf';
@@ -4702,10 +4701,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,
@@ -4734,6 +4730,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(Flex) `
   flex-wrap: wrap;
@@ -5098,7 +5103,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,
@@ -5487,6 +5492,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();
@@ -5498,6 +5505,25 @@ const usePythonSandbox = () => {
     return { preparePythonSandbox };
 };
 
+const FINAL_STATUSES = [
+    RemoteTaskStatus.Completed,
+    RemoteTaskStatus.Error,
+    RemoteTaskStatus.Interrupted,
+    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, t } = useGlobalContext();
     const { addSubscription, connection, unsubscribeById } = useServerNotificationsContext();
@@ -5574,8 +5600,24 @@ const usePythonTask = () => {
                     connection.off(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
                 }
                 if (data.status === RemoteTaskStatus.Completed) {
-                    const subTasks = await api.remoteTaskManager.get(newTaskId);
-                    setResult(subTasks?.[0]?.results?.response ?? null);
+                    try {
+                        const subTask = await pollSubtaskCompletion({ taskId: newTaskId, api });
+                        if (subTask?.status === 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)));
+                    }
                 }
             }
         };
@@ -5694,6 +5736,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 ? (jsx(LayerGroup, { group: {
                     ...layer,
@@ -5708,21 +5751,30 @@ const treeNodesToProjectItems = (currentProjectItems, treeNodes) => {
         return currentProjectItems;
     }
     const combineProjectItems = (nodes) => {
-        return nodes.map(node => {
-            return {
-                ...returnFound(currentProjectItems, { name: node.id }),
+        return nodes.reduce((result, node) => {
+            const original = 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 = useMemo(() => layers?.map(layer => createTreeNode(layer, LayerItem, onlyMainTools)), [LayerItem, layers, onlyMainTools]);
     const onUpdate = useCallback((updatedNodes) => {
+        if (externalOnUpdate) {
+            externalOnUpdate(updatedNodes);
+            return;
+        }
         const newProjectInfo = JSON.parse(JSON.stringify(projectInfo));
         const page = getPagesFromProjectInfo(newProjectInfo)?.[pageIndex - 1];
         if (!page) {
@@ -5730,7 +5782,7 @@ const LayerTree = ({ layers, onlyMainTools }) => {
         }
         page.layers = treeNodesToProjectItems(page.layers, updatedNodes);
         updateProject(newProjectInfo);
-    }, [pageIndex, projectInfo, updateProject]);
+    }, [externalOnUpdate, pageIndex, projectInfo, updateProject]);
     return (jsx(DraggableTree, { nodes: nodes, disableDrag: onlyMainTools, options: { pastePlaceholderHeight: "0.025rem" }, onUpdate: onUpdate }));
 };
 
@@ -10981,6 +11033,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);
@@ -11057,24 +11110,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: 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,
@@ -11086,6 +11140,8 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
         api.eql,
         attributes,
         layerParams,
+        layerInfo,
+        projectDataSources,
         eqlParameters,
     ]);
     const getUpdatingDataSources = useCallback(() => {
@@ -12423,5 +12479,5 @@ const Map$1 = ({ zIndex, lowerSiblings, upperSiblings, onError, children, ...res
                 }, children: children }), upperSiblings] }));
 };
 
-export { AddFeatureButton, AddFeatureContainer, AlertIconContainer, AttributeGalleryContainer, AttributeLabel, BASE_CONTAINER_STYLE, BaseMapTheme, CONFIG_PAGES_ID, CONFIG_PAGE_ID, CameraContainer, Chart, ChartContainer, ChartLegend, ChartLoading, Container, ContainerChildren, ContainerLoading, ContainerTemplate, ContainerWrapper, ContainersGroupContainer, DEFAULT_ATTRIBUTE_NAME, DEFAULT_BARCHART_RADIUS, DEFAULT_BASE_MAP, DEFAULT_CHART_ANGLE, DEFAULT_CHART_HEIGHT, DEFAULT_CHART_WIDTH, DEFAULT_CIRCLE_PAINT, DEFAULT_DASHBOARD_CONFIG, DEFAULT_DATA_SOURCE_LIMIT, DEFAULT_DROPDOWN_WIDTH, DEFAULT_FILL_EXTRUSION_PAINT, DEFAULT_FILL_PAINT, DEFAULT_FILTER_PADDING, DEFAULT_ID_ATTRIBUTE_NAME, DEFAULT_LAT, DEFAULT_LINE_PAINT, DEFAULT_LNG, DEFAULT_PAGES_CONFIG, DEFAULT_PIECHART_RADIUS, DEFAULT_ZOOM, Dashboard, DashboardCheckbox, DashboardChip, DashboardContent, DashboardContext, DashboardDefaultHeader, DashboardHeader, DashboardLoading, DashboardPlaceholder, DashboardPlaceholderWrap, DashboardProvider, DashboardWrapper, DataSourceContainer, DataSourceError, DataSourceErrorContainer, DataSourceInnerContainer, DataSourceProgressContainer, DateFormat, DefaultAttributesContainer, DefaultHeaderContainer, DefaultHeaderWrapper, DividerContainer, EditGeometryType, ElementButton, ElementCamera, ElementChart, ElementChips, ElementControl, ElementIcon, ElementImage, ElementLegend, ElementLink, ElementMarkdown, ElementSlideshow, ElementSvg, ElementTooltip, ElementValueWrapper, ExpandableTitle, FEATURE_CARD_DEFAULT_COLORS, FEATURE_CARD_OTHER_COLOR, FILTERED_VALUE_OPACITY, FILTER_PREFIX, FeatureCardButtons, FeatureCardContext, FeatureCardDefaultHeader, FeatureCardGradientHeader, FeatureCardHeader, FeatureCardIconHeader, FeatureCardProvider, FeatureCardSlideshowHeader, FeatureCardTitle, FeatureControls, FeatureTitleContainer, FiltersContainer, GEOMETRY_ATTRIBUTE, GlobalContext, GlobalProvider, Header, HeaderContainer, HeaderFrontView, HeaderTemplate, HeaderTitleContainer, HiddenTitleItems, IconContainer, ImageContainer, LEFT_PANEL_HEADER_HEIGHT, Layer, LayerDescription, LayerGroup, LayerGroupList, LayerIcon, LayerIconContainer, LayerListContainer, LayerTree, LayersContainer, LayersListWrapper, LinearProgressContainer, LogTerminal, LogoContainer, MAX_CHART_WIDTH, Map$1 as Map, MapContext, MapProvider, NO_CONTENT_VALUE, NUMERIC_ATTRIBUTE_TYPES, NoLiveSnapshotContainer, OneColumnContainer, PROVIDER_PREFIX, PageNavigator, PageTitle, PageTitleContainer, PagesContainer, Pagination, PresentationHeader, PresentationHeaderButtons, PresentationHeaderTools, PresentationPanelContainer, PresentationPanelWrapper, PresentationWrapper, ProgressContainer, ProviderPrefix, RoundedBackgroundContainer, SERVER_NOTIFICATION_EVENT, STACK_BAR_TOTAL_HEIGHT, ScalingFactor, ServerNotificationsContext, ServerNotificationsProvider, SlideshowContainer, SmallPreviewContainer$1 as SmallPreviewContainer, SmallPreviewControl, SmallPreviewCounter, SmallPreviewImages, SmallPreviewLeft, SmallPreviewRight, StackBar, SvgImage, TIME_ZONE_FORMAT, TabsContainer, TextTrim, ThemeName, TitleContainer, TopContainer, TopContainerButtons, TwoColumnContainer, UploadContainer, WidgetType, addDataSource, addDataSources, adjustColor, applyFiltersToCondition, applyQueryFilters, applyVarsToCondition, checkEqualOrIncludes, checkIsLoading, convertSpToTurfFeature, createConfigLayer, createConfigPage, createNewPageId, createTreeNode, dateOptions, debounce, decimalOpacityToHex, eqlParametersToPayload, findAttributeInExpression, formatArea, formatAttributeValue, formatChartRelatedValue, formatConditionValue, formatDataSourceCondition, formatDate$1 as formatDate, formatElementValue, formatLength, formatNumber, formatPolygonMeasure, getActualExtrusionHeight, getAttributeByName, getAttributeValue, getAttributesConfiguration, getChartAxes, getChartFilterName, getChartMarkers, getConfigFilter, getContainerComponent, getDashboardHeader, getDataFromAttributes, getDataFromRelatedFeatures, getDataSource, getDataSourceFilterValue, getDate, getDefaultConfig, getElementValue, getFeatureAttributes, getFeatureCardHeader, getFilterComponent, getFilterSelectedItems, getFilterValue, getFormattedAttributes, getGradientColors, getLayerInfo, getLayerInfoFromDataSources, getPagesFromConfig, getPagesFromProjectInfo, getProxyService, getRelatedAttribute, getRenderElement, getResourceUrl, getRootElementId, getSelectedFilterValue, getSlideshowImages, getSvgUrl, getTemplateNameFromAttribute, getTotalFromAttributes, getTotalFromRelatedFeatures, hexToRgba, isCompositeLayerConfiguration, isEmptyElementValue, isEmptyValue, isHiddenEmptyValue, isLayerService, isNotValidSelectedTab, isNumeric, isObject, isProxyService, isVisibleContainer, metersPerPixel, numberOptions, parseClientStyle, parseIconNames, parseIconNamesFromClientStyle, pieChartTooltipFromAttributes, pieChartTooltipFromRelatedFeatures, pointOptions, removeDataSource, rgbToHex, roundTotalSum, sliceShownOtherItems, timeOptions, tooltipNameFromAttributes, tooltipValueFromAttributes, tooltipValueFromRelatedFeatures, transparentizeColor, treeNodesToProjectItems, updateDataSource, useAppHeight, useAutoCompleteControl, useChartChange, useChartData, useCurrentPageLayers, useCustomFeatureSelect, useDashboardHeader, useDataSources, useDebouncedCallback, useDiffPage, useExpandableContainers, useExportPdf, useFetchImageWithAuth, useFetchWithAuth, useGetConfigLayer, useGlobalContext, useHeaderRender, useHideIfEmptyDataSource, useIconsFromLayers, useLayerHiddenAttributes, useLayerParams, useMapContext, useMapDraw, useMapImages, useMaxZoomTo, useProjectDashboardInit, usePythonSandbox, usePythonTask, useRedrawLayer, useRelatedDataSourceAttributes, useRenderElement, useServerNotificationsContext, useShownOtherItems, useToggle, useUpdateDataSource, useVisibleProjectItems, useWidgetConfig, useWidgetContext, useWidgetFilters, useWidgetPage, useWindowResize, useZoomToFeatures, useZoomToPoint };
+export { AddFeatureButton, AddFeatureContainer, AlertIconContainer, AttributeGalleryContainer, AttributeLabel, BASE_CONTAINER_STYLE, BaseMapTheme, CONFIG_PAGES_ID, CONFIG_PAGE_ID, CameraContainer, Chart, ChartContainer, ChartLegend, ChartLoading, Container, ContainerChildren, ContainerLoading, ContainerTemplate, ContainerWrapper, ContainersGroupContainer, DEFAULT_ATTRIBUTE_NAME, DEFAULT_BARCHART_RADIUS, DEFAULT_BASE_MAP, DEFAULT_CHART_ANGLE, DEFAULT_CHART_HEIGHT, DEFAULT_CHART_WIDTH, DEFAULT_CIRCLE_PAINT, DEFAULT_DASHBOARD_CONFIG, DEFAULT_DATA_SOURCE_LIMIT, DEFAULT_DROPDOWN_WIDTH, DEFAULT_FILL_EXTRUSION_PAINT, DEFAULT_FILL_PAINT, DEFAULT_FILTER_PADDING, DEFAULT_ID_ATTRIBUTE_NAME, DEFAULT_LAT, DEFAULT_LINE_PAINT, DEFAULT_LNG, DEFAULT_PAGES_CONFIG, DEFAULT_PIECHART_RADIUS, DEFAULT_ZOOM, Dashboard, DashboardCheckbox, DashboardChip, DashboardContent, DashboardContext, DashboardDefaultHeader, DashboardHeader, DashboardLoading, DashboardPlaceholder, DashboardPlaceholderWrap, DashboardProvider, DashboardWrapper, DataSourceContainer, DataSourceError, DataSourceErrorContainer, DataSourceInnerContainer, DataSourceProgressContainer, DateFormat, DefaultAttributesContainer, DefaultHeaderContainer, DefaultHeaderWrapper, DividerContainer, EditGeometryType, ElementButton, ElementCamera, ElementChart, ElementChips, ElementControl, ElementIcon, ElementImage, ElementLegend, ElementLink, ElementMarkdown, ElementSlideshow, ElementSvg, ElementTooltip, ElementValueWrapper, ExpandableTitle, FEATURE_CARD_DEFAULT_COLORS, FEATURE_CARD_OTHER_COLOR, FILTERED_VALUE_OPACITY, FILTER_PREFIX, FeatureCardButtons, FeatureCardContext, FeatureCardDefaultHeader, FeatureCardGradientHeader, FeatureCardHeader, FeatureCardIconHeader, FeatureCardProvider, FeatureCardSlideshowHeader, FeatureCardTitle, FeatureControls, FeatureTitleContainer, FiltersContainer, GEOMETRY_ATTRIBUTE, GlobalContext, GlobalProvider, Header, HeaderContainer, HeaderFrontView, HeaderTemplate, HeaderTitleContainer, HiddenTitleItems, IconContainer, ImageContainer, LEFT_PANEL_HEADER_HEIGHT, Layer, LayerDescription, LayerGroup, LayerGroupList, LayerIcon, LayerIconContainer, LayerListContainer, LayerTree, LayersContainer, LayersListWrapper, LinearProgressContainer, LogTerminal, LogoContainer, MAX_CHART_WIDTH, Map$1 as Map, MapContext, MapProvider, NO_CONTENT_VALUE, NUMERIC_ATTRIBUTE_TYPES, NoLiveSnapshotContainer, OneColumnContainer, POLL_SUBTASK_INTERVAL_MS, POLL_SUBTASK_TIMEOUT_MS, PROVIDER_PREFIX, PageNavigator, PageTitle, PageTitleContainer, PagesContainer, Pagination, PresentationHeader, PresentationHeaderButtons, PresentationHeaderTools, PresentationPanelContainer, PresentationPanelWrapper, PresentationWrapper, ProgressContainer, ProviderPrefix, RoundedBackgroundContainer, SERVER_NOTIFICATION_EVENT, STACK_BAR_TOTAL_HEIGHT, ScalingFactor, ServerNotificationsContext, ServerNotificationsProvider, SlideshowContainer, SmallPreviewContainer$1 as SmallPreviewContainer, SmallPreviewControl, SmallPreviewCounter, SmallPreviewImages, SmallPreviewLeft, SmallPreviewRight, StackBar, SvgImage, TIME_ZONE_FORMAT, TabsContainer, TextTrim, ThemeName, TitleContainer, TopContainer, TopContainerButtons, TwoColumnContainer, UploadContainer, WidgetType, addDataSource, addDataSources, adjustColor, applyFiltersToCondition, applyQueryFilters, applyVarsToCondition, checkEqualOrIncludes, checkIsLoading, convertSpToTurfFeature, createConfigLayer, createConfigPage, createNewPageId, createTreeNode, dateOptions, debounce, decimalOpacityToHex, eqlParametersToPayload, findAttributeInExpression, formatArea, formatAttributeValue, formatChartRelatedValue, formatConditionValue, formatDataSourceCondition, formatDate$1 as formatDate, formatElementValue, formatLength, formatNumber, formatPolygonMeasure, getActualExtrusionHeight, getAttributeByName, getAttributeValue, getAttributesConfiguration, getChartAxes, getChartFilterName, getChartMarkers, getConfigFilter, getContainerComponent, getDashboardHeader, getDataFromAttributes, getDataFromRelatedFeatures, getDataSource, getDataSourceFilterValue, getDate, getDefaultConfig, getElementValue, getFeatureAttributes, getFeatureCardHeader, getFilterComponent, getFilterSelectedItems, getFilterValue, getFormattedAttributes, getGradientColors, getLayerInfo, getLayerInfoFromDataSources, getPagesFromConfig, getPagesFromProjectInfo, getProxyService, getRelatedAttribute, getRenderElement, getResourceUrl, getRootElementId, getSelectedFilterValue, getSlideshowImages, getSvgUrl, getTemplateNameFromAttribute, getTotalFromAttributes, getTotalFromRelatedFeatures, hexToRgba, isCompositeLayerConfiguration, isEmptyElementValue, isEmptyValue, isHiddenEmptyValue, isLayerService, isNotValidSelectedTab, isNumeric, isObject, isProxyService, isVisibleContainer, metersPerPixel, numberOptions, parseClientStyle, parseIconNames, parseIconNamesFromClientStyle, pieChartTooltipFromAttributes, pieChartTooltipFromRelatedFeatures, pointOptions, removeDataSource, rgbToHex, roundTotalSum, sliceShownOtherItems, timeOptions, tooltipNameFromAttributes, tooltipValueFromAttributes, tooltipValueFromRelatedFeatures, transparentizeColor, treeNodesToProjectItems, updateDataSource, useAppHeight, useAutoCompleteControl, useChartChange, useChartData, useCurrentPageLayers, useCustomFeatureSelect, useDashboardHeader, useDataSources, useDebouncedCallback, useDiffPage, useExpandableContainers, useExportPdf, useFetchImageWithAuth, useFetchWithAuth, useGetConfigLayer, useGlobalContext, useHeaderRender, useHideIfEmptyDataSource, useIconsFromLayers, useLayerHiddenAttributes, useLayerParams, useMapContext, useMapDraw, useMapImages, useMaxZoomTo, useProjectDashboardInit, usePythonSandbox, usePythonTask, useRedrawLayer, useRelatedDataSourceAttributes, useRenderElement, useServerNotificationsContext, useShownOtherItems, useToggle, useUpdateDataSource, useVisibleProjectItems, useWidgetConfig, useWidgetContext, useWidgetFilters, useWidgetPage, useWindowResize, useZoomToFeatures, useZoomToPoint };
 //# sourceMappingURL=react.esm.js.map