From c05a3e853d69bcba222e176a2bf760935f50cbb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Grocholewski?= <m.grocholewski@atcomp.pl>
Date: Fri, 22 Nov 2024 09:24:20 +0100
Subject: [PATCH] fix(vector-map): avoid clearing submap connections on clear
bioentities data
---
.../mouseClick/mouseLeftClick/onMapLeftClick.test.ts | 4 ++--
.../listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts | 4 ++--
src/redux/bioEntity/bioEntity.reducers.ts | 5 +++++
src/redux/bioEntity/bioEntity.slice.ts | 3 +++
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.test.ts b/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.test.ts
index 373c01d1..212465ce 100644
--- a/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.test.ts
+++ b/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.test.ts
@@ -2,7 +2,7 @@
import { updateLastClick } from '@/redux/map/map.slice';
import { closeDrawer } from '@/redux/drawer/drawer.slice';
import { resetReactionsData } from '@/redux/reactions/reactions.slice';
-import { clearBioEntitiesData } from '@/redux/bioEntity/bioEntity.slice';
+import { clearBioEntities } from '@/redux/bioEntity/bioEntity.slice';
import { handleFeaturesClick } from '@/components/Map/MapViewer/utils/listeners/mapSingleClick/handleFeaturesClick';
import Map from 'ol/Map';
import { onMapLeftClick } from '@/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick';
@@ -66,7 +66,7 @@ describe('onMapLeftClick', () => {
expect(dispatch).toHaveBeenCalledWith(updateLastClick(expect.any(Object)));
expect(dispatch).toHaveBeenCalledWith(closeDrawer());
expect(dispatch).toHaveBeenCalledWith(resetReactionsData());
- expect(dispatch).toHaveBeenCalledWith(clearBioEntitiesData());
+ expect(dispatch).toHaveBeenCalledWith(clearBioEntities());
});
it('calls leftClickHandleAlias if feature type is ALIAS', async () => {
diff --git a/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts b/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts
index 7a2dd125..839ef138 100644
--- a/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts
+++ b/src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts
@@ -7,7 +7,7 @@ import { toLonLat } from 'ol/proj';
import { latLngToPoint } from '@/utils/map/latLngToPoint';
import { FeatureLike } from 'ol/Feature';
import { closeDrawer } from '@/redux/drawer/drawer.slice';
-import { clearBioEntitiesData } from '@/redux/bioEntity/bioEntity.slice';
+import { clearBioEntities } from '@/redux/bioEntity/bioEntity.slice';
import { leftClickHandleAlias } from '@/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/leftClickHandleAlias';
import { handleFeaturesClick } from '@/components/Map/MapViewer/utils/listeners/mapSingleClick/handleFeaturesClick';
import { resetReactionsData } from '@/redux/reactions/reactions.slice';
@@ -39,7 +39,7 @@ export const onMapLeftClick =
}
dispatch(resetReactionsData());
- dispatch(clearBioEntitiesData());
+ dispatch(clearBioEntities());
return;
}
diff --git a/src/redux/bioEntity/bioEntity.reducers.ts b/src/redux/bioEntity/bioEntity.reducers.ts
index 57c38c9d..51779291 100644
--- a/src/redux/bioEntity/bioEntity.reducers.ts
+++ b/src/redux/bioEntity/bioEntity.reducers.ts
@@ -115,6 +115,11 @@ export const clearBioEntitiesDataReducer = (state: BioEntityContentsState): void
state.submapConnections = BIOENTITY_SUBMAP_CONNECTIONS_INITIAL_STATE;
};
+export const clearBioEntitiesReducer = (state: BioEntityContentsState): void => {
+ state.data = [];
+ state.loading = 'idle';
+};
+
export const toggleIsContentTabOpenedReducer = (
state: BioEntityContentsState,
action: PayloadAction<boolean>,
diff --git a/src/redux/bioEntity/bioEntity.slice.ts b/src/redux/bioEntity/bioEntity.slice.ts
index dbd2093c..2a9f849d 100644
--- a/src/redux/bioEntity/bioEntity.slice.ts
+++ b/src/redux/bioEntity/bioEntity.slice.ts
@@ -2,6 +2,7 @@ import { createSlice } from '@reduxjs/toolkit';
import { BIOENTITY_INITIAL_STATE } from './bioEntity.constants';
import {
clearBioEntitiesDataReducer,
+ clearBioEntitiesReducer,
getBioEntityContentsReducer,
getMultiBioEntityContentsReducer,
getSubmapConnectionsBioEntityReducer,
@@ -15,6 +16,7 @@ export const bioEntityContentsSlice = createSlice({
initialState: BIOENTITY_INITIAL_STATE,
reducers: {
clearBioEntitiesData: clearBioEntitiesDataReducer,
+ clearBioEntities: clearBioEntitiesReducer,
toggleIsContentTabOpened: toggleIsContentTabOpenedReducer,
setBioEntityContents: setBioEntityContentsReducer,
setMultipleBioEntityContents: setMultipleBioEntityContentsReducer,
@@ -28,6 +30,7 @@ export const bioEntityContentsSlice = createSlice({
export const {
clearBioEntitiesData,
+ clearBioEntities,
toggleIsContentTabOpened,
setBioEntityContents,
setMultipleBioEntityContents,
--
GitLab