From a5e40a80765c8645bf13988e0131cd241c32b4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Or=C5=82=C3=B3w?= <adrian.orlow@fishbrain.com>
Date: Fri, 29 Mar 2024 11:46:13 +0100
Subject: [PATCH] feat: rfc changes
---
.../TopBar/SearchBar/SearchBar.component.tsx | 3 ---
.../BioEntitiesPinsListItem.component.tsx | 2 --
.../PerfectMatchSwitch.component.test.tsx | 8 +++-----
.../PerfectMatchSwitch/PerfectMatchSwitch.component.tsx | 2 --
4 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx
index 5725603a..750e7e97 100644
--- a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx
+++ b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx
@@ -1,5 +1,4 @@
import lensIcon from '@/assets/vectors/icons/lens.svg';
-import { getSubmapConnectionsBioEntity } from '@/redux/bioEntity/thunks/getSubmapConnectionsBioEntity';
import {
currentSelectedSearchElement,
searchDrawerOpenSelector,
@@ -52,7 +51,6 @@ export const SearchBar = (): JSX.Element => {
const searchValues = getSearchValuesArrayAndTrimToSeven(searchValue);
dispatch(resetReactionsData());
- dispatch(getSubmapConnectionsBioEntity());
dispatch(getSearchData({ searchQueries: searchValues, isPerfectMatch }));
openSearchDrawerIfClosed(getDefaultSearchTab(searchValues));
};
@@ -62,7 +60,6 @@ export const SearchBar = (): JSX.Element => {
if (event.code === ENTER_KEY_CODE) {
dispatch(resetReactionsData());
- dispatch(getSubmapConnectionsBioEntity());
dispatch(getSearchData({ searchQueries: searchValues, isPerfectMatch }));
openSearchDrawerIfClosed(getDefaultSearchTab(searchValues));
}
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.tsx
index 8e3cb044..fbc71283 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/BioEntitiesResultsList/BioEntitiesPinsList/BioEntitiesPinsListItem/BioEntitiesPinsListItem.component.tsx
@@ -8,7 +8,6 @@ import {
import { getCanvasIcon } from '@/components/Map/MapViewer/utils/config/getCanvasIcon';
import { PINS_COLORS } from '@/constants/canvas';
import { DEFAULT_MAX_ZOOM } from '@/constants/map';
-import { getSubmapConnectionsBioEntity } from '@/redux/bioEntity/thunks/getSubmapConnectionsBioEntity';
import { openSearchDrawerWithSelectedTab } from '@/redux/drawer/drawer.slice';
import { numberByEntityNumberIdSelector } from '@/redux/entityNumber/entityNumber.selectors';
import { useAppDispatch } from '@/redux/hooks/useAppDispatch';
@@ -56,7 +55,6 @@ export const BioEntitiesPinsListItem = ({
const handleSearchMapForPin = (): void => {
const searchValues = getSearchValuesArrayAndTrimToSeven(name);
dispatch(resetReactionsData());
- dispatch(getSubmapConnectionsBioEntity());
dispatch(getSearchData({ searchQueries: searchValues, isPerfectMatch: true }));
dispatch(openSearchDrawerWithSelectedTab(getDefaultSearchTab(searchValues)));
};
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.test.tsx
index c758af89..36a6ed72 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.test.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.test.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-magic-numbers */
-import { FIRST_ARRAY_ELEMENT, SECOND_ARRAY_ELEMENT } from '@/constants/common';
+import { FIRST_ARRAY_ELEMENT, SECOND_ARRAY_ELEMENT, THIRD_ARRAY_ELEMENT } from '@/constants/common';
import { SEARCH_STATE_INITIAL_MOCK } from '@/redux/search/search.mock';
import { AppDispatch, RootState, StoreType } from '@/redux/store';
import { getReduxStoreWithActionsListener } from '@/utils/testing/getReduxStoreActionsListener';
@@ -105,12 +105,10 @@ describe('PerfectMatchSwitch - component', () => {
type: 'reactions/resetReactionsData',
});
- expect(actions[2].type).toBe('project/getSubmapConnectionsBioEntity/pending');
-
- expect(actions[3].meta.arg).toStrictEqual({
+ expect(actions[THIRD_ARRAY_ELEMENT].meta.arg).toStrictEqual({
isPerfectMatch: true,
searchQueries: ['nadh', 'scna'],
});
- expect(actions[3].type).toEqual('project/getSearchData/pending');
+ expect(actions[THIRD_ARRAY_ELEMENT].type).toEqual('project/getSearchData/pending');
});
});
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.tsx
index 0d19dbf5..c58d2390 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/SearchDrawerHeader/PerfectMatchSwitch/PerfectMatchSwitch.component.tsx
@@ -1,5 +1,4 @@
/* eslint-disable jsx-a11y/label-has-associated-control */
-import { getSubmapConnectionsBioEntity } from '@/redux/bioEntity/thunks/getSubmapConnectionsBioEntity';
import { useAppDispatch } from '@/redux/hooks/useAppDispatch';
import { useAppSelector } from '@/redux/hooks/useAppSelector';
import { resetReactionsData } from '@/redux/reactions/reactions.slice';
@@ -22,7 +21,6 @@ export const PerfectMatchSwitch = (): JSX.Element => {
setChecked(isCheckedNewValue);
dispatch(resetReactionsData());
- dispatch(getSubmapConnectionsBioEntity());
dispatch(getSearchData({ searchQueries: searchValue, isPerfectMatch: isCheckedNewValue }));
};
--
GitLab