@opengeoweb/taf 4.10.0 → 4.11.0

package/index.esm.js

@@ -2637,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 {
@@ -2767,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();
       }
@@ -4019,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
 
@@ -4038,13 +4043,14 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
       onStartDrag = _useDragOrder.onStartDrag,
       activeDraggingIndex = _useDragOrder.activeDraggingIndex;
 
-  var isFormDirty = formState.isDirty,
+  var dirtyFields = formState.dirtyFields,
       errors = formState.errors;
-  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) {
@@ -4056,7 +4062,7 @@ 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)
     });
@@ -4064,9 +4070,17 @@ 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,
-      keepDirtyValues: false
+    Object.keys(formData).forEach(function (key) {
+      if (!keepDirty || key === 'changeGroups') {
+        resetField(key, {
+          keepDirty: keepDirty,
+          defaultValue: formData[key]
+        });
+      }
+
+      setValue(key, formData[key], {
+        shouldDirty: keepDirty
+      });
     });
   };
 
@@ -4165,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.',
@@ -4214,13 +4228,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
 
       case 'CLEAR':
         showConfirmDialog(action).then(function () {
-          var emptiedForm = clearTafFormData(getValues()); // Trigger an invisible change to dirty the form
-          // This is needed to trigger the autosave on changing location/time
-
-          var baseForecastFields = getFieldNames(false, -1);
-          setValue(baseForecastFields.wind, ' ', {
-            shouldDirty: true
-          });
+          var emptiedForm = clearTafFormData(getValues());
           resetFormValues(emptiedForm, true);
           showSnackbar('TAF has been cleared');
         });
@@ -5261,7 +5269,9 @@ var TopTabs = function TopTabs(_ref) {
   } : _ref$tafFromBackend;
 
   var _useFormContext = useFormContext(),
-      isDirty = _useFormContext.formState.isDirty;
+      dirtyFields = _useFormContext.formState.dirtyFields;
+
+  var isDirty = isFormDirty(dirtyFields);
 
   if (!tafFromBackend) {
     return null;
@@ -5329,8 +5339,9 @@ var LocationTabs = function LocationTabs(_ref) {
       timeSlot = _ref.timeSlot;
 
   var _useFormContext = useFormContext(),
-      isDirty = _useFormContext.formState.isDirty;
+      dirtyFields = _useFormContext.formState.dirtyFields;
 
+  var isDirty = isFormDirty(dirtyFields);
   return /*#__PURE__*/React.createElement(MenuList, {
     "data-testid": "location-tabs",
     sx: {

package/index.umd.js

@@ -2645,6 +2645,9 @@
           return 'NEW';
       }
     };
+    var isFormDirty = function isFormDirty(dirtyFields) {
+      return Object.keys(dirtyFields).length > 0;
+    };
 
     var textFieldStyle = function textFieldStyle(theme) {
       return {
@@ -2774,7 +2777,9 @@
           }) || null;
 
           if (foundValue) {
-            setValue(name, foundValue.value);
+            setValue(name, foundValue.value, {
+              shouldDirty: true
+            });
             setMaxLength(foundValue.value.length);
             event.preventDefault();
           }
@@ -4021,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
 
@@ -4040,13 +4045,14 @@
           onStartDrag = _o.onStartDrag,
           activeDraggingIndex = _o.activeDraggingIndex;
 
-      var isFormDirty = formState.isDirty,
+      var dirtyFields = formState.dirtyFields,
           errors = formState.errors;
-      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) {
@@ -4058,7 +4064,7 @@
         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)
         });
@@ -4069,9 +4075,17 @@
           keepDirty = false;
         }
 
-        reset(formData, {
-          keepDirty: keepDirty,
-          keepDirtyValues: false
+        Object.keys(formData).forEach(function (key) {
+          if (!keepDirty || key === 'changeGroups') {
+            resetField(key, {
+              keepDirty: keepDirty,
+              defaultValue: formData[key]
+            });
+          }
+
+          setValue(key, formData[key], {
+            shouldDirty: keepDirty
+          });
         });
       };
 
@@ -4173,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.',
@@ -4221,13 +4235,7 @@
 
           case 'CLEAR':
             showConfirmDialog(action).then(function () {
-              var emptiedForm = clearTafFormData(getValues()); // Trigger an invisible change to dirty the form
-              // This is needed to trigger the autosave on changing location/time
-
-              var baseForecastFields = getFieldNames(false, -1);
-              setValue(baseForecastFields.wind, ' ', {
-                shouldDirty: true
-              });
+              var emptiedForm = clearTafFormData(getValues());
               resetFormValues(emptiedForm, true);
               showSnackbar('TAF has been cleared');
             });
@@ -5270,7 +5278,8 @@
           location: 'EHAM'
         }
       } : _c;
-      var isDirty = reactHookForm.useFormContext().formState.isDirty;
+      var dirtyFields = reactHookForm.useFormContext().formState.dirtyFields;
+      var isDirty = isFormDirty(dirtyFields);
 
       if (!tafFromBackend) {
         return null;
@@ -5336,7 +5345,8 @@
           _c = _a.onChangeTab,
           onChangeTab = _c === void 0 ? function () {} : _c,
           timeSlot = _a.timeSlot;
-      var isDirty = reactHookForm.useFormContext().formState.isDirty;
+      var dirtyFields = reactHookForm.useFormContext().formState.dirtyFields;
+      var isDirty = isFormDirty(dirtyFields);
       return /*#__PURE__*/React__namespace.createElement(material.MenuList, {
         "data-testid": "location-tabs",
         sx: {

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

@@ -72,4 +72,7 @@ export declare const prepareTafValues: (_taf: Taf, tafAction: TafActions, addEmp
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,25 +12,25 @@
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/api": "4.10.0",
+    "@opengeoweb/api": "4.11.0",
     "react": "^17.0.2",
     "axios": "^0.25.0",
-    "@opengeoweb/shared": "4.10.0",
+    "@opengeoweb/shared": "4.11.0",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/theme": "4.10.0",
+    "@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.10.0",
+    "@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",
     "date-fns": "^2.29.3",
-    "@opengeoweb/core": "4.10.0",
-    "@opengeoweb/webmap": "4.10.0",
+    "@opengeoweb/core": "4.11.0",
+    "@opengeoweb/webmap": "4.11.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-intl": "^5.17.5",
@@ -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.10.0",
+    "@opengeoweb/authentication": "4.11.0",
     "react-router-dom": "^6.4.2",
     "query-string": "^6.13.7"
   }