@opengeoweb/core 2.15.0 → 3.0.0

package/index.esm.js

@@ -7,7 +7,7 @@ import _, { isEqual, debounce, throttle, range } from 'lodash';
 import { takeLatest, put, select, call, all, takeEvery } from 'redux-saga/effects';
 import { connect, useDispatch, useSelector, Provider } from 'react-redux';
 import { Tooltip, Paper, Typography, Grid, InputLabel, IconButton, Box, CircularProgress, List, ListSubheader, ListItem, ListItemText, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, DialogActions, Button, MenuItem, FormControl, LinearProgress, InputAdornment, ListItemSecondaryAction, ListItemIcon, Checkbox, Switch, Slider, FormControlLabel, Popover, useMediaQuery, useTheme, SliderThumb } from '@mui/material';
-import { ToolButton, ToolContainerDraggable, TooltipSelect, AlertIcon, sliderStyles, tooltipContainerStyles, CustomSlider, ToggleMenu, ManagerButton, EnableButton, AlertBanner, ManagerDeleteButton, CustomToggleButton, useIsMounted } from '@opengeoweb/shared';
+import { ToolButton, ToolContainerDraggable, TooltipSelect, AlertIcon, tooltipContainerStyles, sliderHeaderStyle, CustomSlider, ToggleMenu, ManagerButton, EnableButton, AlertBanner, ManagerDeleteButton, CustomToggleButton, useIsMounted } from '@opengeoweb/shared';
 import { Pause, Play, Cached, Add, Copy, Flag, DragHandle as DragHandle$1, Filter, Close, Search, Clear, ChevronLeft, ChevronRight, Edit, Delete, Home, Minus, Layers, Equalizer, Sort, Link, LinkOff, AutoUpdateActive, AutoUpdateInActive, TextIcon, FastForward, Options, SliderThumb as SliderThumb$1, List as List$1, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
 import makeStyles from '@mui/styles/makeStyles';
 import { legendImageStore, WMImageEventType, getLegendGraphicURLForLayer, WMGetServiceFromStore, LayerType as LayerType$1, getMapImageStore, WMBBOX, debug, DebugType, WMJSMap, WMLayer } from '@opengeoweb/webmap';
@@ -1666,6 +1666,17 @@ var slice$5 = createSlice({
         draft.availableBaseLayers.allIds.push(layer.id);
       });
     },
+    setAvailableBaseLayers: function setAvailableBaseLayers(draft, action) {
+      var layers = action.payload.layers;
+      draft.availableBaseLayers.byId = {};
+      draft.availableBaseLayers.allIds = []; // add new available baselayers
+
+      layers.forEach(function (layer) {
+        if (layer.layerType !== LayerType.baseLayer || !layer.mapId) return;
+        draft.availableBaseLayers.byId[layer.id] = createLayer(Object.assign({}, layer));
+        draft.availableBaseLayers.allIds.push(layer.id);
+      });
+    },
     onUpdateLayerInformation: function onUpdateLayerInformation(draft, action) {
       var _action$payload11 = action.payload,
           layerStyle = _action$payload11.layerStyle,
@@ -1949,12 +1960,13 @@ var getLayerStyles = createSelector(getLayerFromService, function (layer) {
  * @returns {array} returnType: [] - array containing services
  */
 
-var getServicesInArray = createSelector(servicesStore, function (store) {
+createSelector(servicesStore, function (store) {
   var services = store ? store.byId : {};
   var arrayOfServiceObjects = Object.keys(services).map(function (key) {
     return {
       name: services[key].name,
-      serviceUrl: services[key].serviceUrl
+      serviceUrl: services[key].serviceUrl,
+      isUserAddedService: services[key].isUserAddedService
     };
   });
   return arrayOfServiceObjects;
@@ -4373,7 +4385,8 @@ var slice = createSlice({
           serviceId = _action$payload.serviceId,
           serviceName = _action$payload.serviceName,
           serviceUrl = _action$payload.serviceUrl,
-          keywords = _action$payload.keywords;
+          keywords = _action$payload.keywords,
+          isUserAddedService = _action$payload.isUserAddedService;
 
       if (!draft.filters.activeServices.byId[serviceId]) {
         draft.filters.activeServices.byId[serviceId] = {};
@@ -4408,6 +4421,7 @@ var slice = createSlice({
       draft.filters.activeServices.byId[serviceId].serviceName = serviceName;
       draft.filters.activeServices.byId[serviceId].serviceUrl = serviceUrl;
       draft.filters.activeServices.byId[serviceId].enabled = true;
+      draft.filters.activeServices.byId[serviceId].isUserAddedService = isUserAddedService;
       draft.filters.activeServices.byId[serviceId].keywordsPerService = keywords;
       if (!draft.filters.activeServices.allIds.includes(serviceId)) draft.filters.activeServices.allIds.push(serviceId);
     },
@@ -8198,7 +8212,7 @@ var mergePresetsAndUserAddedServices = function mergePresetsAndUserAddedServices
 };
 var isService = function isService(param) {
   var serviceParam = param;
-  return !!((serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.id) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.name) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.url));
+  return !!((serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.id) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.name) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.url), serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.isUserAddedService);
 };
 
 var getUserAddedServices = function getUserAddedServices() {
@@ -8207,6 +8221,13 @@ var getUserAddedServices = function getUserAddedServices() {
     var parsedData = JSON.parse(storedString);
 
     if (parsedData && _typeof(parsedData) === 'object') {
+      Object.values(parsedData).forEach(function (value) {
+        // eslint-disable-next-line no-prototype-builtins
+        if (value.hasOwnProperty('url') && value.hasOwnProperty('id')) {
+          var service = value;
+          service.isUserAddedService = true;
+        }
+      });
       return Object.entries(parsedData).reduce(function (userServices, _ref) {
         var _ref2 = _slicedToArray(_ref, 2),
             serviceUrl = _ref2[0],
@@ -8233,39 +8254,26 @@ var _marked = /*#__PURE__*/regeneratorRuntime.mark(newServiceAddedSaga),
     _marked2 = /*#__PURE__*/regeneratorRuntime.mark(layerSelectServiceRemovedSaga),
     _marked3 = /*#__PURE__*/regeneratorRuntime.mark(rootSaga);
 function newServiceAddedSaga(capturedAction) {
-  var addedService, id, serviceUrl, name, keywords, services, findServiceName;
+  var addedService, id, serviceUrl, name, isUserAddedService, keywords;
   return regeneratorRuntime.wrap(function newServiceAddedSaga$(_context) {
     while (1) {
       switch (_context.prev = _context.next) {
         case 0:
           addedService = capturedAction.payload;
-          id = addedService.id, serviceUrl = addedService.serviceUrl, name = addedService.name;
+          id = addedService.id, serviceUrl = addedService.serviceUrl, name = addedService.name, isUserAddedService = addedService.isUserAddedService;
           keywords = addedService.layers.reduce(function (keywordAccumulator, layer) {
             return keywordAccumulator.concat(layer.path, layer.keywords);
           }, []);
           _context.next = 5;
-          return select(getServicesInArray);
-
-        case 5:
-          services = _context.sent;
-
-          findServiceName = function findServiceName() {
-            var foundService = services.find(function (object) {
-              return (object === null || object === void 0 ? void 0 : object.url) === serviceUrl;
-            });
-            if (foundService) return foundService.name;
-            return name;
-          };
-
-          _context.next = 9;
           return put(layerSelectActions.addKeywordsAndActiveServices({
             serviceId: id,
-            serviceName: findServiceName(),
+            serviceName: name,
             serviceUrl: serviceUrl,
-            keywords: keywords
+            keywords: keywords,
+            isUserAddedService: isUserAddedService
           }));
 
-        case 9:
+        case 5:
         case "end":
           return _context.stop();
       }
@@ -9723,7 +9731,6 @@ var OpacitySelect = function OpacitySelect(_ref) {
       _ref$isEnabled = _ref.isEnabled,
       isEnabled = _ref$isEnabled === void 0 ? true : _ref$isEnabled;
   var classes = useStyles$n();
-  var sliderClasses = sliderStyles();
 
   var _React$useState = React.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -9789,8 +9796,8 @@ var OpacitySelect = function OpacitySelect(_ref) {
     onBlur: onBlur
   }, currentOpacityText)), open ? /*#__PURE__*/React.createElement("div", {
     className: classes.sliderBackground
-  }, /*#__PURE__*/React.createElement("div", {
-    className: sliderClasses.sliderHeader
+  }, /*#__PURE__*/React.createElement(Box, {
+    sx: sliderHeaderStyle
   }, "Opacity"), /*#__PURE__*/React.createElement(CustomSlider, {
     "data-testid": "opacitySlider",
     orientation: "vertical",
@@ -10963,6 +10970,15 @@ var constructListAvailableBaseLayers = function constructListAvailableBaseLayers
     }));
   }, baseLayersWithMapId);
 };
+var areAvailableBaseLayersSame = function areAvailableBaseLayersSame(availableBaseLayerList, newBaseLayerList) {
+  var availableList = availableBaseLayerList.map(function (layer) {
+    return layer.name;
+  });
+  var newList = newBaseLayerList.map(function (layer) {
+    return layer.name;
+  });
+  return isEqual(availableList, newList);
+};
 
 var BaseLayersConnect = function BaseLayersConnect(_ref) {
   var mapId = _ref.mapId,
@@ -10976,14 +10992,16 @@ var BaseLayersConnect = function BaseLayersConnect(_ref) {
   });
   React.useEffect(function () {
     // Set initial availableBaseLayers only if none set for that map yet
-    if (currentAvailableBaseLayers.length < 1) {
-      var availableBaseLayersToBeAdded = constructListAvailableBaseLayers(selectedBaseLayers, preloadedAvailableBaseLayers, mapId);
-      dispatch(layerActions.addAvailableBaseLayers({
+    var availableBaseLayersToBeAdded = constructListAvailableBaseLayers(selectedBaseLayers, preloadedAvailableBaseLayers, mapId);
+    var areBaseLayersSame = areAvailableBaseLayersSame(availableBaseLayersToBeAdded, currentAvailableBaseLayers);
+
+    if (!areBaseLayersSame) {
+      dispatch(layerActions.setAvailableBaseLayers({
         layers: availableBaseLayersToBeAdded
       }));
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  }, [mapId]);
+  }, [mapId, preloadedAvailableBaseLayers]);
 
   var onChangeBaseLayers = function onChangeBaseLayers(newSelectedLayerId) {
     var newBaseLayer = currentAvailableBaseLayers.filter(function (layer) {
@@ -11283,23 +11301,22 @@ var ServicePopup = function ServicePopup(_ref) {
       hideBackdrop = _ref$hideBackdrop === void 0 ? false : _ref$hideBackdrop,
       isOpen = _ref.isOpen,
       closePopup = _ref.closePopup,
+      serviceId = _ref.serviceId,
       url = _ref.url,
       services = _ref.services,
       serviceSetLayers = _ref.serviceSetLayers;
 
-  var _a, _b;
-
-  var _React$useState = React.useState(servicePopupVariant !== 'edit' || services === undefined ? '' : (_a = services[url]) === null || _a === void 0 ? void 0 : _a.name),
+  var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       serviceName = _React$useState2[0],
       setServiceName = _React$useState2[1];
 
-  var _React$useState3 = React.useState(servicePopupVariant === 'add' || url === undefined ? '' : url),
+  var _React$useState3 = React.useState(''),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       serviceUrl = _React$useState4[0],
       setServiceUrl = _React$useState4[1];
 
-  var _React$useState5 = React.useState(servicePopupVariant !== 'edit' || services === undefined ? '' : (_b = services[url]) === null || _b === void 0 ? void 0 : _b["abstract"]),
+  var _React$useState5 = React.useState(''),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
       _abstract = _React$useState6[0],
       setAbstract = _React$useState6[1];
@@ -11334,6 +11351,19 @@ var ServicePopup = function ServicePopup(_ref) {
       serviceUrlHelperText = _React$useState18[0],
       setServiceUrlHelperText = _React$useState18[1];
 
+  React.useEffect(function () {
+    var _a;
+
+    if (servicePopupVariant === 'edit') {
+      setServiceName(((_a = services[serviceId]) === null || _a === void 0 ? void 0 : _a.serviceName) || '');
+      setServiceUrl(url || '');
+    }
+
+    if (servicePopupVariant === 'save') {
+      setServiceUrl(url || '');
+    }
+  }, [serviceId, services, url, servicePopupVariant, isOpen]);
+
   var validateServiceUrl = function validateServiceUrl(url) {
     if (url === '' || url === null || typeof url === 'undefined') return false;
     var matcher = /^(?:\w+:)?\/\/([^\s.]+\.\S{2}|[0-9a-zA-Z]+[:?\d]*)\S*$/;
@@ -11420,11 +11450,10 @@ var ServicePopup = function ServicePopup(_ref) {
 
   var ServiceNameInRedux = function ServiceNameInRedux() {
     if (servicePopupVariant === 'add' || servicePopupVariant === 'save') {
-      for (var service in services) {
-        if (services && services[service].name.toLowerCase() === serviceName.toLowerCase()) return true;
-      }
-
-      return false;
+      var foundName = Object.keys(services).find(function (serviceId) {
+        return services[serviceId].serviceName.toLowerCase() === (serviceName === null || serviceName === void 0 ? void 0 : serviceName.toLowerCase());
+      });
+      return foundName !== undefined;
     }
 
     return false;
@@ -11432,11 +11461,10 @@ var ServicePopup = function ServicePopup(_ref) {
 
   var UrlInRedux = function UrlInRedux() {
     if (servicePopupVariant === 'add' || servicePopupVariant === 'save') {
-      if (services && services[serviceUrl]) {
-        return true;
-      }
-
-      return false;
+      var foundUrl = Object.keys(services).find(function (serviceId) {
+        return services[serviceId].serviceUrl === serviceUrl;
+      });
+      return foundUrl !== undefined;
     }
 
     return false;
@@ -11444,6 +11472,7 @@ var ServicePopup = function ServicePopup(_ref) {
 
 
   React.useEffect(function () {
+    if (serviceName === undefined) return;
     setServiceNameHelperText('');
 
     if (ServiceNameInRedux()) {
@@ -11459,7 +11488,7 @@ var ServicePopup = function ServicePopup(_ref) {
   React.useEffect(function () {
     setServiceUrlHelperText('');
 
-    if (serviceUrl.length > 0 && !validateServiceUrl(serviceUrl)) {
+    if (serviceUrl && serviceUrl.length > 0 && !validateServiceUrl(serviceUrl)) {
       setServiceUrlHasError(true);
       setServiceUrlHelperText('Error: Not a valid URL.');
     } else if (UrlInRedux()) {
@@ -11546,7 +11575,8 @@ var ServicePopup = function ServicePopup(_ref) {
       return setAbstract(event.target.value);
     },
     value: _abstract,
-    "data-testid": "abstractTextField"
+    "data-testid": "abstractTextField",
+    disabled: true
   })), /*#__PURE__*/React.createElement(DialogActions, {
     sx: style$1.footerContent
   }, /*#__PURE__*/React.createElement(Button, {
@@ -11602,10 +11632,11 @@ var ServicePopupConnect = function ServicePopupConnect(_ref) {
       hideBackdrop = _ref.hideBackdrop,
       isOpen = _ref.isOpen,
       closePopup = _ref.closePopup,
+      serviceId = _ref.serviceId,
       url = _ref.url;
   var dispatch = useDispatch();
   var services = useSelector(function (store) {
-    return getServices(store);
+    return getActiveServices(store);
   });
   var serviceSetLayers = React__default.useCallback(function (payload) {
     dispatch(serviceActions.serviceSetLayers(payload));
@@ -11615,9 +11646,10 @@ var ServicePopupConnect = function ServicePopupConnect(_ref) {
     hideBackdrop: hideBackdrop,
     isOpen: isOpen,
     closePopup: closePopup,
-    url: url,
+    serviceId: serviceId,
     services: services,
-    serviceSetLayers: serviceSetLayers
+    serviceSetLayers: serviceSetLayers,
+    url: url
   });
 };
 
@@ -12459,28 +12491,32 @@ var styles = {
 
 var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
   var services = _ref.services,
-      mapStoreRemoveService = _ref.mapStoreRemoveService,
-      _ref$layers = _ref.layers,
-      layers = _ref$layers === void 0 ? [] : _ref$layers;
+      mapStoreRemoveService = _ref.mapStoreRemoveService;
 
   var _React$useState = React.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
-      addServiceisOpen = _React$useState2[0],
+      addServiceIsOpen = _React$useState2[0],
       setAddServiceIsOpen = _React$useState2[1];
 
+  var _React$useState3 = React.useState({
+    isOpen: false,
+    serviceId: '',
+    serviceUrl: ''
+  }),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      editServiceIsOpen = _React$useState4[0],
+      setEditServiceIsOpen = _React$useState4[1];
+
   var openAddService = function openAddService() {
     setAddServiceIsOpen(true);
   };
 
   var closePopup = function closePopup() {
     setAddServiceIsOpen(false);
-  };
-
-  var isDisabled = function isDisabled(service) {
-    return layers.some(function (layer) {
-      return layer.service && layer.service.includes(service);
-    }) || preloadedDefaultMapServices.some(function (defaultMapService) {
-      return defaultMapService.url && defaultMapService.url.includes(service);
+    setEditServiceIsOpen({
+      isOpen: false,
+      serviceId: '',
+      serviceUrl: ''
     });
   };
 
@@ -12509,16 +12545,25 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
         marginRight: '-10px'
       }
     }, /*#__PURE__*/React.createElement(Tooltip, {
-      title: "Edit Service"
+      title: "Edit Service",
+      disableHoverListener: !services[serviceId].isUserAddedService
     }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(IconButton, {
-      disabled: isDisabled(services[serviceId].serviceUrl),
+      disabled: !services[serviceId].isUserAddedService,
       "data-testid": "openEditServiceButton",
-      size: "large"
+      size: "large",
+      onClick: function onClick() {
+        setEditServiceIsOpen({
+          isOpen: true,
+          serviceId: serviceId,
+          serviceUrl: services[serviceId].serviceUrl
+        });
+      }
     }, /*#__PURE__*/React.createElement(Edit, null)))), /*#__PURE__*/React.createElement(Tooltip, {
-      title: "Delete Service"
+      title: "Delete Service",
+      disableHoverListener: !services[serviceId].isUserAddedService
     }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(IconButton, {
       size: "large",
-      disabled: isDisabled(services[serviceId].serviceUrl),
+      disabled: !services[serviceId].isUserAddedService,
       onClick: function onClick() {
         return mapStoreRemoveService(serviceId, services[serviceId].serviceUrl);
       },
@@ -12532,10 +12577,16 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
     sx: styles.button,
     variant: "tertiary",
     startIcon: /*#__PURE__*/React.createElement(Add, null)
-  }, "Add a new service"))), addServiceisOpen && /*#__PURE__*/React.createElement(ServicePopupConnect, {
+  }, "Add a new service"))), addServiceIsOpen && /*#__PURE__*/React.createElement(ServicePopupConnect, {
     servicePopupVariant: "add",
-    isOpen: addServiceisOpen,
+    isOpen: addServiceIsOpen,
     closePopup: closePopup
+  }), editServiceIsOpen && /*#__PURE__*/React.createElement(ServicePopupConnect, {
+    servicePopupVariant: "edit",
+    isOpen: editServiceIsOpen.isOpen,
+    closePopup: closePopup,
+    serviceId: editServiceIsOpen.serviceId,
+    url: editServiceIsOpen.serviceUrl
   }));
 };
 
@@ -12558,9 +12609,6 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
 
 var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect() {
   var dispatch = useDispatch();
-  var allLayers = useSelector(function (store) {
-    return getAllLayers(store);
-  });
   var mapStoreRemoveService = React.useCallback(function (serviceId, serviceUrl) {
     dispatch(serviceActions.mapStoreRemoveService({
       id: serviceId,
@@ -12572,7 +12620,6 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect() {
   });
   return /*#__PURE__*/React.createElement(ServiceOptionsDialog, {
     services: services,
-    layers: allLayers,
     mapStoreRemoveService: mapStoreRemoveService
   });
 };
@@ -13162,6 +13209,11 @@ var LayerSelectConnect = function LayerSelectConnect(_ref) {
   var serviceSetLayers = React.useCallback(function (payload) {
     dispatch(serviceActions.serviceSetLayers(payload));
   }, [dispatch]);
+
+  var checkIfUserAddedService = function checkIfUserAddedService(service) {
+    return !!service.isUserAddedService;
+  };
+
   React.useEffect(function () {
     if (isOpenInStore && preloadedServices && preloadedServices.length > 0) {
       mergePresetsAndUserAddedServices(preloadedServices, getUserAddedServices()).forEach(function (service) {
@@ -13173,7 +13225,7 @@ var LayerSelectConnect = function LayerSelectConnect(_ref) {
               name: service.name,
               serviceUrl: service.url,
               layers: layers,
-              isUserAddedService: false
+              isUserAddedService: checkIfUserAddedService(service)
             });
           }
         })["catch"](function () {
@@ -14225,7 +14277,6 @@ var SpeedButton = function SpeedButton(_ref) {
   var animationDelay = _ref.animationDelay,
       setMapAnimationDelay = _ref.setMapAnimationDelay;
   var classes = useStyles$c();
-  var sliderClasses = sliderStyles();
 
   var _React$useState = React.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -14290,8 +14341,8 @@ var SpeedButton = function SpeedButton(_ref) {
     text: text
   })))), open ? /*#__PURE__*/React.createElement("div", {
     className: classes.sliderBackground
-  }, /*#__PURE__*/React.createElement("div", {
-    className: sliderClasses.sliderHeader
+  }, /*#__PURE__*/React.createElement(Box, {
+    sx: sliderHeaderStyle
   }, "Speed"), /*#__PURE__*/React.createElement(CustomSlider, {
     "data-testid": "speedSlider",
     orientation: "vertical",
@@ -14466,7 +14517,6 @@ var TimeStepButton = function TimeStepButton(_ref) {
     return null;
   } : _ref$onToggleTimestep;
   var classes = useStyles$b();
-  var sliderClasses = sliderStyles();
 
   var _React$useState = React.useState(false),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -14535,8 +14585,8 @@ var TimeStepButton = function TimeStepButton(_ref) {
     "data-testid": "timeStepButtonText"
   })))), open ? /*#__PURE__*/React.createElement("div", {
     className: classes.sliderBackground
-  }, /*#__PURE__*/React.createElement("div", {
-    className: sliderClasses.sliderHeader
+  }, /*#__PURE__*/React.createElement(Box, {
+    sx: sliderHeaderStyle
   }, "Time step"), /*#__PURE__*/React.createElement(CustomSlider, {
     "data-testid": "timeStepButtonSlider",
     orientation: "vertical",

package/index.umd.js

@@ -1532,6 +1532,17 @@
             draft.availableBaseLayers.allIds.push(layer.id);
           });
         },
+        setAvailableBaseLayers: function setAvailableBaseLayers(draft, action) {
+          var layers = action.payload.layers;
+          draft.availableBaseLayers.byId = {};
+          draft.availableBaseLayers.allIds = []; // add new available baselayers
+
+          layers.forEach(function (layer) {
+            if (layer.layerType !== LayerType.baseLayer || !layer.mapId) return;
+            draft.availableBaseLayers.byId[layer.id] = createLayer(__assign({}, layer));
+            draft.availableBaseLayers.allIds.push(layer.id);
+          });
+        },
         onUpdateLayerInformation: function onUpdateLayerInformation(draft, action) {
           var _a = action.payload,
               layerStyle = _a.layerStyle,
@@ -1815,12 +1826,13 @@
      * @returns {array} returnType: [] - array containing services
      */
 
-    var getServicesInArray = toolkit.createSelector(servicesStore, function (store) {
+    toolkit.createSelector(servicesStore, function (store) {
       var services = store ? store.byId : {};
       var arrayOfServiceObjects = Object.keys(services).map(function (key) {
         return {
           name: services[key].name,
-          serviceUrl: services[key].serviceUrl
+          serviceUrl: services[key].serviceUrl,
+          isUserAddedService: services[key].isUserAddedService
         };
       });
       return arrayOfServiceObjects;
@@ -4308,7 +4320,8 @@
               serviceId = _b.serviceId,
               serviceName = _b.serviceName,
               serviceUrl = _b.serviceUrl,
-              keywords = _b.keywords;
+              keywords = _b.keywords,
+              isUserAddedService = _b.isUserAddedService;
 
           if (!draft.filters.activeServices.byId[serviceId]) {
             draft.filters.activeServices.byId[serviceId] = {};
@@ -4346,6 +4359,7 @@
           draft.filters.activeServices.byId[serviceId].serviceName = serviceName;
           draft.filters.activeServices.byId[serviceId].serviceUrl = serviceUrl;
           draft.filters.activeServices.byId[serviceId].enabled = true;
+          draft.filters.activeServices.byId[serviceId].isUserAddedService = isUserAddedService;
           draft.filters.activeServices.byId[serviceId].keywordsPerService = keywords;
           if (!draft.filters.activeServices.allIds.includes(serviceId)) draft.filters.activeServices.allIds.push(serviceId);
         },
@@ -8459,7 +8473,7 @@
     };
     var isService = function isService(param) {
       var serviceParam = param;
-      return !!((serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.id) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.name) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.url));
+      return !!((serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.id) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.name) && (serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.url), serviceParam === null || serviceParam === void 0 ? void 0 : serviceParam.isUserAddedService);
     };
 
     var getUserAddedServices = function getUserAddedServices() {
@@ -8468,6 +8482,13 @@
         var parsedData = JSON.parse(storedString);
 
         if (parsedData && _typeof(parsedData) === 'object') {
+          Object.values(parsedData).forEach(function (value) {
+            // eslint-disable-next-line no-prototype-builtins
+            if (value.hasOwnProperty('url') && value.hasOwnProperty('id')) {
+              var service = value;
+              service.isUserAddedService = true;
+            }
+          });
           return Object.entries(parsedData).reduce(function (userServices, _a) {
             var _b;
 
@@ -8509,40 +8530,26 @@
      * Copyright 2022 - Finnish Meteorological Institute (FMI)
      * */
     function newServiceAddedSaga(capturedAction) {
-      var addedService, id, serviceUrl, name, keywords, services, findServiceName;
+      var addedService, id, serviceUrl, name, isUserAddedService, keywords;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             addedService = capturedAction.payload;
-            id = addedService.id, serviceUrl = addedService.serviceUrl, name = addedService.name;
+            id = addedService.id, serviceUrl = addedService.serviceUrl, name = addedService.name, isUserAddedService = addedService.isUserAddedService;
             keywords = addedService.layers.reduce(function (keywordAccumulator, layer) {
               return keywordAccumulator.concat(layer.path, layer.keywords);
             }, []);
-            return [4
-            /*yield*/
-            , effects.select(getServicesInArray)];
-
-          case 1:
-            services = _a.sent();
-
-            findServiceName = function findServiceName() {
-              var foundService = services.find(function (object) {
-                return (object === null || object === void 0 ? void 0 : object.url) === serviceUrl;
-              });
-              if (foundService) return foundService.name;
-              return name;
-            };
-
             return [4
             /*yield*/
             , effects.put(layerSelectActions.addKeywordsAndActiveServices({
               serviceId: id,
-              serviceName: findServiceName(),
+              serviceName: name,
               serviceUrl: serviceUrl,
-              keywords: keywords
+              keywords: keywords,
+              isUserAddedService: isUserAddedService
             }))];
 
-          case 2:
+          case 1:
             _a.sent();
 
             return [2
@@ -10127,7 +10134,6 @@
           _b = _a.isEnabled,
           isEnabled = _b === void 0 ? true : _b;
       var classes = useStyles$n();
-      var sliderClasses = shared.sliderStyles();
 
       var _c = __read(React__namespace.useState(false), 2),
           open = _c[0],
@@ -10191,8 +10197,8 @@
         onBlur: onBlur
       }, currentOpacityText)), open ? /*#__PURE__*/React__namespace.createElement("div", {
         className: classes.sliderBackground
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        className: sliderClasses.sliderHeader
+      }, /*#__PURE__*/React__namespace.createElement(material.Box, {
+        sx: shared.sliderHeaderStyle
       }, "Opacity"), /*#__PURE__*/React__namespace.createElement(shared.CustomSlider, {
         "data-testid": "opacitySlider",
         orientation: "vertical",
@@ -11379,6 +11385,15 @@
         }));
       }, baseLayersWithMapId);
     };
+    var areAvailableBaseLayersSame = function areAvailableBaseLayersSame(availableBaseLayerList, newBaseLayerList) {
+      var availableList = availableBaseLayerList.map(function (layer) {
+        return layer.name;
+      });
+      var newList = newBaseLayerList.map(function (layer) {
+        return layer.name;
+      });
+      return _.isEqual(availableList, newList);
+    };
 
     var BaseLayersConnect = function BaseLayersConnect(_a) {
       var mapId = _a.mapId,
@@ -11392,14 +11407,16 @@
       });
       React__namespace.useEffect(function () {
         // Set initial availableBaseLayers only if none set for that map yet
-        if (currentAvailableBaseLayers.length < 1) {
-          var availableBaseLayersToBeAdded = constructListAvailableBaseLayers(selectedBaseLayers, preloadedAvailableBaseLayers, mapId);
-          dispatch(layerActions.addAvailableBaseLayers({
+        var availableBaseLayersToBeAdded = constructListAvailableBaseLayers(selectedBaseLayers, preloadedAvailableBaseLayers, mapId);
+        var areBaseLayersSame = areAvailableBaseLayersSame(availableBaseLayersToBeAdded, currentAvailableBaseLayers);
+
+        if (!areBaseLayersSame) {
+          dispatch(layerActions.setAvailableBaseLayers({
             layers: availableBaseLayersToBeAdded
           }));
         } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-      }, [mapId]);
+      }, [mapId, preloadedAvailableBaseLayers]);
 
       var onChangeBaseLayers = function onChangeBaseLayers(newSelectedLayerId) {
         var newBaseLayer = currentAvailableBaseLayers.filter(function (layer) {
@@ -11725,52 +11742,64 @@
     };
 
     var ServicePopup = function ServicePopup(_a) {
-      var _b, _c;
-
       var servicePopupVariant = _a.servicePopupVariant,
-          _d = _a.hideBackdrop,
-          hideBackdrop = _d === void 0 ? false : _d,
+          _b = _a.hideBackdrop,
+          hideBackdrop = _b === void 0 ? false : _b,
           isOpen = _a.isOpen,
           closePopup = _a.closePopup,
+          serviceId = _a.serviceId,
           url = _a.url,
           services = _a.services,
           serviceSetLayers = _a.serviceSetLayers;
 
-      var _e = __read(React__namespace.useState(servicePopupVariant !== 'edit' || services === undefined ? '' : (_b = services[url]) === null || _b === void 0 ? void 0 : _b.name), 2),
-          serviceName = _e[0],
-          setServiceName = _e[1];
+      var _c = __read(React__namespace.useState(''), 2),
+          serviceName = _c[0],
+          setServiceName = _c[1];
+
+      var _d = __read(React__namespace.useState(''), 2),
+          serviceUrl = _d[0],
+          setServiceUrl = _d[1];
 
-      var _f = __read(React__namespace.useState(servicePopupVariant === 'add' || url === undefined ? '' : url), 2),
-          serviceUrl = _f[0],
-          setServiceUrl = _f[1];
+      var _e = __read(React__namespace.useState(''), 2),
+          _abstract = _e[0],
+          setAbstract = _e[1];
 
-      var _g = __read(React__namespace.useState(servicePopupVariant !== 'edit' || services === undefined ? '' : (_c = services[url]) === null || _c === void 0 ? void 0 : _c["abstract"]), 2),
-          _abstract = _g[0],
-          setAbstract = _g[1];
+      var _f = __read(React__namespace.useState(false), 2),
+          disableButton = _f[0],
+          setDisableButton = _f[1];
+
+      var _g = __read(React__namespace.useState(false), 2),
+          isLoading = _g[0],
+          setIsLoading = _g[1];
 
       var _h = __read(React__namespace.useState(false), 2),
-          disableButton = _h[0],
-          setDisableButton = _h[1];
+          serviceNameHasError = _h[0],
+          setServiceNameHasError = _h[1];
 
-      var _j = __read(React__namespace.useState(false), 2),
-          isLoading = _j[0],
-          setIsLoading = _j[1];
+      var _j = __read(React__namespace.useState(''), 2),
+          serviceNameHelperText = _j[0],
+          setServiceNameHelperText = _j[1];
 
       var _k = __read(React__namespace.useState(false), 2),
-          serviceNameHasError = _k[0],
-          setServiceNameHasError = _k[1];
+          serviceUrlHasError = _k[0],
+          setServiceUrlHasError = _k[1];
 
       var _l = __read(React__namespace.useState(''), 2),
-          serviceNameHelperText = _l[0],
-          setServiceNameHelperText = _l[1];
+          serviceUrlHelperText = _l[0],
+          setServiceUrlHelperText = _l[1];
 
-      var _m = __read(React__namespace.useState(false), 2),
-          serviceUrlHasError = _m[0],
-          setServiceUrlHasError = _m[1];
+      React__namespace.useEffect(function () {
+        var _a;
 
-      var _o = __read(React__namespace.useState(''), 2),
-          serviceUrlHelperText = _o[0],
-          setServiceUrlHelperText = _o[1];
+        if (servicePopupVariant === 'edit') {
+          setServiceName(((_a = services[serviceId]) === null || _a === void 0 ? void 0 : _a.serviceName) || '');
+          setServiceUrl(url || '');
+        }
+
+        if (servicePopupVariant === 'save') {
+          setServiceUrl(url || '');
+        }
+      }, [serviceId, services, url, servicePopupVariant, isOpen]);
 
       var validateServiceUrl = function validateServiceUrl(url) {
         if (url === '' || url === null || typeof url === 'undefined') return false;
@@ -11869,11 +11898,10 @@
 
       var ServiceNameInRedux = function ServiceNameInRedux() {
         if (servicePopupVariant === 'add' || servicePopupVariant === 'save') {
-          for (var service in services) {
-            if (services && services[service].name.toLowerCase() === serviceName.toLowerCase()) return true;
-          }
-
-          return false;
+          var foundName = Object.keys(services).find(function (serviceId) {
+            return services[serviceId].serviceName.toLowerCase() === (serviceName === null || serviceName === void 0 ? void 0 : serviceName.toLowerCase());
+          });
+          return foundName !== undefined;
         }
 
         return false;
@@ -11881,11 +11909,10 @@
 
       var UrlInRedux = function UrlInRedux() {
         if (servicePopupVariant === 'add' || servicePopupVariant === 'save') {
-          if (services && services[serviceUrl]) {
-            return true;
-          }
-
-          return false;
+          var foundUrl = Object.keys(services).find(function (serviceId) {
+            return services[serviceId].serviceUrl === serviceUrl;
+          });
+          return foundUrl !== undefined;
         }
 
         return false;
@@ -11893,6 +11920,7 @@
 
 
       React__namespace.useEffect(function () {
+        if (serviceName === undefined) return;
         setServiceNameHelperText('');
 
         if (ServiceNameInRedux()) {
@@ -11908,7 +11936,7 @@
       React__namespace.useEffect(function () {
         setServiceUrlHelperText('');
 
-        if (serviceUrl.length > 0 && !validateServiceUrl(serviceUrl)) {
+        if (serviceUrl && serviceUrl.length > 0 && !validateServiceUrl(serviceUrl)) {
           setServiceUrlHasError(true);
           setServiceUrlHelperText('Error: Not a valid URL.');
         } else if (UrlInRedux()) {
@@ -11995,7 +12023,8 @@
           return setAbstract(event.target.value);
         },
         value: _abstract,
-        "data-testid": "abstractTextField"
+        "data-testid": "abstractTextField",
+        disabled: true
       })), /*#__PURE__*/React__namespace.createElement(material.DialogActions, {
         sx: style$1.footerContent
       }, /*#__PURE__*/React__namespace.createElement(material.Button, {
@@ -12051,10 +12080,11 @@
           hideBackdrop = _a.hideBackdrop,
           isOpen = _a.isOpen,
           closePopup = _a.closePopup,
+          serviceId = _a.serviceId,
           url = _a.url;
       var dispatch = reactRedux.useDispatch();
       var services = reactRedux.useSelector(function (store) {
-        return getServices(store);
+        return getActiveServices(store);
       });
       var serviceSetLayers = React__default["default"].useCallback(function (payload) {
         dispatch(serviceActions.serviceSetLayers(payload));
@@ -12064,9 +12094,10 @@
         hideBackdrop: hideBackdrop,
         isOpen: isOpen,
         closePopup: closePopup,
-        url: url,
+        serviceId: serviceId,
         services: services,
-        serviceSetLayers: serviceSetLayers
+        serviceSetLayers: serviceSetLayers,
+        url: url
       });
     };
 
@@ -13026,13 +13057,19 @@
 
     var ServiceOptionsDialog = function ServiceOptionsDialog(_a) {
       var services = _a.services,
-          mapStoreRemoveService = _a.mapStoreRemoveService,
-          _b = _a.layers,
-          layers = _b === void 0 ? [] : _b;
+          mapStoreRemoveService = _a.mapStoreRemoveService;
 
-      var _c = __read(React__namespace.useState(false), 2),
-          addServiceisOpen = _c[0],
-          setAddServiceIsOpen = _c[1];
+      var _b = __read(React__namespace.useState(false), 2),
+          addServiceIsOpen = _b[0],
+          setAddServiceIsOpen = _b[1];
+
+      var _c = __read(React__namespace.useState({
+        isOpen: false,
+        serviceId: '',
+        serviceUrl: ''
+      }), 2),
+          editServiceIsOpen = _c[0],
+          setEditServiceIsOpen = _c[1];
 
       var openAddService = function openAddService() {
         setAddServiceIsOpen(true);
@@ -13040,13 +13077,10 @@
 
       var closePopup = function closePopup() {
         setAddServiceIsOpen(false);
-      };
-
-      var isDisabled = function isDisabled(service) {
-        return layers.some(function (layer) {
-          return layer.service && layer.service.includes(service);
-        }) || preloadedDefaultMapServices.some(function (defaultMapService) {
-          return defaultMapService.url && defaultMapService.url.includes(service);
+        setEditServiceIsOpen({
+          isOpen: false,
+          serviceId: '',
+          serviceUrl: ''
         });
       };
 
@@ -13075,16 +13109,25 @@
             marginRight: '-10px'
           }
         }, /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
-          title: "Edit Service"
+          title: "Edit Service",
+          disableHoverListener: !services[serviceId].isUserAddedService
         }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
-          disabled: isDisabled(services[serviceId].serviceUrl),
+          disabled: !services[serviceId].isUserAddedService,
           "data-testid": "openEditServiceButton",
-          size: "large"
+          size: "large",
+          onClick: function onClick() {
+            setEditServiceIsOpen({
+              isOpen: true,
+              serviceId: serviceId,
+              serviceUrl: services[serviceId].serviceUrl
+            });
+          }
         }, /*#__PURE__*/React__namespace.createElement(theme.Edit, null)))), /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
-          title: "Delete Service"
+          title: "Delete Service",
+          disableHoverListener: !services[serviceId].isUserAddedService
         }, /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
           size: "large",
-          disabled: isDisabled(services[serviceId].serviceUrl),
+          disabled: !services[serviceId].isUserAddedService,
           onClick: function onClick() {
             return mapStoreRemoveService(serviceId, services[serviceId].serviceUrl);
           },
@@ -13098,10 +13141,16 @@
         sx: styles.button,
         variant: "tertiary",
         startIcon: /*#__PURE__*/React__namespace.createElement(theme.Add, null)
-      }, "Add a new service"))), addServiceisOpen && /*#__PURE__*/React__namespace.createElement(ServicePopupConnect, {
+      }, "Add a new service"))), addServiceIsOpen && /*#__PURE__*/React__namespace.createElement(ServicePopupConnect, {
         servicePopupVariant: "add",
-        isOpen: addServiceisOpen,
+        isOpen: addServiceIsOpen,
         closePopup: closePopup
+      }), editServiceIsOpen && /*#__PURE__*/React__namespace.createElement(ServicePopupConnect, {
+        servicePopupVariant: "edit",
+        isOpen: editServiceIsOpen.isOpen,
+        closePopup: closePopup,
+        serviceId: editServiceIsOpen.serviceId,
+        url: editServiceIsOpen.serviceUrl
       }));
     };
 
@@ -13124,9 +13173,6 @@
 
     var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect() {
       var dispatch = reactRedux.useDispatch();
-      var allLayers = reactRedux.useSelector(function (store) {
-        return getAllLayers(store);
-      });
       var mapStoreRemoveService = React__namespace.useCallback(function (serviceId, serviceUrl) {
         dispatch(serviceActions.mapStoreRemoveService({
           id: serviceId,
@@ -13138,7 +13184,6 @@
       });
       return /*#__PURE__*/React__namespace.createElement(ServiceOptionsDialog, {
         services: services,
-        layers: allLayers,
         mapStoreRemoveService: mapStoreRemoveService
       });
     };
@@ -13754,6 +13799,11 @@
       var serviceSetLayers = React__namespace.useCallback(function (payload) {
         dispatch(serviceActions.serviceSetLayers(payload));
       }, [dispatch]);
+
+      var checkIfUserAddedService = function checkIfUserAddedService(service) {
+        return !!service.isUserAddedService;
+      };
+
       React__namespace.useEffect(function () {
         if (isOpenInStore && preloadedServices && preloadedServices.length > 0) {
           mergePresetsAndUserAddedServices(preloadedServices, getUserAddedServices()).forEach(function (service) {
@@ -13765,7 +13815,7 @@
                   name: service.name,
                   serviceUrl: service.url,
                   layers: layers,
-                  isUserAddedService: false
+                  isUserAddedService: checkIfUserAddedService(service)
                 });
               }
             })["catch"](function () {
@@ -14847,7 +14897,6 @@
       var animationDelay = _a.animationDelay,
           setMapAnimationDelay = _a.setMapAnimationDelay;
       var classes = useStyles$c();
-      var sliderClasses = shared.sliderStyles();
 
       var _b = __read(React__namespace.useState(false), 2),
           open = _b[0],
@@ -14911,8 +14960,8 @@
         text: text
       })))), open ? /*#__PURE__*/React__namespace.createElement("div", {
         className: classes.sliderBackground
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        className: sliderClasses.sliderHeader
+      }, /*#__PURE__*/React__namespace.createElement(material.Box, {
+        sx: shared.sliderHeaderStyle
       }, "Speed"), /*#__PURE__*/React__namespace.createElement(shared.CustomSlider, {
         "data-testid": "speedSlider",
         orientation: "vertical",
@@ -15103,7 +15152,6 @@
         return null;
       } : _d;
       var classes = useStyles$b();
-      var sliderClasses = shared.sliderStyles();
 
       var _e = __read(React__namespace.useState(false), 2),
           open = _e[0],
@@ -15171,8 +15219,8 @@
         "data-testid": "timeStepButtonText"
       })))), open ? /*#__PURE__*/React__namespace.createElement("div", {
         className: classes.sliderBackground
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        className: sliderClasses.sliderHeader
+      }, /*#__PURE__*/React__namespace.createElement(material.Box, {
+        sx: shared.sliderHeaderStyle
       }, "Time step"), /*#__PURE__*/React__namespace.createElement(shared.CustomSlider, {
         "data-testid": "timeStepButtonSlider",
         orientation: "vertical",

package/lib/components/LayerManager/BaseLayerRow/BaseLayers/BaseLayersConnect.d.ts

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { Layer } from '../../../../store/mapStore/types';
 export declare const constructLayerId: (baseLayer: Layer, selectedBaseLayers: Layer[]) => string;
 export declare const constructListAvailableBaseLayers: (selectedBaseLayers: Layer[], preloadedAvailableBaseLayers: Layer[], mapId: string) => Layer[];
+export declare const areAvailableBaseLayersSame: (availableBaseLayerList: Layer[], newBaseLayerList: Layer[]) => boolean;
 interface BaseLayersConnectProps {
     mapId: string;
     preloadedAvailableBaseLayers: Layer[];

package/lib/components/LayerManager/LayerSelect/ServiceOptionsDialog/ServiceOptionsDialog.d.ts

@@ -1,10 +1,8 @@
 import * as React from 'react';
-import { ReduxLayer } from '../../../../store/mapStore/layers/types';
 import { ActiveServiceObject } from '../../../../store/layerSelect/types';
 interface ServiceOptionsDialogProps {
     services: Record<string, ActiveServiceObject>;
     mapStoreRemoveService?: (serviceId: string, serviceUrl: string) => void;
-    layers?: ReduxLayer[];
 }
 declare const ServiceOptionsDialog: React.FC<ServiceOptionsDialogProps>;
 export default ServiceOptionsDialog;

package/lib/components/LayerManager/LayerSelect/ServicePopup/ServicePopup.d.ts

@@ -1,12 +1,14 @@
 import * as React from 'react';
 import { SetLayersForServicePayload } from '../../../../store/mapStore/types';
+import { ActiveServices } from '../../../../store/layerSelect/types';
 interface ServicePopupProps {
     servicePopupVariant: 'edit' | 'add' | 'save';
     hideBackdrop?: boolean;
     isOpen?: boolean;
     closePopup?: () => void;
+    serviceId?: string;
     url?: string;
-    services?: any;
+    services?: ActiveServices;
     serviceSetLayers: (payload: SetLayersForServicePayload) => void;
 }
 export declare const ADD_HEADING = "Add a new service";

package/lib/components/LayerManager/LayerSelect/ServicePopup/ServicePopupConnect.d.ts

@@ -4,6 +4,7 @@ interface ServicePopupConnectProps {
     hideBackdrop?: boolean;
     isOpen?: boolean;
     closePopup?: () => void;
+    serviceId?: string;
     url?: string;
 }
 declare const ServicePopupConnect: React.FC<ServicePopupConnectProps>;

package/lib/components/WMSLoader/services.d.ts

@@ -2,4 +2,5 @@ export interface Service {
     name: string;
     url: string;
     id: string;
+    isUserAddedService?: boolean;
 }

package/lib/index.d.ts

@@ -71,6 +71,7 @@ export declare const mapActions: {
     layerSetDimensions: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<mapTypes.SetLayerDimensionsPayload, string>;
     addAvailableBaseLayer: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<mapTypes.AddAvailableBaseLayerPayload, string>;
     addAvailableBaseLayers: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<mapTypes.AddAvailableBaseLayersPayload, string>;
+    setAvailableBaseLayers: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<mapTypes.AddAvailableBaseLayersPayload, string>;
     onUpdateLayerInformation: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<mapTypes.UpdateLayerInfoPayload, string>;
 };
 export { mapSelectors, mapTypes, mapUtils, layerReducer, layerActions, uiActions, uiSelectors, uiTypes, genericActions as syncGroupActions, };

package/lib/store/layerSelect/types.d.ts

@@ -3,6 +3,7 @@ export interface ActiveServiceObject {
     serviceUrl?: string;
     enabled?: boolean;
     keywordsPerService?: string[];
+    isUserAddedService?: boolean;
 }
 export interface ActiveServices {
     [key: string]: ActiveServiceObject;
@@ -51,6 +52,7 @@ export interface AddKeywordsAndActiveServicesPayload {
     serviceName: string;
     serviceUrl: string;
     keywords: string[];
+    isUserAddedService: boolean;
 }
 export interface LayerSelectServiceRemovedPayload {
     serviceId: string;

package/lib/store/mapStore/layers/reducer.d.ts

@@ -1,5 +1,5 @@
 import { PayloadAction } from '@reduxjs/toolkit';
-import { LayerState, Layer, AddLayerPayload, SetLayerDimensionPayload, SetLayerEnabledPayload, SetLayerOpacityPayload, SetLayerStylePayload, SetLayerNamePayload, SetLayerGeojsonPayload, DeleteLayerPayload, ErrorLayerPayload, SetLayersPayload, SetBaseLayersPayload, AddBaseLayerPayload, SetLayerDimensionsPayload, AddAvailableBaseLayerPayload, AddAvailableBaseLayersPayload, UpdateLayerInfoPayload } from './types';
+import { LayerState, Layer, AddLayerPayload, SetLayerDimensionPayload, SetLayerEnabledPayload, SetLayerOpacityPayload, SetLayerStylePayload, SetLayerNamePayload, SetLayerGeojsonPayload, DeleteLayerPayload, ErrorLayerPayload, SetLayersPayload, SetBaseLayersPayload, AddBaseLayerPayload, SetLayerDimensionsPayload, AddAvailableBaseLayerPayload, AddAvailableBaseLayersPayload, UpdateLayerInfoPayload, SetAvailableBaseLayersPayload } from './types';
 export declare const createLayer: ({ id, opacity, enabled, layerType, status, ...props }: Layer) => Layer;
 export declare const initialState: LayerState;
 export declare const slice: import("@reduxjs/toolkit").Slice<LayerState, {
@@ -19,6 +19,7 @@ export declare const slice: import("@reduxjs/toolkit").Slice<LayerState, {
     layerSetDimensions: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<SetLayerDimensionsPayload>) => void;
     addAvailableBaseLayer: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<AddAvailableBaseLayerPayload>) => void;
     addAvailableBaseLayers: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<AddAvailableBaseLayersPayload>) => void;
+    setAvailableBaseLayers: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<SetAvailableBaseLayersPayload>) => void;
     onUpdateLayerInformation: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<UpdateLayerInfoPayload>) => LayerState;
 }, "layerReducer">;
 export declare const reducer: import("@reduxjs/toolkit").Reducer<LayerState, import("@reduxjs/toolkit").AnyAction>;
@@ -39,6 +40,7 @@ export declare const layerActions: import("@reduxjs/toolkit").CaseReducerActions
     layerSetDimensions: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<SetLayerDimensionsPayload>) => void;
     addAvailableBaseLayer: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<AddAvailableBaseLayerPayload>) => void;
     addAvailableBaseLayers: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<AddAvailableBaseLayersPayload>) => void;
+    setAvailableBaseLayers: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<SetAvailableBaseLayersPayload>) => void;
     onUpdateLayerInformation: (draft: import("immer/dist/internal").WritableDraft<LayerState>, action: PayloadAction<UpdateLayerInfoPayload>) => LayerState;
 }>;
 export declare type LayerActions = ReturnType<typeof layerActions.layerSetDimensions> | ReturnType<typeof layerActions.layerChangeStyle> | ReturnType<typeof layerActions.addAvailableBaseLayer> | ReturnType<typeof layerActions.addAvailableBaseLayers> | ReturnType<typeof layerActions.addBaseLayer> | ReturnType<typeof layerActions.addLayer> | ReturnType<typeof layerActions.baseLayerDelete> | ReturnType<typeof layerActions.onUpdateLayerInformation> | ReturnType<typeof layerActions.layerChangeDimension> | ReturnType<typeof layerActions.layerChangeEnabled> | ReturnType<typeof layerActions.layerChangeGeojson> | ReturnType<typeof layerActions.layerChangeName> | ReturnType<typeof layerActions.layerChangeOpacity> | ReturnType<typeof layerActions.layerDelete> | ReturnType<typeof layerActions.layerError> | ReturnType<typeof layerActions.setBaseLayers> | ReturnType<typeof layerActions.setLayers>;

package/lib/store/mapStore/layers/types.d.ts

@@ -143,6 +143,7 @@ export interface AddAvailableBaseLayersPayload {
     layers: ReduxLayer[];
     origin?: string;
 }
+export declare type SetAvailableBaseLayersPayload = AddAvailableBaseLayersPayload;
 export interface ErrorLayerPayload extends LayerPayload {
     error: Error;
 }

package/lib/store/mapStore/service/selectors.d.ts

@@ -136,9 +136,11 @@ export declare const getServicesInArray: ((state: {
 }) => {
     name: string;
     serviceUrl: string;
+    isUserAddedService: boolean;
 }[]) & import("reselect").OutputSelectorFields<((args_0: ServiceState) => {
     name: string;
     serviceUrl: string;
+    isUserAddedService: boolean;
 }[]) & {
     clearCache: () => void;
 }> & {

package/lib/store/mapStore/service/types.d.ts

@@ -7,6 +7,7 @@ export interface ReduxService {
     serviceUrl?: string;
     active?: boolean;
     layers?: ServiceLayer[];
+    isUserAddedService?: boolean;
 }
 /**
  * Used in the services object of webmap to keep a list of available layers in the service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "2.15.0",
+  "version": "3.0.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,22 +13,22 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/theme": "2.15.0",
+    "@opengeoweb/theme": "3.0.0",
     "@mui/material": "^5.2.8",
     "@mui/styles": "^5.2.3",
     "moment": "^2.29.0",
     "react-redux": "^8.0.2",
     "react-intl": "^5.17.5",
     "lodash": "^4.17.20",
-    "@opengeoweb/shared": "2.15.0",
+    "@opengeoweb/shared": "3.0.0",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
-    "@opengeoweb/form-fields": "2.15.0",
+    "@opengeoweb/form-fields": "3.0.0",
     "react-hook-form": "^6.12.1",
     "moment-timezone": "^0.5.31",
     "@mui/lab": "^5.0.0-alpha.64",
     "axios": "^0.25.0",
-    "@opengeoweb/webmap": "2.15.0",
+    "@opengeoweb/webmap": "3.0.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",