@opengeoweb/taf 4.17.0 → 4.19.0

package/index.esm.js

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import React__default from 'react';
-import { Grid, Button, IconButton, Chip, Box, Typography, FormLabel, Switch, TextField, Card, Tabs, Tab, Dialog, MenuList, MenuItem, Backdrop, CircularProgress } from '@mui/material';
+import { Grid, Button, Chip, Box, Typography, FormLabel, Switch, TextField, Card, Tabs, Tab, Dialog, MenuList, MenuItem, Backdrop, CircularProgress } from '@mui/material';
 import { useFormContext, Controller, useFieldArray } from 'react-hook-form';
 import { useDispatch } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { HIDDEN_INPUT_HELPER_IS_DRAFT, getDeepProperty, useDraftFormHelpers, ReactHookFormHiddenInput, ReactHookFormProvider } from '@opengeoweb/form-fields';
-import { useIsMounted, CustomTooltip, ToolContainerDraggable, Avatar, getInitials, ToggleMenu, useConfirmationDialog, usePreventBrowserClose, ToolButton, ToolHeader, AlertBanner, getErrorMessage as getErrorMessage$1, getWarningMessage, ConfirmationServiceProvider, usePoller, ErrorBoundary } from '@opengeoweb/shared';
+import { useIsMounted, CustomIconButton, CustomTooltip, ToolContainerDraggable, Avatar, getInitials, ToggleMenu, useConfirmationDialog, usePreventBrowserClose, ToolButton, ToolHeader, AlertBanner, getErrorMessage as getErrorMessage$1, getWarningMessage, ConfirmationServiceProvider, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import { snackbarActions } from '@opengeoweb/core';
 import moment from 'moment';
 import { isEqual } from 'lodash';
@@ -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) {
@@ -1650,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]) {
@@ -1691,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({
@@ -1705,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()) {
@@ -2554,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);
@@ -2584,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,
@@ -2846,8 +2893,8 @@ var getFormRowPosition = function getFormRowPosition(formRow) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2021 - Finnish Meteorological Institute (FMI)
+ * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
 
 var DragHandle = function DragHandle(_ref) {
@@ -2856,18 +2903,21 @@ var DragHandle = function DragHandle(_ref) {
       _ref$isDisabled = _ref.isDisabled,
       isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
       index = _ref.index;
-  return /*#__PURE__*/React__default.createElement(IconButton, {
+  return /*#__PURE__*/React__default.createElement(CustomIconButton, {
     className: "handle",
     "data-testid": "dragHandle-".concat(index),
     disableRipple: true,
     disabled: isDisabled,
-    size: "large",
     sx: {
-      backgroundColor: 'transparent',
-      '&:hover': {
-        backgroundColor: 'transparent'
-      },
-      cursor: isSorting ? 'grabbing' : 'grab'
+      cursor: isSorting ? 'grabbing' : 'grab',
+      '&.MuiButtonBase-root.MuiIconButton-root': {
+        width: 50,
+        height: 50,
+        color: 'geowebColors.greys.accessible',
+        '&:hover': {
+          backgroundColor: 'transparent'
+        }
+      }
     }
   }, /*#__PURE__*/React__default.createElement(DragHandle$1, null));
 };
@@ -2909,7 +2959,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]);
 
@@ -4643,7 +4697,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, {
@@ -4933,7 +4990,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;
   });
@@ -5282,7 +5343,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) {
@@ -1648,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;
@@ -1691,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({
@@ -1705,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
 
@@ -2555,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);
@@ -2585,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,
@@ -2853,8 +2900,8 @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
+     * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2023 - Finnish Meteorological Institute (FMI)
      * */
 
     var DragHandle = function DragHandle(_a) {
@@ -2863,18 +2910,21 @@
           _c = _a.isDisabled,
           isDisabled = _c === void 0 ? false : _c,
           index = _a.index;
-      return /*#__PURE__*/React__default["default"].createElement(material.IconButton, {
+      return /*#__PURE__*/React__default["default"].createElement(shared.CustomIconButton, {
         className: "handle",
         "data-testid": "dragHandle-" + index,
         disableRipple: true,
         disabled: isDisabled,
-        size: "large",
         sx: {
-          backgroundColor: 'transparent',
-          '&:hover': {
-            backgroundColor: 'transparent'
-          },
-          cursor: isSorting ? 'grabbing' : 'grab'
+          cursor: isSorting ? 'grabbing' : 'grab',
+          '&.MuiButtonBase-root.MuiIconButton-root': {
+            width: 50,
+            height: 50,
+            color: 'geowebColors.greys.accessible',
+            '&:hover': {
+              backgroundColor: 'transparent'
+            }
+          }
         }
       }, /*#__PURE__*/React__default["default"].createElement(theme.DragHandle, null));
     };
@@ -2922,7 +2972,10 @@
         rowIndex = -1;
       }
 
-      if (!fieldErrors) return [];
+      if (!fieldErrors) {
+        return [];
+      }
+
       return Object.keys(fieldErrors).reduce(function (list, key) {
         var error = __assign({}, fieldErrors[key]);
 
@@ -4662,7 +4715,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, {
@@ -4947,7 +5003,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;
       });
@@ -5307,7 +5367,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);
@@ -5695,9 +5758,12 @@
               case 2:
                 _a.sent();
 
-                if (!isMounted.current) return [2
-                /*return*/
-                ];
+                if (!isMounted.current) {
+                  return [2
+                  /*return*/
+                  ];
+                }
+
                 setLoading(false);
                 setError(null);
                 return [3
@@ -5706,9 +5772,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.17.0",
+  "version": "4.19.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,43 +12,44 @@
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/api": "4.17.0",
+    "@opengeoweb/api": "4.19.0",
     "react": "^18.2.0",
     "axios": "^0.25.0",
-    "@opengeoweb/shared": "4.17.0",
-    "@mui/material": "^5.10.8",
-    "@opengeoweb/theme": "4.17.0",
+    "@opengeoweb/shared": "4.19.0",
+    "@mui/material": "^5.12.0",
+    "@opengeoweb/theme": "4.19.0",
+    "@mui/x-date-pickers": "^6.2.1",
     "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.17.0",
+    "@opengeoweb/core": "4.19.0",
     "moment": "^2.29.0",
-    "@opengeoweb/webmap": "4.17.0",
+    "@opengeoweb/webmap": "4.19.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",
     "immer": "^9.0.15",
+    "@reduxjs/toolkit": "^1.8.3",
     "react-window": "^1.8.7",
-    "@opengeoweb/form-fields": "4.17.0",
+    "@opengeoweb/form-fields": "4.19.0",
     "react-hook-form": "^7.41.5",
     "moment-timezone": "^0.5.31",
-    "@mui/x-date-pickers": "^5.0.4",
-    "@reduxjs/toolkit": "^1.8.3",
+    "react-resize-detector": "^9.1.0",
     "lodash.clonedeep": "^4.5.0",
     "@turf/turf": "^5.1.6",
     "react-router-dom": "^6.4.2",
-    "@mui/system": "^5.10.8",
+    "@mui/system": "^5.12.0",
     "redux-saga": "^1.2.1",
     "@redux-eggs/redux-toolkit": "^2.2.0",
     "@redux-eggs/saga-extension": "^2.2.0",
     "react-dom": "^18.2.0",
-    "@opengeoweb/authentication": "4.17.0",
+    "@opengeoweb/authentication": "4.19.0",
     "query-string": "^6.13.7",
-    "@emotion/react": "^11.10.4"
+    "@emotion/react": "^11.10.6"
   }
 }