@opengeoweb/warnings 12.13.0 → 13.1.0

package/index.esm.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useDispatch, useSelector } from 'react-redux';
-import { Polygons, ExitDomain, Share, Edit, Delete, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, DrawPolygon, Visibility, Add, ArrowUpCompact, ArrowDownCompact, breakpoints, DragHandle, Options, Close, ChevronDown, ChevronUp, Copy, Update, Cancel, Success, Expire, Remove } from '@opengeoweb/theme';
+import { Polygons, ExitDomain, Share, Edit, Delete, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, SevereMountainWaves, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, DrawPolygon, Visibility, Add, ArrowUpCompact, ArrowDownCompact, breakpoints, DragHandle, Options, Close, ChevronDown, ChevronUp, Copy, Update, Cancel, Success, Expire, Remove } from '@opengeoweb/theme';
 import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawingToolSelectors, layerSelectors, uiSelectors, drawingToolActions, layerActions, mapListener, layersListener, drawingToolListener, syncGroupsListener, openlayersListener, syncGroupsReducer, drawingToolReducer, uiReducer, layerReducer, mapReducer, useSetupDialog, genericSelectors, useUpdateSharedData, genericActions, selectorMemoizationOptions } from '@opengeoweb/store';
 import { defaultPolygon, emptyGeoJSON, MapControlButton, getIcon, rewindGeometry, getGeoJSONPropertyValue, currentlySupportedDrawModes, defaultLayers, viewUtils, OpenLayersMapView, MapControls, OpenLayersZoomControl, OpenLayersLayer, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle } from '@opengeoweb/webmap-react';
 import { SHARED_NAMESPACE, useConfirmationDialog, dateUtils, ToggleMenu, calculateStartSize, ToolContainerDraggable, AlertBanner, sessionStorageProvider, ConfirmationDialog, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, FilterChip, TooltipSelect, LastUpdateTime, usePreventBrowserClose, CustomToggleButton, Filter, FilterOption, StatusTag, getAxiosErrorMessage, ErrorBoundary } from '@opengeoweb/shared';
@@ -264,7 +264,6 @@ var en = {
 	"maritime-warning-post-success": "Warning published successfully",
 	"maritime-loading-config": "Loading config...",
 	"maritime-config-error": "Something went wrong with loading the configuration file",
-	"maritime-warning-validfrom": "Start time: ",
 	"maritime-warning-validuntil": "End time: "
 };
 var nl = {
@@ -463,7 +462,6 @@ var nl = {
 	"maritime-warning-post-success": "Waarschuwing succesvol gepubliceerd",
 	"maritime-loading-config": "Laden van configuratie...",
 	"maritime-config-error": "Er is iets misgegaan bij het laden van het configuratiebestand",
-	"maritime-warning-validfrom": "Start tijd: ",
 	"maritime-warning-validuntil": "Eind tijd: "
 };
 var fi = {
@@ -628,14 +626,14 @@ var no = {
 	"drawing-tool-form-update": "Oppdater objekt",
 	"drawing-tool-form-exit-draw-mode": "Trykk ESC for å avslutte tegnemodus",
 	"drawing-tool-form-drawing-required": "Objekttegning kreves",
-	"close-dialog-cancel": "Avbryt",
+	"close-dialog-cancel": "Cancel",
 	"close-dialog-confirm": "Lukk",
 	"close-draw-dialog-title": "Lukk tegneverktøy",
 	"close-dialog-description": "Du har gjort endringer, er du sikker på at du vil lukke?",
 	"drawing-tool-title": "Tegneverktøy",
-	"object-manager-title": "Objektmanager for",
+	"object-manager-title": "Objekter for",
 	"object-manager-add": "Legg til nytt objekt",
-	"delete-dialog-cancel": "Avbryt",
+	"delete-dialog-cancel": "Cancel",
 	"delete-dialog-confirm": "Slett",
 	"delete-dialog-title": "Slett objekt",
 	"delete-dialog-description": "Er du sikker på at du vil slette?",
@@ -747,30 +745,30 @@ var no = {
 	"filter-phenomenon": "Fenomen",
 	"filter-level": "Grad",
 	"filter-source": "Kilder",
-	"warning-dialog-expire-succes": "ikke oversatt",
-	"warning-dialog-expire-title": "ikke oversatt",
-	"warning-dialog-expire-confirm": "ikke oversatt",
-	"warning-dialog-expire-description": "ikke oversatt",
-	"warning-dialog-withdraw-succes": "ikke oversatt",
-	"warning-dialog-withdraw-title": "ikke oversatt",
-	"warning-dialog-withdraw-confirm": "ikke oversatt",
-	"warning-dialog-withdraw-description": "ikke oversatt",
-	"warning-domain-aviation": "ikke oversatt",
-	"warning-domain-maritime": "ikke oversatt",
-	"warning-domain-public": "ikke oversatt",
+	"warning-dialog-expire-succes": "Varselet er utgått",
+	"warning-dialog-expire-title": "Opphør varsel",
+	"warning-dialog-expire-confirm": "Opphør",
+	"warning-dialog-expire-description": "Er du sikker på at du vil opphøre dette varselet?",
+	"warning-dialog-withdraw-succes": "Varselet er tilbaketrukket",
+	"warning-dialog-withdraw-title": "Trekk tilbake varsel",
+	"warning-dialog-withdraw-confirm": "Trekk tilbake",
+	"warning-dialog-withdraw-description": "Er du sikker på at du vil tilbaketrekke dette varselet?",
+	"warning-domain-aviation": "SIGMET/AIRMET",
+	"warning-domain-maritime": "Maritim",
+	"warning-domain-public": "Farevarsel",
 	"error-title-retry": "Prøv igjen",
 	"tac-missing-data": "Mangler data: ingen TAC kan genereres",
 	"warning-list-button-renew": "Renew",
-	"aviation-save-success": "{{warningType}} er lagret!",
-	"aviation-publish-success": "{{warningType}} er lagret!",
-	"publish-this-product": "Er du sikker på at du vil publisere dette {{product}}?",
-	"yes-cancel": "Ja, kanseller {{product}}",
-	"cancel-this-product": "Er du sikker på at du vil avbryte dette {{product}}?",
-	"aviation-cancel-success": "{{warningType}} er kansellert!",
-	"aviation-discard-success": "{{warningType}} er forkastet!",
+	"aviation-save-success": "{{warningType}} has succesfully been saved!",
+	"aviation-publish-success": "{{warningType}} has succesfully been published!",
+	"publish-this-product": "Are you sure you want to publish this {{product}}?",
+	"yes-cancel": "Yes, cancel {{product}}",
+	"cancel-this-product": "Are you sure you want to cancel this {{product}}?",
+	"aviation-cancel-success": "{{warningType}} has succesfully been cancelled!",
+	"aviation-discard-success": "{{warningType}} has been discarded!",
 	"error-auth-login": "Denne delen er passordbeskyttet. Vennligst logg inn.",
-	"cancel-warningType": "Kanseller {{warningType}}",
-	cancelling: "Kansellerer"
+	"cancel-warningType": "Cancel {{warningType}}",
+	cancelling: "Cancelling"
 };
 var warningsTranslations = {
 	en: en,
@@ -2658,6 +2656,8 @@ var getAviationPhenomenaIcon = function getAviationPhenomenaIcon(key) {
       return jsx(Haze, {});
     case 'VA_CLD':
       return jsx(VulcanicEruption, {});
+    case 'SEV_MTW':
+      return jsx(SevereMountainWaves, {});
     case 'EMBD_TS':
     case 'EMBD_TSGR':
     case 'FRQ_TS':
@@ -3342,6 +3342,7 @@ var useMutateDeleteDrawing = function useMutateDeleteDrawing() {
     }
   });
 };
+var BE_EDITOR_WARNING = 'Warning is being edited by another user and cannot be updated';
 var usePostMaritimeWarnings = function usePostMaritimeWarnings() {
   var _useAuthenticationCon6 = useAuthenticationContext(),
     auth = _useAuthenticationCon6.auth;
@@ -3355,31 +3356,22 @@ var usePostMaritimeWarnings = function usePostMaritimeWarnings() {
       return postMaritimeWarnings(auth, data);
     },
     onSuccess: function onSuccess() {
+      void queryClient.invalidateQueries({
+        queryKey: ['public-warning-list']
+      });
       dispatch(snackbarActions.openSnackbar({
         type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
         key: 'maritime-warning-post-success'
       }));
     },
-    onSettled: function () {
-      var _onSettled = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 2;
-              return queryClient.invalidateQueries({
-                queryKey: ['public-warning-list']
-              });
-            case 2:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6);
-      }));
-      function onSettled() {
-        return _onSettled.apply(this, arguments);
+    onError: function onError(error) {
+      if (error.message === BE_EDITOR_WARNING) {
+        // only in case of an editor conflict, we need to update the list
+        void queryClient.invalidateQueries({
+          queryKey: ['public-warning-list']
+        });
       }
-      return onSettled;
-    }()
+    }
   });
 };
 var useMutateMaritimeWarningsEditor = function useMutateMaritimeWarningsEditor() {
@@ -5091,9 +5083,7 @@ var renewAviationProduct = function renewAviationProduct(aviationWarning, produc
 };
 var amendAviationProduct = function amendAviationProduct(aviationWarning, productConfig) {
   var warningDetail = aviationWarning.sigmetAirmetDetails;
-  var newValidStart = dateUtils.dateToString(dateUtils.add(new Date(), {
-    minutes: 5
-  }));
+  var newValidStart = dateUtils.dateToString(new Date());
   var newValidUntil = 'phenomenon' in warningDetail ? getDefaultValidUntilValue(productConfig, warningDetail.phenomenon, warningDetail.locationIndicatorATSR, newValidStart) : warningDetail.validDateEnd;
   var amendedWarningDetail = Object.assign({}, warningDetail, {
     validDateStart: newValidStart,
@@ -5604,7 +5594,7 @@ var ProbabilityField = function ProbabilityField(_ref) {
   });
 };
 
-var VALID_FROM_MAX_HOURS_AFTER_CURRENT = 168;
+var VALID_FROM_MAX_HOURS_AFTER_CURRENT = 192;
 var _isValueBeforeCurrentTime$1 = function isValueBeforeCurrentTime(value, t) {
   return isXHoursBefore(value, dateUtils.getCurrentTimeAsString(), 0) || t('warning-valid-from-error-before-current');
 };
@@ -5650,7 +5640,7 @@ var ValidFrom = function ValidFrom(_ref) {
   });
 };
 
-var VALID_UNTIL_MAX_HOURS_AFTER_CURRENT = 180;
+var VALID_UNTIL_MAX_HOURS_AFTER_CURRENT = 192;
 var VALID_UNTIL_MIN_HOURS_AFTER_VALID_FROM = 1;
 var _isValueBeforeCurrentTime = function isValueBeforeCurrentTime(value, t) {
   return isXHoursBefore(value, dateUtils.getCurrentTimeAsString(), 0) || t('warning-valid-until-error-before-current');
@@ -6893,10 +6883,18 @@ var MaritimeWarningAvatar = function MaritimeWarningAvatar(_ref) {
   });
 };
 
+var spinnerSx$1 = {
+  width: '16px!important',
+  height: '16px!important',
+  position: 'absolute',
+  top: 0,
+  bottom: 0,
+  margin: 'auto',
+  marginLeft: 1
+};
 var getWarningsValidity = function getWarningsValidity(t, warnings) {
-  var validFrom = warnings.length > 0 && warnings[0].validFrom ? dateUtils.dateToString(dateUtils.createDate(warnings[0].validFrom), dateUtils.DATE_FORMAT_NAME_OF_DAY_MONTH) : '';
   var validUntil = warnings.length > 0 && warnings[0].validUntil ? dateUtils.dateToString(dateUtils.createDate(warnings[0].validUntil), dateUtils.DATE_FORMAT_NAME_OF_DAY_MONTH) : '';
-  return validFrom && validUntil ? "" + t('maritime-warning-validfrom') + validFrom + " - " + t('maritime-warning-validuntil') + validUntil : '';
+  return validUntil ? "" + t('maritime-warning-validuntil') + validUntil : '';
 };
 var MaritimeWarningsForm = function MaritimeWarningsForm(_ref) {
   var _sx, _sx2, _sx3, _sx4;
@@ -6924,6 +6922,9 @@ var MaritimeWarningsForm = function MaritimeWarningsForm(_ref) {
     maritimeConfig = _ref.maritimeConfig,
     _ref$lastUpdatedTime = _ref.lastUpdatedTime,
     lastUpdatedTime = _ref$lastUpdatedTime === void 0 ? '' : _ref$lastUpdatedTime;
+  var _React$useState = React__default.useState(false),
+    isPublishing = _React$useState[0],
+    setIsPublishing = _React$useState[1];
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var showConfirmDialog = useConfirmationDialog();
@@ -6989,6 +6990,39 @@ var MaritimeWarningsForm = function MaritimeWarningsForm(_ref) {
     };
   }();
   var validTimes = getWarningsValidity(t, warnings);
+  var onPressPublish = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (isPublishing) {
+              _context3.next = 12;
+              break;
+            }
+            setIsPublishing(true);
+            _context3.prev = 2;
+            _context3.next = 5;
+            return onSubmit();
+          case 5:
+            _context3.next = 9;
+            break;
+          case 7:
+            _context3.prev = 7;
+            _context3.t0 = _context3["catch"](2);
+          case 9:
+            _context3.prev = 9;
+            setIsPublishing(false);
+            return _context3.finish(9);
+          case 12:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[2, 7, 9, 12]]);
+    }));
+    return function onPressPublish() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   return jsxs(Box, {
     sx: (_sx = {
       display: 'flex',
@@ -7122,9 +7156,18 @@ var MaritimeWarningsForm = function MaritimeWarningsForm(_ref) {
         }, _sx4["@container maritime (min-width: " + breakpoints.tablet + "px)"] = {
           marginLeft: '24px!important'
         }, _sx4),
-        disabled: !modified || !isValid,
-        onClick: onSubmit,
-        children: t('warning-button-publish')
+        disabled: !modified || !isValid || isPublishing,
+        onClick: onPressPublish,
+        children: jsxs("span", {
+          style: {
+            position: 'relative'
+          },
+          children: [isPublishing ? t('warning-button-publishing') : t('warning-button-publish'), isPublishing && jsx(CircularProgress, {
+            "data-testid": "spinner",
+            color: "inherit",
+            sx: spinnerSx$1
+          })]
+        })
       })]
     })]
   });
@@ -7157,7 +7200,7 @@ var MaritimeWarningsFormConnect = function MaritimeWarningsFormConnect(_ref) {
     refetchWarnings = _usePublicWarnings.refetch,
     dataUpdatedAt = _usePublicWarnings.dataUpdatedAt;
   var _usePostMaritimeWarni = usePostMaritimeWarnings(),
-    postWarnings = _usePostMaritimeWarni.mutate,
+    postWarnings = _usePostMaritimeWarni.mutateAsync,
     publishError = _usePostMaritimeWarni.error;
   var _useMutateMaritimeWar = useMutateMaritimeWarningsEditor(),
     mutateEditor = _useMutateMaritimeWar.mutate,
@@ -7289,14 +7332,15 @@ var MaritimeWarningsFormConnect = function MaritimeWarningsFormConnect(_ref) {
             type: 'mergeWarnings'
           });
           maritimeWarnings = mapItemsToMaritimeWarnings(nextState.warnings, domain, maritimeConfig, auth == null ? void 0 : auth.username);
-          postWarnings(maritimeWarnings, {
+          _context.next = 5;
+          return postWarnings(maritimeWarnings, {
             onSuccess: function onSuccess() {
               dispatch({
                 type: 'submitWarnings'
               });
             }
           });
-        case 4:
+        case 5:
         case "end":
           return _context.stop();
       }
@@ -7355,7 +7399,8 @@ var MaritimeWarningsFormConnect = function MaritimeWarningsFormConnect(_ref) {
     void updateEditor(false);
   }, [t, domainLabel, mutateEditor, domain, refetchWarnings, confirmDialog, showSnackbar]);
   useEffect(function () {
-    if (publishError) {
+    // the BE_EDITOR_WARNING is handled in shouldGiveEditorWarning
+    if (publishError && publishError.message !== BE_EDITOR_WARNING) {
       setError({
         title: publishError.message,
         severity: 'error'
@@ -7368,10 +7413,10 @@ var MaritimeWarningsFormConnect = function MaritimeWarningsFormConnect(_ref) {
     } else {
       setError(undefined);
     }
-  }, [publishError, editorError]);
+  }, [editorError, publishError]);
   var shouldGiveEditorWarning = React__default.useCallback(function (newEditor, oldEditor) {
     var oldEditorIsYou = oldEditor && oldEditor === (auth == null ? void 0 : auth.username);
-    if (oldEditorIsYou && newEditor && newEditor !== oldEditor) {
+    if (oldEditorIsYou && (newEditor || publishError) && newEditor !== oldEditor) {
       setError({
         title: t('maritime-editor-off', {
           domain: domainLabel
@@ -7379,7 +7424,7 @@ var MaritimeWarningsFormConnect = function MaritimeWarningsFormConnect(_ref) {
         severity: 'warning'
       });
     }
-  }, [auth == null ? void 0 : auth.username, domainLabel, t]);
+  }, [auth == null ? void 0 : auth.username, domainLabel, publishError, t]);
   useEffect(function () {
     // Only give editor warning when the change in editor is from a refetch
     if (hasFetched) {
@@ -7720,6 +7765,24 @@ var Form = function Form(_ref5) {
   var formMethods = useForm({
     defaultValues: {}
   });
+  var endOfWarningValidity = publicWarningDetails == null ? void 0 : publicWarningDetails.validUntil;
+  React.useEffect(function () {
+    if (!endOfWarningValidity || formState !== 'amending') {
+      return function () {};
+    }
+    var end = new Date(endOfWarningValidity).getTime();
+    var now = Date.now();
+    if (end <= now) {
+      onCloseForm();
+      return function () {};
+    }
+    var timer = setTimeout(function () {
+      onCloseForm();
+    }, end - now + 1000);
+    return function () {
+      return clearTimeout(timer);
+    };
+  }, [endOfWarningValidity, formState, onCloseForm]);
   var initialPublicWarningArea = (publicWarningDetails == null || (_publicWarningDetails = publicWarningDetails.areas) == null ? void 0 : _publicWarningDetails.length) && (publicWarningDetails == null || (_publicWarningDetails2 = publicWarningDetails.areas[0]) == null ? void 0 : _publicWarningDetails2.geoJSON);
   var _React$useState4 = React.useState(initialPublicWarningArea),
     warningGeoJSONFeature = _React$useState4[0],
@@ -7816,11 +7879,27 @@ var Form = function Form(_ref5) {
       })) : null
     });
   };
-  var cancelAviationProduct = function cancelAviationProduct(warningType) {
-    return onSaveAviationForm(selectedAviationProduct, 'CANCELLED', warningType, isVAPhenomenon(selectedAviationProduct, ProductAction.CANCEL) && watch('vaSigmetMoveToFIR')).then(function (result) {
-      return result != null ? result : null;
-    });
-  };
+  var cancelAviationProduct = /*#__PURE__*/function () {
+    var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(warningType) {
+      var result;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return onSaveAviationForm(selectedAviationProduct, 'CANCELLED', warningType, isVAPhenomenon(selectedAviationProduct, ProductAction.CANCEL) && watch('vaSigmetMoveToFIR'));
+          case 2:
+            result = _context6.sent;
+            return _context6.abrupt("return", result != null ? result : null);
+          case 4:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function cancelAviationProduct(_x3) {
+      return _ref1.apply(this, arguments);
+    };
+  }();
   var getPublishButtonLabel = function getPublishButtonLabel() {
     if (isCancelling) {
       return t('cancelling');
@@ -7836,7 +7915,7 @@ var Form = function Form(_ref5) {
     return t('warning-button-publish');
   };
   var handleSubmitAviationProduct = /*#__PURE__*/function () {
-    var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(action, warningType) {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(action, warningType) {
       var formValues;
       return _regeneratorRuntime().wrap(function _callee0$(_context0) {
         while (1) switch (_context0.prev = _context0.next) {
@@ -7871,35 +7950,35 @@ var Form = function Form(_ref5) {
           case 14:
             toggleIsDraft(false);
             void handleSubmit(/*#__PURE__*/function () {
-              var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formValues) {
-                return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-                  while (1) switch (_context7.prev = _context7.next) {
+              var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(formValues) {
+                return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                  while (1) switch (_context8.prev = _context8.next) {
                     case 0:
-                      _context7.next = 2;
-                      return showConfirmDialog(action).then(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-                        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                          while (1) switch (_context6.prev = _context6.next) {
+                      _context8.next = 2;
+                      return showConfirmDialog(action).then(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+                        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                          while (1) switch (_context7.prev = _context7.next) {
                             case 0:
                               setIsPublishing(true);
-                              _context6.next = 3;
+                              _context7.next = 3;
                               return onSaveAviationForm(formValues, 'PUBLISHED', warningType)["catch"](function () {});
                             case 3:
                             case "end":
-                              return _context6.stop();
+                              return _context7.stop();
                           }
-                        }, _callee6);
+                        }, _callee7);
                       })));
                     case 2:
                       setIsPublishing(false);
                       onCloseForm();
                     case 4:
                     case "end":
-                      return _context7.stop();
+                      return _context8.stop();
                   }
-                }, _callee7);
+                }, _callee8);
               }));
-              return function (_x5) {
-                return _ref10.apply(this, arguments);
+              return function (_x6) {
+                return _ref11.apply(this, arguments);
               };
             }())();
             return _context0.abrupt("break", 23);
@@ -7914,36 +7993,35 @@ var Form = function Form(_ref5) {
             return _context0.abrupt("break", 23);
           case 19:
             void handleSubmit(/*#__PURE__*/function () {
-              var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(formValues) {
+              var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(formValues) {
                 return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                   while (1) switch (_context9.prev = _context9.next) {
                     case 0:
-                      _context9.next = 2;
-                      return showConfirmDialog(action).then(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-                        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-                          while (1) switch (_context8.prev = _context8.next) {
-                            case 0:
-                              setIsPublishing(true);
-                              void cancelAviationProduct(warningType).then(function () {
-                                void onSaveAviationForm(formValues, 'PUBLISHED', warningType).then(function () {
-                                  setIsPublishing(false);
-                                  onCloseForm();
-                                });
-                              });
-                            case 2:
-                            case "end":
-                              return _context8.stop();
-                          }
-                        }, _callee8);
-                      })));
-                    case 2:
+                      _context9.prev = 0;
+                      _context9.next = 3;
+                      return showConfirmDialog(action);
+                    case 3:
+                      setIsPublishing(true);
+                      // 1) Publish amended warning
+                      _context9.next = 6;
+                      return onSaveAviationForm(formValues, 'PUBLISHED', warningType);
+                    case 6:
+                      _context9.next = 8;
+                      return cancelAviationProduct(warningType);
+                    case 8:
+                      onCloseForm();
+                    case 9:
+                      _context9.prev = 9;
+                      setIsPublishing(false);
+                      return _context9.finish(9);
+                    case 12:
                     case "end":
                       return _context9.stop();
                   }
-                }, _callee9);
+                }, _callee9, null, [[0,, 9, 12]]);
               }));
-              return function (_x6) {
-                return _ref12.apply(this, arguments);
+              return function (_x7) {
+                return _ref13.apply(this, arguments);
               };
             }())();
             return _context0.abrupt("break", 23);
@@ -7957,8 +8035,8 @@ var Form = function Form(_ref5) {
         }
       }, _callee0);
     }));
-    return function handleSubmitAviationProduct(_x3, _x4) {
-      return _ref1.apply(this, arguments);
+    return function handleSubmitAviationProduct(_x4, _x5) {
+      return _ref10.apply(this, arguments);
     };
   }();
   var onPressClear = function onPressClear() {
@@ -8067,7 +8145,8 @@ var Form = function Form(_ref5) {
               return fetchSigmetTAC(product);
             },
             storedGeoJSON: storedStartGeoJSON,
-            storedEndGeoJSON: storedEndGeoJSON
+            storedEndGeoJSON: storedEndGeoJSON,
+            isAmending: formState === 'amending'
           })
         });
       }
@@ -8090,7 +8169,8 @@ var Form = function Form(_ref5) {
           getTAC: function getTAC(product) {
             return fetchAirmetTAC(product);
           },
-          storedGeoJSON: storedStartGeoJSON
+          storedGeoJSON: storedStartGeoJSON,
+          isAmending: formState === 'amending'
         })
       });
     }
@@ -8390,49 +8470,46 @@ var PublicWarningsForm = function PublicWarningsForm(props) {
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var getPublicWarningStore = function getPublicWarningStore(store) {
+var selectPublicWarningState = function selectPublicWarningState(store) {
   if (store && store.publicWarningForm) {
     return store.publicWarningForm;
   }
   return {};
 };
-var selectPublicWarningState = createSelector(getPublicWarningStore, function (state) {
-  return state;
-});
-createSelector(getPublicWarningStore, function (publicWarningStore) {
+createSelector(selectPublicWarningState, function (publicWarningStore) {
   return publicWarningStore.object;
 });
-var getPublicWarning = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getPublicWarning = createSelector(selectPublicWarningState, function (publicWarningStore) {
   return publicWarningStore == null ? void 0 : publicWarningStore.warning;
 });
-var getPublicWarningStatus = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getPublicWarningStatus = createSelector(selectPublicWarningState, function (publicWarningStore) {
   var _publicWarningStore$w;
   return publicWarningStore == null || (_publicWarningStore$w = publicWarningStore.warning) == null ? void 0 : _publicWarningStore$w.status;
 });
-var getPublicWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getPublicWarningId = createSelector(selectPublicWarningState, function (publicWarningStore) {
   var _publicWarningStore$w2;
   return publicWarningStore == null || (_publicWarningStore$w2 = publicWarningStore.warning) == null ? void 0 : _publicWarningStore$w2.warningDetail.id;
 });
-var getPublicWarningAreas = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getPublicWarningAreas = createSelector(selectPublicWarningState, function (publicWarningStore) {
   var _publicWarningStore$w3;
   return (publicWarningStore == null || (_publicWarningStore$w3 = publicWarningStore.warning) == null ? void 0 : _publicWarningStore$w3.warningDetail.areas) || [];
 });
-var getPublicWarningFormState = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getPublicWarningFormState = createSelector(selectPublicWarningState, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.formState) || '';
 });
-createSelector(getPublicWarningStore, function (publicWarningStore) {
+createSelector(selectPublicWarningState, function (publicWarningStore) {
   return publicWarningStore == null ? void 0 : publicWarningStore.error;
 });
-var getSelectedWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getSelectedWarningId = createSelector(selectPublicWarningState, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.selectedWarningId) || '';
 });
-var getSelectedPublicIsFormDirty = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getSelectedPublicIsFormDirty = createSelector(selectPublicWarningState, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.isFormDirty) || false;
 });
-var getWarningType = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getWarningType = createSelector(selectPublicWarningState, function (publicWarningStore) {
   return publicWarningStore == null ? void 0 : publicWarningStore.warningType;
 });
-var getPublicWarningPanelId = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var getPublicWarningPanelId = createSelector(selectPublicWarningState, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.panelId) || '';
 });
 
@@ -9361,6 +9438,32 @@ var useWarnings = function useWarnings(disabled) {
     dataUpdatedAt: dataUpdatedAt
   };
 };
+function useAutoRefetchOnExpiry(combinedWarnings, refetchWarnings) {
+  React__default.useEffect(function () {
+    if (!combinedWarnings || combinedWarnings.length === 0) {
+      return undefined;
+    }
+    var now = new Date();
+    var futureEnds = combinedWarnings.map(function (wn) {
+      return new Date(wn.warningDetail.validUntil);
+    }).filter(function (date) {
+      return date > now;
+    });
+    if (futureEnds.length === 0) {
+      return undefined;
+    }
+    var nextExpiry = Math.min.apply(Math, futureEnds.map(function (date) {
+      return date.getTime();
+    }));
+    var msUntilNext = nextExpiry - now.getTime();
+    var timeout = setTimeout(function () {
+      refetchWarnings();
+    }, msUntilNext + 1000);
+    return function () {
+      clearTimeout(timeout);
+    };
+  }, [combinedWarnings, refetchWarnings]);
+}
 
 var warningFormConfirmationOptions = function warningFormConfirmationOptions(t) {
   return {
@@ -11347,6 +11450,7 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     isFetching = _useWarnings.isFetching,
     error = _useWarnings.error,
     dataUpdatedAt = _useWarnings.dataUpdatedAt;
+  useAutoRefetchOnExpiry(combinedWarnings, refetchWarnings);
   var lastUpdateTime = dateUtils.dateToString(new Date(dataUpdatedAt), dateUtils.DATE_FORMAT_HOURS);
   var _React$useState = React__default.useState(undefined),
     confirmDialogOptions = _React$useState[0],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "12.13.0",
+  "version": "13.1.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,25 +8,25 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.13.0",
-    "@opengeoweb/shared": "12.13.0",
-    "@opengeoweb/store": "12.13.0",
-    "@opengeoweb/webmap-react": "12.13.0",
-    "@tanstack/react-query": "^5.69.2",
+    "@opengeoweb/api": "13.1.0",
+    "@opengeoweb/shared": "13.1.0",
+    "@opengeoweb/store": "13.1.0",
+    "@opengeoweb/webmap-react": "13.1.0",
+    "@tanstack/react-query": "^5.85.5",
     "react-redux": "^9.2.0",
-    "@opengeoweb/theme": "12.13.0",
-    "@opengeoweb/form-fields": "12.13.0",
+    "@opengeoweb/theme": "13.1.0",
+    "@opengeoweb/form-fields": "13.1.0",
     "react-hook-form": "^7.50.1",
     "lodash": "^4.17.21",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/snackbar": "12.13.0",
+    "@opengeoweb/snackbar": "13.1.0",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "axios": "^1.7.7",
-    "@opengeoweb/core": "12.13.0",
-    "@opengeoweb/webmap": "12.13.0",
-    "@opengeoweb/authentication": "12.13.0",
-    "@opengeoweb/sigmet-airmet": "12.13.0",
+    "@opengeoweb/core": "13.1.0",
+    "@opengeoweb/webmap": "13.1.0",
+    "@opengeoweb/authentication": "13.1.0",
+    "@opengeoweb/sigmet-airmet": "13.1.0",
     "react-i18next": "^15.1.1",
     "i18next": "^25.0.1",
     "@mui/material": "^7.0.1",

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

@@ -7,4 +7,5 @@ interface WarningsResponse {
     dataUpdatedAt: number;
 }
 export declare const useWarnings: (disabled?: boolean) => WarningsResponse;
+export declare function useAutoRefetchOnExpiry(combinedWarnings: Warning[], refetchWarnings: () => void): void;
 export {};

package/src/lib/api/warning-api/hooks.d.ts

@@ -44,6 +44,7 @@ interface DeleteDrawingParams {
 export declare const useMutateDeleteDrawing: () => UseMutationResult<{
     id: string;
 }, Error, DeleteDrawingParams>;
+export declare const BE_EDITOR_WARNING = "Warning is being edited by another user and cannot be updated";
 export declare const usePostMaritimeWarnings: () => MutationReturnType<MaritimeWarning[]>;
 interface MutateMaritimeEditorParams {
     domain: MaritimeWarningsType;

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

@@ -16,7 +16,7 @@ export interface MaritimeWarningsFormProps {
     onAddWarning: () => void;
     onChangeWarning: (id: string, newValues: Partial<MaritimeWarningItemAttributes>) => void;
     onMoveWarning: (oldIndex: number, newIndex: number) => void;
-    onSubmit: () => void;
+    onSubmit: () => Promise<void>;
     onClear: () => void;
     onToggleReadOnly: (isReadOnly: boolean) => void;
     isReadOnly: boolean;

package/src/lib/components/MaritimeWarningsForm/MaritimeWarningsFormConnect.stories.d.ts

@@ -11,3 +11,4 @@ export declare const CoastalWatersLight: Story;
 export declare const CoastalWatersDark: Story;
 export declare const EditorToggleDemo: Story;
 export declare const EditorTakeoverDemo: Story;
+export declare const PublishErrorDemo: Story;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { TFunction } from 'i18next';
-export declare const VALID_FROM_MAX_HOURS_AFTER_CURRENT = 168;
+export declare const VALID_FROM_MAX_HOURS_AFTER_CURRENT = 192;
 export declare const isValueBeforeCurrentTime: (value: string, t: TFunction) => boolean | string;
 export declare const isMaxHoursAfterCurrentTime: (value: string, t: TFunction) => boolean | string;
 export declare const ValidFrom: React.FC<{

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { TFunction } from 'i18next';
-export declare const VALID_UNTIL_MAX_HOURS_AFTER_CURRENT = 180;
+export declare const VALID_UNTIL_MAX_HOURS_AFTER_CURRENT = 192;
 export declare const VALID_UNTIL_MIN_HOURS_AFTER_VALID_FROM = 1;
 export declare const isValueBeforeCurrentTime: (value: string, t: TFunction) => boolean | string;
 export declare const isMaxHoursAfterCurrentTime: (value: string, t: TFunction) => boolean | string;

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

@@ -1,27 +1,6 @@
 import { WarningModuleStore } from '../types';
 import { WarningFormState } from './reducer';
-export declare const getPublicWarningStore: (store: WarningModuleStore) => WarningFormState;
-export declare const selectPublicWarningState: ((state: WarningModuleStore) => WarningFormState) & {
-    clearCache: () => void;
-    resultsCount: () => number;
-    resetResultsCount: () => void;
-} & {
-    resultFunc: (resultFuncArgs_0: WarningFormState) => WarningFormState;
-    memoizedResultFunc: ((resultFuncArgs_0: WarningFormState) => WarningFormState) & {
-        clearCache: () => void;
-        resultsCount: () => number;
-        resetResultsCount: () => void;
-    };
-    lastResult: () => WarningFormState;
-    dependencies: [(store: WarningModuleStore) => WarningFormState];
-    recomputations: () => number;
-    resetRecomputations: () => void;
-    dependencyRecomputations: () => number;
-    resetDependencyRecomputations: () => void;
-} & {
-    argsMemoize: typeof import("reselect").weakMapMemoize;
-    memoize: typeof import("reselect").weakMapMemoize;
-};
+export declare const selectPublicWarningState: (store: WarningModuleStore) => WarningFormState;
 export declare const getPublicWarningObject: ((state: WarningModuleStore) => import("../warningsDrawings/types").DrawingListItem | undefined) & {
     clearCache: () => void;
     resultsCount: () => number;