@opengeoweb/taf 2.15.0 → 3.0.0

package/index.esm.js

@@ -6,7 +6,7 @@ import { ReactSortable, Sortable } from 'react-sortablejs';
 import { isEqual } from 'lodash';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { getDeepProperty, ReactHookFormHiddenInput, ReactHookFormProvider } from '@opengeoweb/form-fields';
-import { useIsMounted, ToggleMenu, useDraftFormHelpers, ToolContainerDraggable, Avatar, getInitials, useConfirmationDialog, usePreventBrowserClose, ToolButton, ToolHeader, AlertBanner, getErrorMessage as getErrorMessage$1, ConfirmationServiceProvider, usePoller, ErrorBoundary } from '@opengeoweb/shared';
+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';
@@ -4025,7 +4025,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
       auth = _useAuthenticationCon.auth;
 
   var isEditor = editor === (auth === null || auth === void 0 ? void 0 : auth.username) || false;
-  var isDefaultDisabled = getIsFormDefaultDisabled(tafFromBackend.taf.status);
+  var isDefaultDisabled = getIsFormDefaultDisabled(originalTaf.status);
   var confirmDialog = useConfirmationDialog();
 
   var _useDraftFormHelpers = useDraftFormHelpers(true),
@@ -4116,14 +4116,14 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
   var resetFormValues = function resetFormValues() {
     var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
     var shouldAddEmptyChangGroup = arguments.length > 1 ? arguments[1] : undefined;
-    var newTaf = prepareTafValues(tafFromBackend.taf, action, shouldAddEmptyChangGroup);
+    var newTaf = prepareTafValues(originalTaf, action, shouldAddEmptyChangGroup);
     reset(newTaf);
   };
 
   var resetForm = function resetForm() {
     var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
     var resetDisabled = arguments.length > 1 ? arguments[1] : undefined;
-    var shouldAddEmptyChangGroup = !(tafFromBackend.taf && tafFromBackend.taf.changeGroups) && !resetDisabled;
+    var shouldAddEmptyChangGroup = !(originalTaf && originalTaf.changeGroups) && !resetDisabled;
     resetFormValues(action, shouldAddEmptyChangGroup);
     setIsDisabled(resetDisabled);
     setTafAction(action);
@@ -4293,7 +4293,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
                 switch (_context4.prev = _context4.next) {
                   case 0:
                     _context4.next = 2;
-                    return onFormAction(action, convertTafValuesToObject(prepareTafValues(tafFromBackend.taf, action)));
+                    return onFormAction(action, convertTafValuesToObject(prepareTafValues(originalTaf, action)));
 
                   case 2:
                   case "end":
@@ -4399,7 +4399,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
 
   React__default.useEffect(function () {
     setIsDisabled(!isEditor || isDefaultDisabled);
-    var defaultValues = prepareTafValues(tafFromBackend.taf, undefined, !isDefaultDisabled && !tafFromBackend.taf.changeGroups); // set initial form values
+    var defaultValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled && !originalTaf.changeGroups); // set initial form values
 
     reset(defaultValues); // set validate flag to validate after the values have been set
 
@@ -4429,10 +4429,12 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
     }; // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   React__default.useEffect(function () {
-    var newValues = prepareTafValues(tafFromBackend.taf, undefined, !isDefaultDisabled && !tafFromBackend.taf.changeGroups); // set new form values when tafFromBackend changed
+    var newValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled && !originalTaf.changeGroups); // set new form values when taf values changed
 
-    reset(newValues); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tafFromBackend]);
+    reset(newValues); // reset TAC when taf values changed
+
+    resetTAC(); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [originalTaf]);
   React__default.useEffect(function () {
     // update disabled state when editor changed
     setIsDisabled(!isEditor || isDefaultDisabled); // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -4440,8 +4442,8 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
   React__default.useEffect(function () {
     if (shouldValidate && !isDisabled) {
       // trigger validation on all changegroup validity times after form is enabled since they could be outside the new validity period
-      var _tafFromBackend$taf$c = tafFromBackend.taf.changeGroups,
-          changeGroups = _tafFromBackend$taf$c === void 0 ? [] : _tafFromBackend$taf$c;
+      var _originalTaf$changeGr = originalTaf.changeGroups,
+          changeGroups = _originalTaf$changeGr === void 0 ? [] : _originalTaf$changeGr;
       var validFields = changeGroups.map(function (_field, index) {
         return "changeGroups[".concat(index, "].valid");
       });
@@ -4622,14 +4624,16 @@ var TabPanel = function TabPanel(_a) {
  * */
 
 var TafHeader = function TafHeader(_ref) {
-  var title = _ref.title;
+  var title = _ref.title,
+      _ref$sx = _ref.sx,
+      sx = _ref$sx === void 0 ? {} : _ref$sx;
   return /*#__PURE__*/React__default.createElement(Typography, {
-    sx: {
+    sx: Object.assign({
       textAlign: 'center',
       fontWeight: 500,
       paddingTop: '6px',
       textTransform: 'capitalize'
-    }
+    }, sx)
   }, title);
 };
 
@@ -5400,9 +5404,21 @@ var fromActionToStatus = function fromActionToStatus(tafAction) {
       return 'NEW';
   }
 };
+var isWarning = function isWarning(error) {
+  return (error === null || error === void 0 ? void 0 : error.type) === 'WARNING';
+};
 
 var parseErrorMessage = function parseErrorMessage(error, params) {
   var message = getErrorMessage$1(error);
+  var warningMessage = getWarningMessage(error);
+
+  if (warningMessage) {
+    return {
+      type: 'WARNING',
+      title: warningMessage
+    };
+  }
+
   return params.changeStatusTo === 'CANCELLED' ? {
     type: 'CANCELLED',
     title: 'Cancelling this TAF failed, please try again',
@@ -5518,6 +5534,7 @@ var TafPanel = function TafPanel(_ref) {
     return null;
   } : _ref$setIsFormDisable,
       error = _ref.error;
+  var severity = isWarning(error) ? 'warning' : 'error';
 
   var onTafAction = function onTafAction(action, taf) {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
@@ -5566,7 +5583,10 @@ var TafPanel = function TafPanel(_ref) {
     index: index,
     "data-testid": "taf-panel".concat(activeTafIndex === index ? '-active' : '')
   }, /*#__PURE__*/React__default.createElement(TafHeader, {
-    title: getTafStatusLabel(tafFromBackend.taf.status)
+    title: getTafStatusLabel(tafFromBackend.taf.status),
+    sx: {
+      marginBottom: '4px'
+    }
   }), isLoading && /*#__PURE__*/React__default.createElement(Spinner, {
     "data-testid": "taf-loading",
     sx: {
@@ -5575,7 +5595,7 @@ var TafPanel = function TafPanel(_ref) {
       color: 'geowebColors.backdrops.white.fill'
     }
   }), error && /*#__PURE__*/React__default.createElement(AlertBanner, {
-    severity: "error",
+    severity: severity,
     title: error.title,
     info: error.message,
     dataTestId: "taf-error",
@@ -5755,19 +5775,33 @@ var TafLayout = function TafLayout(_ref) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              _context.prev = 0;
+              setError(null);
+              _context.next = 4;
               return postTafRequest(data);
 
-            case 2:
+            case 4:
               // callback
               onUpdateTaf();
+              _context.next = 11;
+              break;
 
-            case 3:
+            case 7:
+              _context.prev = 7;
+              _context.t0 = _context["catch"](0);
+
+              if (isWarning(_context.t0)) {
+                onUpdateTaf();
+              }
+
+              throw _context.t0;
+
+            case 11:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee);
+      }, _callee, null, [[0, 7]]);
     }));
   };
 
@@ -5778,25 +5812,26 @@ var TafLayout = function TafLayout(_ref) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
-              _context2.next = 3;
+              setError(null);
+              _context2.next = 4;
               return patchTafRequest(data);
 
-            case 3:
+            case 4:
               // callback
               onUpdateTaf();
               return _context2.abrupt("return", true);
 
-            case 7:
-              _context2.prev = 7;
+            case 8:
+              _context2.prev = 8;
               _context2.t0 = _context2["catch"](0);
               return _context2.abrupt("return", false);
 
-            case 10:
+            case 11:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[0, 7]]);
+      }, _callee2, null, [[0, 8]]);
     }));
   };
 

package/index.umd.js

@@ -3992,7 +3992,7 @@
           editor = tafFromBackend.editor;
       var auth = authentication.useAuthenticationContext().auth;
       var isEditor = editor === (auth === null || auth === void 0 ? void 0 : auth.username) || false;
-      var isDefaultDisabled = getIsFormDefaultDisabled(tafFromBackend.taf.status);
+      var isDefaultDisabled = getIsFormDefaultDisabled(originalTaf.status);
       var confirmDialog = shared.useConfirmationDialog();
 
       var _h = shared.useDraftFormHelpers(true),
@@ -4083,7 +4083,7 @@
           action = undefined;
         }
 
-        var newTaf = prepareTafValues(tafFromBackend.taf, action, shouldAddEmptyChangGroup);
+        var newTaf = prepareTafValues(originalTaf, action, shouldAddEmptyChangGroup);
         reset(newTaf);
       };
 
@@ -4092,7 +4092,7 @@
           action = undefined;
         }
 
-        var shouldAddEmptyChangGroup = !(tafFromBackend.taf && tafFromBackend.taf.changeGroups) && !resetDisabled;
+        var shouldAddEmptyChangGroup = !(originalTaf && originalTaf.changeGroups) && !resetDisabled;
         resetFormValues(action, shouldAddEmptyChangGroup);
         setIsDisabled(resetDisabled);
         setTafAction(action);
@@ -4263,7 +4263,7 @@
                     case 0:
                       return [4
                       /*yield*/
-                      , onFormAction(action, convertTafValuesToObject(prepareTafValues(tafFromBackend.taf, action)))];
+                      , onFormAction(action, convertTafValuesToObject(prepareTafValues(originalTaf, action)))];
 
                     case 1:
                       _a.sent();
@@ -4382,7 +4382,7 @@
 
       React__default["default"].useEffect(function () {
         setIsDisabled(!isEditor || isDefaultDisabled);
-        var defaultValues = prepareTafValues(tafFromBackend.taf, undefined, !isDefaultDisabled && !tafFromBackend.taf.changeGroups); // set initial form values
+        var defaultValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled && !originalTaf.changeGroups); // set initial form values
 
         reset(defaultValues); // set validate flag to validate after the values have been set
 
@@ -4412,10 +4412,12 @@
         }; // eslint-disable-next-line react-hooks/exhaustive-deps
       }, []);
       React__default["default"].useEffect(function () {
-        var newValues = prepareTafValues(tafFromBackend.taf, undefined, !isDefaultDisabled && !tafFromBackend.taf.changeGroups); // set new form values when tafFromBackend changed
+        var newValues = prepareTafValues(originalTaf, undefined, !isDefaultDisabled && !originalTaf.changeGroups); // set new form values when taf values changed
 
-        reset(newValues); // eslint-disable-next-line react-hooks/exhaustive-deps
-      }, [tafFromBackend]);
+        reset(newValues); // reset TAC when taf values changed
+
+        resetTAC(); // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, [originalTaf]);
       React__default["default"].useEffect(function () {
         // update disabled state when editor changed
         setIsDisabled(!isEditor || isDefaultDisabled); // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -4423,7 +4425,7 @@
       React__default["default"].useEffect(function () {
         if (shouldValidate && !isDisabled) {
           // trigger validation on all changegroup validity times after form is enabled since they could be outside the new validity period
-          var _a = tafFromBackend.taf.changeGroups,
+          var _a = originalTaf.changeGroups,
               changeGroups = _a === void 0 ? [] : _a;
           var validFields = changeGroups.map(function (_field, index) {
             return "changeGroups[" + index + "].valid";
@@ -4587,32 +4589,17 @@
       }, other), value === index && children);
     };
 
-    /* *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     *
-     * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2022 - Finnish Meteorological Institute (FMI)
-     * */
-
     var TafHeader = function TafHeader(_a) {
-      var title = _a.title;
+      var title = _a.title,
+          _b = _a.sx,
+          sx = _b === void 0 ? {} : _b;
       return /*#__PURE__*/React__default["default"].createElement(material.Typography, {
-        sx: {
+        sx: __assign({
           textAlign: 'center',
           fontWeight: 500,
           paddingTop: '6px',
           textTransform: 'capitalize'
-        }
+        }, sx)
       }, title);
     };
 
@@ -5366,9 +5353,21 @@
           return 'NEW';
       }
     };
+    var isWarning = function isWarning(error) {
+      return (error === null || error === void 0 ? void 0 : error.type) === 'WARNING';
+    };
 
     var parseErrorMessage = function parseErrorMessage(error, params) {
       var message = shared.getErrorMessage(error);
+      var warningMessage = shared.getWarningMessage(error);
+
+      if (warningMessage) {
+        return {
+          type: 'WARNING',
+          title: warningMessage
+        };
+      }
+
       return params.changeStatusTo === 'CANCELLED' ? {
         type: 'CANCELLED',
         title: 'Cancelling this TAF failed, please try again',
@@ -5478,6 +5477,7 @@
         return null;
       } : _h,
           error = _a.error;
+      var severity = isWarning(error) ? 'warning' : 'error';
 
       var onTafAction = function onTafAction(action, taf) {
         return __awaiter(void 0, void 0, void 0, function () {
@@ -5578,7 +5578,10 @@
         index: index,
         "data-testid": "taf-panel" + (activeTafIndex === index ? '-active' : '')
       }, /*#__PURE__*/React__default["default"].createElement(TafHeader, {
-        title: getTafStatusLabel(tafFromBackend.taf.status)
+        title: getTafStatusLabel(tafFromBackend.taf.status),
+        sx: {
+          marginBottom: '4px'
+        }
       }), isLoading && /*#__PURE__*/React__default["default"].createElement(Spinner, {
         "data-testid": "taf-loading",
         sx: {
@@ -5587,7 +5590,7 @@
           color: 'geowebColors.backdrops.white.fill'
         }
       }), error && /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
-        severity: "error",
+        severity: severity,
         title: error.title,
         info: error.message,
         dataTestId: "taf-error",
@@ -5734,9 +5737,13 @@
 
       var postTaf = function postTaf(data) {
         return __awaiter(void 0, void 0, void 0, function () {
+          var error_1;
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
+                _a.trys.push([0, 2,, 3]);
+
+                setError(null);
                 return [4
                 /*yield*/
                 , postTafRequest(data)];
@@ -5746,6 +5753,20 @@
 
 
                 onUpdateTaf();
+                return [3
+                /*break*/
+                , 3];
+
+              case 2:
+                error_1 = _a.sent();
+
+                if (isWarning(error_1)) {
+                  onUpdateTaf();
+                }
+
+                throw error_1;
+
+              case 3:
                 return [2
                 /*return*/
                 ];
@@ -5761,6 +5782,7 @@
               case 0:
                 _a.trys.push([0, 2,, 3]);
 
+                setError(null);
                 return [4
                 /*yield*/
                 , patchTafRequest(data)];

package/lib/components/TafHeader/TafHeader.d.ts

@@ -1,6 +1,8 @@
+import { SxProps } from '@mui/material';
 import React from 'react';
 interface TafHeaderProps {
     title: string;
+    sx?: SxProps;
 }
 declare const TafHeader: React.FC<TafHeaderProps>;
 export default TafHeader;

package/lib/components/TafLayout/TafPanel/TafPanel.d.ts

@@ -4,7 +4,7 @@ import { TafFromBackend, TafActions, TafStatus, TafFromFrontEnd } from '../../..
 import { IssuesPanePosition } from '../../IssuesPane/types';
 export declare const fromActionToStatus: (tafAction: TafActions) => TafStatus;
 export declare type TafError = {
-    type: 'CANCELLED' | 'SERVER';
+    type: 'CANCELLED' | 'SERVER' | 'WARNING';
     title: string;
     message?: string;
     testId?: string;
@@ -22,6 +22,7 @@ interface TafPanelProps {
     setIsFormDisabled?: (isDisabled: boolean) => void;
     error?: TafError;
 }
+export declare const isWarning: (error: TafError) => boolean;
 export declare const usePostTafRequest: (request: (params?: unknown) => Promise<void>, errorParser?: (error: AxiosError | Error, params: TafFromFrontEnd) => TafError) => {
     isLoading: boolean;
     error: TafError;

package/lib/components/TafLayout/TafPanel/TafPanel.stories.d.ts

@@ -0,0 +1,21 @@
+import * as React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const TafPanelSaveErrorLightSnap: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const TafPanelSaveErrorDarkSnap: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const TafPanelTakeOverErrorLightSnap: {
+    (): React.ReactElement;
+    storyName: string;
+};
+export declare const TafPanelTakeOverErrorDarkSnap: {
+    (): React.ReactElement;
+    storyName: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "2.15.0",
+  "version": "3.0.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,22 +13,22 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/api": "2.15.0",
+    "@opengeoweb/api": "3.0.0",
     "axios": "^0.25.0",
-    "@opengeoweb/shared": "2.15.0",
+    "@opengeoweb/shared": "3.0.0",
     "@mui/material": "^5.2.8",
-    "@opengeoweb/theme": "2.15.0",
+    "@opengeoweb/theme": "3.0.0",
     "@mui/styles": "^5.2.3",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "2.15.0",
+    "@opengeoweb/form-fields": "3.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": "2.15.0",
+    "@opengeoweb/authentication": "3.0.0",
     "react-router-dom": "^5.2.0",
     "query-string": "^6.13.7",
     "react-sortablejs": "^6.0.0",