productSchema deleted in favor of reactionProductSchema

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));
 };

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,
             },
           ],
         },

src/models/bioEntitySchema.ts

 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)),

src/models/products.ts

-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()),
-  }),
-]);