@opengeoweb/warnings 14.0.1 → 14.2.1

package/index.esm.js

@@ -1,28 +1,31 @@
 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, 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 { 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, Info, Copy, Update, Cancel, Success, Expire, Remove, Options, ChevronDown, ChevronUp, Close, Clock } 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';
+import { SHARED_NAMESPACE, useConfirmationDialog, dateUtils, ToggleMenu, calculateStartSize, ToolContainerDraggable, AlertBanner, sessionStorageProvider, ConfirmationDialog, usePrevious, CustomIconButton, usePreventBrowserClose, CustomTooltip, Avatar, getInitials, SwitchButton, FilterChip, TooltipSelect, LastUpdateTime, CustomToggleButton, Filter, StatusTag, FilterOption, getAxiosErrorMessage, CustomDialog, ConfirmationButtons, ErrorBoundary } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, current, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { defaultBbox } from '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, useDraftFormHelpers, ReactHookFormSelect, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, errorMessages, isEmpty, ReactHookFormDateTime, isXHoursAfter, isXHoursBefore } from '@opengeoweb/form-fields';
-import { SA_NAMESPACE, isInstanceOfCancelSigmet, getDefaultValidFromValue, isInstanceOfCancelAirmet, getDefaultValidUntilValue, findSequenceNumber, getSequenceStyling, useShortTestHelpers, ProductAction, SigmetForm, AirmetForm, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, isVAPhenomenon, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, prepareCancelSigmet, getProductFormMode } from '@opengeoweb/sigmet-airmet';
+import { SA_NAMESPACE, isInstanceOfCancelSigmet, getDefaultValidFromValue, isInstanceOfCancelAirmet, getDefaultValidUntilValue, useShortTestHelpers, ProductAction, SigmetForm, AirmetForm, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, isVAPhenomenon, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, prepareCancelSigmet, getProductFormMode, findSequenceNumber, getSequenceStyling } from '@opengeoweb/sigmet-airmet';
 import { LayerType, generateMapId } from '@opengeoweb/webmap';
 import { t } from 'i18next';
 import { useTranslation } from 'react-i18next';
 import * as React from 'react';
 import React__default, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
 import { useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
-import { styled, Box, Typography, ListItem, Paper, ListItemButton, Stack, Grid, LinearProgress, Button, MenuItem, FormHelperText, Card, CardContent, Tabs, Tab, useTheme, FormControl, CircularProgress, Menu, DialogTitle, DialogContent, Switch, ListItemText } from '@mui/material';
+import { styled, Box, Typography, ListItem, Paper, ListItemButton, Stack, Grid, LinearProgress, Button, MenuItem, FormHelperText, Card, CardContent, Tabs, Tab, useTheme, FormControl, CircularProgress, Menu, ListItemText, DialogTitle, DialogContent, Switch, RadioGroup, FormControlLabel, Radio, InputAdornment, Collapse } from '@mui/material';
 import { VariableSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { getHeaders, handleResponse, AirmetPhenomena, SigmetPhenomena, useAuthQuery, useAuthenticationContext, optimisticUpdate, ProductStatus } from '@opengeoweb/api';
-import { useQueryClient, useMutation } from '@tanstack/react-query';
+import { useQueryClient, useMutation, queryOptions, QueryClient, useQuery } from '@tanstack/react-query';
 import { snackbarListener, snackbarReducer, snackbarActions, snackbarTypes } from '@opengeoweb/snackbar';
 import { useFormContext, useForm, FormProvider } from 'react-hook-form';
 import { isEqual, cloneDeep, clamp, concat, groupBy, pick } from 'lodash';
 import { ReactSortable } from 'react-sortablejs';
+import { LocalizationProvider } from '@mui/x-date-pickers';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
 
 var en = {
 	"drawing-tool-form-tools": "Tools",
@@ -125,6 +128,7 @@ var en = {
 	"warning-list-status-published": "Published",
 	"warning-list-status-todo": "Reviews",
 	"warning-list-status-expired": "Expired & Withdrawn (last 24 hours)",
+	"warning-list-status-expired-custom-time": "Expired & Withdrawn",
 	"warning-list-header-incident": "Incident",
 	"warning-list-header-incidents": "Incidents",
 	"warning-list-header-last-update": "Last update",
@@ -159,6 +163,15 @@ var en = {
 	"filter-source": "Sources",
 	"filter-hide": "Hide {{subject}}",
 	"filter-show": "Show {{subject}}",
+	"filter-time": "Timefilter",
+	"filter-time-no-filter": "No filter",
+	"filter-time-today": "Today",
+	"filter-time-tomorrow": "Tomorrow",
+	"filter-time-custom": "Select time span",
+	"filter-time-apply": "Apply",
+	"filter-choose-date-time": "Choose a date and time",
+	"filter-start": "Start",
+	"filter-end": "End",
 	"warning-domain-aviation": "Aviation",
 	"warning-domain-maritime": "Maritime",
 	"warning-domain-public": "Public",
@@ -210,16 +223,16 @@ var en = {
 	"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}}",
+	"yes-cancel": "Cancel {{product}}",
 	"cancel-this-product": "Are you sure you want to cancel this {{product}}?",
 	"cancel-message": "Cancel message",
 	"will-cancel-message": "Will cancel warning",
-	"tac-label": "TAC:",
 	"aviation-cancel-success": "{{warningType}} has succesfully been cancelled!",
 	"aviation-discard-success": "{{warningType}} has been discarded!",
 	"error-auth-login": "This feature is protected by authentication. Please log in to proceed",
 	"cancel-warningType": "Cancel {{warningType}}",
 	cancelling: "Cancelling",
+	loading: "Loading...",
 	"maritime-new-warning": "New warning",
 	"maritime-add-area": "Add",
 	"maritime-no-area-selected": "(no area selected)",
@@ -269,7 +282,9 @@ 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-validuntil": "End time: "
+	"maritime-warning-validuntil": "End time: ",
+	"maritime-wind-change-warning": "The entered wind change exceeds 180°. Please check if veering / backing is correct.",
+	"maritime-wind-change-error": "A wind change less than 45° is not allowed."
 };
 var nl = {
 	"drawing-tool-form-tools": "Gereedschap",
@@ -369,6 +384,7 @@ var nl = {
 	"warning-list-status-published": "Gepubliceerd",
 	"warning-list-status-todo": "Te doen",
 	"warning-list-status-expired": "Verlopen en Ingetrokken (laatste 24 uur)",
+	"warning-list-status-expired-custom-time": "Verlopen en Ingetrokken",
 	"warning-list-header-incident": "Incident",
 	"warning-list-header-incidents": "Incidenten",
 	"warning-list-header-last-update": "Laatste update",
@@ -401,6 +417,15 @@ var nl = {
 	"filter-phenomenon": "Fenomenen",
 	"filter-level": "Niveaus",
 	"filter-source": "Bronnen",
+	"filter-time": "Tijdsfilter",
+	"filter-time-no-filter": "Geen filter",
+	"filter-time-today": "Vandaag",
+	"filter-time-tomorrow": "Morgen",
+	"filter-time-custom": "Selecteer een tijdsspanne",
+	"filter-time-apply": "Pas toe",
+	"filter-choose-date-time": "Kies een datum en tijd",
+	"filter-start": "Start",
+	"filter-end": "Eind",
 	"warning-dialog-expire-succes": "Waarschuwing laten verlopen is succesvol",
 	"warning-dialog-expire-title": "Waarschuwing laten verlopen",
 	"warning-dialog-expire-confirm": "Verlopen",
@@ -425,6 +450,7 @@ var nl = {
 	"error-auth-login": "Deze functie wordt beschermd door authenticatie. Log in om verder te gaan",
 	"cancel-warningType": "Annuleer {{warningType}}",
 	cancelling: "Annuleren",
+	loading: "Laden...",
 	"maritime-new-warning": "Nieuwe waarschuwing",
 	"maritime-add-area": "Toevoegen",
 	"maritime-no-area-selected": "(geen gebied geselecteerd)",
@@ -470,7 +496,9 @@ 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-validuntil": "Eind tijd: "
+	"maritime-warning-validuntil": "Eind tijd: ",
+	"maritime-wind-change-warning": "De ingevulde wind wijziging overschrijdt 180°. Controleer of ruimend / krimpend klopt.",
+	"maritime-wind-change-error": "Een wind wijziging van minder dan 45° is niet toegestaan."
 };
 var fi = {
 	"drawing-tool-form-tools": "Työkalut",
@@ -570,6 +598,7 @@ var fi = {
 	"warning-list-status-published": "Julkaistua",
 	"warning-list-status-todo": "Arvostelua",
 	"warning-list-status-expired": "Vanhentunutta (viimeiset 24 tuntia)",
+	"warning-list-status-expired-custom-time": "Vanhentunutta",
 	"warning-list-header-incident": "Ongelmaa",
 	"warning-list-header-incidents": "Ongelmia",
 	"warning-list-header-last-update": "Viimeisin päivitys",
@@ -602,6 +631,15 @@ var fi = {
 	"filter-phenomenon": "ei käännetty",
 	"filter-level": "ei käännetty",
 	"filter-source": "ei käännetty",
+	"filter-time": "Aikarajaus",
+	"filter-time-no-filter": "Ei rajausta",
+	"filter-time-today": "Tänään",
+	"filter-time-tomorrow": "Huomenna",
+	"filter-time-custom": "Valitse aikaväli",
+	"filter-time-apply": "Käytä",
+	"filter-choose-date-time": "Valitse päivämäärä ja aika",
+	"filter-start": "Alku",
+	"filter-end": "Loppu",
 	"warning-dialog-expire-succes": "ei käännetty",
 	"warning-dialog-expire-title": "ei käännetty",
 	"warning-dialog-expire-confirm": "ei käännetty",
@@ -626,6 +664,7 @@ var fi = {
 	"error-auth-login": "Tämän toiminnallisuuden käyttäminen vaatii tunnistautumista. Kirjaudu sisään jatkaaksesi",
 	"cancel-warningType": "Peruuta {{warningType}}",
 	cancelling: "Peruuttaminen",
+	loading: "Ladataan...",
 	"maritime-editor-off": "Et ole enää {{domain}} -merivaroitusten muokkaaja",
 	"maritime-warning-post-success": "Varoitus julkaistu onnistuneesti"
 };
@@ -727,6 +766,7 @@ var no = {
 	"warning-list-status-published": "Publisert",
 	"warning-list-status-todo": "Til sjekk",
 	"warning-list-status-expired": "Utgått (siste 24 timer)",
+	"warning-list-status-expired-custom-time": "Utgått",
 	"warning-list-header-incident": "Hendelse",
 	"warning-list-header-incidents": "Hendelser",
 	"warning-list-header-last-update": "Sist oppdatert",
@@ -759,6 +799,15 @@ var no = {
 	"filter-phenomenon": "Fenomen",
 	"filter-level": "Grad",
 	"filter-source": "Kilder",
+	"filter-time": "Tidsfilter",
+	"filter-time-no-filter": "Ingen filter",
+	"filter-time-today": "I dag",
+	"filter-time-tomorrow": "I morgen",
+	"filter-time-custom": "Velg tidsintervall",
+	"filter-time-apply": "Bruk",
+	"filter-choose-date-time": "Velg data og tid",
+	"filter-start": "Start",
+	"filter-end": "Slutt",
 	"warning-dialog-expire-succes": "Varselet er utgått",
 	"warning-dialog-expire-title": "Opphør varsel",
 	"warning-dialog-expire-confirm": "Opphør",
@@ -776,13 +825,14 @@ var no = {
 	"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}}",
+	"yes-cancel": "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": "Cancel {{warningType}}",
-	cancelling: "Cancelling"
+	cancelling: "Cancelling",
+	loading: "Laster..."
 };
 var warningsTranslations = {
 	en: en,
@@ -2457,12 +2507,6 @@ var domainPhenomena = {
   "public": [].concat(Object.keys(Phenomenon$1))
 };
 var defaultPhenomenonFilter = makeFilterFromList(Object.keys(AllPhenomenaKeys));
-var initialFilters = {
-  source: defaultEmptyFilter,
-  domain: defaultDomainFilter,
-  phenomenon: defaultPhenomenonFilter,
-  level: defaultLevelFilter
-};
 var getSelectedOptions = function getSelectedOptions(options) {
   if (options === void 0) {
     options = {};
@@ -2497,13 +2541,14 @@ var updateState = function updateState(state, optionKey, value, only) {
 };
 /** Make sure our value is in the filter */
 var getValue = function getValue(values, value) {
-  return Object.values(values).find(function (existingValue) {
+  var _Object$values$find;
+  return (_Object$values$find = Object.values(values).find(function (existingValue) {
     return existingValue === value;
-  }) || emptyFilterId;
+  })) != null ? _Object$values$find : emptyFilterId;
 };
 var getFiltersFromWarnings = function getFiltersFromWarnings(warnings, filterKey) {
   var filterOptions = [emptyFilterId];
-  if (!warnings || !warnings.length) {
+  if (!(warnings != null && warnings.length)) {
     // return default list
     return filterOptions;
   }
@@ -2517,6 +2562,84 @@ var getFiltersFromWarnings = function getFiltersFromWarnings(warnings, filterKey
   });
   return filterOptions;
 };
+var TimeFilterMode;
+(function (TimeFilterMode) {
+  TimeFilterMode["all"] = "all";
+  TimeFilterMode["today"] = "today";
+  TimeFilterMode["tomorrow"] = "tomorrow";
+  TimeFilterMode["custom"] = "custom";
+})(TimeFilterMode || (TimeFilterMode = {}));
+var defaultTimeFilter = {
+  mode: TimeFilterMode.all
+};
+var isWarningWithinInterval = function isWarningWithinInterval(warning, timeFilter) {
+  // "NO FILTER"
+  if (timeFilter.mode === TimeFilterMode.all) {
+    return true;
+  }
+  var warningStart = new Date(warning.warningDetail.validFrom);
+  var warningEnd = new Date(warning.warningDetail.validUntil);
+  // CUSTOM TIME SPAN
+  if (timeFilter.mode === TimeFilterMode.custom) {
+    if (!timeFilter.customStart || !timeFilter.customEnd) {
+      return true;
+    }
+    var filterStart = new Date(timeFilter.customStart);
+    var filterEnd = new Date(timeFilter.customEnd);
+    return warningEnd >= filterStart && warningStart <= filterEnd;
+  }
+  // TODAY or TOMORROW
+  var now = new Date();
+  var rangeStart;
+  var rangeEnd;
+  if (timeFilter.mode === TimeFilterMode.today) {
+    // TODAY
+    rangeStart = dateUtils.startOfDayUTC(now);
+    rangeEnd = dateUtils.set(rangeStart, {
+      date: rangeStart.getUTCDate() + 1,
+      hours: 0,
+      minutes: 0,
+      seconds: 0
+    });
+  } else {
+    // TOMORROW
+    rangeStart = dateUtils.set(now, {
+      date: now.getUTCDate() + 1,
+      hours: 0,
+      minutes: 0,
+      seconds: 0
+    });
+    rangeEnd = dateUtils.set(rangeStart, {
+      date: rangeStart.getUTCDate() + 1,
+      hours: 0,
+      minutes: 0,
+      seconds: 0
+    });
+  }
+  return warningEnd >= rangeStart && warningStart <= rangeEnd;
+};
+var getApiParams = function getApiParams(timeFilter) {
+  if (timeFilter.mode === TimeFilterMode.all) {
+    return {};
+  }
+  if (timeFilter.mode === TimeFilterMode.custom) {
+    if (!timeFilter.customStart || !timeFilter.customEnd) {
+      return {};
+    }
+    return {
+      start_time: new Date(timeFilter.customStart).toISOString(),
+      end_time: new Date(timeFilter.customEnd).toISOString()
+    };
+  }
+  return {};
+};
+var initialFilters = {
+  source: defaultEmptyFilter,
+  domain: defaultDomainFilter,
+  phenomenon: defaultPhenomenonFilter,
+  level: defaultLevelFilter,
+  time: defaultTimeFilter
+};
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -4152,6 +4275,10 @@ var DrawingToolFormConnect = function DrawingToolFormConnect() {
   var featureLayerGeoJSONProperties = useSelector(function (store) {
     return layerSelectors.getFeatureLayerGeoJSONProperties(store, drawTool == null ? void 0 : drawTool.geoJSONLayerId);
   });
+  var isFormDirty = useSelector(function (store) {
+    return getWarningFormDirty(store, drawingDialogType);
+  });
+  usePreventBrowserClose(isFormDirty || isLayerInEditMode);
   var onSubmitForm = React.useCallback(function (formValues) {
     saveOrUpdateDrawing({
       id: drawing == null ? void 0 : drawing.id,
@@ -4498,16 +4625,70 @@ var config = sessionStorageProvider.getConfig();
 var airmetBaseUrl = config.GW_AIRMET_BASE_URL || '';
 var sigmetBaseUrl = config.GW_SIGMET_BASE_URL || '';
 // API
-var getAirmetList = function getAirmetList(auth) {
-  return fetch(airmetBaseUrl + "/airmetlist", {
-    headers: getHeaders(auth)
-  }).then(handleResponse);
-};
-var getSigmetList = function getSigmetList(auth) {
-  return fetch(sigmetBaseUrl + "/sigmetlist", {
-    headers: getHeaders(auth)
-  }).then(handleResponse);
-};
+var getAirmetList = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(auth, params) {
+    var queryParams, url, response, data;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (params === void 0) {
+            params = {};
+          }
+          queryParams = new URLSearchParams(params);
+          url = airmetBaseUrl + "/airmetlist" + (queryParams.toString() ? "?" + queryParams.toString() : '');
+          _context.next = 5;
+          return fetch(url, {
+            headers: getHeaders(auth)
+          });
+        case 5:
+          response = _context.sent;
+          _context.next = 8;
+          return handleResponse(response);
+        case 8:
+          data = _context.sent;
+          return _context.abrupt("return", data);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getAirmetList(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var getSigmetList = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(auth, params) {
+    var queryParams, url, response, data;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (params === void 0) {
+            params = {};
+          }
+          queryParams = new URLSearchParams(params);
+          url = sigmetBaseUrl + "/sigmetlist" + (queryParams.toString() ? "?" + queryParams.toString() : '');
+          _context2.next = 5;
+          return fetch(url, {
+            headers: getHeaders(auth)
+          });
+        case 5:
+          response = _context2.sent;
+          _context2.next = 8;
+          return handleResponse(response);
+        case 8:
+          data = _context2.sent;
+          return _context2.abrupt("return", data);
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getSigmetList(_x3, _x4) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 var getAirmetConfig = function getAirmetConfig(auth) {
   return fetch(airmetBaseUrl + "/airmet-config", {
     headers: getHeaders(auth)
@@ -4522,144 +4703,144 @@ var getSigmetConfig = function getSigmetConfig(auth) {
     return result.json();
   });
 };
-var getAirmetTAC = function getAirmetTAC(auth, product) {
+var getAirmetTAC = function getAirmetTAC(product, auth) {
   return fetch(airmetBaseUrl + "/airmet2tac", {
     body: JSON.stringify(product),
     method: 'POST',
     headers: getHeaders(auth)
   }).then(/*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(result) {
       var textData;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             if (!(result.status === 200)) {
-              _context.next = 5;
+              _context3.next = 5;
               break;
             }
-            _context.next = 3;
+            _context3.next = 3;
             return result.text();
           case 3:
-            textData = _context.sent;
-            return _context.abrupt("return", {
+            textData = _context3.sent;
+            return _context3.abrupt("return", {
               data: textData
             });
           case 5:
             throw new Error("Failed to fetch TAC data: " + result.statusText);
           case 6:
           case "end":
-            return _context.stop();
+            return _context3.stop();
         }
-      }, _callee);
+      }, _callee3);
     }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
+    return function (_x5) {
+      return _ref3.apply(this, arguments);
     };
   }());
 };
-var getSigmetTAC = function getSigmetTAC(auth, product) {
+var getSigmetTAC = function getSigmetTAC(product, auth) {
   return fetch(sigmetBaseUrl + "/sigmet2tac", {
     body: JSON.stringify(product),
     method: 'POST',
     headers: getHeaders(auth)
   }).then(/*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(result) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
       var textData;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (!(result.status === 200)) {
-              _context2.next = 5;
+              _context4.next = 5;
               break;
             }
-            _context2.next = 3;
+            _context4.next = 3;
             return result.text();
           case 3:
-            textData = _context2.sent;
-            return _context2.abrupt("return", {
+            textData = _context4.sent;
+            return _context4.abrupt("return", {
               data: textData
             });
           case 5:
             throw new Error("Failed to fetch TAC data: " + result.statusText);
           case 6:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee4);
     }));
-    return function (_x2) {
-      return _ref2.apply(this, arguments);
+    return function (_x6) {
+      return _ref4.apply(this, arguments);
     };
   }());
 };
 // For cancel TAC (not normal TAC)
-var getAirmetCancelTAC = function getAirmetCancelTAC(auth, product) {
+var getAirmetCancelTAC = function getAirmetCancelTAC(product, auth) {
   return fetch(airmetBaseUrl + "/airmet2cancel2tac", {
     body: JSON.stringify(product),
     method: 'POST',
     headers: getHeaders(auth)
   }).then(/*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(result) {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(result) {
       var textData;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if (!(result.status === 200)) {
-              _context3.next = 5;
+              _context5.next = 5;
               break;
             }
-            _context3.next = 3;
+            _context5.next = 3;
             return result.text();
           case 3:
-            textData = _context3.sent;
-            return _context3.abrupt("return", {
+            textData = _context5.sent;
+            return _context5.abrupt("return", {
               data: textData
             });
           case 5:
             throw new Error("Failed to fetch Cancel TAC data: " + result.statusText);
           case 6:
           case "end":
-            return _context3.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee5);
     }));
-    return function (_x3) {
-      return _ref3.apply(this, arguments);
+    return function (_x7) {
+      return _ref5.apply(this, arguments);
     };
   }());
 };
-var getSigmetCancelTAC = function getSigmetCancelTAC(auth, product) {
+var getSigmetCancelTAC = function getSigmetCancelTAC(product, auth) {
   return fetch(sigmetBaseUrl + "/sigmet2cancel2tac", {
     body: JSON.stringify(product),
     method: 'POST',
     headers: getHeaders(auth)
   }).then(/*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(result) {
       var textData;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!(result.status === 200)) {
-              _context4.next = 5;
+              _context6.next = 5;
               break;
             }
-            _context4.next = 3;
+            _context6.next = 3;
             return result.text();
           case 3:
-            textData = _context4.sent;
-            return _context4.abrupt("return", {
+            textData = _context6.sent;
+            return _context6.abrupt("return", {
               data: textData
             });
           case 5:
             throw new Error("Failed to fetch Cancel TAC data: " + result.statusText);
           case 6:
           case "end":
-            return _context4.stop();
+            return _context6.stop();
         }
-      }, _callee4);
+      }, _callee6);
     }));
-    return function (_x4) {
-      return _ref4.apply(this, arguments);
+    return function (_x8) {
+      return _ref6.apply(this, arguments);
     };
   }());
 };
@@ -4678,6 +4859,137 @@ var postAirmet = function postAirmet(auth, data) {
   }).then(handleResponse);
 };
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2025 - Finnish Meteorological Institute (FMI)
+ * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var LIB_KEY = 'warnings';
+var API_KEY = 'aviation';
+var generateAviationQueryKeys = function generateAviationQueryKeys(queryKeys) {
+  return [LIB_KEY, API_KEY].concat(queryKeys);
+};
+// 2) Unique keys per query
+var aviationQueryOptions = {
+  getSigmetTAC: function getSigmetTAC$1(product, credentials) {
+    var _product$uuid;
+    return queryOptions({
+      queryKey: generateAviationQueryKeys(['sigmet', 'tac', (_product$uuid = product.uuid) != null ? _product$uuid : product.firName]),
+      queryFn: function queryFn() {
+        return getSigmetTAC(product, credentials);
+      }
+    });
+  },
+  getAirmetTAC: function getAirmetTAC$1(product, credentials) {
+    var _product$uuid2;
+    return queryOptions({
+      queryKey: generateAviationQueryKeys(['airmet', 'tac', (_product$uuid2 = product.uuid) != null ? _product$uuid2 : product.firName]),
+      queryFn: function queryFn() {
+        return getAirmetTAC(product, credentials);
+      }
+    });
+  },
+  getSigmetCancelTAC: function getSigmetCancelTAC$1(product, credentials) {
+    var _product$uuid3;
+    return queryOptions({
+      queryKey: generateAviationQueryKeys(['sigmet', 'cancel', (_product$uuid3 = product.uuid) != null ? _product$uuid3 : product.firName]),
+      queryFn: function queryFn() {
+        return getSigmetCancelTAC(product, credentials);
+      }
+    });
+  },
+  getAirmetCancelTAC: function getAirmetCancelTAC$1(product, credentials) {
+    var _product$uuid4;
+    return queryOptions({
+      queryKey: generateAviationQueryKeys(['airmet', 'cancel', (_product$uuid4 = product.uuid) != null ? _product$uuid4 : product.firName]),
+      queryFn: function queryFn() {
+        return getAirmetCancelTAC(product, credentials);
+      }
+    });
+  }
+};
+
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2025 - Finnish Meteorological Institute (FMI)
+ * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var tryParse = function tryParse(st) {
+  try {
+    return JSON.parse(st);
+  } catch (_unused) {
+    return null;
+  }
+};
+var joinLoc = function joinLoc(loc) {
+  if (!Array.isArray(loc) || loc.length === 0) {
+    return '';
+  }
+  var start = typeof loc[0] === 'string' && (loc[0] === 'body' || loc[0] === 'query') ? 1 : 0;
+  return loc.slice(start).join('.');
+};
+function humanizeApiErrorMessage(err) {
+  // 1) Best effort to extract a message we can parse
+  var raw =
+  // eslint-disable-next-line no-nested-ternary
+  err instanceof Error ? typeof err.message === 'string' ? err.message : String(err.message) : typeof err === 'string' ? err : '';
+  var parsed = raw && (raw.startsWith('{') || raw.startsWith('[')) ? tryParse(raw) : null;
+  // 3) If array of validation errors
+  if (Array.isArray(parsed)) {
+    var lines = parsed.map(function (vi) {
+      var _vi$msg, _vi$msg2;
+      var path = joinLoc(vi.loc);
+      return path ? path + ": " + ((_vi$msg = vi.msg) != null ? _vi$msg : 'Invalid') : (_vi$msg2 = vi.msg) != null ? _vi$msg2 : 'Invalid';
+    });
+    return lines.slice(0, 5).join('; ');
+  }
+  // 4) If parsed is an object with common fields
+  if (parsed && typeof parsed === 'object') {
+    var obj = parsed;
+    if (typeof obj.detail === 'string' && typeof obj.title === 'string') {
+      return obj.title + ": " + obj.detail;
+    }
+    if (typeof obj.message === 'string') {
+      return obj.message;
+    }
+    if (Array.isArray(obj.errors)) {
+      return obj.errors.map(function (e) {
+        var _e$message;
+        return typeof e === 'string' ? e : (_e$message = e == null ? void 0 : e.message) != null ? _e$message : JSON.stringify(e);
+      }).join('; ');
+    }
+  }
+  // 5) If message is [object Object]
+  if (raw.includes('[object Object]')) {
+    return 'Validation failed — check required fields.';
+  }
+  return raw || 'Unknown error occurred';
+}
+
 var getAviationSnackbarKey = function getAviationSnackbarKey(status) {
   switch (status) {
     case 'PUBLISHED':
@@ -4690,24 +5002,30 @@ var getAviationSnackbarKey = function getAviationSnackbarKey(status) {
       return 'aviation-save-success';
   }
 };
-var useAirmetList = function useAirmetList(disabled) {
+var useAirmetList = function useAirmetList(disabled, timeFilter) {
   if (disabled === void 0) {
     disabled = false;
   }
-  return useAuthQuery(['airmet-list'], getAirmetList, disabled);
+  var apiParams = timeFilter ? getApiParams(timeFilter) : {};
+  return useAuthQuery(['airmet-list', JSON.stringify(apiParams)], function (auth) {
+    return getAirmetList(auth, apiParams);
+  }, disabled);
 };
-var useSigmetList = function useSigmetList(disabled) {
+var useSigmetList = function useSigmetList(disabled, timeFilter) {
   if (disabled === void 0) {
     disabled = false;
   }
-  return useAuthQuery(['sigmet-list'], getSigmetList, disabled);
+  var apiParams = timeFilter ? getApiParams(timeFilter) : {};
+  return useAuthQuery(['sigmet-list', JSON.stringify(apiParams)], function (auth) {
+    return getSigmetList(auth, apiParams);
+  }, disabled);
 };
 var useAviationWarnings = function useAviationWarnings() {
   var _useAirmetList = useAirmetList(),
     airmets = _useAirmetList.data;
   var _useSigmetList = useSigmetList(),
     sigmets = _useSigmetList.data;
-  return (airmets || []).concat(sigmets || []);
+  return (airmets != null ? airmets : []).concat(sigmets != null ? sigmets : []);
 };
 var useProductConfig = function useProductConfig(warningType, disabled) {
   if (disabled === void 0) {
@@ -4717,108 +5035,192 @@ var useProductConfig = function useProductConfig(warningType, disabled) {
   var sigmetQuery = useAuthQuery(['sigmet-config'], getSigmetConfig, disabled);
   return warningType === 'airmet' ? airmetQuery : sigmetQuery;
 };
-var useTACApi = function useTACApi() {
+var useFetchSigmetTAC = function useFetchSigmetTAC(product, enabled) {
+  if (enabled === void 0) {
+    enabled = true;
+  }
   var _useAuthenticationCon = useAuthenticationContext(),
     auth = _useAuthenticationCon.auth;
-  var queryClient = useQueryClient();
-  var fetchSigmetTAC = function fetchSigmetTAC(product) {
-    return queryClient.fetchQuery({
-      queryKey: ['sigmet-tac', product],
-      queryFn: function queryFn() {
-        return getSigmetTAC(auth, product);
-      },
-      staleTime: 1000 * 15
-    });
-  };
-  var fetchAirmetTAC = function fetchAirmetTAC(product) {
-    return queryClient.fetchQuery({
-      queryKey: ['airmet-tac', product],
-      queryFn: function queryFn() {
-        return getAirmetTAC(auth, product);
-      },
-      staleTime: 1000 * 15
-    });
-  };
-  var fetchSigmetCancelTAC = function fetchSigmetCancelTAC(product) {
-    return queryClient.fetchQuery({
-      queryKey: ['sigmet-cancel-tac', product],
-      queryFn: function queryFn() {
-        return getSigmetCancelTAC(auth, product);
-      },
-      staleTime: 1000 * 15
-    });
-  };
-  var fetchAirmetCancelTAC = function fetchAirmetCancelTAC(product) {
-    return queryClient.fetchQuery({
-      queryKey: ['airmet-cancel-tac', product],
-      queryFn: function queryFn() {
-        return getAirmetCancelTAC(auth, product);
-      },
-      staleTime: 1000 * 15
-    });
-  };
-  return {
-    fetchSigmetTAC: fetchSigmetTAC,
-    fetchAirmetTAC: fetchAirmetTAC,
-    fetchSigmetCancelTAC: fetchSigmetCancelTAC,
-    fetchAirmetCancelTAC: fetchAirmetCancelTAC
-  };
+  return useQuery(Object.assign({}, aviationQueryOptions.getSigmetTAC(product, auth), {
+    enabled: enabled
+  }));
 };
-/**
- * Hook for posting a SIGMET, with feedback.
- *
- * @param snackBarMessage - Message to show on success.
- * @param onDialogClose - Optional callback to close a dialog.
- * @returns A mutation result for posting a SIGMET.
- */
-var usePostSigmet = function usePostSigmet() {
+var useFetchAirmetTAC = function useFetchAirmetTAC(product, enabled) {
+  if (enabled === void 0) {
+    enabled = true;
+  }
   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) {
-        throw new Error('Authentication context not found');
+  return useQuery(Object.assign({}, aviationQueryOptions.getAirmetTAC(product, auth), {
+    enabled: enabled
+  }));
+};
+var useFetchSigmetCancelTAC = function useFetchSigmetCancelTAC(product, enabled) {
+  if (enabled === void 0) {
+    enabled = true;
+  }
+  var _useAuthenticationCon3 = useAuthenticationContext(),
+    auth = _useAuthenticationCon3.auth;
+  return useQuery(Object.assign({}, aviationQueryOptions.getSigmetCancelTAC(product, auth), {
+    enabled: enabled
+  }));
+};
+var useFetchAirmetCancelTAC = function useFetchAirmetCancelTAC(product, enabled) {
+  if (enabled === void 0) {
+    enabled = true;
+  }
+  var _useAuthenticationCon4 = useAuthenticationContext(),
+    auth = _useAuthenticationCon4.auth;
+  return useQuery(Object.assign({}, aviationQueryOptions.getAirmetCancelTAC(product, auth), {
+    enabled: enabled
+  }));
+};
+var useTACApi = function useTACApi() {
+  var _useAuthenticationCon5 = useAuthenticationContext(),
+    auth = _useAuthenticationCon5.auth;
+  var queryClient = new QueryClient();
+  return {
+    fetchSigmetTAC: function () {
+      var _fetchSigmetTAC = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(product) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", queryClient.fetchQuery(aviationQueryOptions.getSigmetTAC(product, auth)));
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function fetchSigmetTAC(_x) {
+        return _fetchSigmetTAC.apply(this, arguments);
       }
-      return postSigmet(auth, formData);
-    },
+      return fetchSigmetTAC;
+    }(),
+    fetchAirmetTAC: function () {
+      var _fetchAirmetTAC = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(product) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", queryClient.fetchQuery(aviationQueryOptions.getAirmetTAC(product, auth)));
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function fetchAirmetTAC(_x2) {
+        return _fetchAirmetTAC.apply(this, arguments);
+      }
+      return fetchAirmetTAC;
+    }(),
+    fetchSigmetCancelTAC: function () {
+      var _fetchSigmetCancelTAC = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(product) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              return _context3.abrupt("return", queryClient.fetchQuery(aviationQueryOptions.getSigmetCancelTAC(product, auth)));
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function fetchSigmetCancelTAC(_x3) {
+        return _fetchSigmetCancelTAC.apply(this, arguments);
+      }
+      return fetchSigmetCancelTAC;
+    }(),
+    fetchAirmetCancelTAC: function () {
+      var _fetchAirmetCancelTAC = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(product) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              return _context4.abrupt("return", queryClient.fetchQuery(aviationQueryOptions.getAirmetCancelTAC(product, auth)));
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      function fetchAirmetCancelTAC(_x4) {
+        return _fetchAirmetCancelTAC.apply(this, arguments);
+      }
+      return fetchAirmetCancelTAC;
+    }()
+  };
+};
+/**
+ * Hook for posting a SIGMET, with feedback.
+ *
+ * @param snackBarMessage - Message to show on success.
+ * @param onDialogClose - Optional callback to close a dialog.
+ * @returns A mutation result for posting a SIGMET.
+ */
+var usePostSigmet = function usePostSigmet() {
+  var _useAuthenticationCon6 = useAuthenticationContext(),
+    auth = _useAuthenticationCon6.auth;
+  var dispatch = useDispatch();
+  var queryClient = useQueryClient();
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  return useMutation({
+    mutationFn: function () {
+      var _mutationFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(formData) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (auth) {
+                _context5.next = 2;
+                break;
+              }
+              throw new Error('Authentication context not found');
+            case 2:
+              return _context5.abrupt("return", postSigmet(auth, formData));
+            case 3:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }));
+      function mutationFn(_x5) {
+        return _mutationFn.apply(this, arguments);
+      }
+      return mutationFn;
+    }(),
     onError: function onError(error) {
       void queryClient.invalidateQueries({
         queryKey: ['sigmet']
       });
-      var errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
+      var formattedError = humanizeApiErrorMessage(error);
       dispatch(publicWarningFormActions.setFormError({
-        message: "Failed to save SIGMET: " + errorMessage
+        message: "Failed to save SIGMET: " + formattedError
       }));
     },
     onSuccess: function () {
-      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) {
+      var _onSuccess = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(data, variables) {
+        var snackbarKey;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               snackbarKey = getAviationSnackbarKey(variables.changeStatusTo);
-              warningType = 'SIGMET';
               dispatch(snackbarActions.openSnackbar({
                 type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
                 key: t(snackbarKey, {
-                  warningType: warningType
+                  warningType: 'SIGMET'
                 })
               }));
-              _context.next = 5;
+              _context6.next = 4;
               return queryClient.invalidateQueries({
                 queryKey: ['sigmet-list']
               });
-            case 5:
+            case 4:
             case "end":
-              return _context.stop();
+              return _context6.stop();
           }
-        }, _callee);
+        }, _callee6);
       }));
-      function onSuccess(_x, _x2) {
+      function onSuccess(_x6, _x7) {
         return _onSuccess.apply(this, arguments);
       }
       return onSuccess;
@@ -4833,53 +5235,69 @@ var usePostSigmet = function usePostSigmet() {
  * @returns A mutation result for posting an AIRMET.
  */
 var usePostAirmet = function usePostAirmet() {
-  var _useAuthenticationCon3 = useAuthenticationContext(),
-    auth = _useAuthenticationCon3.auth;
+  var _useAuthenticationCon7 = useAuthenticationContext(),
+    auth = _useAuthenticationCon7.auth;
   var dispatch = useDispatch();
   var queryClient = useQueryClient();
   var _useWarningsTranslati2 = useWarningsTranslation(),
     t = _useWarningsTranslati2.t;
   return useMutation({
-    mutationFn: function mutationFn(formData) {
-      if (!auth) {
-        throw new Error('Authentication context not found');
+    mutationFn: function () {
+      var _mutationFn2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              if (auth) {
+                _context7.next = 2;
+                break;
+              }
+              throw new Error('Authentication context not found');
+            case 2:
+              return _context7.abrupt("return", postAirmet(auth, formData));
+            case 3:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      }));
+      function mutationFn(_x8) {
+        return _mutationFn2.apply(this, arguments);
       }
-      return postAirmet(auth, formData);
-    },
+      return mutationFn;
+    }(),
     onError: function onError(error) {
       void queryClient.invalidateQueries({
         queryKey: ['airmet']
       });
-      var errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
+      var formattedError = humanizeApiErrorMessage(error);
       dispatch(publicWarningFormActions.setFormError({
-        message: "Failed to save AIRMET: " + errorMessage
+        message: "Failed to save AIRMET: " + formattedError
       }));
     },
     onSuccess: function () {
-      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) {
+      var _onSuccess2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(data, variables) {
+        var snackbarKey;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               snackbarKey = getAviationSnackbarKey(variables.changeStatusTo);
-              warningType = 'AIRMET';
               dispatch(snackbarActions.openSnackbar({
                 type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
                 key: t(snackbarKey, {
-                  warningType: warningType
+                  warningType: 'AIRMET'
                 })
               }));
-              _context2.next = 5;
+              _context8.next = 4;
               return queryClient.invalidateQueries({
                 queryKey: ['airmet-list']
               });
-            case 5:
+            case 4:
             case "end":
-              return _context2.stop();
+              return _context8.stop();
           }
-        }, _callee2);
+        }, _callee8);
       }));
-      function onSuccess(_x3, _x4) {
+      function onSuccess(_x9, _x0) {
         return _onSuccess2.apply(this, arguments);
       }
       return onSuccess;
@@ -5182,8 +5600,13 @@ var renewAviationProduct = function renewAviationProduct(aviationWarning, produc
 };
 var amendAviationProduct = function amendAviationProduct(aviationWarning, productConfig) {
   var warningDetail = aviationWarning.sigmetAirmetDetails;
-  var newValidStart = dateUtils.dateToString(new Date());
-  var newValidUntil = 'phenomenon' in warningDetail ? getDefaultValidUntilValue(productConfig, warningDetail.phenomenon, warningDetail.locationIndicatorATSR, newValidStart) : warningDetail.validDateEnd;
+  // Use your shared util to get an ISO "now" in UTC
+  var nowIso = dateUtils.getCurrentTimeAsString();
+  // Active if published start has passed (you can also include end > now if you prefer)
+  var hasStarted = !!warningDetail.validDateStart && new Date(warningDetail.validDateStart).getTime() <= new Date(nowIso).getTime();
+  // Only when already active do we snap start to now and recompute end
+  var newValidStart = hasStarted ? nowIso : warningDetail.validDateStart;
+  var newValidUntil = hasStarted && 'phenomenon' in warningDetail ? getDefaultValidUntilValue(productConfig, warningDetail.phenomenon, warningDetail.locationIndicatorATSR, newValidStart) : warningDetail.validDateEnd;
   var amendedWarningDetail = Object.assign({}, warningDetail, {
     validDateStart: newValidStart,
     validDateEnd: newValidUntil,
@@ -6101,6 +6524,23 @@ var AddButton = function AddButton(_ref2) {
   });
 };
 
+var WarningListDragHandle = function WarningListDragHandle() {
+  return jsx(CustomIconButton, {
+    className: "handle",
+    tabIndex: -1,
+    disableTouchRipple: true,
+    sx: {
+      '&.handle:hover': function handleHover(theme) {
+        return Object.assign({}, theme.palette.geowebColors.layerManager.dragHandleHover);
+      },
+      cursor: 'grab',
+      marginTop: 0.5,
+      paddingLeft: 0
+    },
+    children: jsx(DragHandle, {})
+  });
+};
+
 var WarningListSelect = /*#__PURE__*/React__default.memo(function (_ref) {
   var options = _ref.options,
     value = _ref.value,
@@ -6113,7 +6553,9 @@ var WarningListSelect = /*#__PURE__*/React__default.memo(function (_ref) {
     _ref$isReadOnly = _ref.isReadOnly,
     isReadOnly = _ref$isReadOnly === void 0 ? false : _ref$isReadOnly,
     _ref$displayEmpty = _ref.displayEmpty,
-    displayEmpty = _ref$displayEmpty === void 0 ? false : _ref$displayEmpty;
+    displayEmpty = _ref$displayEmpty === void 0 ? false : _ref$displayEmpty,
+    _ref$validationResult = _ref.validationResult,
+    validationResult = _ref$validationResult === void 0 ? true : _ref$validationResult;
   var currentIndex = options.findIndex(function (option) {
     return option.value === value;
   });
@@ -6146,6 +6588,8 @@ var WarningListSelect = /*#__PURE__*/React__default.memo(function (_ref) {
             WebkitTextFillColor: 'inherit'
           }
         }
+      }, validationResult !== true && {
+        backgroundColor: "geowebColors.functional." + validationResult + "Outline.fill"
       }, additionalStyling),
       currentIndex: currentIndex > -1 ? currentIndex : undefined,
       renderValue: renderValue,
@@ -6287,100 +6731,257 @@ var WindForceSelect = function WindForceSelect(_ref) {
   });
 };
 
-var WarningListDragHandle = function WarningListDragHandle() {
-  return jsx(CustomIconButton, {
-    className: "handle",
-    tabIndex: -1,
-    disableTouchRipple: true,
-    sx: {
-      '&.handle:hover': function handleHover(theme) {
-        return Object.assign({}, theme.palette.geowebColors.layerManager.dragHandleHover);
-      },
-      cursor: 'grab',
-      marginTop: 0.5
-    },
-    children: jsx(DragHandle, {})
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2025 - Finnish Meteorological Institute (FMI)
+ * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var isWarningEmpty = function isWarningEmpty(item) {
+  var windDirectionFrom = item.windDirectionFrom,
+    windForce = item.windForce,
+    changeType = item.changeType,
+    windDirectionTo = item.windDirectionTo,
+    assignedAreaIds = item.assignedAreaIds;
+  if (assignedAreaIds.length) {
+    return false;
+  }
+  return [windDirectionFrom, windForce, changeType, windDirectionTo].every(function (value) {
+    return value === undefined || value.trim() === '';
   });
 };
-
-var getWindDirectionsFromConfig = function getWindDirectionsFromConfig(directionConfig, t) {
-  return directionConfig.map(function (direction) {
-    return {
-      value: direction.value,
-      label: t("maritime-direction-" + direction.value) || direction.label
-    };
-  });
+var isWarningValid = function isWarningValid(item, config) {
+  var windDirectionFrom = item.windDirectionFrom,
+    windForce = item.windForce,
+    assignedAreaIds = item.assignedAreaIds,
+    changeType = item.changeType,
+    windDirectionTo = item.windDirectionTo;
+  // Direction, windspeed and areas are required.
+  if (!windDirectionFrom || !windForce || !assignedAreaIds.length) {
+    return false;
+  }
+  // If there is a Change selected, Direction to is also required
+  if (changeType && changeType !== 'NO_CHANGE' && !windDirectionTo) {
+    return false;
+  }
+  if (windDirectionTo && changeType) {
+    var result = validateWindDirectionChange(windDirectionFrom, windDirectionTo, changeType, config);
+    return result !== 'error';
+  }
+  return true;
 };
-var getWindForceFromConfig = function getWindForceFromConfig(forceConfig) {
-  if (forceConfig.maritimeLevelsSummer) {
-    return forceConfig.maritimeLevelsSummer.map(function (force) {
-      return {
-        value: force.windForce,
-        level: force.level
-      };
-    });
+var isWarningsValid = function isWarningsValid(warnings, config) {
+  // One single empty row is allowed, if not empty it should be valid
+  if (warnings.length === 1) {
+    return isWarningEmpty(warnings[0]) || isWarningValid(warnings[0], config);
   }
-  return forceConfig.maritimeLevelsWinter.map(function (force) {
-    return {
-      value: force.windForce,
-      level: force.level
-    };
+  return warnings.every(function (warning) {
+    return !isWarningEmpty(warning) && isWarningValid(warning, config);
   });
 };
-var getChangeTypeFromConfig = function getChangeTypeFromConfig(changeConfig, t) {
-  return changeConfig.map(function (change) {
-    return {
-      value: change.key,
-      label: t("maritime-change-" + change.key) || change.label
-    };
+var getLevelFromWindForce = function getLevelFromWindForce(maritimeConfig, windForce) {
+  var _maritimeConfig$marit;
+  var period = maritimeConfig.maritimeLevelDefinition.maritimeLevelsSummer ? 'maritimeLevelsSummer' : 'maritimeLevelsWinter';
+  var levelInfo = (_maritimeConfig$marit = maritimeConfig.maritimeLevelDefinition) == null ? void 0 : _maritimeConfig$marit[period].find(function (level) {
+    return (level == null ? void 0 : level.windForce) === windForce;
   });
+  return (levelInfo == null ? void 0 : levelInfo.level) || 'extreme';
 };
-var WarningListItem$1 = /*#__PURE__*/React__default.memo(function (_ref) {
-  var warning = _ref.warning,
-    areas = _ref.areas,
-    selectedAreaIds = _ref.selectedAreaIds,
-    onAddClick = _ref.onAddClick,
-    onRemove = _ref.onRemove,
-    onChange = _ref.onChange,
-    onToggleSelectArea = _ref.onToggleSelectArea,
-    onSelectMultipleAreas = _ref.onSelectMultipleAreas,
-    onRemoveArea = _ref.onRemoveArea,
-    isReadOnly = _ref.isReadOnly,
-    _ref$shouldShowDistri = _ref.shouldShowDistricts,
-    shouldShowDistricts = _ref$shouldShowDistri === void 0 ? false : _ref$shouldShowDistri,
-    maritimeConfig = _ref.maritimeConfig;
-  var areasById = React__default.useMemo(function () {
-    return new Map(areas.map(function (area) {
-      return [area.districtName, area];
-    }));
-  }, [areas]);
-  var assignedAreas = React__default.useMemo(function () {
-    return warning.assignedAreaIds.map(function (areaId) {
-      return areasById.get(areaId);
-    }).filter(function (area) {
-      return area !== undefined;
-    });
-  }, [warning.assignedAreaIds, areasById]);
-  var _useWarningsTranslati = useWarningsTranslation(),
-    t = _useWarningsTranslati.t;
-  var handleChangeFromDirection = React__default.useCallback(function (value) {
-    onChange(warning.id, {
-      windDirectionFrom: value
-    });
-  }, [onChange, warning.id]);
-  var handleChangeWindForce = React__default.useCallback(function (value) {
-    onChange(warning.id, {
-      windForce: value
-    });
-  }, [onChange, warning]);
-  var handleChangeWindChangeType = React__default.useCallback(function (value) {
-    onChange(warning.id, {
-      changeType: value
-    });
-    if (value === 'NO_CHANGE') {
-      onChange(warning.id, {
-        windDirectionTo: ''
-      });
+var getType = function getType(domain) {
+  switch (domain) {
+    case 'coastalWaters':
+      return 'maritimeWarningCoastal';
+    case 'northSeaDistricts':
+    default:
+      return 'maritimeWarningNorthSea';
+  }
+};
+var mapItemsToMaritimeWarnings = function mapItemsToMaritimeWarnings(warnings, domain, maritimeConfig, editor) {
+  var type = getType(domain);
+  if (warnings.length === 1 && warnings[0].assignedAreaIds.length === 0) {
+    // 1 warning without any areas means cancel/withdraw all warnings
+    return [{
+      type: type,
+      editor: editor,
+      status: PublicWarningStatus.PUBLISHED,
+      warningDetail: {
+        areas: [],
+        domain: type
+      }
+    }];
+  }
+  return warnings.map(function (warning) {
+    return {
+      type: type,
+      editor: editor,
+      status: PublicWarningStatus.PUBLISHED,
+      warningDetail: {
+        phenomenon: 'wind',
+        validFrom: new Date().toISOString(),
+        validUntil: new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString(),
+        level: getLevelFromWindForce(maritimeConfig, warning.windForce || ''),
+        probability: 100,
+        areas: warning.assignedAreaIds.map(function (areaId) {
+          var areaDetails = maritimeConfig.districtList[domain].find(function (district) {
+            return district.districtName === areaId;
+          });
+          return {
+            objectName: areaId,
+            geoJSON: (areaDetails == null ? void 0 : areaDetails.geoJSON) || {
+              type: 'FeatureCollection',
+              features: []
+            }
+          };
+        }),
+        windDirectionFrom: warning.windDirectionFrom,
+        windForce: warning.windForce,
+        changeType: warning.changeType || 'NO_CHANGE',
+        windDirectionTo: warning.windDirectionTo,
+        descriptionOriginal: '',
+        descriptionTranslation: '',
+        domain: type
+      }
+    };
+  });
+};
+var mapMaritimeWarningsToItems = function mapMaritimeWarningsToItems(warnings) {
+  return warnings.map(function (warning) {
+    var _warning$warningDetai;
+    return {
+      id: warning.id || '',
+      assignedAreaIds: ((_warning$warningDetai = warning.warningDetail.areas) == null ? void 0 : _warning$warningDetai.map(function (area) {
+        return area.objectName;
+      })) || [],
+      windDirectionFrom: warning.warningDetail.windDirectionFrom,
+      windDirectionTo: warning.warningDetail.windDirectionTo,
+      windForce: warning.warningDetail.windForce,
+      changeType: warning.warningDetail.changeType,
+      validFrom: warning.warningDetail.validFrom,
+      validUntil: warning.warningDetail.validUntil
+    };
+  });
+};
+var getDegreesFromDirection = function getDegreesFromDirection(maritimeConfig, direction) {
+  var _directionDefinition$;
+  var directionDefinition = maritimeConfig.windDirectionDefinition.find(function (item) {
+    return item.value === direction;
+  });
+  return (_directionDefinition$ = directionDefinition == null ? void 0 : directionDefinition.degrees) != null ? _directionDefinition$ : undefined;
+};
+var validateWindDirectionChange = function validateWindDirectionChange(directionFrom, directionTo, changeType, config) {
+  if (!directionFrom || !directionTo || !changeType || !config || changeType === 'NO_CHANGE') {
+    return true;
+  }
+  var directionFromDegrees = getDegreesFromDirection(config, directionFrom);
+  var directionToDegrees = getDegreesFromDirection(config, directionTo);
+  if (directionFromDegrees === undefined || directionToDegrees === undefined) {
+    return true;
+  }
+  if (directionFromDegrees === directionToDegrees) {
+    return 'error';
+  }
+  var max = config.validation.dirTo.max_wind_change;
+  var min = config.validation.dirTo.min_wind_change;
+  // Calculate the absolute angular difference (0-360)
+  var diff = changeType === 'BACKING' ? (directionFromDegrees - directionToDegrees + 360) % 360 : (directionToDegrees - directionFromDegrees + 360) % 360;
+  if (diff > max.value) {
+    return max.level;
+  }
+  if (diff < min.value) {
+    return min.level;
+  }
+  return true;
+};
+
+var getWindDirectionsFromConfig = function getWindDirectionsFromConfig(directionConfig, t) {
+  return directionConfig.map(function (direction) {
+    return {
+      value: direction.value,
+      label: t("maritime-direction-" + direction.value) || direction.label
+    };
+  });
+};
+var getWindForceFromConfig = function getWindForceFromConfig(forceConfig) {
+  if (forceConfig.maritimeLevelsSummer) {
+    return forceConfig.maritimeLevelsSummer.map(function (force) {
+      return {
+        value: force.windForce,
+        level: force.level
+      };
+    });
+  }
+  return forceConfig.maritimeLevelsWinter.map(function (force) {
+    return {
+      value: force.windForce,
+      level: force.level
+    };
+  });
+};
+var getChangeTypeFromConfig = function getChangeTypeFromConfig(changeConfig, t) {
+  return changeConfig.map(function (change) {
+    return {
+      value: change.key,
+      label: t("maritime-change-" + change.key) || change.label
+    };
+  });
+};
+var WarningListItem$1 = /*#__PURE__*/React__default.memo(function (_ref) {
+  var warning = _ref.warning,
+    areas = _ref.areas,
+    selectedAreaIds = _ref.selectedAreaIds,
+    onAddClick = _ref.onAddClick,
+    onRemove = _ref.onRemove,
+    onChange = _ref.onChange,
+    onToggleSelectArea = _ref.onToggleSelectArea,
+    onSelectMultipleAreas = _ref.onSelectMultipleAreas,
+    onRemoveArea = _ref.onRemoveArea,
+    isReadOnly = _ref.isReadOnly,
+    _ref$shouldShowDistri = _ref.shouldShowDistricts,
+    shouldShowDistricts = _ref$shouldShowDistri === void 0 ? false : _ref$shouldShowDistri,
+    maritimeConfig = _ref.maritimeConfig;
+  var areasById = React__default.useMemo(function () {
+    return new Map(areas.map(function (area) {
+      return [area.districtName, area];
+    }));
+  }, [areas]);
+  var assignedAreas = React__default.useMemo(function () {
+    return warning.assignedAreaIds.map(function (areaId) {
+      return areasById.get(areaId);
+    }).filter(function (area) {
+      return area !== undefined;
+    });
+  }, [warning.assignedAreaIds, areasById]);
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  var handleChangeFromDirection = React__default.useCallback(function (value) {
+    onChange(warning.id, {
+      windDirectionFrom: value
+    });
+  }, [onChange, warning.id]);
+  var handleChangeWindForce = React__default.useCallback(function (value) {
+    onChange(warning.id, {
+      windForce: value
+    });
+  }, [onChange, warning]);
+  var handleChangeWindChangeType = React__default.useCallback(function (value) {
+    onChange(warning.id, {
+      changeType: value
+    });
+    if (value === 'NO_CHANGE') {
+      onChange(warning.id, {
+        windDirectionTo: ''
+      });
     }
   }, [onChange, warning]);
   var handleChangeToDirection = React__default.useCallback(function (value) {
@@ -6393,6 +6994,8 @@ var WarningListItem$1 = /*#__PURE__*/React__default.memo(function (_ref) {
   }, [warning.id, onAddClick]);
   var shouldDisableDirTo = warning.changeType === 'NO_CHANGE' || isReadOnly;
   var changeOptions = getChangeTypeFromConfig(maritimeConfig.changeType, t);
+  var validationResult = validateWindDirectionChange(warning.windDirectionFrom, warning.windDirectionTo, warning.changeType, maritimeConfig);
+  var showInfoIcon = validationResult !== true;
   return jsxs(StyledItem, {
     "data-testid": "maritime-warning",
     children: [!isReadOnly && jsx(WarningListDragHandle, {}), jsx(WarningListSelect, {
@@ -6440,7 +7043,8 @@ var WarningListItem$1 = /*#__PURE__*/React__default.memo(function (_ref) {
         });
         return typeof (option == null ? void 0 : option.label) === 'function' ? option.label(t) : option == null ? void 0 : option.label;
       },
-      displayEmpty: true
+      displayEmpty: true,
+      validationResult: validationResult
     }), jsx(WarningListSelect, {
       gridArea: "dirTo",
       label: t('maritime-header-direction-to'),
@@ -6448,7 +7052,24 @@ var WarningListItem$1 = /*#__PURE__*/React__default.memo(function (_ref) {
       onChange: handleChangeToDirection,
       value: warning.windDirectionTo,
       isReadOnly: shouldDisableDirTo
-    }), !isReadOnly && jsx(CustomIconButton, {
+    }), showInfoIcon ? jsx(Box, {
+      sx: {
+        gridArea: 'info',
+        justifySelf: 'left',
+        height: '24px'
+      },
+      children: jsx(CustomTooltip, {
+        title: t("maritime-wind-change-" + validationResult),
+        children: jsx("span", {
+          children: jsx(Info, {
+            sx: {
+              marginTop: 0.5,
+              color: "geowebColors.functional." + validationResult
+            }
+          })
+        })
+      })
+    }) : null, !isReadOnly && jsx(CustomIconButton, {
       sx: {
         gridArea: 'delete',
         justifySelf: 'end',
@@ -6480,10 +7101,10 @@ var StyledItem = styled('div')(function (_ref2) {
     gap: theme.spacing(0.5),
     paddingInline: theme.spacing(0.25),
     // styling for small windows
-    gridTemplateAreas: "\n        \"drag dirFrom    dirFrom windForce delete\"\n        \".    areas      areas   areas     .\"\n        \".    changeType dirTo dirTo       .\" \n    ",
-    gridTemplateColumns: '20px minmax(87px, 1fr) 1fr minmax(60px, 1fr) 20px'
+    gridTemplateAreas: "\n        \"drag dirFrom    dirFrom windForce  windForce delete\"\n        \".    areas      areas   areas      areas     .\"\n        \".    changeType dirTo   dirTo      info      .\" \n    ",
+    gridTemplateColumns: '16px minmax(82px, 1fr) 1fr minmax(60px, 1fr) 20px 20px'
   }, _ref3["@container maritime (min-width: " + breakpoints.tablet + "px)"] = {
-    gridTemplateAreas: "\n        \"drag dirFrom windForce areas changeType dirTo delete\" \n    ",
+    gridTemplateAreas: "\n        \"drag dirFrom windForce areas changeType dirTo info delete\" \n    ",
     gridTemplateColumns: 'var(--grid-columns)'
   }, _ref3;
 });
@@ -6516,7 +7137,7 @@ var WarningList = function WarningList(_ref) {
       flexDirection: 'column',
       minHeight: 0,
       marginBottom: 1,
-      '--grid-columns': '30px 150px 60px 2fr 150px 150px 1fr'
+      '--grid-columns': '16px 150px 60px 2fr 150px 150px 0.5fr 0.5fr'
     },
     children: [jsxs(Box, {
       sx: (_sx = {
@@ -6855,172 +7476,34 @@ function useConfirmDeleteDialog(_ref) {
   };
 }
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2025 - Finnish Meteorological Institute (FMI)
- * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var isWarningEmpty = function isWarningEmpty(item) {
-  var windDirectionFrom = item.windDirectionFrom,
-    windForce = item.windForce,
-    changeType = item.changeType,
-    windDirectionTo = item.windDirectionTo,
-    assignedAreaIds = item.assignedAreaIds;
-  if (assignedAreaIds.length) {
-    return false;
-  }
-  return [windDirectionFrom, windForce, changeType, windDirectionTo].every(function (value) {
-    return value === undefined || value.trim() === '';
+var MaritimeWarningAvatar = function MaritimeWarningAvatar(_ref) {
+  var editor = _ref.editor,
+    _ref$tooltipPlacement = _ref.tooltipPlacement,
+    tooltipPlacement = _ref$tooltipPlacement === void 0 ? 'bottom' : _ref$tooltipPlacement;
+  return jsx(CustomTooltip, {
+    title: "Editor: " + editor,
+    placement: tooltipPlacement,
+    children: jsx("span", {
+      children: jsx(Avatar, {
+        size: "small",
+        children: getInitials(editor)
+      })
+    })
   });
 };
-var isWarningValid = function isWarningValid(item) {
-  var windDirectionFrom = item.windDirectionFrom,
-    windForce = item.windForce,
-    assignedAreaIds = item.assignedAreaIds,
-    changeType = item.changeType,
-    windDirectionTo = item.windDirectionTo;
-  // Direction, windspeed and areas are required.
-  if (!windDirectionFrom || !windForce || !assignedAreaIds.length) {
-    return false;
-  }
-  // If there is a Change selected, Direction to is also required
-  if (changeType && changeType !== 'NO_CHANGE') {
-    return !!windDirectionTo;
-  }
-  return true;
-};
-var isWarningsValid = function isWarningsValid(warnings) {
-  // One single empty row is allowed, if not empty it should be valid
-  if (warnings.length === 1) {
-    return isWarningEmpty(warnings[0]) || isWarningValid(warnings[0]);
-  }
-  return warnings.every(function (warning) {
-    return !isWarningEmpty(warning) && isWarningValid(warning);
-  });
+
+var spinnerSx$1 = {
+  width: '16px!important',
+  height: '16px!important',
+  position: 'absolute',
+  top: 0,
+  bottom: 0,
+  margin: 'auto',
+  marginLeft: 1
 };
-var getLevelFromWindForce = function getLevelFromWindForce(maritimeConfig, windForce) {
-  var _maritimeConfig$marit;
-  var period = maritimeConfig.maritimeLevelDefinition.maritimeLevelsSummer ? 'maritimeLevelsSummer' : 'maritimeLevelsWinter';
-  var levelInfo = (_maritimeConfig$marit = maritimeConfig.maritimeLevelDefinition) == null ? void 0 : _maritimeConfig$marit[period].find(function (level) {
-    return (level == null ? void 0 : level.windForce) === windForce;
-  });
-  return (levelInfo == null ? void 0 : levelInfo.level) || 'extreme';
-};
-var getType = function getType(domain) {
-  switch (domain) {
-    case 'coastalWaters':
-      return 'maritimeWarningCoastal';
-    case 'northSeaDistricts':
-    default:
-      return 'maritimeWarningNorthSea';
-  }
-};
-var mapItemsToMaritimeWarnings = function mapItemsToMaritimeWarnings(warnings, domain, maritimeConfig, editor) {
-  var type = getType(domain);
-  if (warnings.length === 1 && warnings[0].assignedAreaIds.length === 0) {
-    // 1 warning without any areas means cancel/withdraw all warnings
-    return [{
-      type: type,
-      editor: editor,
-      status: PublicWarningStatus.PUBLISHED,
-      warningDetail: {
-        areas: [],
-        domain: type
-      }
-    }];
-  }
-  return warnings.map(function (warning) {
-    return {
-      type: type,
-      editor: editor,
-      status: PublicWarningStatus.PUBLISHED,
-      warningDetail: {
-        phenomenon: 'wind',
-        validFrom: new Date().toISOString(),
-        validUntil: new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString(),
-        level: getLevelFromWindForce(maritimeConfig, warning.windForce || ''),
-        probability: 100,
-        areas: warning.assignedAreaIds.map(function (areaId) {
-          var areaDetails = maritimeConfig.districtList[domain].find(function (district) {
-            return district.districtName === areaId;
-          });
-          return {
-            objectName: areaId,
-            geoJSON: (areaDetails == null ? void 0 : areaDetails.geoJSON) || {
-              type: 'FeatureCollection',
-              features: []
-            }
-          };
-        }),
-        windDirectionFrom: warning.windDirectionFrom,
-        windForce: warning.windForce,
-        changeType: warning.changeType || 'NO_CHANGE',
-        windDirectionTo: warning.windDirectionTo,
-        descriptionOriginal: '',
-        descriptionTranslation: '',
-        domain: type
-      }
-    };
-  });
-};
-var mapMaritimeWarningsToItems = function mapMaritimeWarningsToItems(warnings) {
-  return warnings.map(function (warning) {
-    var _warning$warningDetai;
-    return {
-      id: warning.id || '',
-      assignedAreaIds: ((_warning$warningDetai = warning.warningDetail.areas) == null ? void 0 : _warning$warningDetai.map(function (area) {
-        return area.objectName;
-      })) || [],
-      windDirectionFrom: warning.warningDetail.windDirectionFrom,
-      windDirectionTo: warning.warningDetail.windDirectionTo,
-      windForce: warning.warningDetail.windForce,
-      changeType: warning.warningDetail.changeType,
-      validFrom: warning.warningDetail.validFrom,
-      validUntil: warning.warningDetail.validUntil
-    };
-  });
-};
-
-var MaritimeWarningAvatar = function MaritimeWarningAvatar(_ref) {
-  var editor = _ref.editor,
-    _ref$tooltipPlacement = _ref.tooltipPlacement,
-    tooltipPlacement = _ref$tooltipPlacement === void 0 ? 'bottom' : _ref$tooltipPlacement;
-  return jsx(CustomTooltip, {
-    title: "Editor: " + editor,
-    placement: tooltipPlacement,
-    children: jsx("span", {
-      children: jsx(Avatar, {
-        size: "small",
-        children: getInitials(editor)
-      })
-    })
-  });
-};
-
-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 validUntil = warnings.length > 0 && warnings[0].validUntil ? dateUtils.dateToString(dateUtils.createDate(warnings[0].validUntil), dateUtils.DATE_FORMAT_NAME_OF_DAY_MONTH) : '';
-  return validUntil ? "" + t('maritime-warning-validuntil') + validUntil : '';
+var getWarningsValidity = function getWarningsValidity(t, warnings) {
+  var validUntil = warnings.length > 0 && warnings[0].validUntil ? dateUtils.dateToString(dateUtils.createDate(warnings[0].validUntil), dateUtils.DATE_FORMAT_NAME_OF_DAY_MONTH) : '';
+  return validUntil ? "" + t('maritime-warning-validuntil') + validUntil : '';
 };
 var MaritimeWarningsForm = function MaritimeWarningsForm(_ref) {
   var _sx, _sx2, _sx3, _sx4;
@@ -7083,7 +7566,7 @@ var MaritimeWarningsForm = function MaritimeWarningsForm(_ref) {
       }
     }, _callee);
   })), [onClear, t, showConfirmDialog]);
-  var isValid = isWarningsValid(warnings);
+  var isValid = isWarningsValid(warnings, maritimeConfig);
   var onSwitchMode = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
       var checked, isReadOnly;
@@ -7614,173 +8097,6 @@ var MaritimeWarningsFormConnect = function MaritimeWarningsFormConnect(_ref) {
   });
 };
 
-var CancelAviationDialogContent = function CancelAviationDialogContent(_ref) {
-  var product = _ref.product,
-    warningType = _ref.warningType;
-  var _useTACApi = useTACApi(),
-    fetchSigmetCancelTAC = _useTACApi.fetchSigmetCancelTAC,
-    fetchAirmetCancelTAC = _useTACApi.fetchAirmetCancelTAC,
-    fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
-    fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
-  var _React$useState = React__default.useState(null),
-    cancelTAC = _React$useState[0],
-    setCancelTAC = _React$useState[1];
-  var _React$useState2 = React__default.useState(null),
-    currentTAC = _React$useState2[0],
-    setCurrentTAC = _React$useState2[1];
-  var _useWarningsTranslati = useWarningsTranslation(),
-    t = _useWarningsTranslati.t;
-  React__default.useEffect(function () {
-    var fetchData = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var cancelResult, currentResult;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              if (!(warningType === 'sigmet')) {
-                _context.next = 7;
-                break;
-              }
-              _context.next = 4;
-              return fetchSigmetCancelTAC(product);
-            case 4:
-              _context.t0 = _context.sent;
-              _context.next = 10;
-              break;
-            case 7:
-              _context.next = 9;
-              return fetchAirmetCancelTAC(product);
-            case 9:
-              _context.t0 = _context.sent;
-            case 10:
-              cancelResult = _context.t0;
-              setCancelTAC(cancelResult.data);
-              if (!(warningType === 'sigmet')) {
-                _context.next = 18;
-                break;
-              }
-              _context.next = 15;
-              return fetchSigmetTAC(product);
-            case 15:
-              _context.t1 = _context.sent;
-              _context.next = 21;
-              break;
-            case 18:
-              _context.next = 20;
-              return fetchAirmetTAC(product);
-            case 20:
-              _context.t1 = _context.sent;
-            case 21:
-              currentResult = _context.t1;
-              setCurrentTAC(currentResult.data);
-              _context.next = 27;
-              break;
-            case 25:
-              _context.prev = 25;
-              _context.t2 = _context["catch"](0);
-            case 27:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, null, [[0, 25]]);
-      }));
-      return function fetchData() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    void fetchData();
-  }, [fetchAirmetCancelTAC, fetchAirmetTAC, fetchSigmetCancelTAC, fetchSigmetTAC, product, warningType]);
-  var tacBlockStyle = {
-    whiteSpace: 'pre-wrap',
-    wordBreak: 'break-word',
-    overflowX: 'auto',
-    overflowY: 'auto',
-    maxWidth: '100%',
-    fontFamily: 'monospace',
-    fontSize: '0.9rem',
-    minHeight: 120,
-    maxHeight: 140
-  };
-  var renderTacWithSequence = function renderTacWithSequence(tac, noTacKey, product) {
-    if (!tac) {
-      return jsx(Box, {
-        component: "pre",
-        sx: tacBlockStyle,
-        children: t(noTacKey)
-      });
-    }
-    var noTac = t(noTacKey);
-    var hasTac = tac.split('\n').length > 0 && tac !== noTac;
-    var sequenceNumberInTac = findSequenceNumber(tac, noTac);
-    var sequenceStyle = getSequenceStyling(product, hasTac);
-    var words = tac.split(' ');
-    return jsxs(Box, {
-      component: "pre",
-      sx: tacBlockStyle,
-      children: [jsx(Box, {
-        component: "span",
-        sx: {
-          fontWeight: 'bold',
-          fontSize: 12,
-          mr: 1.5
-        },
-        children: t('tac-label')
-      }), words.map(function (word, i) {
-        return jsx(Box
-        // eslint-disable-next-line react/no-array-index-key
-        , {
-          component: "span",
-          sx: hasTac && word === sequenceNumberInTac ? sequenceStyle : {},
-          children: word + (i < words.length - 1 ? ' ' : '')
-        }, word + "-" + i);
-      })]
-    });
-  };
-  return jsxs(Box, {
-    sx: {
-      width: '500px',
-      maxWidth: '600px'
-    },
-    children: [jsx(Typography, {
-      variant: "subtitle2",
-      marginTop: "15px",
-      children: jsx("strong", {
-        children: t('cancel-message')
-      })
-    }), jsx("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'flex-start'
-      },
-      children: renderTacWithSequence(cancelTAC, 'tac-missing-data')
-    }), jsx(Typography, {
-      variant: "subtitle2",
-      children: jsx("strong", {
-        children: t('will-cancel-message')
-      })
-    }), jsx("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'flex-start'
-      },
-      children: jsxs(Box, {
-        component: "pre",
-        sx: tacBlockStyle,
-        children: [jsx(Box, {
-          component: "span",
-          sx: {
-            fontWeight: 'bold',
-            fontSize: 12,
-            mr: 1.5
-          },
-          children: t('tac-label')
-        }), currentTAC != null ? currentTAC : t('tac-missing-data')]
-      })
-    })]
-  });
-};
-
 var _excluded$3 = ["IS_DRAFT", "object", "translation-select"];
 var useScrollTopOnError = function useScrollTopOnError(error) {
   var ref = React.useRef(null);
@@ -8044,11 +8360,8 @@ var Form = function Form(_ref5) {
     isPublishing = _React$useState[0],
     setIsPublishing = _React$useState[1];
   var _React$useState2 = React.useState(false),
-    isCancelling = _React$useState2[0],
-    setIsCancelling = _React$useState2[1];
-  var _React$useState3 = React.useState(false),
-    isSaving = _React$useState3[0],
-    setIsSaving = _React$useState3[1];
+    isSaving = _React$useState2[0],
+    setIsSaving = _React$useState2[1];
   var _useTACApi = useTACApi(),
     fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
     fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
@@ -8077,12 +8390,12 @@ var Form = function Form(_ref5) {
     };
   }, [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],
-    setWarningGeoJSONFeature = _React$useState4[1];
-  var _React$useState5 = React.useState(publicWarningDetails == null ? void 0 : publicWarningDetails.areas),
-    originalWarningAreas = _React$useState5[0],
-    setOriginalWarningAreas = _React$useState5[1];
+  var _React$useState3 = React.useState(initialPublicWarningArea),
+    warningGeoJSONFeature = _React$useState3[0],
+    setWarningGeoJSONFeature = _React$useState3[1];
+  var _React$useState4 = React.useState(publicWarningDetails == null ? void 0 : publicWarningDetails.areas),
+    originalWarningAreas = _React$useState4[0],
+    setOriginalWarningAreas = _React$useState4[1];
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var _useFormContext = useFormContext(),
@@ -8164,12 +8477,7 @@ var Form = function Form(_ref5) {
       confirmLabel: getConfirmationDialogButtonLabel(t, action, warningType || 'airmet'),
       cancelLabel: getConfirmationDialogCancelLabel(t, action),
       catchOnCancel: action === ProductAction.CLOSE,
-      content:
-      // eslint-disable-next-line no-nested-ternary
-      action === ProductAction.CANCEL ? jsx(CancelAviationDialogContent, {
-        product: selectedAviationProduct,
-        warningType: warningType
-      }) : isVAPhenomenon(selectedAviationProduct, action) && !isShortTest() ? jsx(FormProvider, Object.assign({}, formMethods, {
+      content: isVAPhenomenon(selectedAviationProduct, action) && !isShortTest() ? jsx(FormProvider, Object.assign({}, formMethods, {
         children: jsx(CancelSigmetVolcanicMovements, {
           sigmet: selectedAviationProduct,
           productConfig: aviationConfig
@@ -8199,9 +8507,6 @@ var Form = function Form(_ref5) {
     };
   }();
   var getPublishButtonLabel = function getPublishButtonLabel() {
-    if (isCancelling) {
-      return t('cancelling');
-    }
     if (isPublishing) {
       return t('warning-button-publishing');
     }
@@ -8225,7 +8530,7 @@ var Form = function Form(_ref5) {
             return _context0.abrupt("return");
           case 2:
             _context0.t0 = action;
-            _context0.next = _context0.t0 === ProductAction.SAVE ? 5 : _context0.t0 === ProductAction.PUBLISH ? 14 : _context0.t0 === ProductAction.CANCEL ? 17 : _context0.t0 === ProductAction.AMEND ? 19 : _context0.t0 === ProductAction.RENEW ? 21 : _context0.t0 === ProductAction.DISCARD ? 21 : _context0.t0 === ProductAction.DUPLICATE ? 21 : _context0.t0 === ProductAction.CLOSE ? 21 : 22;
+            _context0.next = _context0.t0 === ProductAction.SAVE ? 5 : _context0.t0 === ProductAction.PUBLISH ? 14 : _context0.t0 === ProductAction.AMEND ? 17 : _context0.t0 === ProductAction.RENEW ? 19 : _context0.t0 === ProductAction.DISCARD ? 19 : _context0.t0 === ProductAction.DUPLICATE ? 19 : _context0.t0 === ProductAction.CLOSE ? 19 : 20;
             break;
           case 5:
             toggleIsDraft(true);
@@ -8244,7 +8549,7 @@ var Form = function Form(_ref5) {
             })["catch"](function () {});
           case 12:
             setIsSaving(false);
-            return _context0.abrupt("break", 23);
+            return _context0.abrupt("break", 21);
           case 14:
             toggleIsDraft(false);
             void handleSubmit(/*#__PURE__*/function () {
@@ -8279,17 +8584,8 @@ var Form = function Form(_ref5) {
                 return _ref11.apply(this, arguments);
               };
             }())();
-            return _context0.abrupt("break", 23);
+            return _context0.abrupt("break", 21);
           case 17:
-            void showConfirmDialog(action).then(function () {
-              setIsCancelling(true);
-              void cancelAviationProduct(warningType)["finally"](function () {
-                setIsCancelling(false);
-                onCloseForm();
-              });
-            });
-            return _context0.abrupt("break", 23);
-          case 19:
             void handleSubmit(/*#__PURE__*/function () {
               var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(formValues) {
                 return _regeneratorRuntime().wrap(function _callee9$(_context9) {
@@ -8322,12 +8618,12 @@ var Form = function Form(_ref5) {
                 return _ref13.apply(this, arguments);
               };
             }())();
-            return _context0.abrupt("break", 23);
-          case 21:
-            return _context0.abrupt("break", 23);
-          case 22:
+            return _context0.abrupt("break", 21);
+          case 19:
+            return _context0.abrupt("break", 21);
+          case 20:
             console.warn("Unhandled product action: " + action);
-          case 23:
+          case 21:
           case "end":
             return _context0.stop();
         }
@@ -8404,6 +8700,9 @@ var Form = function Form(_ref5) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [initialPublicWarningArea]);
   var aviationId = selectedAviationProduct == null ? void 0 : selectedAviationProduct.uuid;
+  var publishedStart = publicWarningDetails == null ? void 0 : publicWarningDetails.validFrom;
+  var nowIso = dateUtils.getCurrentTimeAsString();
+  var lockValidFrom = formState === 'amending' && !!publishedStart && new Date(publishedStart).getTime() <= new Date(nowIso).getTime();
   React.useEffect(function () {
     if (!selectedAviationProduct) {
       return;
@@ -8444,7 +8743,7 @@ var Form = function Form(_ref5) {
             },
             storedGeoJSON: storedStartGeoJSON,
             storedEndGeoJSON: storedEndGeoJSON,
-            isAmending: formState === 'amending'
+            lockValidFrom: lockValidFrom
           })
         });
       }
@@ -8468,7 +8767,7 @@ var Form = function Form(_ref5) {
             return fetchAirmetTAC(product);
           },
           storedGeoJSON: storedStartGeoJSON,
-          isAmending: formState === 'amending'
+          lockValidFrom: lockValidFrom
         })
       });
     }
@@ -8716,7 +9015,7 @@ var Form = function Form(_ref5) {
               sx: {
                 width: '100%'
               },
-              disabled: isPublishing || isCancelling,
+              disabled: isPublishing,
               onClick: function onClick() {
                 void (selectedAviationProduct ? handleSubmitAviationProduct(ProductAction.CANCEL, warningType) : onPressPublish());
               },
@@ -8724,7 +9023,7 @@ var Form = function Form(_ref5) {
                 style: {
                   position: 'relative'
                 },
-                children: [getPublishButtonLabel(), (isPublishing || isCancelling) && jsx(CircularProgress, {
+                children: [getPublishButtonLabel(), isPublishing && jsx(CircularProgress, {
                   "data-testid": "spinner",
                   color: "inherit",
                   sx: spinnerSx
@@ -9728,18 +10027,18 @@ var AreaObjectLoaderConnect = function AreaObjectLoaderConnect(_ref) {
  * Copyright 2025 - Finnish Meteorological Institute (FMI)
  * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var useWarnings = function useWarnings(disabled) {
+var useWarnings = function useWarnings(disabled, timeFilter) {
   var _usePublicWarnings = usePublicWarnings(disabled),
     publicWarnings = _usePublicWarnings.data,
     refetchPublicWarnings = _usePublicWarnings.refetch,
     isFetchingPublicWarnings = _usePublicWarnings.isFetching,
     publicWarningsError = _usePublicWarnings.error,
     dataUpdatedAt = _usePublicWarnings.dataUpdatedAt;
-  var _useAirmetList = useAirmetList(disabled),
+  var _useAirmetList = useAirmetList(disabled, timeFilter),
     airmetWarnings = _useAirmetList.data,
     refetchAirmet = _useAirmetList.refetch,
     isFetchingAirmet = _useAirmetList.isFetching;
-  var _useSigmetList = useSigmetList(disabled),
+  var _useSigmetList = useSigmetList(disabled, timeFilter),
     sigmetWarnings = _useSigmetList.data,
     refetchSigmet = _useSigmetList.refetch,
     isFetchingSigmet = _useSigmetList.isFetching;
@@ -9828,6 +10127,7 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
   var isFormDirty = useSelector(function (store) {
     return getSelectedPublicIsFormDirty(store);
   });
+  usePreventBrowserClose(isFormDirty);
   var publicWarningState = useSelector(getPublicWarning);
   var _ref2 = publicWarningState || {},
     status = _ref2.status,
@@ -9879,6 +10179,9 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dispatch, linkedMaps == null ? void 0 : linkedMaps.join(',')]);
   React__default.useEffect(function () {
+    if (updatedWarningType === 'airmet' || updatedWarningType === 'sigmet') {
+      return;
+    }
     if (editor !== (selectedWarning == null ? void 0 : selectedWarning.editor) && status !== 'TODO') {
       void setIsEditor(editor !== (auth == null ? void 0 : auth.username));
     }
@@ -10103,300 +10406,133 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
   });
 };
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2024 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var warningColors = Object.assign({}, LevelColors);
-
-var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
-  var id = _ref.id,
-    options = _ref.options,
-    updateFilter = _ref.updateFilter;
+var BUTTON_AIRMET = 'AIRMET';
+var BUTTON_SIGMET = 'SIGMET';
+var NewWarningButton = function NewWarningButton(_ref) {
+  var onCreateWarning = _ref.onCreateWarning,
+    _ref$isDefaultOpen = _ref.isDefaultOpen,
+    isDefaultOpen = _ref$isDefaultOpen === void 0 ? false : _ref$isDefaultOpen;
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
-  var _useState = useState(null),
-    anchorEl = _useState[0],
-    setAnchorEl = _useState[1];
-  var _getSelectedOptions = getSelectedOptions(options),
-    noSelectedOptions = _getSelectedOptions.noSelectedOptions,
-    allSelected = _getSelectedOptions.allSelected;
-  var isDisabled = Object.keys(options).length < 2;
-  return jsxs(Fragment, {
-    children: [jsx(CustomTooltip, {
-      title: isDisabled ? t('filter-no-results') : t('filter-options'),
-      placement: "bottom",
-      children: jsx("span", {
-        style: {
-          margin: 0
-        },
-        children: jsx(FilterChip, {
-          id: id,
-          label: t("filter-" + id),
-          isSelected: !isDisabled && noSelectedOptions > 0,
-          onClick: function onClick(ref) {
-            return setAnchorEl(ref);
-          },
-          onClickIcon: function onClickIcon(ref) {
-            return setAnchorEl(ref);
-          },
-          isDisabled: isDisabled,
-          size: "medium",
-          actionIcon: jsxs(Grid, {
-            container: true,
-            alignItems: "center",
-            style: {
-              marginRight: '8px',
-              minWidth: '36px'
-            },
-            children: [jsx(Options, {}), jsx(Typography, {
-              variant: "body2",
-              sx: {
-                paddingLeft: 0.5
-              },
-              children: !isDisabled && noSelectedOptions > 0 && noSelectedOptions
-            })]
-          })
-        })
-      })
+  var config = sessionStorageProvider.getConfig();
+  var showMartimeWarningOption = !!config.GW_WARNINGS_MARITIME_WARNINGS;
+  var _React$useState = React__default.useState(null),
+    anchorEl = _React$useState[0],
+    setAnchorEl = _React$useState[1];
+  var isOpen = Boolean(anchorEl);
+  var handleClick = function handleClick(event) {
+    event.stopPropagation();
+    setAnchorEl(event.currentTarget);
+  };
+  var handleClose = function handleClose(event) {
+    event.stopPropagation();
+    setAnchorEl(null);
+  };
+  var onCreateNewWarning = function onCreateNewWarning(warningType, event) {
+    onCreateWarning(warningType);
+    handleClose(event);
+  };
+  var buttonId = 'newWarningButton';
+  React__default.useEffect(function () {
+    if (isDefaultOpen) {
+      setAnchorEl(document.getElementById(buttonId));
+    }
+  }, [isDefaultOpen, buttonId]);
+  return jsxs(Fragment, {
+    children: [jsxs(CustomToggleButton, {
+      id: buttonId,
+      onClick: handleClick,
+      sx: Object.assign({
+        textTransform: 'initial!important',
+        marginBottom: '8px',
+        fontSize: '12px',
+        height: '32px!important',
+        whiteSpace: 'nowrap',
+        minWidth: 'auto',
+        paddingRight: '12px!important'
+      }, isOpen ? {
+        '&.MuiToggleButton-root.primary': {
+          backgroundColor: 'geowebColors.buttons.primary.mouseOver.fill'
+        }
+      } : {}),
+      children: [jsx(Add, {}), t('warning-list-button_create')]
     }), jsxs(Menu, {
-      open: Boolean(anchorEl),
-      onClose: function onClose() {
-        return setAnchorEl(null);
-      },
       anchorEl: anchorEl,
-      slotProps: {
-        backdrop: {
-          style: {
-            opacity: 0,
-            transition: 'none'
-          }
+      open: isOpen,
+      onClose: function onClose(event, reason) {
+        if (reason === 'tabKeyDown') {
+          return;
         }
+        handleClose(event);
       },
-      sx: {
-        padding: 3
+      anchorOrigin: {
+        vertical: 'bottom',
+        horizontal: 'center'
       },
-      children: [jsxs(DialogTitle, {
-        id: "dialog-title",
-        sx: {
-          zIndex: 1,
-          padding: '8px 18px 16px 24px',
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center'
-        },
-        children: [jsx(Typography, {
-          sx: {
-            fontSize: '20px',
-            fontWeight: 500,
-            paddingRight: 1
-          },
-          "data-testid": "customDialog-title",
-          component: "span",
-          children: t("filter-" + id)
-        }), jsx(CustomIconButton, {
-          "aria-label": t('close-dialog-confirm'),
-          onClick: function onClick() {
-            return setAnchorEl(null);
-          },
-          sx: {
-            '&.MuiIconButton-root': {
-              color: 'geowebColors.greys.accessible'
-            }
-          },
-          children: jsx(Close, {})
-        })]
-      }), jsxs(DialogContent, {
-        sx: {
-          padding: '0px 24px 16px 24px'
-        },
-        children: [jsxs(Grid, {
-          container: true,
-          justifyContent: "space-between",
-          alignItems: "center",
-          children: [t('filter-select-all'), jsx(Switch, {
-            slotProps: {
-              input: {
-                'aria-label': t('filter-select-all')
+      transformOrigin: {
+        vertical: 'top',
+        horizontal: 'center'
+      },
+      slotProps: {
+        root: {
+          slotProps: {
+            backdrop: {
+              style: {
+                opacity: 0,
+                transition: 'none'
               }
-            },
-            checked: allSelected,
-            onChange: function onChange() {
-              return updateFilter(id, 'ALL', !allSelected);
-            },
-            sx: {
-              marginRight: '-12px',
-              marginTop: '-6px'
             }
-          })]
-        }), jsxs(Box, {
-          children: [options[emptyFilterId] !== undefined && jsx(FilterOption, {
-            optionId: emptyFilterId,
-            checked: options[emptyFilterId],
-            onClick: function onClick(checked, only) {
-              return updateFilter(id, emptyFilterId, checked, only);
-            },
-            labelStyle: {
-              fontSize: '16px'
-            },
-            label: jsx(Fragment, {
-              children: t(getTranslationKey(emptyFilterId, id))
-            })
-          }, id + "-" + emptyFilterId), Object.keys(options).map(function (optionId) {
-            if (optionId === emptyFilterId) {
-              return null;
-            }
-            var warningColor = warningColors[optionId];
-            return jsx(FilterOption, {
-              optionId: optionId,
-              checked: options[optionId],
-              onClick: function onClick(checked, only) {
-                return updateFilter(id, optionId, checked, only);
-              },
-              labelStyle: Object.assign({}, getLevelStyle(warningColor), {
-                width: LevelColors[optionId] ? 'fit-content' : '100%',
-                fontSize: '16px'
-              }),
-              label: jsx(CustomTooltip, {
-                title: t(getTranslationKey(optionId, id)),
-                placement: "bottom",
-                children: jsxs(Box, {
-                  "data-testid": "wrapper-" + optionId,
-                  sx: {
-                    display: 'flex',
-                    alignItems: 'center',
-                    gap: 1,
-                    maxWidth: 200
-                  },
-                  children: [getPhenomenaIcon(optionId), jsx(Typography, {
-                    noWrap: true,
-                    variant: "body2",
-                    sx: {
-                      fontSize: '16px'
-                    },
-                    children: t(getTranslationKey(optionId, id))
-                  })]
-                })
-              })
-            }, id + "-" + optionId);
-          })]
-        })]
-      })]
-    })]
-  });
-};
-
-var filterOrder = ['source', 'domain', 'phenomenon', 'level'];
-var FilterList = function FilterList(_ref) {
-  var _ref$onClickAll = _ref.onClickAll,
-    onClickAll = _ref$onClickAll === void 0 ? function () {} : _ref$onClickAll,
-    _ref$isAllSelected = _ref.isAllSelected,
-    isAllSelected = _ref$isAllSelected === void 0 ? true : _ref$isAllSelected,
-    filterState = _ref.filterState,
-    updateFilter = _ref.updateFilter;
-  var _useWarningsTranslati = useWarningsTranslation(),
-    t = _useWarningsTranslati.t;
-  return jsxs(Stack, {
-    direction: "row",
-    spacing: 1,
-    sx: {
-      display: 'block',
-      '.MuiChip-root': {
-        margin: 0,
-        marginRight: 1,
-        marginBottom: 1
-      }
-    },
-    children: [jsx(CustomTooltip, {
-      title: isAllSelected ? t('filter-hide-all') : t('filter-show-all'),
-      placement: "bottom",
-      children: jsx("span", {
-        style: {
-          margin: 0
+          }
         },
-        children: jsx(FilterChip, {
-          id: "all",
-          label: t('filter-all'),
-          isSelected: isAllSelected,
-          handleClick: function handleClick() {
-            return onClickAll(isAllSelected);
-          },
-          size: "medium"
-        })
-      })
-    }), filterOrder.map(function (filterId) {
-      return jsx(ExpandableFilterChip, {
-        id: filterId,
-        options: filterState[filterId],
-        updateFilter: updateFilter
-      }, filterId);
-    })]
-  });
-};
-
-var _excluded$2 = ["totalWarnings", "status", "isExpanded", "onClick"];
-var HEADER_SIZE = 32;
-var WarningListItemSeperator = function WarningListItemSeperator(_ref) {
-  var totalWarnings = _ref.totalWarnings,
-    status = _ref.status,
-    isExpanded = _ref.isExpanded,
-    onClick = _ref.onClick,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
-  var _useWarningsTranslati = useWarningsTranslation(),
-    t = _useWarningsTranslati.t;
-  var getStatus = function getStatus(status) {
-    switch (status) {
-      case 'DRAFT':
-        return t('warning-list-status-draft');
-      case 'PUBLISHED':
-        return t('warning-list-status-published');
-      case 'TODO':
-        return t('warning-list-status-todo');
-      default:
-        return t('warning-list-status-expired');
-    }
-  };
-  var headerText = totalWarnings + " " + getStatus(status);
-  return jsx(ListItem, Object.assign({}, props, {
-    sx: {
-      height: HEADER_SIZE,
-      padding: 0
-    },
-    "aria-label": "warninglist " + status,
-    children: jsxs(ListItemButton, {
-      sx: {
-        height: HEADER_SIZE,
-        padding: 0
+        list: {
+          style: {
+            padding: '0px'
+          }
+        }
       },
-      onClick: onClick,
-      "data-testid": "warninglist-" + status,
-      "aria-expanded": isExpanded,
-      children: [isExpanded ? jsx(ChevronDown, {}) : jsx(ChevronUp, {}), jsx(Typography, {
-        variant: "caption",
-        sx: {
-          opacity: 0.67,
-          marginLeft: 1
+      children: [jsx(MenuItem, {
+        onClick: function onClick(event) {
+          onCreateNewWarning('public', event);
+        },
+        children: jsx(ListItemText, {
+          children: t('public-warning-title').toUpperCase()
+        })
+      }, "Public"), jsx(MenuItem, {
+        onClick: function onClick(event) {
+          onCreateNewWarning('airmet', event);
         },
-        children: headerText
-      })]
-    })
-  }));
+        children: jsx(ListItemText, {
+          children: BUTTON_AIRMET
+        })
+      }, "Airmet"), jsx(MenuItem, {
+        onClick: function onClick(event) {
+          onCreateNewWarning('sigmet', event);
+        },
+        children: jsx(ListItemText, {
+          children: BUTTON_SIGMET
+        })
+      }, "Sigmet"), showMartimeWarningOption ? jsxs(Fragment, {
+        children: [jsx(MenuItem, {
+          onClick: function onClick(event) {
+            onCreateNewWarning('maritimeWarningCoastal', event);
+          },
+          children: jsx(ListItemText, {
+            children: t('maritime-warning-coastal-title').toUpperCase()
+          })
+        }, "MaritimeWarningCoastal"), jsx(MenuItem, {
+          onClick: function onClick(event) {
+            onCreateNewWarning('maritimeWarningNorthSea', event);
+          },
+          children: jsx(ListItemText, {
+            children: t('maritime-warning-northsea-title').toUpperCase()
+          })
+        }, "MaritimeWarningNorthSea")]
+      }) : null]
+    })]
+  });
 };
 
-var _excluded$1 = ["title", "status", "children", "width"];
+var _excluded$2 = ["title", "status", "children", "width"];
 var WarningListColumnContent = function WarningListColumnContent(_ref) {
   var _sx;
   var title = _ref.title,
@@ -10404,7 +10540,7 @@ var WarningListColumnContent = function WarningListColumnContent(_ref) {
     children = _ref.children,
     _ref$width = _ref.width,
     width = _ref$width === void 0 ? 76 : _ref$width,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
   return jsxs(Grid, {
     sx: Object.assign({}, props.sx, {
       width: width
@@ -10592,7 +10728,7 @@ var WarningListItemMenu = function WarningListItemMenu(_ref) {
   }
 };
 
-var _excluded = ["warning", "activeWarningId", "highlightedItem", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning", "onExpireWarning", "onWithdrawWarning", "onActionAviationWarning", "onActionMaritimeWarning"];
+var _excluded$1 = ["warning", "activeWarningId", "highlightedItem", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning", "onExpireWarning", "onWithdrawWarning", "onActionAviationWarning", "onActionMaritimeWarning"];
 var renderLevelText = function renderLevelText(levelString) {
   if (!levelString) {
     return null;
@@ -10691,7 +10827,7 @@ var WarningListItem = function WarningListItem(_ref) {
     onActionAviationWarning = _ref$onActionAviation === void 0 ? function () {} : _ref$onActionAviation,
     _ref$onActionMaritime = _ref.onActionMaritimeWarning,
     onActionMaritimeWarning = _ref$onActionMaritime === void 0 ? function () {} : _ref$onActionMaritime,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var phenomenonDetails = allPhenomenaDict[warning.warningDetail.phenomenon];
@@ -10881,182 +11017,661 @@ var WarningListItem = function WarningListItem(_ref) {
                 // Show sigmet-airmet level
                 return warning.warningDetail.level;
               }
-              return renderLevelText(defaultLevelText);
-            }()
-          })
-        }), jsx(WarningListColumnContent, {
-          title: t('areas'),
-          status: status,
-          children: jsx(Box, {
-            display: "inline-block",
-            component: "div",
-            ref: objectNameRef,
-            sx: {
-              textOverflow: 'ellipsis',
-              overflow: 'hidden',
-              width: 70,
-              whiteSpace: 'nowrap'
+              return renderLevelText(defaultLevelText);
+            }()
+          })
+        }), jsx(WarningListColumnContent, {
+          title: t('areas'),
+          status: status,
+          children: jsx(Box, {
+            display: "inline-block",
+            component: "div",
+            ref: objectNameRef,
+            sx: {
+              textOverflow: 'ellipsis',
+              overflow: 'hidden',
+              width: 70,
+              whiteSpace: 'nowrap'
+            },
+            children: jsx(CustomTooltip, {
+              title: objectHoverText,
+              placement: "top",
+              sx: {
+                zIndex: 1000
+              },
+              children: jsx("span", {
+                children: objectNameText
+              })
+            })
+          })
+        }), jsx(WarningListColumnContent, {
+          title: t('warning-list-header-status'),
+          status: status,
+          width: 96,
+          children: jsxs(Box, {
+            sx: {
+              position: 'relative'
+            },
+            children: [renderStatusIcon(warning, status), warning.editor && jsx(Box, {
+              sx: {
+                width: '16px',
+                position: 'absolute',
+                top: '1px',
+                right: '4px'
+              },
+              children: jsx(WarningAvatar, {
+                editor: warning.editor,
+                status: warning.productStatus
+              })
+            })]
+          })
+        })]
+      })
+    })
+  }), warning.id);
+};
+
+var _excluded = ["totalWarnings", "status", "isExpanded", "timeFilter", "onClick"];
+var HEADER_SIZE = 32;
+var WarningListItemSeperator = function WarningListItemSeperator(_ref) {
+  var totalWarnings = _ref.totalWarnings,
+    status = _ref.status,
+    isExpanded = _ref.isExpanded,
+    timeFilter = _ref.timeFilter,
+    onClick = _ref.onClick,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  var getStatus = function getStatus(status) {
+    switch (status) {
+      case 'DRAFT':
+        return t('warning-list-status-draft');
+      case 'PUBLISHED':
+        return t('warning-list-status-published');
+      case 'TODO':
+        return t('warning-list-status-todo');
+      default:
+        return timeFilter.mode === 'custom' ? t('warning-list-status-expired-custom-time') : t('warning-list-status-expired');
+    }
+  };
+  var headerText = totalWarnings + " " + getStatus(status);
+  return jsx(ListItem, Object.assign({}, props, {
+    sx: {
+      height: HEADER_SIZE,
+      padding: 0
+    },
+    "aria-label": "warninglist " + status,
+    children: jsxs(ListItemButton, {
+      sx: {
+        height: HEADER_SIZE,
+        padding: 0
+      },
+      onClick: onClick,
+      "data-testid": "warninglist-" + status,
+      "aria-expanded": isExpanded,
+      children: [isExpanded ? jsx(ChevronDown, {}) : jsx(ChevronUp, {}), jsx(Typography, {
+        variant: "caption",
+        sx: {
+          opacity: 0.67,
+          marginLeft: 1
+        },
+        children: headerText
+      })]
+    })
+  }));
+};
+
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2024 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var warningColors = Object.assign({}, LevelColors);
+
+var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
+  var id = _ref.id,
+    options = _ref.options,
+    updateFilter = _ref.updateFilter;
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  var _useState = useState(null),
+    anchorEl = _useState[0],
+    setAnchorEl = _useState[1];
+  var _getSelectedOptions = getSelectedOptions(options),
+    noSelectedOptions = _getSelectedOptions.noSelectedOptions,
+    allSelected = _getSelectedOptions.allSelected;
+  var isDisabled = Object.keys(options).length < 2;
+  return jsxs(Fragment, {
+    children: [jsx(CustomTooltip, {
+      title: isDisabled ? t('filter-no-results') : t('filter-options'),
+      placement: "bottom",
+      children: jsx("span", {
+        style: {
+          margin: 0
+        },
+        children: jsx(FilterChip, {
+          id: id,
+          label: t("filter-" + id),
+          isSelected: !isDisabled && noSelectedOptions > 0,
+          onClick: function onClick(ref) {
+            return setAnchorEl(ref);
+          },
+          onClickIcon: function onClickIcon(ref) {
+            return setAnchorEl(ref);
+          },
+          isDisabled: isDisabled,
+          size: "medium",
+          actionIcon: jsxs(Grid, {
+            container: true,
+            alignItems: "center",
+            style: {
+              marginRight: '8px',
+              minWidth: '36px'
+            },
+            children: [jsx(Options, {}), jsx(Typography, {
+              variant: "body2",
+              sx: {
+                paddingLeft: 0.5
+              },
+              children: !isDisabled && noSelectedOptions > 0 && noSelectedOptions
+            })]
+          })
+        })
+      })
+    }), jsxs(Menu, {
+      open: Boolean(anchorEl),
+      onClose: function onClose() {
+        return setAnchorEl(null);
+      },
+      anchorEl: anchorEl,
+      slotProps: {
+        backdrop: {
+          style: {
+            opacity: 0,
+            transition: 'none'
+          }
+        }
+      },
+      sx: {
+        padding: 3
+      },
+      children: [jsxs(DialogTitle, {
+        id: "dialog-title",
+        sx: {
+          zIndex: 1,
+          padding: '8px 18px 16px 24px',
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center'
+        },
+        children: [jsx(Typography, {
+          sx: {
+            fontSize: '20px',
+            fontWeight: 500,
+            paddingRight: 1
+          },
+          "data-testid": "customDialog-title",
+          component: "span",
+          children: t("filter-" + id)
+        }), jsx(CustomIconButton, {
+          "aria-label": t('close-dialog-confirm'),
+          onClick: function onClick() {
+            return setAnchorEl(null);
+          },
+          sx: {
+            '&.MuiIconButton-root': {
+              color: 'geowebColors.greys.accessible'
+            }
+          },
+          children: jsx(Close, {})
+        })]
+      }), jsxs(DialogContent, {
+        sx: {
+          padding: '0px 24px 16px 24px'
+        },
+        children: [jsxs(Grid, {
+          container: true,
+          justifyContent: "space-between",
+          alignItems: "center",
+          children: [t('filter-select-all'), jsx(Switch, {
+            slotProps: {
+              input: {
+                'aria-label': t('filter-select-all')
+              }
+            },
+            checked: allSelected,
+            onChange: function onChange() {
+              return updateFilter(id, 'ALL', !allSelected);
             },
-            children: jsx(CustomTooltip, {
-              title: objectHoverText,
-              placement: "top",
-              sx: {
-                zIndex: 1000
-              },
-              children: jsx("span", {
-                children: objectNameText
-              })
-            })
-          })
-        }), jsx(WarningListColumnContent, {
-          title: t('warning-list-header-status'),
-          status: status,
-          width: 96,
-          children: jsxs(Box, {
             sx: {
-              position: 'relative'
+              marginRight: '-12px',
+              marginTop: '-6px'
+            }
+          })]
+        }), jsxs(Box, {
+          children: [options[emptyFilterId] !== undefined && jsx(FilterOption, {
+            optionId: emptyFilterId,
+            checked: options[emptyFilterId],
+            onClick: function onClick(checked, only) {
+              return updateFilter(id, emptyFilterId, checked, only);
             },
-            children: [renderStatusIcon(warning, status), warning.editor && jsx(Box, {
-              sx: {
-                width: '16px',
-                position: 'absolute',
-                top: '1px',
-                right: '4px'
+            labelStyle: {
+              fontSize: '16px'
+            },
+            label: jsx(Fragment, {
+              children: t(getTranslationKey(emptyFilterId, id))
+            })
+          }, id + "-" + emptyFilterId), Object.keys(options).map(function (optionId) {
+            if (optionId === emptyFilterId) {
+              return null;
+            }
+            var warningColor = warningColors[optionId];
+            return jsx(FilterOption, {
+              optionId: optionId,
+              checked: options[optionId],
+              onClick: function onClick(checked, only) {
+                return updateFilter(id, optionId, checked, only);
               },
-              children: jsx(WarningAvatar, {
-                editor: warning.editor,
-                status: warning.productStatus
+              labelStyle: Object.assign({}, getLevelStyle(warningColor), {
+                width: LevelColors[optionId] ? 'fit-content' : '100%',
+                fontSize: '16px'
+              }),
+              label: jsx(CustomTooltip, {
+                title: t(getTranslationKey(optionId, id)),
+                placement: "bottom",
+                children: jsxs(Box, {
+                  "data-testid": "wrapper-" + optionId,
+                  sx: {
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: 1,
+                    maxWidth: 200
+                  },
+                  children: [getPhenomenaIcon(optionId), jsx(Typography, {
+                    noWrap: true,
+                    variant: "body2",
+                    sx: {
+                      fontSize: '16px'
+                    },
+                    children: t(getTranslationKey(optionId, id))
+                  })]
+                })
               })
-            })]
-          })
+            }, id + "-" + optionId);
+          })]
         })]
-      })
-    })
-  }), warning.id);
+      })]
+    })]
+  });
 };
 
-var BUTTON_AIRMET = 'AIRMET';
-var BUTTON_SIGMET = 'SIGMET';
-var NewWarningButton = function NewWarningButton(_ref) {
-  var onCreateWarning = _ref.onCreateWarning,
-    _ref$isDefaultOpen = _ref.isDefaultOpen,
-    isDefaultOpen = _ref$isDefaultOpen === void 0 ? false : _ref$isDefaultOpen;
+var TimeFilterChip = function TimeFilterChip(_ref) {
+  var _getPickerValue;
+  var timeFilter = _ref.timeFilter,
+    onUpdateTimeFilter = _ref.onUpdateTimeFilter;
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
-  var config = sessionStorageProvider.getConfig();
-  var showMartimeWarningOption = !!config.GW_WARNINGS_MARITIME_WARNINGS;
-  var _React$useState = React__default.useState(null),
-    anchorEl = _React$useState[0],
-    setAnchorEl = _React$useState[1];
-  var isOpen = Boolean(anchorEl);
-  var handleClick = function handleClick(event) {
-    event.stopPropagation();
-    setAnchorEl(event.currentTarget);
+  var _useState = useState(null),
+    anchorEl = _useState[0],
+    setAnchorEl = _useState[1];
+  var _useState2 = useState(),
+    tempCustomStart = _useState2[0],
+    setTempCustomStart = _useState2[1];
+  var _useState3 = useState(),
+    tempCustomEnd = _useState3[0],
+    setTempCustomEnd = _useState3[1];
+  var isSelected = timeFilter.mode !== TimeFilterMode.all;
+  var pickerStartValue = tempCustomStart != null ? tempCustomStart : timeFilter.customStart;
+  var pickerEndValue = tempCustomEnd != null ? tempCustomEnd : timeFilter.customEnd;
+  var handleModeChange = function handleModeChange(mode) {
+    if (mode === TimeFilterMode.custom) {
+      var _timeFilter$customSta, _timeFilter$customEnd;
+      setTempCustomStart((_timeFilter$customSta = timeFilter.customStart) != null ? _timeFilter$customSta : new Date(Date.now()).toISOString());
+      setTempCustomEnd((_timeFilter$customEnd = timeFilter.customEnd) != null ? _timeFilter$customEnd : new Date(Date.now()).toISOString());
+    }
+    var newFilter = {
+      mode: mode,
+      customStart: mode === TimeFilterMode.custom ? timeFilter.customStart : undefined,
+      customEnd: mode === TimeFilterMode.custom ? timeFilter.customEnd : undefined
+    };
+    onUpdateTimeFilter(newFilter);
   };
-  var handleClose = function handleClose(event) {
-    event.stopPropagation();
+  var handleTempTimeChange = function handleTempTimeChange(field, value) {
+    var _dateUtils$setUTCDate;
+    if (!value) {
+      if (field === 'customStart') {
+        setTempCustomStart(undefined);
+      } else {
+        setTempCustomEnd(undefined);
+      }
+      return;
+    }
+    var isoString = (_dateUtils$setUTCDate = dateUtils.setUTCDate(value)) == null ? void 0 : _dateUtils$setUTCDate.toISOString();
+    if (field === 'customStart') {
+      setTempCustomStart(isoString);
+    } else {
+      setTempCustomEnd(isoString);
+    }
+  };
+  var getPickerValue = function getPickerValue(isoString) {
+    if (!isoString) {
+      return null;
+    }
+    var utc = new Date(isoString);
+    return new Date(utc.getUTCFullYear(), utc.getUTCMonth(), utc.getUTCDate(), utc.getUTCHours(), utc.getUTCMinutes());
+  };
+  var handleApply = function handleApply() {
+    onUpdateTimeFilter({
+      mode: TimeFilterMode.custom,
+      customStart: tempCustomStart,
+      customEnd: tempCustomEnd
+    });
     setAnchorEl(null);
   };
-  var onCreateNewWarning = function onCreateNewWarning(warningType, event) {
-    onCreateWarning(warningType);
-    handleClose(event);
+  var getTimeFilterLabel = function getTimeFilterLabel(mode, t) {
+    var baseLabel = t('filter-time');
+    if (mode === TimeFilterMode.all) {
+      return baseLabel;
+    }
+    if (mode === TimeFilterMode.custom) {
+      if (!timeFilter.customStart || !timeFilter.customEnd) {
+        return baseLabel + " (" + t('filter-time-custom') + ")";
+      }
+      var currentYear = new Date().getUTCFullYear();
+      var startYear = dateUtils.getYear(timeFilter.customStart);
+      var endYear = dateUtils.getYear(timeFilter.customEnd);
+      var includeYear = startYear !== currentYear || endYear !== currentYear;
+      var dateFormat = includeYear ? dateUtils.DATE_FORMAT_DATEPICKER : dateUtils.DATE_FORMAT_DATEPICKER_NO_YEAR;
+      var start = dateUtils.dateToString(new Date(timeFilter.customStart), dateFormat);
+      var end = dateUtils.dateToString(new Date(timeFilter.customEnd), dateFormat);
+      return baseLabel + " (" + start + " - " + end + ")";
+    }
+    return baseLabel + " (" + t("filter-time-" + mode) + ")";
   };
-  var buttonId = 'newWarningButton';
-  React__default.useEffect(function () {
-    if (isDefaultOpen) {
-      setAnchorEl(document.getElementById(buttonId));
-    }
-  }, [isDefaultOpen, buttonId]);
   return jsxs(Fragment, {
-    children: [jsxs(CustomToggleButton, {
-      id: buttonId,
-      onClick: handleClick,
-      sx: Object.assign({
-        textTransform: 'initial!important',
-        marginBottom: '8px',
-        fontSize: '12px',
-        height: '32px!important',
-        whiteSpace: 'nowrap',
-        minWidth: 'auto',
-        paddingRight: '12px!important'
-      }, isOpen ? {
-        '&.MuiToggleButton-root.primary': {
-          backgroundColor: 'geowebColors.buttons.primary.mouseOver.fill'
-        }
-      } : {}),
-      children: [jsx(Add, {}), t('warning-list-button_create')]
+    children: [jsx(CustomTooltip, {
+      title: t('filter-time'),
+      placement: "bottom",
+      children: jsx(Box, {
+        children: jsx(FilterChip, {
+          id: "time",
+          label: jsxs(Box, {
+            sx: {
+              display: 'flex',
+              alignItems: 'center',
+              gap: 0.5
+            },
+            children: [jsx(Clock, {
+              sx: {
+                mr: 1
+              }
+            }), getTimeFilterLabel(timeFilter.mode, t)]
+          }),
+          isSelected: isSelected,
+          onClick: function onClick(ref) {
+            return setAnchorEl(ref);
+          },
+          size: "medium",
+          actionIcon: jsx(Grid, {
+            container: true,
+            alignItems: "center",
+            style: {
+              marginRight: '8px',
+              minWidth: '24px'
+            },
+            children: jsx(ChevronDown, {
+              fontSize: "small",
+              sx: {
+                ml: 1
+              }
+            })
+          }),
+          onClickIcon: function onClickIcon(ref) {
+            return setAnchorEl(ref);
+          }
+        })
+      })
     }), jsxs(Menu, {
-      anchorEl: anchorEl,
-      open: isOpen,
-      onClose: function onClose(event, reason) {
-        if (reason === 'tabKeyDown') {
-          return;
-        }
-        handleClose(event);
-      },
-      anchorOrigin: {
-        vertical: 'bottom',
-        horizontal: 'center'
-      },
-      transformOrigin: {
-        vertical: 'top',
-        horizontal: 'center'
+      open: Boolean(anchorEl),
+      onClose: function onClose() {
+        return setAnchorEl(null);
       },
+      anchorEl: anchorEl,
       slotProps: {
-        root: {
-          slotProps: {
-            backdrop: {
-              style: {
-                opacity: 0,
-                transition: 'none'
-              }
-            }
-          }
-        },
-        list: {
+        backdrop: {
           style: {
-            padding: '0px'
+            opacity: 0,
+            transition: 'none'
           }
         }
       },
-      children: [jsx(MenuItem, {
-        onClick: function onClick(event) {
-          onCreateNewWarning('public', event);
-        },
-        children: jsx(ListItemText, {
-          children: t('public-warning-title').toUpperCase()
-        })
-      }, "Public"), jsx(MenuItem, {
-        onClick: function onClick(event) {
-          onCreateNewWarning('airmet', event);
+      sx: {
+        padding: 3
+      },
+      children: [jsxs(DialogTitle, {
+        id: "dialog-title",
+        sx: {
+          zIndex: 1,
+          padding: '8px 18px 16px 24px',
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center'
         },
-        children: jsx(ListItemText, {
-          children: BUTTON_AIRMET
-        })
-      }, "Airmet"), jsx(MenuItem, {
-        onClick: function onClick(event) {
-          onCreateNewWarning('sigmet', event);
+        children: [jsx(Typography, {
+          sx: {
+            fontSize: '20px',
+            fontWeight: 500,
+            paddingRight: 1
+          },
+          component: "span",
+          children: t('filter-time')
+        }), jsx(CustomIconButton, {
+          "aria-label": t('close-dialog-confirm'),
+          onClick: function onClick() {
+            return setAnchorEl(null);
+          },
+          sx: {
+            '&.MuiIconButton-root': {
+              color: 'geowebColors.greys.accessible'
+            }
+          },
+          children: jsx(Close, {})
+        })]
+      }), jsxs(DialogContent, {
+        sx: {
+          padding: '0px 24px 16px 24px'
         },
-        children: jsx(ListItemText, {
-          children: BUTTON_SIGMET
-        })
-      }, "Sigmet"), showMartimeWarningOption ? jsxs(Fragment, {
-        children: [jsx(MenuItem, {
-          onClick: function onClick(event) {
-            onCreateNewWarning('maritimeWarningCoastal', event);
+        children: [jsxs(RadioGroup, {
+          value: timeFilter.mode,
+          onChange: function onChange(e) {
+            return handleModeChange(e.target.value);
           },
-          children: jsx(ListItemText, {
-            children: t('maritime-warning-coastal-title').toUpperCase()
-          })
-        }, "MaritimeWarningCoastal"), jsx(MenuItem, {
-          onClick: function onClick(event) {
-            onCreateNewWarning('maritimeWarningNorthSea', event);
+          children: [jsx(FormControlLabel, {
+            value: TimeFilterMode.all,
+            control: jsx(Radio, {}),
+            label: t('filter-time-no-filter')
+          }), jsx(FormControlLabel, {
+            value: TimeFilterMode.today,
+            control: jsx(Radio, {}),
+            label: t('filter-time-today')
+          }), jsx(FormControlLabel, {
+            value: TimeFilterMode.tomorrow,
+            control: jsx(Radio, {}),
+            label: t('filter-time-tomorrow')
+          }), jsx(FormControlLabel, {
+            value: TimeFilterMode.custom,
+            control: jsx(Radio, {}),
+            label: t('filter-time-custom')
+          })]
+        }), timeFilter.mode === TimeFilterMode.custom && jsxs(Box, {
+          sx: {
+            mt: 2,
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 2
           },
-          children: jsx(ListItemText, {
-            children: t('maritime-warning-northsea-title').toUpperCase()
-          })
-        }, "MaritimeWarningNorthSea")]
-      }) : null]
+          children: [jsxs(LocalizationProvider, {
+            dateAdapter: AdapterDateFns,
+            children: [jsxs(Box, {
+              sx: {
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center'
+              },
+              children: [jsx(Typography, {
+                sx: {
+                  mr: 1
+                },
+                children: t('filter-start')
+              }), jsx(DateTimePicker, {
+                label: t('filter-choose-date-time'),
+                ampm: false,
+                value: (_getPickerValue = getPickerValue(pickerStartValue)) != null ? _getPickerValue : new Date(Date.now()),
+                onChange: function onChange(value) {
+                  return handleTempTimeChange('customStart', value);
+                },
+                format: dateUtils.DATE_FORMAT_DATEPICKER,
+                slotProps: {
+                  textField: {
+                    variant: 'filled',
+                    InputProps: {
+                      endAdornment: jsx(InputAdornment, {
+                        position: "end",
+                        children: "UTC"
+                      })
+                    }
+                  },
+                  field: {
+                    clearable: true,
+                    openPickerButtonPosition: 'start'
+                  }
+                },
+                timeSteps: {
+                  minutes: 1
+                }
+              })]
+            }), jsxs(Box, {
+              sx: {
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center'
+              },
+              children: [jsx(Typography, {
+                sx: {
+                  mr: 1
+                },
+                children: t('filter-end')
+              }), jsx(DateTimePicker, {
+                label: t('filter-choose-date-time'),
+                ampm: false,
+                value: getPickerValue(pickerEndValue),
+                onChange: function onChange(value) {
+                  return handleTempTimeChange('customEnd', value);
+                },
+                format: dateUtils.DATE_FORMAT_DATEPICKER,
+                slotProps: {
+                  textField: {
+                    variant: 'filled',
+                    InputProps: {
+                      endAdornment: jsx(InputAdornment, {
+                        position: "end",
+                        children: "UTC"
+                      })
+                    }
+                  },
+                  field: {
+                    clearable: true,
+                    openPickerButtonPosition: 'start'
+                  }
+                },
+                timeSteps: {
+                  minutes: 1
+                }
+              })]
+            })]
+          }), jsx(Box, {
+            sx: {
+              display: 'flex',
+              justifyContent: 'flex-end'
+            },
+            children: jsx(Button, {
+              onClick: handleApply,
+              sx: {
+                textTransform: 'none',
+                px: 6,
+                py: 1,
+                backgroundColor: 'geowebColors.buttons.tool.active.fill',
+                color: 'white'
+              },
+              children: t('filter-time-apply')
+            })
+          })]
+        })]
+      })]
+    })]
+  });
+};
+
+var filterOrder = ['source', 'domain', 'phenomenon', 'level'];
+var FilterList = function FilterList(_ref) {
+  var _ref$onClickAll = _ref.onClickAll,
+    onClickAll = _ref$onClickAll === void 0 ? function () {} : _ref$onClickAll,
+    _ref$isAllSelected = _ref.isAllSelected,
+    isAllSelected = _ref$isAllSelected === void 0 ? true : _ref$isAllSelected,
+    filterState = _ref.filterState,
+    updateFilter = _ref.updateFilter,
+    timeFilter = _ref.timeFilter,
+    onUpdateTimeFilter = _ref.onUpdateTimeFilter;
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  return jsxs(Box, {
+    sx: {
+      display: 'flex',
+      flexWrap: 'wrap',
+      alignItems: 'center',
+      gap: 1,
+      pb: 4
+    },
+    children: [jsx(CustomTooltip, {
+      title: isAllSelected ? t('filter-hide-all') : t('filter-show-all'),
+      placement: "bottom",
+      children: jsx("div", {
+        children: jsx(FilterChip, {
+          id: "all",
+          label: t('filter-all'),
+          isSelected: isAllSelected,
+          handleClick: function handleClick() {
+            return onClickAll(isAllSelected);
+          },
+          size: "medium"
+        })
+      })
+    }), filterOrder.map(function (filterId) {
+      return jsx(ExpandableFilterChip, {
+        id: filterId,
+        options: filterState[filterId],
+        updateFilter: updateFilter
+      }, filterId);
+    }), jsx(Box, {
+      sx: {
+        marginLeft: 'auto'
+      },
+      children: jsx(TimeFilterChip, {
+        timeFilter: timeFilter,
+        onUpdateTimeFilter: onUpdateTimeFilter
+      })
     })]
   });
 };
@@ -11065,15 +11680,17 @@ var groupWarningsOnStatus = function groupWarningsOnStatus(warnings, sortState)
   var key = sortState.key,
     direction = sortState.direction;
   var sortedWarnings = warnings.sort(function (warningA, warningB) {
+    var _dateStringB$localeCo;
     var dateStringA = key === 'lastUpdatedTime' ? warningA[key] : warningA.warningDetail[key];
     var dateStringB = key === 'lastUpdatedTime' ? warningB[key] : warningB.warningDetail[key];
-    return (dateStringB == null ? void 0 : dateStringB.localeCompare(dateStringA || '')) || 0;
+    return (_dateStringB$localeCo = dateStringB == null ? void 0 : dateStringB.localeCompare(dateStringA != null ? dateStringA : '')) != null ? _dateStringB$localeCo : 0;
   });
   if (direction === 'asc') {
     sortedWarnings.reverse();
   }
   var groupedWarnings = groupBy(sortedWarnings, function (warning) {
-    var status = warning.status || mapProductStatusToWarningStatus(warning.productStatus);
+    var _warning$status;
+    var status = (_warning$status = warning.status) != null ? _warning$status : mapProductStatusToWarningStatus(warning.productStatus);
     switch (status) {
       case PublicWarningStatus.DRAFT:
       case PublicWarningStatus.DRAFT_PUBLISHED:
@@ -11097,7 +11714,7 @@ var groupWarningsOnStatus = function groupWarningsOnStatus(warnings, sortState)
   }, groupedWarnings);
 };
 var PublicWarningList = function PublicWarningList(_ref) {
-  var _sx, _sx2, _sx3;
+  var _sx, _sx2;
   var _ref$warnings = _ref.warnings,
     warnings = _ref$warnings === void 0 ? [] : _ref$warnings,
     filterHookState = _ref.filterHookState,
@@ -11132,7 +11749,9 @@ var PublicWarningList = function PublicWarningList(_ref) {
     setExpandedSections = _ref.setExpandedSections;
   var updateFilter = filterHookState.updateFilter,
     allSelected = filterHookState.allSelected,
-    filterState = filterHookState.filterState;
+    filterState = filterHookState.filterState,
+    timeFilter = filterHookState.timeFilter,
+    updateTimeFilter = filterHookState.updateTimeFilter;
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var _React$useState = React__default.useState({
@@ -11217,7 +11836,7 @@ var PublicWarningList = function PublicWarningList(_ref) {
     }
   }, [hoveredFeatureId, items]);
   return jsxs(Fragment, {
-    children: [isLoading && jsx(LinearProgress, {
+    children: [isLoading ? jsx(LinearProgress, {
       "data-testid": "loading-bar",
       color: "secondary",
       sx: {
@@ -11225,7 +11844,7 @@ var PublicWarningList = function PublicWarningList(_ref) {
         width: '100%',
         top: 0
       }
-    }), jsxs(Box, {
+    }) : null, jsxs(Box, {
       sx: {
         padding: 3,
         height: '100%',
@@ -11236,67 +11855,50 @@ var PublicWarningList = function PublicWarningList(_ref) {
       "data-testid": "publicWarningList",
       children: [jsxs(Box, {
         ref: filterRef,
-        sx: (_sx = {
+        sx: {
           display: 'flex',
-          flexWrap: 'wrap',
-          alignItems: 'flex-end',
-          flexDirection: 'column'
-        }, _sx["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
-          flexDirection: 'row',
-          ' .create-warning': {
-            order: 2
-          }
-        }, _sx),
-        children: [jsx(Box, {
-          className: "warning-filter",
+          flexDirection: 'column',
+          gap: 2
+        },
+        children: [jsxs(Box, {
           sx: {
-            flex: 1,
-            minWidth: 0,
-            order: 2,
-            alignSelf: 'flex-start'
+            display: 'flex',
+            justifyContent: 'flex-end',
+            alignItems: 'center'
           },
+          children: [lastUpdatedTime ? jsx(LastUpdateTime, {
+            onPressRefresh: onRefetchWarnings,
+            lastUpdateTime: lastUpdatedTime
+          }) : jsx(Box, {}), jsx(NewWarningButton, {
+            onCreateWarning: onCreateWarning
+          })]
+        }), jsx(Box, {
           children: jsx(FilterList, {
             isAllSelected: allSelected,
             onClickAll: onClickAll,
             filterState: filterState,
-            updateFilter: updateFilter
+            updateFilter: updateFilter,
+            timeFilter: timeFilter,
+            onUpdateTimeFilter: updateTimeFilter
           })
-        }), jsxs(Box, {
-          className: "create-warning",
-          sx: {
-            order: 1
-          },
-          children: [lastUpdatedTime && jsx(Box, {
-            sx: {
-              "float": 'left',
-              minWidth: 140,
-              paddingTop: 0.5
-            },
-            children: jsx(LastUpdateTime, {
-              onPressRefresh: onRefetchWarnings,
-              lastUpdateTime: lastUpdatedTime
-            })
-          }), jsx(NewWarningButton, {
-            onCreateWarning: onCreateWarning
-          })]
         })]
-      }), error && jsx(AlertBanner, {
+      }), error ? jsx(AlertBanner, {
         title: error.message,
         shouldClose: true
-      }), !error && jsxs(Grid, {
+      }) : null, !error && jsxs(Grid, {
         container: true,
         rowSpacing: 0,
         columnSpacing: 0,
         alignItems: "center",
         justifyContent: "space-between",
         size: "grow",
-        sx: (_sx2 = {
+        sx: (_sx = {
           maxWidth: '100%',
           display: 'none',
           marginTop: '4px'
-        }, _sx2["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
+        }, _sx["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
           display: 'flex'
-        }, _sx2),
+        }, _sx),
         children: [jsx(WarningListHeaderContent, {
           title: t('warning-list-header-incidents'),
           sx: {
@@ -11336,9 +11938,9 @@ var PublicWarningList = function PublicWarningList(_ref) {
           width: 140
         }), jsx(WarningListHeaderContent, {
           title: t('warning-list-header-levels'),
-          sx: (_sx3 = {}, _sx3["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
+          sx: (_sx2 = {}, _sx2["@container publicWarningList (min-width: " + breakpoints.desktop + "px)"] = {
             width: 56
-          }, _sx3)
+          }, _sx2)
         }), jsx(WarningListHeaderContent, {
           title: t('areas'),
           width: 100
@@ -11349,7 +11951,7 @@ var PublicWarningList = function PublicWarningList(_ref) {
             marginRight: '48px'
           }
         })]
-      }), sortedWarnings && !error && jsx(Box, {
+      }), sortedWarnings && !error ? jsx(Box, {
         "data-testid": "warnings-list",
         sx: {
           height: "calc(100% - " + filterHeight + "px)",
@@ -11378,6 +11980,7 @@ var PublicWarningList = function PublicWarningList(_ref) {
                 if (warning.totalWarnings !== undefined) {
                   var header = warning;
                   return jsx(WarningListItemSeperator, {
+                    timeFilter: timeFilter,
                     status: header.status,
                     totalWarnings: header.totalWarnings,
                     style: style,
@@ -11407,11 +12010,86 @@ var PublicWarningList = function PublicWarningList(_ref) {
             });
           }
         })
-      })]
+      }) : null]
     })]
   });
 };
 
+var ConfirmDeleteWarningDialog = function ConfirmDeleteWarningDialog(_ref) {
+  var _ref$onClose = _ref.onClose,
+    onClose = _ref$onClose === void 0 ? function () {} : _ref$onClose,
+    title = _ref.title,
+    description = _ref.description,
+    request = _ref.request,
+    confirmLabel = _ref.confirmLabel,
+    callback = _ref.callback,
+    isLocked = _ref.isLocked;
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  var defaultError = isLocked ? t('warning-dialog-delete-islocked') : undefined;
+  var _React$useState = React__default.useState(false),
+    isLoading = _React$useState[0],
+    setIsLoading = _React$useState[1];
+  var _React$useState2 = React__default.useState(defaultError),
+    error = _React$useState2[0],
+    setError = _React$useState2[1];
+  var onSubmit = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setIsLoading(true);
+            _context.prev = 1;
+            _context.next = 4;
+            return request();
+          case 4:
+            callback && callback();
+            setIsLoading(false);
+            _context.next = 12;
+            break;
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](1);
+            setError(getAxiosErrorMessage(_context.t0));
+            setIsLoading(false);
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 8]]);
+    }));
+    return function onSubmit() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return jsx(ConfirmationDialog, Object.assign({
+    title: title,
+    open: true,
+    confirmLabel: confirmLabel,
+    cancelLabel: t('warning-dialog-cancel'),
+    description: !error ? description : '',
+    onClose: onClose,
+    onSubmit: onSubmit,
+    isLoading: isLoading
+  }, error && {
+    content: jsxs(Box, {
+      sx: {
+        marginBottom: 0
+      },
+      children: [jsx(AlertBanner, {
+        title: error,
+        severity: isLocked ? 'warning' : 'error'
+      }), jsx(Typography, {
+        variant: "body1",
+        sx: {
+          marginTop: 1
+        },
+        children: description
+      })]
+    })
+  }));
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -11527,7 +12205,8 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
   var savedDomainFilter = savedFilterState.domain,
     savedPhenomenonFilter = savedFilterState.phenomenon,
     savedLevelFilter = savedFilterState.level,
-    savedSourceFilter = savedFilterState.source;
+    savedSourceFilter = savedFilterState.source,
+    savedTimeFilter = savedFilterState.time;
   /** Levels for selected domain(s) */
   var relevantLevels = useMemo(function () {
     return getLevelsForDomainFilter(savedDomainFilter);
@@ -11558,7 +12237,7 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
   var defaultSourceFilter = useMemo(function () {
     return Object.fromEntries(relevantSources.map(function (key) {
       var presetValue = presetFilterState == null ? void 0 : presetFilterState.source[key];
-      return [key, presetValue === undefined ? true : presetValue];
+      return [key, presetValue != null ? presetValue : true];
     }));
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -11572,11 +12251,13 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
     };
   }, [defaultSourceFilter]);
   var initialFiltersWithPresets = useMemo(function () {
+    var _presetFilterState$ti;
     return {
       source: defaultSourceFilter || defaultEmptyFilter,
       domain: Object.assign({}, initialFilters.domain, presetFilterState == null ? void 0 : presetFilterState.domain),
       phenomenon: Object.assign({}, initialFilters.phenomenon, presetFilterState == null ? void 0 : presetFilterState.phenomenon),
-      level: Object.assign({}, initialFilters.level, presetFilterState == null ? void 0 : presetFilterState.level)
+      level: Object.assign({}, initialFilters.level, presetFilterState == null ? void 0 : presetFilterState.level),
+      time: (_presetFilterState$ti = presetFilterState == null ? void 0 : presetFilterState.time) != null ? _presetFilterState$ti : defaultTimeFilter
     };
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -11626,7 +12307,16 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
       });
     }
   };
+  var updateTimeFilter = useCallback(function (timeFilter) {
+    onUpdateFilters({
+      time: timeFilter
+    });
+  }, [onUpdateFilters]);
   var byFilterState = useCallback(function (warning) {
+    var _relevantSources$find;
+    if (!isWarningWithinInterval(warning, savedTimeFilter)) {
+      return false;
+    }
     var levelDomain = function () {
       if (['SIG', 'AIR'].includes(warning.warningDetail.level)) {
         return Domain.aviation;
@@ -11647,100 +12337,256 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
     if (!pickedPhenomenaFilter[phenomenon]) {
       return false;
     }
-    var source = relevantSources.find(function (source) {
+    var source = (_relevantSources$find = relevantSources.find(function (source) {
       return source === warning.warningDetail.warningProposalSource;
-    }) || emptyFilterId;
+    })) != null ? _relevantSources$find : emptyFilterId;
     if (!savedSourceFilter[source]) {
       return false;
     }
     return true;
-  }, [savedDomainFilter, pickedLevelFilter, pickedPhenomenaFilter, relevantSources, savedSourceFilter]);
+  }, [savedDomainFilter, pickedLevelFilter, pickedPhenomenaFilter, relevantSources, savedSourceFilter, savedTimeFilter]);
   return {
     allSelected: allSelected,
     updateFilter: updateFilter,
+    updateTimeFilter: updateTimeFilter,
     byFilterState: byFilterState,
     filterState: {
       domain: savedDomainFilter,
       level: pickedLevelFilter,
       phenomenon: pickedPhenomenaFilter,
-      source: savedSourceFilter
+      source: savedSourceFilter,
+      time: savedTimeFilter
+    },
+    timeFilter: savedTimeFilter
+  };
+};
+
+var CancelAviationDialogContent = function CancelAviationDialogContent(_ref) {
+  var _cancelQuery$data$dat, _cancelQuery$data, _currentQuery$data$da, _currentQuery$data, _t;
+  var product = _ref.product,
+    warningType = _ref.warningType,
+    errorMessage = _ref.errorMessage;
+  var _useWarningsTranslati = useWarningsTranslation(),
+    t = _useWarningsTranslati.t;
+  var isSigmet = warningType === 'sigmet';
+  var enabled = !!(product != null && product.uuid);
+  // Only run the two queries we actually need
+  var sigCancel = useFetchSigmetCancelTAC(product, isSigmet && enabled);
+  var airCancel = useFetchAirmetCancelTAC(product, !isSigmet && enabled);
+  var sigCurrent = useFetchSigmetTAC(product, isSigmet && enabled);
+  var airCurrent = useFetchAirmetTAC(product, !isSigmet && enabled);
+  // Pick active queries per warning type
+  var cancelQuery = isSigmet ? sigCancel : airCancel;
+  var currentQuery = isSigmet ? sigCurrent : airCurrent;
+  // Derived TAC strings
+  var cancelTAC = (_cancelQuery$data$dat = (_cancelQuery$data = cancelQuery.data) == null ? void 0 : _cancelQuery$data.data) != null ? _cancelQuery$data$dat : null;
+  var currentTAC = (_currentQuery$data$da = (_currentQuery$data = currentQuery.data) == null ? void 0 : _currentQuery$data.data) != null ? _currentQuery$data$da : null;
+  // Per-section loading/error
+  var isLoadingCancel = cancelQuery.isLoading || !enabled;
+  var isLoadingCurrent = currentQuery.isLoading || !enabled;
+  var isErrorCancel = !!cancelQuery.error;
+  var isErrorCurrent = !!currentQuery.error;
+  var loadingLabel = (_t = t('loading')) != null ? _t : 'Loading...';
+  var noTacLabel = t('tac-missing-data');
+  var COLLAPSED = 90; // px
+  var tacBlockStyle = {
+    whiteSpace: 'pre-wrap',
+    wordBreak: 'break-word',
+    overflowX: 'auto',
+    overflowY: 'auto',
+    maxWidth: '100%',
+    fontFamily: 'monospace',
+    fontSize: '0.9rem',
+    lineHeight: 1.4
+  };
+  var renderPre = function renderPre(text) {
+    return jsx(Box, {
+      component: "pre",
+      sx: tacBlockStyle,
+      children: text
+    });
+  };
+  var renderTacWithSequence = function renderTacWithSequence(tac, noTacKey, prod) {
+    if (!tac) {
+      return jsx(Box, {
+        component: "pre",
+        sx: tacBlockStyle,
+        children: t(noTacKey)
+      });
     }
+    var noTac = t(noTacKey);
+    var hasTac = tac.split('\n').length > 0 && tac !== noTac;
+    var sequenceNumberInTac = findSequenceNumber(tac, noTac);
+    var sequenceStyle = getSequenceStyling(prod, hasTac);
+    var words = tac.split(' ');
+    return jsx(Box, {
+      component: "pre",
+      sx: tacBlockStyle,
+      children: words.map(function (word, i) {
+        return jsx(Box, {
+          component: "span",
+          sx: hasTac && word === sequenceNumberInTac ? sequenceStyle : {},
+          children: word + (i < words.length - 1 ? ' ' : '')
+        }, word + "-" + i);
+      })
+    });
   };
+  var cancelContent;
+  if (isLoadingCancel) {
+    cancelContent = renderPre(loadingLabel);
+  } else if (isErrorCancel) {
+    cancelContent = renderPre(noTacLabel);
+  } else {
+    cancelContent = renderTacWithSequence(cancelTAC, 'tac-missing-data');
+  }
+  var currentContent;
+  if (isLoadingCurrent) {
+    currentContent = renderPre(loadingLabel);
+  } else if (isErrorCurrent) {
+    currentContent = renderPre(noTacLabel);
+  } else {
+    currentContent = jsx(Box, {
+      component: "pre",
+      sx: tacBlockStyle,
+      children: currentTAC != null ? currentTAC : noTacLabel
+    });
+  }
+  return jsxs(Box, {
+    sx: {
+      width: 500,
+      maxWidth: 600
+    },
+    children: [jsx(Typography, {
+      fontWeight: "medium",
+      variant: "inherit",
+      children: t('cancel-message')
+    }), jsx("div", {
+      style: {
+        display: 'flex',
+        paddingLeft: 12
+      },
+      children: jsx(Collapse, {
+        collapsedSize: COLLAPSED,
+        easing: "ease",
+        "in": true,
+        timeout: 200,
+        children: cancelContent
+      })
+    }), jsx(Typography, {
+      fontWeight: "medium",
+      variant: "inherit",
+      children: t('will-cancel-message')
+    }), jsx("div", {
+      style: {
+        display: 'flex',
+        paddingLeft: 12
+      },
+      children: jsx(Collapse, {
+        collapsedSize: COLLAPSED,
+        easing: "ease",
+        "in": true,
+        timeout: 200,
+        children: currentContent
+      })
+    }), errorMessage ? jsx(Box, {
+      sx: {
+        marginBottom: 2
+      },
+      children: jsx(AlertBanner, {
+        title: errorMessage,
+        shouldClose: true
+      })
+    }) : null]
+  });
 };
 
-var ConfirmDeleteWarningDialog = function ConfirmDeleteWarningDialog(_ref) {
-  var _ref$onClose = _ref.onClose,
-    onClose = _ref$onClose === void 0 ? function () {} : _ref$onClose,
-    title = _ref.title,
-    description = _ref.description,
-    request = _ref.request,
+var CancelAviationConfirmDialog = function CancelAviationConfirmDialog(_ref) {
+  var open = _ref.open,
+    type = _ref.type,
+    product = _ref.product,
+    showVA = _ref.showVA,
+    aviationConfig = _ref.aviationConfig,
+    sigmet = _ref.sigmet,
     confirmLabel = _ref.confirmLabel,
-    callback = _ref.callback,
-    isLocked = _ref.isLocked;
-  var _useWarningsTranslati = useWarningsTranslation(),
-    t = _useWarningsTranslati.t;
-  var defaultError = isLocked ? t('warning-dialog-delete-islocked') : undefined;
-  var _React$useState = React__default.useState(false),
-    isLoading = _React$useState[0],
-    setIsLoading = _React$useState[1];
-  var _React$useState2 = React__default.useState(defaultError),
-    error = _React$useState2[0],
-    setError = _React$useState2[1];
-  var onSubmit = /*#__PURE__*/function () {
+    title = _ref.title,
+    onClose = _ref.onClose,
+    cancelAviationProduct = _ref.cancelAviationProduct,
+    onSuccess = _ref.onSuccess;
+  var _React$useState = React__default.useState(null),
+    errorMsg = _React$useState[0],
+    setErrorMsg = _React$useState[1];
+  var _React$useState2 = React__default.useState(false),
+    isSubmitting = _React$useState2[0],
+    setIsSubmitting = _React$useState2[1];
+  var vaForm = useForm({
+    mode: 'onChange',
+    defaultValues: {}
+  });
+  var handleSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setIsLoading(true);
-            _context.prev = 1;
-            _context.next = 4;
-            return request();
-          case 4:
-            callback && callback();
-            setIsLoading(false);
-            _context.next = 12;
+            setIsSubmitting(true);
+            setErrorMsg(null);
+            _context.prev = 2;
+            _context.next = 5;
+            return cancelAviationProduct(product, type);
+          case 5:
+            setIsSubmitting(false);
+            onSuccess == null || onSuccess();
+            onClose();
+            _context.next = 14;
             break;
-          case 8:
-            _context.prev = 8;
-            _context.t0 = _context["catch"](1);
-            setError(getAxiosErrorMessage(_context.t0));
-            setIsLoading(false);
-          case 12:
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](2);
+            setIsSubmitting(false);
+            setErrorMsg("Failed to cancel " + type.toUpperCase() + ": " + humanizeApiErrorMessage(_context.t0));
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 8]]);
+      }, _callee, null, [[2, 10]]);
     }));
-    return function onSubmit() {
+    return function handleSubmit() {
       return _ref2.apply(this, arguments);
     };
   }();
-  return jsx(ConfirmationDialog, Object.assign({
+  return jsxs(CustomDialog, {
+    "data-testid": "cancel-aviation-dialog",
     title: title,
-    open: true,
-    confirmLabel: confirmLabel,
-    cancelLabel: t('warning-dialog-cancel'),
-    description: !error ? description : '',
+    description: "",
+    open: open,
     onClose: onClose,
-    onSubmit: onSubmit,
-    isLoading: isLoading
-  }, error && {
-    content: jsxs(Box, {
-      sx: {
-        marginBottom: 0
-      },
-      children: [jsx(AlertBanner, {
-        title: error,
-        severity: isLocked ? 'warning' : 'error'
-      }), jsx(Typography, {
-        variant: "body1",
+    isResizable: true,
+    resizableDefaultSize: {
+      width: 560,
+      height: 'auto'
+    },
+    actions: jsx(ConfirmationButtons, {
+      confirmLabel: confirmLabel,
+      cancelLabel: "Close",
+      isLoading: isSubmitting,
+      onSubmit: handleSubmit,
+      onClose: onClose
+    }),
+    children: [jsx(CancelAviationDialogContent, {
+      product: product,
+      warningType: type,
+      errorMessage: errorMsg != null ? errorMsg : undefined
+    }), showVA ? jsxs(FormProvider, Object.assign({}, vaForm, {
+      children: [jsx(Box, {
+        component: "hr",
         sx: {
-          marginTop: 1
-        },
-        children: description
+          my: 1
+        }
+      }), jsx(CancelSigmetVolcanicMovements, {
+        productConfig: aviationConfig,
+        sigmet: sigmet
       })]
-    })
-  }));
+    })) : null]
+  });
 };
 
 var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
@@ -11759,8 +12605,12 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
   var dispatch = useDispatch();
   var confirmDialog = useConfirmationDialog();
   var _useAuthenticationCon = useAuthenticationContext$1(),
-    auth = _useAuthenticationCon.auth;
-  var _useWarnings = useWarnings(),
+    auth = _useAuthenticationCon.auth,
+    isLoggedIn = _useAuthenticationCon.isLoggedIn;
+  var savedFilterState = useSelector(function (store) {
+    return getWarningsFilterById(store, panelId);
+  });
+  var _useWarnings = useWarnings(false, savedFilterState.time),
     combinedWarnings = _useWarnings.combinedWarnings,
     refetchWarnings = _useWarnings.refetchWarnings,
     isFetching = _useWarnings.isFetching,
@@ -11772,9 +12622,6 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     confirmDialogOptions = _React$useState[0],
     setConfirmDialogOptions = _React$useState[1];
   var selectedWarningId = useSelector(getSelectedWarningId);
-  var savedFilterState = useSelector(function (store) {
-    return getWarningsFilterById(store, panelId);
-  });
   var isFormDirty = useSelector(getSelectedPublicIsFormDirty);
   var openPublicWarningDialog = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(formAction, warning, warningType) {
@@ -11868,14 +12715,28 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       confirmLabel: t('warning-dialog-expire-confirm'),
       title: t('warning-dialog-expire-title'),
       description: t('warning-dialog-expire-description'),
-      request: function request() {
-        return saveWarning({
-          id: expiredWarning.id,
-          data: Object.assign({}, expiredWarning, {
-            type: 'public'
-          })
-        });
-      },
+      request: function () {
+        var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                return _context3.abrupt("return", saveWarning({
+                  id: expiredWarning.id,
+                  data: Object.assign({}, expiredWarning, {
+                    type: 'public'
+                  })
+                }));
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        function request() {
+          return _request.apply(this, arguments);
+        }
+        return request;
+      }(),
       callback: function callback() {
         return onRemoveSuccess(expiredWarning.id, t('warning-dialog-expire-succes'));
       }
@@ -11889,14 +12750,28 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       confirmLabel: t('warning-dialog-withdraw-confirm'),
       title: t('warning-dialog-withdraw-title'),
       description: t('warning-dialog-withdraw-description'),
-      request: function request() {
-        return saveWarning({
-          id: withdrawnWarning.id,
-          data: Object.assign({}, withdrawnWarning, {
-            type: 'public'
-          })
-        });
-      },
+      request: function () {
+        var _request2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                return _context4.abrupt("return", saveWarning({
+                  id: withdrawnWarning.id,
+                  data: Object.assign({}, withdrawnWarning, {
+                    type: 'public'
+                  })
+                }));
+              case 1:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4);
+        }));
+        function request() {
+          return _request2.apply(this, arguments);
+        }
+        return request;
+      }(),
       callback: function callback() {
         return onRemoveSuccess(withdrawnWarning.id, t('warning-dialog-withdraw-succes'));
       }
@@ -11910,48 +12785,89 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     postSigmet = _usePostSigmet.mutateAsync;
   var _usePostAirmet = usePostAirmet(),
     postAirmet = _usePostAirmet.mutateAsync;
-  var deleteAviationProduct = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(productToPost, newStatus, warningType) {
-      var uuid, _postProductParam, postProductParam, errorMessage;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+  var aviationWarnings = useAviationWarnings();
+  var selectedBackendProduct = React__default.useMemo(function () {
+    return aviationWarnings.find(function (aviationProduct) {
+      return aviationProduct.uuid === selectedWarningId;
+    });
+  }, [aviationWarnings, selectedWarningId]);
+  var postAviationProduct = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(productToPost, newStatus, type, opts) {
+      var _productToPost$uuid, _opts$vaSigmetMoveToF;
+      var uuid, body, _param, param;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context3.prev = 0;
-            uuid = (productToPost == null ? void 0 : productToPost.sigmetAirmetDetails.uuid) || null;
-            if (!(warningType === 'sigmet')) {
-              _context3.next = 7;
+            uuid = (_productToPost$uuid = productToPost == null ? void 0 : productToPost.uuid) != null ? _productToPost$uuid : null;
+            body = newStatus === 'CANCELLED' && selectedBackendProduct ? getCancelSigmet(selectedBackendProduct, (_opts$vaSigmetMoveToF = opts == null ? void 0 : opts.vaSigmetMoveToFIR) != null ? _opts$vaSigmetMoveToF : 'UNKNOWN') : productToPost;
+            if (!(type === 'sigmet')) {
+              _context5.next = 5;
               break;
             }
-            _postProductParam = createSigmetPostParameter(productToPost.sigmetAirmetDetails, newStatus, uuid);
-            _context3.next = 6;
-            return postSigmet(_postProductParam);
-          case 6:
-            return _context3.abrupt("return", _context3.sent);
+            _param = createSigmetPostParameter(body, newStatus, uuid);
+            return _context5.abrupt("return", postSigmet(_param));
+          case 5:
+            param = createAirmetPostParameter(body, newStatus, uuid);
+            return _context5.abrupt("return", postAirmet(param));
           case 7:
-            postProductParam = createAirmetPostParameter(productToPost.sigmetAirmetDetails, newStatus, uuid);
-            _context3.next = 10;
-            return postAirmet(postProductParam);
-          case 10:
-            return _context3.abrupt("return", _context3.sent);
-          case 13:
-            _context3.prev = 13;
-            _context3.t0 = _context3["catch"](0);
-            errorMessage = _context3.t0 instanceof Error ? _context3.t0 : 'Unknown error occurred';
-            dispatch(snackbarActions.openSnackbar({
-              type: snackbarTypes.SnackbarMessageType.VERBATIM_MESSAGE,
-              message: "Failed to save " + warningType.toUpperCase() + ": " + errorMessage
-            }));
-            throw _context3.t0;
-          case 18:
           case "end":
-            return _context3.stop();
+            return _context5.stop();
         }
-      }, _callee3, null, [[0, 13]]);
+      }, _callee5);
     }));
-    return function deleteAviationProduct(_x5, _x6, _x7) {
+    return function postAviationProduct(_x5, _x6, _x7, _x8) {
       return _ref4.apply(this, arguments);
     };
   }();
+  var getCancelSigmet = function getCancelSigmet(selectedProduct, vaSigmetMoveToFIR) {
+    if ('sigmet' in selectedProduct) {
+      return prepareCancelSigmet(selectedProduct.sigmet, vaSigmetMoveToFIR != null ? vaSigmetMoveToFIR : 'UNKNOWN');
+    }
+    return selectedProduct.airmet;
+  };
+  var _cancelAviationProduct = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(warning, type) {
+      var result;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return postAviationProduct(warning, 'CANCELLED', type);
+          case 2:
+            result = _context6.sent;
+            return _context6.abrupt("return", result != null ? result : null);
+          case 4:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function cancelAviationProduct(_x9, _x0) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var _React$useState2 = React__default.useState(false),
+    cancelOpen = _React$useState2[0],
+    setCancelOpen = _React$useState2[1];
+  var _React$useState3 = React__default.useState(null),
+    cancelCtx = _React$useState3[0],
+    setCancelCtx = _React$useState3[1];
+  var openCancelDialog = function openCancelDialog(warning) {
+    var type = warning.warningDetail.level === 'SIG' ? 'sigmet' : 'airmet';
+    var product = warning.sigmetAirmetDetails;
+    var showVA = isVAPhenomenon(warning.sigmetAirmetDetails, ProductAction.CANCEL);
+    setCancelCtx({
+      type: type,
+      product: product,
+      showVA: showVA,
+      sigmet: warning.sigmetAirmetDetails
+    });
+    setCancelOpen(true);
+  };
+  var closeCancelDialog = function closeCancelDialog() {
+    setCancelOpen(false);
+    setCancelCtx(null);
+  };
   var handleAviationProductClick = function handleAviationProductClick(warning, actionType) {
     if (!warning) {
       return;
@@ -11970,19 +12886,38 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
         updatedWarning = duplicateAviationProduct(warning);
         void openPublicWarningDialog('edit', updatedWarning, type);
         break;
-      case 'CANCEL':
-        void openPublicWarningDialog('cancel', warning, type);
-        break;
+      case ProductAction.CANCEL:
+        {
+          openCancelDialog(warning);
+          break;
+        }
       case 'DISCARD':
         {
-          var isLocked = warning.editor && warning.editor !== (auth == null ? void 0 : auth.username) || false;
+          var _warning$editor, _auth$username;
+          var editor = (_warning$editor = warning.editor) != null ? _warning$editor : '';
+          var currentUser = (_auth$username = auth == null ? void 0 : auth.username) != null ? _auth$username : '';
+          var isLocked = editor !== '' && editor !== currentUser;
           setConfirmDialogOptions({
             confirmLabel: t('warning-dialog-delete-confirm'),
             title: t('warning-dialog-delete-title'),
             description: t('warning-dialog-delete-description'),
-            request: function request() {
-              return deleteAviationProduct(warning, 'DISCARDED', type);
-            },
+            request: function () {
+              var _request3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+                return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                  while (1) switch (_context7.prev = _context7.next) {
+                    case 0:
+                      return _context7.abrupt("return", postAviationProduct(warning.sigmetAirmetDetails, 'DISCARDED', type));
+                    case 1:
+                    case "end":
+                      return _context7.stop();
+                  }
+                }, _callee7);
+              }));
+              function request() {
+                return _request3.apply(this, arguments);
+              }
+              return request;
+            }(),
             callback: function callback() {
               return onRemoveSuccess(warning.id);
             },
@@ -11993,38 +12928,38 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     }
   };
   var editMaritimeWarning = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(warning) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(warning) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if (!(warning && auth != null && auth.username && !warning.editor)) {
-              _context4.next = 9;
+              _context8.next = 9;
               break;
             }
-            _context4.prev = 1;
-            _context4.next = 4;
+            _context8.prev = 1;
+            _context8.next = 4;
             return updateMaritimeWarningEditor({
               domain: warning.type,
               isEditor: true
             });
           case 4:
-            _context4.next = 8;
+            _context8.next = 8;
             break;
           case 6:
-            _context4.prev = 6;
-            _context4.t0 = _context4["catch"](1);
+            _context8.prev = 6;
+            _context8.t0 = _context8["catch"](1);
           case 8:
             refetchWarnings();
           case 9:
             void openPublicWarningDialog('', undefined, warning.type);
           case 10:
           case "end":
-            return _context4.stop();
+            return _context8.stop();
         }
-      }, _callee4, null, [[1, 6]]);
+      }, _callee8, null, [[1, 6]]);
     }));
-    return function editMaritimeWarning(_x8) {
-      return _ref5.apply(this, arguments);
+    return function editMaritimeWarning(_x1) {
+      return _ref6.apply(this, arguments);
     };
   }();
   var handleMaritimeProductClick = function handleMaritimeProductClick(warning, actionType) {
@@ -12047,20 +12982,37 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     }));
   };
   var deleteWarning = function deleteWarning(warningId, warningEditor) {
-    var isLocked = warningEditor && warningEditor !== (auth == null ? void 0 : auth.username) || false;
+    var _auth$username2;
+    var editor = warningEditor != null ? warningEditor : '';
+    var currentUser = (_auth$username2 = auth == null ? void 0 : auth.username) != null ? _auth$username2 : '';
+    var isLocked = editor !== '' && editor !== currentUser;
     setConfirmDialogOptions({
       confirmLabel: t('warning-dialog-delete-confirm'),
       title: t('warning-dialog-delete-title'),
       description: t('warning-dialog-delete-description'),
-      request: function request() {
-        return deletePublicWarning({
-          id: warningId
-        }, {
-          onSuccess: function onSuccess() {
-            return onRemoveSuccessHooks(warningId);
-          }
-        });
-      },
+      request: function () {
+        var _request4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+          return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+            while (1) switch (_context9.prev = _context9.next) {
+              case 0:
+                return _context9.abrupt("return", deletePublicWarning({
+                  id: warningId
+                }, {
+                  onSuccess: function onSuccess() {
+                    return onRemoveSuccessHooks(warningId);
+                  }
+                }));
+              case 1:
+              case "end":
+                return _context9.stop();
+            }
+          }, _callee9);
+        }));
+        function request() {
+          return _request4.apply(this, arguments);
+        }
+        return request;
+      }(),
       isLocked: isLocked
     });
   };
@@ -12072,14 +13024,28 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       confirmLabel: t('warning-dialog-delete-confirm'),
       title: t('warning-dialog-delete-title'),
       description: t('warning-dialog-delete-description'),
-      request: function request() {
-        return saveWarning({
-          id: ignoredWarning.id,
-          data: Object.assign({}, ignoredWarning, {
-            type: 'public'
-          })
-        });
-      },
+      request: function () {
+        var _request5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0() {
+          return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+            while (1) switch (_context0.prev = _context0.next) {
+              case 0:
+                return _context0.abrupt("return", saveWarning({
+                  id: ignoredWarning.id,
+                  data: Object.assign({}, ignoredWarning, {
+                    type: 'public'
+                  })
+                }));
+              case 1:
+              case "end":
+                return _context0.stop();
+            }
+          }, _callee0);
+        }));
+        function request() {
+          return _request5.apply(this, arguments);
+        }
+        return request;
+      }(),
       callback: function callback() {
         return onRemoveSuccess(ignoredWarning.id, t('warning-dialog-delete-succes'));
       }
@@ -12126,17 +13092,18 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
   var filteredWarnings = React__default.useMemo(function () {
     return combinedWarnings.filter(filterHookState.byFilterState);
   }, [combinedWarnings, filterHookState.byFilterState]);
-  var _React$useState2 = React__default.useState({
+  var _React$useState4 = React__default.useState({
       TODO: false,
       DRAFT: false,
       PUBLISHED: true,
       EXPIRED: false
     }),
-    expandedSections = _React$useState2[0],
-    setExpandedSections = _React$useState2[1];
+    expandedSections = _React$useState4[0],
+    setExpandedSections = _React$useState4[1];
   var filteredWarningsByExpandedSections = React__default.useMemo(function () {
     return filteredWarnings.filter(function (warning) {
-      return warning.status && expandedSections[warning.status] || warning.productStatus && expandedSections[warning.productStatus];
+      var _ref7;
+      return (_ref7 = warning.status && expandedSections[warning.status]) != null ? _ref7 : warning.productStatus && expandedSections[warning.productStatus];
     });
   }, [filteredWarnings, expandedSections]);
   var selectedAviationProductId = (_filteredWarnings$fin = filteredWarnings.find(function (warning) {
@@ -12144,57 +13111,96 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
   })) == 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.id !== selectedAviationProductId && (warning != null && warning.warningDetail && warning.warningDetail.areas ? warning.warningDetail.areas.filter(function (area) {
-        return area.geoJSON;
+      var _warning$warningDetai, _warning$warningDetai2;
+      var id = warning == null ? void 0 : warning.id;
+      if (!id || id === selectedAviationProductId) {
+        return [];
+      }
+      var areas = (_warning$warningDetai = warning == null || (_warning$warningDetai2 = warning.warningDetail) == null ? void 0 : _warning$warningDetai2.areas) != null ? _warning$warningDetai : [];
+      return areas.filter(function (area) {
+        return !!area.geoJSON;
       }).map(function (area) {
+        var _warning$warningDetai3, _area$areaId;
+        var level = warning == null || (_warning$warningDetai3 = warning.warningDetail) == null ? void 0 : _warning$warningDetai3.level;
         var isAviationWarning = warning.warningDetail.level === 'SIG' || warning.warningDetail.level === 'AIR';
-        var styledGeoJSON = warningLevelFeatureColors(warning.warningDetail.level, area.geoJSON, isAviationWarning);
+        var styledGeoJSON = level ? warningLevelFeatureColors(level, area.geoJSON, isAviationWarning) : area.geoJSON;
         return {
-          id: warning.id + area.areaId,
-          originalId: warning.id,
+          id: id + ((_area$areaId = area.areaId) != null ? _area$areaId : ''),
+          originalId: id,
           geoJSON: styledGeoJSON
         };
-      }) : []) || [];
+      });
     }).filter(function (feature) {
-      return feature.id;
+      return !!feature.id;
     });
   }, [filteredWarningsByExpandedSections, selectedAviationProductId]);
   var _useUpdateSharedData = useUpdateSharedData({
       features: allFeatures
     }, panelId),
     hoveredFeatureId = _useUpdateSharedData.hoverId;
-  return jsxs(Fragment, {
+  return isLoggedIn ? jsxs(Fragment, {
     children: [jsx(PublicWarningList, {
-      warnings: filteredWarnings,
+      error: error != null ? error : undefined,
       expandedSections: expandedSections,
-      setExpandedSections: setExpandedSections,
+      filterHookState: filterHookState,
+      hoveredFeatureId: hoveredFeatureId,
       isLoading: isFetching,
-      error: error || undefined,
-      onSelectWarning: selectWarning,
+      lastUpdatedTime: lastUpdateTime,
+      onActionAviationWarning: handleAviationProductClick,
+      onActionMaritimeWarning: handleMaritimeProductClick,
       onCreateWarning: createWarning,
-      onEditWarning: editWarning,
-      onDeleteWarning: deleteWarning,
       onDeleteReviewWarning: deleteReviewWarning,
+      onDeleteWarning: deleteWarning,
+      onEditWarning: editWarning,
       onExpireWarning: expireWarning,
+      onRefetchWarnings: refetchWarnings,
+      onSelectWarning: selectWarning,
       onWithdrawWarning: withdrawWarning,
       selectedWarningId: selectedWarningId,
-      lastUpdatedTime: lastUpdateTime,
-      onRefetchWarnings: refetchWarnings,
-      filterHookState: filterHookState,
-      hoveredFeatureId: hoveredFeatureId,
-      onActionAviationWarning: handleAviationProductClick,
-      onActionMaritimeWarning: handleMaritimeProductClick
-    }), confirmDialogOptions && jsx(ConfirmDeleteWarningDialog, {
+      setExpandedSections: setExpandedSections,
+      warnings: filteredWarnings
+    }), confirmDialogOptions ? jsx(ConfirmDeleteWarningDialog, {
+      callback: confirmDialogOptions.callback,
+      confirmLabel: confirmDialogOptions.confirmLabel,
+      description: confirmDialogOptions.description,
+      isLocked: confirmDialogOptions.isLocked,
       onClose: function onClose() {
         return setConfirmDialogOptions(undefined);
       },
-      title: confirmDialogOptions.title,
-      description: confirmDialogOptions.description,
       request: confirmDialogOptions.request,
-      confirmLabel: confirmDialogOptions.confirmLabel,
-      callback: confirmDialogOptions.callback,
-      isLocked: confirmDialogOptions.isLocked
+      title: confirmDialogOptions.title
+    }) : null, cancelCtx && jsx(CancelAviationConfirmDialog, {
+      open: cancelOpen,
+      type: cancelCtx.type,
+      product: cancelCtx.product,
+      showVA: cancelCtx.showVA,
+      aviationConfig: aviationConfig,
+      sigmet: cancelCtx.sigmet,
+      title: getConfirmationDialogTitle(t, ProductAction.CANCEL, cancelCtx.type),
+      confirmLabel: getConfirmationDialogButtonLabel(t, ProductAction.CANCEL, cancelCtx.type),
+      onClose: closeCancelDialog,
+      cancelAviationProduct: function () {
+        var _cancelAviationProduct2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1(product, t) {
+          return _regeneratorRuntime().wrap(function _callee1$(_context1) {
+            while (1) switch (_context1.prev = _context1.next) {
+              case 0:
+                return _context1.abrupt("return", _cancelAviationProduct(product, t));
+              case 1:
+              case "end":
+                return _context1.stop();
+            }
+          }, _callee1);
+        }));
+        function cancelAviationProduct(_x10, _x11) {
+          return _cancelAviationProduct2.apply(this, arguments);
+        }
+        return cancelAviationProduct;
+      }()
     })]
+  }) : jsx(AlertBanner, {
+    severity: "error",
+    title: t('error-auth-login'),
+    dataTestId: "public-warning-list-auth-error"
   });
 };