@opengeoweb/sigmet-airmet 14.3.0 → 14.4.0

package/index.esm.js

@@ -79,7 +79,7 @@ var en = {
 	"geometry-maximum-points-message": "The start position drawing allows a maximum of {{maxPoints}} individual points",
 	"geometry-more-than-6-points-message": "The start/end position drawing has exceeded 6 individual points. The TAC has a total of {{totalDrawnPoints}} points. If possible, reduce the number of points.",
 	"geometry-intersection-above-6-points-message": "The start/end position of the intersected polygon has {{intersectingPolygonPointsTotal}} points, and the intersection of the drawn polygon with the FIR-boundary has exceeded 6 individual points. Check if the TAC in the preview corresponds to the intended area.",
-	"geometry-only-one-start-position-drawing": "Only one start position drawing is allowed",
+	"geometry-only-one-start-position-drawing": "The drawn polygon results in several polygons, and no TAC can be produced",
 	"progress-get-movement-step-valktmessage": "Speed should be rounded to the nearest {{value}}kt",
 	"progress-get-movement-step-valkmhmessage": "Speed should be rounded to the nearest {{value}}kmh",
 	"progress-coordinate-empty-message": "An end position drawing is required when selecting End position",
@@ -144,7 +144,8 @@ var en = {
 	"surface-visibility-maximum-visibility": "The maximum visibility in meters is {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Value in meters",
 	"surface-visibility-between-time": "Forecast time should lie between the valid start and valid end time",
-	phenomenon: "Phenomenon"
+	phenomenon: "Phenomenon",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var fi = {
 	"sigmet-airmet": "sigmet",
@@ -269,7 +270,8 @@ var fi = {
 	"surface-visibility-maximum-visibility": "Maksiminäkyvyys metreinä: {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Arvo metreinä",
 	"surface-visibility-between-time": "Ennusteajan tulee olla voimassa olevan alkamis- ja päättymisajan välissä",
-	phenomenon: "sääilmiö"
+	phenomenon: "sääilmiö",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var no = {
 	"sigmet-airmet": "sigmet",
@@ -396,7 +398,8 @@ var no = {
 	"surface-visibility-maximum-visibility": "The maximum visibility in meters is {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Value in meters",
 	"surface-visibility-between-time": "Forecast time should lie between the valid start and valid end time",
-	phenomenon: "Phenomenon"
+	phenomenon: "Phenomenon",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var nl = {
 	"sigmet-airmet": "sigmet",
@@ -521,7 +524,8 @@ var nl = {
 	"surface-visibility-maximum-visibility": "De maximale zichtbaarheid in meters is {{maximumVisibility}}",
 	"surface-visibility-helper-text": "Waarde in meters",
 	"surface-visibility-between-time": "De prognosetijd moet tussen de geldige start- en eindtijd liggen",
-	phenomenon: "Fenomeen"
+	phenomenon: "Fenomeen",
+	"geometry-drawing-disabled": "Link a map to enable draw tools"
 };
 var sigmetAirmetTranslations = {
 	en: en,
@@ -5555,7 +5559,8 @@ var DrawTools = function DrawTools(_ref) {
     tools = _ref.tools,
     onChangeTool = _ref.onChangeTool,
     _ref$isDisabled = _ref.isDisabled,
-    isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
+    isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
+    disabledTooltip = _ref.disabledTooltip;
   usePreventBrowserClose(activeTool !== '');
   return jsx(Box, {
     "data-testid": "drawtools",
@@ -5565,19 +5570,23 @@ var DrawTools = function DrawTools(_ref) {
       justifyContent: 'space-between'
     },
     children: tools.map(function (tool) {
+      var radio = jsx(Radio, {
+        icon: getToolIcon(tool.selectionType),
+        value: true,
+        checkedIcon: getToolIcon(tool.selectionType),
+        checked: activeTool === tool.drawModeId,
+        disabled: isDisabled,
+        onChange: function onChange() {
+          onChangeTool(tool);
+        },
+        "data-testid": tool.drawModeId,
+        sx: styles$1.radioInput
+      });
+      var title = isDisabled && disabledTooltip ? disabledTooltip : tool.title;
       return jsx(CustomTooltip, {
-        title: tool.title,
-        children: jsx(Radio, {
-          icon: getToolIcon(tool.selectionType),
-          value: true,
-          checkedIcon: getToolIcon(tool.selectionType),
-          checked: activeTool === tool.drawModeId,
-          disabled: isDisabled,
-          onChange: function onChange() {
-            onChangeTool(tool);
-          },
-          "data-testid": tool.drawModeId,
-          sx: styles$1.radioInput
+        title: title,
+        children: jsx("span", {
+          children: radio
         })
       }, tool.drawModeId);
     })
@@ -6425,6 +6434,9 @@ var Progress = function Progress(_ref) {
   var isRequired = function isRequired(value) {
     return isShortTest() || isRequiredField(value);
   };
+  var shortTest = isShortTest();
+  var combinedDisabled = shortTest || drawToolsDisabled;
+  var disabledTooltip = !shortTest && drawToolsDisabled ? t('geometry-drawing-disabled') : undefined;
   var movementType = watch('movementType');
   var getFIRValue = function getFIRValue() {
     return getValues('locationIndicatorATSR');
@@ -6620,7 +6632,8 @@ var Progress = function Progress(_ref) {
           tools: tools,
           activeTool: activeTool,
           onChangeTool: onChangeTool,
-          isDisabled: drawToolsDisabled
+          isDisabled: combinedDisabled,
+          disabledTooltip: disabledTooltip
         }), activeTool && jsx(FormHelperText, {
           variant: "filled",
           sx: styles$2.quitDrawModeMessage,
@@ -6806,6 +6819,9 @@ var StartGeometry = function StartGeometry(_ref) {
   var getFIRValue = function getFIRValue() {
     return getValues('locationIndicatorATSR');
   };
+  var shortTest = isShortTest();
+  var combinedDisabled = shortTest || isDisabled;
+  var disabledTooltip = !shortTest && isDisabled ? t('geometry-drawing-disabled') : undefined;
   // Max points the FIR allows for a polygon
   var maxPoints = getMaxPolygonPoints(getFIRValue(), productConfig);
   // Intersections with FIR
@@ -6827,7 +6843,8 @@ var StartGeometry = function StartGeometry(_ref) {
       activeTool: activeTool,
       tools: tools,
       onChangeTool: onChangeTool,
-      isDisabled: isShortTest() || isDisabled
+      isDisabled: combinedDisabled,
+      disabledTooltip: disabledTooltip
     }), activeTool && jsx(FormHelperText, {
       variant: "filled",
       sx: styles$2.quitDrawModeMessage,
@@ -6852,15 +6869,14 @@ var StartGeometry = function StartGeometry(_ref) {
       children: t('geometry-intersection-above-6-points-message', {
         intersectingPolygonPointsTotal: intersectingPolygonPointsTotal
       })
-    }), hasMulitpleIntersections(geoJSONIntersection) && !activeTool && !errors.startGeometry && !isFir(geoJSON) && jsx(FormHelperText, {
-      variant: "filled",
-      children: t('geometry-multi-intersections-message')
     }), jsx(ReactHookFormHiddenInput, {
       name: "startGeometry",
       rules: {
         validate: {
-          maximumOneDrawing: function maximumOneDrawing(value) {
-            return isMaximumOneDrawing(value) || t('geometry-only-one-start-position-drawing');
+          maximumOneDrawing: function maximumOneDrawing() {
+            var intersection = watch('startGeometryIntersect');
+            var result = isMaximumOneDrawing(intersection);
+            return result || t('geometry-only-one-start-position-drawing');
           },
           intersectWithFIR: function intersectWithFIR(value) {
             return hasIntersectionWithFIR(value, watch('startGeometryIntersect')) || t('geometry-no-intersection-message');
@@ -8471,6 +8487,7 @@ var SigmetForm = function SigmetForm(_ref) {
     watch = _useFormContext2.watch,
     setValue = _useFormContext2.setValue,
     handleSubmit = _useFormContext2.handleSubmit,
+    trigger = _useFormContext2.trigger,
     errors = _useFormContext2.formState.errors;
   var _React$useState = React__default.useState(false),
     hasUserChangedTime = _React$useState[0],
@@ -8565,15 +8582,18 @@ var SigmetForm = function SigmetForm(_ref) {
   }, [updateTac, watch]);
   var onUpdateStartgeoJSON = useCallback(function (updatedStartGeoJSON, updateStartGeoJSONIntersection) {
     setValue('startGeometry', updatedStartGeoJSON, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometry'), updatedStartGeoJSON)
     });
     setValue('startGeometryIntersect', updateStartGeoJSONIntersection, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometryIntersect'), updateStartGeoJSONIntersection)
     });
+    queueMicrotask(function () {
+      return void trigger('startGeometry');
+    });
     onChangeForm();
-  }, [setValue, watch, onChangeForm]);
+  }, [setValue, watch, trigger, onChangeForm]);
   var onUpdateEndGeoJson = useCallback(function (updatedEndGeoJSON, updateEndGeoJSONIntersection) {
     setValue('endGeometry', updatedEndGeoJSON, {
       shouldValidate: true,
@@ -8939,15 +8959,18 @@ var AirmetForm = function AirmetForm(_ref) {
   }, [updateTac, watch]);
   var onUpdateStartgeoJSON = useCallback(function (updatedStartGeoJSON, updateStartGeoJSONIntersection) {
     setValue('startGeometry', updatedStartGeoJSON, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometry'), updatedStartGeoJSON)
     });
     setValue('startGeometryIntersect', updateStartGeoJSONIntersection, {
-      shouldValidate: true,
+      shouldValidate: false,
       shouldDirty: isGeometryDirty(watch('startGeometryIntersect'), updateStartGeoJSONIntersection)
     });
+    queueMicrotask(function () {
+      return void trigger('startGeometry');
+    });
     onChangeForm();
-  }, [setValue, watch, onChangeForm]);
+  }, [setValue, watch, onChangeForm, trigger]);
   var updateStartGeoJson = useCallback(function (newGeoJSON) {
     var _setGeoJSON = setGeoJSON(newGeoJSON),
       newStartGeoJson = _setGeoJSON[0],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "14.3.0",
+  "version": "14.4.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,17 +8,17 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "14.3.0",
-    "@opengeoweb/shared": "14.3.0",
-    "@opengeoweb/theme": "14.3.0",
-    "@opengeoweb/store": "14.3.0",
-    "@opengeoweb/webmap": "14.3.0",
-    "@opengeoweb/webmap-react": "14.3.0",
+    "@opengeoweb/api": "14.4.0",
+    "@opengeoweb/shared": "14.4.0",
+    "@opengeoweb/theme": "14.4.0",
+    "@opengeoweb/store": "14.4.0",
+    "@opengeoweb/webmap": "14.4.0",
+    "@opengeoweb/webmap-react": "14.4.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/core": "14.3.0",
-    "@opengeoweb/authentication": "14.3.0",
+    "@opengeoweb/core": "14.4.0",
+    "@opengeoweb/authentication": "14.4.0",
     "@mui/system": "^7.3.2",
-    "@opengeoweb/form-fields": "14.3.0",
+    "@opengeoweb/form-fields": "14.4.0",
     "react-hook-form": "^7.50.1",
     "axios": "^1.7.7",
     "lodash": "^4.17.21",

package/src/lib/components/ProductForms/ProductFormFields/DrawTools.d.ts

@@ -5,6 +5,7 @@ interface DrawToolsProps {
     tools: DrawMode[];
     onChangeTool: (newToolMode: DrawMode) => void;
     isDisabled?: boolean;
+    disabledTooltip?: string;
 }
 declare const DrawTools: React.FC<DrawToolsProps>;
 export default DrawTools;