@evergis/react 3.1.118 → 3.1.120-alpha.0

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

@@ -1,4 +1,4 @@
-import { QueryLayerServiceConfigurationDc } from '@evergis/api';
+import { PagedFeaturesListDc, QueryLayerServiceConfigurationDc } from '@evergis/api';
 import { ClientFeatureAttribute, ConfigContainerChild, ConfigDataSource, DataSourcePromise, EqlDataSource, FetchedDataSource, SelectedFilters, WidgetType } from '../types';
 export declare const useDataSources: ({ type: widgetType, config, attributes, filters, layerParams, eqlParameters, }: {
     type?: WidgetType;
@@ -8,7 +8,7 @@ export declare const useDataSources: ({ type: widgetType, config, attributes, fi
     layerParams?: Record<string, string>;
     eqlParameters?: QueryLayerServiceConfigurationDc["eqlParameters"];
 }) => {
-    getDataSourcePromises: ({ ds, query, parameters, layerName, limit, condition, url, resourceId }: ConfigDataSource, newFilters?: SelectedFilters, offset?: number) => Promise<EqlDataSource | import('@evergis/api').PagedFeaturesListDc>;
+    getDataSourcePromises: ({ ds, query, parameters, layerName, limit, condition, url, resourceId }: ConfigDataSource, newFilters?: SelectedFilters, offset?: number) => Promise<EqlDataSource | PagedFeaturesListDc>;
     getUpdatingDataSources: () => ConfigDataSource[];
     getUpdatedDataSources: (responses: DataSourcePromise[], currentDataSources: ConfigDataSource[], otherDataSources: FetchedDataSource[]) => any;
     zoomToLayersExtent: (layers: Array<{

package/dist/core/index.d.ts

@@ -1,3 +1,2 @@
 export * from './classification';
-export * from './feature';
 export * from './icons';

package/dist/index.js

@@ -4258,11 +4258,11 @@ const getDataSource = (dataSourceName, dataSources) => dataSources?.find(({ name
 const getDataSourceFilterValue = ({ filterName, filterProp, attributeAlias, dataSource, selectedFilters, }) => {
     if (lodash.isNil(selectedFilters[filterName]))
         return null;
-    const feature = dataSource?.features?.find(({ attributes }) => attributes[attributeAlias] ===
+    const feature = dataSource?.features?.find(({ properties }) => properties[attributeAlias] ===
         (Array.isArray(selectedFilters[filterName].value)
             ? selectedFilters[filterName].value[0]
             : selectedFilters[filterName].value));
-    return feature?.attributes?.[filterProp];
+    return feature?.properties?.[filterProp];
 };
 
 const getSelectedFilterValue = (filterName, selectedFilters, defaultValue) => {
@@ -5179,73 +5179,6 @@ const useRedrawLayer = () => {
     }, [map]);
 };
 
-const findAttributeInExpression = (expression) => {
-    if (Array.isArray(expression) && expression.length === 2 && expression[0] === "get") {
-        return [expression[1]];
-    }
-    return expression.reduce((acc, curr) => {
-        if (!Array.isArray(curr)) {
-            return acc;
-        }
-        if (curr[0] === "get") {
-            return [...new Set([...acc, curr[1]])];
-        }
-        return [...new Set([...acc, ...findAttributeInExpression(curr)])];
-    }, []);
-};
-
-const getActualExtrusionHeight = (paint) => {
-    return Array.isArray(paint?.["fill-extrusion-height"]) && paint?.["fill-extrusion-height"][0] === "+"
-        ? paint?.["fill-extrusion-height"][1]
-        : paint?.["fill-extrusion-height"];
-};
-
-const extractAttributesFromObject = (obj) => {
-    if (!obj || lodash.isEmpty(obj)) {
-        return [];
-    }
-    return Object.entries(obj).reduce((acc, [, value]) => {
-        if (!Array.isArray(value)) {
-            return acc;
-        }
-        return [...new Set([...acc, ...findAttributeInExpression(value)])];
-    }, []);
-};
-const parseClientStyle = (style) => {
-    if (!style) {
-        return [];
-    }
-    return style?.items?.reduce((acc, curr) => {
-        const paintAttributes = extractAttributesFromObject(curr.paint);
-        const layoutAttributes = extractAttributesFromObject(curr.layout);
-        const filterAttributes = curr.filter
-            ? findAttributeInExpression(curr.filter)
-            : [];
-        return [...new Set([...acc, ...paintAttributes, ...layoutAttributes, ...filterAttributes])];
-    }, []);
-};
-
-const convertSpToTurfFeature = (geometry) => {
-    if (!geometry) {
-        return;
-    }
-    switch (geometry.type) {
-        case api.GeometryType.Point:
-            return turf.point(geometry.coordinates);
-        case api.GeometryType.Multipoint:
-            return turf.multiPoint(geometry.coordinates);
-        case api.GeometryType.Polyline:
-            return turf.multiLineString(geometry.coordinates);
-        case api.GeometryType.Polygon:
-        case api.GeometryType.Envelope:
-            return turf.polygon(geometry.coordinates);
-        case api.GeometryType.MultiPolygon:
-            return turf.multiPolygon(geometry.coordinates);
-        case api.GeometryType.GeometryCollection:
-            return turf.geometryCollection(geometry.geometries);
-    }
-};
-
 const useZoomToFeatures = () => {
     const { map } = useMapContext();
     return React.useCallback((features, padding) => {
@@ -5254,7 +5187,7 @@ const useZoomToFeatures = () => {
         }
         const currentFeatureCenter = turf.bbox({
             type: "FeatureCollection",
-            features: features.map(feature => convertSpToTurfFeature(feature.geometry)),
+            features: features,
         });
         map.current.fitBounds(currentFeatureCenter, { padding: padding ?? 150 });
     }, [map]);
@@ -5528,7 +5461,7 @@ const LayerTree = ({ layers, onlyMainTools }) => {
         page.layers = treeNodesToProjectItems(page.layers, updatedNodes);
         updateProject(newProjectInfo);
     }, [pageIndex, projectInfo, updateProject]);
-    return (jsxRuntime.jsx(uilibGl.DraggableTree, { nodes: nodes, disableDrag: onlyMainTools, options: { pastePlaceholderHeight: "0.0625rem" }, onUpdate: onUpdate }));
+    return (jsxRuntime.jsx(uilibGl.DraggableTree, { nodes: nodes, disableDrag: onlyMainTools, options: { pastePlaceholderHeight: "0.025rem" }, onUpdate: onUpdate }));
 };
 
 const LayersListWrapper = styled(uilibGl.Flex) `
@@ -5541,6 +5474,7 @@ const LayerListContainer = styled(uilibGl.Flex) `
   flex-grow: 1;
   height: 100%;
   box-sizing: border-box;
+  padding-top: 0.25rem;
 `;
 
 const ElementValueWrapper = styled.div `
@@ -5911,9 +5845,9 @@ function getValueIndex(items, attributes) {
 const getChartMarkers = (items, markers, dataSources) => {
     if (typeof markers === "string") {
         const dataSource = getDataSource(markers, dataSources);
-        return dataSource?.features?.map(({ attributes }) => ({
-            ...attributes,
-            value: getValueIndex(items, attributes),
+        return dataSource?.features?.map(({ properties }) => ({
+            ...properties,
+            value: getValueIndex(items, properties),
         })) || [];
     }
     return (markers?.map(marker => ({
@@ -6350,19 +6284,19 @@ const DataSourceProgressContainer = React.memo(({ config, elementConfig, type, i
     const totalUnits = React.useMemo(() => unitsElement?.type === "attributeUnits"
         ? attributes?.find(({ attributeName }) => attributeName === unitsElement.attributeName)?.stringFormat
             ?.unitsLabel
-        : dataSource?.features?.[0]?.attributes[unitsElement?.attributeName], [attributes, dataSource?.features, unitsElement?.attributeName, unitsElement?.type]);
+        : dataSource?.features?.[0]?.properties[unitsElement?.attributeName], [attributes, dataSource?.features, unitsElement?.attributeName, unitsElement?.type]);
     const totalValue = React.useMemo(() => {
         const attribute = attributes?.find(({ attributeName }) => attributeName === valueElement?.attributeName);
         const { type: attributeType, stringFormat } = attribute || {};
-        const result = dataSource?.features?.reduce((total, feature) => total + feature.attributes[valueElement?.attributeName], 0);
+        const result = dataSource?.features?.reduce((total, feature) => total + feature.properties[valueElement?.attributeName], 0);
         return formatAttributeValue({ t, type: attributeType, value: result, stringFormat, noUnits: !!unitsElement?.type });
     }, [attributes, dataSource?.features, unitsElement?.type, valueElement?.attributeName]);
     const currentMaxValue = React.useMemo(() => {
         if (typeof maxValue === "string") {
-            return dataSource?.features?.[0]?.attributes[maxValue];
+            return dataSource?.features?.[0]?.properties[maxValue];
         }
         return (maxValue ||
-            dataSource?.features?.reduce((result, item) => Math.max(result, item.attributes[valueElement?.attributeName]), 0));
+            dataSource?.features?.reduce((result, item) => Math.max(result, item.properties[valueElement?.attributeName]), 0));
     }, [dataSource?.features, maxValue, valueElement?.attributeName]);
     if (!relatedDataSource)
         return null;
@@ -7746,7 +7680,7 @@ const LayerIconContainer = styled.div `
   align-items: center;
   justify-content: center;
   min-width: 2rem;
-  margin-right: 0.75rem;
+  margin-right: 0.5rem;
 `;
 const AlertIconContainer = styled(uilibGl.Flex) `
   align-items: center;
@@ -8179,7 +8113,7 @@ const useCameraAttribute = (cameraId) => {
     // const { api } = useGlobalContext();
     const [currentIndex, setCurrentIndex] = React.useState(0);
     const [currentPage, setCurrentPage] = React.useState(0);
-    const [timeline, /* setTimeline*/] = React.useState([]);
+    const [timeline, /* setTimeline*/] = React.useState /* <ArchiveTimelineItemDc[]>*/([]);
     const [isLoadingSnapshot, setLoadingSnapshot] = React.useState(false);
     const [isLoadingTimeline, setLoadingTimeline] = React.useState(false);
     const [isOpenGallery, toggleGallery] = useToggle();
@@ -8323,8 +8257,8 @@ const ElementControl = ({ elementConfig }) => {
             return [];
         }
         return dataSource.features.map(item => ({
-            value: item.attributes?.[attributeName] || "",
-            text: item.attributes?.[control?.attributeAlias || attributeName] || "",
+            value: item.properties?.[attributeName] || "",
+            text: item.properties?.[control?.attributeAlias || attributeName] || "",
         }));
     }, [control?.attributeAlias, dataSource?.features, attributeName]);
     const isDisabled = React.useMemo(() => {
@@ -8652,7 +8586,7 @@ const ElementSlideshow = ({ elementConfig, type, renderElement }) => {
     const images = React.useMemo(() => {
         const dataSource = relatedDataSource ? dataSources?.find(({ name }) => name === relatedDataSource) : null;
         const array = dataSource
-            ? dataSource.features.map(feature => feature.attributes[attributeName])
+            ? dataSource.features.map(feature => feature.properties[attributeName])
             : getSlideshowImages({
                 element: elementConfig,
                 attribute: attributes?.find(({ name }) => name === attributeName),
@@ -9045,7 +8979,7 @@ function getFeatureAttributes(feature = {}, layer, dataSource) {
     if (!layerDefinition) {
         return [];
     }
-    const currentAttributes = !feature && dataSource ? dataSource.features[0].attributes : feature?.attributes;
+    const currentAttributes = !feature && dataSource ? dataSource.features[0].properties : feature?.properties;
     const { id: idValue } = feature || {};
     const { idAttribute, attributes } = layerDefinition || {};
     const layerAttributes = idAttribute
@@ -9062,7 +8996,7 @@ function getFeatureAttributes(feature = {}, layer, dataSource) {
                 readOnly: true,
             }
             : {
-                value: currentAttributes?.[attributeName] || dataSource?.features?.[0]?.attributes?.[attributeName],
+                value: currentAttributes?.[attributeName] || dataSource?.features?.[0]?.properties?.[attributeName],
                 readOnly: isCalculated || !isEditable,
             };
         const clientData = layer.layerAttributes?.find(layerAttribute => layerAttribute.attributeName === attributeName)?.clientData;
@@ -9234,10 +9168,10 @@ const getListOptions = (items, filterName, configFilters) => {
     if (!filter)
         return [];
     return (items?.map(item => ({
-        text: item.attributes[filter.attributeAlias || DEFAULT_ATTRIBUTE_NAME],
-        value: item.attributes[filter.attributeValue || DEFAULT_ATTRIBUTE_NAME],
-        min: filter.attributeMin ? item.attributes[filter.attributeMin] : null,
-        max: filter.attributeMax ? item.attributes[filter.attributeMax] : null,
+        text: item.properties[filter.attributeAlias || DEFAULT_ATTRIBUTE_NAME],
+        value: item.properties[filter.attributeValue || DEFAULT_ATTRIBUTE_NAME],
+        min: filter.attributeMin ? item.properties[filter.attributeMin] : null,
+        max: filter.attributeMax ? item.properties[filter.attributeMax] : null,
     })) || []);
 };
 
@@ -9549,8 +9483,8 @@ const RangeDateFilter = ({ type, filter }) => {
     const { filterName, label, minValue, maxValue, withTime } = filter.options;
     const configFilter = React.useMemo(() => getConfigFilter(filterName, configFilters), [configFilters, filterName]);
     const dataSource = React.useMemo(() => getDataSource(configFilter?.relatedDataSource, dataSources), [configFilter?.relatedDataSource, dataSources]);
-    const { minFromData, maxFromData } = React.useMemo(() => dataSource?.features?.reduce((prev, { attributes }) => {
-        const date = getDate(attributes[configFilter?.attributeValue]);
+    const { minFromData, maxFromData } = React.useMemo(() => dataSource?.features?.reduce((prev, { properties }) => {
+        const date = getDate(properties[configFilter?.attributeValue]);
         return {
             minFromData: !prev.minFromData ? date : date < prev.minFromData ? date : prev.minFromData,
             maxFromData: !prev.maxFromData ? date : date > prev.maxFromData ? date : prev.maxFromData
@@ -9771,7 +9705,7 @@ const ChipsFilter = ({ type, filter, elementConfig, }) => {
             return [];
         const features = dataSource.features;
         return features.map(feature => {
-            const attrs = feature.attributes;
+            const attrs = feature.properties;
             const text = attrs[configFilter.attributeAlias || DEFAULT_ATTRIBUTE_NAME];
             const value = attrs[configFilter.attributeValue || DEFAULT_ATTRIBUTE_NAME];
             const chipIcon = iconAttribute
@@ -10476,7 +10410,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
             const queryResponse = await api.eql.getPagedQueryResult({ saveInHistory: false }, getProps);
             const descriptionResponse = await api.eql.getQueryDescription(getProps);
             return {
-                items: queryResponse.items,
+                items: queryResponse.features,
                 attributeDefinition: descriptionResponse,
             };
         }
@@ -10524,7 +10458,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                 !!currentDataSources[index].url ||
                 !!currentDataSources[index].resourceId;
             newDataSources[index].layerName = currentDataSources[index].layerName;
-            const items = response.status === "rejected" ? null : response.value?.items || response.items;
+            const items = response.status === "rejected" ? null : response.value?.features || response.items;
             newDataSources[index].features =
                 response.status === "rejected"
                     ? null
@@ -10955,7 +10889,7 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
                     const attribute = layerInfo?.layerDefinition.attributes[attributeName];
                     const dataSource = getDataSource(dataSourceName, dataSources);
                     const units = attributeUnits
-                        ? dataSource?.features?.[0]?.attributes?.[attributeUnits]
+                        ? dataSource?.features?.[0]?.properties?.[attributeUnits]
                         : attribute?.stringFormat?.unitsLabel;
                     const formatValue = attribute
                         ? formatAttributeValue({ t, type: attribute.type, value, stringFormat: attribute.stringFormat, noUnits: true })
@@ -11554,6 +11488,52 @@ const getClientStyleItemPrefixSuffix = (geometryType, itemType) => {
     }
 };
 
+const findAttributeInExpression = (expression) => {
+    if (Array.isArray(expression) && expression.length === 2 && expression[0] === "get") {
+        return [expression[1]];
+    }
+    return expression.reduce((acc, curr) => {
+        if (!Array.isArray(curr)) {
+            return acc;
+        }
+        if (curr[0] === "get") {
+            return [...new Set([...acc, curr[1]])];
+        }
+        return [...new Set([...acc, ...findAttributeInExpression(curr)])];
+    }, []);
+};
+
+const getActualExtrusionHeight = (paint) => {
+    return Array.isArray(paint?.["fill-extrusion-height"]) && paint?.["fill-extrusion-height"][0] === "+"
+        ? paint?.["fill-extrusion-height"][1]
+        : paint?.["fill-extrusion-height"];
+};
+
+const extractAttributesFromObject = (obj) => {
+    if (!obj || lodash.isEmpty(obj)) {
+        return [];
+    }
+    return Object.entries(obj).reduce((acc, [, value]) => {
+        if (!Array.isArray(value)) {
+            return acc;
+        }
+        return [...new Set([...acc, ...findAttributeInExpression(value)])];
+    }, []);
+};
+const parseClientStyle = (style) => {
+    if (!style) {
+        return [];
+    }
+    return style?.items?.reduce((acc, curr) => {
+        const paintAttributes = extractAttributesFromObject(curr.paint);
+        const layoutAttributes = extractAttributesFromObject(curr.layout);
+        const filterAttributes = curr.filter
+            ? findAttributeInExpression(curr.filter)
+            : [];
+        return [...new Set([...acc, ...paintAttributes, ...layoutAttributes, ...filterAttributes])];
+    }, []);
+};
+
 const VectorLayer = ({ layer, tileUrl, visible, beforeId, getLayerTempStyle, filterVersion, }) => {
     const clientStyle = layer?.configuration?.clientStyle;
     const { idAttribute, geometryType } = layer.layerDefinition || {};
@@ -11903,7 +11883,6 @@ exports.applyQueryFilters = applyQueryFilters;
 exports.applyVarsToCondition = applyVarsToCondition;
 exports.checkEqualOrIncludes = checkEqualOrIncludes;
 exports.checkIsLoading = checkIsLoading;
-exports.convertSpToTurfFeature = convertSpToTurfFeature;
 exports.createConfigLayer = createConfigLayer;
 exports.createConfigPage = createConfigPage;
 exports.createNewPageId = createNewPageId;