@opengeoweb/layer-select 9.10.2 → 9.11.0

package/index.esm.js

@@ -16,7 +16,7 @@ import Typography$1 from '@mui/material/Typography';
 import Grid$1 from '@mui/material/Grid';
 import { LegendLayout } from '@opengeoweb/webmap-react';
 import { FixedSizeList } from 'react-window';
-import { webmapUtils, LayerType, getCapabilities, WMGetServiceFromStore, clearImageCache } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, getCapabilities, WMGetServiceFromStore, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
 import { snackbarActions } from '@opengeoweb/snackbar';
 import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
@@ -5025,7 +5025,7 @@ const ServiceOptionsDialogConnect = ({
         scope: service && service.scope || 'user',
         isUpdating: true
       });
-      clearImageCache();
+      clearImageCacheForAllMaps();
       const serviceTitle = service && service.serviceName || layersForService.name;
       showSnackbar(getServiceSuccesUpdateMessage(serviceTitle));
     } catch (error) {
@@ -5252,16 +5252,18 @@ const ServicePopupUnwrapped = ({
     setValue
   } = useFormContext();
   const [isLoading, setIsLoading] = React.useState(false);
+  const [shouldForceReload, setShouldForceReload] = React.useState(false);
   const fetchServiceData = newServiceUrl => __awaiter(void 0, void 0, void 0, function* () {
     try {
       setIsLoading(true);
-      yield getCapabilities.getLayersFromService(newServiceUrl);
-      const service = WMGetServiceFromStore(newServiceUrl);
-      setValue(fields.serviceName.name, service.title);
+      const service = yield loadWMSService(newServiceUrl, true);
+      setValue(fields.serviceName.name, service.name);
       setValue(fields.serviceAbstracts.name, service.abstract);
       setIsLoading(false);
+      setShouldForceReload(false);
     } catch (error) {
       setIsLoading(false);
+      setShouldForceReload(true);
       setError(fields.serviceUrl.name, {
         message: VALIDATIONS_REQUEST_FAILED,
         type: 'SYSTEM'
@@ -5272,13 +5274,13 @@ const ServicePopupUnwrapped = ({
     clearErrors(fields.serviceUrl.name);
     setIsLoading(true);
     try {
-      const layersForService = yield loadWMSService(formValues.serviceUrl, true);
+      const service = yield loadWMSService(formValues.serviceUrl, shouldForceReload);
       serviceSetLayers({
-        id: layersForService.id,
+        id: service.id,
         name: formValues.serviceName,
         serviceUrl: formValues.serviceUrl,
         abstract: formValues.serviceAbstracts,
-        layers: layersForService.layers,
+        layers: service.layers,
         scope: 'user'
       });
       setIsLoading(false);
@@ -5300,9 +5302,12 @@ const ServicePopupUnwrapped = ({
     }
   };
   const onBlurServiceUrl = () => {
-    if (!errors[fields.serviceUrl.name]) {
-      fetchServiceData(getValues(fields.serviceUrl.name));
-    }
+    trigger(fields.serviceUrl.name).then(() => {
+      const hasValue = getValues(fields.serviceUrl.name);
+      if (!errors[fields.serviceUrl.name] && hasValue) {
+        fetchServiceData(getValues(fields.serviceUrl.name));
+      }
+    });
   };
   const onKeyDownServiceUrl = event => {
     if (event.key === 'Enter') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.10.2",
+  "version": "9.11.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {