@opengeoweb/sigmet-airmet 6.0.3 → 6.1.0

package/index.esm.js

@@ -4,15 +4,16 @@ import { FormControlLabel, Radio, Grid, Typography, Box as Box$2, Button, Checkb
 import { useFormContext } from 'react-hook-form';
 import { useDraftFormHelpers, ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, isValidDate, isBefore, isBetween, hasMaxFeaturePoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isAfter, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useApiContext, useApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
-import { defaultStyleProperties, defaultIntersectionStyleProperties, defaultPoint, defaultBox, defaultPolygon, DRAWMODE, addFeatureProperties, defaultDelete, MapControls, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, MapViewLayer, TimeSliderConnect, LegendConnect, LayerManagerConnect, useMapDrawTool } from '@opengeoweb/core';
+import { defaultIntersectionStyleProperties, defaultPoint, defaultBox, defaultPolygon, defaultDelete, MapControls, LayerManagerMapButtonConnect, LegendMapButtonConnect, MultiDimensionSelectMapButtonsConnect, MapViewConnect, MapViewLayer, TimeSliderConnect, LegendConnect, LayerManagerConnect, useMapDrawTool } from '@opengeoweb/core';
+import { defaultStyleProperties, DRAWMODE, addFeatureProperties } from '@opengeoweb/webmap-react';
 import { CustomTooltip, ToggleMenu, useIsMounted, StatusTag, AlertBanner, ConfirmationServiceProvider, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import moment from 'moment';
 import { polygonToLineString, booleanClockwise, rewind } from '@turf/turf';
-import { layerTypes, mapSelectors, syncGroupsActions, mapStoreActions, defaultLayers, syncConstants } from '@opengeoweb/store';
 import { DrawFIRLand, ChevronLeft, Edit, Success, Clock } from '@opengeoweb/theme';
+import { LayerType, webmapUtils } from '@opengeoweb/webmap';
 import { debounce } from 'lodash';
 import 'react-dom';
-import { webmapUtils } from '@opengeoweb/webmap';
+import { mapSelectors, syncGroupsActions, mapStoreActions, defaultLayers, syncConstants } from '@opengeoweb/store';
 import { jsx } from 'react/jsx-runtime';
 
 function _iterableToArrayLimit(arr, i) {
@@ -1291,7 +1292,7 @@ var getFieldLabel = function getFieldLabel(title, isDisabled) {
 var getBaseLayers = function getBaseLayers(productConfig) {
   var _a, _b;
   return ((_b = (_a = productConfig.mapPreset) === null || _a === void 0 ? void 0 : _a.layers) === null || _b === void 0 ? void 0 : _b.filter(function (layer) {
-    return layer.layerType === layerTypes.LayerType.baseLayer || layer.layerType === layerTypes.LayerType.overLayer;
+    return layer.layerType === LayerType.baseLayer || layer.layerType === LayerType.overLayer;
   })) || [];
 };
 var getMaxMovementSpeedValue = function getMaxMovementSpeedValue(unit, selectedFIR, productConfig) {
@@ -3333,6 +3334,9 @@ var shouldRetrieveTAC = function shouldRetrieveTAC(product) {
   return false;
 };
 var useTAC = function useTAC(initialProduct, getTAC) {
+  var hasErrors = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
+    return false;
+  };
   var _React$useState = React__default.useState(noTAC),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     TAC = _React$useState2[0],
@@ -3369,25 +3373,35 @@ var useTAC = function useTAC(initialProduct, getTAC) {
     }));
   };
   React__default.useEffect(function () {
-    if (shouldRetrieveTAC(initialProduct)) {
+    if (shouldRetrieveTAC(initialProduct) && !hasErrors()) {
       retrieveTAC(initialProduct);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var update = function update(formValues) {
-    if (shouldRetrieveTAC(formValues)) {
+  var update = function update(formValues, hasFormErrors) {
+    if (shouldRetrieveTAC(formValues) && !hasFormErrors) {
       retrieveTAC(formValues);
     } else if (isMounted.current) {
       setTAC(noTAC);
     }
   };
-  var delayedQuery = React__default.useMemo(function () {
-    return debounce(function (formFn) {
-      return update(formFn());
-    }, 1000);
-  },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  []);
+  var debouncedSearch = React__default.useRef(debounce(function (formFn, hasFormErrors) {
+    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            update(formFn(), hasFormErrors());
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+  }, 1000)).current;
+  var delayedQuery = function delayedQuery(formFn) {
+    debouncedSearch.cancel();
+    debouncedSearch(formFn, hasErrors);
+  };
   return [TAC, delayedQuery];
 };
 var ProductFormTAC = function ProductFormTAC(_ref) {
@@ -8043,8 +8057,8 @@ var SigmetForm = function SigmetForm(_ref) {
     api = _useApiContext.api;
   var _useMapDrawTool = useMapDrawTool({
       defaultEditModes: getDrawTools(StartOrEndDrawing.start, getFir(productConfig)),
-      defaultGeoJSON: !isCancelSigmet && initialSigmet ? addFeatureProperties(initialSigmet.startGeometry, featurePropsStart) : undefined,
-      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet ? addFeatureProperties(initialSigmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
+      defaultGeoJSON: !isCancelSigmet && initialSigmet && initialSigmet.startGeometry ? addFeatureProperties(initialSigmet.startGeometry, featurePropsStart) : undefined,
+      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet && initialSigmet.startGeometryIntersect ? addFeatureProperties(initialSigmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
       defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig), featurePropsFIR)
     }),
     startGeoJSON = _useMapDrawTool.geoJSON,
@@ -8058,8 +8072,8 @@ var SigmetForm = function SigmetForm(_ref) {
     setStartEditModes = _useMapDrawTool.setEditModes;
   var _useMapDrawTool2 = useMapDrawTool({
       defaultEditModes: getDrawTools(StartOrEndDrawing.end, getFir(productConfig)),
-      defaultGeoJSON: !isCancelSigmet && initialSigmet ? addFeatureProperties(initialSigmet.endGeometry, featurePropsEnd) : undefined,
-      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet ? addFeatureProperties(initialSigmet.endGeometryIntersect, featurePropsIntersectionEnd) : undefined,
+      defaultGeoJSON: !isCancelSigmet && initialSigmet && initialSigmet.endGeometry ? addFeatureProperties(initialSigmet.endGeometry, featurePropsEnd) : undefined,
+      defaultGeoJSONIntersection: !isCancelSigmet && initialSigmet && initialSigmet.endGeometryIntersect ? addFeatureProperties(initialSigmet.endGeometryIntersect, featurePropsIntersectionEnd) : undefined,
       defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig), featurePropsFIR),
       defaultGeoJSONIntersectionProperties: featurePropsIntersectionEnd
     }),
@@ -8130,14 +8144,18 @@ var SigmetForm = function SigmetForm(_ref) {
   var _useFormContext2 = useFormContext(),
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
-    handleSubmit = _useFormContext2.handleSubmit;
+    handleSubmit = _useFormContext2.handleSubmit,
+    errors = _useFormContext2.formState.errors;
+  var getHasFormErrors = function getHasFormErrors() {
+    return Object.keys(errors).length > 0;
+  };
   var _React$useState = React__default.useState(mode === 'view'),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     isDisabled = _React$useState2[0],
     setIsDisabled = _React$useState2[1];
   var isReadOnly = mode === 'view';
   var helperText = isDisabled ? '' : 'Optional';
-  var _useTAC = useTAC(initialSigmet !== null ? initialSigmet : initialCancelSigmet, api.getSigmetTAC),
+  var _useTAC = useTAC(initialSigmet !== null ? initialSigmet : initialCancelSigmet, api.getSigmetTAC, getHasFormErrors),
     _useTAC2 = _slicedToArray(_useTAC, 2),
     tac = _useTAC2[0],
     updateTac = _useTAC2[1];
@@ -8333,8 +8351,8 @@ var AirmetForm = function AirmetForm(_ref) {
     api = _useApiContext.api;
   var _useMapDrawTool = useMapDrawTool({
       defaultEditModes: getDrawTools(StartOrEndDrawing.start, getFir(productConfig)),
-      defaultGeoJSON: !isCancelAirmet && initialAirmet ? addFeatureProperties(initialAirmet.startGeometry, featurePropsStart) : undefined,
-      defaultGeoJSONIntersection: !isCancelAirmet && initialAirmet ? addFeatureProperties(initialAirmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
+      defaultGeoJSON: !isCancelAirmet && initialAirmet && initialAirmet.startGeometry ? addFeatureProperties(initialAirmet.startGeometry, featurePropsStart) : undefined,
+      defaultGeoJSONIntersection: !isCancelAirmet && initialAirmet && initialAirmet.startGeometryIntersect ? addFeatureProperties(initialAirmet.startGeometryIntersect, featurePropsIntersectionStart) : undefined,
       defaultGeoJSONIntersectionBounds: addFeatureProperties(getFir(productConfig), featurePropsFIR)
     }),
     startGeoJSON = _useMapDrawTool.geoJSON,
@@ -8378,14 +8396,18 @@ var AirmetForm = function AirmetForm(_ref) {
     setValue = _useFormContext2.setValue,
     handleSubmit = _useFormContext2.handleSubmit,
     getValues = _useFormContext2.getValues,
-    trigger = _useFormContext2.trigger;
+    trigger = _useFormContext2.trigger,
+    errors = _useFormContext2.formState.errors;
+  var getHasFormErrors = function getHasFormErrors() {
+    return Object.keys(errors).length > 0;
+  };
   var _React$useState = React__default.useState(mode === 'view'),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     isDisabled = _React$useState2[0],
     setIsDisabled = _React$useState2[1];
   var isReadOnly = mode === 'view';
   var helperText = isDisabled ? '' : 'Optional';
-  var _useTAC = useTAC(initialAirmet !== null ? initialAirmet : initialCancelAirmet, api.getAirmetTAC),
+  var _useTAC = useTAC(initialAirmet !== null ? initialAirmet : initialCancelAirmet, api.getAirmetTAC, getHasFormErrors),
     _useTAC2 = _slicedToArray(_useTAC, 2),
     tac = _useTAC2[0],
     updateTac = _useTAC2[1];
@@ -13748,7 +13770,7 @@ var CancelSigmetVolcanicMovements = function CancelSigmetVolcanicMovements(_ref)
     key: "UNKNOWN",
     value: "UNKNOWN",
     control: /*#__PURE__*/React__default.createElement(Radio, null),
-    label: "Don't know"
+    label: "Cancel VA SIGMET without VA MOV TO information"
   })));
 };
 
@@ -16429,7 +16451,7 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
             case 0:
               _context.next = 2;
               return new Promise(function (resolve) {
-                return setTimeout(resolve, 2000);
+                setTimeout(resolve, 2000);
               });
             case 2:
               return _context.abrupt("return", axiosInstance.get('/sigmetConfiguration').then(function () {
@@ -16451,7 +16473,7 @@ var getApiRoutes = function getApiRoutes(axiosInstance) {
             case 0:
               _context2.next = 2;
               return new Promise(function (resolve) {
-                return setTimeout(resolve, 2000);
+                setTimeout(resolve, 2000);
               });
             case 2:
               return _context2.abrupt("return", axiosInstance.get('/airmetConfiguration').then(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "6.0.3",
+  "version": "6.1.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,14 +13,15 @@
   "dependencies": {
     "@mui/material": "5.12.0",
     "@mui/system": "5.14.5",
-    "@opengeoweb/api": "6.0.3",
-    "@opengeoweb/authentication": "6.0.3",
-    "@opengeoweb/core": "6.0.3",
-    "@opengeoweb/form-fields": "6.0.3",
-    "@opengeoweb/shared": "6.0.3",
-    "@opengeoweb/store": "6.0.3",
-    "@opengeoweb/theme": "6.0.3",
-    "@opengeoweb/webmap": "6.0.3",
+    "@opengeoweb/api": "6.1.0",
+    "@opengeoweb/authentication": "6.1.0",
+    "@opengeoweb/core": "6.1.0",
+    "@opengeoweb/form-fields": "6.1.0",
+    "@opengeoweb/shared": "6.1.0",
+    "@opengeoweb/store": "6.1.0",
+    "@opengeoweb/theme": "6.1.0",
+    "@opengeoweb/webmap": "6.1.0",
+    "@opengeoweb/webmap-react": "6.0.4",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
     "@reduxjs/toolkit": "1.9.5",

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

@@ -5,7 +5,7 @@ export declare const noTAC = "Missing data: no TAC can be generated";
 export declare const shouldRetrieveTAC: (product: AviationProduct) => boolean;
 export declare const useTAC: (initialProduct: AviationProduct, getTAC: (product: AviationProduct) => Promise<{
     data: string;
-}>) => [string, any];
+}>, hasErrors?: () => boolean) => [string, any];
 interface ProductFormTACProps {
     tac: string;
 }