@opengeoweb/warnings 11.0.0 → 11.1.0

package/index.esm.js

@@ -3,8 +3,8 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, breakpoints, Options, Close, ChevronDown, ChevronUp, Copy, Update, Success, Expire, Remove, ArrowUpCompact, ArrowDownCompact } from '@opengeoweb/theme';
 import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawingToolSelectors, layerSelectors, uiSelectors, drawingToolActions, layerActions, useSetupDialog, selectorMemoizationOptions, useUpdateSharedData, layersListener, drawingToolListener, layerReducer, uiReducer, drawingToolReducer } 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, isAxiosError as isAxiosError$1 } from '@opengeoweb/shared';
-import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf, combineReducers, configureStore } from '@reduxjs/toolkit';
+import { SHARED_NAMESPACE, useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, CustomToggleButton, Filter, FilterChip, FilterOption, StatusTag, LastUpdateTime, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
+import { createEntityAdapter, createSlice, createSelector, current, createListenerMiddleware, combineReducers, configureStore } from '@reduxjs/toolkit';
 import 'i18next';
 import { useTranslation } from 'react-i18next';
 import '@opengeoweb/core';
@@ -17,13 +17,12 @@ import React__default, { useState, useEffect, useRef, useMemo, useCallback } fro
 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, AirmetPhenomena, SigmetPhenomena, getHeaders, handleResponse, useAuthQuery, useAuthenticationContext, ProductStatus, optimisticUpdate } from '@opengeoweb/api';
-import { rest } from 'msw';
-import { concat, isEqual, cloneDeep, clamp, groupBy, pick, assign } from 'lodash';
+import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider, AirmetPhenomena, SigmetPhenomena, getHeaders, handleResponse, useAuthQuery, useAuthenticationContext, optimisticUpdate, ProductStatus } from '@opengeoweb/api';
+import { http, HttpResponse, passthrough, delay } from 'msw';
+import { concat, isEqual, cloneDeep, clamp, groupBy, pick } from 'lodash';
 import { useFormContext } from 'react-hook-form';
 import { getConfig, useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
 import { useQueryClient, useMutation } from '@tanstack/react-query';
-import { isAxiosError } from 'axios';
 
 var en = {
 	"drawing-tool-form-tools": "Tools",
@@ -2166,36 +2165,6 @@ var slice$1 = createSlice({
       draft.warningType = (warning == null ? void 0 : warning.type) || warningType;
       draft.panelId = panelId;
     },
-    // publish warning
-    publishWarning: function publishWarning(draft,
-    // eslint-disable-next-line no-unused-vars
-    action) {
-      draft.formState = 'publishing';
-      delete draft.error;
-    },
-    publishWarningSuccess: function publishWarningSuccess(draft, action) {
-      var publicWarning = action.payload.publicWarning;
-      draft.warning = publicWarning;
-      // If form has been published, set form to readonly
-      draft.formState = 'readonly';
-    },
-    // save warning
-    saveWarning: function saveWarning(draft,
-    // eslint-disable-next-line no-unused-vars
-    action) {
-      draft.formState = 'saving';
-      delete draft.error;
-      draft.warning = action.payload.publicWarning;
-    },
-    saveWarningSuccess: function saveWarningSuccess(draft, action) {
-      var _publicWarning$warnin;
-      var publicWarning = action.payload.publicWarning;
-      draft.warning = publicWarning;
-      if (publicWarning != null && (_publicWarning$warnin = publicWarning.warningDetail) != null && _publicWarning$warnin.id) {
-        draft.selectedWarningId = publicWarning.warningDetail.id;
-      }
-      draft.formState = '';
-    },
     setFormError: function setFormError(draft, action) {
       var _action$payload3 = action.payload,
         message = _action$payload3.message,
@@ -7438,39 +7407,22 @@ var airmetList$1 = airmetListJSON;
 var sigmetList$1 = 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$1));
-}), rest.get(/^.*\/sigmetlist$/, function (_, res, ctx) {
-  return res(ctx.status(200), ctx.json(sigmetList$1));
-}), 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();
+[http.get(/^.*\/airmetlist$/, function () {
+  return HttpResponse.json(airmetList$1);
+}), http.get(/^.*\/sigmetlist$/, function () {
+  return HttpResponse.json(sigmetList$1);
+}), http.get(/^.*\/airmet-config$/, function () {
+  return HttpResponse.json(airmetConfig);
+}), http.get(/^.*\/sigmet-config$/, function () {
+  return HttpResponse.json(sigmetConfig);
+}), http.post(/^.*\/airmet2tac$/, function () {
+  return HttpResponse.text(fakeAirmetTAC);
+}), http.post(/^.*\/sigmet2tac$/, function () {
+  return HttpResponse.text(fakeSigmetTAC);
+}), http.get(/^(?!.*(sigmet|airmet)).*$/, function () {
+  return passthrough();
 })];
 
-/* *
- * 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 drawingList = drawingListJSON;
 var drawingsListFullContent = drawingsListFullContentJSON;
 var warningList = warningListJSON.map(function (pw) {
@@ -7481,24 +7433,35 @@ var warningList = warningListJSON.map(function (pw) {
 warningList.filter(function (warning) {
   return warning.status !== 'EXPIRED' && warning.status !== 'WITHDRAWN';
 }).length;
-var sigmetList = sigmetListJSON$1.map(function (s) {
-  return Object.assign({}, s, {
+var sigmetList = sigmetListJSON$1.map(function (sig) {
+  return Object.assign({}, sig, {
     type: 'sigmet'
   });
 });
-var airmetList = airmetListJSON$1.map(function (a) {
-  return Object.assign({}, a, {
+var airmetList = airmetListJSON$1.map(function (air) {
+  return Object.assign({}, air, {
     type: 'airmet'
   });
 });
 concat(warningList, sigmetList, airmetList);
 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) {
+[http.get(/^.*\/warnings$/, function () {
   // respond using a mocked JSON body
-  return res(ctx.status(200), ctx.json(warningList));
-}), rest.post(/^.*\/warnings\/(.*)$/, function (req, res, ctx) {
-  return res(ctx.status(200), ctx.json({}));
-})];
+  return HttpResponse.json(warningList);
+}), http.post(/^.*\/warnings\/(.*)$/, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  return _regeneratorRuntime().wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        _context.next = 2;
+        return delay();
+      case 2:
+        return _context.abrupt("return", HttpResponse.json(null));
+      case 3:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+})))];
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -8736,12 +8699,15 @@ 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);
-var makeFilterFromList = function makeFilterFromList(options) {
+var makeFilterFromList = function makeFilterFromList(options, value) {
   var _options$reduce;
+  if (value === void 0) {
+    value = true;
+  }
   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));
+    return p ? Object.assign({}, acc, (_Object$assign = {}, _Object$assign[p] = value, _Object$assign)) : acc;
+  }, (_options$reduce = {}, _options$reduce[emptyFilterId] = value, _options$reduce));
 };
 var AllPhenomena = Object.assign({}, AirmetPhenomena, SigmetPhenomena, Phenomenon$1);
 var AllPhenomenaKeys = Object.fromEntries(Object.keys(AllPhenomena).map(function (key) {
@@ -8761,6 +8727,9 @@ var initialFilters = {
   level: defaultLevelFilter
 };
 var getSelectedOptions = function getSelectedOptions(options) {
+  if (options === void 0) {
+    options = {};
+  }
   var selectedOptions = Object.keys(options).filter(function (k) {
     return options[k];
   });
@@ -9800,14 +9769,32 @@ var Form = function Form(_ref5) {
   var _publicWarningDetails, _publicWarningDetails2;
   var defaultMapPreset = _ref5.defaultMapPreset,
     _ref5$onSaveForm = _ref5.onSaveForm,
-    onSaveForm = _ref5$onSaveForm === void 0 ? function () {} : _ref5$onSaveForm,
+    onSaveForm = _ref5$onSaveForm === void 0 ? /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", null);
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })) : _ref5$onSaveForm,
     _ref5$onPublishForm = _ref5.onPublishForm,
-    onPublishForm = _ref5$onPublishForm === void 0 ? function () {} : _ref5$onPublishForm,
+    onPublishForm = _ref5$onPublishForm === void 0 ? /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", null);
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    })) : _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,
     publicWarningDetails = _ref5.publicWarningDetails,
     _ref5$error = _ref5.error,
     error = _ref5$error === void 0 ? {
@@ -9825,14 +9812,25 @@ var Form = function Form(_ref5) {
     selectedAviationProduct = _ref5.selectedAviationProduct,
     _ref5$warningType = _ref5.warningType,
     warningType = _ref5$warningType === void 0 ? 'public' : _ref5$warningType,
-    mode = _ref5.mode;
+    mode = _ref5.mode,
+    _ref5$onSetViewModeRe = _ref5.onSetViewModeResetArea,
+    onSetViewModeResetArea = _ref5$onSetViewModeRe === void 0 ? function () {} : _ref5$onSetViewModeRe;
+  var _React$useState = React.useState(false),
+    isPublishing = _React$useState[0],
+    setIsPublishing = _React$useState[1];
+  var _React$useState2 = React.useState(false),
+    isSaving = _React$useState2[0],
+    setIsSaving = _React$useState2[1];
   var _useTACApi = useTACApi(),
     fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
     fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
   var initialPublicWarningArea = (publicWarningDetails == null || (_publicWarningDetails = publicWarningDetails.areas) == null ? void 0 : _publicWarningDetails.length) && (publicWarningDetails == null || (_publicWarningDetails2 = publicWarningDetails.areas[0]) == null ? void 0 : _publicWarningDetails2.geoJSON);
-  var _React$useState = React.useState(initialPublicWarningArea),
-    warningGeoJSONFeature = _React$useState[0],
-    setWarningGeoJSONFeature = _React$useState[1];
+  var _React$useState3 = React.useState(initialPublicWarningArea),
+    warningGeoJSONFeature = _React$useState3[0],
+    setWarningGeoJSONFeature = _React$useState3[1];
+  var _React$useState4 = React.useState(publicWarningDetails == null ? void 0 : publicWarningDetails.areas),
+    originalWarningAreas = _React$useState4[0],
+    setOriginalWarningAreas = _React$useState4[1];
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var _useFormContext = useFormContext(),
@@ -9844,8 +9842,6 @@ var Form = function Form(_ref5) {
   var _useDraftFormHelpers = useDraftFormHelpers(),
     toggleIsDraft = _useDraftFormHelpers.toggleIsDraft,
     DraftFieldHelper = _useDraftFormHelpers.DraftFieldHelper;
-  var isPublishing = formAction === 'publishing';
-  var isSaving = formAction === 'saving';
   var areFieldsDisabled = isPublishing || isSaving;
   useFormDirty({
     isDirty: Object.keys(dirtyFields).length > 0,
@@ -9861,19 +9857,23 @@ var Form = function Form(_ref5) {
     if (!isPublishing) {
       toggleIsDraft(false);
       void handleSubmit( /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
+        var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                onPublishForm(prepareFormValues(data));
-              case 1:
+                setIsPublishing(true);
+                _context3.next = 3;
+                return onPublishForm(prepareFormValues(data))["catch"](function () {});
+              case 3:
+                setIsPublishing(false);
+              case 4:
               case "end":
-                return _context.stop();
+                return _context3.stop();
             }
-          }, _callee);
+          }, _callee3);
         }));
         return function (_x) {
-          return _ref6.apply(this, arguments);
+          return _ref8.apply(this, arguments);
         };
       }())();
     }
@@ -9882,19 +9882,23 @@ var Form = function Form(_ref5) {
     if (!isSaving) {
       toggleIsDraft(true);
       void handleSubmit( /*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
+        var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(data) {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                onSaveForm(prepareFormValues(data));
-              case 1:
+                setIsSaving(true);
+                _context4.next = 3;
+                return onSaveForm(prepareFormValues(data))["catch"](function () {});
+              case 3:
+                setIsSaving(false);
+              case 4:
               case "end":
-                return _context2.stop();
+                return _context4.stop();
             }
-          }, _callee2);
+          }, _callee4);
         }));
         return function (_x2) {
-          return _ref7.apply(this, arguments);
+          return _ref9.apply(this, arguments);
         };
       }())();
     }
@@ -9904,6 +9908,7 @@ var Form = function Form(_ref5) {
     setWarningGeoJSONFeature(undefined);
     onClearForm();
   };
+  // When switching warning, reset the form to the new values
   var publicWarningId = publicWarningDetails == null ? void 0 : publicWarningDetails.id;
   React.useEffect(function () {
     if (selectedAviationProduct) {
@@ -9911,8 +9916,27 @@ var Form = function Form(_ref5) {
     }
     // sync redux with react-hook-form
     reset(getFormData(publicWarningDetails, object));
+    setOriginalWarningAreas(publicWarningDetails == null ? void 0 : publicWarningDetails.areas);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [publicWarningId]);
+  // When the editor gets set back to viewer and the form is dirty, reset any changes made
+  React.useEffect(function () {
+    if (selectedAviationProduct) {
+      return;
+    }
+    if (isReadOnly && (Object.keys(dirtyFields).length > 0 || (publicWarningDetails == null ? void 0 : publicWarningDetails.areas) !== originalWarningAreas)) {
+      // // sync redux with react-hook-form
+      var oldPublicWarning = Object.assign({}, publicWarningDetails, {
+        areas: originalWarningAreas
+      });
+      reset(getFormData(oldPublicWarning, object));
+      if ((publicWarningDetails == null ? void 0 : publicWarningDetails.areas) !== originalWarningAreas) {
+        // update the store to contain the original area again
+        onSetViewModeResetArea(originalWarningAreas || []);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isReadOnly]);
   var areas = publicWarningDetails == null ? void 0 : publicWarningDetails.areas;
   React.useEffect(function () {
     if (selectedAviationProduct) {
@@ -9920,7 +9944,9 @@ var Form = function Form(_ref5) {
     }
     if (areas) {
       // sync redux with react-hook-form
-      setValue('areas', areas);
+      setValue('areas', areas, {
+        shouldDirty: true
+      });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [areas, setValue]);
@@ -10213,7 +10239,10 @@ var getPublicWarningStore = function getPublicWarningStore(store) {
   }
   return {};
 };
-var getPublicWarningObject = createSelector(getPublicWarningStore, function (publicWarningStore) {
+var selectPublicWarningState = createSelector(getPublicWarningStore, function (state) {
+  return state;
+});
+createSelector(getPublicWarningStore, function (publicWarningStore) {
   return publicWarningStore.object;
 });
 var getPublicWarning = createSelector(getPublicWarningStore, function (publicWarningStore) {
@@ -10234,7 +10263,7 @@ var getPublicWarningAreas = createSelector(getPublicWarningStore, function (publ
 var getPublicWarningFormState = createSelector(getPublicWarningStore, function (publicWarningStore) {
   return (publicWarningStore == null ? void 0 : publicWarningStore.formState) || '';
 });
-var getPublicWarningFormError = createSelector(getPublicWarningStore, function (publicWarningStore) {
+createSelector(getPublicWarningStore, function (publicWarningStore) {
   return publicWarningStore == null ? void 0 : publicWarningStore.error;
 });
 var getSelectedWarningId = createSelector(getPublicWarningStore, function (publicWarningStore) {
@@ -10275,51 +10304,298 @@ var PublicWarningStatus;
   PublicWarningStatus["WITHDRAWN"] = "WITHDRAWN";
 })(PublicWarningStatus || (PublicWarningStatus = {}));
 
+/* *
+ * 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).then(function (warnings) {
+    return warnings.map(function (warning) {
+      return Object.assign({}, warning, {
+        type: 'public'
+      });
+    });
+  });
+};
+var updatePublicWarningEditor = function updatePublicWarningEditor(warningId, isEditor, auth) {
+  return fetch(publicWarningBaseUrl + "/warnings/" + warningId + "?editor=" + (isEditor ? 'true' : 'false') + "&force=true", {
+    headers: getHeaders(auth),
+    method: 'POST'
+  }).then(handleResponse);
+};
+var updatePublicWarning = function updatePublicWarning(warningId, auth, data) {
+  return fetch(publicWarningBaseUrl + "/warnings/" + warningId, {
+    headers: getHeaders(auth),
+    method: 'POST',
+    body: JSON.stringify(data)
+  }).then(handleResponse);
+};
+var postPublicWarning = function postPublicWarning(auth, data) {
+  return fetch(publicWarningBaseUrl + "/warnings/", {
+    headers: getHeaders(auth),
+    method: 'POST',
+    body: JSON.stringify(data)
+  }).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 (warning, _ref2) {
+    var isEditor = _ref2.isEditor;
+    return Object.assign({}, warning, {
+      editor: isEditor ? auth.username : undefined
+    });
+  }, function (error) {
+    dispatch(publicWarningFormActions.setFormError({
+      message: error.message
+    }));
+  }), {
+    onSuccess: function () {
+      var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, _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 onSuccess(_x, _x2) {
+        return _onSuccess.apply(this, arguments);
+      }
+      return onSuccess;
+    }()
+  }));
+};
+var useMutateWarning = function useMutateWarning(snackBarMessage) {
+  var queryClient = useQueryClient();
+  var _useAuthenticationCon2 = useAuthenticationContext(),
+    auth = _useAuthenticationCon2.auth;
+  var dispatch = useDispatch();
+  return useMutation(Object.assign({
+    mutationFn: function mutationFn(_ref4) {
+      var id = _ref4.id,
+        data = _ref4.data;
+      if (!auth) {
+        throw new Error('Authentication context not found');
+      }
+      if (id) {
+        return updatePublicWarning(id, auth, data);
+      }
+      return postPublicWarning(auth, data);
+    }
+  }, optimisticUpdate(['public-warning-list'], queryClient, function (_, _ref5) {
+    var data = _ref5.data,
+      id = _ref5.id;
+    return Object.assign({}, data, {
+      id: id,
+      lastUpdatedTime: new Date().toISOString()
+    });
+  }, function (error) {
+    dispatch(publicWarningFormActions.setFormError({
+      message: error.message
+    }));
+  }), {
+    onSuccess: function () {
+      var _onSuccess2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data, variables) {
+        var location, _variables$data, warningDetail, status, newId, newWarning;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              location = data == null ? void 0 : data.get('location');
+              _variables$data = variables.data, warningDetail = _variables$data.warningDetail, status = _variables$data.status;
+              if (
+              // DRAFT_PUBLISHED warnings have  linked_to_id to the published warning it is based on
+              // When publishing a DRAFT_PUBLISHED warning we need to update the published warning and delete the draft
+              warningDetail.linked_to_id && status === PublicWarningStatus.PUBLISHED) {
+                queryClient.setQueryData(['public-warning-list'], function (old) {
+                  return old == null ? void 0 : old.reduce(function (acc, warning) {
+                    if (warning.id === warningDetail.linked_to_id) {
+                      return acc;
+                    }
+                    var id = warning.id === warningDetail.id ? warningDetail.linked_to_id : warningDetail.id;
+                    return [].concat(acc, [Object.assign({}, warning, {
+                      id: id,
+                      warningDetail: Object.assign({}, warningDetail, {
+                        id: id
+                      })
+                    })]);
+                  }, []);
+                });
+              }
+              if (location) {
+                // When making a new warning we get it's ID from the location header
+                newId = getIdFromUrl(location);
+                newWarning = Object.assign({}, variables.data, {
+                  id: newId,
+                  lastUpdatedTime: new Date().toISOString(),
+                  warningDetail: Object.assign({}, warningDetail, {
+                    id: newId,
+                    domain: 'public'
+                  })
+                });
+                queryClient.setQueryData(['public-warning-list'], function (old) {
+                  return [].concat(old || [], [newWarning]);
+                });
+                dispatch(publicWarningFormActions.openPublicWarningFormDialog({
+                  warning: newWarning,
+                  formState: '',
+                  panelId: variables.panelId
+                }));
+              }
+              dispatch(snackbarActions.openSnackbar({
+                type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
+                key: snackBarMessage
+              }));
+              if (variables.data.status === PublicWarningStatus.PUBLISHED) {
+                dispatch(uiActions.setToggleOpenDialog({
+                  type: publicWarningDialogType,
+                  setOpen: false
+                }));
+              }
+            case 6:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function onSuccess(_x3, _x4) {
+        return _onSuccess2.apply(this, arguments);
+      }
+      return onSuccess;
+    }()
+  }));
+};
+var usePublishWarning = function usePublishWarning() {
+  return useMutateWarning('warning-publish-succes');
+};
+var useSaveWarning = function useSaveWarning() {
+  return useMutateWarning('warning-save-succes');
+};
+
 var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
   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,
-    onFormSubmit = _ref.onFormSubmit;
-  var publicWarning = useSelector(getPublicWarning);
-  var publicWarningObject = useSelector(getPublicWarningObject);
-  var publicWarningFormAction = useSelector(getPublicWarningFormState);
-  var publicWarningFormError = useSelector(getPublicWarningFormError);
+    mode = _ref.mode;
+  var _useSelector = useSelector(selectPublicWarningState),
+    warning = _useSelector.warning,
+    object = _useSelector.object,
+    formState = _useSelector.formState,
+    error = _useSelector.error,
+    panelId = _useSelector.panelId;
+  var _usePublishWarning = usePublishWarning(),
+    publishWarning = _usePublishWarning.mutateAsync;
+  var _useSaveWarning = useSaveWarning(),
+    saveWarning = _useSaveWarning.mutateAsync;
   var _useAuthenticationCon = useAuthenticationContext$1(),
     auth = _useAuthenticationCon.auth;
   var isEditor = editor === (auth == null ? void 0 : auth.username) || false;
   var dispatch = useDispatch();
-  var publishForm = function publishForm(newFormValues) {
-    if (warningType === 'public') {
-      dispatch(publicWarningFormActions.publishWarning({
-        publicWarning: {
-          warningDetail: newFormValues,
-          status: PublicWarningStatus.PUBLISHED,
-          type: warningType
-        },
-        refetchWarnings: onFormSubmit
-      }));
-    }
-  };
+  var publishForm = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(newFormValues) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", publishWarning({
+              id: newFormValues.id || newFormValues.linked_to_id || '',
+              data: {
+                warningDetail: newFormValues.id ? newFormValues : Object.assign({}, newFormValues, {
+                  id: newFormValues.linked_to_id
+                }),
+                status: PublicWarningStatus.PUBLISHED,
+                type: 'public'
+              }
+            }));
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function publishForm(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var clearForm = function clearForm() {
     dispatch(publicWarningFormActions.removeAllAreas());
   };
-  var saveForm = function saveForm(newFormValues) {
-    var status = newFormValues.linked_to_id ? PublicWarningStatus.DRAFT_PUBLISHED : PublicWarningStatus.DRAFT;
-    if (warningType === 'public') {
-      dispatch(publicWarningFormActions.saveWarning({
-        publicWarning: {
-          warningDetail: newFormValues,
-          status: status,
-          editor: auth == null ? void 0 : auth.username,
-          type: warningType
-        },
-        refetchWarnings: onFormSubmit
-      }));
-    }
-  };
+  var saveForm = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(newFormValues) {
+      var status;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            status = newFormValues.linked_to_id ? PublicWarningStatus.DRAFT_PUBLISHED : PublicWarningStatus.DRAFT;
+            return _context2.abrupt("return", saveWarning({
+              id: newFormValues.id,
+              data: {
+                warningDetail: newFormValues,
+                status: status,
+                editor: auth == null ? void 0 : auth.username,
+                type: 'public'
+              },
+              panelId: panelId
+            }));
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function saveForm(_x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   var onFormDirty = function onFormDirty(isFormDirty) {
     dispatch(publicWarningFormActions.setFormDirty({
       isFormDirty: isFormDirty
@@ -10328,20 +10604,20 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
   var getIsReadOnly = function getIsReadOnly() {
     // public warning related
     if (warningType === 'public') {
-      if (publicWarningFormAction === 'readonly') {
+      if (formState === 'readonly') {
         return true;
       }
-      if ((publicWarning == null ? void 0 : publicWarning.status) === 'TODO') {
+      if ((warning == null ? void 0 : warning.status) === 'TODO') {
         return false;
       }
       // Readonly in case you are not creating a new warning and you are not set as the editor
-      return !isEditor && (publicWarning == null ? void 0 : publicWarning.status) !== undefined;
+      return !isEditor && (warning == null ? void 0 : warning.status) !== undefined;
     }
     // aviation related
     if ((selectedAviationProduct == null ? void 0 : selectedAviationProduct.status) === 'DRAFT') {
       return false;
     }
-    if (publicWarningFormAction === 'edit') {
+    if (formState === 'edit') {
       return false;
     }
     if (mode === 'new') {
@@ -10350,28 +10626,33 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     return true;
   };
   var isReadOnly = getIsReadOnly();
-  var formMode = publicWarningFormAction === 'edit' ? 'edit' : mode;
+  var formMode = formState === 'edit' ? 'edit' : mode;
   var onAddObject = function onAddObject() {
     dispatch(uiActions.setToggleOpenDialog({
       type: uiTypes.DialogTypes.AreaObjectLoader,
       setOpen: true
     }));
   };
+  var onSetViewModeResetArea = function onSetViewModeResetArea(area) {
+    dispatch(publicWarningFormActions.addArea({
+      area: area[0]
+    }));
+  };
   return jsx(PublicWarningsForm, {
-    object: publicWarningObject,
-    publicWarningDetails: publicWarning == null ? void 0 : publicWarning.warningDetail,
+    object: object,
+    publicWarningDetails: warning == null ? void 0 : warning.warningDetail,
     onPublishForm: publishForm,
     onSaveForm: saveForm,
     onClearForm: clearForm,
-    formAction: publicWarningFormAction,
     isReadOnly: isReadOnly,
-    error: publicWarningFormError,
+    error: error,
     onFormDirty: onFormDirty,
     defaultMapPreset: defaultMapPreset,
     onAddObject: onAddObject,
     selectedAviationProduct: selectedAviationProduct,
     warningType: warningType,
-    mode: formMode
+    mode: formMode,
+    onSetViewModeResetArea: onSetViewModeResetArea
   });
 };
 
@@ -11296,103 +11577,6 @@ var duplicateAviationProduct = function duplicateAviationProduct(aviationWarning
   });
 };
 
-/* *
- * 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).then(function (warnings) {
-    return warnings.map(function (warning) {
-      return Object.assign({}, warning, {
-        type: 'public'
-      });
-    });
-  });
-};
-var updatePublicWarningEditor = function updatePublicWarningEditor(warningId, isEditor, auth) {
-  return fetch(publicWarningBaseUrl + "/warnings/" + warningId + "?editor=" + (isEditor ? 'true' : 'false') + "&force=true", {
-    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.
@@ -11602,12 +11786,16 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
             dispatch(publicWarningFormActions.setFormValues({
               formState: isReadOnly ? 'readonly' : ''
             }));
+            dispatch(uiActions.setToggleOpenDialog({
+              type: uiTypes.DialogTypes.AreaObjectLoader,
+              setOpen: false
+            }));
             updatePublicWarningEditor.mutate({
               id: selectedWarningId,
               isEditor: !isReadOnly
             });
             return _context2.abrupt("return", true);
-          case 14:
+          case 15:
           case "end":
             return _context2.stop();
         }
@@ -11729,10 +11917,7 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
         defaultMapPreset: defaultMapPreset,
         selectedAviationProduct: selectedAviationProduct,
         warningType: updatedWarningType,
-        mode: mode,
-        onFormSubmit: function onFormSubmit() {
-          return refetchWarnings();
-        }
+        mode: mode
       })
     }), jsx(AreaObjectLoaderConnect, {})]
   });
@@ -13174,7 +13359,9 @@ var slice = createSlice({
         filterState = _action$payload.filterState,
         panelId = _action$payload.panelId;
       if (panelId) {
-        draft.filterState[panelId] = filterState;
+        var _current;
+        var currentFilterState = ((_current = current(draft)) == null ? void 0 : _current.filterState[panelId]) || initialFilters;
+        draft.filterState[panelId] = Object.assign({}, currentFilterState, filterState);
       }
     }
   }
@@ -13254,6 +13441,23 @@ var selectors = /*#__PURE__*/Object.freeze({
   selectAllPublicWarnings: selectAllPublicWarnings
 });
 
+/* *
+ * 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 getLevelsForDomainFilter = function getLevelsForDomainFilter(domainFilter) {
   return Object.keys(domainFilter).flatMap(function (domain) {
     return domainFilter[domain] ? domainLevels[domain] : [];
@@ -13264,31 +13468,36 @@ var getPhenomenaForDomainFilter = function getPhenomenaForDomainFilter(domainFil
     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
-  var updatedOptions = assign(pickedFilterOptions, pick(savedFilter || {}, Object.keys(pickedFilterOptions)));
-  var _getSelectedOptions = getSelectedOptions(updatedOptions),
+/** Get filter object
+ * @param savedFilter The savedFilter with all options
+ * @param visibleOptions The options that should be shown
+ * @returns pickedFilterObject - The filter object with only the relevant options
+ * @returns allSelected - A value for whether or not every visible option is selected
+ */
+var getFilterOptions = function getFilterOptions(savedFilter, visibleOptions) {
+  var pickedFilterObject = pick(savedFilter, [emptyFilterId].concat(visibleOptions));
+  var _getSelectedOptions = getSelectedOptions(pickedFilterObject),
     allSelected = _getSelectedOptions.allSelected;
-  return [updatedOptions, allSelected];
+  return [pickedFilterObject, allSelected];
 };
 var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, savedFilterState, presetFilterState) {
-  var pickedDomainFilter = savedFilterState.domain,
-    pickedPhenomenonFilter = savedFilterState.phenomenon,
-    pickedLevelFilter = savedFilterState.level,
-    pickedSourceFilter = savedFilterState.source,
-    pickedIncidentFilter = savedFilterState.incident;
-  /// level
+  var savedDomainFilter = savedFilterState.domain,
+    savedPhenomenonFilter = savedFilterState.phenomenon,
+    savedLevelFilter = savedFilterState.level,
+    savedSourceFilter = savedFilterState.source,
+    savedIncidentFilter = savedFilterState.incident;
+  /** Levels for selected domain(s) */
   var relevantLevels = useMemo(function () {
-    return getLevelsForDomainFilter(pickedDomainFilter);
-  }, [pickedDomainFilter]);
-  var _getFilterOptions = getFilterOptions(defaultLevelFilter, relevantLevels, pickedLevelFilter),
-    updatedPickedLevels = _getFilterOptions[0],
+    return getLevelsForDomainFilter(savedDomainFilter);
+  }, [savedDomainFilter]);
+  var _getFilterOptions = getFilterOptions(savedLevelFilter, relevantLevels),
+    pickedLevelFilter = _getFilterOptions[0],
     allLevelsSelected = _getFilterOptions[1];
-  // phenomenon
+  /** Phenomena for selected domain(s) */
   var domainPhenomena = useMemo(function () {
-    return getPhenomenaForDomainFilter(pickedDomainFilter);
-  }, [pickedDomainFilter]);
+    return getPhenomenaForDomainFilter(savedDomainFilter);
+  }, [savedDomainFilter]);
+  /** Phenomena in the warnings */
   var warningsPhenomena = useMemo(function () {
     return getFiltersFromWarnings(warnings, 'phenomenon');
   }, [warnings]);
@@ -13297,9 +13506,8 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
       return warningsPhenomena.includes(phenomenon);
     });
   }, [warningsPhenomena, domainPhenomena]);
-  relevantPhenomena.push(emptyFilterId);
-  var _getFilterOptions2 = getFilterOptions(defaultPhenomenonFilter, relevantPhenomena, pickedPhenomenonFilter),
-    updatedPickedPhenomena = _getFilterOptions2[0],
+  var _getFilterOptions2 = getFilterOptions(savedPhenomenonFilter, relevantPhenomena),
+    pickedPhenomenaFilter = _getFilterOptions2[0],
     allPhenomenaSelected = _getFilterOptions2[1];
   // source
   var relevantSources = useMemo(function () {
@@ -13307,46 +13515,54 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
   }, [warnings]);
   var defaultSourceFilter = useMemo(function () {
     return Object.fromEntries(relevantSources.map(function (key) {
-      return [key, true];
+      var presetValue = presetFilterState == null ? void 0 : presetFilterState.source[key];
+      return [key, presetValue === undefined ? true : presetValue];
     }));
-  }, [relevantSources]);
-  var _getFilterOptions3 = getFilterOptions(defaultSourceFilter, relevantSources, pickedSourceFilter),
-    updatedPickedSources = _getFilterOptions3[0],
-    allSourcesSelected = _getFilterOptions3[1];
-  // incident
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [relevantSources]);
+  var _getSelectedOptions2 = getSelectedOptions(savedSourceFilter),
+    allSourcesSelected = _getSelectedOptions2.allSelected;
+  /** Incidents in the warnings */
   var relevantIncidents = useMemo(function () {
     return getFiltersFromWarnings(warnings, 'incident');
   }, [warnings]);
+  /** FilterObject based on relevant incidents with values from the preset */
   var defaultIncidentFilter = useMemo(function () {
     return Object.fromEntries(relevantIncidents.map(function (key) {
-      return [key, true];
+      var presetValue = presetFilterState == null ? void 0 : presetFilterState.incident[key];
+      return [key, presetValue === undefined ? true : presetValue];
     }));
-  }, [relevantIncidents]);
-  var _getFilterOptions4 = getFilterOptions(defaultIncidentFilter, relevantIncidents, pickedIncidentFilter),
-    updatedPickedIncidents = _getFilterOptions4[0],
-    allIncidentsSelected = _getFilterOptions4[1];
+  }, [relevantIncidents, presetFilterState == null ? void 0 : presetFilterState.incident]);
+  var _getSelectedOptions3 = getSelectedOptions(savedIncidentFilter),
+    allIncidentsSelected = _getSelectedOptions3.allSelected;
+  var populatedIncidentAndSourceFilter = useMemo(function () {
+    return {
+      incident: defaultIncidentFilter,
+      source: defaultSourceFilter
+    };
+  }, [defaultIncidentFilter, defaultSourceFilter]);
+  var initialFiltersWithPresets = useMemo(function () {
+    return {
+      incident: defaultIncidentFilter || defaultEmptyFilter,
+      source: defaultSourceFilter || defaultEmptyFilter,
+      domain: Object.assign({}, initialFilters.domain, presetFilterState == null ? void 0 : presetFilterState.domain),
+      phenomenon: Object.assign({}, initialFilters.phenomenon, presetFilterState == null ? void 0 : presetFilterState.phenomenon),
+      level: Object.assign({}, initialFilters.level, presetFilterState == null ? void 0 : presetFilterState.level)
+    };
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [presetFilterState]);
+  useEffect(function () {
+    onUpdateFilters(populatedIncidentAndSourceFilter, true);
+  }, [populatedIncidentAndSourceFilter, onUpdateFilters]);
   useEffect(function () {
     // when the preset changes, update the filters
-    if (presetFilterState) {
-      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(Object.assign({}, initialFilters, {
-        incident: makeFilterFromList(relevantIncidents),
-        source: makeFilterFromList(relevantSources)
-      }), 'system');
-    }
+    onUpdateFilters(initialFiltersWithPresets, true);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [presetFilterState, onUpdateFilters]);
-  var _getSelectedOptions2 = getSelectedOptions(pickedDomainFilter),
-    allDomainSelected = _getSelectedOptions2.allSelected;
+  }, [initialFiltersWithPresets, onUpdateFilters]);
+  var _getSelectedOptions4 = getSelectedOptions(savedDomainFilter),
+    allDomainSelected = _getSelectedOptions4.allSelected;
   var allSelected = allDomainSelected && allLevelsSelected && allPhenomenaSelected && allIncidentsSelected && allSourcesSelected;
   /**
    * @param filterKey - Name of the filter | "ALL" filters
@@ -13358,44 +13574,40 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
     var levelFilter = value ? defaultLevelFilter : defaultEmptyFilter;
     if (filterKey === 'ALL') {
       onUpdateFilters({
-        domain: updateState(pickedDomainFilter, 'ALL', value),
+        domain: updateState(savedDomainFilter, 'ALL', value),
         level: updateState(levelFilter, 'ALL', value),
-        phenomenon: updateState(pickedPhenomenonFilter, 'ALL', value),
-        incident: updateState(pickedIncidentFilter, 'ALL', value),
-        source: updateState(pickedSourceFilter, 'ALL', value)
-      }, 'user');
+        phenomenon: updateState(savedPhenomenonFilter, 'ALL', value),
+        incident: updateState(savedIncidentFilter, 'ALL', value),
+        source: updateState(savedSourceFilter, 'ALL', value)
+      });
     } else if (filterKey === 'domain') {
-      var newDomain = updateState(pickedDomainFilter, optionKey, value, only);
-      var _relevantLevels = getLevelsForDomainFilter(newDomain);
-      var _getFilterOptions5 = getFilterOptions(defaultLevelFilter, _relevantLevels, pickedLevelFilter),
-        newLevel = _getFilterOptions5[0];
-      onUpdateFilters(Object.assign({}, savedFilterState, {
-        domain: newDomain,
-        level: newLevel // levels depend on selected domains
-      }), 'user');
+      var newDomain = updateState(savedDomainFilter, optionKey, value, only);
+      onUpdateFilters({
+        domain: newDomain
+      });
     } else if (filterKey === 'level') {
-      onUpdateFilters(Object.assign({}, savedFilterState, {
-        level: updateState(pickedLevelFilter, optionKey, value, only)
-      }), 'user');
+      onUpdateFilters({
+        level: updateState(savedLevelFilter, optionKey, value, only)
+      });
     } else if (filterKey === 'phenomenon') {
-      onUpdateFilters(Object.assign({}, savedFilterState, {
-        phenomenon: updateState(pickedPhenomenonFilter, optionKey, value, only)
-      }), 'user');
+      onUpdateFilters({
+        phenomenon: updateState(savedPhenomenonFilter, optionKey, value, only)
+      });
     } else if (filterKey === 'source') {
-      onUpdateFilters(Object.assign({}, savedFilterState, {
-        source: updateState(pickedSourceFilter, optionKey, value, only)
-      }), 'user');
+      onUpdateFilters({
+        source: updateState(savedSourceFilter, optionKey, value, only)
+      });
     } else if (filterKey === 'incident') {
-      onUpdateFilters(Object.assign({}, savedFilterState, {
-        incident: updateState(pickedIncidentFilter, optionKey, value, only)
-      }), 'user');
+      onUpdateFilters({
+        incident: updateState(savedIncidentFilter, optionKey, value, only)
+      });
     }
   };
   var byFilterState = useCallback(function (warning) {
-    var levelDomain = ['SIG', 'AIR'].find(function (d) {
-      return d === warning.warningDetail.level;
+    var levelDomain = ['SIG', 'AIR'].find(function (dom) {
+      return dom === warning.warningDetail.level;
     }) ? Domain.aviation : Domain["public"];
-    if (!pickedDomainFilter[levelDomain]) {
+    if (!savedDomainFilter[levelDomain]) {
       return false;
     }
     var level = getValue(Level, warning.warningDetail.level);
@@ -13403,33 +13615,33 @@ var useWarningFilters = function useWarningFilters(warnings, onUpdateFilters, sa
       return false;
     }
     var phenomenon = getValue(AllPhenomenaKeys, warning.warningDetail.phenomenon);
-    if (!pickedPhenomenonFilter[phenomenon]) {
+    if (!pickedPhenomenaFilter[phenomenon]) {
       return false;
     }
     var source = relevantSources.find(function (source) {
       return source === warning.warningDetail.warningProposalSource;
     }) || emptyFilterId;
-    if (!updatedPickedSources[source]) {
+    if (!savedSourceFilter[source]) {
       return false;
     }
     var incident = relevantIncidents.find(function (incident) {
       return incident === warning.warningDetail.incident;
     }) || emptyFilterId;
-    if (!updatedPickedIncidents[incident]) {
+    if (!savedIncidentFilter[incident]) {
       return false;
     }
     return true;
-  }, [pickedDomainFilter, pickedLevelFilter, pickedPhenomenonFilter, relevantSources, updatedPickedSources, relevantIncidents, updatedPickedIncidents]);
+  }, [savedDomainFilter, pickedLevelFilter, pickedPhenomenaFilter, relevantSources, savedSourceFilter, relevantIncidents, savedIncidentFilter]);
   return {
     allSelected: allSelected,
     updateFilter: updateFilter,
     byFilterState: byFilterState,
     filterState: {
-      domain: pickedDomainFilter,
-      level: updatedPickedLevels,
-      phenomenon: updatedPickedPhenomena,
-      incident: updatedPickedIncidents,
-      source: updatedPickedSources
+      domain: savedDomainFilter,
+      level: pickedLevelFilter,
+      phenomenon: pickedPhenomenaFilter,
+      incident: savedIncidentFilter,
+      source: savedSourceFilter
     }
   };
 };
@@ -13747,11 +13959,14 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
     openSnackbar(snackbarMessage);
     refetchWarnings();
   };
-  var onUpdateFilters = React__default.useCallback(function (filterState, origin) {
+  var onUpdateFilters = React__default.useCallback(function (filterState, systemUpdate) {
+    if (systemUpdate === void 0) {
+      systemUpdate = false;
+    }
     dispatch(publicWarningActions.setWarningFilters({
       filterState: filterState,
       panelId: panelId,
-      origin: origin
+      systemUpdate: systemUpdate
     }));
   }, [dispatch, panelId]);
   var filterHookState = useWarningFilters(combinedWarnings, onUpdateFilters, savedFilterState, presetFilterState);
@@ -13879,52 +14094,28 @@ var componentsLookUp = function componentsLookUp(payload, apiProps) {
   }
 };
 
-var getErrorMessage = function getErrorMessage(error) {
-  return isAxiosError(error) ? getAxiosErrorMessage(error) : error.message;
-};
 var publicWarningFormListener = createListenerMiddleware();
 publicWarningFormListener.startListening({
-  actionCreator: publicWarningFormActions.publishWarning,
+  actionCreator: publicWarningFormActions.openPublicWarningFormDialog,
   effect: function () {
     var _effect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, listenerApi) {
-      var payload, publicWarning, refetchWarnings, publishedWarning, isDialogOpen;
+      var payload, panelId;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payload = _ref.payload;
             listenerApi.cancelActiveListeners();
-            _context.prev = 2;
-            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: 'warning-publish-succes'
-              }
-            }));
+            panelId = payload.panelId;
             listenerApi.dispatch(uiActions.setToggleOpenDialog({
+              setOpen: true,
               type: publicWarningDialogType,
-              setOpen: false
+              sourcePanelId: panelId
             }));
-            _context.next = 16;
-            break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](2);
-            isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            errorEffect(listenerApi.dispatch, getErrorMessage(_context.t0), isDialogOpen);
-          case 16:
+          case 4:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 12]]);
+      }, _callee);
     }));
     function effect(_x, _x2) {
       return _effect.apply(this, arguments);
@@ -13933,201 +14124,14 @@ publicWarningFormListener.startListening({
   }()
 });
 publicWarningFormListener.startListening({
-  actionCreator: publicWarningFormActions.saveWarning,
+  actionCreator: uiActions.setToggleOpenDialog,
   effect: function () {
     var _effect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2, listenerApi) {
-      var payload, publicWarning, refetchWarnings, savedWarning, isDialogOpen;
+      var payload;
       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, refetchWarnings = payload.refetchWarnings;
-            _context2.next = 6;
-            return saveOrUpdateWarning(publicWarning);
-          case 6:
-            savedWarning = _context2.sent;
-            if (refetchWarnings) {
-              refetchWarnings();
-            }
-            listenerApi.dispatch(publicWarningFormActions.saveWarningSuccess({
-              publicWarning: savedWarning,
-              message: {
-                type: snackbarTypes.SnackbarMessageType.TRANSLATABLE_MESSAGE,
-                key: 'warning-save-succes'
-              }
-            }));
-            _context2.next = 15;
-            break;
-          case 11:
-            _context2.prev = 11;
-            _context2.t0 = _context2["catch"](2);
-            isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            errorEffect(listenerApi.dispatch, getErrorMessage(_context2.t0), isDialogOpen);
-          case 15:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[2, 11]]);
-    }));
-    function effect(_x3, _x4) {
-      return _effect2.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
-// Side effects/snackbar listeners
-publicWarningFormListener.startListening({
-  matcher: isAnyOf(publicWarningFormActions.publishWarningSuccess, publicWarningFormActions.saveWarningSuccess),
-  effect: function () {
-    var _effect3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3, listenerApi) {
-      var payload, message, isDialogOpen;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            payload = _ref3.payload;
-            listenerApi.cancelActiveListeners();
-            message = payload.message;
-            listenerApi.dispatch(snackbarActions.openSnackbar(message));
-            isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            toggleDialogLoadingEffect(listenerApi.dispatch, isDialogOpen, false);
-          case 6:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    function effect(_x5, _x6) {
-      return _effect3.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
-publicWarningFormListener.startListening({
-  matcher: isAnyOf(publicWarningFormActions.publishWarning, publicWarningFormActions.saveWarning),
-  effect: function () {
-    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:
-            listenerApi.cancelActiveListeners();
-            isDialogOpen = uiSelectors.getisDialogOpen(listenerApi.getState(), publicWarningDialogType);
-            toggleDialogLoadingEffect(listenerApi.dispatch, isDialogOpen, true);
-          case 3:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    }));
-    function effect(_x7, _x8) {
-      return _effect4.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
-publicWarningFormListener.startListening({
-  actionCreator: publicWarningFormActions.openPublicWarningFormDialog,
-  effect: function () {
-    var _effect5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref4, listenerApi) {
-      var payload, panelId;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            payload = _ref4.payload;
-            listenerApi.cancelActiveListeners();
-            panelId = payload.panelId;
-            listenerApi.dispatch(uiActions.setToggleOpenDialog({
-              setOpen: true,
-              type: publicWarningDialogType,
-              sourcePanelId: panelId
-            }));
-          case 4:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    }));
-    function effect(_x9, _x10) {
-      return _effect5.apply(this, arguments);
-    }
-    return effect;
-  }()
-});
-var saveOrUpdateWarning = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(publicWarning) {
-    var warningsApi, warningDetail, status, warning, newWarningId;
-    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) {
-            _context6.next = 6;
-            break;
-          }
-          _context6.next = 5;
-          return warningsApi.updateWarning(warningDetail.id, publicWarning);
-        case 5:
-          return _context6.abrupt("return", publicWarning);
-        case 6:
-          if (!(status === 'PUBLISHED' && warningDetail.linked_to_id)) {
-            _context6.next = 11;
-            break;
-          }
-          warning = Object.assign({}, publicWarning, {
-            warningDetail: Object.assign({}, warningDetail, {
-              id: warningDetail.linked_to_id
-            })
-          });
-          _context6.next = 10;
-          return warningsApi.updateWarning(warningDetail.linked_to_id, warning);
-        case 10:
-          return _context6.abrupt("return", warning);
-        case 11:
-          _context6.next = 13;
-          return warningsApi.saveWarningAs(publicWarning);
-        case 13:
-          newWarningId = _context6.sent;
-          return _context6.abrupt("return", Object.assign({}, publicWarning, {
-            warningDetail: Object.assign({}, warningDetail, {
-              id: newWarningId
-            })
-          }));
-        case 15:
-        case "end":
-          return _context6.stop();
-      }
-    }, _callee6);
-  }));
-  return function saveOrUpdateWarning(_x11) {
-    return _ref5.apply(this, arguments);
-  };
-}();
-var toggleDialogLoadingEffect = function toggleDialogLoadingEffect(dispatch, isDialogOpen, isLoading) {
-  if (isDialogOpen) {
-    dispatch(uiActions.toggleIsLoadingDialog({
-      isLoading: isLoading,
-      type: publicWarningDialogType
-    }));
-  }
-};
-var errorEffect = function errorEffect(dispatch, message, isDialogOpen) {
-  dispatch(publicWarningFormActions.setFormError({
-    message: message
-  }));
-  toggleDialogLoadingEffect(dispatch, isDialogOpen, false);
-};
-publicWarningFormListener.startListening({
-  actionCreator: uiActions.setToggleOpenDialog,
-  effect: function () {
-    var _effect6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref6, listenerApi) {
-      var payload;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
-          case 0:
-            payload = _ref6.payload;
             if (!payload.setOpen && payload.type === publicWarningDialogType) {
               listenerApi.dispatch(uiActions.setToggleOpenDialog({
                 setOpen: false,
@@ -14136,12 +14140,12 @@ publicWarningFormListener.startListening({
             }
           case 2:
           case "end":
-            return _context7.stop();
+            return _context2.stop();
         }
-      }, _callee7);
+      }, _callee2);
     }));
-    function effect(_x12, _x13) {
-      return _effect6.apply(this, arguments);
+    function effect(_x3, _x4) {
+      return _effect2.apply(this, arguments);
     }
     return effect;
   }()
@@ -14215,7 +14219,7 @@ warningsDrawingsListener.startListening({
                 isLoading: false,
                 type: drawingDialogType
               }));
-              errorMessage = isAxiosError$1(taskError) ? getAxiosErrorMessage(taskError) : taskError.message;
+              errorMessage = isAxiosError(taskError) ? getAxiosErrorMessage(taskError) : taskError.message;
               listenerApi.dispatch(uiActions.setErrorDialog({
                 type: drawingDialogType,
                 error: errorMessage