diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.test.tsx index 485dd029cc1d98752dd57fad61745ee796dbc66d..3b381a37639ae2672f47e60c15911704cf875ffd 100644 --- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.test.tsx +++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsList.component.test.tsx @@ -1,14 +1,14 @@ -import { render, screen } from '@testing-library/react'; +import { chemicalsFixture } from '@/models/fixtures/chemicalsFixture'; +import { drugsFixture } from '@/models/fixtures/drugFixtures'; +import { mirnasFixture } from '@/models/fixtures/mirnasFixture'; +import { StoreType } from '@/redux/store'; import { InitialStoreState, getReduxWrapperWithStore, } from '@/utils/testing/getReduxWrapperWithStore'; -import { drugsFixture } from '@/models/fixtures/drugFixtures'; -import { chemicalsFixture } from '@/models/fixtures/chemicalsFixture'; -import { mirnasFixture } from '@/models/fixtures/mirnasFixture'; -import { StoreType } from '@/redux/store'; -import { PinItem, PinType } from './PinsList.types'; +import { render, screen } from '@testing-library/react'; import { PinsList } from './PinsList.component'; +import { PinItem, PinTypeWithNone } from './PinsList.types'; const DRUGS_PINS_LIST = drugsFixture.map(drug => ({ id: drug.id, @@ -30,7 +30,7 @@ const MIRNA_PINS_LIST = mirnasFixture.map(mirna => ({ const renderComponent = ( pinsList: PinItem[], - type: PinType, + type: PinTypeWithNone, initialStoreState: InitialStoreState = {}, ): { store: StoreType } => { const { Wrapper, store } = getReduxWrapperWithStore(initialStoreState); diff --git a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsListItem/PinsListItem.component.test.tsx b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsListItem/PinsListItem.component.test.tsx index 2f6a4e50e53888a449898beb0ac8b3edec12a1e8..17a3656c292a09d0a0d11a8a264c88348528abb3 100644 --- a/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsListItem/PinsListItem.component.test.tsx +++ b/src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsListItem/PinsListItem.component.test.tsx @@ -1,15 +1,15 @@ /* eslint-disable no-magic-numbers */ -import { render, screen } from '@testing-library/react'; +import { bioEntitiesContentFixture } from '@/models/fixtures/bioEntityContentsFixture'; +import { chemicalsFixture } from '@/models/fixtures/chemicalsFixture'; +import { drugsFixture } from '@/models/fixtures/drugFixtures'; +import { StoreType } from '@/redux/store'; +import { PinDetailsItem } from '@/types/models'; import { InitialStoreState, getReduxWrapperWithStore, } from '@/utils/testing/getReduxWrapperWithStore'; -import { drugsFixture } from '@/models/fixtures/drugFixtures'; -import { chemicalsFixture } from '@/models/fixtures/chemicalsFixture'; -import { bioEntitiesContentFixture } from '@/models/fixtures/bioEntityContentsFixture'; -import { StoreType } from '@/redux/store'; -import { PinDetailsItem } from '@/types/models'; -import { PinType } from '../PinsList.types'; +import { render, screen } from '@testing-library/react'; +import { PinTypeWithNone } from '../PinsList.types'; import { PinsListItem } from './PinsListItem.component'; const DRUGS_PIN = { @@ -25,7 +25,7 @@ const CHEMICALS_PIN = { const renderComponent = ( name: string, pin: PinDetailsItem, - type: PinType, + type: PinTypeWithNone, initialStoreState: InitialStoreState = {}, ): { store: StoreType } => { const { Wrapper, store } = getReduxWrapperWithStore(initialStoreState); diff --git a/src/models/authorSchema.ts b/src/models/authorSchema.ts index 2dfa82ec918b797f2a3b1cd8816e197274cd2f1c..26e455533d6f570ce62b13678879503566159432 100644 --- a/src/models/authorSchema.ts +++ b/src/models/authorSchema.ts @@ -1,3 +1,11 @@ import { z } from 'zod'; -export const authorSchema = z.string(); +export const authorSchema = z.union([ + z.string(), + z.object({ + firstName: z.string(), + lastName: z.string(), + email: z.string(), + organisation: z.string(), + }), +]);