@evergis/react 4.0.112 → 4.0.113

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/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';

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;
@@ -4330,6 +4331,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 +7113,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 +7150,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
         dataSources,
         configFilters,
         ewktGeometry,
-        api.layers,
-        api.remoteTaskManager,
-        api.eql,
+        api,
         attributes,
         layerParams,
         layerInfo,
@@ -15337,6 +15357,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 +15411,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;