@evergis/react 3.1.54 → 3.1.56

package/dist/components/Dashboard/containers/UploadContainer/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/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/types.d.ts

@@ -78,6 +78,7 @@ export interface ConfigOptions {
     inlineUnits?: boolean;
     noUnits?: boolean;
     noEmptyOption?: boolean;
+    noMargin?: boolean;
     chartId?: string;
     showTotal?: boolean;
     totalWord?: string;

package/dist/index.js

@@ -5120,13 +5120,6 @@ const Container = styled(uilibGl.Flex) `
           align-items: center;
         `}
 
-  ${({ isMain, isColumn }) => (isMain || isColumn) &&
-    styled.css `
-      > :not(:last-child) {
-        margin-bottom: 1.5rem;
-      }
-    `}
-
   ${({ isTitle }) => isTitle &&
     styled.css `
       &&&& {
@@ -5147,6 +5140,7 @@ const ContainerWrapper = styled(uilibGl.Flex) `
   width: 100%;
   background: ${({ theme: { palette } }) => palette.backgroundAlpha};
   box-shadow: rgb(0 0 0 / 15%) 0 0.1875rem 0.625rem;
+  margin-bottom: 2rem;
   padding: 1.5rem;
   border-radius: 0.5rem;
   backdrop-filter: blur(20px);
@@ -5157,6 +5151,12 @@ const ContainerWrapper = styled(uilibGl.Flex) `
   ${Container} > :not(:last-child) {
     margin-bottom: 1.5rem;
   }
+  
+  ${({ $noMargin }) => $noMargin && styled.css `
+    &&&& {
+      margin-bottom: 0;
+    }
+  `}
 `;
 const DashboardChip = styled(uilibGl.Chip) `
   margin: 0 0.25rem 0.25rem 0;
@@ -5221,12 +5221,6 @@ const DashboardWrapper = styled(uilibGl.Flex) `
   width: calc(100% - 3rem);
   height: calc(100% - ${LEFT_PANEL_HEADER_HEIGHT});
 
-  > ${ContainerWrapper} {
-    > * {
-      margin-bottom: 2rem;
-    }
-  }
-
   ${({ hasImage, isPresentationMode }) => hasImage &&
     !isPresentationMode &&
     styled.css `
@@ -6717,96 +6711,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 = {
@@ -8190,6 +8122,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,
@@ -8203,6 +8215,7 @@ const elementComponents = {
     chart: ElementChart,
     legend: ElementLegend,
     markdown: ElementMarkdown,
+    uploader: ElementUploader,
 };
 
 const getElementValue = ({ getDefaultContainer, ...props }) => {
@@ -10258,12 +10271,12 @@ const ContainerChildren = React.memo(({ items, isColumn, isMain, renderElement }
                 index,
                 wrap: isColumn || isMain,
             });
-            return isMain ? (jsxRuntime.jsx(ContainerWrapper, { id: item.id, "data-templatename": item.templateName, children: jsxRuntime.jsx(DashboardWrapper, { children: render }) }, index)) : (jsxRuntime.jsx(React.Fragment, { children: render }, index));
+            return isMain ? (jsxRuntime.jsx(ContainerWrapper, { "data-id": item.id, "data-templatename": item.templateName, "$noMargin": item.options?.noMargin, children: jsxRuntime.jsx(DashboardWrapper, { children: render }) }, index)) : (jsxRuntime.jsx(React.Fragment, { children: render }, index));
         }) }));
 });
 
 const DashboardLoading = React.memo(() => {
-    return (jsxRuntime.jsx(Container, { noBorders: true, children: jsxRuntime.jsx(ContainerWrapper, { children: jsxRuntime.jsx(DashboardWrapper, { children: jsxRuntime.jsx(DashboardPlaceholderWrap, { children: jsxRuntime.jsxs(DashboardPlaceholder, { isLoading: true, children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "dashboard_loading" }), jsxRuntime.jsx(uilibGl.Flex, { width: "8rem", children: jsxRuntime.jsx(uilibGl.LinearProgress, {}) })] }) }) }) }) }));
+    return (jsxRuntime.jsx(Container, { noBorders: true, children: jsxRuntime.jsx(ContainerWrapper, { "$noMargin": true, children: jsxRuntime.jsx(DashboardWrapper, { children: jsxRuntime.jsx(DashboardPlaceholderWrap, { children: jsxRuntime.jsxs(DashboardPlaceholder, { isLoading: true, children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "dashboard_loading" }), jsxRuntime.jsx(uilibGl.Flex, { width: "8rem", children: jsxRuntime.jsx(uilibGl.LinearProgress, {}) })] }) }) }) }) }));
 });
 
 const Dashboard = React.memo(({ type = exports.WidgetType.Dashboard, config, noBorders }) => {