@opengeoweb/sigmet-airmet 14.3.0 → 14.5.0

package/index.esm.js

@@ -1,16 +1,15 @@
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { sessionStorageProvider, PROJECTION, useIsMounted, dateUtils, usePreventBrowserClose, CustomTooltip, usePrevious, ConfirmationServiceProvider, useConfirmationDialog, CustomDialog, AlertBanner, StatusTag, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import { Box as Box$1 } from '@mui/system';
-import * as React from 'react';
-import React__default, { useRef, useEffect, useCallback } from 'react';
-import { FormControlLabel, Radio, Grid, Typography, Box, Checkbox, MenuItem, FormHelperText, useTheme, Backdrop, CircularProgress, Card, Button, LinearProgress, List, ListItemButton } from '@mui/material';
+import React, { useRef, useEffect, useCallback } from 'react';
+import { Grid, Typography, FormControlLabel, Radio, Box, Checkbox, MenuItem, FormHelperText, useTheme, Backdrop, CircularProgress, Card, Button, LinearProgress, List, ListItemButton } from '@mui/material';
 import { useFormContext } from 'react-hook-form';
 import { FORM_FIELDS_NAMESPACE, useDraftFormHelpers, ReactHookFormRadioGroup, hasValidGeometry, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMin, isValidMax, isEmpty, ReactHookFormDateTime, countIntersectionPoints, hasMulitpleIntersections, ReactHookFormHiddenInput, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isMaximumOneDrawing, isXHoursBefore, isXHoursAfter, ReactHookFormTextField, DegreesMinutesField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import { uiSelectors, useUpdateSharedData, mapSelectors, syncGroupsActions, layerActions, mapActions, defaultLayers, syncConstants, uiActions, uiTypes, genericSelectors, drawingToolActions } from '@opengeoweb/store';
 import { FEATURE_DRAW_SECONDARY_FILL_COLOR, FEATURE_DRAW_SECONDARY_STROKE_COLOR, defaultIntersectionStyleProperties, defaultGeoJSONStyleProperties, addSelectionTypeToGeoJSON, DRAWMODE, defaultLocation, addGeoJSONProperties, defaultBox, defaultPolygon, defaultDelete, getIcon, addFeatureProperties, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle, OpenLayersMapDraw, useMapDrawTool, rewindGeometry } from '@opengeoweb/webmap-react';
-import { getHeaders, handleResponse, useAuthQuery, useAuthenticationContext } from '@opengeoweb/api';
 import { useQueryClient, useMutation } from '@tanstack/react-query';
+import { getHeaders, handleResponse, useAuthQuery, useAuthenticationContext } from '@opengeoweb/api';
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { LegendConnect, OlMapViewConnect, TimeSliderConnect } from '@opengeoweb/core';
@@ -79,7 +78,7 @@ var en = {
 	"geometry-maximum-points-message": "The start position drawing allows a maximum of {{maxPoints}} individual points",
 	"geometry-more-than-6-points-message": "The start/end position drawing has exceeded 6 individual points. The TAC has a total of {{totalDrawnPoints}} points. If possible, reduce the number of points.",
 	"geometry-intersection-above-6-points-message": "The start/end position of the intersected polygon has {{intersectingPolygonPointsTotal}} points, and the intersection of the drawn polygon with the FIR-boundary has exceeded 6 individual points. Check if the TAC in the preview corresponds to the intended area.",
-	"geometry-only-one-start-position-drawing": "Only one start position drawing is allowed",
+	"geometry-only-one-start-position-drawing": "The drawn polygon results in several polygons, and no TAC can be produced",
 	"progress-get-movement-step-valktmessage": "Speed should be rounded to the nearest {{value}}kt",
 	"progress-get-movement-step-valkmhmessage": "Speed should be rounded to the nearest {{value}}kmh",
 	"progress-coordinate-empty-message": "An end position drawing is required when selecting End position",
@@ -144,7 +143,8 @@ var en = {
 	"surface-visibility-maximum-visibility": "The maximum visibility in meters is {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Value in meters",
 	"surface-visibility-between-time": "Forecast time should lie between the valid start and valid end time",
-	phenomenon: "Phenomenon"
+	phenomenon: "Phenomenon",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var fi = {
 	"sigmet-airmet": "sigmet",
@@ -269,7 +269,8 @@ var fi = {
 	"surface-visibility-maximum-visibility": "Maksiminäkyvyys metreinä: {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Arvo metreinä",
 	"surface-visibility-between-time": "Ennusteajan tulee olla voimassa olevan alkamis- ja päättymisajan välissä",
-	phenomenon: "sääilmiö"
+	phenomenon: "sääilmiö",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var no = {
 	"sigmet-airmet": "sigmet",
@@ -396,7 +397,8 @@ var no = {
 	"surface-visibility-maximum-visibility": "The maximum visibility in meters is {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Value in meters",
 	"surface-visibility-between-time": "Forecast time should lie between the valid start and valid end time",
-	phenomenon: "Phenomenon"
+	phenomenon: "Phenomenon",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var nl = {
 	"sigmet-airmet": "sigmet",
@@ -521,7 +523,8 @@ var nl = {
 	"surface-visibility-maximum-visibility": "De maximale zichtbaarheid in meters is {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Waarde in meters",
 	"surface-visibility-between-time": "De prognosetijd moet tussen de geldige start- en eindtijd liggen",
-	phenomenon: "Fenomeen"
+	phenomenon: "Fenomeen",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var sigmetAirmetTranslations = {
 	en: en,
@@ -530,133 +533,6 @@ var sigmetAirmetTranslations = {
 	nl: nl
 };
 
-/**
- * The possible type for the airmet
- */
-var AirmetType;
-(function (AirmetType) {
-  AirmetType["NORMAL"] = "Normal";
-  AirmetType["TEST"] = "Test";
-  AirmetType["EXERCISE"] = "Exercise";
-})(AirmetType || (AirmetType = {}));
-/**
- * The possible type for the sigmet
- */
-var SigmetType;
-(function (SigmetType) {
-  SigmetType["NORMAL"] = "Normal";
-  SigmetType["TEST"] = "Test";
-  SigmetType["EXERCISE"] = "Exercise";
-  SigmetType["SHORT_TEST"] = "Short test";
-  SigmetType["SHORT_VA_TEST"] = "Short VA test";
-})(SigmetType || (SigmetType = {}));
-var VisibilityCause;
-(function (VisibilityCause) {
-  VisibilityCause["DZ"] = "Drizzle";
-  VisibilityCause["DU"] = "Dust";
-  VisibilityCause["PO"] = "Dust or sand devil";
-  VisibilityCause["DS"] = "Dust storm";
-  VisibilityCause["FG"] = "Fog";
-  VisibilityCause["FC"] = "Funnel clouds";
-  VisibilityCause["GR"] = "Hail";
-  VisibilityCause["HZ"] = "Haze";
-  VisibilityCause["PL"] = "Ice pellets";
-  VisibilityCause["BR"] = "Mist";
-  VisibilityCause["RA"] = "Rain";
-  VisibilityCause["SA"] = "Sand";
-  VisibilityCause["SS"] = "Sand storm";
-  VisibilityCause["FU"] = "Smoke";
-  VisibilityCause["SN"] = "Snow";
-  VisibilityCause["SG"] = "Snow grains";
-  VisibilityCause["GS"] = "Soft hail";
-  VisibilityCause["SQ"] = "Squalls";
-  VisibilityCause["VA"] = "Volcanic Ash";
-})(VisibilityCause || (VisibilityCause = {}));
-/* Speed unit, e.g. 'KT', 'KMH' */
-var MovementUnit;
-(function (MovementUnit) {
-  MovementUnit["KT"] = "kt";
-  MovementUnit["KMH"] = "kmh";
-})(MovementUnit || (MovementUnit = {}));
-var WindUnit;
-(function (WindUnit) {
-  WindUnit["KT"] = "kt";
-  WindUnit["MPS"] = "mps";
-})(WindUnit || (WindUnit = {}));
-var ProductAction;
-(function (ProductAction) {
-  ProductAction["PUBLISH"] = "PUBLISH";
-  ProductAction["CANCEL"] = "CANCEL";
-  ProductAction["RENEW"] = "RENEW";
-  ProductAction["AMEND"] = "AMEND";
-  ProductAction["SAVE"] = "SAVE";
-  ProductAction["DISCARD"] = "DISCARD";
-  ProductAction["DUPLICATE"] = "DUPLICATE";
-  ProductAction["CLOSE"] = "CLOSE";
-})(ProductAction || (ProductAction = {}));
-var ProductStatusDescription;
-(function (ProductStatusDescription) {
-  ProductStatusDescription["DRAFT"] = "Draft";
-  ProductStatusDescription["PUBLISHED"] = "Published";
-  ProductStatusDescription["CANCELLED"] = "Cancelled";
-  ProductStatusDescription["EXPIRED"] = "Expired";
-  ProductStatusDescription["RENEWED"] = "Renewed";
-  ProductStatusDescription["DISCARDED"] = "Discarded";
-})(ProductStatusDescription || (ProductStatusDescription = {}));
-var CloudLevelUnits;
-(function (CloudLevelUnits) {
-  CloudLevelUnits["FT"] = "ft";
-  CloudLevelUnits["M"] = "m";
-})(CloudLevelUnits || (CloudLevelUnits = {}));
-var LevelUnits;
-(function (LevelUnits) {
-  LevelUnits["FT"] = "ft";
-  LevelUnits["M"] = "m";
-  LevelUnits["FL"] = "FL";
-})(LevelUnits || (LevelUnits = {}));
-var Direction;
-(function (Direction) {
-  Direction["N"] = "N";
-  Direction["NNE"] = "NNE";
-  Direction["NE"] = "NE";
-  Direction["ENE"] = "ENE";
-  Direction["E"] = "E";
-  Direction["ESE"] = "ESE";
-  Direction["SE"] = "SE";
-  Direction["SSE"] = "SSE";
-  Direction["S"] = "S";
-  Direction["SSW"] = "SSW";
-  Direction["SW"] = "SW";
-  Direction["WSW"] = "WSW";
-  Direction["W"] = "W";
-  Direction["WNW"] = "WNW";
-  Direction["NW"] = "NW";
-  Direction["NNW"] = "NNW";
-})(Direction || (Direction = {}));
-var isInstanceOfSigmet = function isInstanceOfSigmet(obj) {
-  return 'phenomenon' in obj;
-};
-var isInstanceOfCancelSigmet = function isInstanceOfCancelSigmet(obj) {
-  return 'cancelsSigmetSequenceId' in obj;
-};
-var isInstanceOfAirmet = function isInstanceOfAirmet(obj) {
-  return 'phenomenon' in obj;
-};
-var isInstanceOfCancelAirmet = function isInstanceOfCancelAirmet(obj) {
-  return 'cancelsAirmetSequenceId' in obj;
-};
-var isInstanceOfSigmetOrAirmet = function isInstanceOfSigmetOrAirmet(obj) {
-  return 'phenomenon' in obj;
-};
-var isInstanceOfCancelSigmetOrAirmet = function isInstanceOfCancelSigmetOrAirmet(obj) {
-  return 'cancelsSigmetSequenceId' in obj || 'cancelsAirmetSequenceId' in obj;
-};
-var StartOrEndDrawing;
-(function (StartOrEndDrawing) {
-  StartOrEndDrawing["start"] = "start";
-  StartOrEndDrawing["end"] = "end";
-})(StartOrEndDrawing || (StartOrEndDrawing = {}));
-
 function _OverloadYield(e, d) {
   this.v = e, this.k = d;
 }
@@ -1013,87 +889,217 @@ var safeFetch = /*#__PURE__*/function () {
   };
 }();
 // API
-var getAirmetList = function getAirmetList(auth) {
-  return safeFetch(airmetBaseUrl + "/airmetlist", {
-    headers: getHeaders(auth)
-  });
-};
-var getSigmetList = function getSigmetList(auth) {
-  return safeFetch(sigmetBaseUrl + "/sigmetlist", {
-    headers: getHeaders(auth)
-  });
-};
-var getAirmetConfig = function getAirmetConfig(auth) {
-  return fetch(airmetBaseUrl + "/airmet-config", {
-    headers: getHeaders(auth)
-  }).then(function (result) {
-    return result.json();
-  });
-};
-var getSigmetConfig = function getSigmetConfig(auth) {
-  return fetch(sigmetBaseUrl + "/sigmet-config", {
-    headers: getHeaders(auth)
-  }).then(function (result) {
-    return result.json();
-  });
-};
-var postTAC = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(url, auth, product) {
-    var result, textData;
+var getAirmetList = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(auth) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context2.next = 2;
+          return _context2.abrupt("return", safeFetch(airmetBaseUrl + "/airmetlist", {
+            headers: getHeaders(auth)
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getAirmetList(_x4) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var getSigmetList = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(auth) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", safeFetch(sigmetBaseUrl + "/sigmetlist", {
+            headers: getHeaders(auth)
+          }));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function getSigmetList(_x5) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+var getAirmetConfig = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(auth) {
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          return _context5.abrupt("return", fetch(airmetBaseUrl + "/airmet-config", {
+            headers: getHeaders(auth)
+          }).then(/*#__PURE__*/function () {
+            var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(result) {
+              return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
+                  case 0:
+                    return _context4.abrupt("return", result.json());
+                  case 1:
+                  case "end":
+                    return _context4.stop();
+                }
+              }, _callee4);
+            }));
+            return function (_x7) {
+              return _ref5.apply(this, arguments);
+            };
+          }()));
+        case 1:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return function getAirmetConfig(_x6) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+var getSigmetConfig = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(auth) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          return _context7.abrupt("return", fetch(sigmetBaseUrl + "/sigmet-config", {
+            headers: getHeaders(auth)
+          }).then(/*#__PURE__*/function () {
+            var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(result) {
+              return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                while (1) switch (_context6.prev = _context6.next) {
+                  case 0:
+                    return _context6.abrupt("return", result.json());
+                  case 1:
+                  case "end":
+                    return _context6.stop();
+                }
+              }, _callee6);
+            }));
+            return function (_x9) {
+              return _ref7.apply(this, arguments);
+            };
+          }()));
+        case 1:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
+  return function getSigmetConfig(_x8) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+var postTAC = /*#__PURE__*/function () {
+  var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(url, auth, product) {
+    var result, textData;
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          _context8.next = 2;
           return fetch(url, {
             method: 'POST',
             body: JSON.stringify(product),
             headers: getHeaders(auth)
           });
         case 2:
-          result = _context2.sent;
+          result = _context8.sent;
           if (result.ok) {
-            _context2.next = 5;
+            _context8.next = 5;
             break;
           }
           throw new Error("Failed to fetch TAC data: " + result.statusText);
         case 5:
-          _context2.next = 7;
+          _context8.next = 7;
           return result.text();
         case 7:
-          textData = _context2.sent;
-          return _context2.abrupt("return", {
+          textData = _context8.sent;
+          return _context8.abrupt("return", {
             data: textData
           });
         case 9:
         case "end":
-          return _context2.stop();
+          return _context8.stop();
       }
-    }, _callee2);
+    }, _callee8);
   }));
-  return function postTAC(_x4, _x5, _x6) {
-    return _ref2.apply(this, arguments);
+  return function postTAC(_x0, _x1, _x10) {
+    return _ref8.apply(this, arguments);
+  };
+}();
+var getSigmetTAC = /*#__PURE__*/function () {
+  var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(auth, product) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
+        case 0:
+          return _context9.abrupt("return", postTAC(sigmetBaseUrl + "/sigmet2tac", auth, product));
+        case 1:
+        case "end":
+          return _context9.stop();
+      }
+    }, _callee9);
+  }));
+  return function getSigmetTAC(_x11, _x12) {
+    return _ref9.apply(this, arguments);
+  };
+}();
+var getAirmetTAC = /*#__PURE__*/function () {
+  var _ref0 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(auth, product) {
+    return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+      while (1) switch (_context0.prev = _context0.next) {
+        case 0:
+          return _context0.abrupt("return", postTAC(airmetBaseUrl + "/airmet2tac", auth, product));
+        case 1:
+        case "end":
+          return _context0.stop();
+      }
+    }, _callee0);
+  }));
+  return function getAirmetTAC(_x13, _x14) {
+    return _ref0.apply(this, arguments);
+  };
+}();
+var postSigmet = /*#__PURE__*/function () {
+  var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1(auth, data) {
+    return _regeneratorRuntime().wrap(function _callee1$(_context1) {
+      while (1) switch (_context1.prev = _context1.next) {
+        case 0:
+          return _context1.abrupt("return", fetch(sigmetBaseUrl + "/sigmet", {
+            headers: getHeaders(auth),
+            method: 'POST',
+            body: JSON.stringify(data)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context1.stop();
+      }
+    }, _callee1);
+  }));
+  return function postSigmet(_x15, _x16) {
+    return _ref1.apply(this, arguments);
+  };
+}();
+var postAirmet = /*#__PURE__*/function () {
+  var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(auth, data) {
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          return _context10.abrupt("return", fetch(airmetBaseUrl + "/airmet", {
+            headers: getHeaders(auth),
+            method: 'POST',
+            body: JSON.stringify(data)
+          }).then(handleResponse));
+        case 1:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  }));
+  return function postAirmet(_x17, _x18) {
+    return _ref10.apply(this, arguments);
   };
 }();
-var getSigmetTAC = function getSigmetTAC(auth, product) {
-  return postTAC(sigmetBaseUrl + "/sigmet2tac", auth, product);
-};
-var getAirmetTAC = function getAirmetTAC(auth, product) {
-  return postTAC(airmetBaseUrl + "/airmet2tac", auth, product);
-};
-var postSigmet = function postSigmet(auth, data) {
-  return fetch(sigmetBaseUrl + "/sigmet", {
-    headers: getHeaders(auth),
-    method: 'POST',
-    body: JSON.stringify(data)
-  }).then(handleResponse);
-};
-var postAirmet = function postAirmet(auth, data) {
-  return fetch(airmetBaseUrl + "/airmet", {
-    headers: getHeaders(auth),
-    method: 'POST',
-    body: JSON.stringify(data)
-  }).then(handleResponse);
-};
 
 var useAirmetList = function useAirmetList(disabled) {
   if (disabled === void 0) {
@@ -1116,24 +1122,78 @@ var useTACApi = function useTACApi() {
   var _useAuthenticationCon = useAuthenticationContext(),
     auth = _useAuthenticationCon.auth;
   var queryClient = useQueryClient();
-  var fetchSigmetTAC = function fetchSigmetTAC(product) {
-    return queryClient.fetchQuery({
-      queryKey: ['sigmet-tac', product],
-      queryFn: function queryFn() {
-        return getSigmetTAC(auth, product);
-      },
-      staleTime: 1000 * 15
-    });
-  };
-  var fetchAirmetTAC = function fetchAirmetTAC(product) {
-    return queryClient.fetchQuery({
-      queryKey: ['airmet-tac', product],
-      queryFn: function queryFn() {
-        return getAirmetTAC(auth, product);
-      },
-      staleTime: 1000 * 15
-    });
-  };
+  var fetchSigmetTAC = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(product) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", queryClient.fetchQuery({
+              queryKey: ['sigmet-tac', product],
+              queryFn: function () {
+                var _queryFn = _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", getSigmetTAC(auth, product));
+                      case 1:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                function queryFn() {
+                  return _queryFn.apply(this, arguments);
+                }
+                return queryFn;
+              }(),
+              staleTime: 1000 * 15
+            }));
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function fetchSigmetTAC(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var fetchAirmetTAC = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(product) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            return _context4.abrupt("return", queryClient.fetchQuery({
+              queryKey: ['airmet-tac', product],
+              queryFn: function () {
+                var _queryFn2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
+                      case 0:
+                        return _context3.abrupt("return", getAirmetTAC(auth, product));
+                      case 1:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }, _callee3);
+                }));
+                function queryFn() {
+                  return _queryFn2.apply(this, arguments);
+                }
+                return queryFn;
+              }(),
+              staleTime: 1000 * 15
+            }));
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function fetchAirmetTAC(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   return {
     fetchSigmetTAC: fetchSigmetTAC,
     fetchAirmetTAC: fetchAirmetTAC
@@ -1144,31 +1204,48 @@ var usePostSigmet = function usePostSigmet() {
     auth = _useAuthenticationCon2.auth;
   var queryClient = useQueryClient();
   return useMutation({
-    mutationFn: function mutationFn(formData) {
-      if (!auth) {
-        throw new Error('Authentication context not found');
+    mutationFn: function () {
+      var _mutationFn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(formData) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (auth) {
+                _context5.next = 2;
+                break;
+              }
+              throw new Error('Authentication context not found');
+            case 2:
+              return _context5.abrupt("return", postSigmet(auth, formData));
+            case 3:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }));
+      function mutationFn(_x3) {
+        return _mutationFn.apply(this, arguments);
       }
-      return postSigmet(auth, formData);
-    },
+      return mutationFn;
+    }(),
     onError: function onError() {
       void queryClient.invalidateQueries({
         queryKey: ['sigmet']
       });
     },
     onSuccess: function () {
-      var _onSuccess = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _onSuccess = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context.next = 2;
+              _context6.next = 2;
               return queryClient.invalidateQueries({
                 queryKey: ['sigmet-list']
               });
             case 2:
             case "end":
-              return _context.stop();
+              return _context6.stop();
           }
-        }, _callee);
+        }, _callee6);
       }));
       function onSuccess() {
         return _onSuccess.apply(this, arguments);
@@ -1182,31 +1259,48 @@ var usePostAirmet = function usePostAirmet() {
     auth = _useAuthenticationCon3.auth;
   var queryClient = useQueryClient();
   return useMutation({
-    mutationFn: function mutationFn(formData) {
-      if (!auth) {
-        throw new Error('Authentication context not found');
+    mutationFn: function () {
+      var _mutationFn2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              if (auth) {
+                _context7.next = 2;
+                break;
+              }
+              throw new Error('Authentication context not found');
+            case 2:
+              return _context7.abrupt("return", postAirmet(auth, formData));
+            case 3:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      }));
+      function mutationFn(_x4) {
+        return _mutationFn2.apply(this, arguments);
       }
-      return postAirmet(auth, formData);
-    },
+      return mutationFn;
+    }(),
     onError: function onError() {
       void queryClient.invalidateQueries({
         queryKey: ['airmet']
       });
     },
     onSuccess: function () {
-      var _onSuccess2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _onSuccess2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context2.next = 2;
+              _context8.next = 2;
               return queryClient.invalidateQueries({
                 queryKey: ['airmet-list']
               });
             case 2:
             case "end":
-              return _context2.stop();
+              return _context8.stop();
           }
-        }, _callee2);
+        }, _callee8);
       }));
       function onSuccess() {
         return _onSuccess2.apply(this, arguments);
@@ -1262,6 +1356,133 @@ var useShortTestHelpers = function useShortTestHelpers() {
   };
 };
 
+/**
+ * The possible type for the airmet
+ */
+var AirmetType;
+(function (AirmetType) {
+  AirmetType["NORMAL"] = "Normal";
+  AirmetType["TEST"] = "Test";
+  AirmetType["EXERCISE"] = "Exercise";
+})(AirmetType || (AirmetType = {}));
+/**
+ * The possible type for the sigmet
+ */
+var SigmetType;
+(function (SigmetType) {
+  SigmetType["NORMAL"] = "Normal";
+  SigmetType["TEST"] = "Test";
+  SigmetType["EXERCISE"] = "Exercise";
+  SigmetType["SHORT_TEST"] = "Short test";
+  SigmetType["SHORT_VA_TEST"] = "Short VA test";
+})(SigmetType || (SigmetType = {}));
+var VisibilityCause;
+(function (VisibilityCause) {
+  VisibilityCause["DZ"] = "Drizzle";
+  VisibilityCause["DU"] = "Dust";
+  VisibilityCause["PO"] = "Dust or sand devil";
+  VisibilityCause["DS"] = "Dust storm";
+  VisibilityCause["FG"] = "Fog";
+  VisibilityCause["FC"] = "Funnel clouds";
+  VisibilityCause["GR"] = "Hail";
+  VisibilityCause["HZ"] = "Haze";
+  VisibilityCause["PL"] = "Ice pellets";
+  VisibilityCause["BR"] = "Mist";
+  VisibilityCause["RA"] = "Rain";
+  VisibilityCause["SA"] = "Sand";
+  VisibilityCause["SS"] = "Sand storm";
+  VisibilityCause["FU"] = "Smoke";
+  VisibilityCause["SN"] = "Snow";
+  VisibilityCause["SG"] = "Snow grains";
+  VisibilityCause["GS"] = "Soft hail";
+  VisibilityCause["SQ"] = "Squalls";
+  VisibilityCause["VA"] = "Volcanic Ash";
+})(VisibilityCause || (VisibilityCause = {}));
+/* Speed unit, e.g. 'KT', 'KMH' */
+var MovementUnit;
+(function (MovementUnit) {
+  MovementUnit["KT"] = "kt";
+  MovementUnit["KMH"] = "kmh";
+})(MovementUnit || (MovementUnit = {}));
+var WindUnit;
+(function (WindUnit) {
+  WindUnit["KT"] = "kt";
+  WindUnit["MPS"] = "mps";
+})(WindUnit || (WindUnit = {}));
+var ProductAction;
+(function (ProductAction) {
+  ProductAction["PUBLISH"] = "PUBLISH";
+  ProductAction["CANCEL"] = "CANCEL";
+  ProductAction["RENEW"] = "RENEW";
+  ProductAction["AMEND"] = "AMEND";
+  ProductAction["SAVE"] = "SAVE";
+  ProductAction["DISCARD"] = "DISCARD";
+  ProductAction["DUPLICATE"] = "DUPLICATE";
+  ProductAction["CLOSE"] = "CLOSE";
+})(ProductAction || (ProductAction = {}));
+var ProductStatusDescription;
+(function (ProductStatusDescription) {
+  ProductStatusDescription["DRAFT"] = "Draft";
+  ProductStatusDescription["PUBLISHED"] = "Published";
+  ProductStatusDescription["CANCELLED"] = "Cancelled";
+  ProductStatusDescription["EXPIRED"] = "Expired";
+  ProductStatusDescription["RENEWED"] = "Renewed";
+  ProductStatusDescription["DISCARDED"] = "Discarded";
+})(ProductStatusDescription || (ProductStatusDescription = {}));
+var CloudLevelUnits;
+(function (CloudLevelUnits) {
+  CloudLevelUnits["FT"] = "ft";
+  CloudLevelUnits["M"] = "m";
+})(CloudLevelUnits || (CloudLevelUnits = {}));
+var LevelUnits;
+(function (LevelUnits) {
+  LevelUnits["FT"] = "ft";
+  LevelUnits["M"] = "m";
+  LevelUnits["FL"] = "FL";
+})(LevelUnits || (LevelUnits = {}));
+var Direction;
+(function (Direction) {
+  Direction["N"] = "N";
+  Direction["NNE"] = "NNE";
+  Direction["NE"] = "NE";
+  Direction["ENE"] = "ENE";
+  Direction["E"] = "E";
+  Direction["ESE"] = "ESE";
+  Direction["SE"] = "SE";
+  Direction["SSE"] = "SSE";
+  Direction["S"] = "S";
+  Direction["SSW"] = "SSW";
+  Direction["SW"] = "SW";
+  Direction["WSW"] = "WSW";
+  Direction["W"] = "W";
+  Direction["WNW"] = "WNW";
+  Direction["NW"] = "NW";
+  Direction["NNW"] = "NNW";
+})(Direction || (Direction = {}));
+var isInstanceOfSigmet = function isInstanceOfSigmet(obj) {
+  return 'phenomenon' in obj;
+};
+var isInstanceOfCancelSigmet = function isInstanceOfCancelSigmet(obj) {
+  return 'cancelsSigmetSequenceId' in obj;
+};
+var isInstanceOfAirmet = function isInstanceOfAirmet(obj) {
+  return 'phenomenon' in obj;
+};
+var isInstanceOfCancelAirmet = function isInstanceOfCancelAirmet(obj) {
+  return 'cancelsAirmetSequenceId' in obj;
+};
+var isInstanceOfSigmetOrAirmet = function isInstanceOfSigmetOrAirmet(obj) {
+  return 'phenomenon' in obj;
+};
+var isInstanceOfCancelSigmetOrAirmet = function isInstanceOfCancelSigmetOrAirmet(obj) {
+  return 'cancelsSigmetSequenceId' in obj || 'cancelsAirmetSequenceId' in obj;
+};
+var StartOrEndDrawing;
+(function (StartOrEndDrawing) {
+  StartOrEndDrawing["start"] = "start";
+  StartOrEndDrawing["end"] = "end";
+})(StartOrEndDrawing || (StartOrEndDrawing = {}));
+
 var location_indicator_mwo$1 = "EHDB";
 var fir_areas$1 = {
 	EHAA: {
@@ -1409,28 +1630,43 @@ var fir_areas$1 = {
 		},
 		location_indicator_atsr: "EHAA",
 		location_indicator_atsu: "EHAA",
-		area_preset: "NL_FIR",
 		max_hours_of_validity: 4,
 		hours_before_validity: 4,
-		tc_max_hours_of_validity: 6,
-		tc_hours_before_validity: 12,
-		va_max_hours_of_validity: 6,
-		va_hours_before_validity: 12,
-		adjacent_firs: [
-			"EKDK",
-			"EDWW",
-			"EDGG",
-			"EBBU",
-			"EGTT",
-			"EGPX"
-		],
+		cloud_lower_level_min: {
+			FT: 100
+		},
+		cloud_lower_level_max: {
+			FT: 900
+		},
+		cloud_level_min: {
+			FT: 100
+		},
+		cloud_level_max: {
+			FT: 9900
+		},
+		cloud_level_rounding_ft: 100,
+		cloud_level_rounding_m_below: 30,
+		cloud_level_rounding_m_above: 300,
+		wind_direction_rounding: 10,
+		wind_speed_min: {
+			KT: 31,
+			MPS: 0
+		},
+		wind_speed_max: {
+			KT: 199,
+			MPS: 99
+		},
+		visibility_max: 4900,
+		visibility_min: 0,
+		visibility_rounding_below: 50,
+		visibility_rounding_above: 100,
 		level_min: {
 			FT: 500,
 			FL: 50
 		},
 		level_max: {
 			FT: 4500,
-			FL: 650
+			FL: 100
 		},
 		level_rounding_FL: 5,
 		level_rounding_FT: 500,
@@ -1448,68 +1684,76 @@ var fir_areas$1 = {
 		max_polygon_points: 7,
 		phenomenon: [
 			{
-				code: "EMBD_TS",
-				description: "Embedded thunderstorm(s)"
+				code: "SFC_VIS",
+				description: "Surface visibility"
 			},
 			{
-				code: "EMBD_TSGR",
-				description: "Embedded thunderstorm(s) with hail"
+				code: "SFC_WIND",
+				description: "Surface wind"
 			},
 			{
-				code: "FRQ_TS",
-				description: "Frequent thunderstorm(s)"
+				code: "OVC_CLD",
+				description: "Overcast cloud"
 			},
 			{
-				code: "FRQ_TSGR",
-				description: "Frequent thunderstorm(s) with hail"
+				code: "BKN_CLD",
+				description: "Broken cloud"
 			},
 			{
-				code: "HVY_DS",
-				description: "Heavy duststorm"
+				code: "ISOL_CB",
+				description: "Isolated cumulonimbus cloud"
 			},
 			{
-				code: "HVY_SS",
-				description: "Heavy sandstorm"
+				code: "OCNL_CB",
+				description: "Occasional cumulonimbus cloud"
 			},
 			{
-				code: "OBSC_TS",
-				description: "Obscured thunderstorm(s)"
+				code: "FRQ_CB",
+				description: "Frequent cumulonimbus cloud"
 			},
 			{
-				code: "OBSC_TSGR",
-				description: "Obscured thunderstorm(s) with hail"
+				code: "ISOL_TS",
+				description: "Isolated thunderstorm(s)"
 			},
 			{
-				code: "RDOACT_CLD",
-				description: "Radioactive cloud"
+				code: "OCNL_TS",
+				description: "Occasional thunderstorm(s)"
 			},
 			{
-				code: "SEV_ICE",
-				description: "Severe icing"
+				code: "ISOL_TSGR",
+				description: "Isolated thunderstorm(s) with hail"
 			},
 			{
-				code: "SEV_ICE_FRZ_RN",
-				description: "Severe icing due to freezing rain"
+				code: "OCNL_TSGR",
+				description: "Occasional thunderstorm(s) with hail"
 			},
 			{
-				code: "SEV_MTW",
-				description: "Severe mountain wave"
+				code: "ISOL_TCU",
+				description: "Isolated towering cumulus cloud"
 			},
 			{
-				code: "SEV_TURB",
-				description: "Severe turbulence"
+				code: "OCNL_TCU",
+				description: "Occasional towering cumulus cloud"
 			},
 			{
-				code: "SQL_TS",
-				description: "Squall line thunderstorm(s)"
+				code: "FRQ_TCU",
+				description: "Frequent towering cumulus cloud"
 			},
 			{
-				code: "SQL_TSGR",
-				description: "Squall line thunderstorm(s) with hail"
+				code: "MOD_ICE",
+				description: "Moderate icing"
 			},
 			{
-				code: "VA_CLD",
-				description: "Volcanic ash cloud"
+				code: "MOD_MTW",
+				description: "Moderate mountain wave"
+			},
+			{
+				code: "MOD_TURB",
+				description: "Moderate turbulence"
+			},
+			{
+				code: "MT_OBSC",
+				description: "Mountains obscured"
 			}
 		],
 		units: [
@@ -1525,6 +1769,18 @@ var fir_areas$1 = {
 				allowed_units: [
 					"KT"
 				]
+			},
+			{
+				unit_type: "surfacewind_unit",
+				allowed_units: [
+					"KT"
+				]
+			},
+			{
+				unit_type: "cloud_level_unit",
+				allowed_units: [
+					"FT"
+				]
 			}
 		]
 	},
@@ -2749,88 +3005,83 @@ var fir_areas$1 = {
 		},
 		location_indicator_atsr: "EZZZ",
 		location_indicator_atsu: "EZZZ",
-		area_preset: "NL_FIR",
 		max_hours_of_validity: 4,
 		hours_before_validity: 4,
-		tc_max_hours_of_validity: 6,
-		tc_hours_before_validity: 12,
-		va_max_hours_of_validity: 6,
-		va_hours_before_validity: 12,
-		movement_rounding_kt: 20,
-		movement_rounding_kmh: 30,
+		movement_rounding_kt: 5,
+		movement_rounding_kmh: 10,
 		max_polygon_points: 20,
-		adjacent_firs: [
-			"EKDK",
-			"EDWW",
-			"EDGG",
-			"EBBU",
-			"EGTT",
-			"EGPX"
-		],
 		phenomenon: [
 			{
-				code: "EMBD_TS",
-				description: "Embedded thunderstorm(s)"
+				code: "SFC_VIS",
+				description: "Surface visibility"
 			},
 			{
-				code: "EMBD_TSGR",
-				description: "Embedded thunderstorm(s) with hail"
+				code: "SFC_WIND",
+				description: "Surface wind"
 			},
 			{
-				code: "FRQ_TS",
-				description: "Frequent thunderstorm(s)"
+				code: "OVC_CLD",
+				description: "Overcast cloud"
 			},
 			{
-				code: "FRQ_TSGR",
-				description: "Frequent thunderstorm(s) with hail"
+				code: "BKN_CLD",
+				description: "Broken cloud"
 			},
 			{
-				code: "HVY_DS",
-				description: "Heavy duststorm"
+				code: "ISOL_CB",
+				description: "Isolated cumulonimbus cloud"
 			},
 			{
-				code: "HVY_SS",
-				description: "Heavy sandstorm"
+				code: "OCNL_CB",
+				description: "Occasional cumulonimbus cloud"
 			},
 			{
-				code: "OBSC_TS",
-				description: "Obscured thunderstorm(s)"
+				code: "FRQ_CB",
+				description: "Frequent cumulonimbus cloud"
 			},
 			{
-				code: "OBSC_TSGR",
-				description: "Obscured thunderstorm(s) with hail"
+				code: "ISOL_TS",
+				description: "Isolated thunderstorm(s)"
 			},
 			{
-				code: "RDOACT_CLD",
-				description: "Radioactive cloud"
+				code: "OCNL_TS",
+				description: "Occasional thunderstorm(s)"
 			},
 			{
-				code: "SEV_ICE",
-				description: "Severe icing"
+				code: "ISOL_TSGR",
+				description: "Isolated thunderstorm(s) with hail"
 			},
 			{
-				code: "SEV_ICE_FRZ_RN",
-				description: "Severe icing due to freezing rain"
+				code: "OCNL_TSGR",
+				description: "Occasional thunderstorm(s) with hail"
 			},
 			{
-				code: "SEV_MTW",
-				description: "Severe mountain wave"
+				code: "ISOL_TCU",
+				description: "Isolated towering cumulus cloud"
 			},
 			{
-				code: "SEV_TURB",
-				description: "Severe turbulence"
+				code: "OCNL_TCU",
+				description: "Occasional towering cumulus cloud"
 			},
 			{
-				code: "SQL_TS",
-				description: "Squall line thunderstorm(s)"
+				code: "FRQ_TCU",
+				description: "Frequent towering cumulus cloud"
 			},
 			{
-				code: "SQL_TSGR",
-				description: "Squall line thunderstorm(s) with hail"
+				code: "MOD_ICE",
+				description: "Moderate icing"
 			},
 			{
-				code: "VA_CLD",
-				description: "Volcanic ash cloud"
+				code: "MOD_MTW",
+				description: "Moderate mountain wave"
+			},
+			{
+				code: "MOD_TURB",
+				description: "Moderate turbulence"
+			},
+			{
+				code: "MT_OBSC",
+				description: "Mountains obscured"
 			}
 		],
 		units: [
@@ -2847,12 +3098,24 @@ var fir_areas$1 = {
 					"KT",
 					"KMH"
 				]
+			},
+			{
+				unit_type: "surfacewind_unit",
+				allowed_units: [
+					"KT"
+				]
+			},
+			{
+				unit_type: "cloud_level_unit",
+				allowed_units: [
+					"FT"
+				]
 			}
 		]
 	}
 };
 var valid_from_delay_minutes$1 = 30;
-var default_validity_minutes$1 = 180;
+var default_validity_minutes$1 = 60;
 var active_firs$1 = [
 	"EHAA",
 	"EZZZ"
@@ -2860,13 +3123,13 @@ var active_firs$1 = [
 var mapPreset$1 = {
 	layers: [
 		{
-			id: "baseLayer-sigmet",
+			id: "baseLayer-airmet",
 			name: "WorldMap_Light_Grey_Canvas",
 			type: "twms",
 			layerType: "baseLayer"
 		},
 		{
-			id: "countryborder-sigmet",
+			id: "countryborder-airmet",
 			name: "countryborders",
 			layerType: "overLayer",
 			format: "image/png",
@@ -2874,7 +3137,7 @@ var mapPreset$1 = {
 			service: "https://geoservices.knmi.nl/wms?DATASET=baselayers&"
 		},
 		{
-			id: "northseastations-sigmet",
+			id: "northseastations-airmet",
 			name: "northseastations",
 			layerType: "overLayer",
 			service: "https://adaguc-server-geoweb.geoweb.knmi.cloud/adagucserver?dataset=OVL",
@@ -2882,7 +3145,7 @@ var mapPreset$1 = {
 			enabled: true
 		},
 		{
-			id: "airports-sigmet",
+			id: "airports-airmet",
 			name: "airports",
 			layerType: "overLayer",
 			service: "https://adaguc-server-geoweb.geoweb.knmi.cloud/adagucserver?dataset=OVL",
@@ -2900,7 +3163,7 @@ var mapPreset$1 = {
 		srs: "EPSG:3857"
 	}
 };
-var sigmetDefaultConfig = {
+var airmetDefaultConfig = {
 	location_indicator_mwo: location_indicator_mwo$1,
 	fir_areas: fir_areas$1,
 	valid_from_delay_minutes: valid_from_delay_minutes$1,
@@ -3056,43 +3319,28 @@ var fir_areas = {
 		},
 		location_indicator_atsr: "EHAA",
 		location_indicator_atsu: "EHAA",
+		area_preset: "NL_FIR",
 		max_hours_of_validity: 4,
 		hours_before_validity: 4,
-		cloud_lower_level_min: {
-			FT: 100
-		},
-		cloud_lower_level_max: {
-			FT: 900
-		},
-		cloud_level_min: {
-			FT: 100
-		},
-		cloud_level_max: {
-			FT: 9900
-		},
-		cloud_level_rounding_ft: 100,
-		cloud_level_rounding_m_below: 30,
-		cloud_level_rounding_m_above: 300,
-		wind_direction_rounding: 10,
-		wind_speed_min: {
-			KT: 31,
-			MPS: 0
-		},
-		wind_speed_max: {
-			KT: 199,
-			MPS: 99
-		},
-		visibility_max: 4900,
-		visibility_min: 0,
-		visibility_rounding_below: 50,
-		visibility_rounding_above: 100,
+		tc_max_hours_of_validity: 6,
+		tc_hours_before_validity: 12,
+		va_max_hours_of_validity: 6,
+		va_hours_before_validity: 12,
+		adjacent_firs: [
+			"EKDK",
+			"EDWW",
+			"EDGG",
+			"EBBU",
+			"EGTT",
+			"EGPX"
+		],
 		level_min: {
 			FT: 500,
 			FL: 50
 		},
 		level_max: {
 			FT: 4500,
-			FL: 100
+			FL: 650
 		},
 		level_rounding_FL: 5,
 		level_rounding_FT: 500,
@@ -3110,76 +3358,68 @@ var fir_areas = {
 		max_polygon_points: 7,
 		phenomenon: [
 			{
-				code: "SFC_VIS",
-				description: "Surface visibility"
-			},
-			{
-				code: "SFC_WIND",
-				description: "Surface wind"
-			},
-			{
-				code: "OVC_CLD",
-				description: "Overcast cloud"
+				code: "EMBD_TS",
+				description: "Embedded thunderstorm(s)"
 			},
 			{
-				code: "BKN_CLD",
-				description: "Broken cloud"
+				code: "EMBD_TSGR",
+				description: "Embedded thunderstorm(s) with hail"
 			},
 			{
-				code: "ISOL_CB",
-				description: "Isolated cumulonimbus cloud"
+				code: "FRQ_TS",
+				description: "Frequent thunderstorm(s)"
 			},
 			{
-				code: "OCNL_CB",
-				description: "Occasional cumulonimbus cloud"
+				code: "FRQ_TSGR",
+				description: "Frequent thunderstorm(s) with hail"
 			},
 			{
-				code: "FRQ_CB",
-				description: "Frequent cumulonimbus cloud"
+				code: "HVY_DS",
+				description: "Heavy duststorm"
 			},
 			{
-				code: "ISOL_TS",
-				description: "Isolated thunderstorm(s)"
+				code: "HVY_SS",
+				description: "Heavy sandstorm"
 			},
 			{
-				code: "OCNL_TS",
-				description: "Occasional thunderstorm(s)"
+				code: "OBSC_TS",
+				description: "Obscured thunderstorm(s)"
 			},
 			{
-				code: "ISOL_TSGR",
-				description: "Isolated thunderstorm(s) with hail"
+				code: "OBSC_TSGR",
+				description: "Obscured thunderstorm(s) with hail"
 			},
 			{
-				code: "OCNL_TSGR",
-				description: "Occasional thunderstorm(s) with hail"
+				code: "RDOACT_CLD",
+				description: "Radioactive cloud"
 			},
 			{
-				code: "ISOL_TCU",
-				description: "Isolated towering cumulus cloud"
+				code: "SEV_ICE",
+				description: "Severe icing"
 			},
 			{
-				code: "OCNL_TCU",
-				description: "Occasional towering cumulus cloud"
+				code: "SEV_ICE_FRZ_RN",
+				description: "Severe icing due to freezing rain"
 			},
 			{
-				code: "FRQ_TCU",
-				description: "Frequent towering cumulus cloud"
+				code: "SEV_MTW",
+				description: "Severe mountain wave"
 			},
 			{
-				code: "MOD_ICE",
-				description: "Moderate icing"
+				code: "SEV_TURB",
+				description: "Severe turbulence"
 			},
 			{
-				code: "MOD_MTW",
-				description: "Moderate mountain wave"
+				code: "SQL_TS",
+				description: "Squall line thunderstorm(s)"
 			},
 			{
-				code: "MOD_TURB",
-				description: "Moderate turbulence"
+				code: "SQL_TSGR",
+				description: "Squall line thunderstorm(s) with hail"
 			},
 			{
-				code: "MT_OBSC",
-				description: "Mountains obscured"
+				code: "VA_CLD",
+				description: "Volcanic ash cloud"
 			}
 		],
 		units: [
@@ -3195,18 +3435,6 @@ var fir_areas = {
 				allowed_units: [
 					"KT"
 				]
-			},
-			{
-				unit_type: "surfacewind_unit",
-				allowed_units: [
-					"KT"
-				]
-			},
-			{
-				unit_type: "cloud_level_unit",
-				allowed_units: [
-					"FT"
-				]
 			}
 		]
 	},
@@ -4431,83 +4659,88 @@ var fir_areas = {
 		},
 		location_indicator_atsr: "EZZZ",
 		location_indicator_atsu: "EZZZ",
+		area_preset: "NL_FIR",
 		max_hours_of_validity: 4,
 		hours_before_validity: 4,
-		movement_rounding_kt: 5,
-		movement_rounding_kmh: 10,
+		tc_max_hours_of_validity: 6,
+		tc_hours_before_validity: 12,
+		va_max_hours_of_validity: 6,
+		va_hours_before_validity: 12,
+		movement_rounding_kt: 20,
+		movement_rounding_kmh: 30,
 		max_polygon_points: 20,
+		adjacent_firs: [
+			"EKDK",
+			"EDWW",
+			"EDGG",
+			"EBBU",
+			"EGTT",
+			"EGPX"
+		],
 		phenomenon: [
 			{
-				code: "SFC_VIS",
-				description: "Surface visibility"
-			},
-			{
-				code: "SFC_WIND",
-				description: "Surface wind"
-			},
-			{
-				code: "OVC_CLD",
-				description: "Overcast cloud"
+				code: "EMBD_TS",
+				description: "Embedded thunderstorm(s)"
 			},
 			{
-				code: "BKN_CLD",
-				description: "Broken cloud"
+				code: "EMBD_TSGR",
+				description: "Embedded thunderstorm(s) with hail"
 			},
 			{
-				code: "ISOL_CB",
-				description: "Isolated cumulonimbus cloud"
+				code: "FRQ_TS",
+				description: "Frequent thunderstorm(s)"
 			},
 			{
-				code: "OCNL_CB",
-				description: "Occasional cumulonimbus cloud"
+				code: "FRQ_TSGR",
+				description: "Frequent thunderstorm(s) with hail"
 			},
 			{
-				code: "FRQ_CB",
-				description: "Frequent cumulonimbus cloud"
+				code: "HVY_DS",
+				description: "Heavy duststorm"
 			},
 			{
-				code: "ISOL_TS",
-				description: "Isolated thunderstorm(s)"
+				code: "HVY_SS",
+				description: "Heavy sandstorm"
 			},
 			{
-				code: "OCNL_TS",
-				description: "Occasional thunderstorm(s)"
+				code: "OBSC_TS",
+				description: "Obscured thunderstorm(s)"
 			},
 			{
-				code: "ISOL_TSGR",
-				description: "Isolated thunderstorm(s) with hail"
+				code: "OBSC_TSGR",
+				description: "Obscured thunderstorm(s) with hail"
 			},
 			{
-				code: "OCNL_TSGR",
-				description: "Occasional thunderstorm(s) with hail"
+				code: "RDOACT_CLD",
+				description: "Radioactive cloud"
 			},
 			{
-				code: "ISOL_TCU",
-				description: "Isolated towering cumulus cloud"
+				code: "SEV_ICE",
+				description: "Severe icing"
 			},
 			{
-				code: "OCNL_TCU",
-				description: "Occasional towering cumulus cloud"
+				code: "SEV_ICE_FRZ_RN",
+				description: "Severe icing due to freezing rain"
 			},
 			{
-				code: "FRQ_TCU",
-				description: "Frequent towering cumulus cloud"
+				code: "SEV_MTW",
+				description: "Severe mountain wave"
 			},
 			{
-				code: "MOD_ICE",
-				description: "Moderate icing"
+				code: "SEV_TURB",
+				description: "Severe turbulence"
 			},
 			{
-				code: "MOD_MTW",
-				description: "Moderate mountain wave"
+				code: "SQL_TS",
+				description: "Squall line thunderstorm(s)"
 			},
 			{
-				code: "MOD_TURB",
-				description: "Moderate turbulence"
+				code: "SQL_TSGR",
+				description: "Squall line thunderstorm(s) with hail"
 			},
 			{
-				code: "MT_OBSC",
-				description: "Mountains obscured"
+				code: "VA_CLD",
+				description: "Volcanic ash cloud"
 			}
 		],
 		units: [
@@ -4524,24 +4757,12 @@ var fir_areas = {
 					"KT",
 					"KMH"
 				]
-			},
-			{
-				unit_type: "surfacewind_unit",
-				allowed_units: [
-					"KT"
-				]
-			},
-			{
-				unit_type: "cloud_level_unit",
-				allowed_units: [
-					"FT"
-				]
 			}
 		]
 	}
 };
 var valid_from_delay_minutes = 30;
-var default_validity_minutes = 60;
+var default_validity_minutes = 180;
 var active_firs = [
 	"EHAA",
 	"EZZZ"
@@ -4549,13 +4770,13 @@ var active_firs = [
 var mapPreset = {
 	layers: [
 		{
-			id: "baseLayer-airmet",
+			id: "baseLayer-sigmet",
 			name: "WorldMap_Light_Grey_Canvas",
 			type: "twms",
 			layerType: "baseLayer"
 		},
 		{
-			id: "countryborder-airmet",
+			id: "countryborder-sigmet",
 			name: "countryborders",
 			layerType: "overLayer",
 			format: "image/png",
@@ -4563,7 +4784,7 @@ var mapPreset = {
 			service: "https://geoservices.knmi.nl/wms?DATASET=baselayers&"
 		},
 		{
-			id: "northseastations-airmet",
+			id: "northseastations-sigmet",
 			name: "northseastations",
 			layerType: "overLayer",
 			service: "https://adaguc-server-geoweb.geoweb.knmi.cloud/adagucserver?dataset=OVL",
@@ -4571,7 +4792,7 @@ var mapPreset = {
 			enabled: true
 		},
 		{
-			id: "airports-airmet",
+			id: "airports-sigmet",
 			name: "airports",
 			layerType: "overLayer",
 			service: "https://adaguc-server-geoweb.geoweb.knmi.cloud/adagucserver?dataset=OVL",
@@ -4589,7 +4810,7 @@ var mapPreset = {
 		srs: "EPSG:3857"
 	}
 };
-var airmetDefaultConfig = {
+var sigmetDefaultConfig = {
 	location_indicator_mwo: location_indicator_mwo,
 	fir_areas: fir_areas,
 	valid_from_delay_minutes: valid_from_delay_minutes,
@@ -4807,34 +5028,11 @@ var styles$2 = {
   }
 };
 
-var _excluded$1 = ["value", "label", "disabled"];
-// A version of a radio button with label where the label and surrounding white space is not clickable
-var RadioButtonAndLabel = function RadioButtonAndLabel(props) {
-  var value = props.value,
-    label = props.label,
-    _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? true : _props$disabled,
-    restProps = _objectWithoutPropertiesLoose(props, _excluded$1);
-  return jsx(FormControlLabel, Object.assign({
-    style: {
-      pointerEvents: 'none'
-    },
-    value: value,
-    control: jsx(Radio, {
-      style: {
-        pointerEvents: 'auto'
-      }
-    }),
-    label: label,
-    disabled: disabled
-  }, restProps));
-};
-
-var _excluded = ["title", "children"];
+var _excluded$1 = ["title", "children"];
 var ProductFormFieldLayout = function ProductFormFieldLayout(_ref) {
   var title = _ref.title,
     children = _ref.children,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   return jsxs(Grid, Object.assign({
     container: true,
     spacing: 3
@@ -4843,9 +5041,9 @@ var ProductFormFieldLayout = function ProductFormFieldLayout(_ref) {
       container: true,
       justifyContent: "flex-end",
       size: 4,
-      children: title && jsx(Typography, {
-        variant: "subtitle1",
+      children: !!title && jsx(Typography, {
         sx: styles$2.label,
+        variant: "subtitle1",
         children: title
       })
     }), jsx(Grid, {
@@ -4857,6 +5055,29 @@ var ProductFormFieldLayout = function ProductFormFieldLayout(_ref) {
   }));
 };
 
+var _excluded = ["value", "label", "disabled"];
+// A version of a radio button with label where the label and surrounding white space is not clickable
+var RadioButtonAndLabel = function RadioButtonAndLabel(props) {
+  var value = props.value,
+    label = props.label,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? true : _props$disabled,
+    restProps = _objectWithoutPropertiesLoose(props, _excluded);
+  return jsx(FormControlLabel, Object.assign({
+    control: jsx(Radio, {
+      style: {
+        pointerEvents: 'auto'
+      }
+    }),
+    disabled: disabled,
+    label: label,
+    style: {
+      pointerEvents: 'none'
+    },
+    value: value
+  }, restProps));
+};
+
 var Change = function Change(_ref) {
   var isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly;
@@ -4871,7 +5092,6 @@ var Change = function Change(_ref) {
   };
   var fieldsDisabled = isDisabled || isShortTest();
   return jsx(ProductFormFieldLayout, {
-    title: t('change'),
     sx: {
       '.MuiButtonBase-root.MuiRadio-root': {
         padding: '6px',
@@ -4882,30 +5102,31 @@ var Change = function Change(_ref) {
       },
       marginTop: -1
     },
+    title: t('change'),
     children: jsxs(ReactHookFormRadioGroup, {
+      disabled: fieldsDisabled,
+      isReadOnly: isReadOnly,
       name: "change",
       rules: {
         validate: {
           isRequired: isRequired
         }
       },
-      disabled: fieldsDisabled,
-      isReadOnly: isReadOnly,
       children: [jsx(RadioButtonAndLabel, {
-        value: "WKN",
-        label: t('weakening'),
+        "data-testid": "change-WKN",
         disabled: fieldsDisabled,
-        "data-testid": "change-WKN"
+        label: t('weakening'),
+        value: "WKN"
       }), jsx(RadioButtonAndLabel, {
-        value: "NC",
-        label: t('no-change'),
+        "data-testid": "change-NC",
         disabled: fieldsDisabled,
-        "data-testid": "change-NC"
+        label: t('no-change'),
+        value: "NC"
       }), jsx(RadioButtonAndLabel, {
-        value: "INTSF",
-        label: t('intensifying'),
+        "data-testid": "change-INTSF",
         disabled: fieldsDisabled,
-        "data-testid": "change-INTSF"
+        label: t('intensifying'),
+        value: "INTSF"
       })]
     })
   });
@@ -5001,28 +5222,28 @@ var getMinCloudLevelValue = function getMinCloudLevelValue(unit, selectedFIR, pr
   var _getActiveFIRArea2 = getActiveFIRArea(selectedFIR, productConfig),
     cloud_level_min = _getActiveFIRArea2.cloud_level_min;
   // Return min value for selected unit - if not present in list, return 0 as we cannot go below the surface
-  return cloud_level_min !== undefined && cloud_level_min[unit] ? cloud_level_min[unit] : DEFAULT_MINIMUM_SURFACE_LEVEL;
+  return cloud_level_min != null && cloud_level_min[unit] ? cloud_level_min[unit] : DEFAULT_MINIMUM_SURFACE_LEVEL;
 };
 var getMinCloudLowerLevelValue = function getMinCloudLowerLevelValue(unit, selectedFIR, productConfig) {
   // Use first FIR in list if no FIR selected
   var _getActiveFIRArea3 = getActiveFIRArea(selectedFIR, productConfig),
     cloud_lower_level_min = _getActiveFIRArea3.cloud_lower_level_min;
   // Return min value for selected unit - if not present in list, return 0 as we cannot go below the surface
-  return cloud_lower_level_min !== undefined && cloud_lower_level_min[unit] ? cloud_lower_level_min[unit] : DEFAULT_MINIMUM_SURFACE_LEVEL;
+  return cloud_lower_level_min != null && cloud_lower_level_min[unit] ? cloud_lower_level_min[unit] : DEFAULT_MINIMUM_SURFACE_LEVEL;
 };
 var getMaxCloudLevelValue = function getMaxCloudLevelValue(unit, selectedFIR, productConfig) {
   // Use first FIR in list if no FIR selected
   var _getActiveFIRArea4 = getActiveFIRArea(selectedFIR, productConfig),
     cloud_level_max = _getActiveFIRArea4.cloud_level_max;
   // Return max value for selected unit - if not present in list, return null
-  return cloud_level_max !== undefined && cloud_level_max[unit] ? cloud_level_max[unit] : null;
+  return cloud_level_max != null && cloud_level_max[unit] ? cloud_level_max[unit] : null;
 };
 var getMaxCloudLowerLevelValue = function getMaxCloudLowerLevelValue(unit, selectedFIR, productConfig) {
   // Use first FIR in list if no FIR selected
   var _getActiveFIRArea5 = getActiveFIRArea(selectedFIR, productConfig),
     cloud_lower_level_max = _getActiveFIRArea5.cloud_lower_level_max;
   // Return max value for selected unit - if not present in list, return null
-  return cloud_lower_level_max !== undefined && cloud_lower_level_max[unit] ? cloud_lower_level_max[unit] : null;
+  return cloud_lower_level_max != null && cloud_lower_level_max[unit] ? cloud_lower_level_max[unit] : null;
 };
 // Retrieve max value from config - if not set, there is no max value for this unit so we return null
 var getMaxLevelValue = function getMaxLevelValue(unit, selectedFIR, productConfig) {
@@ -5030,7 +5251,7 @@ var getMaxLevelValue = function getMaxLevelValue(unit, selectedFIR, productConfi
   var _getActiveFIRArea6 = getActiveFIRArea(selectedFIR, productConfig),
     level_max = _getActiveFIRArea6.level_max;
   // Return max value for selected unit - if not present in list, return null
-  return level_max !== undefined && level_max[unit] ? level_max[unit] : null;
+  return level_max != null && level_max[unit] ? level_max[unit] : null;
 };
 // Retrieve min value from config - if not set, return zero
 var getMinLevelValue = function getMinLevelValue(unit, selectedFIR, productConfig) {
@@ -5038,14 +5259,14 @@ var getMinLevelValue = function getMinLevelValue(unit, selectedFIR, productConfi
   var _getActiveFIRArea7 = getActiveFIRArea(selectedFIR, productConfig),
     level_min = _getActiveFIRArea7.level_min;
   // Return min value for selected unit - if not present in list, return 0 as we cannot go below the surface
-  return level_min !== undefined && level_min[unit] ? level_min[unit] : DEFAULT_MINIMUM_SURFACE_LEVEL;
+  return level_min != null && level_min[unit] ? level_min[unit] : DEFAULT_MINIMUM_SURFACE_LEVEL;
 };
 var getMaxWindSpeedValue = function getMaxWindSpeedValue(unit, selectedFIR, productConfig) {
   // Use first FIR in list if no FIR selected
   var _getActiveFIRArea8 = getActiveFIRArea(selectedFIR, productConfig),
     wind_speed_max = _getActiveFIRArea8.wind_speed_max;
   // Return min value for selected unit - if not present in list, return null
-  return wind_speed_max !== undefined && wind_speed_max[unit] ? wind_speed_max[unit] : null;
+  return wind_speed_max != null && wind_speed_max[unit] ? wind_speed_max[unit] : null;
 };
 var DEFAULT_MIN_WIND_SPEED = 0;
 var getMinWindSpeedValue = function getMinWindSpeedValue(unit, selectedFIR, productConfig) {
@@ -5053,7 +5274,7 @@ var getMinWindSpeedValue = function getMinWindSpeedValue(unit, selectedFIR, prod
   var _getActiveFIRArea9 = getActiveFIRArea(selectedFIR, productConfig),
     wind_speed_min = _getActiveFIRArea9.wind_speed_min;
   // Return min value for selected unit - if not present in list, return 0 as we have negative wind speed
-  return wind_speed_min !== undefined && wind_speed_min[unit] ? wind_speed_min[unit] : DEFAULT_MIN_WIND_SPEED;
+  return wind_speed_min != null && wind_speed_min[unit] ? wind_speed_min[unit] : DEFAULT_MIN_WIND_SPEED;
 };
 var getMaxVisibilityValue = function getMaxVisibilityValue(selectedFIR, productConfig) {
   // Use first FIR in list if no FIR selected
@@ -5351,7 +5572,7 @@ var getProductIssueDate = function getProductIssueDate(t, initialProduct, initia
   if (initialProduct !== null && (initialProduct.status === 'PUBLISHED' || initialProduct.status === 'EXPIRED') && initialProduct.issueDate) {
     return dateUtils.dateToString(dateUtils.utc(initialProduct.issueDate), dateUtils.DATE_FORMAT_DATEPICKER) + " UTC";
   }
-  if (initialCancelProduct !== null && initialCancelProduct.issueDate) {
+  if (initialCancelProduct != null && initialCancelProduct.issueDate) {
     return dateUtils.dateToString(dateUtils.utc(initialCancelProduct.issueDate), dateUtils.DATE_FORMAT_DATEPICKER) + " UTC";
   }
   return t('not-published');
@@ -5395,11 +5616,11 @@ var getFir = function getFir(productConfig, firName) {
  */
 var isFir = function isFir(geojson) {
   var _geojson$features$;
-  if (!geojson || !geojson.features || geojson.features.length === 0) {
+  if (!(geojson != null && geojson.features) || geojson.features.length === 0) {
     return false;
   }
   var selectionType = (_geojson$features$ = geojson.features[0]) == null || (_geojson$features$ = _geojson$features$.properties) == null ? void 0 : _geojson$features$['selectionType'];
-  return geojson && geojson.features && geojson.features.length > 0 && selectionType === firSelectionType;
+  return (geojson == null ? void 0 : geojson.features) && geojson.features.length > 0 && selectionType === firSelectionType;
 };
 var getFieldLabel = function getFieldLabel(t, title, isDisabled, action) {
   if (action === void 0) {
@@ -5417,14 +5638,14 @@ var getMaxMovementSpeedValue = function getMaxMovementSpeedValue(unit, selectedF
   var _getActiveFIRArea10 = getActiveFIRArea(selectedFIR, productConfig),
     movement_max = _getActiveFIRArea10.movement_max;
   // Return max value for selected unit - if not present in list, return null
-  return movement_max !== undefined && movement_max[unit] ? movement_max[unit] : null;
+  return movement_max != null && movement_max[unit] ? movement_max[unit] : null;
 };
 var DEFAULT_MIN_MOVEMENT_SPEED = 0;
 var getMinMovementSpeedValue = function getMinMovementSpeedValue(unit, selectedFIR, productConfig) {
   var _getActiveFIRArea11 = getActiveFIRArea(selectedFIR, productConfig),
     movement_min = _getActiveFIRArea11.movement_min;
   // Return min value for selected unit - if not present in list, return DEFAULT_MIN_MOVEMENT_SPEED (zero, no negative speeds)
-  return movement_min !== undefined && movement_min[unit] ? movement_min[unit] : DEFAULT_MIN_MOVEMENT_SPEED;
+  return movement_min != null && movement_min[unit] ? movement_min[unit] : DEFAULT_MIN_MOVEMENT_SPEED;
 };
 /** Trigger form validations for given list of field names if field has a value */
 var triggerValidations = function triggerValidations(fieldNames, getValues, trigger) {
@@ -5507,7 +5728,7 @@ var useFormLayers = function useFormLayers(layers) {
       geoJSON: layer.geojson
     };
   }).filter(function (layer) {
-    return layer.geoJSON !== undefined;
+    return layer.geoJSON !== undefined && layer.geoJSON !== null;
   });
   var sourcePanelId = useSelector(function (store) {
     return uiSelectors.getSourcePanelId(store, 'publicWarnings');
@@ -5555,7 +5776,8 @@ var DrawTools = function DrawTools(_ref) {
     tools = _ref.tools,
     onChangeTool = _ref.onChangeTool,
     _ref$isDisabled = _ref.isDisabled,
-    isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
+    isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
+    disabledTooltip = _ref.disabledTooltip;
   usePreventBrowserClose(activeTool !== '');
   return jsx(Box, {
     "data-testid": "drawtools",
@@ -5565,19 +5787,23 @@ var DrawTools = function DrawTools(_ref) {
       justifyContent: 'space-between'
     },
     children: tools.map(function (tool) {
+      var radio = jsx(Radio, {
+        checked: activeTool === tool.drawModeId,
+        checkedIcon: getToolIcon(tool.selectionType),
+        "data-testid": tool.drawModeId,
+        disabled: isDisabled,
+        icon: getToolIcon(tool.selectionType),
+        onChange: function onChange() {
+          onChangeTool(tool);
+        },
+        sx: styles$1.radioInput,
+        value: true
+      });
+      var title = isDisabled && disabledTooltip ? disabledTooltip : tool.title;
       return jsx(CustomTooltip, {
-        title: tool.title,
-        children: jsx(Radio, {
-          icon: getToolIcon(tool.selectionType),
-          value: true,
-          checkedIcon: getToolIcon(tool.selectionType),
-          checked: activeTool === tool.drawModeId,
-          disabled: isDisabled,
-          onChange: function onChange() {
-            onChangeTool(tool);
-          },
-          "data-testid": tool.drawModeId,
-          sx: styles$1.radioInput
+        title: title,
+        children: jsx("span", {
+          children: radio
         })
       }, tool.drawModeId);
     })
@@ -5680,7 +5906,7 @@ var Levels = function Levels(_ref) {
   var isTS = isTSPhenomenon(phenomenon);
   var isSigmetTS = productType === 'sigmet' && isTS;
   var prevPhenomenon = usePrevious(phenomenon);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (productType !== 'sigmet') {
       return;
     }
@@ -5713,7 +5939,7 @@ var Levels = function Levels(_ref) {
   // Get allowed level units based on selected FIR - if no FIR selected, allow all default units
   var allowedLevelUnitsForFir = getAllowedUnits(getFIRValue(), productConfig, 'level_unit', LevelUnits);
   var radioactiveCloudLevel = getMaxLevelValue(LevelUnits.FL, getFIRValue(), productConfig);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (levelInfoMode !== 'BETW') {
       unregister('lowerLevel');
     }
@@ -5724,21 +5950,16 @@ var Levels = function Levels(_ref) {
     }
   }, [getValues, isRadioactiveCloud, levelInfoMode, radioactiveCloudLevel, setValue, trigger, unregister]);
   return jsx(ProductFormFieldLayout, {
-    title: t('levels'),
     sx: Object.assign({}, styles$2.containerItem, {
       '.MuiFormHelperText-root.Mui-error': {
         marginBottom: '-16px'
       }
     }),
+    title: t('levels'),
     children: jsxs(ReactHookFormRadioGroup, {
-      name: "levelInfoMode",
-      rules: {
-        validate: {
-          isRequired: isRequired
-        }
-      },
       disabled: fieldsDisabled,
       isReadOnly: isReadOnly,
+      name: "levelInfoMode",
       onChange: function onChange() {
         // Reset default value for the level value to '' so when it rerenders it uses this empty default value
         setValue('level.unit', 'FL');
@@ -5746,17 +5967,22 @@ var Levels = function Levels(_ref) {
         // Clear out errors for the levels
         clearErrors(['level', 'lowerLevel']);
       },
+      rules: {
+        validate: {
+          isRequired: isRequired
+        }
+      },
       children: [jsx(RadioButtonAndLabel, {
-        value: "AT",
-        label: t('at'),
         checked: levelInfoMode === 'AT' || levelInfoMode === 'TOPS',
         "data-testid": "levels-AT",
-        disabled: fieldsDisabled
+        disabled: fieldsDisabled,
+        label: t('at'),
+        value: "AT"
       }), (levelInfoMode === 'AT' || levelInfoMode === 'TOPS') && !isRadioactiveCloud ? jsxs(Grid, {
+        alignItems: "flex-start",
         container: true,
-        spacing: 2,
         justifyItems: "flex-end",
-        alignItems: "flex-start",
+        spacing: 2,
         children: [jsx(Grid, {
           size: {
             xs: 12,
@@ -5765,6 +5991,8 @@ var Levels = function Levels(_ref) {
           children: jsx(FormControlLabel, {
             control: jsx(Checkbox, {
               checked: levelInfoMode === 'TOPS',
+              color: "secondary",
+              disabled: isDisabled || isSigmetTS,
               onChange: function onChange() {
                 if (isSigmetTS) {
                   return;
@@ -5772,9 +6000,7 @@ var Levels = function Levels(_ref) {
                 setValue('levelInfoMode', levelInfoMode === 'AT' ? 'TOPS' : 'AT', {
                   shouldDirty: true
                 });
-              },
-              color: "secondary",
-              disabled: isDisabled || isSigmetTS
+              }
             }),
             "data-testid": "levels-TOPS",
             label: t('levels-tops-label')
@@ -5785,22 +6011,22 @@ var Levels = function Levels(_ref) {
             md: 3
           },
           children: jsx(ReactHookFormSelect, {
-            name: "level.unit",
+            defaultValue: 'FL',
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: t('unit-label'),
+            name: "level.unit",
+            onChange: function onChange() {
+              triggerValidations(['level.value'], getValues, trigger);
+              _onChange();
+            },
             rules: {
               validate: {
                 isRequired: isRequired
               }
             },
-            sx: styles$2.unit,
             size: "small",
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            defaultValue: 'FL',
-            onChange: function onChange() {
-              triggerValidations(['level.value'], getValues, trigger);
-              _onChange();
-            },
+            sx: styles$2.unit,
             children: Object.keys(allowedLevelUnitsForFir).map(function (key) {
               return jsx(MenuItem, {
                 value: key,
@@ -5814,9 +6040,12 @@ var Levels = function Levels(_ref) {
             md: 6
           },
           children: jsx(ReactHookFormNumberField, {
-            name: "level.value",
+            autoFocus: true,
             "data-testid": "level.value",
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: t('level'),
+            name: "level.value",
             rules: {
               validate: {
                 isRequired: isRequired,
@@ -5847,18 +6076,15 @@ var Levels = function Levels(_ref) {
                 }
               }
             },
-            size: "small",
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            autoFocus: true
+            size: "small"
           })
         })]
       }) : null, jsx(RadioButtonAndLabel, {
-        value: "BETW",
-        label: t('between'),
         checked: levelInfoMode === 'BETW' || levelInfoMode === 'BETW_SFC',
         "data-testid": "levels-BETW",
-        disabled: fieldsDisabled
+        disabled: fieldsDisabled,
+        label: t('between'),
+        value: "BETW"
       }), levelInfoMode === 'BETW' || levelInfoMode === 'BETW_SFC' ? jsxs(Fragment, {
         children: [jsxs(Grid, {
           container: true,
@@ -5874,8 +6100,15 @@ var Levels = function Levels(_ref) {
               md: 3
             },
             children: jsx(ReactHookFormSelect, {
-              name: "level.unit",
+              defaultValue: 'FL',
+              disabled: fieldsDisabled,
+              isReadOnly: isReadOnly,
               label: t('unit-label'),
+              name: "level.unit",
+              onChange: function onChange() {
+                triggerValidations(['level.value', 'lowerLevel.value', 'lowerLevel.unit'], getValues, trigger);
+                _onChange();
+              },
               rules: {
                 validate: {
                   isRequired: isRequired,
@@ -5889,13 +6122,6 @@ var Levels = function Levels(_ref) {
               },
               size: "small",
               sx: styles$2.unit,
-              disabled: fieldsDisabled,
-              isReadOnly: isReadOnly,
-              defaultValue: 'FL',
-              onChange: function onChange() {
-                triggerValidations(['level.value', 'lowerLevel.value', 'lowerLevel.unit'], getValues, trigger);
-                _onChange();
-              },
               children: Object.keys(allowedLevelUnitsForFir).map(function (key) {
                 return jsx(MenuItem, {
                   value: key,
@@ -5909,11 +6135,14 @@ var Levels = function Levels(_ref) {
               md: 6
             },
             children: jsx(ReactHookFormNumberField, {
-              value: level || '',
-              name: "level.value",
+              autoFocus: true,
+              disabled: fieldsDisabled,
+              isReadOnly: isReadOnly,
               label: t('levels-upper-level-label'),
-              sx: styles$2.levelField,
-              size: "small",
+              name: "level.value",
+              onChange: function onChange() {
+                triggerValidations(['lowerLevel.value'], getValues, trigger);
+              },
               rules: {
                 validate: {
                   isRequired: isRequired,
@@ -5944,19 +6173,16 @@ var Levels = function Levels(_ref) {
                   }
                 }
               },
-              disabled: fieldsDisabled,
-              isReadOnly: isReadOnly,
-              onChange: function onChange() {
-                triggerValidations(['lowerLevel.value'], getValues, trigger);
-              },
-              autoFocus: true
+              size: "small",
+              sx: styles$2.levelField,
+              value: level || ''
             })
           })]
         }), jsxs(Grid, {
+          alignItems: "flex-start",
           container: true,
-          spacing: 2,
           justifyItems: "flex-end",
-          alignItems: "flex-start",
+          spacing: 2,
           children: [jsx(Grid, {
             size: {
               xs: 12,
@@ -5965,15 +6191,15 @@ var Levels = function Levels(_ref) {
             children: jsx(FormControlLabel, {
               control: jsx(Checkbox, {
                 checked: levelInfoMode === 'BETW_SFC',
+                color: "secondary",
+                disabled: fieldsDisabled,
+                name: "checkedF",
                 onChange: function onChange() {
                   getValues('level.unit') && trigger('level.unit');
                   setValue('levelInfoMode', getValues('levelInfoMode') === 'BETW' ? 'BETW_SFC' : 'BETW', {
                     shouldDirty: true
                   });
-                },
-                name: "checkedF",
-                color: "secondary",
-                disabled: fieldsDisabled
+                }
               }),
               "data-testid": "levels-SFC",
               label: "SFC"
@@ -5985,8 +6211,15 @@ var Levels = function Levels(_ref) {
                 md: 3
               },
               children: jsx(ReactHookFormSelect, {
-                name: "lowerLevel.unit",
+                defaultValue: getValues('level.unit') || 'FL',
+                disabled: isDisabled,
+                isReadOnly: isReadOnly,
                 label: t('unit-label'),
+                name: "lowerLevel.unit",
+                onChange: function onChange() {
+                  triggerValidations(['lowerLevel.value', 'level.unit'], getValues, trigger);
+                  _onChange();
+                },
                 rules: {
                   validate: {
                     isRequired: isRequired,
@@ -6000,13 +6233,6 @@ var Levels = function Levels(_ref) {
                 },
                 size: "small",
                 sx: styles$2.unit,
-                disabled: isDisabled,
-                isReadOnly: isReadOnly,
-                defaultValue: getValues('level.unit') || 'FL',
-                onChange: function onChange() {
-                  triggerValidations(['lowerLevel.value', 'level.unit'], getValues, trigger);
-                  _onChange();
-                },
                 children: Object.keys(allowedLevelUnitsForFir).map(function (key) {
                   return jsx(MenuItem, {
                     value: key,
@@ -6020,8 +6246,10 @@ var Levels = function Levels(_ref) {
                 md: 6
               },
               children: jsx(ReactHookFormNumberField, {
-                name: "lowerLevel.value",
+                disabled: isDisabled,
+                isReadOnly: isReadOnly,
                 label: t('levels-lower-level-label'),
+                name: "lowerLevel.value",
                 rules: {
                   validate: {
                     isRequired: isRequired,
@@ -6058,24 +6286,22 @@ var Levels = function Levels(_ref) {
                     }
                   }
                 },
-                size: "small",
-                disabled: isDisabled,
-                isReadOnly: isReadOnly
+                size: "small"
               })
             })]
           })]
         })]
       }) : null, jsx(RadioButtonAndLabel, {
-        value: "ABV",
-        label: t('above'),
-        disabled: fieldsDisabled,
         checked: levelInfoMode === 'ABV' || levelInfoMode === 'TOPS_ABV',
-        "data-testid": "levels-ABV"
+        "data-testid": "levels-ABV",
+        disabled: fieldsDisabled,
+        label: t('above'),
+        value: "ABV"
       }), levelInfoMode === 'ABV' || levelInfoMode === 'TOPS_ABV' ? jsxs(Grid, {
+        alignItems: "flex-start",
         container: true,
-        spacing: 2,
         justifyItems: "flex-end",
-        alignItems: "flex-start",
+        spacing: 2,
         children: [jsx(Grid, {
           size: {
             xs: 12,
@@ -6084,6 +6310,7 @@ var Levels = function Levels(_ref) {
           children: jsx(FormControlLabel, {
             control: jsx(Checkbox, {
               checked: levelInfoMode === 'TOPS_ABV',
+              disabled: isDisabled || isSigmetTS,
               onChange: function onChange() {
                 if (isSigmetTS) {
                   return;
@@ -6091,11 +6318,10 @@ var Levels = function Levels(_ref) {
                 setValue('levelInfoMode', levelInfoMode === 'ABV' ? 'TOPS_ABV' : 'ABV', {
                   shouldDirty: true
                 });
-              },
-              disabled: isDisabled || isSigmetTS
+              }
             }),
-            label: t('levels-tops-label'),
-            "data-testid": "levels-TOPS_ABV"
+            "data-testid": "levels-TOPS_ABV",
+            label: t('levels-tops-label')
           })
         }), jsx(Grid, {
           size: {
@@ -6103,8 +6329,15 @@ var Levels = function Levels(_ref) {
             md: 3
           },
           children: jsx(ReactHookFormSelect, {
-            name: "level.unit",
+            defaultValue: 'FL',
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: t('unit-label'),
+            name: "level.unit",
+            onChange: function onChange() {
+              triggerValidations(['level.value'], getValues, trigger);
+              _onChange();
+            },
             rules: {
               validate: {
                 isRequired: isRequired
@@ -6112,13 +6345,6 @@ var Levels = function Levels(_ref) {
             },
             size: "small",
             sx: styles$2.unit,
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            defaultValue: 'FL',
-            onChange: function onChange() {
-              triggerValidations(['level.value'], getValues, trigger);
-              _onChange();
-            },
             children: Object.keys(allowedLevelUnitsForFir).map(function (key) {
               return jsx(MenuItem, {
                 value: key,
@@ -6132,8 +6358,11 @@ var Levels = function Levels(_ref) {
             md: 6
           },
           children: jsx(ReactHookFormNumberField, {
-            name: "level.value",
+            autoFocus: true,
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: t('level'),
+            name: "level.value",
             rules: {
               validate: {
                 isRequired: isRequired,
@@ -6164,10 +6393,7 @@ var Levels = function Levels(_ref) {
                 }
               }
             },
-            size: "small",
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            autoFocus: true
+            size: "small"
           })
         })]
       }) : null]
@@ -6205,27 +6431,27 @@ var ObservationForecast = function ObservationForecast(_ref) {
       }
     },
     children: jsxs(ReactHookFormRadioGroup, {
-      name: "isObservationOrForecast",
       disabled: fieldsDisabled,
+      isReadOnly: isReadOnly,
+      name: "isObservationOrForecast",
+      onChange: function onChange() {
+        triggerValidations(['observationOrForecastTime'], getValues, trigger);
+      },
       rules: {
         validate: {
           isRequired: isRequired
         }
       },
-      onChange: function onChange() {
-        triggerValidations(['observationOrForecastTime'], getValues, trigger);
-      },
-      isReadOnly: isReadOnly,
       children: [(!isReadOnly || watch('isObservationOrForecast') === 'OBS') && jsx(RadioButtonAndLabel, {
-        value: "OBS",
-        label: t('observation-label'),
+        "data-testid": "isObservationOrForecast-OBS",
         disabled: fieldsDisabled,
-        "data-testid": "isObservationOrForecast-OBS"
+        label: t('observation-label'),
+        value: "OBS"
       }), (!isReadOnly || watch('isObservationOrForecast') === 'FCST') && jsx(RadioButtonAndLabel, {
-        value: "FCST",
-        label: t('forecast-label'),
+        "data-testid": "isObservationOrForecast-FCST",
         disabled: fieldsDisabled,
-        "data-testid": "isObservationOrForecast-FCST"
+        label: t('forecast-label'),
+        value: "FCST"
       })]
     })
   });
@@ -6255,10 +6481,17 @@ var ObservationForecastTime = function ObservationForecastTime(_ref) {
   return !isReadOnly || watch('observationOrForecastTime') !== null ? jsx(ProductFormFieldLayout, {
     title: t('at'),
     children: jsx(ReactHookFormDateTime, {
-      disablePast: watch('isObservationOrForecast') === 'FCST',
+      "data-testid": "obs-fcst-time",
       disableFuture: watch('isObservationOrForecast') === 'OBS',
-      name: "observationOrForecastTime",
+      disablePast: watch('isObservationOrForecast') === 'FCST',
+      disabled: fieldsDisabled,
+      helperText: helperText,
+      isReadOnly: isReadOnly,
       label: label,
+      name: "observationOrForecastTime",
+      onChange: function onChange() {
+        return _onChange();
+      },
       rules: {
         validate: {
           isValidDate: dateUtils.isValidIsoDateString,
@@ -6270,14 +6503,7 @@ var ObservationForecastTime = function ObservationForecastTime(_ref) {
           }
         }
       },
-      disabled: fieldsDisabled,
-      isReadOnly: isReadOnly,
-      helperText: helperText,
-      onChange: function onChange() {
-        return _onChange();
-      },
-      sx: styles$2.helperText,
-      "data-testid": "obs-fcst-time"
+      sx: styles$2.helperText
     })
   }) : null;
 };
@@ -6313,23 +6539,19 @@ var Phenomenon = function Phenomenon(_ref) {
     handleSinglePhenomenaSelection();
   }
   return jsx(ProductFormFieldLayout, {
-    title: t('phenomenon-title'),
     sx: {
       '.MuiFormHelperText-root.Mui-error': {
         marginBottom: '-22px',
         marginTop: '2px'
       }
     },
+    title: t('phenomenon-title'),
     children: jsx(ReactHookFormSelect, {
-      name: "phenomenon",
-      label: label,
-      rules: {
-        required: true
-      },
+      "data-testid": "phenomenon",
       disabled: fieldsDisabled,
       isReadOnly: isReadOnly,
-      size: "small",
-      "data-testid": "phenomenon",
+      label: label,
+      name: "phenomenon",
       onChange: function onChange() {
         if (getValues('movementType') === 'NO_VA_EXP') {
           setValue('movementType', null);
@@ -6343,6 +6565,10 @@ var Phenomenon = function Phenomenon(_ref) {
         triggerValidations(['validDateStart', 'validDateEnd'], getValues, trigger);
         _onChange();
       },
+      rules: {
+        required: true
+      },
+      size: "small",
       children: phenomenaList.map(function (phenomenon) {
         return jsx(MenuItem, {
           value: phenomenon.code,
@@ -6425,13 +6651,16 @@ var Progress = function Progress(_ref) {
   var isRequired = function isRequired(value) {
     return isShortTest() || isRequiredField(value);
   };
+  var shortTest = isShortTest();
+  var combinedDisabled = shortTest || drawToolsDisabled;
+  var disabledTooltip = !shortTest && drawToolsDisabled ? t('geometry-drawing-disabled') : undefined;
   var movementType = watch('movementType');
   var getFIRValue = function getFIRValue() {
     return getValues('locationIndicatorATSR');
   };
   // Get allowed movement units based on selected FIR - if no FIR selected, allow all units
   var allowedMovementUnitsForFir = getAllowedUnits(getFIRValue(), productConfig, 'movement_unit', MovementUnit);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (movementType !== 'MOVEMENT') {
       unregister('movementDirection');
       unregister('movementSpeed');
@@ -6454,24 +6683,19 @@ var Progress = function Progress(_ref) {
   var drawnGeometry = geoJSON == null || (_geoJSON$features$ = geoJSON.features[0]) == null ? void 0 : _geoJSON$features$.geometry;
   var interceptionGeometry = geoJSONIntersection == null || (_geoJSONIntersection$ = geoJSONIntersection.features[0]) == null ? void 0 : _geoJSONIntersection$.geometry;
   // Total points in the user drawn polygon
-  var totalDrawnPoints = drawnGeometry && drawnGeometry.coordinates[0] ? drawnGeometry.coordinates[0].length : 0;
+  var totalDrawnPoints = drawnGeometry != null && drawnGeometry.coordinates[0] ? drawnGeometry.coordinates[0].length : 0;
   // Total points in the intersection polygon
-  var intersectingPolygonPointsTotal = interceptionGeometry && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
+  var intersectingPolygonPointsTotal = interceptionGeometry != null && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
   var showMaxFeaturePointsWarning = intersectionPointCount > 7 && hasMaxFeaturePoints(geoJSONIntersection, maxPoints) && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   var showMoreThan6PointsWarning = totalDrawnPoints > 7 && intersectionPointCount < 1 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   var showIntersectionAbove6PointsWarning = intersectingPolygonPointsTotal > 7 && intersectionPointCount > 1 && maxPoints > 7 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   return jsxs(ProductFormFieldLayout, {
-    title: t('progress'),
     sx: styles$2.containerItem,
+    title: t('progress'),
     children: [jsxs(ReactHookFormRadioGroup, {
-      name: "movementType",
       "data-testid": "movementType-group",
-      rules: {
-        validate: {
-          isRequired: isRequired
-        }
-      },
       isReadOnly: isReadOnly,
+      name: "movementType",
       onChange: function onChange() {
         var deleteTool = tools == null ? void 0 : tools.find(function (tool) {
           return tool.value === 'DELETE';
@@ -6480,33 +6704,46 @@ var Progress = function Progress(_ref) {
           onChangeTool(deleteTool);
         }
       },
-      children: [isVolcanicCloud && jsx(RadioButtonAndLabel, {
-        value: "NO_VA_EXP",
-        label: t('progress-radio-button-label-no-va-exp'),
+      rules: {
+        validate: {
+          isRequired: isRequired
+        }
+      },
+      children: [!!isVolcanicCloud && jsx(RadioButtonAndLabel, {
+        "data-testid": "movementType-NO_VA_EXP",
         disabled: fieldsDisabled,
-        "data-testid": "movementType-NO_VA_EXP"
+        label: t('progress-radio-button-label-no-va-exp'),
+        value: "NO_VA_EXP"
       }), jsxs(Fragment, {
         children: [jsx(RadioButtonAndLabel, {
-          value: "STATIONARY",
-          label: t('progress-radio-button-label-stationary'),
+          "data-testid": "movementType-STATIONARY",
           disabled: fieldsDisabled,
-          "data-testid": "movementType-STATIONARY"
+          label: t('progress-radio-button-label-stationary'),
+          value: "STATIONARY"
         }), jsx(RadioButtonAndLabel, {
-          value: "MOVEMENT",
+          "data-testid": "movementType-MOVEMENT",
+          disabled: fieldsDisabled,
           label: t('progress-radio-button-label-movement'),
+          value: "MOVEMENT"
+        }), !!isSigmet && !!isShortTestOrRdoact && jsx(RadioButtonAndLabel, {
+          "data-testid": "movementType-FORECAST_POSITION",
           disabled: fieldsDisabled,
-          "data-testid": "movementType-MOVEMENT"
-        }), isSigmet && isShortTestOrRdoact && jsx(RadioButtonAndLabel, {
-          value: "FORECAST_POSITION",
           label: t('progress-radio-button-label-end-potision'),
-          disabled: fieldsDisabled,
-          "data-testid": "movementType-FORECAST_POSITION"
+          value: "FORECAST_POSITION"
         })]
       }), movementType === 'MOVEMENT' && !isShortTestOrRdoact && jsxs(Fragment, {
         children: [jsx(Grid, {
           children: jsx(ReactHookFormSelect, {
-            name: "movementDirection",
+            autoFocus: true,
+            "data-testid": "movement-movementDirection",
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: t('progress-movement-direction-label'),
+            name: "movementDirection",
+            onChange: function onChange(event) {
+              event.stopPropagation();
+              _onChange();
+            },
             rules: {
               validate: {
                 isRequired: isRequired
@@ -6514,14 +6751,6 @@ var Progress = function Progress(_ref) {
             },
             size: "small",
             sx: styles$2.movement,
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            "data-testid": "movement-movementDirection",
-            onChange: function onChange(event) {
-              event.stopPropagation();
-              _onChange();
-            },
-            autoFocus: true,
             children: Object.keys(Direction).map(function (key) {
               return jsx(MenuItem, {
                 value: key,
@@ -6534,8 +6763,17 @@ var Progress = function Progress(_ref) {
           children: [jsx(Grid, {
             size: 5,
             children: jsx(ReactHookFormSelect, {
-              name: "movementUnit",
+              "data-testid": "movement-movementUnit",
+              defaultValue: 'KT',
+              disabled: isDisabled,
+              isReadOnly: isReadOnly,
               label: t('progress-movement-unit-label'),
+              name: "movementUnit",
+              onChange: function onChange(event) {
+                event.stopPropagation();
+                triggerValidations(['movementSpeed'], getValues, trigger);
+                _onChange();
+              },
               rules: {
                 validate: {
                   isRequired: isRequired
@@ -6543,15 +6781,6 @@ var Progress = function Progress(_ref) {
               },
               size: "small",
               sx: styles$2.unit,
-              disabled: isDisabled,
-              isReadOnly: isReadOnly,
-              defaultValue: 'KT',
-              "data-testid": "movement-movementUnit",
-              onChange: function onChange(event) {
-                event.stopPropagation();
-                triggerValidations(['movementSpeed'], getValues, trigger);
-                _onChange();
-              },
               children: Object.keys(allowedMovementUnitsForFir).map(function (key) {
                 return jsx(MenuItem, {
                   value: key,
@@ -6562,8 +6791,14 @@ var Progress = function Progress(_ref) {
           }), jsx(Grid, {
             size: 7,
             children: jsx(ReactHookFormNumberField, {
-              name: "movementSpeed",
+              "data-testid": "movement-movementSpeed",
+              disabled: isDisabled,
+              isReadOnly: isReadOnly,
               label: t('progress-movement-speed-label'),
+              name: "movementSpeed",
+              onChange: function onChange(event) {
+                return event == null ? void 0 : event.stopPropagation();
+              },
               rules: {
                 validate: {
                   isRequired: isRequired,
@@ -6594,53 +6829,48 @@ var Progress = function Progress(_ref) {
                   }
                 }
               },
-              size: "small",
-              disabled: isDisabled,
-              isReadOnly: isReadOnly,
-              "data-testid": "movement-movementSpeed",
-              onChange: function onChange(event) {
-                return event && event.stopPropagation();
-              }
+              size: "small"
             })
           })]
         })]
-      }), isSigmet && !isShortTestOrRdoact && jsx(RadioButtonAndLabel, {
-        value: "FORECAST_POSITION",
-        label: t('progress-radio-button-label-end-potision'),
+      }), !!isSigmet && !isShortTestOrRdoact && jsx(RadioButtonAndLabel, {
+        "data-testid": "movementType-FORECAST_POSITION",
         disabled: isDisabled,
-        "data-testid": "movementType-FORECAST_POSITION"
+        label: t('progress-radio-button-label-end-potision'),
+        value: "FORECAST_POSITION"
       })]
-    }), isSigmet && !isShortTestOrRdoact && movementType === 'FORECAST_POSITION' && jsxs(Grid, {
+    }), !!isSigmet && !isShortTestOrRdoact && movementType === 'FORECAST_POSITION' && jsxs(Grid, {
       "data-testid": "endGeometry",
-      sx: styles$2.drawSectionProgress,
       size: 12,
+      sx: styles$2.drawSectionProgress,
       children: [!isReadOnly && jsxs(Fragment, {
         children: [jsx(DrawTools, {
-          "data-testid": "endGeometry-drawTools",
-          tools: tools,
           activeTool: activeTool,
+          "data-testid": "endGeometry-drawTools",
+          disabledTooltip: disabledTooltip,
+          isDisabled: combinedDisabled,
           onChangeTool: onChangeTool,
-          isDisabled: drawToolsDisabled
-        }), activeTool && jsx(FormHelperText, {
-          variant: "filled",
+          tools: tools
+        }), !!activeTool && jsx(FormHelperText, {
           sx: styles$2.quitDrawModeMessage,
+          variant: "filled",
           children: t('geometry-exit-draw-mode-message')
         }), !!errors.endGeometry && jsx(FormHelperText, {
           error: true,
           variant: "filled",
           children: errors.endGeometry.message
         }), /* non-blocking warnings */
-        showMaxFeaturePointsWarning && jsx(FormHelperText, {
+        !!showMaxFeaturePointsWarning && jsx(FormHelperText, {
           variant: "filled",
           children: t('geometry-max-feature-points-message')
         }), /* non-blocking warnings */
-        showMoreThan6PointsWarning && jsx(FormHelperText, {
+        !!showMoreThan6PointsWarning && jsx(FormHelperText, {
           variant: "filled",
           children: t('progress-more-than-6-points-message', {
             totalDrawnPoints: totalDrawnPoints
           })
         }), /* non-blocking warnings */
-        showIntersectionAbove6PointsWarning && jsx(FormHelperText, {
+        !!showIntersectionAbove6PointsWarning && jsx(FormHelperText, {
           variant: "filled",
           children: t('progress-intersection-above-6-points-message', {
             intersectingPolygonPointsTotal: intersectingPolygonPointsTotal
@@ -6743,17 +6973,17 @@ var SelectFIR = function SelectFIR(_ref) {
   return jsxs(ProductFormFieldLayout, {
     title: t('select-fir-title'),
     children: [jsx(ReactHookFormSelect, {
-      name: "locationIndicatorATSR",
+      defaultValue: locationIndicatorATSR,
+      disabled: isDisabled,
+      isReadOnly: isReadOnly,
       label: isReadOnly ? 'FIR' : t('select-fir-label'),
+      name: "locationIndicatorATSR",
+      onChange: onChangeLocationATSR,
       rules: {
         validate: {
           isRequired: isRequired
         }
       },
-      disabled: isDisabled,
-      isReadOnly: isReadOnly,
-      defaultValue: locationIndicatorATSR,
-      onChange: onChangeLocationATSR,
       size: "small",
       children: optionsFIR.map(function (fir) {
         return jsx(MenuItem, {
@@ -6762,21 +6992,21 @@ var SelectFIR = function SelectFIR(_ref) {
         }, fir.ATSR + "-" + fir.FIR);
       })
     }), jsx(ReactHookFormHiddenInput, {
-      name: "locationIndicatorATSU",
+      "data-testid": "locationIndicatorATSU",
       defaultValue: locationIndicatorATSU,
-      "data-testid": "locationIndicatorATSU"
+      name: "locationIndicatorATSU"
     }), jsx(ReactHookFormHiddenInput, {
-      name: "locationIndicatorMWO",
+      "data-testid": "locationIndicatorMWO",
       defaultValue: locationIndicatorMWO,
-      "data-testid": "locationIndicatorMWO"
+      name: "locationIndicatorMWO"
     }), jsx(ReactHookFormHiddenInput, {
-      name: "firName",
+      "data-testid": "firName",
       defaultValue: firName,
-      "data-testid": "firName"
+      name: "firName"
     }), jsx(ReactHookFormHiddenInput, {
-      name: "firGeometry",
+      "data-testid": "firGeometry",
       defaultValue: firGeometry,
-      "data-testid": "firGeometry"
+      name: "firGeometry"
     })]
   });
 };
@@ -6806,6 +7036,9 @@ var StartGeometry = function StartGeometry(_ref) {
   var getFIRValue = function getFIRValue() {
     return getValues('locationIndicatorATSR');
   };
+  var shortTest = isShortTest();
+  var combinedDisabled = shortTest || isDisabled;
+  var disabledTooltip = !shortTest && isDisabled ? t('geometry-drawing-disabled') : undefined;
   // Max points the FIR allows for a polygon
   var maxPoints = getMaxPolygonPoints(getFIRValue(), productConfig);
   // Intersections with FIR
@@ -6813,54 +7046,54 @@ var StartGeometry = function StartGeometry(_ref) {
   var drawnGeometry = geoJSON == null || (_geoJSON$features$ = geoJSON.features[0]) == null ? void 0 : _geoJSON$features$.geometry;
   var interceptionGeometry = geoJSONIntersection == null || (_geoJSONIntersection$ = geoJSONIntersection.features[0]) == null ? void 0 : _geoJSONIntersection$.geometry;
   // Total points in the user drawn polygon
-  var totalDrawnPoints = drawnGeometry && drawnGeometry.coordinates[0] ? drawnGeometry.coordinates[0].length : 0;
+  var totalDrawnPoints = drawnGeometry != null && drawnGeometry.coordinates[0] ? drawnGeometry.coordinates[0].length : 0;
   // Total points in the intersection polygon
-  var intersectingPolygonPointsTotal = interceptionGeometry && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
+  var intersectingPolygonPointsTotal = interceptionGeometry != null && interceptionGeometry.coordinates[0] ? interceptionGeometry.coordinates[0].length : 0;
   var showMaxFeaturePointsWarning = intersectionPointCount > 7 && hasMaxFeaturePoints(geoJSONIntersection, maxPoints) && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   var showMoreThan6PointsWarning = totalDrawnPoints > 7 && intersectionPointCount < 1 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   var showIntersectionAbove6PointsWarning = intersectingPolygonPointsTotal > 7 && intersectionPointCount > 1 && maxPoints > 7 && !activeTool && !errors.startGeometry && !isFir(geoJSON);
   return !isReadOnly ? jsxs(ProductFormFieldLayout, {
-    title: t('start-position'),
-    sx: styles$2.drawSection,
     "data-testid": "startGeometry",
+    sx: styles$2.drawSection,
+    title: t('start-position'),
     children: [jsx(DrawTools, {
       activeTool: activeTool,
-      tools: tools,
+      disabledTooltip: disabledTooltip,
+      isDisabled: combinedDisabled,
       onChangeTool: onChangeTool,
-      isDisabled: isShortTest() || isDisabled
-    }), activeTool && jsx(FormHelperText, {
-      variant: "filled",
+      tools: tools
+    }), !!activeTool && jsx(FormHelperText, {
       sx: styles$2.quitDrawModeMessage,
+      variant: "filled",
       children: t('geometry-exit-draw-mode-message')
     }), !!errors.startGeometry && jsx(FormHelperText, {
       error: true,
       variant: "filled",
       children: errors.startGeometry.message
     }), /* non-blocking warnings */
-    showMaxFeaturePointsWarning && jsx(FormHelperText, {
+    !!showMaxFeaturePointsWarning && jsx(FormHelperText, {
       variant: "filled",
       children: t('geometry-max-feature-points-message')
     }), /* non-blocking warnings */
-    showMoreThan6PointsWarning && jsx(FormHelperText, {
+    !!showMoreThan6PointsWarning && jsx(FormHelperText, {
       variant: "filled",
       children: t('geometry-more-than-6-points-message', {
         totalDrawnPoints: totalDrawnPoints
       })
     }), /* non-blocking warnings */
-    showIntersectionAbove6PointsWarning && jsx(FormHelperText, {
+    !!showIntersectionAbove6PointsWarning && jsx(FormHelperText, {
       variant: "filled",
       children: t('geometry-intersection-above-6-points-message', {
         intersectingPolygonPointsTotal: intersectingPolygonPointsTotal
       })
-    }), hasMulitpleIntersections(geoJSONIntersection) && !activeTool && !errors.startGeometry && !isFir(geoJSON) && jsx(FormHelperText, {
-      variant: "filled",
-      children: t('geometry-multi-intersections-message')
     }), jsx(ReactHookFormHiddenInput, {
       name: "startGeometry",
       rules: {
         validate: {
-          maximumOneDrawing: function maximumOneDrawing(value) {
-            return isMaximumOneDrawing(value) || t('geometry-only-one-start-position-drawing');
+          maximumOneDrawing: function maximumOneDrawing() {
+            var intersection = watch('startGeometryIntersect');
+            var result = isMaximumOneDrawing(intersection);
+            return result || t('geometry-only-one-start-position-drawing');
           },
           intersectWithFIR: function intersectWithFIR(value) {
             return hasIntersectionWithFIR(value, watch('startGeometryIntersect')) || t('geometry-no-intersection-message');
@@ -6899,19 +7132,19 @@ var Type = function Type(_ref) {
   return jsx(ProductFormFieldLayout, {
     title: t('type-title'),
     children: jsx(ReactHookFormSelect, {
-      name: "type",
-      label: label,
-      disabled: isDisabled,
-      isReadOnly: isReadOnly,
-      size: "small",
+      autoFocus: true,
       "data-testid": "type",
       defaultValue: "NORMAL",
+      disabled: isDisabled,
+      isReadOnly: isReadOnly,
+      label: label,
+      name: "type",
       onChange: function onChange() {
         onTypeChange();
         triggerValidations(['validDateStart', 'validDateEnd'], getValues, trigger);
         _onChange();
       },
-      autoFocus: true,
+      size: "small",
       children: Object.keys(messageType).map(function (key) {
         return jsx(MenuItem, {
           value: key,
@@ -6960,7 +7193,7 @@ var ValidFrom = function ValidFrom(_ref) {
     isRequired = _useDraftFormHelpers.isRequired;
   var label = getFieldLabel(t, t('date-and-time'), isReadOnly);
   // Only auto-sync to now when amending an already-active SIGMET
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (!lockBecauseActive) {
       return;
     }
@@ -7001,19 +7234,19 @@ var ValidFrom = function ValidFrom(_ref) {
   return jsx(ProductFormFieldLayout, {
     title: t('valid-from'),
     children: jsx(ReactHookFormDateTime, {
+      "data-testid": "valid-from",
+      defaultNullValue: getDefaultValidFromValue(productConfig),
       disablePast: true,
-      name: "validDateStart",
+      disabled: isDisabled || lockBecauseActive,
+      isReadOnly: isReadOnly,
       label: label,
-      defaultNullValue: getDefaultValidFromValue(productConfig),
-      rules: rules,
+      name: "validDateStart",
       onChange: function onChange() {
         onUserChange == null || onUserChange();
         triggerValidations(['validDateEnd', 'observationOrForecastTime'], getValues, trigger);
         _onChange();
       },
-      disabled: isDisabled || lockBecauseActive,
-      isReadOnly: isReadOnly,
-      "data-testid": "valid-from",
+      rules: rules,
       sx: Object.assign({}, styles$2.helperText, {
         '.MuiFormHelperText-root.Mui-error': {
           marginBottom: '-16px'
@@ -7054,13 +7287,13 @@ var ValidUntil = function ValidUntil(_ref) {
     isRequired = _useDraftFormHelpers.isRequired;
   var dateAndTime = t('date-and-time');
   var label = getFieldLabel(t, dateAndTime, isReadOnly);
-  var _React$useState = React__default.useState(getDefaultValidUntilValue(productConfig, getValues('phenomenon'), getValues('locationIndicatorATSR'), getValues('validDateStart'))),
+  var _React$useState = React.useState(getDefaultValidUntilValue(productConfig, getValues('phenomenon'), getValues('locationIndicatorATSR'), getValues('validDateStart'))),
     defaultValidUntilValue = _React$useState[0],
     setDefaultValidUntilValue = _React$useState[1];
   var phenomenon = watch('phenomenon');
   var locationIndicatorATSR = watch('locationIndicatorATSR');
   var validFrom = watch('validDateStart');
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (hasUserChangedTime) {
       return;
     }
@@ -7076,10 +7309,18 @@ var ValidUntil = function ValidUntil(_ref) {
   return jsx(ProductFormFieldLayout, {
     title: t('valid-until'),
     children: jsx(ReactHookFormDateTime, {
+      "data-testid": "valid-until",
+      defaultNullValue: defaultValidUntilValue,
       disablePast: true,
-      name: "validDateEnd",
+      disabled: isDisabled,
+      isReadOnly: isReadOnly,
       label: label,
-      defaultNullValue: defaultValidUntilValue,
+      name: "validDateEnd",
+      onChange: function onChange() {
+        onUserChange == null || onUserChange(); // Track manual change
+        triggerValidations(['validDateStart', 'observationOrForecastTime'], getValues, trigger);
+        _onChange();
+      },
       rules: {
         validate: {
           isRequired: isRequired,
@@ -7094,14 +7335,6 @@ var ValidUntil = function ValidUntil(_ref) {
           }
         }
       },
-      disabled: isDisabled,
-      isReadOnly: isReadOnly,
-      onChange: function onChange() {
-        onUserChange == null || onUserChange(); // Track manual change
-        triggerValidations(['validDateStart', 'observationOrForecastTime'], getValues, trigger);
-        _onChange();
-      },
-      "data-testid": "valid-until",
       sx: Object.assign({}, styles$2.helperText, {
         '.MuiFormHelperText-root.Mui-error': {
           marginBottom: '-16px'
@@ -7137,39 +7370,51 @@ var VolcanicFields = function VolcanicFields(_ref) {
         }
       },
       children: [(!isReadOnly || !!watch('vaSigmetVolcanoName')) && jsx(Grid, {
-        sx: styles$2.volcanicField,
         size: 12,
+        sx: styles$2.volcanicField,
         children: jsx(ReactHookFormTextField, {
-          name: "vaSigmetVolcanoName",
+          disabled: isDisabled,
+          helperText: helperText,
+          isReadOnly: isReadOnly,
           label: t('volcano-name'),
+          name: "vaSigmetVolcanoName",
           rules: {
             required: false
           },
-          disabled: isDisabled,
-          helperText: helperText,
-          upperCase: true,
-          isReadOnly: isReadOnly,
-          size: "small"
+          size: "small",
+          upperCase: true
         })
       }), (!isReadOnly || !!watch('vaSigmetVolcanoCoordinates.latitude')) && jsx(Grid, {
         size: 6,
         children: degreesAndMinutes ? jsx(DegreesMinutesField, {
-          name: "vaSigmetVolcanoCoordinates.latitude",
-          label: t('latitude-degrees-and-minutes'),
           disabled: isDisabled,
           isReadOnly: isReadOnly,
+          label: t('latitude-degrees-and-minutes'),
+          name: "vaSigmetVolcanoCoordinates.latitude",
           t: t
         }) : jsx(ReactHookFormNumberField, {
-          name: "vaSigmetVolcanoCoordinates.latitude",
-          label: t('latitude'),
-          inputMode: "decimal",
-          size: "small",
-          sx: styles$2.latitude,
           disabled: isDisabled,
+          inputMode: "decimal",
           isReadOnly: isReadOnly,
-          onChange: function onChange() {
-            return trigger('vaSigmetVolcanoCoordinates.longitude');
-          },
+          label: t('latitude'),
+          name: "vaSigmetVolcanoCoordinates.latitude",
+          onChange: function () {
+            var _onChange = _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", trigger('vaSigmetVolcanoCoordinates.longitude'));
+                  case 1:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            function onChange() {
+              return _onChange.apply(this, arguments);
+            }
+            return onChange;
+          }(),
           rules: {
             required: true,
             validate: {
@@ -7178,28 +7423,42 @@ var VolcanicFields = function VolcanicFields(_ref) {
                 return isNonOrBothCoordinates(value, getValues('vaSigmetVolcanoCoordinates.longitude'));
               }
             }
-          }
+          },
+          size: "small",
+          sx: styles$2.latitude
         })
       }), (!isReadOnly || !!watch('vaSigmetVolcanoCoordinates.longitude')) && jsx(Grid, {
         size: 6,
         children: degreesAndMinutes ? jsx(DegreesMinutesField, {
-          name: "vaSigmetVolcanoCoordinates.longitude",
-          label: t('longitude-degrees-and-minutes'),
           disabled: isDisabled,
-          isReadOnly: isReadOnly,
           isLongitude: true,
+          isReadOnly: isReadOnly,
+          label: t('longitude-degrees-and-minutes'),
+          name: "vaSigmetVolcanoCoordinates.longitude",
           t: t
         }) : jsx(ReactHookFormNumberField, {
-          name: "vaSigmetVolcanoCoordinates.longitude",
-          label: t('longitude'),
-          inputMode: "decimal",
-          size: "small",
-          sx: styles$2.latitude,
           disabled: isDisabled,
+          inputMode: "decimal",
           isReadOnly: isReadOnly,
-          onChange: function onChange() {
-            return trigger('vaSigmetVolcanoCoordinates.latitude');
-          },
+          label: t('longitude'),
+          name: "vaSigmetVolcanoCoordinates.longitude",
+          onChange: function () {
+            var _onChange2 = _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", trigger('vaSigmetVolcanoCoordinates.latitude'));
+                  case 1:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2);
+            }));
+            function onChange() {
+              return _onChange2.apply(this, arguments);
+            }
+            return onChange;
+          }(),
           rules: {
             required: true,
             validate: {
@@ -7208,7 +7467,9 @@ var VolcanicFields = function VolcanicFields(_ref) {
                 return isNonOrBothCoordinates(value, getValues('vaSigmetVolcanoCoordinates.latitude'));
               }
             }
-          }
+          },
+          size: "small",
+          sx: styles$2.latitude
         })
       })]
     })
@@ -7278,13 +7539,15 @@ var SurfaceVisibility = function SurfaceVisibility(_ref) {
       justifyContent: "flex-start",
       size: 8,
       children: [jsx(Grid, {
-        sx: styles$2.surfaceVisibility,
         size: 12,
+        sx: styles$2.surfaceVisibility,
         children: jsx(ReactHookFormNumberField, {
-          name: "visibilityValue",
           "data-testid": "surfaceVisibility-visibilityValue",
-          label: visibilityLabel,
+          disabled: isDisabled,
           helperText: t('surface-visibility-helper-text'),
+          isReadOnly: isReadOnly,
+          label: visibilityLabel,
+          name: "visibilityValue",
           rules: {
             validate: {
               isRequired: isRequired,
@@ -7310,8 +7573,6 @@ var SurfaceVisibility = function SurfaceVisibility(_ref) {
             }
           },
           size: "small",
-          disabled: isDisabled,
-          isReadOnly: isReadOnly,
           sx: {
             ' .MuiFormHelperText-root': {
               lineHeight: '1.33em'
@@ -7324,20 +7585,20 @@ var SurfaceVisibility = function SurfaceVisibility(_ref) {
           marginTop: -2
         },
         children: jsx(ReactHookFormSelect, {
-          name: "visibilityCause",
-          label: visibilityCauseLabel,
-          rules: {
-            validate: {
-              isRequired: isRequired
-            }
-          },
+          "data-testid": "surfaceVisibility-visibilityCause",
           disabled: isDisabled,
           isReadOnly: isReadOnly,
-          "data-testid": "surfaceVisibility-visibilityCause",
+          label: visibilityCauseLabel,
+          name: "visibilityCause",
           onChange: function onChange(event) {
             event.stopPropagation();
             _onChange();
           },
+          rules: {
+            validate: {
+              isRequired: isRequired
+            }
+          },
           size: "small",
           children: Object.keys(VisibilityCause).map(function (key) {
             return jsx(MenuItem, {
@@ -7405,12 +7666,15 @@ var SurfaceWind = function SurfaceWind(_ref) {
       justifyContent: "flex-start",
       size: 8,
       children: [jsx(Grid, {
-        sx: styles$2.surfaceWind,
         size: 12,
+        sx: styles$2.surfaceWind,
         children: jsx(ReactHookFormNumberField, {
-          name: "windDirection",
-          label: windLabel,
+          "data-testid": "surfaceWind-windDirection",
+          disabled: isDisabled,
           helperText: t('surface-wind-helper-text'),
+          isReadOnly: isReadOnly,
+          label: windLabel,
+          name: "windDirection",
           rules: {
             min: {
               value: 10,
@@ -7427,23 +7691,28 @@ var SurfaceWind = function SurfaceWind(_ref) {
               }
             }
           },
-          size: "small",
-          disabled: isDisabled,
-          isReadOnly: isReadOnly,
-          "data-testid": "surfaceWind-windDirection"
+          size: "small"
         })
       }), jsxs(Grid, {
         container: true,
         size: 12,
+        spacing: 0,
         sx: {
           marginTop: -2
         },
-        spacing: 0,
         children: [jsx(Grid, {
           size: 5,
           children: jsx(ReactHookFormSelect, {
-            name: "windUnit",
+            "data-testid": "surfaceWind-windUnit",
+            defaultValue: 'KT',
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: t('unit-label'),
+            name: "windUnit",
+            onChange: function onChange() {
+              triggerValidations(['windSpeed'], getValues, trigger);
+              _onChange();
+            },
             rules: {
               validate: {
                 isRequired: isRequired
@@ -7451,14 +7720,6 @@ var SurfaceWind = function SurfaceWind(_ref) {
             },
             size: "small",
             sx: styles$2.unit,
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            defaultValue: 'KT',
-            "data-testid": "surfaceWind-windUnit",
-            onChange: function onChange() {
-              triggerValidations(['windSpeed'], getValues, trigger);
-              _onChange();
-            },
             children: Object.keys(allowedWindUnitsForFir).map(function (key) {
               return jsx(MenuItem, {
                 value: key,
@@ -7469,8 +7730,11 @@ var SurfaceWind = function SurfaceWind(_ref) {
         }), jsx(Grid, {
           size: 7,
           children: jsx(ReactHookFormNumberField, {
-            name: "windSpeed",
+            "data-testid": "surfaceWind-windSpeed",
+            disabled: isDisabled,
+            isReadOnly: isReadOnly,
             label: speedLabel,
+            name: "windSpeed",
             rules: {
               validate: {
                 isRequired: isRequired,
@@ -7495,10 +7759,7 @@ var SurfaceWind = function SurfaceWind(_ref) {
                 }
               }
             },
-            size: "small",
-            disabled: isDisabled,
-            isReadOnly: isReadOnly,
-            "data-testid": "surfaceWind-windSpeed"
+            size: "small"
           })
         })]
       })]
@@ -7572,7 +7833,7 @@ var CloudLevels = function CloudLevels(_ref) {
   var cloudLevelInfoMode = watch('cloudLevelInfoMode');
   // Get allowed cloud level units based on selected FIR - if no FIR selected, allow all default units
   var allowedCloudLevelUnitsForFir = getAllowedUnits(getFIRValue(), productConfig, 'cloud_level_unit', CloudLevelUnits);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV') {
       unregister('cloudLowerLevel');
     }
@@ -7586,8 +7847,8 @@ var CloudLevels = function CloudLevels(_ref) {
       justifyContent: "flex-end",
       size: 4,
       children: jsx(Typography, {
-        variant: "subtitle1",
         sx: styles$2.label,
+        variant: "subtitle1",
         children: t('levels')
       })
     }), jsx(Grid, {
@@ -7597,8 +7858,8 @@ var CloudLevels = function CloudLevels(_ref) {
       children: jsxs(Grid, {
         size: 12,
         children: [jsx(ReactHookFormHiddenInput, {
-          name: "cloudLevelInfoMode",
-          defaultValue: "BETW"
+          defaultValue: "BETW",
+          name: "cloudLevelInfoMode"
         }), jsxs(Grid, {
           container: true,
           size: 12,
@@ -7610,6 +7871,9 @@ var CloudLevels = function CloudLevels(_ref) {
               children: jsx(FormControlLabel, {
                 control: jsx(Checkbox, {
                   checked: cloudLevelInfoMode === 'BETW_ABV' || cloudLevelInfoMode === 'BETW_SFC_ABV',
+                  color: "secondary",
+                  disabled: isDisabled,
+                  name: "checkedAbove",
                   onChange: function onChange() {
                     switch (getValues('cloudLevelInfoMode')) {
                       case 'BETW':
@@ -7633,10 +7897,7 @@ var CloudLevels = function CloudLevels(_ref) {
                         });
                         break;
                     }
-                  },
-                  name: "checkedAbove",
-                  color: "secondary",
-                  disabled: isDisabled
+                  }
                 }),
                 "data-testid": "cloudLevels-Above",
                 label: "Above"
@@ -7645,25 +7906,25 @@ var CloudLevels = function CloudLevels(_ref) {
           }), jsx(Grid, {
             size: 3,
             children: jsx(ReactHookFormSelect, {
-              name: "cloudLevel.unit",
-              label: "Unit",
               "data-testid": "cloudLevel-unit",
-              rules: {
-                validate: {
-                  isRequired: isRequired
-                }
-              },
-              size: "small",
-              sx: styles$2.unit,
+              defaultValue: 'FT',
               disabled: isDisabled,
               isReadOnly: isReadOnly,
-              defaultValue: 'FT',
+              label: "Unit",
+              name: "cloudLevel.unit",
               onChange: function onChange() {
                 // Unit change is reflected in the Lower Cloud Level
                 setValue('cloudLowerLevel.unit', getValues('cloudLevel.unit'));
                 triggerValidations(['cloudLevel.value', 'cloudLowerLevel.value'], getValues, trigger);
                 _onChange();
               },
+              rules: {
+                validate: {
+                  isRequired: isRequired
+                }
+              },
+              size: "small",
+              sx: styles$2.unit,
               children: Object.keys(allowedCloudLevelUnitsForFir).map(function (key) {
                 return jsx(MenuItem, {
                   value: key,
@@ -7674,11 +7935,14 @@ var CloudLevels = function CloudLevels(_ref) {
           }), jsx(Grid, {
             size: 5,
             children: jsx(ReactHookFormNumberField, {
-              name: "cloudLevel.value",
-              label: "Upper level",
               "data-testid": "cloudLevel-value",
-              size: "small",
-              sx: styles$2.levelField,
+              disabled: isDisabled,
+              isReadOnly: isReadOnly,
+              label: "Upper level",
+              name: "cloudLevel.value",
+              onChange: function onChange() {
+                triggerValidations(['cloudLowerLevel.value'], getValues, trigger);
+              },
               rules: {
                 validate: {
                   isRequired: isRequired,
@@ -7700,11 +7964,8 @@ var CloudLevels = function CloudLevels(_ref) {
                   }
                 }
               },
-              disabled: isDisabled,
-              isReadOnly: isReadOnly,
-              onChange: function onChange() {
-                triggerValidations(['cloudLowerLevel.value'], getValues, trigger);
-              }
+              size: "small",
+              sx: styles$2.levelField
             })
           })]
         }), jsxs(Grid, {
@@ -7718,6 +7979,9 @@ var CloudLevels = function CloudLevels(_ref) {
               children: jsx(FormControlLabel, {
                 control: jsx(Checkbox, {
                   checked: cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV',
+                  color: "secondary",
+                  disabled: isDisabled,
+                  name: "checkedSFC",
                   onChange: function onChange() {
                     switch (getValues('cloudLevelInfoMode')) {
                       case 'BETW':
@@ -7741,10 +8005,7 @@ var CloudLevels = function CloudLevels(_ref) {
                         });
                         break;
                     }
-                  },
-                  name: "checkedSFC",
-                  color: "secondary",
-                  disabled: isDisabled
+                  }
                 }),
                 "data-testid": "cloudLevels-SFC",
                 label: "SFC"
@@ -7754,25 +8015,25 @@ var CloudLevels = function CloudLevels(_ref) {
             children: [jsx(Grid, {
               size: 3,
               children: jsx(ReactHookFormSelect, {
-                name: "cloudLowerLevel.unit",
-                label: "Unit",
                 "data-testid": "cloudLowerLevel-unit",
-                rules: {
-                  validate: {
-                    isRequired: isRequired
-                  }
-                },
-                size: "small",
-                sx: styles$2.unit,
+                defaultValue: getValues('cloudLevel.unit') ? getValues('cloudLevel.unit') : 'FT',
                 disabled: isDisabled,
                 isReadOnly: isReadOnly,
-                defaultValue: getValues('cloudLevel.unit') ? getValues('cloudLevel.unit') : 'FT',
+                label: "Unit",
+                name: "cloudLowerLevel.unit",
                 onChange: function onChange() {
                   // Unit change is reflected in the Upper Cloud Level
                   setValue('cloudLevel.unit', getValues('cloudLowerLevel.unit'));
                   triggerValidations(['cloudLowerLevel.value', 'cloudLevel.value'], getValues, trigger);
                   _onChange();
                 },
+                rules: {
+                  validate: {
+                    isRequired: isRequired
+                  }
+                },
+                size: "small",
+                sx: styles$2.unit,
                 children: Object.keys(allowedCloudLevelUnitsForFir).map(function (key) {
                   return jsx(MenuItem, {
                     value: key,
@@ -7783,9 +8044,11 @@ var CloudLevels = function CloudLevels(_ref) {
             }), jsx(Grid, {
               size: 5,
               children: jsx(ReactHookFormNumberField, {
-                name: "cloudLowerLevel.value",
-                label: "Lower level",
                 "data-testid": "cloudLowerLevel-value",
+                disabled: isDisabled,
+                isReadOnly: isReadOnly,
+                label: "Lower level",
+                name: "cloudLowerLevel.value",
                 rules: {
                   validate: {
                     isRequired: isRequired,
@@ -7813,9 +8076,7 @@ var CloudLevels = function CloudLevels(_ref) {
                     }
                   }
                 },
-                size: "small",
-                disabled: isDisabled,
-                isReadOnly: isReadOnly
+                size: "small"
               })
             })]
           })]
@@ -7831,16 +8092,16 @@ var IssuedAt = function IssuedAt(_ref) {
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   return jsx(ProductFormFieldLayout, {
-    title: t('issued-at'),
     sx: {
       marginTop: -2
     },
+    title: t('issued-at'),
     children: jsx(Typography, {
-      variant: "body2",
       sx: Object.assign({}, styles$2.body, {
         fontSize: '1rem',
         color: isReadOnly ? 'geowebColors.typographyAndIcons.text' : 'geowebColors.buttons.primary.disabled.color'
       }),
+      variant: "body2",
       children: date
     })
   });
@@ -7934,7 +8195,8 @@ var useTAC = function useTAC(t, initialProduct, getTAC, hasErrors, omitChange) {
       return false;
     };
   }
-  var _React$useState = React__default.useState(noTAC(t)),
+  // eslint-disable-next-line react/hook-use-state
+  var _React$useState = React.useState(noTAC(t)),
     TAC = _React$useState[0],
     setTAC = _React$useState[1];
   var _useIsMounted = useIsMounted(),
@@ -7971,7 +8233,7 @@ var useTAC = function useTAC(t, initialProduct, getTAC, hasErrors, omitChange) {
       return _ref.apply(this, arguments);
     };
   }();
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (shouldRetrieveTAC(initialProduct, omitChange) && !hasErrors()) {
       void retrieveTAC(initialProduct);
     }
@@ -7984,7 +8246,7 @@ var useTAC = function useTAC(t, initialProduct, getTAC, hasErrors, omitChange) {
       setTAC(noTAC(t));
     }
   };
-  var debouncedSearch = React__default.useRef(debounce(/*#__PURE__*/function () {
+  var debouncedSearch = React.useRef(debounce(/*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(formFn, hasFormErrors) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -8015,14 +8277,15 @@ var ProductFormTAC = function ProductFormTAC(_ref3) {
   var sequenceNumberInTac = findSequenceNumber(tac, noTAC(t));
   var sequenceStyle = getSequenceStyling(product, hasTac);
   return jsx(Typography, {
-    variant: "body2",
     component: "div",
+    "data-testid": "productform-tac-message",
     sx: {
       whiteSpace: 'break-spaces'
     },
-    "data-testid": "productform-tac-message",
+    variant: "body2",
     children: jsx(Box, {
       component: "p",
+      "data-testid": "productform-tac-message-line",
       sx: {
         margin: 0,
         fontSize: '1.125rem',
@@ -8031,7 +8294,6 @@ var ProductFormTAC = function ProductFormTAC(_ref3) {
         letterSpacing: '0.5px',
         marginTop: '2px'
       },
-      "data-testid": "productform-tac-message-line",
       children: tac.split(' ').map(function (word, index) {
         return jsx(Box, {
           component: "span",
@@ -8048,16 +8310,16 @@ var Tac = function Tac(_ref) {
     children = _ref.children,
     product = _ref.product;
   return jsxs(ProductFormFieldLayout, {
-    title: "TAC",
     sx: {
       marginTop: -3,
       '.MuiTypography-root.MuiTypography-subtitle1': {
         marginTop: '2px'
       }
     },
+    title: "TAC",
     children: [jsx(ProductFormTAC, {
-      tac: tac,
-      product: product
+      product: product,
+      tac: tac
     }), children]
   });
 };
@@ -8074,7 +8336,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
   var firstMap = useSelector(function (store) {
     return mapSelectors.getFirstMap(store);
   }, shallowEqual);
-  var firstMapId = firstMap && firstMap.id ? firstMap.id : '';
+  var firstMapId = firstMap != null && firstMap.id ? firstMap.id : '';
   var mapLayers = useSelector(function (store) {
     return mapSelectors.getMapLayers(store, firstMapId);
   }, shallowEqual);
@@ -8090,7 +8352,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
     dispatch(syncGroupsActions.syncGroupAddTarget(payload));
   }, [dispatch]);
   React.useEffect(function () {
-    if (mapLayers && mapLayers.length) {
+    if (mapLayers != null && mapLayers.length) {
       // use maplayers, but change layerId and current mapId
       var layers = mapLayers.map(function (layer) {
         return Object.assign({}, layer, {
@@ -8103,7 +8365,7 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
         layers: layers
       }));
     }
-    if (mapDimensions && mapDimensions.length) {
+    if (mapDimensions != null && mapDimensions.length) {
       dispatch(mapActions.mapChangeDimension({
         mapId: mapId,
         dimension: mapDimensions[0],
@@ -8150,23 +8412,23 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return jsxs("div", {
+    "data-testid": "MapView",
+    ref: mapWindowRef,
     style: {
       position: 'relative',
       height: '100%'
     },
-    "data-testid": "MapView",
-    ref: mapWindowRef,
     children: [jsx(LegendConnect, {
-      showMapId: true,
-      mapId: mapId
-    }), jsxs(OlMapViewConnect, {
       mapId: mapId,
+      showMapId: true
+    }), jsxs(OlMapViewConnect, {
       controls: {
         mapControlsPositionTop: 0,
         layerManagerAndLegend: true,
         zoomControls: true,
         dimensionSelect: true
       },
+      mapId: mapId,
       source: "module",
       children: [children, geoJSONLayers.map(function (layer) {
         return jsxs("div", {
@@ -8176,19 +8438,19 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
             style: genericOpenLayersFeatureStyle,
             zIndex: 2000
           }), jsx(OpenLayersMapDraw, {
-            viewOnlyStyle: genericOpenLayersFeatureStyle,
-            selectedFeatureIndex: layer.selectedFeatureIndex || 0,
-            geojson: layer.geojson,
             drawMode: layer.drawMode,
-            isInEditMode: layer.isInEditMode || false,
-            updateGeojson: layer.updateGeojson,
             exitDrawModeCallback: function exitDrawModeCallback(reason) {
               try {
-                (layer == null ? void 0 : layer.exitDrawModeCallback) && (layer == null ? void 0 : layer.exitDrawModeCallback(reason));
+                layer == null || layer.exitDrawModeCallback == null || layer.exitDrawModeCallback(reason);
               } catch (e) {
                 window.console.trace(e);
               }
-            }
+            },
+            geojson: layer.geojson,
+            isInEditMode: layer.isInEditMode || false,
+            selectedFeatureIndex: layer.selectedFeatureIndex || 0,
+            updateGeojson: layer.updateGeojson,
+            viewOnlyStyle: genericOpenLayersFeatureStyle
           })]
         }, layer.id);
       })]
@@ -8201,9 +8463,9 @@ var MapViewGeoJson = function MapViewGeoJson(_ref) {
         width: '100%'
       },
       children: jsx(TimeSliderConnect, {
-        sourceId: timesliderId,
         mapId: mapId,
-        mapWindowRef: mapWindowRef
+        mapWindowRef: mapWindowRef,
+        sourceId: timesliderId
       })
     })]
   });
@@ -8228,6 +8490,11 @@ var ProductFormLayout = function ProductFormLayout(_ref) {
       overflowY: 'hidden'
     }, _sx),
     children: [jsx(Grid, {
+      size: {
+        xs: 12,
+        sm: 6,
+        lg: 8
+      },
       sx: (_sx2 = {
         height: 400,
         padding: 2
@@ -8235,18 +8502,18 @@ var ProductFormLayout = function ProductFormLayout(_ref) {
         height: '100%',
         padding: 0
       }, _sx2),
-      size: {
-        xs: 12,
-        sm: 6,
-        lg: 8
-      },
       children: jsx(MapViewGeoJson, {
         baseLayers: baseLayers,
-        projection: projection,
         geoJSONLayers: geoJSONLayers,
+        projection: projection,
         children: mapChildren
       })
     }), jsx(Grid, {
+      size: {
+        xs: 12,
+        sm: 6,
+        lg: 4
+      },
       sx: (_sx3 = {
         paddingTop: 5,
         paddingBottom: 5,
@@ -8255,11 +8522,6 @@ var ProductFormLayout = function ProductFormLayout(_ref) {
         overflowY: 'auto',
         height: '100%'
       }, _sx3),
-      size: {
-        xs: 12,
-        sm: 6,
-        lg: 4
-      },
       children: children
     })]
   });
@@ -8432,7 +8694,7 @@ var useConditionalFields$1 = function useConditionalFields(productConfig) {
   var hasRadioactiveCloud = watch('phenomenon') === 'RDOACT_CLD';
   var changeFromConfig = getOmitChangeFromConfig(productConfig);
   var omitChange = changeFromConfig && (hasVolcanicAshes || hasRadioactiveCloud);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (!hasVolcanicAshes) {
       unregister(['vaSigmetVolcanoName', 'vaSigmetVolcanoCoordinates.latitude', 'vaSigmetVolcanoCoordinates.longitude']);
     }
@@ -8471,12 +8733,13 @@ var SigmetForm = function SigmetForm(_ref) {
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
     handleSubmit = _useFormContext2.handleSubmit,
+    trigger = _useFormContext2.trigger,
     errors = _useFormContext2.formState.errors;
-  var _React$useState = React__default.useState(false),
+  var _React$useState = React.useState(false),
     hasUserChangedTime = _React$useState[0],
     setHasUserChangedTime = _React$useState[1];
   var firBorderAtStart = initialSigmet ? initialSigmet.locationIndicatorATSR : productConfig.active_firs[0];
-  var _React$useState2 = React__default.useState(getDefaultPhenomena(productConfig).phenomena),
+  var _React$useState2 = React.useState(getDefaultPhenomena(productConfig).phenomena),
     phenomenaList = _React$useState2[0],
     setPhenomenaList = _React$useState2[1];
   var sourcePanelId = useSelector(function (store) {
@@ -8557,7 +8820,7 @@ var SigmetForm = function SigmetForm(_ref) {
   var _useTAC = useTAC(t, initialSigmet != null ? initialSigmet : initialCancelSigmet, getTAC != null ? getTAC : fetchSigmetTAC, getHasFormErrors, getOmitChangeFromConfig(productConfig)),
     tac = _useTAC[0],
     updateTac = _useTAC[1];
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     updateTac(watch);
   }, [initialSigmet, updateTac, watch]);
   var onChangeForm = useCallback(function () {
@@ -8565,15 +8828,18 @@ var SigmetForm = function SigmetForm(_ref) {
   }, [updateTac, watch]);
   var onUpdateStartgeoJSON = useCallback(function (updatedStartGeoJSON, updateStartGeoJSONIntersection) {
     setValue('startGeometry', updatedStartGeoJSON, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometry'), updatedStartGeoJSON)
     });
     setValue('startGeometryIntersect', updateStartGeoJSONIntersection, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometryIntersect'), updateStartGeoJSONIntersection)
     });
+    queueMicrotask(function () {
+      return void trigger('startGeometry');
+    });
     onChangeForm();
-  }, [setValue, watch, onChangeForm]);
+  }, [setValue, watch, trigger, onChangeForm]);
   var onUpdateEndGeoJson = useCallback(function (updatedEndGeoJSON, updateEndGeoJSONIntersection) {
     setValue('endGeometry', updatedEndGeoJSON, {
       shouldValidate: true,
@@ -8628,12 +8894,12 @@ var SigmetForm = function SigmetForm(_ref) {
     updateGeojson: updateStartGeoJson
   }), getEndLayer('geoJSONIntersection', 'geojsonlayer-intersection-end'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
   useFormLayers(layers);
-  var _React$useState3 = React__default.useState(mode === 'view'),
+  var _React$useState3 = React.useState(mode === 'view'),
     isDisabled = _React$useState3[0],
     setIsDisabled = _React$useState3[1];
   var isReadOnly = mode === 'view';
   var helperText = isReadOnly ? '' : 'Optional';
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     var isInDrawMode = activeStartTool !== '' || activeEndTool !== '';
     setDialogActionsDisabled == null || setDialogActionsDisabled(isInDrawMode);
     if (mode === 'view') {
@@ -8678,92 +8944,92 @@ var SigmetForm = function SigmetForm(_ref) {
       spacing: 2,
       sx: formStyles,
       children: [jsx(Type, {
-        productType: "sigmet",
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeForm
+        onChange: onChangeForm,
+        productType: "sigmet"
       }), !isCancelSigmet && jsx(Phenomenon, {
-        productType: "sigmet",
-        productConfig: productConfig,
-        phenomenaList: phenomenaList,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeForm
+        onChange: onChangeForm,
+        phenomenaList: phenomenaList,
+        productConfig: productConfig,
+        productType: "sigmet"
       }), !isCancelSigmet && jsx(ObservationForecast, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly
       }), !isCancelSigmet && jsx(ObservationForecastTime, {
+        helperText: helperText,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        helperText: helperText,
         onChange: onChangeForm
       }), !isCancelSigmet && hasVolcanicAshes && !isShortTest() ? jsx(VolcanicFields, {
-        isDisabled: isDisabled,
-        isReadOnly: isReadOnly,
+        degreesAndMinutes: degreesAndMinutes,
         helperText: helperText,
-        degreesAndMinutes: degreesAndMinutes
+        isDisabled: isDisabled,
+        isReadOnly: isReadOnly
       }) : null, jsx(ValidFrom, {
-        productConfig: productConfig,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
+        lockBecauseActive: lockValidFrom,
         onChange: onChangeForm,
         onUserChange: function onUserChange() {
           return setHasUserChangedTime(true);
         },
-        lockBecauseActive: lockValidFrom
+        productConfig: productConfig
       }), jsx(ValidUntil, {
-        productConfig: productConfig,
+        hasUserChangedTime: hasUserChangedTime,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        hasUserChangedTime: hasUserChangedTime,
         onUserChange: function onUserChange() {
           return setHasUserChangedTime(true);
-        }
+        },
+        productConfig: productConfig
       }), jsx(SelectFIR, {
-        productConfig: productConfig,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: function onChange(event, newPhenomenaList) {
           onChangeFir(newPhenomenaList != null ? newPhenomenaList : [], event);
-        }
+        },
+        productConfig: productConfig
       }), jsx(StartGeometry, {
-        isReadOnly: isReadOnly,
+        activeTool: activeStartTool,
         geoJSON: startGeoJSON,
         geoJSONIntersection: startGeoJSONIntersection,
-        tools: startEditModes,
+        isDisabled: drawToolsDisabled,
+        isReadOnly: isReadOnly,
         onChangeTool: onChangeStartTool,
-        activeTool: activeStartTool,
         productConfig: productConfig,
-        isDisabled: drawToolsDisabled
+        tools: startEditModes
       }), !isCancelSigmet && jsx(Levels, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        productType: "sigmet",
-        productConfig: productConfig
-      }), !isCancelSigmet && jsx(Progress, {
-        productType: "sigmet",
         productConfig: productConfig,
+        productType: "sigmet"
+      }), !isCancelSigmet && jsx(Progress, {
+        activeTool: activeEndTool,
+        drawToolsDisabled: drawToolsDisabled,
+        geoJSON: endGeoJSON,
+        geoJSONIntersection: endGeoJSONIntersection,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        geoJSON: endGeoJSON,
-        geoJSONIntersection: endGeoJSONIntersection,
-        tools: endEditModes,
         onChangeTool: onChangeEndTool,
-        activeTool: activeEndTool,
-        drawToolsDisabled: drawToolsDisabled
+        productConfig: productConfig,
+        productType: "sigmet",
+        tools: endEditModes
       }), !isCancelSigmet && !omitChange && jsx(Change, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly
       }), isCancelSigmet && watch('vaSigmetMoveToFIR') ? jsx(ProductFormFieldLayout, {
         children: jsxs(Typography, {
-          variant: "body2",
+          "data-testid": "vaSigmetMoveToFIR",
           sx: Object.assign({}, styles$2.body, {
             marginBottom: '-4px'
           }),
-          "data-testid": "vaSigmetMoveToFIR",
+          variant: "body2",
           children: [t('vulcanic-cloud-moving-text'), ":", ' ', jsxs("b", {
             children: [" ", watch('vaSigmetMoveToFIR')]
           })]
@@ -8772,11 +9038,11 @@ var SigmetForm = function SigmetForm(_ref) {
         date: getProductIssueDate(t, initialSigmet, initialCancelSigmet),
         isReadOnly: isReadOnly
       }), jsxs(Tac, {
-        tac: tac,
         product: product,
+        tac: tac,
         children: [jsx(ReactHookFormHiddenInput, {
-          name: "sequence",
-          defaultValue: "-1"
+          defaultValue: "-1",
+          name: "sequence"
         }), /* Add hidden fields for TAC generation in case of cancel sigmet */
         isCancelSigmet ? jsxs(Fragment, {
           children: [jsx(ReactHookFormHiddenInput, {
@@ -8802,8 +9068,8 @@ var SigmetForm = function SigmetForm(_ref) {
       width: '100%'
     },
     children: jsx(ProductFormLayout, {
-      productConfig: productConfig,
       geoJSONLayers: layers,
+      productConfig: productConfig,
       children: renderForm()
     })
   });
@@ -8816,28 +9082,28 @@ var useConditionalFields = function useConditionalFields() {
   // phenomenon: SFC_VIS
   var phenomenon = watch('phenomenon');
   var hasSurfaceVisiblity = phenomenon === 'SFC_VIS';
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (!hasSurfaceVisiblity) {
       unregister(['visibilityValue', 'visibilityCause']);
     }
   }, [hasSurfaceVisiblity, unregister]);
   // phenomenon: SFC_WIND
   var hasSurfaceWind = watch('phenomenon') === 'SFC_WIND';
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (!hasSurfaceWind) {
       unregister(['windDirection', 'windUnit', 'windSpeed']);
     }
   }, [hasSurfaceWind, unregister]);
   // phenomenon: SFC_WIND, SFC_VIS, BKN_CLD, OVC_CLD
   var hasLevels = phenomenon !== 'SFC_WIND' && phenomenon !== 'SFC_VIS' && phenomenon !== 'BKN_CLD' && phenomenon !== 'OVC_CLD';
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (!hasLevels) {
       unregister(['levelInfoMode', 'level', 'lowerLevel']);
     }
   }, [hasLevels, unregister]);
   // phenomenon: BKN_CLD
   var hasCloudLevels = phenomenon === 'BKN_CLD' || phenomenon === 'OVC_CLD';
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (!hasCloudLevels) {
       unregister(['cloudLevelInfoMode', 'cloudLevel', 'cloudLowerLevel']);
     }
@@ -8872,10 +9138,10 @@ var AirmetForm = function AirmetForm(_ref) {
     getValues = _useFormContext2.getValues,
     trigger = _useFormContext2.trigger,
     errors = _useFormContext2.formState.errors;
-  var _React$useState = React__default.useState(getDefaultPhenomena(productConfig).phenomena),
+  var _React$useState = React.useState(getDefaultPhenomena(productConfig).phenomena),
     phenomenaList = _React$useState[0],
     setPhenomenaList = _React$useState[1];
-  var _React$useState2 = React__default.useState(false),
+  var _React$useState2 = React.useState(false),
     hasUserChangedTime = _React$useState2[0],
     setHasUserChangedTime = _React$useState2[1];
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
@@ -8931,7 +9197,7 @@ var AirmetForm = function AirmetForm(_ref) {
   var _useTAC = useTAC(t, initialAirmet != null ? initialAirmet : initialCancelAirmet, getTAC != null ? getTAC : fetchAirmetTAC, getHasFormErrors),
     tac = _useTAC[0],
     updateTac = _useTAC[1];
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     updateTac(watch);
   }, [initialAirmet, updateTac, watch]);
   var onChangeForm = useCallback(function () {
@@ -8939,15 +9205,18 @@ var AirmetForm = function AirmetForm(_ref) {
   }, [updateTac, watch]);
   var onUpdateStartgeoJSON = useCallback(function (updatedStartGeoJSON, updateStartGeoJSONIntersection) {
     setValue('startGeometry', updatedStartGeoJSON, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometry'), updatedStartGeoJSON)
     });
     setValue('startGeometryIntersect', updateStartGeoJSONIntersection, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometryIntersect'), updateStartGeoJSONIntersection)
     });
+    queueMicrotask(function () {
+      return void trigger('startGeometry');
+    });
     onChangeForm();
-  }, [setValue, watch, onChangeForm]);
+  }, [setValue, watch, onChangeForm, trigger]);
   var updateStartGeoJson = useCallback(function (newGeoJSON) {
     var _setGeoJSON = setGeoJSON(newGeoJSON),
       newStartGeoJson = _setGeoJSON[0],
@@ -8972,12 +9241,12 @@ var AirmetForm = function AirmetForm(_ref) {
     updateGeojson: updateStartGeoJson
   }), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
   useFormLayers(layers);
-  var _React$useState3 = React__default.useState(mode === 'view'),
+  var _React$useState3 = React.useState(mode === 'view'),
     isDisabled = _React$useState3[0],
     setIsDisabled = _React$useState3[1];
   var isReadOnly = mode === 'view';
   var helperText = isReadOnly ? '' : 'Optional';
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     var isInDrawMode = activeStartTool !== '';
     if (mode === 'view') {
       setIsDisabled(true);
@@ -9014,98 +9283,98 @@ var AirmetForm = function AirmetForm(_ref) {
       spacing: 2,
       sx: formStyles,
       children: [jsx(Type, {
-        productType: "airmet",
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeForm
+        onChange: onChangeForm,
+        productType: "airmet"
       }), !isCancelAirmet && jsx(Phenomenon, {
-        productType: "airmet",
-        productConfig: productConfig,
-        phenomenaList: phenomenaList,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeForm
+        onChange: onChangeForm,
+        phenomenaList: phenomenaList,
+        productConfig: productConfig,
+        productType: "airmet"
       }), !isCancelAirmet && hasSurfaceVisiblity ? jsx(SurfaceVisibility, {
-        isReadOnly: isReadOnly,
         isDisabled: isDisabled,
+        isReadOnly: isReadOnly,
         onChange: onChangeForm,
         productConfig: productConfig
       }) : null, !isCancelAirmet && hasSurfaceWind ? jsx(SurfaceWind, {
-        isReadOnly: isReadOnly,
         isDisabled: isDisabled,
+        isReadOnly: isReadOnly,
         onChange: onChangeForm,
         productConfig: productConfig
       }) : null, !isCancelAirmet && jsx(ObservationForecast, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly
       }), !isCancelAirmet && jsx(ObservationForecastTime, {
+        helperText: helperText,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        helperText: helperText,
         onChange: onChangeForm
       }), jsx(ValidFrom, {
-        productConfig: productConfig,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
+        lockBecauseActive: lockValidFrom,
         onChange: onChangeForm,
         onUserChange: function onUserChange() {
           return setHasUserChangedTime(true);
         },
-        lockBecauseActive: lockValidFrom
+        productConfig: productConfig
       }), jsx(ValidUntil, {
-        productConfig: productConfig,
+        hasUserChangedTime: hasUserChangedTime,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        hasUserChangedTime: hasUserChangedTime,
         onUserChange: function onUserChange() {
           return setHasUserChangedTime(true);
-        }
+        },
+        productConfig: productConfig
       }), jsx(SelectFIR, {
-        isReadOnly: isReadOnly,
         isDisabled: isDisabled,
-        productConfig: productConfig,
+        isReadOnly: isReadOnly,
         onChange: function onChange(event, newPhenomenaList) {
           onChangeFir(newPhenomenaList != null ? newPhenomenaList : [], event);
-        }
+        },
+        productConfig: productConfig
       }), jsx(StartGeometry, {
-        isReadOnly: isReadOnly,
+        activeTool: activeStartTool,
         geoJSON: startGeoJSON,
         geoJSONIntersection: startGeoJSONIntersection,
-        tools: startEditModes,
+        isDisabled: drawToolsDisabled,
+        isReadOnly: isReadOnly,
         onChangeTool: onChangeStartTool,
-        activeTool: activeStartTool,
         productConfig: productConfig,
-        isDisabled: drawToolsDisabled
+        tools: startEditModes
       }), !isCancelAirmet && hasLevels ? jsx(Levels, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        productType: "airmet",
-        productConfig: productConfig
+        productConfig: productConfig,
+        productType: "airmet"
       }) : null, !isCancelAirmet && hasCloudLevels ? jsx(CloudLevels, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
         productConfig: productConfig
       }) : null, !isCancelAirmet && jsx(Progress, {
-        productType: "airmet",
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        productConfig: productConfig
+        productConfig: productConfig,
+        productType: "airmet"
       }), !isCancelAirmet && jsx(Change, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly
       }), jsx(IssuedAt, {
-        isReadOnly: isReadOnly,
-        date: getProductIssueDate(t, initialAirmet, initialCancelAirmet)
+        date: getProductIssueDate(t, initialAirmet, initialCancelAirmet),
+        isReadOnly: isReadOnly
       }), jsxs(Tac, {
-        tac: tac,
         product: product,
+        tac: tac,
         children: [jsx(ReactHookFormHiddenInput, {
-          name: "sequence",
-          defaultValue: "-1"
+          defaultValue: "-1",
+          name: "sequence"
         }), /* Add hidden fields for TAC generation in case of cancel airmet */
         isCancelAirmet ? jsxs(Fragment, {
           children: [jsx(ReactHookFormHiddenInput, {
@@ -9131,8 +9400,8 @@ var AirmetForm = function AirmetForm(_ref) {
       width: '100%'
     },
     children: jsx(ProductFormLayout, {
-      productConfig: productConfig,
       geoJSONLayers: layers,
+      productConfig: productConfig,
       children: renderForm()
     })
   });
@@ -9151,24 +9420,24 @@ var CancelSigmetVolcanicMovements = function CancelSigmetVolcanicMovements(_ref)
       variant: "body1",
       children: [t('vulcanic-ash-description'), ":"]
     }), jsxs(ReactHookFormRadioGroup, {
+      defaultValue: t('unknown').toUpperCase(),
       name: "vaSigmetMoveToFIR",
+      row: true,
       rules: {
         validate: {
           isRequired: isRequired
         }
       },
-      row: true,
-      defaultValue: t('unknown').toUpperCase(),
       children: [allFIRS[sigmet.locationIndicatorATSR].adjacent_firs.map(function (adjacentFIR) {
         return jsx(FormControlLabel, {
-          value: adjacentFIR,
           control: jsx(Radio, {}),
-          label: adjacentFIR
+          label: adjacentFIR,
+          value: adjacentFIR
         }, adjacentFIR);
       }), jsx(FormControlLabel, {
-        value: "UNKNOWN",
         control: jsx(Radio, {}),
-        label: t('vulcanic-VA-SIGMET-text')
+        label: t('vulcanic-VA-SIGMET-text'),
+        value: "UNKNOWN"
       }, "UNKNOWN")]
     })]
   });
@@ -9226,7 +9495,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     dialogActionsDisabled = _React$useState3[0],
     setDialogActionsDisabled = _React$useState3[1];
   var postProduct = function postProduct(productToPost, newStatus) {
-    var uuid = product !== null && product.uuid ? product.uuid : null;
+    var uuid = product != null && product.uuid ? product.uuid : null;
     var postProductParam = productType === 'sigmet' ? createSigmetPostParameter(productToPost, newStatus, uuid) : createAirmetPostParameter(productToPost, newStatus, uuid);
     apiCall(postProductParam).then(function () {
       onToggleDialog();
@@ -9241,27 +9510,40 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     }
     toggleDialogStatus(shouldRefreshList);
   };
-  var showConfirmDialog = function showConfirmDialog(action) {
-    return confirmationDialog({
-      title: getConfirmationDialogTitle(t, action, productType),
-      description: getConfirmationDialogContent(t, action, productType),
-      confirmLabel: getConfirmationDialogButtonLabel(t, action, productType),
-      cancelLabel: getConfirmationDialogCancelLabel(t, action),
-      catchOnCancel: action === ProductAction.CLOSE,
-      content: isVAPhenomenon(product, action) && !isShortTest() ? jsx(CancelSigmetVolcanicMovements, {
-        sigmet: product,
-        productConfig: productConfig
-      }) : null
-    });
-  };
-  var onProductButtonPress = /*#__PURE__*/function () {
+  var showConfirmDialog = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(action) {
-      var isDraft, formValues;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.t0 = action;
-            _context.next = _context.t0 === ProductAction.CLOSE ? 3 : _context.t0 === ProductAction.CANCEL ? 5 : _context.t0 === ProductAction.DISCARD ? 7 : _context.t0 === ProductAction.RENEW ? 9 : 11;
+            return _context.abrupt("return", confirmationDialog({
+              title: getConfirmationDialogTitle(t, action, productType),
+              description: getConfirmationDialogContent(t, action, productType),
+              confirmLabel: getConfirmationDialogButtonLabel(t, action, productType),
+              cancelLabel: getConfirmationDialogCancelLabel(t, action),
+              catchOnCancel: action === ProductAction.CLOSE,
+              content: isVAPhenomenon(product, action) && !isShortTest() ? jsx(CancelSigmetVolcanicMovements, {
+                productConfig: productConfig,
+                sigmet: product
+              }) : null
+            }));
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function showConfirmDialog(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onProductButtonPress = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(action) {
+      var isDraft, formValues;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.t0 = action;
+            _context2.next = _context2.t0 === ProductAction.CLOSE ? 3 : _context2.t0 === ProductAction.CANCEL ? 5 : _context2.t0 === ProductAction.DISCARD ? 7 : _context2.t0 === ProductAction.RENEW ? 9 : 11;
             break;
           case 3:
             if (mode === 'view' || !isDirty) {
@@ -9279,7 +9561,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
                 }
               });
             }
-            return _context.abrupt("break", 22);
+            return _context2.abrupt("break", 22);
           case 5:
             void showConfirmDialog(action).then(function () {
               // if volcanic sigmet - add to which FIR it's moving
@@ -9289,7 +9571,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
                 postProduct(product, 'CANCELLED');
               }
             });
-            return _context.abrupt("break", 22);
+            return _context2.abrupt("break", 22);
           case 7:
             void showConfirmDialog(action).then(function () {
               // If we're discarding a new SIGMET/AIRMET - just close the dialog
@@ -9300,23 +9582,23 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
                 postProduct(product, 'DISCARDED');
               }
             });
-            return _context.abrupt("break", 22);
+            return _context2.abrupt("break", 22);
           case 9:
             onRenewClick();
-            return _context.abrupt("break", 22);
+            return _context2.abrupt("break", 22);
           case 11:
             isDraft = action === ProductAction.SAVE;
             toggleIsDraft(isDraft);
             if (!isDraft) {
-              _context.next = 20;
+              _context2.next = 20;
               break;
             }
-            _context.next = 16;
+            _context2.next = 16;
             return trigger();
           case 16:
             formValues = getValues(); // Save draft without blocking on validation
             postProduct(formValues, 'DRAFT');
-            _context.next = 21;
+            _context2.next = 21;
             break;
           case 20:
             // Validate and submit normally (will block if invalid)
@@ -9326,29 +9608,23 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
               });
             })();
           case 21:
-            return _context.abrupt("break", 22);
+            return _context2.abrupt("break", 22);
           case 22:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function onProductButtonPress(_x) {
-      return _ref2.apply(this, arguments);
+    return function onProductButtonPress(_x2) {
+      return _ref3.apply(this, arguments);
     };
   }();
   var title = getDialogtitle(t, product, productType, productConfig);
   return jsxs(CustomDialog, {
-    open: isOpen,
     "data-testid": "productform-dialog",
-    title: title,
-    fullWidth: true,
-    maxWidth: "xl",
     disableEnforceFocus: true,
     disableEscapeKeyDown: true,
-    onClose: function onClose() {
-      void onProductButtonPress(ProductAction.CLOSE);
-    },
+    fullWidth: true,
     headerActions: getLifecycleActions({
       canBe: productCanBe,
       onButtonPress: onProductButtonPress,
@@ -9356,19 +9632,25 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
       areActionsDisabled: dialogActionsDisabled,
       t: t
     }),
+    maxWidth: "xl",
+    onClose: function onClose() {
+      void onProductButtonPress(ProductAction.CLOSE);
+    },
+    open: isOpen,
+    style: {
+      zIndex: 1000
+    },
     sx: {
       height: '100%',
       '.MuiDialogContent-root': {
         padding: 0
       }
     },
-    style: {
-      zIndex: 1000
-    },
+    title: title,
     children: [errorStoreMessage ? jsx(AlertBanner, {
+      info: errorStoreMessageText,
       severity: "error",
-      title: "An error has occurred while saving, please try again",
-      info: errorStoreMessageText
+      title: "An error has occurred while saving, please try again"
     }) : null, jsx(Box, {
       sx: {
         display: 'flex',
@@ -9376,20 +9658,20 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
         height: '100%'
       },
       children: productType === 'sigmet' ? jsx(SigmetForm, {
-        mode: mode,
-        isCancelSigmet: product !== null && isInstanceOfCancelSigmet(product),
-        initialSigmet: product !== null && !isInstanceOfCancelSigmet(product) ? product : null,
         initialCancelSigmet: product !== null && isInstanceOfCancelSigmet(product) ? product : null,
+        initialSigmet: product !== null && !isInstanceOfCancelSigmet(product) ? product : null,
+        isCancelSigmet: product !== null && isInstanceOfCancelSigmet(product),
+        mode: mode,
+        product: product,
         productConfig: productConfig,
-        setDialogActionsDisabled: setDialogActionsDisabled,
-        product: product
+        setDialogActionsDisabled: setDialogActionsDisabled
       }) : jsx(AirmetForm, {
-        mode: mode,
-        isCancelAirmet: product !== null && isInstanceOfCancelAirmet(product),
         initialAirmet: product !== null && !isInstanceOfCancelAirmet(product) ? product : null,
         initialCancelAirmet: product !== null && isInstanceOfCancelAirmet(product) ? product : null,
-        productConfig: productConfig,
-        product: product
+        isCancelAirmet: product !== null && isInstanceOfCancelAirmet(product),
+        mode: mode,
+        product: product,
+        productConfig: productConfig
       })
     }), jsx(DraftFieldHelper, {}), jsx(Backdrop, {
       "data-testid": "loader",
@@ -9404,8 +9686,8 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     })]
   });
 };
-var Wrapper = function Wrapper(_ref3) {
-  var props = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
+var Wrapper = function Wrapper(_ref4) {
+  var props = Object.assign({}, (_objectDestructuringEmpty(_ref4), _ref4));
   return jsx(ReactHookFormProvider, {
     options: Object.assign({}, defaultFormOptions, {
       defaultValues: props.product,
@@ -9445,15 +9727,15 @@ var ProductFormDialog = function ProductFormDialog(_ref) {
   var product = productListItem !== null ? prepareProductValues(productType === 'sigmet' ? productListItem[productType] : productListItem[productType], productType, productConfig) : null;
   return jsx(Wrapper, {
     isOpen: isOpen,
-    toggleDialogStatus: toggleDialogStatus,
+    mode: mode,
     onRenewClick: function onRenewClick() {
       return handleRenewProductClick(productListItem);
     },
-    mode: mode,
-    productCanBe: productCanBe,
     product: product,
+    productCanBe: productCanBe,
+    productConfig: productConfig,
     productType: productType,
-    productConfig: productConfig
+    toggleDialogStatus: toggleDialogStatus
   });
 };
 
@@ -9483,8 +9765,8 @@ var getActiveStatus = function getActiveStatus(product) {
 var getStatusTagList = function getStatusTagList(product, cancelsSeqId) {
   if (cancelsSeqId !== null) {
     return jsx(StatusTag, {
-      content: "cancels " + cancelsSeqId,
       color: "red",
+      content: "cancels " + cancelsSeqId,
       sx: {
         width: '80px'
       }
@@ -9492,8 +9774,8 @@ var getStatusTagList = function getStatusTagList(product, cancelsSeqId) {
   }
   if (product.status === 'CANCELLED') {
     return jsx(StatusTag, {
-      content: "cancelled " + product.sequence,
       color: "red",
+      content: "cancelled " + product.sequence,
       sx: {
         width: '80px'
       }
@@ -9501,16 +9783,16 @@ var getStatusTagList = function getStatusTagList(product, cancelsSeqId) {
   }
   if (dateUtils.utc(product.validDateEnd) < dateUtils.utc()) {
     return jsx(StatusTag, {
-      content: "expired",
       color: "grey",
+      content: "expired",
       sx: {
         width: '80px'
       }
     });
   }
   return jsx(StatusTag, {
-    content: product.status.toLowerCase(),
     color: product.status === 'PUBLISHED' ? 'green' : 'grey',
+    content: product.status.toLowerCase(),
     sx: {
       marginRight: '0!important',
       width: '80px'
@@ -9616,14 +9898,15 @@ var ProductListRow = function ProductListRow(_ref2) {
     t = _useSigmetAirmetTrans.t;
   var _useIsMounted = useIsMounted(),
     isMounted = _useIsMounted.isMounted;
-  var _React$useState = React__default.useState(''),
+  // eslint-disable-next-line react/hook-use-state
+  var _React$useState = React.useState(''),
     TAC = _React$useState[0],
     setTAC = _React$useState[1];
   var _useTACApi = useTACApi(),
     fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
     fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
   var apiCall = productType === 'sigmet' ? fetchSigmetTAC : fetchAirmetTAC;
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     var retrieveTAC = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(productToPost) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -9682,26 +9965,26 @@ var ProductListRow = function ProductListRow(_ref2) {
   };
   return jsx(Card, {
     elevation: 0,
-    variant: "outlined",
     sx: listRowStyles,
+    variant: "outlined",
     children: jsx(Box, {
       className: "productListContainer",
       children: jsxs(Grid, {
-        container: true,
         alignItems: "center",
-        spacing: 0,
         className: "rowContainer",
+        container: true,
+        spacing: 0,
         children: [jsxs(Grid, {
           className: "col-1",
           children: [phenomenon !== null && jsx(ProductListRowHeader, {
             title: productType.toUpperCase()
           }), jsx(CustomTooltip, {
-            title: phenomenon !== null ? String(getPhenomenon(fir, phenomenon, productConfig)) : '',
             placement: "bottom-start",
+            title: phenomenon !== null ? String(getPhenomenon(fir, phenomenon, productConfig)) : '',
             children: jsx(Typography, {
-              variant: "subtitle2",
               noWrap: true,
               sx: styles.font,
+              variant: "subtitle2",
               children: phenomenon !== null ? getLabel(product) : 'Cancel'
             })
           })]
@@ -9710,6 +9993,19 @@ var ProductListRow = function ProductListRow(_ref2) {
           children: [jsx(ProductListRowHeader, {
             title: t('issue-time')
           }), jsx(CustomTooltip, {
+            placement: "bottom-start",
+            slotProps: {
+              tooltip: {
+                sx: {
+                  bgcolor: 'geowebColors.background.surface',
+                  boxShadow: 8,
+                  '& .MuiTooltip-arrow': {
+                    color: 'common.black'
+                  },
+                  maxWidth: 472
+                }
+              }
+            },
             title: jsxs(Fragment, {
               children: [jsx(ProductListRowHeader, {
                 title: "TAC"
@@ -9717,7 +10013,6 @@ var ProductListRow = function ProductListRow(_ref2) {
                 style: {
                   whiteSpace: 'pre-line'
                 },
-                variant: "subtitle2",
                 sx: Object.assign({}, styles.font, {
                   color: 'geowebColors.typographyAndIcons.text',
                   fontSize: '1.125rem',
@@ -9726,26 +10021,14 @@ var ProductListRow = function ProductListRow(_ref2) {
                   lineHeight: '28px',
                   letterSpacing: '0.5px'
                 }),
+                variant: "subtitle2",
                 children: TAC
               })]
             }),
-            placement: "bottom-start",
-            slotProps: {
-              tooltip: {
-                sx: {
-                  bgcolor: 'geowebColors.background.surface',
-                  boxShadow: 8,
-                  '& .MuiTooltip-arrow': {
-                    color: 'common.black'
-                  },
-                  maxWidth: 472
-                }
-              }
-            },
             children: jsx(Typography, {
-              variant: "subtitle2",
-              sx: styles.font,
               "data-testid": "issueTime",
+              sx: styles.font,
+              variant: "subtitle2",
               children: product.issueDate ? dateUtils.dateToString(dateUtils.utc(product.issueDate), dateUtils.DATE_FORMAT_NAME_OF_MONTH) + " UTC" : t('not-published')
             })
           })]
@@ -9754,20 +10037,20 @@ var ProductListRow = function ProductListRow(_ref2) {
           children: [jsx(ProductListRowHeader, {
             title: t('valid-time')
           }), jsx(Typography, {
-            variant: "subtitle2",
-            sx: styles.font,
             "data-testid": "validTime",
+            sx: styles.font,
+            variant: "subtitle2",
             children: validTime
           })]
         }), jsxs(Grid, {
           className: "col-4",
           container: true,
           children: [product.status === 'DRAFT' ? jsx(Button, {
+            startIcon: jsx(Edit, {}),
             sx: {
               marginTop: '6px'
             },
             variant: "flat",
-            startIcon: jsx(Edit, {}),
             children: t('draft')
           }) : getStatusTagList(product, cancelsSeqId), product.status === 'PUBLISHED' && cancelsSeqId === null && getActiveStatus(product)]
         })]
@@ -9787,9 +10070,9 @@ var ProductList = function ProductList(_ref) {
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   return jsxs(Fragment, {
-    children: [isLoading && jsx(LinearProgress, {
-      "data-testid": "productlist-loadingbar",
+    children: [!!isLoading && jsx(LinearProgress, {
       color: "secondary",
+      "data-testid": "productlist-loadingbar",
       sx: {
         position: 'absolute',
         width: '100%',
@@ -9797,7 +10080,7 @@ var ProductList = function ProductList(_ref) {
         left: 0,
         top: 0
       }
-    }), error && jsx(Box, {
+    }), !!error && jsx(Box, {
       sx: {
         marginBottom: 2,
         ' .MuiAlert-message': {
@@ -9805,25 +10088,25 @@ var ProductList = function ProductList(_ref) {
         }
       },
       children: jsx(AlertBanner, {
-        severity: "error",
-        title: error.name,
+        dataTestId: "productList-alert",
         info: error.message ? error.message : '',
-        dataTestId: "productList-alert"
+        severity: "error",
+        title: error.name
       })
     }), jsxs(Grid, {
+      alignItems: "stretch",
       container: true,
       direction: "column",
-      alignItems: "stretch",
       children: [jsx(Grid, {
         container: true,
         justifyContent: "flex-end",
         children: jsx(Button, {
-          variant: "primary",
           "data-testid": "productListCreateButton",
           onClick: onClickNewProduct,
           sx: {
             textTransform: 'initial'
           },
+          variant: "primary",
           children: t('create-new-product', {
             product: productType.toUpperCase()
           })
@@ -9833,7 +10116,7 @@ var ProductList = function ProductList(_ref) {
           width: '100%',
           minHeight: '600px'
         },
-        children: productList && jsx(List, {
+        children: !!productList && jsx(List, {
           sx: {
             paddingTop: 4,
             containerType: 'inline-size'
@@ -9850,8 +10133,8 @@ var ProductList = function ProductList(_ref) {
               },
               children: jsx(ProductListRow, {
                 product: product,
-                productType: productType,
-                productConfig: productConfig
+                productConfig: productConfig,
+                productType: productType
               })
             }, product.uuid);
           })
@@ -9934,14 +10217,14 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
     errorList = _useProductApi.error,
     productList = _useProductApi.result,
     fetchNewProductList = _useProductApi.fetchNewData;
-  var _React$useState = React__default.useState(false),
+  var _React$useState = React.useState(false),
     isFormDialogOpen = _React$useState[0],
     setIsFormDialogOpen = _React$useState[1];
-  var _React$useState2 = React__default.useState(),
+  var _React$useState2 = React.useState(),
     selectedProduct = _React$useState2[0],
     setSelectedProduct = _React$useState2[1];
   usePoller([productList, errorList], fetchNewProductList, 60000);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (selectedProduct && !isFormDialogOpen) {
       toggleDialogOpen();
     }
@@ -9952,7 +10235,7 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
       shouldRefreshList = true;
     }
     // Refresh list on closing dialog
-    if (isFormDialogOpen === true && shouldRefreshList) {
+    if (isFormDialogOpen && shouldRefreshList) {
       void fetchNewProductList();
     }
     setIsFormDialogOpen(!isFormDialogOpen);
@@ -9984,20 +10267,20 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
     },
     children: [jsx(ProductList, {
       "data-testid": "sigmetAirmetList",
-      productList: productList,
-      productType: productType,
-      productConfig: productConfig,
-      isLoading: isLoadingList,
       error: errorList,
+      isLoading: isLoadingList,
+      onClickNewProduct: handleNewProductClick,
       onClickProductRow: handleProductRowClick,
-      onClickNewProduct: handleNewProductClick
-    }), jsx(ProductFormDialog, {
-      productType: productType,
       productConfig: productConfig,
-      isOpen: isFormDialogOpen,
-      toggleDialogStatus: toggleDialogOpen,
+      productList: productList,
+      productType: productType
+    }), jsx(ProductFormDialog, {
       handleRenewProductClick: handleRenewProductClick,
-      productListItem: selectedProduct
+      isOpen: isFormDialogOpen,
+      productConfig: productConfig,
+      productListItem: selectedProduct,
+      productType: productType,
+      toggleDialogStatus: toggleDialogOpen
     })]
   });
 };
@@ -10019,19 +10302,19 @@ var DownloadSigmetAirmetConfigWrapper = function DownloadSigmetAirmetConfigWrapp
   }
   if (error) {
     return jsx(AlertBanner, {
-      title: t('error-title'),
-      info: !isLoggedIn ? t('error-auth-login') : error.message
+      info: !isLoggedIn ? t('error-auth-login') : error.message,
+      title: t('error-title')
     });
   }
   if (!productConfig) {
     return jsx(AlertBanner, {
-      title: t('error-title'),
-      info: t('error-no-config-found')
+      info: t('error-no-config-found'),
+      title: t('error-title')
     });
   }
   return jsx(MetInfoWrapper, {
-    productType: productType,
-    productConfig: productConfig
+    productConfig: productConfig,
+    productType: productType
   });
 };
 
@@ -10059,17 +10342,17 @@ ConnectedModuleWrapper) {
     case 'SigmetModule':
       if (ConnectedModuleWrapper) {
         return jsx(ConnectedModuleWrapper, {
+          auth: auth,
           component: AviationProductApiWrapper,
-          payload: payload,
           config: config,
-          auth: auth,
           onSetAuth: onSetAuth,
+          payload: payload,
           productType: "sigmet"
         });
       }
       return jsx(AviationProductApiWrapper, {
-        config: config,
         auth: auth,
+        config: config,
         onSetAuth: onSetAuth,
         productType: "sigmet"
       });
@@ -10092,17 +10375,17 @@ ConnectedModuleWrapper) {
     case 'AirmetModule':
       if (ConnectedModuleWrapper) {
         return jsx(ConnectedModuleWrapper, {
+          auth: auth,
           component: AviationProductApiWrapper,
-          payload: payload,
           config: config,
-          auth: auth,
           onSetAuth: onSetAuth,
+          payload: payload,
           productType: "airmet"
         });
       }
       return jsx(AviationProductApiWrapper, {
-        config: config,
         auth: auth,
+        config: config,
         onSetAuth: onSetAuth,
         productType: "airmet"
       });