@evergis/react 3.1.58 → 3.1.60

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

@@ -1,5 +1,5 @@
-import { ConfigContainer, ConfigContainerChild, WidgetType } from '../types';
+import { ConfigContainerChild, WidgetType } from '../types';
 export declare const useWidgetConfig: (type?: WidgetType) => {
-    config: ConfigContainer;
+    config: any;
     pages: ConfigContainerChild[];
 };

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

@@ -12,6 +12,7 @@ export declare const useWidgetContext: (type?: WidgetType) => {
     attributes: import('../types').ClientFeatureAttribute[];
     feature: import('../../..').SelectedFeature;
     closeFeatureCard: VoidFunction;
+    containerIds: string[];
     components: {
         LayerItem?: import('react').FC<import('../..').LayerItemProps>;
         ProjectCatalogMenu?: import('react').FC;

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;

package/dist/contexts/DashboardContext/types.d.ts

@@ -4,6 +4,7 @@ import { ConfigContainer, DashboardLayerPayload, DashboardState, LayerItemProps,
 import { LayerInfo } from '../../types';
 export type DashboardContextProps = PropsWithChildren<{
     config?: ConfigContainer;
+    containerIds?: string[];
     projectInfo?: ExtendedProjectInfoDc;
     updateProject?: (projectInfo: ExtendedProjectInfoDc) => void;
     pageIndex?: number;

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

@@ -3920,7 +3920,7 @@ const ServerNotificationsProvider = ({ url, initialized, children }) => {
 };
 
 const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
-    const { projectInfo, updateProject, layerInfos, geometryFilter, dashboardLayers, setDashboardLayer, components: dashboardComponents, config: dashboardConfig, pageIndex: projectPageIndex, selectedTabId: projectSelectedTabId, setSelectedTabId: setProjectSelectedTabId, dataSources: projectDataSources, loading: projectLoading, filters: projectFilters, changeFilters: projectChangeFilters, expandContainer: projectExpandContainer, expandedContainers: projectExpandedContainers, nextPage: projectNextPage, prevPage: projectPrevPage, changePage: projectChangePage, } = React.useContext(DashboardContext) || {};
+    const { projectInfo, updateProject, layerInfos, geometryFilter, dashboardLayers, setDashboardLayer, components: dashboardComponents, config: dashboardConfig, containerIds, pageIndex: projectPageIndex, selectedTabId: projectSelectedTabId, setSelectedTabId: setProjectSelectedTabId, dataSources: projectDataSources, loading: projectLoading, filters: projectFilters, changeFilters: projectChangeFilters, expandContainer: projectExpandContainer, expandedContainers: projectExpandedContainers, nextPage: projectNextPage, prevPage: projectPrevPage, changePage: projectChangePage, } = React.useContext(DashboardContext) || {};
     const { layerInfo, attributes, feature, closeFeatureCard, config: featureConfig, pageIndex: featurePageIndex, selectedTabId: featureSelectedTabId, setSelectedTabId: setFeatureSelectedTabId, dataSources: featureDataSources, loading: featureLoading, filters: featureFilters, changeFilters: featureChangeFilters, expandContainer: featureExpandContainer, expandedContainers: featureExpandedContainers, nextPage: featureNextPage, prevPage: featurePrevPage, changePage: featureChangePage, } = React.useContext(FeatureCardContext) || {};
     return {
         projectInfo,
@@ -3933,6 +3933,7 @@ const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
         attributes,
         feature,
         closeFeatureCard,
+        containerIds,
         components: dashboardComponents,
         config: type === exports.WidgetType.Dashboard ? dashboardConfig : featureConfig,
         isLoading: type === exports.WidgetType.Dashboard ? projectLoading : featureLoading,
@@ -4840,7 +4841,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 +4855,8 @@ const usePythonTask = () => {
                         resourceId,
                         parameters,
                         script,
+                        fileName,
+                        methodName,
                         method: "pythonrunner/run",
                     },
                 },
@@ -6737,7 +6740,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 +6748,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: "Запуск" })] }) }));
@@ -9393,16 +9396,27 @@ const tooltipValueFromRelatedFeatures = (t, value, relatedAttributes, layerInfo)
 };
 
 const useWidgetConfig = (type = exports.WidgetType.Dashboard) => {
-    const { config: configProp, projectInfo, layerInfo } = useWidgetContext(type);
+    const { config: configProp, containerIds, projectInfo, layerInfo } = useWidgetContext(type);
     const config = React.useMemo(() => {
         if (configProp) {
             return configProp;
         }
-        if (type === exports.WidgetType.Dashboard) {
-            return (projectInfo?.content?.dashboardConfiguration || {});
+        const currentConfig = type === exports.WidgetType.Dashboard
+            ? (projectInfo?.content?.dashboardConfiguration || {})
+            : (layerInfo?.configuration?.cardConfiguration || {});
+        if (containerIds?.length) {
+            const elements = containerIds.map(id => findAnd.returnFound(currentConfig, { id })).filter(Boolean);
+            if (!elements.length)
+                return currentConfig;
+            const newConfig = JSON.parse(JSON.stringify(currentConfig));
+            const pages = getPagesFromConfig(newConfig);
+            if (!pages?.[0]?.children)
+                return currentConfig;
+            pages[0].children = elements;
+            return newConfig;
         }
-        return (layerInfo?.configuration?.cardConfiguration || {});
-    }, [configProp, layerInfo?.configuration?.cardConfiguration, projectInfo?.content?.dashboardConfiguration, type]);
+        return currentConfig;
+    }, [configProp, containerIds, layerInfo?.configuration?.cardConfiguration, projectInfo?.content?.dashboardConfiguration, type]);
     const pages = React.useMemo(() => (getPagesFromConfig(config) || []), [config]);
     return {
         config,
@@ -10338,9 +10352,9 @@ const ExpandableTitle = React.memo(({ elementConfig, type, renderElement }) => {
     const { id, options, templateName, children } = elementConfig || {};
     const { expandable, fontColor, expanded, layerNames } = options || {};
     const titleElement = children?.find(item => item.id === "title");
-    const isVisible = isVisibleContainer(id, expandable, expanded, expandedContainers);
     if (!titleElement)
         return null;
+    const isVisible = isVisibleContainer(id, expandable, expanded, expandedContainers);
     return (jsxRuntime.jsx(TitleContainer, { containerId: id, elementConfig: titleElement, templateName: templateName, layerNames: layerNames, fontColor: fontColor, expandable: expandable, expanded: expanded, type: type, isVisible: isVisible, renderElement: renderElement }));
 });