@opengeoweb/warnings 9.6.0 → 9.8.0

package/index.esm.js

@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, Wind, Fog, Lightning, Snow, Rain, TemperatureHigh, FunnelCloud, TemperatureLow, CoastalEvent, breakpoints, Options } from '@opengeoweb/theme';
 import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawtoolSelectors, layerSelectors, uiSelectors, drawtoolActions, mapStoreActions, layerActions, useSetupDialog } from '@opengeoweb/store';
 import { emptyGeoJSON, MapControlButton, getGeoJSONPropertyValue, getIcon, rewindGeometry, currentlySupportedDrawModes } from '@opengeoweb/webmap-react';
-import { useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, LastUpdateTime, StatusTag, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
+import { useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, LastUpdateTime, StatusTag, ErrorBoundary, isAxiosError, pollingIntervalTimeout } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector } from '@reduxjs/toolkit';
 import { snackbarActions } from '@opengeoweb/snackbar';
 import { styled, Box, Typography, ListItem, Grid, Paper, ListItemButton, Stack, LinearProgress, Button, FormHelperText, MenuItem, Tabs, Tab, FormControl, Card, CardContent, ListItemIcon, CircularProgress, List } from '@mui/material';
@@ -15,7 +15,7 @@ import { ReactHookFormProvider, defaultFormOptions, ReactHookFormHiddenInput, is
 import { useFormContext } from 'react-hook-form';
 import { clamp } from 'lodash';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
-import { takeLatest, put, call, select } from 'redux-saga/effects';
+import { takeLatest, put, call, select, delay } from 'redux-saga/effects';
 import { isAxiosError as isAxiosError$1 } from 'axios';
 
 function _iterableToArrayLimit(r, l) {
@@ -1528,9 +1528,62 @@ var publicWarningDialogType = uiTypes.DialogTypes.PublicWarnings;
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
-var initialState$1 = {};
+var publicWarningsAdapter = createEntityAdapter({
+  selectId: function selectId(warning) {
+    return warning.id;
+  }
+});
+var initialState$1 = {
+  warnings: publicWarningsAdapter.getInitialState(),
+  isLoading: true,
+  lastUpdatedTime: ''
+};
 var slice$1 = createSlice({
   initialState: initialState$1,
+  name: 'publicWarnings',
+  reducers: {
+    fetchWarnings: function fetchWarnings(draft) {
+      draft.isLoading = true;
+      delete draft.error;
+    },
+    fetchWarningsSuccess: function fetchWarningsSuccess(draft, action) {
+      var _action$payload = action.payload,
+        warnings = _action$payload.warnings,
+        lastUpdatedTime = _action$payload.lastUpdatedTime;
+      draft.isLoading = false;
+      draft.lastUpdatedTime = lastUpdatedTime;
+      publicWarningsAdapter.setAll(draft.warnings, warnings);
+    },
+    fetchWarningsError: function fetchWarningsError(draft, action) {
+      var error = action.payload.error;
+      draft.isLoading = false;
+      draft.error = error;
+    }
+  }
+});
+var reducer$1 = slice$1.reducer;
+var publicWarningActions = slice$1.actions;
+
+/* *
+ * 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 TAKEOVER_MESSAGE = 'You are no longer the editor of this warning';
+var initialState = {};
+var slice = createSlice({
+  initialState: initialState,
   name: 'publicWarningForm',
   reducers: {
     setFormValues: function setFormValues(draft, action) {
@@ -1562,7 +1615,7 @@ var slice$1 = createSlice({
     toggleEditorWarning: function toggleEditorWarning(draft,
     // eslint-disable-next-line no-unused-vars
     action) {
-      draft.error = '';
+      delete draft.error;
     },
     toggleEditorWarningSuccess: function toggleEditorWarningSuccess(draft, action) {
       var _action$payload3 = action.payload,
@@ -1578,7 +1631,7 @@ var slice$1 = createSlice({
     // eslint-disable-next-line no-unused-vars
     action) {
       draft.formState = 'publishing';
-      draft.error = '';
+      delete draft.error;
     },
     publishWarningSuccess: function publishWarningSuccess(draft, action) {
       var publicWarning = action.payload.publicWarning;
@@ -1591,7 +1644,7 @@ var slice$1 = createSlice({
     // eslint-disable-next-line no-unused-vars
     action) {
       draft.formState = 'saving';
-      draft.error = '';
+      delete draft.error;
       draft.publicWarning = action.payload.publicWarning;
     },
     saveWarningSuccess: function saveWarningSuccess(draft, action) {
@@ -1604,9 +1657,15 @@ var slice$1 = createSlice({
       draft.formState = '';
     },
     setFormError: function setFormError(draft, action) {
-      var error = action.payload.error;
+      var _action$payload4 = action.payload,
+        message = _action$payload4.message,
+        _action$payload4$seve = _action$payload4.severity,
+        severity = _action$payload4$seve === void 0 ? 'error' : _action$payload4$seve;
       draft.formState = '';
-      draft.error = error;
+      draft.error = {
+        severity: severity,
+        message: message
+      };
     },
     setFormDirty: function setFormDirty(draft, action) {
       var isFormDirty = action.payload.isFormDirty;
@@ -1615,9 +1674,9 @@ var slice$1 = createSlice({
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(uiActions.setToggleOpenDialog, function (draft, action) {
-      var _action$payload4 = action.payload,
-        type = _action$payload4.type,
-        setOpen = _action$payload4.setOpen;
+      var _action$payload5 = action.payload,
+        type = _action$payload5.type,
+        setOpen = _action$payload5.setOpen;
       if (type === publicWarningDialogType && setOpen === false) {
         delete draft.object;
         delete draft.publicWarning;
@@ -1626,11 +1685,29 @@ var slice$1 = createSlice({
         delete draft.selectedPublicWarningId;
         delete draft.isFormDirty;
       }
+    }).addCase(publicWarningActions.fetchWarningsSuccess, function (draft, action) {
+      var _a;
+      var warnings = action.payload.warnings;
+      if (draft.selectedPublicWarningId) {
+        var currentWarning = warnings.find(function (warning) {
+          return warning.id === draft.selectedPublicWarningId;
+        });
+        if (((_a = draft.publicWarning) === null || _a === void 0 ? void 0 : _a.editor) !== (currentWarning === null || currentWarning === void 0 ? void 0 : currentWarning.editor)) {
+          draft.publicWarning.editor = currentWarning === null || currentWarning === void 0 ? void 0 : currentWarning.editor;
+          // if form is in edit mode show warning
+          if (draft.formState === '') {
+            draft.error = {
+              severity: 'warning',
+              message: TAKEOVER_MESSAGE
+            };
+          }
+        }
+      }
     });
   }
 });
-var reducer$1 = slice$1.reducer;
-var publicWarningFormActions = slice$1.actions;
+var reducer = slice.reducer;
+var publicWarningFormActions = slice.actions;
 
 var getDeleteSucces = function getDeleteSucces(objectName) {
   return "".concat(objectName, " has been deleted");
@@ -5394,7 +5471,10 @@ var Form = function Form(_ref5) {
     formAction = _ref5$formAction === void 0 ? '' : _ref5$formAction,
     publicWarningDetails = _ref5.publicWarningDetails,
     _ref5$error = _ref5.error,
-    error = _ref5$error === void 0 ? '' : _ref5$error,
+    error = _ref5$error === void 0 ? {
+      severity: 'error',
+      message: ''
+    } : _ref5$error,
     _ref5$isReadOnly = _ref5.isReadOnly,
     isReadOnly = _ref5$isReadOnly === void 0 ? false : _ref5$isReadOnly,
     _ref5$onFormDirty = _ref5.onFormDirty,
@@ -5412,7 +5492,7 @@ var Form = function Form(_ref5) {
   useFormDirty({
     isDirty: isDirty,
     isLoading: isPublishing || isSaving,
-    error: error,
+    error: error === null || error === void 0 ? void 0 : error.message,
     onFormDirty: onFormDirty,
     onSuccess: function onSuccess() {
       // reset form dirty after successfull saving
@@ -5464,7 +5544,7 @@ var Form = function Form(_ref5) {
     // sync redux with react-hook-form
     reset(getFormData(publicWarningDetails, object));
   }, [object, reset, publicWarningDetails]);
-  var errors = getErrors(error);
+  var errors = getErrors(error.message);
   return /*#__PURE__*/React.createElement(ContainerWrapper, null, /*#__PURE__*/React.createElement(ContainerFormWrapper, {
     isReadOnly: isReadOnly
   }, /*#__PURE__*/React.createElement(ContainerGrid, null, errors && ( /*#__PURE__*/React.createElement(Box, {
@@ -5474,7 +5554,8 @@ var Form = function Form(_ref5) {
   }, /*#__PURE__*/React.createElement(AlertBanner, {
     title: errors.title,
     info: errors.errors,
-    shouldClose: true
+    shouldClose: true,
+    severity: error === null || error === void 0 ? void 0 : error.severity
   }))), /*#__PURE__*/React.createElement(Grid, {
     container: true,
     rowSpacing: 2
@@ -5672,7 +5753,7 @@ var getPublicWarningFormState = createSelector(getPublicWarningStore, function (
   return (publicWarningStore === null || publicWarningStore === void 0 ? void 0 : publicWarningStore.formState) || '';
 });
 var getPublicWarningFormError = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  return (publicWarningStore === null || publicWarningStore === void 0 ? void 0 : publicWarningStore.error) || '';
+  return publicWarningStore === null || publicWarningStore === void 0 ? void 0 : publicWarningStore.error;
 });
 var getSelectedPublicWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
   return (publicWarningStore === null || publicWarningStore === void 0 ? void 0 : publicWarningStore.selectedPublicWarningId) || '';
@@ -6299,58 +6380,6 @@ var PublicWarningList = function PublicWarningList(_ref2) {
   }))));
 };
 
-/* *
- * 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 publicWarningsAdapter = createEntityAdapter({
-  selectId: function selectId(warning) {
-    return warning.id;
-  }
-});
-var initialState = {
-  warnings: publicWarningsAdapter.getInitialState(),
-  isLoading: true,
-  lastUpdatedTime: ''
-};
-var slice = createSlice({
-  initialState: initialState,
-  name: 'publicWarnings',
-  reducers: {
-    fetchWarnings: function fetchWarnings(draft) {
-      draft.isLoading = true;
-      delete draft.error;
-    },
-    fetchWarningsSuccess: function fetchWarningsSuccess(draft, action) {
-      var _action$payload = action.payload,
-        warnings = _action$payload.warnings,
-        lastUpdatedTime = _action$payload.lastUpdatedTime;
-      draft.isLoading = false;
-      draft.lastUpdatedTime = lastUpdatedTime;
-      publicWarningsAdapter.setAll(draft.warnings, warnings);
-    },
-    fetchWarningsError: function fetchWarningsError(draft, action) {
-      var error = action.payload.error;
-      draft.isLoading = false;
-      draft.error = error;
-    }
-  }
-});
-var reducer = slice.reducer;
-var publicWarningActions = slice.actions;
-
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -6802,7 +6831,7 @@ function toggleEditorWarningSaga(_ref) {
           return call(warningsApi.toggleEditorWarning, warningId, isEditor);
         case 7:
           _context2.next = 9;
-          return put(publicWarningActions.fetchWarnings);
+          return put(publicWarningActions.fetchWarnings());
         case 9:
           _context2.next = 11;
           return put(publicWarningFormActions.toggleEditorWarningSuccess({
@@ -6844,18 +6873,24 @@ function publishWarningSaga(_ref2) {
             message: PUBLISH_SUCCES
           }));
         case 7:
-          _context3.next = 13;
-          break;
+          _context3.next = 9;
+          return put(uiActions.setToggleOpenDialog({
+            type: publicWarningDialogType,
+            setOpen: false
+          }));
         case 9:
-          _context3.prev = 9;
+          _context3.next = 15;
+          break;
+        case 11:
+          _context3.prev = 11;
           _context3.t0 = _context3["catch"](0);
-          _context3.next = 13;
+          _context3.next = 15;
           return call(errorSaga, getErrorMessage(_context3.t0));
-        case 13:
+        case 15:
         case "end":
           return _context3.stop();
       }
-    }, _callee2, null, [[0, 9]]);
+    }, _callee2, null, [[0, 11]]);
   })();
 }
 function saveWarningSaga(_ref3) {
@@ -6919,7 +6954,7 @@ function errorSaga(message) {
       case 0:
         _context6.next = 2;
         return put(publicWarningFormActions.setFormError({
-          error: message
+          message: message
         }));
       case 2:
         _context6.next = 4;
@@ -7025,23 +7060,29 @@ function fetchWarningsSaga() {
           lastUpdatedTime: lastUpdatedTime
         }));
       case 11:
-        _context.next = 17;
-        break;
+        _context.next = 13;
+        return delay(pollingIntervalTimeout);
       case 13:
-        _context.prev = 13;
+        _context.next = 15;
+        return put(publicWarningActions.fetchWarnings());
+      case 15:
+        _context.next = 21;
+        break;
+      case 17:
+        _context.prev = 17;
         _context.t0 = _context["catch"](0);
-        _context.next = 17;
+        _context.next = 21;
         return put(publicWarningActions.fetchWarningsError({
           error: {
             name: _context.t0.name,
             message: _context.t0.message
           }
         }));
-      case 17:
+      case 21:
       case "end":
         return _context.stop();
     }
-  }, _marked, null, [[0, 13]]);
+  }, _marked, null, [[0, 17]]);
 }
 function refetchWarnings() {
   return _regeneratorRuntime().wrap(function refetchWarnings$(_context2) {
@@ -7091,8 +7132,8 @@ var drawingModuleConfig = {
   id: 'drawing-module',
   reducersMap: {
     drawings: reducer$2,
-    publicWarningForm: reducer$1,
-    publicWarnings: reducer
+    publicWarningForm: reducer,
+    publicWarnings: reducer$1
   },
   sagas: [drawingSaga, publicWarningRootSaga, publicWarnings]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.6.0",
+  "version": "9.8.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/PublicWarningList/PublicWarningListConnect.stories.d.ts

@@ -7,3 +7,4 @@ export declare const PublicWarningListLight: () => React.ReactElement;
 export declare const PublicWarningListDark: () => React.ReactElement;
 export declare const PublicWarningListError: () => React.ReactElement;
 export declare const PublicWarningListErrorDeleteWarning: () => React.ReactElement;
+export declare const PublicWarningListDifferentEditors: () => React.ReactElement;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { PublicWarningDetail } from '../../store/publicWarningForm/types';
 import { BaseDrawingListItem, DrawingListItem } from '../../store/drawings/types';
-import { FormAction } from '../../store/publicWarningForm/reducer';
+import { FormAction, FormError } from '../../store/publicWarningForm/reducer';
 export declare const getEmptyPublicWarning: () => PublicWarningDetail;
 export declare const getFormData: (publicWarningsDetails: PublicWarningDetail | undefined, object?: DrawingListItem) => PublicWarningDetail;
 export declare const LABEL_PROBABILITY = "Probability";
@@ -22,7 +22,7 @@ interface FormProps {
     onPublishForm?: (formValues: PublicWarningDetail) => void;
     object?: DrawingListItem;
     publicWarningDetails?: PublicWarningDetail;
-    error?: string;
+    error?: FormError;
     isReadOnly?: boolean;
     onFormDirty?: (isFormDirty: boolean) => void;
 }

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

@@ -47,3 +47,11 @@ export declare const PublicWarningsFormDialogDarkReadOnly: {
     (): React.ReactElement;
     storyName: string;
 };
+export declare const PublicWarningsFormDialogLightTakeoverWarning: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const PublicWarningsFormDialogDarkTakeoverWarning: {
+    (): React.ReactElement;
+    storyName: string;
+};

package/src/lib/store/publicWarningForm/reducer.d.ts

@@ -1,15 +1,21 @@
 import { PayloadAction, Draft } from '@reduxjs/toolkit';
+import { AlertColor } from '@mui/material';
 import { DrawingListItem } from '../drawings/types';
 import { PublicWarning } from './types';
 export type FormAction = '' | 'saving' | 'publishing' | 'readonly';
+export type FormError = {
+    severity?: AlertColor;
+    message: string;
+};
 export interface PublicWarningFormState {
     object?: DrawingListItem;
     publicWarning?: PublicWarning;
     formState?: FormAction;
-    error?: string;
+    error?: FormError;
     selectedPublicWarningId?: string;
     isFormDirty?: boolean;
 }
+export declare const TAKEOVER_MESSAGE = "You are no longer the editor of this warning";
 export declare const initialState: PublicWarningFormState;
 export declare const reducer: import("redux").Reducer<PublicWarningFormState, import("redux").AnyAction>;
 export declare const publicWarningFormActions: import("@reduxjs/toolkit").CaseReducerActions<{
@@ -47,9 +53,7 @@ export declare const publicWarningFormActions: import("@reduxjs/toolkit").CaseRe
         publicWarning: PublicWarning;
         message: string;
     }>) => void;
-    setFormError: (draft: Draft<PublicWarningFormState>, action: PayloadAction<{
-        error: string;
-    }>) => void;
+    setFormError: (draft: Draft<PublicWarningFormState>, action: PayloadAction<FormError>) => void;
     setFormDirty: (draft: Draft<PublicWarningFormState>, action: PayloadAction<{
         isFormDirty: boolean;
     }>) => void;

package/src/lib/store/publicWarningForm/selectors.d.ts

@@ -26,7 +26,7 @@ export declare const getPublicWarningFormState: ((state: WarningModuleStore) =>
 }> & {
     clearCache: () => void;
 };
-export declare const getPublicWarningFormError: ((state: WarningModuleStore) => string) & import("reselect").OutputSelectorFields<(args_0: PublicWarningFormState) => string, {
+export declare const getPublicWarningFormError: ((state: WarningModuleStore) => import("./reducer").FormError | undefined) & import("reselect").OutputSelectorFields<(args_0: PublicWarningFormState) => import("./reducer").FormError | undefined, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;