@opengeoweb/sigmet-airmet 14.0.1 → 14.1.0

package/index.esm.js

@@ -1,22 +1,23 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { createApiInstance, useApiContext, useApi, ApiProvider, createFakeApiInstance } from '@opengeoweb/api';
-import { PROJECTION, useIsMounted, dateUtils, CustomTooltip, usePrevious, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, CustomDialog, AlertBanner, isAxiosError, getAxiosErrorMessage, StatusTag, usePoller, ErrorBoundary } from '@opengeoweb/shared';
+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, { useState, useRef, useEffect, useCallback } from 'react';
-import { FormControlLabel, Radio, Grid, Typography, Box, Checkbox, MenuItem, FormHelperText, TextField, useTheme, Backdrop, CircularProgress, Card, Button, LinearProgress, List, ListItemButton } from '@mui/material';
-import { useFormContext, Controller } 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, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
+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 { 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 { defaultIntersectionStyleProperties, defaultGeoJSONStyleProperties, addSelectionTypeToGeoJSON, DRAWMODE, defaultPoint, 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 i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { LegendConnect, OlMapViewConnect, TimeSliderConnect } from '@opengeoweb/core';
-import { uiSelectors, useUpdateSharedData, mapSelectors, syncGroupsActions, layerActions, mapActions, defaultLayers, syncConstants, uiActions, uiTypes, genericSelectors, drawingToolActions } from '@opengeoweb/store';
 import { DrawFIRLand, Edit, Success, Clock } from '@opengeoweb/theme';
 import { LayerType, webmapUtils } from '@opengeoweb/webmap';
-import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import { debounce } from 'lodash';
-import { useAuthenticationContext } from '@opengeoweb/authentication';
+import { useAuthenticationContext as useAuthenticationContext$1 } from '@opengeoweb/authentication';
 
 var en = {
 	"sigmet-airmet": "sigmet",
@@ -529,56 +530,6 @@ var sigmetAirmetTranslations = {
 	nl: nl
 };
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2022 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
-  return {
-    getSigmetConfiguration: function getSigmetConfiguration() {
-      return axiosInstance.get('/sigmet-config');
-    },
-    getSigmetList: function getSigmetList() {
-      return axiosInstance.get('/sigmetlist');
-    },
-    postSigmet: function postSigmet(formData) {
-      return axiosInstance.post('/sigmet', Object.assign({}, formData));
-    },
-    getSigmetTAC: function getSigmetTAC(sigmetData) {
-      return axiosInstance.post('/sigmet2tac', Object.assign({}, sigmetData));
-    },
-    getAirmetConfiguration: function getAirmetConfiguration() {
-      return axiosInstance.get('/airmet-config');
-    },
-    getAirmetList: function getAirmetList() {
-      return axiosInstance.get('/airmetlist');
-    },
-    postAirmet: function postAirmet(formData) {
-      return axiosInstance.post('/airmet', Object.assign({}, formData));
-    },
-    getAirmetTAC: function getAirmetTAC(sigmetData) {
-      return axiosInstance.post('/airmet2tac', Object.assign({}, sigmetData));
-    }
-  };
-};
-var createApi$1 = function createApi(props) {
-  var axiosInstance = createApiInstance(props);
-  return getApiRoutes$1(axiosInstance);
-};
-
 /**
  * The possible type for the airmet
  */
@@ -990,6 +941,289 @@ function _regeneratorRuntime() {
   })();
 }
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2024 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var SA_NAMESPACE = 'sigmetairmet';
+var ns = [SA_NAMESPACE, FORM_FIELDS_NAMESPACE];
+var translateKeyOutsideComponents = function translateKeyOutsideComponents(key, params) {
+  if (params === void 0) {
+    params = undefined;
+  }
+  return i18n.t(key, Object.assign({
+    ns: ns
+  }, params));
+};
+var useSigmetAirmetTranslation = function useSigmetAirmetTranslation() {
+  return useTranslation(ns);
+};
+
+var config = sessionStorageProvider.getConfig();
+var airmetBaseUrl = config.GW_AIRMET_BASE_URL || '';
+var sigmetBaseUrl = config.GW_SIGMET_BASE_URL || '';
+var safeFetch = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, options, timeoutMs) {
+    var controller, timeout, response, newError;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (timeoutMs === void 0) {
+            timeoutMs = 5000;
+          }
+          controller = new AbortController();
+          timeout = setTimeout(function () {
+            return controller.abort();
+          }, timeoutMs);
+          _context.prev = 3;
+          _context.next = 6;
+          return fetch(url, Object.assign({}, options, {
+            signal: controller.signal
+          }));
+        case 6:
+          response = _context.sent;
+          _context.next = 9;
+          return handleResponse(response);
+        case 9:
+          return _context.abrupt("return", _context.sent);
+        case 12:
+          _context.prev = 12;
+          _context.t0 = _context["catch"](3);
+          newError = Object.assign({}, _context.t0, {
+            name: translateKeyOutsideComponents('error-backend')
+          });
+          throw newError;
+        case 16:
+          _context.prev = 16;
+          clearTimeout(timeout);
+          return _context.finish(16);
+        case 19:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[3, 12, 16, 19]]);
+  }));
+  return function safeFetch(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+// 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;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return fetch(url, {
+            method: 'POST',
+            body: JSON.stringify(product),
+            headers: getHeaders(auth)
+          });
+        case 2:
+          result = _context2.sent;
+          if (result.ok) {
+            _context2.next = 5;
+            break;
+          }
+          throw new Error("Failed to fetch TAC data: " + result.statusText);
+        case 5:
+          _context2.next = 7;
+          return result.text();
+        case 7:
+          textData = _context2.sent;
+          return _context2.abrupt("return", {
+            data: textData
+          });
+        case 9:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function postTAC(_x4, _x5, _x6) {
+    return _ref2.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) {
+    disabled = false;
+  }
+  return useAuthQuery(['airmet-list'], getAirmetList, disabled, false);
+};
+var useSigmetList = function useSigmetList(disabled) {
+  if (disabled === void 0) {
+    disabled = false;
+  }
+  return useAuthQuery(['sigmet-list'], getSigmetList, disabled, false);
+};
+var useProductConfig = function useProductConfig(productType) {
+  var airmetQuery = useAuthQuery(['airmet-config'], getAirmetConfig, productType !== 'airmet');
+  var sigmetQuery = useAuthQuery(['sigmet-config'], getSigmetConfig, productType !== 'sigmet');
+  return productType === 'airmet' ? airmetQuery : sigmetQuery;
+};
+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
+    });
+  };
+  return {
+    fetchSigmetTAC: fetchSigmetTAC,
+    fetchAirmetTAC: fetchAirmetTAC
+  };
+};
+var usePostSigmet = function usePostSigmet() {
+  var _useAuthenticationCon2 = useAuthenticationContext(),
+    auth = _useAuthenticationCon2.auth;
+  var queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: function mutationFn(formData) {
+      if (!auth) {
+        throw new Error('Authentication context not found');
+      }
+      return postSigmet(auth, formData);
+    },
+    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) {
+            case 0:
+              _context.next = 2;
+              return queryClient.invalidateQueries({
+                queryKey: ['sigmet-list']
+              });
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function onSuccess() {
+        return _onSuccess.apply(this, arguments);
+      }
+      return onSuccess;
+    }()
+  });
+};
+var usePostAirmet = function usePostAirmet() {
+  var _useAuthenticationCon3 = useAuthenticationContext(),
+    auth = _useAuthenticationCon3.auth;
+  var queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: function mutationFn(formData) {
+      if (!auth) {
+        throw new Error('Authentication context not found');
+      }
+      return postAirmet(auth, formData);
+    },
+    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) {
+            case 0:
+              _context2.next = 2;
+              return queryClient.invalidateQueries({
+                queryKey: ['airmet-list']
+              });
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function onSuccess() {
+        return _onSuccess2.apply(this, arguments);
+      }
+      return onSuccess;
+    }()
+  });
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -4392,37 +4626,6 @@ var airmetDefaultConfig = {
 var sigmetConfig = sigmetDefaultConfig;
 var airmetConfig = airmetDefaultConfig;
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2024 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var SA_NAMESPACE = 'sigmetairmet';
-var ns = [SA_NAMESPACE, FORM_FIELDS_NAMESPACE];
-var translateKeyOutsideComponents = function translateKeyOutsideComponents(key, params) {
-  if (params === void 0) {
-    params = undefined;
-  }
-  return i18n.t(key, Object.assign({
-    ns: ns
-  }, params));
-};
-var useSigmetAirmetTranslation = function useSigmetAirmetTranslation() {
-  return useTranslation(ns);
-};
-
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -5321,35 +5524,6 @@ var useFormLayers = function useFormLayers(layers) {
     formFeatures: formLayers
   }, sourcePanelId);
 };
-function degreesMinutesToDecimal(input) {
-  var raw = input.toString().trim();
-  var negative = raw.startsWith('-');
-  var digits = raw.replace(/[^0-9]/g, '');
-  var sign = negative ? -1 : 1;
-  if (digits.length <= 2) {
-    var _deg = parseInt(digits || '0', 10);
-    return sign * _deg;
-  }
-  // split into degrees + minutes
-  var deg = parseInt(digits.slice(0, digits.length - 2), 10);
-  var min = parseInt(digits.slice(-2), 10);
-  // normalize minutes overflow (e.g. 65 → 1°05′)
-  var extraDeg = Math.floor(min / 60);
-  min %= 60;
-  return sign * (deg + extraDeg + min / 60);
-}
-function decimalToDegreesMinutes(value) {
-  var sign = value < 0 ? '-' : '';
-  var abs = Math.abs(value);
-  var degrees = Math.floor(abs);
-  var minutes = Math.round((abs - degrees) * 60);
-  // normalize rounding overflow (e.g. 59.9 min → +1 degree)
-  if (minutes === 60) {
-    abs += 1;
-    return decimalToDegreesMinutes(sign === '-' ? -abs : abs);
-  }
-  return "" + sign + degrees + "\xB0" + minutes.toString().padStart(2, '0') + "\u2032";
-}
 var getSequenceStyling = function getSequenceStyling(product, hasTac) {
   if (hasTac === void 0) {
     hasTac = false;
@@ -5390,6 +5564,7 @@ var DrawTools = function DrawTools(_ref) {
     onChangeTool = _ref.onChangeTool,
     _ref$isDisabled = _ref.isDisabled,
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
+  usePreventBrowserClose(activeTool !== '');
   return jsx(Box, {
     "data-testid": "drawtools",
     sx: {
@@ -6944,103 +7119,6 @@ var ValidUntil = function ValidUntil(_ref) {
   });
 };
 
-var DegreesMinutesField = function DegreesMinutesField(_ref) {
-  var name = _ref.name,
-    label = _ref.label,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-    _ref$isReadOnly = _ref.isReadOnly,
-    isReadOnly = _ref$isReadOnly === void 0 ? false : _ref$isReadOnly,
-    _ref$size = _ref.size,
-    size = _ref$size === void 0 ? 'small' : _ref$size,
-    _ref$isLongitude = _ref.isLongitude,
-    isLongitude = _ref$isLongitude === void 0 ? false : _ref$isLongitude;
-  var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
-    t = _useSigmetAirmetTrans.t;
-  var _useFormContext = useFormContext(),
-    control = _useFormContext.control;
-  var _useState = useState(null),
-    localInput = _useState[0],
-    setLocalInput = _useState[1];
-  var _useState2 = useState(false),
-    isEditing = _useState2[0],
-    setIsEditing = _useState2[1];
-  return jsx(Controller, {
-    name: name,
-    control: control,
-    rules: {
-      validate: function validate(value) {
-        if (value == null || isNaN(value)) {
-          return true;
-        } // let empty pass
-        if (!isLongitude && (value < -90 || value > 90)) {
-          return t('form-fields-error-latitude-minutes');
-        }
-        if (isLongitude && (value < -180 || value > 180)) {
-          return t('form-fields-error-longitude-minutes');
-        }
-        return true;
-      }
-    },
-    render: function render(_ref2) {
-      var _fieldState$error;
-      var field = _ref2.field,
-        fieldState = _ref2.fieldState;
-      var value = field.value,
-        onChange = field.onChange;
-      var handleChange = function handleChange(e) {
-        setLocalInput(e.target.value);
-        setIsEditing(true);
-      };
-      var handleBlur = function handleBlur() {
-        if (localInput != null && localInput !== '-' && localInput !== '') {
-          var input = localInput.replace(/[^\d-]/g, '');
-          var negative = input.startsWith('-');
-          var digits = input.replace(/[^0-9]/g, '');
-          // Latitude: 4 digits (DDMM), Longitude: 5 (DDDMM)
-          var maxLen = isLongitude ? 5 : 4;
-          if (digits.length > maxLen) {
-            digits = digits.slice(0, maxLen);
-          }
-          var normalized = negative ? "-" + digits : digits;
-          try {
-            var decimal = degreesMinutesToDecimal(normalized);
-            onChange(decimal);
-          } catch (_unused) {
-            // Invalid, do not update form value
-          }
-        }
-        setIsEditing(false);
-        setLocalInput(null);
-      };
-      var displayValue;
-      if (isEditing) {
-        displayValue = localInput != null ? localInput : '';
-      } else if (value != null) {
-        displayValue = decimalToDegreesMinutes(value);
-      } else {
-        displayValue = '';
-      }
-      return jsx(TextField, {
-        placeholder: isLongitude ? 'DDD°MM′' : 'DD°MM′',
-        label: label,
-        value: displayValue,
-        onChange: handleChange,
-        onBlur: handleBlur,
-        disabled: disabled,
-        slotProps: {
-          input: {
-            readOnly: isReadOnly
-          }
-        },
-        size: size,
-        error: !!fieldState.error,
-        helperText: (_fieldState$error = fieldState.error) == null ? void 0 : _fieldState$error.message
-      });
-    }
-  });
-};
-
 var VolcanicFields = function VolcanicFields(_ref) {
   var isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
@@ -7087,7 +7165,8 @@ var VolcanicFields = function VolcanicFields(_ref) {
           name: "vaSigmetVolcanoCoordinates.latitude",
           label: t('latitude-degrees-and-minutes'),
           disabled: isDisabled,
-          isReadOnly: isReadOnly
+          isReadOnly: isReadOnly,
+          t: t
         }) : jsx(ReactHookFormNumberField, {
           name: "vaSigmetVolcanoCoordinates.latitude",
           label: t('latitude'),
@@ -7116,7 +7195,8 @@ var VolcanicFields = function VolcanicFields(_ref) {
           label: t('longitude-degrees-and-minutes'),
           disabled: isDisabled,
           isReadOnly: isReadOnly,
-          isLongitude: true
+          isLongitude: true,
+          t: t
         }) : jsx(ReactHookFormNumberField, {
           name: "vaSigmetVolcanoCoordinates.longitude",
           label: t('longitude'),
@@ -8393,8 +8473,8 @@ var SigmetForm = function SigmetForm(_ref) {
     isAmending = _ref.isAmending;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
-  var _useApiContext = useApiContext(),
-    api = _useApiContext.api;
+  var _useTACApi = useTACApi(),
+    fetchSigmetTAC = _useTACApi.fetchSigmetTAC;
   var _useFormContext2 = useFormContext(),
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
@@ -8407,11 +8487,49 @@ var SigmetForm = function SigmetForm(_ref) {
   var _React$useState2 = React__default.useState(getDefaultPhenomena(productConfig).phenomena),
     phenomenaList = _React$useState2[0],
     setPhenomenaList = _React$useState2[1];
+  var sourcePanelId = useSelector(function (store) {
+    return uiSelectors.getSourcePanelId(store, 'publicWarnings');
+  });
+  var linkedMaps = useSelector(function (store) {
+    return genericSelectors.getLinkedMaps(store, sourcePanelId);
+  });
+  var getSrsForMapId = useSelector(function (store) {
+    return linkedMaps ? mapSelectors.getSrs(store, linkedMaps[0]) : undefined;
+  });
+  // Fallback to Mercator for '', null, or undefined
+  var projection = getSrsForMapId != null && getSrsForMapId.trim() ? getSrsForMapId : 'EPSG:3857';
+  var prevProjection = usePrevious(projection);
+  // Trigger update if projection changes
+  useEffect(function () {
+    if (prevProjection === undefined) {
+      return;
+    }
+    if (projection !== prevProjection) {
+      var _startGeoJSON$feature;
+      if (startGeoJSON != null && (_startGeoJSON$feature = startGeoJSON.features) != null && _startGeoJSON$feature.length) {
+        updateStartGeoJson(startGeoJSON);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [projection, prevProjection]);
+  useEffect(function () {
+    if (prevProjection === undefined) {
+      return;
+    }
+    if (projection !== prevProjection) {
+      var _endGeoJSON$features;
+      if (endGeoJSON != null && (_endGeoJSON$features = endGeoJSON.features) != null && _endGeoJSON$features.length) {
+        updateEndGeoJson(endGeoJSON);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [projection, prevProjection]);
   var _useMapDrawTool = useMapDrawTool({
       defaultDrawModes: getDrawTools(t, StartOrEndDrawing.start, getFir(productConfig, firBorderAtStart)),
-      defaultGeoJSON: !isCancelSigmet && initialSigmet && initialSigmet.startGeometry ? addFeatureProperties(initialSigmet.startGeometry, featurePropsStart) : undefined,
-      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet && initialSigmet.startGeometryIntersect ? addFeatureProperties(initialSigmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
-      defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig, firBorderAtStart), featurePropsFIR)
+      defaultGeoJSON: !isCancelSigmet && initialSigmet != null && initialSigmet.startGeometry ? addFeatureProperties(initialSigmet.startGeometry, featurePropsStart) : undefined,
+      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet != null && initialSigmet.startGeometryIntersect ? addFeatureProperties(initialSigmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
+      defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig, firBorderAtStart), featurePropsFIR),
+      projection: projection
     }),
     startGeoJSON = _useMapDrawTool.geoJSON,
     setStartGeoJSON = _useMapDrawTool.setGeoJSON,
@@ -8425,10 +8543,11 @@ var SigmetForm = function SigmetForm(_ref) {
     setStartEditModes = _useMapDrawTool.setDrawModes;
   var _useMapDrawTool2 = useMapDrawTool({
       defaultDrawModes: getDrawTools(t, StartOrEndDrawing.end, getFir(productConfig, firBorderAtStart)),
-      defaultGeoJSON: !isCancelSigmet && initialSigmet && initialSigmet.endGeometry ? addFeatureProperties(initialSigmet.endGeometry, featurePropsEnd) : undefined,
-      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet && initialSigmet.endGeometryIntersect ? addFeatureProperties(initialSigmet.endGeometryIntersect, featurePropsIntersectionEnd) : undefined,
+      defaultGeoJSON: !isCancelSigmet && initialSigmet != null && initialSigmet.endGeometry ? addFeatureProperties(initialSigmet.endGeometry, featurePropsEnd) : undefined,
+      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet != null && initialSigmet.endGeometryIntersect ? addFeatureProperties(initialSigmet.endGeometryIntersect, featurePropsIntersectionEnd) : undefined,
       defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig, firBorderAtStart), featurePropsFIR),
-      defaultGeoJSONIntersectionProperties: featurePropsIntersectionEnd
+      defaultGeoJSONIntersectionProperties: featurePropsIntersectionEnd,
+      projection: projection
     }),
     endGeoJSON = _useMapDrawTool2.geoJSON,
     setEndGeoJSON = _useMapDrawTool2.setGeoJSON,
@@ -8443,7 +8562,7 @@ var SigmetForm = function SigmetForm(_ref) {
   var getHasFormErrors = function getHasFormErrors() {
     return Object.keys(errors).length > 0;
   };
-  var _useTAC = useTAC(t, initialSigmet !== null ? initialSigmet : initialCancelSigmet, getTAC || api.getSigmetTAC, getHasFormErrors, getOmitChangeFromConfig(productConfig)),
+  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 () {
@@ -8524,7 +8643,7 @@ var SigmetForm = function SigmetForm(_ref) {
   var helperText = isReadOnly ? '' : 'Optional';
   React__default.useEffect(function () {
     var isInDrawMode = activeStartTool !== '' || activeEndTool !== '';
-    setDialogActionsDisabled && setDialogActionsDisabled(isInDrawMode);
+    setDialogActionsDisabled == null || setDialogActionsDisabled(isInDrawMode);
     if (mode === 'view') {
       setIsDisabled(true);
     } else {
@@ -8586,12 +8705,12 @@ var SigmetForm = function SigmetForm(_ref) {
         isReadOnly: isReadOnly,
         helperText: helperText,
         onChange: onChangeForm
-      }), !isCancelSigmet && hasVolcanicAshes && !isShortTest() && jsx(VolcanicFields, {
+      }), !isCancelSigmet && hasVolcanicAshes && !isShortTest() ? jsx(VolcanicFields, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         helperText: helperText,
         degreesAndMinutes: degreesAndMinutes
-      }), jsx(ValidFrom, {
+      }) : null, jsx(ValidFrom, {
         productConfig: productConfig,
         isDisabled: isDisabled,
         isAmending: isAmending,
@@ -8614,7 +8733,7 @@ var SigmetForm = function SigmetForm(_ref) {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: function onChange(event, newPhenomenaList) {
-          onChangeFir(newPhenomenaList || [], event);
+          onChangeFir(newPhenomenaList != null ? newPhenomenaList : [], event);
         }
       }), jsx(StartGeometry, {
         isReadOnly: isReadOnly,
@@ -8646,7 +8765,7 @@ var SigmetForm = function SigmetForm(_ref) {
       }), !isCancelSigmet && !omitChange && jsx(Change, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly
-      }), isCancelSigmet && watch('vaSigmetMoveToFIR') && jsx(ProductFormFieldLayout, {
+      }), isCancelSigmet && watch('vaSigmetMoveToFIR') ? jsx(ProductFormFieldLayout, {
         children: jsxs(Typography, {
           variant: "body2",
           sx: Object.assign({}, styles$2.body, {
@@ -8657,7 +8776,7 @@ var SigmetForm = function SigmetForm(_ref) {
             children: [" ", watch('vaSigmetMoveToFIR')]
           })]
         })
-      }), jsx(IssuedAt, {
+      }) : null, jsx(IssuedAt, {
         date: getProductIssueDate(t, initialSigmet, initialCancelSigmet),
         isReadOnly: isReadOnly
       }), jsxs(Tac, {
@@ -8667,7 +8786,7 @@ var SigmetForm = function SigmetForm(_ref) {
           name: "sequence",
           defaultValue: "-1"
         }), /* Add hidden fields for TAC generation in case of cancel sigmet */
-        isCancelSigmet && jsxs(Fragment, {
+        isCancelSigmet ? jsxs(Fragment, {
           children: [jsx(ReactHookFormHiddenInput, {
             name: "cancelsSigmetSequenceId"
           }), jsx(ReactHookFormHiddenInput, {
@@ -8675,7 +8794,7 @@ var SigmetForm = function SigmetForm(_ref) {
           }), jsx(ReactHookFormHiddenInput, {
             name: "validDateStartOfSigmetToCancel"
           })]
-        })]
+        }) : null]
       })]
     });
   };
@@ -8769,14 +8888,40 @@ var AirmetForm = function AirmetForm(_ref) {
     setHasUserChangedTime = _React$useState2[1];
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
-  var _useApiContext = useApiContext(),
-    api = _useApiContext.api;
+  var _useTACApi = useTACApi(),
+    fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
   var firBorderAtStart = initialAirmet ? initialAirmet.locationIndicatorATSR : productConfig.active_firs[0];
+  var sourcePanelId = useSelector(function (store) {
+    return uiSelectors.getSourcePanelId(store, 'publicWarnings');
+  });
+  var linkedMaps = useSelector(function (store) {
+    return genericSelectors.getLinkedMaps(store, sourcePanelId);
+  });
+  var getSrsForMapId = useSelector(function (store) {
+    return linkedMaps ? mapSelectors.getSrs(store, linkedMaps[0]) : undefined;
+  });
+  // Fallback to Mercator for '', null, or undefined
+  var projection = getSrsForMapId != null && getSrsForMapId.trim() ? getSrsForMapId : 'EPSG:3857';
+  var prevProjection = usePrevious(projection);
+  // Trigger update if projection changes
+  useEffect(function () {
+    if (prevProjection === undefined) {
+      return;
+    }
+    if (projection !== prevProjection) {
+      var _startGeoJSON$feature;
+      if (startGeoJSON != null && (_startGeoJSON$feature = startGeoJSON.features) != null && _startGeoJSON$feature.length) {
+        updateStartGeoJson(startGeoJSON);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [projection, prevProjection]);
   var _useMapDrawTool = useMapDrawTool({
       defaultDrawModes: getDrawTools(t, StartOrEndDrawing.start, getFir(productConfig, firBorderAtStart)),
-      defaultGeoJSON: !isCancelAirmet && initialAirmet && initialAirmet.startGeometry ? addFeatureProperties(initialAirmet.startGeometry, featurePropsStart) : undefined,
-      defaultGeoJSONIntersection: !isCancelAirmet && initialAirmet && initialAirmet.startGeometryIntersect ? addFeatureProperties(initialAirmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
-      defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig, firBorderAtStart), featurePropsFIR)
+      defaultGeoJSON: !isCancelAirmet && initialAirmet != null && initialAirmet.startGeometry ? addFeatureProperties(initialAirmet.startGeometry, featurePropsStart) : undefined,
+      defaultGeoJSONIntersection: !isCancelAirmet && !!(initialAirmet != null && initialAirmet.startGeometry) ? addFeatureProperties(initialAirmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
+      defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig, firBorderAtStart), featurePropsFIR),
+      projection: projection
     }),
     startGeoJSON = _useMapDrawTool.geoJSON,
     setGeoJSON = _useMapDrawTool.setGeoJSON,
@@ -8791,7 +8936,7 @@ var AirmetForm = function AirmetForm(_ref) {
   var getHasFormErrors = function getHasFormErrors() {
     return Object.keys(errors).length > 0;
   };
-  var _useTAC = useTAC(t, initialAirmet !== null ? initialAirmet : initialCancelAirmet, getTAC || api.getAirmetTAC, getHasFormErrors),
+  var _useTAC = useTAC(t, initialAirmet != null ? initialAirmet : initialCancelAirmet, getTAC != null ? getTAC : fetchAirmetTAC, getHasFormErrors),
     tac = _useTAC[0],
     updateTac = _useTAC[1];
   React__default.useEffect(function () {
@@ -8888,17 +9033,17 @@ var AirmetForm = function AirmetForm(_ref) {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm
-      }), !isCancelAirmet && hasSurfaceVisiblity && jsx(SurfaceVisibility, {
+      }), !isCancelAirmet && hasSurfaceVisiblity ? jsx(SurfaceVisibility, {
         isReadOnly: isReadOnly,
         isDisabled: isDisabled,
         onChange: onChangeForm,
         productConfig: productConfig
-      }), !isCancelAirmet && hasSurfaceWind && jsx(SurfaceWind, {
+      }) : null, !isCancelAirmet && hasSurfaceWind ? jsx(SurfaceWind, {
         isReadOnly: isReadOnly,
         isDisabled: isDisabled,
         onChange: onChangeForm,
         productConfig: productConfig
-      }), !isCancelAirmet && jsx(ObservationForecast, {
+      }) : null, !isCancelAirmet && jsx(ObservationForecast, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly
       }), !isCancelAirmet && jsx(ObservationForecastTime, {
@@ -8929,7 +9074,7 @@ var AirmetForm = function AirmetForm(_ref) {
         isDisabled: isDisabled,
         productConfig: productConfig,
         onChange: function onChange(event, newPhenomenaList) {
-          onChangeFir(newPhenomenaList || [], event);
+          onChangeFir(newPhenomenaList != null ? newPhenomenaList : [], event);
         }
       }), jsx(StartGeometry, {
         isReadOnly: isReadOnly,
@@ -8940,18 +9085,18 @@ var AirmetForm = function AirmetForm(_ref) {
         activeTool: activeStartTool,
         productConfig: productConfig,
         isDisabled: drawToolsDisabled
-      }), !isCancelAirmet && hasLevels && jsx(Levels, {
+      }), !isCancelAirmet && hasLevels ? jsx(Levels, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
         productType: "airmet",
         productConfig: productConfig
-      }), !isCancelAirmet && hasCloudLevels && jsx(CloudLevels, {
+      }) : null, !isCancelAirmet && hasCloudLevels ? jsx(CloudLevels, {
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
         productConfig: productConfig
-      }), !isCancelAirmet && jsx(Progress, {
+      }) : null, !isCancelAirmet && jsx(Progress, {
         productType: "airmet",
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
@@ -8970,7 +9115,7 @@ var AirmetForm = function AirmetForm(_ref) {
           name: "sequence",
           defaultValue: "-1"
         }), /* Add hidden fields for TAC generation in case of cancel airmet */
-        isCancelAirmet && jsxs(Fragment, {
+        isCancelAirmet ? jsxs(Fragment, {
           children: [jsx(ReactHookFormHiddenInput, {
             name: "cancelsAirmetSequenceId"
           }), jsx(ReactHookFormHiddenInput, {
@@ -8978,7 +9123,7 @@ var AirmetForm = function AirmetForm(_ref) {
           }), jsx(ReactHookFormHiddenInput, {
             name: "validDateStartOfAirmetToCancel"
           })]
-        })]
+        }) : null]
       })]
     });
   };
@@ -9060,9 +9205,10 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     product = _ref.product;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
-  var _useApiContext = useApiContext(),
-    api = _useApiContext.api;
-  var apiCall = productType === 'sigmet' ? api.postSigmet : api.postAirmet;
+  var postSigmetMutation = usePostSigmet();
+  var postAirmetMutation = usePostAirmet();
+  var apiCall = productType === 'sigmet' ? postSigmetMutation.mutateAsync : postAirmetMutation.mutateAsync;
+  var isLoading = productType === 'sigmet' ? postSigmetMutation.isPending : postAirmetMutation.isPending;
   var _useFormContext = useFormContext(),
     handleSubmit = _useFormContext.handleSubmit,
     formState = _useFormContext.formState,
@@ -9079,38 +9225,28 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
   usePreventBrowserClose(isDirty);
   var confirmationDialog = useConfirmationDialog();
   var _React$useState = React.useState(false),
-    showLoader = _React$useState[0],
-    setLoader = _React$useState[1];
-  var _React$useState2 = React.useState(false),
-    errorStoreMessage = _React$useState2[0],
-    setErrorStoreMessage = _React$useState2[1];
-  var _React$useState3 = React.useState(''),
-    errorStoreMessageText = _React$useState3[0],
-    setErrorStoreMessageText = _React$useState3[1];
-  var _React$useState4 = React.useState(false),
-    dialogActionsDisabled = _React$useState4[0],
-    setDialogActionsDisabled = _React$useState4[1];
+    errorStoreMessage = _React$useState[0],
+    setErrorStoreMessage = _React$useState[1];
+  var _React$useState2 = React.useState(''),
+    errorStoreMessageText = _React$useState2[0],
+    setErrorStoreMessageText = _React$useState2[1];
+  var _React$useState3 = React.useState(false),
+    dialogActionsDisabled = _React$useState3[0],
+    setDialogActionsDisabled = _React$useState3[1];
   var postProduct = function postProduct(productToPost, newStatus) {
     var uuid = product !== null && product.uuid ? product.uuid : null;
     var postProductParam = productType === 'sigmet' ? createSigmetPostParameter(productToPost, newStatus, uuid) : createAirmetPostParameter(productToPost, newStatus, uuid);
-    setLoader(true);
-    setErrorStoreMessage(false);
-    setErrorStoreMessageText('');
     apiCall(postProductParam).then(function () {
       onToggleDialog();
     })["catch"](function (error) {
       setErrorStoreMessage(true);
-      if (isAxiosError(error)) {
-        setErrorStoreMessageText(getAxiosErrorMessage(error));
-      }
-      setLoader(false);
+      setErrorStoreMessageText(error.message || 'Unknown error');
     });
   };
   var onToggleDialog = function onToggleDialog(shouldRefreshList) {
     if (shouldRefreshList === void 0) {
       shouldRefreshList = true;
     }
-    setLoader(false);
     toggleDialogStatus(shouldRefreshList);
   };
   var showConfirmDialog = function showConfirmDialog(action) {
@@ -9265,7 +9401,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
       })
     }), jsx(DraftFieldHelper, {}), jsx(Backdrop, {
       "data-testid": "loader",
-      open: showLoader,
+      open: isLoading,
       sx: {
         zIndex: 1500,
         color: '#fff'
@@ -9486,25 +9622,39 @@ var ProductListRow = function ProductListRow(_ref2) {
     productConfig = _ref2.productConfig;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
-  var _useApiContext = useApiContext(),
-    api = _useApiContext.api;
   var _useIsMounted = useIsMounted(),
     isMounted = _useIsMounted.isMounted;
   var _React$useState = React__default.useState(''),
     TAC = _React$useState[0],
     setTAC = _React$useState[1];
-  var apiCall = productType === 'sigmet' ? api.getSigmetTAC : api.getAirmetTAC;
+  var _useTACApi = useTACApi(),
+    fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
+    fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
+  var apiCall = productType === 'sigmet' ? fetchSigmetTAC : fetchAirmetTAC;
   React__default.useEffect(function () {
-    var retrieveTAC = function retrieveTAC(productToPost) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      apiCall(productToPost).then(function (result) {
-        if (isMounted.current) {
-          setTAC(result.data);
-        }
-      })["catch"](function () {});
-    };
+    var retrieveTAC = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(productToPost) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return apiCall(productToPost).then(function (result) {
+                if (isMounted.current) {
+                  setTAC(result.data);
+                }
+              })["catch"](function () {});
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function retrieveTAC(_x) {
+        return _ref3.apply(this, arguments);
+      };
+    }();
     if (shouldRetrieveTAC(product)) {
-      retrieveTAC(product);
+      void retrieveTAC(product);
     } else if (isMounted.current) {
       setTAC(noTAC(t));
     }
@@ -9720,80 +9870,36 @@ var ProductList = function ProductList(_ref) {
 };
 
 var useProductApi = function useProductApi(productType) {
-  var _React$useState = React__default.useState({
-      isLoading: false,
-      error: undefined,
-      result: []
-    }),
-    state = _React$useState[0],
-    setState = _React$useState[1];
-  var _useIsMounted = useIsMounted(),
-    isMounted = _useIsMounted.isMounted;
-  var _useApiContext = useApiContext(),
-    api = _useApiContext.api;
-  var requestList = productType === 'sigmet' ? api.getSigmetList : api.getAirmetList;
-  var updateState = function updateState(newState) {
-    if (isMounted.current) {
-      setState(function (currentState) {
-        return Object.assign({}, currentState, newState);
-      });
-    }
-  };
-  var fetchNewData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _yield$requestList, data, newError;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!state.isLoading) {
+  var sigmetQuery = useSigmetList(productType !== 'sigmet');
+  var airmetQuery = useAirmetList(productType !== 'airmet');
+  var query = productType === 'sigmet' ? sigmetQuery : airmetQuery;
+  var data = query.data,
+    isLoading = query.isLoading,
+    error = query.error,
+    refetch = query.refetch;
+  return {
+    result: data || [],
+    isLoading: isLoading,
+    error: error,
+    fetchNewData: function () {
+      var _fetchNewData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
               _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return");
-          case 2:
-            updateState(Object.assign({}, state, {
-              isLoading: true,
-              error: undefined
-            }));
-            _context.prev = 3;
-            _context.next = 6;
-            return requestList();
-          case 6:
-            _yield$requestList = _context.sent;
-            data = _yield$requestList.data;
-            updateState(Object.assign({}, state, {
-              result: data,
-              isLoading: false
-            }));
-            _context.next = 15;
-            break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](3);
-            newError = Object.assign({}, _context.t0, {
-              name: translateKeyOutsideComponents('error-backend')
-            });
-            updateState(Object.assign({}, state, {
-              error: newError,
-              isLoading: false
-            }));
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[3, 11]]);
-    }));
-    return function fetchNewData() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  React__default.useEffect(function () {
-    void fetchNewData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return Object.assign({}, state, {
-    fetchNewData: fetchNewData
-  });
+              return refetch();
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function fetchNewData() {
+        return _fetchNewData.apply(this, arguments);
+      }
+      return fetchNewData;
+    }()
+  };
 };
 var renewProduct = function renewProduct(oldProduct, productConfig) {
   return Object.assign({}, oldProduct, {
@@ -9827,8 +9933,6 @@ var renewSigmet = function renewSigmet(oldSigmet, productConfig) {
  * Pass in either 'sigmet' or 'airmet' as prop to determine the mode
  * @param {string} productType productType: string - either 'sigmet' or 'airmet'. Determines mode in which wrapper is loaded
  *
- * @example
- * ```<ApiProvider baseURL="http://test.com" appURL="http://app.com" auth={auth} onSetAuth={onSetAuth} createApi={api.createApi} authTokenURL="url/tokenrefresh"> <MetInfoWrapper productType="sigmet"/> </ApiProvider>```
  */
 var MetInfoWrapper = function MetInfoWrapper(_ref) {
   var productType = _ref.productType,
@@ -9910,16 +10014,13 @@ var DownloadSigmetAirmetConfigWrapper = function DownloadSigmetAirmetConfigWrapp
   var productType = _ref.productType;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
-  var _useApiContext = useApiContext(),
-    api = _useApiContext.api;
-  var _useAuthenticationCon = useAuthenticationContext(),
+  var _useAuthenticationCon = useAuthenticationContext$1(),
     isLoggedIn = _useAuthenticationCon.isLoggedIn;
-  var getConfigurationRequest = api[productType === 'sigmet' ? 'getSigmetConfiguration' : 'getAirmetConfiguration'];
-  var _useApi = useApi(getConfigurationRequest),
-    productConfig = _useApi.result,
-    isConfigLoading = _useApi.isLoading,
-    error = _useApi.error;
-  if (isConfigLoading) {
+  var _useProductConfig = useProductConfig(productType),
+    productConfig = _useProductConfig.data,
+    isLoading = _useProductConfig.isLoading,
+    error = _useProductConfig.error;
+  if (isLoading) {
     return jsx(LinearProgress, {
       "data-testid": "loadingSpinner"
     });
@@ -9930,6 +10031,12 @@ var DownloadSigmetAirmetConfigWrapper = function DownloadSigmetAirmetConfigWrapp
       info: !isLoggedIn ? t('error-auth-login') : error.message
     });
   }
+  if (!productConfig) {
+    return jsx(AlertBanner, {
+      title: t('error-title'),
+      info: t('error-no-config-found')
+    });
+  }
   return jsx(MetInfoWrapper, {
     productType: productType,
     productConfig: productConfig
@@ -9938,23 +10045,10 @@ var DownloadSigmetAirmetConfigWrapper = function DownloadSigmetAirmetConfigWrapp
 
 var AviationProductApiWrapper = function AviationProductApiWrapper(_ref) {
   var config = _ref.config,
-    auth = _ref.auth,
-    onSetAuth = _ref.onSetAuth,
     productType = _ref.productType;
-  return config ? jsx(ApiProvider, {
-    config: {
-      baseURL: config.baseURL,
-      appURL: config.appURL,
-      authTokenURL: config.authTokenURL,
-      authClientId: config.authClientId
-    },
-    auth: auth,
-    onSetAuth: onSetAuth,
-    createApi: createApi$1,
-    children: jsx(ErrorBoundary, {
-      children: jsx(DownloadSigmetAirmetConfigWrapper, {
-        productType: productType
-      })
+  return config ? jsx(ErrorBoundary, {
+    children: jsx(DownloadSigmetAirmetConfigWrapper, {
+      productType: productType
     })
   }) : null;
 };
@@ -11987,104 +12081,4 @@ var fakeSigmetList = [{
   }
 }];
 
-var fakeSigmetTAC = 'EHAA SIGMET 1 VALID 121249/121449 EHDB- EHAA AMSTERDAM FIR FRQ TS OBS ENTIRE FIR FL010 STNR WKN';
-var fakeAirmetTAC = 'EHAA AIRMET -1 VALID 310700/311100 EHDB- EHAA AMSTERDAM FIR ISOL CB OBS ENTIRE FIR FL020 STNR NC';
-var getApiRoutes = function getApiRoutes(axiosInstance) {
-  return {
-    getSigmetConfiguration: function () {
-      var _getSigmetConfiguration = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return new Promise(function (resolve) {
-                setTimeout(resolve, 2000);
-              });
-            case 2:
-              return _context.abrupt("return", axiosInstance.get('/sigmetConfiguration').then(function () {
-                return {
-                  data: sigmetConfig
-                };
-              }));
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      function getSigmetConfiguration() {
-        return _getSigmetConfiguration.apply(this, arguments);
-      }
-      return getSigmetConfiguration;
-    }(),
-    getAirmetConfiguration: function () {
-      var _getAirmetConfiguration = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return new Promise(function (resolve) {
-                setTimeout(resolve, 2000);
-              });
-            case 2:
-              return _context2.abrupt("return", axiosInstance.get('/airmetConfiguration').then(function () {
-                return {
-                  data: airmetConfig
-                };
-              }));
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      function getAirmetConfiguration() {
-        return _getAirmetConfiguration.apply(this, arguments);
-      }
-      return getAirmetConfiguration;
-    }(),
-    getSigmetList: function getSigmetList() {
-      return axiosInstance.get('/sigmetlist').then(function () {
-        return {
-          data: fakeSigmetList
-        };
-      });
-    },
-    getSigmetTAC: function getSigmetTAC(formData) {
-      return axiosInstance.post('/sigmet2tac', formData).then(function () {
-        return {
-          data: fakeSigmetTAC
-        };
-      });
-    },
-    getAirmetTAC: function getAirmetTAC(formdata) {
-      return axiosInstance.post('/airmet2tac', formdata).then(function () {
-        return {
-          data: fakeAirmetTAC
-        };
-      });
-    },
-    postSigmet: function postSigmet(_postSigmet) {
-      // eslint-disable-next-line no-console
-      console.log('form has been posted with following values:', _postSigmet.sigmet);
-      return axiosInstance.post('/sigmet', _postSigmet);
-    },
-    getAirmetList: function getAirmetList() {
-      return axiosInstance.get('/airmetlist').then(function () {
-        return {
-          data: fakeAirmetList
-        };
-      });
-    },
-    postAirmet: function postAirmet(_postAirmet) {
-      // eslint-disable-next-line no-console
-      console.log('form has been posted with following values:', _postAirmet.airmet);
-      return axiosInstance.post('/airmet', _postAirmet);
-    }
-  };
-};
-var createApi = function createApi() {
-  return getApiRoutes(createFakeApiInstance());
-};
-
-export { AirmetComponentsLookUp, AirmetForm, AirmetType, CancelSigmetVolcanicMovements, CloudLevelUnits, DEFAULT_MINIMUM_SURFACE_LEVEL, DEFAULT_MIN_MOVEMENT_SPEED, DEFAULT_MIN_VISIBILITY, DEFAULT_MIN_WIND_SPEED, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductAction, ProductFormDialog, Wrapper as ProductFormDialogContent, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createAirmetPostParameter, createApi$1 as createApi, createApi as createFakeApi, createSigmetPostParameter, decimalToDegreesMinutes, degreesMinutesToDecimal, extractUnitsToShow, fakeAirmetList, fakeSigmetList, findSequenceNumber, firSelectionType, getActiveFIRArea, getAllFirAreas, getAllowedUnits, getBaseLayers, getConfirmationDialogButtonLabel, getConfirmationDialogCancelLabel, getConfirmationDialogContent, getConfirmationDialogTitle, getDefaultPhenomena, getDefaultValidFromValue, getDefaultValidUntilValue, getDefaultValidityMinutesFromConfig, getDialogtitle, getDrawTools, getFieldLabel, getFir, getFirArea, getFirOptions, getHoursBeforeValidity, getLevelInFeet, getLifecycleActions, getMaxCloudLevelValue, getMaxCloudLowerLevelValue, getMaxHoursOfValidity, getMaxLevelValue, getMaxMovementSpeedValue, getMaxPolygonPoints, getMaxVisibilityValue, getMaxWindSpeedValue, getMinCloudLevelValue, getMinCloudLowerLevelValue, getMinLevelValue, getMinMovementSpeedValue, getMinVisibilityValue, getMinWindSpeedValue, getOmitChangeFromConfig, getPhenomenon, getProductFormMode, getProductIssueDate, getProjection, getSequenceStyling, getToolIcon, getValidFromDelayTimeMinutesFromConfig, getValidFromXHoursBeforeMessage, hasMaxFeaturePoints, hasValue, isFir, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, isLevelLower, isVAPhenomenon, prepareCancelSigmet, prepareFormValues, prepareProductValues, sigmetAirmetTranslations as saTranslations, sigmetConfig, triggerValidations, updateDrawToolsWithFir, useDelayedFormValues, useFormLayers, useShortTestHelpers };
+export { AirmetComponentsLookUp, AirmetForm, AirmetType, CancelSigmetVolcanicMovements, CloudLevelUnits, DEFAULT_MINIMUM_SURFACE_LEVEL, DEFAULT_MIN_MOVEMENT_SPEED, DEFAULT_MIN_VISIBILITY, DEFAULT_MIN_WIND_SPEED, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductAction, ProductFormDialog, Wrapper as ProductFormDialogContent, ProductList, ProductListRow, ProductStatusDescription, SA_NAMESPACE, SigmetComponentsLookUp, SigmetForm, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createAirmetPostParameter, createSigmetPostParameter, extractUnitsToShow, fakeAirmetList, fakeSigmetList, findSequenceNumber, firSelectionType, getActiveFIRArea, getAllFirAreas, getAllowedUnits, getBaseLayers, getConfirmationDialogButtonLabel, getConfirmationDialogCancelLabel, getConfirmationDialogContent, getConfirmationDialogTitle, getDefaultPhenomena, getDefaultValidFromValue, getDefaultValidUntilValue, getDefaultValidityMinutesFromConfig, getDialogtitle, getDrawTools, getFieldLabel, getFir, getFirArea, getFirOptions, getHoursBeforeValidity, getLevelInFeet, getLifecycleActions, getMaxCloudLevelValue, getMaxCloudLowerLevelValue, getMaxHoursOfValidity, getMaxLevelValue, getMaxMovementSpeedValue, getMaxPolygonPoints, getMaxVisibilityValue, getMaxWindSpeedValue, getMinCloudLevelValue, getMinCloudLowerLevelValue, getMinLevelValue, getMinMovementSpeedValue, getMinVisibilityValue, getMinWindSpeedValue, getOmitChangeFromConfig, getPhenomenon, getProductFormMode, getProductIssueDate, getProjection, getSequenceStyling, getToolIcon, getValidFromDelayTimeMinutesFromConfig, getValidFromXHoursBeforeMessage, hasMaxFeaturePoints, hasValue, isFir, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, isLevelLower, isVAPhenomenon, prepareCancelSigmet, prepareFormValues, prepareProductValues, sigmetAirmetTranslations as saTranslations, sigmetConfig, triggerValidations, updateDrawToolsWithFir, useDelayedFormValues, useFormLayers, useShortTestHelpers };