@opengeoweb/sigmet-airmet 4.8.0 → 4.9.1

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
@@ -2275,7 +2293,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,15 +2312,17 @@ var Phenomenon = function Phenomenon(_ref) {
         setValue('movementType', null);
       }
 
-      if (getValues('phenomenon') !== 'SFC_VIS') {
-        setValue('visibilityValue', null);
-        setValue('visibilityCause', null);
-      }
+      if (!isSigmet) {
+        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);
+        if (getValues('phenomenon') !== 'SFC_WIND') {
+          setValue('windDirection', null);
+          setValue('windUnit', null);
+          setValue('windSpeed', null);
+        }
       }
 
       _onChange();
@@ -3652,7 +3673,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 +3715,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];
 };
 
@@ -4103,8 +4128,7 @@ var SigmetForm = function SigmetForm(_ref) {
   var _useFormContext = useFormContext(),
       watch = _useFormContext.watch,
       setValue = _useFormContext.setValue,
-      handleSubmit = _useFormContext.handleSubmit,
-      getValues = _useFormContext.getValues;
+      handleSubmit = _useFormContext.handleSubmit;
 
   var _React$useState = React__default.useState(mode === 'view'),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -4120,7 +4144,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
 
 
@@ -4317,8 +4341,7 @@ var AirmetForm = function AirmetForm(_ref) {
   var _useFormContext = useFormContext(),
       watch = _useFormContext.watch,
       setValue = _useFormContext.setValue,
-      handleSubmit = _useFormContext.handleSubmit,
-      getValues = _useFormContext.getValues;
+      handleSubmit = _useFormContext.handleSubmit;
 
   var phenomenon = watch('phenomenon');
 
@@ -4336,7 +4359,7 @@ var AirmetForm = function AirmetForm(_ref) {
       updateTac = _useTAC2[1];
 
   var onChangeForm = function onChangeForm() {
-    updateTac(getValues());
+    updateTac(watch);
   };
 
   var initialGeometry = initialAirmet && !isCancelAirmet ? {
@@ -5067,18 +5090,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);
@@ -5270,14 +5291,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,
+      shouldUnregister: true
+    })
   }, /*#__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
   })));
 };

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
@@ -2248,7 +2266,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,15 +2285,17 @@
             setValue('movementType', null);
           }
 
-          if (getValues('phenomenon') !== 'SFC_VIS') {
-            setValue('visibilityValue', null);
-            setValue('visibilityCause', null);
-          }
+          if (!isSigmet) {
+            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);
+            if (getValues('phenomenon') !== 'SFC_WIND') {
+              setValue('windDirection', null);
+              setValue('windUnit', null);
+              setValue('windSpeed', null);
+            }
           }
 
           _onChange();
@@ -3570,7 +3591,7 @@
 
                 return [4
                 /*yield*/
-                , getTAC(product)];
+                , getTAC(prepareFormValues(product))];
 
               case 1:
                 result = _a.sent();
@@ -3616,10 +3637,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];
     };
 
@@ -3992,8 +4017,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 +4031,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
 
 
@@ -4202,8 +4226,7 @@
       var _f = reactHookForm.useFormContext(),
           watch = _f.watch,
           setValue = _f.setValue,
-          handleSubmit = _f.handleSubmit,
-          getValues = _f.getValues;
+          handleSubmit = _f.handleSubmit;
 
       var phenomenon = watch('phenomenon');
 
@@ -4219,7 +4242,7 @@
           updateTac = _h[1];
 
       var onChangeForm = function onChangeForm() {
-        updateTac(getValues());
+        updateTac(watch);
       };
 
       var initialGeometry = initialAirmet && !isCancelAirmet ? {
@@ -4956,18 +4979,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);
@@ -5143,14 +5164,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,
+          shouldUnregister: true
+        })
       }, /*#__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
       })));
     };

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.9.1",
   "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.9.1",
+    "@opengeoweb/theme": "4.9.1",
     "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.9.1",
     "react-hook-form": "^7.41.5",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
@@ -27,11 +27,11 @@
     "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.9.1",
+    "@opengeoweb/webmap": "4.9.1",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "@opengeoweb/api": "4.8.0",
+    "@opengeoweb/api": "4.9.1",
     "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",