@evergis/react 3.1.55 → 3.1.57

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

@@ -1,3 +1,8 @@
-export declare const LayersContainerWrapper: import('styled-components').StyledComponent<any, any, {
+export declare const LayersContainerWrapper: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {
+    isTitle?: boolean;
+    isColumn?: boolean;
+    isMain?: boolean;
+    noBorders?: boolean;
+} & {
     isPresentationMode?: boolean;
-}, string | number | symbol>;
+}, never>;

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

@@ -1,2 +1,6 @@
-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>;
+export declare const UploaderContainer: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {
+    isTitle?: boolean;
+    isColumn?: boolean;
+    isMain?: boolean;
+    noBorders?: boolean;
+}, never>;

package/dist/components/Dashboard/elements/ElementUploader/index.d.ts

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

package/dist/components/Dashboard/{containers/TaskContainer → elements/ElementUploader}/styled.d.ts

@@ -1,2 +1 @@
-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/elements/registry.d.ts

@@ -14,4 +14,5 @@ export declare const elementComponents: {
         expandedContainers: Record<string, boolean>;
     }>;
     readonly markdown: import('react').FC<import('..').ContainerProps>;
+    readonly uploader: import('react').FC<import('..').ContainerProps>;
 };

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

@@ -1,5 +1,17 @@
-export declare const Container: any;
-export declare const ContainerWrapper: any;
+import { CSSProperties } from 'react';
+export declare const ElementValueWrapper: import('styled-components').StyledComponent<"div", any, {
+    noMargin?: boolean;
+}, never>;
+export declare const Container: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {
+    isTitle?: boolean;
+    isColumn?: boolean;
+    isMain?: boolean;
+    noBorders?: boolean;
+}, never>;
+export declare const ContainerWrapper: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {
+    $zIndex?: CSSProperties["zIndex"];
+    $noMargin?: boolean;
+}, never>;
 export declare const DashboardChip: import('styled-components').StyledComponent<any, any, any, any>;
 export declare const DashboardPlaceholderWrap: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;
 export declare const DashboardPlaceholder: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {

package/dist/index.js

@@ -4507,75 +4507,6 @@ const DashboardChip$1 = styled(uilibGl.Chip) `
   ${({ $fontColor, $isDefault }) => !!$fontColor && !$isDefault && CustomChipColorMixin}
 `;
 
-const getAttributeByName = (attributeName, attributes) => {
-    return Array.isArray(attributeName)
-        ? null
-        : attributeName
-            ? attributes?.find(({ name }) => name === attributeName)
-            : null;
-};
-
-const formatElementValue = ({ t, value, elementConfig, attributes, wrap, }) => {
-    const { id, type, defaultValue, options, style, attributeName, templateName } = elementConfig || {};
-    const attribute = attributeName ? getAttributeByName(attributeName, attributes) : null;
-    const { fontColor, fontSize, noUnits, tagView, bgColor, withDivider, radius } = options || {};
-    const valueOrDefault = value || defaultValue;
-    const resultValue = type === "attributeValue" && attribute?.type && attribute?.stringFormat
-        ? formatAttributeValue({
-            t,
-            type: attribute.type,
-            value: valueOrDefault,
-            stringFormat: attribute.stringFormat,
-            noUnits,
-        })
-        : valueOrDefault;
-    if (!wrap)
-        return resultValue;
-    return (jsxRuntime.jsxs(React.Fragment, { children: [tagView ? (jsxRuntime.jsx(DashboardChip$1, { text: resultValue, "$bgColor": bgColor, "$fontColor": fontColor, "$fontSize": fontSize, "$radius": radius, style: style })) : resultValue, withDivider && jsxRuntime.jsx(uilibGl.Divider, {})] }, id));
-};
-
-const getAttributeValue = (element, attributes) => {
-    const attribute = getAttributeByName(element?.attributeName, attributes);
-    const { maxLength, separator, expandable, lineBreak } = element.options || {};
-    let value = "";
-    if (attribute?.type === api.AttributeType.Boolean && typeof attribute.value === "boolean") {
-        return jsxRuntime.jsx(DashboardCheckbox, { title: attribute.alias || attribute.name, checked: attribute.value });
-    }
-    if (Array.isArray(element?.attributeName)) {
-        const concatAttributes = element.attributeName.map((attributeName) => attributes?.find(({ name }) => name === attributeName)?.value || "");
-        value = concatAttributes.join(separator || ", ");
-    }
-    else {
-        value = attribute?.value?.toString() || "";
-    }
-    return maxLength && maxLength < value.length ? (jsxRuntime.jsx(TextTrim, { maxLength: maxLength, expandable: expandable, lineBreak: lineBreak, children: value })) : (value);
-};
-
-const getChartAxes = (chartElement) => chartElement?.options?.relatedDataSources?.filter(({ chartAxis }) => chartAxis === "y");
-
-const getChartFilterName = (relatedDataSources) => {
-    const relatedAttributes = relatedDataSources || [];
-    const axes = relatedAttributes.filter(({ chartAxis }) => chartAxis === "y");
-    return axes?.[0]?.filterName;
-};
-
-function getValueIndex(items, attributes) {
-    return items?.findIndex(({ name }) => name.toString() === attributes.value?.toString());
-}
-const getChartMarkers = (items, markers, dataSources) => {
-    if (typeof markers === "string") {
-        const dataSource = getDataSource(markers, dataSources);
-        return dataSource?.features?.map(({ attributes }) => ({
-            ...attributes,
-            value: getValueIndex(items, attributes),
-        })) || [];
-    }
-    return (markers?.map(marker => ({
-        ...marker,
-        value: getValueIndex(items, marker),
-    })) || []);
-};
-
 const LayerGroupContainer = styled(uilibGl.Flex) `
   display: flex;
   justify-content: center;
@@ -5104,21 +5035,34 @@ const LayerListContainer = styled(uilibGl.Flex) `
   box-sizing: border-box;
 `;
 
+const ElementValueWrapper = styled.div `
+  transition: background-color ${uilibGl.transition.toggle};
+  
+  ${({ noMargin }) => styled.css `
+    &&&& {
+      margin-bottom: 0;
+    }
+  `};
+`;
 const Container = styled(uilibGl.Flex) `
   flex-direction: column;
   width: 100%;
-
+  
   ${({ isColumn }) => isColumn
     ? styled.css `
-          > * {
-            width: 100%;
+        > * {
+          width: 100%;
+
+          :not(:last-child) {
+            margin-bottom: 1.5rem;
           }
-        `
+        }
+      `
     : styled.css `
-          flex-direction: row;
-          justify-content: space-between;
-          align-items: center;
-        `}
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+      `}
 
   ${({ isTitle }) => isTitle &&
     styled.css `
@@ -5147,10 +5091,6 @@ const ContainerWrapper = styled(uilibGl.Flex) `
   color: ${({ theme: { palette } }) => palette.textPrimary};
   z-index: ${({ $zIndex }) => $zIndex ?? 1};
   transition: background-color ${uilibGl.transition.toggle};
-
-  ${Container} > :not(:last-child) {
-    margin-bottom: 1.5rem;
-  }
   
   ${({ $noMargin }) => $noMargin && styled.css `
     &&&& {
@@ -5192,6 +5132,7 @@ const DashboardPlaceholder = styled(uilibGl.Flex) `
     styled.css `
       width: 6.25rem;
     `}
+  
   &&& > * {
     margin-bottom: 0;
   }
@@ -5401,13 +5342,82 @@ const FeatureControls = styled(uilibGl.Flex) `
   }
 `;
 
+const getAttributeByName = (attributeName, attributes) => {
+    return Array.isArray(attributeName)
+        ? null
+        : attributeName
+            ? attributes?.find(({ name }) => name === attributeName)
+            : null;
+};
+
+const formatElementValue = ({ t, value, elementConfig, attributes, wrap, }) => {
+    const { id, type, defaultValue, options, style, attributeName, templateName } = elementConfig || {};
+    const attribute = attributeName ? getAttributeByName(attributeName, attributes) : null;
+    const { fontColor, fontSize, noUnits, tagView, bgColor, withDivider, radius, noMargin } = options || {};
+    const valueOrDefault = value || defaultValue;
+    const resultValue = type === "attributeValue" && attribute?.type && attribute?.stringFormat
+        ? formatAttributeValue({
+            t,
+            type: attribute.type,
+            value: valueOrDefault,
+            stringFormat: attribute.stringFormat,
+            noUnits,
+        })
+        : valueOrDefault;
+    if (!wrap)
+        return resultValue;
+    return (jsxRuntime.jsxs(React.Fragment, { children: [tagView ? (jsxRuntime.jsx(DashboardChip$1, { "data-id": id, "data-templatename": templateName, style: style, text: resultValue, "$bgColor": bgColor, "$fontColor": fontColor, "$fontSize": fontSize, "$radius": radius })) : (jsxRuntime.jsx(ElementValueWrapper, { "data-id": id, "data-templatename": templateName, style: style, noMargin: noMargin, children: resultValue })), withDivider && jsxRuntime.jsx(uilibGl.Divider, {})] }, id));
+};
+
+const getAttributeValue = (element, attributes) => {
+    const attribute = getAttributeByName(element?.attributeName, attributes);
+    const { maxLength, separator, expandable, lineBreak } = element.options || {};
+    let value = "";
+    if (attribute?.type === api.AttributeType.Boolean && typeof attribute.value === "boolean") {
+        return jsxRuntime.jsx(DashboardCheckbox, { title: attribute.alias || attribute.name, checked: attribute.value });
+    }
+    if (Array.isArray(element?.attributeName)) {
+        const concatAttributes = element.attributeName.map((attributeName) => attributes?.find(({ name }) => name === attributeName)?.value || "");
+        value = concatAttributes.join(separator || ", ");
+    }
+    else {
+        value = attribute?.value?.toString() || "";
+    }
+    return maxLength && maxLength < value.length ? (jsxRuntime.jsx(TextTrim, { maxLength: maxLength, expandable: expandable, lineBreak: lineBreak, children: value })) : (value);
+};
+
+const getChartAxes = (chartElement) => chartElement?.options?.relatedDataSources?.filter(({ chartAxis }) => chartAxis === "y");
+
+const getChartFilterName = (relatedDataSources) => {
+    const relatedAttributes = relatedDataSources || [];
+    const axes = relatedAttributes.filter(({ chartAxis }) => chartAxis === "y");
+    return axes?.[0]?.filterName;
+};
+
+function getValueIndex(items, attributes) {
+    return items?.findIndex(({ name }) => name.toString() === attributes.value?.toString());
+}
+const getChartMarkers = (items, markers, dataSources) => {
+    if (typeof markers === "string") {
+        const dataSource = getDataSource(markers, dataSources);
+        return dataSource?.features?.map(({ attributes }) => ({
+            ...attributes,
+            value: getValueIndex(items, attributes),
+        })) || [];
+    }
+    return (markers?.map(marker => ({
+        ...marker,
+        value: getValueIndex(items, marker),
+    })) || []);
+};
+
 const ContainersGroupContainer = React.memo(({ elementConfig, type, renderElement }) => {
     const { expandedContainers } = useWidgetContext(type);
-    const { id, children, options, style } = elementConfig || {};
+    const { id, children, options } = elementConfig || {};
     const { column, expandable, expanded } = options || {};
     const isColumn = column === undefined || column;
     const isVisible = isVisibleContainer(id, expandable, expanded, expandedContainers);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && (jsxRuntime.jsx(Container, { id: id, isColumn: isColumn, style: style, children: jsxRuntime.jsx(ContainerChildren, { items: children, elementConfig: elementConfig, isColumn: isColumn, isMain: id?.startsWith(CONFIG_PAGE_ID), renderElement: renderElement }) }))] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && (jsxRuntime.jsx(Container, { id: id, isColumn: isColumn, children: jsxRuntime.jsx(ContainerChildren, { items: children, elementConfig: elementConfig, isColumn: isColumn, isMain: id?.startsWith(CONFIG_PAGE_ID), renderElement: renderElement }) }))] }));
 });
 
 const ChartLegendContainer = styled(uilibGl.Flex) `
@@ -6711,96 +6721,34 @@ 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, file.name);
-        }));
-        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 { expandedContainers } = useWidgetContext(type);
+    const { id, options } = elementConfig || {};
+    const { expandable, expanded } = options || {};
+    const isVisible = isVisibleContainer(id, expandable, expanded, expandedContainers);
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && renderElement({ id: "uploader", wrap: false })] }));
 });
 
-const TaskContainer = React.memo(({ elementConfig }) => {
-    const { t } = useGlobalContext();
-    const { runTask, error, result, executionTime, loading } = usePythonTask();
+const TaskContainer = React.memo(({ type, elementConfig }) => {
+    const { t, ewktGeometry } = useGlobalContext();
+    const { dataSources, filters: selectedFilters } = useWidgetContext(type);
+    const { currentPage } = useWidgetPage(type);
+    const { runTask, loading } = usePythonTask();
     const { options } = elementConfig || {};
-    const { title, relatedResources } = options || {};
+    const { title, relatedResources, center, icon } = options || {};
     const onClick = React.useCallback(async () => {
         await Promise.all(relatedResources.map(({ resourceId, parameters, script }) => {
-            return runTask({ resourceId, parameters, script });
+            const newParams = applyQueryFilters({
+                parameters,
+                dataSources,
+                selectedFilters,
+                filters: currentPage.filters,
+                geometry: ewktGeometry,
+            });
+            return runTask({ resourceId, parameters: newParams, script });
         }));
-    }, [relatedResources, runTask]);
-    return (jsxRuntime.jsx(uilibGl.WaitingButton, { primary: true, isWaiting: loading, disabled: !relatedResources?.length, onClick: onClick, children: title || t("run", { ns: "dashboard", defaultValue: "Запуск" }) }));
+    }, [currentPage.filters, dataSources, ewktGeometry, relatedResources, runTask, selectedFilters]);
+    return (jsxRuntime.jsx(uilibGl.Flex, { justifyContent: center ? "center" : "flex-start", children: jsxRuntime.jsxs(uilibGl.WaitingButton, { primary: true, isWaiting: loading, disabled: !relatedResources?.length, onClick: onClick, children: [icon && jsxRuntime.jsx(uilibGl.FlexSpan, { marginRight: "0.5rem", children: jsxRuntime.jsx(uilibGl.Icon, { kind: icon }) }), title || t("run", { ns: "dashboard", defaultValue: "Запуск" })] }) }));
 });
 
 const containerComponents = {
@@ -8184,6 +8132,86 @@ const getDefaultConfig = ({ title, defaultTitle, items, baseMapName, position, r
     return dashboardConfiguration;
 };
 
+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 ElementUploader = React.memo(({ elementConfig, type }) => {
+    const { t, api } = useGlobalContext();
+    const { changeFilters } = useWidgetContext(type);
+    const [files, setFiles] = React.useState([]);
+    const refInput = React.useRef();
+    const { id, style, options } = elementConfig || {};
+    const { fileExtensions = DEFAULT_FILE_EXTENSIONS, multiSelect, parentResourceId, icon, title, filterName } = 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 || "", file.name);
+        }));
+        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.jsx(UploaderContainer, { id: id, style: style, children: jsxRuntime.jsx("div", { children: jsxRuntime.jsx(uilibGl.Uploader, { currentRef: refInput, title: renderTitle, accept: fileExtensions, width: "100%", fileItems: files, isMultiple: multiSelect, onUpload: onUpload, onDelete: onDelete }) }) }));
+});
+
 const elementComponents = {
     image: ElementImage,
     slideshow: ElementSlideshow,
@@ -8197,6 +8225,7 @@ const elementComponents = {
     chart: ElementChart,
     legend: ElementLegend,
     markdown: ElementMarkdown,
+    uploader: ElementUploader,
 };
 
 const getElementValue = ({ getDefaultContainer, ...props }) => {
@@ -10808,6 +10837,7 @@ exports.ElementMarkdown = ElementMarkdown;
 exports.ElementSlideshow = ElementSlideshow;
 exports.ElementSvg = ElementSvg;
 exports.ElementTooltip = ElementTooltip;
+exports.ElementValueWrapper = ElementValueWrapper;
 exports.ExpandableTitle = ExpandableTitle;
 exports.FEATURE_CARD_DEFAULT_COLORS = FEATURE_CARD_DEFAULT_COLORS;
 exports.FEATURE_CARD_OTHER_COLOR = FEATURE_CARD_OTHER_COLOR;