Skip to content
Snippets Groups Projects

feat(pin): added Mirna pins and details

Merged Mateusz Bolewski requested to merge feature/search-results-details into development
8 unresolved threads

Added Mirna pins and details on Search.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
11 11 import { organism } from '@/models/organism';
12 12 import { overviewImageView } from '@/models/overviewImageView';
13 13 import { projectSchema } from '@/models/project';
14 import { targetSchema } from '@/models/targetSchema';
  • 17 };
    18
    19 return (
    20 <ul className="px-6 py-2">
    21 {pinsList.map(pin => (
    22 <PinsListItem
    23 key={pin.id}
    24 name={pin.name}
    25 type={type}
    26 onClick={(): void => onPinClick(pin.data)}
    27 />
    28 ))}
    29 </ul>
    30 );
    10 // eslint-disable-next-line no-console
    11 console.log(pinsList);
  • 12 const PINS_LIST = drugsFixture.map(drug => ({
    13 id: drug.id,
    14 name: drug.name,
    15 data: drug,
    11 const PINS_LIST = mirnasFixture.map(mirna => ({
    12 id: mirna.id,
    13 name: mirna.name,
    14 data: mirna,
    16 15 }));
    17 16
    18 17 const renderComponent = (initialStoreState: InitialStoreState = {}): { store: StoreType } => {
    19 18 const { Wrapper, store } = getReduxWrapperWithStore(initialStoreState);
    20 19
    20 // eslint-disable-next-line no-console
    21 console.log(PINS_LIST, 'Mirna List');
    22
  • 34 36 it('should render list of pins', () => {
    35 37 renderComponent();
    36 38
    37 const fristDrugName = drugsFixture[0].name;
    38 const secondDrugName = drugsFixture[1].name;
    39 const firstDrugName = mirnasFixture[0].targets[0].name;
    40 const secondDrugName = mirnasFixture[0].targets[1].name;
    41
    42 // eslint-disable-next-line no-console
    43 console.log(mirnasFixture[0].targets, 'fixture');
  • 34 36 it('should render list of pins', () => {
    35 37 renderComponent();
    36 38
    37 const fristDrugName = drugsFixture[0].name;
    38 const secondDrugName = drugsFixture[1].name;
    39 const firstDrugName = mirnasFixture[0].targets[0].name;
    40 const secondDrugName = mirnasFixture[0].targets[1].name;
    41
    42 // eslint-disable-next-line no-console
  • 34 36 it('should render list of pins', () => {
  • Overall LGTM but removing console.log is an Request For Change from my side

  • Adrian Orłów approved this merge request

    approved this merge request

  • added 1 commit

    Compare with previous version

  • Mateusz Bolewski added 2 commits

    added 2 commits

    • b28bf327 - feat(pin): Remove one test file
    • 5865f20f - feat(pin): remove console.log

    Compare with previous version

  • 28 ))}
    29 </ul>
    30 );
    10 switch (type) {
    11 case 'mirna':
    12 return (
    13 <ul className="h-[calc(100vh-198px)] overflow-auto px-6 py-2">
    14 {pinsList.map(result => {
    15 return result.data.targets.map(pin => (
    16 <MirnaPinsListItem key={pin.name} name={pin.name} pin={pin} />
    17 ));
    18 })}
    19 </ul>
    20 );
    21 default:
    22 return <div />;
  • 1 import { twMerge } from 'tailwind-merge';
    2 import { Icon } from '@/shared/Icon';
    3 import { MirnaItems } from '@/types/models';
    4 import { getPinColor } from './PinsListItem.component.utils';
    5
    6 interface MirnaPinsListItemProps {
    7 name: string;
    8 pin: MirnaItems;
    9 }
    10
    11 export const MirnaPinsListItem = ({ name, pin }: MirnaPinsListItemProps): JSX.Element => {
  • lGTM, no RFC from my side. Some improvements

  • Tadeusz Miesiąc approved this merge request

    approved this merge request

  • added 1 commit

    • c5e354ba - feat(search): fixed selector for number of mirnas pins

    Compare with previous version

  • Mateusz Bolewski mentioned in commit 130c09ca

    mentioned in commit 130c09ca

  • Please register or sign in to reply
    Loading