@opengeoweb/warnings 12.5.0 → 12.6.0

package/index.esm.js

@@ -7,7 +7,7 @@ import { SHARED_NAMESPACE, useConfirmationDialog, dateUtils, ToggleMenu, calcula
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, current, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { defaultBbox } from '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, useDraftFormHelpers, ReactHookFormSelect, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, errorMessages, isEmpty, ReactHookFormDateTime, isXHoursAfter, isXHoursBefore } from '@opengeoweb/form-fields';
-import { SA_NAMESPACE, isInstanceOfCancelSigmet, isInstanceOfCancelAirmet, getDefaultValidUntilValue, useShortTestHelpers, SigmetForm, AirmetForm, ProductAction, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, isVAPhenomenon, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, prepareCancelSigmet, getProductFormMode } from '@opengeoweb/sigmet-airmet';
+import { SA_NAMESPACE, isInstanceOfCancelSigmet, getDefaultValidFromValue, isInstanceOfCancelAirmet, getDefaultValidUntilValue, useShortTestHelpers, SigmetForm, AirmetForm, ProductAction, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, isVAPhenomenon, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, prepareCancelSigmet, getProductFormMode } from '@opengeoweb/sigmet-airmet';
 import { LayerType, generateMapId } from '@opengeoweb/webmap';
 import { t } from 'i18next';
 import { useTranslation } from 'react-i18next';
@@ -208,7 +208,9 @@ var en = {
 	"cancel-this-product": "Are you sure you want to cancel this {{product}}?",
 	"aviation-cancel-success": "{{warningType}} has succesfully been cancelled!",
 	"aviation-discard-success": "{{warningType}} has been discarded!",
-	"error-auth-login": "This feature is protected by authentication. Please log in to proceed"
+	"error-auth-login": "This feature is protected by authentication. Please log in to proceed",
+	"cancel-warningType": "Cancel {{warningType}}",
+	cancelling: "Cancelling"
 };
 var nl = {
 	"drawing-tool-form-tools": "Gereedschap",
@@ -356,7 +358,9 @@ var nl = {
 	"cancel-this-product": "Weet je zeker dat je dit {{product}} wilt annuleren?",
 	"aviation-cancel-success": "niet vertaald",
 	"aviation-discard-success": "niet vertaald",
-	"error-auth-login": "Deze functie wordt beschermd door authenticatie. Log in om verder te gaan"
+	"error-auth-login": "Deze functie wordt beschermd door authenticatie. Log in om verder te gaan",
+	"cancel-warningType": "Annuleer {{warningType}}",
+	cancelling: "Annuleren"
 };
 var fi = {
 	"drawing-tool-form-tools": "Työkalut",
@@ -504,7 +508,9 @@ var fi = {
 	"cancel-this-product": "Oletko varma, että haluat peruuttaa tämän {{product}}:n?",
 	"aviation-cancel-success": "ei käännetty",
 	"aviation-discard-success": "{{warningType}} er forkastet!",
-	"error-auth-login": "Tämän toiminnallisuuden käyttäminen vaatii tunnistautumista. Kirjaudu sisään jatkaaksesi"
+	"error-auth-login": "Tämän toiminnallisuuden käyttäminen vaatii tunnistautumista. Kirjaudu sisään jatkaaksesi",
+	"cancel-warningType": "Peruuta {{warningType}}",
+	cancelling: "Peruuttaminen"
 };
 var no = {
 	"drawing-tool-form-tools": "Verktøy",
@@ -652,7 +658,9 @@ var no = {
 	"cancel-this-product": "Er du sikker på at du vil avbryte dette {{product}}?",
 	"aviation-cancel-success": "{{warningType}} er kansellert!",
 	"aviation-discard-success": "{{warningType}} er forkastet!",
-	"error-auth-login": "Denne delen er passordbeskyttet. Vennligst logg inn."
+	"error-auth-login": "Denne delen er passordbeskyttet. Vennligst logg inn.",
+	"cancel-warningType": "Kanseller {{warningType}}",
+	cancelling: "Kansellerer"
 };
 var warningsTranslations = {
 	en: en,
@@ -4846,14 +4854,11 @@ var transformAirmetToProductFormat = function transformAirmetToProductFormat(war
 };
 // For the Create and Clear buttons
 // The fields initialised to unknown will be set to their default values by ReactHookForm
-var getEmptySigmetWarning = function getEmptySigmetWarning() {
-  var currentTime = new Date();
-  var validFromTime = dateUtils.add(currentTime, {
-    minutes: 15
-  });
-  var validUntilTime = dateUtils.add(currentTime, {
+var getEmptySigmetWarning = function getEmptySigmetWarning(productConfig) {
+  var validDateStart = getDefaultValidFromValue(productConfig);
+  var validDateEnd = dateUtils.dateToString(dateUtils.add(new Date(validDateStart), {
     hours: 4
-  });
+  }));
   return {
     type: undefined,
     phenomenon: '',
@@ -4866,8 +4871,8 @@ var getEmptySigmetWarning = function getEmptySigmetWarning() {
     change: '',
     // Default change
     sequence: undefined,
-    validDateStart: dateUtils.dateToString(validFromTime),
-    validDateEnd: dateUtils.dateToString(validUntilTime),
+    validDateStart: validDateStart,
+    validDateEnd: validDateEnd,
     level: '',
     levelInfoMode: '',
     movementType: '',
@@ -4876,14 +4881,11 @@ var getEmptySigmetWarning = function getEmptySigmetWarning() {
 };
 // For the Create and Clear buttons
 // The fields initialised to unknown will be set to their default values by ReactHookForm
-var getEmptyAirmetWarning = function getEmptyAirmetWarning() {
-  var currentTime = new Date();
-  var validFromTime = dateUtils.add(currentTime, {
-    minutes: 15
-  });
-  var validUntilTime = dateUtils.add(currentTime, {
+var getEmptyAirmetWarning = function getEmptyAirmetWarning(productConfig) {
+  var validDateStart = getDefaultValidFromValue(productConfig);
+  var validDateEnd = dateUtils.dateToString(dateUtils.add(new Date(validDateStart), {
     hours: 4
-  });
+  }));
   return {
     type: undefined,
     phenomenon: '',
@@ -4896,8 +4898,8 @@ var getEmptyAirmetWarning = function getEmptyAirmetWarning() {
     change: '',
     // Default change
     sequence: undefined,
-    validDateStart: dateUtils.dateToString(validFromTime),
-    validDateEnd: dateUtils.dateToString(validUntilTime),
+    validDateStart: validDateStart,
+    validDateEnd: validDateEnd,
     level: '',
     levelInfoMode: '',
     movementType: '',
@@ -5810,8 +5812,11 @@ var Form = function Form(_ref5) {
     isPublishing = _React$useState[0],
     setIsPublishing = _React$useState[1];
   var _React$useState2 = React.useState(false),
-    isSaving = _React$useState2[0],
-    setIsSaving = _React$useState2[1];
+    isCancelling = _React$useState2[0],
+    setIsCancelling = _React$useState2[1];
+  var _React$useState3 = React.useState(false),
+    isSaving = _React$useState3[0],
+    setIsSaving = _React$useState3[1];
   var _useTACApi = useTACApi(),
     fetchSigmetTAC = _useTACApi.fetchSigmetTAC,
     fetchAirmetTAC = _useTACApi.fetchAirmetTAC;
@@ -5822,12 +5827,12 @@ var Form = function Form(_ref5) {
     defaultValues: {}
   });
   var initialPublicWarningArea = (publicWarningDetails == null || (_publicWarningDetails = publicWarningDetails.areas) == null ? void 0 : _publicWarningDetails.length) && (publicWarningDetails == null || (_publicWarningDetails2 = publicWarningDetails.areas[0]) == null ? void 0 : _publicWarningDetails2.geoJSON);
-  var _React$useState3 = React.useState(initialPublicWarningArea),
-    warningGeoJSONFeature = _React$useState3[0],
-    setWarningGeoJSONFeature = _React$useState3[1];
-  var _React$useState4 = React.useState(publicWarningDetails == null ? void 0 : publicWarningDetails.areas),
-    originalWarningAreas = _React$useState4[0],
-    setOriginalWarningAreas = _React$useState4[1];
+  var _React$useState4 = React.useState(initialPublicWarningArea),
+    warningGeoJSONFeature = _React$useState4[0],
+    setWarningGeoJSONFeature = _React$useState4[1];
+  var _React$useState5 = React.useState(publicWarningDetails == null ? void 0 : publicWarningDetails.areas),
+    originalWarningAreas = _React$useState5[0],
+    setOriginalWarningAreas = _React$useState5[1];
   var _useWarningsTranslati = useWarningsTranslation(),
     t = _useWarningsTranslati.t;
   var _useFormContext = useFormContext(),
@@ -5920,6 +5925,20 @@ var Form = function Form(_ref5) {
   var cancelAviationProduct = function cancelAviationProduct(warningType) {
     return onSaveAviationForm(selectedAviationProduct, 'CANCELLED', warningType, isVAPhenomenon(selectedAviationProduct, ProductAction.CANCEL) && watch('vaSigmetMoveToFIR'));
   };
+  var getPublishButtonLabel = function getPublishButtonLabel() {
+    if (isCancelling) {
+      return t('cancelling');
+    }
+    if (isPublishing) {
+      return t('warning-button-publishing');
+    }
+    if (selectedAviationProduct) {
+      return t('cancel-warningType', {
+        warningType: warningType
+      });
+    }
+    return t('warning-button-publish');
+  };
   var handleSubmitAviationProduct = /*#__PURE__*/function () {
     var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(action, warningType) {
       var formValues;
@@ -5984,10 +6003,11 @@ var Form = function Form(_ref5) {
             return _context10.abrupt("break", 22);
           case 16:
             void showConfirmDialog(action).then(function () {
-              setIsPublishing(true);
-              void cancelAviationProduct(warningType);
-              setIsPublishing(false);
-              onCloseForm();
+              setIsCancelling(true);
+              void cancelAviationProduct(warningType)["finally"](function () {
+                setIsCancelling(false);
+                onCloseForm();
+              });
             });
             return _context10.abrupt("break", 22);
           case 18:
@@ -6042,10 +6062,10 @@ var Form = function Form(_ref5) {
   var onPressClear = function onPressClear() {
     switch (warningType) {
       case 'sigmet':
-        reset(getEmptySigmetWarning());
+        reset(getEmptySigmetWarning(aviationConfig != null ? aviationConfig : {}));
         break;
       case 'airmet':
-        reset(getEmptyAirmetWarning());
+        reset(getEmptyAirmetWarning(aviationConfig != null ? aviationConfig : {}));
         break;
       case 'public':
       default:
@@ -6380,7 +6400,7 @@ var Form = function Form(_ref5) {
               sx: {
                 width: '100%'
               },
-              disabled: isSaving,
+              disabled: isPublishing || isCancelling,
               onClick: function onClick() {
                 void (selectedAviationProduct ? handleSubmitAviationProduct(ProductAction.CANCEL, warningType) : onPressPublish());
               },
@@ -6388,7 +6408,7 @@ var Form = function Form(_ref5) {
                 style: {
                   position: 'relative'
                 },
-                children: [isPublishing ? t('warning-button-publishing') : t('warning-button-publish'), isPublishing && jsx(CircularProgress, {
+                children: [getPublishButtonLabel(), (isPublishing || isCancelling) && jsx(CircularProgress, {
                   "data-testid": "spinner",
                   color: "inherit",
                   sx: spinnerSx
@@ -7655,8 +7675,18 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
   var updatedWarningType = selectedSigmet ? 'sigmet' : selectedAirmet && 'airmet' || warningType;
   var _useProductConfig = useProductConfig(updatedWarningType, !isDialogOpen),
     aviationConfig = _useProductConfig.data;
-  var selectedSigmetProduct = selectedSigmet && aviationConfig ? transformSigmetToProductFormat(selectedSigmet) : getEmptySigmetWarning();
-  var selectedAirmetProduct = selectedAirmet && aviationConfig ? transformAirmetToProductFormat(selectedAirmet) : getEmptyAirmetWarning();
+  var selectedSigmetProduct;
+  if (selectedSigmet && aviationConfig) {
+    selectedSigmetProduct = transformSigmetToProductFormat(selectedSigmet);
+  } else if (aviationConfig) {
+    selectedSigmetProduct = getEmptySigmetWarning(aviationConfig);
+  }
+  var selectedAirmetProduct;
+  if (selectedAirmet && aviationConfig) {
+    selectedAirmetProduct = transformAirmetToProductFormat(selectedAirmet);
+  } else if (aviationConfig) {
+    selectedAirmetProduct = getEmptyAirmetWarning(aviationConfig);
+  }
   var selectedAviationProduct = React__default.useMemo(function () {
     if (['sigmet', 'airmet'].includes((selectedWarningObject == null ? void 0 : selectedWarningObject.type) || '') && aviationConfig) {
       return flattenPublicWarning(selectedWarningObject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "12.5.0",
+  "version": "12.6.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,25 +8,25 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.5.0",
-    "@opengeoweb/shared": "12.5.0",
-    "@opengeoweb/store": "12.5.0",
-    "@opengeoweb/webmap-react": "12.5.0",
+    "@opengeoweb/api": "12.6.0",
+    "@opengeoweb/shared": "12.6.0",
+    "@opengeoweb/store": "12.6.0",
+    "@opengeoweb/webmap-react": "12.6.0",
     "@tanstack/react-query": "^5.69.2",
     "react-redux": "^9.2.0",
-    "@opengeoweb/theme": "12.5.0",
-    "@opengeoweb/form-fields": "12.5.0",
+    "@opengeoweb/theme": "12.6.0",
+    "@opengeoweb/form-fields": "12.6.0",
     "react-hook-form": "^7.50.1",
     "lodash": "^4.17.21",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/snackbar": "12.5.0",
+    "@opengeoweb/snackbar": "12.6.0",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "axios": "^1.7.7",
-    "@opengeoweb/core": "12.5.0",
-    "@opengeoweb/webmap": "12.5.0",
-    "@opengeoweb/authentication": "12.5.0",
-    "@opengeoweb/sigmet-airmet": "12.5.0",
+    "@opengeoweb/core": "12.6.0",
+    "@opengeoweb/webmap": "12.6.0",
+    "@opengeoweb/authentication": "12.6.0",
+    "@opengeoweb/sigmet-airmet": "12.6.0",
     "react-i18next": "^15.1.1",
     "i18next": "^25.0.1",
     "@mui/material": "^7.0.1",

package/src/lib/utils/sig-airmet-util.d.ts

@@ -11,8 +11,8 @@ export declare const transformSigmetToProductFormat: (warning: SigmetFromBackend
 export declare const transformAirmetToProductFormat: (warning: AirmetFromBackend | undefined) => AviationProduct;
 export declare const transformSigmetFromBackendToProductFormat: (warning: SigmetFromBackend) => AviationProduct;
 export declare const transformAirmetFromBackendToProductFormat: (warning: AirmetFromBackend) => AviationProduct;
-export declare const getEmptySigmetWarning: () => AviationProduct;
-export declare const getEmptyAirmetWarning: () => AviationProduct;
+export declare const getEmptySigmetWarning: (productConfig: ProductConfig) => AviationProduct;
+export declare const getEmptyAirmetWarning: (productConfig: ProductConfig) => AviationProduct;
 export declare const renewAviationProduct: <T extends AirmetWarning | SigmetWarning>(aviationWarning: T, productConfig: ProductConfig) => T;
 export declare const amendAviationProduct: <T extends AirmetWarning | SigmetWarning>(aviationWarning: T, productConfig: ProductConfig) => T;
 export declare const duplicateAviationProduct: <T extends AirmetWarning | SigmetWarning>(aviationWarning: T) => T;