@opengeoweb/warnings 9.30.0 → 9.31.0

package/index.esm.js

@@ -2,24 +2,24 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useDispatch, useSelector } from 'react-redux';
 import { Polygons, Share, ExitDomain, Edit, Delete, CoastalEvent, TemperatureLow, TemperatureHigh, Rain, Snow, Lightning, Fog, Wind, Thunderstorm, VulcanicEruption, Haze, FreezingPrecipitation, ModerateAircraftIcing, SevereAircraftIcing, ModerateTurbulence, SevereTurbulence, SandStorm, RadioactiveMaterials, DrawPolygon, Visibility, Add, breakpoints, Close, Options, ChevronDown, ChevronUp, Copy, Success, Expire, Remove } from '@opengeoweb/theme';
 import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawtoolSelectors, layerSelectors, uiSelectors, mapStoreActions, drawtoolActions, layerActions, useSetupDialog } from '@opengeoweb/store';
-import { defaultPolygon, emptyGeoJSON, MapControlButton, getIcon, rewindGeometry, getGeoJSONPropertyValue, currentlySupportedDrawModes, MapView, MapViewLayer, defaultLayers, getFeatureExtent } from '@opengeoweb/webmap-react';
+import { defaultPolygon, emptyGeoJSON, MapControlButton, getIcon, rewindGeometry, getGeoJSONPropertyValue, currentlySupportedDrawModes, defaultLayers, MapView, MapViewLayer, getFeatureExtent } from '@opengeoweb/webmap-react';
 import { SHARED_NAMESPACE, useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, CustomToggleButton, Filter, getPosition, FilterChip, FilterListItem, FilterLabel, StatusTag, LastUpdateTime, ErrorBoundary, pollingIntervalTimeout, isAxiosError as isAxiosError$1 } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, isAnyOf } from '@reduxjs/toolkit';
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
 import '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, useDraftFormHelpers, ReactHookFormSelect, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, errorMessages, ReactHookFormDateTime, isXHoursBefore, isXHoursAfter, isEmpty } from '@opengeoweb/form-fields';
-import { generateMapId, LayerType, getWMJSMapById, getGeoCoordFromLatLong, WMBBOX } from '@opengeoweb/webmap';
+import { LayerType, generateMapId, getWMJSMapById, getGeoCoordFromLatLong, WMBBOX } from '@opengeoweb/webmap';
 import { snackbarActions, snackbarTypes } from '@opengeoweb/snackbar';
 import * as React from 'react';
 import React__default, { useState, useEffect, useRef } from 'react';
 import { styled, Box, Typography, ListItem, Grid2, Paper, ListItemButton, Stack, LinearProgress, Button, MenuItem, FormHelperText, Tabs, Tab, Card, CardContent, CircularProgress, Menu, DialogTitle, DialogContent, Switch, ListItemIcon, Checkbox, ListItemText } from '@mui/material';
 import { VariableSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
-import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider, ProductStatus, useAirmetList, useSigmetList } from '@opengeoweb/api';
+import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider, ProductStatus, getHeaders, useAuthQuery } from '@opengeoweb/api';
 import { useFormContext } from 'react-hook-form';
 import { isEqual, cloneDeep, clamp, debounce } from 'lodash';
-import { useAuthenticationContext } from '@opengeoweb/authentication';
+import { useAuthenticationContext, getConfig } from '@opengeoweb/authentication';
 import { produce } from 'immer';
 import { isAxiosError } from 'axios';
 
@@ -11349,9 +11349,13 @@ const zoomToFeature = (mapId, geojsonFeature) => {
 };
 const WarningsMapView = ({
   geojsonFeature,
-  defaultBbox,
+  defaultMapPreset,
   isSnapshot: _isSnapshot = false
 }) => {
+  var _a, _b;
+  const defaultBbox = defaultMapPreset === null || defaultMapPreset === void 0 ? void 0 : defaultMapPreset.proj;
+  const defaultBaseLayer = ((_a = defaultMapPreset === null || defaultMapPreset === void 0 ? void 0 : defaultMapPreset.layers) === null || _a === void 0 ? void 0 : _a.find(layer => layer.layerType === LayerType.baseLayer)) || defaultLayers.baseLayerGrey;
+  const defaultOverLayer = ((_b = defaultMapPreset === null || defaultMapPreset === void 0 ? void 0 : defaultMapPreset.layers) === null || _b === void 0 ? void 0 : _b.find(layer => layer.layerType === LayerType.overLayer)) || defaultLayers.overLayer;
   const mapId = React.useRef(`WarningsMapView_${generateMapId()}`).current;
   const warningLayer = {
     id: `${mapId}geojsonfeature`,
@@ -11386,9 +11390,9 @@ const WarningsMapView = ({
       },
       holdShiftToScroll: true
     }, {
-      children: [!_isSnapshot && jsx(MapViewLayer, Object.assign({}, defaultLayers.baseLayerGrey, {
+      children: [!_isSnapshot && jsx(MapViewLayer, Object.assign({}, defaultBaseLayer, {
         id: `${mapId}_baseLayer`
-      })), warningLayer.geojson && jsx(MapViewLayer, Object.assign({}, warningLayer)), !_isSnapshot && jsx(MapViewLayer, Object.assign({}, defaultLayers.overLayer, {
+      })), warningLayer.geojson && jsx(MapViewLayer, Object.assign({}, warningLayer)), !_isSnapshot && jsx(MapViewLayer, Object.assign({}, defaultOverLayer, {
         id: `${mapId}_overlayer`
       }))]
     }))
@@ -11600,7 +11604,7 @@ const getWarningGeoJSONWithColor = (level, geoJSON) => {
   });
 };
 const Form = ({
-  defaultBbox,
+  defaultMapPreset,
   onSaveForm: _onSaveForm = () => {},
   onPublishForm: _onPublishForm = () => {},
   object,
@@ -11742,7 +11746,7 @@ const Form = ({
           }, {
             children: jsx(WarningsMapView, {
               geojsonFeature: geoJSONFeature,
-              defaultBbox: defaultBbox,
+              defaultMapPreset: defaultMapPreset,
               isSnapshot: _isSnapshot
             })
           })), jsx(Grid2, Object.assign({
@@ -11998,7 +12002,7 @@ var PublicWarningStatus;
 })(PublicWarningStatus || (PublicWarningStatus = {}));
 
 const PublicWarningsFormConnect = ({
-  defaultBbox
+  defaultMapPreset
 }) => {
   const publicWarning = useSelector(store => getPublicWarning(store));
   const publicWarningObject = useSelector(store => getPublicWarningObject(store));
@@ -12059,7 +12063,7 @@ const PublicWarningsFormConnect = ({
     isReadOnly: isReadOnly,
     error: publicWarningFormError,
     onFormDirty: onFormDirty,
-    defaultBbox: defaultBbox,
+    defaultMapPreset: defaultMapPreset,
     onAddObject: onAddObject
   });
 };
@@ -13723,7 +13727,7 @@ const PublicWarningsFormDialogConnect = ({
   bounds,
   source: _source = 'app',
   startPosition,
-  defaultBbox
+  defaultMapPreset
 }) => {
   const warningsApi = getWarningsApi();
   const {
@@ -13826,7 +13830,7 @@ const PublicWarningsFormDialogConnect = ({
       publicWarningEditor: publicWarningEditor
     }, {
       children: jsx(PublicWarningsFormConnect, {
-        defaultBbox: defaultBbox
+        defaultMapPreset: defaultMapPreset
       })
     })), jsx(AreaObjectLoaderConnect, {})]
   });
@@ -14597,7 +14601,8 @@ const transformAirmetToWarningFormat = apiAirmet => {
       validUntil: airmet.validDateEnd,
       level: 'AIR',
       probability: 0,
-      incident: airmet.sequence
+      incident: airmet.sequence,
+      firName: airmet.firName
     }
   };
 };
@@ -14619,7 +14624,8 @@ const transformSigmetToWarningFormat = apiSigmet => {
       validUntil: sigmet.validDateEnd,
       level: 'SIG',
       probability: 0,
-      incident: sigmet.sequence
+      incident: sigmet.sequence,
+      firName: sigmet.firName
     }
   };
 };
@@ -14722,9 +14728,9 @@ const WarningListItem = _a => {
   } = useWarningsTranslation();
   const phenomenonDetails = allPhenomenaDict[warning.warningDetail.phenomenon];
   const objectNameText = ((_c = (_b = warning.warningDetail.areas) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.objectName) || '-';
+  const objectHoverText = warning.warningDetail.firName ? warning.warningDetail.firName : objectNameText;
   const {
-    ref: objectNameRef,
-    isOverflowing: isObjectNameOverflowing
+    ref: objectNameRef
   } = useOverflowCheck(objectNameText);
   const phenomenonText = (phenomenonDetails === null || phenomenonDetails === void 0 ? void 0 : phenomenonDetails.translationKey) ? t(phenomenonDetails.translationKey) : '-';
   const {
@@ -14923,8 +14929,8 @@ const WarningListItem = _a => {
               whiteSpace: 'nowrap'
             }
           }, {
-            children: isObjectNameOverflowing ? jsx(CustomTooltip, Object.assign({
-              title: objectNameText,
+            children: jsx(CustomTooltip, Object.assign({
+              title: objectHoverText,
               placement: "top",
               sx: {
                 zIndex: 1000
@@ -14933,9 +14939,7 @@ const WarningListItem = _a => {
               children: jsx("span", {
                 children: objectNameText
               })
-            })) : jsx("span", {
-              children: objectNameText
-            })
+            }))
           }))
         })), jsx(WarningListColumnContent, Object.assign({
           title: t('warning-list-header-status'),
@@ -15536,6 +15540,37 @@ const ConfirmDeleteWarningDialog = ({
   }));
 };
 
+const config = getConfig();
+const airmetBaseUrl = config.GW_AIRMET_BASE_URL;
+const sigmetBaseUrl = config.GW_SIGMET_BASE_URL;
+// API
+const getAirmetList = auth => fetch(`${airmetBaseUrl}/airmetlist`, {
+  headers: getHeaders(auth)
+}).then(r => r.json());
+const getSigmetList = auth => fetch(`${sigmetBaseUrl}/sigmetlist`, {
+  headers: getHeaders(auth)
+}).then(r => r.json());
+
+/* *
+ * 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 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2024 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+const useAirmetList = () => useAuthQuery(['airmet-list'], getAirmetList);
+const useSigmetList = () => useAuthQuery(['sigmet-list'], getSigmetList);
+
 const PublicWarningListConnect = () => {
   const {
     t

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.30.0",
+  "version": "9.31.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -22,7 +22,7 @@
     "@opengeoweb/snackbar": "*",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.20",
-    "axios": "1.5.0",
+    "axios": "^1.7.7",
     "@opengeoweb/core": "*",
     "@opengeoweb/webmap": "*",
     "@opengeoweb/authentication": "*",

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

@@ -0,0 +1,7 @@
+import { Credentials } from '@opengeoweb/authentication';
+import { AirmetConfig, AirmetFromBackend, SigmetConfig, SigmetFromBackend } from '@opengeoweb/api';
+export declare const getAirmetList: (auth: Credentials) => Promise<AirmetFromBackend[]>;
+export declare const getSigmetList: (auth: Credentials) => Promise<SigmetFromBackend[]>;
+export declare const getlocalProductConfig: <T extends SigmetConfig | AirmetConfig>(configUrl: string) => Promise<T>;
+export declare const getAirmetConfig: (auth: Credentials) => Promise<AirmetConfig>;
+export declare const getSigmetConfig: (auth: Credentials) => Promise<SigmetConfig>;

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

@@ -0,0 +1,4 @@
+import { UseQueryResult } from '@tanstack/react-query';
+import { AirmetFromBackend, SigmetFromBackend } from '@opengeoweb/api';
+export declare const useAirmetList: () => UseQueryResult<AirmetFromBackend[]>;
+export declare const useSigmetList: () => UseQueryResult<SigmetFromBackend[]>;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Bbox } from '@opengeoweb/webmap';
+import { MapPreset } from '@opengeoweb/store';
 import { PublicWarningDetail } from '../../store/publicWarningForm/types';
 import { BaseDrawingListItem, DrawingListItem } from '../../store/drawings/types';
 import { FormAction, FormError } from '../../store/publicWarningForm/reducer';
@@ -14,10 +14,7 @@ interface FormData extends PublicWarningDetail {
 export declare const prepareFormValues: (data: FormData) => PublicWarningDetail;
 interface FormProps {
     formAction?: FormAction;
-    defaultBbox?: {
-        srs: string;
-        bbox: Bbox;
-    };
+    defaultMapPreset?: MapPreset;
     onSaveForm?: (formValues: PublicWarningDetail) => void;
     onPublishForm?: (formValues: PublicWarningDetail) => void;
     object?: DrawingListItem;

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

@@ -1,10 +1,7 @@
 import * as React from 'react';
-import { Bbox } from '@opengeoweb/webmap';
+import { MapPreset } from '@opengeoweb/store';
 interface PublicWarningsFormConnectProps {
-    defaultBbox?: {
-        srs: string;
-        bbox: Bbox;
-    };
+    defaultMapPreset?: MapPreset;
 }
 export declare const PublicWarningsFormConnect: React.FC<PublicWarningsFormConnectProps>;
 export {};

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

@@ -1,16 +1,12 @@
 import React from 'react';
-import { uiTypes } from '@opengeoweb/store';
+import { uiTypes, MapPreset } from '@opengeoweb/store';
 import { ConfirmationOptions, Position } from '@opengeoweb/shared';
 import { TFunction } from 'i18next';
-import { Bbox } from '@opengeoweb/webmap';
 export declare const warningFormConfirmationOptions: (t: TFunction) => ConfirmationOptions;
 export declare const isAlreadyEdited: (publicWarningEditor: string | undefined, username: string | undefined) => boolean;
 export declare const PublicWarningsFormDialogConnect: React.FC<{
     bounds?: string;
     source?: uiTypes.Source;
     startPosition?: Position;
-    defaultBbox?: {
-        srs: string;
-        bbox: Bbox;
-    };
+    defaultMapPreset?: MapPreset;
 }>;

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

@@ -1,13 +1,10 @@
 import * as React from 'react';
-import { Bbox } from '@opengeoweb/webmap';
 import { FeatureCollection } from 'geojson';
+import { MapPreset } from '@opengeoweb/store';
 export declare const zoomToFeature: (mapId: string, geojsonFeature: FeatureCollection | undefined) => void;
 interface WarningsMapViewProps {
     geojsonFeature: FeatureCollection | undefined;
-    defaultBbox?: {
-        srs: string;
-        bbox: Bbox;
-    };
+    defaultMapPreset?: MapPreset;
     isSnapshot?: boolean;
 }
 export declare const WarningsMapView: React.FC<WarningsMapViewProps>;

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

@@ -21,6 +21,7 @@ export interface PublicWarningDetail {
     proposal_id?: string;
     linked_to_id?: string;
     incident?: string;
+    firName?: string;
 }
 export declare enum PublicWarningStatus {
     DRAFT = "DRAFT",

package/src/lib/utils/testUtils.d.ts

@@ -0,0 +1,4 @@
+import { Store } from '@reduxjs/toolkit';
+import { uiTypes, WebMapStateModuleState } from '@opengeoweb/store';
+import { WarningModuleStore } from '../store/types';
+export declare const createMockStore: (mockState: WarningModuleStore & uiTypes.UIModuleState & WebMapStateModuleState) => Store;