@opengeoweb/layer-select 14.4.0 → 14.5.1

package/index.esm.js

@@ -1,10 +1,9 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import * as React from 'react';
-import React__default from 'react';
+import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { CustomIconButton, FilterOption, ToolContainerDraggable, CustomAccordion, CustomTooltip, SearchHighlight, SearchField, CustomToggleButton, AlertBanner, ToggleMenu, CustomDialog, sessionStorageProvider } from '@opengeoweb/shared';
-import { Filter, ArrowDropDownDown, LayersAdd, Add, Cached, Edit, Visibility, Delete, MeteoGate, Copy } from '@opengeoweb/theme';
 import { uiTypes, serviceActions, selectorMemoizationOptions, serviceSelectors, uiActions, getUserAddedServices, setUserAddedServices, layerActions, uiSelectors, layerSelectors, mapListener, serviceListener, layersListener, openlayersListener, uiReducer, layerReducer, serviceReducer, mapReducer, useSetupDialog, mapSelectors, layerTypes, mapEnums } from '@opengeoweb/store';
+import { Filter, ArrowDropDownDown, LayersAdd, MeteoGate, Add, Cached, Edit, Visibility, Delete, Copy } from '@opengeoweb/theme';
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { compact, countBy, partition } from 'lodash';
 import { snackbarListener, snackbarReducer, snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
@@ -14,8 +13,8 @@ import { useTranslation } from 'react-i18next';
 import { FixedSizeList } from 'react-window';
 import { getDimensionsList, LayerInfoButton, clearImageCacheForAllMaps } from '@opengeoweb/webmap-react';
 import { LayerType, webmapUtils, getWMSServiceId, queryWMSServiceInfo, queryWMSLayers, invalidateWMSGetCapabilities } from '@opengeoweb/webmap';
-import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
+import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 
 var en = {
 	"layer-select": "Layer Select",
@@ -223,11 +222,11 @@ var filterLayersFromService = function filterLayersFromService(serviceId, servic
   var searchStringArray = searchString.split(' ');
   return mapStoreService.layers.filter(function (layer) {
     return searchStringArray.every(function (search) {
-      var _layer$name, _layer$title, _layer$abstract;
+      var _layer$keywords, _layer$name, _layer$title, _layer$abstract;
       var searchLowercase = search.toLowerCase();
       var layerFilterIds = layer.path.map(function (group) {
         return getFilterId('groups', group);
-      }).concat(layer.keywords.map(function (keyword) {
+      }).concat(((_layer$keywords = layer.keywords) != null ? _layer$keywords : []).map(function (keyword) {
         return getFilterId('keywords', keyword);
       }));
       var isFilterInLayer = (layerFilterIds == null ? void 0 : layerFilterIds.some(function (id) {
@@ -251,23 +250,6 @@ var isUserAddedService = function isUserAddedService(scope) {
   return scope === 'user';
 };
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2023 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
 var layerSelectFilterAdapter = createEntityAdapter();
 var layerSelectActiveServicesAdapter = createEntityAdapter({
   selectId: function selectId(service) {
@@ -494,7 +476,7 @@ var layerSelectReducer = slice.reducer,
  * */
 var useAppSelector = useSelector;
 var layerSelectStore = function layerSelectStore(store) {
-  return store && store.layerSelect ? store.layerSelect : null;
+  return store != null && store.layerSelect ? store.layerSelect : null;
 };
 /**
  * Returns search filter string
@@ -688,28 +670,6 @@ var selectors = /*#__PURE__*/Object.freeze({
   useAppSelector: useAppSelector
 });
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2022 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-
-var types = /*#__PURE__*/Object.freeze({
-  __proto__: null
-});
-
 function _OverloadYield(e, d) {
   this.v = e, this.k = d;
 }
@@ -1191,11 +1151,11 @@ var KeywordFilterButtonConnect = function KeywordFilterButtonConnect(_ref) {
     }));
   }, [currentActiveMapId, dispatch, isOpenInStore, mapId, source, dialogType]);
   return jsx(CustomIconButton, {
-    variant: "tool",
-    onClick: openFilterResultsDialog,
-    isSelected: isOpenInStore,
-    id: "keywordFilterButton",
     "data-testid": "keywordFilterButton",
+    id: "keywordFilterButton",
+    isSelected: isOpenInStore,
+    onClick: openFilterResultsDialog,
+    variant: "tool",
     children: jsx(Filter, {})
   });
 };
@@ -1210,12 +1170,12 @@ var KeywordFilterResultsListItemConnect = function KeywordFilterResultsListItemC
     }));
   }, [dispatch]);
   return jsx(FilterOption, {
-    optionId: filter.id,
     checked: !!filter.checked,
+    label: filter.amountVisible ? filter.name + " (" + filter.amountVisible + ")" : filter.name,
     onClick: function onClick(checked, only) {
       toggleFilter(filter.id, only);
     },
-    label: filter.amountVisible ? filter.name + " (" + filter.amountVisible + ")" : filter.name
+    optionId: filter.id
   });
 };
 
@@ -1228,14 +1188,14 @@ var KeywordFilterSelectAllSwitchConnect = function KeywordFilterSelectAllSwitchC
     dispatch(layerSelectActions.toggleAllFilters());
   }, [dispatch]);
   return jsx(Switch, {
+    checked: allFiltersActive,
+    "data-testid": "customSwitch",
+    onChange: toggleFilters,
     slotProps: {
       input: {
         'aria-label': 'All'
       }
-    },
-    checked: allFiltersActive,
-    onChange: toggleFilters,
-    "data-testid": "customSwitch"
+    }
   });
 };
 
@@ -1283,27 +1243,27 @@ var KeywordFilterResults = function KeywordFilterResults(_ref) {
   var _useLayerSelectTransl = useLayerSelectTranslation(),
     t = _useLayerSelectTransl.t;
   return jsxs(ToolContainerDraggable, {
-    title: t('groups-and-keywords-dialog-title'),
+    bounds: bounds,
     "data-testid": "keywordFilterResults",
-    startSize: {
-      width: 349,
-      height: 600
-    },
-    minWidth: 312,
-    minHeight: 192,
     isOpen: isOpen,
+    minHeight: 192,
+    minWidth: 312,
     onClose: onClose,
-    bounds: bounds,
     onMouseDown: onMouseDown,
     order: order,
     source: source,
+    startSize: {
+      width: 349,
+      height: 600
+    },
+    title: t('groups-and-keywords-dialog-title'),
     children: [jsxs(Grid, {
+      alignItems: "center",
       container: true,
+      justifyContent: "space-between",
       size: {
         xs: 12
       },
-      justifyContent: "space-between",
-      alignItems: "center",
       sx: {
         backgroundColor: 'background.paper',
         position: 'sticky',
@@ -1311,31 +1271,31 @@ var KeywordFilterResults = function KeywordFilterResults(_ref) {
         zIndex: 100
       },
       children: [jsx(Grid, {
+        alignItems: "center",
         container: true,
+        justifyContent: "flex-start",
         size: {
           xs: 6
         },
-        justifyContent: "flex-start",
-        alignItems: "center",
         sx: {
           padding: '15px 15px 0 24px'
         },
         children: t('select-all')
       }), jsx(Grid, {
+        alignContent: "center",
         container: true,
+        justifyContent: "flex-end",
         size: {
           xs: 6
         },
-        justifyContent: "flex-end",
-        alignContent: "center",
         sx: {
           padding: '15px 15px 0 15px'
         },
         children: jsx(KeywordFilterSelectAllSwitchConnect, {})
       })]
     }), jsx(CustomAccordion, {
-      title: t('groups'),
       detailsSx: accordionDetailsStyle,
+      title: t('groups'),
       children: jsx(List, {
         dense: true,
         style: listStyle,
@@ -1346,8 +1306,8 @@ var KeywordFilterResults = function KeywordFilterResults(_ref) {
         })
       })
     }), jsx(CustomAccordion, {
-      title: t('keywords'),
       detailsSx: accordionDetailsStyle,
+      title: t('keywords'),
       children: jsx(List, {
         dense: true,
         style: listStyle,
@@ -1375,12 +1335,12 @@ var KeywordFilterResultsConnect = function KeywordFilterResultsConnect(_ref) {
   var filters = useAppSelector(getFilters);
   return jsx(KeywordFilterResults, {
     bounds: bounds,
+    filters: filters,
     isOpen: isDialogOpen,
     onClose: onCloseDialog,
     onMouseDown: setDialogOrder,
     order: dialogOrder,
-    source: uiSource,
-    filters: filters
+    source: uiSource
   });
 };
 
@@ -1424,7 +1384,8 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
     });
   };
   var handleClose = function handleClose(event) {
-    if (anchorRef.current && anchorRef.current.contains(event.target)) {
+    var _anchorRef$current;
+    if ((_anchorRef$current = anchorRef.current) != null && _anchorRef$current.contains(event.target)) {
       return;
     }
     setOpen(false);
@@ -1442,25 +1403,15 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
   };
   return jsxs(Fragment, {
     children: [jsxs(ToggleButtonGroup, {
-      ref: anchorRef,
       fullWidth: true,
+      ref: anchorRef,
       style: {
         height: '32px'
       },
       children: [jsx(ToggleButton, {
-        "data-testid": "layerAddRemoveButton-" + layer.name,
-        value: "selected",
-        selected: !!foundLayer,
         className: "tool",
-        style: {
-          borderRadius: '3px 0 0 3px',
-          height: 'inherit',
-          minWidth: '62px',
-          fontSize: '12px'
-        },
-        onMouseDown: function onMouseDown(e) {
-          e.stopPropagation();
-        },
+        "data-testid": "layerAddRemoveButton-" + layer.name,
+        fullWidth: true,
         onClick: function onClick() {
           !foundLayer ? addLayer({
             serviceUrl: serviceUrl,
@@ -1470,7 +1421,17 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
             layerIndex: foundLayerIndex
           });
         },
-        fullWidth: true,
+        onMouseDown: function onMouseDown(e) {
+          e.stopPropagation();
+        },
+        selected: !!foundLayer,
+        style: {
+          borderRadius: '3px 0 0 3px',
+          height: 'inherit',
+          minWidth: '62px',
+          fontSize: '12px'
+        },
+        value: "selected",
         children: !foundLayer ? t('add') : t('remove')
       }), jsx(Box, {
         sx: {
@@ -1478,20 +1439,20 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
           backgroundColor: foundLayer || layerExistsInWorkspace ? 'geowebColors.buttons.primary.default.borderColor' : 'geowebColors.buttons.secondary.default.fill'
         }
       }), jsx(ToggleButton, {
+        className: "tool",
         "data-testid": "layerAddRemoveButton-dropdown-" + layer.name,
-        value: "dropdown",
-        selected: !!layerExistsInWorkspace,
         onClick: handleToggle,
-        className: "tool",
         onMouseDown: function onMouseDown(e) {
           e.stopPropagation();
         },
+        selected: !!layerExistsInWorkspace,
         style: {
           marginLeft: '0',
           minWidth: '32px',
           borderRadius: '0 3px 3px 0',
           height: 'inherit'
         },
+        value: "dropdown",
         children: jsx(ArrowDropDownDown, {
           style: {
             marginRight: '1px'
@@ -1499,14 +1460,14 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
         })
       })]
     }), jsx(Popper, {
-      open: open,
       anchorEl: anchorRef.current,
-      role: undefined,
-      transition: true,
+      open: open,
       placement: "bottom-end",
+      role: undefined,
       style: {
         zIndex: 1300
       },
+      transition: true,
       children: function children(_ref2) {
         var TransitionProps = _ref2.TransitionProps,
           placement = _ref2.placement;
@@ -1520,8 +1481,8 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
               children: jsxs(MenuList, {
                 autoFocusItem: true,
                 children: [jsx(MenuItem, {
-                  onClick: handleAddAll,
                   disabled: existsInAllMaps,
+                  onClick: handleAddAll,
                   children: t('add-to-all-maps')
                 }), jsx(MenuItem, {
                   disabled: !layerExistsInWorkspace,
@@ -1541,7 +1502,7 @@ var LayerAddRemoveButton = function LayerAddRemoveButton(_ref) {
 
 var LayerListDimensions = function LayerListDimensions(_ref) {
   var dimensions = _ref.dimensions;
-  if (!dimensions || !dimensions.length) {
+  if (!(dimensions != null && dimensions.length)) {
     return null;
   }
   return jsx(Fragment, {
@@ -1686,7 +1647,7 @@ var layerInfoStyle = {
   lineHeight: 1
 };
 var LayerListRow = function LayerListRow(_ref) {
-  var _layer$keywords;
+  var _layer$keywords, _layer$keywords2;
   var layer = _ref.layer,
     service = _ref.service,
     allLayers = _ref.allLayers,
@@ -1707,10 +1668,10 @@ var LayerListRow = function LayerListRow(_ref) {
   var columns = widthToColumns(layerSelectWidth);
   var dimensions = getDimensionsList(layer.dimensions);
   return jsxs(Grid, {
-    "data-testid": "layerListLayerRow",
+    alignItems: "center",
     container: true,
+    "data-testid": "layerListLayerRow",
     justifyContent: "center",
-    alignItems: "center",
     sx: {
       backgroundColor: 'geowebColors.cards.cardContainer',
       padding: '8px',
@@ -1736,8 +1697,8 @@ var LayerListRow = function LayerListRow(_ref) {
             overflow: 'hidden'
           },
           children: jsx(SearchHighlight, {
-            text: layer.title,
-            search: searchFilter
+            search: searchFilter,
+            text: layer.title
           })
         })
       }), jsxs(Grid, {
@@ -1753,8 +1714,8 @@ var LayerListRow = function LayerListRow(_ref) {
             overflow: 'hidden'
           },
           children: jsx(SearchHighlight, {
-            text: service.name,
-            search: searchFilter
+            search: searchFilter,
+            text: service.name
           })
         }), jsx(LayerInfoButton, {
           isActive: hasActiveLayer,
@@ -1764,12 +1725,12 @@ var LayerListRow = function LayerListRow(_ref) {
         sx: columns.column2,
         children: [jsx(Grid, {
           sx: columns.column3,
-          children: layer["abstract"] && jsx(Typography, {
+          children: !!layer["abstract"] && jsx(Typography, {
             "data-testid": "layerAbstract",
             sx: layerInfoStyle,
             children: jsx(SearchHighlight, {
-              text: layer["abstract"],
-              search: searchFilter
+              search: searchFilter,
+              text: layer["abstract"]
             })
           })
         }), jsxs(Grid, {
@@ -1785,42 +1746,42 @@ var LayerListRow = function LayerListRow(_ref) {
             children: [layer.path.length > 0 && jsxs(Typography, {
               sx: layerInfoStyle,
               children: [t('groups'), ":", ' ', jsx(SearchHighlight, {
-                text: layer.path.join(' / '),
-                search: searchFilter
+                search: searchFilter,
+                text: layer.path.join(' / ')
               })]
             }), ((_layer$keywords = layer.keywords) == null ? void 0 : _layer$keywords.length) > 0 && jsxs(Typography, {
               sx: layerInfoStyle,
               children: [t('keywords'), ":", ' ', jsx(SearchHighlight, {
-                text: layer.keywords.slice().sort(function (textA, textB) {
+                search: searchFilter,
+                text: ((_layer$keywords2 = layer.keywords) != null ? _layer$keywords2 : []).slice().sort(function (textA, textB) {
                   return textA.localeCompare(textB);
-                }).join(', '),
-                search: searchFilter
+                }).join(', ')
               })]
             })]
           })]
         })]
       })]
     }), jsx(Grid, {
+      alignItems: "center",
       container: true,
-      sx: columns.column9,
       justifyContent: "flex-end",
-      alignItems: "center",
+      sx: columns.column9,
       children: jsx(Box, {
+        alignItems: "flex-start",
         sx: (columns.column7, {
           width: '100%',
           paddingLeft: '16px'
         }),
-        alignItems: "flex-start",
         children: jsx(LayerAddRemoveButton, {
-          layer: layer,
-          serviceUrl: service.serviceUrl,
-          allMapIds: allMapIds,
-          allLayers: allLayers,
           addLayer: addLayer,
           addLayerToAllMaps: addLayerToAllMaps,
+          allLayers: allLayers,
+          allMapIds: allMapIds,
           deleteLayer: deleteLayer,
+          layer: layer,
+          mapLayers: mapLayers,
           removeLayerFromAllMaps: removeLayerFromAllMaps,
-          mapLayers: mapLayers
+          serviceUrl: service.serviceUrl
         })
       })
     })]
@@ -1871,26 +1832,26 @@ var LayerList = function LayerList(_ref) {
         var isActiveLayer = isLayerInfoVisibleInStore && (currentLayerInfo == null ? void 0 : currentLayerInfo.serviceUrl) === service.serviceUrl && (currentLayerInfo == null ? void 0 : currentLayerInfo.layerName) === filter.name;
         return jsx("div", {
           style: style,
-          children: service && jsx(LayerListRow, {
-            layer: filter,
-            service: service,
-            allLayers: allLayers,
-            allMapIds: allMapIds,
+          children: !!service && jsx(LayerListRow, {
             addLayer: addLayer,
             addLayerToAllMaps: addLayerToAllMaps,
+            allLayers: allLayers,
+            allMapIds: allMapIds,
             deleteLayer: deleteLayer,
-            removeLayerFromAllMaps: removeLayerFromAllMaps,
-            mapLayers: mapLayers,
-            layerSelectWidth: layerSelectWidth,
-            searchFilter: searchFilter,
             hasActiveLayer: isActiveLayer,
+            layer: filter,
+            layerSelectWidth: layerSelectWidth,
+            mapLayers: mapLayers,
             onToggleActiveLayer: function onToggleActiveLayer() {
               return _onToggleActiveLayer({
                 serviceUrl: service == null ? void 0 : service.serviceUrl,
                 layerName: filter.name,
                 isActiveLayer: isActiveLayer
               });
-            }
+            },
+            removeLayerFromAllMaps: removeLayerFromAllMaps,
+            searchFilter: searchFilter,
+            service: service
           })
         }, filter.name);
       }
@@ -2013,24 +1974,24 @@ var LayerListConnect = function LayerListConnect(_ref) {
     }
   }, [mapId, dispatch]);
   return jsx(LayerList, {
-    filteredLayers: filteredLayers,
-    services: services,
-    allLayers: allLayers,
-    allMapIds: allMapIds,
-    layerSelectHeight: layerSelectHeight,
-    serviceListHeight: serviceListHeight,
-    layerSelectWidth: layerSelectWidth,
     addLayer: function addLayer(params) {
       return _addLayer(params, mapId);
     },
     addLayerToAllMaps: addLayerToAllMaps,
+    allLayers: allLayers,
+    allMapIds: allMapIds,
+    currentLayerInfo: currentLayerInfo,
     deleteLayer: deleteLayer,
-    removeLayerFromAllMaps: removeLayerFromAllMaps,
-    mapLayers: mapLayers,
-    searchFilter: searchFilter,
+    filteredLayers: filteredLayers,
     isLayerInfoVisibleInStore: isLayerInfoVisibleInStore,
+    layerSelectHeight: layerSelectHeight,
+    layerSelectWidth: layerSelectWidth,
+    mapLayers: mapLayers,
     onToggleActiveLayer: onToggleActiveLayer,
-    currentLayerInfo: currentLayerInfo
+    removeLayerFromAllMaps: removeLayerFromAllMaps,
+    searchFilter: searchFilter,
+    serviceListHeight: serviceListHeight,
+    services: services
   });
 };
 
@@ -2069,15 +2030,50 @@ var LayerSelectButtonConnect = function LayerSelectButtonConnect(_ref) {
     }));
   }, [currentActiveMapId, dispatch, isOpenInStore, mapId, source, dialogType]);
   return jsx(CustomIconButton, {
+    "data-testid": "layerSelectButton",
+    id: "layerSelectButton",
     onClick: openLayerSelectDialog,
     sx: style$2,
-    id: "layerSelectButton",
-    "data-testid": "layerSelectButton",
     tooltipTitle: tooltipTitle || t('layer-select-button-tooltip'),
     children: icon
   });
 };
 
+var DataExplorerButtonConnect = function DataExplorerButtonConnect(_ref) {
+  var mapId = _ref.mapId,
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? 'app' : _ref$source;
+  var dispatch = useDispatch();
+  var dialogType = uiTypes.DialogTypes.DataExplorer;
+  var currentActiveMapId = useSelector(function (store) {
+    return uiSelectors.getDialogMapId(store, dialogType);
+  });
+  var isOpenInStore = useSelector(function (store) {
+    return uiSelectors.getisDialogOpen(store, dialogType);
+  });
+  var openDataExplorerDialog = React.useCallback(function () {
+    dispatch(uiActions.setActiveMapIdForDialog({
+      type: dialogType,
+      setOpen: currentActiveMapId !== mapId ? true : !isOpenInStore,
+      source: source,
+      mapId: mapId,
+      origin: mapEnums.MapActionOrigin.map
+    }));
+  }, [dispatch, dialogType, currentActiveMapId, mapId, isOpenInStore, source]);
+  return jsx(CustomTooltip, {
+    title: "MeteoGate Data Explorer",
+    children: jsx(CustomIconButton, {
+      "data-testid": "dataExplorerButton",
+      isSelected: currentActiveMapId !== mapId ? false : isOpenInStore,
+      onClick: openDataExplorerDialog,
+      variant: "tool",
+      children: jsx(MeteoGate, {
+        sx: {}
+      })
+    })
+  });
+};
+
 var SearchFieldConnect = function SearchFieldConnect() {
   var dispatch = useDispatch();
   var searchFilter = useAppSelector(function (store) {
@@ -2096,9 +2092,9 @@ var SearchFieldConnect = function SearchFieldConnect() {
     }));
   };
   return jsx(SearchField, {
-    setSearchFilter: setSearchFilter,
+    onOpenServicePopup: toggleServicePopup,
     searchFilter: searchFilter,
-    onOpenServicePopup: toggleServicePopup
+    setSearchFilter: setSearchFilter
   });
 };
 
@@ -2124,22 +2120,20 @@ var ServiceChip = function ServiceChip(_ref) {
     t = _useLayerSelectTransl.t;
   var _useTheme = useTheme(),
     geowebColors = _useTheme.palette.geowebColors;
-  var chip = all ? 'all' : service && service.serviceUrl;
+  var chip = all ? 'all' : service == null ? void 0 : service.serviceUrl;
   return jsx(CustomTooltip, {
     title: service != null && service["abstract"] ? "Abstract: " + service["abstract"] : '',
     children: jsx("span", {
       children: jsx(CustomToggleButton, {
-        variant: "boxed",
-        selected: Boolean(isSelected),
-        tabIndex: 0,
         "data-testid": all ? 'serviceChipAll' : 'serviceChip',
+        disabled: isDisabled,
         onClick: function onClick() {
           return toggleChip(chip);
         },
         onKeyDown: function onKeyDown() {
           return toggleChip(chip);
         },
-        disabled: isDisabled,
+        selected: Boolean(isSelected),
         sx: Object.assign({}, style$1, isInSearch && Object.assign({
           backgroundColor: geowebColors.chip.highlightDefault.rgba + "!important",
           '&:hover': {
@@ -2151,6 +2145,8 @@ var ServiceChip = function ServiceChip(_ref) {
             backgroundColor: geowebColors.chip.highlightActiveMouseOver.rgba + "!important"
           }
         })),
+        tabIndex: 0,
+        variant: "boxed",
         children: service ? service.serviceName : t('all')
       })
     })
@@ -2181,36 +2177,38 @@ var ServiceChipConnect = function ServiceChipConnect(_ref) {
     }));
   };
   return jsx(ServiceChip, {
-    service: service,
-    toggleChip: toggleChip,
-    isSelected: isAllSelected ? false : service.enabled,
     isDisabled: service.isLoading,
-    isInSearch: isInSearch
+    isInSearch: isInSearch,
+    isSelected: isAllSelected ? false : service.enabled,
+    service: service,
+    toggleChip: toggleChip
   });
 };
 var AllChipConnect = function AllChipConnect(_ref2) {
   var isAllSelected = _ref2.isAllSelected;
   var dispatch = useDispatch();
   return jsx(ServiceChip, {
+    isSelected: isAllSelected,
     toggleChip: function toggleChip() {
       if (!isAllSelected) {
         dispatch(layerSelectActions.enableAllActiveServices());
       }
-    },
-    isSelected: isAllSelected
+    }
   });
 };
 
 var ServiceList = function ServiceList(_ref) {
+  var _ref$current;
   var activeServicesById = _ref.activeServicesById,
     setHeight = _ref.setHeight;
   var ref = React.useRef(null);
   var _React$useState = React.useState(0),
     serviceListHeight = _React$useState[0],
     setServiceListHeight = _React$useState[1];
-  var clientHeight = ref && ref.current && ref.current.clientHeight && ref.current.clientHeight;
+  var clientHeight = (ref == null || (_ref$current = ref.current) == null ? void 0 : _ref$current.clientHeight) && ref.current.clientHeight;
   React.useEffect(function () {
-    if (ref && ref.current && ref.current.clientHeight) {
+    var _ref$current2;
+    if (ref != null && (_ref$current2 = ref.current) != null && _ref$current2.clientHeight) {
       setServiceListHeight(ref.current.clientHeight);
     }
   }, [activeServicesById, clientHeight]);
@@ -2223,13 +2221,14 @@ var ServiceList = function ServiceList(_ref) {
     return activeService.enabled;
   });
   return jsx(Box, {
+    "data-testid": "serviceList",
     sx: {
       marginTop: '8px',
       width: '100%',
       overflow: 'hidden'
     },
-    "data-testid": "serviceList",
     children: jsxs(Box, {
+      ref: ref,
       sx: {
         width: '100%',
         display: 'block',
@@ -2240,13 +2239,12 @@ var ServiceList = function ServiceList(_ref) {
         marginBottom: '8px',
         fontSize: '0.875rem'
       },
-      ref: ref,
-      children: [(activeServicesIds == null ? void 0 : activeServicesIds.length) && jsx(AllChipConnect, {
+      children: [!!(activeServicesIds != null && activeServicesIds.length) && jsx(AllChipConnect, {
         isAllSelected: isAllSelected
       }), activeServices.map(function (service) {
         return jsx(ServiceChipConnect, {
-          service: service,
-          isAllSelected: isAllSelected
+          isAllSelected: isAllSelected,
+          service: service
         }, service.serviceUrl);
       })]
     })
@@ -2259,8 +2257,8 @@ var ServiceListConnect = function ServiceListConnect(_ref) {
     return getFilteredActiveServices(store);
   });
   return jsx(ServiceList, {
-    setHeight: setHeight,
-    activeServicesById: sortByService(filteredActiveServices)
+    activeServicesById: sortByService(filteredActiveServices),
+    setHeight: setHeight
   });
 };
 
@@ -2332,45 +2330,45 @@ var ServiceOptionsDialog = function ServiceOptionsDialog(_ref) {
     (_dialogRef$current = dialogRef.current) == null || _dialogRef$current.focus();
   }, []);
   return jsxs(Box, {
-    sx: styles.servicesContainer,
     "data-testid": "ServiceDialog",
     onKeyDown: function onKeyDown(event) {
       if (event.key !== 'Escape') {
         event.stopPropagation();
       }
     },
-    tabIndex: -1,
     ref: dialogRef,
+    sx: styles.servicesContainer,
+    tabIndex: -1,
     children: [jsxs(Box, {
       sx: styles.header,
       children: [jsx(Box, {
         sx: styles.text,
         children: t('services')
-      }), error && jsx(AlertBanner, {
-        title: error,
-        shouldClose: true
-      })]
+      }), error ? jsx(AlertBanner, {
+        shouldClose: true,
+        title: error
+      }) : null]
     }), jsx(Backdrop, {
+      open: isLoading,
       sx: Object.assign({}, styles.loading, {
         backgroundSize: 'cover'
       }),
-      open: isLoading,
       children: jsx(CircularProgress, {})
     }), jsx(Rows, {
-      services: services,
-      layerSelectRemoveService: layerSelectRemoveService,
       layerSelectReloadService: layerSelectReloadService,
-      setServicePopupInfo: setServicePopupInfo,
-      selectedLayers: selectedLayers
+      layerSelectRemoveService: layerSelectRemoveService,
+      selectedLayers: selectedLayers,
+      services: services,
+      setServicePopupInfo: setServicePopupInfo
     }), jsx(Box, {
       sx: styles.footer,
       children: jsx(Button, {
+        "data-testid": "openAddServiceButton",
         onClick: openAddService,
         onKeyDown: stopTabPropagation,
-        "data-testid": "openAddServiceButton",
+        startIcon: jsx(Add, {}),
         sx: styles.button,
         variant: "tertiary",
-        startIcon: jsx(Add, {}),
         children: t('add-a-new-service')
       })
     })]
@@ -2441,31 +2439,30 @@ var Rows = function Rows(_ref2) {
             },
             children: [jsx(CustomTooltip, {
               "data-testid": "updateServiceTooltip",
-              title: t('update-service-title'),
               placement: tooltipPlacement(),
               slotProps: {
                 popper: tooltipPopperProps
               },
+              title: t('update-service-title'),
               children: jsx(CustomIconButton, {
-                "data-testid": "updateServiceButton",
                 "aria-label": "Update layers from WMS service",
-                onKeyDown: stopTabPropagation,
+                "data-testid": "updateServiceButton",
                 onClick: function onClick() {
                   layerSelectReloadService(serviceUrl);
                 },
+                onKeyDown: stopTabPropagation,
                 children: jsx(Cached, {})
               })
             }), userAddedService ? jsx(CustomTooltip, {
-              title: t('edit-service-title'),
               placement: tooltipPlacement(),
               slotProps: {
                 popper: tooltipPopperProps
               },
+              title: t('edit-service-title'),
               children: jsx("span", {
                 children: jsx(CustomIconButton, {
                   "aria-label": "edit service",
                   "data-testid": "openEditServiceButton",
-                  onKeyDown: stopTabPropagation,
                   onClick: function onClick() {
                     setServicePopupInfo({
                       isOpen: true,
@@ -2474,20 +2471,20 @@ var Rows = function Rows(_ref2) {
                       variant: 'edit'
                     });
                   },
+                  onKeyDown: stopTabPropagation,
                   children: jsx(Edit, {})
                 })
               })
             }) : jsx(CustomTooltip, {
-              title: t('show-service-title'),
               placement: tooltipPlacement(),
               slotProps: {
                 popper: tooltipPopperProps
               },
+              title: t('show-service-title'),
               children: jsx("span", {
                 children: jsx(CustomIconButton, {
                   "aria-label": "show service",
                   "data-testid": "openShowServiceButton",
-                  onKeyDown: stopTabPropagation,
                   onClick: function onClick() {
                     setServicePopupInfo({
                       isOpen: true,
@@ -2496,26 +2493,27 @@ var Rows = function Rows(_ref2) {
                       variant: 'show'
                     });
                   },
+                  onKeyDown: stopTabPropagation,
                   children: jsx(Visibility, {})
                 })
               })
-            }), userAddedService && jsx(Box, {
+            }), !!userAddedService && jsx(Box, {
               children: jsx(CustomTooltip, {
-                title: deleteServiceTitle(t, serviceHasActiveLayers),
+                "data-testid": "removeServiceTooltip",
+                placement: tooltipPlacement(),
                 slotProps: {
                   popper: tooltipPopperProps
                 },
-                placement: tooltipPlacement(),
-                "data-testid": "removeServiceTooltip",
+                title: deleteServiceTitle(t, serviceHasActiveLayers),
                 children: jsx("span", {
                   children: jsx(CustomIconButton, {
-                    "data-testid": "removeServiceButton",
                     "aria-label": "delete service",
+                    "data-testid": "removeServiceButton",
                     disabled: serviceHasActiveLayers,
-                    onKeyDown: stopTabPropagation,
                     onClick: function onClick() {
                       return layerSelectRemoveService(serviceId, serviceUrl, serviceName);
                     },
+                    onKeyDown: stopTabPropagation,
                     children: jsx(Delete, {})
                   })
                 })
@@ -2703,15 +2701,15 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect(_ref) {
             service = getService(services, serviceUrl);
             serviceSetLayers({
               id: layersForService.id,
-              name: service && service.serviceName || layersForService.name,
+              name: (service == null ? void 0 : service.serviceName) || layersForService.name,
               serviceUrl: serviceUrl,
-              "abstract": service && service["abstract"] || layersForService["abstract"],
+              "abstract": (service == null ? void 0 : service["abstract"]) || layersForService["abstract"],
               layers: layersForService.layers,
-              scope: service && service.scope || 'user',
+              scope: (service == null ? void 0 : service.scope) || 'user',
               isUpdating: true
             });
             clearImageCacheForAllMaps();
-            serviceTitle = service && service.serviceName || layersForService.name;
+            serviceTitle = (service == null ? void 0 : service.serviceName) || layersForService.name;
             showSnackbar(getServiceSuccesUpdateMessage(serviceTitle));
             _context.next = 16;
             break;
@@ -2736,13 +2734,13 @@ var ServiceOptionsDialogConnect = function ServiceOptionsDialogConnect(_ref) {
     };
   }(), [serviceSetLayers, services, showSnackbar, t]);
   return jsx(ServiceOptionsDialog, {
+    error: error,
+    isLoading: isLoading,
+    layerSelectReloadService: layerSelectReloadService,
+    layerSelectRemoveService: layerSelectRemoveService,
     selectedLayers: selectedLayers,
     services: services,
-    layerSelectRemoveService: layerSelectRemoveService,
-    layerSelectReloadService: layerSelectReloadService,
-    setServicePopupInfo: setServicePopupInfo,
-    isLoading: isLoading,
-    error: error
+    setServicePopupInfo: setServicePopupInfo
   });
 };
 
@@ -2757,41 +2755,6 @@ var ServiceOptionsButton = function ServiceOptionsButton(_ref) {
   });
 };
 
-var DataExplorerButtonConnect = function DataExplorerButtonConnect(_ref) {
-  var mapId = _ref.mapId,
-    _ref$source = _ref.source,
-    source = _ref$source === void 0 ? 'app' : _ref$source;
-  var dispatch = useDispatch();
-  var dialogType = uiTypes.DialogTypes.DataExplorer;
-  var currentActiveMapId = useSelector(function (store) {
-    return uiSelectors.getDialogMapId(store, dialogType);
-  });
-  var isOpenInStore = useSelector(function (store) {
-    return uiSelectors.getisDialogOpen(store, dialogType);
-  });
-  var openDataExplorerDialog = React.useCallback(function () {
-    dispatch(uiActions.setActiveMapIdForDialog({
-      type: dialogType,
-      setOpen: currentActiveMapId !== mapId ? true : !isOpenInStore,
-      source: source,
-      mapId: mapId,
-      origin: mapEnums.MapActionOrigin.map
-    }));
-  }, [dispatch, dialogType, currentActiveMapId, mapId, isOpenInStore, source]);
-  return jsx(CustomTooltip, {
-    title: "MeteoGate Data Explorer",
-    children: jsx(CustomIconButton, {
-      variant: "tool",
-      "data-testid": "dataExplorerButton",
-      onClick: openDataExplorerDialog,
-      isSelected: currentActiveMapId !== mapId ? false : isOpenInStore,
-      children: jsx(MeteoGate, {
-        sx: {}
-      })
-    })
-  });
-};
-
 var LayerSelect = function LayerSelect(_ref) {
   var mapId = _ref.mapId,
     bounds = _ref.bounds,
@@ -2836,29 +2799,12 @@ var LayerSelect = function LayerSelect(_ref) {
     }
   };
   return jsxs(ToolContainerDraggable, {
-    title: showTitle ? "Layer Select " + mapId : 'Layer Select',
-    startSize: {
-      width: width,
-      height: height
-    },
-    minWidth: 320,
-    minHeight: 126,
-    startPosition: {
-      top: 150,
-      left: 100
-    },
-    isOpen: isOpen,
-    onResizeStop: function onResizeStop(_event, _direction, node) {
-      var width = node.offsetWidth,
-        height = node.offsetHeight;
-      onChangeSize({
-        width: width,
-        height: height
-      });
-    },
-    onClose: onClose,
     bounds: bounds,
     "data-testid": "layerSelectWindow",
+    isOpen: isOpen,
+    minHeight: 126,
+    minWidth: 320,
+    onClose: onClose,
     onMouseDown: function onMouseDown(event) {
       var target = event.target;
       var isButtonInScrollableList = target.closest('.layerInfoButton') || target.closest('.layerAddRemoveButton');
@@ -2869,8 +2815,25 @@ var LayerSelect = function LayerSelect(_ref) {
       }
       _onMouseDown(event);
     },
+    onResizeStop: function onResizeStop(_event, _direction, node) {
+      var width = node.offsetWidth,
+        height = node.offsetHeight;
+      onChangeSize({
+        width: width,
+        height: height
+      });
+    },
     order: order,
     source: source,
+    startPosition: {
+      top: 150,
+      left: 100
+    },
+    startSize: {
+      width: width,
+      height: height
+    },
+    title: showTitle ? "Layer Select " + mapId : 'Layer Select',
     children: [jsx(Box, {
       sx: {
         padding: '4px 16px 0 16px'
@@ -2888,11 +2851,11 @@ var LayerSelect = function LayerSelect(_ref) {
         children: [jsx(Grid, {
           size: 12,
           children: jsx(KeywordFilterButtonConnect, {
-            mapId: mapId,
             isMultiMap: isMultiMap,
+            mapId: mapId,
             source: source
           })
-        }), hasDataExplorer && jsx(Grid, {
+        }), !!hasDataExplorer && jsx(Grid, {
           size: 12,
           children: jsx(DataExplorerButtonConnect, {
             mapId: mapId
@@ -2920,10 +2883,10 @@ var LayerSelect = function LayerSelect(_ref) {
         padding: '0 16px'
       },
       children: jsx(LayerListConnect, {
-        mapId: mapId,
         layerSelectHeight: height,
-        serviceListHeight: serviceListHeight,
-        layerSelectWidth: width
+        layerSelectWidth: width,
+        mapId: mapId,
+        serviceListHeight: serviceListHeight
       })
     })]
   });
@@ -3129,51 +3092,34 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
   var isShowPopup = servicePopupVariant === 'show';
   var isServiceUrlDisabled = isShowPopup || servicePopupVariant === 'edit';
   return jsx(CustomDialog, {
-    open: isOpen,
-    hideBackdrop: hideBackdrop,
-    fullWidth: true,
-    maxWidth: "xs",
-    "data-testid": "servicePopup",
-    title: getTitleForVariant(t, servicePopupVariant),
-    sx: {
-      '& .MuiDialog-paper': {
-        backgroundColor: "geowebColors.cards.cardContainer",
-        maxWidth: 458
-      }
-    },
-    onClose: function onClose() {
-      return closePopup && closePopup();
-    },
     actions: isShowPopup ? jsx(Button, {
       onClick: function onClick() {
         return closePopup();
       },
-      variant: "tertiary",
       sx: {
         width: {
           xs: '100%',
           sm: '117px'
         }
       },
+      variant: "tertiary",
       children: t('close')
     }) : jsxs(Fragment, {
       children: [jsx(Button, {
-        onClick: closePopup,
         "data-testid": "closePopupButtonCancel",
-        variant: "tertiary",
+        onClick: closePopup,
         sx: {
           width: {
             xs: '100%',
             sm: '117px'
           }
         },
+        variant: "tertiary",
         children: t('cancel')
       }), jsx(Button, {
-        type: "submit",
-        variant: "primary",
-        form: "servicePopupForm",
-        disabled: isSubmitDisabled || isLoading,
         "data-testid": "saveServiceButton",
+        disabled: isSubmitDisabled || isLoading,
+        form: "servicePopupForm",
         sx: {
           marginLeft: {
             xs: '0px!important',
@@ -3184,21 +3130,51 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
             sm: '117px'
           }
         },
+        type: "submit",
+        variant: "primary",
         children: t('save')
       })]
     }),
+    "data-testid": "servicePopup",
+    fullWidth: true,
+    hideBackdrop: hideBackdrop,
+    maxWidth: "xs",
+    onClose: function onClose() {
+      return closePopup == null ? void 0 : closePopup();
+    },
+    open: isOpen,
+    sx: {
+      '& .MuiDialog-paper': {
+        backgroundColor: "geowebColors.cards.cardContainer",
+        maxWidth: 458
+      }
+    },
+    title: getTitleForVariant(t, servicePopupVariant),
     children: jsxs("form", {
       id: "servicePopupForm",
-      onSubmit: handleSubmit(function (formValues) {
-        return addNewService(formValues);
-      }),
-      children: [isLoading && jsx(Box, {
+      onSubmit: handleSubmit(/*#__PURE__*/function () {
+        var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(formValues) {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                return _context3.abrupt("return", addNewService(formValues));
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function (_x3) {
+          return _ref5.apply(this, arguments);
+        };
+      }()),
+      children: [!!isLoading && jsx(Box, {
         sx: {
           position: 'relative'
         },
         children: jsx(LinearProgress, {
-          "data-testid": "loadingIndicator",
           color: "secondary",
+          "data-testid": "loadingIndicator",
           sx: {
             position: 'absolute',
             width: '100%',
@@ -3206,21 +3182,9 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
           }
         })
       }), jsx(ReactHookFormTextField, {
-        name: FormFields.serviceUrl,
-        label: t('service-url-label'),
-        onFocus: onFocusServiceUrl,
         autoFocus: !shouldDisableAutoFocus,
-        onBlur: onBlurServiceUrl,
-        onKeyDown: onKeyDownServiceUrl,
-        sx: style.textField,
-        rules: {
-          required: true,
-          validate: Object.assign({}, !isServiceUrlDisabled && {
-            onValidateServiceUrl: onValidateServiceUrl
-          })
-        },
+        defaultValue: serviceUrl,
         disabled: isServiceUrlDisabled || isLoading,
-        isReadOnly: isShowPopup,
         inputSlotProps: {
           disableUnderline: isShowPopup,
           endAdornment: isShowPopup && jsx(InputAdornment, {
@@ -3238,46 +3202,58 @@ var ServicePopupUnwrapped = function ServicePopupUnwrapped(_ref2) {
             })
           })
         },
-        defaultValue: serviceUrl
+        isReadOnly: isShowPopup,
+        label: t('service-url-label'),
+        name: FormFields.serviceUrl,
+        onBlur: onBlurServiceUrl,
+        onFocus: onFocusServiceUrl,
+        onKeyDown: onKeyDownServiceUrl,
+        rules: {
+          required: true,
+          validate: Object.assign({}, !isServiceUrlDisabled && {
+            onValidateServiceUrl: onValidateServiceUrl
+          })
+        },
+        sx: style.textField
       }), jsx(ReactHookFormTextField, {
-        name: FormFields.serviceName,
+        defaultValue: serviceName,
+        disabled: isShowPopup || isLoading,
+        inputSlotProps: {
+          disableUnderline: isShowPopup
+        },
+        isReadOnly: isShowPopup,
         label: t('service-name-label'),
+        name: FormFields.serviceName,
         rules: {
           required: true,
           validate: {
             onValidateServiceName: onValidateServiceName
           }
         },
+        sx: style.textField
+      }), jsx(ReactHookFormTextField, {
+        defaultValue: "",
         disabled: isShowPopup || isLoading,
-        isReadOnly: isShowPopup,
+        helperText: !isShowPopup ? t('service-popup-helper-text') : '',
         inputSlotProps: {
           disableUnderline: isShowPopup
         },
-        sx: style.textField,
-        defaultValue: serviceName
-      }), jsx(ReactHookFormTextField, {
+        isReadOnly: isShowPopup,
+        label: t('service-abstracts-label'),
         multiline: true,
-        rows: 4,
         name: FormFields.serviceAbstracts,
-        label: t('service-abstracts-label'),
-        disabled: isShowPopup || isLoading,
-        isReadOnly: isShowPopup,
-        inputSlotProps: {
-          disableUnderline: isShowPopup
-        },
-        helperText: !isShowPopup ? t('service-popup-helper-text') : '',
-        sx: style.textField,
-        defaultValue: ""
+        rows: 4,
+        sx: style.textField
       }), !isServiceUrlDisabled && jsx(InitialValidationsTrigger, {
-        trigger: trigger,
         getValues: getValues,
-        onValidField: fetchServiceData
+        onValidField: fetchServiceData,
+        trigger: trigger
       })]
     })
   });
 };
-var ServicePopup = function ServicePopup(_ref5) {
-  var props = Object.assign({}, (_objectDestructuringEmpty(_ref5), _ref5));
+var ServicePopup = function ServicePopup(_ref6) {
+  var props = Object.assign({}, (_objectDestructuringEmpty(_ref6), _ref6));
   return jsx(ReactHookFormProvider, {
     options: Object.assign({}, defaultFormOptions, {
       defaultValues: {
@@ -3308,25 +3284,25 @@ var ServicePopupDialogConnect = function ServicePopupDialogConnect(_ref) {
   var activeService = useAppSelector(function (store) {
     return getActiveServiceById(store, serviceId);
   });
-  var serviceSetLayers = React__default.useCallback(function (payload) {
+  var serviceSetLayers = React.useCallback(function (payload) {
     dispatch(serviceActions.serviceSetLayers(payload));
   }, [dispatch]);
-  var showSnackbar = React__default.useCallback(function (message) {
+  var showSnackbar = React.useCallback(function (message) {
     dispatch(snackbarActions.openSnackbar({
       type: snackbarTypes.SnackbarMessageType.VERBATIM_MESSAGE,
       message: message
     }));
   }, [dispatch]);
   return jsx(ServicePopup, {
-    servicePopupVariant: variant,
-    isOpen: isOpen,
     closePopup: setServicePopupClosed,
-    services: services,
-    serviceSetLayers: serviceSetLayers,
+    isOpen: isOpen,
+    serviceAbstracts: activeService == null ? void 0 : activeService["abstract"],
     serviceId: serviceId,
-    serviceUrl: url || (activeService == null ? void 0 : activeService.serviceUrl),
     serviceName: activeService == null ? void 0 : activeService.serviceName,
-    serviceAbstracts: activeService == null ? void 0 : activeService["abstract"],
+    servicePopupVariant: variant,
+    serviceSetLayers: serviceSetLayers,
+    serviceUrl: url || (activeService == null ? void 0 : activeService.serviceUrl),
+    services: services,
     showSnackbar: showSnackbar
   });
 };
@@ -3340,7 +3316,7 @@ var ServicePopupConnect = function ServicePopupConnect() {
     url = _useAppSelector.url,
     serviceId = _useAppSelector.serviceId,
     variant = _useAppSelector.variant;
-  var setServicePopupClosed = React__default.useCallback(function () {
+  var setServicePopupClosed = React.useCallback(function () {
     dispatch(layerSelectActions.closeServicePopupOpen());
   }, [dispatch]);
   if (!isOpen) {
@@ -3349,9 +3325,9 @@ var ServicePopupConnect = function ServicePopupConnect() {
   return jsx(ServicePopupDialogConnect, {
     isOpen: isOpen,
     serviceId: serviceId,
-    variant: variant,
+    setServicePopupClosed: setServicePopupClosed,
     url: url,
-    setServicePopupClosed: setServicePopupClosed
+    variant: variant
   });
 };
 
@@ -3384,21 +3360,21 @@ var LayerSelectConnect = function LayerSelectConnect(_ref) {
   var hasDataExplorer = !!config.GW_DATA_EXPLORER_CONFIGURATION_FILENAME;
   return jsxs(Fragment, {
     children: [jsx(LayerSelect, {
-      mapId: mapId || initialMapId,
       bounds: bounds,
+      hasDataExplorer: hasDataExplorer,
+      isMultiMap: isMultiMap,
       isOpen: isDialogOpen,
+      mapId: mapId || initialMapId,
       onClose: onCloseDialog,
-      showTitle: showTitle,
       onMouseDown: setDialogOrder,
       order: dialogOrder,
-      source: uiSource,
-      isMultiMap: isMultiMap,
-      hasDataExplorer: hasDataExplorer
+      showTitle: showTitle,
+      source: uiSource
     }), jsx(KeywordFilterResultsConnect, {
-      mapId: mapId || initialMapId,
-      isMultiMap: isMultiMap
+      isMultiMap: isMultiMap,
+      mapId: mapId || initialMapId
     }), jsx(ServicePopupConnect, {})]
   });
 };
 
-export { AllChipConnect, DataExplorerButtonConnect, KeywordFilterButtonConnect, KeywordFilterResults, KeywordFilterResultsConnect, KeywordFilterResultsListItemConnect, KeywordFilterSelectAllSwitchConnect, LAYER_SELECT_NAMESPACE, LayerAddRemoveButton, LayerList, LayerListConnect, LayerListDimensions, LayerListRow, LayerSelectButtonConnect, LayerSelectConnect, SearchFieldConnect, ServiceChip, ServiceChipConnect, ServiceList, ServiceListConnect, ServiceOptionsButton, ServiceOptionsDialog, ServiceOptionsDialogConnect, ServicePopup, ServicePopupConnect, ServicePopupDialogConnect, createMockStore, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, initialState as layerSelectInitialState, layerSelectListener, layerSelectMiddlewares, layerSelectReducer, layerSelectReducersMap, selectors as layerSelectSelectors, layerSelectTranslations, types as layerSelectTypes, useAppSelector };
+export { AllChipConnect, DataExplorerButtonConnect, KeywordFilterButtonConnect, KeywordFilterResults, KeywordFilterResultsConnect, KeywordFilterResultsListItemConnect, KeywordFilterSelectAllSwitchConnect, LAYER_SELECT_NAMESPACE, LayerAddRemoveButton, LayerList, LayerListConnect, LayerListDimensions, LayerListRow, LayerSelectButtonConnect, LayerSelectConnect, SearchFieldConnect, ServiceChip, ServiceChipConnect, ServiceList, ServiceListConnect, ServiceOptionsButton, ServiceOptionsDialog, ServiceOptionsDialogConnect, ServicePopup, ServicePopupConnect, ServicePopupDialogConnect, createMockStore, getServiceSuccesUpdateMessage, getSuccesMessage, isUserAddedService, layerSelectActions, initialState as layerSelectInitialState, layerSelectListener, layerSelectMiddlewares, layerSelectReducer, layerSelectReducersMap, selectors as layerSelectSelectors, layerSelectTranslations, useAppSelector };