@opengeoweb/taf 9.3.1 → 9.4.1

package/index.esm.js

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import React__default from 'react';
 import { Grid, Button, Chip, Box, Typography, TextField, Card, Tabs, Tab, Dialog, MenuList, MenuItem, Backdrop, CircularProgress } from '@mui/material';
-import { useFormContext, Controller, useFieldArray } from 'react-hook-form';
+import { useFormContext, useFieldArray, Controller } from 'react-hook-form';
 import { useDispatch } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { HIDDEN_INPUT_HELPER_IS_DRAFT, getDeepProperty, useDraftFormHelpers, ReactHookFormHiddenInput, ReactHookFormProvider } from '@opengeoweb/form-fields';
-import { useIsMounted, CustomIconButton, CustomTooltip, ToolContainerDraggable, Avatar, getInitials, ToggleMenu, useConfirmationDialog, usePreventBrowserClose, SwitchButton, ToolHeader, AlertBanner, getErrorMessage as getErrorMessage$1, getWarningMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
+import { dateUtils, useIsMounted, CustomIconButton, CustomTooltip, ToolContainerDraggable, Avatar, getInitials, ToggleMenu, useConfirmationDialog, usePreventBrowserClose, SwitchButton, ToolHeader, AlertBanner, getErrorMessage as getErrorMessage$1, getWarningMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import { snackbarActions } from '@opengeoweb/snackbar';
 import moment from 'moment';
 import { isEqual } from 'lodash';
@@ -2274,6 +2274,26 @@ var validateFourthCloud = function validateFourthCloud(firstCloudValue, secondCl
   return true;
 };
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
+ * */
+var DATE_FORMAT_YEAR = "yyyy-MM-dd'";
+var DATE_FORMAT_ISSUE_TIME = "ddHHmm'Z";
+var DATE_FORMAT_FULL = "yyyy-MM-dd'T'HH:mm:ss'";
+
 var emptyBaseForecast = {
   wind: '',
   visibility: '',
@@ -2292,7 +2312,7 @@ var emptyBaseForecast = {
 var MIN_NUMBER_CHANGE_GROUP = 5;
 // formatters
 var formatIssueTime = function formatIssueTime(issueDate) {
-  return issueDate ? "".concat(moment(issueDate).utc().format('DDHHmm'), "Z") : 'Not issued';
+  return issueDate ? dateUtils.dateToString(new Date(issueDate), DATE_FORMAT_ISSUE_TIME) : 'Not issued';
 };
 function formatFormValues(row) {
   return Object.keys(row).reduce(function (list, key) {
@@ -3182,7 +3202,8 @@ var TafModuleContext = /*#__PURE__*/React.createContext({
   registerValidateForm: null,
   tafAction: null,
   setTafAction: null,
-  onPreventCloseView: null
+  onPreventCloseView: null,
+  useFieldArrayMethods: {}
 });
 var useTafModuleContext = function useTafModuleContext() {
   return React.useContext(TafModuleContext);
@@ -3201,6 +3222,12 @@ var useTafModuleState = function useTafModuleState(_ref) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     tafAction = _React$useState4[0],
     setTafAction = _React$useState4[1];
+  var _useFormContext = useFormContext(),
+    control = _useFormContext.control;
+  var useFieldArrayMethods = useFieldArray({
+    control: control,
+    name: 'changeGroups'
+  });
   var onRegisterValidateForm = function onRegisterValidateForm(promiseToRegister) {
     registerValidateForm(function () {
       return promiseToRegister;
@@ -3211,7 +3238,8 @@ var useTafModuleState = function useTafModuleState(_ref) {
     registerValidateForm: onRegisterValidateForm,
     tafAction: tafAction,
     setTafAction: setTafAction,
-    onPreventCloseView: onPreventCloseView
+    onPreventCloseView: onPreventCloseView,
+    useFieldArrayMethods: useFieldArrayMethods
   };
 };
 var TafModuleProvider = function TafModuleProvider(_ref2) {
@@ -4080,23 +4108,20 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     _useTafModuleContext$ = _useTafModuleContext.setTafAction,
     setTafAction = _useTafModuleContext$ === void 0 ? function () {} : _useTafModuleContext$,
     _useTafModuleContext$2 = _useTafModuleContext.onPreventCloseView,
-    onPreventCloseView = _useTafModuleContext$2 === void 0 ? function () {} : _useTafModuleContext$2;
+    onPreventCloseView = _useTafModuleContext$2 === void 0 ? function () {} : _useTafModuleContext$2,
+    useFieldArrayMethods = _useTafModuleContext.useFieldArrayMethods;
+  var fields = useFieldArrayMethods.fields,
+    insert = useFieldArrayMethods.insert,
+    remove = useFieldArrayMethods.remove,
+    move = useFieldArrayMethods.move,
+    replace = useFieldArrayMethods.replace;
   var _useFormContext = useFormContext(),
-    control = _useFormContext.control,
     handleSubmit = _useFormContext.handleSubmit,
     trigger = _useFormContext.trigger,
     formState = _useFormContext.formState,
     getValues = _useFormContext.getValues,
     setValue = _useFormContext.setValue,
-    resetField = _useFormContext.resetField;
-  var _useFieldArray = useFieldArray({
-      control: control,
-      name: 'changeGroups'
-    }),
-    fields = _useFieldArray.fields,
-    insert = _useFieldArray.insert,
-    remove = _useFieldArray.remove,
-    move = _useFieldArray.move;
+    reset = _useFormContext.reset;
   var _useDragOrder = useDragOrder(trigger, move),
     onChangeOrder = _useDragOrder.onChangeOrder,
     onStartDrag = _useDragOrder.onStartDrag,
@@ -4127,17 +4152,10 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
   };
   var resetFormValues = function resetFormValues(formData) {
     var keepDirty = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    Object.keys(formData).forEach(function (key) {
-      if (!keepDirty || key === 'changeGroups') {
-        resetField(key, {
-          keepDirty: keepDirty,
-          defaultValue: formData[key]
-        });
-      }
-      setValue(key, formData[key], {
-        shouldDirty: keepDirty
-      });
+    reset(formData, {
+      keepDirty: keepDirty
     });
+    replace(formData.changeGroups);
   };
   var resetFormState = function resetFormState(resetDisabled) {
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
@@ -4976,7 +4994,10 @@ var TacContainer = function TacContainer(_ref) {
   var _useFormContext = useFormContext(),
     getValues = _useFormContext.getValues,
     trigger = _useFormContext.trigger,
-    setValue = _useFormContext.setValue;
+    reset = _useFormContext.reset;
+  var _useTafModuleContext = useTafModuleContext(),
+    useFieldArrayMethods = _useTafModuleContext.useFieldArrayMethods;
+  var replace = useFieldArrayMethods.replace;
   var showSnackbar = React__default.useCallback(function (message) {
     dispatch(snackbarActions.openSnackbar({
       message: message
@@ -4985,12 +5006,10 @@ var TacContainer = function TacContainer(_ref) {
   var handleExport = function handleExport() {
     var currentTaf = getValues();
     var newTaf = prepareTafExportValues(taf, currentTaf);
-    setValue('baseForecast', newTaf.baseForecast, {
-      shouldDirty: true
-    });
-    setValue('changeGroups', newTaf.changeGroups, {
-      shouldDirty: true
+    reset(newTaf, {
+      keepDirty: true
     });
+    replace(newTaf.changeGroups);
     setTimeout(function () {
       trigger(); // trigger all fields validation
     }, 0);
@@ -6095,7 +6114,7 @@ var TafLayout = function TafLayout(_ref2) {
 var TafWrapper = function TafWrapper(_a) {
   var children = _a.children,
     props = __rest(_a, ["children"]);
-  return /*#__PURE__*/React.createElement(TafModuleProvider, Object.assign({}, props), /*#__PURE__*/React.createElement(ReactHookFormProvider, {
+  return /*#__PURE__*/React.createElement(ReactHookFormProvider, {
     options: {
       mode: 'onTouched',
       reValidateMode: 'onChange',
@@ -6105,7 +6124,7 @@ var TafWrapper = function TafWrapper(_a) {
         changeGroups: [emptyChangegroup, emptyChangegroup, emptyChangegroup, emptyChangegroup, emptyChangegroup]
       }
     }
-  }, children));
+  }, /*#__PURE__*/React.createElement(TafModuleProvider, Object.assign({}, props), children));
 };
 
 var getCurrentDate = function getCurrentDate() {
@@ -6269,32 +6288,45 @@ var createApi$1 = function createApi(props) {
 
 // Used to mimic an authenticated user
 var MOCK_USERNAME = 'user.name';
-var currentDate = moment.utc().format('YYYY-MM-DD');
-var tomorrowDate = moment.utc().add(1, 'day').format('YYYY-MM-DD');
+var currentDate = dateUtils.dateToString(dateUtils.utc(), DATE_FORMAT_YEAR);
+var tomorrowDate = dateUtils.dateToString(dateUtils.add(dateUtils.utc(), {
+  days: 1
+}), DATE_FORMAT_YEAR);
 var airportPeriod = 6;
 var airportValidity = 40;
 var validDateRange = function validDateRange(refHour, period) {
-  var startHour = period * Math.floor(parseInt(refHour.format('HH'), 10) / period) % 24;
-  var start = refHour.set({
-    hour: startHour,
-    minute: 0,
-    second: 0
+  var hours = dateUtils.dateToString(refHour, 'HH');
+  var startHour = period * Math.floor(parseInt(hours, 10) / period) % 24;
+  var start = dateUtils.set(refHour, {
+    hours: startHour,
+    minutes: 0,
+    seconds: 0
+  });
+  var end = dateUtils.add(start, {
+    hours: airportValidity
   });
-  var end = start.clone().add(airportValidity, 'hours');
-  return [start.format('YYYY-MM-DDTHH:mm:ss'), end.format('YYYY-MM-DDTHH:mm:ss')];
+  return [dateUtils.dateToString(start, DATE_FORMAT_FULL, false), dateUtils.dateToString(end, DATE_FORMAT_FULL, false)];
 };
 var dateAdd = function dateAdd(refDateAsString, hours) {
-  return moment.utc(refDateAsString).add(hours, 'hours').format('YYYY-MM-DDTHH:mm:ss');
+  var newDate = dateUtils.add(dateUtils.utc(refDateAsString), {
+    hours: hours
+  });
+  var formattedDate = dateUtils.dateToString(newDate, DATE_FORMAT_FULL);
+  return formattedDate;
 };
-var _validDateRange = validDateRange(moment.utc(), airportPeriod),
+var _validDateRange = validDateRange(dateUtils.utc(), airportPeriod),
   _validDateRange2 = _slicedToArray(_validDateRange, 2),
   currentValidDateStart = _validDateRange2[0],
   currentValidDateEnd = _validDateRange2[1];
-var _validDateRange3 = validDateRange(moment.utc().add(6, 'hours'), airportPeriod),
+var _validDateRange3 = validDateRange(dateUtils.add(dateUtils.utc(), {
+    hours: 6
+  }), airportPeriod),
   _validDateRange4 = _slicedToArray(_validDateRange3, 2),
   upcomingValidDateStart = _validDateRange4[0],
   upcomingValidDateEnd = _validDateRange4[1];
-var _validDateRange5 = validDateRange(moment.utc().add(-6, 'hours'), airportPeriod),
+var _validDateRange5 = validDateRange(dateUtils.sub(dateUtils.utc(), {
+    hours: 6
+  }), airportPeriod),
   _validDateRange6 = _slicedToArray(_validDateRange5, 2),
   expiredValidDateStart = _validDateRange6[0],
   expiredValidDateEnd = _validDateRange6[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "9.3.1",
+  "version": "9.4.1",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/TafModule/TafModuleProvider.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { FieldValues, UseFieldArrayReturn } from 'react-hook-form';
 import { BaseTaf, TafActions } from '../../types';
 type ValidateFormPromise = () => Promise<void | BaseTaf>;
 interface TafModuleMethods {
@@ -10,6 +11,7 @@ interface TafModuleContextState {
     tafAction: TafActions;
     setTafAction: (action: TafActions) => void;
     onPreventCloseView: (shouldPreventClose: boolean) => void;
+    useFieldArrayMethods: UseFieldArrayReturn<FieldValues, string>;
 }
 declare const TafModuleContext: React.Context<TafModuleContextState>;
 export declare const useTafModuleContext: () => Partial<TafModuleContextState>;

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

@@ -0,0 +1,3 @@
+export declare const DATE_FORMAT_YEAR = "yyyy-MM-dd'";
+export declare const DATE_FORMAT_ISSUE_TIME = "ddHHmm'Z";
+export declare const DATE_FORMAT_FULL = "yyyy-MM-dd'T'HH:mm:ss'";

package/src/lib/utils/mockdata/fakeTafList.d.ts

@@ -1,6 +1,5 @@
 import { TafFromBackend } from '../../types';
 export declare const MOCK_USERNAME = "user.name";
-export declare const dateFormatUTC = "YYYY-MM-DDTHH:mmZ";
 export declare const fakeTafList: TafFromBackend[];
 export declare const fakeNewTaf: TafFromBackend;
 export declare const fakeNewFixedTaf: TafFromBackend;