From 39d0972df3d69ac85edd5edbe3c6e7317f9e6c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Or=C5=82=C3=B3w?= <adrian.orlow@fishbrain.com>
Date: Mon, 18 Mar 2024 18:23:31 +0100
Subject: [PATCH] fix: data not resetting
---
.../MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts | 3 +--
.../utils/listeners/mapSingleClick/handleDataReset.test.ts | 1 +
.../utils/listeners/mapSingleClick/handleDataReset.ts | 2 ++
src/redux/entityNumber/entityNumber.selectors.ts | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts b/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts
index abe9ebba..f45b6ea6 100644
--- a/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts
+++ b/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts
@@ -1,4 +1,3 @@
-import { ZERO } from '@/constants/common';
import { EntityNumber } from '@/redux/entityNumber/entityNumber.types';
import { BioEntity } from '@/types/models';
import { PinType } from '@/types/pin';
@@ -23,7 +22,7 @@ export const getBioEntitiesFeatures = (
pointToProjection,
type,
// pin's index number
- value: entityNumber?.[bioEntity.elementId] || ZERO,
+ value: entityNumber?.[bioEntity.elementId],
}),
);
};
diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts
index bb5cd7f8..904522c2 100644
--- a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts
+++ b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts
@@ -15,6 +15,7 @@ describe('handleDataReset', () => {
'drugs/clearDrugsData',
'chemicals/clearChemicalsData',
'contextMenu/closeContextMenu',
+ 'entityNumber/clearEntityNumberData',
];
expect(actions.map(a => a.type)).toStrictEqual(actionsTypes);
diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts
index 3f4afbc7..f3b7e3b4 100644
--- a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts
+++ b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts
@@ -1,6 +1,7 @@
import { clearChemicalsData } from '@/redux/chemicals/chemicals.slice';
import { closeContextMenu } from '@/redux/contextMenu/contextMenu.slice';
import { clearDrugsData } from '@/redux/drugs/drugs.slice';
+import { clearEntityNumberData } from '@/redux/entityNumber/entityNumber.slice';
import { resetReactionsData } from '@/redux/reactions/reactions.slice';
import { clearSearchData } from '@/redux/search/search.slice';
import { AppDispatch } from '@/redux/store';
@@ -16,4 +17,5 @@ export const handleDataReset = (dispatch: AppDispatch): void => {
dispatch(clearDrugsData());
dispatch(clearChemicalsData());
dispatch(closeContextMenu());
+ dispatch(clearEntityNumberData());
};
diff --git a/src/redux/entityNumber/entityNumber.selectors.ts b/src/redux/entityNumber/entityNumber.selectors.ts
index 5f468771..64576d50 100644
--- a/src/redux/entityNumber/entityNumber.selectors.ts
+++ b/src/redux/entityNumber/entityNumber.selectors.ts
@@ -10,5 +10,5 @@ export const entityNumberDataSelector = createSelector(
export const numberByEntityNumberIdSelector = createSelector(
[entityNumberDataSelector, (_state, id: string): string => id],
- (entityNumber, id) => entityNumber?.[id],
+ (entityNumber, id): number | undefined => entityNumber?.[id],
);
--
GitLab