@opengeoweb/sigmet-airmet 12.4.1 → 12.5.0

package/index.esm.js

@@ -6727,7 +6727,9 @@ var ValidFrom = function ValidFrom(_ref) {
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
     _ref$onChange = _ref.onChange,
-    _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
+    _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+    _ref$onUserChange = _ref.onUserChange,
+    onUserChange = _ref$onUserChange === void 0 ? function () {} : _ref$onUserChange;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   var _useFormContext = useFormContext(),
@@ -6753,11 +6755,13 @@ var ValidFrom = function ValidFrom(_ref) {
           },
           // The current time can be no more than 4 hours before the validity start (12 for VA/TC SIGMET)
           isCurrentTimeXHoursBeforeValue: function isCurrentTimeXHoursBeforeValue(value) {
-            return isXHoursBefore(dateUtils.getCurrentTimeAsString(), value, getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig)) || getValidFromXHoursBeforeMessage(t, getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig));
+            var isValid = isXHoursBefore(dateUtils.getCurrentTimeAsString(), value, getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig));
+            return isValid ? true : getValidFromXHoursBeforeMessage(t, getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig));
           }
         }
       },
       onChange: function onChange() {
+        onUserChange == null || onUserChange();
         triggerValidations(['validDateEnd', 'observationOrForecastTime'], getValues, trigger);
         _onChange();
       },
@@ -6789,7 +6793,10 @@ var ValidUntil = function ValidUntil(_ref) {
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
     _ref$onChange = _ref.onChange,
-    _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
+    _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+    _ref$onUserChange = _ref.onUserChange,
+    onUserChange = _ref$onUserChange === void 0 ? function () {} : _ref$onUserChange,
+    hasUserChangedTime = _ref.hasUserChangedTime;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   var _useFormContext = useFormContext(),
@@ -6808,19 +6815,18 @@ var ValidUntil = function ValidUntil(_ref) {
   var locationIndicatorATSR = watch('locationIndicatorATSR');
   var validFrom = watch('validDateStart');
   React__default.useEffect(function () {
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    var updateValues = function updateValues() {
-      var newDefaultValidUntilValue = getDefaultValidUntilValue(productConfig, phenomenon, locationIndicatorATSR, validFrom);
-      if (newDefaultValidUntilValue !== defaultValidUntilValue) {
-        setDefaultValidUntilValue(newDefaultValidUntilValue);
-        setValue('validDateEnd', newDefaultValidUntilValue, {
-          shouldValidate: false
-        });
-        void trigger('validDateEnd');
-      }
-    };
-    updateValues();
-  }, [phenomenon, locationIndicatorATSR, validFrom, setValue, productConfig, trigger, defaultValidUntilValue]);
+    if (hasUserChangedTime) {
+      return;
+    }
+    var newDefaultValidUntilValue = getDefaultValidUntilValue(productConfig, phenomenon, locationIndicatorATSR, validFrom);
+    if (newDefaultValidUntilValue !== defaultValidUntilValue) {
+      setDefaultValidUntilValue(newDefaultValidUntilValue);
+      setValue('validDateEnd', newDefaultValidUntilValue, {
+        shouldValidate: false
+      });
+      void trigger('validDateEnd');
+    }
+  }, [phenomenon, locationIndicatorATSR, validFrom, setValue, productConfig, trigger, defaultValidUntilValue, hasUserChangedTime]);
   return jsx(ProductFormFieldLayout, {
     title: t('valid-until'),
     children: jsx(ReactHookFormDateTime, {
@@ -6845,7 +6851,7 @@ var ValidUntil = function ValidUntil(_ref) {
       disabled: isDisabled,
       isReadOnly: isReadOnly,
       onChange: function onChange() {
-        // Trigger validation after any change
+        onUserChange == null || onUserChange(); // Track manual change
         triggerValidations(['validDateStart', 'observationOrForecastTime'], getValues, trigger);
         _onChange();
       },
@@ -8221,10 +8227,13 @@ var SigmetForm = function SigmetForm(_ref) {
     setValue = _useFormContext2.setValue,
     handleSubmit = _useFormContext2.handleSubmit,
     errors = _useFormContext2.formState.errors;
+  var _React$useState = React__default.useState(false),
+    hasUserChangedTime = _React$useState[0],
+    setHasUserChangedTime = _React$useState[1];
   var firBorderAtStart = initialSigmet ? initialSigmet.locationIndicatorATSR : productConfig.active_firs[0];
-  var _React$useState = React__default.useState(getDefaultPhenomena(productConfig).phenomena),
-    phenomenaList = _React$useState[0],
-    setPhenomenaList = _React$useState[1];
+  var _React$useState2 = React__default.useState(getDefaultPhenomena(productConfig).phenomena),
+    phenomenaList = _React$useState2[0],
+    setPhenomenaList = _React$useState2[1];
   var _useMapDrawTool = useMapDrawTool({
       defaultDrawModes: getDrawTools(t, StartOrEndDrawing.start, getFir(productConfig, firBorderAtStart)),
       defaultGeoJSON: !isCancelSigmet && initialSigmet && initialSigmet.startGeometry ? addFeatureProperties(initialSigmet.startGeometry, featurePropsStart) : undefined,
@@ -8335,9 +8344,9 @@ var SigmetForm = function SigmetForm(_ref) {
     updateGeojson: updateStartGeoJson
   }), getEndLayer('geoJSONIntersection', 'geojsonlayer-intersection-end'), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
   useFormLayers(layers);
-  var _React$useState2 = React__default.useState(mode === 'view'),
-    isDisabled = _React$useState2[0],
-    setIsDisabled = _React$useState2[1];
+  var _React$useState3 = React__default.useState(mode === 'view'),
+    isDisabled = _React$useState3[0],
+    setIsDisabled = _React$useState3[1];
   var isReadOnly = mode === 'view';
   var helperText = isReadOnly ? '' : 'Optional';
   React__default.useEffect(function () {
@@ -8407,12 +8416,19 @@ var SigmetForm = function SigmetForm(_ref) {
         productConfig: productConfig,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeForm
+        onChange: onChangeForm,
+        onUserChange: function onUserChange() {
+          return setHasUserChangedTime(true);
+        }
       }), jsx(ValidUntil, {
         productConfig: productConfig,
         isDisabled: isDisabled,
         isReadOnly: isReadOnly,
-        onChange: onChangeForm
+        onChange: onChangeForm,
+        hasUserChangedTime: hasUserChangedTime,
+        onUserChange: function onUserChange() {
+          return setHasUserChangedTime(true);
+        }
       }), jsx(SelectFIR, {
         productConfig: productConfig,
         isDisabled: isDisabled,
@@ -8567,6 +8583,9 @@ var AirmetForm = function AirmetForm(_ref) {
   var _React$useState = React__default.useState(getDefaultPhenomena(productConfig).phenomena),
     phenomenaList = _React$useState[0],
     setPhenomenaList = _React$useState[1];
+  var _React$useState2 = React__default.useState(false),
+    hasUserChangedTime = _React$useState2[0],
+    setHasUserChangedTime = _React$useState2[1];
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   var _useApiContext = useApiContext(),
@@ -8635,9 +8654,9 @@ var AirmetForm = function AirmetForm(_ref) {
     updateGeojson: updateStartGeoJson
   }), getStartLayer('geoJSONIntersection', 'geojsonlayer-intersection-start')];
   useFormLayers(layers);
-  var _React$useState2 = React__default.useState(mode === 'view'),
-    isDisabled = _React$useState2[0],
-    setIsDisabled = _React$useState2[1];
+  var _React$useState3 = React__default.useState(mode === 'view'),
+    isDisabled = _React$useState3[0],
+    setIsDisabled = _React$useState3[1];
   var isReadOnly = mode === 'view';
   var helperText = isReadOnly ? '' : 'Optional';
   React__default.useEffect(function () {
@@ -8707,15 +8726,22 @@ var AirmetForm = function AirmetForm(_ref) {
         helperText: helperText,
         onChange: onChangeForm
       }), jsx(ValidFrom, {
-        isReadOnly: isReadOnly,
+        productConfig: productConfig,
         isDisabled: isDisabled,
+        isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        productConfig: productConfig
+        onUserChange: function onUserChange() {
+          return setHasUserChangedTime(true);
+        }
       }), jsx(ValidUntil, {
-        isReadOnly: isReadOnly,
+        productConfig: productConfig,
         isDisabled: isDisabled,
+        isReadOnly: isReadOnly,
         onChange: onChangeForm,
-        productConfig: productConfig
+        hasUserChangedTime: hasUserChangedTime,
+        onUserChange: function onUserChange() {
+          return setHasUserChangedTime(true);
+        }
       }), jsx(SelectFIR, {
         isReadOnly: isReadOnly,
         isDisabled: isDisabled,
@@ -8858,7 +8884,9 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
   var _useFormContext = useFormContext(),
     handleSubmit = _useFormContext.handleSubmit,
     formState = _useFormContext.formState,
-    watch = _useFormContext.watch;
+    watch = _useFormContext.watch,
+    trigger = _useFormContext.trigger,
+    getValues = _useFormContext.getValues;
   var dirtyFields = formState.dirtyFields;
   var isDirty = Object.keys(dirtyFields).length > 0;
   var _useDraftFormHelpers = useDraftFormHelpers(),
@@ -8916,66 +8944,89 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
       }) : null
     });
   };
-  var onProductButtonPress = function onProductButtonPress(action) {
-    switch (action) {
-      case ProductAction.CLOSE:
-        if (mode === 'view' || !isDirty) {
-          onToggleDialog(false);
-        } else {
-          toggleIsDraft(true);
-          showConfirmDialog(action).then(function () {
-            void handleSubmit(function (formValues) {
-              postProduct(formValues, 'DRAFT');
-            })();
-          })["catch"](function (reason) {
-            if (reason === 'CANCELLED') {
-              // close without save
+  var onProductButtonPress = /*#__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;
+            break;
+          case 3:
+            if (mode === 'view' || !isDirty) {
               onToggleDialog(false);
+            } else {
+              toggleIsDraft(true);
+              showConfirmDialog(action).then(function () {
+                void handleSubmit(function (formValues) {
+                  postProduct(formValues, 'DRAFT');
+                })();
+              })["catch"](function (reason) {
+                if (reason === 'CANCELLED') {
+                  // close without save
+                  onToggleDialog(false);
+                }
+              });
             }
-          });
-        }
-        break;
-      case ProductAction.CANCEL:
-        void showConfirmDialog(action).then(function () {
-          // if volcanic sigmet - add to which FIR it's moving
-          if (isVAPhenomenon(product, action)) {
-            postProduct(prepareCancelSigmet(product, watch('vaSigmetMoveToFIR')), 'CANCELLED');
-          } else {
-            postProduct(product, 'CANCELLED');
-          }
-        });
-        break;
-      case ProductAction.DISCARD:
-        void showConfirmDialog(action).then(function () {
-          // If we're discarding a new SIGMET/AIRMET - just close the dialog
-          if (mode === 'new' || !(product != null && product.uuid)) {
-            onToggleDialog(false);
-          } else {
-            // If we're discarding an existing SIGMET/AIRMET - make call to BE
-            postProduct(product, 'DISCARDED');
-          }
-        });
-        break;
-      case ProductAction.RENEW:
-        onRenewClick();
-        break;
-      default:
-        toggleIsDraft(action === ProductAction.SAVE);
-        // validate form
-        void handleSubmit(function (formValues) {
-          if (action === ProductAction.SAVE) {
-            // NO MODAL, SAVE DIRECTLY
-            postProduct(formValues, 'DRAFT');
-          } else {
-            // YES MODAL
+            return _context.abrupt("break", 22);
+          case 5:
             void showConfirmDialog(action).then(function () {
-              postProduct(formValues, 'PUBLISHED');
+              // if volcanic sigmet - add to which FIR it's moving
+              if (isVAPhenomenon(product, action)) {
+                postProduct(prepareCancelSigmet(product, watch('vaSigmetMoveToFIR')), 'CANCELLED');
+              } else {
+                postProduct(product, 'CANCELLED');
+              }
             });
-          }
-        })();
-        break;
-    }
-  };
+            return _context.abrupt("break", 22);
+          case 7:
+            void showConfirmDialog(action).then(function () {
+              // If we're discarding a new SIGMET/AIRMET - just close the dialog
+              if (mode === 'new' || !(product != null && product.uuid)) {
+                onToggleDialog(false);
+              } else {
+                // If we're discarding an existing SIGMET/AIRMET - make call to BE
+                postProduct(product, 'DISCARDED');
+              }
+            });
+            return _context.abrupt("break", 22);
+          case 9:
+            onRenewClick();
+            return _context.abrupt("break", 22);
+          case 11:
+            isDraft = action === ProductAction.SAVE;
+            toggleIsDraft(isDraft);
+            if (!isDraft) {
+              _context.next = 20;
+              break;
+            }
+            _context.next = 16;
+            return trigger();
+          case 16:
+            formValues = getValues(); // Save draft without blocking on validation
+            postProduct(formValues, 'DRAFT');
+            _context.next = 21;
+            break;
+          case 20:
+            // Validate and submit normally (will block if invalid)
+            void handleSubmit(function (formValues) {
+              void showConfirmDialog(action).then(function () {
+                postProduct(formValues, 'PUBLISHED');
+              });
+            })();
+          case 21:
+            return _context.abrupt("break", 22);
+          case 22:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onProductButtonPress(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var title = getDialogtitle(t, product, productType, productConfig);
   return jsxs(CustomDialog, {
     open: isOpen,
@@ -8986,7 +9037,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     disableEnforceFocus: true,
     disableEscapeKeyDown: true,
     onClose: function onClose() {
-      return onProductButtonPress(ProductAction.CLOSE);
+      void onProductButtonPress(ProductAction.CLOSE);
     },
     headerActions: getLifecycleActions({
       canBe: productCanBe,
@@ -9043,8 +9094,8 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     })]
   });
 };
-var Wrapper = function Wrapper(_ref2) {
-  var props = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
+var Wrapper = function Wrapper(_ref3) {
+  var props = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
   return jsx(ReactHookFormProvider, {
     options: Object.assign({}, defaultFormOptions, {
       defaultValues: props.product,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "12.4.1",
+  "version": "12.5.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,17 +8,17 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.4.1",
-    "@opengeoweb/shared": "12.4.1",
-    "@opengeoweb/theme": "12.4.1",
-    "@opengeoweb/store": "12.4.1",
-    "@opengeoweb/webmap": "12.4.1",
-    "@opengeoweb/webmap-react": "12.4.1",
+    "@opengeoweb/api": "12.5.0",
+    "@opengeoweb/shared": "12.5.0",
+    "@opengeoweb/theme": "12.5.0",
+    "@opengeoweb/store": "12.5.0",
+    "@opengeoweb/webmap": "12.5.0",
+    "@opengeoweb/webmap-react": "12.5.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/core": "12.4.1",
-    "@opengeoweb/authentication": "12.4.1",
+    "@opengeoweb/core": "12.5.0",
+    "@opengeoweb/authentication": "12.5.0",
     "@mui/system": "^7.0.1",
-    "@opengeoweb/form-fields": "12.4.1",
+    "@opengeoweb/form-fields": "12.5.0",
     "react-hook-form": "^7.50.1",
     "axios": "^1.7.7",
     "lodash": "^4.17.21",

package/src/lib/types.d.ts

@@ -299,6 +299,8 @@ export interface FormFieldProps {
     onChange?: (event?: React.ChangeEvent<HTMLInputElement>, phenomenaList?: AviationPhenomenon[]) => void;
     isDisabled: boolean;
     isReadOnly?: boolean;
+    onUserChange?: () => void;
+    hasUserChangedTime?: boolean;
 }
 export interface ConfigurableFormFieldProps extends FormFieldProps {
     productConfig: ProductConfig;