@opengeoweb/taf 9.6.0 → 9.8.0

package/index.esm.js

@@ -795,7 +795,9 @@ var validateValidField = function validateValidField(value, tafStart, tafEnd) {
     return true;
   }
   // Validate length and ensure it doesn't contain any other characters than numbers and / and has either XXXX/XXXX or XXXXXX format
-  if (trimmedValue.length < lengthFM || trimmedValue.length > lengthBECMGTEMPO || !(trimmedValue.match(/^[0-9]{4}\/[0-9]{4}$/) || trimmedValue.match(/^[0-9]{6}$/))) {
+  if (trimmedValue.length < lengthFM || trimmedValue.length > lengthBECMGTEMPO || !(trimmedValue.match(/^[0-9]{4}\/[0-9]{4}$/) || trimmedValue.match(/^[0-9]{6}$/)) ||
+  // only allow dates with / fully typed
+  (tafStart === null || tafStart === void 0 ? void 0 : tafStart.indexOf('/')) > -1 && trimmedValue.length !== lengthBECMGTEMPO || (tafEnd === null || tafEnd === void 0 ? void 0 : tafEnd.indexOf('/')) > -1 && trimmedValue.length !== lengthBECMGTEMPO) {
     return invalidChangeValidInterFieldMessage;
   }
   // Ensure valid date(s) can be made
@@ -3728,6 +3730,11 @@ var TafFormRow = /*#__PURE__*/React__default.forwardRef(function (_a, ref) {
         changeGroups = _getValues.changeGroups;
       var currentChangeGroup = changeGroups[index];
       var previousChangeGroup = changeGroups[index - 1];
+      var isvalidPrevious = validateValidField(currentChangeGroup.valid, getValues('validDateStart'), getValues('validDateEnd')) === true;
+      var isvalidNext = validateValidField(previousChangeGroup.valid, getValues('validDateStart'), getValues('validDateEnd')) === true;
+      if (isvalidPrevious !== true || isvalidNext !== true) {
+        return true;
+      }
       return validatePreviousChangeGroup(currentChangeGroup, previousChangeGroup, validDateStart, validDateEnd);
     }
     return true;
@@ -4146,7 +4153,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     formState = _useFormContext.formState,
     getValues = _useFormContext.getValues,
     setValue = _useFormContext.setValue,
-    reset = _useFormContext.reset;
+    resetField = _useFormContext.resetField;
   var _useDragOrder = useDragOrder(trigger, move),
     onChangeOrder = _useDragOrder.onChangeOrder,
     onStartDrag = _useDragOrder.onStartDrag,
@@ -4177,10 +4184,18 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
   };
   var resetFormValues = function resetFormValues(formData) {
     var keepDirty = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    reset(formData, {
-      keepDirty: keepDirty
+    Object.keys(formData).forEach(function (key) {
+      if (!keepDirty) {
+        resetField(key, {
+          keepDirty: keepDirty,
+          defaultValue: formData[key]
+        });
+      }
+      setValue(key, formData[key], {
+        shouldDirty: keepDirty
+      });
+      replace(formData.changeGroups);
     });
-    replace(formData.changeGroups);
   };
   var resetFormState = function resetFormState(resetDisabled) {
     var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
@@ -5021,7 +5036,8 @@ var TacContainer = function TacContainer(_ref) {
   var _useFormContext = useFormContext(),
     getValues = _useFormContext.getValues,
     trigger = _useFormContext.trigger,
-    reset = _useFormContext.reset;
+    reset = _useFormContext.reset,
+    setValue = _useFormContext.setValue;
   var _useTafModuleContext = useTafModuleContext(),
     useFieldArrayMethods = _useTafModuleContext.useFieldArrayMethods;
   var replace = useFieldArrayMethods.replace;
@@ -5034,7 +5050,17 @@ var TacContainer = function TacContainer(_ref) {
     var currentTaf = getValues();
     var newTaf = prepareTafExportValues(taf, currentTaf);
     reset(newTaf, {
-      keepDirty: true
+      keepDefaultValues: true,
+      keepValues: false,
+      keepDirty: false,
+      keepErrors: false,
+      keepIsValid: false,
+      keepDirtyValues: false
+    });
+    Object.keys(newTaf).forEach(function (key) {
+      setValue(key, newTaf[key], {
+        shouldValidate: true
+      });
     });
     replace(newTaf.changeGroups);
     setTimeout(function () {
@@ -6093,10 +6119,22 @@ var TafWrapper = function TafWrapper(_a) {
     options: {
       mode: 'onTouched',
       reValidateMode: 'onChange',
-      criteriaMode: 'all',
+      criteriaMode: 'firstError',
       defaultValues: {
         baseForecast: emptyBaseForecast,
-        changeGroups: [emptyChangegroup, emptyChangegroup, emptyChangegroup, emptyChangegroup, emptyChangegroup]
+        changeGroups: [emptyChangegroup, emptyChangegroup, emptyChangegroup, emptyChangegroup, emptyChangegroup],
+        validDateStart: '',
+        validDateEnd: '',
+        baseTime: '',
+        previousId: '',
+        previousValidDateStart: '',
+        previousValidDateEnd: '',
+        location: '',
+        messageType: '',
+        uuid: '',
+        issueDate: '',
+        status: '',
+        IS_DRAFT: false
       }
     }
   }, /*#__PURE__*/React.createElement(TafModuleProvider, Object.assign({}, props), children));

package/package.json

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

package/src/lib/components/TafLayout/TafPanel/TafPanel.stories.d.ts

@@ -19,3 +19,4 @@ export declare const TafPanelTakeOverErrorDarkSnap: {
     (): React.ReactElement;
     storyName: string;
 };
+export declare const TafPanelMultipleRowsWithSameDates: () => React.ReactElement;