@evergis/react 4.0.112 → 4.0.114

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

@@ -23,6 +23,7 @@ export declare enum ProviderPrefix {
 export declare const FILTERED_VALUE_OPACITY = 28;
 export declare const DEFAULT_ATTRIBUTE_NAME = "name";
 export declare const DEFAULT_DATA_SOURCE_LIMIT = 100;
+export declare const QUERY_DESCRIPTION_CACHE_TTL = 60000;
 export declare const LEFT_PANEL_HEADER_HEIGHT = "9.1875rem";
 export declare const DEFAULT_BASE_MAP = "Mapbox_Light";
 export declare const DEFAULT_LNG = 37.618423;

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

@@ -4,8 +4,9 @@ import { i18n } from 'i18next';
 import { PieChartData, BarChartMarker } from '@evergis/charts';
 import { IconTypesKeys, IOption } from '@evergis/uilib-gl';
 import { CircleLayerSpecification, FillLayerSpecification, LineLayerSpecification } from 'maplibre-gl';
-import { AttributeFormatConfigurationDc, AttributeType, EqlRequestDc, FeatureDc, OgcGeometryType, PagedFeaturesListDc, PositionDc, QueryLayerServiceInfoDc, RemoteTaskStatus, StringSubType, AttributesConfigurationDc } from '@evergis/api';
+import { AttributeType, EqlRequestDc, FeatureDc, OgcGeometryType, PagedFeaturesListDc, PositionDc, QueryLayerServiceInfoDc, RemoteTaskStatus, StringSubType, AttributesConfigurationDc } from '@evergis/api';
 import { FeatureAttributeValue, EditGeometryType, ThemeName } from '../../types';
+import { AttributeFormatConfiguration } from '../../utils/format';
 import { InnerContainerProps } from './containers/DataSourceInnerContainer/types';
 export * from './componentTypes';
 export * from './branded';
@@ -388,7 +389,7 @@ export interface ConfigDataSourceAttribute {
     alias?: string;
     type?: AttributeType;
     description?: string;
-    stringFormat?: AttributeFormatConfigurationDc;
+    stringFormat?: AttributeFormatConfiguration;
 }
 export interface ConfigDataSource {
     name: string;
@@ -669,6 +670,6 @@ export type ClientFeatureAttribute = {
     type: AttributeType;
     readOnly?: boolean;
     subType?: StringSubType;
-    stringFormat?: AttributeFormatConfigurationDc;
+    stringFormat?: AttributeFormatConfiguration;
     clientData?: unknown;
 };

package/dist/components/Dashboard/utils/fetchQueryDescription.d.ts

@@ -0,0 +1,8 @@
+import { Api } from '@evergis/api';
+type QueryDescriptionRequest = {
+    ds?: string;
+    query?: string;
+    parameters?: Record<string, unknown>;
+};
+export declare const fetchQueryDescription: (api: Api, { ds, query, parameters }: QueryDescriptionRequest) => Promise<(import('@evergis/api').AttributeConfigurationDc | import('@evergis/api').CalculatedAttributeConfigurationDc | import('@evergis/api').GeometryAttributeConfigurationDc | import('@evergis/api').StringAttributeConfigurationDc)[]>;
+export {};

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

@@ -10,6 +10,7 @@ export * from './createNewPageId';
 export * from './eqlParametersToPayload';
 export * from './formatChartRelatedValue';
 export * from './formatConditionValue';
+export * from './fetchQueryDescription';
 export * from './formatDataSourceCondition';
 export * from './formatElementValue';
 export * from './getAttributeByName';
@@ -65,7 +66,6 @@ export * from './mergeAttributeConfigurations';
 export * from './pieChartTooltipFromAttributes';
 export * from './pieChartTooltipFromRelatedFeatures';
 export * from './removeDataSource';
-export * from './roundTotalSum';
 export * from './updateDataSource';
 export * from './sliceShownOtherItems';
 export * from './toCssSize';

package/dist/index.js

@@ -3502,6 +3502,7 @@ exports.ProviderPrefix = void 0;
 const FILTERED_VALUE_OPACITY = 28;
 const DEFAULT_ATTRIBUTE_NAME = "name";
 const DEFAULT_DATA_SOURCE_LIMIT = 100;
+const QUERY_DESCRIPTION_CACHE_TTL = 60000;
 const LEFT_PANEL_HEADER_HEIGHT = "9.1875rem";
 const DEFAULT_BASE_MAP = "Mapbox_Light";
 const DEFAULT_LNG = 37.618423;
@@ -3805,6 +3806,22 @@ const debounce = (callback, delay) => {
     };
 };
 
+const MILLION = 1000000;
+const TEN_THOUSANDS = 10000;
+const THOUSAND = 1000;
+const FRACTION_DIGITS = 1;
+const roundTotalSum = (value) => {
+    if (!value)
+        return "";
+    if (value >= MILLION) {
+        return `${(value / MILLION).toFixed(FRACTION_DIGITS)}M`;
+    }
+    if (value >= TEN_THOUSANDS) {
+        return `${(value / THOUSAND).toFixed(FRACTION_DIGITS)}K`;
+    }
+    return value;
+};
+
 const TIME_ZONE_FORMAT = ' "GMT"z'; // eslint-disable-line
 exports.ScalingFactor = void 0;
 (function (ScalingFactor) {
@@ -3933,8 +3950,9 @@ const formatDateValue = (stringFormat, dateValue) => {
     const timeFormat = (timeOptionValue && dateFns.format(value, showTimeZone ? `${timeOptionValue} zz` : timeOptionValue)) || "";
     return dateFormat ? `${dateFormat} ${timeFormat}` : "";
 };
+const appendUnitsLabel = (value, unitsLabel, noUnits) => (unitsLabel && !noUnits ? `${value} ${unitsLabel}` : value)?.toString() || "";
 const formatNumberValue = (stringFormat, value, type, noUnits = false) => {
-    const { scalingFactor, rounding, splitDigitGroup, unitsLabel } = stringFormat || {};
+    const { scalingFactor, rounding, splitDigitGroup, roundDigitGroup, unitsLabel } = stringFormat || {};
     const isIntValue = [api.AttributeType.Int32, api.AttributeType.Int64].includes(type);
     const isDefaultScaling = stringFormat && stringFormat.scalingFactor === +numberOptions[0].value;
     let currentValue = value;
@@ -3944,6 +3962,10 @@ const formatNumberValue = (stringFormat, value, type, noUnits = false) => {
     if (scalingFactor) {
         currentValue *= scalingFactor;
     }
+    const compactValue = roundDigitGroup ? roundTotalSum(Number(currentValue)) : null;
+    if (typeof compactValue === "string" && compactValue) {
+        return appendUnitsLabel(compactValue, unitsLabel, noUnits);
+    }
     if ((rounding || rounding === 0) && (!isIntValue || (isIntValue && !isDefaultScaling))) {
         currentValue = currentValue && Number(currentValue).toFixed(rounding);
     }
@@ -3953,10 +3975,7 @@ const formatNumberValue = (stringFormat, value, type, noUnits = false) => {
     if (currentValue) {
         currentValue = currentValue.toString().replace(".", ",");
     }
-    if (unitsLabel && !noUnits) {
-        currentValue = `${currentValue} ${unitsLabel}`;
-    }
-    return currentValue?.toString() || "";
+    return appendUnitsLabel(currentValue, unitsLabel, noUnits);
 };
 const formatAttributeValue = ({ t, type, value, stringFormat, noUnits = false }) => {
     const isNilValue = lodash.isNil(value);
@@ -4330,6 +4349,25 @@ const formatChartRelatedValue = (t, value, layerInfo, relatedAttributes) => {
         : value;
 };
 
+const descriptionCache = new Map();
+const fetchQueryDescription = (api, { ds, query, parameters }) => {
+    const key = JSON.stringify([ds ?? null, query ?? null]);
+    const cached = descriptionCache.get(key);
+    if (cached && Date.now() - cached.requestedAt < QUERY_DESCRIPTION_CACHE_TTL) {
+        return cached.request;
+    }
+    const request = api.eql
+        .getQueryDescription({ ds, query, parameters })
+        .then(description => description)
+        .catch(error => {
+        if (descriptionCache.get(key)?.request === request)
+            descriptionCache.delete(key);
+        throw error;
+    });
+    descriptionCache.set(key, { requestedAt: Date.now(), request });
+    return request;
+};
+
 const applyFiltersToCondition = ({ condition, name, defaultValue, filters, isSingle, isSetParams, }) => {
     const rawValue = filters[name] !== undefined ? filters[name].value : defaultValue;
     if (isTreeFilterValue(rawValue)) {
@@ -7093,8 +7131,10 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
             };
             const newSignature = JSON.stringify(["eql", ds, query, newParams, offset, limit]);
             return dedupe(newSignature, async () => {
-                const queryResponse = await api.eql.getPagedQueryResult({ saveInHistory: false }, getProps);
-                const descriptionResponse = await api.eql.getQueryDescription(getProps);
+                const [queryResponse, descriptionResponse] = await Promise.all([
+                    api.eql.getPagedQueryResult({ saveInHistory: false }, getProps),
+                    fetchQueryDescription(api, { ds, query, parameters: newParams }),
+                ]);
                 return {
                     items: queryResponse.features,
                     attributes: descriptionResponse,
@@ -7128,9 +7168,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
         dataSources,
         configFilters,
         ewktGeometry,
-        api.layers,
-        api.remoteTaskManager,
-        api.eql,
+        api,
         attributes,
         layerParams,
         layerInfo,
@@ -14157,22 +14195,6 @@ const removeDataSource = (dashboardConfiguration, name, pageIndex) => {
     return newConfig;
 };
 
-const BILLION = 1000000;
-const TEN_THOUSANDS = 10000;
-const THOUSAND = 1000;
-const FRACTION_DIGITS = 1;
-const roundTotalSum = (value) => {
-    if (!value)
-        return "";
-    if (value >= BILLION) {
-        return `${(value / BILLION).toFixed(FRACTION_DIGITS)}M`;
-    }
-    if (value >= TEN_THOUSANDS) {
-        return `${(value / THOUSAND).toFixed(FRACTION_DIGITS)}K`;
-    }
-    return value;
-};
-
 const updateDataSource = (dashboardConfiguration, name, pageIndex, data) => {
     const newConfig = JSON.parse(JSON.stringify(dashboardConfiguration));
     if (newConfig.dataSources?.length) {
@@ -15337,6 +15359,7 @@ exports.PresentationPanelContainer = PresentationPanelContainer;
 exports.PresentationPanelWrapper = PresentationPanelWrapper;
 exports.PresentationWrapper = PresentationWrapper;
 exports.ProgressContainer = ProgressContainer;
+exports.QUERY_DESCRIPTION_CACHE_TTL = QUERY_DESCRIPTION_CACHE_TTL;
 exports.RoundedBackgroundContainer = RoundedBackgroundContainer;
 exports.SAVE_HOOK_RESULT_DURATION = SAVE_HOOK_RESULT_DURATION;
 exports.SERVER_NOTIFICATION_EVENT = SERVER_NOTIFICATION_EVENT;
@@ -15390,6 +15413,7 @@ exports.decimalOpacityToHex = decimalOpacityToHex;
 exports.enrichStyleItemsWithIds = enrichStyleItemsWithIds;
 exports.enrichStyleModelsWithIds = enrichStyleModelsWithIds;
 exports.eqlParametersToPayload = eqlParametersToPayload;
+exports.fetchQueryDescription = fetchQueryDescription;
 exports.findAttributeInExpression = findAttributeInExpression;
 exports.formatArea = formatArea;
 exports.formatAttributeValue = formatAttributeValue;