@opengeoweb/sigmet-airmet 8.3.1 → 8.4.0

package/index.esm.js

@@ -416,6 +416,15 @@ function _toPropertyKey(arg) {
   return typeof key === "symbol" ? key : String(key);
 }
 
+/**
+ * The possible type for the sigmet
+ */
+var SigmetType;
+(function (SigmetType) {
+  SigmetType["NORMAL"] = "Normal";
+  SigmetType["TEST"] = "Test";
+  SigmetType["EXERCISE"] = "Exercise";
+})(SigmetType || (SigmetType = {}));
 /**
  * The possible phenomena for the sigmet
  */
@@ -586,6 +595,20 @@ var styles$2 = {
   containerItem: {
     ' .MuiTypography-subtitle1': {
       marginTop: 1
+    },
+    paddingTop: '8px!important',
+    '+ .MuiGrid-item': {
+      paddingTop: 0
+    },
+    '.MuiButtonBase-root.MuiRadio-root': {
+      padding: '6px',
+      marginLeft: '3px'
+    },
+    '.MuiFormControl-root.MuiTextField-root': {
+      marginBottom: 0
+    },
+    '.MuiGrid-root': {
+      alignItems: 'flex-start'
     }
   },
   volcanicField: {
@@ -604,7 +627,10 @@ var styles$2 = {
     marginBottom: 2
   },
   latitude: {
-    width: '97%'
+    width: '97%',
+    '.MuiFormControl-root.MuiTextField-root': {
+      margin: 0
+    }
   },
   unit: {
     width: '95%'
@@ -623,12 +649,25 @@ var styles$2 = {
   },
   helperText: {
     ' .MuiFormHelperText-root': {
-      position: 'absolute',
-      top: 56,
+      top: 'auto',
+      position: 'relative',
+      lineHeight: '1.33em',
       '&.Mui-error': {
         top: 'auto',
         position: 'relative'
       }
+    },
+    '.MuiFormLabel-root.MuiInputLabel-root': {
+      top: -4,
+      lineHeight: '1.33em'
+    },
+    '.MuiSvgIcon-root': {
+      width: '0.8em',
+      height: '0.8em'
+    },
+    '.MuiButtonBase-root.MuiIconButton-root': {
+      padding: '2px',
+      marginLeft: '-4px'
     }
   }
 };
@@ -1533,6 +1572,7 @@ var Levels = function Levels(_ref) {
       }
     },
     sx: styles$2.unit,
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     defaultValue: 'FL',
@@ -1577,6 +1617,7 @@ var Levels = function Levels(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     autoFocus: true
@@ -1613,6 +1654,7 @@ var Levels = function Levels(_ref) {
         }
       }
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -1634,6 +1676,7 @@ var Levels = function Levels(_ref) {
     name: "level.value",
     label: "Upper level",
     sx: styles$2.levelField,
+    size: "small",
     rules: {
       validate: {
         isRequired: isRequired,
@@ -1708,6 +1751,7 @@ var Levels = function Levels(_ref) {
         }
       }
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -1758,6 +1802,7 @@ var Levels = function Levels(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly
   }))))) : null, /*#__PURE__*/React__default.createElement(RadioButtonAndLabel, {
@@ -1801,6 +1846,7 @@ var Levels = function Levels(_ref) {
         isRequired: isRequired
       }
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -1845,6 +1891,7 @@ var Levels = function Levels(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     autoFocus: true
@@ -1879,8 +1926,9 @@ var ObservationForecast = function ObservationForecast(_ref) {
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
     sx: {
       paddingTop: '8px!important',
-      '+ .MuiGrid-item': {
-        paddingTop: 5
+      '.MuiButtonBase-root.MuiRadio-root': {
+        padding: '6px',
+        marginLeft: '3px'
       }
     }
   }, /*#__PURE__*/React__default.createElement(ReactHookFormRadioGroup, {
@@ -2001,6 +2049,7 @@ var Phenomenon = function Phenomenon(_ref) {
     },
     disabled: isDisabled,
     isReadOnly: isReadOnly,
+    size: "small",
     "data-testid": "phenomenon",
     onChange: function onChange() {
       if (getValues('movementType') === 'NO_VA_EXP') {
@@ -2008,8 +2057,7 @@ var Phenomenon = function Phenomenon(_ref) {
       }
       triggerValidations(['validDateStart', 'validDateEnd'], getValues, trigger);
       _onChange();
-    },
-    autoFocus: true
+    }
   }, Object.keys(phenomenaList).map(function (key) {
     return /*#__PURE__*/React__default.createElement(MenuItem, {
       value: key,
@@ -2232,6 +2280,7 @@ var Progress = function Progress(_ref) {
     rules: {
       validate: isRequired
     },
+    size: "small",
     sx: styles$2.movement,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -2259,6 +2308,7 @@ var Progress = function Progress(_ref) {
     rules: {
       validate: isRequired
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -2304,6 +2354,7 @@ var Progress = function Progress(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     "data-testid": "movement-movementSpeed",
@@ -2424,8 +2475,7 @@ var SelectFIR = function SelectFIR(_ref) {
     onChange(changeEvent);
   };
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
-    title: "Where",
-    sx: styles$2.containerItem
+    title: "Where"
   }, /*#__PURE__*/React__default.createElement(ReactHookFormSelect, {
     name: "locationIndicatorATSR",
     label: isReadOnly ? 'FIR' : 'Select FIR',
@@ -2437,7 +2487,8 @@ var SelectFIR = function SelectFIR(_ref) {
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     defaultValue: locationIndicatorATSR,
-    onChange: onChangeLocationATSR
+    onChange: onChangeLocationATSR,
+    size: "small"
   }, optionsFIR.map(function (fir) {
     return /*#__PURE__*/React__default.createElement(MenuItem, {
       key: "".concat(fir.ATSR, "-").concat(fir.FIR),
@@ -2476,41 +2527,33 @@ var SelectFIR = function SelectFIR(_ref) {
  * */
 var Type = function Type(_ref) {
   var isReadOnly = _ref.isReadOnly,
-    isDisabled = _ref.isDisabled;
-  var _useDraftFormHelpers = useDraftFormHelpers(),
-    isRequired = _useDraftFormHelpers.isRequired;
+    isDisabled = _ref.isDisabled,
+    _ref$onChange = _ref.onChange,
+    _onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
+  var _useFormContext = useFormContext(),
+    getValues = _useFormContext.getValues,
+    trigger = _useFormContext.trigger;
+  var label = getFieldLabel('Type', isReadOnly);
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
-    title: "Type",
-    sx: styles$2.containerItem
-  }, /*#__PURE__*/React__default.createElement(Grid, {
-    item: true,
-    xs: 12
-  }, /*#__PURE__*/React__default.createElement(ReactHookFormRadioGroup, {
+    title: "Type"
+  }, /*#__PURE__*/React__default.createElement(ReactHookFormSelect, {
     name: "type",
-    rules: {
-      validate: {
-        isRequired: isRequired
-      }
-    },
+    label: label,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
-    defaultValue: "NORMAL"
-  }, /*#__PURE__*/React__default.createElement(RadioButtonAndLabel, {
-    value: "NORMAL",
-    label: "Normal",
-    disabled: isDisabled,
-    "data-testid": "type-NORMAL"
-  }), /*#__PURE__*/React__default.createElement(RadioButtonAndLabel, {
-    value: "TEST",
-    label: "Test",
-    disabled: isDisabled,
-    "data-testid": "type-TEST"
-  }), /*#__PURE__*/React__default.createElement(RadioButtonAndLabel, {
-    value: "EXERCISE",
-    label: "Exercise",
-    disabled: isDisabled,
-    "data-testid": "type-EXERCISE"
-  }))));
+    size: "small",
+    "data-testid": "type",
+    onChange: function onChange() {
+      triggerValidations(['validDateStart', 'validDateEnd'], getValues, trigger);
+      _onChange();
+    },
+    autoFocus: true
+  }, Object.keys(SigmetType).map(function (key) {
+    return /*#__PURE__*/React__default.createElement(MenuItem, {
+      value: key,
+      key: key
+    }, SigmetType[key]);
+  })));
 };
 
 /* *
@@ -2578,7 +2621,8 @@ var ValidFrom = function ValidFrom(_ref) {
     },
     disabled: isDisabled,
     isReadOnly: isReadOnly,
-    "data-testid": "valid-from"
+    "data-testid": "valid-from",
+    sx: styles$2.helperText
   }));
 };
 
@@ -2643,7 +2687,8 @@ var ValidUntil = function ValidUntil(_ref) {
     onChange: function onChange() {
       triggerValidations(['validDateStart', 'observationOrForecastTime'], getValues, trigger);
       _onChange();
-    }
+    },
+    sx: styles$2.helperText
   }));
 };
 
@@ -2698,7 +2743,8 @@ var VolcanicFields = function VolcanicFields(_ref) {
     disabled: isDisabled,
     helperText: helperText,
     upperCase: true,
-    isReadOnly: isReadOnly
+    isReadOnly: isReadOnly,
+    size: "small"
   })), (!isReadOnly || !!watch('vaSigmetVolcanoCoordinates.latitude')) && /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 6
@@ -2716,6 +2762,7 @@ var VolcanicFields = function VolcanicFields(_ref) {
         }
       }
     },
+    size: "small",
     sx: Object.assign({}, styles$2.latitude),
     disabled: isDisabled,
     onChange: function onChange() {
@@ -2730,6 +2777,8 @@ var VolcanicFields = function VolcanicFields(_ref) {
     "data-testid": "vaSigmetVolcanoCoordinates.longitude",
     label: "Longitude",
     inputMode: "decimal",
+    size: "small",
+    sx: Object.assign({}, styles$2.latitude),
     rules: {
       required: true,
       validate: {
@@ -2847,6 +2896,7 @@ var SurfaceVisibility = function SurfaceVisibility(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly
   })), /*#__PURE__*/React__default.createElement(Grid, {
@@ -2866,7 +2916,8 @@ var SurfaceVisibility = function SurfaceVisibility(_ref) {
     onChange: function onChange(event) {
       event.stopPropagation();
       _onChange();
-    }
+    },
+    size: "small"
   }, Object.keys(VisibilityCause).map(function (key) {
     return /*#__PURE__*/React__default.createElement(MenuItem, {
       value: key,
@@ -2965,6 +3016,7 @@ var SurfaceWind = function SurfaceWind(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     "data-testid": "surfaceWind-windDirection"
@@ -2983,6 +3035,7 @@ var SurfaceWind = function SurfaceWind(_ref) {
         isRequired: isRequired
       }
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -3021,6 +3074,7 @@ var SurfaceWind = function SurfaceWind(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly,
     "data-testid": "surfaceWind-windSpeed"
@@ -3185,6 +3239,7 @@ var CloudLevels = function CloudLevels(_ref) {
         isRequired: isRequired
       }
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -3207,6 +3262,7 @@ var CloudLevels = function CloudLevels(_ref) {
     name: "cloudLevel.value",
     label: "Upper level",
     "data-testid": "cloudLevel-value",
+    size: "small",
     sx: styles$2.levelField,
     rules: {
       validate: {
@@ -3289,6 +3345,7 @@ var CloudLevels = function CloudLevels(_ref) {
         isRequired: isRequired
       }
     },
+    size: "small",
     sx: styles$2.unit,
     disabled: isDisabled,
     isReadOnly: isReadOnly,
@@ -3338,6 +3395,7 @@ var CloudLevels = function CloudLevels(_ref) {
         }
       }
     },
+    size: "small",
     disabled: isDisabled,
     isReadOnly: isReadOnly
   })))))));
@@ -3534,6 +3592,12 @@ var IssuedAt = function IssuedAt(_ref) {
   var date = _ref.date,
     isReadOnly = _ref.isReadOnly;
   return /*#__PURE__*/React__default.createElement(ProductFormFieldLayout, {
+    sx: {
+      paddingTop: 0,
+      '+ .MuiGrid-item': {
+        paddingTop: 0
+      }
+    },
     title: "Issued at"
   }, /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
@@ -8301,8 +8365,28 @@ var SigmetForm = function SigmetForm(_ref) {
     return /*#__PURE__*/React__default.createElement(Grid, {
       container: true,
       direction: "column",
-      spacing: 5
-    }, !isCancelSigmet && /*#__PURE__*/React__default.createElement(Phenomenon, {
+      spacing: 2,
+      sx: {
+        '.MuiSelect-select.MuiInputBase-input.MuiFilledInput-input': {
+          paddingTop: '17px',
+          paddingBottom: '0px'
+        },
+        '.MuiInputBase-input.MuiFilledInput-input': {
+          paddingTop: '15px',
+          paddingBottom: '2px'
+        },
+        '+ .MuiGrid-item': {
+          paddingTop: '16px'
+        },
+        '.MuiFormHelperText-root': {
+          lineHeight: '1.33em'
+        }
+      }
+    }, /*#__PURE__*/React__default.createElement(Type, {
+      isDisabled: isDisabled,
+      isReadOnly: isReadOnly,
+      onChange: onChangeForm
+    }), !isCancelSigmet && /*#__PURE__*/React__default.createElement(Phenomenon, {
       productType: "sigmet",
       isDisabled: isDisabled,
       isReadOnly: isReadOnly,
@@ -8383,10 +8467,7 @@ var SigmetForm = function SigmetForm(_ref) {
       name: "validDateEndOfSigmetToCancel"
     }), /*#__PURE__*/React__default.createElement(ReactHookFormHiddenInput, {
       name: "validDateStartOfSigmetToCancel"
-    }))), /*#__PURE__*/React__default.createElement(Type, {
-      isDisabled: isDisabled,
-      isReadOnly: isReadOnly
-    }));
+    }))));
   };
   if (!showMap) {
     return renderForm();
@@ -8554,8 +8635,28 @@ var AirmetForm = function AirmetForm(_ref) {
     return /*#__PURE__*/React__default.createElement(Grid, {
       container: true,
       direction: "column",
-      spacing: 6
-    }, !isCancelAirmet && /*#__PURE__*/React__default.createElement(Phenomenon, {
+      spacing: 2,
+      sx: {
+        '.MuiSelect-select.MuiInputBase-input.MuiFilledInput-input': {
+          paddingTop: '17px',
+          paddingBottom: '0px'
+        },
+        '.MuiInputBase-input.MuiFilledInput-input': {
+          paddingTop: '15px',
+          paddingBottom: '2px'
+        },
+        '+ .MuiGrid-item': {
+          paddingTop: '16px'
+        },
+        '.MuiFormHelperText-root': {
+          lineHeight: '1.33em'
+        }
+      }
+    }, /*#__PURE__*/React__default.createElement(Type, {
+      isDisabled: isDisabled,
+      isReadOnly: isReadOnly,
+      onChange: onChangeForm
+    }), !isCancelAirmet && /*#__PURE__*/React__default.createElement(Phenomenon, {
       productType: "airmet",
       isDisabled: isDisabled,
       isReadOnly: isReadOnly,
@@ -8635,10 +8736,7 @@ var AirmetForm = function AirmetForm(_ref) {
       name: "validDateEndOfAirmetToCancel"
     }), /*#__PURE__*/React__default.createElement(ReactHookFormHiddenInput, {
       name: "validDateStartOfAirmetToCancel"
-    }))), /*#__PURE__*/React__default.createElement(Type, {
-      isDisabled: isDisabled,
-      isReadOnly: isReadOnly
-    }));
+    }))));
   };
   if (!showMap) {
     return renderForm();
@@ -16848,4 +16946,4 @@ var AirmetComponentsLookUp = function AirmetComponentsLookUp(payload, _ref) {
   }
 };
 
-export { AirmetComponentsLookUp, AirmetForm, AirmetPhenomena, CloudLevelUnits, ContentDialog, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductList, ProductListRow, ProductStatusDescription, SigmetComponentsLookUp, SigmetForm, SigmetPhenomena, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createApi$1 as createApi, createApi as createFakeApi, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, sigmetConfig };
+export { AirmetComponentsLookUp, AirmetForm, AirmetPhenomena, CloudLevelUnits, ContentDialog, Direction, DownloadSigmetAirmetConfigWrapper, LevelUnits, MapViewGeoJson, MetInfoWrapper, MovementUnit, ProductList, ProductListRow, ProductStatusDescription, SigmetComponentsLookUp, SigmetForm, SigmetPhenomena, SigmetType, StartOrEndDrawing, VisibilityCause, WindUnit, airmetConfig, createApi$1 as createApi, createApi as createFakeApi, isInstanceOfAirmet, isInstanceOfCancelAirmet, isInstanceOfCancelSigmet, isInstanceOfCancelSigmetOrAirmet, isInstanceOfSigmet, isInstanceOfSigmetOrAirmet, sigmetConfig };

package/package.json

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

package/src/lib/components/ProductForms/ProductForm.styles.d.ts

@@ -11,6 +11,20 @@ export declare const styles: {
         ' .MuiTypography-subtitle1': {
             marginTop: number;
         };
+        paddingTop: string;
+        '+ .MuiGrid-item': {
+            paddingTop: number;
+        };
+        '.MuiButtonBase-root.MuiRadio-root': {
+            padding: string;
+            marginLeft: string;
+        };
+        '.MuiFormControl-root.MuiTextField-root': {
+            marginBottom: number;
+        };
+        '.MuiGrid-root': {
+            alignItems: string;
+        };
     };
     volcanicField: {
         marginBottom: number;
@@ -29,6 +43,9 @@ export declare const styles: {
     };
     latitude: {
         width: string;
+        '.MuiFormControl-root.MuiTextField-root': {
+            margin: number;
+        };
     };
     unit: {
         width: string;
@@ -47,12 +64,25 @@ export declare const styles: {
     };
     helperText: {
         ' .MuiFormHelperText-root': {
+            top: string;
             position: string;
-            top: number;
+            lineHeight: string;
             '&.Mui-error': {
                 top: string;
                 position: string;
             };
         };
+        '.MuiFormLabel-root.MuiInputLabel-root': {
+            top: number;
+            lineHeight: string;
+        };
+        '.MuiSvgIcon-root': {
+            width: string;
+            height: string;
+        };
+        '.MuiButtonBase-root.MuiIconButton-root': {
+            padding: string;
+            marginLeft: string;
+        };
     };
 };

package/src/lib/types.d.ts

@@ -1,6 +1,14 @@
 /// <reference types="react" />
 import { mapTypes } from '@opengeoweb/store';
 export type ProductType = 'sigmet' | 'airmet';
+/**
+ * The possible type for the sigmet
+ */
+export declare enum SigmetType {
+    'NORMAL' = "Normal",
+    'TEST' = "Test",
+    'EXERCISE' = "Exercise"
+}
 /**
  * The possible phenomena for the sigmet
  */