@opengeoweb/sigmet-airmet 9.26.0 → 9.27.0

package/index.esm.js

@@ -2957,9 +2957,6 @@ const getMaxHoursOfValidity = (phenomenon, fir, config) => {
 const getValidFromDelayTimeMinutesFromConfig = config => {
   return config.valid_from_delay_minutes;
 };
-const getDefaultValidityMinutesFromConfig = config => {
-  return config.default_validity_minutes;
-};
 const getOmitChangeFromConfig = config => {
   return config.omit_change_va_and_rdoact_cloud === true;
 };
@@ -4798,9 +4795,16 @@ const getValidFromXHoursBeforeMessage = hours => translateKeyOutsideComponents('
 });
 const getDefaultValidFromValue = productConfig => {
   const validFromDelayTimeMinutes = getValidFromDelayTimeMinutesFromConfig(productConfig);
-  return dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
+  const dateWithDelay = dateUtils.add(dateUtils.utc(), {
     minutes: validFromDelayTimeMinutes
-  }));
+  });
+  const minutes = dateWithDelay.getUTCMinutes();
+  // Calculate the minutes needed to round up to the next half hour
+  const extraMinutes = minutes <= 30 ? 30 - minutes : 60 - minutes;
+  const roundedDate = dateUtils.add(dateWithDelay, {
+    minutes: extraMinutes
+  });
+  return dateUtils.dateToString(roundedDate);
 };
 const ValidFrom = ({
   productConfig,
@@ -4849,12 +4853,16 @@ const ValidFrom = ({
   }));
 };
 
-const getDefaultValidUntilValue = productConfig => {
-  const defaultValidityMinutes = getDefaultValidityMinutesFromConfig(productConfig);
-  const validFromDelayTimeMinutes = getValidFromDelayTimeMinutesFromConfig(productConfig);
-  return dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
-    minutes: defaultValidityMinutes + validFromDelayTimeMinutes
-  }));
+const getDefaultValidUntilValue = (productConfig, phenomenon, fir, validFrom) => {
+  const maxHoursOfValidity = getMaxHoursOfValidity(phenomenon, fir || '', productConfig);
+  // Set default validity to 2 hours for thunderstorms, otherwise use maxHoursOfValidity
+  const defaultHoursOfValidity = ['EMBD_TS', 'EMBD_TSGR', 'FRQ_TS', 'FRQ_TSGR', 'OBSC_TS', 'OBSC_TSGR', 'SQL_TSGR', 'ISOL_TS', 'ISOL_TSGR', 'OCNL_TS', 'OCNL_TSGR'].includes(phenomenon) ? 2 : maxHoursOfValidity;
+  // Use validFrom if provided, otherwise use current UTC time
+  const baseDate = validFrom ? new Date(validFrom) : dateUtils.utc();
+  const dateWithValidity = dateUtils.add(baseDate, {
+    hours: defaultHoursOfValidity
+  });
+  return dateUtils.dateToString(dateWithValidity);
 };
 const ValidUntil = ({
   productConfig,
@@ -4867,13 +4875,33 @@ const ValidUntil = ({
   } = useSigmetAirmetTranslation();
   const {
     getValues,
-    trigger
+    trigger,
+    watch,
+    setValue
   } = useFormContext();
   const {
     isRequired
   } = useDraftFormHelpers();
   const dateAndTime = t('date-and-time');
   const label = getFieldLabel(dateAndTime, isReadOnly);
+  const [defaultValidUntilValue, setDefaultValidUntilValue] = React__default.useState(getDefaultValidUntilValue(productConfig, getValues('phenomenon'), getValues('locationIndicatorATSR'), getValues('validDateStart')));
+  const phenomenon = watch('phenomenon');
+  const locationIndicatorATSR = watch('locationIndicatorATSR');
+  const validFrom = watch('validDateStart');
+  React__default.useEffect(() => {
+    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+    const updateValues = () => {
+      const newDefaultValidUntilValue = getDefaultValidUntilValue(productConfig, phenomenon, locationIndicatorATSR, validFrom);
+      if (newDefaultValidUntilValue !== defaultValidUntilValue) {
+        setDefaultValidUntilValue(newDefaultValidUntilValue);
+        setValue('validDateEnd', newDefaultValidUntilValue, {
+          shouldValidate: false
+        });
+        trigger('validDateEnd');
+      }
+    };
+    updateValues();
+  }, [phenomenon, locationIndicatorATSR, validFrom, setValue, productConfig, trigger, defaultValidUntilValue]);
   return jsx(ProductFormFieldLayout, Object.assign({
     title: t('valid-until')
   }, {
@@ -4881,14 +4909,12 @@ const ValidUntil = ({
       disablePast: true,
       name: "validDateEnd",
       label: label,
-      defaultNullValue: getDefaultValidUntilValue(productConfig),
+      defaultNullValue: defaultValidUntilValue,
       rules: {
         validate: {
           isRequired,
           isValidDate: dateUtils.isValidIsoDateString,
-          // Validity end has to be after validity start
           isAfter: value => value ? dateUtils.isAfter(value, getValues('validDateStart')) || t('valid-until-time') : true,
-          // Validity end can be no more than 4 hours after validity start (6 for VA/TC SIGMET)
           isXHoursAfter: value => isXHoursAfter(value, getValues('validDateStart'), getMaxHoursOfValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig)) || t('valid-until-time-error', {
             hours: getMaxHoursOfValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig)
           })
@@ -4897,11 +4923,13 @@ const ValidUntil = ({
       disabled: isDisabled,
       isReadOnly: isReadOnly,
       onChange: () => {
+        // Trigger validation after any change
         triggerValidations(['validDateStart', 'observationOrForecastTime'], getValues, trigger);
         _onChange();
       },
+      "data-testid": "valid-until",
       sx: styles$2.helperText
-    })
+    }, defaultValidUntilValue)
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "9.26.0",
+  "version": "9.27.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -30,7 +30,9 @@
     "react-i18next": "^14.1.2"
   },
   "peerDependencies": {
-    "react": "18"
+    "react": "18",
+    "@emotion/react": "*",
+    "@emotion/styled": "*"
   },
   "module": "./index.esm.js",
   "type": "module",

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

@@ -1,5 +1,5 @@
 import React from 'react';
 import { ConfigurableFormFieldProps, ProductConfig } from '../../../types';
-export declare const getDefaultValidUntilValue: (productConfig: ProductConfig) => string;
+export declare const getDefaultValidUntilValue: (productConfig: ProductConfig, phenomenon?: string, fir?: string, validFrom?: string) => string;
 declare const ValidUntil: React.FC<ConfigurableFormFieldProps>;
 export default ValidUntil;