@opengeoweb/warnings 6.1.1 → 7.0.0

package/index.esm.js

@@ -1,11 +1,12 @@
 import * as React from 'react';
 import React__default, { useContext, useRef, useCallback, useDebugValue, Fragment, useState, useEffect } from 'react';
 import 'react-dom';
-import { Polygons, Edit, Delete } from '@opengeoweb/theme';
-import { uiTypes, uiSelectors, uiActions, layerSelectors, drawSelectors, mapStoreActions, drawActions, snackbarActions } from '@opengeoweb/store';
-import { MapControlButton, useSetupDialog } from '@opengeoweb/core';
-import { dateUtils, ToggleMenu, ToolContainerDraggable, AlertBanner, calculateDialogSizeAndPosition } from '@opengeoweb/shared';
-import { List, Typography, ListItem, MenuItem, ListItemText, Paper, ListItemButton, Box, Stack } from '@mui/material';
+import { Polygons } from '@opengeoweb/theme';
+import { uiTypes, uiSelectors, layerSelectors, drawSelectors, uiActions, drawActions, mapStoreActions, snackbarActions } from '@opengeoweb/store';
+import { MapControlButton } from '@opengeoweb/webmap-react';
+import { useAreaDrawDialogAction, useSetupDialog } from '@opengeoweb/core';
+import { dateUtils, ToolContainerDraggable, AlertBanner, calculateDialogSizeAndPosition } from '@opengeoweb/shared';
+import { Typography, List, ListItem, Paper, ListItemButton, Box, Stack, LinearProgress } from '@mui/material';
 import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
 
 var shim = {exports: {}};
@@ -1198,32 +1199,46 @@ initializeUseSelector(withSelector.exports.useSyncExternalStoreWithSelector);
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
-var dialogType$1 = uiTypes.DialogTypes.AreaManager;
+var areaDialogType = uiTypes.DialogTypes.AreaManager;
 var AreaManagerMapButtonConnect = function AreaManagerMapButtonConnect(_ref) {
   var mapId = _ref.mapId,
     _ref$source = _ref.source,
     source = _ref$source === void 0 ? 'app' : _ref$source;
-  var dispatch = useDispatch();
+  var _useAreaDrawDialogAct = useAreaDrawDialogAction({
+      mapId: mapId,
+      source: source
+    }),
+    closeDrawDialog = _useAreaDrawDialogAct.closeDrawDialog,
+    openAreaDialog = _useAreaDrawDialogAct.openAreaDialog,
+    closeAreaDialog = _useAreaDrawDialogAct.closeAreaDialog;
   var mapIdForCurrentlyOpenDialog = useSelector(function (store) {
-    return uiSelectors.getDialogMapId(store, dialogType$1);
+    return uiSelectors.getDialogMapId(store, areaDialogType);
   });
-  var dialogIsOpen = useSelector(function (store) {
-    return uiSelectors.getisDialogOpen(store, dialogType$1);
+  var isAreaDialogOpen = useSelector(function (store) {
+    return uiSelectors.getisDialogOpen(store, areaDialogType);
   });
+  var drawingDialogType = "".concat(uiTypes.DialogTypes.DockedDrawingTool, "-").concat(mapId);
+  var isDrawDialogOpen = useSelector(function (store) {
+    return uiSelectors.getisDialogOpen(store, drawingDialogType);
+  });
+  var openAreasDialog = function openAreasDialog() {
+    // close drawing dialog if open
+    if (isDrawDialogOpen) {
+      closeDrawDialog();
+    }
+    // open area manager dialog
+    openAreaDialog();
+  };
+  var onClick = function onClick() {
+    var openDialogForAnotherMap = mapIdForCurrentlyOpenDialog !== mapId;
+    var shouldOpen = openDialogForAnotherMap || !isAreaDialogOpen;
+    shouldOpen ? openAreasDialog() : closeAreaDialog();
+  };
   return /*#__PURE__*/React__default.createElement(MapControlButton, {
     "aria-label": "Area Manager Button for ".concat(mapId),
     title: "Area Manager",
-    onClick: function onClick() {
-      var openDialogForAnotherMap = mapIdForCurrentlyOpenDialog !== mapId;
-      var shouldOpen = openDialogForAnotherMap || !dialogIsOpen;
-      dispatch(uiActions.setActiveMapIdForDialog({
-        type: dialogType$1,
-        mapId: mapId,
-        setOpen: shouldOpen,
-        source: source
-      }));
-    },
-    isActive: mapIdForCurrentlyOpenDialog === mapId && dialogIsOpen
+    onClick: onClick,
+    isActive: mapIdForCurrentlyOpenDialog === mapId && isAreaDialogOpen
   }, /*#__PURE__*/React__default.createElement(Polygons, null));
 };
 
@@ -1636,12 +1651,21 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
+var NO_AREAS_FOUND = 'No areas found';
 var Drawings = function Drawings(_ref) {
   var drawings = _ref.drawings,
     onClickDrawing = _ref.onClickDrawing,
-    onClickEdit = _ref.onClickEdit,
     activeDrawing = _ref.activeDrawing;
   var lastHeaderRef = React__default.useRef('');
+  if (drawings.length === 0) {
+    return /*#__PURE__*/React__default.createElement(Typography, {
+      sx: {
+        paddingLeft: '16px',
+        paddingTop: '8px'
+      },
+      variant: "body1"
+    }, NO_AREAS_FOUND);
+  }
   return /*#__PURE__*/React__default.createElement(List, null, drawings.map(function (drawing) {
     var drawingDate = dateUtils.isoStringToDate(drawing.lastUpdatedTime);
     var header = dateUtils.dateToString(drawingDate, 'EEEE, MMMM dd', true);
@@ -1655,17 +1679,7 @@ var Drawings = function Drawings(_ref) {
       },
       variant: "caption"
     }, header), /*#__PURE__*/React__default.createElement(ListItem, {
-      disablePadding: true,
-      secondaryAction: /*#__PURE__*/React__default.createElement(ToggleMenu, {
-        menuTitle: "Area options",
-        tooltipTitle: "Area options",
-        menuPosition: "bottom",
-        "aria-label": "Options"
-      }, /*#__PURE__*/React__default.createElement(MenuItem, {
-        onClick: function onClick() {
-          return onClickEdit(drawing.id);
-        }
-      }, /*#__PURE__*/React__default.createElement(ListItemText, null, "Edit"), /*#__PURE__*/React__default.createElement(Edit, null)), /*#__PURE__*/React__default.createElement(MenuItem, null, /*#__PURE__*/React__default.createElement(ListItemText, null, "Delete"), " ", /*#__PURE__*/React__default.createElement(Delete, null)))
+      disablePadding: true
     }, /*#__PURE__*/React__default.createElement(Paper, {
       elevation: 1,
       sx: {
@@ -1738,25 +1752,17 @@ var AreaManager = function AreaManager(_ref) {
     drawingListItems = _ref.drawingListItems,
     _ref$onClickDrawing = _ref.onClickDrawing,
     onClickDrawing = _ref$onClickDrawing === void 0 ? function () {} : _ref$onClickDrawing,
-    _ref$onUnMount = _ref.onUnMount,
-    onUnMount = _ref$onUnMount === void 0 ? function () {} : _ref$onUnMount,
-    _ref$onEditDrawing = _ref.onEditDrawing,
-    onEditDrawing = _ref$onEditDrawing === void 0 ? function () {} : _ref$onEditDrawing,
     _ref$activeDrawingId = _ref.activeDrawingId,
     activeDrawingId = _ref$activeDrawingId === void 0 ? '' : _ref$activeDrawingId,
-    error = _ref.error;
+    error = _ref.error,
+    _ref$isLoading = _ref.isLoading,
+    isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading;
   var minSize = DEFAULT_AREA_MANAGER_MIN_SIZE;
   var startSizeCalc = calculateStartSize(minSize, size, startPosition);
   var _React$useState = React.useState(startSizeCalc),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     sizeInState = _React$useState2[0],
     setSizeInState = _React$useState2[1];
-  React.useEffect(function () {
-    return function () {
-      onUnMount();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   return /*#__PURE__*/React.createElement(ToolContainerDraggable, {
     title: title,
     startSize: sizeInState,
@@ -1789,13 +1795,16 @@ var AreaManager = function AreaManager(_ref) {
         setSizeInState(dragSize);
       }
     }
-  }, error && /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(AlertBanner, {
+  }, isLoading && /*#__PURE__*/React.createElement(LinearProgress, {
+    "data-testid": "loading-bar",
+    color: "secondary"
+  }), error && /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(AlertBanner, {
     title: error,
     shouldClose: true
-  })), /*#__PURE__*/React.createElement(Drawings, {
+  })), !isLoading && !error && /*#__PURE__*/React.createElement(Drawings, {
     drawings: drawingListItems,
     onClickDrawing: onClickDrawing,
-    onClickEdit: onEditDrawing,
+    // onClickEdit={onEditDrawing}
     activeDrawing: activeDrawingId
   }));
 };
@@ -1817,6 +1826,10 @@ var AreaManager = function AreaManager(_ref) {
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
 var API_NAME = 'warnings';
+var getIdFromUrl = function getIdFromUrl(url) {
+  var splitString = url && url.split('/');
+  return url && splitString[splitString.length - 2];
+};
 var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
   return {
     getDrawings: function getDrawings() {
@@ -1829,7 +1842,10 @@ var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
       return axiosInstance.post("/drawings/".concat(drawingId, "/"), data);
     },
     saveDrawingAs: function saveDrawingAs(data) {
-      return axiosInstance.post("/drawings/", data);
+      return axiosInstance.post("/drawings/", data).then(function (response) {
+        var headerLocation = response === null || response === void 0 ? void 0 : response.request.getResponseHeader('Location');
+        return getIdFromUrl(headerLocation);
+      });
     },
     deleteDrawing: function deleteDrawing(drawingId) {
       return axiosInstance.post("/drawings/".concat(drawingId, "?delete=true"));
@@ -1853,7 +1869,6 @@ var AreaManagerConnect = function AreaManagerConnect(_ref) {
   var _useSetupDialog = useSetupDialog(dialogType, source),
     dialogOrder = _useSetupDialog.dialogOrder,
     setDialogOrder = _useSetupDialog.setDialogOrder,
-    onCloseDialog = _useSetupDialog.onCloseDialog,
     isDialogOpen = _useSetupDialog.isDialogOpen,
     uiSource = _useSetupDialog.uiSource,
     setFocused = _useSetupDialog.setFocused,
@@ -1863,6 +1878,11 @@ var AreaManagerConnect = function AreaManagerConnect(_ref) {
   var mapId = useSelector(function (store) {
     return uiSelectors.getDialogMapId(store, dialogType);
   });
+  var _useAreaDrawDialogAct = useAreaDrawDialogAction({
+      mapId: mapId,
+      source: source
+    }),
+    closeAreaDialog = _useAreaDrawDialogAct.closeAreaDialog;
   var geoJSONLayerId = "".concat(mapId, "-geosjon");
   var currentLayer = useSelector(function (store) {
     return layerSelectors.getLayerById(store, geoJSONLayerId);
@@ -1875,14 +1895,21 @@ var AreaManagerConnect = function AreaManagerConnect(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     drawings = _useState2[0],
     setDrawings = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var fetchDrawings = function fetchDrawings() {
     uiActions.setErrorDialog({
       error: 'error.message',
       type: dialogType
     });
+    setLoading(true);
     warningsApi.getDrawings().then(function (response) {
+      setLoading(false);
       setDrawings(response.data);
     })["catch"](function (error) {
+      setLoading(false);
       dispatch(uiActions.setErrorDialog({
         error: error.message,
         type: dialogType
@@ -1890,9 +1917,11 @@ var AreaManagerConnect = function AreaManagerConnect(_ref) {
     });
   };
   useEffect(function () {
-    fetchDrawings();
+    if (isDialogOpen) {
+      fetchDrawings();
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [isDialogOpen]);
   var deleteGeoJSONLayer = function deleteGeoJSONLayer() {
     dispatch(mapStoreActions.layerDelete({
       layerId: geoJSONLayerId,
@@ -1952,55 +1981,38 @@ var AreaManagerConnect = function AreaManagerConnect(_ref) {
       }, _callee2);
     }));
   };
-  var openDrawTools = function openDrawTools(drawingId) {
-    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var _yield$warningsApi$ge, data;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
-            return warningsApi.getDrawingDetails(drawingId);
-          case 3:
-            _yield$warningsApi$ge = _context3.sent;
-            data = _yield$warningsApi$ge.data;
-            // update draw tool values
-            dispatch(drawActions.setDrawValues({
-              area: data.area,
-              areaName: data.name,
-              mapId: mapId,
-              id: drawingId
-            }));
-            // open draw dialog
-            dispatch(uiActions.setActiveMapIdForDialog({
-              type: "".concat(uiTypes.DialogTypes.DockedDrawingTool, "-").concat(mapId),
-              mapId: mapId,
-              setOpen: true,
-              source: source
-            }));
-            _context3.next = 11;
-            break;
-          case 9:
-            _context3.prev = 9;
-            _context3.t0 = _context3["catch"](0);
-          case 11:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[0, 9]]);
-    }));
-  };
-  var onEditDrawing = function onEditDrawing(drawingId) {
-    // delete current redux layers
-    deleteGeoJSONLayer();
-    onCloseDialog();
-    openDrawTools(drawingId);
-  };
+  // TODO: re-enable for: https://gitlab.com/opengeoweb/opengeoweb/-/issues/4080
+  // const openDrawTools = async (drawingId: string): Promise<void> => {
+  //   try {
+  //     const { data } = await warningsApi.getDrawingDetails(drawingId);
+  //     // update draw tool values
+  //     dispatch(
+  //       drawActions.setDrawValues({
+  //         area: data.area,
+  //         areaName: data.name,
+  //         mapId,
+  //         id: drawingId,
+  //       }),
+  //     );
+  //     // open draw dialog
+  //     dispatch(
+  //       uiActions.setActiveMapIdForDialog({
+  //         type: `${uiTypes.DialogTypes.DockedDrawingTool}-${mapId}`,
+  //         mapId,
+  //         setOpen: true,
+  //         source,
+  //       }),
+  //     );
+  //   } catch (error) {
+  //     // TODO: handle error. Might need to move this to redux
+  //   }
+  // };
+  // const onEditDrawing = (drawingId: string): void => {
+  //   closeAreaDialog();
+  //   openDrawTools(drawingId);
+  // };
   var onClose = function onClose() {
-    onCloseDialog();
-  };
-  var onHideAreaManager = function onHideAreaManager() {
-    deleteGeoJSONLayer();
+    closeAreaDialog();
   };
   if (!isDialogOpen) {
     return null;
@@ -2021,10 +2033,10 @@ var AreaManagerConnect = function AreaManagerConnect(_ref) {
     },
     drawingListItems: drawings,
     onClickDrawing: onClickDrawing,
-    onUnMount: onHideAreaManager,
-    onEditDrawing: onEditDrawing,
+    // onEditDrawing={onEditDrawing}
     activeDrawingId: activeDrawingId,
-    error: uiError
+    error: uiError,
+    isLoading: loading
   });
 };
 
@@ -3011,9 +3023,6 @@ function delayP(ms, val) {
 }
 
 if (process.env.NODE_ENV !== 'production' && typeof Proxy !== 'undefined') ;
-var identity = function identity(v) {
-  return v;
-};
 function check(value, predicate, error) {
   if (!predicate(value)) {
     throw new Error(error);
@@ -3064,7 +3073,6 @@ var PUT = 'PUT';
 var CALL = 'CALL';
 var FORK = 'FORK';
 var CANCEL = 'CANCEL';
-var SELECT = 'SELECT';
 
 var TEST_HINT = '\n(HINT: if you are getting these errors in tests, consider using createMockTask from @redux-saga/testing-utils)';
 
@@ -3248,25 +3256,6 @@ function cancel(taskOrTasks) {
 
   return makeEffect(CANCEL, taskOrTasks);
 }
-function select(selector) {
-  if (selector === void 0) {
-    selector = identity;
-  }
-
-  for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
-    args[_key5 - 1] = arguments[_key5];
-  }
-
-  if (process.env.NODE_ENV !== 'production' && arguments.length) {
-    check(arguments[0], notUndef, 'select(selector, [...]): argument selector is undefined');
-    check(selector, func, "select(selector, [...]): argument " + selector + " is not a function");
-  }
-
-  return makeEffect(SELECT, {
-    selector: selector,
-    args: args
-  });
-}
 var delay =
 /*#__PURE__*/
 call.bind(null, delayP);
@@ -3407,144 +3396,91 @@ var SUBMIT_ERROR = 'Something went wrong saving a drawing';
 var getSnackbarMessage = function getSnackbarMessage(areaName, id) {
   return "Drawing ".concat(areaName, " has been ").concat(id ? 'updated' : 'saved', "!");
 };
-function onOpenUiDialogSaga(_ref) {
+function submitDrawValuesSaga(_ref) {
   var payload = _ref.payload;
   return /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var type, mapId, drawUiType, areaManagerUiType, isDrawingOpen, isAreaManagerOpen;
+    var mapId, id, formValues, dialogType, warningsApi, newID;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
-        case 0:
-          type = payload.type, mapId = payload.mapId;
-          drawUiType = "".concat(uiTypes.DialogTypes.DockedDrawingTool, "-").concat(mapId);
-          areaManagerUiType = uiTypes.DialogTypes.AreaManager;
-          if (!(type === areaManagerUiType)) {
-            _context.next = 10;
-            break;
-          }
-          _context.next = 6;
-          return select(uiSelectors.getisDialogOpen, drawUiType);
-        case 6:
-          isDrawingOpen = _context.sent;
-          if (!isDrawingOpen) {
-            _context.next = 10;
-            break;
-          }
-          _context.next = 10;
-          return put(uiActions.setToggleOpenDialog(Object.assign(Object.assign({}, payload), {
-            type: drawUiType,
-            setOpen: false
-          })));
-        case 10:
-          if (!(type === drawUiType)) {
-            _context.next = 17;
-            break;
-          }
-          _context.next = 13;
-          return select(uiSelectors.getisDialogOpen, areaManagerUiType);
-        case 13:
-          isAreaManagerOpen = _context.sent;
-          if (!isAreaManagerOpen) {
-            _context.next = 17;
-            break;
-          }
-          _context.next = 17;
-          return put(uiActions.setToggleOpenDialog(Object.assign(Object.assign({}, payload), {
-            type: areaManagerUiType,
-            setOpen: false
-          })));
-        case 17:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })();
-}
-function submitDrawValuesSaga(_ref2) {
-  var payload = _ref2.payload;
-  return /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var mapId, id, formValues, dialogType, warningsApi, newID;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           mapId = payload.mapId, id = payload.id, formValues = __rest(payload, ["mapId", "id"]);
           dialogType = "".concat(uiTypes.DialogTypes.DockedDrawingTool, "-").concat(mapId);
-          _context2.prev = 2;
-          _context2.next = 5;
+          _context.prev = 2;
+          _context.next = 5;
           return put(uiActions.toggleIsLoadingDialog({
             isLoading: true,
             type: dialogType
           }));
         case 5:
-          _context2.next = 7;
+          _context.next = 7;
           return call(getWarningsApi);
         case 7:
-          warningsApi = _context2.sent;
+          warningsApi = _context.sent;
           if (id) {
-            _context2.next = 16;
+            _context.next = 16;
             break;
           }
-          _context2.next = 11;
+          _context.next = 11;
           return call(warningsApi.saveDrawingAs, formValues);
         case 11:
-          newID = _context2.sent;
-          _context2.next = 14;
-          return put(drawActions.setDrawValues(Object.assign({
+          newID = _context.sent;
+          _context.next = 14;
+          return put(drawActions.setDrawValues({
             mapId: mapId,
-            id: newID
-          }, formValues)));
+            id: newID,
+            areaName: formValues.name,
+            area: formValues.area
+          }));
         case 14:
-          _context2.next = 18;
+          _context.next = 18;
           break;
         case 16:
-          _context2.next = 18;
+          _context.next = 18;
           return call(warningsApi.updateDrawing, id, formValues);
         case 18:
-          _context2.next = 20;
+          _context.next = 20;
           return put(snackbarActions.openSnackbar({
-            message: getSnackbarMessage(formValues.areaName, id)
+            message: getSnackbarMessage(formValues.name, id)
           }));
         case 20:
-          _context2.next = 22;
+          _context.next = 22;
           return put(uiActions.toggleIsLoadingDialog({
             isLoading: false,
             type: dialogType
           }));
         case 22:
-          _context2.next = 30;
+          _context.next = 30;
           break;
         case 24:
-          _context2.prev = 24;
-          _context2.t0 = _context2["catch"](2);
-          _context2.next = 28;
+          _context.prev = 24;
+          _context.t0 = _context["catch"](2);
+          _context.next = 28;
           return put(uiActions.toggleIsLoadingDialog({
             isLoading: false,
             type: dialogType
           }));
         case 28:
-          _context2.next = 30;
+          _context.next = 30;
           return put(uiActions.setErrorDialog({
             type: dialogType,
             error: SUBMIT_ERROR
           }));
         case 30:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2, null, [[2, 24]]);
+    }, _callee, null, [[2, 24]]);
   })();
 }
 function drawingSaga() {
-  return _regeneratorRuntime().wrap(function drawingSaga$(_context3) {
-    while (1) switch (_context3.prev = _context3.next) {
+  return _regeneratorRuntime().wrap(function drawingSaga$(_context2) {
+    while (1) switch (_context2.prev = _context2.next) {
       case 0:
-        _context3.next = 2;
-        return takeLatest$1(uiActions.setActiveMapIdForDialog, onOpenUiDialogSaga);
-      case 2:
-        _context3.next = 4;
+        _context2.next = 2;
         return takeLatest$1(drawActions.submitDrawValues, submitDrawValuesSaga);
-      case 4:
+      case 2:
       case "end":
-        return _context3.stop();
+        return _context2.stop();
     }
   }, _marked);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "6.1.1",
+  "version": "7.0.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -9,12 +9,12 @@
   },
   "dependencies": {
     "@mui/material": "5.12.0",
-    "@opengeoweb/api": "6.1.1",
-    "@opengeoweb/core": "6.1.1",
-    "@opengeoweb/shared": "6.1.1",
-    "@opengeoweb/store": "6.1.1",
-    "@opengeoweb/theme": "6.1.1",
-    "@opengeoweb/webmap-react": "6.1.1",
+    "@opengeoweb/api": "7.0.0",
+    "@opengeoweb/core": "7.0.0",
+    "@opengeoweb/shared": "7.0.0",
+    "@opengeoweb/store": "7.0.0",
+    "@opengeoweb/theme": "7.0.0",
+    "@opengeoweb/webmap-react": "7.0.0",
     "@reduxjs/toolkit": "1.9.5",
     "axios": "1.5.0",
     "react": "18.2.0",

package/src/lib/components/AreaManager/AreaManager.d.ts

@@ -26,8 +26,7 @@ export declare const AreaManager: React.FC<{
     headerSize?: HeaderSize;
     drawingListItems: DrawingListItem[];
     onClickDrawing?: (drawing: DrawingListItem) => void;
-    onUnMount?: () => void;
-    onEditDrawing?: (drawingId: string) => void;
     activeDrawingId?: string;
     error?: string;
+    isLoading?: boolean;
 }>;

package/src/lib/components/AreaManager/AreaManager.stories.d.ts

@@ -23,3 +23,11 @@ export declare const AreaManagerDark: {
     };
     storyName: string;
 };
+export declare const AreaManagerLightNoResults: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const AreaManagerDarkNoResults: {
+    (): React.ReactElement;
+    storyName: string;
+};

package/src/lib/components/AreaManager/Drawings.d.ts

@@ -1,8 +1,8 @@
 import { FC } from 'react';
 import { DrawingListItem } from '../../store/drawings/types';
+export declare const NO_AREAS_FOUND = "No areas found";
 export declare const Drawings: FC<{
     drawings: DrawingListItem[];
     onClickDrawing: (drawing: DrawingListItem) => void;
-    onClickEdit: (drawingId: string) => void;
     activeDrawing: string;
 }>;

package/src/lib/store/drawings/sagas.d.ts

@@ -1,9 +1,6 @@
 import { SagaIterator } from 'redux-saga';
 export declare const SUBMIT_ERROR = "Something went wrong saving a drawing";
 export declare const getSnackbarMessage: (areaName: string, id: string) => string;
-export declare function onOpenUiDialogSaga({ payload }: {
-    payload: any;
-}): SagaIterator;
 export declare function submitDrawValuesSaga({ payload }: {
     payload: any;
 }): SagaIterator;

package/src/lib/store/drawings/types.d.ts

@@ -1,9 +1,9 @@
-export type DrawingScope = 'user';
+import { drawTypes } from '@opengeoweb/store';
 export interface DrawingListItem {
     id: string;
     name: string;
     lastUpdatedTime: string;
-    scope: DrawingScope;
+    scope: drawTypes.DrawingScope;
     area: GeoJSON.FeatureCollection;
 }
 export interface DrawingFromBE extends DrawingListItem {

package/src/lib/utils/api.d.ts

@@ -2,6 +2,7 @@ import { CreateApiProps } from '@opengeoweb/api';
 import { AxiosInstance } from 'axios';
 import { DrawingDetails, DrawingFromBE, DrawingListItem } from '../store/drawings/types';
 export declare const API_NAME = "warnings";
+export declare const getIdFromUrl: (url: string) => string;
 export type WarningsApi = {
     getDrawings: () => Promise<{
         data: DrawingListItem[];