From 16f01b2ccb739bda846d5def5e236f28b43da563 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Fri, 15 Nov 2024 09:19:56 +0100
Subject: [PATCH] productSchema deleted in favor of reactionProductSchema
---
.../getBioEntitiesIdsFromReaction.ts | 6 +++---
.../mapSingleClick/handleReactionResults.test.ts | 2 +-
src/models/bioEntitySchema.ts | 8 ++++----
src/models/products.ts | 14 --------------
4 files changed, 8 insertions(+), 22 deletions(-)
delete mode 100644 src/models/products.ts
diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/getBioEntitiesIdsFromReaction.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/getBioEntitiesIdsFromReaction.ts
index d9bbae20..05a44675 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 de879d60..8ea95af0 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 83f7f0c7..650832a9 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 56e205fe..00000000
--- 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()),
- }),
-]);
--
GitLab