@opengeoweb/warnings 12.1.2 → 12.3.0

package/index.esm.js

@@ -1,27 +1,27 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useDispatch, useSelector } from 'react-redux';
-import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, breakpoints, Options, Close, ChevronDown, ChevronUp, Copy, Update, Success, Expire, Remove, ArrowUpCompact, ArrowDownCompact } from '@opengeoweb/theme';
-import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawingToolSelectors, layerSelectors, uiSelectors, drawingToolActions, layerActions, useSetupDialog, selectorMemoizationOptions, useUpdateSharedData, mapListener, layersListener, drawingToolListener, syncGroupsListener, mapReducer, layerReducer, uiReducer, drawingToolReducer, syncGroupsReducer } from '@opengeoweb/store';
+import { Polygons, ExitDomain, Share, Edit, Delete, DrawPolygon, Visibility, Add, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, breakpoints, Options, Close, ChevronDown, ChevronUp, Copy, Update, Cancel, Success, Expire, Remove, ArrowUpCompact, ArrowDownCompact } from '@opengeoweb/theme';
+import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawingToolSelectors, layerSelectors, uiSelectors, drawingToolActions, layerActions, useSetupDialog, genericSelectors, selectorMemoizationOptions, useUpdateSharedData, mapListener, layersListener, drawingToolListener, syncGroupsListener, openlayersListener, syncGroupsReducer, drawingToolReducer, uiReducer, layerReducer, mapReducer } 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, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, CustomToggleButton, Filter, FilterChip, FilterOption, StatusTag, LastUpdateTime, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
+import { SHARED_NAMESPACE, useConfirmationDialog, dateUtils, ToggleMenu, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, sessionStorageProvider, CustomToggleButton, Filter, FilterChip, FilterOption, StatusTag, LastUpdateTime, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector, current, createListenerMiddleware, combineReducers, configureStore } from '@reduxjs/toolkit';
-import 'i18next';
-import { useTranslation } from 'react-i18next';
-import '@opengeoweb/core';
-import { FORM_FIELDS_NAMESPACE, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormSelect, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, useDraftFormHelpers, errorMessages, isEmpty, ReactHookFormDateTime, isXHoursBefore, isXHoursAfter } from '@opengeoweb/form-fields';
+import { defaultBbox } from '@opengeoweb/core';
+import { FORM_FIELDS_NAMESPACE, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormSelect, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, useDraftFormHelpers, errorMessages, isEmpty, ReactHookFormDateTime, isXHoursAfter, isXHoursBefore } from '@opengeoweb/form-fields';
+import { SA_NAMESPACE, airmetConfig, sigmetConfig, isInstanceOfCancelSigmet, isInstanceOfCancelAirmet, getDefaultValidUntilValue, useShortTestHelpers, SigmetForm, AirmetForm, ProductAction, isVAPhenomenon, prepareCancelSigmet, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, getProductFormMode } from '@opengeoweb/sigmet-airmet';
 import { LayerType, generateMapId } from '@opengeoweb/webmap';
-import { airmetConfig, sigmetConfig, isInstanceOfCancelSigmet, isInstanceOfCancelAirmet, getDefaultValidUntilValue, SigmetForm, AirmetForm, createAirmetPostParameter, createSigmetPostParameter, getProductFormMode, ProductAction } from '@opengeoweb/sigmet-airmet';
+import { t } from 'i18next';
+import { useTranslation } from 'react-i18next';
 import { snackbarActions, snackbarTypes, snackbarListener, snackbarReducer } from '@opengeoweb/snackbar';
 import * as React from 'react';
 import React__default, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
-import { styled, Box, Typography, ListItem, Grid2, Paper, ListItemButton, Stack, LinearProgress, Button, FormHelperText, MenuItem, Card, CardContent, Tabs, Tab, CircularProgress, Menu, DialogTitle, DialogContent, Switch, ListItemText } from '@mui/material';
+import { styled, Box, Typography, ListItem, Paper, ListItemButton, Stack, Grid, LinearProgress, Button, FormHelperText, MenuItem, Card, CardContent, Tabs, Tab, CircularProgress, Menu, DialogTitle, DialogContent, Switch, ListItemText } from '@mui/material';
 import { VariableSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider, getHeaders, handleResponse, useAuthQuery, useAuthenticationContext, ProductStatus, AirmetPhenomena, SigmetPhenomena, optimisticUpdate } from '@opengeoweb/api';
 import { http, HttpResponse, passthrough, delay } from 'msw';
 import { concat, isEqual, cloneDeep, clamp, groupBy, pick } from 'lodash';
-import { useFormContext } from 'react-hook-form';
-import { getConfig, useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
+import { useFormContext, useForm, FormProvider } from 'react-hook-form';
+import { useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
 import { useQueryClient, useMutation } from '@tanstack/react-query';
 
 var en = {
@@ -201,7 +201,12 @@ var en = {
 	"warning-dialog-withdraw-description": "Are you sure you want to withdraw this warning?",
 	"tac-missing-data": "Missing data: no TAC can be generated",
 	"warning-list-button-renew": "Renew",
-	"aviation-save-succes": "{{warningType}} has succesfully been saved!"
+	"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!"
 };
 var nl = {
 	"drawing-tool-form-tools": "Gereedschap",
@@ -341,7 +346,12 @@ var nl = {
 	"error-title-retry": "Probeer opnieuw",
 	"tac-missing-data": "Ontbrekende gegevens: er kan geen TAC worden gegenereerd",
 	"warning-list-button-renew": "Hernieuwen",
-	"aviation-save-succes": "{{warningType}} is succesvol opgeslagen!"
+	"aviation-save-success": "{{warningType}} is succesvol opgeslagen!",
+	"aviation-publish-success": "niet vertaald",
+	"publish-this-product": "Weet je zeker dat je dit {{product}} wilt publiceren?",
+	"yes-cancel": "Ja, annuleer {{product}}",
+	"cancel-this-product": "Weet je zeker dat je dit {{product}} wilt annuleren?",
+	"aviation-cancel-success": "niet vertaald"
 };
 var fi = {
 	"drawing-tool-form-tools": "Työkalut",
@@ -481,7 +491,12 @@ var fi = {
 	"error-title-retry": "Yritä uudelleen",
 	"tac-missing-data": "Tarvittavia tietoja puuttuu, TAC:ia ei voida generoida",
 	"warning-list-button-renew": "Renew",
-	"aviation-save-succes": "{{warningType}} tallannettu onnistuneesti"
+	"aviation-save-success": "{{warningType}} tallannettu onnistuneesti",
+	"aviation-publish-success": "ei käännetty",
+	"publish-this-product": "Oletko varma, että haluat julkaista tämän {{product}}:n?",
+	"yes-cancel": "Kyllä, peruuta {{product}}",
+	"cancel-this-product": "Oletko varma, että haluat peruuttaa tämän {{product}}:n?",
+	"aviation-cancel-success": "ei käännetty"
 };
 var no = {
 	"drawing-tool-form-tools": "Verktøy",
@@ -621,7 +636,12 @@ var no = {
 	"error-title-retry": "Prøv igjen",
 	"tac-missing-data": "Mangler data: ingen TAC kan genereres",
 	"warning-list-button-renew": "Renew",
-	"aviation-save-succes": "{{warningType}} er lagret!"
+	"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!"
 };
 var warningsTranslations = {
 	en: en,
@@ -659,7 +679,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -682,9 +702,9 @@ function _regeneratorRuntime() {
   function define(t, e, r) {
     return Object.defineProperty(t, e, {
       value: r,
-      enumerable: !0,
-      configurable: !0,
-      writable: !0
+      enumerable: true,
+      configurable: true,
+      writable: true
     }), t[e];
   }
   try {
@@ -777,7 +797,7 @@ function _regeneratorRuntime() {
         if ("throw" === i) throw a;
         return {
           value: t,
-          done: !0
+          done: true
         };
       }
       for (n.method = i, n.arg = a;;) {
@@ -828,7 +848,7 @@ function _regeneratorRuntime() {
   function Context(t) {
     this.tryEntries = [{
       tryLoc: "root"
-    }], t.forEach(pushTryEntry, this), this.reset(!0);
+    }], t.forEach(pushTryEntry, this), this.reset(true);
   }
   function values(e) {
     if (e || "" === e) {
@@ -838,8 +858,8 @@ function _regeneratorRuntime() {
       if (!isNaN(e.length)) {
         var o = -1,
           i = function next() {
-            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
-            return next.value = t, next.done = !0, next;
+            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = false, next;
+            return next.value = t, next.done = true, next;
           };
         return i.next = i;
       }
@@ -848,10 +868,10 @@ function _regeneratorRuntime() {
   }
   return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
     value: GeneratorFunctionPrototype,
-    configurable: !0
+    configurable: true
   }), o(GeneratorFunctionPrototype, "constructor", {
     value: GeneratorFunction,
-    configurable: !0
+    configurable: true
   }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
     var e = "function" == typeof t && t.constructor;
     return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
@@ -880,17 +900,17 @@ function _regeneratorRuntime() {
     return r.reverse(), function next() {
       for (; r.length;) {
         var t = r.pop();
-        if (t in e) return next.value = t, next.done = !1, next;
+        if (t in e) return next.value = t, next.done = false, next;
       }
-      return next.done = !0, next;
+      return next.done = true, next;
     };
   }, e.values = values, Context.prototype = {
     constructor: Context,
     reset: function (e) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
+      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = false, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
     },
     stop: function () {
-      this.done = !0;
+      this.done = true;
       var t = this.tryEntries[0].completion;
       if ("throw" === t.type) throw t.arg;
       return this.rval;
@@ -909,10 +929,10 @@ function _regeneratorRuntime() {
           var c = n.call(i, "catchLoc"),
             u = n.call(i, "finallyLoc");
           if (c && u) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, true);
             if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
           } else if (c) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, true);
           } else {
             if (!u) throw Error("try statement without catch or finally");
             if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
@@ -1125,7 +1145,7 @@ var getWarningFormDirty = createSelector(selectDrawByInstanceId, function (drawi
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 var WARN_NAMESPACE = 'warn';
-var ns = [WARN_NAMESPACE, FORM_FIELDS_NAMESPACE, SHARED_NAMESPACE];
+var ns = [WARN_NAMESPACE, FORM_FIELDS_NAMESPACE, SHARED_NAMESPACE, SA_NAMESPACE];
 var useWarningsTranslation = function useWarningsTranslation() {
   return useTranslation(ns);
 };
@@ -1674,10 +1694,10 @@ var Objects = function Objects(_ref2) {
               children: jsx(ListItem, {
                 style: style,
                 disablePadding: true,
-                secondaryAction: jsxs(Grid2, {
+                secondaryAction: jsxs(Grid, {
                   container: true,
                   rowSpacing: 1,
-                  children: [jsx(Grid2, {
+                  children: [jsx(Grid, {
                     className: "objectActions",
                     children: jsx(ToggleMenu, {
                       buttonSx: (_buttonSx = {
@@ -1710,7 +1730,7 @@ var Objects = function Objects(_ref2) {
                         icon: jsx(ExitDomain, {})
                       }]
                     })
-                  }), object.scope === 'user' && jsx(Grid2, {
+                  }), object.scope === 'user' && jsx(Grid, {
                     className: "objectActions",
                     children: jsx(ToggleMenu, {
                       menuTitle: t('object-manager-options-menu'),
@@ -1968,9 +1988,6 @@ var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
     },
     updateWarning: function updateWarning(warningId, data) {
       return axiosInstance.post("/warnings/" + warningId + "/", data);
-    },
-    deleteWarning: function deleteWarning(warningId) {
-      return axiosInstance.post("/warnings/" + warningId + "?delete=true");
     }
   };
 };
@@ -2043,10 +2060,7 @@ var ConfirmDeleteDialog = function ConfirmDeleteDialog(_ref) {
     description: !error ? description : '',
     onClose: onClose,
     onSubmit: onSubmit,
-    isLoading: isLoading,
-    sx: {
-      width: 330
-    }
+    isLoading: isLoading
   }, error && {
     content: jsxs(Box, {
       sx: {
@@ -7565,12 +7579,6 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
     },
     updateWarning: function updateWarning(warningId, data) {
       return axiosInstance.post("/warnings/" + warningId + "/", data);
-    },
-    deleteWarning: function deleteWarning(warningId) {
-      warningList.splice(warningList.findIndex(function (warning) {
-        return warning.id === warningId;
-      }), 1);
-      return axiosInstance.post("/warnings/" + warningId + "?delete=true");
     }
   };
 };
@@ -7791,20 +7799,20 @@ var DrawingToolFormContentsNoMemo = function DrawingToolFormContentsNoMemo(_ref)
           title: dialogError,
           shouldClose: true
         })
-      }), jsxs(Grid2, {
+      }), jsxs(Grid, {
         "data-testid": "drawingToolForm",
         container: true,
         direction: "column",
         spacing: 1,
         padding: 2,
-        children: [jsx(Grid2, {
+        children: [jsx(Grid, {
           children: jsx(Typography, {
             variant: "body2",
             children: t('drawing-tool-form-tools')
           })
-        }), jsx(Grid2, {
+        }), jsx(Grid, {
           container: true,
-          children: jsxs(Grid2, {
+          children: jsxs(Grid, {
             children: [drawModes.map(function (mode) {
               return jsx(CustomIconButton, {
                 variant: "tool",
@@ -7850,10 +7858,10 @@ var DrawingToolFormContentsNoMemo = function DrawingToolFormContentsNoMemo(_ref)
               }
             })]
           })
-        }), jsx(Grid2, {
+        }), jsx(Grid, {
           container: true,
           size: "grow",
-          children: jsx(Grid2, {
+          children: jsx(Grid, {
             size: {
               xs: 12,
               sm: 6
@@ -7876,7 +7884,7 @@ var DrawingToolFormContentsNoMemo = function DrawingToolFormContentsNoMemo(_ref)
               })
             })
           })
-        }), jsxs(Grid2, {
+        }), jsxs(Grid, {
           children: [jsx(ReactHookFormTextField, {
             name: "objectName",
             label: t('drawing-tool-form-object-name'),
@@ -8400,7 +8408,7 @@ var PublicWarningsFormDialog = function PublicWarningsFormDialog(_ref) {
   }));
 };
 
-var config$1 = getConfig();
+var config$1 = sessionStorageProvider.getConfig();
 var airmetBaseUrl = config$1.GW_AIRMET_BASE_URL || '';
 var sigmetBaseUrl = config$1.GW_SIGMET_BASE_URL || '';
 // API
@@ -8513,6 +8521,16 @@ var postAirmet = function postAirmet(auth, data) {
   }).then(handleResponse);
 };
 
+var getAviationSnackbarKey = function getAviationSnackbarKey(status) {
+  switch (status) {
+    case 'PUBLISHED':
+      return 'aviation-publish-success';
+    case 'CANCELLED':
+      return 'aviation-cancel-success';
+    default:
+      return 'aviation-save-success';
+  }
+};
 var useAirmetList = function useAirmetList(disabled) {
   if (disabled === void 0) {
     disabled = false;
@@ -8565,11 +8583,13 @@ var useTACApi = function useTACApi() {
  * @param onDialogClose - Optional callback to close a dialog.
  * @returns A mutation result for posting a SIGMET.
  */
-var usePostSigmet = function usePostSigmet(snackBarMessage) {
+var usePostSigmet = function usePostSigmet() {
   var _useAuthenticationCon2 = useAuthenticationContext(),
     auth = _useAuthenticationCon2.auth;
   var dispatch = useDispatch();
   var queryClient = useQueryClient();
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
   return useMutation({
     mutationFn: function mutationFn(formData) {
       if (!auth) {
@@ -8578,25 +8598,30 @@ var usePostSigmet = function usePostSigmet(snackBarMessage) {
       return postSigmet(auth, formData);
     },
     onSuccess: function () {
-      var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, variables) {
+        var snackbarKey, warningType;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              snackbarKey = getAviationSnackbarKey(variables.changeStatusTo);
+              warningType = 'SIGMET';
               dispatch(snackbarActions.openSnackbar({
                 type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-                key: snackBarMessage
+                key: t(snackbarKey, {
+                  warningType: warningType
+                })
               }));
-              _context.next = 3;
+              _context.next = 5;
               return queryClient.invalidateQueries({
                 queryKey: ['sigmet-list']
               });
-            case 3:
+            case 5:
             case "end":
               return _context.stop();
           }
         }, _callee);
       }));
-      function onSuccess() {
+      function onSuccess(_x, _x2) {
         return _onSuccess.apply(this, arguments);
       }
       return onSuccess;
@@ -8610,11 +8635,13 @@ var usePostSigmet = function usePostSigmet(snackBarMessage) {
  * @param onDialogClose - Optional callback to close a dialog.
  * @returns A mutation result for posting an AIRMET.
  */
-var usePostAirmet = function usePostAirmet(snackBarMessage) {
+var usePostAirmet = function usePostAirmet() {
   var _useAuthenticationCon3 = useAuthenticationContext(),
     auth = _useAuthenticationCon3.auth;
   var dispatch = useDispatch();
   var queryClient = useQueryClient();
+  var _useWarningsTranslati2 = useWarningsTranslation(),
+    t = _useWarningsTranslati2.t;
   return useMutation({
     mutationFn: function mutationFn(formData) {
       if (!auth) {
@@ -8623,25 +8650,30 @@ var usePostAirmet = function usePostAirmet(snackBarMessage) {
       return postAirmet(auth, formData);
     },
     onSuccess: function () {
-      var _onSuccess2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _onSuccess2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data, variables) {
+        var snackbarKey, warningType;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              snackbarKey = getAviationSnackbarKey(variables.changeStatusTo);
+              warningType = 'AIRMET';
               dispatch(snackbarActions.openSnackbar({
                 type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-                key: snackBarMessage
+                key: t(snackbarKey, {
+                  warningType: warningType
+                })
               }));
-              _context2.next = 3;
+              _context2.next = 5;
               return queryClient.invalidateQueries({
                 queryKey: ['airmet-list']
               });
-            case 3:
+            case 5:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      function onSuccess() {
+      function onSuccess(_x3, _x4) {
         return _onSuccess2.apply(this, arguments);
       }
       return onSuccess;
@@ -8984,7 +9016,8 @@ var WarningsMapView = function WarningsMapView(_ref) {
     defaultMapPreset = _ref.defaultMapPreset,
     _ref$isSnapshot = _ref.isSnapshot,
     isSnapshot = _ref$isSnapshot === void 0 ? false : _ref$isSnapshot;
-  var defaultBbox = defaultMapPreset == null ? void 0 : defaultMapPreset.proj;
+  var defaultMapPresetBbox = geojsonFeature != null && geojsonFeature.features.length ? undefined : defaultBbox;
+  var defaultBbox$1 = (defaultMapPreset == null ? void 0 : defaultMapPreset.proj) || defaultMapPresetBbox;
   var defaultBaseLayer = (defaultMapPreset == null || (_defaultMapPreset$lay = defaultMapPreset.layers) == null ? void 0 : _defaultMapPreset$lay.find(function (layer) {
     return layer.layerType === LayerType.baseLayer;
   })) || defaultLayers.baseLayerGrey;
@@ -8993,17 +9026,16 @@ var WarningsMapView = function WarningsMapView(_ref) {
   })) || defaultLayers.overLayer;
   var mapId = React.useRef("WarningsMapView_" + generateMapId()).current;
   var warningLayer = {
-    id: mapId + "geojsonfeature",
     geojson: geojsonFeature,
     layerType: LayerType.featureLayer
   };
   var viewRef = useRef(viewUtils.makeView());
   React.useEffect(function () {
-    if (viewRef.current.getProjection().getCode() !== (defaultBbox == null ? void 0 : defaultBbox.srs)) {
-      viewRef.current = viewUtils.makeView(defaultBbox == null ? void 0 : defaultBbox.srs);
+    if (viewRef.current.getProjection().getCode() !== (defaultBbox$1 == null ? void 0 : defaultBbox$1.srs)) {
+      viewRef.current = viewUtils.makeView(defaultBbox$1 == null ? void 0 : defaultBbox$1.srs);
     }
-    defaultBbox && defaultBbox.bbox ? viewUtils.setViewFromExtent(viewRef.current, defaultBbox == null ? void 0 : defaultBbox.bbox) : viewUtils.setViewFromFeature(viewRef.current, geojsonFeature);
-  }, [defaultBbox, geojsonFeature]);
+    defaultBbox$1 && defaultBbox$1.bbox ? viewUtils.setViewFromExtent(viewRef.current, defaultBbox$1 == null ? void 0 : defaultBbox$1.bbox) : viewUtils.setViewFromFeature(viewRef.current, geojsonFeature);
+  }, [defaultBbox$1, geojsonFeature]);
   return jsx("div", {
     style: {
       height: '200px',
@@ -9012,6 +9044,7 @@ var WarningsMapView = function WarningsMapView(_ref) {
     children: jsxs(OpenLayersMapView, {
       view: viewRef.current,
       holdShiftToScroll: true,
+      mapId: mapId,
       children: [jsx(MapControls, {
         style: {
           top: 0
@@ -9330,7 +9363,7 @@ var getLevelStyle = function getLevelStyle(levelColor) {
     paddingLeft: levelColor ? '0.5em' : 0,
     paddingRight: '0.5em',
     paddingBottom: '1px',
-    marginLeft: -'0.5em',
+    marginLeft: NaN,
     border: levelColor ? "solid 1px " + levelColor.borderColor : 'none'
   };
 };
@@ -9801,12 +9834,12 @@ var Phenomenon = function Phenomenon(_ref) {
     children: warningFormPhenomena.map(function (phenomenon) {
       return jsx(MenuItem, {
         value: phenomenon.key,
-        children: jsxs(Grid2, {
+        children: jsxs(Grid, {
           container: true,
           justifyContent: "space-between",
-          children: [jsx(Grid2, {
+          children: [jsx(Grid, {
             children: t(phenomenon.translationKey)
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             sx: {
               minWidth: 56
             },
@@ -10050,16 +10083,16 @@ var ContainerGrid = styled('div')(function (_ref3) {
   var theme = _ref3.theme;
   return _ref4 = {
     backgroundColor: theme.palette.background.paper,
-    '.MuiGrid2-grid-sm-6, .MuiGrid2-grid-sm-4': {
+    '.MuiGrid-grid-sm-6, .MuiGrid-grid-sm-4': {
       width: '100%',
       minWidth: '100%'
     }
   }, _ref4[containerQueryBreakpoint] = {
-    '.MuiGrid2-grid-sm-6': {
+    '.MuiGrid-grid-sm-6': {
       width: sm6Width,
       minWidth: sm6Width
     },
-    '.MuiGrid2-grid-sm-4': {
+    '.MuiGrid-grid-sm-4': {
       width: sm4Width,
       minWidth: sm4Width
     }
@@ -10192,6 +10225,8 @@ var Form = function Form(_ref5) {
     })) : _ref5$onPublishForm,
     _ref5$onClearForm = _ref5.onClearForm,
     onClearForm = _ref5$onClearForm === void 0 ? function () {} : _ref5$onClearForm,
+    _ref5$onCloseForm = _ref5.onCloseForm,
+    onCloseForm = _ref5$onCloseForm === void 0 ? function () {} : _ref5$onCloseForm,
     _ref5$onSaveAviationF = _ref5.onSaveAviationForm,
     onSaveAviationForm = _ref5$onSaveAviationF === void 0 ? /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -10223,8 +10258,11 @@ var Form = function Form(_ref5) {
     _ref5$warningType = _ref5.warningType,
     warningType = _ref5$warningType === void 0 ? 'public' : _ref5$warningType,
     mode = _ref5.mode,
+    formState = _ref5.formState,
     _ref5$onSetViewModeRe = _ref5.onSetViewModeResetArea,
-    onSetViewModeResetArea = _ref5$onSetViewModeRe === void 0 ? function () {} : _ref5$onSetViewModeRe;
+    onSetViewModeResetArea = _ref5$onSetViewModeRe === void 0 ? function () {} : _ref5$onSetViewModeRe,
+    storedStartGeoJSON = _ref5.storedStartGeoJSON,
+    storedEndGeoJSON = _ref5.storedEndGeoJSON;
   var _React$useState = React.useState(false),
     isPublishing = _React$useState[0],
     setIsPublishing = _React$useState[1];
@@ -10234,6 +10272,12 @@ var Form = function Form(_ref5) {
   var _useTACApi = useTACApi(),
     fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
     fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
+  var _useShortTestHelpers = useShortTestHelpers(),
+    isShortTest = _useShortTestHelpers.isShortTest;
+  var confirmationDialog = useConfirmationDialog();
+  var formMethods = useForm({
+    defaultValues: {}
+  });
   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$useState3 = React.useState(initialPublicWarningArea),
     warningGeoJSONFeature = _React$useState3[0],
@@ -10248,7 +10292,8 @@ var Form = function Form(_ref5) {
     reset = _useFormContext.reset,
     dirtyFields = _useFormContext.formState.dirtyFields,
     getValues = _useFormContext.getValues,
-    setValue = _useFormContext.setValue;
+    setValue = _useFormContext.setValue,
+    watch = _useFormContext.watch;
   var _useDraftFormHelpers = useDraftFormHelpers(),
     toggleIsDraft = _useDraftFormHelpers.toggleIsDraft,
     DraftFieldHelper = _useDraftFormHelpers.DraftFieldHelper;
@@ -10313,29 +10358,103 @@ var Form = function Form(_ref5) {
       }())();
     }
   };
-  var handleSubmitAviationProduct = function handleSubmitAviationProduct(newStatus, warningType) {
-    if (!isSaving) {
-      toggleIsDraft(true);
-      void handleSubmit( /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(formValues) {
-          return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-            while (1) switch (_context6.prev = _context6.next) {
-              case 0:
-                setIsSaving(true);
-                _context6.next = 3;
-                return onSaveAviationForm(formValues, newStatus, warningType)["catch"](function () {});
-              case 3:
-                setIsSaving(false);
-              case 4:
-              case "end":
-                return _context6.stop();
-            }
-          }, _callee6);
-        }));
-        return function (_x3) {
-          return _ref11.apply(this, arguments);
-        };
-      }())();
+  var showConfirmDialog = function showConfirmDialog(action) {
+    return confirmationDialog({
+      title: getConfirmationDialogTitle(t, action, warningType || 'airmet'),
+      description: getConfirmationDialogContent(t, action, warningType || 'airmet'),
+      confirmLabel: getConfirmationDialogButtonLabel(t, action, warningType || 'airmet'),
+      cancelLabel: getConfirmationDialogCancelLabel(t, action),
+      catchOnCancel: action === ProductAction.CLOSE,
+      content: isVAPhenomenon(selectedAviationProduct, action) && !isShortTest() ? jsx(FormProvider, Object.assign({}, formMethods, {
+        children: jsx(CancelSigmetVolcanicMovements, {
+          sigmet: selectedAviationProduct,
+          productConfig: aviationConfig
+        })
+      })) : null
+    });
+  };
+  var handleSubmitAviationProduct = function handleSubmitAviationProduct(action, warningType) {
+    if (isSaving) {
+      return;
+    }
+    switch (action) {
+      case ProductAction.SAVE:
+        toggleIsDraft(true);
+        void handleSubmit( /*#__PURE__*/function () {
+          var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(formValues) {
+            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
+                case 0:
+                  setIsSaving(true);
+                  _context6.next = 3;
+                  return onSaveAviationForm(formValues, 'DRAFT', warningType)["catch"](function () {});
+                case 3:
+                  setIsSaving(false);
+                case 4:
+                case "end":
+                  return _context6.stop();
+              }
+            }, _callee6);
+          }));
+          return function (_x3) {
+            return _ref11.apply(this, arguments);
+          };
+        }())();
+        break;
+      case ProductAction.PUBLISH:
+        void handleSubmit( /*#__PURE__*/function () {
+          var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(formValues) {
+            return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+              while (1) switch (_context8.prev = _context8.next) {
+                case 0:
+                  _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);
+                          _context7.next = 3;
+                          return onSaveAviationForm(formValues, 'PUBLISHED', warningType)["catch"](function () {});
+                        case 3:
+                        case "end":
+                          return _context7.stop();
+                      }
+                    }, _callee7);
+                  })));
+                case 2:
+                  setIsPublishing(false);
+                  onCloseForm();
+                case 4:
+                case "end":
+                  return _context8.stop();
+              }
+            }, _callee8);
+          }));
+          return function (_x4) {
+            return _ref12.apply(this, arguments);
+          };
+        }())();
+        break;
+      case ProductAction.CANCEL:
+        void showConfirmDialog(action).then(function () {
+          setIsPublishing(true);
+          // if volcanic sigmet - add to which FIR it's moving
+          if (isVAPhenomenon(selectedAviationProduct, action)) {
+            void onSaveAviationForm(prepareCancelSigmet(selectedAviationProduct, watch('vaSigmetMoveToFIR')), 'CANCELLED', warningType);
+          } else {
+            void onSaveAviationForm(selectedAviationProduct, 'CANCELLED', warningType);
+          }
+          setIsPublishing(false);
+          onCloseForm();
+        });
+        break;
+      case ProductAction.RENEW:
+      case ProductAction.DISCARD:
+      case ProductAction.DUPLICATE:
+      case ProductAction.CLOSE:
+        break;
+      default:
+        console.warn("Unhandled product action: " + action);
     }
   };
   var onPressClear = function onPressClear() {
@@ -10452,7 +10571,9 @@ var Form = function Form(_ref5) {
           product: selectedAviationProduct,
           getTAC: function getTAC(product) {
             return fetchSigmetTAC(product);
-          }
+          },
+          storedGeoJSON: storedStartGeoJSON,
+          storedEndGeoJSON: storedEndGeoJSON
         }) : jsx(AirmetForm, {
           showMap: false,
           mode: mode,
@@ -10463,17 +10584,18 @@ var Form = function Form(_ref5) {
           product: selectedAviationProduct,
           getTAC: function getTAC(product) {
             return fetchAirmetTAC(product);
-          }
+          },
+          storedGeoJSON: storedStartGeoJSON
         })
       }) : jsx(ContainerGrid, {
-        children: jsxs(Grid2, {
+        children: jsxs(Grid, {
           size: {
             xs: 12
           },
           container: true,
           rowSpacing: 2,
           columnSpacing: 2,
-          children: [jsx(Grid2, {
+          children: [jsx(Grid, {
             size: {
               xs: 12
             },
@@ -10481,7 +10603,7 @@ var Form = function Form(_ref5) {
               isDisabled: areFieldsDisabled,
               isReadOnly: isReadOnly
             })
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12
             },
@@ -10492,7 +10614,7 @@ var Form = function Form(_ref5) {
               onAddObject: onAddObject,
               isDisabled: areFieldsDisabled || isReadOnly
             })
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12
             },
@@ -10501,7 +10623,7 @@ var Form = function Form(_ref5) {
               defaultMapPreset: defaultMapPreset,
               isSnapshot: isSnapshot
             })
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12,
               sm: 6
@@ -10510,7 +10632,7 @@ var Form = function Form(_ref5) {
               isDisabled: areFieldsDisabled,
               isReadOnly: isReadOnly
             })
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12,
               sm: 6
@@ -10519,13 +10641,13 @@ var Form = function Form(_ref5) {
               isDisabled: areFieldsDisabled,
               isReadOnly: isReadOnly
             })
-          }), jsxs(Grid2, {
+          }), jsxs(Grid, {
             size: {
               xs: 12
             },
             container: true,
             spacing: 2,
-            children: [jsx(Grid2, {
+            children: [jsx(Grid, {
               size: {
                 xs: 12,
                 sm: 6
@@ -10534,7 +10656,7 @@ var Form = function Form(_ref5) {
                 isDisabled: areFieldsDisabled,
                 isReadOnly: isReadOnly
               })
-            }), jsx(Grid2, {
+            }), jsx(Grid, {
               size: {
                 xs: 12,
                 sm: 6
@@ -10544,13 +10666,13 @@ var Form = function Form(_ref5) {
                 isReadOnly: isReadOnly
               })
             })]
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12
             },
             container: true,
             spacing: 2,
-            children: jsx(Grid2, {
+            children: jsx(Grid, {
               size: {
                 xs: 12
               },
@@ -10564,7 +10686,7 @@ var Form = function Form(_ref5) {
       }), jsx(DraftFieldHelper, {}), jsx(ReactHookFormHiddenInput, {
         name: "id"
       })]
-    }), !isReadOnly && jsx(Box, {
+    }), formState !== 'cancel' && !isReadOnly && jsx(Box, {
       sx: {
         padding: '24px 10px 14px 10px',
         position: 'absolute',
@@ -10577,10 +10699,10 @@ var Form = function Form(_ref5) {
         border: 'none'
       },
       children: jsx(ContainerGrid, {
-        children: jsxs(Grid2, {
+        children: jsxs(Grid, {
           container: true,
           spacing: 2,
-          children: [jsx(Grid2, {
+          children: [jsx(Grid, {
             size: {
               xs: 12,
               sm: 4
@@ -10595,7 +10717,7 @@ var Form = function Form(_ref5) {
               onClick: onPressClear,
               children: t('warning-button-clear')
             })
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12,
               sm: 4
@@ -10608,7 +10730,7 @@ var Form = function Form(_ref5) {
               },
               disabled: isPublishing,
               onClick: function onClick() {
-                return selectedAviationProduct ? handleSubmitAviationProduct('DRAFT', warningType) : onPressSave();
+                return selectedAviationProduct ? handleSubmitAviationProduct(ProductAction.SAVE, warningType) : onPressSave();
               },
               children: jsxs("span", {
                 style: {
@@ -10621,7 +10743,7 @@ var Form = function Form(_ref5) {
                 })]
               })
             })
-          }), jsx(Grid2, {
+          }), jsx(Grid, {
             size: {
               xs: 12,
               sm: 4
@@ -10632,7 +10754,9 @@ var Form = function Form(_ref5) {
                 width: '100%'
               },
               disabled: isSaving,
-              onClick: onPressPublish,
+              onClick: function onClick() {
+                selectedAviationProduct ? handleSubmitAviationProduct(ProductAction.PUBLISH, warningType) : onPressPublish();
+              },
               children: jsxs("span", {
                 style: {
                   position: 'relative'
@@ -10647,6 +10771,51 @@ var Form = function Form(_ref5) {
           })]
         })
       })
+    }), formState === 'cancel' && jsx(Box, {
+      sx: {
+        padding: '24px 10px 14px 10px',
+        position: 'absolute',
+        bottom: 0,
+        width: '100%',
+        backgroundColor: 'geowebColors.background.surfaceApp',
+        boxShadow: '0 2px 4px 0 rgba(0, 0, 0, 0.5)',
+        zIndex: 1,
+        overflowX: 'hidden',
+        border: 'none'
+      },
+      children: jsx(ContainerGrid, {
+        children: jsx(Grid, {
+          container: true,
+          spacing: 2,
+          children: jsx(Grid, {
+            size: {
+              xs: 12,
+              sm: 4,
+              md: 4
+            },
+            children: jsx(Button, {
+              variant: "primary",
+              sx: {
+                width: '100%'
+              },
+              disabled: isSaving,
+              onClick: function onClick() {
+                selectedAviationProduct ? handleSubmitAviationProduct(ProductAction.CANCEL, warningType) : 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
+                })]
+              })
+            })
+          })
+        })
+      })
     })]
   });
 };
@@ -10681,7 +10850,7 @@ var PublicWarningsForm = function PublicWarningsForm(props) {
  * Copyright 2024 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var config = getConfig();
+var config = sessionStorageProvider.getConfig();
 var publicWarningBaseUrl = config.GW_DRAWINGS_BASE_URL || '';
 // API
 var getPublicWarningList = function getPublicWarningList(auth) {
@@ -10715,6 +10884,12 @@ var postPublicWarning = function postPublicWarning(auth, data) {
     body: JSON.stringify(data)
   }).then(handleResponse);
 };
+var deleteWarning = function deleteWarning(warningId, auth) {
+  return fetch(publicWarningBaseUrl + "/warnings/" + warningId + "?delete=true", {
+    headers: getHeaders(auth),
+    method: 'POST'
+  }).then(handleResponse);
+};
 
 /**
  * @param disabled - Disables fetching, but still returns cached values.
@@ -10876,6 +11051,49 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
     }()
   }));
 };
+var useMutateDeleteWarning = function useMutateDeleteWarning() {
+  var queryClient = useQueryClient();
+  var dispatch = useDispatch();
+  var _useAuthenticationCon3 = useAuthenticationContext(),
+    auth = _useAuthenticationCon3.auth;
+  return useMutation({
+    mutationFn: function mutationFn(_ref6) {
+      var id = _ref6.id;
+      if (!auth) {
+        throw new Error('Authentication context not found');
+      }
+      return deleteWarning(id, auth);
+    },
+    onSuccess: function () {
+      var _onSuccess3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_, variables) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              void queryClient.cancelQueries({
+                queryKey: ['public-warning-list']
+              });
+              queryClient.setQueryData(['public-warning-list'], function (old) {
+                return old == null ? void 0 : old.filter(function (warning) {
+                  return warning.id !== variables.id;
+                });
+              });
+              dispatch(snackbarActions.openSnackbar({
+                type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
+                key: t('warning-dialog-delete-succes')
+              }));
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function onSuccess(_x5, _x6) {
+        return _onSuccess3.apply(this, arguments);
+      }
+      return onSuccess;
+    }()
+  });
+};
 var usePublishWarning = function usePublishWarning() {
   return useMutateWarning('warning-publish-succes');
 };
@@ -10950,8 +11168,6 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     _ref$warningType = _ref.warningType,
     warningType = _ref$warningType === void 0 ? 'public' : _ref$warningType,
     mode = _ref.mode;
-  var _useWarningsTranslati = useWarningsTranslation(),
-    t = _useWarningsTranslati.t;
   var _useSelector = useSelector(selectPublicWarningState),
     warning = _useSelector.warning,
     object = _useSelector.object,
@@ -10962,13 +11178,9 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     publishWarning = _usePublishWarning.mutateAsync;
   var _useSaveWarning = useSaveWarning(),
     saveWarning = _useSaveWarning.mutateAsync;
-  var _usePostSigmet = usePostSigmet(t('aviation-save-succes', {
-      warningType: 'sigmet'.toUpperCase()
-    })),
+  var _usePostSigmet = usePostSigmet(),
     postSigmet = _usePostSigmet.mutateAsync;
-  var _usePostAirmet = usePostAirmet(t('aviation-save-succes', {
-      warningType: 'airmet'.toUpperCase()
-    })),
+  var _usePostAirmet = usePostAirmet(),
     postAirmet = _usePostAirmet.mutateAsync;
   var _useAuthenticationCon = useAuthenticationContext$1(),
     auth = _useAuthenticationCon.auth;
@@ -11002,6 +11214,12 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
   var clearForm = function clearForm() {
     dispatch(publicWarningFormActions.removeAllAreas());
   };
+  var closeForm = function closeForm() {
+    dispatch(uiActions.setToggleOpenDialog({
+      setOpen: false,
+      type: publicWarningDialogType
+    }));
+  };
   var saveAviationForm = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(productToPost, newStatus, warningType) {
       var uuid, _postProductParam, postProductParam, errorMessage;
@@ -11092,6 +11310,9 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     if ((selectedAviationProduct == null ? void 0 : selectedAviationProduct.status) === 'DRAFT') {
       return false;
     }
+    if (formState === 'cancel') {
+      return true;
+    }
     if (formState === 'edit') {
       return false;
     }
@@ -11113,12 +11334,26 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
       area: area[0]
     }));
   };
+  var selectedMapIds = useSelector(function (state) {
+    return genericSelectors.getLinkedMaps(state, panelId);
+  });
+  var storedStartGeoJSON = useSelector(function (state) {
+    var _state$layers;
+    var layer = (_state$layers = state.layers) == null ? void 0 : _state$layers.byId["drawLayer-sigmetStartGeometry-" + selectedMapIds];
+    return layer ? layer.geojson : undefined;
+  });
+  var storedEndGeoJSON = useSelector(function (state) {
+    var _state$layers2;
+    var layer = (_state$layers2 = state.layers) == null ? void 0 : _state$layers2.byId["drawLayer-sigmetEndGeometry-" + selectedMapIds];
+    return layer ? layer.geojson : undefined;
+  });
   return jsx(PublicWarningsForm, {
     object: object,
     publicWarningDetails: warning == null ? void 0 : warning.warningDetail,
     onPublishForm: publishForm,
     onSaveForm: saveForm,
     onClearForm: clearForm,
+    onCloseForm: closeForm,
     onSaveAviationForm: saveAviationForm,
     isReadOnly: isReadOnly,
     error: error,
@@ -11128,7 +11363,10 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     selectedAviationProduct: selectedAviationProduct,
     warningType: warningType,
     mode: formMode,
-    onSetViewModeResetArea: onSetViewModeResetArea
+    formState: formState,
+    onSetViewModeResetArea: onSetViewModeResetArea,
+    storedStartGeoJSON: storedStartGeoJSON,
+    storedEndGeoJSON: storedEndGeoJSON
   }, (warning == null ? void 0 : warning.id) || (selectedAviationProduct == null ? void 0 : selectedAviationProduct.uuid) || 'new');
 };
 
@@ -12243,7 +12481,7 @@ var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
           },
           isDisabled: isDisabled,
           size: "medium",
-          actionIcon: jsxs(Grid2, {
+          actionIcon: jsxs(Grid, {
             container: true,
             alignItems: "center",
             style: {
@@ -12309,7 +12547,7 @@ var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
         sx: {
           padding: '0px 24px 16px 24px'
         },
-        children: [jsxs(Grid2, {
+        children: [jsxs(Grid, {
           container: true,
           justifyContent: "space-between",
           alignItems: "center",
@@ -12488,7 +12726,7 @@ var WarningListColumnContent = function WarningListColumnContent(_ref) {
     _ref$width = _ref.width,
     width = _ref$width === void 0 ? 76 : _ref$width,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$3);
-  return jsxs(Grid2, {
+  return jsxs(Grid, {
     sx: Object.assign({}, props.sx, {
       width: width
     }),
@@ -12616,11 +12854,19 @@ var WarningListItemMenu = function WarningListItemMenu(_ref) {
             text: t('warning-list-button-renew'),
             action: function action() {
               if (warning) {
-                onActionAviationWarning(warning);
+                onActionAviationWarning(warning, ProductAction.RENEW);
               }
             },
             icon: jsx(Update, {})
-          }, aviationDuplicate];
+          }, aviationDuplicate, {
+            text: 'CNL',
+            action: function action() {
+              if (warning) {
+                onActionAviationWarning(warning, ProductAction.CANCEL);
+              }
+            },
+            icon: jsx(Cancel, {})
+          }];
         case ProductStatus.CANCELLED:
           return [];
         case ProductStatus.EXPIRED:
@@ -12816,7 +13062,7 @@ var WarningListItem = function WarningListItem(_ref) {
       },
       "aria-label": "warning item for " + warning.id,
       selected: activeWarningId === warning.id,
-      children: jsxs(Grid2, {
+      children: jsxs(Grid, {
         className: "warning-list",
         container: true,
         rowSpacing: 0,
@@ -13092,7 +13338,7 @@ var WarningListHeaderContent = function WarningListHeaderContent(_ref) {
     sortDirection = _ref.sortDirection,
     sortable = _ref.sortable,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
-  return jsx(Grid2, {
+  return jsx(Grid, {
     sx: Object.assign({}, props.sx, {
       width: width,
       cursor: _onClick ? 'pointer' : 'default'
@@ -13303,32 +13549,26 @@ var PublicWarningList = function PublicWarningList(_ref) {
         containerType: 'inline-size'
       },
       "data-testid": "publicWarningList",
-      children: [jsxs(Grid2, {
-        container: true,
-        justifyItems: "flex-end",
+      children: [jsxs(Box, {
         ref: filterRef,
-        sx: (_sx = {}, _sx["@container publicWarningList (max-width: " + breakpoints.tablet + "px)"] = {
-          ' .MuiGrid2-grid-sm-12': {
-            maxWidth: '100%',
-            flexBasis: '100%'
-          },
-          ' .warning-filter': {
-            order: 2
-          },
+        sx: (_sx = {
+          display: 'flex',
+          flexWrap: 'wrap',
+          alignItems: 'flex-end',
+          flexDirection: 'column'
+        }, _sx["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
+          flexDirection: 'row',
           ' .create-warning': {
-            order: 1
+            order: 2
           }
         }, _sx),
-        children: [jsx(Grid2, {
+        children: [jsx(Box, {
           className: "warning-filter",
-          order: {
-            xs: 2,
-            md: 1
-          },
-          size: {
-            xs: 12,
-            sm: 12,
-            md: 8
+          sx: {
+            flex: 1,
+            minWidth: 0,
+            order: 2,
+            alignSelf: 'flex-start'
           },
           children: jsx(FilterList, {
             isAllSelected: allSelected,
@@ -13336,21 +13576,10 @@ var PublicWarningList = function PublicWarningList(_ref) {
             filterState: filterState,
             updateFilter: updateFilter
           })
-        }), jsxs(Grid2, {
+        }), jsxs(Box, {
           className: "create-warning",
-          order: {
-            xs: 1,
-            md: 2
-          },
           sx: {
-            display: 'flex'
-          },
-          justifyContent: "flex-end",
-          alignItems: "self-start",
-          size: {
-            xs: 12,
-            sm: 12,
-            md: 4
+            order: 1
           },
           children: [lastUpdatedTime && jsx(Box, {
             sx: {
@@ -13369,7 +13598,7 @@ var PublicWarningList = function PublicWarningList(_ref) {
       }), error && jsx(AlertBanner, {
         title: error.message,
         shouldClose: true
-      }), !error && jsxs(Grid2, {
+      }), !error && jsxs(Grid, {
         container: true,
         rowSpacing: 0,
         columnSpacing: 0,
@@ -13849,7 +14078,7 @@ var ConfirmDeleteWarningDialog = function ConfirmDeleteWarningDialog(_ref) {
             _context.next = 4;
             return request();
           case 4:
-            callback();
+            callback && callback();
             setIsLoading(false);
             _context.next = 12;
             break;
@@ -13876,10 +14105,7 @@ var ConfirmDeleteWarningDialog = function ConfirmDeleteWarningDialog(_ref) {
     description: !error ? description : '',
     onClose: onClose,
     onSubmit: onSubmit,
-    isLoading: isLoading,
-    sx: {
-      width: 330
-    }
+    isLoading: isLoading
   }, error && {
     content: jsxs(Box, {
       sx: {
@@ -13900,9 +14126,12 @@ var ConfirmDeleteWarningDialog = function ConfirmDeleteWarningDialog(_ref) {
 };
 
 var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
+  var _filteredWarnings$fin;
   var panelId = _ref.panelId,
     presetFilterState = _ref.presetFilterState;
   var updatePublicWarningEditor = useMutatePublicWarningEditor();
+  var _useMutateDeleteWarni = useMutateDeleteWarning(),
+    deletePublicWarning = _useMutateDeleteWarni.mutateAsync;
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var dispatch = useDispatch();
@@ -14077,12 +14306,16 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     switch (actionType) {
       case 'RENEW':
         updatedWarning = renewAviationProduct(warning, aviationConfig);
+        void openPublicWarningDialog('edit', updatedWarning, type);
         break;
       case 'DUPLICATE':
         updatedWarning = duplicateAviationProduct(warning);
+        void openPublicWarningDialog('edit', updatedWarning, type);
+        break;
+      case 'CANCEL':
+        void openPublicWarningDialog('cancel', warning, type);
         break;
     }
-    void openPublicWarningDialog('edit', updatedWarning, type);
   };
   var openSnackbar = function openSnackbar(message) {
     dispatch(snackbarActions.openSnackbar({
@@ -14097,10 +14330,13 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       title: t('warning-dialog-delete-title'),
       description: t('warning-dialog-delete-description'),
       request: function request() {
-        return warningsApi.deleteWarning(warningId);
-      },
-      callback: function callback() {
-        return onRemoveSuccess(warningId, t('warning-dialog-delete-succes'));
+        return deletePublicWarning({
+          id: warningId
+        }, {
+          onSuccess: function onSuccess() {
+            return onRemoveSuccessHooks(warningId);
+          }
+        });
       },
       isLocked: isLocked
     });
@@ -14121,6 +14357,17 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       }
     });
   };
+  var onRemoveSuccessHooks = function onRemoveSuccessHooks(warningId) {
+    setConfirmDialogOptions(undefined);
+    // Close warning dialog if needed
+    if (selectedWarningId === warningId) {
+      dispatch(uiActions.setToggleOpenDialog({
+        setOpen: false,
+        type: publicWarningDialogType
+      }));
+    }
+  };
+  // TODO remove when all is moved to tanstack
   var onRemoveSuccess = function onRemoveSuccess(warningId, snackbarMessage) {
     // close confirm dialog
     setConfirmDialogOptions(undefined);
@@ -14161,9 +14408,12 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       return warning.status && expandedSections[warning.status] || warning.productStatus && expandedSections[warning.productStatus];
     });
   }, [filteredWarnings, expandedSections]);
+  var selectedAviationProductId = (_filteredWarnings$fin = filteredWarnings.find(function (warning) {
+    return (warning.warningDetail.level === 'SIG' || warning.warningDetail.level === 'AIR') && warning.id === selectedWarningId;
+  })) == null ? void 0 : _filteredWarnings$fin.id;
   var allFeatures = React__default.useMemo(function () {
     return filteredWarningsByExpandedSections.flatMap(function (warning) {
-      return (warning == null ? void 0 : warning.id) && (warning != null && warning.warningDetail && warning.warningDetail.areas ? warning.warningDetail.areas.filter(function (area) {
+      return (warning == null ? void 0 : warning.id) && warning.id !== selectedAviationProductId && (warning != null && warning.warningDetail && warning.warningDetail.areas ? warning.warningDetail.areas.filter(function (area) {
         return area.geoJSON;
       }).map(function (area) {
         var isAviationWarning = warning.warningDetail.level === 'SIG' || warning.warningDetail.level === 'AIR';
@@ -14177,7 +14427,7 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     }).filter(function (feature) {
       return feature.id;
     });
-  }, [filteredWarningsByExpandedSections]);
+  }, [filteredWarningsByExpandedSections, selectedAviationProductId]);
   var _useUpdateSharedData = useUpdateSharedData({
       features: allFeatures
     }, panelId),
@@ -14217,11 +14467,7 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
 };
 
 var warningListViewPreset = {
-  title: 'Warning List',
-  id: 'warninglist',
-  componentType: 'WarningList',
-  initialProps: {}
-};
+  componentType: 'WarningList'};
 var PublicWarningApiWrapper = function PublicWarningApiWrapper(_ref) {
   var config = _ref.config,
     auth = _ref.auth,
@@ -14460,18 +14706,16 @@ var warningsReducersMap = {
   snackbar: snackbarReducer,
   syncGroups: syncGroupsReducer
 };
-var warningsMiddlewares = [mapListener.middleware, layersListener.middleware, drawingToolListener.middleware, warningsDrawingsListener.middleware, publicWarningsListener.middleware, publicWarningFormListener.middleware, snackbarListener.middleware, syncGroupsListener.middleware];
+var warningsMiddlewares = [mapListener.middleware, layersListener.middleware, drawingToolListener.middleware, warningsDrawingsListener.middleware, publicWarningsListener.middleware, publicWarningFormListener.middleware, snackbarListener.middleware, syncGroupsListener.middleware, openlayersListener.middleware];
 var warningsRootReducer = combineReducers(warningsReducersMap);
 var createMockStore = function createMockStore(mockState) {
   return configureStore({
     reducer: warningsRootReducer,
     preloadedState: mockState,
-    middleware: warningsMiddlewares
+    middleware: function middleware(getDefaultMiddleware) {
+      return getDefaultMiddleware().concat(warningsMiddlewares);
+    }
   });
 };
-/*  _____ NOTE --> We should use the middlwares like this down below, but as it will be more strict, it exposes errors from the code itself, which won´t be fixed in this MR ______
-   middleware: (getDefaultMiddleware) =>
-     getDefaultMiddleware().concat(warningsMiddlewares),
-*/
 
 export { DrawingToolConnect, Wrapper as DrawingToolForm, DrawingToolFormConnect, DrawingToolMapButtonConnect, ObjectManagerConnect, ObjectManagerMapButtonConnect, PublicWarningApiWrapper, PublicWarningsFormDialog, PublicWarningsFormDialogConnect, WARN_NAMESPACE, WarningsModuleProvider, componentsLookUp, createMockStore, isAlreadyEdited, publicWarningActions, publicWarningFormActions, publicWarningFormListener, publicWarningFormReducer, publicWarningsListener, publicWarningsReducer, selectors as publicWarningsSelectors, useObjectDrawDialogAction, warningFormConfirmationOptions, warningsDrawingsActions, warningsDrawingsListener, warningsDrawingsReducer, warningsMiddlewares, warningsReducersMap, warningsTranslations };