@opengeoweb/workspace 11.0.0 → 11.1.0

package/index.esm.js

@@ -5,11 +5,11 @@ import { chunk, cloneDeep, pick, isEmpty, isEqual, isString } from 'lodash';
 import { getLeaves, MosaicContext, getAndAssertNodeAtPathExists, createBalancedTreeFromLeaves, MosaicWindow, Mosaic } from 'react-mosaic-component';
 import { timeSeriesActions, TimeSeriesTypes, timeSeriesSelectors, timeSeriesReducer } from '@opengeoweb/timeseries';
 import { publicWarningActions, WARN_NAMESPACE, warningsTranslations, publicWarningsSelectors } from '@opengeoweb/warnings';
-import { PROJECTION, getAxiosErrorMessage, isAxiosAuthError, isAxiosError as isAxiosError$1, SHARED_NAMESPACE, sharedTranslations, ConfirmationServiceProvider, CustomIconButton, useConfirmationDialog, AlertBanner, PresetScope, CustomTooltip, SearchHighlight, ToggleMenu, DEFAULT_FILTER_HEIGHT, Filter, Resizable, ToolContainer, renderCounter, CustomToggleButton, usePrevious, ConfirmationDialog } from '@opengeoweb/shared';
+import { PROJECTION, getAxiosErrorMessage, isAxiosAuthError, isAxiosError as isAxiosError$1, SHARED_NAMESPACE, sharedTranslations, ConfirmationServiceProvider, CustomIconButton, useConfirmationDialog, AlertBanner, PresetScope, CustomTooltip, SearchHighlight, ToggleMenu, DEFAULT_FILTER_HEIGHT, Filter, renderCounter, CustomDialog, ToolContainer, CustomToggleButton, usePrevious, ConfirmationButtons } from '@opengeoweb/shared';
 import { snackbarTypes, snackbarActions, snackbarListener, snackbarReducer, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
 import { isAxiosError } from 'axios';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { ThemeWrapper, lightTheme, Link, LinkOff, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, BackdropStyle, BackdropElement, CloudLoading, CloudIdle, WebAssetOff, Exclamation } from '@opengeoweb/theme';
+import { ThemeWrapper, lightTheme, Link, LinkOff, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, CloudLoading, CloudIdle, WebAssetOff, Exclamation } from '@opengeoweb/theme';
 import { Provider, useDispatch, useSelector, useStore, shallowEqual } from 'react-redux';
 import { initReactI18next, useTranslation, I18nextProvider } from 'react-i18next';
 import { AuthenticationProvider, useAuthenticationContext, GEOWEB_ROLE_PRESETS_ADMIN } from '@opengeoweb/authentication';
@@ -20,7 +20,7 @@ import { CORE_NAMESPACE, coreTranslations } from '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, formFieldsTranslations, ReactHookFormTextField, ReactHookFormHiddenInput, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
 import * as React from 'react';
 import React__default, { useCallback } from 'react';
-import { Menu, Typography, List, ListItem, ListItemButton, ListItemIcon, Checkbox, ListItemText, LinearProgress, Grid2, Box, Backdrop, ListSubheader, MenuItem, useTheme, FormGroup, FormControlLabel, Tabs } from '@mui/material';
+import { Menu, Typography, List, ListItem, ListItemButton, ListItemIcon, Checkbox, ListItemText, LinearProgress, Grid2, Box, ListSubheader, MenuItem, useTheme, FormGroup, FormControlLabel, Tabs } from '@mui/material';
 import 'react-mosaic-component/react-mosaic-component.css';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { FixedSizeList } from 'react-window';
@@ -1414,9 +1414,9 @@ var slice$2 = createSlice({
     warningsPresetChangeActions.map(function (warningsAction) {
       return builder.addCase(warningsAction, function (draft, action) {
         var _action$payload14 = action.payload,
-          origin = _action$payload14.origin,
+          systemUpdate = _action$payload14.systemUpdate,
           panelId = _action$payload14.panelId;
-        if (origin === 'user' && panelId) {
+        if (!systemUpdate && panelId) {
           var entity = draft.entities[panelId];
           if (entity && !(entity != null && entity.hasChanges)) {
             entity.hasChanges = true;
@@ -6536,7 +6536,8 @@ var WorkspaceSelectListRow = function WorkspaceSelectListRow(_ref) {
         fontSize: '12px',
         fontWeight: 500,
         textOverflow: 'ellipsis',
-        overflow: 'hidden'
+        overflow: 'hidden',
+        whiteSpace: 'nowrap'
       },
       ' .MuiListItemText-secondary': {
         fontSize: '10px',
@@ -6892,36 +6893,32 @@ var ViewPresetMenuListConnect = function ViewPresetMenuListConnect(_ref) {
   });
 };
 
-var ResizeMenu = function ResizeMenu(_ref) {
-  var onCloseMenu = _ref.onCloseMenu,
-    title = _ref.title,
-    children = _ref.children;
-  return jsx(Resizable, {
-    defaultSize: {
+var ViewPresetMenu = function ViewPresetMenu(_ref) {
+  var closeMenu = _ref.closeMenu,
+    panelId = _ref.panelId,
+    _ref$isOpen = _ref.isOpen,
+    isOpen = _ref$isOpen === void 0 ? false : _ref$isOpen;
+  var _useWorkspaceTranslat = useWorkspaceTranslation(),
+    t = _useWorkspaceTranslat.t;
+  renderCounter.count(ViewPresetMenu.name);
+  return jsx(CustomDialog, {
+    open: isOpen,
+    onClose: function onClose() {
+      if (closeMenu) {
+        closeMenu();
+      }
+    },
+    isResizable: true,
+    hasLayout: false,
+    resizableDefaultSize: {
       width: 380,
       height: '90%'
     },
-    maxWidth: "100%",
-    minHeight: 110,
-    minWidth: 280,
-    style: {
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'center'
-    },
-    enable: {
-      top: true,
-      right: true,
-      bottom: true,
-      left: true,
-      topRight: true,
-      bottomRight: true,
-      bottomLeft: true,
-      topLeft: true
-    },
+    shouldRenderInline: true,
+    "data-testid": "workspace-viewpreset-menu",
     children: jsx(ToolContainer, {
-      title: title,
-      onClose: onCloseMenu,
+      title: t('workspace-viewpreset-menu'),
+      onClose: closeMenu,
       style: {
         width: '100%',
         height: '100%'
@@ -6929,40 +6926,11 @@ var ResizeMenu = function ResizeMenu(_ref) {
       onClick: function onClick(event) {
         event.stopPropagation();
       },
-      children: children
-    })
-  });
-};
-
-var ViewPresetMenu = function ViewPresetMenu(_ref) {
-  var _ref$hideBackdrop = _ref.hideBackdrop,
-    hideBackdrop = _ref$hideBackdrop === void 0 ? false : _ref$hideBackdrop,
-    closeMenu = _ref.closeMenu,
-    panelId = _ref.panelId;
-  var _useWorkspaceTranslat = useWorkspaceTranslation(),
-    t = _useWorkspaceTranslat.t;
-  var toolContainer = jsx(ResizeMenu, {
-    title: t('workspace-viewpreset-menu'),
-    onCloseMenu: closeMenu,
-    children: jsx(ViewPresetMenuListConnect, {
-      panelId: panelId
+      children: jsx(ViewPresetMenuListConnect, {
+        panelId: panelId
+      })
     })
   });
-  renderCounter.count(ViewPresetMenu.name);
-  return hideBackdrop ?
-  // Enable hiding backdrop from snapshot tests
-  toolContainer : jsxs(Backdrop, {
-    "data-testid": "viewpresetMenuBackdrop",
-    open: true,
-    sx: Object.assign({
-      '&.MuiBackdrop-root': {
-        position: 'absolute',
-        zIndex: 1002
-      }
-    }, BackdropStyle()),
-    onClick: closeMenu,
-    children: [BackdropElement(), toolContainer]
-  });
 };
 
 var workspacePresetOptionId = 'workspace-options-toolbutton';
@@ -7504,14 +7472,15 @@ var WorkspaceTileConnect = /*#__PURE__*/React.memo(function (_ref2) {
       })
     }), defaultComponentsLookupResult, genericComponentsLookupResult, jsx(FetchViewPresets, {
       panelId: mosaicNodeId
-    }), isViewPresetDialogOpen && jsx(ViewPresetMenu, {
+    }), jsx(ViewPresetMenu, {
       panelId: mosaicNodeId,
       closeMenu: function closeMenu() {
         toggleViewPresetDialog({
           panelId: mosaicNodeId,
           isViewPresetDialogOpen: false
         });
-      }
+      },
+      isOpen: isViewPresetDialogOpen
     })]
   });
 }, isEqual);
@@ -7845,7 +7814,8 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect() {
   return jsxs(Box, {
     "data-testid": "workspace-selectlist-connect",
     style: {
-      height: '100%'
+      height: '100%',
+      width: '100%'
     },
     tabIndex: 0,
     children: [isFetching && jsx(LinearProgress, {
@@ -7899,28 +7869,49 @@ var WorkspaceSelectListConnect = function WorkspaceSelectListConnect() {
 };
 
 var WorkspaceMenu = function WorkspaceMenu(_ref) {
-  var _ref$hideBackdrop = _ref.hideBackdrop,
-    hideBackdrop = _ref$hideBackdrop === void 0 ? false : _ref$hideBackdrop,
+  var _ref$isOpen = _ref.isOpen,
+    isOpen = _ref$isOpen === void 0 ? false : _ref$isOpen,
     closeMenu = _ref.closeMenu;
   var _useWorkspaceTranslat = useWorkspaceTranslation(),
     t = _useWorkspaceTranslat.t;
-  var toolContainer = jsx(ResizeMenu, {
-    title: t('workspace-menu'),
-    onCloseMenu: closeMenu,
-    children: jsx(WorkspaceSelectListConnect, {})
-  });
-  return hideBackdrop ?
-  // Enable hiding backdrop from snapshot tests
-  toolContainer : jsxs(Backdrop, {
-    "data-testid": "workspaceMenuBackdrop",
-    open: true,
-    sx: Object.assign({
-      '&.MuiBackdrop-root': {
-        top: '40px'
+  return jsx(CustomDialog, {
+    open: isOpen,
+    onClose: function onClose() {
+      if (closeMenu) {
+        closeMenu();
+      }
+    },
+    isResizable: true,
+    hasLayout: false,
+    resizableDefaultSize: {
+      width: 380,
+      height: '90%'
+    },
+    slotProps: {
+      backdrop: {
+        style: {
+          top: 40
+        }
+      },
+      root: {
+        style: {
+          top: 40
+        }
       }
-    }, BackdropStyle()),
-    onClick: closeMenu,
-    children: [BackdropElement(), toolContainer]
+    },
+    "data-testid": "workspace-menu",
+    children: jsx(ToolContainer, {
+      title: t('workspace-menu'),
+      onClose: closeMenu,
+      style: {
+        width: '100%',
+        height: '100%'
+      },
+      onClick: function onClick(event) {
+        event.stopPropagation();
+      },
+      children: jsx(WorkspaceSelectListConnect, {})
+    })
   });
 };
 
@@ -7960,7 +7951,8 @@ var WorkspaceMenuButton = function WorkspaceMenuButton(_ref) {
         },
         children: jsx(PresetWorkspace, {})
       })
-    }), showMenu && jsx(WorkspaceMenu, {
+    }), jsx(WorkspaceMenu, {
+      isOpen: showMenu,
       closeMenu: onCloseMenu
     })]
   });
@@ -8586,20 +8578,26 @@ var WorkspacePresetsFormDialog = function WorkspacePresetsFormDialog(_ref) {
     };
   }();
   var cancelLabel = t('workspace-cancel');
-  return jsx(ConfirmationDialog, {
+  return jsx(CustomDialog, {
     "data-testid": "workspace-preset-dialog",
     title: getDialogTitle(action),
     open: isOpen,
-    confirmLabel: confirmLabel,
-    cancelLabel: cancelLabel,
     description: "",
     onClose: onClose,
     onSubmit: onSubmit,
-    isLoading: isLoading,
-    sx: {
-      width: '330px'
+    isResizable: true,
+    resizableDefaultSize: {
+      width: 500,
+      height: 'auto'
     },
-    content: jsx(WorkspacePresetsForm, {
+    actions: jsx(ConfirmationButtons, {
+      onClose: onClose,
+      cancelLabel: cancelLabel,
+      isLoading: isLoading,
+      onSubmit: onSubmit,
+      confirmLabel: confirmLabel
+    }),
+    children: jsx(WorkspacePresetsForm, {
       formValues: formValues,
       error: error,
       onSubmit: onSubmit,
@@ -8655,7 +8653,7 @@ var WorkspaceTabConnect = function WorkspaceTabConnect(_ref) {
       title: title,
       workspaceId: workspaceId,
       appTitle: appTitle
-    }), Boolean(dialogDetails) && jsx(WorkspacePresetsFormDialogWrapper, {
+    }), jsx(WorkspacePresetsFormDialogWrapper, {
       isOpen: Boolean(dialogDetails),
       onClose: closeWorkspaceActionDialog,
       presetId: presetId || undefined,
@@ -8966,20 +8964,24 @@ var ViewPresetsFormDialog = function ViewPresetsFormDialog(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  return jsx(ConfirmationDialog, {
+  return jsx(CustomDialog, {
     "data-testid": "map-preset-dialog",
     title: title,
     open: isOpen,
-    confirmLabel: confirmLabel,
-    cancelLabel: t('workspace-cancel'),
     description: "",
     onClose: onClose,
     onSubmit: onSubmit,
-    isLoading: isLoading,
     sx: {
       width: '330px'
     },
-    content: jsx(ViewPresetsForm, {
+    actions: jsx(ConfirmationButtons, {
+      onClose: onClose,
+      cancelLabel: t('workspace-cancel'),
+      isLoading: isLoading,
+      onSubmit: onSubmit,
+      confirmLabel: confirmLabel
+    }),
+    children: jsx(ViewPresetsForm, {
       viewComponentType: viewComponentType,
       formValues: formValues,
       error: error,

package/package.json

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

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

@@ -2,7 +2,7 @@ import React from 'react';
 export declare const DIALOG_TITLE = "View presets menu";
 export interface ViewPresetMenuProps {
     panelId: string;
-    hideBackdrop?: boolean;
     closeMenu?: () => void;
+    isOpen?: boolean;
 }
 export declare const ViewPresetMenu: React.FC<ViewPresetMenuProps>;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 export interface WorkspaceMenuProps {
-    hideBackdrop?: boolean;
     closeMenu?: () => void;
+    isOpen?: boolean;
 }
 export declare const WorkspaceMenu: React.FC<WorkspaceMenuProps>;

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

@@ -1,6 +0,0 @@
-import React from 'react';
-export declare const ResizeMenu: React.FC<{
-    onCloseMenu?: () => void;
-    title: string;
-    children: React.ReactNode;
-}>;

package/src/lib/components/ResizeMenu/ResizeMenu.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/src/lib/components/ResizeMenu/index.d.ts

@@ -1 +0,0 @@
-export * from './ResizeMenu';