@opengeoweb/taf 4.9.1 → 4.11.0

package/index.esm.js

@@ -11,7 +11,7 @@ import { HIDDEN_INPUT_HELPER_IS_DRAFT, useIsMounted, ToggleMenu, CustomTooltip,
 import { snackbarActions } from '@opengeoweb/core';
 import moment from 'moment';
 import { isEqual } from 'lodash';
-import { Add, Delete, Close, DragHandle as DragHandle$1, ThumbsUp, Clock, Cancel, Edit, Success, Export, ListItem, Cached } from '@opengeoweb/theme';
+import { Add, Delete, Close, DragHandle as DragHandle$1, ThumbsUp, Clock, Cancel, Success, Edit, Export, ListItem, Cached } from '@opengeoweb/theme';
 import ReactDOM from 'react-dom';
 import { useApiContext, createApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
 import LinearProgress from '@mui/material/LinearProgress';
@@ -2014,7 +2014,8 @@ var emptyBaseForecast = {
     cloud3: '',
     cloud4: ''
   }
-}; // formatters
+};
+var MIN_NUMBER_CHANGE_GROUP = 5; // formatters
 
 var formatIssueTime = function formatIssueTime(issueDate) {
   return issueDate ? "".concat(moment(issueDate).utc().format('DDHHmm'), "Z") : 'Not issued';
@@ -2421,7 +2422,7 @@ var useDragOrder = function useDragOrder(trigger, move) {
 }; // dialog utils
 
 var getConfirmationDialogTitle = function getConfirmationDialogTitle(action) {
-  if (action === 'DISCARD') return 'Discard TAF';
+  if (action === 'CLEAR') return 'Clear TAF';
   if (action === 'PUBLISH') return 'Publish';
   if (action === 'AMEND') return 'This TAF is an amendment';
   if (action === 'CORRECT') return 'This TAF is a correction';
@@ -2446,8 +2447,8 @@ var isTafAmendedCorrectedChanged = function isTafAmendedCorrectedChanged(isFormD
 };
 var getConfirmationDialogContent = function getConfirmationDialogContent(action, isFormDirty) {
   switch (action) {
-    case 'DISCARD':
-      return 'Are you sure you would like to discard this TAF? Any changes made will be lost';
+    case 'CLEAR':
+      return 'Are you sure you would like to clear this TAF? All content will be lost';
 
     case 'PUBLISH':
       return 'Are you sure you want to publish this TAF?';
@@ -2462,9 +2463,9 @@ var getConfirmationDialogContent = function getConfirmationDialogContent(action,
 };
 var getConfirmationDialogButtonLabel = function getConfirmationDialogButtonLabel(action) {
   switch (action) {
-    case 'DISCARD':
+    case 'CLEAR':
       {
-        return 'Discard';
+        return 'Clear';
       }
 
     case 'CANCEL':
@@ -2555,7 +2556,7 @@ var createChangeGroup = function createChangeGroup(changeGroup) {
   });
 };
 var prepareTafValues = function prepareTafValues(_taf, tafAction) {
-  var addEmptyChangeGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var addEmptyChangeGroups = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
   var _a; // If action is AMEND/CORRECT/DRAFT_AMEND/DRAFT_CORRECTION - add previous valid start and end
   // If action is AMEND/DRAFT_AMEND - update validity start time to current time
@@ -2568,18 +2569,44 @@ var prepareTafValues = function prepareTafValues(_taf, tafAction) {
     cloud: Object.assign(Object.assign({}, emptyBaseForecast.cloud), formattedBaseForecast.cloud)
   });
   var formattedChangeGroups = ((_a = taf.changeGroups) === null || _a === void 0 ? void 0 : _a.map(formatFormValues)) || [];
-  var changeGroups = formattedChangeGroups.map(createChangeGroup); // Add empty changegroup if set tot true
+  var changeGroups = formattedChangeGroups.map(createChangeGroup); // If addEmptyChangeGroups is true - ensure there are at least MIN_NUMBER_CHANGE_GROUP changegroups
+
+  if (addEmptyChangeGroups) {
+    var changeGroupsToAdd = MIN_NUMBER_CHANGE_GROUP - changeGroups.length;
 
-  if (addEmptyChangeGroup) {
-    changeGroups.push(emptyChangegroup);
+    if (changeGroupsToAdd > 0) {
+      Array.from(Array(changeGroupsToAdd)).map(function () {
+        return changeGroups.push(emptyChangegroup);
+      });
+    }
   }
 
-  return Object.assign(Object.assign({}, taf), _defineProperty({
+  return Object.assign(Object.assign({
+    issueDate: '',
+    previousId: null,
+    previousValidDateStart: null,
+    previousValidDateEnd: null
+  }, taf), _defineProperty({
     messageType: getMessageType(taf, tafAction),
     baseForecast: baseForecast,
     changeGroups: changeGroups
   }, HIDDEN_INPUT_HELPER_IS_DRAFT, true));
 };
+var clearTafFormData = function clearTafFormData(tafFormValues) {
+  // Remove all except for the validity times
+  var baseForecast = {
+    valid: tafFormValues.baseForecast.valid
+  };
+  var emptyChangeGroups = [];
+  Array.from(Array(MIN_NUMBER_CHANGE_GROUP)).map(function () {
+    return emptyChangeGroups.push(emptyChangegroup);
+  });
+  return Object.assign(Object.assign({}, tafFormValues), {
+    baseForecast: Object.assign(Object.assign({}, emptyBaseForecast), baseForecast),
+    // Add empty change groups
+    changeGroups: emptyChangeGroups
+  });
+};
 var getIsFormDefaultDisabled = function getIsFormDefaultDisabled(status) {
   return !(status === 'NEW' || status === 'DRAFT' || status === 'DRAFT_AMENDED' || status === 'DRAFT_CORRECTED');
 };
@@ -2610,6 +2637,9 @@ var fromStatusToAction = function fromStatusToAction(tafStatus) {
       return 'NEW';
   }
 };
+var isFormDirty = function isFormDirty(dirtyFields) {
+  return Object.keys(dirtyFields).length > 0;
+};
 
 var textFieldStyle = function textFieldStyle(theme) {
   return {
@@ -2740,7 +2770,9 @@ var TafFormTextField = function TafFormTextField(_ref) {
       }) || null;
 
       if (foundValue) {
-        setValue(name, foundValue.value);
+        setValue(name, foundValue.value, {
+          shouldDirty: true
+        });
         setMaxLength(foundValue.value.length);
         event.preventDefault();
       }
@@ -3480,13 +3512,13 @@ var TafFormButtons = function TafFormButtons(_ref2) {
     canBe: canBe,
     onTafViewModeButtonPress: onTafViewModeButtonPress
   }) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Button, {
-    "data-testid": "discardtaf",
+    "data-testid": "cleartaf",
     variant: "tertiary",
     onClick: function onClick() {
       // Simply discard the changes and close the dialog.
-      onTafEditModeButtonPress('DISCARD');
+      onTafEditModeButtonPress('CLEAR');
     }
-  }, "Discard"), /*#__PURE__*/React__default.createElement(Button, {
+  }, "Clear"), /*#__PURE__*/React__default.createElement(Button, {
     "data-testid": "savedrafttaf",
     variant: "tertiary",
     onClick: function onClick() {
@@ -3553,9 +3585,7 @@ var DragHandle = function DragHandle(_ref) {
       '&:hover': {
         backgroundColor: 'transparent'
       },
-      cursor: function cursor() {
-        return isSorting ? 'grabbing' : 'grab';
-      }
+      cursor: isSorting ? 'grabbing' : 'grab'
     }
   }, /*#__PURE__*/React__default.createElement(DragHandle$1, null));
 };
@@ -3994,7 +4024,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
       formState = _useFormContext.formState,
       getValues = _useFormContext.getValues,
       setValue = _useFormContext.setValue,
-      reset = _useFormContext.reset; // added this ignore as the build is failing otherwise on: Type instantiation is excessively deep and possibly infinite.
+      resetField = _useFormContext.resetField; // added this ignore as the build is failing otherwise on: Type instantiation is excessively deep and possibly infinite.
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
 
@@ -4015,12 +4045,12 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
 
   var dirtyFields = formState.dirtyFields,
       errors = formState.errors;
-  var isFormDirty = Object.keys(dirtyFields).length > 0;
-  usePreventBrowserClose(isFormDirty && !isDisabled); // Needed to be able to show a confirmation dialog on closing parent view
+  var isFormDirty$1 = isFormDirty(dirtyFields);
+  usePreventBrowserClose(isFormDirty$1 && !isDisabled); // Needed to be able to show a confirmation dialog on closing parent view
 
   React__default.useEffect(function () {
-    onPreventCloseView(isFormDirty); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isFormDirty]);
+    onPreventCloseView(isFormDirty$1); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isFormDirty$1]);
   var hiddenInputFields = ['baseTime', 'issueDate', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd', HIDDEN_INPUT_HELPER_IS_DRAFT];
 
   var onSubmit = function onSubmit(data) {
@@ -4032,16 +4062,25 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     return confirmDialog({
       title: getConfirmationDialogTitle(action),
       description: getConfirmationDialogContent(action, function () {
-        return isTafAmendedCorrectedChanged(isFormDirty, originalTaf, convertTafValuesToObject(getValues()));
+        return isTafAmendedCorrectedChanged(isFormDirty$1, originalTaf, convertTafValuesToObject(getValues()));
       }),
       confirmLabel: getConfirmationDialogButtonLabel(action)
     });
   };
 
   var resetFormValues = function resetFormValues(formData) {
-    reset(formData, {
-      keepDirty: false,
-      keepDirtyValues: false
+    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
+      });
     });
   };
 
@@ -4049,7 +4088,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
     var resetDisabled = arguments.length > 1 ? arguments[1] : undefined;
     var tafToReset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : originalTaf;
-    var shouldAddEmptyChangGroup = !(tafToReset && tafToReset.changeGroups) && !resetDisabled;
+    var shouldAddEmptyChangGroup = !resetDisabled;
     var newTaf = prepareTafValues(tafToReset, action, shouldAddEmptyChangGroup);
     resetFormValues(newTaf);
     setIsDisabled(resetDisabled);
@@ -4140,7 +4179,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
   var onSwitchMode = function onSwitchMode(event) {
     var checked = event.target.checked;
 
-    if (!checked && isFormDirty) {
+    if (!checked && isFormDirty$1) {
       confirmDialog({
         title: 'Whoops',
         description: 'Are you sure you want to switch to viewer mode? Your unsaved changes will be lost.',
@@ -4187,15 +4226,12 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
         })();
         break;
 
-      case 'DISCARD':
-        if (isFormDirty) {
-          showConfirmDialog(action).then(function () {
-            resetFormState(undefined, isDefaultDisabled);
-          });
-        } else {
-          resetFormState(undefined, isDefaultDisabled);
-        }
-
+      case 'CLEAR':
+        showConfirmDialog(action).then(function () {
+          var emptiedForm = clearTafFormData(getValues());
+          resetFormValues(emptiedForm, true);
+          showSnackbar('TAF has been cleared');
+        });
         break;
 
       case 'AMEND':
@@ -4369,7 +4405,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     }; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   React__default.useEffect(function () {
-    var newValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled && !originalTaf.changeGroups); // set new form values when taf values changed
+    var newValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled); // set new form values when taf values changed
 
     resetFormValues(newValues); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [originalTaf]);
@@ -4431,10 +4467,10 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     handle: ".handle",
     direction: "vertical",
     // hover props
-    forceFallback: true,
+    forceFallback: false,
     onStart: function onStart(event) {
       onStartDrag(event);
-      Sortable.ghost.style.opacity = '1';
+      if (Sortable.ghost) Sortable.ghost.style.opacity = '1';
     }
   }, fields.map(function (item, index) {
     return /*#__PURE__*/React__default.createElement(TafFormRow, {
@@ -4741,69 +4777,72 @@ var IconWithTooltip = function IconWithTooltip(_ref) {
       children = _ref.children;
   return /*#__PURE__*/React.createElement(CustomTooltip, {
     title: title,
-    placement: "right"
+    placement: "right",
+    "data-testid": "statusIcon-tooltip"
   }, /*#__PURE__*/React.createElement(Box, {
     component: "span"
   }, children));
 };
 
 var StatusIcon = function StatusIcon(_ref2) {
-  var timeSlot = _ref2.timeSlot,
-      status = _ref2.status;
+  var status = _ref2.status,
+      timeSlot = _ref2.timeSlot;
 
-  if (status === 'NEW') {
-    return null;
-  }
+  switch (status) {
+    case 'DRAFT':
+    case 'DRAFT_AMENDED':
+    case 'DRAFT_CORRECTED':
+      return /*#__PURE__*/React.createElement(IconWithTooltip, {
+        title: getTafStatusLabel(status)
+      }, /*#__PURE__*/React.createElement(Edit, {
+        "data-testid": "status-draft",
+        sx: {
+          color: 'geowebColors.buttons.tertiary.default.color'
+        }
+      }));
 
-  if (status === 'EXPIRED') {
-    return /*#__PURE__*/React.createElement(IconWithTooltip, {
-      title: "Expired"
-    }, /*#__PURE__*/React.createElement(Clock, {
-      "data-testid": "status-expired",
-      sx: {
-        transform: 'scaleX(-1)',
-        color: 'geowebColors.buttons.tertiary.disabled.color'
-      }
-    }));
-  }
+    case 'PUBLISHED':
+    case 'CORRECTED':
+    case 'AMENDED':
+      return /*#__PURE__*/React.createElement(IconWithTooltip, {
+        title: getTafStatusLabel(status)
+      }, timeSlot === 'ACTIVE' ? /*#__PURE__*/React.createElement(Success, {
+        "data-testid": "status-active",
+        sx: {
+          color: 'geowebColors.functional.success'
+        }
+      }) : /*#__PURE__*/React.createElement(Clock, {
+        "data-testid": "status-upcoming",
+        sx: {
+          color: 'geowebColors.functional.success'
+        }
+      }));
 
-  if (status === 'CANCELLED') {
-    return /*#__PURE__*/React.createElement(IconWithTooltip, {
-      title: "Cancelled"
-    }, /*#__PURE__*/React.createElement(Cancel, {
-      "data-testid": "status-cancelled",
-      sx: {
-        color: 'geowebColors.captions.captionError.rgba'
-      }
-    }));
-  }
+    case 'CANCELLED':
+      return /*#__PURE__*/React.createElement(IconWithTooltip, {
+        title: getTafStatusLabel(status)
+      }, /*#__PURE__*/React.createElement(Cancel, {
+        "data-testid": "status-cancelled",
+        sx: {
+          color: 'geowebColors.captions.captionError.rgba'
+        }
+      }));
 
-  if (status === 'DRAFT' || status === 'DRAFT_CORRECTED' || status === 'DRAFT_AMENDED') {
-    return /*#__PURE__*/React.createElement(IconWithTooltip, {
-      title: "Draft"
-    }, /*#__PURE__*/React.createElement(Edit, {
-      "data-testid": "status-draft",
-      sx: {
-        color: 'geowebColors.buttons.tertiary.default.color'
-      }
-    }));
-  }
+    case 'EXPIRED':
+      return /*#__PURE__*/React.createElement(IconWithTooltip, {
+        title: getTafStatusLabel(status)
+      }, /*#__PURE__*/React.createElement(Clock, {
+        "data-testid": "status-expired",
+        sx: {
+          transform: 'scaleX(-1)',
+          color: 'geowebColors.buttons.tertiary.disabled.color'
+        }
+      }));
 
-  return timeSlot === 'ACTIVE' ? /*#__PURE__*/React.createElement(IconWithTooltip, {
-    title: "Active"
-  }, /*#__PURE__*/React.createElement(Success, {
-    "data-testid": "status-active",
-    sx: {
-      color: 'geowebColors.functional.success'
-    }
-  })) : /*#__PURE__*/React.createElement(IconWithTooltip, {
-    title: "Upcoming"
-  }, /*#__PURE__*/React.createElement(Clock, {
-    "data-testid": "status-upcoming",
-    sx: {
-      color: 'geowebColors.functional.success'
-    }
-  }));
+    case 'NEW':
+    default:
+      return null;
+  }
 };
 
 /* *
@@ -4849,8 +4888,8 @@ var ExportButton = function ExportButton(_ref) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2022 - Finnish Meteorological Institute (FMI)
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
 var AdverseWeatherTACMessage = function AdverseWeatherTACMessage(_ref) {
   var TAC = _ref.TAC,
@@ -4881,7 +4920,8 @@ var AdverseWeatherTACMessage = function AdverseWeatherTACMessage(_ref) {
         }, isActive && {
           backgroundColor: 'geowebColors.functional.warningHighlight.rgba'
         }), word.type === 'adverse' && {
-          color: 'geowebColors.captions.captionError.rgba'
+          color: 'geowebColors.captions.captionError.rgba',
+          fontWeight: 'bold'
         })
       }, word.text === '=' ? "".concat(word.text) : " ".concat(word.text));
     }));
@@ -5231,7 +5271,7 @@ var TopTabs = function TopTabs(_ref) {
   var _useFormContext = useFormContext(),
       dirtyFields = _useFormContext.formState.dirtyFields;
 
-  var isDirty = Object.keys(dirtyFields).length > 0;
+  var isDirty = isFormDirty(dirtyFields);
 
   if (!tafFromBackend) {
     return null;
@@ -5301,7 +5341,7 @@ var LocationTabs = function LocationTabs(_ref) {
   var _useFormContext = useFormContext(),
       dirtyFields = _useFormContext.formState.dirtyFields;
 
-  var isDirty = Object.keys(dirtyFields).length > 0;
+  var isDirty = isFormDirty(dirtyFields);
   return /*#__PURE__*/React.createElement(MenuList, {
     "data-testid": "location-tabs",
     sx: {

package/index.umd.js

@@ -2015,7 +2015,8 @@
         cloud3: '',
         cloud4: ''
       }
-    }; // formatters
+    };
+    var MIN_NUMBER_CHANGE_GROUP = 5; // formatters
 
     var formatIssueTime = function formatIssueTime(issueDate) {
       return issueDate ? moment__default["default"](issueDate).utc().format('DDHHmm') + "Z" : 'Not issued';
@@ -2423,7 +2424,7 @@
     }; // dialog utils
 
     var getConfirmationDialogTitle = function getConfirmationDialogTitle(action) {
-      if (action === 'DISCARD') return 'Discard TAF';
+      if (action === 'CLEAR') return 'Clear TAF';
       if (action === 'PUBLISH') return 'Publish';
       if (action === 'AMEND') return 'This TAF is an amendment';
       if (action === 'CORRECT') return 'This TAF is a correction';
@@ -2448,8 +2449,8 @@
     };
     var getConfirmationDialogContent = function getConfirmationDialogContent(action, isFormDirty) {
       switch (action) {
-        case 'DISCARD':
-          return 'Are you sure you would like to discard this TAF? Any changes made will be lost';
+        case 'CLEAR':
+          return 'Are you sure you would like to clear this TAF? All content will be lost';
 
         case 'PUBLISH':
           return 'Are you sure you want to publish this TAF?';
@@ -2464,9 +2465,9 @@
     };
     var getConfirmationDialogButtonLabel = function getConfirmationDialogButtonLabel(action) {
       switch (action) {
-        case 'DISCARD':
+        case 'CLEAR':
           {
-            return 'Discard';
+            return 'Clear';
           }
 
         case 'CANCEL':
@@ -2556,13 +2557,13 @@
         cloud: __assign(__assign({}, emptyChangegroup.cloud), changeGroup.cloud)
       });
     };
-    var prepareTafValues = function prepareTafValues(_taf, tafAction, addEmptyChangeGroup) {
+    var prepareTafValues = function prepareTafValues(_taf, tafAction, addEmptyChangeGroups) {
       var _a;
 
       var _b;
 
-      if (addEmptyChangeGroup === void 0) {
-        addEmptyChangeGroup = false;
+      if (addEmptyChangeGroups === void 0) {
+        addEmptyChangeGroups = false;
       } // If action is AMEND/CORRECT/DRAFT_AMEND/DRAFT_CORRECTION - add previous valid start and end
       // If action is AMEND/DRAFT_AMEND - update validity start time to current time
 
@@ -2576,18 +2577,44 @@
       });
 
       var formattedChangeGroups = ((_b = taf.changeGroups) === null || _b === void 0 ? void 0 : _b.map(formatFormValues)) || [];
-      var changeGroups = formattedChangeGroups.map(createChangeGroup); // Add empty changegroup if set tot true
+      var changeGroups = formattedChangeGroups.map(createChangeGroup); // If addEmptyChangeGroups is true - ensure there are at least MIN_NUMBER_CHANGE_GROUP changegroups
+
+      if (addEmptyChangeGroups) {
+        var changeGroupsToAdd = MIN_NUMBER_CHANGE_GROUP - changeGroups.length;
 
-      if (addEmptyChangeGroup) {
-        changeGroups.push(emptyChangegroup);
+        if (changeGroupsToAdd > 0) {
+          Array.from(Array(changeGroupsToAdd)).map(function () {
+            return changeGroups.push(emptyChangegroup);
+          });
+        }
       }
 
-      return __assign(__assign({}, taf), (_a = {
+      return __assign(__assign({
+        issueDate: '',
+        previousId: null,
+        previousValidDateStart: null,
+        previousValidDateEnd: null
+      }, taf), (_a = {
         messageType: getMessageType(taf, tafAction),
         baseForecast: baseForecast,
         changeGroups: changeGroups
       }, _a[shared.HIDDEN_INPUT_HELPER_IS_DRAFT] = true, _a));
     };
+    var clearTafFormData = function clearTafFormData(tafFormValues) {
+      // Remove all except for the validity times
+      var baseForecast = {
+        valid: tafFormValues.baseForecast.valid
+      };
+      var emptyChangeGroups = [];
+      Array.from(Array(MIN_NUMBER_CHANGE_GROUP)).map(function () {
+        return emptyChangeGroups.push(emptyChangegroup);
+      });
+      return __assign(__assign({}, tafFormValues), {
+        baseForecast: __assign(__assign({}, emptyBaseForecast), baseForecast),
+        // Add empty change groups
+        changeGroups: emptyChangeGroups
+      });
+    };
     var getIsFormDefaultDisabled = function getIsFormDefaultDisabled(status) {
       return !(status === 'NEW' || status === 'DRAFT' || status === 'DRAFT_AMENDED' || status === 'DRAFT_CORRECTED');
     };
@@ -2618,6 +2645,9 @@
           return 'NEW';
       }
     };
+    var isFormDirty = function isFormDirty(dirtyFields) {
+      return Object.keys(dirtyFields).length > 0;
+    };
 
     var textFieldStyle = function textFieldStyle(theme) {
       return {
@@ -2747,7 +2777,9 @@
           }) || null;
 
           if (foundValue) {
-            setValue(name, foundValue.value);
+            setValue(name, foundValue.value, {
+              shouldDirty: true
+            });
             setMaxLength(foundValue.value.length);
             event.preventDefault();
           }
@@ -3484,13 +3516,13 @@
         canBe: canBe,
         onTafViewModeButtonPress: onTafViewModeButtonPress
       }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "discardtaf",
+        "data-testid": "cleartaf",
         variant: "tertiary",
         onClick: function onClick() {
           // Simply discard the changes and close the dialog.
-          onTafEditModeButtonPress('DISCARD');
+          onTafEditModeButtonPress('CLEAR');
         }
-      }, "Discard"), /*#__PURE__*/React__default["default"].createElement(material.Button, {
+      }, "Clear"), /*#__PURE__*/React__default["default"].createElement(material.Button, {
         "data-testid": "savedrafttaf",
         variant: "tertiary",
         onClick: function onClick() {
@@ -3557,9 +3589,7 @@
           '&:hover': {
             backgroundColor: 'transparent'
           },
-          cursor: function cursor() {
-            return isSorting ? 'grabbing' : 'grab';
-          }
+          cursor: isSorting ? 'grabbing' : 'grab'
         }
       }, /*#__PURE__*/React__default["default"].createElement(theme.DragHandle, null));
     };
@@ -3996,7 +4026,7 @@
           formState = _l.formState,
           getValues = _l.getValues,
           setValue = _l.setValue,
-          reset = _l.reset; // added this ignore as the build is failing otherwise on: Type instantiation is excessively deep and possibly infinite.
+          resetField = _l.resetField; // added this ignore as the build is failing otherwise on: Type instantiation is excessively deep and possibly infinite.
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
 
@@ -4017,12 +4047,12 @@
 
       var dirtyFields = formState.dirtyFields,
           errors = formState.errors;
-      var isFormDirty = Object.keys(dirtyFields).length > 0;
-      shared.usePreventBrowserClose(isFormDirty && !isDisabled); // Needed to be able to show a confirmation dialog on closing parent view
+      var isFormDirty$1 = isFormDirty(dirtyFields);
+      shared.usePreventBrowserClose(isFormDirty$1 && !isDisabled); // Needed to be able to show a confirmation dialog on closing parent view
 
       React__default["default"].useEffect(function () {
-        onPreventCloseView(isFormDirty); // eslint-disable-next-line react-hooks/exhaustive-deps
-      }, [isFormDirty]);
+        onPreventCloseView(isFormDirty$1); // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, [isFormDirty$1]);
       var hiddenInputFields = ['baseTime', 'issueDate', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd', shared.HIDDEN_INPUT_HELPER_IS_DRAFT];
 
       var onSubmit = function onSubmit(data) {
@@ -4034,16 +4064,28 @@
         return confirmDialog({
           title: getConfirmationDialogTitle(action),
           description: getConfirmationDialogContent(action, function () {
-            return isTafAmendedCorrectedChanged(isFormDirty, originalTaf, convertTafValuesToObject(getValues()));
+            return isTafAmendedCorrectedChanged(isFormDirty$1, originalTaf, convertTafValuesToObject(getValues()));
           }),
           confirmLabel: getConfirmationDialogButtonLabel(action)
         });
       };
 
-      var resetFormValues = function resetFormValues(formData) {
-        reset(formData, {
-          keepDirty: false,
-          keepDirtyValues: false
+      var resetFormValues = function resetFormValues(formData, keepDirty) {
+        if (keepDirty === void 0) {
+          keepDirty = false;
+        }
+
+        Object.keys(formData).forEach(function (key) {
+          if (!keepDirty || key === 'changeGroups') {
+            resetField(key, {
+              keepDirty: keepDirty,
+              defaultValue: formData[key]
+            });
+          }
+
+          setValue(key, formData[key], {
+            shouldDirty: keepDirty
+          });
         });
       };
 
@@ -4056,7 +4098,7 @@
           tafToReset = originalTaf;
         }
 
-        var shouldAddEmptyChangGroup = !(tafToReset && tafToReset.changeGroups) && !resetDisabled;
+        var shouldAddEmptyChangGroup = !resetDisabled;
         var newTaf = prepareTafValues(tafToReset, action, shouldAddEmptyChangGroup);
         resetFormValues(newTaf);
         setIsDisabled(resetDisabled);
@@ -4145,7 +4187,7 @@
       var onSwitchMode = function onSwitchMode(event) {
         var checked = event.target.checked;
 
-        if (!checked && isFormDirty) {
+        if (!checked && isFormDirty$1) {
           confirmDialog({
             title: 'Whoops',
             description: 'Are you sure you want to switch to viewer mode? Your unsaved changes will be lost.',
@@ -4191,15 +4233,12 @@
             })();
             break;
 
-          case 'DISCARD':
-            if (isFormDirty) {
-              showConfirmDialog(action).then(function () {
-                resetFormState(undefined, isDefaultDisabled);
-              });
-            } else {
-              resetFormState(undefined, isDefaultDisabled);
-            }
-
+          case 'CLEAR':
+            showConfirmDialog(action).then(function () {
+              var emptiedForm = clearTafFormData(getValues());
+              resetFormValues(emptiedForm, true);
+              showSnackbar('TAF has been cleared');
+            });
             break;
 
           case 'AMEND':
@@ -4388,7 +4427,7 @@
         }; // eslint-disable-next-line react-hooks/exhaustive-deps
       }, []);
       React__default["default"].useEffect(function () {
-        var newValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled && !originalTaf.changeGroups); // set new form values when taf values changed
+        var newValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled); // set new form values when taf values changed
 
         resetFormValues(newValues); // eslint-disable-next-line react-hooks/exhaustive-deps
       }, [originalTaf]);
@@ -4450,10 +4489,10 @@
         handle: ".handle",
         direction: "vertical",
         // hover props
-        forceFallback: true,
+        forceFallback: false,
         onStart: function onStart(event) {
           onStartDrag(event);
-          Sortable__default["default"].ghost.style.opacity = '1';
+          if (Sortable__default["default"].ghost) Sortable__default["default"].ghost.style.opacity = '1';
         }
       }, fields.map(function (item, index) {
         return /*#__PURE__*/React__default["default"].createElement(TafFormRow, {
@@ -4755,69 +4794,72 @@
           children = _a.children;
       return /*#__PURE__*/React__namespace.createElement(shared.CustomTooltip, {
         title: title,
-        placement: "right"
+        placement: "right",
+        "data-testid": "statusIcon-tooltip"
       }, /*#__PURE__*/React__namespace.createElement(material.Box, {
         component: "span"
       }, children));
     };
 
     var StatusIcon = function StatusIcon(_a) {
-      var timeSlot = _a.timeSlot,
-          status = _a.status;
+      var status = _a.status,
+          timeSlot = _a.timeSlot;
 
-      if (status === 'NEW') {
-        return null;
-      }
+      switch (status) {
+        case 'DRAFT':
+        case 'DRAFT_AMENDED':
+        case 'DRAFT_CORRECTED':
+          return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
+            title: getTafStatusLabel(status)
+          }, /*#__PURE__*/React__namespace.createElement(theme.Edit, {
+            "data-testid": "status-draft",
+            sx: {
+              color: 'geowebColors.buttons.tertiary.default.color'
+            }
+          }));
 
-      if (status === 'EXPIRED') {
-        return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
-          title: "Expired"
-        }, /*#__PURE__*/React__namespace.createElement(theme.Clock, {
-          "data-testid": "status-expired",
-          sx: {
-            transform: 'scaleX(-1)',
-            color: 'geowebColors.buttons.tertiary.disabled.color'
-          }
-        }));
-      }
+        case 'PUBLISHED':
+        case 'CORRECTED':
+        case 'AMENDED':
+          return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
+            title: getTafStatusLabel(status)
+          }, timeSlot === 'ACTIVE' ? /*#__PURE__*/React__namespace.createElement(theme.Success, {
+            "data-testid": "status-active",
+            sx: {
+              color: 'geowebColors.functional.success'
+            }
+          }) : /*#__PURE__*/React__namespace.createElement(theme.Clock, {
+            "data-testid": "status-upcoming",
+            sx: {
+              color: 'geowebColors.functional.success'
+            }
+          }));
 
-      if (status === 'CANCELLED') {
-        return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
-          title: "Cancelled"
-        }, /*#__PURE__*/React__namespace.createElement(theme.Cancel, {
-          "data-testid": "status-cancelled",
-          sx: {
-            color: 'geowebColors.captions.captionError.rgba'
-          }
-        }));
-      }
+        case 'CANCELLED':
+          return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
+            title: getTafStatusLabel(status)
+          }, /*#__PURE__*/React__namespace.createElement(theme.Cancel, {
+            "data-testid": "status-cancelled",
+            sx: {
+              color: 'geowebColors.captions.captionError.rgba'
+            }
+          }));
 
-      if (status === 'DRAFT' || status === 'DRAFT_CORRECTED' || status === 'DRAFT_AMENDED') {
-        return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
-          title: "Draft"
-        }, /*#__PURE__*/React__namespace.createElement(theme.Edit, {
-          "data-testid": "status-draft",
-          sx: {
-            color: 'geowebColors.buttons.tertiary.default.color'
-          }
-        }));
-      }
+        case 'EXPIRED':
+          return /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
+            title: getTafStatusLabel(status)
+          }, /*#__PURE__*/React__namespace.createElement(theme.Clock, {
+            "data-testid": "status-expired",
+            sx: {
+              transform: 'scaleX(-1)',
+              color: 'geowebColors.buttons.tertiary.disabled.color'
+            }
+          }));
 
-      return timeSlot === 'ACTIVE' ? /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
-        title: "Active"
-      }, /*#__PURE__*/React__namespace.createElement(theme.Success, {
-        "data-testid": "status-active",
-        sx: {
-          color: 'geowebColors.functional.success'
-        }
-      })) : /*#__PURE__*/React__namespace.createElement(IconWithTooltip, {
-        title: "Upcoming"
-      }, /*#__PURE__*/React__namespace.createElement(theme.Clock, {
-        "data-testid": "status-upcoming",
-        sx: {
-          color: 'geowebColors.functional.success'
-        }
-      }));
+        case 'NEW':
+        default:
+          return null;
+      }
     };
 
     /* *
@@ -4863,8 +4905,8 @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      *
-     * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2022 - Finnish Meteorological Institute (FMI)
+     * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2023 - Finnish Meteorological Institute (FMI)
      * */
     var AdverseWeatherTACMessage = function AdverseWeatherTACMessage(_a) {
       var TAC = _a.TAC,
@@ -4895,7 +4937,8 @@
             }, isActive && {
               backgroundColor: 'geowebColors.functional.warningHighlight.rgba'
             }), word.type === 'adverse' && {
-              color: 'geowebColors.captions.captionError.rgba'
+              color: 'geowebColors.captions.captionError.rgba',
+              fontWeight: 'bold'
             })
           }, word.text === '=' ? "" + word.text : " " + word.text);
         }));
@@ -5236,7 +5279,7 @@
         }
       } : _c;
       var dirtyFields = reactHookForm.useFormContext().formState.dirtyFields;
-      var isDirty = Object.keys(dirtyFields).length > 0;
+      var isDirty = isFormDirty(dirtyFields);
 
       if (!tafFromBackend) {
         return null;
@@ -5303,7 +5346,7 @@
           onChangeTab = _c === void 0 ? function () {} : _c,
           timeSlot = _a.timeSlot;
       var dirtyFields = reactHookForm.useFormContext().formState.dirtyFields;
-      var isDirty = Object.keys(dirtyFields).length > 0;
+      var isDirty = isFormDirty(dirtyFields);
       return /*#__PURE__*/React__namespace.createElement(material.MenuList, {
         "data-testid": "location-tabs",
         sx: {

package/lib/components/StatusIcon/StatusIcon.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { TafStatus, TimeSlot } from '../../types';
 interface StatusIconProps {
-    timeSlot: TimeSlot;
     status: TafStatus;
+    timeSlot: TimeSlot;
 }
 declare const StatusIcon: React.FC<StatusIconProps>;
 export default StatusIcon;

package/lib/components/TafForm/utils.d.ts

@@ -16,6 +16,7 @@ export declare const emptyBaseForecast: {
         cloud4: string;
     };
 };
+export declare const MIN_NUMBER_CHANGE_GROUP = 5;
 export declare const formatIssueTime: (issueDate: string) => string;
 declare type BaseForecastOrChangeGroupFormData<T extends BaseForecast | ChangeGroup> = T extends ChangeGroup ? ChangeGroupFormData : BaseForecastFormData;
 export declare function formatFormValues<T extends BaseForecast | ChangeGroup>(row: T): BaseForecastOrChangeGroupFormData<T>;
@@ -67,7 +68,11 @@ export declare const getTafStatusLabel: (status: TafStatus) => string;
 export declare const getMessageType: (taf: Taf, tafAction: TafActions) => string;
 export declare const getAmendedCorrectedTafTimes: (taf: Taf, tafAction: TafActions) => Taf;
 export declare const createChangeGroup: (changeGroup: ChangeGroupFormData) => ChangeGroupFormData;
-export declare const prepareTafValues: (_taf: Taf, tafAction: TafActions, addEmptyChangeGroup?: boolean) => TafFormData;
+export declare const prepareTafValues: (_taf: Taf, tafAction: TafActions, addEmptyChangeGroups?: boolean) => TafFormData;
+export declare const clearTafFormData: (tafFormValues: TafFormData) => TafFormData;
 export declare const getIsFormDefaultDisabled: (status: TafStatus) => boolean;
 export declare const fromStatusToAction: (tafStatus: TafStatus) => TafActions;
+export declare const isFormDirty: (dirtyFields: Partial<Readonly<{
+    [x: string]: unknown;
+}>>) => boolean;
 export {};

package/lib/types.d.ts

@@ -67,7 +67,7 @@ export interface BaseTaf {
     issueDate?: TafDate;
 }
 export declare type TafStatus = 'NEW' | 'DRAFT' | 'DRAFT_AMENDED' | 'DRAFT_CORRECTED' | 'PUBLISHED' | 'CORRECTED' | 'AMENDED' | 'CANCELLED' | 'EXPIRED';
-export declare type TafActions = 'NEW' | 'DRAFT' | 'DRAFT_AMEND' | 'DRAFT_CORRECT' | 'PUBLISH' | 'CANCEL' | 'CORRECT' | 'AMEND' | 'CLOSE' | 'DISCARD';
+export declare type TafActions = 'NEW' | 'DRAFT' | 'DRAFT_AMEND' | 'DRAFT_CORRECT' | 'PUBLISH' | 'CANCEL' | 'CORRECT' | 'AMEND' | 'CLOSE' | 'CLEAR';
 export declare type TafCanbe = 'DRAFTED' | 'DISCARDED' | 'PUBLISHED' | 'CANCELLED' | 'AMENDED' | 'CORRECTED';
 export interface Taf extends BaseTaf {
     status: TafStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "4.9.1",
+  "version": "4.11.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,32 +12,32 @@
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/core": "4.9.1",
+    "@opengeoweb/api": "4.11.0",
     "react": "^17.0.2",
-    "@opengeoweb/shared": "4.9.1",
+    "axios": "^0.25.0",
+    "@opengeoweb/shared": "4.11.0",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/theme": "4.9.1",
+    "@opengeoweb/theme": "4.11.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
     "react-redux": "^8.0.4",
-    "@opengeoweb/form-fields": "4.9.1",
+    "@opengeoweb/form-fields": "4.11.0",
     "react-hook-form": "^7.41.5",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "@mui/x-date-pickers": "^5.0.4",
     "lodash": "^4.17.20",
-    "axios": "^0.25.0",
     "date-fns": "^2.29.3",
-    "@opengeoweb/webmap": "4.9.1",
+    "@opengeoweb/core": "4.11.0",
+    "@opengeoweb/webmap": "4.11.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "@opengeoweb/api": "4.9.1",
     "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",
-    "react-window": "^1.8.7",
     "immer": "^9.0.15",
+    "react-window": "^1.8.7",
     "@reduxjs/toolkit": "^1.8.3",
     "lodash.clonedeep": "^4.5.0",
     "@turf/turf": "^5.1.6",
@@ -46,7 +46,7 @@
     "@redux-eggs/redux-toolkit": "^2.2.0",
     "@redux-eggs/saga-extension": "^2.2.0",
     "react-dom": "^17.0.2",
-    "@opengeoweb/authentication": "4.9.1",
+    "@opengeoweb/authentication": "4.11.0",
     "react-router-dom": "^6.4.2",
     "query-string": "^6.13.7"
   }