From d392e6c7c67d1842488cda6cf0b025df2e4fa495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20Miesi=C4=85c?= <tadeusz.miesiac@gmail.com>
Date: Tue, 14 Nov 2023 15:08:23 +0100
Subject: [PATCH] Revert "feat(search query): added search query to support
multisearch"
This reverts commit 90396fe74306e6802cab39357af692abdfd448f7.
---
poc.ts | 33 +++++++++++++++++++
.../SearchBar/SearchBar.component.test.tsx | 16 ---------
.../TopBar/SearchBar/SearchBar.component.tsx | 13 +++-----
.../AccordionsDetails.component.test.tsx | 4 +--
src/models/drugSchema.ts | 2 +-
src/redux/root/init.thunks.ts | 8 -----
src/redux/root/query.selectors.ts | 5 +--
src/types/query.ts | 3 --
src/utils/parseQueryToTypes.test.ts | 11 -------
src/utils/parseQueryToTypes.ts | 1 -
10 files changed, 41 insertions(+), 55 deletions(-)
create mode 100644 poc.ts
diff --git a/poc.ts b/poc.ts
new file mode 100644
index 00000000..958c0f3b
--- /dev/null
+++ b/poc.ts
@@ -0,0 +1,33 @@
+// scenario: user inputs multi values up to 7 separated by comma. Click search
+// goal: have data stored in redux to be used in multitab on search results
+
+import { Loading } from '@/types/loadingState';
+
+// 1: needs to validate number of imputs, dont let more then 7;
+// 2: get each of values to search for and send 4 queries for each of them (drugs, mirna, chemicals, bioEntity)
+// 3: save values to the store:
+
+/** Current store of bioEntity,drugs,chemicals,mirna */
+
+type FetchDataState<T, T2 = undefined> = {
+ data: T | T2;
+ loading: Loading;
+ error: Error;
+};
+
+// proposed
+
+type MultiSearchData<T, T2 = undefined> = {
+ searchQuery: string; // it will allow us to use it in tabs, find desired values
+ data: T | undefined;
+ loading: Loading; // it will be possible to use it search tabs to show loading indicator
+ error: Error; //
+};
+
+type MultiFetchDataState<T> = {
+ data: MultiSearchData<T>[];
+ loading: Loading;
+ error: Error;
+};
+
+// possible problems: if later we want to add search query for pin it might be tricky to store values and access them. Unless we agree to add separate field just for it
diff --git a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx
index 33254b83..e870ed60 100644
--- a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx
+++ b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.test.tsx
@@ -1,5 +1,4 @@
import { StoreType } from '@/redux/store';
-import { useRouter } from 'next/router';
import { getReduxWrapperWithStore } from '@/utils/testing/getReduxWrapperWithStore';
import { fireEvent, render, screen } from '@testing-library/react';
import { SearchBar } from './SearchBar.component';
@@ -19,14 +18,6 @@ const renderComponent = (): { store: StoreType } => {
);
};
-jest.mock('next/router', () => ({
- useRouter: jest.fn(),
-}));
-
-(useRouter as jest.Mock).mockReturnValue({
- query: {},
-});
-
describe('SearchBar - component', () => {
it('should let user type text', () => {
renderComponent();
@@ -59,11 +50,4 @@ describe('SearchBar - component', () => {
expect(input).toBeDisabled();
});
-
- it('should set initial search value to match searchValue query param', () => {
- (useRouter as jest.Mock).mockReturnValue({
- query: { searchValue: 'aspirin;nadh' },
- });
- renderComponent();
- });
});
diff --git a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx
index b47a4bf5..431b4e57 100644
--- a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx
+++ b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx
@@ -5,9 +5,8 @@ import { useAppDispatch } from '@/redux/hooks/useAppDispatch';
import { isPendingSearchStatusSelector } from '@/redux/search/search.selectors';
import { getSearchData } from '@/redux/search/search.thunks';
import Image from 'next/image';
-import { ChangeEvent, KeyboardEvent, useEffect, useState } from 'react';
+import { ChangeEvent, KeyboardEvent, useState } from 'react';
import { useSelector } from 'react-redux';
-import { useRouter } from 'next/router';
import { getSearchValuesArrayAndTrimToSeven } from './SearchBar.utils';
const ENTER_KEY_CODE = 'Enter';
@@ -15,15 +14,9 @@ const ENTER_KEY_CODE = 'Enter';
export const SearchBar = (): JSX.Element => {
const isPendingSearchStatus = useSelector(isPendingSearchStatusSelector);
const isDrawerOpen = useSelector(isDrawerOpenSelector);
+
const [searchValue, setSearchValue] = useState<string>('');
const dispatch = useAppDispatch();
- const { query } = useRouter();
-
- useEffect(() => {
- if (!searchValue && query.searchValue) {
- setSearchValue(String(query.searchValue));
- }
- }, [searchValue, query]);
const openSearchDrawerIfClosed = (): void => {
if (!isDrawerOpen) {
@@ -38,6 +31,7 @@ export const SearchBar = (): JSX.Element => {
const searchValues = getSearchValuesArrayAndTrimToSeven(searchValue);
dispatch(getSearchData(searchValues));
+ // setSearchQueryInRouter(searchValue);
openSearchDrawerIfClosed();
};
@@ -46,6 +40,7 @@ export const SearchBar = (): JSX.Element => {
if (event.code === ENTER_KEY_CODE) {
dispatch(getSearchData(searchValues));
+ // setSearchQueryInRouter(searchValue);
openSearchDrawerIfClosed();
}
};
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.test.tsx
index 86e82f93..2f3c00b7 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.test.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.test.tsx
@@ -37,12 +37,12 @@ describe('AccordionsDetails - component', () => {
expect(screen.getByText(drugName, { exact: false })).toBeInTheDocument();
});
- it.skip('should display description of drug', () => {
+ it('should display description of drug', () => {
renderComponent();
const drugDescription = drugsFixture[0].description;
- expect(screen.getByText(drugDescription || '', { exact: false })).toBeInTheDocument();
+ expect(screen.getByText(drugDescription, { exact: false })).toBeInTheDocument();
});
it('should display synonyms of drug', () => {
renderComponent();
diff --git a/src/models/drugSchema.ts b/src/models/drugSchema.ts
index 17c54ddf..346dfa96 100644
--- a/src/models/drugSchema.ts
+++ b/src/models/drugSchema.ts
@@ -6,7 +6,7 @@ export const drugSchema = z.object({
/** identifier of the chemical */
id: z.string(),
name: z.string(),
- description: z.string().nullable(),
+ description: z.string(),
/** list of synonyms */
synonyms: z.array(z.string()),
brandNames: z.array(z.string()),
diff --git a/src/redux/root/init.thunks.ts b/src/redux/root/init.thunks.ts
index a627aefc..c91e96ef 100644
--- a/src/redux/root/init.thunks.ts
+++ b/src/redux/root/init.thunks.ts
@@ -1,4 +1,3 @@
-import { openSearchDrawer } from '@/redux/drawer/drawer.slice';
import { createAsyncThunk } from '@reduxjs/toolkit';
import { PROJECT_ID } from '@/constants';
import { AppDispatch } from '@/redux/store';
@@ -13,7 +12,6 @@ import {
initMapSizeAndModelId,
initOpenedMaps,
} from '../map/map.thunks';
-import { getSearchData } from '../search/search.thunks';
interface InitializeAppParams {
queryData: QueryData;
@@ -39,10 +37,4 @@ export const fetchInitialAppData = createAsyncThunk<
]);
/** Create tabs for maps / submaps */
dispatch(initOpenedMaps({ queryData }));
-
- /** Trigger search */
- if (queryData.searchValue) {
- dispatch(getSearchData(queryData.searchValue));
- dispatch(openSearchDrawer());
- }
});
diff --git a/src/redux/root/query.selectors.ts b/src/redux/root/query.selectors.ts
index 0439c5f8..e0c3d785 100644
--- a/src/redux/root/query.selectors.ts
+++ b/src/redux/root/query.selectors.ts
@@ -1,13 +1,10 @@
import { QueryDataParams } from '@/types/query';
import { createSelector } from '@reduxjs/toolkit';
import { mapDataSelector } from '../map/map.selectors';
-import { searchValueSelector } from '../search/search.selectors';
export const queryDataParamsSelector = createSelector(
- searchValueSelector,
mapDataSelector,
- (searchValue, { modelId, backgroundId, position }): QueryDataParams => ({
- searchValue: searchValue.join(';'),
+ ({ modelId, backgroundId, position }): QueryDataParams => ({
modelId,
backgroundId,
...position.last,
diff --git a/src/types/query.ts b/src/types/query.ts
index cf67cf2f..bd9cb48c 100644
--- a/src/types/query.ts
+++ b/src/types/query.ts
@@ -1,14 +1,12 @@
import { Point } from './map';
export interface QueryData {
- searchValue?: string[];
modelId?: number;
backgroundId?: number;
initialPosition?: Partial<Point>;
}
export interface QueryDataParams {
- searchValue: string;
modelId?: number;
backgroundId?: number;
x?: number;
@@ -17,7 +15,6 @@ export interface QueryDataParams {
}
export interface QueryDataRouterParams {
- searchValue?: string;
modelId?: string;
backgroundId?: string;
x?: string;
diff --git a/src/utils/parseQueryToTypes.test.ts b/src/utils/parseQueryToTypes.test.ts
index d1e15975..8151e0c9 100644
--- a/src/utils/parseQueryToTypes.test.ts
+++ b/src/utils/parseQueryToTypes.test.ts
@@ -4,33 +4,22 @@ describe('parseQueryToTypes', () => {
it('should return valid data', () => {
expect({}).toEqual({});
- expect(parseQueryToTypes({ searchValue: 'nadh;aspirin' })).toEqual({
- searchValue: ['nadh', 'aspirin'],
- modelId: undefined,
- backgroundId: undefined,
- initialPosition: { x: undefined, y: undefined, z: undefined },
- });
-
expect(parseQueryToTypes({ modelId: '666' })).toEqual({
- searchValue: undefined,
modelId: 666,
backgroundId: undefined,
initialPosition: { x: undefined, y: undefined, z: undefined },
});
expect(parseQueryToTypes({ x: '2137' })).toEqual({
- searchValue: undefined,
modelId: undefined,
backgroundId: undefined,
initialPosition: { x: 2137, y: undefined, z: undefined },
});
expect(parseQueryToTypes({ y: '1372' })).toEqual({
- searchValue: undefined,
modelId: undefined,
backgroundId: undefined,
initialPosition: { x: undefined, y: 1372, z: undefined },
});
expect(parseQueryToTypes({ z: '3721' })).toEqual({
- searchValue: undefined,
modelId: undefined,
backgroundId: undefined,
initialPosition: { x: undefined, y: undefined, z: 3721 },
diff --git a/src/utils/parseQueryToTypes.ts b/src/utils/parseQueryToTypes.ts
index 4123eebf..d1b3f297 100644
--- a/src/utils/parseQueryToTypes.ts
+++ b/src/utils/parseQueryToTypes.ts
@@ -1,7 +1,6 @@
import { QueryData, QueryDataRouterParams } from '@/types/query';
export const parseQueryToTypes = (query: QueryDataRouterParams): QueryData => ({
- searchValue: query.searchValue?.split(';'),
modelId: Number(query.modelId) || undefined,
backgroundId: Number(query.backgroundId) || undefined,
initialPosition: {
--
GitLab