@opengeoweb/warnings 9.4.1 → 9.5.0

package/index.esm.js

@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Polygons, Share, ExitDomain, Edit, Delete, DrawPolygon, Visibility, Add, Wind, Fog, Lightning, Snow, Rain, TemperatureHigh, FunnelCloud, TemperatureLow, CoastalEvent, breakpoints, Options } from '@opengeoweb/theme';
 import { uiTypes, uiActions, getSingularDrawtoolDrawLayerId, drawtoolSelectors, layerSelectors, uiSelectors, drawtoolActions, mapStoreActions, layerActions, useSetupDialog } from '@opengeoweb/store';
 import { emptyGeoJSON, MapControlButton, getGeoJSONPropertyValue, getIcon, rewindGeometry, currentlySupportedDrawModes } from '@opengeoweb/webmap-react';
-import { useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, SwitchButton, StatusTag, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
+import { useConfirmationDialog, ToggleMenu, dateUtils, calculateStartSize, ToolContainerDraggable, AlertBanner, ConfirmationDialog, getAxiosErrorMessage, usePrevious, CustomIconButton, CustomTooltip, Avatar, getInitials, SwitchButton, StatusTag, ErrorBoundary, isAxiosError } from '@opengeoweb/shared';
 import { createEntityAdapter, createSlice, createSelector } from '@reduxjs/toolkit';
 import { snackbarActions } from '@opengeoweb/snackbar';
 import { styled, Box, Typography, ListItem, Grid, Paper, ListItemButton, Stack, LinearProgress, Button, FormHelperText, MenuItem, Tabs, Tab, FormControl, Card, CardContent, ListItemIcon, CircularProgress, List } from '@mui/material';
@@ -1639,7 +1639,7 @@ var ObjectManagerConnect = function ObjectManagerConnect(_ref) {
     openDrawDialog = _useObjectDrawDialogA.openDrawDialog;
   var geoJSONLayerId = getSingularDrawtoolDrawLayerId(mapId);
   var currentLayer = useSelector(function (store) {
-    return layerSelectors.getLayerById(store, geoJSONLayerId);
+    return layerSelectors.getLayerByIdWithoutTimeDimension(store, geoJSONLayerId);
   });
   var currrentDrawing = useSelector(function (store) {
     return selectDrawByInstanceId(store, drawingDialogType);
@@ -4538,6 +4538,18 @@ var DrawingToolConnect = function DrawingToolConnect(_ref) {
   }, /*#__PURE__*/React.createElement(DrawingToolFormConnect, null));
 };
 
+var WarningAvatar = function WarningAvatar(_ref) {
+  var editor = _ref.editor,
+    _ref$tooltipPlacement = _ref.tooltipPlacement,
+    tooltipPlacement = _ref$tooltipPlacement === void 0 ? 'bottom' : _ref$tooltipPlacement;
+  return /*#__PURE__*/React.createElement(CustomTooltip, {
+    title: "Editor: ".concat(editor),
+    placement: tooltipPlacement
+  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Avatar, {
+    size: "small"
+  }, getInitials(editor))));
+};
+
 var DEFAULT_WARNING_DIALOG_SIZE = {
   width: 320,
   height: 800
@@ -4579,7 +4591,8 @@ var PublicWarningsFormDialog = function PublicWarningsFormDialog(_ref) {
     _ref$onChangeFormMode = _ref.onChangeFormMode,
     onChangeFormMode = _ref$onChangeFormMode === void 0 ? function () {} : _ref$onChangeFormMode,
     _ref$shouldHideFormMo = _ref.shouldHideFormMode,
-    shouldHideFormMode = _ref$shouldHideFormMo === void 0 ? false : _ref$shouldHideFormMo;
+    shouldHideFormMode = _ref$shouldHideFormMo === void 0 ? false : _ref$shouldHideFormMo,
+    publicWarningEditor = _ref.publicWarningEditor;
   var minSize = DEFAULT_WARNING_DIALOG_MIN_SIZE;
   var startSizeCalc = calculateStartSize(minSize, size, startPosition);
   var _React$useState = React.useState(startSizeCalc),
@@ -4633,7 +4646,8 @@ var PublicWarningsFormDialog = function PublicWarningsFormDialog(_ref) {
         right: 32,
         backgroundColor: 'geowebColors.background.surface',
         height: 24,
-        paddingLeft: 1
+        paddingLeft: 1,
+        paddingRight: 0.5
       }
     }, /*#__PURE__*/React.createElement(Box, {
       sx: {
@@ -4643,7 +4657,15 @@ var PublicWarningsFormDialog = function PublicWarningsFormDialog(_ref) {
     }, /*#__PURE__*/React.createElement(SwitchButton, {
       checked: !isReadOnly,
       onChange: onChangeMode
-    }))))
+    })), publicWarningEditor && ( /*#__PURE__*/React.createElement(Box, {
+      sx: {
+        position: 'relative',
+        top: 3,
+        right: '-2px'
+      }
+    }, /*#__PURE__*/React.createElement(WarningAvatar, {
+      editor: publicWarningEditor
+    })))))
   }, {
     sx: {
       footer: {
@@ -6011,9 +6033,22 @@ var WarningsOnStatus = function WarningsOnStatus(_ref) {
       }
     }, ((_a = warning.warningDetail) === null || _a === void 0 ? void 0 : _a.level) && (levelDetails === null || levelDetails === void 0 ? void 0 : levelDetails.title) || '-')), /*#__PURE__*/React__default.createElement(WarningListColumnContent, {
       status: status
-    }, status === 'DRAFT' ? ( /*#__PURE__*/React__default.createElement(Button, {
+    }, status === 'DRAFT' ? ( /*#__PURE__*/React__default.createElement(Box, {
+      sx: {
+        position: 'relative'
+      }
+    }, warning.editor && ( /*#__PURE__*/React__default.createElement(Box, {
+      sx: {
+        width: '16px',
+        position: 'absolute',
+        top: '1px',
+        right: '-25px'
+      }
+    }, /*#__PURE__*/React__default.createElement(WarningAvatar, {
+      editor: warning.editor
+    }))), /*#__PURE__*/React__default.createElement(Button, {
       sx: {
-        height: '30px',
+        height: '20px',
         padding: '0px',
         '& .MuiSvgIcon-root': {
           marginRight: '-2px'
@@ -6021,7 +6056,7 @@ var WarningsOnStatus = function WarningsOnStatus(_ref) {
       },
       variant: "flat",
       startIcon: /*#__PURE__*/React__default.createElement(Edit, null)
-    }, "DRAFT")) : ( /*#__PURE__*/React__default.createElement(StatusTag, {
+    }, "DRAFT"))) : ( /*#__PURE__*/React__default.createElement(StatusTag, {
       content: status.toLowerCase(),
       color: status === 'EXPIRED' ? 'grey' : 'green',
       sx: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/warnings",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "description": "GeoWeb warinings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

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

@@ -19,4 +19,5 @@ export declare const PublicWarningsFormDialog: React.FC<{
     isReadOnly?: boolean;
     onChangeFormMode?: (isReadOnly: boolean) => void;
     shouldHideFormMode?: boolean;
+    publicWarningEditor?: string;
 }>;

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

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