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 373c01d13ecda7c0386bf8b33e662f73ef9c86ca..212465ce35f150f5631ed8db563f50b4cbe34f7d 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 7a2dd125d03f2b0b2a2dbecaab3a3536e7a1bb47..839ef138cb6e80ebce57c311ccff3f02673ae10a 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 57c38c9d9cce42bae75d38461d0cdeb681db38bb..517792916872a630a10d4c953bf4415fedff6b59 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 dbd2093c165840fb4c383dbc30eb3dacafe58a8f..2a9f849dda0ecee6d73d1cc2d8737af1f12ad633 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,