@opengeoweb/warnings 12.7.0 → 12.8.0

package/index.esm.js

@@ -2227,6 +2227,9 @@ var slice$1 = createSlice({
       var warningId = action.payload.warningId;
       draft.selectedWarningId = warningId;
       draft.formState = 'edit';
+    },
+    setSelectedWarningId: function setSelectedWarningId(draft, action) {
+      draft.selectedWarningId = action.payload;
     }
   },
   extraReducers: function extraReducers(builder) {
@@ -4538,6 +4541,15 @@ var usePostSigmet = function usePostSigmet() {
       }
       return postSigmet(auth, formData);
     },
+    onError: function onError(error) {
+      void queryClient.invalidateQueries({
+        queryKey: ['sigmet']
+      });
+      var errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
+      dispatch(publicWarningFormActions.setFormError({
+        message: "Failed to save SIGMET: " + errorMessage
+      }));
+    },
     onSuccess: function () {
       var _onSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, variables) {
         var snackbarKey, warningType;
@@ -4590,6 +4602,15 @@ var usePostAirmet = function usePostAirmet() {
       }
       return postAirmet(auth, formData);
     },
+    onError: function onError(error) {
+      void queryClient.invalidateQueries({
+        queryKey: ['airmet']
+      });
+      var errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
+      dispatch(publicWarningFormActions.setFormError({
+        message: "Failed to save AIRMET: " + errorMessage
+      }));
+    },
     onSuccess: function () {
       var _onSuccess2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data, variables) {
         var snackbarKey, warningType;
@@ -5920,7 +5941,9 @@ var Form = function Form(_ref5) {
     });
   };
   var cancelAviationProduct = function cancelAviationProduct(warningType) {
-    return onSaveAviationForm(selectedAviationProduct, 'CANCELLED', warningType, isVAPhenomenon(selectedAviationProduct, ProductAction.CANCEL) && watch('vaSigmetMoveToFIR'));
+    return onSaveAviationForm(selectedAviationProduct, 'CANCELLED', warningType, isVAPhenomenon(selectedAviationProduct, ProductAction.CANCEL) && watch('vaSigmetMoveToFIR')).then(function (result) {
+      return result != null ? result : null;
+    });
   };
   var getPublishButtonLabel = function getPublishButtonLabel() {
     if (isCancelling) {
@@ -5949,7 +5972,7 @@ var Form = function Form(_ref5) {
             return _context10.abrupt("return");
           case 2:
             _context10.t0 = action;
-            _context10.next = _context10.t0 === ProductAction.SAVE ? 5 : _context10.t0 === ProductAction.PUBLISH ? 14 : _context10.t0 === ProductAction.CANCEL ? 16 : _context10.t0 === ProductAction.AMEND ? 18 : _context10.t0 === ProductAction.RENEW ? 20 : _context10.t0 === ProductAction.DISCARD ? 20 : _context10.t0 === ProductAction.DUPLICATE ? 20 : _context10.t0 === ProductAction.CLOSE ? 20 : 21;
+            _context10.next = _context10.t0 === ProductAction.SAVE ? 5 : _context10.t0 === ProductAction.PUBLISH ? 14 : _context10.t0 === ProductAction.CANCEL ? 17 : _context10.t0 === ProductAction.AMEND ? 19 : _context10.t0 === ProductAction.RENEW ? 21 : _context10.t0 === ProductAction.DISCARD ? 21 : _context10.t0 === ProductAction.DUPLICATE ? 21 : _context10.t0 === ProductAction.CLOSE ? 21 : 22;
             break;
           case 5:
             toggleIsDraft(true);
@@ -5960,11 +5983,17 @@ var Form = function Form(_ref5) {
             formValues = getValues();
             setIsSaving(true);
             _context10.next = 12;
-            return onSaveAviationForm(formValues, 'DRAFT', warningType)["catch"](function () {});
+            return onSaveAviationForm(formValues, 'DRAFT', warningType, undefined, function (uuid) {
+              setValue('uuid', uuid, {
+                shouldValidate: true,
+                shouldDirty: false
+              });
+            })["catch"](function () {});
           case 12:
             setIsSaving(false);
-            return _context10.abrupt("break", 22);
+            return _context10.abrupt("break", 23);
           case 14:
+            toggleIsDraft(false);
             void handleSubmit( /*#__PURE__*/function () {
               var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formValues) {
                 return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -5997,8 +6026,8 @@ var Form = function Form(_ref5) {
                 return _ref12.apply(this, arguments);
               };
             }())();
-            return _context10.abrupt("break", 22);
-          case 16:
+            return _context10.abrupt("break", 23);
+          case 17:
             void showConfirmDialog(action).then(function () {
               setIsCancelling(true);
               void cancelAviationProduct(warningType)["finally"](function () {
@@ -6006,8 +6035,8 @@ var Form = function Form(_ref5) {
                 onCloseForm();
               });
             });
-            return _context10.abrupt("break", 22);
-          case 18:
+            return _context10.abrupt("break", 23);
+          case 19:
             void handleSubmit( /*#__PURE__*/function () {
               var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(formValues) {
                 return _regeneratorRuntime().wrap(function _callee9$(_context9) {
@@ -6041,12 +6070,12 @@ var Form = function Form(_ref5) {
                 return _ref14.apply(this, arguments);
               };
             }())();
-            return _context10.abrupt("break", 22);
-          case 20:
-            return _context10.abrupt("break", 22);
+            return _context10.abrupt("break", 23);
           case 21:
-            console.warn("Unhandled product action: " + action);
+            return _context10.abrupt("break", 23);
           case 22:
+            console.warn("Unhandled product action: " + action);
+          case 23:
           case "end":
             return _context10.stop();
         }
@@ -6567,46 +6596,44 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
     return selectedProduct.airmet;
   };
   var saveAviationForm = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(productToPost, newStatus, warningType, vaSigmetMoveToFIR) {
-      var product, uuid, _postProductParam, postProductParam, errorMessage;
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(productToPost, newStatus, warningType, vaSigmetMoveToFIR, setSelectedUUID) {
+      var _result;
+      var product, uuid, result, postProductParam, _postProductParam;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            // if volcanic sigmet - add to which FIR it's moving
             product = newStatus === 'CANCELLED' && selectedBackendProduct ? getCancelSigmet(selectedBackendProduct, vaSigmetMoveToFIR) : productToPost;
-            _context2.prev = 1;
             uuid = (selectedAviationProduct == null ? void 0 : selectedAviationProduct.uuid) || null;
             if (!(warningType === 'sigmet')) {
-              _context2.next = 8;
+              _context2.next = 9;
               break;
             }
-            _postProductParam = createSigmetPostParameter(product, newStatus, uuid);
-            _context2.next = 7;
-            return postSigmet(_postProductParam);
-          case 7:
-            return _context2.abrupt("return", _context2.sent);
-          case 8:
-            postProductParam = createAirmetPostParameter(product, newStatus, uuid);
-            _context2.next = 11;
-            return postAirmet(postProductParam);
-          case 11:
-            return _context2.abrupt("return", _context2.sent);
-          case 14:
-            _context2.prev = 14;
-            _context2.t0 = _context2["catch"](1);
-            errorMessage = _context2.t0 instanceof Error ? _context2.t0 : 'Unknown error occurred';
-            dispatch(snackbarActions.openSnackbar({
-              type: snackbarTypes.SnackbarMessageType.VERBATIM_MESSAGE,
-              message: "Failed to save " + warningType.toUpperCase() + ": " + errorMessage
-            }));
-            throw _context2.t0;
-          case 19:
+            postProductParam = createSigmetPostParameter(product, newStatus, uuid);
+            _context2.next = 6;
+            return postSigmet(postProductParam);
+          case 6:
+            result = _context2.sent;
+            _context2.next = 13;
+            break;
+          case 9:
+            _postProductParam = createAirmetPostParameter(product, newStatus, uuid);
+            _context2.next = 12;
+            return postAirmet(_postProductParam);
+          case 12:
+            result = _context2.sent;
+          case 13:
+            if ((_result = result) != null && _result.uuid) {
+              setSelectedUUID == null || setSelectedUUID(result.uuid);
+              dispatch(publicWarningFormActions.setSelectedWarningId(result.uuid));
+            }
+            return _context2.abrupt("return", result);
+          case 15:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[1, 14]]);
+      }, _callee2);
     }));
-    return function saveAviationForm(_x2, _x3, _x4, _x5) {
+    return function saveAviationForm(_x2, _x3, _x4, _x5, _x6) {
       return _ref3.apply(this, arguments);
     };
   }();
@@ -6633,7 +6660,7 @@ var PublicWarningsFormConnect = function PublicWarningsFormConnect(_ref) {
         }
       }, _callee3);
     }));
-    return function saveForm(_x6) {
+    return function saveForm(_x7) {
       return _ref4.apply(this, arguments);
     };
   }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "12.7.0",
+  "version": "12.8.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,30 +8,31 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.7.0",
-    "@opengeoweb/shared": "12.7.0",
-    "@opengeoweb/store": "12.7.0",
-    "@opengeoweb/webmap-react": "12.7.0",
+    "@opengeoweb/api": "12.8.0",
+    "@opengeoweb/shared": "12.8.0",
+    "@opengeoweb/store": "12.8.0",
+    "@opengeoweb/webmap-react": "12.8.0",
     "@tanstack/react-query": "^5.69.2",
     "react-redux": "^9.2.0",
-    "@opengeoweb/theme": "12.7.0",
-    "@opengeoweb/form-fields": "12.7.0",
+    "@opengeoweb/theme": "12.8.0",
+    "@opengeoweb/form-fields": "12.8.0",
     "react-hook-form": "^7.50.1",
     "lodash": "^4.17.21",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/snackbar": "12.7.0",
+    "@opengeoweb/snackbar": "12.8.0",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "axios": "^1.7.7",
-    "@opengeoweb/core": "12.7.0",
-    "@opengeoweb/webmap": "12.7.0",
-    "@opengeoweb/authentication": "12.7.0",
-    "@opengeoweb/sigmet-airmet": "12.7.0",
+    "@opengeoweb/core": "12.8.0",
+    "@opengeoweb/webmap": "12.8.0",
+    "@opengeoweb/authentication": "12.8.0",
+    "@opengeoweb/sigmet-airmet": "12.8.0",
     "react-i18next": "^15.1.1",
     "i18next": "^25.0.1",
     "@mui/material": "^7.0.1",
     "ol": "^10.4.0",
-    "msw": "^2.7.3"
+    "msw": "^2.7.3",
+    "@types/geojson": "^7946.0.14"
   },
   "peerDependencies": {
     "react": "18",
@@ -41,5 +42,5 @@
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js",
-  "types": "./index.esm.d.ts"
+  "types": "./index.d.ts"
 }

package/src/lib/api/aviation-api/api.d.ts

@@ -13,5 +13,5 @@ export declare const getAirmetTAC: (auth: Credentials, product: AviationProduct)
 export declare const getSigmetTAC: (auth: Credentials, product: AviationProduct) => Promise<{
     data: string;
 }>;
-export declare const postSigmet: (auth: Credentials, data: SigmetFromFrontend) => Promise<Headers | null>;
-export declare const postAirmet: (auth: Credentials, data: AirmetFromFrontend) => Promise<Headers | null>;
+export declare const postSigmet: (auth: Credentials, data: SigmetFromFrontend) => Promise<SigmetFromBackend>;
+export declare const postAirmet: (auth: Credentials, data: AirmetFromFrontend) => Promise<AirmetFromBackend>;

package/src/lib/api/aviation-api/hooks.d.ts

@@ -13,9 +13,6 @@ export declare const useTACApi: () => {
     fetchSigmetTAC: (product: AviationProduct) => FetchTACData;
     fetchAirmetTAC: (product: AviationProduct) => FetchTACData;
 };
-type MutationReturnType<T> = UseMutationResult<Headers | null, Error, T, {
-    oldData: AirmetFromFrontend[] | SigmetFromFrontend[] | undefined;
-}>;
 /**
  * Hook for posting a SIGMET, with feedback.
  *
@@ -23,7 +20,7 @@ type MutationReturnType<T> = UseMutationResult<Headers | null, Error, T, {
  * @param onDialogClose - Optional callback to close a dialog.
  * @returns A mutation result for posting a SIGMET.
  */
-export declare const usePostSigmet: () => MutationReturnType<SigmetFromFrontend>;
+export declare const usePostSigmet: () => UseMutationResult<SigmetFromBackend, Error, SigmetFromFrontend>;
 /**
  * Hook for posting an AIRMET, with feedback.
  *
@@ -31,5 +28,5 @@ export declare const usePostSigmet: () => MutationReturnType<SigmetFromFrontend>
  * @param onDialogClose - Optional callback to close a dialog.
  * @returns A mutation result for posting an AIRMET.
  */
-export declare const usePostAirmet: () => MutationReturnType<AirmetFromFrontend>;
+export declare const usePostAirmet: () => UseMutationResult<AirmetFromBackend, Error, AirmetFromFrontend>;
 export {};

package/src/lib/components/ObjectManager/ObjectManager.stories.d.ts

@@ -11,10 +11,10 @@ declare const _default: {
         onMouseDown?: (() => void) | undefined;
         isOpen: boolean;
         order?: number | undefined;
-        source?: import("dist/libs/shared/src").Source | undefined;
-        size?: import("dist/libs/shared/src").DraggableSize | undefined;
-        startPosition?: import("dist/libs/shared/src").Position | undefined;
-        headerSize?: import("dist/libs/shared/src").HeaderSize | undefined;
+        source?: import("@opengeoweb/shared").Source | undefined;
+        size?: import("@opengeoweb/shared").DraggableSize | undefined;
+        startPosition?: import("@opengeoweb/shared").Position | undefined;
+        headerSize?: import("@opengeoweb/shared").HeaderSize | undefined;
         drawingListItems: DrawingListItem[];
         onClickDrawing?: ((drawing: DrawingListItem) => void) | undefined;
         onEditDrawing?: ((drawingId: string) => void) | undefined;

package/src/lib/components/PublicWarningList/ConfirmWarningDialog.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
+import { AirmetFromBackend, SigmetFromBackend } from '@opengeoweb/api';
 export interface ConfirmDialogProps {
     title: string;
     description: string;
-    request: () => Promise<void> | Promise<Headers | null>;
+    request: () => Promise<void> | Promise<Headers | null> | Promise<SigmetFromBackend | AirmetFromBackend>;
     confirmLabel: string;
     callback?: (data?: unknown) => void;
     isLocked?: boolean;

package/src/lib/components/PublicWarningsForm/PublicWarningsForm.d.ts

@@ -2,6 +2,7 @@ import { AviationProduct, FormMode, ProductStatus } from '@opengeoweb/sigmet-air
 import * as React from 'react';
 import { MapPreset } from '@opengeoweb/store';
 import { FeatureCollection, GeoJsonProperties, Geometry } from 'geojson';
+import { AirmetFromBackend, SigmetFromBackend } from '@opengeoweb/api';
 import { FormError } from '../../store/publicWarningForm/reducer';
 import { Area, PublicWarningDetail, WarningType } from '../../store/publicWarningForm/types';
 import { BaseDrawingListItem, DrawingListItem } from '../../store/warningsDrawings/types';
@@ -21,7 +22,7 @@ export interface FormProps {
     onPublishForm?: (formValues: PublicWarningDetail) => Promise<Headers | null>;
     onClearForm?: () => void;
     onCloseForm?: () => void;
-    onSaveAviationForm?: (formValues: AviationProduct, action: ProductStatus, warningType: 'sigmet' | 'airmet', vaSigmetMoveToFIR?: string) => Promise<Headers | null>;
+    onSaveAviationForm?: (productToPost: AviationProduct, newStatus: ProductStatus, warningType: 'sigmet' | 'airmet', vaSigmetMoveToFIR?: string, setSelectedUUID?: (uuid: string) => void) => Promise<SigmetFromBackend | AirmetFromBackend | undefined>;
     object?: DrawingListItem;
     publicWarningDetails?: PublicWarningDetail;
     error?: FormError;

package/src/lib/store/publicWarningForm/reducer.d.ts

@@ -47,4 +47,5 @@ export declare const publicWarningFormReducer: import("redux").Reducer<WarningFo
     setEditMode: (draft: Draft<WarningFormState>, action: PayloadAction<{
         warningId: string;
     }>) => void;
+    setSelectedWarningId: (draft: Draft<WarningFormState>, action: PayloadAction<string>) => void;
 }, "publicWarningForm">;

package/src/lib/utils/fakeApi/index.d.ts

@@ -1,6 +1,8 @@
 import { RequestHandler } from 'msw';
+import { SigmetFromBackend } from '@opengeoweb/api';
 import type { DrawingFromBE, DrawingListItem } from '../../store/warningsDrawings/types';
 import type { AirmetWarning, PublicWarning, SigmetWarning, Warning } from '../../store/publicWarningForm/types';
+export declare const newSigmet: SigmetFromBackend;
 declare const drawingList: DrawingListItem[];
 declare const drawingsListFullContent: DrawingFromBE[];
 declare const warningList: PublicWarning[];