@opengeoweb/workspace 9.23.1 → 9.25.0

package/index.esm.js

@@ -4,7 +4,7 @@ import { syncGroupsTypes, syncGroupsActions, layerActions, mapStoreActions, uiAc
 import { createApiInstance, createNonAuthApiInstance, getApi, createFakeApiInstance, ApiProvider, useApiContext } from '@opengeoweb/api';
 import { getLeaves, MosaicContext, getAndAssertNodeAtPathExists, createBalancedTreeFromLeaves, MosaicWindow, Mosaic } from 'react-mosaic-component';
 import i18n from 'i18next';
-import { SHARED_NAMESPACE, sharedTranslations, isAxiosAuthError, getAxiosErrorMessage, isAxiosError, withEggs, ConfirmationServiceProvider, useConfirmationDialog, CustomIconButton, AlertBanner, CustomTooltip, SearchHighlight, ToggleMenu, usePrevious, Resizable, ToolContainer, renderCounter, CustomToggleButton, ConfirmationDialog } from '@opengeoweb/shared';
+import { SHARED_NAMESPACE, sharedTranslations, isAxiosAuthError, getAxiosErrorMessage, isAxiosError, withEggs, ConfirmationServiceProvider, useConfirmationDialog, CustomIconButton, AlertBanner, CustomTooltip, SearchHighlight, ToggleMenu, DEFAULT_FILTER_HEIGHT, usePrevious, Filter, Resizable, ToolContainer, renderCounter, CustomToggleButton, ConfirmationDialog } from '@opengeoweb/shared';
 import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations } from '@opengeoweb/webmap-react';
 import { initReactI18next, useTranslation, I18nextProvider } from 'react-i18next';
 import { CORE_NAMESPACE, coreTranslations } from '@opengeoweb/core';
@@ -13,7 +13,7 @@ import { takeLatest, takeEvery, debounce, delay, put, all, select, call as call$
 import { snackbarActions, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
 import { isAxiosError as isAxiosError$1 } from 'axios';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { ThemeWrapper, lightTheme, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, Search, Clear, CloudLoading, CloudIdle, WebAssetOff } from '@opengeoweb/theme';
+import { ThemeWrapper, lightTheme, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, CloudLoading, CloudIdle, WebAssetOff } from '@opengeoweb/theme';
 import { Provider, useDispatch, useSelector, useStore, shallowEqual } from 'react-redux';
 import { timeSeriesModuleConfig } from '@opengeoweb/timeseries';
 import { AuthenticationProvider, useAuthenticationContext } from '@opengeoweb/authentication';
@@ -22,7 +22,7 @@ import { getSagaExtension } from '@redux-eggs/saga-extension';
 import { produce } from 'immer';
 import * as React from 'react';
 import React__default, { useCallback } from 'react';
-import { LinearProgress, Typography, ListItem, ListItemButton, ListItemIcon, ListItemText, Grid, useTheme, Chip, Stack, debounce as debounce$1, TextField, InputAdornment, Box, Backdrop, Menu, ListSubheader, MenuItem, Tabs } from '@mui/material';
+import { LinearProgress, Typography, ListItem, ListItemButton, ListItemIcon, ListItemText, Grid, Box, Backdrop, Menu, ListSubheader, MenuItem, useTheme, Tabs } from '@mui/material';
 import 'react-mosaic-component/react-mosaic-component.css';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { FixedSizeList } from 'react-window';
@@ -31,10 +31,6 @@ import { useFormContext } from 'react-hook-form';
 var en = {
 	"workspace-menu": "Workspace menu",
 	"workspace-new": "New workspace",
-	"workspace-my-presets": "My presets",
-	"workspace-system-presets": "System presets",
-	"workspace-all-button": "All",
-	"workspace-search": "Search",
 	"workspace-loading": "Loading",
 	"workspace-options": "Options",
 	"workspace-results": "results",
@@ -92,10 +88,6 @@ var en = {
 var fi = {
 	"workspace-menu": "Workspace menu",
 	"workspace-new": "Uusi workspace",
-	"workspace-my-presets": "Omat presetit",
-	"workspace-system-presets": "Järestelmä presetit",
-	"workspace-all-button": "Kaikki",
-	"workspace-search": "Etsi",
 	"workspace-loading": "Ladataan",
 	"workspace-options": "Valinnat",
 	"workspace-results": "tulokset",
@@ -153,10 +145,6 @@ var fi = {
 var no = {
 	"workspace-menu": "Arbeidsrommeny",
 	"workspace-new": "Nytt arbeidsrom",
-	"workspace-my-presets": "Mine presets",
-	"workspace-system-presets": "System presets",
-	"workspace-all-button": "Alle",
-	"workspace-search": "Søk",
 	"workspace-loading": "Laster",
 	"workspace-options": "Valg",
 	"workspace-results": "resultater",
@@ -214,10 +202,6 @@ var no = {
 var nl = {
 	"workspace-menu": "Workspace menu",
 	"workspace-new": "Nieuwe workspace",
-	"workspace-my-presets": "Mijn presets",
-	"workspace-system-presets": "Systeem presets",
-	"workspace-all-button": "Alle",
-	"workspace-search": "Zoeken",
 	"workspace-loading": "Laden",
 	"workspace-options": "Opties",
 	"workspace-results": "resultaten",
@@ -1735,13 +1719,13 @@ var WorkspaceErrorType;
 })(WorkspaceErrorType || (WorkspaceErrorType = {}));
 
 const workspaceListFilterOptions = [{
-  label: 'workspace-my-presets',
+  label: 'shared-filter-my-presets',
   id: 'user',
   type: 'scope',
   isSelected: true,
   isDisabled: false
 }, {
-  label: 'workspace-system-presets',
+  label: 'shared-filter-system-presets',
   id: 'system',
   type: 'scope',
   isSelected: true,
@@ -2885,13 +2869,13 @@ var PresetAction;
 })(PresetAction || (PresetAction = {}));
 
 const viewPresetsListFilterOptions = [{
-  label: 'workspace-my-presets',
+  label: 'shared-filter-my-presets',
   id: 'user',
   type: 'scope',
   isSelected: true,
   isDisabled: false
 }, {
-  label: 'workspace-system-presets',
+  label: 'shared-filter-system-presets',
   id: 'system',
   type: 'scope',
   isSelected: true,
@@ -3588,7 +3572,7 @@ const initWorkspaceTestI18n = () => {
   });
 };
 initWorkspaceTestI18n();
-const ns = [WORKSPACE_NAMESPACE];
+const ns = [WORKSPACE_NAMESPACE, SHARED_NAMESPACE];
 const translateKeyOutsideComponents = (key, params = undefined) => i18n.t(key, Object.assign({
   ns
 }, params));
@@ -8446,155 +8430,6 @@ const WorkspaceSelectListRow = ({
   }));
 };
 
-const FilterChip = ({
-  label,
-  id,
-  isSelected: _isSelected = false,
-  isDisabled: _isDisabled = false,
-  handleClick: _handleClick = () => {}
-}) => {
-  const theme = useTheme();
-  return jsx(Chip, {
-    size: "small",
-    id: id,
-    label: label,
-    disabled: _isDisabled,
-    variant: _isSelected ? 'filled' : 'outlined',
-    color: _isSelected ? 'secondary' : 'default',
-    sx: {
-      borderColor: `${theme.palette.geowebColors.buttons.tertiary.default.borderColor}`,
-      padding: '0px 4px'
-    },
-    onClick: () => _handleClick(id)
-  });
-};
-
-const FilterList = ({
-  filters: _filters = workspaceListFilterOptions,
-  onChipClick: _onChipClick = () => {},
-  isAllSelected: _isAllSelected = false
-}) => {
-  const {
-    t
-  } = useWorkspaceTranslation();
-  return jsxs(Stack, Object.assign({
-    direction: "row",
-    spacing: 1,
-    "data-testid": "filterList"
-  }, {
-    children: [jsx(FilterChip, {
-      id: "all",
-      label: t('workspace-all-button'),
-      isSelected: _isAllSelected,
-      handleClick: key => _onChipClick(key, !_isAllSelected)
-    }), _filters.map(filter => {
-      return jsx(FilterChip, {
-        id: filter.id,
-        label: t(filter.label),
-        isSelected: _isAllSelected ? false : filter.isSelected,
-        isDisabled: filter.isDisabled,
-        handleClick: key => {
-          // If they are all isSelected ensure that if one is clicked that one will be the only one set to selected
-          const selected = _isAllSelected ? true : !filter.isSelected;
-          _onChipClick(key, selected);
-        }
-      }, filter.id);
-    })]
-  }));
-};
-
-const DEBOUNCE_TIMEOUT = 300;
-const SearchButton = ({
-  label
-}) => jsx(CustomIconButton, Object.assign({
-  tooltipTitle: label,
-  edge: "end",
-  size: "large"
-}, {
-  children: jsx(Search, {})
-}));
-const ClearButton = ({
-  onClick
-}) => jsx(CustomIconButton, Object.assign({
-  tooltipTitle: "Clear",
-  edge: "end",
-  onClick: onClick,
-  size: "large"
-}, {
-  children: jsx(Clear, {})
-}));
-const SearchField = ({
-  valueChanged,
-  value: _value = ''
-}) => {
-  const [localValue, setLocalValue] = React.useState(_value);
-  const {
-    t
-  } = useWorkspaceTranslation();
-  const label = t('workspace-search');
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const handleValueChangeDebounced = React.useCallback(debounce$1(valueChanged, DEBOUNCE_TIMEOUT), []);
-  return jsx(TextField, {
-    variant: "filled",
-    size: "small",
-    sx: {
-      '& input': {
-        paddingTop: '18px'
-      }
-    },
-    label: label,
-    value: localValue,
-    autoFocus: true,
-    fullWidth: true,
-    onChange: e => {
-      handleValueChangeDebounced(e.target.value);
-      setLocalValue(e.target.value);
-    },
-    InputProps: {
-      endAdornment: jsx(InputAdornment, Object.assign({
-        position: "end"
-      }, {
-        children: localValue ? jsx(ClearButton, {
-          onClick: () => {
-            setLocalValue('');
-            valueChanged('');
-          }
-        }) : jsx(SearchButton, {
-          label: label
-        })
-      }))
-    }
-  });
-};
-
-const DEFAULT_FILTER_HEIGHT = 85;
-const WorkspaceFilter = ({
-  filters,
-  onClickFilterChip: _onClickFilterChip = () => {},
-  onSearch: _onSearch = () => {},
-  isAllSelected,
-  searchQuery
-}) => {
-  return jsx(Box, Object.assign({
-    sx: {
-      marginBottom: '8px'
-    }
-  }, {
-    children: jsxs(Stack, Object.assign({
-      spacing: 1
-    }, {
-      children: [jsx(SearchField, {
-        value: searchQuery,
-        valueChanged: _onSearch
-      }), jsx(FilterList, {
-        filters: filters,
-        onChipClick: _onClickFilterChip,
-        isAllSelected: isAllSelected
-      })]
-    }))
-  }));
-};
-
 const MIN_HEIGHT_SCROLLABLE_LIST = 88; // Slightly less than 2 rows
 const LIST_PADDING_TOP = 8;
 const DEFAULT_RESULTS_HEIGHT = 22;
@@ -8826,7 +8661,7 @@ const ViewPresetMenuListConnect = ({
         height: '100%'
       }
     }, {
-      children: [!error && jsx(WorkspaceFilter, {
+      children: [!error && jsx(Filter, {
         filters: viewPresetListFilters,
         onClickFilterChip: onClickFilterChip,
         isAllSelected: isAllSelectedForFilters,
@@ -9713,7 +9548,7 @@ const WorkspaceSelectListConnect = () => {
         height: '100%'
       }
     }, {
-      children: [!error && jsx(WorkspaceFilter, {
+      children: [!error && jsx(Filter, {
         filters: workspaceListFilters,
         onClickFilterChip: onClickFilterChip,
         isAllSelected: isAllSelected,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/workspace",
-  "version": "9.23.1",
+  "version": "9.25.0",
   "description": "GeoWeb Workspace library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -10,7 +10,6 @@
   "dependencies": {
     "react-redux": "^8.1.3",
     "@opengeoweb/shared": "*",
-    "@mui/material": "^5.16.0",
     "@opengeoweb/store": "*",
     "@opengeoweb/api": "*",
     "react-hook-form": "^7.50.1",
@@ -36,7 +35,8 @@
     "@opengeoweb/warnings": "*",
     "i18next": "^23.11.5",
     "react-i18next": "^14.1.2",
-    "@opengeoweb/webmap-react": "9.23.1"
+    "@mui/material": "^5.16.0",
+    "@opengeoweb/webmap-react": "9.25.0"
   },
   "peerDependencies": {
     "react": "18"

package/src/lib/components/WorkspaceFilter/FilterChip.d.ts

@@ -1,10 +0,0 @@
-import * as React from 'react';
-interface FilterChipProps {
-    id: string;
-    label: string;
-    isSelected?: boolean;
-    isDisabled?: boolean;
-    handleClick?: (label: string) => void;
-}
-declare const FilterChip: React.FC<FilterChipProps>;
-export default FilterChip;

package/src/lib/components/WorkspaceFilter/FilterChip.spec.d.ts

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

package/src/lib/components/WorkspaceFilter/FilterList.d.ts

@@ -1,9 +0,0 @@
-import * as React from 'react';
-import { WorkspaceListFilter } from '../../store/workspaceList/types';
-interface FilterListProps {
-    filters?: WorkspaceListFilter[];
-    onChipClick?: (id: string, selected: boolean) => void;
-    isAllSelected?: boolean;
-}
-declare const FilterList: React.FC<FilterListProps>;
-export default FilterList;

package/src/lib/components/WorkspaceFilter/FilterList.spec.d.ts

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

package/src/lib/components/WorkspaceFilter/SearchField.d.ts

@@ -1,8 +0,0 @@
-import * as React from 'react';
-export declare const DEBOUNCE_TIMEOUT = 300;
-interface SearchFieldProps {
-    valueChanged: (value: string) => void;
-    value?: string;
-}
-declare const SearchField: React.FC<SearchFieldProps>;
-export default SearchField;

package/src/lib/components/WorkspaceFilter/SearchField.spec.d.ts

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

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

@@ -1,13 +0,0 @@
-import { BoxProps } from '@mui/material';
-import * as React from 'react';
-import { WorkspaceListFilter } from '../../store/workspaceList/types';
-export declare const DEFAULT_FILTER_HEIGHT = 85;
-interface WorkspaceFilterProps extends BoxProps {
-    filters: WorkspaceListFilter[];
-    onClickFilterChip?: (id: string, selected: boolean) => void;
-    onSearch?: (value: string) => void;
-    isAllSelected?: boolean;
-    searchQuery?: string;
-}
-declare const WorkspaceFilter: React.FC<WorkspaceFilterProps>;
-export default WorkspaceFilter;

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

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

package/src/lib/components/WorkspaceFilter/WorkspaceFilter.stories.d.ts

@@ -1,25 +0,0 @@
-import * as React from 'react';
-declare const _default: {
-    title: string;
-};
-export default _default;
-export declare const WorkspaceFilterLight: {
-    (): React.ReactElement;
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-    tags: string[];
-};
-export declare const WorkspaceFilterDark: {
-    (): React.ReactElement;
-    parameters: {
-        zeplinLink: {
-            name: string;
-            link: string;
-        }[];
-    };
-    tags: string[];
-};