@opengeoweb/taf 3.0.0 → 4.0.0

package/index.esm.js

@@ -9,9 +9,8 @@ import { getDeepProperty, ReactHookFormHiddenInput, ReactHookFormProvider } from
 import { useIsMounted, ToggleMenu, useDraftFormHelpers, ToolContainerDraggable, Avatar, getInitials, useConfirmationDialog, usePreventBrowserClose, ToolButton, ToolHeader, AlertBanner, getErrorMessage as getErrorMessage$1, getWarningMessage, ConfirmationServiceProvider, usePoller, ErrorBoundary } from '@opengeoweb/shared';
 import moment from 'moment';
 import { Add, Delete, Close, DragHandle as DragHandle$1, ThumbsUp, Clock, Cancel, Edit, Success, Export, ListItem, Cached } from '@opengeoweb/theme';
-import makeStyles from '@mui/styles/makeStyles';
 import ReactDOM from 'react-dom';
-import { useApiContext, createApiInstance, ApiProvider } from '@opengeoweb/api';
+import { useApiContext, createApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
 import LinearProgress from '@mui/material/LinearProgress';
 import Box$1 from '@mui/material/Box';
 
@@ -3518,19 +3517,6 @@ var TafFormButtons = function TafFormButtons(_ref2) {
  * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2021 - Finnish Meteorological Institute (FMI)
  * */
-var useStyles = makeStyles(function () {
-  return {
-    dragHandle: {
-      backgroundColor: 'transparent',
-      '&:hover': {
-        backgroundColor: 'transparent'
-      },
-      cursor: function cursor(isSorting) {
-        return isSorting ? 'grabbing' : 'grab';
-      }
-    }
-  };
-});
 
 var DragHandle = function DragHandle(_ref) {
   var _ref$isSorting = _ref.isSorting,
@@ -3538,13 +3524,21 @@ var DragHandle = function DragHandle(_ref) {
       _ref$isDisabled = _ref.isDisabled,
       isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
       index = _ref.index;
-  var classes = useStyles(isSorting);
   return /*#__PURE__*/React__default.createElement(IconButton, {
-    className: "".concat(classes.dragHandle, " handle"),
+    className: "handle",
     "data-testid": "dragHandle-".concat(index),
     disableRipple: true,
     disabled: isDisabled,
-    size: "large"
+    size: "large",
+    sx: {
+      backgroundColor: 'transparent',
+      '&:hover': {
+        backgroundColor: 'transparent'
+      },
+      cursor: function cursor() {
+        return isSorting ? 'grabbing' : 'grab';
+      }
+    }
   }, /*#__PURE__*/React__default.createElement(DragHandle$1, null));
 };
 
@@ -4873,17 +4867,18 @@ var StatusIcon = function StatusIcon(_ref2) {
  * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2022 - Finnish Meteorological Institute (FMI)
  * */
+var TOOLTIP_TITLE = 'Import TAC';
 
 var ExportButton = function ExportButton(_ref) {
   var onClick = _ref.onClick,
       isHidden = _ref.isHidden;
   return isHidden ? null : /*#__PURE__*/React__default.createElement(Tooltip, {
-    title: "Import TAC",
+    title: TOOLTIP_TITLE,
     placement: "left"
-  }, /*#__PURE__*/React__default.createElement("span", null, /*#__PURE__*/React__default.createElement(ToolButton, {
+  }, /*#__PURE__*/React__default.createElement(ToolButton, {
     onClick: onClick,
     "data-testid": "export-tac-button"
-  }, /*#__PURE__*/React__default.createElement(Export, null))));
+  }, /*#__PURE__*/React__default.createElement(Export, null)));
 };
 
 var TacContainer = function TacContainer(_ref) {
@@ -6179,10 +6174,8 @@ var Wrapper = function Wrapper(props) {
   return /*#__PURE__*/React.createElement(TafWrapper, Object.assign({}, props), /*#__PURE__*/React.createElement(TafModule, null));
 };
 
-var createApi$1 = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
-  var axiosInstance = createApiInstance(url, appUrl, auth, setAuth, authTokenUrl, authClientId);
+var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
   return {
-    // api data
     getTafList: function getTafList() {
       return axiosInstance.get('/taflist');
     },
@@ -6200,6 +6193,11 @@ var createApi$1 = function createApi(url, appUrl, auth, setAuth, authTokenUrl, a
   };
 };
 
+var createApi$1 = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
+  var axiosInstance = createApiInstance(url, appUrl, auth, setAuth, authTokenUrl, authClientId);
+  return getApiRoutes$1(axiosInstance);
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7162,21 +7160,6 @@ var fakeAmendmentTaf = {
 
 var fakeTafTac = 'TAF EHAM 0812/0918 20020G35KT 0500 SN BKN040\nBECMG 0814/0816 0700 BKN001=';
 
-var fakePromise = function fakePromise(withRandomError) {
-  var signal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  return new Promise(function (resolve, reject) {
-    var timer = setTimeout(function () {
-      if (!withRandomError) return resolve();
-      var randomError = Math.floor(Math.random() * 4) + 1;
-      return randomError === 4 ? reject(new Error('something went wrong')) : resolve();
-    }, 300);
-    signal === null || signal === void 0 ? void 0 : signal.signal.addEventListener('abort', function () {
-      clearTimeout(timer);
-      reject(new Error('canceled'));
-    });
-  });
-};
-
 var fakeUpdatedTafList = _toConsumableArray(fakeTafList);
 
 var setFakeUpdatedList = function setFakeUpdatedList(newList) {
@@ -7185,26 +7168,13 @@ var setFakeUpdatedList = function setFakeUpdatedList(newList) {
 var getFakeUpdatedList = function getFakeUpdatedList() {
   return fakeUpdatedTafList;
 };
-var fakeAxiosInstance = {
-  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars, @typescript-eslint/explicit-module-boundary-types
-  get: function get(_url, _params) {
-    return fakePromise(false);
-  },
-  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars, @typescript-eslint/explicit-module-boundary-types
-  post: function post(_url, _params, _signal) {
-    return fakePromise(false, _signal);
-  },
-  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars, @typescript-eslint/explicit-module-boundary-types
-  patch: function patch(_url, _params, _signal) {
-    return fakePromise(false, _signal);
-  }
-};
-var createApi = function createApi() {
+
+var getApiRoutes = function getApiRoutes(axiosInstance) {
   return {
     getTafList: function getTafList() {
       // eslint-disable-next-line no-console
       console.log('Retrieving new TAF list');
-      return fakeAxiosInstance.get('/taflist').then(function () {
+      return axiosInstance.get('/taflist').then(function () {
         return {
           data: getFakeUpdatedList()
         };
@@ -7215,10 +7185,10 @@ var createApi = function createApi() {
       console.log("The new status of the taf will be ".concat(_postTaf.changeStatusTo)); // eslint-disable-next-line no-console
 
       console.log('form has been posted with following values:', _postTaf.taf);
-      return fakeAxiosInstance.post('/taf', _postTaf);
+      return axiosInstance.post('/taf', _postTaf);
     },
-    getTAC: function getTAC(tafData, signal) {
-      return fakeAxiosInstance.post.apply(fakeAxiosInstance, ['/taf2tac'].concat([Object.assign({}, tafData)].concat(_toConsumableArray(signal ? [{
+    getTAC: function getTAC(taf, signal) {
+      return axiosInstance.post.apply(axiosInstance, ['/taf2tac'].concat([Object.assign({}, taf)].concat(_toConsumableArray(signal ? [{
         signal: signal
       }] : [])))).then(function () {
         return {
@@ -7239,11 +7209,16 @@ var createApi = function createApi() {
       setFakeUpdatedList(updatedList); // eslint-disable-next-line no-console
 
       console.log("The new editor of the taf will be ".concat(_patchTaf.editor || 'empty'));
-      return fakeAxiosInstance.patch('/taf', _patchTaf);
+      return axiosInstance.patch('/taf', _patchTaf);
     }
   };
 };
 
+var createApi = function createApi() {
+  var instance = createFakeApiInstance();
+  return getApiRoutes(instance);
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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-sortablejs'), require('lodash'), require('@opengeoweb/authentication'), require('@opengeoweb/form-fields'), require('@opengeoweb/shared'), require('moment'), require('@opengeoweb/theme'), require('@mui/styles/makeStyles'), 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-sortablejs', 'lodash', '@opengeoweb/authentication', '@opengeoweb/form-fields', '@opengeoweb/shared', 'moment', '@opengeoweb/theme', '@mui/styles/makeStyles', '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.reactSortablejs, global.lodash, global.authentication, global.formFields, global.shared, global.moment, global.theme, global.makeStyles, global.ReactDOM, global.api, global.LinearProgress, global.Box));
-})(this, (function (exports, React, material, reactHookForm, reactSortablejs, lodash, authentication, formFields, shared, moment, theme, makeStyles, 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-sortablejs'), require('lodash'), require('@opengeoweb/authentication'), require('@opengeoweb/form-fields'), require('@opengeoweb/shared'), 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-sortablejs', 'lodash', '@opengeoweb/authentication', '@opengeoweb/form-fields', '@opengeoweb/shared', '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.reactSortablejs, global.lodash, global.authentication, global.formFields, global.shared, global.moment, global.theme, global.ReactDOM, global.api, global.LinearProgress, global.Box));
+})(this, (function (exports, React, material, reactHookForm, reactSortablejs, lodash, authentication, formFields, shared, moment, theme, ReactDOM, api, LinearProgress, Box) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -27,7 +27,6 @@
     var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     var React__namespace = /*#__PURE__*/_interopNamespace(React);
     var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
-    var makeStyles__default = /*#__PURE__*/_interopDefaultLegacy(makeStyles);
     var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
     var LinearProgress__default = /*#__PURE__*/_interopDefaultLegacy(LinearProgress);
     var Box__default = /*#__PURE__*/_interopDefaultLegacy(Box);
@@ -3515,19 +3514,6 @@
      * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
      * Copyright 2021 - Finnish Meteorological Institute (FMI)
      * */
-    var useStyles = makeStyles__default["default"](function () {
-      return {
-        dragHandle: {
-          backgroundColor: 'transparent',
-          '&:hover': {
-            backgroundColor: 'transparent'
-          },
-          cursor: function cursor(isSorting) {
-            return isSorting ? 'grabbing' : 'grab';
-          }
-        }
-      };
-    });
 
     var DragHandle = function DragHandle(_a) {
       var _b = _a.isSorting,
@@ -3535,13 +3521,21 @@
           _c = _a.isDisabled,
           isDisabled = _c === void 0 ? false : _c,
           index = _a.index;
-      var classes = useStyles(isSorting);
       return /*#__PURE__*/React__default["default"].createElement(material.IconButton, {
-        className: classes.dragHandle + " handle",
+        className: "handle",
         "data-testid": "dragHandle-" + index,
         disableRipple: true,
         disabled: isDisabled,
-        size: "large"
+        size: "large",
+        sx: {
+          backgroundColor: 'transparent',
+          '&:hover': {
+            backgroundColor: 'transparent'
+          },
+          cursor: function cursor() {
+            return isSorting ? 'grabbing' : 'grab';
+          }
+        }
       }, /*#__PURE__*/React__default["default"].createElement(theme.DragHandle, null));
     };
 
@@ -4845,17 +4839,18 @@
      * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
      * Copyright 2022 - Finnish Meteorological Institute (FMI)
      * */
+    var TOOLTIP_TITLE = 'Import TAC';
 
     var ExportButton = function ExportButton(_a) {
       var onClick = _a.onClick,
           isHidden = _a.isHidden;
       return isHidden ? null : /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
-        title: "Import TAC",
+        title: TOOLTIP_TITLE,
         placement: "left"
-      }, /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement(shared.ToolButton, {
+      }, /*#__PURE__*/React__default["default"].createElement(shared.ToolButton, {
         onClick: onClick,
         "data-testid": "export-tac-button"
-      }, /*#__PURE__*/React__default["default"].createElement(theme.Export, null))));
+      }, /*#__PURE__*/React__default["default"].createElement(theme.Export, null)));
     };
 
     /* *
@@ -6167,10 +6162,8 @@
       return /*#__PURE__*/React__namespace.createElement(TafWrapper, __assign({}, props), /*#__PURE__*/React__namespace.createElement(TafModule, null));
     };
 
-    var createApi$1 = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
-      var axiosInstance = api.createApiInstance(url, appUrl, auth, setAuth, authTokenUrl, authClientId);
+    var getApiRoutes$1 = function getApiRoutes(axiosInstance) {
       return {
-        // api data
         getTafList: function getTafList() {
           return axiosInstance.get('/taflist');
         },
@@ -6188,6 +6181,11 @@
       };
     };
 
+    var createApi$1 = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
+      var axiosInstance = api.createApiInstance(url, appUrl, auth, setAuth, authTokenUrl, authClientId);
+      return getApiRoutes$1(axiosInstance);
+    };
+
     /* *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
@@ -7147,24 +7145,6 @@
 
     var fakeTafTac = 'TAF EHAM 0812/0918 20020G35KT 0500 SN BKN040\nBECMG 0814/0816 0700 BKN001=';
 
-    var fakePromise = function fakePromise(withRandomError, signal) {
-      if (signal === void 0) {
-        signal = null;
-      }
-
-      return new Promise(function (resolve, reject) {
-        var timer = setTimeout(function () {
-          if (!withRandomError) return resolve();
-          var randomError = Math.floor(Math.random() * 4) + 1;
-          return randomError === 4 ? reject(new Error('something went wrong')) : resolve();
-        }, 300);
-        signal === null || signal === void 0 ? void 0 : signal.signal.addEventListener('abort', function () {
-          clearTimeout(timer);
-          reject(new Error('canceled'));
-        });
-      });
-    };
-
     var fakeUpdatedTafList = __spreadArray([], __read(fakeTafList));
 
     var setFakeUpdatedList = function setFakeUpdatedList(newList) {
@@ -7173,26 +7153,13 @@
     var getFakeUpdatedList = function getFakeUpdatedList() {
       return fakeUpdatedTafList;
     };
-    var fakeAxiosInstance = {
-      // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars, @typescript-eslint/explicit-module-boundary-types
-      get: function get(_url, _params) {
-        return fakePromise(false);
-      },
-      // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars, @typescript-eslint/explicit-module-boundary-types
-      post: function post(_url, _params, _signal) {
-        return fakePromise(false, _signal);
-      },
-      // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars, @typescript-eslint/explicit-module-boundary-types
-      patch: function patch(_url, _params, _signal) {
-        return fakePromise(false, _signal);
-      }
-    };
-    var createApi = function createApi() {
+
+    var getApiRoutes = function getApiRoutes(axiosInstance) {
       return {
         getTafList: function getTafList() {
           // eslint-disable-next-line no-console
           console.log('Retrieving new TAF list');
-          return fakeAxiosInstance.get('/taflist').then(function () {
+          return axiosInstance.get('/taflist').then(function () {
             return {
               data: getFakeUpdatedList()
             };
@@ -7203,10 +7170,10 @@
           console.log("The new status of the taf will be " + _postTaf.changeStatusTo); // eslint-disable-next-line no-console
 
           console.log('form has been posted with following values:', _postTaf.taf);
-          return fakeAxiosInstance.post('/taf', _postTaf);
+          return axiosInstance.post('/taf', _postTaf);
         },
-        getTAC: function getTAC(tafData, signal) {
-          return fakeAxiosInstance.post.apply(fakeAxiosInstance, __spreadArray(['/taf2tac'], __read(__spreadArray([__assign({}, tafData)], __read(signal ? [{
+        getTAC: function getTAC(taf, signal) {
+          return axiosInstance.post.apply(axiosInstance, __spreadArray(['/taf2tac'], __read(__spreadArray([__assign({}, taf)], __read(signal ? [{
             signal: signal
           }] : []))))).then(function () {
             return {
@@ -7227,11 +7194,16 @@
           setFakeUpdatedList(updatedList); // eslint-disable-next-line no-console
 
           console.log("The new editor of the taf will be " + (_patchTaf.editor || 'empty'));
-          return fakeAxiosInstance.patch('/taf', _patchTaf);
+          return axiosInstance.patch('/taf', _patchTaf);
         }
       };
     };
 
+    var createApi = function createApi() {
+      var instance = api.createFakeApiInstance();
+      return getApiRoutes(instance);
+    };
+
     /* *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.

package/lib/components/TafForm/TafFormRow/DragHandle.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
-export declare const useStyles: (props?: any) => import("@mui/styles/withStyles").ClassNameMap<"dragHandle">;
-interface DragHandleProps {
+export interface DragHandleProps {
     isSorting?: boolean;
     isDisabled?: boolean;
     index: number;

package/lib/components/TafLayout/TacOverview/ExportButton.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+export declare const TOOLTIP_TITLE = "Import TAC";
 interface ExportButtonProps {
     onClick: () => void;
     isHidden: boolean;

package/lib/utils/api.d.ts

@@ -1,2 +1,13 @@
 import { Credentials } from '@opengeoweb/api';
-export declare const createApi: (url: string, appUrl: string, auth: Credentials, setAuth: (cred: Credentials) => void, authTokenUrl: string, authClientId: string) => any;
+import { Taf, TafFromBackend, TafFromFrontEnd } from '../types';
+export declare type TafApi = {
+    getTafList: () => Promise<{
+        data: TafFromBackend[];
+    }>;
+    postTaf: (formData: TafFromFrontEnd) => Promise<void>;
+    getTAC: (tafData: Taf, signal?: AbortSignal) => Promise<{
+        data: string;
+    }>;
+    patchTaf: (formData: TafFromFrontEnd) => Promise<void>;
+};
+export declare const createApi: (url: string, appUrl: string, auth: Credentials, setAuth: (cred: Credentials) => void, authTokenUrl: string, authClientId: string) => TafApi;

package/lib/utils/fakeApi.d.ts

@@ -1,10 +1,6 @@
 import { TafFromBackend } from '../types';
+import { TafApi } from './api';
 export declare const fakeTafTac = "TAF EHAM 0812/0918 20020G35KT 0500 SN BKN040\nBECMG 0814/0816 0700 BKN001=";
 export declare const setFakeUpdatedList: (newList: TafFromBackend[]) => void;
 export declare const getFakeUpdatedList: () => TafFromBackend[];
-export declare const fakeAxiosInstance: {
-    get: (_url: any, _params?: any) => Promise<void>;
-    post: (_url: any, _params?: any, _signal?: any) => Promise<void>;
-    patch: (_url: any, _params?: any, _signal?: any) => Promise<void>;
-};
-export declare const createApi: () => any;
+export declare const createApi: () => TafApi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,22 +13,21 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/api": "3.0.0",
+    "@opengeoweb/api": "4.0.0",
     "axios": "^0.25.0",
-    "@opengeoweb/shared": "3.0.0",
+    "@opengeoweb/shared": "4.0.0",
     "@mui/material": "^5.2.8",
-    "@opengeoweb/theme": "3.0.0",
-    "@mui/styles": "^5.2.3",
+    "@opengeoweb/theme": "4.0.0",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "3.0.0",
+    "@opengeoweb/form-fields": "4.0.0",
     "react-hook-form": "^6.12.1",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
     "@mui/lab": "^5.0.0-alpha.64",
     "react-dom": "^17.0.2",
-    "@opengeoweb/authentication": "3.0.0",
+    "@opengeoweb/authentication": "4.0.0",
     "react-router-dom": "^5.2.0",
     "query-string": "^6.13.7",
     "react-sortablejs": "^6.0.0",