@evergis/react 3.1.109 → 3.1.111

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/hooks/useRenderContainerItem.d.ts

@@ -0,0 +1,10 @@
+import { ConfigContainerChild, RenderElementFunction, WidgetType } from '../types';
+export declare const useRenderContainerItem: (type: WidgetType, renderElement: RenderElementFunction) => (elementConfig: ConfigContainerChild, attribute: string) => {
+    id: string;
+    value: import('react').ReactNode;
+    hideEmpty: boolean;
+    style: import('react').CSSProperties;
+    hasIcon: boolean;
+    hasUnits: boolean;
+    render: RenderElementFunction;
+};

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/components/LayerIcon/index.d.ts

@@ -2,4 +2,5 @@ import { FC } from 'react';
 import { LayerInfo } from '../../types';
 export declare const LayerIcon: FC<{
     layerInfo: LayerInfo;
+    error?: boolean;
 }>;

package/dist/index.js

@@ -6072,20 +6072,9 @@ 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 TwoColumnContainer = React.memo(({ config, elementConfig, type, renderElement }) => {
-    const { selectedTabId, layerInfo, attributes } = useWidgetContext(type);
-    const { attributes: renderAttributes } = elementConfig?.options || {};
-    const renderContainer = React.useCallback((attribute) => {
+const useRenderContainerItem = (type, renderElement) => {
+    const { config, layerInfo, selectedTabId, attributes } = useWidgetContext(type);
+    return React.useCallback((elementConfig, attribute) => {
         const { id, options, style, children } = elementConfig || {};
         const { hideEmpty, innerTemplateStyle } = options || {};
         const hasUnits = children?.some(({ id }) => id === "units");
@@ -6123,10 +6112,44 @@ const TwoColumnContainer = React.memo(({ config, elementConfig, type, renderElem
             })
             : renderElement;
         const value = render({ id: "value" });
+        return {
+            id,
+            value,
+            hideEmpty,
+            style: innerTemplateStyle || style,
+            hasIcon,
+            hasUnits,
+            render,
+        };
+    }, []);
+};
+
+const BASE_STYLE = {
+    marginBottom: "1rem",
+};
+const OneColumnContainer = React.memo(({ type, elementConfig, renderElement }) => {
+    const getRenderContainerItem = useRenderContainerItem(type, renderElement);
+    const { options } = elementConfig || {};
+    const { attributes: renderAttributes, innerTemplateStyle } = options || {};
+    const renderContainer = React.useCallback((attribute) => {
+        const { id, value, hideEmpty, style, hasUnits, render } = getRenderContainerItem(elementConfig, attribute);
+        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: [render({ id: "alias" }), render({ id: "tooltip" })] }), jsxRuntime.jsxs(ContainerValue, { children: [value, hasUnits && jsxRuntime.jsx(ContainerUnits, { children: render({ id: "units" }) })] })] }));
+    }, [getRenderContainerItem, elementConfig, innerTemplateStyle]);
+    return renderAttributes?.length ? (jsxRuntime.jsx(jsxRuntime.Fragment, { children: renderAttributes.map(attribute => renderContainer(attribute)) })) : (renderContainer());
+});
+
+const TwoColumnContainer = React.memo(({ elementConfig, type, renderElement }) => {
+    const getRenderContainerItem = useRenderContainerItem(type, renderElement);
+    const { options } = elementConfig || {};
+    const { attributes: renderAttributes, innerTemplateStyle } = options || {};
+    const renderContainer = React.useCallback((attribute) => {
+        const { id, value, hideEmpty, style, hasIcon, hasUnits, render } = getRenderContainerItem(elementConfig, attribute);
         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]);
+    }, [getRenderContainerItem, elementConfig]);
     return renderAttributes?.length ? (jsxRuntime.jsx(jsxRuntime.Fragment, { children: renderAttributes.map(attribute => renderContainer(attribute)) })) : (renderContainer());
 });
 
@@ -7681,9 +7704,9 @@ var img$1 = "data:image/svg+xml,%3csvg width='32' height='32' viewBox='0 0 32 32
 
 var img = "data:image/svg+xml,%3csvg width='32' height='32' viewBox='0 0 32 32' fill='none' xmlns='http://www.w3.org/2000/svg'%3e %3crect width='32' height='32' fill='transparent'/%3e %3crect x='8' y='8' width='16' height='16' rx='2' fill='url(%23paint0_linear_6459_10399)'/%3e %3cdefs%3e %3clinearGradient id='paint0_linear_6459_10399' x1='8' y1='8' x2='24' y2='24' gradientUnits='userSpaceOnUse'%3e %3cstop stop-color='%230084D6'/%3e %3cstop offset='0.489583' stop-color='%230084D6'/%3e %3cstop offset='0.489683' stop-color='%2305A9FF'/%3e %3cstop offset='0.921875' stop-color='%2305A9FF'/%3e %3c/linearGradient%3e %3c/defs%3e%3c/svg%3e";
 
-const LayerIcon = ({ layerInfo }) => {
+const LayerIcon = ({ layerInfo, error }) => {
     const renderSymbol = React.useMemo(() => {
-        if (!layerInfo.geometryType) {
+        if (!layerInfo.geometryType || error) {
             return (jsxRuntime.jsx(AlertIconContainer, { children: jsxRuntime.jsx(uilibGl.Icon, { kind: "warning" }) }));
         }
         switch (layerInfo.geometryType) {
@@ -10763,6 +10786,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) {
+            return renderAttributes;
+        }
+        if (attributesExclude) {
+            const allAttributes = attributes?.map(attr => attr.name) || [];
+            return allAttributes.filter(attr => !attributesExclude.includes(attr));
+        }
+        return null;
+    }, [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 +11990,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;