@opengeoweb/core 8.4.0 → 8.4.1

package/index.esm.js

@@ -11,7 +11,7 @@ import { jsx } from 'react/jsx-runtime';
 import Box$3 from '@mui/material/Box';
 import Typography$1 from '@mui/material/Typography';
 import Grid$1 from '@mui/material/Grid';
-import { LegendLayout, MapControlButton, ZoomControls, CanvasComponent, MapView, MapViewLayer, LegendDialog, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
+import { LegendLayout, MapControlButton, ZoomControls, CanvasComponent, MapView, MapViewLayer, LegendDialog, SearchDialog, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
 import _, { isEqual as isEqual$1, debounce, groupBy, throttle as throttle$1, range } from 'lodash';
 import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
@@ -14277,7 +14277,7 @@ var ServiceChip = function ServiceChip(_ref) {
     title: (service === null || service === void 0 ? void 0 : service["abstract"]) ? "Abstract: ".concat(service["abstract"]) : ''
   }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(CustomToggleButton, {
     variant: "boxed",
-    selected: isSelected,
+    selected: Boolean(isSelected),
     tabIndex: 0,
     "data-testid": all ? 'serviceChipAll' : 'serviceChip',
     onClick: function onClick() {
@@ -14291,92 +14291,66 @@ var ServiceChip = function ServiceChip(_ref) {
   }, service ? service.serviceName : 'All')));
 };
 
+/* *
+ * 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)
+ * */
 var ServiceChipConnect = function ServiceChipConnect(_ref) {
-  var _ref$all = _ref.all,
-    all = _ref$all === void 0 ? false : _ref$all,
-    serviceId = _ref.serviceId,
-    service = _ref.service,
-    isSelected = _ref.isSelected,
-    isAllSelected = _ref.isAllSelected,
-    isDisabled = _ref.isDisabled;
+  var service = _ref.service,
+    isAllSelected = _ref.isAllSelected;
   var dispatch = useDispatch();
-  var activeServices = useSelector(function (store) {
-    return layerSelectSelectors.getActiveServices(store);
-  });
-  var setAllServicesEnabled = function setAllServicesEnabled(allServicesEnabled) {
-    dispatch(layerSelectActions.setAllServicesEnabled({
-      allServicesEnabled: allServicesEnabled
-    }));
-  };
-  var hasSelectedStyle = !isAllSelected && isSelected || isAllSelected && (service === null || service === void 0 ? void 0 : service.serviceName) === 'all';
-  var toggleChip = function toggleChip(service) {
-    if (service === 'all') {
-      if (isSelected) {
-        setAllServicesEnabled(false);
-        Object.entries(activeServices).forEach(function (_ref2) {
-          var _ref3 = _slicedToArray(_ref2, 2),
-            serviceID = _ref3[0],
-            service = _ref3[1];
-          if (service.enabled) {
-            dispatch(layerSelectActions.disableActiveService({
-              serviceId: serviceID,
-              filters: service.filterIds
-            }));
-          }
-        });
-      } else {
-        setAllServicesEnabled(true);
-        Object.entries(activeServices).forEach(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            serviceID = _ref5[0],
-            service = _ref5[1];
-          if (!service.enabled) {
-            dispatch(layerSelectActions.enableActiveService({
-              serviceId: serviceID,
-              filters: service.filterIds
-            }));
-          }
-        });
-      }
-    } else if (isSelected) {
+  var serviceId = service.serviceId;
+  var toggleChip = function toggleChip() {
+    if (service.enabled) {
       if (isAllSelected) {
-        setAllServicesEnabled(false);
-        Object.entries(activeServices).forEach(function (_ref6) {
-          var _ref7 = _slicedToArray(_ref6, 2),
-            serviceID = _ref7[0],
-            service = _ref7[1];
-          var shouldDisable = service.enabled && serviceID !== serviceId;
-          if (shouldDisable) {
-            dispatch(layerSelectActions.disableActiveService({
-              serviceId: serviceID,
-              filters: service.filterIds
-            }));
-          }
-        });
-      } else {
-        dispatch(layerSelectActions.disableActiveService({
-          serviceId: serviceId,
-          filters: activeServices[serviceId].filterIds
+        dispatch(layerSelectActions.onlyThisServiceEnabled({
+          serviceId: serviceId
         }));
+        return;
       }
-    } else {
-      dispatch(layerSelectActions.enableActiveService({
-        serviceId: serviceId,
-        filters: activeServices[serviceId].filterIds
+      dispatch(layerSelectActions.disableActiveService({
+        serviceId: serviceId
       }));
+      return;
     }
+    dispatch(layerSelectActions.enableActiveService({
+      serviceId: serviceId
+    }));
   };
   return /*#__PURE__*/React.createElement(ServiceChip, {
     service: service,
-    all: all,
     toggleChip: toggleChip,
-    isSelected: hasSelectedStyle,
-    isDisabled: isDisabled
+    isSelected: isAllSelected ? false : service.enabled,
+    isDisabled: service.isLoading
+  });
+};
+var AllChipConnect = function AllChipConnect(_ref2) {
+  var isAllSelected = _ref2.isAllSelected;
+  var dispatch = useDispatch();
+  return /*#__PURE__*/React.createElement(ServiceChip, {
+    toggleChip: function toggleChip() {
+      if (!isAllSelected) {
+        dispatch(layerSelectActions.enableAllActiveServices());
+      }
+    },
+    isSelected: isAllSelected
   });
 };
 
 var ServiceList = function ServiceList(_ref) {
-  var activeServices = _ref.activeServices,
+  var activeServicesById = _ref.activeServicesById,
     setHeight = _ref.setHeight;
   var ref = React.useRef(null);
   var _React$useState = React.useState(0),
@@ -14388,11 +14362,13 @@ var ServiceList = function ServiceList(_ref) {
     if (ref && ref.current && ref.current.clientHeight) {
       setServiceListHeight(ref.current.clientHeight);
     }
-  }, [activeServices, clientHeight]);
+  }, [activeServicesById, clientHeight]);
   React.useEffect(function () {
     setHeight(serviceListHeight);
   }, [serviceListHeight, setHeight]);
-  var isAllSelected = Object.values(activeServices).every(function (activeService) {
+  var activeServicesIds = Object.keys(activeServicesById);
+  var activeServices = Object.values(activeServicesById);
+  var isAllSelected = activeServices.every(function (activeService) {
     return activeService.enabled;
   });
   return /*#__PURE__*/React.createElement(Box$2, {
@@ -14414,20 +14390,13 @@ var ServiceList = function ServiceList(_ref) {
       fontSize: '0.875rem'
     },
     ref: ref
-  }, activeServices && Object.keys(activeServices) && Object.keys(activeServices).length > 0 && /*#__PURE__*/React.createElement(ServiceChipConnect, {
-    key: "All",
-    all: true,
-    isSelected: isAllSelected
-  }), Object.keys(activeServices).map(function (serviceId) {
-    var _a, _b;
-    var service = activeServices[serviceId];
+  }, (activeServicesIds === null || activeServicesIds === void 0 ? void 0 : activeServicesIds.length) && /*#__PURE__*/React.createElement(AllChipConnect, {
+    isAllSelected: isAllSelected
+  }), activeServices.map(function (service) {
     return /*#__PURE__*/React.createElement(ServiceChipConnect, {
-      key: serviceId,
-      serviceId: serviceId,
+      key: service.serviceUrl,
       service: service,
-      isSelected: (_a = activeServices[serviceId]) === null || _a === void 0 ? void 0 : _a.enabled,
-      isAllSelected: isAllSelected,
-      isDisabled: activeServices[serviceId] === undefined || ((_b = activeServices[serviceId]) === null || _b === void 0 ? void 0 : _b.isLoading) === true
+      isAllSelected: isAllSelected
     });
   })));
 };
@@ -14455,7 +14424,7 @@ var ServiceListConnect = function ServiceListConnect(_ref) {
   });
   return /*#__PURE__*/React.createElement(ServiceList, {
     setHeight: setHeight,
-    activeServices: sortByService(activeServices)
+    activeServicesById: sortByService(activeServices)
   });
 };
 
@@ -24069,6 +24038,77 @@ var GetFeatureInfoButtonConnect = function GetFeatureInfoButtonConnect(_ref) {
   }, /*#__PURE__*/React.createElement(Info, null));
 };
 
+/* *
+ * 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)
+ * */
+var SearchControlButtonConnect = function SearchControlButtonConnect(_ref) {
+  var mapId = _ref.mapId,
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? 'app' : _ref$source;
+  var dispatch = useDispatch();
+  var dialogType = "".concat(uiTypes.DialogTypes.Search, "-").concat(mapId);
+  var currentActiveMapId = useSelector(function (store) {
+    return uiSelectors.getDialogMapId(store, dialogType);
+  });
+  var isOpenInStore = useSelector(function (store) {
+    return uiSelectors.getisDialogOpen(store, dialogType);
+  });
+  var openSearchDialog = React__default.useCallback(function () {
+    dispatch(uiActions.setActiveMapIdForDialog({
+      type: dialogType,
+      mapId: mapId,
+      setOpen: currentActiveMapId !== mapId ? true : !isOpenInStore,
+      source: source
+    }));
+  }, [currentActiveMapId, dialogType, dispatch, isOpenInStore, mapId, source]);
+  return /*#__PURE__*/React__default.createElement(MapControlButton, {
+    onClick: openSearchDialog,
+    title: "Search",
+    "aria-label": "Map search"
+  }, /*#__PURE__*/React__default.createElement(Search, null));
+};
+
+/* *
+ * 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)
+ * */
+var SearchControlConnect = function SearchControlConnect(_ref) {
+  var mapId = _ref.mapId;
+  var dialogType = "".concat(uiTypes.DialogTypes.Search, "-").concat(mapId);
+  var _useSetupDialog = useSetupDialog(dialogType),
+    isDialogOpen = _useSetupDialog.isDialogOpen,
+    onCloseDialog = _useSetupDialog.onCloseDialog;
+  return /*#__PURE__*/React__default.createElement(SearchDialog, {
+    isOpen: isDialogOpen,
+    onClose: onCloseDialog
+  });
+};
+
 var titleStyle = function titleStyle(theme) {
   return {
     position: 'absolute',
@@ -24128,9 +24168,11 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_a) {
     displayGetFeatureInfoButtonInMap = _a$displayGetFeatureI === void 0 ? false : _a$displayGetFeatureI,
     _a$shouldDisplayDrawC = _a.shouldDisplayDrawControls,
     shouldDisplayDrawControls = _a$shouldDisplayDrawC === void 0 ? false : _a$shouldDisplayDrawC,
+    _a$displaySearchButto = _a.displaySearchButtonInMap,
+    displaySearchButtonInMap = _a$displaySearchButto === void 0 ? false : _a$displaySearchButto,
     mapControls = _a.mapControls,
     children = _a.children,
-    props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "mapControls", "children"]);
+    props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "mapControls", "children"]);
   var dispatch = useDispatch();
   var mapId = React__default.useRef(id || webmapUtils.generateMapId()).current;
   React__default.useEffect(function () {
@@ -24211,7 +24253,9 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_a) {
     style: {
       top: mapControlsPositionTop
     }
-  }, /*#__PURE__*/React__default.createElement(ZoomControlConnect, {
+  }, displaySearchButtonInMap && /*#__PURE__*/React__default.createElement(SearchControlButtonConnect, {
+    mapId: mapId
+  }), /*#__PURE__*/React__default.createElement(ZoomControlConnect, {
     mapId: id
   }), displayLayerManagerAndLegendButtonInMap && /*#__PURE__*/React__default.createElement(LayerManagerMapButtonConnect, {
     mapId: mapId
@@ -24242,6 +24286,8 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_a) {
     showMapId: true,
     mapId: mapId,
     multiLegend: multiLegend
+  }), /*#__PURE__*/React__default.createElement(SearchControlConnect, {
+    mapId: mapId
   }), showClock && /*#__PURE__*/React__default.createElement(TimeSliderClockConnect, {
     mapId: mapId
   }), displayGetFeatureInfoButtonInMap && /*#__PURE__*/React__default.createElement(GetFeatureInfoConnect, {
@@ -24582,12 +24628,14 @@ var componentsLookUp = function componentsLookUp(_ref) {
       {
         var mapPreset = initialProps.mapPreset,
           mapControls = initialProps.mapControls,
-          shouldDisplayDrawControls = initialProps.shouldDisplayDrawControls;
+          shouldDisplayDrawControls = initialProps.shouldDisplayDrawControls,
+          displaySearchButtonInMap = initialProps.displaySearchButtonInMap;
         return /*#__PURE__*/React__default.createElement(ConfigurableMapConnect, Object.assign({}, mapPreset, {
           id: id,
           "data-testid": "coreConfigurableMapConnect",
           displayGetFeatureInfoButtonInMap: true,
           shouldDisplayDrawControls: shouldDisplayDrawControls,
+          displaySearchButtonInMap: displaySearchButtonInMap,
           mapControls: mapControls
         }));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,13 +14,13 @@
   "peerDependencies": {
     "@mui/material": "5.12.0",
     "@mui/system": "5.14.14",
-    "@opengeoweb/api": "8.4.0",
-    "@opengeoweb/form-fields": "8.4.0",
-    "@opengeoweb/shared": "8.4.0",
-    "@opengeoweb/store": "8.4.0",
-    "@opengeoweb/theme": "8.4.0",
-    "@opengeoweb/webmap": "8.4.0",
-    "@opengeoweb/webmap-react": "8.4.0",
+    "@opengeoweb/api": "8.4.1",
+    "@opengeoweb/form-fields": "8.4.1",
+    "@opengeoweb/shared": "8.4.1",
+    "@opengeoweb/store": "8.4.1",
+    "@opengeoweb/theme": "8.4.1",
+    "@opengeoweb/webmap": "8.4.1",
+    "@opengeoweb/webmap-react": "8.4.1",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
     "@reduxjs/toolkit": "1.9.7",

package/src/lib/components/ComponentsLookUp/componentsLookUp.d.ts

@@ -12,6 +12,7 @@ export interface InitialMapProps {
     syncGroupsIds: string[];
     mapControls?: React.ReactNode;
     shouldDisplayDrawControls?: boolean;
+    displaySearchButtonInMap?: boolean;
 }
 interface InitialSliderProps {
     sliderPreset: {

package/src/lib/components/ConfigurableMap/ConfigurableMapConnect.d.ts

@@ -36,6 +36,7 @@ export interface ConfigurableMapConnectProps {
     showClock?: boolean;
     displayGetFeatureInfoButtonInMap?: boolean;
     shouldDisplayDrawControls?: boolean;
+    displaySearchButtonInMap?: boolean;
     children?: React.ReactNode;
     mapControls?: React.ReactNode;
 }

package/src/lib/components/LayerManager/LayerSelect/ServiceList/ServiceChipConnect.d.ts

@@ -1,12 +1,10 @@
 import * as React from 'react';
 import { layerSelectTypes } from '@opengeoweb/store';
 export interface ServiceChipConnectProps {
-    all?: boolean;
-    serviceId?: string;
-    service?: layerSelectTypes.ActiveServiceObject;
-    isSelected?: boolean;
-    isAllSelected?: boolean;
-    isDisabled?: boolean;
+    service: layerSelectTypes.ActiveServiceObject;
+    isAllSelected: boolean;
 }
-declare const ServiceChipConnect: React.FC<ServiceChipConnectProps>;
-export default ServiceChipConnect;
+export declare const ServiceChipConnect: React.FC<ServiceChipConnectProps>;
+export declare const AllChipConnect: React.FC<{
+    isAllSelected: boolean;
+}>;

package/src/lib/components/LayerManager/LayerSelect/ServiceList/ServiceList.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { layerSelectTypes } from '@opengeoweb/store';
 interface ServiceListProps {
-    activeServices: layerSelectTypes.ActiveServiceObjectEntities;
+    activeServicesById: layerSelectTypes.ActiveServiceObjectEntities;
     setHeight: (height: number) => void;
 }
 declare const ServiceList: React.FC<ServiceListProps>;

package/src/lib/components/Search/SearchControl.stories.d.ts

@@ -0,0 +1,13 @@
+import * as React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const SearchControlConnectStoryLight: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const SearchControlConnectStoryDark: {
+    (): React.ReactElement;
+    storyName: string;
+};

package/src/lib/components/Search/SearchControlButtonConnect.d.ts

@@ -0,0 +1,8 @@
+import { CustomIconProps } from '@opengeoweb/shared';
+import { uiTypes } from '@opengeoweb/store';
+import React from 'react';
+export interface SearchControlButtonConnectProps extends CustomIconProps {
+    mapId: string;
+    source?: uiTypes.Source;
+}
+export declare const SearchControlButtonConnect: React.FC<SearchControlButtonConnectProps>;

package/src/lib/components/Search/SearchControlConnect.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+export interface SearchControlConnectProps {
+    mapId?: string;
+}
+export declare const SearchControlConnect: React.FC<SearchControlConnectProps>;

package/src/lib/components/Search/index.d.ts

@@ -0,0 +1,2 @@
+export { SearchControlButtonConnect } from './SearchControlButtonConnect';
+export { SearchControlConnect } from './SearchControlConnect';

package/src/lib/components/LayerManager/LayerSelect/ServiceList/ServiceList.spec.d.ts

@@ -1 +0,0 @@
-export {};