@opengeoweb/sigmet-airmet 4.8.0 → 4.10.0

package/index.esm.js

@@ -1472,9 +1472,27 @@ var getProductFormLifecycleButtons = function getProductFormLifecycleButtons(can
 var hasValue = function hasValue(value) {
   return value !== null && value.toString() !== 'NaN';
 };
-var removeEmptyNumberFieldValues = function removeEmptyNumberFieldValues(product) {
+var prepareFormValues = function prepareFormValues(product) {
   return Object.keys(product).reduce(function (list, key) {
-    var value = product[key]; // check if nested object has value
+    var value = product[key]; // remove hidden form values
+
+    if (key === 'IS_DRAFT') {
+      return list;
+    } // remove geometry if empty coordinates
+
+
+    if (key === 'endGeometry' || key === 'endGeometryIntersect' || key === 'startGeometry' || key === 'startGeometryIntersect') {
+      if ((value === null || value === void 0 ? void 0 : value.features[0].geometry.type) === 'Polygon' && (value === null || value === void 0 ? void 0 : value.features[0].geometry.coordinates[0].length)) {
+        return Object.assign(Object.assign({}, list), _defineProperty({}, key, value));
+      }
+
+      if ((value === null || value === void 0 ? void 0 : value.features[0].geometry.type) === 'Point' && (value === null || value === void 0 ? void 0 : value.features[0].geometry.coordinates.length)) {
+        return Object.assign(Object.assign({}, list), _defineProperty({}, key, value));
+      }
+
+      return list;
+    } // check if nested object has value
+
 
     if (_typeof(value) === 'object' && value !== null && value !== undefined) {
       var hasNaNValue = Object.keys(value).reduce(function (total, valKey) {
@@ -1491,7 +1509,7 @@ var createSigmetPostParameter = function createSigmetPostParameter(sigmetToPost,
     uuid: previousUuid
   }) : sigmetToPost; // Do not send empty numbered fields to the BE to prevent errors
 
-  var sigmet = removeEmptyNumberFieldValues(sigmetIncludingUuid);
+  var sigmet = prepareFormValues(sigmetIncludingUuid);
   return {
     changeStatusTo: newStatus,
     sigmet: sigmet
@@ -1502,7 +1520,7 @@ var createAirmetPostParameter = function createAirmetPostParameter(airmetToPost,
     uuid: previousUuid
   }) : airmetToPost; // Do not send empty numbered fields to the BE to prevent errors
 
-  var airmet = removeEmptyNumberFieldValues(airmetIncludingUuid);
+  var airmet = prepareFormValues(airmetIncludingUuid);
   return {
     changeStatusTo: newStatus,
     airmet: airmet
@@ -1740,12 +1758,13 @@ var Levels = function Levels(_ref) {
       setValue = _useFormContext.setValue,
       trigger = _useFormContext.trigger,
       getValues = _useFormContext.getValues,
-      reset = _useFormContext.reset,
-      clearErrors = _useFormContext.clearErrors;
+      clearErrors = _useFormContext.clearErrors,
+      unregister = _useFormContext.unregister;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
       isRequired = _useDraftFormHelpers.isRequired;
 
+  var levelInfoMode = watch('levelInfoMode');
   var config = productType === 'sigmet' ? sigmetConfig : airmetConfig;
 
   var _useProductSettings = useProductSettings(config),
@@ -1754,6 +1773,11 @@ var Levels = function Levels(_ref) {
   var selectedFIR = watch('locationIndicatorATSR'); // Get allowed level units based on selected FIR - if no FIR selected, allow all default units
 
   var allowedLevelUnitsForFir = getAllowedUnits(selectedFIR, allowedUnits, 'level_unit', LevelUnits);
+  React__default.useEffect(function () {
+    if (levelInfoMode !== 'BETW') {
+      unregister('lowerLevel');
+    }
+  }, [levelInfoMode, unregister]);
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
     title: "Levels",
     sx: styles$2.containerItem
@@ -1771,29 +1795,18 @@ var Levels = function Levels(_ref) {
     isReadOnly: isReadOnly,
     onChange: function onChange() {
       // Reset default value for the level value to '' so when it rerenders it uses this empty default value
-      var currentValues = getValues();
-      reset(Object.assign(Object.assign({}, currentValues), {
-        level: {
-          unit: 'FL',
-          value: null
-        }
-      }), {
-        keepErrors: true,
-        keepDirty: true,
-        keepIsSubmitted: false,
-        keepTouched: false,
-        keepIsValid: false
-      }); // Clear out errors for the levels
+      setValue('level.unit', 'FL');
+      setValue('level.value', null); // Clear out errors for the levels
 
       clearErrors(['level', 'lowerLevel']);
     }
   }, /*#__PURE__*/React__default.createElement(RadioButtonAndLabel, {
     value: "AT",
     label: "At",
-    checked: watch('levelInfoMode') === 'AT' || watch('levelInfoMode') === 'TOPS',
+    checked: levelInfoMode === 'AT' || levelInfoMode === 'TOPS',
     "data-testid": "levels-AT",
     disabled: isDisabled
-  }), watch('levelInfoMode') === 'AT' || watch('levelInfoMode') === 'TOPS' ? /*#__PURE__*/React__default.createElement(Grid, {
+  }), levelInfoMode === 'AT' || levelInfoMode === 'TOPS' ? /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 12,
     container: true,
@@ -1806,7 +1819,7 @@ var Levels = function Levels(_ref) {
     md: 3
   }, /*#__PURE__*/React__default.createElement(FormControlLabel, {
     control: /*#__PURE__*/React__default.createElement(Checkbox, {
-      checked: watch('levelInfoMode') === 'TOPS',
+      checked: levelInfoMode === 'TOPS',
       onChange: function onChange() {
         setValue('levelInfoMode', getValues('levelInfoMode') === 'AT' ? 'TOPS' : 'AT', {
           shouldDirty: true
@@ -1880,10 +1893,10 @@ var Levels = function Levels(_ref) {
   }))) : null, /*#__PURE__*/React__default.createElement(RadioButtonAndLabel, {
     value: "BETW",
     label: "Between",
-    checked: watch('levelInfoMode') === 'BETW' || watch('levelInfoMode') === 'BETW_SFC',
+    checked: levelInfoMode === 'BETW' || levelInfoMode === 'BETW_SFC',
     "data-testid": "levels-BETW",
     disabled: isDisabled
-  }), watch('levelInfoMode') === 'BETW' || watch('levelInfoMode') === 'BETW_SFC' ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
+  }), levelInfoMode === 'BETW' || levelInfoMode === 'BETW_SFC' ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 12,
     container: true,
@@ -1904,7 +1917,7 @@ var Levels = function Levels(_ref) {
         isRequired: isRequired,
         validateLevelUnitCombinations: function validateLevelUnitCombinations(value) {
           return (// level step depends on the unit
-            _validateLevelUnitCombinations(value, watch('levelInfoMode') === 'BETW_SFC' ? 'SFC' : getValues('lowerLevel.unit')) === true
+            _validateLevelUnitCombinations(value, levelInfoMode === 'BETW_SFC' ? 'SFC' : getValues('lowerLevel.unit')) === true
           );
         }
       }
@@ -1971,7 +1984,7 @@ var Levels = function Levels(_ref) {
     md: 3
   }, /*#__PURE__*/React__default.createElement(FormControlLabel, {
     control: /*#__PURE__*/React__default.createElement(Checkbox, {
-      checked: watch('levelInfoMode') === 'BETW_SFC',
+      checked: levelInfoMode === 'BETW_SFC',
       onChange: function onChange() {
         getValues('level.unit') && trigger('level.unit');
         setValue('levelInfoMode', getValues('levelInfoMode') === 'BETW' ? 'BETW_SFC' : 'BETW', {
@@ -1984,7 +1997,7 @@ var Levels = function Levels(_ref) {
     }),
     "data-testid": "levels-SFC",
     label: "SFC"
-  })), watch('levelInfoMode') !== 'BETW_SFC' && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
+  })), levelInfoMode !== 'BETW_SFC' && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 4,
     md: 3
@@ -2058,9 +2071,9 @@ var Levels = function Levels(_ref) {
     value: "ABV",
     label: "Above",
     disabled: isDisabled,
-    checked: watch('levelInfoMode') === 'ABV' || watch('levelInfoMode') === 'TOPS_ABV',
+    checked: levelInfoMode === 'ABV' || levelInfoMode === 'TOPS_ABV',
     "data-testid": "levels-ABV"
-  }), watch('levelInfoMode') === 'ABV' || watch('levelInfoMode') === 'TOPS_ABV' ? /*#__PURE__*/React__default.createElement(Grid, {
+  }), levelInfoMode === 'ABV' || levelInfoMode === 'TOPS_ABV' ? /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 12,
     container: true,
@@ -2073,7 +2086,7 @@ var Levels = function Levels(_ref) {
     md: 3
   }, /*#__PURE__*/React__default.createElement(FormControlLabel, {
     control: /*#__PURE__*/React__default.createElement(Checkbox, {
-      checked: watch('levelInfoMode') === 'TOPS_ABV',
+      checked: levelInfoMode === 'TOPS_ABV',
       onChange: function onChange() {
         setValue('levelInfoMode', getValues('levelInfoMode') === 'ABV' ? 'TOPS_ABV' : 'ABV', {
           shouldDirty: true
@@ -2275,7 +2288,8 @@ var Phenomenon = function Phenomenon(_ref) {
       setValue = _useFormContext.setValue,
       trigger = _useFormContext.trigger;
 
-  var phenomenaList = productType === 'sigmet' ? SigmetPhenomena : AirmetPhenomena;
+  var isSigmet = productType === 'sigmet';
+  var phenomenaList = isSigmet ? SigmetPhenomena : AirmetPhenomena;
   var label = getFieldLabel('Phenomenon', isReadOnly);
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
     title: "What"
@@ -2293,17 +2307,6 @@ var Phenomenon = function Phenomenon(_ref) {
         setValue('movementType', null);
       }
 
-      if (getValues('phenomenon') !== 'SFC_VIS') {
-        setValue('visibilityValue', null);
-        setValue('visibilityCause', null);
-      }
-
-      if (getValues('phenomenon') !== 'SFC_WIND') {
-        setValue('windDirection', null);
-        setValue('windUnit', null);
-        setValue('windSpeed', null);
-      }
-
       _onChange();
 
       return trigger([].concat(_toConsumableArray(getValues('validDateStart') ? ['validDateStart'] : []), _toConsumableArray(getValues('validDateEnd') ? ['validDateEnd'] : [])));
@@ -2475,7 +2478,8 @@ var Progress = function Progress(_ref) {
       watch = _useFormContext.watch,
       getValues = _useFormContext.getValues,
       trigger = _useFormContext.trigger,
-      errors = _useFormContext.formState.errors;
+      errors = _useFormContext.formState.errors,
+      unregister = _useFormContext.unregister;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
       isRequired = _useDraftFormHelpers.isRequired,
@@ -2490,6 +2494,18 @@ var Progress = function Progress(_ref) {
   var selectedFIR = watch('locationIndicatorATSR'); // Get allowed movement units based on selected FIR - if no FIR selected, allow all units
 
   var allowedMovementUnitsForFir = getAllowedUnits(selectedFIR, allowedUnits, 'movement_unit', MovementUnit);
+  React__default.useEffect(function () {
+    if (movementType !== 'MOVEMENT') {
+      unregister('movementDirection');
+      unregister('movementSpeed');
+      unregister('movementUnit');
+    }
+
+    if (movementType !== 'FORECAST_POSITION') {
+      unregister('endGeometry');
+      unregister('endGeometryIntersect');
+    }
+  }, [movementType, unregister]);
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
     title: "Progress",
     sx: styles$2.containerItem
@@ -3355,7 +3371,8 @@ var CloudLevels = function CloudLevels(_ref) {
       watch = _useFormContext.watch,
       setValue = _useFormContext.setValue,
       trigger = _useFormContext.trigger,
-      getValues = _useFormContext.getValues;
+      getValues = _useFormContext.getValues,
+      unregister = _useFormContext.unregister;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
       isRequired = _useDraftFormHelpers.isRequired;
@@ -3363,9 +3380,15 @@ var CloudLevels = function CloudLevels(_ref) {
   var _useProductSettings = useProductSettings(airmetConfig),
       allowedUnits = _useProductSettings.allowedUnits;
 
-  var selectedFIR = watch('locationIndicatorATSR'); // Get allowed cloud level units based on selected FIR - if no FIR selected, allow all default units
+  var selectedFIR = watch('locationIndicatorATSR');
+  var cloudLevelInfoMode = watch('cloudLevelInfoMode'); // Get allowed cloud level units based on selected FIR - if no FIR selected, allow all default units
 
   var allowedCloudLevelUnitsForFir = getAllowedUnits(selectedFIR, allowedUnits, 'cloud_level_unit', CloudLevelUnits);
+  React__default.useEffect(function () {
+    if (cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV') {
+      unregister('cloudLowerLevel');
+    }
+  }, [cloudLevelInfoMode, unregister]);
   return /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     container: true,
@@ -3397,12 +3420,12 @@ var CloudLevels = function CloudLevels(_ref) {
   }, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 4
-  }, (!isReadOnly || watch('cloudLevelInfoMode') === 'BETW_ABV' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV') && /*#__PURE__*/React__default.createElement(ReactHookFormFormControl, {
+  }, (!isReadOnly || cloudLevelInfoMode === 'BETW_ABV' || cloudLevelInfoMode === 'BETW_SFC_ABV') && /*#__PURE__*/React__default.createElement(ReactHookFormFormControl, {
     disabled: isDisabled,
     isReadOnly: isReadOnly
   }, /*#__PURE__*/React__default.createElement(FormControlLabel, {
     control: /*#__PURE__*/React__default.createElement(Checkbox, {
-      checked: watch('cloudLevelInfoMode') === 'BETW_ABV' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV',
+      checked: cloudLevelInfoMode === 'BETW_ABV' || cloudLevelInfoMode === 'BETW_SFC_ABV',
       onChange: function onChange() {
         switch (getValues('cloudLevelInfoMode')) {
           case 'BETW':
@@ -3510,12 +3533,12 @@ var CloudLevels = function CloudLevels(_ref) {
   }, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 4
-  }, (!isReadOnly || watch('cloudLevelInfoMode') === 'BETW_SFC' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV') && /*#__PURE__*/React__default.createElement(ReactHookFormFormControl, {
+  }, (!isReadOnly || cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV') && /*#__PURE__*/React__default.createElement(ReactHookFormFormControl, {
     disabled: isDisabled,
     isReadOnly: isReadOnly
   }, /*#__PURE__*/React__default.createElement(FormControlLabel, {
     control: /*#__PURE__*/React__default.createElement(Checkbox, {
-      checked: watch('cloudLevelInfoMode') === 'BETW_SFC' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV',
+      checked: cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV',
       onChange: function onChange() {
         switch (getValues('cloudLevelInfoMode')) {
           case 'BETW':
@@ -3549,7 +3572,7 @@ var CloudLevels = function CloudLevels(_ref) {
     }),
     "data-testid": "cloudLevels-SFC",
     label: "SFC"
-  }))), watch('cloudLevelInfoMode') !== 'BETW_SFC' && watch('cloudLevelInfoMode') !== 'BETW_SFC_ABV' && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
+  }))), cloudLevelInfoMode !== 'BETW_SFC' && cloudLevelInfoMode !== 'BETW_SFC_ABV' && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 3
   }, /*#__PURE__*/React__default.createElement(ReactHookFormSelect, {
@@ -3652,7 +3675,7 @@ var useTAC = function useTAC(initialProduct, getTAC) {
             case 0:
               _context.prev = 0;
               _context.next = 3;
-              return getTAC(product);
+              return getTAC(prepareFormValues(product));
 
             case 3:
               result = _context.sent;
@@ -3694,10 +3717,14 @@ var useTAC = function useTAC(initialProduct, getTAC) {
     } else if (isMounted.current) {
       setTAC(noTAC);
     }
-  }; // eslint-disable-next-line react-hooks/exhaustive-deps
-
+  };
 
-  var delayedQuery = React__default.useCallback(debounce(update, 1000), []);
+  var delayedQuery = React__default.useMemo(function () {
+    return debounce(function (formFn) {
+      return update(formFn());
+    }, 1000);
+  }, // eslint-disable-next-line react-hooks/exhaustive-deps
+  []);
   return [TAC, delayedQuery];
 };
 
@@ -4086,6 +4113,23 @@ var ProductFormLayout = function ProductFormLayout(_a) {
   }, children));
 };
 
+var useConditionalFields$1 = function useConditionalFields() {
+  var _useFormContext = useFormContext(),
+      watch = _useFormContext.watch,
+      unregister = _useFormContext.unregister; // phenomenon: VA_CLD
+
+
+  var hasVolcanicAshes = watch('phenomenon') === 'VA_CLD';
+  React__default.useEffect(function () {
+    if (!hasVolcanicAshes) {
+      unregister(['vaSigmetVolcanoName', 'vaSigmetVolcanoCoordinates.latitude', 'vaSigmetVolcanoCoordinates.longitude']);
+    }
+  }, [hasVolcanicAshes, unregister]);
+  return {
+    hasVolcanicAshes: hasVolcanicAshes
+  };
+};
+
 var SigmetForm = function SigmetForm(_ref) {
   var mode = _ref.mode,
       _ref$isCancelSigmet = _ref.isCancelSigmet,
@@ -4100,11 +4144,10 @@ var SigmetForm = function SigmetForm(_ref) {
   var _useApiContext = useApiContext(),
       api = _useApiContext.api;
 
-  var _useFormContext = useFormContext(),
-      watch = _useFormContext.watch,
-      setValue = _useFormContext.setValue,
-      handleSubmit = _useFormContext.handleSubmit,
-      getValues = _useFormContext.getValues;
+  var _useFormContext2 = useFormContext(),
+      watch = _useFormContext2.watch,
+      setValue = _useFormContext2.setValue,
+      handleSubmit = _useFormContext2.handleSubmit;
 
   var _React$useState = React__default.useState(mode === 'view'),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -4120,7 +4163,7 @@ var SigmetForm = function SigmetForm(_ref) {
       updateTac = _useTAC2[1];
 
   var onChangeForm = function onChangeForm() {
-    updateTac(getValues());
+    updateTac(watch);
   }; // TODO: [Loes Cornelis]: fix this whole mess of if statements for isCancelSigmet and hidden fields if disabled throughout the form
 
 
@@ -4185,6 +4228,9 @@ var SigmetForm = function SigmetForm(_ref) {
     }
   }, [drawMode.start, drawMode.end, isReadOnly, isDisabled]);
 
+  var _useConditionalFields = useConditionalFields$1(),
+      hasVolcanicAshes = _useConditionalFields.hasVolcanicAshes;
+
   var renderForm = function renderForm() {
     return /*#__PURE__*/React__default.createElement(Grid, {
       container: true,
@@ -4203,7 +4249,7 @@ var SigmetForm = function SigmetForm(_ref) {
       isReadOnly: isReadOnly,
       helperText: helperText,
       onChange: onChangeForm
-    }), !isCancelSigmet && watch('phenomenon') === 'VA_CLD' && /*#__PURE__*/React__default.createElement(VolcanicFields, {
+    }), !isCancelSigmet && hasVolcanicAshes && /*#__PURE__*/React__default.createElement(VolcanicFields, {
       isDisabled: isDisabled,
       isReadOnly: isReadOnly,
       helperText: helperText
@@ -4300,6 +4346,48 @@ var SigmetForm = function SigmetForm(_ref) {
   }, renderForm()));
 };
 
+var useConditionalFields = function useConditionalFields() {
+  var _useFormContext = useFormContext(),
+      watch = _useFormContext.watch,
+      unregister = _useFormContext.unregister; // phenomenon: SFC_VIS
+
+
+  var phenomenon = watch('phenomenon');
+  var hasSurfaceVisiblity = phenomenon === 'SFC_VIS';
+  React__default.useEffect(function () {
+    if (!hasSurfaceVisiblity) {
+      unregister(['visibilityValue', 'visibilityCause']);
+    }
+  }, [hasSurfaceVisiblity, unregister]); // phenomenon: SFC_WIND
+
+  var hasSurfaceWind = watch('phenomenon') === 'SFC_WIND';
+  React__default.useEffect(function () {
+    if (!hasSurfaceWind) {
+      unregister(['windDirection', 'windUnit', 'windSpeed']);
+    }
+  }, [hasSurfaceWind, unregister]); // phenomenon: SFC_WIND, SFC_VIS, BKN_CLD, OVC_CLD
+
+  var hasLevels = phenomenon !== 'SFC_WIND' && phenomenon !== 'SFC_VIS' && phenomenon !== 'BKN_CLD' && phenomenon !== 'OVC_CLD';
+  React__default.useEffect(function () {
+    if (!hasLevels) {
+      unregister(['levelInfoMode', 'level', 'lowerLevel']);
+    }
+  }, [hasLevels, unregister]); // phenomenon: BKN_CLD
+
+  var hasCloudLevels = phenomenon === 'BKN_CLD' || phenomenon === 'OVC_CLD';
+  React__default.useEffect(function () {
+    if (!hasCloudLevels) {
+      unregister(['cloudLevelInfoMode', 'cloudLevel', 'cloudLowerLevel']);
+    }
+  }, [hasCloudLevels, unregister]);
+  return {
+    hasSurfaceVisiblity: hasSurfaceVisiblity,
+    hasSurfaceWind: hasSurfaceWind,
+    hasLevels: hasLevels,
+    hasCloudLevels: hasCloudLevels
+  };
+};
+
 var AirmetForm = function AirmetForm(_ref) {
   var mode = _ref.mode,
       _ref$isCancelAirmet = _ref.isCancelAirmet,
@@ -4314,13 +4402,10 @@ var AirmetForm = function AirmetForm(_ref) {
   var _useApiContext = useApiContext(),
       api = _useApiContext.api;
 
-  var _useFormContext = useFormContext(),
-      watch = _useFormContext.watch,
-      setValue = _useFormContext.setValue,
-      handleSubmit = _useFormContext.handleSubmit,
-      getValues = _useFormContext.getValues;
-
-  var phenomenon = watch('phenomenon');
+  var _useFormContext2 = useFormContext(),
+      watch = _useFormContext2.watch,
+      setValue = _useFormContext2.setValue,
+      handleSubmit = _useFormContext2.handleSubmit;
 
   var _React$useState = React__default.useState(mode === 'view'),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -4336,7 +4421,7 @@ var AirmetForm = function AirmetForm(_ref) {
       updateTac = _useTAC2[1];
 
   var onChangeForm = function onChangeForm() {
-    updateTac(getValues());
+    updateTac(watch);
   };
 
   var initialGeometry = initialAirmet && !isCancelAirmet ? {
@@ -4379,6 +4464,12 @@ var AirmetForm = function AirmetForm(_ref) {
     }
   }, [drawMode.start, isReadOnly, isDisabled]);
 
+  var _useConditionalFields = useConditionalFields(),
+      hasSurfaceVisiblity = _useConditionalFields.hasSurfaceVisiblity,
+      hasSurfaceWind = _useConditionalFields.hasSurfaceWind,
+      hasLevels = _useConditionalFields.hasLevels,
+      hasCloudLevels = _useConditionalFields.hasCloudLevels;
+
   var renderForm = function renderForm() {
     return /*#__PURE__*/React__default.createElement(Grid, {
       container: true,
@@ -4389,11 +4480,11 @@ var AirmetForm = function AirmetForm(_ref) {
       isDisabled: isDisabled,
       isReadOnly: isReadOnly,
       onChange: onChangeForm
-    }), !isCancelAirmet && phenomenon === 'SFC_VIS' && /*#__PURE__*/React__default.createElement(SurfaceVisibility, {
+    }), !isCancelAirmet && hasSurfaceVisiblity && /*#__PURE__*/React__default.createElement(SurfaceVisibility, {
       isReadOnly: isReadOnly,
       isDisabled: isDisabled,
       onChange: onChangeForm
-    }), !isCancelAirmet && phenomenon === 'SFC_WIND' && /*#__PURE__*/React__default.createElement(SurfaceWind, {
+    }), !isCancelAirmet && hasSurfaceWind && /*#__PURE__*/React__default.createElement(SurfaceWind, {
       isReadOnly: isReadOnly,
       isDisabled: isDisabled,
       onChange: onChangeForm
@@ -4426,12 +4517,12 @@ var AirmetForm = function AirmetForm(_ref) {
       setDrawModeType: function setDrawModeType(mapDrawMode, StartOrEndDrawing) {
         _setDrawModeType(mapDrawMode, StartOrEndDrawing, updateStartDrawing);
       }
-    }), !isCancelAirmet && phenomenon !== 'SFC_WIND' && phenomenon !== 'SFC_VIS' && phenomenon !== 'BKN_CLD' && phenomenon !== 'OVC_CLD' && /*#__PURE__*/React__default.createElement(Levels, {
+    }), !isCancelAirmet && hasLevels && /*#__PURE__*/React__default.createElement(Levels, {
       isDisabled: isDisabled,
       isReadOnly: isReadOnly,
       onChange: onChangeForm,
       productType: "airmet"
-    }), !isCancelAirmet && (phenomenon === 'BKN_CLD' || phenomenon === 'OVC_CLD') && /*#__PURE__*/React__default.createElement(CloudLevels, {
+    }), !isCancelAirmet && hasCloudLevels && /*#__PURE__*/React__default.createElement(CloudLevels, {
       isDisabled: isDisabled,
       isReadOnly: isReadOnly,
       onChange: onChangeForm
@@ -5067,18 +5158,16 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
 
   React.useEffect(function () {
     // set the values of the newly selected product
-    reset(product !== null ? Object.assign({}, product) : {});
+    reset(product !== null ? Object.assign({}, product) : {}, {
+      keepDefaultValues: true
+    });
     return function () {
       // reset form on unmount
       reset({});
     };
   }, [reset, product]);
 
-  var postProduct = function postProduct(_productToPost, newStatus) {
-    // remove hidden helper fields
-    _productToPost.IS_DRAFT;
-        var productToPost = __rest(_productToPost, ["IS_DRAFT"]);
-
+  var postProduct = function postProduct(productToPost, newStatus) {
     var uuid = product !== null && product.uuid ? product.uuid : null;
     var postProductParam = productType === 'sigmet' ? createSigmetPostParameter(productToPost, newStatus, uuid) : createAirmetPostParameter(productToPost, newStatus, uuid);
     setLoader(true);
@@ -5098,8 +5187,9 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
   };
 
   var onToggleDialog = function onToggleDialog() {
+    var shouldRefreshList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     setLoader(false);
-    toggleDialogStatus();
+    toggleDialogStatus(shouldRefreshList);
   };
 
   var showConfirmDialog = function showConfirmDialog(action) {
@@ -5119,7 +5209,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
     switch (action) {
       case 'CLOSED':
         if (mode === 'view' || !isDirty) {
-          onToggleDialog();
+          onToggleDialog(false);
         } else {
           toggleIsDraft(true);
           showConfirmDialog(action).then(function () {
@@ -5129,7 +5219,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
           })["catch"](function (reason) {
             if (reason === 'CANCELLED') {
               // close without save
-              onToggleDialog();
+              onToggleDialog(false);
             }
           });
         }
@@ -5151,7 +5241,7 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
         showConfirmDialog(action).then(function () {
           // If we're discarding a new SIGMET/AIRMET - just close the dialog
           if (mode === 'new') {
-            onToggleDialog();
+            onToggleDialog(false);
           } else {
             // If we're discarding an existing SIGMET/AIRMET - make call to BE
             postProduct(product, action);
@@ -5270,14 +5360,18 @@ var ProductFormDialog = function ProductFormDialog(_ref) {
     return null;
   }
 
+  var product = productListItem !== null ? prepareProductValues(productListItem[productType], productType) : null;
   return /*#__PURE__*/React.createElement(ReactHookFormProvider, {
-    options: defaultFormOptions
+    options: Object.assign(Object.assign({}, defaultFormOptions), {
+      defaultValues: product,
+      values: product
+    })
   }, /*#__PURE__*/React.createElement(ConfirmationServiceProvider, null, /*#__PURE__*/React.createElement(ProductFormDialogContent, {
     isOpen: isOpen,
     toggleDialogStatus: toggleDialogStatus,
     mode: mode,
     productCanBe: productCanBe,
-    product: productListItem !== null ? prepareProductValues(productListItem[productType], productType) : null,
+    product: product,
     productType: productType
   })));
 };
@@ -5328,8 +5422,9 @@ var MetInfoWrapper = function MetInfoWrapper(_ref) {
   }, [selectedProduct]);
 
   var toggleDialogOpen = function toggleDialogOpen() {
+    var shouldRefreshList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     // Refresh list on closing dialog
-    if (isFormDialogOpen === true) getNewProductList();
+    if (isFormDialogOpen === true && shouldRefreshList) getNewProductList();
     setIsFormDialogOpen(!isFormDialogOpen);
   };
 

package/index.umd.js

@@ -1463,20 +1463,38 @@
     var hasValue = function hasValue(value) {
       return value !== null && value.toString() !== 'NaN';
     };
-    var removeEmptyNumberFieldValues = function removeEmptyNumberFieldValues(product) {
+    var prepareFormValues = function prepareFormValues(product) {
       return Object.keys(product).reduce(function (list, key) {
-        var _a, _b;
+        var _a, _b, _c, _d;
+
+        var value = product[key]; // remove hidden form values
+
+        if (key === 'IS_DRAFT') {
+          return list;
+        } // remove geometry if empty coordinates
+
+
+        if (key === 'endGeometry' || key === 'endGeometryIntersect' || key === 'startGeometry' || key === 'startGeometryIntersect') {
+          if ((value === null || value === void 0 ? void 0 : value.features[0].geometry.type) === 'Polygon' && (value === null || value === void 0 ? void 0 : value.features[0].geometry.coordinates[0].length)) {
+            return __assign(__assign({}, list), (_a = {}, _a[key] = value, _a));
+          }
+
+          if ((value === null || value === void 0 ? void 0 : value.features[0].geometry.type) === 'Point' && (value === null || value === void 0 ? void 0 : value.features[0].geometry.coordinates.length)) {
+            return __assign(__assign({}, list), (_b = {}, _b[key] = value, _b));
+          }
+
+          return list;
+        } // check if nested object has value
 
-        var value = product[key]; // check if nested object has value
 
         if (_typeof(value) === 'object' && value !== null && value !== undefined) {
           var hasNaNValue = Object.keys(value).reduce(function (total, valKey) {
             return !hasValue(value[valKey]) || total;
           }, false);
-          return __assign(__assign({}, list), !hasNaNValue && (_a = {}, _a[key] = value, _a));
+          return __assign(__assign({}, list), !hasNaNValue && (_c = {}, _c[key] = value, _c));
         }
 
-        return __assign(__assign({}, list), hasValue(value) && (_b = {}, _b[key] = value, _b));
+        return __assign(__assign({}, list), hasValue(value) && (_d = {}, _d[key] = value, _d));
       }, {});
     };
     var createSigmetPostParameter = function createSigmetPostParameter(sigmetToPost, newStatus, previousUuid) {
@@ -1484,7 +1502,7 @@
         uuid: previousUuid
       }) : sigmetToPost; // Do not send empty numbered fields to the BE to prevent errors
 
-      var sigmet = removeEmptyNumberFieldValues(sigmetIncludingUuid);
+      var sigmet = prepareFormValues(sigmetIncludingUuid);
       return {
         changeStatusTo: newStatus,
         sigmet: sigmet
@@ -1495,7 +1513,7 @@
         uuid: previousUuid
       }) : airmetToPost; // Do not send empty numbered fields to the BE to prevent errors
 
-      var airmet = removeEmptyNumberFieldValues(airmetIncludingUuid);
+      var airmet = prepareFormValues(airmetIncludingUuid);
       return {
         changeStatusTo: newStatus,
         airmet: airmet
@@ -1738,15 +1756,21 @@
           setValue = _c.setValue,
           trigger = _c.trigger,
           getValues = _c.getValues,
-          reset = _c.reset,
-          clearErrors = _c.clearErrors;
+          clearErrors = _c.clearErrors,
+          unregister = _c.unregister;
 
       var isRequired = shared.useDraftFormHelpers().isRequired;
+      var levelInfoMode = watch('levelInfoMode');
       var config = productType === 'sigmet' ? sigmetConfig : airmetConfig;
       var allowedUnits = useProductSettings(config).allowedUnits;
       var selectedFIR = watch('locationIndicatorATSR'); // Get allowed level units based on selected FIR - if no FIR selected, allow all default units
 
       var allowedLevelUnitsForFir = getAllowedUnits(selectedFIR, allowedUnits, 'level_unit', LevelUnits);
+      React__default["default"].useEffect(function () {
+        if (levelInfoMode !== 'BETW') {
+          unregister('lowerLevel');
+        }
+      }, [levelInfoMode, unregister]);
       return /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
         title: "Levels",
         sx: styles$2.containerItem
@@ -1764,29 +1788,18 @@
         isReadOnly: isReadOnly,
         onChange: function onChange() {
           // Reset default value for the level value to '' so when it rerenders it uses this empty default value
-          var currentValues = getValues();
-          reset(__assign(__assign({}, currentValues), {
-            level: {
-              unit: 'FL',
-              value: null
-            }
-          }), {
-            keepErrors: true,
-            keepDirty: true,
-            keepIsSubmitted: false,
-            keepTouched: false,
-            keepIsValid: false
-          }); // Clear out errors for the levels
+          setValue('level.unit', 'FL');
+          setValue('level.value', null); // Clear out errors for the levels
 
           clearErrors(['level', 'lowerLevel']);
         }
       }, /*#__PURE__*/React__default["default"].createElement(RadioButtonAndLabel, {
         value: "AT",
         label: "At",
-        checked: watch('levelInfoMode') === 'AT' || watch('levelInfoMode') === 'TOPS',
+        checked: levelInfoMode === 'AT' || levelInfoMode === 'TOPS',
         "data-testid": "levels-AT",
         disabled: isDisabled
-      }), watch('levelInfoMode') === 'AT' || watch('levelInfoMode') === 'TOPS' ? /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+      }), levelInfoMode === 'AT' || levelInfoMode === 'TOPS' ? /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 12,
         container: true,
@@ -1799,7 +1812,7 @@
         md: 3
       }, /*#__PURE__*/React__default["default"].createElement(material.FormControlLabel, {
         control: /*#__PURE__*/React__default["default"].createElement(material.Checkbox, {
-          checked: watch('levelInfoMode') === 'TOPS',
+          checked: levelInfoMode === 'TOPS',
           onChange: function onChange() {
             setValue('levelInfoMode', getValues('levelInfoMode') === 'AT' ? 'TOPS' : 'AT', {
               shouldDirty: true
@@ -1870,10 +1883,10 @@
       }))) : null, /*#__PURE__*/React__default["default"].createElement(RadioButtonAndLabel, {
         value: "BETW",
         label: "Between",
-        checked: watch('levelInfoMode') === 'BETW' || watch('levelInfoMode') === 'BETW_SFC',
+        checked: levelInfoMode === 'BETW' || levelInfoMode === 'BETW_SFC',
         "data-testid": "levels-BETW",
         disabled: isDisabled
-      }), watch('levelInfoMode') === 'BETW' || watch('levelInfoMode') === 'BETW_SFC' ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+      }), levelInfoMode === 'BETW' || levelInfoMode === 'BETW_SFC' ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 12,
         container: true,
@@ -1894,7 +1907,7 @@
             isRequired: isRequired,
             validateLevelUnitCombinations: function validateLevelUnitCombinations(value) {
               // level step depends on the unit
-              return _validateLevelUnitCombinations(value, watch('levelInfoMode') === 'BETW_SFC' ? 'SFC' : getValues('lowerLevel.unit')) === true;
+              return _validateLevelUnitCombinations(value, levelInfoMode === 'BETW_SFC' ? 'SFC' : getValues('lowerLevel.unit')) === true;
             }
           }
         },
@@ -1957,7 +1970,7 @@
         md: 3
       }, /*#__PURE__*/React__default["default"].createElement(material.FormControlLabel, {
         control: /*#__PURE__*/React__default["default"].createElement(material.Checkbox, {
-          checked: watch('levelInfoMode') === 'BETW_SFC',
+          checked: levelInfoMode === 'BETW_SFC',
           onChange: function onChange() {
             getValues('level.unit') && trigger('level.unit');
             setValue('levelInfoMode', getValues('levelInfoMode') === 'BETW' ? 'BETW_SFC' : 'BETW', {
@@ -1970,7 +1983,7 @@
         }),
         "data-testid": "levels-SFC",
         label: "SFC"
-      })), watch('levelInfoMode') !== 'BETW_SFC' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+      })), levelInfoMode !== 'BETW_SFC' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 4,
         md: 3
@@ -2039,9 +2052,9 @@
         value: "ABV",
         label: "Above",
         disabled: isDisabled,
-        checked: watch('levelInfoMode') === 'ABV' || watch('levelInfoMode') === 'TOPS_ABV',
+        checked: levelInfoMode === 'ABV' || levelInfoMode === 'TOPS_ABV',
         "data-testid": "levels-ABV"
-      }), watch('levelInfoMode') === 'ABV' || watch('levelInfoMode') === 'TOPS_ABV' ? /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+      }), levelInfoMode === 'ABV' || levelInfoMode === 'TOPS_ABV' ? /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 12,
         container: true,
@@ -2054,7 +2067,7 @@
         md: 3
       }, /*#__PURE__*/React__default["default"].createElement(material.FormControlLabel, {
         control: /*#__PURE__*/React__default["default"].createElement(material.Checkbox, {
-          checked: watch('levelInfoMode') === 'TOPS_ABV',
+          checked: levelInfoMode === 'TOPS_ABV',
           onChange: function onChange() {
             setValue('levelInfoMode', getValues('levelInfoMode') === 'ABV' ? 'TOPS_ABV' : 'ABV', {
               shouldDirty: true
@@ -2248,7 +2261,8 @@
           setValue = _c.setValue,
           trigger = _c.trigger;
 
-      var phenomenaList = productType === 'sigmet' ? SigmetPhenomena : AirmetPhenomena;
+      var isSigmet = productType === 'sigmet';
+      var phenomenaList = isSigmet ? SigmetPhenomena : AirmetPhenomena;
       var label = getFieldLabel('Phenomenon', isReadOnly);
       return /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
         title: "What"
@@ -2266,17 +2280,6 @@
             setValue('movementType', null);
           }
 
-          if (getValues('phenomenon') !== 'SFC_VIS') {
-            setValue('visibilityValue', null);
-            setValue('visibilityCause', null);
-          }
-
-          if (getValues('phenomenon') !== 'SFC_WIND') {
-            setValue('windDirection', null);
-            setValue('windUnit', null);
-            setValue('windSpeed', null);
-          }
-
           _onChange();
 
           return trigger(__spreadArray(__spreadArray([], __read(getValues('validDateStart') ? ['validDateStart'] : [])), __read(getValues('validDateEnd') ? ['validDateEnd'] : [])));
@@ -2446,7 +2449,8 @@
           watch = _e.watch,
           getValues = _e.getValues,
           trigger = _e.trigger,
-          errors = _e.formState.errors;
+          errors = _e.formState.errors,
+          unregister = _e.unregister;
 
       var _f = shared.useDraftFormHelpers(),
           isRequired = _f.isRequired,
@@ -2458,6 +2462,18 @@
       var selectedFIR = watch('locationIndicatorATSR'); // Get allowed movement units based on selected FIR - if no FIR selected, allow all units
 
       var allowedMovementUnitsForFir = getAllowedUnits(selectedFIR, allowedUnits, 'movement_unit', MovementUnit);
+      React__default["default"].useEffect(function () {
+        if (movementType !== 'MOVEMENT') {
+          unregister('movementDirection');
+          unregister('movementSpeed');
+          unregister('movementUnit');
+        }
+
+        if (movementType !== 'FORECAST_POSITION') {
+          unregister('endGeometry');
+          unregister('endGeometryIntersect');
+        }
+      }, [movementType, unregister]);
       return /*#__PURE__*/React__default["default"].createElement(ProductFormFieldLayout, {
         title: "Progress",
         sx: styles$2.containerItem
@@ -3283,13 +3299,20 @@
           watch = _c.watch,
           setValue = _c.setValue,
           trigger = _c.trigger,
-          getValues = _c.getValues;
+          getValues = _c.getValues,
+          unregister = _c.unregister;
 
       var isRequired = shared.useDraftFormHelpers().isRequired;
       var allowedUnits = useProductSettings(airmetConfig).allowedUnits;
-      var selectedFIR = watch('locationIndicatorATSR'); // Get allowed cloud level units based on selected FIR - if no FIR selected, allow all default units
+      var selectedFIR = watch('locationIndicatorATSR');
+      var cloudLevelInfoMode = watch('cloudLevelInfoMode'); // Get allowed cloud level units based on selected FIR - if no FIR selected, allow all default units
 
       var allowedCloudLevelUnitsForFir = getAllowedUnits(selectedFIR, allowedUnits, 'cloud_level_unit', CloudLevelUnits);
+      React__default["default"].useEffect(function () {
+        if (cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV') {
+          unregister('cloudLowerLevel');
+        }
+      }, [cloudLevelInfoMode, unregister]);
       return /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         container: true,
@@ -3321,12 +3344,12 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 4
-      }, (!isReadOnly || watch('cloudLevelInfoMode') === 'BETW_ABV' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV') && /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormFormControl, {
+      }, (!isReadOnly || cloudLevelInfoMode === 'BETW_ABV' || cloudLevelInfoMode === 'BETW_SFC_ABV') && /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormFormControl, {
         disabled: isDisabled,
         isReadOnly: isReadOnly
       }, /*#__PURE__*/React__default["default"].createElement(material.FormControlLabel, {
         control: /*#__PURE__*/React__default["default"].createElement(material.Checkbox, {
-          checked: watch('cloudLevelInfoMode') === 'BETW_ABV' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV',
+          checked: cloudLevelInfoMode === 'BETW_ABV' || cloudLevelInfoMode === 'BETW_SFC_ABV',
           onChange: function onChange() {
             switch (getValues('cloudLevelInfoMode')) {
               case 'BETW':
@@ -3432,12 +3455,12 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 4
-      }, (!isReadOnly || watch('cloudLevelInfoMode') === 'BETW_SFC' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV') && /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormFormControl, {
+      }, (!isReadOnly || cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV') && /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormFormControl, {
         disabled: isDisabled,
         isReadOnly: isReadOnly
       }, /*#__PURE__*/React__default["default"].createElement(material.FormControlLabel, {
         control: /*#__PURE__*/React__default["default"].createElement(material.Checkbox, {
-          checked: watch('cloudLevelInfoMode') === 'BETW_SFC' || watch('cloudLevelInfoMode') === 'BETW_SFC_ABV',
+          checked: cloudLevelInfoMode === 'BETW_SFC' || cloudLevelInfoMode === 'BETW_SFC_ABV',
           onChange: function onChange() {
             switch (getValues('cloudLevelInfoMode')) {
               case 'BETW':
@@ -3471,7 +3494,7 @@
         }),
         "data-testid": "cloudLevels-SFC",
         label: "SFC"
-      }))), watch('cloudLevelInfoMode') !== 'BETW_SFC' && watch('cloudLevelInfoMode') !== 'BETW_SFC_ABV' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+      }))), cloudLevelInfoMode !== 'BETW_SFC' && cloudLevelInfoMode !== 'BETW_SFC_ABV' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 3
       }, /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormSelect, {
@@ -3570,7 +3593,7 @@
 
                 return [4
                 /*yield*/
-                , getTAC(product)];
+                , getTAC(prepareFormValues(product))];
 
               case 1:
                 result = _a.sent();
@@ -3616,10 +3639,14 @@
         } else if (isMounted.current) {
           setTAC(noTAC);
         }
-      }; // eslint-disable-next-line react-hooks/exhaustive-deps
-
+      };
 
-      var delayedQuery = React__default["default"].useCallback(lodash.debounce(update, 1000), []);
+      var delayedQuery = React__default["default"].useMemo(function () {
+        return lodash.debounce(function (formFn) {
+          return update(formFn());
+        }, 1000);
+      }, // eslint-disable-next-line react-hooks/exhaustive-deps
+      []);
       return [TAC, delayedQuery];
     };
 
@@ -3977,6 +4004,23 @@
       }, children));
     };
 
+    var useConditionalFields$1 = function useConditionalFields() {
+      var _a = reactHookForm.useFormContext(),
+          watch = _a.watch,
+          unregister = _a.unregister; // phenomenon: VA_CLD
+
+
+      var hasVolcanicAshes = watch('phenomenon') === 'VA_CLD';
+      React__default["default"].useEffect(function () {
+        if (!hasVolcanicAshes) {
+          unregister(['vaSigmetVolcanoName', 'vaSigmetVolcanoCoordinates.latitude', 'vaSigmetVolcanoCoordinates.longitude']);
+        }
+      }, [hasVolcanicAshes, unregister]);
+      return {
+        hasVolcanicAshes: hasVolcanicAshes
+      };
+    };
+
     var SigmetForm = function SigmetForm(_a) {
       var mode = _a.mode,
           _b = _a.isCancelSigmet,
@@ -3992,8 +4036,7 @@
       var _f = reactHookForm.useFormContext(),
           watch = _f.watch,
           setValue = _f.setValue,
-          handleSubmit = _f.handleSubmit,
-          getValues = _f.getValues;
+          handleSubmit = _f.handleSubmit;
 
       var _g = __read(React__default["default"].useState(mode === 'view'), 2),
           isDisabled = _g[0],
@@ -4007,7 +4050,7 @@
           updateTac = _h[1];
 
       var onChangeForm = function onChangeForm() {
-        updateTac(getValues());
+        updateTac(watch);
       }; // TODO: [Loes Cornelis]: fix this whole mess of if statements for isCancelSigmet and hidden fields if disabled throughout the form
 
 
@@ -4071,6 +4114,7 @@
           setIsDisabled(isInDrawMode);
         }
       }, [drawMode.start, drawMode.end, isReadOnly, isDisabled]);
+      var hasVolcanicAshes = useConditionalFields$1().hasVolcanicAshes;
 
       var renderForm = function renderForm() {
         return /*#__PURE__*/React__default["default"].createElement(material.Grid, {
@@ -4090,7 +4134,7 @@
           isReadOnly: isReadOnly,
           helperText: helperText,
           onChange: onChangeForm
-        }), !isCancelSigmet && watch('phenomenon') === 'VA_CLD' && /*#__PURE__*/React__default["default"].createElement(VolcanicFields, {
+        }), !isCancelSigmet && hasVolcanicAshes && /*#__PURE__*/React__default["default"].createElement(VolcanicFields, {
           isDisabled: isDisabled,
           isReadOnly: isReadOnly,
           helperText: helperText
@@ -4187,6 +4231,48 @@
       }, renderForm()));
     };
 
+    var useConditionalFields = function useConditionalFields() {
+      var _a = reactHookForm.useFormContext(),
+          watch = _a.watch,
+          unregister = _a.unregister; // phenomenon: SFC_VIS
+
+
+      var phenomenon = watch('phenomenon');
+      var hasSurfaceVisiblity = phenomenon === 'SFC_VIS';
+      React__default["default"].useEffect(function () {
+        if (!hasSurfaceVisiblity) {
+          unregister(['visibilityValue', 'visibilityCause']);
+        }
+      }, [hasSurfaceVisiblity, unregister]); // phenomenon: SFC_WIND
+
+      var hasSurfaceWind = watch('phenomenon') === 'SFC_WIND';
+      React__default["default"].useEffect(function () {
+        if (!hasSurfaceWind) {
+          unregister(['windDirection', 'windUnit', 'windSpeed']);
+        }
+      }, [hasSurfaceWind, unregister]); // phenomenon: SFC_WIND, SFC_VIS, BKN_CLD, OVC_CLD
+
+      var hasLevels = phenomenon !== 'SFC_WIND' && phenomenon !== 'SFC_VIS' && phenomenon !== 'BKN_CLD' && phenomenon !== 'OVC_CLD';
+      React__default["default"].useEffect(function () {
+        if (!hasLevels) {
+          unregister(['levelInfoMode', 'level', 'lowerLevel']);
+        }
+      }, [hasLevels, unregister]); // phenomenon: BKN_CLD
+
+      var hasCloudLevels = phenomenon === 'BKN_CLD' || phenomenon === 'OVC_CLD';
+      React__default["default"].useEffect(function () {
+        if (!hasCloudLevels) {
+          unregister(['cloudLevelInfoMode', 'cloudLevel', 'cloudLowerLevel']);
+        }
+      }, [hasCloudLevels, unregister]);
+      return {
+        hasSurfaceVisiblity: hasSurfaceVisiblity,
+        hasSurfaceWind: hasSurfaceWind,
+        hasLevels: hasLevels,
+        hasCloudLevels: hasCloudLevels
+      };
+    };
+
     var AirmetForm = function AirmetForm(_a) {
       var mode = _a.mode,
           _b = _a.isCancelAirmet,
@@ -4202,10 +4288,7 @@
       var _f = reactHookForm.useFormContext(),
           watch = _f.watch,
           setValue = _f.setValue,
-          handleSubmit = _f.handleSubmit,
-          getValues = _f.getValues;
-
-      var phenomenon = watch('phenomenon');
+          handleSubmit = _f.handleSubmit;
 
       var _g = __read(React__default["default"].useState(mode === 'view'), 2),
           isDisabled = _g[0],
@@ -4219,7 +4302,7 @@
           updateTac = _h[1];
 
       var onChangeForm = function onChangeForm() {
-        updateTac(getValues());
+        updateTac(watch);
       };
 
       var initialGeometry = initialAirmet && !isCancelAirmet ? {
@@ -4262,6 +4345,12 @@
         }
       }, [drawMode.start, isReadOnly, isDisabled]);
 
+      var _k = useConditionalFields(),
+          hasSurfaceVisiblity = _k.hasSurfaceVisiblity,
+          hasSurfaceWind = _k.hasSurfaceWind,
+          hasLevels = _k.hasLevels,
+          hasCloudLevels = _k.hasCloudLevels;
+
       var renderForm = function renderForm() {
         return /*#__PURE__*/React__default["default"].createElement(material.Grid, {
           container: true,
@@ -4272,11 +4361,11 @@
           isDisabled: isDisabled,
           isReadOnly: isReadOnly,
           onChange: onChangeForm
-        }), !isCancelAirmet && phenomenon === 'SFC_VIS' && /*#__PURE__*/React__default["default"].createElement(SurfaceVisibility, {
+        }), !isCancelAirmet && hasSurfaceVisiblity && /*#__PURE__*/React__default["default"].createElement(SurfaceVisibility, {
           isReadOnly: isReadOnly,
           isDisabled: isDisabled,
           onChange: onChangeForm
-        }), !isCancelAirmet && phenomenon === 'SFC_WIND' && /*#__PURE__*/React__default["default"].createElement(SurfaceWind, {
+        }), !isCancelAirmet && hasSurfaceWind && /*#__PURE__*/React__default["default"].createElement(SurfaceWind, {
           isReadOnly: isReadOnly,
           isDisabled: isDisabled,
           onChange: onChangeForm
@@ -4309,12 +4398,12 @@
           setDrawModeType: function setDrawModeType(mapDrawMode, StartOrEndDrawing) {
             _setDrawModeType(mapDrawMode, StartOrEndDrawing, updateStartDrawing);
           }
-        }), !isCancelAirmet && phenomenon !== 'SFC_WIND' && phenomenon !== 'SFC_VIS' && phenomenon !== 'BKN_CLD' && phenomenon !== 'OVC_CLD' && /*#__PURE__*/React__default["default"].createElement(Levels, {
+        }), !isCancelAirmet && hasLevels && /*#__PURE__*/React__default["default"].createElement(Levels, {
           isDisabled: isDisabled,
           isReadOnly: isReadOnly,
           onChange: onChangeForm,
           productType: "airmet"
-        }), !isCancelAirmet && (phenomenon === 'BKN_CLD' || phenomenon === 'OVC_CLD') && /*#__PURE__*/React__default["default"].createElement(CloudLevels, {
+        }), !isCancelAirmet && hasCloudLevels && /*#__PURE__*/React__default["default"].createElement(CloudLevels, {
           isDisabled: isDisabled,
           isReadOnly: isReadOnly,
           onChange: onChangeForm
@@ -4956,18 +5045,16 @@
 
       React__namespace.useEffect(function () {
         // set the values of the newly selected product
-        reset(product !== null ? __assign({}, product) : {});
+        reset(product !== null ? __assign({}, product) : {}, {
+          keepDefaultValues: true
+        });
         return function () {
           // reset form on unmount
           reset({});
         };
       }, [reset, product]);
 
-      var postProduct = function postProduct(_productToPost, newStatus) {
-        // remove hidden helper fields
-        _productToPost.IS_DRAFT;
-            var productToPost = __rest(_productToPost, ["IS_DRAFT"]);
-
+      var postProduct = function postProduct(productToPost, newStatus) {
         var uuid = product !== null && product.uuid ? product.uuid : null;
         var postProductParam = productType === 'sigmet' ? createSigmetPostParameter(productToPost, newStatus, uuid) : createAirmetPostParameter(productToPost, newStatus, uuid);
         setLoader(true);
@@ -4986,9 +5073,13 @@
         });
       };
 
-      var onToggleDialog = function onToggleDialog() {
+      var onToggleDialog = function onToggleDialog(shouldRefreshList) {
+        if (shouldRefreshList === void 0) {
+          shouldRefreshList = true;
+        }
+
         setLoader(false);
-        toggleDialogStatus();
+        toggleDialogStatus(shouldRefreshList);
       };
 
       var showConfirmDialog = function showConfirmDialog(action) {
@@ -5008,7 +5099,7 @@
         switch (action) {
           case 'CLOSED':
             if (mode === 'view' || !isDirty) {
-              onToggleDialog();
+              onToggleDialog(false);
             } else {
               toggleIsDraft(true);
               showConfirmDialog(action).then(function () {
@@ -5018,7 +5109,7 @@
               })["catch"](function (reason) {
                 if (reason === 'CANCELLED') {
                   // close without save
-                  onToggleDialog();
+                  onToggleDialog(false);
                 }
               });
             }
@@ -5040,7 +5131,7 @@
             showConfirmDialog(action).then(function () {
               // If we're discarding a new SIGMET/AIRMET - just close the dialog
               if (mode === 'new') {
-                onToggleDialog();
+                onToggleDialog(false);
               } else {
                 // If we're discarding an existing SIGMET/AIRMET - make call to BE
                 postProduct(product, action);
@@ -5143,14 +5234,18 @@
         return null;
       }
 
+      var product = productListItem !== null ? prepareProductValues(productListItem[productType], productType) : null;
       return /*#__PURE__*/React__namespace.createElement(formFields.ReactHookFormProvider, {
-        options: formFields.defaultFormOptions
+        options: __assign(__assign({}, formFields.defaultFormOptions), {
+          defaultValues: product,
+          values: product
+        })
       }, /*#__PURE__*/React__namespace.createElement(shared.ConfirmationServiceProvider, null, /*#__PURE__*/React__namespace.createElement(ProductFormDialogContent, {
         isOpen: isOpen,
         toggleDialogStatus: toggleDialogStatus,
         mode: mode,
         productCanBe: productCanBe,
-        product: productListItem !== null ? prepareProductValues(productListItem[productType], productType) : null,
+        product: product,
         productType: productType
       })));
     };
@@ -5196,9 +5291,13 @@
 
       }, [selectedProduct]);
 
-      var toggleDialogOpen = function toggleDialogOpen() {
-        // Refresh list on closing dialog
-        if (isFormDialogOpen === true) getNewProductList();
+      var toggleDialogOpen = function toggleDialogOpen(shouldRefreshList) {
+        if (shouldRefreshList === void 0) {
+          shouldRefreshList = true;
+        } // Refresh list on closing dialog
+
+
+        if (isFormDialogOpen === true && shouldRefreshList) getNewProductList();
         setIsFormDialogOpen(!isFormDialogOpen);
       };
 

package/lib/components/ProductForms/ProductFormDialog.d.ts

@@ -4,7 +4,7 @@ export declare const prepareProductValues: (product: Sigmet | Airmet | CancelSig
 interface ProductFormDialogProps {
     isOpen: boolean;
     productType: ProductType;
-    toggleDialogStatus: () => void;
+    toggleDialogStatus: (shouldRefreshList?: boolean) => void;
     productListItem?: SigmetFromBackend | AirmetFromBackend;
 }
 export declare const ProductFormDialog: React.FC<ProductFormDialogProps>;

package/lib/components/ProductForms/ProductFormDialogContent.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CancelSigmet, Sigmet, FormMode, CancelAirmet, Airmet, ProductType } from '../../types';
 interface ProductFormDialogContentProps {
     isOpen: boolean;
-    toggleDialogStatus: () => void;
+    toggleDialogStatus: (shouldRefreshList?: boolean) => void;
     mode: FormMode;
     productType: ProductType;
     productCanBe: string[];

package/lib/components/ProductForms/ProductFormTac.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import { CancelSigmet, Sigmet, Airmet, CancelAirmet } from '../../types';
+declare type AviationProduct = Sigmet | CancelSigmet | Airmet | CancelAirmet;
 export declare const noTAC = "Missing data: no TAC can be generated";
-export declare const shouldRetrieveTAC: (product: Sigmet | CancelSigmet | Airmet | CancelAirmet) => boolean;
-export declare const useTAC: (initialProduct: Sigmet | CancelSigmet | Airmet | CancelAirmet, getTAC: (product: Sigmet | CancelSigmet | Airmet | CancelAirmet) => Promise<{
+export declare const shouldRetrieveTAC: (product: AviationProduct) => boolean;
+export declare const useTAC: (initialProduct: AviationProduct, getTAC: (product: AviationProduct) => Promise<{
     data: string;
 }>) => [string, any];
 interface ProductFormTACProps {

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

@@ -27,7 +27,7 @@ export declare const getProductFormMode: (canBeOptions: ProductCanbe[], productL
 export declare const getProductFormLifecycleButtons: (canBe: string[], onButtonPress: (newStatus: ProductStatus | 'DISCARDED') => void) => React.ReactElement;
 declare type Product = Sigmet | Airmet | CancelSigmet | CancelAirmet;
 export declare const hasValue: (value: number) => boolean;
-export declare const removeEmptyNumberFieldValues: <T extends Product>(product: T) => T;
+export declare const prepareFormValues: <T extends Product>(product: T) => T;
 export declare const createSigmetPostParameter: (sigmetToPost: Sigmet | CancelSigmet, newStatus: ProductStatus, previousUuid: string) => SigmetFromFrontend;
 export declare const createAirmetPostParameter: (airmetToPost: Airmet | CancelAirmet, newStatus: ProductStatus, previousUuid: string) => AirmetFromFrontend;
 export declare const useDelayedFormValues: (getValues: () => void, register: () => void, delay?: number) => [unknown, () => void];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "4.8.0",
+  "version": "4.10.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,12 +14,12 @@
     "react": "^17.0.2",
     "react-redux": "^8.0.4",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/shared": "4.8.0",
-    "@opengeoweb/theme": "4.8.0",
+    "@opengeoweb/shared": "4.10.0",
+    "@opengeoweb/theme": "4.10.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
-    "@opengeoweb/form-fields": "4.8.0",
+    "@opengeoweb/form-fields": "4.10.0",
     "react-hook-form": "^7.41.5",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
@@ -27,16 +27,16 @@
     "lodash": "^4.17.20",
     "axios": "^0.25.0",
     "date-fns": "^2.29.3",
-    "@opengeoweb/core": "4.8.0",
-    "@opengeoweb/webmap": "4.8.0",
+    "@opengeoweb/core": "4.10.0",
+    "@opengeoweb/webmap": "4.10.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "@opengeoweb/api": "4.8.0",
+    "@opengeoweb/api": "4.10.0",
     "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",