@evergis/react 4.0.7 → 4.0.8

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

@@ -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, fileName, methodName }: ConfigDataSource, newFilters?: SelectedFilters, offset?: number) => Promise<EqlDataSource | PagedFeaturesListDc>;
+    getDataSourcePromises: ({ ds, query, parameters, layerName, limit, condition, url, resourceId, fileName, methodName, }: ConfigDataSource, newFilters?: SelectedFilters, offset?: number) => Promise<EqlDataSource | PagedFeaturesListDc>;
     getUpdatingDataSources: () => ConfigDataSource[];
     getUpdatedDataSources: (responses: DataSourcePromise[], currentDataSources: ConfigDataSource[], otherDataSources: FetchedDataSource[]) => any;
     zoomToLayersExtent: (layers: Array<{

package/dist/index.js

@@ -3950,6 +3950,9 @@ const useFetchWithAuth = (url, transform, cleanup) => {
         })
             .then(res => (res.ok ? transformRef.current(res) : null))
             .then(setData)
+            .catch(() => {
+            setData(null);
+        })
             .finally(() => {
             loadingRef.current = false;
         });
@@ -4402,13 +4405,13 @@ const applyQueryFilters = ({ parameters: configParameters, filters: configFilter
         if (configParameters[key].endsWith(".max")) {
             return {
                 ...result,
-                [key]: selectedFilters?.[filterName]?.max ?? defaultValue,
+                [key]: selectedFilters?.[filterName]?.max ?? (Array.isArray(defaultValue) ? defaultValue[1] : defaultValue),
             };
         }
         if (configParameters[key].endsWith(".min")) {
             return {
                 ...result,
-                [key]: selectedFilters?.[filterName]?.min ?? defaultValue,
+                [key]: selectedFilters?.[filterName]?.min ?? (Array.isArray(defaultValue) ? defaultValue[0] : defaultValue),
             };
         }
         if (configParameters[key].includes(".")) {
@@ -10705,12 +10708,13 @@ const useDashboardHeader = () => {
     };
 };
 
+/* eslint-disable max-lines */
 const useDataSources = ({ type: widgetType, config, attributes, filters, layerParams, eqlParameters, }) => {
     const { ewktGeometry, api } = useGlobalContext();
     const { dataSources } = useWidgetContext(widgetType);
     const { filters: configFilters, dataSources: configDataSources } = config || {};
     const prevFilters = React.useRef({});
-    const getDataSourcePromises = React.useCallback(async ({ ds, query, parameters, layerName, limit, condition, url, resourceId, fileName, methodName }, newFilters, offset = 0) => {
+    const getDataSourcePromises = React.useCallback(async ({ ds, query, parameters, layerName, limit, condition, url, resourceId, fileName, methodName, }, newFilters, offset = 0) => {
         const selectedFilters = {
             ...(filters || {}),
             ...(newFilters || {}),
@@ -10725,7 +10729,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                     parameters,
                     ...(fileName && { fileName }),
                     ...(methodName && { methodName }),
-                }
+                },
             });
             if (response.error) {
                 throw new Error(response.error.message);
@@ -10740,19 +10744,27 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
             geometry: ewktGeometry,
         });
         if (url) {
-            const response = await fetch(url, {
-                method: "POST",
-                headers: {
-                    Accept: "application/json",
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify(newParams),
-            });
-            const json = await response.json();
-            return {
-                items: json.result.items,
-                attributeDefinition: json.result.attributeDefinition,
-            };
+            try {
+                const response = await fetch(url, {
+                    method: "POST",
+                    headers: {
+                        Accept: "application/json",
+                        "Content-Type": "application/json",
+                    },
+                    body: JSON.stringify(newParams),
+                });
+                if (!response.ok) {
+                    throw new Error(`HTTP error: ${response.status}`);
+                }
+                const json = await response.json();
+                return {
+                    items: json.result.items,
+                    attributeDefinition: json.result.attributeDefinition,
+                };
+            }
+            catch (error) {
+                throw error instanceof Error ? error : new Error(String(error));
+            }
         }
         if (!layerName) {
             const getProps = {
@@ -10788,11 +10800,23 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                 ]
                 : [condition, query].filter(Boolean),
         });
-    }, [filters, dataSources, configFilters, ewktGeometry, attributes, layerParams, eqlParameters]);
+    }, [
+        filters,
+        dataSources,
+        configFilters,
+        ewktGeometry,
+        api.layers,
+        api.remoteTaskManager,
+        api.eql,
+        attributes,
+        layerParams,
+        eqlParameters,
+    ]);
     const getUpdatingDataSources = React.useCallback(() => {
         const diffFilterNames = filters
             ? Object.keys(filters).filter(key => Array.isArray(filters[key].value)
-                ? filters[key].value.length !== prevFilters.current[key]?.value?.length ||
+                ? filters[key].value.length !==
+                    prevFilters.current[key]?.value?.length ||
                     filters[key].value.some((item, index) => item !== prevFilters.current[key]?.value?.[index])
                 : filters[key].value !== prevFilters.current[key]?.value)
             : [];
@@ -10815,7 +10839,8 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
             newDataSources[index].layerName = currentDataSources[index].layerName;
             const items = response.status === "rejected"
                 ? null
-                : response.value?.features || response.value?.items;
+                : response.value?.features ||
+                    response.value?.items;
             newDataSources[index].features =
                 response.status === "rejected"
                     ? null
@@ -10827,13 +10852,18 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
                         }))
                         : items;
             newDataSources[index].attributeDefinition =
-                response.status === "rejected" || (!isQueryDataSource && !isPythonDataSource)
+                response.status === "rejected" ||
+                    (!isQueryDataSource && !isPythonDataSource)
                     ? null
-                    : response.value?.attributeDefinition ||
+                    : response.value
+                        ?.attributeDefinition ||
                         (isPythonDataSource && items?.[0]?.properties
                             ? Object.fromEntries(Object.entries(items[0].properties).map(([key, val]) => [
                                 key,
-                                { type: typeof val === "number" ? "Float" : "String", isDisplayed: true },
+                                {
+                                    type: typeof val === "number" ? "Float" : "String",
+                                    isDisplayed: true,
+                                },
                             ]))
                             : null);
         });
@@ -10859,7 +10889,7 @@ const useDataSources = ({ type: widgetType, config, attributes, filters, layerPa
           position: bbox.center,
           resolution: map.getAdjustedResolution(resolution),
         });*/
-    }, []);
+    }, [api.layers]);
     return {
         getDataSourcePromises,
         getUpdatingDataSources,