@opengeoweb/sigmet-airmet 14.1.0 → 14.2.1

package/index.esm.js

@@ -960,14 +960,6 @@ function _regeneratorRuntime() {
  * */
 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);
 };
@@ -1003,7 +995,7 @@ var safeFetch = /*#__PURE__*/function () {
           _context.prev = 12;
           _context.t0 = _context["catch"](3);
           newError = Object.assign({}, _context.t0, {
-            name: translateKeyOutsideComponents('error-backend')
+            name: i18n.t('error-backend')
           });
           throw newError;
         case 16:
@@ -6952,12 +6944,12 @@ var ValidFrom = function ValidFrom(_ref) {
   var productConfig = _ref.productConfig,
     isDisabled = _ref.isDisabled,
     isReadOnly = _ref.isReadOnly,
-    _ref$isAmending = _ref.isAmending,
-    isAmending = _ref$isAmending === void 0 ? false : _ref$isAmending,
     _ref$onChange = _ref.onChange,
     _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
     _ref$onUserChange = _ref.onUserChange,
-    onUserChange = _ref$onUserChange === void 0 ? function () {} : _ref$onUserChange;
+    onUserChange = _ref$onUserChange === void 0 ? function () {} : _ref$onUserChange,
+    _ref$lockBecauseActiv = _ref.lockBecauseActive,
+    lockBecauseActive = _ref$lockBecauseActiv === void 0 ? false : _ref$lockBecauseActiv;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   var _useFormContext = useFormContext(),
@@ -6967,13 +6959,13 @@ var ValidFrom = function ValidFrom(_ref) {
   var _useDraftFormHelpers = useDraftFormHelpers(),
     isRequired = _useDraftFormHelpers.isRequired;
   var label = getFieldLabel(t, t('date-and-time'), isReadOnly);
-  // Update input field to now if amending exceeds the current minute
+  // Only auto-sync to now when amending an already-active SIGMET
   React__default.useEffect(function () {
-    if (!isAmending) {
-      return undefined;
+    if (!lockBecauseActive) {
+      return;
     }
     var updateNow = function updateNow() {
-      setValue('validDateStart', dateUtils.getCurrentTimeAsString(), {
+      return setValue('validDateStart', dateUtils.getCurrentTimeAsString(), {
         shouldValidate: true
       });
     };
@@ -6984,13 +6976,28 @@ var ValidFrom = function ValidFrom(_ref) {
       updateNow();
       intervalId = setInterval(updateNow, 60000);
     }, msUntilNextMinute);
+    // eslint-disable-next-line consistent-return
     return function () {
       clearTimeout(timeoutId);
       if (intervalId) {
         clearInterval(intervalId);
       }
     };
-  }, [isAmending, setValue]);
+  }, [lockBecauseActive, setValue]);
+  var nowIso = dateUtils.getCurrentTimeAsString();
+  var rules = lockBecauseActive ? {} : {
+    validate: {
+      isRequired: isRequired,
+      isValidDate: dateUtils.isValidIsoDateString,
+      isValueBeforeCurrentTime: function isValueBeforeCurrentTime(value) {
+        return isXHoursBefore(value, nowIso, 0) || t('valid-from-before-current-error');
+      },
+      isCurrentTimeXHoursBeforeValue: function isCurrentTimeXHoursBeforeValue(value) {
+        var hours = getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig);
+        return isXHoursBefore(nowIso, value, hours) || getValidFromXHoursBeforeMessage(t, hours);
+      }
+    }
+  };
   return jsx(ProductFormFieldLayout, {
     title: t('valid-from'),
     children: jsx(ReactHookFormDateTime, {
@@ -6998,28 +7005,13 @@ var ValidFrom = function ValidFrom(_ref) {
       name: "validDateStart",
       label: label,
       defaultNullValue: getDefaultValidFromValue(productConfig),
-      rules: isAmending ? {} // skip validation, auto-controlled
-      : {
-        validate: {
-          isRequired: isRequired,
-          isValidDate: dateUtils.isValidIsoDateString,
-          // The validity start cannot be before the current time
-          isValueBeforeCurrentTime: function isValueBeforeCurrentTime(value) {
-            return isXHoursBefore(value, dateUtils.getCurrentTimeAsString(), 0) || t('valid-from-before-current-error');
-          },
-          // The current time can be no more than 4 hours before the validity start (12 for VA/TC SIGMET)
-          isCurrentTimeXHoursBeforeValue: function isCurrentTimeXHoursBeforeValue(value) {
-            var isValid = isXHoursBefore(dateUtils.getCurrentTimeAsString(), value, getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig));
-            return isValid || getValidFromXHoursBeforeMessage(t, getHoursBeforeValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig));
-          }
-        }
-      },
+      rules: rules,
       onChange: function onChange() {
         onUserChange == null || onUserChange();
         triggerValidations(['validDateEnd', 'observationOrForecastTime'], getValues, trigger);
         _onChange();
       },
-      disabled: isDisabled || isAmending,
+      disabled: isDisabled || lockBecauseActive,
       isReadOnly: isReadOnly,
       "data-testid": "valid-from",
       sx: Object.assign({}, styles$2.helperText, {
@@ -8470,7 +8462,7 @@ var SigmetForm = function SigmetForm(_ref) {
     getTAC = _ref.getTAC,
     storedGeoJSON = _ref.storedGeoJSON,
     storedEndGeoJSON = _ref.storedEndGeoJSON,
-    isAmending = _ref.isAmending;
+    lockValidFrom = _ref.lockValidFrom;
   var _useSigmetAirmetTrans = useSigmetAirmetTranslation(),
     t = _useSigmetAirmetTrans.t;
   var _useTACApi = useTACApi(),
@@ -8713,12 +8705,12 @@ var SigmetForm = function SigmetForm(_ref) {
       }) : null, jsx(ValidFrom, {
         productConfig: productConfig,
         isDisabled: isDisabled,
-        isAmending: isAmending,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
         onUserChange: function onUserChange() {
           return setHasUserChangedTime(true);
-        }
+        },
+        lockBecauseActive: lockValidFrom
       }), jsx(ValidUntil, {
         productConfig: productConfig,
         isDisabled: isDisabled,
@@ -8872,7 +8864,7 @@ var AirmetForm = function AirmetForm(_ref) {
     product = _ref.product,
     getTAC = _ref.getTAC,
     storedGeoJSON = _ref.storedGeoJSON,
-    isAmending = _ref.isAmending;
+    lockValidFrom = _ref.lockValidFrom;
   var _useFormContext2 = useFormContext(),
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
@@ -9054,12 +9046,12 @@ var AirmetForm = function AirmetForm(_ref) {
       }), jsx(ValidFrom, {
         productConfig: productConfig,
         isDisabled: isDisabled,
-        isAmending: isAmending,
         isReadOnly: isReadOnly,
         onChange: onChangeForm,
         onUserChange: function onUserChange() {
           return setHasUserChangedTime(true);
-        }
+        },
+        lockBecauseActive: lockValidFrom
       }), jsx(ValidUntil, {
         productConfig: productConfig,
         isDisabled: isDisabled,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "14.1.0",
+  "version": "14.2.1",
   "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": "14.1.0",
-    "@opengeoweb/shared": "14.1.0",
-    "@opengeoweb/theme": "14.1.0",
-    "@opengeoweb/store": "14.1.0",
-    "@opengeoweb/webmap": "14.1.0",
-    "@opengeoweb/webmap-react": "14.1.0",
+    "@opengeoweb/api": "14.2.1",
+    "@opengeoweb/shared": "14.2.1",
+    "@opengeoweb/theme": "14.2.1",
+    "@opengeoweb/store": "14.2.1",
+    "@opengeoweb/webmap": "14.2.1",
+    "@opengeoweb/webmap-react": "14.2.1",
     "react-redux": "^9.2.0",
-    "@opengeoweb/core": "14.1.0",
-    "@opengeoweb/authentication": "14.1.0",
+    "@opengeoweb/core": "14.2.1",
+    "@opengeoweb/authentication": "14.2.1",
     "@mui/system": "^7.3.2",
-    "@opengeoweb/form-fields": "14.1.0",
+    "@opengeoweb/form-fields": "14.2.1",
     "react-hook-form": "^7.50.1",
     "axios": "^1.7.7",
     "lodash": "^4.17.21",

package/src/lib/components/ProductForms/AirmetForm/AirmetForm.d.ts

@@ -12,7 +12,7 @@ export interface AirmetFormProps {
         data: string;
     }>;
     storedGeoJSON?: GeoJSON.FeatureCollection;
-    isAmending?: boolean;
+    lockValidFrom?: boolean;
 }
 declare const AirmetForm: React.FC<AirmetFormProps>;
 export default AirmetForm;

package/src/lib/components/ProductForms/ProductFormFields/ValidFrom.d.ts

@@ -4,7 +4,7 @@ import { ConfigurableFormFieldProps, ProductConfig } from '../../../types';
 export declare const getValidFromXHoursBeforeMessage: (t: TFunction, hours: number) => string;
 export declare const getDefaultValidFromValue: (productConfig: ProductConfig) => string;
 interface ValidFromProps extends ConfigurableFormFieldProps {
-    isAmending?: boolean;
+    lockBecauseActive?: boolean;
 }
 declare const ValidFrom: React.FC<ValidFromProps>;
 export default ValidFrom;

package/src/lib/components/ProductForms/SigmetForm/SigmetForm.d.ts

@@ -14,7 +14,7 @@ export interface SigmetFormProps {
     }>;
     storedGeoJSON?: GeoJSON.FeatureCollection;
     storedEndGeoJSON?: GeoJSON.FeatureCollection;
-    isAmending?: boolean;
+    lockValidFrom?: boolean;
 }
 declare const SigmetForm: React.FC<SigmetFormProps>;
 export default SigmetForm;

package/src/lib/utils/i18n.d.ts

@@ -2,6 +2,6 @@ import i18n from 'i18next';
 import { UseTranslationResponse } from 'react-i18next';
 export declare const SA_NAMESPACE = "sigmetairmet";
 export declare const initSigmetAirmetI18n: () => void;
-export declare const translateKeyOutsideComponents: (key: string, params?: Record<string, string | number> | undefined) => string;
+export declare const translateInTestsAndStories: (key: string, params?: Record<string, string | number> | undefined) => string;
 export declare const useSigmetAirmetTranslation: () => UseTranslationResponse<typeof SA_NAMESPACE, typeof i18n>;
 export { i18n };