@opengeoweb/workspace 9.1.0 → 9.2.0

package/index.esm.js

@@ -5,11 +5,11 @@ import { isAxiosError, getAxiosErrorMessage, withEggs, ConfirmationServiceProvid
 import { snackbarActions, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
 import * as React from 'react';
 import React__default, { useContext, useRef, useCallback, useDebugValue, createElement, PureComponent, forwardRef } from 'react';
-import { ThemeWrapper, lightTheme, Menu, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, Search, Clear, WebAssetOff } from '@opengeoweb/theme';
+import { ThemeWrapper, lightTheme, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, Search, Clear, WebAssetOff } from '@opengeoweb/theme';
 import { unstable_batchedUpdates } from 'react-dom';
 import { timeSeriesModuleConfig } from '@opengeoweb/timeseries';
 import { AuthenticationProvider, useAuthenticationContext } from '@opengeoweb/authentication';
-import { useTheme as useTheme$2, LinearProgress, Typography, ListItem, ListItemButton, ListItemIcon, ListItemText, Grid, Chip, Stack, debounce as debounce$1, TextField, InputAdornment, Box as Box$2, Backdrop, Menu as Menu$1, ListSubheader, MenuItem, Tabs } from '@mui/material';
+import { LinearProgress, Typography, ListItem, ListItemButton, ListItemIcon, ListItemText, Grid, useTheme as useTheme$2, Chip, Stack, debounce as debounce$1, TextField, InputAdornment, Box as Box$2, Backdrop, Menu, ListSubheader, MenuItem, Tabs } from '@mui/material';
 import 'react-mosaic-component/react-mosaic-component.css';
 import { jsx } from 'react/jsx-runtime';
 import { ReactHookFormTextField, ReactHookFormHiddenInput, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
@@ -22733,6 +22733,13 @@ var viewPresetsListFullContent = [
 		componentType: "CapWarningList",
 		initialProps: {
 		}
+	},
+	{
+		id: "warningList",
+		title: "Warning List",
+		componentType: "WarningList",
+		initialProps: {
+		}
 	}
 ];
 
@@ -22898,6 +22905,12 @@ var viewPresetsList = [
 		id: "capView",
 		date: "2022-06-01T12:34:27.787184",
 		scope: "system"
+	},
+	{
+		title: "Warning List",
+		id: "warningList",
+		date: "2022-06-01T12:34:27.787184",
+		scope: "system"
 	}
 ];
 
@@ -25784,12 +25797,7 @@ var WorkspaceControls = function WorkspaceControls(_ref) {
   var createNode = _ref.createNode,
     path = _ref.path,
     _ref$shouldPreventClo = _ref.shouldPreventCloseView,
-    shouldPreventCloseView = _ref$shouldPreventClo === void 0 ? false : _ref$shouldPreventClo,
-    _ref$isViewPresetDial = _ref.isViewPresetDialogOpen,
-    isViewPresetDialogOpen = _ref$isViewPresetDial === void 0 ? false : _ref$isViewPresetDial,
-    _ref$onToggleViewPres = _ref.onToggleViewPresetDialog,
-    onToggleViewPresetDialog = _ref$onToggleViewPres === void 0 ? function () {} : _ref$onToggleViewPres;
-  var theme = useTheme$2();
+    shouldPreventCloseView = _ref$shouldPreventClo === void 0 ? false : _ref$shouldPreventClo;
   var confirmDialog = useConfirmationDialog();
   var _React$useContext = React.useContext(MosaicContext),
     actions = _React$useContext.mosaicActions;
@@ -25849,25 +25857,6 @@ var WorkspaceControls = function WorkspaceControls(_ref) {
     }));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CustomIconButton, {
-    "data-testid": "open-viewpresets",
-    sx: Object.assign(Object.assign({}, buttonStyle), {
-      '&&': {
-        backgroundColor: !isViewPresetDialogOpen ? 'transparent' : undefined,
-        '&:hover': {
-          backgroundColor: 'geowebColors.workspace.tabButtonHover'
-        },
-        '.MuiSvgIcon-root > path': {
-          fill: isViewPresetDialogOpen ? theme.palette.geowebColors.iconButtons.tool.active.color : undefined
-        }
-      }
-    }),
-    variant: "tool",
-    onClick: function onClick() {
-      onToggleViewPresetDialog(!isViewPresetDialogOpen);
-    },
-    tooltipTitle: "Open view presets",
-    isSelected: isViewPresetDialogOpen
-  }, /*#__PURE__*/React.createElement(Menu, null)), /*#__PURE__*/React.createElement(CustomIconButton, {
     "data-testid": "split-horizontal-btn",
     sx: buttonStyle,
     onClick: function onClick() {
@@ -27635,7 +27624,7 @@ var WorkspaceOptions = function WorkspaceOptions(_ref) {
           paddingRight: '4px !important',
           display: 'block',
           width: '100%',
-          height: 24,
+          height: 20,
           fontStyle: hasChanges ? 'italic' : undefined,
           fontWeight: 500,
           textOverflow: 'ellipsis',
@@ -27645,7 +27634,9 @@ var WorkspaceOptions = function WorkspaceOptions(_ref) {
           textAlign: 'left',
           textTransform: 'none',
           '&.MuiButtonBase-root': {
-            paddingLeft: '12px',
+            paddingLeft: 1,
+            paddingTop: 1,
+            paddingBottom: 1,
             border: 'none'
           }
         }
@@ -27658,7 +27649,7 @@ var WorkspaceOptions = function WorkspaceOptions(_ref) {
         marginLeft: 1,
         color: 'geowebColors.captions.captionStatus.rgba'
       }
-    }, panelId), /*#__PURE__*/React.createElement(Menu$1, {
+    }, panelId), /*#__PURE__*/React.createElement(Menu, {
       BackdropProps: {
         style: {
           opacity: 0,
@@ -27723,6 +27714,7 @@ var WorkspaceOptions = function WorkspaceOptions(_ref) {
  * Copyright 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * */
+var VIEW_PRESET_MENU_TOOLTIP = 'View presets menu';
 var NEW_TITLE_SUFFIX = '(not saved)';
 var EXISTING_TITLE_SUFFIX = '(modified)';
 var getPresetTitle = function getPresetTitle(title, hasChanges, isNew) {
@@ -27735,8 +27727,10 @@ var getPresetTitle = function getPresetTitle(title, hasChanges, isNew) {
   return title;
 };
 var WorkspaceViewTitleConnect = function WorkspaceViewTitleConnect(_ref) {
-  var panelId = _ref.panelId;
+  var panelId = _ref.panelId,
+    isViewPresetDialogOpen = _ref.isViewPresetDialogOpen;
   var dispatch = useDispatch();
+  var theme = useTheme$2();
   var currentMapPreset = useSelector(function (store) {
     return mapSelectors.getMapPreset(store, panelId);
   });
@@ -27813,11 +27807,43 @@ var WorkspaceViewTitleConnect = function WorkspaceViewTitleConnect(_ref) {
       }
     });
   };
+  var toggleViewPresetDialog = React.useCallback(function (_ref2) {
+    var panelId = _ref2.panelId,
+      isViewPresetDialogOpen = _ref2.isViewPresetDialogOpen;
+    dispatch(viewPresetActions.toggleViewPresetListDialog({
+      panelId: panelId,
+      isViewPresetListDialogOpen: isViewPresetDialogOpen
+    }));
+  }, [dispatch]);
   var isNewActive = activeMapPresetId === '';
   var title = (workspaceView === null || workspaceView === void 0 ? void 0 : workspaceView.title) || MAPPRESET_ACTIVE_TITLE;
   var viewScope = workspaceView === null || workspaceView === void 0 ? void 0 : workspaceView.scope;
   var fullTitle = getPresetTitle(title, hasMapPresetChanges, isNewActive);
-  return /*#__PURE__*/React.createElement(WorkspaceOptions, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CustomIconButton, {
+    "data-testid": "open-viewpresets",
+    sx: {
+      marginLeft: -1,
+      marginRight: 1,
+      '&&': {
+        backgroundColor: !isViewPresetDialogOpen ? 'transparent' : undefined,
+        '&:hover': {
+          backgroundColor: 'geowebColors.workspace.tabButtonHover'
+        },
+        '.MuiSvgIcon-root > path': {
+          fill: isViewPresetDialogOpen ? theme.palette.geowebColors.iconButtons.tool.active.color : undefined
+        }
+      }
+    },
+    variant: "tool",
+    onClick: function onClick() {
+      toggleViewPresetDialog({
+        panelId: panelId,
+        isViewPresetDialogOpen: !isViewPresetDialogOpen
+      });
+    },
+    tooltipTitle: VIEW_PRESET_MENU_TOOLTIP,
+    isSelected: isViewPresetDialogOpen
+  }, /*#__PURE__*/React.createElement(Preset, null)), /*#__PURE__*/React.createElement(WorkspaceOptions, {
     panelId: panelId,
     title: fullTitle,
     hasChanges: hasMapPresetChanges || isNewActive,
@@ -27826,7 +27852,7 @@ var WorkspaceViewTitleConnect = function WorkspaceViewTitleConnect(_ref) {
     handleSaveAs: onSaveAs,
     handleEdit: viewScope === 'user' ? onEdit : undefined,
     id: "viewpreset-options-toolbutton"
-  });
+  }));
 };
 
 /* *
@@ -27948,19 +27974,13 @@ var WorkspaceTileConnect = function WorkspaceTileConnect(_ref) {
     path: path,
     createNode: createNode,
     title: /*#__PURE__*/React.createElement(WorkspaceViewTitleConnect, {
-      panelId: mosaicNodeId
+      panelId: mosaicNodeId,
+      isViewPresetDialogOpen: isViewPresetDialogOpen || false
     }),
     toolbarControls: /*#__PURE__*/React.createElement(WorkspaceControls, {
       createNode: createNode,
       path: path,
-      shouldPreventCloseView: shouldPreventCloseView,
-      isViewPresetDialogOpen: isViewPresetDialogOpen,
-      onToggleViewPresetDialog: function onToggleViewPresetDialog(isViewPresetDialogOpen) {
-        toggleViewPresetDialog({
-          panelId: mosaicNodeId,
-          isViewPresetDialogOpen: isViewPresetDialogOpen
-        });
-      }
+      shouldPreventCloseView: shouldPreventCloseView
     })
   }, isViewPresetsFetching && /*#__PURE__*/React.createElement(LinearProgress, {
     "data-testid": "loading-bar",
@@ -33132,7 +33152,7 @@ var WorkspaceMenuButton = function WorkspaceMenuButton(_ref) {
   };
   return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(Box$2, {
     sx: {
-      padding: 1,
+      padding: '4px 8px',
       flexGrow: 1
     }
   }, /*#__PURE__*/React__default.createElement(CustomIconButton, {
@@ -33143,6 +33163,7 @@ var WorkspaceMenuButton = function WorkspaceMenuButton(_ref) {
     isSelected: showMenu,
     "aria-label": "workspace menu",
     variant: "tool",
+    tooltipTitle: "Workspace menu",
     sx: {
       '&&': {
         backgroundColor: !showMenu ? 'transparent' : undefined,
@@ -33151,7 +33172,7 @@ var WorkspaceMenuButton = function WorkspaceMenuButton(_ref) {
         }
       }
     }
-  }, /*#__PURE__*/React__default.createElement(Menu, null))), /*#__PURE__*/React__default.createElement(WorkspaceMenu, {
+  }, /*#__PURE__*/React__default.createElement(PresetWorkspace, null))), /*#__PURE__*/React__default.createElement(WorkspaceMenu, {
     isOpen: showMenu,
     closeMenu: onCloseMenu
   }));
@@ -33319,16 +33340,15 @@ var WorkspaceTab = function WorkspaceTab(_ref) {
     sx: {
       display: 'flex',
       flexDirection: 'row',
-      alignItems: 'center',
-      paddingLeft: 1
+      alignItems: 'center'
     },
     "data-testid": "workspaceTab"
-  }, /*#__PURE__*/React.createElement(WorkspaceOptionsConnect, {
+  }, /*#__PURE__*/React.createElement(WorkspaceMenuButtonConnect, {
+    workspaceId: workspaceId
+  }), /*#__PURE__*/React.createElement(WorkspaceOptionsConnect, {
     title: title,
     activeTab: activeTab,
     workspaceId: workspaceId
-  }), /*#__PURE__*/React.createElement(WorkspaceMenuButtonConnect, {
-    workspaceId: workspaceId
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/workspace",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "GeoWeb Workspace library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/WorkspaceView/WorkspaceControls.d.ts

@@ -4,8 +4,6 @@ interface WorkspaceControlsProps {
     path: MosaicBranch[];
     createNode?: () => MosaicNode<string>;
     shouldPreventCloseView?: boolean;
-    isViewPresetDialogOpen?: boolean;
-    onToggleViewPresetDialog?: (isOpen: boolean) => void;
 }
 declare const WorkspaceControls: React.FC<WorkspaceControlsProps>;
 export default WorkspaceControls;

package/src/lib/components/WorkspaceViewTitle/WorkspaceViewTitleConnect.d.ts

@@ -1,6 +1,11 @@
 import * as React from 'react';
+export interface ToggleViewPresetDialogProps {
+    panelId: string;
+    isViewPresetDialogOpen: boolean;
+}
 interface WorkspaceViewTitleConnectProps {
     panelId: string;
+    isViewPresetDialogOpen: boolean;
 }
 export declare const NEW_TITLE_SUFFIX = "(not saved)";
 export declare const EXISTING_TITLE_SUFFIX = "(modified)";

package/src/lib/storyUtils/componentsLookUp.d.ts

@@ -3,9 +3,10 @@ import { ComponentsLookUpPayload as CoreComponentsLookUpPayload } from '@opengeo
 import { ComponentsLookUpPayload as TimeseriesComponentsLookUpPayload } from '@opengeoweb/timeseries';
 import { ComponentsLookUpPayload as TafComponentsLookUpPayload } from '@opengeoweb/taf';
 import { SigmetComponentsLookUpPayload, AirmetComponentsLookUpPayload } from '@opengeoweb/sigmet-airmet';
+import { ComponentsLookUpPayload as WarningListComponentsLookUpPayLoad } from '@opengeoweb/warnings';
 /**
  * The lookup table is for registering your own components with the workspace.
  * @param payload
  * @returns
  */
-export declare const componentsLookUp: (payload: CoreComponentsLookUpPayload | TimeseriesComponentsLookUpPayload | TafComponentsLookUpPayload | SigmetComponentsLookUpPayload | AirmetComponentsLookUpPayload) => React.ReactElement;
+export declare const componentsLookUp: (payload: CoreComponentsLookUpPayload | TimeseriesComponentsLookUpPayload | TafComponentsLookUpPayload | SigmetComponentsLookUpPayload | AirmetComponentsLookUpPayload | WarningListComponentsLookUpPayLoad) => React.ReactElement;

package/src/lib/storyUtils/componentsLookUp.stories.d.ts

@@ -40,3 +40,7 @@ export declare const MapWithTimeslider: {
     (): React.ReactElement;
     storyName: string;
 };
+export declare const WarningList: {
+    (): React.ReactElement;
+    storyName: string;
+};