@opengeoweb/workspace 9.35.1-spike-oltanstack.0 → 9.37.0

package/index.esm.js

@@ -1,23 +1,22 @@
-import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware } from '@reduxjs/toolkit';
-import { syncGroupsTypes, syncGroupsActions, layerActions, mapStoreActions, uiActions, genericActions, mapActions, layerTypes, mapEnums, selectorMemoizationOptions, genericSelectors, mapSelectors, syncGroupsSelectors, routerActions, coreModuleConfig, linkComponentTypesConstants, uiTypes, loadingIndicatorSelectors, uiSelectors } from '@opengeoweb/store';
+import { createEntityAdapter, createSlice, createSelector, createListenerMiddleware, combineReducers, configureStore } from '@reduxjs/toolkit';
+import { syncGroupsTypes, syncGroupsActions, layerActions, mapStoreActions, uiActions, genericActions, mapActions, layerTypes, mapEnums, selectorMemoizationOptions, genericSelectors, mapSelectors, syncGroupsSelectors, routerActions, coreModuleReducersMap, routerReducersMap, coreModuleMiddlewares, routerMiddlewares, linkComponentTypesConstants, uiTypes, loadingIndicatorSelectors, uiSelectors } from '@opengeoweb/store';
 import { createApiInstance, createNonAuthApiInstance, getApi, createFakeApiInstance, ApiProvider, useApiContext } from '@opengeoweb/api';
-import _, { chunk, cloneDeep, isEmpty, isEqual, isString } from 'lodash';
+import _, { chunk, cloneDeep, pick, isEmpty, isEqual, isString } from 'lodash';
 import { getLeaves, MosaicContext, getAndAssertNodeAtPathExists, createBalancedTreeFromLeaves, MosaicWindow, Mosaic } from 'react-mosaic-component';
-import { timeSeriesActions, TimeSeriesTypes, timeSeriesSelectors, timeSeriesModuleConfig } from '@opengeoweb/timeseries';
-import { PROJECTION, getAxiosErrorMessage, isAxiosAuthError, isAxiosError as isAxiosError$1, SHARED_NAMESPACE, sharedTranslations, withEggs, ConfirmationServiceProvider, CustomIconButton, useConfirmationDialog, AlertBanner, CustomTooltip, SearchHighlight, ToggleMenu, DEFAULT_FILTER_HEIGHT, usePrevious, Filter, Resizable, ToolContainer, renderCounter, CustomToggleButton, ConfirmationDialog } from '@opengeoweb/shared';
-import { snackbarTypes, snackbarActions, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
+import { timeSeriesActions, TimeSeriesTypes, timeSeriesSelectors, timeSeriesReducersMap, timeSeriesMiddlewares } from '@opengeoweb/timeseries';
+import { PROJECTION, getAxiosErrorMessage, isAxiosAuthError, isAxiosError as isAxiosError$1, SHARED_NAMESPACE, sharedTranslations, ConfirmationServiceProvider, CustomIconButton, useConfirmationDialog, AlertBanner, CustomTooltip, SearchHighlight, ToggleMenu, DEFAULT_FILTER_HEIGHT, usePrevious, Filter, Resizable, ToolContainer, renderCounter, CustomToggleButton, ConfirmationDialog } from '@opengeoweb/shared';
+import { snackbarTypes, snackbarActions, snackbarReducersMap, snackbarMiddlewares, 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, CloudLoading, CloudIdle, WebAssetOff, Exclamation } from '@opengeoweb/theme';
+import { ThemeWrapper, lightTheme, Link, LinkOff, SplitVertical, SplitHorizontal, Expand, UnExpand, Close, Delete, Preset, PresetWorkspace, PresetTiles, BackdropStyle, BackdropElement, 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';
-import { createStore } from '@redux-eggs/redux-toolkit';
-import { produce } from 'immer';
 import i18n from 'i18next';
 import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations } from '@opengeoweb/webmap-react';
 import { CORE_NAMESPACE, coreTranslations } from '@opengeoweb/core';
 import { FORM_FIELDS_NAMESPACE, formFieldsTranslations, ReactHookFormTextField, ReactHookFormHiddenInput, ReactHookFormProvider, defaultFormOptions } from '@opengeoweb/form-fields';
+import { produce } from 'immer';
 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';
@@ -2289,7 +2288,7 @@ var getWorkspaceData = createSelector(getWorkspaceState, getViewPresetsStore, ge
       viewPresetId: viewPresetId
     };
   });
-  var linkedState = syncGroupsStore == null ? void 0 : syncGroupsStore.linkedState.links;
+  var linkedState = pick(syncGroupsStore == null ? void 0 : syncGroupsStore.linkedState.links, store.views.allIds);
   return {
     id: store.id,
     title: store.title,
@@ -4707,11 +4706,14 @@ workspaceListener.startListening({
             allSyncGroups.map(function (syncGroup) {
               return listenerApi.dispatch(syncGroupsActions.syncGroupAddGroup(syncGroup));
             });
+            listenerApi.dispatch(genericActions.setLinkedMap({
+              newLinks: payload.workspacePreset.linking || {}
+            }));
             isTimeScrollingEnabled = payload.workspacePreset.isTimeScrollingEnabled || false;
             listenerApi.dispatch(syncGroupsActions.syncGroupToggleIsTimeScrollingEnabled({
               isTimeScrollingEnabled: isTimeScrollingEnabled
             }));
-          case 10:
+          case 11:
           case "end":
             return _context3.stop();
         }
@@ -4887,13 +4889,10 @@ workspaceListener.startListening({
               };
             }()));
           case 19:
-            listenerApi.dispatch(genericActions.setLinkedMap({
-              newLinks: workspaceData.linking || {}
-            }));
-            _context8.next = 26;
+            _context8.next = 25;
             break;
-          case 22:
-            _context8.prev = 22;
+          case 21:
+            _context8.prev = 21;
             _context8.t0 = _context8["catch"](3);
             errorType = _context8.t0.message === ERROR_NOT_FOUND ? WorkspaceErrorType.NOT_FOUND : WorkspaceErrorType.GENERIC;
             listenerApi.dispatch(workspaceActions.errorWorkspace({
@@ -4903,11 +4902,11 @@ workspaceListener.startListening({
                 type: errorType
               }
             }));
-          case 26:
+          case 25:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, null, [[3, 22]]);
+      }, _callee8, null, [[3, 21]]);
     }));
     function effect(_x12, _x13) {
       return _effect5.apply(this, arguments);
@@ -5911,18 +5910,19 @@ workspaceListListener.startListening({
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
+var workspaceReducersMap = {
+  workspace: reducer$1,
+  workspaceList: reducer$3,
+  viewPresetsList: reducer,
+  viewPresets: reducer$2
+};
+var workspaceMiddlewares = [viewPresetsListener.middleware, workspaceListener.middleware, workspaceListListener.middleware];
 var workspaceModuleConfig = {
   id: 'workspace-module',
-  reducersMap: {
-    workspace: reducer$1,
-    workspaceList: reducer$3,
-    viewPresetsList: reducer,
-    viewPresets: reducer$2
-  },
-  middlewares: [viewPresetsListener.middleware, workspaceListener.middleware, workspaceListListener.middleware]
+  reducersMap: workspaceReducersMap,
+  middlewares: workspaceMiddlewares
 };
 
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -5940,34 +5940,29 @@ var workspaceModuleConfig = {
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var devToolsStateSanitizer = {
-  stateSanitizer: function stateSanitizer(state) {
-    return produce(state, function (draftState) {
-      // @ts-ignore
-      if (state['services']) {
-        // @ts-ignore
-        Object.values(state['services'].byId).forEach(function (service) {
-          // @ts-ignore
-          draftState['services'].byId[service.id].layers =
-          // @ts-ignore
-          service.layers.length;
-        });
-      }
-    });
-  }
-};
-var store = createStore({
-  defaultMiddlewareOptions: {
-    serializableCheck: {
-      warnAfter: 128
+var WORKSPACE_NAMESPACE = 'workspace';
+var initWorkspaceTestI18n = function initWorkspaceTestI18n() {
+  var _en, _fi, _no, _nl;
+  void i18n.use(initReactI18next).init({
+    lng: 'en',
+    ns: WORKSPACE_NAMESPACE,
+    interpolation: {
+      escapeValue: false
     },
-    immutableCheck: {
-      warnAfter: 128
+    resources: {
+      en: (_en = {}, _en[WORKSPACE_NAMESPACE] = workspaceTranslations.en, _en[SHARED_NAMESPACE] = sharedTranslations.en, _en[CORE_NAMESPACE] = coreTranslations.en, _en[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.en, _en[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.en, _en),
+      fi: (_fi = {}, _fi[WORKSPACE_NAMESPACE] = workspaceTranslations.fi, _fi[SHARED_NAMESPACE] = sharedTranslations.fi, _fi[CORE_NAMESPACE] = coreTranslations.fi, _fi[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.fi, _fi[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.fi, _fi),
+      no: (_no = {}, _no[WORKSPACE_NAMESPACE] = workspaceTranslations.no, _no[SHARED_NAMESPACE] = sharedTranslations.no, _no[CORE_NAMESPACE] = coreTranslations.no, _no[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.no, _no[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.no, _no),
+      nl: (_nl = {}, _nl[WORKSPACE_NAMESPACE] = workspaceTranslations.nl, _nl[SHARED_NAMESPACE] = sharedTranslations.nl, _nl[CORE_NAMESPACE] = coreTranslations.nl, _nl[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.nl, _nl[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.nl, _nl)
     }
-  },
-  devTools: devToolsStateSanitizer
-});
+  });
+};
+var ns = [WORKSPACE_NAMESPACE, SHARED_NAMESPACE];
+var useWorkspaceTranslation = function useWorkspaceTranslation() {
+  return useTranslation(ns);
+};
 
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -5985,26 +5980,32 @@ var store = createStore({
  * Copyright 2023 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var WORKSPACE_NAMESPACE = 'workspace';
-var initWorkspaceTestI18n = function initWorkspaceTestI18n() {
-  var _en, _fi, _no, _nl;
-  void i18n.use(initReactI18next).init({
-    lng: 'en',
-    ns: WORKSPACE_NAMESPACE,
-    interpolation: {
-      escapeValue: false
+var devToolsStateSanitizer = {
+  stateSanitizer: function stateSanitizer(state) {
+    return produce(state, function (draftState) {
+      // @ts-ignore
+      if (state['services']) {
+        // @ts-ignore
+        Object.values(state['services'].byId).forEach(function (service) {
+          // @ts-ignore
+          draftState['services'].byId[service.id].layers =
+          // @ts-ignore
+          service.layers.length;
+        });
+      }
+    });
+  }
+};
+var rootReducer = combineReducers(Object.assign({}, coreModuleReducersMap, workspaceReducersMap, timeSeriesReducersMap, snackbarReducersMap, routerReducersMap));
+var createTestWorkspaceStore = function createTestWorkspaceStore() {
+  var store = configureStore({
+    reducer: rootReducer,
+    middleware: function middleware(getDefaultMiddleware) {
+      return getDefaultMiddleware().concat([].concat(coreModuleMiddlewares, workspaceMiddlewares, timeSeriesMiddlewares, snackbarMiddlewares, routerMiddlewares));
     },
-    resources: {
-      en: (_en = {}, _en[WORKSPACE_NAMESPACE] = workspaceTranslations.en, _en[SHARED_NAMESPACE] = sharedTranslations.en, _en[CORE_NAMESPACE] = coreTranslations.en, _en[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.en, _en[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.en, _en),
-      fi: (_fi = {}, _fi[WORKSPACE_NAMESPACE] = workspaceTranslations.fi, _fi[SHARED_NAMESPACE] = sharedTranslations.fi, _fi[CORE_NAMESPACE] = coreTranslations.fi, _fi[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.fi, _fi[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.fi, _fi),
-      no: (_no = {}, _no[WORKSPACE_NAMESPACE] = workspaceTranslations.no, _no[SHARED_NAMESPACE] = sharedTranslations.no, _no[CORE_NAMESPACE] = coreTranslations.no, _no[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.no, _no[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.no, _no),
-      nl: (_nl = {}, _nl[WORKSPACE_NAMESPACE] = workspaceTranslations.nl, _nl[SHARED_NAMESPACE] = sharedTranslations.nl, _nl[CORE_NAMESPACE] = coreTranslations.nl, _nl[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.nl, _nl[FORM_FIELDS_NAMESPACE] = formFieldsTranslations.nl, _nl)
-    }
+    devTools: devToolsStateSanitizer
   });
-};
-var ns = [WORKSPACE_NAMESPACE, SHARED_NAMESPACE];
-var useWorkspaceTranslation = function useWorkspaceTranslation() {
-  return useTranslation(ns);
+  return store;
 };
 
 var WorkspaceThemeProvider = function WorkspaceThemeProvider(_ref) {
@@ -6016,16 +6017,8 @@ var WorkspaceThemeProvider = function WorkspaceThemeProvider(_ref) {
     children: children
   });
 };
-var WorkspaceWrapperProvider = withEggs([].concat(coreModuleConfig, [timeSeriesModuleConfig, workspaceModuleConfig]))(function (_ref2) {
-  var theme = _ref2.theme,
-    children = _ref2.children;
-  return jsx(WorkspaceThemeProvider, {
-    theme: theme,
-    children: children
-  });
-});
-var DemoWrapper = function DemoWrapper(_ref3) {
-  var props = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
+var DemoWrapper = function DemoWrapper(_ref2) {
+  var props = Object.assign({}, (_objectDestructuringEmpty(_ref2), _ref2));
   return jsx(WorkspaceI18nProvider, {
     children: jsx(WorkspaceThemeProvider, Object.assign({}, props))
   });
@@ -6045,15 +6038,15 @@ var defaultAuthConfig = {
   },
   sessionStorageProvider: null
 };
-var WorkspaceWrapperProviderWithStore = function WorkspaceWrapperProviderWithStore(_ref4) {
-  var children = _ref4.children,
-    _ref4$store = _ref4.store,
-    store$1 = _ref4$store === void 0 ? store : _ref4$store,
-    _ref4$createApi = _ref4.createApi,
-    createApi$1 = _ref4$createApi === void 0 ? createApi : _ref4$createApi,
-    theme = _ref4.theme,
-    _ref4$auth = _ref4.auth,
-    auth = _ref4$auth === void 0 ? defaultAuthConfig : _ref4$auth;
+var WorkspaceWrapperProviderWithStore = function WorkspaceWrapperProviderWithStore(_ref3) {
+  var children = _ref3.children,
+    _ref3$store = _ref3.store,
+    store = _ref3$store === void 0 ? createTestWorkspaceStore() : _ref3$store,
+    _ref3$createApi = _ref3.createApi,
+    createApi$1 = _ref3$createApi === void 0 ? createApi : _ref3$createApi,
+    theme = _ref3.theme,
+    _ref3$auth = _ref3.auth,
+    auth = _ref3$auth === void 0 ? defaultAuthConfig : _ref3$auth;
   return jsx(WorkspaceI18nProvider, {
     children: jsx(AuthenticationProvider, {
       value: auth,
@@ -6061,8 +6054,8 @@ var WorkspaceWrapperProviderWithStore = function WorkspaceWrapperProviderWithSto
         createApi: createApi$1,
         name: API_NAME,
         children: jsx(Provider, {
-          store: store$1,
-          children: jsx(WorkspaceWrapperProvider, {
+          store: store,
+          children: jsx(WorkspaceThemeProvider, {
             theme: theme,
             children: jsx(SnackbarWrapperConnect, {
               children: jsx(ConfirmationServiceProvider, {
@@ -6075,8 +6068,8 @@ var WorkspaceWrapperProviderWithStore = function WorkspaceWrapperProviderWithSto
     })
   });
 };
-var WorkspaceI18nProvider = function WorkspaceI18nProvider(_ref5) {
-  var children = _ref5.children;
+var WorkspaceI18nProvider = function WorkspaceI18nProvider(_ref4) {
+  var children = _ref4.children;
   initWorkspaceTestI18n();
   return jsx(I18nextProvider, {
     i18n: i18n,
@@ -6998,17 +6991,17 @@ var ViewPresetMenu = function ViewPresetMenu(_ref) {
   renderCounter.count(ViewPresetMenu.name);
   return hideBackdrop ?
   // Enable hiding backdrop from snapshot tests
-  toolContainer : jsx(Backdrop, {
+  toolContainer : jsxs(Backdrop, {
     "data-testid": "viewpresetMenuBackdrop",
     open: true,
-    sx: {
+    sx: Object.assign({
       '&.MuiBackdrop-root': {
         position: 'absolute',
         zIndex: 1002
       }
-    },
+    }, BackdropStyle()),
     onClick: closeMenu,
-    children: toolContainer
+    children: [BackdropElement(), toolContainer]
   });
 };
 
@@ -7912,16 +7905,16 @@ var WorkspaceMenu = function WorkspaceMenu(_ref) {
   });
   return hideBackdrop ?
   // Enable hiding backdrop from snapshot tests
-  toolContainer : jsx(Backdrop, {
+  toolContainer : jsxs(Backdrop, {
     "data-testid": "workspaceMenuBackdrop",
     open: true,
-    sx: {
+    sx: Object.assign({
       '&.MuiBackdrop-root': {
         top: '40px'
       }
-    },
+    }, BackdropStyle()),
     onClick: closeMenu,
-    children: toolContainer
+    children: [BackdropElement(), toolContainer]
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/workspace",
-  "version": "9.35.1-spike-oltanstack.0",
+  "version": "9.37.0",
   "description": "GeoWeb Workspace library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -18,8 +18,6 @@
     "@opengeoweb/snackbar": "*",
     "react-window": "^1.8.10",
     "lodash": "^4.17.21",
-    "@redux-eggs/core": "^2.2.0",
-    "@redux-eggs/redux-toolkit": "^2.2.0",
     "immer": "^10.0.3",
     "axios": "^1.7.7",
     "react-virtualized-auto-sizer": "^1.0.21",

package/src/lib/store/config.d.ts

@@ -1,5 +1,10 @@
-import { Egg } from '@redux-eggs/core';
-import { Store } from '@reduxjs/toolkit';
+import { ListenerMiddleware, ReducersMapObject } from '@reduxjs/toolkit';
 import { WorkspaceModuleStore } from './types';
-declare const workspaceModuleConfig: Egg<Store<WorkspaceModuleStore>>;
+export declare const workspaceReducersMap: ReducersMapObject<WorkspaceModuleStore>;
+export declare const workspaceMiddlewares: ListenerMiddleware[];
+declare const workspaceModuleConfig: {
+    id: string;
+    reducersMap: ReducersMapObject<WorkspaceModuleStore, import("redux").Action<any>>;
+    middlewares: ListenerMiddleware[];
+};
 export default workspaceModuleConfig;

package/src/lib/store/index.d.ts

@@ -1 +1 @@
-export { store } from './store';
+export { createTestWorkspaceStore } from './store';

package/src/lib/store/store.d.ts

@@ -1,2 +1,2 @@
-declare const store: import("@redux-eggs/core").EggExt & import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<any, import("redux").AnyAction, [import("@reduxjs/toolkit").ThunkMiddleware<any, import("redux").AnyAction>]>;
-export { store };
+import { ToolkitStore } from '@reduxjs/toolkit/dist/configureStore';
+export declare const createTestWorkspaceStore: () => ToolkitStore;

package/src/lib/store/workspace/selectors.d.ts

@@ -144,7 +144,7 @@ export declare const getWorkspaceData: ((state: AppStore & import("@opengeoweb/s
     abstract: string | undefined;
     mosaicNode: import("react-mosaic-component").MosaicNode<string>;
     isTimeScrollingEnabled: boolean;
-    linking: Record<string, string[]>;
+    linking: Pick<Record<string, string[]>, string>;
 }) & import("reselect").OutputSelectorFields<(args_0: WorkspaceState, args_1: import("../viewPresets/types").ViewPresetState, args_2: import("dist/libs/store/src/store/generic/synchronizationGroups/types").SynchronizationGroupState) => {
     id: string | undefined;
     title: string;
@@ -161,7 +161,7 @@ export declare const getWorkspaceData: ((state: AppStore & import("@opengeoweb/s
     abstract: string | undefined;
     mosaicNode: import("react-mosaic-component").MosaicNode<string>;
     isTimeScrollingEnabled: boolean;
-    linking: Record<string, string[]>;
+    linking: Pick<Record<string, string[]>, string>;
 }, {
     clearCache: () => void;
 }> & {