@opengeoweb/sigmet-airmet 4.7.0 → 4.8.0

package/index.esm.js

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import React__default from 'react';
-import { FormControlLabel, Radio, Grid, Typography, Box, Button, Checkbox, MenuItem, FormHelperText, useTheme, Dialog, DialogTitle, DialogContent, Card, List, ListItem, Skeleton, Backdrop, CircularProgress } from '@mui/material';
+import { FormControlLabel, Radio, Grid, Typography, Box, Button, Checkbox, MenuItem, FormHelperText, useTheme, Dialog, DialogTitle, DialogContent, Card, LinearProgress, List, ListItem, Backdrop, CircularProgress } from '@mui/material';
 import { useFormContext } from 'react-hook-form';
-import { ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, isValidDate, isBefore, isBetween, hasMaxFeaturePoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isAfter, isXHoursAfter, ReactHookFormTextField, containsNoCommas, isLatitude, isNonOrBothCoordinates, isLongitude, errorMessages, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
+import { ReactHookFormRadioGroup, ReactHookFormSelect, ReactHookFormNumberField, isInteger, isValidMax, isValidMin, isEmpty, ReactHookFormDateTime, isValidDate, isBefore, isBetween, hasMaxFeaturePoints, hasMulitpleIntersections, ReactHookFormHiddenInput, isMaximumOneDrawing, hasIntersectionWithFIR, isValidGeoJsonCoordinates, isXHoursBefore, isAfter, isXHoursAfter, ReactHookFormTextField, isLatitude, isNonOrBothCoordinates, isLongitude, errorMessages, ReactHookFormFormControl, isGeometryDirty, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import { useApiContext, useApi, createApiInstance } from '@opengeoweb/api';
 import produce, { produce as produce$1 } from 'immer';
 import * as turf from '@turf/turf';
@@ -1775,15 +1775,14 @@ var Levels = function Levels(_ref) {
       reset(Object.assign(Object.assign({}, currentValues), {
         level: {
           unit: 'FL',
-          value: ''
+          value: null
         }
       }), {
-        errors: true,
-        dirtyFields: true,
-        isDirty: true,
-        isSubmitted: false,
-        touched: false,
-        isValid: false
+        keepErrors: true,
+        keepDirty: true,
+        keepIsSubmitted: false,
+        keepTouched: false,
+        keepIsValid: false
       }); // Clear out errors for the levels
 
       clearErrors(['level', 'lowerLevel']);
@@ -2348,7 +2347,7 @@ var StartGeometry = function StartGeometry(_ref) {
       setDrawModeType = _ref.setDrawModeType;
 
   var _useFormContext = useFormContext(),
-      errors = _useFormContext.errors,
+      errors = _useFormContext.formState.errors,
       watch = _useFormContext.watch;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
@@ -2476,7 +2475,7 @@ var Progress = function Progress(_ref) {
       watch = _useFormContext.watch,
       getValues = _useFormContext.getValues,
       trigger = _useFormContext.trigger,
-      errors = _useFormContext.errors;
+      errors = _useFormContext.formState.errors;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
       isRequired = _useDraftFormHelpers.isRequired,
@@ -3014,7 +3013,6 @@ var VolcanicFields = function VolcanicFields(_ref) {
     rules: {
       required: false,
       validate: {
-        containsNoCommas: containsNoCommas,
         isLatitude: isLatitude,
         isNonOrBothCoordinates: function isNonOrBothCoordinates$1(value) {
           return isNonOrBothCoordinates(value, getValues('vaSigmetVolcanoCoordinates.longitude'));
@@ -3039,7 +3037,6 @@ var VolcanicFields = function VolcanicFields(_ref) {
     rules: {
       required: false,
       validate: {
-        containsNoCommas: containsNoCommas,
         isLongitude: isLongitude,
         isNonOrBothCoordinates: function isNonOrBothCoordinates$1(value) {
           return isNonOrBothCoordinates(value, getValues('vaSigmetVolcanoCoordinates.latitude'));
@@ -4922,7 +4919,14 @@ var ProductList = function ProductList(_ref) {
       width: '100%',
       minHeight: '600px'
     }
-  }, error && /*#__PURE__*/React__default.createElement(AlertBanner, {
+  }, isLoading && /*#__PURE__*/React__default.createElement(LinearProgress, {
+    "data-testid": "productlist-loadingbar",
+    color: "secondary",
+    sx: {
+      marginTop: '28px',
+      marginBottom: '-32px'
+    }
+  }), error && /*#__PURE__*/React__default.createElement(AlertBanner, {
     severity: "error",
     title: "An error has occurred while retrieving the list, please try again",
     info: error.message ? error.message : '',
@@ -4948,11 +4952,7 @@ var ProductList = function ProductList(_ref) {
       product: product,
       productType: productType
     }));
-  })), isLoading && /*#__PURE__*/React__default.createElement(Skeleton, {
-    "data-testid": "productList-skeleton",
-    variant: "rectangular",
-    height: "660px"
-  })));
+  }))));
 };
 
 /* *
@@ -5040,7 +5040,8 @@ var ProductFormDialogContent = function ProductFormDialogContent(_ref) {
       formState = _useFormContext.formState,
       watch = _useFormContext.watch;
 
-  var isDirty = formState.isDirty;
+  var dirtyFields = formState.dirtyFields;
+  var isDirty = Object.keys(dirtyFields).length > 0;
 
   var _useDraftFormHelpers = useDraftFormHelpers(),
       toggleIsDraft = _useDraftFormHelpers.toggleIsDraft,

package/index.umd.js

@@ -1768,15 +1768,14 @@
           reset(__assign(__assign({}, currentValues), {
             level: {
               unit: 'FL',
-              value: ''
+              value: null
             }
           }), {
-            errors: true,
-            dirtyFields: true,
-            isDirty: true,
-            isSubmitted: false,
-            touched: false,
-            isValid: false
+            keepErrors: true,
+            keepDirty: true,
+            keepIsSubmitted: false,
+            keepTouched: false,
+            keepIsValid: false
           }); // Clear out errors for the levels
 
           clearErrors(['level', 'lowerLevel']);
@@ -2321,7 +2320,7 @@
           setDrawModeType = _a.setDrawModeType;
 
       var _c = reactHookForm.useFormContext(),
-          errors = _c.errors,
+          errors = _c.formState.errors,
           watch = _c.watch;
 
       var isDraft = shared.useDraftFormHelpers().isDraft;
@@ -2447,7 +2446,7 @@
           watch = _e.watch,
           getValues = _e.getValues,
           trigger = _e.trigger,
-          errors = _e.errors;
+          errors = _e.formState.errors;
 
       var _f = shared.useDraftFormHelpers(),
           isRequired = _f.isRequired,
@@ -2950,7 +2949,6 @@
         rules: {
           required: false,
           validate: {
-            containsNoCommas: formFields.containsNoCommas,
             isLatitude: formFields.isLatitude,
             isNonOrBothCoordinates: function isNonOrBothCoordinates(value) {
               return formFields.isNonOrBothCoordinates(value, getValues('vaSigmetVolcanoCoordinates.longitude'));
@@ -2975,7 +2973,6 @@
         rules: {
           required: false,
           validate: {
-            containsNoCommas: formFields.containsNoCommas,
             isLongitude: formFields.isLongitude,
             isNonOrBothCoordinates: function isNonOrBothCoordinates(value) {
               return formFields.isNonOrBothCoordinates(value, getValues('vaSigmetVolcanoCoordinates.latitude'));
@@ -4822,7 +4819,14 @@
           width: '100%',
           minHeight: '600px'
         }
-      }, error && /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
+      }, isLoading && /*#__PURE__*/React__default["default"].createElement(material.LinearProgress, {
+        "data-testid": "productlist-loadingbar",
+        color: "secondary",
+        sx: {
+          marginTop: '28px',
+          marginBottom: '-32px'
+        }
+      }), error && /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
         severity: "error",
         title: "An error has occurred while retrieving the list, please try again",
         info: error.message ? error.message : '',
@@ -4848,11 +4852,7 @@
           product: product,
           productType: productType
         }));
-      })), isLoading && /*#__PURE__*/React__default["default"].createElement(material.Skeleton, {
-        "data-testid": "productList-skeleton",
-        variant: "rectangular",
-        height: "660px"
-      })));
+      }))));
     };
 
     /* *
@@ -4932,7 +4932,8 @@
           formState = _b.formState,
           watch = _b.watch;
 
-      var isDirty = formState.isDirty;
+      var dirtyFields = formState.dirtyFields;
+      var isDirty = Object.keys(dirtyFields).length > 0;
 
       var _c = shared.useDraftFormHelpers(),
           toggleIsDraft = _c.toggleIsDraft,

package/lib/components/ProductList/ProductList.stories.d.ts

@@ -4,6 +4,7 @@ declare const _default: {
 };
 export default _default;
 export declare const SigmetListDemo: () => React.ReactElement;
+export declare const SigmetListLoading: () => React.ReactElement;
 export declare const SigmetListDemoSnapshot: {
     (): React.ReactElement;
     storyName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,24 +14,24 @@
     "react": "^17.0.2",
     "react-redux": "^8.0.4",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/shared": "4.7.0",
-    "@opengeoweb/theme": "4.7.0",
+    "@opengeoweb/shared": "4.8.0",
+    "@opengeoweb/theme": "4.8.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
-    "@opengeoweb/form-fields": "4.7.0",
-    "react-hook-form": "^6.12.1",
+    "@opengeoweb/form-fields": "4.8.0",
+    "react-hook-form": "^7.41.5",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "@mui/x-date-pickers": "^5.0.4",
     "lodash": "^4.17.20",
     "axios": "^0.25.0",
     "date-fns": "^2.29.3",
-    "@opengeoweb/core": "4.7.0",
-    "@opengeoweb/webmap": "4.7.0",
+    "@opengeoweb/core": "4.8.0",
+    "@opengeoweb/webmap": "4.8.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "@opengeoweb/api": "4.7.0",
+    "@opengeoweb/api": "4.8.0",
     "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",