@opengeoweb/time-series 14.3.0 → 14.4.0

package/index.esm.js

@@ -6,7 +6,7 @@ import { mapUtils, selectorMemoizationOptions, genericSelectors, uiSelectors, ui
 import { snackbarActions, snackbarTypes, snackbarListener, snackbarReducer } from '@opengeoweb/snackbar';
 import { dateUtils, CustomTooltip, CustomToggleButton, TooltipSelect, CustomIconButton, CustomAccordion, ToolContainerDraggable, SearchHighlight, SearchField, ToggleMenu, CustomDialog, AlertBanner, useConfirmationDialog, SwitchButton, useResizeObserver } from '@opengeoweb/shared';
 import { MenuItem, useTheme, LinearProgress, Grid, Box, Typography, ClickAwayListener, Input, Collapse, ListItem, ListItemButton, ListItemText, List, Button, InputAdornment, Card, styled, Stack, Tooltip, ListItemIcon, Checkbox } from '@mui/material';
-import { isString, trim, trimStart, compact, chain, groupBy, sortBy, uniqBy, isEqual } from 'lodash';
+import { isString, trim, trimStart, compact, chain, groupBy, countBy, sortBy, uniqBy, isEqual } from 'lodash';
 import { ReactSortable } from 'react-sortablejs';
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
@@ -141,6 +141,7 @@ var en = {
 	"timeseries-legend-tooltip-show": "Show legend",
 	"timeseries-legend-tooltip-hide": "Hide legend",
 	"error-title": "Some parameters could not be loaded.",
+	"error-message-missing-collection-or-service": "No collection and/or service found for parameter.",
 	"timeseries-add-plot": "Add plot"
 };
 var fi = {
@@ -252,6 +253,7 @@ var fi = {
 	"timeseries-legend-tooltip-show": "Näytä selite",
 	"timeseries-legend-tooltip-hide": "Piilota selite",
 	"error-title": "Joitain parametreja ei pystytty lataamaan",
+	"error-message-missing-collection-or-service": "Parametrille ei löytynyt kokoelmaa ja/tai palvelua",
 	"timeseries-add-plot": "Lisää kaavio"
 };
 var no = {
@@ -362,7 +364,8 @@ var no = {
 	"timeseries-legend": "Forklaring",
 	"timeseries-legend-tooltip-show": "Vis forklaring",
 	"timeseries-legend-tooltip-hide": "Skjul forklaring",
-	"error-title": "ikke oversatt",
+	"error-title": "Noen parametere kunne ikke lastes.",
+	"error-message-missing-collection-or-service": "Ingen kolleksjon og/eller tjeneste funnet for parameter.",
 	"timeseries-add-plot": "Legg til plott"
 };
 var nl = {
@@ -479,6 +482,7 @@ var nl = {
 	"timeseries-legend-tooltip-show": "Toon legenda",
 	"timeseries-legend-tooltip-hide": "Verberg legenda",
 	"error-title": "Sommige parameters konden niet worden geladen.",
+	"error-message-missing-collection-or-service": "Geen collectie en/of service gevonden voor parameter.",
 	"timeseries-add-plot": "Grafiek toevoegen"
 };
 var timeseriesTranslations = {
@@ -2775,7 +2779,7 @@ var useGetCollectionsAndInstanceDetails = function useGetCollectionsAndInstanceD
     }
   });
 };
-var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selectedLocation, services, splitGeoJsonByCollection) {
+var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selectedLocation, services, splitGeoJsonByCollection, t) {
   var _useState = useState([]),
     plotsWithData = _useState[0],
     setPlotsWithData = _useState[1];
@@ -2785,7 +2789,8 @@ var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selecte
   }, [plotsWithoutData, services]);
   // First fetch collection and any relevant instance data
   var _useGetCollectionsAnd = useGetCollectionsAndInstanceDetails(collectionsList),
-    collectionDetails = _useGetCollectionsAnd.data;
+    collectionDetails = _useGetCollectionsAnd.data,
+    isDetailsFetching = _useGetCollectionsAnd.isFetching;
   var geojsonMap = useMemo(function () {
     return new Map(splitGeoJsonByCollection.map(function (gjs) {
       return [gjs.serviceName + "_" + gjs.collectionName, gjs];
@@ -2794,8 +2799,9 @@ var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selecte
   // Construct all queries to be executed
   var queries = useMemo(function () {
     return plotsWithoutData.parameters.map(function (parameter) {
-      var _collection$allInstan, _parameter$dimension;
-      var service = collectionsList[parameter.serviceId + "-" + parameter.collectionId].service;
+      var _collectionsList, _collection$allInstan, _parameter$dimension;
+      // Note: service can be undefined
+      var service = (_collectionsList = collectionsList[parameter.serviceId + "-" + parameter.collectionId]) == null ? void 0 : _collectionsList.service;
       var collection = collectionDetails == null ? void 0 : collectionDetails.find(function (collection) {
         return collection.serviceId === parameter.serviceId && collection.collectionId === parameter.collectionId;
       });
@@ -2815,11 +2821,11 @@ var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selecte
             return _regeneratorRuntime().wrap(function _callee7$(_context7) {
               while (1) switch (_context7.prev = _context7.next) {
                 case 0:
-                  if (collection) {
+                  if (!(!collection || !service)) {
                     _context7.next = 2;
                     break;
                   }
-                  throw new Error('No collection found for parameter');
+                  throw new Error('error-message-missing-collection-or-service');
                 case 2:
                   _context7.next = 4;
                   return fetchEdrParameter(parameter, selectedLocation, service, geojsonMap, intervalParam, collection, instanceInfo);
@@ -2837,12 +2843,15 @@ var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selecte
           }
           return queryFn;
         }(),
-        enabled: !!parameter && !!selectedLocation.lon && !!selectedLocation.lat && !!service && !!collection,
+        enabled: !!parameter && !!selectedLocation.lon && !!selectedLocation.lat && (
+        // This condition allows us to see errors about missing collections/services
+        // that can not be explained by unfinished previous queries
+        !isDetailsFetching || !!collection && !!service),
         refetchInterval: 5 * 60 * 1000,
         retry: false
       };
     });
-  }, [collectionDetails, geojsonMap, plotsWithoutData.parameters, selectedLocation, collectionsList]);
+  }, [collectionDetails, geojsonMap, plotsWithoutData.parameters, selectedLocation, collectionsList, isDetailsFetching]);
   var results = useQueries({
     queries: queries,
     combine: function combine(results) {
@@ -2854,10 +2863,15 @@ var useGetPlotsWithData = function useGetPlotsWithData(plotsWithoutData, selecte
       var isFetching = results.some(function (result) {
         return result.isFetching;
       });
-      var errorMessage = results.map(function (result) {
+      var errorsWithCount = countBy(results.map(function (result) {
         var _result$error;
         return result == null || (_result$error = result.error) == null ? void 0 : _result$error.message;
-      }).filter(Boolean).join(', ');
+      }).filter(Boolean));
+      var errorMessage = Object.entries(errorsWithCount).map(function (_ref) {
+        var message = _ref[0],
+          count = _ref[1];
+        return "\"" + t(message) + "\" (x" + count + ")";
+      }).join(', ');
       var error = errorMessage ? new Error(errorMessage) : null;
       return {
         data: data,
@@ -7158,7 +7172,7 @@ var TimeSeriesView = /*#__PURE__*/React__default.memo(function (_ref) {
     onToggleLegendParam = _ref.onToggleLegendParam;
   var _useTimeseriesTransla = useTimeseriesTranslation(),
     t = _useTimeseriesTransla.t;
-  var _useGetPlotsWithData = useGetPlotsWithData(plotPreset, selectedLocation, services, splitGeoJsonByCollection),
+  var _useGetPlotsWithData = useGetPlotsWithData(plotPreset, selectedLocation, services, splitGeoJsonByCollection, t),
     plotsWithData = _useGetPlotsWithData.data,
     isFetchingPlots = _useGetPlotsWithData.isFetching,
     error = _useGetPlotsWithData.error;
@@ -7176,7 +7190,7 @@ var TimeSeriesView = /*#__PURE__*/React__default.memo(function (_ref) {
     },
     children: [error && jsx(AlertBanner, {
       title: t('error-title'),
-      info: "\"" + error.message + "\"",
+      info: "" + error.message,
       shouldClose: true
     }), plotsWithData && jsx(TimeSeriesChart, {
       plotsWithData: plotsWithData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/time-series",
-  "version": "14.3.0",
+  "version": "14.4.0",
   "description": "GeoWeb time-series library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -9,26 +9,26 @@
   },
   "dependencies": {
     "immer": "^10.0.3",
-    "@opengeoweb/shared": "14.3.0",
+    "@opengeoweb/shared": "14.4.0",
     "@reduxjs/toolkit": "^2.6.1",
     "react-redux": "^9.2.0",
-    "@opengeoweb/webmap": "14.3.0",
-    "@opengeoweb/webmap-react": "14.3.0",
+    "@opengeoweb/webmap": "14.4.0",
+    "@opengeoweb/webmap-react": "14.4.0",
     "lodash": "^4.17.21",
-    "@opengeoweb/api": "14.3.0",
-    "@opengeoweb/theme": "14.3.0",
-    "@opengeoweb/store": "14.3.0",
+    "@opengeoweb/api": "14.4.0",
+    "@opengeoweb/theme": "14.4.0",
+    "@opengeoweb/store": "14.4.0",
     "echarts-for-react": "^3.0.2",
     "echarts": "^5.4.3",
     "react-sortablejs": "^6.1.4",
-    "@opengeoweb/snackbar": "14.3.0",
+    "@opengeoweb/snackbar": "14.4.0",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.21",
     "msw": "^2.7.3",
     "i18next": "^25.0.1",
     "react-i18next": "^15.1.1",
-    "@opengeoweb/core": "14.3.0",
-    "@opengeoweb/form-fields": "14.3.0",
+    "@opengeoweb/core": "14.4.0",
+    "@opengeoweb/form-fields": "14.4.0",
     "@mui/material": "^7.0.1",
     "react-hook-form": "^7.61.1",
     "uuid": "^10.0.0",

package/src/lib/utils/timeseries-api/hooks.d.ts

@@ -5,6 +5,7 @@ import { EDRServiceInformation } from './api';
 import { TimeseriesCollectionDetail } from '../../components/TimeSeriesSelect/utils';
 import { EDRCollection, EDRInstance, GeoJsonWithService, PlotWithData, PointerLocation, UseGetLocationReturnTypeProperties } from '../../components/TimeSeries/types';
 import { ParameterCollectionQueryData } from '../../components/TimeSeries/utils';
+import { TFunction } from 'i18next';
 interface CombinedResult<T> {
     data: T | undefined;
     isFetching: boolean;
@@ -50,7 +51,7 @@ export declare const useGetDetailsForCollection: (service: TimeSeriesService, co
 export declare const useGetInstances: (serviceUrl: string, collectionId: string, supportsInstances?: boolean) => UseQueryResult<EDRInstance[]>;
 export declare const useGetServiceCollectionDetails: (services: TimeSeriesService[], isOpen: boolean) => CombinedResult<TimeseriesCollectionDetail[]>;
 export declare const useGetCollectionsAndInstanceDetails: (queryData: Record<string, ParameterCollectionQueryData>) => CombinedResult<TimeseriesCollectionDetail[]>;
-export declare const useGetPlotsWithData: (plotsWithoutData: PlotPreset, selectedLocation: PointerLocation, services: TimeSeriesService[], splitGeoJsonByCollection: GeoJsonWithService[]) => {
+export declare const useGetPlotsWithData: (plotsWithoutData: PlotPreset, selectedLocation: PointerLocation, services: TimeSeriesService[], splitGeoJsonByCollection: GeoJsonWithService[], t: TFunction) => {
     data: PlotWithData[] | undefined;
     isFetching: boolean;
     error: Error | null | undefined;