diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/getBioEntitiesIdsFromReaction.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/getBioEntitiesIdsFromReaction.ts index d9bbae20c549af61e5b21a8be6ef7d87f779f416..05a446750e483ef9ffd148a5d3192acba219538e 100644 --- a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/getBioEntitiesIdsFromReaction.ts +++ b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/getBioEntitiesIdsFromReaction.ts @@ -2,8 +2,8 @@ import { NewReaction } from '@/types/models'; export const getBioEntitiesIdsFromReaction = (reaction: NewReaction): string[] => { const { products, reactants, modifiers } = reaction; - const productsIds = products.map(p => ('aliasId' in p ? p.aliasId : p.element)); - const reactantsIds = reactants.map(r => ('aliasId' in r ? r.aliasId : r.element)); - const modifiersIds = modifiers.map(m => ('aliasId' in m ? m.aliasId : m.element)); + const productsIds = products.map(p => p.element); + const reactantsIds = reactants.map(r => r.element); + const modifiersIds = modifiers.map(m => m.element); return [...productsIds, ...reactantsIds, ...modifiersIds].map(identifier => String(identifier)); }; diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleReactionResults.test.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleReactionResults.test.ts index de879d60f75db85294989510cba362fd9826c5cd..8ea95af0899a7efa5f413e376349918a0767a3fa 100644 --- a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleReactionResults.test.ts +++ b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleReactionResults.test.ts @@ -186,7 +186,7 @@ describe('handleReactionResults - util', () => { modifiers: [ { ...newReactionFixture.modifiers[0], - aliasId: ELEMENT_SEARCH_RESULT_MOCK_ALIAS.id, + element: ELEMENT_SEARCH_RESULT_MOCK_ALIAS.id, }, ], }, diff --git a/src/models/bioEntitySchema.ts b/src/models/bioEntitySchema.ts index 83f7f0c7eab111cbeea3ee399eeb56d8ff87035e..650832a9d92d649acbd79f1df377a4d2f6ea7c2a 100644 --- a/src/models/bioEntitySchema.ts +++ b/src/models/bioEntitySchema.ts @@ -1,11 +1,11 @@ import { ZERO } from '@/constants/common'; import { z } from 'zod'; +import { reactionProduct } from '@/models/reactionProduct'; import { colorSchema } from './colorSchema'; import { glyphSchema } from './glyphSchema'; import { lineSchema } from './lineSchema'; import { modificationResiduesSchema } from './modificationResiduesSchema'; import { operatorSchema } from './operatorSchema'; -import { productsSchema } from './products'; import { referenceSchema } from './referenceSchema'; import { structuralStateSchema } from './structuralStateSchema'; import { submodelSchema } from './submodelSchema'; @@ -84,9 +84,9 @@ export const bioEntitySchema = z.object({ subsystem: z.optional(z.string()).nullable().optional(), geneProteinReaction: z.optional(z.string()).nullable().optional(), kinetics: z.optional(z.null()), - products: z.optional(z.array(productsSchema)), - reactants: z.optional(z.array(productsSchema)), - modifiers: z.optional(z.array(productsSchema)), + products: z.optional(z.array(reactionProduct)), + reactants: z.optional(z.array(reactionProduct)), + modifiers: z.optional(z.array(reactionProduct)), processCoordinates: z.optional(z.null()), line: z.optional(lineSchema), operators: z.optional(z.array(operatorSchema)), diff --git a/src/models/products.ts b/src/models/products.ts deleted file mode 100644 index 56e205fe4b3cbc9c9746edd22f9cd266ab865f3d..0000000000000000000000000000000000000000 --- a/src/models/products.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { z } from 'zod'; - -export const productsSchema = z.union([ - z.object({ - aliasId: z.number(), - stoichiometry: z.number().nullable(), - type: z.optional(z.string()), - }), - z.object({ - element: z.number(), - stoichiometry: z.number().nullable(), - type: z.optional(z.string()), - }), -]);