Update bio page data structure (#1429)

* Update bio page data structure * lint
datacommonsorg · Jan 31, 2022 · 47b7bbe · 47b7bbe
1 parent 407c97f
commit 47b7bbe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/static/js/protein/page.tsx b/static/js/protein/page.tsx
@@ -21,7 +21,7 @@
 import axios from "axios";
 import React from "react";
 
-import { GraphNode } from "../shared/types";
+import { GraphNodes } from "../shared/types";
 import { drawTissueScoreChart } from "./chart";
 
 interface PagePropType {
@@ -30,7 +30,7 @@ interface PagePropType {
 }
 
 interface PageStateType {
-  data: GraphNode;
+  data: GraphNodes;
 }
 
 export class Page extends React.Component<PagePropType, PageStateType> {
@@ -76,14 +76,14 @@ export class Page extends React.Component<PagePropType, PageStateType> {
       return {};
     }
     const result = {};
-    for (const neighbour of this.state.data.neighbours) {
+    for (const neighbour of this.state.data.nodes[0].neighbors) {
       if (neighbour.property !== "detectedProtein") {
         continue;
       }
       for (const node of neighbour.nodes) {
         let tissue = null;
         let score = null;
-        for (const n of node.neighbours) {
+        for (const n of node.neighbors) {
           if (n.property === "humanTissue") {
             tissue = n.nodes[0].value;
           } else if (n.property === "proteinExpressionScore") {

diff --git a/static/js/shared/types.ts b/static/js/shared/types.ts
@@ -130,10 +130,19 @@ export interface StatVarSummary {
   provenanceSummary?: { [provId: string]: ProvenanceSummary };
 }
 
+// One node in a Graph.
 export interface GraphNode {
+  neighbors: LinkedNodes[];
   value: string;
-  neighbours: {
-    property: string;
-    nodes: GraphNode[];
-  }[];
+}
+
+// Linked nodes for a Graph
+export interface LinkedNodes {
+  property: string;
+  direction: number;
+  nodes: GraphNode[];
+}
+
+export interface GraphNodes {
+  nodes: GraphNode[];
 }