@opengeoweb/sigmet-airmet 9.16.0 → 9.17.0

package/index.esm.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import React__default from 'react';
 import { FormControlLabel, Radio, Grid, Typography, Box, Button, Checkbox, MenuItem, FormHelperText, useTheme, Dialog, DialogTitle, DialogContent, Card, LinearProgress, List, ListItemButton, Backdrop, CircularProgress } from '@mui/material';
 import { useFormContext } from 'react-hook-form';
-import { useDraftFormHelpers, ReactHookFormRadioGroup, DATE_FORMAT_FNS, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, isValidDate, isBefore, isBetween, hasMaxFeaturePoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isAfter, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
+import { useDraftFormHelpers, ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, hasMaxFeaturePoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useApiContext, useApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
 import { defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultPoint, addGeoJSONProperties, defaultBox, defaultPolygon, DRAWMODE, addSelectionTypeToGeoJSON, defaultDelete, getIcon, MapControls, MapViewLayer, useMapDrawTool, addFeatureProperties, rewindGeometry } from '@opengeoweb/webmap-react';
 import { dateUtils, ToggleMenu, CustomTooltip, useIsMounted, StatusTag, AlertBanner, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
@@ -2783,10 +2783,10 @@ const getConfirmationDialogCancelLabel = action => {
 };
 const getProductIssueDate = (initialProduct, initialCancelProduct) => {
   if (initialProduct !== null && (initialProduct.status === 'PUBLISHED' || initialProduct.status === 'EXPIRED') && initialProduct.issueDate) {
-    return `${dateUtils.dateToString(dateUtils.utc(initialProduct.issueDate), DATE_FORMAT_FNS)} UTC`;
+    return `${dateUtils.dateToString(dateUtils.utc(initialProduct.issueDate), dateUtils.DATE_FORMAT_DATEPICKER)} UTC`;
   }
   if (initialCancelProduct !== null && initialCancelProduct.issueDate) {
-    return `${dateUtils.dateToString(dateUtils.utc(initialCancelProduct.issueDate), DATE_FORMAT_FNS)} UTC`;
+    return `${dateUtils.dateToString(dateUtils.utc(initialCancelProduct.issueDate), dateUtils.DATE_FORMAT_DATEPICKER)} UTC`;
   }
   return '(Not published)';
 };
@@ -3559,9 +3559,9 @@ const ObservationForecastTime = ({
     label: label,
     rules: {
       validate: {
-        isValidDate,
-        isBefore: val => watch('isObservationOrForecast') === 'OBS' && val ? isBefore(val, dateUtils.getCurrentTimeAsString()) || 'Observation time cannot be in the future' : true,
-        isBetween: val => watch('isObservationOrForecast') === 'FCST' && val ? isBetween(goZeroSeconds(val), goZeroSeconds(watch('validDateStart')), goZeroSeconds(watch('validDateEnd'))) || ForecastTimeValidation : true
+        isValidDate: dateUtils.isValidIsoDateString,
+        isBefore: val => watch('isObservationOrForecast') === 'OBS' && val ? dateUtils.isBefore(val, dateUtils.getNowUtc()) || 'Observation time cannot be in the future' : true,
+        isBetween: val => watch('isObservationOrForecast') === 'FCST' && val ? dateUtils.isBetween(dateUtils.isoStringToDate(val), dateUtils.isoStringToDate(goZeroSeconds(watch('validDateStart'))), dateUtils.isoStringToDate(goZeroSeconds(watch('validDateEnd'))), '[]') || ForecastTimeValidation : true
       }
     },
     disabled: fieldsDisabled,
@@ -4159,7 +4159,7 @@ const ValidFrom = ({
     rules: {
       validate: {
         isRequired,
-        isValidDate,
+        isValidDate: dateUtils.isValidIsoDateString,
         // The validity start can not be before the current time
         isValueBeforeCurrentTime: value => isXHoursBefore(value, dateUtils.getCurrentTimeAsString(), 0) || VALID_FROM_ERROR_BEFORE_CURRENT,
         // The current time can be no more than 4 hours before the validity start (12 for VA/TC SIGMET)
@@ -4224,9 +4224,9 @@ const ValidUntil = ({
     rules: {
       validate: {
         isRequired,
-        isValidDate,
+        isValidDate: dateUtils.isValidIsoDateString,
         // Validity end has to be after validity start
-        isAfter: value => isAfter(value, getValues('validDateStart')) || 'Valid until time has to be after Valid from time',
+        isAfter: value => value ? dateUtils.isAfter(value, getValues('validDateStart')) || 'Valid until time has to be after Valid from 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)) || `Valid until time can be no more than ${getMaxHoursOfValidity(getValues('phenomenon'), getValues('locationIndicatorATSR'), productConfig)} hours after Valid from time`
       }
@@ -9928,7 +9928,7 @@ const formatValidTime = (startDate, endDate, format) => {
   if (!startDate || !endDate) {
     return '-';
   }
-  return `${dateUtils.dateToString(dateUtils.utc(startDate), 'dd MMM yyyy, HH:mm')} - ${dateUtils.dateToString(dateUtils.utc(endDate), format)} UTC`;
+  return `${dateUtils.dateToString(dateUtils.utc(startDate), dateUtils.DATE_FORMAT_NAME_OF_MONTH)} - ${dateUtils.dateToString(dateUtils.utc(endDate), format)} UTC`;
 };
 const ProductListRowHeader = ({
   title
@@ -10033,7 +10033,7 @@ const ProductListRow = ({
   }, [product, apiCall]);
   const cancelsSeqId = isInstanceOfCancelSigmetOrAirmet(product) ? getCancelSeqId(product) : null;
   const phenomenon = isInstanceOfSigmetOrAirmet(product) && product.phenomenon ? product.phenomenon : null;
-  const validTimeFormat = dateUtils.dateToString(dateUtils.utc(product.validDateStart), 'dd MMM yyyy') === dateUtils.dateToString(dateUtils.utc(product.validDateEnd), 'dd MMM yyyy') ? 'HH:mm' : 'dd MMM yyyy, HH:mm';
+  const validTimeFormat = dateUtils.dateToString(dateUtils.utc(product.validDateStart), dateUtils.DATE_FORMAT_YEAR) === dateUtils.dateToString(dateUtils.utc(product.validDateEnd), dateUtils.DATE_FORMAT_YEAR) ? dateUtils.DATE_FORMAT_HOURS : dateUtils.DATE_FORMAT_NAME_OF_MONTH;
   const validTime = formatValidTime(product.validDateStart, product.validDateEnd, validTimeFormat);
   const getLabel = product => {
     const isSigmetOrAirmet = product => {
@@ -10122,7 +10122,7 @@ const ProductListRow = ({
     variant: "subtitle2",
     sx: styles.font,
     "data-testid": "issueTime"
-  }, product.issueDate ? `${dateUtils.dateToString(dateUtils.utc(product.issueDate), 'dd MMM yyyy, HH:mm')} UTC` : '(Not published)'))), /*#__PURE__*/React__default.createElement(Grid, {
+  }, product.issueDate ? `${dateUtils.dateToString(dateUtils.utc(product.issueDate), dateUtils.DATE_FORMAT_NAME_OF_MONTH)} UTC` : '(Not published)'))), /*#__PURE__*/React__default.createElement(Grid, {
     className: "col-3",
     item: true
   }, /*#__PURE__*/React__default.createElement(ProductListRowHeader, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "9.16.0",
+  "version": "9.17.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {