@opengeoweb/taf 4.16.0 → 4.18.0

package/index.esm.js

@@ -390,7 +390,10 @@ var getValidityTimeStamp = function getValidityTimeStamp(sectionType, sections,
 
 
 var parseValidToObject = function parseValidToObject(value, tafStart, tafEnd) {
-  if (!value) return null; // Create valid object from passed string
+  if (!value) {
+    return null;
+  } // Create valid object from passed string
+
 
   var trimmedValue = value.trim();
   var tafStartMoment = moment.utc(tafStart);
@@ -453,7 +456,10 @@ var validateIsValidDates = function validateIsValidDates(value, tafStart, tafEnd
 
   var sectionValidationStart = validateValidSections(startSections, 'start'); // If invalid start - return with errors
 
-  if (sectionValidationStart.length) return sectionValidationStart;
+  if (sectionValidationStart.length) {
+    return sectionValidationStart;
+  }
+
   var startTimestamp = getValidityTimeStamp('start', startSections, tafStartMoment, tafEndMoment); // Validate start is within the taf validity bounds
 
   if (startTimestamp < tafStartMoment || startTimestamp > tafEndMoment) {
@@ -466,7 +472,10 @@ var validateIsValidDates = function validateIsValidDates(value, tafStart, tafEnd
 
     var sectionValidationEnd = validateValidSections(endSections, 'end'); // If invalid end - return with errors
 
-    if (sectionValidationEnd.length) return sectionValidationEnd;
+    if (sectionValidationEnd.length) {
+      return sectionValidationEnd;
+    }
+
     var endTimestamp = getValidityTimeStamp('end', endSections, tafStartMoment, tafEndMoment); // Validate end is not before start
 
     if (endTimestamp < startTimestamp) {
@@ -604,7 +613,11 @@ var validatePreviousChangeGroup = function validatePreviousChangeGroup(currentCh
 
 var validateOverlapWithFM = function validateOverlapWithFM(currentChangeGroup, nextChangeGroups, tafStart, tafEnd) {
   var valid = getFieldValue(currentChangeGroup.valid);
-  if (!valid || !nextChangeGroups.length) return true;
+
+  if (!valid || !nextChangeGroups.length) {
+    return true;
+  }
+
   var validValue = parseValidToObject(valid, tafStart, tafEnd);
   var currentRowEndTime = moment(validValue.end);
   var firstFMChangeGroup = nextChangeGroups.find(function (nextChangeGroup) {
@@ -1592,13 +1605,16 @@ var validateWindInterSection = function validateWindInterSection(speed, gust, di
   if (direction === 'VRB' && (speed === 'P99' || parseInt(speed, 10) > 2)) {
     // Only allow VRB for speeds smaller than 3 or in combination with gusts and showers (SH, TS, SQ)
     var allowedWeatherPhenom = ['SH', 'TS', 'SQ'];
+
     if (gust === '' || !allowedWeatherPhenom.some(function (allowedPhenom) {
       return weather1Value.includes(allowedPhenom);
     }) && !allowedWeatherPhenom.some(function (allowedPhenom) {
       return weather2Value.includes(allowedPhenom);
     }) && !allowedWeatherPhenom.some(function (allowedPhenom) {
       return weather3Value.includes(allowedPhenom);
-    })) return invalidWindVRBWindDirectionMessage;
+    })) {
+      return invalidWindVRBWindDirectionMessage;
+    }
   } // Validate gust
 
 
@@ -1647,14 +1663,20 @@ var validateWindField = function validateWindField(value, weatherfield1, weather
 };
 
 var formatSingleCloud = function formatSingleCloud(value) {
-  if (!value) return null;
+  if (!value) {
+    return null;
+  }
+
   return value.type ? "".concat(value.coverage).concat(prependZeroes(value.height, 3)).concat(value.type) : "".concat(value.coverage).concat(prependZeroes(value.height, 3));
 }; // TODO: clouds type = Clouds, but couldn't get it to work properly https://gitlab.com/opengeoweb/opengeoweb/-/issues/119
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 
 
 var formatCloudsToString = function formatCloudsToString(clouds) {
-  if (!clouds) return null;
+  if (!clouds) {
+    return null;
+  }
+
   return Object.keys(clouds).reduce(function (list, key) {
     // only format it if it has a value
     if (clouds[key]) {
@@ -1688,7 +1710,10 @@ var formatCloudsToString = function formatCloudsToString(clouds) {
 }; // parsers
 
 var parseSingleCloud = function parseSingleCloud(value) {
-  if (!value) return null;
+  if (!value) {
+    return null;
+  }
+
   var trimmedCloud = value.trim();
   var cloudType = trimmedCloud.substring(6, 9);
   return Object.assign({
@@ -1702,7 +1727,10 @@ var parseSingleCloud = function parseSingleCloud(value) {
 
 
 var parseCloudsToObject = function parseCloudsToObject(clouds) {
-  if (!clouds) return null;
+  if (!clouds) {
+    return null;
+  }
+
   return Object.keys(clouds).reduce(function (list, key) {
     // only parse it if it has a value
     if (clouds[key] && clouds[key].trim()) {
@@ -2551,7 +2579,11 @@ var useDragOrder = function useDragOrder(trigger, move) {
   var onChangeOrder = function onChangeOrder(_ref) {
     var oldIndex = _ref.oldIndex,
         newIndex = _ref.newIndex;
-    if (oldIndex === undefined || newIndex === undefined) return;
+
+    if (oldIndex === undefined || newIndex === undefined) {
+      return;
+    }
+
     move(oldIndex, newIndex);
     onUpdatelastDragOrder([oldIndex, newIndex]);
     setActiveDraggingIndex(false);
@@ -2581,17 +2613,35 @@ var useDragOrder = function useDragOrder(trigger, move) {
 }; // dialog utils
 
 var getConfirmationDialogTitle = function getConfirmationDialogTitle(action) {
-  if (action === 'CLEAR') return 'Clear TAF';
-  if (action === 'PUBLISH') return 'Publish';
-  if (action === 'AMEND') return 'This TAF is an amendment';
-  if (action === 'CORRECT') return 'This TAF is a correction';
-  if (action === 'CANCEL') return 'Cancel TAF';
+  if (action === 'CLEAR') {
+    return 'Clear TAF';
+  }
+
+  if (action === 'PUBLISH') {
+    return 'Publish';
+  }
+
+  if (action === 'AMEND') {
+    return 'This TAF is an amendment';
+  }
+
+  if (action === 'CORRECT') {
+    return 'This TAF is a correction';
+  }
+
+  if (action === 'CANCEL') {
+    return 'Cancel TAF';
+  }
+
   return 'Cancel TAF';
 }; // Check if the amended/corrected TAF has been changed. Only compare the fields users are able to fill in
 // (i.e. exclude baseforecast valid time as that gets updated when doing an amendment automatically outside of the users influence)
 
 var isTafAmendedCorrectedChanged = function isTafAmendedCorrectedChanged(originalTaf, currentTaf) {
-  if (originalTaf === null || currentTaf === null) return false;
+  if (originalTaf === null || currentTaf === null) {
+    return false;
+  }
+
   var originalBaseF = originalTaf.baseForecast,
       originalChG = originalTaf.changeGroups;
   var currentBaseF = currentTaf.baseForecast,
@@ -2906,7 +2956,11 @@ var getIssuesLabel = function getIssuesLabel(sumOfErrors) {
 var getErrorValues = function getErrorValues(fieldErrors) {
   var isChangeGroup = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var rowIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : -1;
-  if (!fieldErrors) return [];
+
+  if (!fieldErrors) {
+    return [];
+  }
+
   return Object.keys(fieldErrors).reduce(function (list, key) {
     var error = Object.assign({}, fieldErrors[key]);
 
@@ -4640,7 +4694,10 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     forceFallback: false,
     onStart: function onStart(event) {
       onStartDrag(event);
-      if (Sortable.ghost) Sortable.ghost.style.opacity = '1';
+
+      if (Sortable.ghost) {
+        Sortable.ghost.style.opacity = '1';
+      }
     }
   }, fields.map(function (item, index) {
     return /*#__PURE__*/React__default.createElement(TafFormRow, {
@@ -4829,7 +4886,11 @@ var sortTafsOnIssueDate = function sortTafsOnIssueDate() {
   return _toConsumableArray(tafList).sort(function (_ref3, _ref4) {
     var tafA = _ref3.taf;
     var tafB = _ref4.taf;
-    if (tafA.issueDate < tafB.issueDate || tafA.issueDate && !tafB.issueDate) return 1;
+
+    if (tafA.issueDate < tafB.issueDate || tafA.issueDate && !tafB.issueDate) {
+      return 1;
+    }
+
     return -1;
   });
 };
@@ -4926,7 +4987,11 @@ var getNewTafLocationIndex = function getNewTafLocationIndex(tafLocations, previ
 };
 var getPreviousTaf = function getPreviousTaf(tafList, currentTaf) {
   var previousId = currentTaf.taf.previousId;
-  if (!previousId) return null;
+
+  if (!previousId) {
+    return null;
+  }
+
   var previousTaf = tafList.find(function (taf) {
     return taf.taf.uuid === previousId;
   });
@@ -5275,7 +5340,10 @@ var TacOverview = function TacOverview(_ref) {
   };
 
   var scrollToPosition = React__default.useCallback(function () {
-    if (!scrollRef.current) return;
+    if (!scrollRef.current) {
+      return;
+    }
+
     var containerTop = scrollRef.current.getBoundingClientRect().top;
     var firstLocation = scrollRef.current.querySelector("[data-location=\"".concat(activeLocation, "\"]"));
     var paddingTop = parseInt(getComputedStyle(scrollRef.current).paddingTop, 10);

package/index.umd.js

@@ -384,7 +384,10 @@
 
 
     var parseValidToObject = function parseValidToObject(value, tafStart, tafEnd) {
-      if (!value) return null; // Create valid object from passed string
+      if (!value) {
+        return null;
+      } // Create valid object from passed string
+
 
       var trimmedValue = value.trim();
       var tafStartMoment = moment__default["default"].utc(tafStart);
@@ -447,7 +450,10 @@
 
       var sectionValidationStart = validateValidSections(startSections, 'start'); // If invalid start - return with errors
 
-      if (sectionValidationStart.length) return sectionValidationStart;
+      if (sectionValidationStart.length) {
+        return sectionValidationStart;
+      }
+
       var startTimestamp = getValidityTimeStamp('start', startSections, tafStartMoment, tafEndMoment); // Validate start is within the taf validity bounds
 
       if (startTimestamp < tafStartMoment || startTimestamp > tafEndMoment) {
@@ -460,7 +466,10 @@
 
         var sectionValidationEnd = validateValidSections(endSections, 'end'); // If invalid end - return with errors
 
-        if (sectionValidationEnd.length) return sectionValidationEnd;
+        if (sectionValidationEnd.length) {
+          return sectionValidationEnd;
+        }
+
         var endTimestamp = getValidityTimeStamp('end', endSections, tafStartMoment, tafEndMoment); // Validate end is not before start
 
         if (endTimestamp < startTimestamp) {
@@ -598,7 +607,11 @@
 
     var validateOverlapWithFM = function validateOverlapWithFM(currentChangeGroup, nextChangeGroups, tafStart, tafEnd) {
       var valid = getFieldValue(currentChangeGroup.valid);
-      if (!valid || !nextChangeGroups.length) return true;
+
+      if (!valid || !nextChangeGroups.length) {
+        return true;
+      }
+
       var validValue = parseValidToObject(valid, tafStart, tafEnd);
       var currentRowEndTime = moment__default["default"](validValue.end);
       var firstFMChangeGroup = nextChangeGroups.find(function (nextChangeGroup) {
@@ -1590,13 +1603,16 @@
       if (direction === 'VRB' && (speed === 'P99' || parseInt(speed, 10) > 2)) {
         // Only allow VRB for speeds smaller than 3 or in combination with gusts and showers (SH, TS, SQ)
         var allowedWeatherPhenom = ['SH', 'TS', 'SQ'];
+
         if (gust === '' || !allowedWeatherPhenom.some(function (allowedPhenom) {
           return weather1Value.includes(allowedPhenom);
         }) && !allowedWeatherPhenom.some(function (allowedPhenom) {
           return weather2Value.includes(allowedPhenom);
         }) && !allowedWeatherPhenom.some(function (allowedPhenom) {
           return weather3Value.includes(allowedPhenom);
-        })) return invalidWindVRBWindDirectionMessage;
+        })) {
+          return invalidWindVRBWindDirectionMessage;
+        }
       } // Validate gust
 
 
@@ -1645,14 +1661,20 @@
     };
 
     var formatSingleCloud = function formatSingleCloud(value) {
-      if (!value) return null;
+      if (!value) {
+        return null;
+      }
+
       return value.type ? "" + value.coverage + prependZeroes(value.height, 3) + value.type : "" + value.coverage + prependZeroes(value.height, 3);
     }; // TODO: clouds type = Clouds, but couldn't get it to work properly https://gitlab.com/opengeoweb/opengeoweb/-/issues/119
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 
 
     var formatCloudsToString = function formatCloudsToString(clouds) {
-      if (!clouds) return null;
+      if (!clouds) {
+        return null;
+      }
+
       return Object.keys(clouds).reduce(function (list, key) {
         // only format it if it has a value
         var _a, _b, _c, _d;
@@ -1688,7 +1710,10 @@
     }; // parsers
 
     var parseSingleCloud = function parseSingleCloud(value) {
-      if (!value) return null;
+      if (!value) {
+        return null;
+      }
+
       var trimmedCloud = value.trim();
       var cloudType = trimmedCloud.substring(6, 9);
       return __assign({
@@ -1702,7 +1727,10 @@
 
 
     var parseCloudsToObject = function parseCloudsToObject(clouds) {
-      if (!clouds) return null;
+      if (!clouds) {
+        return null;
+      }
+
       return Object.keys(clouds).reduce(function (list, key) {
         var _a, _b, _c, _d; // only parse it if it has a value
 
@@ -2552,7 +2580,11 @@
       var onChangeOrder = function onChangeOrder(_a) {
         var oldIndex = _a.oldIndex,
             newIndex = _a.newIndex;
-        if (oldIndex === undefined || newIndex === undefined) return;
+
+        if (oldIndex === undefined || newIndex === undefined) {
+          return;
+        }
+
         move(oldIndex, newIndex);
         onUpdatelastDragOrder([oldIndex, newIndex]);
         setActiveDraggingIndex(false);
@@ -2582,17 +2614,35 @@
     }; // dialog utils
 
     var getConfirmationDialogTitle = function getConfirmationDialogTitle(action) {
-      if (action === 'CLEAR') return 'Clear TAF';
-      if (action === 'PUBLISH') return 'Publish';
-      if (action === 'AMEND') return 'This TAF is an amendment';
-      if (action === 'CORRECT') return 'This TAF is a correction';
-      if (action === 'CANCEL') return 'Cancel TAF';
+      if (action === 'CLEAR') {
+        return 'Clear TAF';
+      }
+
+      if (action === 'PUBLISH') {
+        return 'Publish';
+      }
+
+      if (action === 'AMEND') {
+        return 'This TAF is an amendment';
+      }
+
+      if (action === 'CORRECT') {
+        return 'This TAF is a correction';
+      }
+
+      if (action === 'CANCEL') {
+        return 'Cancel TAF';
+      }
+
       return 'Cancel TAF';
     }; // Check if the amended/corrected TAF has been changed. Only compare the fields users are able to fill in
     // (i.e. exclude baseforecast valid time as that gets updated when doing an amendment automatically outside of the users influence)
 
     var isTafAmendedCorrectedChanged = function isTafAmendedCorrectedChanged(originalTaf, currentTaf) {
-      if (originalTaf === null || currentTaf === null) return false;
+      if (originalTaf === null || currentTaf === null) {
+        return false;
+      }
+
       var originalBaseF = originalTaf.baseForecast,
           originalChG = originalTaf.changeGroups;
       var currentBaseF = currentTaf.baseForecast,
@@ -2919,7 +2969,10 @@
         rowIndex = -1;
       }
 
-      if (!fieldErrors) return [];
+      if (!fieldErrors) {
+        return [];
+      }
+
       return Object.keys(fieldErrors).reduce(function (list, key) {
         var error = __assign({}, fieldErrors[key]);
 
@@ -4659,7 +4712,10 @@
         forceFallback: false,
         onStart: function onStart(event) {
           onStartDrag(event);
-          if (Sortable__default["default"].ghost) Sortable__default["default"].ghost.style.opacity = '1';
+
+          if (Sortable__default["default"].ghost) {
+            Sortable__default["default"].ghost.style.opacity = '1';
+          }
         }
       }, fields.map(function (item, index) {
         return /*#__PURE__*/React__default["default"].createElement(TafFormRow, {
@@ -4843,7 +4899,11 @@
       return __spreadArray([], __read(tafList)).sort(function (_a, _b) {
         var tafA = _a.taf;
         var tafB = _b.taf;
-        if (tafA.issueDate < tafB.issueDate || tafA.issueDate && !tafB.issueDate) return 1;
+
+        if (tafA.issueDate < tafB.issueDate || tafA.issueDate && !tafB.issueDate) {
+          return 1;
+        }
+
         return -1;
       });
     };
@@ -4940,7 +5000,11 @@
     };
     var getPreviousTaf = function getPreviousTaf(tafList, currentTaf) {
       var previousId = currentTaf.taf.previousId;
-      if (!previousId) return null;
+
+      if (!previousId) {
+        return null;
+      }
+
       var previousTaf = tafList.find(function (taf) {
         return taf.taf.uuid === previousId;
       });
@@ -5300,7 +5364,10 @@
       };
 
       var scrollToPosition = React__default["default"].useCallback(function () {
-        if (!scrollRef.current) return;
+        if (!scrollRef.current) {
+          return;
+        }
+
         var containerTop = scrollRef.current.getBoundingClientRect().top;
         var firstLocation = scrollRef.current.querySelector("[data-location=\"" + activeLocation + "\"]");
         var paddingTop = parseInt(getComputedStyle(scrollRef.current).paddingTop, 10);
@@ -5688,9 +5755,12 @@
               case 2:
                 _a.sent();
 
-                if (!isMounted.current) return [2
-                /*return*/
-                ];
+                if (!isMounted.current) {
+                  return [2
+                  /*return*/
+                  ];
+                }
+
                 setLoading(false);
                 setError(null);
                 return [3
@@ -5699,9 +5769,13 @@
 
               case 3:
                 error_1 = _a.sent();
-                if (!isMounted.current) return [2
-                /*return*/
-                ];
+
+                if (!isMounted.current) {
+                  return [2
+                  /*return*/
+                  ];
+                }
+
                 newErrorr = errorParser ? errorParser(error_1, params) : error_1;
                 setLoading(false);
                 setError(newErrorr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "4.16.0",
+  "version": "4.18.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,21 +12,21 @@
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/api": "4.16.0",
+    "@opengeoweb/api": "4.18.0",
     "react": "^18.2.0",
     "axios": "^0.25.0",
-    "@opengeoweb/shared": "4.16.0",
+    "@opengeoweb/shared": "4.18.0",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/theme": "4.16.0",
+    "@opengeoweb/theme": "4.18.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
     "react-redux": "^8.0.4",
     "lodash": "^4.17.20",
     "date-fns": "^2.29.3",
-    "@opengeoweb/core": "4.16.0",
+    "@opengeoweb/core": "4.18.0",
     "moment": "^2.29.0",
-    "@opengeoweb/webmap": "4.16.0",
+    "@opengeoweb/webmap": "4.18.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-intl": "^5.17.5",
@@ -34,7 +34,7 @@
     "sortablejs": "^1.15.0",
     "immer": "^9.0.15",
     "react-window": "^1.8.7",
-    "@opengeoweb/form-fields": "4.16.0",
+    "@opengeoweb/form-fields": "4.18.0",
     "react-hook-form": "^7.41.5",
     "moment-timezone": "^0.5.31",
     "@mui/x-date-pickers": "^5.0.4",
@@ -47,7 +47,7 @@
     "@redux-eggs/redux-toolkit": "^2.2.0",
     "@redux-eggs/saga-extension": "^2.2.0",
     "react-dom": "^18.2.0",
-    "@opengeoweb/authentication": "4.16.0",
+    "@opengeoweb/authentication": "4.18.0",
     "query-string": "^6.13.7",
     "@emotion/react": "^11.10.4"
   }