@opengeoweb/taf 4.2.0 → 4.3.0

package/index.esm.js

@@ -3,7 +3,8 @@ import React__default from 'react';
 import { TextField, Grid, Box, Button, IconButton, Tooltip, Chip, Typography, FormLabel, Switch, 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, Sortable } from 'react-sortablejs';
+import { ReactSortable } from 'react-sortablejs';
+import Sortable from 'sortablejs';
 import { isEqual } from 'lodash';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { getDeepProperty, ReactHookFormHiddenInput, ReactHookFormProvider } from '@opengeoweb/form-fields';
@@ -3069,9 +3070,9 @@ var TafFormRow = /*#__PURE__*/React__default.forwardRef(function (_a, ref) {
     justifyContent: "flex-start",
     "data-testid": "row-".concat(namePrefix),
     container: true,
-    ref: ref,
-    columns: 24
+    ref: ref
   }, props), /*#__PURE__*/React__default.createElement(Grid, {
+    columns: 24,
     item: true,
     container: true,
     justifyContent: "flex-end",
@@ -3342,7 +3343,8 @@ var TafFormRow = /*#__PURE__*/React__default.forwardRef(function (_a, ref) {
     sm: 1,
     sx: {
       marginBottom: '16px'
-    }
+    },
+    columns: 24
   }, /*#__PURE__*/React__default.createElement(TafFormOptionsButton, {
     isChangeGroup: isChangeGroup,
     addChangeGroupBelow: addChangeGroupBelow,
@@ -3461,6 +3463,7 @@ var TafFormButtons = function TafFormButtons(_ref2) {
     item: true,
     container: true,
     justifyContent: "flex-end",
+    columns: 24,
     xs: 24,
     sm: 23
   }, isFormDisabled ? /*#__PURE__*/React__default.createElement(ViewModeButtons, {
@@ -3501,6 +3504,7 @@ var TafFormButtons = function TafFormButtons(_ref2) {
     }
   }, "Publish"))), /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
+    columns: 24,
     sm: 1
   }));
 };
@@ -4058,7 +4062,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
   var isFormDirty = formState.isDirty,
       errors = formState.errors;
   usePreventBrowserClose(isFormDirty && !isDisabled);
-  var hiddenInputFields = ['baseTime', 'issueDate', 'type', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd'];
+  var hiddenInputFields = ['baseTime', 'issueDate', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd'];
 
   var _React$useState = React__default.useState(getValues()),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -6436,7 +6440,6 @@ var fakeTafList = [{
     validDateEnd: upcomingValidDateEnd,
     location: 'EHAM',
     status: 'NEW',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6456,7 +6459,6 @@ var fakeTafList = [{
     validDateEnd: upcomingValidDateEnd,
     location: 'EHRD',
     status: 'DRAFT',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6485,7 +6487,6 @@ var fakeTafList = [{
     previousValidDateEnd: upcomingValidDateEnd,
     location: 'EHLE',
     status: 'DRAFT_AMENDED',
-    type: 'NORMAL',
     messageType: 'AMD',
     baseForecast: {
       valid: {
@@ -6544,7 +6545,6 @@ var fakeTafList = [{
     previousValidDateEnd: upcomingValidDateEnd,
     location: 'EHLE',
     status: 'CORRECTED',
-    type: 'NORMAL',
     messageType: 'COR',
     baseForecast: {
       valid: {
@@ -6612,7 +6612,6 @@ var fakeTafList = [{
     validDateEnd: upcomingValidDateEnd,
     location: 'EHGG',
     status: 'PUBLISHED',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6671,7 +6670,6 @@ var fakeTafList = [{
     previousValidDateEnd: upcomingValidDateEnd,
     location: 'EHBK',
     status: 'CANCELLED',
-    type: 'NORMAL',
     messageType: 'CNL',
     baseForecast: {
       valid: {
@@ -6713,7 +6711,6 @@ var fakeTafList = [{
     previousValidDateEnd: upcomingValidDateEnd,
     location: 'TNCB',
     status: 'AMENDED',
-    type: 'NORMAL',
     messageType: 'AMD',
     baseForecast: {
       valid: {
@@ -6752,7 +6749,6 @@ var fakeTafList = [{
     validDateEnd: currentValidDateEnd,
     location: 'EHAM',
     status: 'PUBLISHED',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6791,7 +6787,6 @@ var fakeTafList = [{
     validDateEnd: currentValidDateEnd,
     location: 'EHRD',
     status: 'NEW',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6812,7 +6807,6 @@ var fakeTafList = [{
     validDateEnd: currentValidDateEnd,
     location: 'EHLE',
     status: 'NEW',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6833,7 +6827,6 @@ var fakeTafList = [{
     validDateEnd: currentValidDateEnd,
     location: 'EHGG',
     status: 'NEW',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6854,7 +6847,6 @@ var fakeTafList = [{
     validDateEnd: currentValidDateEnd,
     location: 'EHBK',
     status: 'NEW',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6875,7 +6867,6 @@ var fakeTafList = [{
     validDateEnd: currentValidDateEnd,
     location: 'TNCB',
     status: 'NEW',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6896,7 +6887,6 @@ var fakeTafList = [{
     validDateEnd: expiredValidDateEnd,
     location: 'EHAM',
     status: 'EXPIRED',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -6954,7 +6944,6 @@ var fakeNewTaf = {
   canbe: ['DRAFTED', 'DISCARDED', 'PUBLISHED'],
   editor: null,
   taf: {
-    type: 'NORMAL',
     messageType: 'ORG',
     status: 'NEW',
     uuid: '5f9583fjdf0445332f337925',
@@ -6998,7 +6987,6 @@ var fakePublishedTaf = {
     validDateEnd: "".concat(tomorrowDate, "T18:00:00Z"),
     location: 'EHLE',
     status: 'PUBLISHED',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -7140,7 +7128,6 @@ var fakeDraftTaf = {
     validDateEnd: "".concat(tomorrowDate, "T23:59:00Z"),
     location: 'EHLE',
     status: 'DRAFT',
-    type: 'NORMAL',
     messageType: 'ORG',
     baseForecast: {
       valid: {
@@ -7198,7 +7185,6 @@ var fakeDraftAmendmentTaf = {
     previousValidDateEnd: "".concat(tomorrowDate, "T18:00:00Z"),
     location: 'EHAM',
     status: 'DRAFT_AMENDED',
-    type: 'NORMAL',
     messageType: 'AMD',
     baseForecast: {
       valid: {
@@ -7279,7 +7265,6 @@ var fakeAmendmentTaf = {
     previousValidDateEnd: "".concat(tomorrowDate, "T18:00:00Z"),
     location: 'EHAM',
     status: 'AMENDED',
-    type: 'NORMAL',
     messageType: 'AMD',
     baseForecast: {
       valid: {

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('react-redux'), require('react-sortablejs'), require('lodash'), require('@opengeoweb/authentication'), require('@opengeoweb/form-fields'), require('@opengeoweb/shared'), require('@opengeoweb/core'), require('moment'), require('@opengeoweb/theme'), require('react-dom'), require('@opengeoweb/api'), require('@mui/material/LinearProgress'), require('@mui/material/Box')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'react', '@mui/material', 'react-hook-form', 'react-redux', 'react-sortablejs', 'lodash', '@opengeoweb/authentication', '@opengeoweb/form-fields', '@opengeoweb/shared', '@opengeoweb/core', 'moment', '@opengeoweb/theme', 'react-dom', '@opengeoweb/api', '@mui/material/LinearProgress', '@mui/material/Box'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Taf = {}, global.React, global.material, global.reactHookForm, global.reactRedux, global.reactSortablejs, global.lodash, global.authentication, global.formFields, global.shared, global.core, global.moment, global.theme, global.ReactDOM, global.api, global.LinearProgress, global.Box));
-})(this, (function (exports, React, material, reactHookForm, reactRedux, reactSortablejs, lodash, authentication, formFields, shared, core, moment, theme, ReactDOM, api, LinearProgress, Box) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@mui/material'), require('react-hook-form'), require('react-redux'), require('react-sortablejs'), require('sortablejs'), require('lodash'), require('@opengeoweb/authentication'), require('@opengeoweb/form-fields'), require('@opengeoweb/shared'), require('@opengeoweb/core'), require('moment'), require('@opengeoweb/theme'), require('react-dom'), require('@opengeoweb/api'), require('@mui/material/LinearProgress'), require('@mui/material/Box')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'react', '@mui/material', 'react-hook-form', 'react-redux', 'react-sortablejs', 'sortablejs', 'lodash', '@opengeoweb/authentication', '@opengeoweb/form-fields', '@opengeoweb/shared', '@opengeoweb/core', 'moment', '@opengeoweb/theme', 'react-dom', '@opengeoweb/api', '@mui/material/LinearProgress', '@mui/material/Box'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Taf = {}, global.React, global.material, global.reactHookForm, global.reactRedux, global.reactSortablejs, global.Sortable, global.lodash, global.authentication, global.formFields, global.shared, global.core, global.moment, global.theme, global.ReactDOM, global.api, global.LinearProgress, global.Box));
+})(this, (function (exports, React, material, reactHookForm, reactRedux, reactSortablejs, Sortable, lodash, authentication, formFields, shared, core, moment, theme, ReactDOM, api, LinearProgress, Box) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,6 +26,7 @@
 
     var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     var React__namespace = /*#__PURE__*/_interopNamespace(React);
+    var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
     var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
     var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
     var LinearProgress__default = /*#__PURE__*/_interopDefaultLegacy(LinearProgress);
@@ -3066,9 +3067,9 @@
         justifyContent: "flex-start",
         "data-testid": "row-" + namePrefix,
         container: true,
-        ref: ref,
-        columns: 24
+        ref: ref
       }, props), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        columns: 24,
         item: true,
         container: true,
         justifyContent: "flex-end",
@@ -3339,7 +3340,8 @@
         sm: 1,
         sx: {
           marginBottom: '16px'
-        }
+        },
+        columns: 24
       }, /*#__PURE__*/React__default["default"].createElement(TafFormOptionsButton, {
         isChangeGroup: isChangeGroup,
         addChangeGroupBelow: addChangeGroupBelow,
@@ -3458,6 +3460,7 @@
         item: true,
         container: true,
         justifyContent: "flex-end",
+        columns: 24,
         xs: 24,
         sm: 23
       }, isFormDisabled ? /*#__PURE__*/React__default["default"].createElement(ViewModeButtons, {
@@ -3498,6 +3501,7 @@
         }
       }, "Publish"))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
+        columns: 24,
         sm: 1
       }));
     };
@@ -4024,7 +4028,7 @@
       var isFormDirty = formState.isDirty,
           errors = formState.errors;
       shared.usePreventBrowserClose(isFormDirty && !isDisabled);
-      var hiddenInputFields = ['baseTime', 'issueDate', 'type', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd'];
+      var hiddenInputFields = ['baseTime', 'issueDate', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd'];
 
       var _l = __read(React__default["default"].useState(getValues()), 2),
           delayedFormValues = _l[0],
@@ -4519,7 +4523,7 @@
         forceFallback: true,
         onStart: function onStart(event) {
           onStartDrag(event);
-          reactSortablejs.Sortable.ghost.style.opacity = '1';
+          Sortable__default["default"].ghost.style.opacity = '1';
         }
       }, fields.map(function (item, index) {
         return /*#__PURE__*/React__default["default"].createElement(TafFormRow, {
@@ -6414,7 +6418,6 @@
         validDateEnd: upcomingValidDateEnd,
         location: 'EHAM',
         status: 'NEW',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6434,7 +6437,6 @@
         validDateEnd: upcomingValidDateEnd,
         location: 'EHRD',
         status: 'DRAFT',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6463,7 +6465,6 @@
         previousValidDateEnd: upcomingValidDateEnd,
         location: 'EHLE',
         status: 'DRAFT_AMENDED',
-        type: 'NORMAL',
         messageType: 'AMD',
         baseForecast: {
           valid: {
@@ -6522,7 +6523,6 @@
         previousValidDateEnd: upcomingValidDateEnd,
         location: 'EHLE',
         status: 'CORRECTED',
-        type: 'NORMAL',
         messageType: 'COR',
         baseForecast: {
           valid: {
@@ -6590,7 +6590,6 @@
         validDateEnd: upcomingValidDateEnd,
         location: 'EHGG',
         status: 'PUBLISHED',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6649,7 +6648,6 @@
         previousValidDateEnd: upcomingValidDateEnd,
         location: 'EHBK',
         status: 'CANCELLED',
-        type: 'NORMAL',
         messageType: 'CNL',
         baseForecast: {
           valid: {
@@ -6691,7 +6689,6 @@
         previousValidDateEnd: upcomingValidDateEnd,
         location: 'TNCB',
         status: 'AMENDED',
-        type: 'NORMAL',
         messageType: 'AMD',
         baseForecast: {
           valid: {
@@ -6730,7 +6727,6 @@
         validDateEnd: currentValidDateEnd,
         location: 'EHAM',
         status: 'PUBLISHED',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6769,7 +6765,6 @@
         validDateEnd: currentValidDateEnd,
         location: 'EHRD',
         status: 'NEW',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6790,7 +6785,6 @@
         validDateEnd: currentValidDateEnd,
         location: 'EHLE',
         status: 'NEW',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6811,7 +6805,6 @@
         validDateEnd: currentValidDateEnd,
         location: 'EHGG',
         status: 'NEW',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6832,7 +6825,6 @@
         validDateEnd: currentValidDateEnd,
         location: 'EHBK',
         status: 'NEW',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6853,7 +6845,6 @@
         validDateEnd: currentValidDateEnd,
         location: 'TNCB',
         status: 'NEW',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6874,7 +6865,6 @@
         validDateEnd: expiredValidDateEnd,
         location: 'EHAM',
         status: 'EXPIRED',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -6932,7 +6922,6 @@
       canbe: ['DRAFTED', 'DISCARDED', 'PUBLISHED'],
       editor: null,
       taf: {
-        type: 'NORMAL',
         messageType: 'ORG',
         status: 'NEW',
         uuid: '5f9583fjdf0445332f337925',
@@ -6976,7 +6965,6 @@
         validDateEnd: tomorrowDate + "T18:00:00Z",
         location: 'EHLE',
         status: 'PUBLISHED',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -7118,7 +7106,6 @@
         validDateEnd: tomorrowDate + "T23:59:00Z",
         location: 'EHLE',
         status: 'DRAFT',
-        type: 'NORMAL',
         messageType: 'ORG',
         baseForecast: {
           valid: {
@@ -7176,7 +7163,6 @@
         previousValidDateEnd: tomorrowDate + "T18:00:00Z",
         location: 'EHAM',
         status: 'DRAFT_AMENDED',
-        type: 'NORMAL',
         messageType: 'AMD',
         baseForecast: {
           valid: {
@@ -7257,7 +7243,6 @@
         previousValidDateEnd: tomorrowDate + "T18:00:00Z",
         location: 'EHAM',
         status: 'AMENDED',
-        type: 'NORMAL',
         messageType: 'AMD',
         baseForecast: {
           valid: {

package/lib/types.d.ts

@@ -69,10 +69,8 @@ export interface BaseTaf {
 export declare type TafStatus = 'NEW' | 'DRAFT' | 'DRAFT_AMENDED' | 'DRAFT_CORRECTED' | 'PUBLISHED' | 'CORRECTED' | 'AMENDED' | 'CANCELLED' | 'EXPIRED';
 export declare type TafActions = 'NEW' | 'DRAFT' | 'DRAFT_AMEND' | 'DRAFT_CORRECT' | 'PUBLISH' | 'CANCEL' | 'CORRECT' | 'AMEND' | 'CLOSE' | 'DISCARD';
 export declare type TafCanbe = 'DRAFTED' | 'DISCARDED' | 'PUBLISHED' | 'CANCELLED' | 'AMENDED' | 'CORRECTED';
-export declare type TafType = 'NORMAL' | 'TEST' | 'EXERCISE';
 export interface Taf extends BaseTaf {
     status: TafStatus;
-    type: TafType;
 }
 export interface BaseForecastFormData {
     valid: string;
@@ -110,7 +108,6 @@ export interface TafFormData {
     uuid: string;
     issueDate?: string;
     status: TafStatus;
-    type: TafType;
 }
 /**
  * Type with TAF info from the backend

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,26 +12,27 @@
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/core": "4.2.0",
+    "@opengeoweb/core": "4.3.0",
     "react": "^17.0.2",
-    "@opengeoweb/theme": "4.2.0",
-    "@mui/material": "^5.2.8",
+    "@opengeoweb/theme": "4.3.0",
+    "@mui/material": "^5.10.8",
     "moment": "^2.29.0",
     "react-redux": "^8.0.2",
     "react-intl": "^5.17.5",
     "lodash": "^4.17.20",
-    "@opengeoweb/shared": "4.2.0",
-    "react-draggable": "^4.4.3",
+    "@opengeoweb/shared": "4.3.0",
+    "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
-    "@opengeoweb/form-fields": "4.2.0",
+    "@opengeoweb/form-fields": "4.3.0",
     "react-hook-form": "^6.12.1",
     "moment-timezone": "^0.5.31",
-    "@mui/lab": "^5.0.0-alpha.64",
+    "@mui/x-date-pickers": "^5.0.4",
     "axios": "^0.25.0",
-    "@opengeoweb/webmap": "4.2.0",
+    "@opengeoweb/webmap": "4.3.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "react-sortablejs": "^6.0.0",
+    "react-sortablejs": "^6.1.4",
+    "sortablejs": "^1.15.0",
     "react-window": "^1.8.7",
     "redux-dynamic-modules": "^5.2.0",
     "immer": "^9.0.15",
@@ -40,11 +41,10 @@
     "@turf/turf": "^5.1.6",
     "redux-dynamic-modules-saga": "^5.2.0",
     "redux-saga": "^1.1.3",
-    "@opengeoweb/api": "4.2.0",
+    "@opengeoweb/api": "4.3.0",
     "react-dom": "^17.0.2",
-    "@opengeoweb/authentication": "4.2.0",
-    "react-router-dom": "^5.2.0",
-    "query-string": "^6.13.7",
-    "sortablejs": "^1.14.0"
+    "@opengeoweb/authentication": "4.3.0",
+    "react-router-dom": "^6.4.2",
+    "query-string": "^6.13.7"
   }
 }