@opengeoweb/sigmet-airmet 2.9.0 → 2.13.0

package/index.esm.js

@@ -11,10 +11,9 @@ import * as turf from '@turf/turf';
 import { polygonToLineString, booleanClockwise, rewind } from '@turf/turf';
 import makeStyles from '@mui/styles/makeStyles';
 import { useDraftFormHelpers, useIsMounted, StatusTag, AlertBanner, usePreventBrowserClose, useConfirmationDialog, isAxiosError, getAxiosErrorMessage, ConfirmationServiceProvider, usePoller } from '@opengeoweb/shared';
-import { Location, RegionDraw, PolygonDraw, FIRLandDraw, Delete } from '@opengeoweb/icons';
+import { Location, DrawRegion, DrawPolygon, DrawFIRLand, Delete, ChevronLeft, Info, Edit, Success, Clock } from '@opengeoweb/theme';
 import moment from 'moment';
 import { debounce } from 'lodash';
-import { ArrowBackIos, InfoOutlined, Create, CheckCircle, Schedule } from '@mui/icons-material';
 
 function _typeof(obj) {
   "@babel/helpers - typeof";
@@ -1365,10 +1364,10 @@ var DrawTools = function DrawTools(_ref) {
   }, /*#__PURE__*/React__default.createElement(Tooltip, {
     title: "Draw a box as ".concat(type, " position")
   }, /*#__PURE__*/React__default.createElement(Radio, {
-    icon: /*#__PURE__*/React__default.createElement(RegionDraw, {
+    icon: /*#__PURE__*/React__default.createElement(DrawRegion, {
       className: classes.drawButtons
     }),
-    checkedIcon: /*#__PURE__*/React__default.createElement(RegionDraw, {
+    checkedIcon: /*#__PURE__*/React__default.createElement(DrawRegion, {
       className: classes.drawButtonsSelected
     }),
     checked: drawMode === MapDrawMode.BOX,
@@ -1381,10 +1380,10 @@ var DrawTools = function DrawTools(_ref) {
   }, /*#__PURE__*/React__default.createElement(Tooltip, {
     title: "Draw a shape as ".concat(type, " position")
   }, /*#__PURE__*/React__default.createElement(Radio, {
-    icon: /*#__PURE__*/React__default.createElement(PolygonDraw, {
+    icon: /*#__PURE__*/React__default.createElement(DrawPolygon, {
       className: classes.drawButtons
     }),
-    checkedIcon: /*#__PURE__*/React__default.createElement(PolygonDraw, {
+    checkedIcon: /*#__PURE__*/React__default.createElement(DrawPolygon, {
       className: classes.drawButtonsSelected
     }),
     checked: drawMode === MapDrawMode.POLYGON,
@@ -1397,10 +1396,10 @@ var DrawTools = function DrawTools(_ref) {
   }, /*#__PURE__*/React__default.createElement(Tooltip, {
     title: "Set FIR as ".concat(type, " position")
   }, /*#__PURE__*/React__default.createElement(Radio, {
-    icon: /*#__PURE__*/React__default.createElement(FIRLandDraw, {
+    icon: /*#__PURE__*/React__default.createElement(DrawFIRLand, {
       className: classes.drawButtons
     }),
-    checkedIcon: /*#__PURE__*/React__default.createElement(FIRLandDraw, {
+    checkedIcon: /*#__PURE__*/React__default.createElement(DrawFIRLand, {
       className: classes.drawButtonsSelected
     }),
     checked: drawMode === MapDrawMode.FIR,
@@ -4618,8 +4617,7 @@ var ContentDialog = function ContentDialog(_a) {
     onClick: handleClose,
     color: "secondary",
     size: "medium",
-    startIcon: /*#__PURE__*/React.createElement(ArrowBackIos, {
-      fontSize: "small",
+    startIcon: /*#__PURE__*/React.createElement(ChevronLeft, {
       color: "secondary"
     }),
     "data-testid": "contentdialog-close"
@@ -4650,14 +4648,12 @@ var getActiveStatus = function getActiveStatus(product, className) {
   }
 
   var active = moment(product.validDateStart) <= moment.utc(new Date());
-  return active ? /*#__PURE__*/React__default.createElement(CheckCircle, {
+  return active ? /*#__PURE__*/React__default.createElement(Success, {
     "data-testid": "status-active",
-    className: className,
-    fontSize: "small"
-  }) : /*#__PURE__*/React__default.createElement(Schedule, {
+    className: className
+  }) : /*#__PURE__*/React__default.createElement(Clock, {
     "data-testid": "status-inactive",
-    className: className,
-    fontSize: "small"
+    className: className
   });
 };
 
@@ -4720,7 +4716,8 @@ var useStyles$2 = makeStyles({
   },
   activeStatus: {
     color: '#72bb23',
-    paddingLeft: '6px'
+    paddingLeft: '6px',
+    paddingTop: '2px'
   },
   font: {
     fontWeight: 'normal'
@@ -4809,11 +4806,10 @@ var ProductListRow = function ProductListRow(_ref) {
       }
     }, TAC),
     placement: "bottom-start"
-  }, /*#__PURE__*/React__default.createElement(InfoOutlined, {
+  }, /*#__PURE__*/React__default.createElement("span", null, /*#__PURE__*/React__default.createElement(Info, {
     "data-testid": "productlistrow-tacicon",
-    color: "secondary",
-    fontSize: "small"
-  }))), /*#__PURE__*/React__default.createElement(Grid, {
+    color: "secondary"
+  })))), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     xs: 9,
     sm: 10,
@@ -4846,8 +4842,7 @@ var ProductListRow = function ProductListRow(_ref) {
   }, product.status === 'DRAFT' ? /*#__PURE__*/React__default.createElement(Button, {
     color: "secondary",
     size: "small",
-    startIcon: /*#__PURE__*/React__default.createElement(Create, {
-      fontSize: "small",
+    startIcon: /*#__PURE__*/React__default.createElement(Edit, {
       color: "secondary"
     })
   }, "Draft") : getStatusTagList(product, cancelsSeqId), product.status === 'PUBLISHED' && cancelsSeqId === null && getActiveStatus(product, classes.activeStatus)))));

package/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@mui/material'), require('react-hook-form'), require('@opengeoweb/form-fields'), require('@opengeoweb/api'), require('immer'), require('react-redux'), require('@opengeoweb/core'), require('@turf/turf'), require('@mui/styles/makeStyles'), require('@opengeoweb/shared'), require('@opengeoweb/icons'), require('moment'), require('lodash'), require('@mui/icons-material')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'react', '@mui/material', 'react-hook-form', '@opengeoweb/form-fields', '@opengeoweb/api', 'immer', 'react-redux', '@opengeoweb/core', '@turf/turf', '@mui/styles/makeStyles', '@opengeoweb/shared', '@opengeoweb/icons', 'moment', 'lodash', '@mui/icons-material'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.SigmetAirmet = {}, global.React, global.material, global.reactHookForm, global.formFields, global.api, global.produce, global.reactRedux, global.core, global.turf, global.makeStyles, global.shared, global.icons, global.moment, global.lodash, global.iconsMaterial));
-})(this, (function (exports, React, material, reactHookForm, formFields, api, produce, reactRedux, core, turf, makeStyles, shared, icons, moment, lodash, iconsMaterial) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@mui/material'), require('react-hook-form'), require('@opengeoweb/form-fields'), require('@opengeoweb/api'), require('immer'), require('react-redux'), require('@opengeoweb/core'), require('@turf/turf'), require('@mui/styles/makeStyles'), require('@opengeoweb/shared'), require('@opengeoweb/theme'), require('moment'), require('lodash')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'react', '@mui/material', 'react-hook-form', '@opengeoweb/form-fields', '@opengeoweb/api', 'immer', 'react-redux', '@opengeoweb/core', '@turf/turf', '@mui/styles/makeStyles', '@opengeoweb/shared', '@opengeoweb/theme', 'moment', 'lodash'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.SigmetAirmet = {}, global.React, global.material, global.reactHookForm, global.formFields, global.api, global.produce, global.reactRedux, global.core, global.turf, global.makeStyles, global.shared, global.theme, global.moment, global.lodash));
+})(this, (function (exports, React, material, reactHookForm, formFields, api, produce, reactRedux, core, turf, makeStyles, shared, theme, moment, lodash) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1300,11 +1300,11 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
         title: "Drop a point as " + type + " position"
       }, /*#__PURE__*/React__default["default"].createElement(material.Radio, {
-        icon: /*#__PURE__*/React__default["default"].createElement(icons.Location, {
+        icon: /*#__PURE__*/React__default["default"].createElement(theme.Location, {
           className: classes.drawButtons
         }),
         value: true,
-        checkedIcon: /*#__PURE__*/React__default["default"].createElement(icons.Location, {
+        checkedIcon: /*#__PURE__*/React__default["default"].createElement(theme.Location, {
           className: classes.drawButtonsSelected
         }),
         checked: drawMode === MapDrawMode.POINT,
@@ -1317,10 +1317,10 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
         title: "Draw a box as " + type + " position"
       }, /*#__PURE__*/React__default["default"].createElement(material.Radio, {
-        icon: /*#__PURE__*/React__default["default"].createElement(icons.RegionDraw, {
+        icon: /*#__PURE__*/React__default["default"].createElement(theme.DrawRegion, {
           className: classes.drawButtons
         }),
-        checkedIcon: /*#__PURE__*/React__default["default"].createElement(icons.RegionDraw, {
+        checkedIcon: /*#__PURE__*/React__default["default"].createElement(theme.DrawRegion, {
           className: classes.drawButtonsSelected
         }),
         checked: drawMode === MapDrawMode.BOX,
@@ -1333,10 +1333,10 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
         title: "Draw a shape as " + type + " position"
       }, /*#__PURE__*/React__default["default"].createElement(material.Radio, {
-        icon: /*#__PURE__*/React__default["default"].createElement(icons.PolygonDraw, {
+        icon: /*#__PURE__*/React__default["default"].createElement(theme.DrawPolygon, {
           className: classes.drawButtons
         }),
-        checkedIcon: /*#__PURE__*/React__default["default"].createElement(icons.PolygonDraw, {
+        checkedIcon: /*#__PURE__*/React__default["default"].createElement(theme.DrawPolygon, {
           className: classes.drawButtonsSelected
         }),
         checked: drawMode === MapDrawMode.POLYGON,
@@ -1349,10 +1349,10 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
         title: "Set FIR as " + type + " position"
       }, /*#__PURE__*/React__default["default"].createElement(material.Radio, {
-        icon: /*#__PURE__*/React__default["default"].createElement(icons.FIRLandDraw, {
+        icon: /*#__PURE__*/React__default["default"].createElement(theme.DrawFIRLand, {
           className: classes.drawButtons
         }),
-        checkedIcon: /*#__PURE__*/React__default["default"].createElement(icons.FIRLandDraw, {
+        checkedIcon: /*#__PURE__*/React__default["default"].createElement(theme.DrawFIRLand, {
           className: classes.drawButtonsSelected
         }),
         checked: drawMode === MapDrawMode.FIR,
@@ -1365,10 +1365,10 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
         title: "Remove geometry"
       }, /*#__PURE__*/React__default["default"].createElement(material.Radio, {
-        icon: /*#__PURE__*/React__default["default"].createElement(icons.Delete, {
+        icon: /*#__PURE__*/React__default["default"].createElement(theme.Delete, {
           className: classes.drawButtons
         }),
-        checkedIcon: /*#__PURE__*/React__default["default"].createElement(icons.Delete, {
+        checkedIcon: /*#__PURE__*/React__default["default"].createElement(theme.Delete, {
           className: classes.drawButtonsSelected
         }),
         checked: drawMode === MapDrawMode.DELETE,
@@ -4523,8 +4523,7 @@
         onClick: handleClose,
         color: "secondary",
         size: "medium",
-        startIcon: /*#__PURE__*/React__namespace.createElement(iconsMaterial.ArrowBackIos, {
-          fontSize: "small",
+        startIcon: /*#__PURE__*/React__namespace.createElement(theme.ChevronLeft, {
           color: "secondary"
         }),
         "data-testid": "contentdialog-close"
@@ -4555,14 +4554,12 @@
       }
 
       var active = moment__default["default"](product.validDateStart) <= moment__default["default"].utc(new Date());
-      return active ? /*#__PURE__*/React__default["default"].createElement(iconsMaterial.CheckCircle, {
+      return active ? /*#__PURE__*/React__default["default"].createElement(theme.Success, {
         "data-testid": "status-active",
-        className: className,
-        fontSize: "small"
-      }) : /*#__PURE__*/React__default["default"].createElement(iconsMaterial.Schedule, {
+        className: className
+      }) : /*#__PURE__*/React__default["default"].createElement(theme.Clock, {
         "data-testid": "status-inactive",
-        className: className,
-        fontSize: "small"
+        className: className
       });
     };
 
@@ -4627,7 +4624,8 @@
       },
       activeStatus: {
         color: '#72bb23',
-        paddingLeft: '6px'
+        paddingLeft: '6px',
+        paddingTop: '2px'
       },
       font: {
         fontWeight: 'normal'
@@ -4711,11 +4709,10 @@
           }
         }, TAC),
         placement: "bottom-start"
-      }, /*#__PURE__*/React__default["default"].createElement(iconsMaterial.InfoOutlined, {
+      }, /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement(theme.Info, {
         "data-testid": "productlistrow-tacicon",
-        color: "secondary",
-        fontSize: "small"
-      }))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        color: "secondary"
+      })))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
         xs: 9,
         sm: 10,
@@ -4748,8 +4745,7 @@
       }, product.status === 'DRAFT' ? /*#__PURE__*/React__default["default"].createElement(material.Button, {
         color: "secondary",
         size: "small",
-        startIcon: /*#__PURE__*/React__default["default"].createElement(iconsMaterial.Create, {
-          fontSize: "small",
+        startIcon: /*#__PURE__*/React__default["default"].createElement(theme.Edit, {
           color: "secondary"
         })
       }, "Draft") : getStatusTagList(product, cancelsSeqId), product.status === 'PUBLISHED' && cancelsSeqId === null && getActiveStatus(product, classes.activeStatus)))));

package/lib/utils/testUtils.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { CreateApi } from '@opengeoweb/api';
-import { Store } from 'redux';
+import { Store } from '@reduxjs/toolkit';
 import { AxiosError } from 'axios';
 interface StoryWrapperProps {
     children: React.ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/sigmet-airmet",
-  "version": "2.9.0",
+  "version": "2.13.0",
   "description": "GeoWeb Sigmet/Airmet library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -15,35 +15,31 @@
     "react-redux": "7.2.2",
     "@mui/material": "^5.2.8",
     "@mui/styles": "^5.2.3",
-    "@opengeoweb/shared": "2.9.0",
-    "@opengeoweb/theme": "2.9.0",
-    "@mui/icons-material": "^5.2.5",
+    "@opengeoweb/shared": "2.13.0",
+    "@opengeoweb/theme": "2.13.0",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "2.9.0",
+    "@opengeoweb/form-fields": "2.13.0",
     "react-hook-form": "^6.12.1",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "@mui/lab": "^5.0.0-alpha.64",
     "axios": "^0.25.0",
-    "@opengeoweb/core": "2.9.0",
+    "@opengeoweb/core": "2.13.0",
     "react-intl": "^5.17.5",
-    "@opengeoweb/webmap": "2.9.0",
+    "@opengeoweb/webmap": "2.13.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",
     "immer": "^9.0.15",
     "redux-dynamic-modules": "^5.2.0",
-    "redux": "^4.0.4",
+    "@reduxjs/toolkit": "^1.8.3",
     "lodash.clonedeep": "^4.5.0",
     "@turf/turf": "^5.1.6",
-    "reselect": "^4.1.5",
     "redux-dynamic-modules-saga": "^5.2.0",
-    "@reduxjs/toolkit": "^1.8.3",
     "redux-saga": "^1.1.3",
-    "@opengeoweb/api": "2.9.0",
-    "@opengeoweb/icons": "2.9.0"
+    "@opengeoweb/api": "2.13.0"
   },
   "peerDependencies": {}
 }