@opengeoweb/warnings 10.0.0 → 10.2.0

package/index.esm.js

@@ -1,27 +1,28 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useDispatch, useSelector } from 'react-redux';
-import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, breakpoints, Options, Close, ChevronDown, ChevronUp, Copy, Success, Expire, Remove, ArrowUpCompact, ArrowDownCompact } from '@opengeoweb/theme';
-import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawtoolSelectors, layerSelectors, uiSelectors, drawtoolActions, mapStoreActions, layerActions, useSetupDialog, selectorMemoizationOptions, useUpdateSharedData } from '@opengeoweb/store';
+import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, breakpoints, Options, Close, ChevronDown, ChevronUp, Copy, Update, Success, Expire, Remove, ArrowUpCompact, ArrowDownCompact } from '@opengeoweb/theme';
+import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawtoolSelectors, layerSelectors, uiSelectors, drawingToolActions, layerActions, useSetupDialog, selectorMemoizationOptions, useUpdateSharedData } from '@opengeoweb/store';
 import { defaultPolygon, emptyGeoJSON, MapControlButton, getIcon, rewindGeometry, getGeoJSONPropertyValue, currentlySupportedDrawModes, defaultLayers, MapView, MapViewLayer, getFeatureExtent } from '@opengeoweb/webmap-react';
-import { SHARED_NAMESPACE, useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, CustomToggleButton, Filter, FilterChip, FilterOption, StatusTag, LastUpdateTime, ErrorBoundary, pollingIntervalTimeout, isAxiosError as isAxiosError$1 } from '@opengeoweb/shared';
+import { SHARED_NAMESPACE, useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, CustomToggleButton, Filter, FilterChip, FilterOption, StatusTag, LastUpdateTime, ErrorBoundary, isAxiosError as isAxiosError$1 } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf } from '@reduxjs/toolkit';
 import 'i18next';
 import { useTranslation } from 'react-i18next';
 import '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormSelect, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, useDraftFormHelpers, errorMessages, ReactHookFormDateTime, isXHoursBefore, isXHoursAfter, isEmpty } from '@opengeoweb/form-fields';
 import { LayerType, generateMapId, getWMJSMapById, getGeoCoordFromLatLong, WMBBOX } from '@opengeoweb/webmap';
-import { SigmetForm, isInstanceOfCancelSigmet, AirmetForm, isInstanceOfCancelAirmet, getProductFormMode } from '@opengeoweb/sigmet-airmet';
+import { airmetConfig, sigmetConfig, SigmetForm, isInstanceOfCancelSigmet, AirmetForm, isInstanceOfCancelAirmet, getDefaultValidUntilValue, getProductFormMode } from '@opengeoweb/sigmet-airmet';
 import { snackbarActions, snackbarTypes } from '@opengeoweb/snackbar';
 import * as React from 'react';
 import React__default, { useState, useEffect, useRef, useMemo, useCallback } from 'react';
 import { styled, Box, Typography, ListItem, Grid2, Paper, ListItemButton, Stack, LinearProgress, Button, FormHelperText, MenuItem, Tabs, Tab, Card, CardContent, CircularProgress, Menu, DialogTitle, DialogContent, Switch, ListItemText } from '@mui/material';
 import { VariableSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider, getHeaders, useAuthQuery, useAuthenticationContext, ProductStatus } from '@opengeoweb/api';
+import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider, AirmetPhenomena, SigmetPhenomena, getHeaders, handleResponse, useAuthQuery, useAuthenticationContext, ProductStatus, optimisticUpdate } from '@opengeoweb/api';
+import { rest } from 'msw';
 import { useFormContext } from 'react-hook-form';
 import { isEqual, cloneDeep, clamp, groupBy, pick, assign } from 'lodash';
 import { getConfig, useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
-import { useQueryClient } from '@tanstack/react-query';
+import { useQueryClient, useMutation } from '@tanstack/react-query';
 import { isAxiosError } from 'axios';
 
 var en = {
@@ -199,7 +200,8 @@ var en = {
 	"warning-dialog-withdraw-title": "Withdraw warning",
 	"warning-dialog-withdraw-confirm": "Withdraw",
 	"warning-dialog-withdraw-description": "Are you sure you want to withdraw this warning?",
-	"tac-missing-data": "Missing data: no TAC can be generated"
+	"tac-missing-data": "Missing data: no TAC can be generated",
+	"warning-list-button-renew": "Renew"
 };
 var nl = {
 	"drawing-tool-form-tools": "Gereedschap",
@@ -337,7 +339,8 @@ var nl = {
 	"warning-domain-maritime": "Maritiem",
 	"warning-domain-public": "Publiek",
 	"error-title-retry": "Probeer opnieuw",
-	"tac-missing-data": "Ontbrekende gegevens: er kan geen TAC worden gegenereerd"
+	"tac-missing-data": "Ontbrekende gegevens: er kan geen TAC worden gegenereerd",
+	"warning-list-button-renew": "Hernieuwen"
 };
 var fi = {
 	"drawing-tool-form-tools": "Työkalut",
@@ -475,7 +478,8 @@ var fi = {
 	"warning-domain-maritime": "ei käännetty",
 	"warning-domain-public": "ei käännetty",
 	"error-title-retry": "Yritä uudelleen",
-	"tac-missing-data": "Tarvittavia tietoja puuttu, TAC:ia ei voida generoida"
+	"tac-missing-data": "Tarvittavia tietoja puuttu, TAC:ia ei voida generoida",
+	"warning-list-button-renew": "Renew"
 };
 var no = {
 	"drawing-tool-form-tools": "Verktøy",
@@ -613,7 +617,8 @@ var no = {
 	"warning-domain-maritime": "ikke oversatt",
 	"warning-domain-public": "ikke oversatt",
 	"error-title-retry": "Prøv igjen",
-	"tac-missing-data": "Mangler data: ingen TAC kan genereres"
+	"tac-missing-data": "Mangler data: ingen TAC kan genereres",
+	"warning-list-button-renew": "Renew"
 };
 var warningsTranslations = {
 	en: en,
@@ -1186,7 +1191,7 @@ var useCloseDrawDialog = function useCloseDrawDialog(_ref) {
                 drawMode: ''
               }));
               // reset active draw tool
-              dispatch(drawtoolActions.changeDrawToolMode({
+              dispatch(drawingToolActions.changeDrawToolMode({
                 drawToolId: drawingDialogType,
                 drawModeId: drawDialogActiveDrawModeId
               }));
@@ -1213,7 +1218,7 @@ var useCloseDrawDialog = function useCloseDrawDialog(_ref) {
             }
             // clear existing geoJSON
             if (featureLayerContainsGeoJSON) {
-              dispatch(mapStoreActions.layerChangeGeojson({
+              dispatch(layerActions.layerChangeGeojson({
                 layerId: drawLayerId,
                 geojson: emptyGeoJSON
               }));
@@ -1260,7 +1265,7 @@ var useCloseObjectDialog = function useCloseObjectDialog(_ref3) {
       source: source
     }));
     if (featureLayerContainsGeoJSON && shouldReset) {
-      dispatch(mapStoreActions.layerChangeGeojson({
+      dispatch(layerActions.layerChangeGeojson({
         layerId: drawLayerId,
         geojson: emptyGeoJSON
       }));
@@ -1318,7 +1323,7 @@ var useObjectDrawDialogAction = function useObjectDrawDialogAction(_ref5) {
     objectDialogLayerHasGeoJSON = _useDialogOptions2.hasGeoJSON,
     objectDialogLayerId = _useDialogOptions2.dialogLayerId;
   var clearGeoJSON = function clearGeoJSON(layerId) {
-    dispatch(mapStoreActions.layerChangeGeojson({
+    dispatch(layerActions.layerChangeGeojson({
       layerId: layerId,
       geojson: emptyGeoJSON
     }));
@@ -1366,7 +1371,7 @@ var useObjectDrawDialogAction = function useObjectDrawDialogAction(_ref5) {
             // move shape to screen
             if (isObjectDialogOpen && objectDialogLayerHasGeoJSON) {
               // update new shape
-              dispatch(mapStoreActions.layerSetGeojsonFromLayer({
+              dispatch(layerActions.layerSetGeojsonFromLayer({
                 layerId: currentDrawLayerId,
                 sourceLayerId: objectDialogLayerId
               }));
@@ -1399,13 +1404,13 @@ var useObjectDrawDialogAction = function useObjectDrawDialogAction(_ref5) {
       source: source
     }));
     // activate draw tool
-    dispatch(drawtoolActions.updateGeoJSONLayerId({
+    dispatch(drawingToolActions.updateGeoJSONLayerId({
       drawToolId: drawingDialogType,
       geoJSONLayerId: currentDrawLayerId
     }));
     // activate default draw mode
     if (!drawDialogActiveDrawModeId && !isDrawDialogOpen) {
-      dispatch(drawtoolActions.changeDrawToolMode({
+      dispatch(drawingToolActions.changeDrawToolMode({
         drawToolId: drawingDialogType,
         drawModeId: defaultPolygon.drawModeId
       }));
@@ -1413,7 +1418,7 @@ var useObjectDrawDialogAction = function useObjectDrawDialogAction(_ref5) {
     // move shape to screen
     if (isDrawDialogOpen && drawDialogLayerHasGeoJSON) {
       // update new shape
-      dispatch(mapStoreActions.layerSetGeojsonFromLayer({
+      dispatch(layerActions.layerSetGeojsonFromLayer({
         layerId: currentDrawLayerId,
         sourceLayerId: drawDialogLayerId
       }));
@@ -1435,7 +1440,7 @@ var useObjectDrawDialogAction = function useObjectDrawDialogAction(_ref5) {
       }));
     }
     if (newGeoJSON) {
-      dispatch(mapStoreActions.layerChangeGeojson({
+      dispatch(layerActions.layerChangeGeojson({
         layerId: currentDrawLayerId,
         geojson: newGeoJSON
       }));
@@ -1589,7 +1594,7 @@ var Objects = function Objects(_ref2) {
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var listRef = React__default.useRef(null);
-  var _getListInclHeaders = getListInclHeaders$1(objects),
+  var _getListInclHeaders = getListInclHeaders$1(objects || []),
     listInclHeaders = _getListInclHeaders.listInclHeaders,
     headerList = _getListInclHeaders.headerList;
   var getItemSize = function getItemSize(width, index) {
@@ -1952,10 +1957,6 @@ var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
     getAreaKeywords: function getAreaKeywords() {
       return axiosInstance.get("/area-keywords");
     },
-    // warnings
-    getWarnings: function getWarnings() {
-      return axiosInstance.get('/warnings');
-    },
     saveWarningAs: function saveWarningAs(data) {
       return axiosInstance.post("/warnings/", data).then(function (response) {
         var headerLocation = response == null ? void 0 : response.request.getResponseHeader('Location');
@@ -1967,9 +1968,6 @@ var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
     },
     deleteWarning: function deleteWarning(warningId) {
       return axiosInstance.post("/warnings/" + warningId + "?delete=true");
-    },
-    toggleEditorWarning: function toggleEditorWarning(warningId, isEditor) {
-      return axiosInstance.post("/warnings/" + warningId + "?editor=" + (isEditor ? 'true' : 'false'));
     }
   };
 };
@@ -2100,84 +2098,22 @@ var publicWarningDialogType = uiTypes.DialogTypes.PublicWarnings;
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var publicWarningsAdapter = createEntityAdapter({
-  selectId: function selectId(warning) {
-    return warning.id;
-  }
-});
-var initialState$1 = {
-  warnings: publicWarningsAdapter.getInitialState(),
-  isLoading: true,
-  lastUpdatedTime: '',
-  filterState: {}
-};
+var TAKEOVER_MESSAGE = 'You are no longer the editor of this warning';
+var initialState$1 = {};
 var slice$1 = createSlice({
   initialState: initialState$1,
-  name: 'publicWarnings',
-  reducers: {
-    fetchWarnings: function fetchWarnings(draft) {
-      draft.isLoading = true;
-      delete draft.error;
-    },
-    fetchWarningsSuccess: function fetchWarningsSuccess(draft, action) {
-      var _action$payload = action.payload,
-        warnings = _action$payload.warnings,
-        lastUpdatedTime = _action$payload.lastUpdatedTime;
-      draft.isLoading = false;
-      draft.lastUpdatedTime = lastUpdatedTime;
-      publicWarningsAdapter.setAll(draft.warnings, warnings);
-    },
-    fetchWarningsError: function fetchWarningsError(draft, action) {
-      var error = action.payload.error;
-      draft.isLoading = false;
-      draft.error = error;
-    },
-    setWarningFilters: function setWarningFilters(draft, action) {
-      var _action$payload2 = action.payload,
-        filterState = _action$payload2.filterState,
-        panelId = _action$payload2.panelId;
-      if (panelId) {
-        draft.filterState[panelId] = filterState;
-      }
-    }
-  }
-});
-var reducer$1 = slice$1.reducer;
-var publicWarningActions = slice$1.actions;
-
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2023 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var TAKEOVER_MESSAGE = 'You are no longer the editor of this warning';
-var initialState = {};
-var slice = createSlice({
-  initialState: initialState,
   name: 'publicWarningForm',
   reducers: {
     setFormValues: function setFormValues(draft, action) {
       var _action$payload = action.payload,
         object = _action$payload.object,
-        publicWarning = _action$payload.publicWarning,
+        warning = _action$payload.warning,
         formState = _action$payload.formState;
       if (object) {
         draft.object = object;
       }
-      if (publicWarning) {
-        draft.publicWarning = publicWarning;
+      if (warning) {
+        draft.warning = warning;
       }
       if (formState !== undefined) {
         draft.formState = formState;
@@ -2186,56 +2122,49 @@ var slice = createSlice({
     addArea: function addArea(draft, action) {
       var area = action.payload.area;
       // only support 1 area (for now)
-      if (draft.publicWarning) {
-        draft.publicWarning.warningDetail.areas = [area];
+      if (draft.warning) {
+        var _draft$warning$warnin;
+        var areaWithPreservedUUID = Object.assign({}, (_draft$warning$warnin = draft.warning.warningDetail.areas) == null ? void 0 : _draft$warning$warnin.at(0), area);
+        draft.warning.warningDetail.areas = [areaWithPreservedUUID];
       } else {
         var newWarning = {
           warningDetail: {
             areas: [area]
           }
         };
-        draft.publicWarning = newWarning;
+        draft.warning = newWarning;
       }
     },
     removeArea: function removeArea(draft, action) {
       var area = action.payload.area;
-      if (draft.publicWarning) {
-        var removeAreas = draft.publicWarning.warningDetail.areas.filter(function (existingArea) {
+      if (draft.warning) {
+        var removeAreas = draft.warning.warningDetail.areas.filter(function (existingArea) {
           return existingArea.objectName !== area.objectName;
         });
-        draft.publicWarning.warningDetail.areas = removeAreas;
+        draft.warning.warningDetail.areas = removeAreas;
+      }
+    },
+    removeAllAreas: function removeAllAreas(draft) {
+      if (draft.warning) {
+        draft.warning.warningDetail.areas = [];
       }
     },
     openPublicWarningFormDialog: function openPublicWarningFormDialog(draft, action) {
       var _action$payload2 = action.payload,
         object = _action$payload2.object,
-        publicWarning = _action$payload2.publicWarning,
+        warning = _action$payload2.warning,
         _action$payload2$form = _action$payload2.formState,
         formState = _action$payload2$form === void 0 ? '' : _action$payload2$form,
         _action$payload2$warn = _action$payload2.warningType,
         warningType = _action$payload2$warn === void 0 ? 'public' : _action$payload2$warn,
         panelId = _action$payload2.panelId;
       draft.object = object;
-      draft.publicWarning = publicWarning;
-      draft.selectedPublicWarningId = publicWarning == null ? void 0 : publicWarning.id;
+      draft.warning = warning;
+      draft.selectedWarningId = warning == null ? void 0 : warning.id;
       draft.formState = formState;
       draft.warningType = warningType;
       draft.panelId = panelId;
     },
-    toggleEditorWarning: function toggleEditorWarning(draft,
-    // eslint-disable-next-line no-unused-vars
-    action) {
-      delete draft.error;
-    },
-    toggleEditorWarningSuccess: function toggleEditorWarningSuccess(draft, action) {
-      var _action$payload3 = action.payload,
-        isEditor = _action$payload3.isEditor,
-        username = _action$payload3.username;
-      if (draft.publicWarning) {
-        draft.publicWarning.editor = isEditor ? username : '';
-      }
-      draft.formState = isEditor ? '' : 'readonly';
-    },
     // publish warning
     publishWarning: function publishWarning(draft,
     // eslint-disable-next-line no-unused-vars
@@ -2245,7 +2174,7 @@ var slice = createSlice({
     },
     publishWarningSuccess: function publishWarningSuccess(draft, action) {
       var publicWarning = action.payload.publicWarning;
-      draft.publicWarning = publicWarning;
+      draft.warning = publicWarning;
       // If form has been published, set form to readonly
       draft.formState = 'readonly';
     },
@@ -2255,70 +2184,60 @@ var slice = createSlice({
     action) {
       draft.formState = 'saving';
       delete draft.error;
-      draft.publicWarning = action.payload.publicWarning;
+      draft.warning = action.payload.publicWarning;
     },
     saveWarningSuccess: function saveWarningSuccess(draft, action) {
       var _publicWarning$warnin;
       var publicWarning = action.payload.publicWarning;
-      draft.publicWarning = publicWarning;
+      draft.warning = publicWarning;
       if (publicWarning != null && (_publicWarning$warnin = publicWarning.warningDetail) != null && _publicWarning$warnin.id) {
-        draft.selectedPublicWarningId = publicWarning.warningDetail.id;
+        draft.selectedWarningId = publicWarning.warningDetail.id;
       }
       draft.formState = '';
     },
     setFormError: function setFormError(draft, action) {
-      var _action$payload4 = action.payload,
-        message = _action$payload4.message,
-        _action$payload4$seve = _action$payload4.severity,
-        severity = _action$payload4$seve === void 0 ? 'error' : _action$payload4$seve;
+      var _action$payload3 = action.payload,
+        message = _action$payload3.message,
+        _action$payload3$seve = _action$payload3.severity,
+        severity = _action$payload3$seve === void 0 ? 'error' : _action$payload3$seve;
       draft.formState = '';
       draft.error = {
         severity: severity,
         message: message
       };
     },
+    removeFormError: function removeFormError(draft) {
+      delete draft.error;
+    },
     setFormDirty: function setFormDirty(draft, action) {
       var isFormDirty = action.payload.isFormDirty;
       draft.isFormDirty = isFormDirty;
+    },
+    setEditMode: function setEditMode(draft, action) {
+      var warningId = action.payload.warningId;
+      draft.selectedWarningId = warningId;
+      draft.formState = 'edit';
     }
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(uiActions.setToggleOpenDialog, function (draft, action) {
-      var _action$payload5 = action.payload,
-        type = _action$payload5.type,
-        setOpen = _action$payload5.setOpen;
+      var _action$payload4 = action.payload,
+        type = _action$payload4.type,
+        setOpen = _action$payload4.setOpen;
       if (type === publicWarningDialogType && setOpen === false) {
         delete draft.object;
-        delete draft.publicWarning;
+        delete draft.warning;
         delete draft.formState;
         delete draft.error;
-        delete draft.selectedPublicWarningId;
+        delete draft.selectedWarningId;
         delete draft.isFormDirty;
         delete draft.warningType;
       }
-    }).addCase(publicWarningActions.fetchWarningsSuccess, function (draft, action) {
-      var warnings = action.payload.warnings;
-      if (draft.selectedPublicWarningId) {
-        var _draft$publicWarning;
-        var currentWarning = warnings.find(function (warning) {
-          return warning.id === draft.selectedPublicWarningId;
-        });
-        if (currentWarning && ((_draft$publicWarning = draft.publicWarning) == null ? void 0 : _draft$publicWarning.editor) !== currentWarning.editor) {
-          draft.publicWarning.editor = currentWarning.editor;
-          // if form is in edit mode show warning
-          if (draft.formState === '') {
-            draft.error = {
-              severity: 'warning',
-              message: TAKEOVER_MESSAGE
-            };
-          }
-        }
-      }
     });
   }
 });
-var reducer = slice.reducer;
-var publicWarningFormActions = slice.actions;
+var reducer$1 = slice$1.reducer;
+var publicWarningFormActions = slice$1.actions;
 
 var ObjectManagerConnect = function ObjectManagerConnect(_ref) {
   var bounds = _ref.bounds,
@@ -2396,7 +2315,7 @@ var ObjectManagerConnect = function ObjectManagerConnect(_ref) {
   };
   var showGeoJSONLayer = function showGeoJSONLayer(drawing) {
     if (!currentLayer) {
-      dispatch(mapStoreActions.addLayer({
+      dispatch(layerActions.addLayer({
         mapId: mapId,
         layer: {
           geojson: drawing.geoJSON
@@ -2405,7 +2324,7 @@ var ObjectManagerConnect = function ObjectManagerConnect(_ref) {
         origin: 'warnings-lib'
       }));
     } else {
-      dispatch(mapStoreActions.layerChangeGeojson({
+      dispatch(layerActions.layerChangeGeojson({
         layerId: geoJSONLayerId,
         geojson: drawing.geoJSON
       }));
@@ -2477,10 +2396,12 @@ var ObjectManagerConnect = function ObjectManagerConnect(_ref) {
             _context2.prev = 13;
             _context2.t0 = _context2["catch"](2);
             setLoading(false);
-            dispatch(uiActions.setErrorDialog({
-              error: _context2.t0.message,
-              type: objectDialogType
-            }));
+            if (_context2.t0 instanceof Error) {
+              dispatch(uiActions.setErrorDialog({
+                error: _context2.t0.message,
+                type: objectDialogType
+              }));
+            }
           case 17:
           case "end":
             return _context2.stop();
@@ -2500,7 +2421,7 @@ var ObjectManagerConnect = function ObjectManagerConnect(_ref) {
   var onShareObject = function onShareObject(object) {
     dispatch(publicWarningFormActions.openPublicWarningFormDialog({
       object: object,
-      publicWarning: {
+      warning: {
         warningDetail: {
           areas: [{
             geoJSON: object.geoJSON,
@@ -6942,6 +6863,330 @@ var warningListJSON = [
 	}
 ];
 
+var airmetListJSON = [
+	{
+		uuid: "02d3727a-b190-11ef-ba31-067f7750936d",
+		lastUpdateDate: "2024-12-03T16:02:35",
+		creationDate: "2024-12-03T16:02:35",
+		canbe: [
+			"DRAFTED",
+			"DISCARDED",
+			"PUBLISHED"
+		],
+		airmet: {
+			uuid: "02d3727a-b190-11ef-ba31-067f7750936d",
+			phenomenon: "SFC_WIND",
+			sequence: "-1",
+			validDateStart: "2024-12-03T13:26:19Z",
+			validDateEnd: "2024-12-03T15:26:19Z",
+			firName: "AMSTERDAM FIR",
+			locationIndicatorATSU: "EHAA",
+			locationIndicatorATSR: "EHAA",
+			locationIndicatorMWO: "EHDB",
+			isObservationOrForecast: "OBS",
+			observationOrForecastTime: "2024-12-03T11:26:19Z",
+			movementType: "STATIONARY",
+			change: "WKN",
+			type: "NORMAL",
+			status: "DRAFT",
+			windDirection: 70,
+			windSpeed: 35,
+			windUnit: "KT",
+			firGeometry: {
+			},
+			startGeometry: {
+				type: "FeatureCollection",
+				features: [
+					{
+						type: "Feature",
+						geometry: {
+							type: "Polygon",
+							coordinates: [
+								[
+									[
+										5,
+										55
+									],
+									[
+										4.331914,
+										55.332644
+									],
+									[
+										3.368817,
+										55.764314
+									],
+									[
+										2.761908,
+										54.379261
+									],
+									[
+										3.15576,
+										52.913554
+									],
+									[
+										2.000002,
+										51.500002
+									],
+									[
+										3.370001,
+										51.369722
+									],
+									[
+										3.370527,
+										51.36867
+									],
+									[
+										3.362223,
+										51.320002
+									],
+									[
+										3.36389,
+										51.313608
+									],
+									[
+										3.373613,
+										51.309999
+									],
+									[
+										3.952501,
+										51.214441
+									],
+									[
+										4.397501,
+										51.452776
+									],
+									[
+										5.078611,
+										51.391665
+									],
+									[
+										5.848333,
+										51.139444
+									],
+									[
+										5.651667,
+										50.824717
+									],
+									[
+										6.011797,
+										50.757273
+									],
+									[
+										5.934168,
+										51.036386
+									],
+									[
+										6.222223,
+										51.361666
+									],
+									[
+										5.94639,
+										51.811663
+									],
+									[
+										6.405001,
+										51.830828
+									],
+									[
+										7.053095,
+										52.237764
+									],
+									[
+										7.031389,
+										52.268885
+									],
+									[
+										7.063612,
+										52.346109
+									],
+									[
+										7.065557,
+										52.385828
+									],
+									[
+										7.133055,
+										52.888887
+									],
+									[
+										7.14218,
+										52.898244
+									],
+									[
+										7.191667,
+										53.3
+									],
+									[
+										6.5,
+										53.666667
+									],
+									[
+										6.500002,
+										55.000002
+									],
+									[
+										5,
+										55
+									]
+								]
+							]
+						},
+						properties: {
+							selectionType: "fir"
+						}
+					}
+				]
+			}
+		}
+	}
+];
+
+var sigmetListJSON = [
+	{
+		uuid: "someuniqueidprescibedbyBE2",
+		lastUpdateDate: "2020-09-17T12:00:00Z",
+		creationDate: "2020-09-17T12:00:00Z",
+		canbe: [
+			"CANCELLED"
+		],
+		sigmet: {
+			uuid: "someuniqueidprescibedbyBE2",
+			phenomenon: "VA_CLD",
+			sequence: "A01V",
+			issueDate: "2020-09-17T12:00:00Z",
+			firName: "AMSTERDAM FIR",
+			locationIndicatorATSU: "EHAA",
+			locationIndicatorATSR: "EHAA",
+			locationIndicatorMWO: "EHDB",
+			isObservationOrForecast: "OBS",
+			observationOrForecastTime: "",
+			movementType: "STATIONARY",
+			change: "WKN",
+			type: "NORMAL",
+			status: "PUBLISHED",
+			levelInfoMode: "BETW",
+			vaSigmetVolcanoName: "EYJAFJALLAJOKULL",
+			vaSigmetVolcanoCoordinates: {
+				latitude: 63.62,
+				longitude: -19.61
+			},
+			level: {
+				value: 2000,
+				unit: "FT"
+			},
+			lowerLevel: {
+				value: 1000,
+				unit: "FT"
+			},
+			firGeometry: "",
+			startGeometry: {
+				type: "FeatureCollection",
+				features: [
+					{
+						type: "Feature",
+						properties: {
+							selectionType: "poly"
+						},
+						geometry: {
+							type: "Polygon",
+							coordinates: [
+								[
+									[
+										4.799062887514267,
+										54.04327723979929
+									],
+									[
+										6.006227982070749,
+										53.64012115183787
+									],
+									[
+										4.6168492883359304,
+										53.32840097044425
+									],
+									[
+										4.799062887514267,
+										54.04327723979929
+									]
+								]
+							]
+						}
+					}
+				]
+			},
+			startGeometryIntersect: {
+				type: "FeatureCollection",
+				features: [
+					{
+						type: "Feature",
+						properties: {
+							selectionType: "poly"
+						},
+						geometry: {
+							type: "Polygon",
+							coordinates: [
+								[
+									[
+										4.799062887514267,
+										54.04327723979929
+									],
+									[
+										6.006227982070749,
+										53.64012115183787
+									],
+									[
+										4.6168492883359304,
+										53.32840097044425
+									],
+									[
+										4.799062887514267,
+										54.04327723979929
+									]
+								]
+							]
+						}
+					}
+				]
+			}
+		}
+	}
+];
+
+/* *
+ * 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 airmetList = airmetListJSON;
+var sigmetList = sigmetListJSON;
+var fakeSigmetTAC = 'EHAA SIGMET 1 VALID 121249/121449 EHDB- EHAA AMSTERDAM FIR FRQ TS OBS ENTIRE FIR FL010 STNR WKN';
+var fakeAirmetTAC = 'EHAA AIRMET -1 VALID 310700/311100 EHDB- EHAA AMSTERDAM FIR ISOL CB OBS ENTIRE FIR FL020 STNR NC';
+[rest.get(/^.*\/airmetlist$/, function (_, res, ctx) {
+  return res(ctx.status(200), ctx.json(airmetList));
+}), rest.get(/^.*\/sigmetlist$/, function (_, res, ctx) {
+  return res(ctx.status(200), ctx.json(sigmetList));
+}), rest.get(/^.*\/airmet-config$/, function (_, res, ctx) {
+  return res(ctx.status(200), ctx.json(airmetConfig));
+}), rest.get(/^.*\/sigmet-config$/, function (_, res, ctx) {
+  return res(ctx.status(200), ctx.json(sigmetConfig));
+}), rest.post(/^.*\/airmet2tac$/, function (_, res, ctx) {
+  return res(ctx.status(200), ctx.text(fakeAirmetTAC));
+}), rest.post(/^.*\/sigmet2tac$/, function (_, res, ctx) {
+  return res(ctx.status(200), ctx.text(fakeSigmetTAC));
+}), rest.get(/^(?!.*(sigmet|airmet)).*$/, function (req) {
+  return req.passthrough();
+})];
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -6966,6 +7211,12 @@ warningList.filter(function (warning) {
   return warning.status !== 'EXPIRED' && warning.status !== 'WITHDRAWN';
 }).length;
 var areaKeywordList = ['North Sea districts', 'Coastal Districts', 'KNMI Specific', 'Objects', 'Baltic areas', 'NL', 'FI', 'METNorway Specific', 'Provinces', 'FIR', 'Countries'];
+[rest.get(/^.*\/warnings$/, function (req, res, ctx) {
+  // respond using a mocked JSON body
+  return res(ctx.json(warningList));
+}), rest.post(/^.*\/warnings\/(.*)$/, function (req, res, ctx) {
+  return res(ctx.json({}));
+})];
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -6985,7 +7236,6 @@ var areaKeywordList = ['North Sea districts', 'Coastal Districts', 'KNMI Specifi
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 var ERROR_NOT_FOUND = 'Request failed with status code 400';
-var MOCK_USERNAME = 'user.name';
 var extractDrawingDetailsFromJSON = function extractDrawingDetailsFromJSON(drawingId) {
   return drawingsListFullContent.find(function (element) {
     return element.id === drawingId;
@@ -7061,14 +7311,6 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
         };
       });
     },
-    // public warnings
-    getWarnings: function getWarnings() {
-      return axiosInstance.get("/warnings/").then(function () {
-        return {
-          data: warningList
-        };
-      });
-    },
     saveWarningAs: function saveWarningAs(data) {
       // eslint-disable-next-line no-console
       console.log('api: save warning as', data);
@@ -7088,17 +7330,6 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
         return warning.id === warningId;
       }), 1);
       return axiosInstance.post("/warnings/" + warningId + "?delete=true");
-    },
-    toggleEditorWarning: function toggleEditorWarning(warningId, isEditor) {
-      // eslint-disable-next-line no-console
-      console.log('api: toggle editor warning', warningId, isEditor);
-      var index = warningList.findIndex(function (warning) {
-        return warning.id === warningId;
-      });
-      warningList.splice(index, 1, Object.assign({}, warningList[index], {
-        editor: isEditor ? MOCK_USERNAME : null
-      }));
-      return axiosInstance.post("/warnings/" + warningId + "?editor=" + (isEditor ? 'true' : 'false'));
     }
   };
 };
@@ -7449,7 +7680,7 @@ var DrawingToolFormContentsNoMemo = function DrawingToolFormContentsNoMemo(_ref)
 };
 var DrawingToolFormContents = /*#__PURE__*/React__default.memo(DrawingToolFormContentsNoMemo, isEqual);
 
-var _excluded$8 = ["opacity", "geoJSON"];
+var _excluded$9 = ["opacity", "geoJSON"];
 var getObjectName$1 = function getObjectName(objectName) {
   return objectName || dateUtils.dateToString(new Date(), dateUtils.DATE_FORMAT_DATEPICKER, true) + " UTC";
 };
@@ -7519,7 +7750,7 @@ var DrawingToolForm = function DrawingToolForm(_ref) {
     // remove unneeded properties
     formValues.opacity;
       var geoJSON = formValues.geoJSON,
-      allFormValues = _objectWithoutPropertiesLoose(formValues, _excluded$8);
+      allFormValues = _objectWithoutPropertiesLoose(formValues, _excluded$9);
     // rewind geometry
     var rewindedGeometry = rewindGeometry(geoJSON);
     onSubmitForm(Object.assign({}, allFormValues, {
@@ -7533,7 +7764,8 @@ var DrawingToolForm = function DrawingToolForm(_ref) {
     }));
   }, [geoJSONProperties, drawModes]);
   var onChangeOpacity = React.useCallback(function (event) {
-    var value = event.target.value;
+    var target = event.target;
+    var value = target.value;
     var newOpacity = parseInt(value, 10) / 100;
     var additionalStrokeOpacity = 0.8;
     onChangeProperties({
@@ -7620,7 +7852,7 @@ var DrawingToolFormConnect = function DrawingToolFormConnect() {
     }));
   }, [dispatch, drawTool == null ? void 0 : drawTool.geoJSONLayerId]);
   var onChangeDrawMode = React.useCallback(function (tool) {
-    dispatch(drawtoolActions.changeDrawToolMode({
+    dispatch(drawingToolActions.changeDrawToolMode({
       drawToolId: drawToolId,
       drawModeId: tool.drawModeId
     }));
@@ -7632,7 +7864,7 @@ var DrawingToolFormConnect = function DrawingToolFormConnect() {
       drawMode: ''
     }));
     if (drawTool != null && drawTool.activeDrawModeId) {
-      dispatch(drawtoolActions.changeDrawToolMode({
+      dispatch(drawingToolActions.changeDrawToolMode({
         drawToolId: drawToolId,
         drawModeId: drawTool == null ? void 0 : drawTool.activeDrawModeId
       }));
@@ -7724,12 +7956,12 @@ var DrawingToolConnect = function DrawingToolConnect(_ref) {
   var dispatch = useDispatch();
   React.useEffect(function () {
     var defaultDrawModes = translateDrawModes(currentlySupportedDrawModes, t);
-    dispatch(drawtoolActions.registerDrawTool({
+    dispatch(drawingToolActions.registerDrawTool({
       drawToolId: drawingDialogType,
       defaultDrawModes: defaultDrawModes
     }));
     return function () {
-      dispatch(drawtoolActions.unregisterDrawTool({
+      dispatch(drawingToolActions.unregisterDrawTool({
         drawToolId: drawingDialogType
       }));
     };
@@ -7927,7 +8159,7 @@ var PublicWarningsFormDialog = function PublicWarningsFormDialog(_ref) {
   }));
 };
 
-var _excluded$7 = ["children", "value", "index"];
+var _excluded$8 = ["children", "value", "index"];
 function a11yProps(index) {
   return {
     id: "tab-" + index,
@@ -7948,7 +8180,7 @@ var CustomTabPanel = function CustomTabPanel(props) {
   var children = props.children,
     value = props.value,
     index = props.index,
-    other = _objectWithoutPropertiesLoose(props, _excluded$7);
+    other = _objectWithoutPropertiesLoose(props, _excluded$8);
   return jsx("div", Object.assign({
     role: "tabpanel",
     hidden: value !== index,
@@ -8195,24 +8427,7 @@ var AreaField = function AreaField(_ref) {
   });
 };
 
-var _defaultLevelFilter, _defaultEmptyFilter, _defaultPhenomenonFil;
-/* *
- * 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 _defaultLevelFilter, _defaultEmptyFilter;
 var Domain;
 (function (Domain) {
   Domain["aviation"] = "aviation";
@@ -8251,12 +8466,28 @@ var domainLevels = {
 };
 var defaultLevelFilter = (_defaultLevelFilter = {}, _defaultLevelFilter[emptyFilterId] = true, _defaultLevelFilter.extreme = true, _defaultLevelFilter.moderate = true, _defaultLevelFilter.severe = true, _defaultLevelFilter.AIR = true, _defaultLevelFilter.SIG = true, _defaultLevelFilter);
 var defaultEmptyFilter = (_defaultEmptyFilter = {}, _defaultEmptyFilter[emptyFilterId] = true, _defaultEmptyFilter);
-(_defaultPhenomenonFil = {}, _defaultPhenomenonFil[emptyFilterId] = true, _defaultPhenomenonFil.coastalEvent = true, _defaultPhenomenonFil.fog = true, _defaultPhenomenonFil.highTemp = true, _defaultPhenomenonFil.lowTemp = true, _defaultPhenomenonFil.rain = true, _defaultPhenomenonFil.snowIce = true, _defaultPhenomenonFil.thunderstorm = true, _defaultPhenomenonFil.wind = true, _defaultPhenomenonFil);
+var makeFilterFromList = function makeFilterFromList(options) {
+  var _options$reduce;
+  return options.reduce(function (acc, p) {
+    var _Object$assign;
+    return p ? Object.assign({}, acc, (_Object$assign = {}, _Object$assign[p] = true, _Object$assign)) : acc;
+  }, (_options$reduce = {}, _options$reduce[emptyFilterId] = true, _options$reduce));
+};
+var AllPhenomena = Object.assign({}, AirmetPhenomena, SigmetPhenomena, Phenomenon$1);
+var AllPhenomenaKeys = Object.fromEntries(Object.keys(AllPhenomena).map(function (key) {
+  return [key, key];
+}));
+var domainPhenomena = {
+  aviation: [].concat(Object.keys(SigmetPhenomena), Object.keys(AirmetPhenomena)),
+  maritime: [],
+  "public": [].concat(Object.keys(Phenomenon$1))
+};
+var defaultPhenomenonFilter = makeFilterFromList(Object.keys(AllPhenomenaKeys));
 var initialFilters = {
   incident: defaultEmptyFilter,
   source: defaultEmptyFilter,
   domain: defaultDomainFilter,
-  phenomenon: defaultEmptyFilter,
+  phenomenon: defaultPhenomenonFilter,
   level: defaultLevelFilter
 };
 var getSelectedOptions = function getSelectedOptions(options) {
@@ -8270,11 +8501,11 @@ var getSelectedOptions = function getSelectedOptions(options) {
   };
 };
 var updateState = function updateState(state, optionKey, value, only) {
-  var _Object$assign3;
+  var _Object$assign4;
   if (only) {
     return Object.keys(state).reduce(function (acc, k) {
-      var _Object$assign;
-      return Object.assign({}, acc, (_Object$assign = {}, _Object$assign[k] = k === optionKey, _Object$assign));
+      var _Object$assign2;
+      return Object.assign({}, acc, (_Object$assign2 = {}, _Object$assign2[k] = k === optionKey, _Object$assign2));
     }, {});
   }
   if (optionKey === 'ALL') {
@@ -8282,11 +8513,11 @@ var updateState = function updateState(state, optionKey, value, only) {
       return state;
     }
     return Object.keys(state).reduce(function (acc, k) {
-      var _Object$assign2;
-      return Object.assign({}, acc, (_Object$assign2 = {}, _Object$assign2[k] = value, _Object$assign2));
+      var _Object$assign3;
+      return Object.assign({}, acc, (_Object$assign3 = {}, _Object$assign3[k] = value, _Object$assign3));
     }, {});
   }
-  return Object.assign({}, state, (_Object$assign3 = {}, _Object$assign3[optionKey] = value, _Object$assign3));
+  return Object.assign({}, state, (_Object$assign4 = {}, _Object$assign4[optionKey] = value, _Object$assign4));
 };
 /** Make sure our value is in the filter */
 var getValue = function getValue(values, value) {
@@ -8458,6 +8689,10 @@ var warningPhenomena = [{
   translationKey: 'aviation-phenomenon-obscured-thunderstorm-with-hail',
   key: 'OBSC_TSGR',
   isAviation: true
+}, {
+  translationKey: 'aviation-phenomenon-obscured-thunderstorm',
+  key: 'OBSC_TS',
+  isAviation: true
 }, {
   translationKey: 'aviation-phenomenon-squall-thunderstorm-with-hail',
   key: 'SQL_TSGR',
@@ -8939,23 +9174,19 @@ var ProbabilityField = function ProbabilityField(_ref) {
   });
 };
 
-var config = getConfig();
-var airmetBaseUrl = config.GW_AIRMET_BASE_URL;
-var sigmetBaseUrl = config.GW_SIGMET_BASE_URL;
+var config$1 = getConfig();
+var airmetBaseUrl = config$1.GW_AIRMET_BASE_URL || '';
+var sigmetBaseUrl = config$1.GW_SIGMET_BASE_URL || '';
 // API
 var getAirmetList = function getAirmetList(auth) {
   return fetch(airmetBaseUrl + "/airmetlist", {
     headers: getHeaders(auth)
-  }).then(function (r) {
-    return r.json();
-  });
+  }).then(handleResponse);
 };
 var getSigmetList = function getSigmetList(auth) {
   return fetch(sigmetBaseUrl + "/sigmetlist", {
     headers: getHeaders(auth)
-  }).then(function (r) {
-    return r.json();
-  });
+  }).then(handleResponse);
 };
 var getAirmetConfig = function getAirmetConfig(auth) {
   return fetch(airmetBaseUrl + "/airmet-config", {
@@ -9105,7 +9336,7 @@ var useTACApi = function useTACApi() {
   };
 };
 
-var _excluded$6 = ["IS_DRAFT", "object", "translation-select"];
+var _excluded$7 = ["IS_DRAFT", "object", "translation-select"];
 var useScrollTopOnError = function useScrollTopOnError(error) {
   var ref = React.useRef(null);
   React.useEffect(function () {
@@ -9202,10 +9433,11 @@ var prepareFormValues = function prepareFormValues(data) {
   data.IS_DRAFT;
     data.object;
     data['translation-select'];
-    var productToPost = _objectWithoutPropertiesLoose(data, _excluded$6);
+    var productToPost = _objectWithoutPropertiesLoose(data, _excluded$7);
   // remove empty fields
   return Object.keys(productToPost).reduce(function (warningDetail, fieldName) {
-    var fieldValue = productToPost[fieldName];
+    var key = fieldName;
+    var fieldValue = productToPost[key];
     if (Array.isArray(fieldValue)) {
       if (!fieldValue.length || fieldValue[0].geoJSON === null) {
         return warningDetail;
@@ -9213,7 +9445,7 @@ var prepareFormValues = function prepareFormValues(data) {
     }
     if (fieldValue) {
       var _Object$assign;
-      return Object.assign({}, warningDetail, (_Object$assign = {}, _Object$assign[fieldName] = fieldValue, _Object$assign));
+      return Object.assign({}, warningDetail, (_Object$assign = {}, _Object$assign[key] = fieldValue, _Object$assign));
     }
     return warningDetail;
   }, {});
@@ -9301,6 +9533,8 @@ var Form = function Form(_ref5) {
     onSaveForm = _ref5$onSaveForm === void 0 ? function () {} : _ref5$onSaveForm,
     _ref5$onPublishForm = _ref5.onPublishForm,
     onPublishForm = _ref5$onPublishForm === void 0 ? function () {} : _ref5$onPublishForm,
+    _ref5$onClearForm = _ref5.onClearForm,
+    onClearForm = _ref5$onClearForm === void 0 ? function () {} : _ref5$onClearForm,
     object = _ref5.object,
     _ref5$formAction = _ref5.formAction,
     formAction = _ref5$formAction === void 0 ? '' : _ref5$formAction,
@@ -9398,6 +9632,7 @@ var Form = function Form(_ref5) {
   var onPressClear = function onPressClear() {
     reset(getEmptyPublicWarning());
     setWarningGeoJSONFeature(undefined);
+    onClearForm();
   };
   var publicWarningId = publicWarningDetails == null ? void 0 : publicWarningDetails.id;
   React.useEffect(function () {
@@ -9706,29 +9941,25 @@ var getPublicWarningStore = function getPublicWarningStore(store) {
   if (store && store.publicWarningForm) {
     return store.publicWarningForm;
   }
-  return null;
+  return {};
 };
 var getPublicWarningObject = createSelector(getPublicWarningStore, function (publicWarningStore) {
   return publicWarningStore.object;
 });
 var getPublicWarning = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  return publicWarningStore.publicWarning;
+  return publicWarningStore == null ? void 0 : publicWarningStore.warning;
 });
 var getPublicWarningStatus = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  var _publicWarningStore$p;
-  return publicWarningStore == null || (_publicWarningStore$p = publicWarningStore.publicWarning) == null ? void 0 : _publicWarningStore$p.status;
-});
-var getPublicWarningEditor = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  var _publicWarningStore$p2;
-  return publicWarningStore == null || (_publicWarningStore$p2 = publicWarningStore.publicWarning) == null ? void 0 : _publicWarningStore$p2.editor;
+  var _publicWarningStore$w;
+  return publicWarningStore == null || (_publicWarningStore$w = publicWarningStore.warning) == null ? void 0 : _publicWarningStore$w.status;
 });
 var getPublicWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  var _publicWarningStore$p3;
-  return publicWarningStore == null || (_publicWarningStore$p3 = publicWarningStore.publicWarning) == null ? void 0 : _publicWarningStore$p3.warningDetail.id;
+  var _publicWarningStore$w2;
+  return publicWarningStore == null || (_publicWarningStore$w2 = publicWarningStore.warning) == null ? void 0 : _publicWarningStore$w2.warningDetail.id;
 });
 var getPublicWarningAreas = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  var _publicWarningStore$p4;
-  return (publicWarningStore == null || (_publicWarningStore$p4 = publicWarningStore.publicWarning) == null ? void 0 : _publicWarningStore$p4.warningDetail.areas) || [];
+  var _publicWarningStore$w3;
+  return (publicWarningStore == null || (_publicWarningStore$w3 = publicWarningStore.warning) == null ? void 0 : _publicWarningStore$w3.warningDetail.areas) || [];
 });
 var getPublicWarningFormState = createSelector(getPublicWarningStore, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.formState) || '';
@@ -9736,8 +9967,8 @@ var getPublicWarningFormState = createSelector(getPublicWarningStore, function (
 var getPublicWarningFormError = createSelector(getPublicWarningStore, function (publicWarningStore) {
   return publicWarningStore == null ? void 0 : publicWarningStore.error;
 });
-var getSelectedPublicWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
-  return (publicWarningStore == null ? void 0 : publicWarningStore.selectedPublicWarningId) || '';
+var getSelectedWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
+  return (publicWarningStore == null ? void 0 : publicWarningStore.selectedWarningId) || '';
 });
 var getSelectedPublicIsFormDirty = createSelector(getPublicWarningStore, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.isFormDirty) || false;
@@ -9775,11 +10006,13 @@ var PublicWarningStatus;
 })(PublicWarningStatus || (PublicWarningStatus = {}));
 
 var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
-  var defaultMapPreset = _ref.defaultMapPreset,
+  var editor = _ref.editor,
+    defaultMapPreset = _ref.defaultMapPreset,
     selectedAviationProduct = _ref.selectedAviationProduct,
     _ref$warningType = _ref.warningType,
     warningType = _ref$warningType === void 0 ? 'public' : _ref$warningType,
-    mode = _ref.mode;
+    mode = _ref.mode,
+    onFormSubmit = _ref.onFormSubmit;
   var publicWarning = useSelector(function (store) {
     return getPublicWarning(store);
   });
@@ -9792,21 +10025,22 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
   var publicWarningFormError = useSelector(function (store) {
     return getPublicWarningFormError(store);
   });
-  var publicWarningEditor = useSelector(function (store) {
-    return getPublicWarningEditor(store);
-  });
   var _useAuthenticationCon = useAuthenticationContext$1(),
     auth = _useAuthenticationCon.auth;
-  var isEditor = publicWarningEditor === (auth == null ? void 0 : auth.username) || false;
+  var isEditor = editor === (auth == null ? void 0 : auth.username) || false;
   var dispatch = useDispatch();
   var publishForm = function publishForm(newFormValues) {
     dispatch(publicWarningFormActions.publishWarning({
       publicWarning: {
         warningDetail: newFormValues,
         status: PublicWarningStatus.PUBLISHED
-      }
+      },
+      refetchWarnings: onFormSubmit
     }));
   };
+  var clearForm = function clearForm() {
+    dispatch(publicWarningFormActions.removeAllAreas());
+  };
   var saveForm = function saveForm(newFormValues) {
     var status = newFormValues.linked_to_id ? PublicWarningStatus.DRAFT_PUBLISHED : PublicWarningStatus.DRAFT;
     dispatch(publicWarningFormActions.saveWarning({
@@ -9814,7 +10048,8 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
         warningDetail: newFormValues,
         status: status,
         editor: auth == null ? void 0 : auth.username
-      }
+      },
+      refetchWarnings: onFormSubmit
     }));
   };
   var onFormDirty = function onFormDirty(isFormDirty) {
@@ -9838,12 +10073,16 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     if ((selectedAviationProduct == null ? void 0 : selectedAviationProduct.status) === 'DRAFT') {
       return false;
     }
-    if (mode === 'new') {
+    if (publicWarningFormAction === 'edit') {
+      return false;
+    }
+    if (mode === 'new') {
       return false;
     }
     return true;
   };
   var isReadOnly = getIsReadOnly();
+  var formMode = publicWarningFormAction === 'edit' ? 'edit' : mode;
   var onAddObject = function onAddObject() {
     dispatch(uiActions.setToggleOpenDialog({
       type: uiTypes.DialogTypes.AreaObjectLoader,
@@ -9855,6 +10094,7 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     publicWarningDetails: publicWarning == null ? void 0 : publicWarning.warningDetail,
     onPublishForm: publishForm,
     onSaveForm: saveForm,
+    onClearForm: clearForm,
     formAction: publicWarningFormAction,
     isReadOnly: isReadOnly,
     error: publicWarningFormError,
@@ -9863,7 +10103,7 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     onAddObject: onAddObject,
     selectedAviationProduct: selectedAviationProduct,
     warningType: warningType,
-    mode: mode
+    mode: formMode
   });
 };
 
@@ -10371,6 +10611,9 @@ var AreaObjectLoaderConnect = function AreaObjectLoaderConnect(_ref) {
   var warningId = useSelector(function (store) {
     return getPublicWarningId(store);
   });
+  var warningStatus = useSelector(function (store) {
+    return getPublicWarningStatus(store);
+  });
   var fetchItems = function fetchItems() {
     dispatch(uiActions.setErrorDialog({
       error: '',
@@ -10451,7 +10694,7 @@ var AreaObjectLoaderConnect = function AreaObjectLoaderConnect(_ref) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [areas, searchQuery]);
-  var isChangeAreaDisabled = warningId !== undefined && typeof warningId === 'string' && warningId.length > 0;
+  var isChangeAreaDisabled = warningId !== undefined && typeof warningId === 'string' && warningId.length > 0 && warningStatus !== PublicWarningStatus.DRAFT && warningStatus !== PublicWarningStatus.DRAFT_PUBLISHED;
   var drawingError = uiError ? {
     type: areaObjectLoaderType,
     error: uiError
@@ -10484,26 +10727,25 @@ var AreaObjectLoaderConnect = function AreaObjectLoaderConnect(_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 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2024 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
+var _excluded$6 = ["sigmetAirmetDetail"];
+function isCancelAirmet(warningDetail) {
+  return warningDetail.cancelsAirmetSequenceId !== undefined;
+}
+function isCancelSigmet(warningDetail) {
+  return warningDetail.cancelsSigmetSequenceId !== undefined;
+}
+var flattenPublicWarning = function flattenPublicWarning(publicWarning) {
+  if (!publicWarning) {
+    return {};
+  }
+  var sigmetAirmetDetail = publicWarning.sigmetAirmetDetail,
+    rest = _objectWithoutPropertiesLoose(publicWarning, _excluded$6);
+  return Object.assign({}, rest, sigmetAirmetDetail || {}, {
+    status: sigmetAirmetDetail == null ? void 0 : sigmetAirmetDetail.status
+  });
+};
 var transformAirmetToWarningFormat = function transformAirmetToWarningFormat(apiAirmet) {
   var airmet = apiAirmet.airmet;
-  var cancelAirmet = apiAirmet == null ? void 0 : apiAirmet.airmet;
   var areas = [];
   if (airmet.startGeometry) {
     areas.push({
@@ -10524,23 +10766,22 @@ var transformAirmetToWarningFormat = function transformAirmetToWarningFormat(api
     lastUpdatedTime: apiAirmet.lastUpdateDate,
     productStatus: airmet.status,
     warningDetail: {
-      descriptionOriginal: '',
-      descriptionTranslation: '',
-      areas: areas,
+      id: airmet.uuid,
       phenomenon: airmet.phenomenon,
+      areas: areas,
       validFrom: airmet.validDateStart,
       validUntil: airmet.validDateEnd,
+      incident: airmet.sequence,
       level: 'AIR',
       probability: 0,
-      incident: airmet.sequence,
-      firName: airmet.firName,
-      cancelId: isInstanceOfCancelAirmet(airmet) ? cancelAirmet.cancelsAirmetSequenceId : undefined
-    }
+      descriptionOriginal: '',
+      descriptionTranslation: ''
+    },
+    sigmetAirmetDetail: Object.assign({}, airmet)
   };
 };
 var transformSigmetToWarningFormat = function transformSigmetToWarningFormat(apiSigmet) {
   var sigmet = apiSigmet.sigmet;
-  var cancelSigmet = apiSigmet == null ? void 0 : apiSigmet.sigmet;
   var areas = [];
   if (sigmet.startGeometry) {
     areas.push({
@@ -10577,18 +10818,18 @@ var transformSigmetToWarningFormat = function transformSigmetToWarningFormat(api
     lastUpdatedTime: apiSigmet.lastUpdateDate,
     productStatus: sigmet.status,
     warningDetail: {
-      descriptionOriginal: '',
-      descriptionTranslation: '',
-      areas: areas,
+      id: sigmet.uuid,
       phenomenon: sigmet.phenomenon,
+      areas: areas,
       validFrom: sigmet.validDateStart,
       validUntil: sigmet.validDateEnd,
+      incident: sigmet.sequence,
       level: 'SIG',
       probability: 0,
-      incident: sigmet.sequence,
-      firName: sigmet.firName,
-      cancelId: isInstanceOfCancelSigmet(sigmet) ? cancelSigmet.cancelsSigmetSequenceId : undefined
-    }
+      descriptionOriginal: '',
+      descriptionTranslation: ''
+    },
+    sigmetAirmetDetail: Object.assign({}, sigmet)
   };
 };
 var mapProductStatusToWarningStatus = function mapProductStatusToWarningStatus(productStatus) {
@@ -10604,15 +10845,9 @@ var mapProductStatusToWarningStatus = function mapProductStatusToWarningStatus(p
       return PublicWarningStatus.EXPIRED;
   }
 };
-var transformSigmetToProductFormat = function transformSigmetToProductFormat(warning, config) {
-  var _warning$sigmet;
-  var fir = (warning == null || (_warning$sigmet = warning.sigmet) == null ? void 0 : _warning$sigmet.locationIndicatorATSR) || config.active_firs[0];
-  var firConfig = config.fir_areas[fir];
+var transformSigmetToProductFormat = function transformSigmetToProductFormat(warning) {
   var sigmet = warning == null ? void 0 : warning.sigmet;
   var cancelSigmet = warning == null ? void 0 : warning.sigmet;
-  if (!firConfig) {
-    throw new Error("FIR " + fir + " not found in configuration");
-  }
   return Object.assign({
     uuid: (sigmet == null ? void 0 : sigmet.uuid) || 'default',
     // Use a fallback UUID or handle undefined
@@ -10653,15 +10888,9 @@ var transformSigmetToProductFormat = function transformSigmetToProductFormat(war
     validDateEndOfSigmetToCancel: cancelSigmet.validDateEndOfSigmetToCancel
   });
 };
-var transformAirmetToProductFormat = function transformAirmetToProductFormat(warning, config) {
-  var _warning$airmet;
-  var fir = (warning == null || (_warning$airmet = warning.airmet) == null ? void 0 : _warning$airmet.locationIndicatorATSR) || config.active_firs[0];
-  var firConfig = config.fir_areas[fir];
+var transformAirmetToProductFormat = function transformAirmetToProductFormat(warning) {
   var airmet = warning == null ? void 0 : warning.airmet;
   var cancelAirmet = warning == null ? void 0 : warning.airmet;
-  if (!firConfig) {
-    throw new Error("FIR " + fir + " not found in configuration");
-  }
   return Object.assign({
     uuid: (airmet == null ? void 0 : airmet.uuid) || 'default',
     // Use a fallback UUID or handle undefined
@@ -10774,6 +11003,172 @@ var getEmptyAirmetWarning = function getEmptyAirmetWarning() {
     }
   };
 };
+var renewWarning = function renewWarning(warning, productConfig) {
+  if (!warning.sigmetAirmetDetail) {
+    return warning;
+  }
+  return renewAviationProduct(warning, productConfig);
+};
+var renewAviationProduct = function renewAviationProduct(oldWarning, productConfig) {
+  var warningDetail = oldWarning.sigmetAirmetDetail;
+  if (!warningDetail) {
+    return oldWarning;
+  }
+  var newValidUntil = 'phenomenon' in warningDetail ? getDefaultValidUntilValue(productConfig, warningDetail.phenomenon, warningDetail.locationIndicatorATSR, warningDetail.validDateEnd) : warningDetail.validDateEnd;
+  var renewedWarningDetail = Object.assign({}, warningDetail, {
+    validDateStart: warningDetail.validDateEnd,
+    validDateEnd: newValidUntil,
+    status: ProductStatus.DRAFT,
+    uuid: undefined,
+    sequence: '-1'
+  });
+  return Object.assign({}, oldWarning, {
+    sigmetAirmetDetail: renewedWarningDetail
+  });
+};
+
+/* *
+ * 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 config = getConfig();
+var publicWarningBaseUrl = config.GW_DRAWINGS_BASE_URL || '';
+// API
+var getPublicWarningList = function getPublicWarningList(auth) {
+  return fetch(publicWarningBaseUrl + "/warnings", {
+    headers: getHeaders(auth)
+  }).then(handleResponse);
+};
+var updatePublicWarningEditor = function updatePublicWarningEditor(warningId, isEditor, auth) {
+  return fetch(publicWarningBaseUrl + "/warnings/" + warningId + "?editor=" + (isEditor ? 'true' : 'false'), {
+    headers: getHeaders(auth),
+    method: 'POST'
+  }).then(handleResponse);
+};
+
+/**
+ * @param disabled - Disables fetching, but still returns cached values.
+ * https://tanstack.com/query/v4/docs/framework/react/guides/disabling-queries
+ */
+var usePublicWarnings = function usePublicWarnings(disabled) {
+  if (disabled === void 0) {
+    disabled = false;
+  }
+  return useAuthQuery(['public-warning-list'], getPublicWarningList, disabled, 1000 * 60 * 5);
+};
+var useMutatePublicWarningEditor = function useMutatePublicWarningEditor() {
+  var queryClient = useQueryClient();
+  var _useAuthenticationCon = useAuthenticationContext(),
+    auth = _useAuthenticationCon.auth;
+  var dispatch = useDispatch();
+  return useMutation(Object.assign({
+    mutationFn: function mutationFn(_ref) {
+      var id = _ref.id,
+        isEditor = _ref.isEditor;
+      if (!auth) {
+        throw new Error('Authentication context not found');
+      }
+      return updatePublicWarningEditor(id, isEditor, auth);
+    }
+  }, optimisticUpdate(['public-warning-list'], queryClient, function (w, _ref2) {
+    var isEditor = _ref2.isEditor;
+    return Object.assign({}, w, {
+      editor: isEditor ? auth.username : undefined
+    });
+  }, function (error) {
+    dispatch(publicWarningFormActions.setFormError({
+      message: error.message
+    }));
+  }), {
+    onSettled: function () {
+      var _onSettled = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, e, _ref3) {
+        var isEditor;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              isEditor = _ref3.isEditor;
+              dispatch(snackbarActions.openSnackbar({
+                type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
+                key: isEditor ? 'warning-editor-add-editor' : 'warning-editor-remove-editor'
+              }));
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function onSettled(_x, _x2, _x3) {
+        return _onSettled.apply(this, arguments);
+      }
+      return onSettled;
+    }()
+  }));
+};
+
+/* *
+ * 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 useWarnings = function useWarnings(disabled) {
+  var _usePublicWarnings = usePublicWarnings(disabled),
+    publicWarnings = _usePublicWarnings.data,
+    refetchPublicWarnings = _usePublicWarnings.refetch,
+    isFetchingPublicWarnings = _usePublicWarnings.isFetching,
+    publicWarningsError = _usePublicWarnings.error,
+    dataUpdatedAt = _usePublicWarnings.dataUpdatedAt;
+  var _useAirmetList = useAirmetList(disabled),
+    airmetWarnings = _useAirmetList.data,
+    refetchAirmet = _useAirmetList.refetch,
+    isFetchingAirmet = _useAirmetList.isFetching;
+  var _useSigmetList = useSigmetList(disabled),
+    sigmetWarnings = _useSigmetList.data,
+    refetchSigmet = _useSigmetList.refetch,
+    isFetchingSigmet = _useSigmetList.isFetching;
+  var combinedWarnings = useMemo(function () {
+    var transformedSigmets = (sigmetWarnings == null ? void 0 : sigmetWarnings.map(transformSigmetToWarningFormat)) || [];
+    var transformedAirmets = (airmetWarnings == null ? void 0 : airmetWarnings.map(transformAirmetToWarningFormat)) || [];
+    return (publicWarnings || []).concat(transformedSigmets).concat(transformedAirmets);
+  }, [publicWarnings, sigmetWarnings, airmetWarnings]);
+  var refetchWarnings = function refetchWarnings() {
+    void refetchPublicWarnings();
+    void refetchAirmet();
+    void refetchSigmet();
+  };
+  var isFetching = isFetchingPublicWarnings || isFetchingAirmet || isFetchingSigmet;
+  return {
+    combinedWarnings: combinedWarnings,
+    refetchWarnings: refetchWarnings,
+    isFetching: isFetching,
+    error: publicWarningsError || undefined,
+    dataUpdatedAt: dataUpdatedAt
+  };
+};
 
 var warningFormConfirmationOptions = function warningFormConfirmationOptions(t) {
   return {
@@ -10793,7 +11188,6 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
     source = _ref$source === void 0 ? 'app' : _ref$source,
     startPosition = _ref.startPosition,
     defaultMapPreset = _ref.defaultMapPreset;
-  var warningsApi = getWarningsApi();
   var _useSetupDialog = useSetupDialog(publicWarningDialogType, source),
     dialogOrder = _useSetupDialog.dialogOrder,
     setDialogOrder = _useSetupDialog.setDialogOrder,
@@ -10811,66 +11205,100 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
   var isFormDirty = useSelector(function (store) {
     return getSelectedPublicIsFormDirty(store);
   });
-  var publicWarningStatus = useSelector(function (store) {
-    return getPublicWarningStatus(store);
-  });
+  var publicWarningState = useSelector(getPublicWarning);
+  var _ref2 = publicWarningState || {},
+    status = _ref2.status,
+    editor = _ref2.editor;
+  var _useWarnings = useWarnings(true),
+    combinedWarnings = _useWarnings.combinedWarnings,
+    refetchWarnings = _useWarnings.refetchWarnings,
+    isFetching = _useWarnings.isFetching;
+  var _React$useState = React__default.useState(isFetching),
+    hasFetched = _React$useState[0],
+    setHasFetched = _React$useState[1];
+  React__default.useEffect(function () {
+    if (isFetching) {
+      setHasFetched(true);
+    }
+  }, [isFetching]);
   var selectedWarningId = useSelector(function (store) {
-    return getSelectedPublicWarningId(store);
-  });
-  var publicWarningEditor = useSelector(function (store) {
-    return getPublicWarningEditor(store);
+    return getSelectedWarningId(store);
   });
+  var selectedWarningObject = useSelector(getPublicWarning);
   var warningType = useSelector(getWarningType);
+  var selectedWarning = combinedWarnings == null ? void 0 : combinedWarnings.find(function (w) {
+    return w.id === selectedWarningId;
+  });
   var _useAuthenticationCon = useAuthenticationContext$1(),
     auth = _useAuthenticationCon.auth;
-  var isEditor = publicWarningEditor === (auth == null ? void 0 : auth.username) || false;
-  var getLatestEditor = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var latestWarnings, latestWarning;
+  var isEditor = (selectedWarning == null ? void 0 : selectedWarning.editor) === (auth == null ? void 0 : auth.username) || false;
+  var shouldGiveEditorWarning = React__default.useCallback(function (newEditor, oldEditor) {
+    var oldEditorIsYou = oldEditor && oldEditor === (auth == null ? void 0 : auth.username);
+    if (oldEditorIsYou && newEditor !== oldEditor) {
+      dispatch(publicWarningFormActions.setFormError({
+        severity: 'warning',
+        message: TAKEOVER_MESSAGE
+      }));
+    }
+  }, [dispatch, auth == null ? void 0 : auth.username]);
+  var previousSelectedWarning = usePrevious(selectedWarning);
+  var refetchCurrentEditor = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var newWarnings, newSelectedWarning;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return warningsApi.getWarnings();
+            return getPublicWarningList(auth);
           case 2:
-            latestWarnings = _context.sent;
-            latestWarning = latestWarnings.data.find(function (warning) {
-              return warning.id === selectedWarningId;
+            newWarnings = _context.sent;
+            newSelectedWarning = newWarnings == null ? void 0 : newWarnings.find(function (w) {
+              return w.id === selectedWarningId;
             });
-            return _context.abrupt("return", (latestWarning == null ? void 0 : latestWarning.editor) || '');
+            return _context.abrupt("return", (newSelectedWarning == null ? void 0 : newSelectedWarning.editor) || '');
           case 5:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function getLatestEditor() {
-      return _ref2.apply(this, arguments);
+    return function refetchCurrentEditor() {
+      return _ref3.apply(this, arguments);
     };
   }();
+  React__default.useEffect(function () {
+    if (editor !== (selectedWarning == null ? void 0 : selectedWarning.editor) && status !== 'TODO') {
+      void setIsEditor(editor !== (auth == null ? void 0 : auth.username));
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editor]);
+  React__default.useEffect(function () {
+    if ((selectedWarning == null ? void 0 : selectedWarning.id) !== (previousSelectedWarning == null ? void 0 : previousSelectedWarning.id)) {
+      dispatch(publicWarningFormActions.removeFormError());
+    }
+  }, [selectedWarning == null ? void 0 : selectedWarning.id, previousSelectedWarning == null ? void 0 : previousSelectedWarning.id, dispatch]);
+  React__default.useEffect(function () {
+    // Only give editor warning when the change in selectedWarning is from a refetch
+    if (hasFetched) {
+      setHasFetched(false);
+      shouldGiveEditorWarning(selectedWarning == null ? void 0 : selectedWarning.editor, previousSelectedWarning == null ? void 0 : previousSelectedWarning.editor);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selectedWarning == null ? void 0 : selectedWarning.editor]);
+  var updatePublicWarningEditor = useMutatePublicWarningEditor();
   var setIsEditor = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(isReadOnly) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(isReadOnly) {
       var username, latestEditor;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             username = (auth == null ? void 0 : auth.username) || ''; // make sure to get the latest changes if you are editing an existing warning
-            if (!selectedWarningId) {
-              _context2.next = 7;
-              break;
-            }
-            _context2.next = 4;
-            return getLatestEditor();
-          case 4:
-            _context2.t0 = _context2.sent;
-            _context2.next = 8;
-            break;
-          case 7:
-            _context2.t0 = '';
-          case 8:
-            latestEditor = _context2.t0;
+            _context2.next = 3;
+            return refetchCurrentEditor();
+          case 3:
+            latestEditor = _context2.sent;
             if (!(!selectedWarningId || !isReadOnly && username === latestEditor || isReadOnly && latestEditor !== username)) {
-              _context2.next = 12;
+              _context2.next = 8;
               break;
             }
             // currently editing a new warning or
@@ -10880,34 +11308,40 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
             dispatch(publicWarningFormActions.setFormValues({
               formState: isReadOnly ? 'readonly' : ''
             }));
+            // If the editor was changed in a different window, refetch the warnings
+            if (latestEditor !== (selectedWarning == null ? void 0 : selectedWarning.editor)) {
+              void refetchWarnings();
+            }
             return _context2.abrupt("return", true);
-          case 12:
+          case 8:
             if (!(!isReadOnly && isAlreadyEdited(latestEditor, username))) {
-              _context2.next = 15;
+              _context2.next = 11;
               break;
             }
-            _context2.next = 15;
+            _context2.next = 11;
             return confirmDialog({
               title: t('warning-edit-mode-title'),
               description: t('warning-edit-mode-description'),
               confirmLabel: t('warning-edit-mode-confirm'),
               cancelLabel: t('warning-dialog-cancel')
             });
-          case 15:
-            dispatch(publicWarningFormActions.toggleEditorWarning({
-              warningId: selectedWarningId,
-              isEditor: !isReadOnly,
-              username: username
+          case 11:
+            dispatch(publicWarningFormActions.setFormValues({
+              formState: isReadOnly ? 'readonly' : ''
             }));
+            updatePublicWarningEditor.mutate({
+              id: selectedWarningId,
+              isEditor: !isReadOnly
+            });
             return _context2.abrupt("return", true);
-          case 17:
+          case 14:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function setIsEditor(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var onChangeFormMode = function onChangeFormMode(isReadOnly) {
@@ -10934,7 +11368,7 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
     }
   };
   var closeDialog = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var mayProceed;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -10965,7 +11399,7 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
       }, _callee4);
     }));
     return function closeDialog() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var _useAirmetList = useAirmetList(true),
@@ -10981,15 +11415,26 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
   var updatedWarningType = selectedSigmet ? 'sigmet' : selectedAirmet && 'airmet' || warningType;
   var _useProductConfig = useProductConfig(updatedWarningType, !isDialogOpen),
     aviationConfig = _useProductConfig.data;
-  var selectedSigmetProduct = selectedSigmet && aviationConfig ? transformSigmetToProductFormat(selectedSigmet, aviationConfig) : getEmptySigmetWarning();
-  var selectedAirmetProduct = selectedAirmet && aviationConfig ? transformAirmetToProductFormat(selectedAirmet, aviationConfig) : getEmptyAirmetWarning();
-  var selectedAviationProduct = updatedWarningType === 'sigmet' ? selectedSigmetProduct : updatedWarningType === 'airmet' && selectedAirmetProduct || undefined;
+  var selectedSigmetProduct = selectedSigmet && aviationConfig ? transformSigmetToProductFormat(selectedSigmet) : getEmptySigmetWarning();
+  var selectedAirmetProduct = selectedAirmet && aviationConfig ? transformAirmetToProductFormat(selectedAirmet) : getEmptyAirmetWarning();
+  var selectedAviationProduct = React__default.useMemo(function () {
+    if (selectedWarningObject && selectedWarningObject.sigmetAirmetDetail && aviationConfig) {
+      return flattenPublicWarning(selectedWarningObject);
+    }
+    if (updatedWarningType === 'sigmet') {
+      return selectedSigmetProduct;
+    }
+    if (updatedWarningType === 'airmet') {
+      return selectedAirmetProduct;
+    }
+    return undefined;
+  }, [selectedWarningObject, updatedWarningType, selectedSigmetProduct, selectedAirmetProduct, aviationConfig]);
   var productCanBe = updatedWarningType === 'public' ? ['DRAFTED', 'DISCARDED', 'PUBLISHED'] : (selectedSigmet == null ? void 0 : selectedSigmet.canbe) || (selectedAirmet == null ? void 0 : selectedAirmet.canbe);
   var mode = getProductFormMode(productCanBe, !selectedWarningId ? null : selectedAviationProduct);
   // Readonly also in case you are not creating a new warning and you are not set as the editor
-  var isReadOnly = formAction === 'readonly' || !isEditor && publicWarningStatus !== undefined;
+  var isReadOnly = formAction === 'readonly' || !isEditor && status !== undefined;
   // Only show toggle if in draft status
-  var shouldHideFormToggleMode = publicWarningStatus !== 'DRAFT' && publicWarningStatus !== 'DRAFT_PUBLISHED';
+  var shouldHideFormToggleMode = status !== 'DRAFT' && status !== 'DRAFT_PUBLISHED';
   return jsxs(Fragment, {
     children: [jsx(PublicWarningsFormDialog, {
       isOpen: isDialogOpen,
@@ -11003,14 +11448,18 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
       isReadOnly: isReadOnly,
       onChangeFormMode: onChangeFormMode,
       shouldHideFormMode: shouldHideFormToggleMode,
-      publicWarningEditor: publicWarningEditor,
+      publicWarningEditor: (selectedWarning == null ? void 0 : selectedWarning.editor) || undefined,
       selectedAviationProduct: selectedAviationProduct,
       warningType: updatedWarningType,
       children: jsx(PublicWarningsFormConnect, {
+        editor: (selectedWarning == null ? void 0 : selectedWarning.editor) || undefined,
         defaultMapPreset: defaultMapPreset,
         selectedAviationProduct: selectedAviationProduct,
         warningType: updatedWarningType,
-        mode: mode
+        mode: mode,
+        onFormSubmit: function onFormSubmit() {
+          return refetchWarnings();
+        }
       })
     }), jsx(AreaObjectLoaderConnect, {})]
   });
@@ -11037,9 +11486,10 @@ var warningColors = Object.assign({}, LevelColors);
 
 var _excluded$5 = ["id", "warningDetail", "status", "editor"],
   _excluded2 = ["id", "linked_to_id", "proposal_id", "warning_handle_uuid"],
-  _excluded3 = ["id"],
-  _excluded4 = ["id", "warningDetail"],
-  _excluded5 = ["id"];
+  _excluded3 = ["published_warning_uuid"],
+  _excluded4 = ["id"],
+  _excluded5 = ["id", "warningDetail"],
+  _excluded6 = ["id"];
 var getSortedStatus = function getSortedStatus(status) {
   switch (status) {
     case 'DRAFT_PUBLISHED':
@@ -11053,6 +11503,7 @@ var getSortedStatus = function getSortedStatus(status) {
   }
 };
 var getWarningWithoutIdStatusEditor = function getWarningWithoutIdStatusEditor(warning) {
+  var _warningDetail$areas;
   warning.id;
     var warningDetail = warning.warningDetail;
     warning.status;
@@ -11063,15 +11514,22 @@ var getWarningWithoutIdStatusEditor = function getWarningWithoutIdStatusEditor(w
     warningDetail.proposal_id;
     warningDetail.warning_handle_uuid;
     var cleanWarningDetail = _objectWithoutPropertiesLoose(warningDetail, _excluded2);
+  var areas = (_warningDetail$areas = warningDetail.areas) == null ? void 0 : _warningDetail$areas.map(function (_ref) {
+    _ref.published_warning_uuid;
+      var area = _objectWithoutPropertiesLoose(_ref, _excluded3);
+    return area;
+  });
   return Object.assign({}, fullWarning, {
-    warningDetail: cleanWarningDetail
+    warningDetail: Object.assign({}, cleanWarningDetail, {
+      areas: areas
+    })
   });
 };
 var getWarningWithLinkedToId = function getWarningWithLinkedToId(warning) {
   var id = warning.id,
     warningDetail = warning.warningDetail;
   warningDetail.id;
-    var cleanWarningDetail = _objectWithoutPropertiesLoose(warningDetail, _excluded3);
+    var cleanWarningDetail = _objectWithoutPropertiesLoose(warningDetail, _excluded4);
   return Object.assign({}, warning, {
     warningDetail: Object.assign({}, cleanWarningDetail, {
       linked_to_id: id
@@ -11082,9 +11540,9 @@ var getWarningWithLinkedToId = function getWarningWithLinkedToId(warning) {
 var getWarningWithProposalId = function getWarningWithProposalId(warning) {
   var id = warning.id,
     warningDetail = warning.warningDetail,
-    fullWarning = _objectWithoutPropertiesLoose(warning, _excluded4);
+    fullWarning = _objectWithoutPropertiesLoose(warning, _excluded5);
   warningDetail.id;
-    var cleanWarningDetail = _objectWithoutPropertiesLoose(warningDetail, _excluded5);
+    var cleanWarningDetail = _objectWithoutPropertiesLoose(warningDetail, _excluded6);
   return Object.assign({}, fullWarning, {
     warningDetail: Object.assign({}, cleanWarningDetail, {
       proposal_id: id
@@ -11170,7 +11628,6 @@ var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
         })
       })
     }), jsxs(Menu, {
-      title: t("filter-" + id),
       open: Boolean(anchorEl),
       onClose: function onClose() {
         return setAnchorEl(null);
@@ -11244,11 +11701,7 @@ var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
               return updateFilter(id, emptyFilterId, checked, only);
             },
             labelStyle: {
-              width: 'fit-content',
-              fontSize: '16px',
-              display: 'flex',
-              alignItems: 'center',
-              gap: 1
+              fontSize: '16px'
             },
             label: jsx(Fragment, {
               children: t(getTranslationKey(emptyFilterId, id))
@@ -11265,14 +11718,29 @@ var ExpandableFilterChip = function ExpandableFilterChip(_ref) {
                 return updateFilter(id, optionId, checked, only);
               },
               labelStyle: Object.assign({}, getLevelStyle(warningColor), {
-                width: 'fit-content',
-                fontSize: '16px',
-                display: 'flex',
-                alignItems: 'center',
-                gap: 1
+                width: LevelColors[optionId] ? 'fit-content' : '100%',
+                fontSize: '16px'
               }),
-              label: jsxs(Fragment, {
-                children: [getWarningPhenomenaIcon(optionId), ' ', t(getTranslationKey(optionId, id))]
+              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);
           })]
@@ -11429,6 +11897,8 @@ var WarningListItemMenu = function WarningListItemMenu(_ref) {
     onExpireWarning = _ref$onExpireWarning === void 0 ? function () {} : _ref$onExpireWarning,
     _ref$onWithdrawWarnin = _ref.onWithdrawWarning,
     onWithdrawWarning = _ref$onWithdrawWarnin === void 0 ? function () {} : _ref$onWithdrawWarnin,
+    _ref$onRenewWarning = _ref.onRenewWarning,
+    onRenewWarning = _ref$onRenewWarning === void 0 ? function () {} : _ref$onRenewWarning,
     t = _ref.t;
   var duplicate = {
     text: t('warning-list-button-duplicate'),
@@ -11495,11 +11965,42 @@ var WarningListItemMenu = function WarningListItemMenu(_ref) {
         icon: jsx(Delete, {})
       }];
     default:
-      return [];
+      switch (warning.productStatus) {
+        case ProductStatus.PUBLISHED:
+          if (warning.sigmetAirmetDetail && (isInstanceOfCancelSigmet(warning.sigmetAirmetDetail) || isInstanceOfCancelAirmet(warning.sigmetAirmetDetail))) {
+            return [];
+          }
+          return [{
+            text: t('warning-list-button-renew'),
+            action: function action() {
+              if (warning) {
+                onRenewWarning(warning);
+              }
+            },
+            icon: jsx(Update, {})
+          }];
+        case ProductStatus.CANCELLED:
+          return [];
+        case ProductStatus.EXPIRED:
+          if (warning.sigmetAirmetDetail && (isInstanceOfCancelSigmet(warning.sigmetAirmetDetail) || isInstanceOfCancelAirmet(warning.sigmetAirmetDetail))) {
+            return [];
+          }
+          return [{
+            text: t('warning-list-button-renew'),
+            action: function action() {
+              if (warning) {
+                onRenewWarning(warning);
+              }
+            },
+            icon: jsx(Update, {})
+          }];
+        default:
+          return [];
+      }
   }
 };
 
-var _excluded$2 = ["warning", "activeWarningId", "highlightedItem", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning", "onExpireWarning", "onWithdrawWarning"];
+var _excluded$2 = ["warning", "activeWarningId", "highlightedItem", "onSelectWarning", "onEditWarning", "onDeleteWarning", "onDeleteReviewWarning", "onExpireWarning", "onWithdrawWarning", "onRenewWarning"];
 var renderLevelText = function renderLevelText(levelString) {
   if (!levelString) {
     return null;
@@ -11536,10 +12037,10 @@ var renderStatusIcon = function renderStatusIcon(warning, status) {
       icon: icon
     });
   };
-  if (warning.productStatus === ProductStatus.PUBLISHED && warning.warningDetail.cancelId) {
-    return getStatusTag("Cnls " + warning.warningDetail.cancelId, 'red');
+  if (warning.productStatus === ProductStatus.PUBLISHED && warning.sigmetAirmetDetail && (isCancelAirmet(warning.sigmetAirmetDetail) || isCancelSigmet(warning.sigmetAirmetDetail))) {
+    return getStatusTag("Cnls " + (isCancelAirmet(warning.sigmetAirmetDetail) ? warning.sigmetAirmetDetail.cancelsAirmetSequenceId : warning.sigmetAirmetDetail.cancelsSigmetSequenceId), 'red');
   }
-  if (warning.productStatus === ProductStatus.CANCELLED && warning.warningDetail.cancelId === undefined) {
+  if (warning.productStatus === ProductStatus.CANCELLED && warning.sigmetAirmetDetail) {
     return getStatusTag('Cnld', 'red');
   }
   switch (status) {
@@ -11578,7 +12079,7 @@ var renderStatusIcon = function renderStatusIcon(warning, status) {
   }
 };
 var WarningListItem = function WarningListItem(_ref) {
-  var _warning$warningDetai, _sx, _sx2, _Object$assign;
+  var _warning$warningDetai, _warning$sigmetAirmet, _sx, _sx2, _Object$assign;
   var warning = _ref.warning,
     activeWarningId = _ref.activeWarningId,
     highlightedItem = _ref.highlightedItem,
@@ -11594,12 +12095,14 @@ var WarningListItem = function WarningListItem(_ref) {
     onExpireWarning = _ref$onExpireWarning === void 0 ? function () {} : _ref$onExpireWarning,
     _ref$onWithdrawWarnin = _ref.onWithdrawWarning,
     onWithdrawWarning = _ref$onWithdrawWarnin === void 0 ? function () {} : _ref$onWithdrawWarnin,
+    _ref$onRenewWarning = _ref.onRenewWarning,
+    onRenewWarning = _ref$onRenewWarning === void 0 ? function () {} : _ref$onRenewWarning,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var phenomenonDetails = allPhenomenaDict[warning.warningDetail.phenomenon];
   var objectNameText = ((_warning$warningDetai = warning.warningDetail.areas) == null || (_warning$warningDetai = _warning$warningDetai[0]) == null ? void 0 : _warning$warningDetai.objectName) || '-';
-  var objectHoverText = warning.warningDetail.firName ? warning.warningDetail.firName : objectNameText;
+  var objectHoverText = (_warning$sigmetAirmet = warning.sigmetAirmetDetail) != null && _warning$sigmetAirmet.firName ? warning.sigmetAirmetDetail.firName : objectNameText;
   var _useOverflowCheck = useOverflowCheck(objectNameText),
     objectNameRef = _useOverflowCheck.ref;
   var phenomenonText = phenomenonDetails != null && phenomenonDetails.translationKey ? t(phenomenonDetails.translationKey) : '-';
@@ -11647,7 +12150,8 @@ var WarningListItem = function WarningListItem(_ref) {
         onDeleteReviewWarning: onDeleteReviewWarning,
         onDeleteWarning: onDeleteWarning,
         onExpireWarning: onExpireWarning,
-        onWithdrawWarning: onWithdrawWarning
+        onWithdrawWarning: onWithdrawWarning,
+        onRenewWarning: onRenewWarning
       }),
       buttonIcon: jsx(Options, {})
     }),
@@ -12026,12 +12530,11 @@ var PublicWarningList = function PublicWarningList(_ref) {
   var _ref$warnings = _ref.warnings,
     warnings = _ref$warnings === void 0 ? [] : _ref$warnings,
     filterHookState = _ref.filterHookState,
-    filterState = _ref.filterState,
     _ref$isLoading = _ref.isLoading,
     isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
     error = _ref.error,
-    _ref$selectedPublicWa = _ref.selectedPublicWarningId,
-    selectedPublicWarningId = _ref$selectedPublicWa === void 0 ? '' : _ref$selectedPublicWa,
+    _ref$selectedWarningI = _ref.selectedWarningId,
+    selectedWarningId = _ref$selectedWarningI === void 0 ? '' : _ref$selectedWarningI,
     lastUpdatedTime = _ref.lastUpdatedTime,
     _ref$onSelectWarning = _ref.onSelectWarning,
     onSelectWarning = _ref$onSelectWarning === void 0 ? function () {} : _ref$onSelectWarning,
@@ -12049,11 +12552,14 @@ var PublicWarningList = function PublicWarningList(_ref) {
     onExpireWarning = _ref$onExpireWarning === void 0 ? function () {} : _ref$onExpireWarning,
     _ref$onWithdrawWarnin = _ref.onWithdrawWarning,
     onWithdrawWarning = _ref$onWithdrawWarnin === void 0 ? function () {} : _ref$onWithdrawWarnin,
+    _ref$onRenewWarning = _ref.onRenewWarning,
+    onRenewWarning = _ref$onRenewWarning === void 0 ? function () {} : _ref$onRenewWarning,
     hoveredFeatureId = _ref.hoveredFeatureId,
     expandedSections = _ref.expandedSections,
     setExpandedSections = _ref.setExpandedSections;
   var updateFilter = filterHookState.updateFilter,
-    allSelected = filterHookState.allSelected;
+    allSelected = filterHookState.allSelected,
+    filterState = filterHookState.filterState;
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var _React$useState = React__default.useState({
@@ -12335,9 +12841,10 @@ var PublicWarningList = function PublicWarningList(_ref) {
                   onEditWarning: onEditWarning,
                   onDeleteWarning: onDeleteWarning,
                   onDeleteReviewWarning: onDeleteReviewWarning,
-                  activeWarningId: selectedPublicWarningId,
+                  activeWarningId: selectedWarningId,
                   onExpireWarning: onExpireWarning,
-                  onWithdrawWarning: onWithdrawWarning
+                  onWithdrawWarning: onWithdrawWarning,
+                  onRenewWarning: onRenewWarning
                 }, key);
               }
             });
@@ -12348,6 +12855,51 @@ var PublicWarningList = function PublicWarningList(_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 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var publicWarningsAdapter = createEntityAdapter({
+  selectId: function selectId(warning) {
+    return warning.id;
+  }
+});
+var initialState = {
+  warnings: publicWarningsAdapter.getInitialState(),
+  isLoading: true,
+  lastUpdatedTime: '',
+  filterState: {}
+};
+var slice = createSlice({
+  initialState: initialState,
+  name: 'publicWarnings',
+  reducers: {
+    setWarningFilters: function setWarningFilters(draft, action) {
+      var _action$payload = action.payload,
+        filterState = _action$payload.filterState,
+        panelId = _action$payload.panelId;
+      if (panelId) {
+        draft.filterState[panelId] = filterState;
+      }
+    }
+  }
+});
+var reducer = slice.reducer;
+var publicWarningActions = slice.actions;
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12520,6 +13072,11 @@ var getLevelsForDomainFilter = function getLevelsForDomainFilter(domainFilter) {
     return domainFilter[domain] ? domainLevels[domain] : [];
   });
 };
+var getPhenomenaForDomainFilter = function getPhenomenaForDomainFilter(domainFilter) {
+  return Object.keys(domainFilter).flatMap(function (domain) {
+    return domainFilter[domain] ? domainPhenomena[domain] : [];
+  });
+};
 var getFilterOptions = function getFilterOptions(defaultFilter, allOptions, savedFilter) {
   var pickedFilterOptions = pick(defaultFilter, [emptyFilterId].concat(allOptions));
   // keep options state from savedFilter if it still exists
@@ -12528,7 +13085,7 @@ var getFilterOptions = function getFilterOptions(defaultFilter, allOptions, save
     allSelected = _getSelectedOptions.allSelected;
   return [updatedOptions, allSelected];
 };
-var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, savedFilterState, presetFilterState, isLoading) {
+var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, savedFilterState, presetFilterState) {
   var pickedDomainFilter = savedFilterState.domain,
     pickedPhenomenonFilter = savedFilterState.phenomenon,
     pickedLevelFilter = savedFilterState.level,
@@ -12542,20 +13099,18 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
     updatedPickedLevels = _getFilterOptions[0],
     allLevelsSelected = _getFilterOptions[1];
   // phenomenon
+  var domainPhenomena = useMemo(function () {
+    return getPhenomenaForDomainFilter(pickedDomainFilter);
+  }, [pickedDomainFilter]);
   var warningsPhenomena = useMemo(function () {
     return getFiltersFromWarnings(warnings, 'phenomenon');
   }, [warnings]);
-  // filter out aviation phenomena
-  var phenomenaKeysToFilter = new Set(Object.values(Phenomenon$1));
-  var relevantPhenomena = warningsPhenomena.filter(function (item) {
-    return phenomenaKeysToFilter.has(item);
-  });
+  var relevantPhenomena = useMemo(function () {
+    return domainPhenomena.filter(function (phenomenon) {
+      return warningsPhenomena.includes(phenomenon);
+    });
+  }, [warningsPhenomena, domainPhenomena]);
   relevantPhenomena.push(emptyFilterId);
-  var defaultPhenomenonFilter = useMemo(function () {
-    return Object.fromEntries(relevantPhenomena.map(function (key) {
-      return [key, true];
-    }));
-  }, [relevantPhenomena]);
   var _getFilterOptions2 = getFilterOptions(defaultPhenomenonFilter, relevantPhenomena, pickedPhenomenonFilter),
     updatedPickedPhenomena = _getFilterOptions2[0],
     allPhenomenaSelected = _getFilterOptions2[1];
@@ -12583,28 +13138,25 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
   var _getFilterOptions4 = getFilterOptions(defaultIncidentFilter, relevantIncidents, pickedIncidentFilter),
     updatedPickedIncidents = _getFilterOptions4[0],
     allIncidentsSelected = _getFilterOptions4[1];
-  useEffect(function () {
-    if (isLoading) {
-      return;
-    }
-    // when the warnings change, update the filters
-    onUpdateFilters({
-      incident: updatedPickedIncidents,
-      source: updatedPickedSources,
-      domain: pickedDomainFilter,
-      phenomenon: updatedPickedPhenomena,
-      level: updatedPickedLevels
-    }, 'system');
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [warnings]);
   useEffect(function () {
     // when the preset changes, update the filters
     if (presetFilterState) {
-      onUpdateFilters(presetFilterState, 'system');
+      var initialFiltersWithPresets = {
+        incident: Object.assign({}, makeFilterFromList(relevantIncidents), presetFilterState.incident),
+        source: Object.assign({}, makeFilterFromList(relevantSources), presetFilterState.source),
+        domain: Object.assign({}, initialFilters.domain, presetFilterState.domain),
+        phenomenon: Object.assign({}, initialFilters.phenomenon, presetFilterState.phenomenon),
+        level: Object.assign({}, initialFilters.level, presetFilterState.level)
+      };
+      onUpdateFilters(initialFiltersWithPresets, 'system');
     } else {
       // for a preset without filters saved use the initial filters
-      onUpdateFilters(initialFilters, 'system');
+      onUpdateFilters(Object.assign({}, initialFilters, {
+        incident: makeFilterFromList(relevantIncidents),
+        source: makeFilterFromList(relevantSources)
+      }), 'system');
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [presetFilterState, onUpdateFilters]);
   var _getSelectedOptions2 = getSelectedOptions(pickedDomainFilter),
     allDomainSelected = _getSelectedOptions2.allSelected;
@@ -12663,63 +13215,66 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
     if (!pickedLevelFilter[level]) {
       return false;
     }
-    var phenomenon = getValue(Phenomenon$1, warning.warningDetail.phenomenon);
+    var phenomenon = getValue(AllPhenomenaKeys, warning.warningDetail.phenomenon);
     if (!pickedPhenomenonFilter[phenomenon]) {
       return false;
     }
     var source = relevantSources.find(function (source) {
       return source === warning.warningDetail.warningProposalSource;
     }) || emptyFilterId;
-    if (!pickedSourceFilter[source]) {
+    if (!updatedPickedSources[source]) {
       return false;
     }
     var incident = relevantIncidents.find(function (incident) {
       return incident === warning.warningDetail.incident;
     }) || emptyFilterId;
-    if (!pickedIncidentFilter[incident]) {
+    if (!updatedPickedIncidents[incident]) {
       return false;
     }
     return true;
-  }, [pickedDomainFilter, pickedLevelFilter, pickedPhenomenonFilter, relevantSources, pickedSourceFilter, relevantIncidents, pickedIncidentFilter]);
+  }, [pickedDomainFilter, pickedLevelFilter, pickedPhenomenonFilter, relevantSources, updatedPickedSources, relevantIncidents, updatedPickedIncidents]);
   return {
     allSelected: allSelected,
     updateFilter: updateFilter,
-    byFilterState: byFilterState
+    byFilterState: byFilterState,
+    filterState: {
+      domain: pickedDomainFilter,
+      level: updatedPickedLevels,
+      phenomenon: updatedPickedPhenomena,
+      incident: updatedPickedIncidents,
+      source: updatedPickedSources
+    }
   };
 };
 
 var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
   var panelId = _ref.panelId,
     presetFilterState = _ref.presetFilterState;
+  var updatePublicWarningEditor = useMutatePublicWarningEditor();
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var dispatch = useDispatch();
   var confirmDialog = useConfirmationDialog();
   var _useAuthenticationCon = useAuthenticationContext$1(),
     auth = _useAuthenticationCon.auth;
-  var _useAirmetList = useAirmetList(),
-    airmetList = _useAirmetList.data,
-    refetchAirmetList = _useAirmetList.refetch,
-    isFetchingAirmet = _useAirmetList.isFetching;
-  var _useSigmetList = useSigmetList(),
-    sigmetList = _useSigmetList.data,
-    refetchSigmetList = _useSigmetList.refetch,
-    isFetchingSigmet = _useSigmetList.isFetching;
+  var _useWarnings = useWarnings(),
+    combinedWarnings = _useWarnings.combinedWarnings,
+    refetchWarnings = _useWarnings.refetchWarnings,
+    isFetching = _useWarnings.isFetching,
+    error = _useWarnings.error,
+    dataUpdatedAt = _useWarnings.dataUpdatedAt;
+  var lastUpdateTime = dateUtils.dateToString(new Date(dataUpdatedAt), dateUtils.DATE_FORMAT_HOURS);
   var _React$useState = React__default.useState(undefined),
     confirmDialogOptions = _React$useState[0],
     setConfirmDialogOptions = _React$useState[1];
-  var publicWarnings = useSelector(selectAllPublicWarnings);
-  var selectedPublicWarningId = useSelector(getSelectedPublicWarningId);
-  var isLoading = useSelector(isPublicWarningsLoading) || isFetchingAirmet || isFetchingSigmet;
-  var error = useSelector(getPublicWarningsError);
-  var isFormDirty = useSelector(getSelectedPublicIsFormDirty);
-  var lastUpdatedTime = useSelector(getPublicWarningsLastUpdatedTime);
+  var selectedWarningId = useSelector(getSelectedWarningId);
   var savedFilterState = useSelector(function (store) {
     return getWarningsFilterById(store, panelId);
   });
+  var isFormDirty = useSelector(getSelectedPublicIsFormDirty);
   var warningsApi = getWarningsApi();
   var openPublicWarningDialog = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(formAction, publicWarning, warningType) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(formAction, warning, warningType) {
       var mayProceed;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -12742,8 +13297,8 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
             }
             return _context.abrupt("return");
           case 6:
-            dispatch(publicWarningFormActions.openPublicWarningFormDialog(Object.assign({}, publicWarning && {
-              publicWarning: publicWarning
+            dispatch(publicWarningFormActions.openPublicWarningFormDialog(Object.assign({}, warning && {
+              warning: warning
             }, {
               formState: formAction,
               warningType: warningType,
@@ -12771,24 +13326,24 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!(publicWarning.id && auth != null && auth.username && !publicWarning.editor)) {
-              _context2.next = 6;
+              _context2.next = 7;
               break;
             }
-            dispatch(publicWarningFormActions.toggleEditorWarning({
-              warningId: publicWarning.id,
-              isEditor: true,
-              username: auth == null ? void 0 : auth.username
-            }));
-            _context2.next = 4;
+            refetchWarnings();
+            updatePublicWarningEditor.mutate({
+              id: publicWarning.id,
+              isEditor: true
+            });
+            _context2.next = 5;
             return openPublicWarningDialog('', Object.assign({}, publicWarning, {
               editor: auth == null ? void 0 : auth.username
             }));
-          case 4:
-            _context2.next = 7;
+          case 5:
+            _context2.next = 8;
             break;
-          case 6:
-            void openPublicWarningDialog('', publicWarning);
           case 7:
+            void openPublicWarningDialog('', publicWarning);
+          case 8:
           case "end":
             return _context2.stop();
         }
@@ -12858,6 +13413,17 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       return _ref5.apply(this, arguments);
     };
   }();
+  var warningType = useSelector(getWarningType);
+  var _useProductConfig = useProductConfig(warningType, false),
+    aviationConfig = _useProductConfig.data;
+  var handleRenewProductClick = function handleRenewProductClick(warning, warningType) {
+    if (!warning) {
+      return;
+    }
+    var type = warningType || (warning.warningDetail.level === 'SIG' ? 'sigmet' : 'airmet');
+    var renewedWarning = renewWarning(warning, aviationConfig);
+    void openPublicWarningDialog('edit', renewedWarning, type);
+  };
   var openSnackbar = function openSnackbar(message) {
     dispatch(snackbarActions.openSnackbar({
       type: snackbarTypes.SnackbarMessageType.VERBATIM_MESSAGE,
@@ -12899,29 +13465,15 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     // close confirm dialog
     setConfirmDialogOptions(undefined);
     // Close warning dialog if needed
-    if (selectedPublicWarningId === warningId) {
+    if (selectedWarningId === warningId) {
       dispatch(uiActions.setToggleOpenDialog({
         setOpen: false,
         type: publicWarningDialogType
       }));
     }
     openSnackbar(snackbarMessage);
-    fetchWarnings();
+    refetchWarnings();
   };
-  var fetchWarnings = React__default.useCallback(function () {
-    void refetchAirmetList();
-    void refetchSigmetList();
-    dispatch(publicWarningActions.fetchWarnings());
-  }, [dispatch, refetchAirmetList, refetchSigmetList]);
-  React__default.useEffect(function () {
-    // fetch warnings on mount
-    fetchWarnings();
-  }, [fetchWarnings]);
-  var combinedWarnings = React__default.useMemo(function () {
-    var transformedSigmets = (sigmetList == null ? void 0 : sigmetList.map(transformSigmetToWarningFormat)) || [];
-    var transformedAirmets = (airmetList == null ? void 0 : airmetList.map(transformAirmetToWarningFormat)) || [];
-    return publicWarnings.concat(transformedSigmets).concat(transformedAirmets);
-  }, [publicWarnings, sigmetList, airmetList]);
   var onUpdateFilters = React__default.useCallback(function (filterState, origin) {
     dispatch(publicWarningActions.setWarningFilters({
       filterState: filterState,
@@ -12929,7 +13481,7 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       origin: origin
     }));
   }, [dispatch, panelId]);
-  var filterHookState = useWarningFilters(combinedWarnings, onUpdateFilters, savedFilterState, presetFilterState, isLoading);
+  var filterHookState = useWarningFilters(combinedWarnings, onUpdateFilters, savedFilterState, presetFilterState);
   var filteredWarnings = React__default.useMemo(function () {
     return combinedWarnings.filter(filterHookState.byFilterState);
   }, [combinedWarnings, filterHookState.byFilterState]);
@@ -12948,8 +13500,7 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
   }, [filteredWarnings, expandedSections]);
   var allFeatures = React__default.useMemo(function () {
     return filteredWarningsByExpandedSections.flatMap(function (warning) {
-      var _warning$warningDetai;
-      return (warning == null ? void 0 : warning.id) && (warning == null || (_warning$warningDetai = warning.warningDetail) == null || (_warning$warningDetai = _warning$warningDetai.areas) == null ? void 0 : _warning$warningDetai.filter(function (area) {
+      return (warning == null ? void 0 : warning.id) && (warning != null && warning.warningDetail && 'areas' in warning.warningDetail ? warning.warningDetail.areas.filter(function (area) {
         return area.geoJSON;
       }).map(function (area) {
         var isAviationWarning = warning.warningDetail.level === 'SIG' || warning.warningDetail.level === 'AIR';
@@ -12959,7 +13510,7 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
           originalId: warning.id,
           geoJSON: styledGeoJSON
         };
-      })) || [];
+      }) : []) || [];
     }).filter(function (feature) {
       return feature.id;
     });
@@ -12973,8 +13524,8 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       warnings: filteredWarnings,
       expandedSections: expandedSections,
       setExpandedSections: setExpandedSections,
-      isLoading: isLoading,
-      error: error,
+      isLoading: isFetching,
+      error: error || undefined,
       onSelectWarning: selectWarning,
       onCreateWarning: createWarning,
       onEditWarning: editWarning,
@@ -12982,12 +13533,12 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
       onDeleteReviewWarning: deleteReviewWarning,
       onExpireWarning: expireWarning,
       onWithdrawWarning: withdrawWarning,
-      selectedPublicWarningId: selectedPublicWarningId,
-      lastUpdatedTime: lastUpdatedTime,
-      onRefetchWarnings: fetchWarnings,
+      selectedWarningId: selectedWarningId,
+      lastUpdatedTime: lastUpdateTime,
+      onRefetchWarnings: refetchWarnings,
       filterHookState: filterHookState,
-      filterState: savedFilterState,
-      hoveredFeatureId: hoveredFeatureId
+      hoveredFeatureId: hoveredFeatureId,
+      onRenewWarning: handleRenewProductClick
     }), confirmDialogOptions && jsx(ConfirmDeleteWarningDialog, {
       onClose: function onClose() {
         return setConfirmDialogOptions(undefined);
@@ -13058,48 +13609,49 @@ var componentsLookUp = function componentsLookUp(payload, apiProps) {
 var getErrorMessage = function getErrorMessage(error) {
   return isAxiosError(error) ? getAxiosErrorMessage(error) : error.message;
 };
-var getToggleEditorSuccessMessage = function getToggleEditorSuccessMessage(isEditor) {
-  return isEditor ? 'warning-editor-add-editor' : 'warning-editor-remove-editor';
-};
 var publicWarningFormListener = createListenerMiddleware();
 publicWarningFormListener.startListening({
-  actionCreator: publicWarningFormActions.toggleEditorWarning,
+  actionCreator: publicWarningFormActions.publishWarning,
   effect: function () {
     var _effect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, listenerApi) {
-      var payload, warningId, isEditor, username, warningsApi, isDialogOpen;
+      var payload, publicWarning, refetchWarnings, publishedWarning, isDialogOpen;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payload = _ref.payload;
             listenerApi.cancelActiveListeners();
             _context.prev = 2;
-            warningId = payload.warningId, isEditor = payload.isEditor, username = payload.username;
-            warningsApi = getWarningsApi();
-            _context.next = 7;
-            return warningsApi.toggleEditorWarning(warningId, isEditor);
-          case 7:
-            // update list to show correct avatar
-            listenerApi.dispatch(publicWarningActions.fetchWarnings());
-            listenerApi.dispatch(publicWarningFormActions.toggleEditorWarningSuccess({
-              isEditor: isEditor,
-              username: username,
+            publicWarning = payload.publicWarning, refetchWarnings = payload.refetchWarnings;
+            _context.next = 6;
+            return saveOrUpdateWarning(publicWarning);
+          case 6:
+            publishedWarning = _context.sent;
+            if (refetchWarnings) {
+              refetchWarnings();
+            }
+            listenerApi.dispatch(publicWarningFormActions.publishWarningSuccess({
+              publicWarning: publishedWarning,
               message: {
                 type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-                key: getToggleEditorSuccessMessage(isEditor)
+                key: 'warning-publish-succes'
               }
             }));
-            _context.next = 15;
+            listenerApi.dispatch(uiActions.setToggleOpenDialog({
+              type: publicWarningDialogType,
+              setOpen: false
+            }));
+            _context.next = 16;
             break;
-          case 11:
-            _context.prev = 11;
+          case 12:
+            _context.prev = 12;
             _context.t0 = _context["catch"](2);
             isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
             errorEffect(listenerApi.dispatch, getErrorMessage(_context.t0), isDialogOpen);
-          case 15:
+          case 16:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 11]]);
+      }, _callee, null, [[2, 12]]);
     }));
     function effect(_x, _x2) {
       return _effect.apply(this, arguments);
@@ -13108,32 +13660,31 @@ publicWarningFormListener.startListening({
   }()
 });
 publicWarningFormListener.startListening({
-  actionCreator: publicWarningFormActions.publishWarning,
+  actionCreator: publicWarningFormActions.saveWarning,
   effect: function () {
     var _effect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2, listenerApi) {
-      var payload, publicWarning, publishedWarning, isDialogOpen;
+      var payload, publicWarning, refetchWarnings, savedWarning, isDialogOpen;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             payload = _ref2.payload;
             listenerApi.cancelActiveListeners();
             _context2.prev = 2;
-            publicWarning = payload.publicWarning;
+            publicWarning = payload.publicWarning, refetchWarnings = payload.refetchWarnings;
             _context2.next = 6;
             return saveOrUpdateWarning(publicWarning);
           case 6:
-            publishedWarning = _context2.sent;
-            listenerApi.dispatch(publicWarningFormActions.publishWarningSuccess({
-              publicWarning: publishedWarning,
+            savedWarning = _context2.sent;
+            if (refetchWarnings) {
+              refetchWarnings();
+            }
+            listenerApi.dispatch(publicWarningFormActions.saveWarningSuccess({
+              publicWarning: savedWarning,
               message: {
                 type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-                key: 'warning-publish-succes'
+                key: 'warning-save-succes'
               }
             }));
-            listenerApi.dispatch(uiActions.setToggleOpenDialog({
-              type: publicWarningDialogType,
-              setOpen: false
-            }));
             _context2.next = 15;
             break;
           case 11:
@@ -13153,41 +13704,26 @@ publicWarningFormListener.startListening({
     return effect;
   }()
 });
+// Side effects/snackbar listeners
 publicWarningFormListener.startListening({
-  actionCreator: publicWarningFormActions.saveWarning,
+  matcher: isAnyOf(publicWarningFormActions.publishWarningSuccess, publicWarningFormActions.saveWarningSuccess),
   effect: function () {
     var _effect3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3, listenerApi) {
-      var payload, publicWarning, savedWarning, isDialogOpen;
+      var payload, message, isDialogOpen;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             payload = _ref3.payload;
             listenerApi.cancelActiveListeners();
-            _context3.prev = 2;
-            publicWarning = payload.publicWarning;
-            _context3.next = 6;
-            return saveOrUpdateWarning(publicWarning);
-          case 6:
-            savedWarning = _context3.sent;
-            listenerApi.dispatch(publicWarningFormActions.saveWarningSuccess({
-              publicWarning: savedWarning,
-              message: {
-                type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-                key: 'warning-save-succes'
-              }
-            }));
-            _context3.next = 14;
-            break;
-          case 10:
-            _context3.prev = 10;
-            _context3.t0 = _context3["catch"](2);
+            message = payload.message;
+            listenerApi.dispatch(snackbarActions.openSnackbar(message));
             isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            errorEffect(listenerApi.dispatch, getErrorMessage(_context3.t0), isDialogOpen);
-          case 14:
+            toggleDialogLoadingEffect(listenerApi.dispatch, isDialogOpen, false);
+          case 6:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[2, 10]]);
+      }, _callee3);
     }));
     function effect(_x5, _x6) {
       return _effect3.apply(this, arguments);
@@ -13195,22 +13731,18 @@ publicWarningFormListener.startListening({
     return effect;
   }()
 });
-// Side effects/snackbar listeners
 publicWarningFormListener.startListening({
-  matcher: isAnyOf(publicWarningFormActions.publishWarningSuccess, publicWarningFormActions.saveWarningSuccess, publicWarningFormActions.toggleEditorWarningSuccess),
+  matcher: isAnyOf(publicWarningFormActions.publishWarning, publicWarningFormActions.saveWarning),
   effect: function () {
-    var _effect4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4, listenerApi) {
-      var payload, message, isDialogOpen;
+    var _effect4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_, listenerApi) {
+      var isDialogOpen;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            payload = _ref4.payload;
             listenerApi.cancelActiveListeners();
-            message = payload.message;
-            listenerApi.dispatch(snackbarActions.openSnackbar(message));
             isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            toggleDialogLoadingEffect(listenerApi.dispatch, isDialogOpen, false);
-          case 6:
+            toggleDialogLoadingEffect(listenerApi.dispatch, isDialogOpen, true);
+          case 3:
           case "end":
             return _context4.stop();
         }
@@ -13222,38 +13754,15 @@ publicWarningFormListener.startListening({
     return effect;
   }()
 });
-publicWarningFormListener.startListening({
-  matcher: isAnyOf(publicWarningFormActions.publishWarning, publicWarningFormActions.saveWarning),
-  effect: function () {
-    var _effect5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_, listenerApi) {
-      var isDialogOpen;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            listenerApi.cancelActiveListeners();
-            isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            toggleDialogLoadingEffect(listenerApi.dispatch, isDialogOpen, true);
-          case 3:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    }));
-    function effect(_x9, _x10) {
-      return _effect5.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
 publicWarningFormListener.startListening({
   actionCreator: publicWarningFormActions.openPublicWarningFormDialog,
   effect: function () {
-    var _effect6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref5, listenerApi) {
+    var _effect5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref4, listenerApi) {
       var payload, panelId;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            payload = _ref5.payload;
+            payload = _ref4.payload;
             listenerApi.cancelActiveListeners();
             panelId = payload.panelId;
             listenerApi.dispatch(uiActions.setToggleOpenDialog({
@@ -13263,35 +13772,35 @@ publicWarningFormListener.startListening({
             }));
           case 4:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee6);
+      }, _callee5);
     }));
-    function effect(_x11, _x12) {
-      return _effect6.apply(this, arguments);
+    function effect(_x9, _x10) {
+      return _effect5.apply(this, arguments);
     }
     return effect;
   }()
 });
 var saveOrUpdateWarning = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(publicWarning) {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(publicWarning) {
     var warningsApi, warningDetail, status, warning, newWarningId;
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
           warningsApi = getWarningsApi();
           warningDetail = publicWarning.warningDetail, status = publicWarning.status;
           if (!warningDetail.id) {
-            _context7.next = 6;
+            _context6.next = 6;
             break;
           }
-          _context7.next = 5;
+          _context6.next = 5;
           return warningsApi.updateWarning(warningDetail.id, publicWarning);
         case 5:
-          return _context7.abrupt("return", publicWarning);
+          return _context6.abrupt("return", publicWarning);
         case 6:
           if (!(status === 'PUBLISHED' && warningDetail.linked_to_id)) {
-            _context7.next = 11;
+            _context6.next = 11;
             break;
           }
           warning = Object.assign({}, publicWarning, {
@@ -13299,28 +13808,28 @@ var saveOrUpdateWarning = /*#__PURE__*/function () {
               id: warningDetail.linked_to_id
             })
           });
-          _context7.next = 10;
+          _context6.next = 10;
           return warningsApi.updateWarning(warningDetail.linked_to_id, warning);
         case 10:
-          return _context7.abrupt("return", warning);
+          return _context6.abrupt("return", warning);
         case 11:
-          _context7.next = 13;
+          _context6.next = 13;
           return warningsApi.saveWarningAs(publicWarning);
         case 13:
-          newWarningId = _context7.sent;
-          return _context7.abrupt("return", Object.assign({}, publicWarning, {
+          newWarningId = _context6.sent;
+          return _context6.abrupt("return", Object.assign({}, publicWarning, {
             warningDetail: Object.assign({}, warningDetail, {
               id: newWarningId
             })
           }));
         case 15:
         case "end":
-          return _context7.stop();
+          return _context6.stop();
       }
-    }, _callee7);
+    }, _callee6);
   }));
-  return function saveOrUpdateWarning(_x13) {
-    return _ref6.apply(this, arguments);
+  return function saveOrUpdateWarning(_x11) {
+    return _ref5.apply(this, arguments);
   };
 }();
 var toggleDialogLoadingEffect = function toggleDialogLoadingEffect(dispatch, isDialogOpen, isLoading) {
@@ -13340,12 +13849,12 @@ var errorEffect = function errorEffect(dispatch, message, isDialogOpen) {
 publicWarningFormListener.startListening({
   actionCreator: uiActions.setToggleOpenDialog,
   effect: function () {
-    var _effect7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref7, listenerApi) {
+    var _effect6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref6, listenerApi) {
       var payload;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            payload = _ref7.payload;
+            payload = _ref6.payload;
             if (!payload.setOpen && payload.type === publicWarningDialogType) {
               listenerApi.dispatch(uiActions.setToggleOpenDialog({
                 setOpen: false,
@@ -13354,93 +13863,35 @@ publicWarningFormListener.startListening({
             }
           case 2:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee8);
+      }, _callee7);
     }));
-    function effect(_x14, _x15) {
-      return _effect7.apply(this, arguments);
+    function effect(_x12, _x13) {
+      return _effect6.apply(this, arguments);
     }
     return effect;
   }()
 });
 
-var getLastUpdatedTimeFormatted = function getLastUpdatedTimeFormatted() {
-  return dateUtils.dateToString(dateUtils.utc(), dateUtils.DATE_FORMAT_HOURS);
-};
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
 var publicWarningsListener = createListenerMiddleware();
-publicWarningsListener.startListening({
-  actionCreator: publicWarningActions.fetchWarnings,
-  effect: function () {
-    var _effect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, listenerApi) {
-      var warningsApi, _yield$warningsApi$ge, warnings, lastUpdatedTime;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            listenerApi.cancelActiveListeners();
-            _context.prev = 1;
-            warningsApi = getWarningsApi();
-            _context.next = 5;
-            return warningsApi.getWarnings();
-          case 5:
-            _yield$warningsApi$ge = _context.sent;
-            warnings = _yield$warningsApi$ge.data;
-            lastUpdatedTime = getLastUpdatedTimeFormatted();
-            listenerApi.dispatch(publicWarningActions.fetchWarningsSuccess({
-              warnings: warnings,
-              lastUpdatedTime: lastUpdatedTime
-            }));
-            _context.next = 11;
-            return listenerApi.delay(pollingIntervalTimeout);
-          case 11:
-            listenerApi.dispatch(publicWarningActions.fetchWarnings());
-            _context.next = 17;
-            break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](1);
-            // Don't set an error if the cancelActiveListeners was invoked (which throws a TaskAbortError)
-            if ((_context.t0 == null ? void 0 : _context.t0.code) !== 'listener-cancelled') {
-              listenerApi.dispatch(publicWarningActions.fetchWarningsError({
-                error: {
-                  name: _context.t0.name,
-                  message: _context.t0.message
-                }
-              }));
-            }
-          case 17:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[1, 14]]);
-    }));
-    function effect(_x, _x2) {
-      return _effect.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
-publicWarningsListener.startListening({
-  matcher: isAnyOf(publicWarningFormActions.publishWarningSuccess, publicWarningFormActions.saveWarningSuccess),
-  effect: function () {
-    var _effect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_, listenerApi) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            listenerApi.cancelActiveListeners();
-            listenerApi.dispatch(publicWarningActions.fetchWarnings());
-          case 2:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    function effect(_x3, _x4) {
-      return _effect2.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
 
 var _excluded = ["id"];
 var getSnackbarMessage = function getSnackbarMessage(objectName, id) {
@@ -13457,7 +13908,7 @@ drawingsListener.startListening({
   actionCreator: drawActions.submitDrawValues,
   effect: function () {
     var _effect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, listenerApi) {
-      var payload, id, formValues, warningsApi, newID, errorMessage;
+      var payload, id, formValues, warningsApi, newID, taskError, errorMessage;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -13498,24 +13949,25 @@ drawingsListener.startListening({
               isLoading: false,
               type: drawingDialogType
             }));
-            _context.next = 23;
+            _context.next = 24;
             break;
           case 20:
             _context.prev = 20;
             _context.t0 = _context["catch"](3);
             // Don't do anything if the cancelActiveListeners was invoked (which throws a TaskAbortError)
-            if (_context.t0.code !== 'listener-cancelled') {
+            taskError = _context.t0;
+            if ((taskError == null ? void 0 : taskError.code) !== 'listener-cancelled') {
               listenerApi.dispatch(uiActions.toggleIsLoadingDialog({
                 isLoading: false,
                 type: drawingDialogType
               }));
-              errorMessage = isAxiosError$1(_context.t0) ? getAxiosErrorMessage(_context.t0) : _context.t0.message;
+              errorMessage = isAxiosError$1(taskError) ? getAxiosErrorMessage(taskError) : taskError.message;
               listenerApi.dispatch(uiActions.setErrorDialog({
                 type: drawingDialogType,
                 error: errorMessage
               }));
             }
-          case 23:
+          case 24:
           case "end":
             return _context.stop();
         }
@@ -13546,14 +13998,12 @@ drawingsListener.startListening({
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 var drawingModuleConfig = {
-  // TODO: remove id in https://gitlab.com/opengeoweb/opengeoweb/-/issues/5561
-  id: 'drawing-module',
   reducersMap: {
     drawings: reducer$2,
-    publicWarningForm: reducer,
-    publicWarnings: reducer$1
+    publicWarningForm: reducer$1,
+    publicWarnings: reducer
   },
   middlewares: [drawingsListener.middleware, publicWarningsListener.middleware, publicWarningFormListener.middleware]
 };
 
-export { DrawingToolConnect, Wrapper as DrawingToolForm, DrawingToolFormConnect, DrawingToolMapButtonConnect, ObjectManagerConnect, ObjectManagerMapButtonConnect, PublicWarningApiWrapper, PublicWarningsFormDialog, PublicWarningsFormDialogConnect, WARN_NAMESPACE, WarningsModuleProvider, componentsLookUp, drawingModuleConfig, initialState$1 as initialState, isAlreadyEdited, publicWarningActions, publicWarningFormListener, reducer as publicWarningFormReducer, publicWarningsAdapter, publicWarningsListener, reducer$1 as publicWarningsReducer, selectors as publicWarningsSelectors, reducer$1 as reducer, useObjectDrawDialogAction, warningFormConfirmationOptions, drawingsListener as warningsDrawingsListener, reducer$2 as warningsDrawingsReducer, warningsTranslations };
+export { DrawingToolConnect, Wrapper as DrawingToolForm, DrawingToolFormConnect, DrawingToolMapButtonConnect, ObjectManagerConnect, ObjectManagerMapButtonConnect, PublicWarningApiWrapper, PublicWarningsFormDialog, PublicWarningsFormDialogConnect, WARN_NAMESPACE, WarningsModuleProvider, componentsLookUp, drawingModuleConfig, initialState, isAlreadyEdited, publicWarningActions, publicWarningFormListener, reducer$1 as publicWarningFormReducer, publicWarningsAdapter, publicWarningsListener, reducer as publicWarningsReducer, selectors as publicWarningsSelectors, reducer, useObjectDrawDialogAction, warningFormConfirmationOptions, drawingsListener as warningsDrawingsListener, reducer$2 as warningsDrawingsReducer, warningsTranslations };