From de9e8e0cdf25c2d2eb5d2245d191b15a876ddce6 Mon Sep 17 00:00:00 2001
From: mateusz-winiarczyk <mateusz.winiarczyk@appunite.com>
Date: Wed, 27 Mar 2024 20:43:21 +0100
Subject: [PATCH] fix(search): left panel labels and layout (MIN-293)
---
.../ChemicalsAccordion.component.test.tsx | 4 +-
.../ChemicalsAccordion.component.tsx | 2 +-
.../DrugsAccordion.component.test.tsx | 4 +-
.../DrugsAccordion.component.tsx | 2 +-
.../AccordionsDetails.component.test.tsx | 20 +++------
.../AccordionsDetails.component.tsx | 44 ++++++-------------
.../PinsList/PinsList.component.tsx | 2 +-
.../ResultsList.component.test.tsx | 2 +-
.../ResultsList/ResultsList.component.tsx | 5 +--
.../ResultsList.component.utils.test.tsx | 33 ++++++++++++++
.../ResultsList.component.utils.tsx | 10 +++++
11 files changed, 72 insertions(+), 56 deletions(-)
create mode 100644 src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.test.tsx
create mode 100644 src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.tsx
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.test.tsx
index 5e85e6ae..bcd33a53 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.test.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.test.tsx
@@ -54,7 +54,7 @@ describe('DrugsAccordion - component', () => {
},
});
- expect(screen.getByText('Chemicals (4)')).toBeInTheDocument();
+ expect(screen.getByText('Small molecule targets (4)')).toBeInTheDocument();
});
it('should display loading indicator while waiting for chemicals search response', () => {
renderComponent({
@@ -77,7 +77,7 @@ describe('DrugsAccordion - component', () => {
},
});
- expect(screen.getByText('Chemicals (Loading...)')).toBeInTheDocument();
+ expect(screen.getByText('Small molecule targets (Loading...)')).toBeInTheDocument();
});
it('should navigate user to chemical results list after clicking button', async () => {
const { store } = renderComponent({
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.tsx
index 36dc7c61..4730eb40 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/ChemicalsAccordion/ChemicalsAccordion.component.tsx
@@ -29,7 +29,7 @@ export const ChemicalsAccordion = (): JSX.Element => {
onClick={onAccordionClick}
disabled={isPending || isChemicalsEmpty}
>
- Chemicals
+ Small molecule targets
{isPending && ' (Loading...)'}
{isSucceeded && ` (${chemicalsNumber})`}
</AccordionItemButton>
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.test.tsx
index dfdbab89..c114185c 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.test.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.test.tsx
@@ -47,7 +47,7 @@ describe('DrugsAccordion - component', () => {
error: { name: '', message: '' },
},
});
- expect(screen.getByText('Drugs (4)')).toBeInTheDocument();
+ expect(screen.getByText('Drug targets (4)')).toBeInTheDocument();
});
it('should display loading indicator while waiting for drug search response', () => {
renderComponent({
@@ -64,7 +64,7 @@ describe('DrugsAccordion - component', () => {
error: { name: '', message: '' },
},
});
- expect(screen.getByText('Drugs (Loading...)')).toBeInTheDocument();
+ expect(screen.getByText('Drug targets (Loading...)')).toBeInTheDocument();
});
it('should navigate user to drugs results list after clicking button', async () => {
const { store } = renderComponent({
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.tsx
index e92ba2bd..4dba7886 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/DrugsAccordion/DrugsAccordion.component.tsx
@@ -26,7 +26,7 @@ export const DrugsAccordion = (): JSX.Element => {
onClick={onAccordionClick}
disabled={isPending || isDrugsEmpty}
>
- Drugs
+ Drug targets
{isPending && ' (Loading...)'}
{isSucceeded && ` (${drugsNumber})`}
</AccordionItemButton>
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 b1810ecd..280246c6 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
@@ -7,7 +7,7 @@ import {
getReduxWrapperWithStore,
} from '@/utils/testing/getReduxWrapperWithStore';
import { render, screen } from '@testing-library/react';
-import { PinItem, PinTypeWithNone } from '../PinsList/PinsList.types';
+import { PinItem } from '../PinsList/PinsList.types';
import { AccordionsDetails } from './AccordionsDetails.component';
const DRUGS_PINS_LIST = drugsFixture.map(drug => ({
@@ -24,7 +24,6 @@ const CHEMICALS_PINS_LIST = chemicalsFixture.map(chemical => ({
const renderComponent = (
pinsList: PinItem[],
- type: PinTypeWithNone,
initialStoreState: InitialStoreState = {},
): { store: StoreType } => {
const { Wrapper, store } = getReduxWrapperWithStore(initialStoreState);
@@ -32,7 +31,7 @@ const renderComponent = (
return (
render(
<Wrapper>
- <AccordionsDetails pinsList={pinsList} type={type} />
+ <AccordionsDetails pinsList={pinsList} />
</Wrapper>,
),
{
@@ -43,21 +42,21 @@ const renderComponent = (
describe('AccordionsDetails - component', () => {
it('should display name of drug', () => {
- renderComponent(DRUGS_PINS_LIST, 'drugs');
+ renderComponent(DRUGS_PINS_LIST);
const drugName = drugsFixture[0].name;
expect(screen.getByText(drugName, { exact: false })).toBeInTheDocument();
});
it('should display description of drug', () => {
- renderComponent(DRUGS_PINS_LIST, 'drugs');
+ renderComponent(DRUGS_PINS_LIST);
const drugDescription = drugsFixture[0].description ? drugsFixture[0].description : '';
expect(screen.getByTestId('details-description').textContent).toContain(drugDescription);
});
it('should display synonyms of drug', () => {
- renderComponent(DRUGS_PINS_LIST, 'drugs');
+ renderComponent(DRUGS_PINS_LIST);
const firstDrugSynonym = drugsFixture[0].synonyms[0];
const secondDrugSynonym = drugsFixture[0].synonyms[1];
@@ -65,15 +64,8 @@ describe('AccordionsDetails - component', () => {
expect(screen.getByText(firstDrugSynonym, { exact: false })).toBeInTheDocument();
expect(screen.getByText(secondDrugSynonym, { exact: false })).toBeInTheDocument();
});
- it('should display blood brain barrier for drug', () => {
- renderComponent(DRUGS_PINS_LIST, 'drugs');
-
- const drugAdditionalInfo = drugsFixture[0].bloodBrainBarrier;
-
- expect(screen.getByText(drugAdditionalInfo, { exact: false })).toBeInTheDocument();
- });
it('should display direct evidence publications for chemicals', () => {
- renderComponent(CHEMICALS_PINS_LIST, 'chemicals');
+ renderComponent(CHEMICALS_PINS_LIST);
const chemicalsAdditionalInfo = chemicalsFixture[0].directEvidence
? chemicalsFixture[0].directEvidence
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.tsx
index 6044b3cd..79678e9e 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/AccordionsDetails/AccordionsDetails.component.tsx
@@ -5,9 +5,8 @@ import {
AccordionItemHeading,
AccordionItemPanel,
} from '@/shared/Accordion';
-import { PinItem, PinTypeWithNone } from '../PinsList/PinsList.types';
+import { PinItem } from '../PinsList/PinsList.types';
import {
- getAdditionalInfo,
getEntityDescriptions,
getEntityNames,
getEntitySynonyms,
@@ -15,46 +14,29 @@ import {
interface AccordionsDetailsProps {
pinsList: PinItem[];
- type: PinTypeWithNone;
}
-export const AccordionsDetails = ({ pinsList, type }: AccordionsDetailsProps): JSX.Element => {
+export const AccordionsDetails = ({ pinsList }: AccordionsDetailsProps): JSX.Element => {
return (
- <div data-testid="accordions-details">
+ <div data-testid="accordions-details" className="mb-4">
+ <div className="px-6 py-4">
+ <span className="font-semibold">Name:</span> {getEntityNames(pinsList)}
+ </div>
<Accordion allowZeroExpanded className="px-6">
<AccordionItem>
<AccordionItemHeading>
- <AccordionItemButton className="capitalize">{type}</AccordionItemButton>
- </AccordionItemHeading>
- <AccordionItemPanel>{getEntityNames(pinsList)}</AccordionItemPanel>
- </AccordionItem>
- <AccordionItem>
- <AccordionItemHeading>
- <AccordionItemButton>Description</AccordionItemButton>
+ <AccordionItemButton>Details</AccordionItemButton>
</AccordionItemHeading>
<AccordionItemPanel>
- <div data-testid="details-description">{getEntityDescriptions(pinsList)}</div>
+ <div data-testid="details-description" className="mb-5">
+ <span className="font-semibold">Description:</span> {getEntityDescriptions(pinsList)}
+ </div>
+ <div>
+ <span className="font-semibold">Synonyms:</span> {getEntitySynonyms(pinsList)}
+ </div>
</AccordionItemPanel>
</AccordionItem>
- <AccordionItem>
- <AccordionItemHeading>
- <AccordionItemButton>Synonyms</AccordionItemButton>
- </AccordionItemHeading>
- <AccordionItemPanel>{getEntitySynonyms(pinsList)}</AccordionItemPanel>
- </AccordionItem>
</Accordion>
- {type === 'drugs' && (
- <div className="flex justify-between px-6 py-4 text-sm font-bold">
- <div>Blood brain barrier</div>
- <div>{getAdditionalInfo(pinsList, type)}</div>
- </div>
- )}
- {type === 'chemicals' && (
- <div className="flex justify-between px-6 py-4 text-sm">
- <div className="font-bold">Direct Evidence Publications</div>
- <div>{getAdditionalInfo(pinsList, type)}</div>
- </div>
- )}
</div>
);
};
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.tsx
index 3a734b7d..9f0b9e94 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.tsx
@@ -21,7 +21,7 @@ export const PinsList = ({ pinsList, type }: PinsListProps): JSX.Element => {
return (
<div className="h-[calc(100%-214px)] max-h-[calc(100%-214px)] overflow-auto">
- <AccordionsDetails pinsList={pinsList} type={type} />
+ <AccordionsDetails pinsList={pinsList} />
<ul className="px-6 py-2" data-testid="pins-list">
{targetElements.map(({ target, element }) => (
<PinsListItem
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.test.tsx
index 4601d1aa..0be1f6dd 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.test.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.test.tsx
@@ -67,7 +67,7 @@ describe('ResultsList - component ', () => {
renderComponent(INITIAL_STATE);
const headingText = screen.getByTestId('drawer-heading-text');
- expect(headingText.textContent).toBe('drugs');
+ expect(headingText.textContent).toBe('Drug targets');
const fristDrugName = drugsFixture[0].targets[0].name;
const secondDrugName = drugsFixture[0].targets[1].name;
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.tsx
index 28f99dd6..85d5004c 100644
--- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.tsx
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.tsx
@@ -4,6 +4,7 @@ import { DrawerHeadingBackwardButton } from '@/shared/DrawerHeadingBackwardButto
import { useAppDispatch } from '@/redux/hooks/useAppDispatch';
import { displayGroupedSearchResults } from '@/redux/drawer/drawer.slice';
import { PinsList } from './PinsList';
+import { mapStepTypeToHeading } from './ResultsList.component.utils';
export const ResultsList = (): JSX.Element => {
const dispatch = useAppDispatch();
@@ -17,9 +18,7 @@ export const ResultsList = (): JSX.Element => {
return (
<div className="h-full">
<DrawerHeadingBackwardButton backwardFunction={navigateToGroupedSearchResults}>
- <span className="capitalize" data-testid="drawer-heading-text">
- {stepType}
- </span>
+ <span data-testid="drawer-heading-text">{mapStepTypeToHeading(stepType)}</span>
</DrawerHeadingBackwardButton>
{data && <PinsList pinsList={data} type={stepType} />}
</div>
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.test.tsx
new file mode 100644
index 00000000..fb28052d
--- /dev/null
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.test.tsx
@@ -0,0 +1,33 @@
+import { mapStepTypeToHeading } from './ResultsList.component.utils';
+
+describe('mapStepTypeToHeading - util', () => {
+ it('should return "Drug targets" for stepType "drugs"', () => {
+ const result = mapStepTypeToHeading('drugs');
+ expect(result).toBe('Drug targets');
+ });
+
+ it('should return "Small molecule targets" for stepType "chemicals"', () => {
+ const result = mapStepTypeToHeading('chemicals');
+ expect(result).toBe('Small molecule targets');
+ });
+
+ it('should return the input stepType for other values', () => {
+ const result = mapStepTypeToHeading('someOtherType');
+ expect(result).toBe('someOtherType');
+ });
+
+ it('should return the same string case-sensitive for stepType "drugs"', () => {
+ const result = mapStepTypeToHeading('Drugs');
+ expect(result).toBe('Drugs');
+ });
+
+ it('should return the same string case-sensitive for stepType "chemicals"', () => {
+ const result = mapStepTypeToHeading('Chemicals');
+ expect(result).toBe('Chemicals');
+ });
+
+ it('should return empty string for empty input', () => {
+ const result = mapStepTypeToHeading('');
+ expect(result).toBe('');
+ });
+});
diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.tsx
new file mode 100644
index 00000000..5eb97686
--- /dev/null
+++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/ResultsList.component.utils.tsx
@@ -0,0 +1,10 @@
+export const mapStepTypeToHeading = (stepType: string): string => {
+ switch (stepType) {
+ case 'drugs':
+ return 'Drug targets';
+ case 'chemicals':
+ return 'Small molecule targets';
+ default:
+ return stepType;
+ }
+};
--
GitLab