only used and generatedBy relations and updated requested information…

… of entities
SFB-ELAINE · Jan 6, 2021 · 1ceb3df · 1ceb3df
1 parent 6284214
commit 1ceb3df
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 69 deletions.
diff --git a/packages/backend/src/data.ts b/packages/backend/src/data.ts
@@ -39,7 +39,7 @@ const qualitativeModel: NodeDefinition = {
   classification: 'entity',
   //labelFormatString: "QM${version}${study ? ' (' + study.source  + ')' : ''}",
   labelFormatString: "QM${version}",
-  informationFields: ["Description", "Reference", "Representation, reaction scheme, equations", "Species", "Compartments"]
+  informationFields: ["Description", "Reference", "Species", "Compartments"]
 }
 
 const simulationModel: NodeDefinition = {
@@ -108,13 +108,6 @@ const analyzingActivity: NodeDefinition = {
 }
 
 export const rules: RelationshipRule[] = [
-  {
-    id: 'simulation-experiment-was-generated-by-building-activity',
-    type: ['Generated by'],
-    cardinality: 'one-to-one',
-    source: simulationExperiment.id,
-    target: buildingActivity.id,
-  },
   {
     id: 'simulation-experiment-was-generated-by-calibrating-activity',
     type: ['Generated by'],
@@ -136,13 +129,6 @@ export const rules: RelationshipRule[] = [
     source: simulationExperiment.id,
     target: analyzingActivity.id,
   },
-  {
-    id: 'simulation-data-was-generated-by-building-activity',
-    type: ['Generated by'],
-    cardinality: 'one-to-one',
-    source: simulationData.id,
-    target: buildingActivity.id,
-  },
   {
     id: 'simulation-data-was-generated-by-calibrating-activity',
     type: ['Generated by'],
@@ -164,27 +150,6 @@ export const rules: RelationshipRule[] = [
     source: simulationData.id,
     target: analyzingActivity.id,
   },
-  {
-    id: 'qualitative-model-was-generated-by-building-activity',
-    type: ['Generated by'],
-    cardinality: 'one-to-one',
-    source: qualitativeModel.id,
-    target: buildingActivity.id,
-  },
-  {
-    id: 'qualitative-model-was-generated-by-calibrating-activity',
-    type: ['Generated by'],
-    cardinality: 'one-to-one',
-    source: qualitativeModel.id,
-    target: calibratingActivity.id,
-  },
-  {
-    id: 'qualitative-model-was-generated-by-validating-activity',
-    type: ['Generated by'],
-    cardinality: 'one-to-one',
-    source: qualitativeModel.id,
-    target: validatingActivity.id,
-  },
   {
     id: 'simulation-model-generated-by-building-activity',
     type: ['Generated by'],
@@ -199,13 +164,6 @@ export const rules: RelationshipRule[] = [
     source: simulationModel.id,
     target: calibratingActivity.id,
   },
-  {
-    id: 'simulation-model-generated-by-validating-activity',
-    type: ['Generated by'],
-    cardinality: 'one-to-one',
-    source: simulationModel.id,
-    target: validatingActivity.id,
-  },
   {
     id: 'building-activity-used-research-question',
     type: ['Used'],
@@ -269,6 +227,27 @@ export const rules: RelationshipRule[] = [
     source: calibratingActivity.id,
     target: simulationModel.id,
   },
+  {
+    id: 'calibrating-activity-used-requirement',
+    type: ['Used'],
+    cardinality: 'one-to-many',
+    source: calibratingActivity.id,
+    target: requirement.id,
+  },
+  {
+    id: 'calibrating-activity-used-simulation-data',
+    type: ['Used'],
+    cardinality: 'one-to-many',
+    source: calibratingActivity.id,
+    target: simulationData.id,
+  },
+  {
+    id: 'calibrating-activity-used-wet-lab-data',
+    type: ['Used'],
+    cardinality: 'one-to-many',
+    source: calibratingActivity.id,
+    target: wetlabData.id,
+  },
   {
     id: 'validating-activity-used-simulation-model',
     type: ['Used'],
@@ -277,38 +256,45 @@ export const rules: RelationshipRule[] = [
     target: simulationModel.id,
   },
   {
-    id: 'analyzing-activity-used-simulation-model',
+    id: 'validating-activity-used-requirement',
     type: ['Used'],
     cardinality: 'one-to-many',
-    source: analyzingActivity.id,
-    target: simulationModel.id,
+    source: validatingActivity.id,
+    target: requirement.id,
   },
   {
-    id: 'calibrating-activity-used-simulation-data-for-calibration',
-    type: ['Used for calibration'],
+    id: 'validating-activity-used-simulation-data',
+    type: ['Used'],
     cardinality: 'one-to-many',
-    source: calibratingActivity.id,
+    source: validatingActivity.id,
     target: simulationData.id,
   },
   {
-    id: 'calibrating-activity-used-wet-lab-data-for-calibration',
-    type: ['Used for calibration'],
+    id: 'validating-activity-used-wet-lab-data',
+    type: ['Used'],
     cardinality: 'one-to-many',
-    source: calibratingActivity.id,
+    source: validatingActivity.id,
     target: wetlabData.id,
   },
   {
-    id: 'validating-activity-used-simulation-data-for-validation',
-    type: ['Used for validation'],
+    id: 'analyzing-activity-used-simulation-model',
+    type: ['Used'],
     cardinality: 'one-to-many',
-    source: validatingActivity.id,
+    source: analyzingActivity.id,
+    target: simulationModel.id,
+  },
+  {
+    id: 'analyzing-activity-used-simulation-data',
+    type: ['Used'],
+    cardinality: 'one-to-many',
+    source: analyzingActivity.id,
     target: simulationData.id,
   },
   {
-    id: 'validating-activity-used-wet-lab-data-for-validation',
-    type: ['Used for validation'],
+    id: 'analyzing-activity-used-wet-lab-data',
+    type: ['Used'],
     cardinality: 'one-to-many',
-    source: validatingActivity.id,
+    source: analyzingActivity.id,
     target: wetlabData.id,
   }
 ]

diff --git a/packages/frontend/src/constants.ts b/packages/frontend/src/constants.ts
@@ -18,17 +18,7 @@ export const relationshipColors: RelationshipColors = {
     color: 'black',
     source: 'activity',
     target: 'entity',
-  },
-  'Used for calibration': {
-    color: 'red',
-    source: 'activity',
-    target: 'entity',
-  },
-  'Used for validation': {
-    color: 'green',
-    source: 'activity',
-    target: 'entity',
-  },
+  }
 //    'Related to': {
 //    // We may want to remove this if this relationship isn't used
 //    // Also we may want to customize these values