@opengeoweb/warnings 12.6.0 → 12.7.0

package/index.esm.js

@@ -7,7 +7,7 @@ import { SHARED_NAMESPACE, useConfirmationDialog, dateUtils, ToggleMenu, calcula
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, current, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { defaultBbox } from '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, useDraftFormHelpers, ReactHookFormSelect, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, errorMessages, isEmpty, ReactHookFormDateTime, isXHoursAfter, isXHoursBefore } from '@opengeoweb/form-fields';
-import { SA_NAMESPACE, isInstanceOfCancelSigmet, getDefaultValidFromValue, isInstanceOfCancelAirmet, getDefaultValidUntilValue, useShortTestHelpers, SigmetForm, AirmetForm, ProductAction, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, isVAPhenomenon, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, prepareCancelSigmet, getProductFormMode } from '@opengeoweb/sigmet-airmet';
+import { SA_NAMESPACE, isInstanceOfCancelSigmet, getDefaultValidFromValue, isInstanceOfCancelAirmet, getTacGeometry, getMaxPolygonPoints, getDefaultValidUntilValue, useShortTestHelpers, SigmetForm, AirmetForm, ProductAction, getConfirmationDialogCancelLabel, getConfirmationDialogButtonLabel, getConfirmationDialogContent, getConfirmationDialogTitle, isVAPhenomenon, CancelSigmetVolcanicMovements, createAirmetPostParameter, createSigmetPostParameter, prepareCancelSigmet, getProductFormMode } from '@opengeoweb/sigmet-airmet';
 import { LayerType, generateMapId } from '@opengeoweb/webmap';
 import { t } from 'i18next';
 import { useTranslation } from 'react-i18next';
@@ -2989,7 +2989,7 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
   var _useAuthenticationCon2 = useAuthenticationContext(),
     auth = _useAuthenticationCon2.auth;
   var dispatch = useDispatch();
-  return useMutation(Object.assign({
+  return useMutation({
     mutationFn: function mutationFn(_ref4) {
       var id = _ref4.id,
         data = _ref4.data;
@@ -3001,15 +3001,7 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
         return updatePublicWarning(id, auth, data);
       }
       return postPublicWarning(auth, data);
-    }
-  }, optimisticUpdate(['public-warning-list'], queryClient, function (_, _ref5) {
-    var data = _ref5.data,
-      id = _ref5.id;
-    return Object.assign({}, data, {
-      id: id,
-      lastUpdatedTime: new Date().toISOString()
-    });
-  }), {
+    },
     onError: function onError(error) {
       void queryClient.invalidateQueries({
         queryKey: ['public-warning-list']
@@ -3020,34 +3012,17 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
     },
     onSuccess: function () {
       var _onSuccess2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data, variables) {
-        var location, _variables$data, warningDetail, status, newId, newWarning;
+        var location, warningDetail, newId, newWarning;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              _context2.next = 2;
+              return queryClient.invalidateQueries({
+                queryKey: ['public-warning-list']
+              });
+            case 2:
               location = data == null ? void 0 : data.get('location');
-              _variables$data = variables.data, warningDetail = _variables$data.warningDetail, status = _variables$data.status;
-              if (
-              // DRAFT_PUBLISHED warnings have  linked_to_id to the published warning it is based on
-              // When publishing a DRAFT_PUBLISHED warning we need to update the published warning and delete the draft
-              warningDetail.linked_to_id && status === PublicWarningStatus.PUBLISHED) {
-                queryClient.setQueryData(['public-warning-list'], function (old) {
-                  return old == null ? void 0 : old.reduce(function (acc, warning) {
-                    if (warning.id === warningDetail.linked_to_id) {
-                      return acc;
-                    }
-                    if (warning.id === warningDetail.id) {
-                      return [].concat(acc, [Object.assign({}, warning, {
-                        id: warningDetail.linked_to_id,
-                        warningDetail: Object.assign({}, warning.warningDetail, {
-                          id: warningDetail.linked_to_id
-                        }),
-                        lastUpdatedTime: new Date().toISOString()
-                      })]);
-                    }
-                    return [].concat(acc, [warning]);
-                  }, []);
-                });
-              }
+              warningDetail = variables.data.warningDetail;
               if (location) {
                 // When making a new warning we get it's ID from the location header
                 newId = getIdFromUrl(location);
@@ -3059,9 +3034,6 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
                     domain: 'public'
                   })
                 });
-                queryClient.setQueryData(['public-warning-list'], function (old) {
-                  return [].concat(old || [], [newWarning]);
-                });
                 dispatch(publicWarningFormActions.openPublicWarningFormDialog({
                   warning: newWarning,
                   formState: '',
@@ -3078,7 +3050,7 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
                   setOpen: false
                 }));
               }
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -3089,7 +3061,7 @@ var useMutateWarning = function useMutateWarning(snackBarMessage) {
       }
       return onSuccess;
     }()
-  }));
+  });
 };
 var useMutateDeleteWarning = function useMutateDeleteWarning() {
   var queryClient = useQueryClient();
@@ -3097,8 +3069,8 @@ var useMutateDeleteWarning = function useMutateDeleteWarning() {
   var _useAuthenticationCon3 = useAuthenticationContext(),
     auth = _useAuthenticationCon3.auth;
   return useMutation({
-    mutationFn: function mutationFn(_ref6) {
-      var id = _ref6.id;
+    mutationFn: function mutationFn(_ref5) {
+      var id = _ref5.id;
       if (!auth) {
         throw new Error('Authentication context not found');
       }
@@ -3173,12 +3145,12 @@ var useMutateSaveOrUpdateDrawing = function useMutateSaveOrUpdateDrawing() {
   var queryClient = useQueryClient();
   return useMutation({
     mutationFn: function () {
-      var _mutationFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref7) {
+      var _mutationFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref6) {
         var data, id, headers, location, newId;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              data = _ref7.data, id = _ref7.id;
+              data = _ref6.data, id = _ref6.id;
               if (auth) {
                 _context4.next = 3;
                 break;
@@ -3222,8 +3194,8 @@ var useMutateSaveOrUpdateDrawing = function useMutateSaveOrUpdateDrawing() {
       }
       return mutationFn;
     }(),
-    onSuccess: function onSuccess(_ref8, variables) {
-      var id = _ref8.id;
+    onSuccess: function onSuccess(_ref7, variables) {
+      var id = _ref7.id;
       dispatch(warningsDrawingsActions.setDrawValues({
         drawingInstanceId: drawingDialogType,
         id: String(id),
@@ -3243,12 +3215,12 @@ var useMutateDeleteDrawing = function useMutateDeleteDrawing() {
   var dispatch = useDispatch();
   return useMutation({
     mutationFn: function () {
-      var _mutationFn2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref9) {
+      var _mutationFn2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref8) {
         var drawingId;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              drawingId = _ref9.drawingId;
+              drawingId = _ref8.drawingId;
               if (auth) {
                 _context5.next = 3;
                 break;
@@ -3272,8 +3244,8 @@ var useMutateDeleteDrawing = function useMutateDeleteDrawing() {
       }
       return mutationFn;
     }(),
-    onSuccess: function onSuccess(_, _ref10) {
-      var objectName = _ref10.objectName;
+    onSuccess: function onSuccess(_, _ref9) {
+      var objectName = _ref9.objectName;
       void queryClient.invalidateQueries({
         queryKey: ['drawings']
       });
@@ -4188,14 +4160,19 @@ var DrawingToolConnect = function DrawingToolConnect(_ref) {
 
 var WarningAvatar = function WarningAvatar(_ref) {
   var editor = _ref.editor,
+    status = _ref.status,
     _ref$tooltipPlacement = _ref.tooltipPlacement,
     tooltipPlacement = _ref$tooltipPlacement === void 0 ? 'bottom' : _ref$tooltipPlacement;
+  var effectiveStatus = status != null ? status : 'DRAFT';
+  var isDraft = effectiveStatus === 'DRAFT';
+  var label = isDraft ? 'Editor' : 'Author';
   return jsx(CustomTooltip, {
-    title: "Editor: " + editor,
+    title: label + ": " + editor,
     placement: tooltipPlacement,
     children: jsx("span", {
       children: jsx(Avatar, {
         size: "small",
+        author: !isDraft,
         children: getInitials(editor)
       })
     })
@@ -4336,7 +4313,8 @@ var PublicWarningsFormDialog = function PublicWarningsFormDialog(_ref) {
           width: '16px'
         },
         children: publicWarningEditor && jsx(WarningAvatar, {
-          editor: publicWarningEditor
+          editor: publicWarningEditor,
+          status: selectedAviationProduct == null ? void 0 : selectedAviationProduct.status
         })
       })]
     })
@@ -4659,16 +4637,23 @@ var flattenPublicWarning = function flattenPublicWarning(publicWarning) {
     rest = _objectWithoutPropertiesLoose(publicWarning, _excluded$6);
   return Object.assign({}, rest, sigmetAirmetDetails);
 };
-var transformAirmetToWarningFormat = function transformAirmetToWarningFormat(apiAirmet) {
+var transformAirmetToWarningFormat = function transformAirmetToWarningFormat(apiAirmet, productConfig) {
   var airmet = apiAirmet.airmet;
+  var tacGeometry = getTacGeometry({
+    startGeometry: airmet.startGeometry,
+    startGeometryIntersect: airmet.startGeometryIntersect,
+    maxPoints: getMaxPolygonPoints(airmet.locationIndicatorATSR, productConfig)
+  });
   var areas = [];
   if (airmet.startGeometry) {
     areas.push({
-      geoJSON: Object.assign({}, airmet.startGeometry, {
-        features: airmet.startGeometry.features.map(function (feature) {
+      areaId: airmet.uuid + "-start",
+      geoJSON: Object.assign({}, tacGeometry, {
+        features: tacGeometry.features.map(function (feature) {
           return Object.assign({}, feature, {
             properties: Object.assign({}, feature.properties, {
-              isStartGeometry: true
+              isStartGeometry: true,
+              source: tacGeometry === airmet.startGeometry ? 'drawn' : 'intersected'
             })
           });
         })
@@ -4680,6 +4665,7 @@ var transformAirmetToWarningFormat = function transformAirmetToWarningFormat(api
     id: apiAirmet.uuid,
     lastUpdatedTime: apiAirmet.lastUpdateDate,
     productStatus: airmet.status,
+    editor: apiAirmet.author,
     warningDetail: {
       id: airmet.uuid,
       phenomenon: airmet.phenomenon,
@@ -4696,14 +4682,24 @@ var transformAirmetToWarningFormat = function transformAirmetToWarningFormat(api
     type: 'airmet'
   };
 };
-var transformSigmetToWarningFormat = function transformSigmetToWarningFormat(apiSigmet) {
+var transformSigmetToWarningFormat = function transformSigmetToWarningFormat(apiSigmet, productConfig) {
   var sigmet = apiSigmet.sigmet;
+  var tacGeometryStart = getTacGeometry({
+    startGeometry: sigmet.startGeometry,
+    startGeometryIntersect: sigmet.startGeometryIntersect,
+    maxPoints: getMaxPolygonPoints(sigmet.locationIndicatorATSR, productConfig)
+  });
+  var tacGeometryEnd = getTacGeometry({
+    startGeometry: sigmet.endGeometry,
+    startGeometryIntersect: sigmet.endGeometryIntersect,
+    maxPoints: getMaxPolygonPoints(sigmet.locationIndicatorATSR, productConfig)
+  });
   var areas = [];
   if (sigmet.startGeometry) {
     areas.push({
       areaId: sigmet.uuid + "-start",
-      geoJSON: Object.assign({}, sigmet.startGeometry, {
-        features: sigmet.startGeometry.features.map(function (feature) {
+      geoJSON: Object.assign({}, tacGeometryStart, {
+        features: tacGeometryStart.features.map(function (feature) {
           return Object.assign({}, feature, {
             properties: Object.assign({}, feature.properties, {
               isStartGeometry: true
@@ -4717,8 +4713,8 @@ var transformSigmetToWarningFormat = function transformSigmetToWarningFormat(api
   if (sigmet.endGeometry) {
     areas.push({
       areaId: sigmet.uuid + "-end",
-      geoJSON: Object.assign({}, sigmet.endGeometry, {
-        features: sigmet.endGeometry.features.map(function (feature) {
+      geoJSON: Object.assign({}, tacGeometryEnd, {
+        features: tacGeometryEnd.features.map(function (feature) {
           return Object.assign({}, feature, {
             properties: Object.assign({}, feature.properties, {
               isStartGeometry: false
@@ -4733,6 +4729,7 @@ var transformSigmetToWarningFormat = function transformSigmetToWarningFormat(api
     id: apiSigmet.uuid,
     lastUpdatedTime: apiSigmet.lastUpdateDate,
     productStatus: sigmet.status,
+    editor: apiSigmet.author,
     warningDetail: {
       id: sigmet.uuid,
       phenomenon: sigmet.phenomenon,
@@ -7402,11 +7399,18 @@ var useWarnings = function useWarnings(disabled) {
     sigmetWarnings = _useSigmetList.data,
     refetchSigmet = _useSigmetList.refetch,
     isFetchingSigmet = _useSigmetList.isFetching;
+  var warningType = useSelector(getWarningType);
+  var _useProductConfig = useProductConfig(warningType, false),
+    aviationConfig = _useProductConfig.data;
   var combinedWarnings = useMemo(function () {
-    var transformedSigmets = (sigmetWarnings == null ? void 0 : sigmetWarnings.map(transformSigmetToWarningFormat)) || [];
-    var transformedAirmets = (airmetWarnings == null ? void 0 : airmetWarnings.map(transformAirmetToWarningFormat)) || [];
+    var transformedSigmets = (sigmetWarnings == null ? void 0 : sigmetWarnings.map(function (sigmet) {
+      return transformSigmetToWarningFormat(sigmet, aviationConfig);
+    })) || [];
+    var transformedAirmets = (airmetWarnings == null ? void 0 : airmetWarnings.map(function (airmet) {
+      return transformAirmetToWarningFormat(airmet, aviationConfig);
+    })) || [];
     return concat(publicWarnings || [], transformedSigmets, transformedAirmets);
-  }, [publicWarnings, sigmetWarnings, airmetWarnings]);
+  }, [sigmetWarnings, airmetWarnings, publicWarnings, aviationConfig]);
   var refetchWarnings = function refetchWarnings() {
     void refetchPublicWarnings();
     void refetchAirmet();
@@ -7484,7 +7488,7 @@ var PublicWarningsFormDialogConnect = function PublicWarningsFormDialogConnect(_
   var isEditor = (selectedWarning == null ? void 0 : selectedWarning.editor) === (auth == null ? void 0 : auth.username) || false;
   var shouldGiveEditorWarning = React__default.useCallback(function (newEditor, oldEditor) {
     var oldEditorIsYou = oldEditor && oldEditor === (auth == null ? void 0 : auth.username);
-    if (oldEditorIsYou && newEditor !== oldEditor) {
+    if (oldEditorIsYou && newEditor && newEditor !== oldEditor) {
       dispatch(publicWarningFormActions.setFormError({
         severity: 'warning',
         message: TAKEOVER_MESSAGE
@@ -8521,7 +8525,8 @@ var WarningListItem = function WarningListItem(_ref) {
                 right: '4px'
               },
               children: jsx(WarningAvatar, {
-                editor: warning.editor
+                editor: warning.editor,
+                status: warning.productStatus
               })
             })]
           })
@@ -9616,18 +9621,22 @@ var PublicWarningListConnect = function PublicWarningListConnect(_ref) {
         void openPublicWarningDialog('cancel', warning, type);
         break;
       case 'DISCARD':
-        setConfirmDialogOptions({
-          confirmLabel: t('warning-dialog-delete-confirm'),
-          title: t('warning-dialog-delete-title'),
-          description: t('warning-dialog-delete-description'),
-          request: function request() {
-            return deleteAviationProduct(warning, 'DISCARDED', type);
-          },
-          callback: function callback() {
-            return onRemoveSuccess(warning.id);
-          }
-        });
-        break;
+        {
+          var isLocked = warning.editor && warning.editor !== (auth == null ? void 0 : auth.username) || false;
+          setConfirmDialogOptions({
+            confirmLabel: t('warning-dialog-delete-confirm'),
+            title: t('warning-dialog-delete-title'),
+            description: t('warning-dialog-delete-description'),
+            request: function request() {
+              return deleteAviationProduct(warning, 'DISCARDED', type);
+            },
+            callback: function callback() {
+              return onRemoveSuccess(warning.id);
+            },
+            isLocked: isLocked
+          });
+          break;
+        }
     }
   };
   var openSnackbar = function openSnackbar(message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "12.6.0",
+  "version": "12.7.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,25 +8,25 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.6.0",
-    "@opengeoweb/shared": "12.6.0",
-    "@opengeoweb/store": "12.6.0",
-    "@opengeoweb/webmap-react": "12.6.0",
+    "@opengeoweb/api": "12.7.0",
+    "@opengeoweb/shared": "12.7.0",
+    "@opengeoweb/store": "12.7.0",
+    "@opengeoweb/webmap-react": "12.7.0",
     "@tanstack/react-query": "^5.69.2",
     "react-redux": "^9.2.0",
-    "@opengeoweb/theme": "12.6.0",
-    "@opengeoweb/form-fields": "12.6.0",
+    "@opengeoweb/theme": "12.7.0",
+    "@opengeoweb/form-fields": "12.7.0",
     "react-hook-form": "^7.50.1",
     "lodash": "^4.17.21",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/snackbar": "12.6.0",
+    "@opengeoweb/snackbar": "12.7.0",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
     "axios": "^1.7.7",
-    "@opengeoweb/core": "12.6.0",
-    "@opengeoweb/webmap": "12.6.0",
-    "@opengeoweb/authentication": "12.6.0",
-    "@opengeoweb/sigmet-airmet": "12.6.0",
+    "@opengeoweb/core": "12.7.0",
+    "@opengeoweb/webmap": "12.7.0",
+    "@opengeoweb/authentication": "12.7.0",
+    "@opengeoweb/sigmet-airmet": "12.7.0",
     "react-i18next": "^15.1.1",
     "i18next": "^25.0.1",
     "@mui/material": "^7.0.1",

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

@@ -1,3 +1,6 @@
+import { AirmetFromBackend, SigmetFromBackend } from '@opengeoweb/api';
+export declare const airmetList: AirmetFromBackend[];
+export declare const sigmetList: SigmetFromBackend[];
 export declare const fakeSigmetTAC = "EHAA SIGMET 1 VALID 121249/121449 EHDB- EHAA AMSTERDAM FIR FRQ TS OBS ENTIRE FIR FL010 STNR WKN";
 export declare const fakeAirmetTAC = "EHAA AIRMET -1 VALID 310700/311100 EHDB- EHAA AMSTERDAM FIR ISOL CB OBS ENTIRE FIR FL020 STNR NC";
 export declare const aviationEndpoints: import("msw").HttpHandler[];

package/src/lib/components/PublicWarningsFormDialog/WarningsAvatar.d.ts

@@ -1,7 +1,8 @@
 import { TooltipProps } from '@mui/material';
 import * as React from 'react';
-interface WarningAvatarProps {
+export interface WarningAvatarProps {
     editor: string;
+    status?: string;
     tooltipPlacement?: TooltipProps['placement'];
 }
 declare const WarningAvatar: React.FC<WarningAvatarProps>;

package/src/lib/utils/sig-airmet-util.d.ts

@@ -4,8 +4,8 @@ import { Warning, PublicWarningStatus, AviationWarningDetails, AirmetWarning, Si
 export declare function isCancelAirmet(warningDetail: AviationWarningDetails): warningDetail is CancelAirmet;
 export declare function isCancelSigmet(warningDetail: AviationWarningDetails): warningDetail is CancelSigmet;
 export declare const flattenPublicWarning: (publicWarning: Warning) => Partial<AviationWarningDetails>;
-export declare const transformAirmetToWarningFormat: (apiAirmet: AirmetFromBackend) => AirmetWarning;
-export declare const transformSigmetToWarningFormat: (apiSigmet: SigmetFromBackend) => SigmetWarning;
+export declare const transformAirmetToWarningFormat: (apiAirmet: AirmetFromBackend, productConfig: ProductConfig) => AirmetWarning;
+export declare const transformSigmetToWarningFormat: (apiSigmet: SigmetFromBackend, productConfig: ProductConfig) => SigmetWarning;
 export declare const mapProductStatusToWarningStatus: (productStatus?: ProductStatus) => PublicWarningStatus;
 export declare const transformSigmetToProductFormat: (warning: SigmetFromBackend | undefined) => AviationProduct;
 export declare const transformAirmetToProductFormat: (warning: AirmetFromBackend | undefined) => AviationProduct;