@evergis/react 4.0.22-alpha.4 → 4.0.23-alpha.0

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

@@ -2,7 +2,7 @@ import { CSSProperties, FC, ReactNode } from 'react';
 import { i18n } from 'i18next';
 import { PieChartData, BarChartMarker } from '@evergis/charts';
 import { IconTypesKeys, IOption } from '@evergis/uilib-gl';
-import { AttributeFormatConfigurationDc, AttributeType, EqlRequestDc, FeatureDc, OgcGeometryType, PagedFeaturesListDc, PositionDc, QueryLayerServiceInfoDc, RemoteTaskStatus, StringSubType, AttributeConfigurationDc } from '@evergis/api';
+import { AttributeFormatConfigurationDc, AttributeType, EqlRequestDc, FeatureDc, OgcGeometryType, PagedFeaturesListDc, PositionDc, QueryLayerServiceInfoDc, RemoteTaskStatus, StringSubType, AttributesConfigurationDc } from '@evergis/api';
 import { FeatureAttributeValue, EditGeometryType, ThemeName } from '../../types';
 import { InnerContainerProps } from './containers/DataSourceInnerContainer/types';
 export interface DashboardsProps {
@@ -171,7 +171,7 @@ export interface ConfigDataSource {
 }
 export interface EqlDataSource {
     items: FeatureDc[];
-    attributeDefinition?: Record<string, AttributeConfigurationDc>;
+    attributes?: AttributesConfigurationDc["attributes"];
 }
 export type ConfigFilterValueType = "single" | "range" | "array";
 export interface ConfigFilter {
@@ -361,13 +361,13 @@ export interface FetchedDataSource {
     name: string;
     features: FeatureDc[];
     layerName?: string;
-    attributeDefinition?: Record<string, AttributeConfigurationDc>;
+    attributes?: AttributesConfigurationDc["attributes"];
 }
 export interface WidgetDataSource {
     name: string;
     features: FeatureDc[];
     layerName?: string;
-    attributeDefinition?: Record<string, AttributeConfigurationDc>;
+    attributes?: AttributesConfigurationDc["attributes"];
 }
 export type SelectedFilters = Record<string, SelectedFilter>;
 type DashboardLayerProps = {

package/dist/index.js

@@ -9734,7 +9734,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
         layerInfo: {
             configuration: {
                 attributesConfiguration: {
-                    attributes: dataSource?.attributeDefinition,
+                    attributes: dataSource?.attributes,
                 },
             },
         },
@@ -10644,11 +10644,18 @@ const useChartData = ({ element, type }) => {
                 .map(relatedAxis => {
                 const { dataSourceName, axisColor, attributeName, attributeUnits } = relatedAxis;
                 const dataSource = configDataSources.find(({ name }) => name === dataSourceName);
-                const layerInfo = layerInfos?.find(item => item?.name === dataSource?.layerName);
                 const featureDataSource = getDataSource(dataSourceName, dataSources);
-                const hasLayerInfo = !!layerInfo ||
-                    !!featureDataSource?.attributeDefinition ||
-                    !!featureDataSource?.features?.length;
+                const layerInfo = layerInfos?.find(item => item?.name === dataSource?.layerName) ||
+                    (featureDataSource?.attributes
+                        ? {
+                            configuration: {
+                                attributesConfiguration: {
+                                    attributes: featureDataSource.attributes,
+                                },
+                            },
+                        }
+                        : null);
+                const hasLayerInfo = !!layerInfo || !!featureDataSource?.features?.length;
                 return {
                     items: hasLayerInfo
                         ? getDataFromRelatedFeatures({
@@ -10657,14 +10664,7 @@ const useChartData = ({ element, type }) => {
                             filters: currentPage?.filters,
                             relatedConfig: relatedAxis,
                             dataSource: featureDataSource,
-                            layerInfo: layerInfo ||
-                                {
-                                    configuration: {
-                                        attributesConfiguration: {
-                                            attributes: featureDataSource.attributeDefinition,
-                                        },
-                                    },
-                                },
+                            layerInfo,
                         })
                         : null,
                     color: axisColor,
@@ -10817,7 +10817,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                 const json = await response.json();
                 return {
                     items: json.result.items,
-                    attributeDefinition: json.result.attributeDefinition,
+                    attributes: json.result.attributeDefinition,
                 };
             }
             catch (error) {
@@ -10836,10 +10836,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
             const descriptionResponse = await api.eql.getQueryDescription(getProps);
             return {
                 items: queryResponse.features,
-                attributeDefinition: descriptionResponse.reduce((acc, curr) => ({
-                    ...acc,
-                    [curr.attributeName]: curr,
-                }), {}),
+                attributes: descriptionResponse,
             };
         }
         return api.layers.getFeatures(layerName, {
@@ -10917,7 +10914,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                     (!isQueryDataSource && !isPythonDataSource)
                     ? null
                     : response.value
-                        ?.attributeDefinition ||
+                        ?.attributes ||
                         (isPythonDataSource && items?.[0]?.properties
                             ? Object.fromEntries(Object.entries(items[0].properties).map(([key, val]) => [
                                 key,
@@ -11197,10 +11194,10 @@ const useRelatedDataSourceAttributes = ({ type = exports.WidgetType.Dashboard, e
         {
             configuration: {
                 attributesConfiguration: {
-                    attributes: dataSource?.attributeDefinition || {},
+                    attributes: dataSource?.attributes || {},
                 },
             },
-        }, [currentPage?.dataSources, dataSource?.attributeDefinition, layerInfos, relatedDataSource]);
+        }, [currentPage?.dataSources, dataSource?.attributes, layerInfos, relatedDataSource]);
     const attributes = React.useMemo(() => getFeatureAttributes(feature, layerInfo, dataSource), [dataSource, feature, layerInfo]);
     return { layerInfo, attributes, dataSource };
 };