@evergis/react 4.0.113 → 4.0.114

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

@@ -66,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

@@ -3806,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) {
@@ -3934,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;
@@ -3945,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);
     }
@@ -3954,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);
@@ -14177,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) {