@opengeoweb/store 9.27.0 → 9.28.0

package/index.esm.js

@@ -8,11 +8,9 @@ import { produce } from 'immer';
 import { isEqual, isEmpty, compact } from 'lodash';
 import { useSelector, useDispatch, Provider } from 'react-redux';
 import { useCallback, useEffect } from 'react';
-import { createStore } from '@redux-eggs/redux-toolkit';
-import { getSagaExtension } from '@redux-eggs/saga-extension';
 import { metronome } from '@opengeoweb/metronome';
-import { takeLatest, select, put } from 'redux-saga/effects';
 import { jsx } from 'react/jsx-runtime';
+import { createStore } from '@redux-eggs/redux-toolkit';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -2608,7 +2606,7 @@ const setBbox = createAction('GENERIC_SETBBOX');
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
 /**
- * These actions are fired by the generic/saga.ts, based on generic actions and the synchronizationGroup state.
+ * These actions are fired by the generic/listener.ts, based on generic actions and the synchronizationGroup state.
  *
  * These actions should not be used by components directly. Components should only use the generic actions.
  */
@@ -3195,7 +3193,7 @@ const slice$7 = createSlice({
       });
     }).addCase(setLayerActionSync, (draft, action) => {
       /*
-       * This GENERIC_SYNC_SETLAYERACTIONS action is generated by the syncgroup saga.
+       * This GENERIC_SYNC_SETLAYERACTIONS action is generated by the syncgroup listener.
        * It has multiple targets (Layers) in its payload.
        * These targets can be used as payloads in new Layer actions.
        * These actions are here handled via the layer reducer, as it is the same logic
@@ -4544,7 +4542,7 @@ const slice$5 = createSlice({
       });
     }).addCase(setLayerActionSync, (draft, action) => {
       /*
-       * This GENERIC_SYNC_SETLAYERACTIONS action is generated by the syncgroup saga.
+       * This GENERIC_SYNC_SETLAYERACTIONS action is generated by the syncgroup listener.
        * It has multiple targets (Layers) in its payload.
        * These targets can be used as payloads in new Layer actions.
        * These actions are here handled via the layer reducer, as it is the same logic
@@ -4587,7 +4585,7 @@ const slice$5 = createSlice({
       if (!draft.byId[mapId]) {
         return;
       }
-      // reset preset state (currently setMapPreset saga is firing actions and these are setting values)
+      // reset preset state (currently setMapPreset listener is firing actions and these are setting values)
       draft.byId[mapId].baseLayers = [];
       draft.byId[mapId].mapLayers = [];
       draft.byId[mapId].overLayers = [];
@@ -5205,7 +5203,7 @@ var SyncGroupActionOrigin;
   SyncGroupActionOrigin["layerActions"] = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_LAYERACTIONS";
   SyncGroupActionOrigin["move"] = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_MOVEACTION";
   SyncGroupActionOrigin["add"] = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_ADDACTION";
-  SyncGroupActionOrigin["activateLayerId"] = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_ACTIVELAYERIDACTION";
+  SyncGroupActionOrigin["autoLayerId"] = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_AUTOLAYERIDACTION";
 })(SyncGroupActionOrigin || (SyncGroupActionOrigin = {}));
 
 var types$2 = /*#__PURE__*/Object.freeze({
@@ -7127,7 +7125,7 @@ const metronomeHandler = (timerIds, listenerApi) => {
   }
   // Update all targets of all sync groups in one action.
   if (targetsWithUpdateValue.length > 0) {
-    listenerApi.dispatch(setTimeSync(null, targetsWithUpdateValue, ['metronomesaga']));
+    listenerApi.dispatch(setTimeSync(null, targetsWithUpdateValue, ['metronomelistener']));
   }
 };
 const metronomeListener = createListenerMiddleware();
@@ -8608,10 +8606,6 @@ serviceListener.startListening({
   })
 });
 
-// TODO: This fixes typecheck errors but maybe there is a better way to do that
-createStore({
-  extensions: [getSagaExtension()]
-});
 const mapStoreReducers = {
   webmap: reducer$4,
   services: reducer$2,
@@ -8776,23 +8770,22 @@ const getLayerMoveActionsTargets = (state, payload, actionType) => {
   });
 };
 /**
- * These targets are found for the layer/map action SetActiveLayerId. It needs both a target mapId and layerId
+ * These targets are found for the map action SetAutoLayerId. It needs both a target mapId and layerId
  * @param state
  * @param payload
  * @param actionType
  * @returns
  */
-const getSetActiveLayerIdActionsTargets = (state, payload, actionType) => {
-  const sourceMapId = getMapIdFromLayerId(state, payload.layerId);
-  if (!sourceMapId) {
-    return [];
-  }
-  const foundTargets = findTargets(state, payload, actionType, sourceMapId);
+const getSetAutoLayerIdActionsTargets = (state, payload, actionType) => {
+  const payloadWithLayerId = Object.assign(Object.assign({}, payload), {
+    layerId: payload.autoUpdateLayerId || payload.autoTimeStepLayerId || payload.layerId
+  });
+  const foundTargets = findTargets(state, payloadWithLayerId, actionType, payload.mapId);
   return foundTargets.map(target => {
     return {
       mapId: target.targetId,
       layerId: target.layerId,
-      origin: SyncGroupActionOrigin.activateLayerId
+      origin: SyncGroupActionOrigin.autoLayerId
     };
   });
 };
@@ -8868,6 +8861,105 @@ genericListener.startListening({
     }
   })
 });
+genericListener.startListening({
+  actionCreator: layerActions.addLayer,
+  effect: ({
+    payload,
+    type
+  }, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    listenerApi.cancelActiveListeners();
+    /* Should not listen to actions from itself */
+    if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
+      return;
+    }
+    const targets = getAddLayerActionsTargets(listenerApi.getState(), payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
+    if (targets && targets.length > 0) {
+      listenerApi.dispatch(setLayerActionSync(payload, targets, type));
+    }
+  })
+});
+genericListener.startListening({
+  actionCreator: layerActions.duplicateMapLayer,
+  effect: ({
+    payload
+  }, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    listenerApi.cancelActiveListeners();
+    const sourceLayer = getLayerById(listenerApi.getState(), payload.oldLayerId);
+    const newPayload = {
+      mapId: payload.mapId,
+      layer: sourceLayer,
+      origin: payload.origin
+    };
+    const targets = getAddLayerActionsTargets(listenerApi.getState(), newPayload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
+    if (targets && targets.length > 0) {
+      listenerApi.dispatch(setLayerActionSync(newPayload, targets, layerActions.addLayer.type));
+    }
+  })
+});
+genericListener.startListening({
+  actionCreator: mapActions.layerMoveLayer,
+  effect: ({
+    payload,
+    type
+  }, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    listenerApi.cancelActiveListeners();
+    /* Should not listen to actions from itself */
+    if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
+      return;
+    }
+    const targets = getLayerMoveActionsTargets(listenerApi.getState(), payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
+    if (targets && targets.length > 0) {
+      listenerApi.dispatch(setLayerActionSync(payload, targets, type));
+    }
+  })
+});
+genericListener.startListening({
+  matcher: isAnyOf(mapActions.setAutoLayerId, mapActions.setAutoUpdateLayerId, mapActions.setAutoTimestepLayerId),
+  effect: ({
+    payload,
+    type
+  }, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    listenerApi.cancelActiveListeners();
+    const targets = getSetAutoLayerIdActionsTargets(listenerApi.getState(), payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
+    if (targets && targets.length > 0) {
+      listenerApi.dispatch(setLayerActionSync(payload, targets, type));
+    }
+  })
+});
+genericListener.startListening({
+  actionCreator: layerActions.setBaseLayers,
+  effect: ({
+    payload,
+    type
+  }, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    listenerApi.cancelActiveListeners();
+    /* Should not listen to actions from itself */
+    if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
+      return;
+    }
+    const targets = getMapBaseLayerActionsTargets(listenerApi.getState(), payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
+    if (targets && targets.length > 0) {
+      listenerApi.dispatch(setLayerActionSync(payload, targets, type));
+    }
+  })
+});
+genericListener.startListening({
+  actionCreator: layerActions.layerDelete,
+  effect: ({
+    payload,
+    type
+  }, listenerApi) => __awaiter(void 0, void 0, void 0, function* () {
+    listenerApi.cancelActiveListeners();
+    /* Should not listen to actions from itself */
+    if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
+      return;
+    }
+    const targets = getLayerDeleteActionsTargets(listenerApi.getState(), payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
+    if (targets && targets.length > 0) {
+      listenerApi.dispatch(setLayerActionSync(payload, targets, type));
+    }
+  })
+});
 
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -9085,7 +9177,7 @@ const slice = createSlice({
     draft,
     // eslint-disable-next-line no-unused-vars
     action) => {
-      // action caught in drawingTool/sagas
+      // action caught in drawingTool/listener
     }
   },
   extraReducers: builder => {
@@ -9209,7 +9301,7 @@ var selectors = /*#__PURE__*/Object.freeze({
 });
 
 const drawingToolListener = createListenerMiddleware();
-const registerOrigin = 'drawings saga:registerDrawToolSaga';
+const registerOrigin = 'drawings listener:registerDrawToolListener';
 // register draw tool
 drawingToolListener.startListening({
   actionCreator: drawtoolActions.registerDrawTool,
@@ -9381,7 +9473,7 @@ drawingToolListener.startListening({
       }));
     } catch (error) {
       // eslint-disable-next-line no-console
-      console.log('error changeDrawToolSaga', error);
+      console.log('error changeDrawToolListener', error);
     }
   })
 });
@@ -9726,107 +9818,6 @@ var storeTestUtils = /*#__PURE__*/Object.freeze({
 	webmapStateWithAddedLayer: webmapStateWithAddedLayer
 });
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2020 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-function* addLayerActionsSaga({
-  payload,
-  type
-}) {
-  /* Should not listen to actions from itself */
-  if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
-    return;
-  }
-  const targets = yield select(getAddLayerActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
-  if (targets && targets.length > 0) {
-    yield put(setLayerActionSync(payload, targets, type));
-  }
-}
-function* duplicateMapLayerActionsSaga({
-  payload
-}) {
-  const sourceLayer = yield select(getLayerById, payload.oldLayerId);
-  const newPayload = {
-    mapId: payload.mapId,
-    layer: sourceLayer,
-    origin: payload.origin
-  };
-  const targets = yield select(getAddLayerActionsTargets, newPayload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
-  if (targets && targets.length > 0) {
-    yield put(setLayerActionSync(newPayload, targets, layerActions.addLayer.type));
-  }
-}
-function* deleteLayerActionsSaga({
-  payload,
-  type
-}) {
-  /* Should not listen to actions from itself */
-  if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
-    return;
-  }
-  const targets = yield select(getLayerDeleteActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
-  if (targets && targets.length > 0) {
-    yield put(setLayerActionSync(payload, targets, type));
-  }
-}
-function* moveLayerActionsSaga({
-  payload,
-  type
-}) {
-  /* Should not listen to actions from itself */
-  if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
-    return;
-  }
-  const targets = yield select(getLayerMoveActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
-  if (targets && targets.length > 0) {
-    yield put(setLayerActionSync(payload, targets, type));
-  }
-}
-function* setAutoLayerIdActionsSaga({
-  payload,
-  type
-}) {
-  const targets = yield select(getSetActiveLayerIdActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
-  if (targets && targets.length > 0) {
-    yield put(setLayerActionSync(payload, targets, type));
-  }
-}
-function* mapBaseLayerActionsSaga({
-  payload,
-  type
-}) {
-  /* Should not listen to actions from itself */
-  if (payload && payload.origin === LayerActionOrigin.ReactMapViewParseLayer) {
-    return;
-  }
-  const targets = yield select(getMapBaseLayerActionsTargets, payload, SYNCGROUPS_TYPE_SETLAYERACTIONS);
-  if (targets && targets.length > 0) {
-    yield put(setLayerActionSync(payload, targets, type));
-  }
-}
-function* rootSaga() {
-  yield takeLatest(layerActions.layerDelete.type, deleteLayerActionsSaga);
-  yield takeLatest(layerActions.addLayer.type, addLayerActionsSaga);
-  yield takeLatest(layerActions.duplicateMapLayer.type, duplicateMapLayerActionsSaga);
-  yield takeLatest(mapActions.layerMoveLayer.type, moveLayerActionsSaga);
-  yield takeLatest(mapActions.setAutoLayerId.type, setAutoLayerIdActionsSaga);
-  yield takeLatest(layerActions.setBaseLayers.type, mapBaseLayerActionsSaga);
-}
-
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9899,7 +9890,6 @@ const synchronizationGroupConfig = {
     syncronizationGroupStore: reducer$3,
     loadingIndicatorStore: loadingIndicatorReducer
   },
-  sagas: [rootSaga],
   middlewares: [genericListener.middleware, syncGroupsListener.middleware]
 };
 
@@ -9946,9 +9936,7 @@ const uiModuleConfig = {
  * */
 const coreModuleConfig = [mapStoreModuleConfig, synchronizationGroupConfig, uiModuleConfig, drawtoolModuleConfig];
 
-const createCustomStore = () => createStore({
-  extensions: [getSagaExtension({})]
-});
+const createCustomStore = () => createStore();
 const WrapperWithModules = withEggs(coreModuleConfig)(({
   children
 }) => children);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "9.27.0",
+  "version": "9.28.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,11 +13,9 @@
     "@reduxjs/toolkit": "^1.9.7",
     "@redux-eggs/core": "^2.2.0",
     "@opengeoweb/webmap-react": "*",
-    "redux-saga": "^1.2.3",
     "@opengeoweb/webmap": "*",
     "immer": "^10.0.3",
     "@redux-eggs/redux-toolkit": "^2.2.0",
-    "@redux-eggs/saga-extension": "^2.2.0",
     "lodash": "^4.17.21",
     "@opengeoweb/metronome": "*",
     "@opengeoweb/timeslider": "*"

package/src/store/generic/synchronizationActions/actions.d.ts

@@ -1,7 +1,7 @@
 import type { SetBboxPayload, SetTimePayload, SyncLayerPayloads } from '../types';
 import type { SetBboxSyncActionPayload, SetBboxSyncPayload, SetLayerActionsSyncPayload, SetTimeSyncActionPayload, SetTimeSyncPayload } from './types';
 /**
- * These actions are fired by the generic/saga.ts, based on generic actions and the synchronizationGroup state.
+ * These actions are fired by the generic/listener.ts, based on generic actions and the synchronizationGroup state.
  *
  * These actions should not be used by components directly. Components should only use the generic actions.
  */

package/src/store/generic/synchronizationGroups/types.d.ts

@@ -95,6 +95,6 @@ export declare enum SyncGroupActionOrigin {
     layerActions = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_LAYERACTIONS",
     move = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_MOVEACTION",
     add = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_ADDACTION",
-    activateLayerId = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_ACTIVELAYERIDACTION"
+    autoLayerId = "ORIGIN_GENERIC_SYNCHRONIZATIONGROUP_UTILS_AUTOLAYERIDACTION"
 }
 export {};

package/src/store/generic/synchronizationGroups/utils.d.ts

@@ -1,5 +1,5 @@
 import { CoreAppStore } from '../../types';
-import { AddLayerPayload, DeleteLayerPayload, MoveLayerPayload, SetBaseLayersPayload } from '../../mapStore/types';
+import { AddLayerPayload, DeleteLayerPayload, MoveLayerPayload, SetAutoLayerIdPayload, SetBaseLayersPayload } from '../../mapStore/types';
 import { SyncLayerPayloads, LayerActionPayloadsWithLayerIds } from '../types';
 import { SyncType } from './types';
 interface FoundTargets {
@@ -58,13 +58,13 @@ export declare const getLayerDeleteActionsTargets: (state: CoreAppStore, payload
  */
 export declare const getLayerMoveActionsTargets: (state: CoreAppStore, payload: MoveLayerPayload, actionType: SyncType) => MoveLayerPayload[];
 /**
- * These targets are found for the layer/map action SetActiveLayerId. It needs both a target mapId and layerId
+ * These targets are found for the map action SetAutoLayerId. It needs both a target mapId and layerId
  * @param state
  * @param payload
  * @param actionType
  * @returns
  */
-export declare const getSetActiveLayerIdActionsTargets: (state: CoreAppStore, payload: LayerActionPayloadsWithLayerIds, actionType: SyncType) => LayerActionPayloadsWithLayerIds[];
+export declare const getSetAutoLayerIdActionsTargets: (state: CoreAppStore, payload: SetAutoLayerIdPayload, actionType: SyncType) => LayerActionPayloadsWithLayerIds[];
 /**
  * These targets are found for baselayer actions that work with a mapId like: setBaseLayers
  * @param state

package/src/store/generic/sagas.d.ts

@@ -1,11 +0,0 @@
-import { SagaIterator } from 'redux-saga';
-import { mapActions } from '../mapStore';
-import { layerActions } from '../mapStore/layers/reducer';
-export declare function addLayerActionsSaga({ payload, type, }: ReturnType<typeof layerActions.addLayer>): SagaIterator;
-export declare function duplicateMapLayerActionsSaga({ payload, }: ReturnType<typeof layerActions.duplicateMapLayer>): SagaIterator;
-export declare function deleteLayerActionsSaga({ payload, type, }: ReturnType<typeof layerActions.layerDelete>): SagaIterator;
-export declare function moveLayerActionsSaga({ payload, type, }: ReturnType<typeof mapActions.layerMoveLayer>): SagaIterator;
-export declare function setAutoLayerIdActionsSaga({ payload, type, }: ReturnType<typeof mapActions.setAutoLayerId>): SagaIterator;
-export declare function mapBaseLayerActionsSaga({ payload, type, }: ReturnType<typeof layerActions.setBaseLayers>): SagaIterator;
-export declare function rootSaga(): SagaIterator;
-export default rootSaga;

package/src/store/generic/sagas.spec.d.ts

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