@opengeoweb/taf 12.4.1 → 12.5.0

package/index.esm.js

@@ -2640,8 +2640,8 @@ var postTaf = function postTaf(auth, data) {
     body: JSON.stringify(data)
   }).then(handleResponse);
 };
-var patchTaf = function patchTaf(auth, data) {
-  return fetch(tafBaseUrl + "/taf?force=true", {
+var patchTaf = function patchTaf(auth, data, force) {
+  return fetch(tafBaseUrl + "/taf?force=" + (force ? 'true' : 'false'), {
     method: 'PATCH',
     headers: getHeaders(auth),
     body: JSON.stringify(data)
@@ -3011,12 +3011,13 @@ var usePatchTaf = function usePatchTaf() {
   return useMutation({
     mutationFn: function mutationFn(_ref4) {
       var tafData = _ref4.tafData,
-        setError = _ref4.setError;
+        setError = _ref4.setError,
+        force = _ref4.force;
       if (!auth) {
         throw new Error('Authentication context not found');
       }
       setError(null);
-      return patchTaf(auth, tafData);
+      return patchTaf(auth, tafData, force);
     },
     onSuccess: function () {
       var _onSuccess2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -3038,12 +3039,39 @@ var usePatchTaf = function usePatchTaf() {
       }
       return onSuccess;
     }(),
-    onError: function onError(error, _ref5) {
-      var tafData = _ref5.tafData,
-        setError = _ref5.setError;
-      var newError = parseErrorMessage(error, tafData, t);
-      setError(newError);
-    }
+    onError: function () {
+      var _onError2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(error, _ref5) {
+        var tafData, setError, newError;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              tafData = _ref5.tafData, setError = _ref5.setError;
+              if (!(error.cause === 409)) {
+                _context4.next = 6;
+                break;
+              }
+              _context4.next = 4;
+              return queryClient.invalidateQueries({
+                queryKey: ['taf-list']
+              });
+            case 4:
+              _context4.next = 8;
+              break;
+            case 6:
+              // no refetch, show error message
+              newError = parseErrorMessage(error, tafData, t);
+              setError(newError);
+            case 8:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      function onError(_x5, _x6) {
+        return _onError2.apply(this, arguments);
+      }
+      return onError;
+    }()
   });
 };
 var useGetTAC = function useGetTAC() {
@@ -4926,60 +4954,18 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
       message: message
     }));
   }, [dispatch]);
-  var isLatestEditor = function isLatestEditor(latestEditor, userName) {
-    return latestEditor !== '' && latestEditor !== null && latestEditor !== userName;
-  };
-  var _useTafList = useTafList(true),
-    fetchNewTafList = _useTafList.refetch;
   var setIsEditor = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checked) {
-      var username, _yield$fetchNewTafLis, latestList, _latestList$find, latestEditor, didSucceed;
+      var username, didSucceed;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            username = checked ? auth == null ? void 0 : auth.username : ''; // make sure to get the latest changes
+            username = checked ? auth == null ? void 0 : auth.username : '';
             _context.next = 3;
-            return fetchNewTafList();
-          case 3:
-            _yield$fetchNewTafLis = _context.sent;
-            latestList = _yield$fetchNewTafLis.data;
-            if (latestList) {
-              _context.next = 7;
-              break;
-            }
-            return _context.abrupt("return", false);
-          case 7:
-            _latestList$find = latestList.find(function (taf) {
-              return taf.taf.uuid === originalTaf.uuid;
-            }), latestEditor = _latestList$find.editor;
-            if (!(username === latestEditor)) {
-              _context.next = 10;
-              break;
-            }
-            return _context.abrupt("return", true);
-          case 10:
-            if (!(!checked && isLatestEditor(latestEditor, auth == null ? void 0 : auth.username))) {
-              _context.next = 12;
-              break;
-            }
-            return _context.abrupt("return", true);
-          case 12:
-            if (!(checked && isLatestEditor(latestEditor, auth == null ? void 0 : auth.username))) {
-              _context.next = 15;
-              break;
-            }
-            _context.next = 15;
-            return confirmDialog({
-              title: t('switch-title'),
-              description: t('switch-description'),
-              confirmLabel: t('switch-confirm')
-            });
-          case 15:
-            _context.next = 17;
             return onSwitchEditor(Object.assign({}, tafFromBackend, {
               editor: username
             }));
-          case 17:
+          case 3:
             didSucceed = _context.sent;
             if (didSucceed) {
               showSnackbar(checked ? t('editor-on', {
@@ -4989,7 +4975,7 @@ var TafForm = /*#__PURE__*/React__default.memo(function (_ref) {
               }));
             }
             return _context.abrupt("return", didSucceed);
-          case 20:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -5495,7 +5481,7 @@ var AdverseWeatherTACMessage = function AdverseWeatherTACMessage(_ref) {
       letterSpacing: '0.4px',
       color: 'geowebColors.captions.captionStatus.rgba'
     },
-    children: TAC.tac.map(function (line, index) {
+    children: TAC == null ? void 0 : TAC.tac.map(function (line, index) {
       return jsx(Box$1, {
         component: "span",
         sx: {
@@ -6392,31 +6378,60 @@ var TafLayout = function TafLayout(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var patchTaf = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
+  var updateEditor = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data, force) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return patchTafRequest({
+            return _context2.abrupt("return", patchTafRequest({
               tafData: data,
-              setError: setError
-            });
+              setError: setError,
+              force: force
+            }, {
+              onError: function onError(e) {
+                if (e.cause === 409) {
+                  void confirmDialog({
+                    title: t('switch-title'),
+                    description: t('switch-description'),
+                    confirmLabel: t('switch-confirm')
+                  }).then(function () {
+                    return void updateEditor(data, true);
+                  });
+                }
+              }
+            }));
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function updateEditor(_x3, _x4) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var patchTaf = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.prev = 0;
+            _context3.next = 3;
+            return updateEditor(data, false);
           case 3:
-            return _context2.abrupt("return", true);
+            return _context3.abrupt("return", true);
           case 6:
-            _context2.prev = 6;
-            _context2.t0 = _context2["catch"](0);
-            return _context2.abrupt("return", false);
+            _context3.prev = 6;
+            _context3.t0 = _context3["catch"](0);
+            return _context3.abrupt("return", false);
           case 9:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, null, [[0, 6]]);
+      }, _callee3, null, [[0, 6]]);
     }));
-    return function patchTaf(_x3) {
-      return _ref3.apply(this, arguments);
+    return function patchTaf(_x5) {
+      return _ref4.apply(this, arguments);
     };
   }();
   var CONFIRM_DIALOG_OPTIONS = {
@@ -6424,51 +6439,51 @@ var TafLayout = function TafLayout(_ref) {
     description: t('confirm-dialog-description'),
     confirmLabel: t('confirm-dialog-confirm-label')
   };
-  function onChangeTab(_x4, _x5, _x6) {
+  function onChangeTab(_x6, _x7, _x8) {
     return _onChangeTab.apply(this, arguments);
   }
   function _onChangeTab() {
-    _onChangeTab = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(action, value, isFormDirty) {
+    _onChangeTab = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(action, value, isFormDirty) {
       var taf;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (!isFormDirty) {
-              _context3.next = 15;
+              _context4.next = 15;
               break;
             }
-            _context3.prev = 1;
-            _context3.next = 4;
+            _context4.prev = 1;
+            _context4.next = 4;
             return onValidateForm();
           case 4:
-            taf = _context3.sent;
-            _context3.next = 7;
+            taf = _context4.sent;
+            _context4.next = 7;
             return postTaf({
               taf: taf,
               changeStatusTo: fromActionToStatus(tafActionToDraftAction(tafAction))
             }, true);
           case 7:
             action(value);
-            _context3.next = 13;
+            _context4.next = 13;
             break;
           case 10:
-            _context3.prev = 10;
-            _context3.t0 = _context3["catch"](1);
+            _context4.prev = 10;
+            _context4.t0 = _context4["catch"](1);
             void confirmDialog(CONFIRM_DIALOG_OPTIONS).then(function () {
               action(value);
               setError(null);
             });
           case 13:
-            _context3.next = 17;
+            _context4.next = 17;
             break;
           case 15:
             action(value);
             setError(null);
           case 17:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[1, 10]]);
+      }, _callee4, null, [[1, 10]]);
     }));
     return _onChangeTab.apply(this, arguments);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "12.4.1",
+  "version": "12.5.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,15 +8,15 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.4.1",
-    "@opengeoweb/shared": "12.4.1",
+    "@opengeoweb/api": "12.5.0",
+    "@opengeoweb/shared": "12.5.0",
     "react-hook-form": "^7.50.1",
-    "@opengeoweb/theme": "12.4.1",
-    "@opengeoweb/form-fields": "12.4.1",
-    "@opengeoweb/authentication": "12.4.1",
+    "@opengeoweb/theme": "12.5.0",
+    "@opengeoweb/form-fields": "12.5.0",
+    "@opengeoweb/authentication": "12.5.0",
     "@reduxjs/toolkit": "^2.6.1",
     "react-redux": "^9.2.0",
-    "@opengeoweb/snackbar": "12.4.1",
+    "@opengeoweb/snackbar": "12.5.0",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.1",
     "@emotion/react": "^11.11.1",

package/src/lib/components/TafLayout/TacOverview/AdverseWeatherTacMessage.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { AdverseWeatherTAC } from '../../../types';
 interface AdverseWeatherTACProps {
-    TAC: AdverseWeatherTAC;
+    TAC?: AdverseWeatherTAC;
     isActive: boolean;
 }
 export declare const AdverseWeatherTACMessage: React.FC<AdverseWeatherTACProps>;

package/src/lib/utils/taf-api/api.d.ts

@@ -2,5 +2,5 @@ import { Credentials } from '@opengeoweb/authentication';
 import { TAC, Taf, TafFromBackend, TafFromFrontEnd } from '../../types';
 export declare const getTafList: (auth: Credentials) => Promise<TafFromBackend[]>;
 export declare const postTaf: (auth: Credentials, data: TafFromFrontEnd) => Promise<Response>;
-export declare const patchTaf: (auth: Credentials, data: TafFromFrontEnd) => Promise<Response>;
+export declare const patchTaf: (auth: Credentials, data: TafFromFrontEnd, force?: boolean) => Promise<Response>;
 export declare const getTAC: (auth: Credentials, data: Taf) => Promise<TAC>;

package/src/lib/utils/taf-api/hooks.d.ts

@@ -14,6 +14,7 @@ type PatchReturnType<T> = UseMutationResult<Response | null, Error, T>;
 interface PatchTafProps {
     tafData: TafFromFrontEnd;
     setError: React.Dispatch<React.SetStateAction<TafError | null>>;
+    force?: boolean;
 }
 export declare const usePatchTaf: () => PatchReturnType<PatchTafProps>;
 type GetTACReturnType<T> = UseMutationResult<TAC, Error, T>;