@evergis/react 3.1.109 → 3.1.110

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

@@ -16,5 +16,6 @@ export * from './useRenderElement';
 export * from './useShownOtherItems';
 export * from './useUpdateDataSource';
 export * from './useWidgetConfig';
+export * from './useMultipleAttributesRender';
 export * from './useWidgetContext';
 export * from './useWidgetPage';

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

@@ -0,0 +1,13 @@
+import { ContainerProps } from '../types';
+export declare const useMultipleAttributesRender: (config: ContainerProps["config"], elementConfig: ContainerProps["elementConfig"], type: ContainerProps["type"], renderElement: ContainerProps["renderElement"]) => {
+    getAttributesToRender: () => string[];
+    renderContainer: (attribute?: string) => {
+        render: import('../types').RenderElementFunction;
+        value: import('react').ReactNode;
+        hasUnits: boolean;
+        id: string;
+        style: import('react').CSSProperties;
+        hasIcon: boolean;
+        attr: import('@evergis/api').AttributeConfigurationDc;
+    };
+};

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

@@ -100,6 +100,7 @@ export interface ConfigOptions {
     markers?: BarChartMarker[] | string;
     drawMinMax?: boolean;
     attributes?: string[];
+    attributesExclude?: string[];
     colors?: string[];
     defaultColor?: string;
     primaryColor?: string;

package/dist/index.js

@@ -6072,62 +6072,40 @@ const TwoColumnContainerWrapper = styled(uilibGl.Flex) `
   }
 `;
 
-const OneColumnContainer = React.memo(({ elementConfig, renderElement }) => {
-    const { id, options, style } = elementConfig || {};
-    const { innerTemplateStyle, hideEmpty } = options || {};
-    const value = renderElement({ id: "value" });
-    const hasUnits = elementConfig?.children?.some(({ id }) => id === "units");
-    if (!value && hideEmpty)
-        return null;
-    return (jsxRuntime.jsxs(Container, { id: id, isColumn: true, style: innerTemplateStyle || style, children: [jsxRuntime.jsxs(ContainerAlias, { hasBottomMargin: true, children: [renderElement({ id: "alias" }), renderElement({ id: "tooltip" })] }), jsxRuntime.jsxs(ContainerValue, { children: [value, hasUnits && jsxRuntime.jsx(ContainerUnits, { children: renderElement({ id: "units" }) })] })] }));
+const BASE_STYLE = {
+    marginBottom: "1rem",
+};
+const OneColumnContainer = React.memo(({ config, elementConfig, type, renderElement }) => {
+    const { getAttributesToRender, renderContainer } = useMultipleAttributesRender(config, elementConfig, type, renderElement);
+    const attributesToRender = getAttributesToRender();
+    if (!attributesToRender.length) {
+        const { id, options, style } = elementConfig || {};
+        const { innerTemplateStyle, hideEmpty } = options || {};
+        const value = renderElement({ id: "value" });
+        const hasUnits = elementConfig?.children?.some(({ id }) => id === "units");
+        if (!value && hideEmpty)
+            return null;
+        return (jsxRuntime.jsxs(Container, { id: id, isColumn: true, style: { ...BASE_STYLE, ...(innerTemplateStyle || style) }, children: [jsxRuntime.jsxs(ContainerAlias, { hasBottomMargin: true, children: [renderElement({ id: "alias" }), renderElement({ id: "tooltip" })] }), jsxRuntime.jsxs(ContainerValue, { children: [value, hasUnits && jsxRuntime.jsx(ContainerUnits, { children: renderElement({ id: "units" }) })] })] }));
+    }
+    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: attributesToRender.map(attribute => {
+            const containerData = renderContainer(attribute);
+            if (!containerData)
+                return null;
+            const { render, hasUnits, id, style } = containerData;
+            return (jsxRuntime.jsxs(Container, { id: id, isColumn: true, style: { ...BASE_STYLE, ...(elementConfig?.options?.innerTemplateStyle || style) }, children: [jsxRuntime.jsxs(ContainerAlias, { hasBottomMargin: true, children: [render({ id: "alias" }), render({ id: "tooltip" })] }), jsxRuntime.jsxs(ContainerValue, { children: [render({ id: "value" }), hasUnits && jsxRuntime.jsx(ContainerUnits, { children: render({ id: "units" }) })] })] }, attribute));
+        }) }));
 });
 
 const TwoColumnContainer = React.memo(({ config, elementConfig, type, renderElement }) => {
-    const { selectedTabId, layerInfo, attributes } = useWidgetContext(type);
-    const { attributes: renderAttributes } = elementConfig?.options || {};
-    const renderContainer = React.useCallback((attribute) => {
-        const { id, options, style, children } = elementConfig || {};
-        const { hideEmpty, innerTemplateStyle } = options || {};
-        const hasUnits = children?.some(({ id }) => id === "units");
-        const iconIndex = children?.findIndex(({ id }) => id === "icon");
-        const icon = children?.[iconIndex];
-        const hasIcon = !!icon;
-        const elementChildren = elementConfig?.children?.map(child => ({
-            type: "attributeValue",
-            ...child,
-            attributeName: attribute,
-            options: { noUnits: hasUnits, ...child.options },
-        }));
-        const attr = attribute
-            ? layerInfo?.layerAttributes?.find(({ attributeName }) => attributeName === attribute)
-            : null;
-        if (hasIcon) {
-            elementChildren[iconIndex] = {
-                ...elementChildren[iconIndex],
-                type: attr?.icon?.type?.toLowerCase(),
-                value: attr?.icon?.resourceId || attr?.icon?.url || attr?.icon?.iconName,
-                attributeName: null,
-            };
-        }
-        const render = attribute
-            ? getRenderElement({
-                config,
-                elementConfig: {
-                    ...elementConfig,
-                    children: elementChildren,
-                },
-                selectedTabId,
-                attributes,
-                layerInfo,
-                type,
-            })
-            : renderElement;
-        const value = render({ id: "value" });
-        if (!value && hideEmpty)
-            return null;
-        return (jsxRuntime.jsxs(TwoColumnContainerWrapper, { id: id, style: innerTemplateStyle || style, children: [jsxRuntime.jsxs(ContainerAlias, { children: [hasIcon && jsxRuntime.jsx(ContainerAliasIcon, { children: render({ id: "icon" }) }), render({ id: "alias" }), render({ id: "tooltip" })] }), jsxRuntime.jsxs(ContainerValue, { big: true, children: [value, hasUnits && jsxRuntime.jsx(ContainerUnits, { children: render({ id: "units" }) })] })] }, attribute));
-    }, [attributes, config, getRenderElement, layerInfo, renderElement, selectedTabId, type, elementConfig]);
-    return renderAttributes?.length ? (jsxRuntime.jsx(jsxRuntime.Fragment, { children: renderAttributes.map(attribute => renderContainer(attribute)) })) : (renderContainer());
+    const { getAttributesToRender, renderContainer } = useMultipleAttributesRender(config, elementConfig, type, renderElement);
+    const attributesToRender = getAttributesToRender();
+    return (jsxRuntime.jsx(jsxRuntime.Fragment, { children: attributesToRender.map(attribute => {
+            const containerData = renderContainer(attribute);
+            if (!containerData)
+                return null;
+            const { render, hasUnits, id, style, hasIcon } = containerData;
+            return (jsxRuntime.jsxs(TwoColumnContainerWrapper, { id: id, style: style, children: [jsxRuntime.jsxs(ContainerAlias, { children: [hasIcon && jsxRuntime.jsx(ContainerAliasIcon, { children: render({ id: "icon" }) }), render({ id: "alias" }), render({ id: "tooltip" })] }), jsxRuntime.jsxs(ContainerValue, { big: true, children: [render({ id: "value" }), hasUnits && jsxRuntime.jsx(ContainerUnits, { children: render({ id: "units" }) })] })] }, attribute));
+        }) }));
 });
 
 const InnerContainerWrapper = styled.div `
@@ -6634,6 +6612,7 @@ const PagesContainer = React.memo(({ type = exports.WidgetType.Dashboard, noBord
         setSelectedTabId,
         type,
     ]);
+    console.info("PagesContainer", config, filteredChildren);
     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 }) }));
 });
 
@@ -10763,6 +10742,75 @@ const useUpdateDataSource = ({ dataSource, config, filters, attributes, layerPar
     }, [dataSource, getDataSourcePromises, getUpdatedDataSources, dataSources]);
 };
 
+const useMultipleAttributesRender = (config, elementConfig, type, renderElement) => {
+    const { selectedTabId, layerInfo, attributes } = useWidgetContext(type);
+    const { attributes: renderAttributes, attributesExclude } = elementConfig?.options || {};
+    const getAttributesToRender = React.useCallback(() => {
+        if (renderAttributes && renderAttributes.length > 0) {
+            return renderAttributes;
+        }
+        const allAttributes = attributes?.map(attr => attr.name) || [];
+        if (attributesExclude && attributesExclude.length > 0) {
+            return allAttributes.filter(attr => !attributesExclude.includes(attr));
+        }
+        return allAttributes;
+    }, [renderAttributes, attributesExclude, attributes]);
+    const renderContainer = React.useCallback((attribute) => {
+        const { id, options, style, children } = elementConfig || {};
+        const { hideEmpty, innerTemplateStyle } = options || {};
+        const hasUnits = children?.some(({ id }) => id === "units");
+        const iconIndex = children?.findIndex(({ id }) => id === "icon");
+        const icon = children?.[iconIndex];
+        const hasIcon = !!icon;
+        const elementChildren = elementConfig?.children?.map(child => ({
+            type: "attributeValue",
+            ...child,
+            attributeName: attribute,
+            options: { noUnits: hasUnits, ...child.options },
+        }));
+        const attr = attribute
+            ? layerInfo?.layerAttributes?.find(({ attributeName }) => attributeName === attribute)
+            : null;
+        if (hasIcon) {
+            elementChildren[iconIndex] = {
+                ...elementChildren[iconIndex],
+                type: attr?.icon?.type?.toLowerCase(),
+                value: attr?.icon?.resourceId || attr?.icon?.url || attr?.icon?.iconName,
+                attributeName: null,
+            };
+        }
+        const render = attribute
+            ? getRenderElement({
+                config,
+                elementConfig: {
+                    ...elementConfig,
+                    children: elementChildren,
+                },
+                selectedTabId,
+                attributes,
+                layerInfo,
+                type,
+            })
+            : renderElement;
+        const value = render({ id: "value" });
+        if (!value && hideEmpty)
+            return null;
+        return {
+            render,
+            value,
+            hasUnits,
+            id,
+            style: innerTemplateStyle || style,
+            hasIcon,
+            attr,
+        };
+    }, [attributes, config, getRenderElement, layerInfo, renderElement, selectedTabId, type, elementConfig]);
+    return {
+        getAttributesToRender,
+        renderContainer,
+    };
+};
+
 const StackBar = ({ data, filterName, type, alias, options, renderElement, renderTooltip }) => {
     const { height, showTotal, cornerRadius, groupTooltip } = options || {};
     const { t } = useGlobalContext();
@@ -11898,6 +11946,7 @@ exports.useLayerParams = useLayerParams;
 exports.useMapContext = useMapContext;
 exports.useMapDraw = useMapDraw;
 exports.useMapImages = useMapImages;
+exports.useMultipleAttributesRender = useMultipleAttributesRender;
 exports.useProjectDashboardInit = useProjectDashboardInit;
 exports.usePythonTask = usePythonTask;
 exports.useRedrawLayer = useRedrawLayer;