@opengeoweb/warnings 9.20.2 → 9.22.0

package/index.esm.js

@@ -8,6 +8,7 @@ import { createEntityAdapter, createSlice, createSelector, createListenerMiddlew
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { defaultBbox } from '@opengeoweb/core';
+import { FORM_FIELDS_NAMESPACE, ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormSelect, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, useDraftFormHelpers, errorMessages, ReactHookFormDateTime, isXHoursBefore, isXHoursAfter, isEmpty } from '@opengeoweb/form-fields';
 import { snackbarActions } from '@opengeoweb/snackbar';
 import * as React from 'react';
 import React__default, { useState, useEffect, useRef } from 'react';
@@ -15,12 +16,11 @@ import { styled, Box, Typography, ListItem, Grid, Paper, ListItemButton, Stack,
 import { VariableSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { getApi, createApiInstance, createNonAuthApiInstance, createFakeApiInstance, ApiProvider } from '@opengeoweb/api';
-import { ReactHookFormHiddenInput, isValidGeoJsonCoordinates, ReactHookFormSelect, ReactHookFormTextField, ReactHookFormProvider, defaultFormOptions, useDraftFormHelpers, errorMessages, ReactHookFormDateTime, isXHoursBefore, isXHoursAfter, isEmpty } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
 import { isEqual, cloneDeep, clamp } from 'lodash';
 import { useAuthenticationContext } from '@opengeoweb/authentication';
 import { produce } from 'immer';
-import { generateMapId, LayerType, getWMJSMapById, WMBBOX } from '@opengeoweb/webmap';
+import { generateMapId, LayerType, getWMJSMapById, getGeoCoordFromLatLong, WMBBOX } from '@opengeoweb/webmap';
 import { isAxiosError } from 'axios';
 
 var en = {
@@ -1712,10 +1712,11 @@ const {
 const getWarningFormDirty = createSelector(selectDrawByInstanceId, drawing => (drawing === null || drawing === void 0 ? void 0 : drawing.isFormDirty) || false);
 
 const WARN_NAMESPACE = 'warn';
+const ns = [WARN_NAMESPACE, FORM_FIELDS_NAMESPACE];
 const translateKeyOutsideComponents = (key, params = undefined) => i18n.t(key, Object.assign({
-  ns: [WARN_NAMESPACE]
+  ns
 }, params));
-const useWarningsTranslation = () => useTranslation(WARN_NAMESPACE);
+const useWarningsTranslation = () => useTranslation(ns);
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -7877,7 +7878,7 @@ const levelOptions = t => [Object.assign({
 }, LevelColors[WarningLevel.severe]), Object.assign({
   title: t('warning-level-extreme'),
   key: WarningLevel.extreme
-}, LevelColors['extreme'])];
+}, LevelColors[WarningLevel.extreme])];
 const LevelField = ({
   isDisabled: _isDisabled = false,
   isReadOnly: _isReadOnly = false
@@ -8049,11 +8050,11 @@ const zoomToFeature = (mapId, geojsonFeature) => {
     return;
   }
   const bboxGeoJSON = getFeatureExtent(geojsonFeature);
-  const projectedCoordinateBoxBottomLeft = webmapjs.getGeoCoordFromLatLong({
+  const projectedCoordinateBoxBottomLeft = getGeoCoordFromLatLong(webmapjs, {
     x: bboxGeoJSON.left,
     y: bboxGeoJSON.bottom
   });
-  const projectedCoordinateBoxTopRight = webmapjs.getGeoCoordFromLatLong({
+  const projectedCoordinateBoxTopRight = getGeoCoordFromLatLong(webmapjs, {
     x: bboxGeoJSON.right,
     y: bboxGeoJSON.top
   });
@@ -8095,6 +8096,9 @@ const WarningsMapView = ({
       showScaleBar: false,
       onWMJSMount: mapId => {
         const webmapjs = getWMJSMapById(mapId);
+        if (!webmapjs) {
+          return;
+        }
         webmapjs.hideMouseCursorProperties();
         if (!geojsonFeature) {
           return;
@@ -8286,6 +8290,16 @@ const getErrors = errors => errors ? errors === null || errors === void 0 ? void
   title: '',
   errors: []
 }) : null;
+const getWarningGeoJSONWithColor = (level, geoJSON) => produce(geoJSON, draft => {
+  const draftFeature = draft === null || draft === void 0 ? void 0 : draft.features[0];
+  if (draftFeature) {
+    const defaultProps = getDefaultFeatureProperties(level);
+    if (!draftFeature.properties) {
+      draftFeature.properties = Object.assign({}, defaultProps);
+    }
+    Object.assign(draftFeature.properties, Object.assign(Object.assign({}, defaultProps), draftFeature.properties));
+  }
+});
 const Form = ({
   defaultBbox,
   onSaveForm: _onSaveForm = () => {},
@@ -8301,6 +8315,7 @@ const Form = ({
   onFormDirty: _onFormDirty = () => {},
   isSnapshot: _isSnapshot = false
 }) => {
+  const [warningGeoJSONFeature, setWarningGeoJSONFeature] = React.useState(publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.geoJSON);
   const {
     t
   } = useWarningsTranslation();
@@ -8347,26 +8362,19 @@ const Form = ({
   };
   const onPressClear = () => {
     reset(getEmptyPublicWarning());
+    setWarningGeoJSONFeature(undefined);
   };
   React.useEffect(() => {
     // sync redux with react-hook-form
     reset(getFormData(publicWarningDetails, object));
   }, [object, reset, publicWarningDetails]);
+  React.useEffect(() => {
+    // sync drawing on map with selected warning
+    setWarningGeoJSONFeature(publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.geoJSON);
+  }, [publicWarningDetails]);
   const errors = getErrors(_error.message);
-  // object is used making drawing, publicWarningDetails is used when showing the dialog from the warninglist.
-  const warningGeoJSONFeature = (object === null || object === void 0 ? void 0 : object.geoJSON) || (publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.geoJSON);
-  // Add colors, if not defined
-  const warningGeoJSONFeatureWithFillProps = produce(warningGeoJSONFeature, draft => {
-    const draftFeature = draft === null || draft === void 0 ? void 0 : draft.features[0];
-    if (draftFeature) {
-      const level = WarningLevel[publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.level] || WarningLevel[WarningLevel.moderate];
-      const defaultProps = getDefaultFeatureProperties(level);
-      if (!draftFeature.properties) {
-        draftFeature.properties = Object.assign({}, defaultProps);
-      }
-      Object.assign(draftFeature.properties, Object.assign(Object.assign({}, defaultProps), draftFeature.properties));
-    }
-  });
+  const level = WarningLevel[publicWarningDetails === null || publicWarningDetails === void 0 ? void 0 : publicWarningDetails.level] || WarningLevel[WarningLevel.moderate];
+  const geoJSONFeature = getWarningGeoJSONWithColor(level, warningGeoJSONFeature);
   return jsxs(ContainerWrapper, {
     children: [jsxs(ContainerFormWrapper, Object.assign({
       isReadOnly: _isReadOnly2
@@ -8421,7 +8429,7 @@ const Form = ({
               xs: 12
             }, {
               children: jsx(WarningsMapView, {
-                geojsonFeature: warningGeoJSONFeatureWithFillProps,
+                geojsonFeature: geoJSONFeature,
                 defaultBbox: defaultBbox,
                 isSnapshot: _isSnapshot
               })
@@ -9551,12 +9559,12 @@ const PublicWarningListConnect = () => {
     auth
   } = useAuthenticationContext();
   const [confirmDialogOptions, setConfirmDialogOptions] = React__default.useState(undefined);
-  const warnings = useSelector(store => selectAllPublicWarnings(store));
-  const selectedPublicWarningId = useSelector(store => getSelectedPublicWarningId(store));
-  const isLoading = useSelector(store => isPublicWarningsLoading(store));
-  const error = useSelector(store => getPublicWarningsError(store));
-  const isFormDirty = useSelector(store => getSelectedPublicIsFormDirty(store));
-  const lastUpdatedTime = useSelector(store => getPublicWarningsLastUpdatedTime(store));
+  const warnings = useSelector(selectAllPublicWarnings);
+  const selectedPublicWarningId = useSelector(getSelectedPublicWarningId);
+  const isLoading = useSelector(isPublicWarningsLoading);
+  const error = useSelector(getPublicWarningsError);
+  const isFormDirty = useSelector(getSelectedPublicIsFormDirty);
+  const lastUpdatedTime = useSelector(getPublicWarningsLastUpdatedTime);
   const openPublicWarningDialog = (formAction, publicWarning) => __awaiter(void 0, void 0, void 0, function* () {
     if (isFormDirty) {
       const mayProceed = yield confirmDialog(warningFormConfirmationOptions(t)).then(() => true).catch(() => false);
@@ -9576,9 +9584,20 @@ const PublicWarningListConnect = () => {
   const createWarning = () => {
     openPublicWarningDialog('');
   };
-  const editWarning = publicWarning => {
-    openPublicWarningDialog('', publicWarning);
-  };
+  const editWarning = publicWarning => __awaiter(void 0, void 0, void 0, function* () {
+    if (publicWarning.id && (auth === null || auth === void 0 ? void 0 : auth.username) && !publicWarning.editor) {
+      yield dispatch(publicWarningFormActions.toggleEditorWarning({
+        warningId: publicWarning.id,
+        isEditor: true,
+        username: auth === null || auth === void 0 ? void 0 : auth.username
+      }));
+      yield openPublicWarningDialog('', Object.assign(Object.assign({}, publicWarning), {
+        editor: auth === null || auth === void 0 ? void 0 : auth.username
+      }));
+    } else {
+      openPublicWarningDialog('', publicWarning);
+    }
+  });
   const openSnackbar = message => {
     dispatch(snackbarActions.openSnackbar({
       message
@@ -10005,4 +10024,4 @@ const drawingModuleConfig = {
   middlewares: [drawingsListener.middleware, publicWarningsListener.middleware, publicWarningFormListener.middleware]
 };
 
-export { DrawingToolConnect, Wrapper as DrawingToolForm, DrawingToolFormConnect, DrawingToolMapButtonConnect, ObjectManagerConnect, ObjectManagerMapButtonConnect, PublicWarningApiWrapper, PublicWarningsFormDialog, PublicWarningsFormDialogConnect, WarningsModuleProvider, componentsLookUp, drawingModuleConfig, isAlreadyEdited, useObjectDrawDialogAction, warningFormConfirmationOptions, warningsTranslations };
+export { DrawingToolConnect, Wrapper as DrawingToolForm, DrawingToolFormConnect, DrawingToolMapButtonConnect, ObjectManagerConnect, ObjectManagerMapButtonConnect, PublicWarningApiWrapper, PublicWarningsFormDialog, PublicWarningsFormDialogConnect, WARN_NAMESPACE, WarningsModuleProvider, componentsLookUp, drawingModuleConfig, isAlreadyEdited, useObjectDrawDialogAction, warningFormConfirmationOptions, warningsTranslations };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.20.2",
+  "version": "9.22.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,7 +13,7 @@
     "@opengeoweb/store": "*",
     "@opengeoweb/webmap-react": "*",
     "react-redux": "^8.1.3",
-    "@mui/material": "~5.15.11",
+    "@mui/material": "^5.16.0",
     "@opengeoweb/theme": "*",
     "@opengeoweb/form-fields": "*",
     "react-hook-form": "^7.50.1",
@@ -26,8 +26,8 @@
     "@opengeoweb/core": "*",
     "@opengeoweb/webmap": "*",
     "@opengeoweb/authentication": "*",
-    "react-i18next": "^13.5.0",
-    "i18next": "^23.7.19",
+    "react-i18next": "^14.1.2",
+    "i18next": "^23.11.5",
     "immer": "^10.0.3"
   },
   "peerDependencies": {

package/src/index.d.ts

@@ -6,4 +6,5 @@ export * from './lib/components/DrawingToolForm';
 export * from './lib/components/PublicWarningsFormDialog';
 export * from './lib/components/ComponentsLookUp';
 export * from './lib/store/config';
+export { WARN_NAMESPACE } from './lib/utils/i18n';
 export { warningsTranslations };

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

@@ -4,3 +4,4 @@ export declare const WARN_NAMESPACE = "warn";
 export declare const initWarnI18n: () => void;
 export declare const translateKeyOutsideComponents: (key: string, params?: Record<string, string | number> | undefined) => string;
 export declare const useWarningsTranslation: () => UseTranslationResponse<typeof WARN_NAMESPACE, typeof i18n>;
+export { i18n };