@evergis/react 3.1.57 → 3.1.59

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

@@ -1,5 +1,6 @@
-import { ConfigContainerChild, ContainerProps } from '../../types';
+import { ConfigContainerChild, ContainerProps, WidgetType } from '../../types';
 export type ContainerChildrenProps = {
+    type: WidgetType;
     items: ConfigContainerChild[];
     elementConfig?: ConfigContainerChild;
     isColumn?: boolean;

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

@@ -9,6 +9,7 @@ export * from './useWidgetFilters';
 export * from './useGetConfigLayer';
 export * from './useGlobalContext';
 export * from './useHeaderRender';
+export * from './useHideIfEmptyDataSource';
 export * from './useProjectDashboardInit';
 export * from './useRelatedDataSourceAttributes';
 export * from './useRenderElement';

package/dist/components/Dashboard/hooks/useHideIfEmptyDataSource.d.ts

@@ -0,0 +1,2 @@
+import { WidgetType } from '../types';
+export declare const useHideIfEmptyDataSource: (type?: WidgetType) => (dataSourceName: string) => boolean;

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

@@ -31,6 +31,8 @@ export interface ConfigRelatedResource {
     resourceId: string;
     parameters: Record<string, unknown>;
     script?: string;
+    fileName?: string;
+    methodName?: string;
 }
 export interface BaseMapSettings {
     opacity?: number;
@@ -118,6 +120,7 @@ export interface ConfigOptions {
     bigIcon?: boolean;
     onlyIcon?: boolean;
     hideEmpty?: boolean;
+    hideIfEmptyDataSource?: string;
     innerValue?: boolean;
     groupTooltip?: boolean;
     tabId?: string;

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

@@ -1,8 +1,10 @@
 export declare const usePythonTask: () => {
-    runTask: ({ resourceId, parameters, script, }: {
+    runTask: ({ resourceId, parameters, script, fileName, methodName, }: {
         resourceId: string;
         parameters: Record<string, unknown>;
-        script: string;
+        script?: string;
+        fileName?: string;
+        methodName?: string;
     }) => Promise<void>;
     stopTask: () => Promise<void>;
     result: string;

package/dist/index.js

@@ -4840,7 +4840,7 @@ const usePythonTask = () => {
         setTaskId(null);
         setSubscriptionId(null);
     }, []);
-    const runTask = React.useCallback(async ({ resourceId, parameters, script, }) => {
+    const runTask = React.useCallback(async ({ resourceId, parameters, script, fileName, methodName, }) => {
         reset();
         const start = Date.now();
         let prototypeId = await api$1.remoteTaskManager.createTaskPrototype({
@@ -4854,6 +4854,8 @@ const usePythonTask = () => {
                         resourceId,
                         parameters,
                         script,
+                        fileName,
+                        methodName,
                         method: "pythonrunner/run",
                     },
                 },
@@ -5417,7 +5419,7 @@ const ContainersGroupContainer = React.memo(({ elementConfig, type, renderElemen
     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, 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, { type: type, items: children, elementConfig: elementConfig, isColumn: isColumn, isMain: id?.startsWith(CONFIG_PAGE_ID), renderElement: renderElement }) }))] }));
 });
 
 const ChartLegendContainer = styled(uilibGl.Flex) `
@@ -6122,7 +6124,7 @@ const PagesContainer = React.memo(({ type = exports.WidgetType.Dashboard, noBord
         setSelectedTabId,
         type,
     ]);
-    return (jsxRuntime.jsx(Container, { id: getRootElementId(type), style: { width }, isMain: true, isColumn: isColumn, noBorders: noBorders, children: jsxRuntime.jsx(ContainerChildren, { items: filteredChildren, isMain: true, renderElement: renderElement }) }));
+    return (jsxRuntime.jsx(Container, { id: getRootElementId(type), style: { width }, isMain: true, isColumn: isColumn, noBorders: noBorders, children: jsxRuntime.jsx(ContainerChildren, { type: type, items: filteredChildren, isMain: true, renderElement: renderElement }) }));
 });
 
 const ImageContainerBg$1 = styled.div `
@@ -6737,7 +6739,7 @@ const TaskContainer = React.memo(({ type, elementConfig }) => {
     const { options } = elementConfig || {};
     const { title, relatedResources, center, icon } = options || {};
     const onClick = React.useCallback(async () => {
-        await Promise.all(relatedResources.map(({ resourceId, parameters, script }) => {
+        await Promise.all(relatedResources.map(({ resourceId, parameters, script, fileName, methodName }) => {
             const newParams = applyQueryFilters({
                 parameters,
                 dataSources,
@@ -6745,7 +6747,7 @@ const TaskContainer = React.memo(({ type, elementConfig }) => {
                 filters: currentPage.filters,
                 geometry: ewktGeometry,
             });
-            return runTask({ resourceId, parameters: newParams, script });
+            return runTask({ resourceId, parameters: newParams, script, fileName, methodName });
         }));
     }, [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: "Запуск" })] }) }));
@@ -8257,7 +8259,7 @@ const getElementValue = ({ getDefaultContainer, ...props }) => {
         return attribute?.name ? layerInfo.layerDefinition.attributes[attribute.name]?.description || null : null;
     }
     const ElementComponent = type ? elementComponents[type] : null;
-    return ElementComponent ? jsxRuntime.jsx(ElementComponent, { ...props }) : getDefaultContainer();
+    return ElementComponent ? jsxRuntime.jsx(ElementComponent, { ...props }) : getDefaultContainer?.();
 };
 
 const getLayerAttributes = (layerDefinition) => {
@@ -9965,6 +9967,15 @@ const useGetConfigLayer = () => {
     return React.useCallback((layerName) => currentPage?.layers?.find(({ name }) => name === layerName), [currentPage?.layers]);
 };
 
+const useHideIfEmptyDataSource = (type = exports.WidgetType.Dashboard) => {
+    const { dataSources } = useWidgetContext(type);
+    return React.useCallback((dataSourceName) => {
+        if (!dataSourceName)
+            return false;
+        return !getDataSource(dataSourceName, dataSources)?.features?.length;
+    }, [dataSources]);
+};
+
 const useProjectDashboardInit = () => {
     const { projectInfo, updateProject } = useWidgetContext();
     return React.useCallback(() => {
@@ -10272,7 +10283,8 @@ const ChartLegend = ({ data, chartElement, fontSize, type, twoColumns, loading }
     return (jsxRuntime.jsxs(uilibGl.Flex, { flexDirection: "column", opacity: loading ? FILTERED_VALUE_OPACITY / 100 : 1, children: [jsxRuntime.jsx(ChartLegendContainer, { twoColumns: twoColumns, children: sliceItems(data)?.map(({ name, color }, index) => (jsxRuntime.jsxs(ChartLegendItem, { hasAnyFilter: hasAnyFilter, isFiltered: isFiltered(name), onClick: axes?.[0]?.filterName ? () => onFilter(name) : undefined, children: [jsxRuntime.jsx(ChartLegendColor, { color: color }), jsxRuntime.jsx(ChartLegendName, { "$fontSize": fontSize, "$fontColor": fontColor, children: name })] }, index))) }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: t("other", { ns: "dashboard", defaultValue: "Другое" }) }))] }));
 };
 
-const ContainerChildren = React.memo(({ items, isColumn, isMain, renderElement }) => {
+const ContainerChildren = React.memo(({ type, items, isColumn, isMain, renderElement }) => {
+    const checkIfEmptyDataSource = useHideIfEmptyDataSource(type);
     return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: items
             ?.filter(item => !["title", "icon", "titleIcon"].includes(item.id))
             ?.map((item, index) => {
@@ -10281,6 +10293,8 @@ const ContainerChildren = React.memo(({ items, isColumn, isMain, renderElement }
                 index,
                 wrap: isColumn || isMain,
             });
+            if (checkIfEmptyDataSource(item.options?.hideIfEmptyDataSource))
+                return null;
             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));
         }) }));
 });
@@ -11021,6 +11035,7 @@ exports.useExportPdf = useExportPdf;
 exports.useGetConfigLayer = useGetConfigLayer;
 exports.useGlobalContext = useGlobalContext;
 exports.useHeaderRender = useHeaderRender;
+exports.useHideIfEmptyDataSource = useHideIfEmptyDataSource;
 exports.useLayerParams = useLayerParams;
 exports.useMapContext = useMapContext;
 exports.useMapDraw = useMapDraw;