@opengeoweb/workspace 9.12.0 → 9.13.0

package/index.esm.js

@@ -3366,6 +3366,11 @@ const slice$1 = createSlice({
       draft.hasChanges = true;
       draft.viewType = getViewType$1(draft.views.allIds.length, action.payload.componentType);
     },
+    setNewWorkspaceView: (
+    // eslint-disable-next-line no-unused-vars
+    draft,
+    // eslint-disable-next-line no-unused-vars
+    action) => {},
     deleteWorkspaceView: (draft, action) => {
       const {
         id
@@ -6491,6 +6496,31 @@ function* saveWorkspacePresetSaga(action) {
     }));
   }
 }
+function* setNewWorkspaceViewSaga({
+  payload
+}) {
+  const {
+    mosaicNodeId,
+    componentType,
+    newId
+  } = payload;
+  const bbox = yield select(mapSelectors.getBbox, mosaicNodeId);
+  const srs = yield select(mapSelectors.getSrs, mosaicNodeId);
+  const mapPreset = bbox.bottom ? {
+    proj: {
+      bbox,
+      srs
+    }
+  } : {};
+  yield put(workspaceActions.addWorkspaceView({
+    componentType,
+    id: newId,
+    initialProps: {
+      mapPreset,
+      syncGroupsIds: []
+    }
+  }));
+}
 function* registerMapSaga({
   payload
 }) {
@@ -6530,6 +6560,7 @@ function* workspaceSaga() {
   yield takeLatest(workspaceActions.saveWorkspacePreset, saveWorkspacePresetSaga);
   yield takeLatest(workspaceActions.changeToEmptyMapWorkspace.type, changeToEmptyMapWorkspaceSaga);
   yield takeEvery(workspaceActions.fetchWorkspaceViewPreset.type, fetchWorkspaceViewPresetSaga);
+  yield takeEvery(workspaceActions.setNewWorkspaceView.type, setNewWorkspaceViewSaga);
   yield debounce(100, updateWorkspaceViews.type, updateViewsSaga);
 }
 
@@ -8307,10 +8338,11 @@ const WorkspaceOptions = /*#__PURE__*/React.memo(WorkspaceOptionsNoMemo);
  * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2024 - Finnish Meteorological Institute (FMI)
  * */
-const LoadingIndicator = ({
-  loading: _loading = false
+const LoadingIndicatorConnect = ({
+  panelId
 }) => {
-  return _loading ? ( /*#__PURE__*/React.createElement(CloudLoading, {
+  const isLoading = useSelector(store => loadingIndicatorSelectors.isLoading(store, panelId));
+  return isLoading ? ( /*#__PURE__*/React.createElement(CloudLoading, {
     "data-testid": "cloudicon-loading",
     style: {
       fill: '#186DFF'
@@ -8368,7 +8400,6 @@ const WorkspaceViewTitleConnectNoMemo = ({
   const hasMapPresetChanges = useSelector(store => getViewPresetHasChanges(store, panelId));
   const activeMapPresetId = useSelector(store => getViewPresetActiveId(store, panelId));
   const relatedSyncGroupIds = useSelector(store => syncGroupsSelectors.getAllTargetGroupsForSource(store, panelId));
-  const isLoading = useSelector(store => loadingIndicatorSelectors.isLoading(store, panelId));
   const isNewActive = activeMapPresetId === '';
   const title = workspaceView.title || MAPPRESET_ACTIVE_TITLE;
   const viewScope = workspaceView.scope;
@@ -8443,6 +8474,12 @@ const WorkspaceViewTitleConnectNoMemo = ({
       isViewPresetListDialogOpen: isViewPresetDialogOpen
     }));
   }, [dispatch]);
+  const onClickOpenViewPreset = React.useCallback(() => {
+    toggleViewPresetDialog({
+      panelId,
+      isViewPresetDialogOpen: !isViewPresetDialogOpen
+    });
+  }, [isViewPresetDialogOpen, panelId, toggleViewPresetDialog]);
   const style = React.useMemo(() => customIconStyles(theme, isViewPresetDialogOpen), [isViewPresetDialogOpen, theme]);
   const presetIcon = React.useMemo(() => /*#__PURE__*/React.createElement(Preset, null), []);
   renderCounter.count(WorkspaceViewTitleConnectNoMemo.name);
@@ -8450,12 +8487,7 @@ const WorkspaceViewTitleConnectNoMemo = ({
     "data-testid": "open-viewpresets",
     sx: style,
     variant: "tool",
-    onClick: React.useCallback(() => {
-      toggleViewPresetDialog({
-        panelId,
-        isViewPresetDialogOpen: !isViewPresetDialogOpen
-      });
-    }, [isViewPresetDialogOpen, panelId, toggleViewPresetDialog]),
+    onClick: onClickOpenViewPreset,
     tooltipTitle: VIEW_PRESET_MENU_TOOLTIP,
     isSelected: isViewPresetDialogOpen
   }, presetIcon), /*#__PURE__*/React.createElement(WorkspaceOptions, {
@@ -8467,8 +8499,8 @@ const WorkspaceViewTitleConnectNoMemo = ({
     handleSaveAs: onSaveAs,
     handleEdit: viewScope === 'user' ? onEdit : undefined,
     id: "viewpreset-options-toolbutton"
-  }), /*#__PURE__*/React.createElement(LoadingIndicator, {
-    loading: isLoading
+  }), /*#__PURE__*/React.createElement(LoadingIndicatorConnect, {
+    panelId: panelId
   }));
 };
 const WorkspaceViewTitleConnect = /*#__PURE__*/React.memo(WorkspaceViewTitleConnectNoMemo);
@@ -8496,16 +8528,13 @@ const WorkspaceTileConnect = /*#__PURE__*/React.memo(({
 }) => {
   const dispatch = useDispatch();
   const view = useSelector(store => getViewById(store, _mosaicNodeId));
-  // TODO: make bbox and srs work independent of core lib https://gitlab.com/opengeoweb/opengeoweb/-/issues/1525
-  const bbox = useSelector(store => mapSelectors.getBbox(store, _mosaicNodeId));
-  const srs = useSelector(store => mapSelectors.getSrs(store, _mosaicNodeId));
   const viewIds = useSelector(store => getViewIds(store));
   const shouldPreventCloseView = useSelector(store => getShouldPreventClose(store, _mosaicNodeId));
   const isViewPresetDialogOpen = useSelector(store => getIsViewPresetListDialogOpen(store, _mosaicNodeId));
   const isViewPresetsFetching = useSelector(store => getViewPresetsIsFetching(store, _mosaicNodeId));
   const errorViewPreset = useSelector(store => getViewPresetDetailError(store, _mosaicNodeId));
   const addView = React.useCallback(view => {
-    dispatch(workspaceActions.addWorkspaceView(view));
+    dispatch(workspaceActions.setNewWorkspaceView(view));
   }, [dispatch]);
   const registerView = React.useCallback(({
     panelId,
@@ -8534,22 +8563,13 @@ const WorkspaceTileConnect = /*#__PURE__*/React.memo(({
   }, [dispatch]);
   const createNode = React.useCallback(() => {
     const newId = getUniqueId(viewIds);
-    const mapPreset = bbox.bottom ? {
-      proj: {
-        bbox,
-        srs
-      }
-    } : {};
     addView({
       componentType: 'Map',
-      id: newId,
-      initialProps: {
-        mapPreset,
-        syncGroupsIds: []
-      }
+      mosaicNodeId: _mosaicNodeId,
+      newId
     });
     return newId;
-  }, [viewIds, bbox, srs, addView]);
+  }, [addView, _mosaicNodeId, viewIds]);
   const title = (view === null || view === void 0 ? void 0 : view.title) || (view === null || view === void 0 ? void 0 : view.id) || _mosaicNodeId;
   React.useEffect(() => {
     const viewPresetId = (view === null || view === void 0 ? void 0 : view.id) || '';

package/package.json

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

package/src/lib/components/WorkspaceView/LoadingIndicator/LoadingIndicatorConnect.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+interface LoadingIndicatorConnectProps {
+    panelId: string;
+}
+export declare const LoadingIndicatorConnect: React.FC<LoadingIndicatorConnectProps>;
+export {};

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

@@ -1,10 +1,11 @@
 import { Reducer } from '@reduxjs/toolkit';
-import { WorkspaceAddViewPayload, WorkspaceDeleteViewPayload, WorkspaceState, WorkspaceSetPresetPayload, WorkspaceSetPreventCloseViewPayload, WorkspaceUpdateViewPayload, WorkspaceUpdateViewsPayload, WorkspaceErrorWorkspacePayload, WorkspaceFetchedWorkspacePayload, WorkspaceFetchWorkspacePayload, WorkspaceFetchWorkspaceViewPresetPayload, WorkspaceSaveWorkspacePresetPayload, WorkspaceSetInitialViewMapPresetPayload } from './types';
+import { WorkspaceAddViewPayload, WorkspaceDeleteViewPayload, WorkspaceState, WorkspaceSetPresetPayload, WorkspaceSetPreventCloseViewPayload, WorkspaceUpdateViewPayload, WorkspaceUpdateViewsPayload, WorkspaceErrorWorkspacePayload, WorkspaceFetchedWorkspacePayload, WorkspaceFetchWorkspacePayload, WorkspaceFetchWorkspaceViewPresetPayload, WorkspaceSaveWorkspacePresetPayload, WorkspaceSetInitialViewMapPresetPayload, WorkspaceSetNewViewPayload } from './types';
 export declare const initialState: WorkspaceState;
 export declare const reducer: Reducer<WorkspaceState>;
 export declare const workspaceActions: {
     setInitialViewMapPreset: import("@reduxjs/toolkit").ActionCreatorWithPayload<WorkspaceSetInitialViewMapPresetPayload, "workspace/setInitialViewMapPreset">;
     addWorkspaceView: import("@reduxjs/toolkit").ActionCreatorWithPayload<WorkspaceAddViewPayload, "workspace/addWorkspaceView">;
+    setNewWorkspaceView: import("@reduxjs/toolkit").ActionCreatorWithPayload<WorkspaceSetNewViewPayload, "workspace/setNewWorkspaceView">;
     deleteWorkspaceView: import("@reduxjs/toolkit").ActionCreatorWithPayload<WorkspaceDeleteViewPayload, "workspace/deleteWorkspaceView">;
     updateWorkspaceViews: import("@reduxjs/toolkit").ActionCreatorWithPayload<WorkspaceUpdateViewsPayload, "workspace/updateWorkspaceViews">;
     updateWorkspaceView: import("@reduxjs/toolkit").ActionCreatorWithPayload<WorkspaceUpdateViewPayload, "workspace/updateWorkspaceView">;

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

@@ -7,6 +7,7 @@ export declare function updateViewsSaga(): SagaIterator;
 export declare function fetchWorkspaceViewPresetSaga({ payload, }: ReturnType<typeof workspaceActions.fetchWorkspaceViewPreset>): SagaIterator;
 export declare function fetchWorkspaceSaga(action: ReturnType<typeof workspaceActions.fetchWorkspace>): SagaIterator;
 export declare function saveWorkspacePresetSaga(action: ReturnType<typeof workspaceActions.saveWorkspacePreset>): SagaIterator;
+export declare function setNewWorkspaceViewSaga({ payload, }: ReturnType<typeof workspaceActions.setNewWorkspaceView>): SagaIterator;
 export declare function registerMapSaga({ payload, }: ReturnType<typeof mapStoreActions.registerMap>): SagaIterator;
 export declare function unregisterMapSaga({ payload, }: ReturnType<typeof mapStoreActions.unregisterMap>): SagaIterator;
 declare function workspaceSaga(): SagaIterator;

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

@@ -78,6 +78,11 @@ export interface WorkspaceAddViewPayload {
     componentType: string;
     initialProps: InitialPropsWorkspaceViewType;
 }
+export interface WorkspaceSetNewViewPayload {
+    mosaicNodeId: string;
+    newId: string;
+    componentType: string;
+}
 export interface WorkspaceDeleteViewPayload {
     id: string;
 }

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

@@ -1,6 +0,0 @@
-import * as React from 'react';
-interface LoadingIndicatorProps {
-    loading: boolean;
-}
-export declare const LoadingIndicator: React.FC<LoadingIndicatorProps>;
-export {};