Skip to content
Snippets Groups Projects
Commit c9b637a2 authored by Adrian Orłów's avatar Adrian Orłów :fire:
Browse files

Merge branch 'MIN-208-compartment-is-a-number-should-be-a-name' into 'development'

fix: Compartment is a number, should be a name

Closes MIN-208

See merge request !90
parents 82c7d1d1 55476107
No related branches found
No related tags found
2 merge requests!223reset the pin numbers before search results are fetch (so the results will be...,!90fix: Compartment is a number, should be a name
Pipeline #83985 passed
import { DrawerHeading } from '@/shared/DrawerHeading';
import { useAppSelector } from '@/redux/hooks/useAppSelector';
import { searchedFromMapBioEntityElement } from '@/redux/bioEntity/bioEntity.selectors';
import { ZERO } from '@/constants/common'; import { ZERO } from '@/constants/common';
import { searchedFromMapBioEntityElement } from '@/redux/bioEntity/bioEntity.selectors';
import { useAppSelector } from '@/redux/hooks/useAppSelector';
import { DrawerHeading } from '@/shared/DrawerHeading';
import { AnnotationItem } from './AnnotationItem'; import { AnnotationItem } from './AnnotationItem';
import { AssociatedSubmap } from './AssociatedSubmap'; import { AssociatedSubmap } from './AssociatedSubmap';
...@@ -26,7 +26,7 @@ export const BioEntityDrawer = (): React.ReactNode => { ...@@ -26,7 +26,7 @@ export const BioEntityDrawer = (): React.ReactNode => {
/> />
<div className="flex flex-col gap-6 p-6"> <div className="flex flex-col gap-6 p-6">
<div className="text-sm font-normal"> <div className="text-sm font-normal">
Compartment: <b className="font-semibold">{bioEntityData.compartment}</b> Compartment: <b className="font-semibold">{bioEntityData.compartmentName}</b>
</div> </div>
{bioEntityData.fullName && ( {bioEntityData.fullName && (
<div className="text-sm font-normal"> <div className="text-sm font-normal">
......
import { bioEntitiesContentFixture } from '@/models/fixtures/bioEntityContentsFixture';
import { MODELS_MOCK } from '@/models/mocks/modelsMock'; import { MODELS_MOCK } from '@/models/mocks/modelsMock';
import { StoreType } from '@/redux/store'; import { StoreType } from '@/redux/store';
import { bioEntitiesContentFixture } from '@/models/fixtures/bioEntityContentsFixture';
import { Accordion } from '@/shared/Accordion'; import { Accordion } from '@/shared/Accordion';
import { import {
InitialStoreState, InitialStoreState,
...@@ -73,7 +73,7 @@ describe('BioEntitiesAccordion - component', () => { ...@@ -73,7 +73,7 @@ describe('BioEntitiesAccordion - component', () => {
}); });
expect(screen.getByText('Content (10)')).toBeInTheDocument(); expect(screen.getByText('Content (10)')).toBeInTheDocument();
expect(screen.getByText('Core PD map (4)')).toBeInTheDocument(); expect(screen.getByText('Core PD map (3)')).toBeInTheDocument();
expect(screen.getByText('Histamine signaling (1)')).toBeInTheDocument(); expect(screen.getByText('Histamine signaling (5)')).toBeInTheDocument();
}); });
}); });
import { z } from 'zod'; import { z } from 'zod';
import { referenceSchema } from './referenceSchema';
import { glyphSchema } from './glyphSchema';
import { modificationResiduesSchema } from './modificationResiduesSchema';
import { submodelSchema } from './submodelSchema';
import { colorSchema } from './colorSchema'; import { colorSchema } from './colorSchema';
import { productsSchema } from './products'; import { glyphSchema } from './glyphSchema';
import { lineSchema } from './lineSchema'; import { lineSchema } from './lineSchema';
import { modificationResiduesSchema } from './modificationResiduesSchema';
import { operatorSchema } from './operatorSchema'; import { operatorSchema } from './operatorSchema';
import { productsSchema } from './products';
import { referenceSchema } from './referenceSchema';
import { structuralStateSchema } from './structuralStateSchema'; import { structuralStateSchema } from './structuralStateSchema';
import { submodelSchema } from './submodelSchema';
export const bioEntitySchema = z.object({ export const bioEntitySchema = z.object({
id: z.number(), id: z.number(),
...@@ -33,6 +33,7 @@ export const bioEntitySchema = z.object({ ...@@ -33,6 +33,7 @@ export const bioEntitySchema = z.object({
synonyms: z.array(z.string()), synonyms: z.array(z.string()),
formerSymbols: z.array(z.string()), formerSymbols: z.array(z.string()),
fullName: z.string().nullable(), fullName: z.string().nullable(),
compartmentName: z.string().nullable(),
abbreviation: z.string().nullable(), abbreviation: z.string().nullable(),
formula: z.string().nullable(), formula: z.string().nullable(),
glyph: glyphSchema.nullable(), glyph: glyphSchema.nullable(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment