reaction taxonomy

KarrLab · Mar 16, 2020 · bfc9a18 · bfc9a18
1 parent e070081
commit bfc9a18
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/src/scenes/BiochemicalEntityDetails/DataTable/DataTable.js b/src/scenes/BiochemicalEntityDetails/DataTable/DataTable.js
@@ -176,6 +176,7 @@ class DataTable extends Component {
       rankings.push(rank);
     }
     rankings.push("cellular life");
+    console.log(rankings);
     return rankings;
   }
 
@@ -187,7 +188,11 @@ class DataTable extends Component {
     const route = parseHistoryLocationPathname(this.props.history);
     const organism = route.organism;
 
-    const formattedData = this.props["format-data"](rawData, rankings);
+    const formattedData = this.props["format-data"](
+      rawData,
+      rankings,
+      organism
+    );
     this.sideBarDef = this.props["get-side-bar-def"](formattedData);
     this.colDefs = this.props["get-col-defs"](organism, formattedData);
 

diff --git a/src/scenes/BiochemicalEntityDetails/Reaction/RateConstantsDataTable.js b/src/scenes/BiochemicalEntityDetails/Reaction/RateConstantsDataTable.js
@@ -22,7 +22,7 @@ class RateConstantsDataTable extends Component {
     );
   }
 
-  static formatData(rawData) {
+  static formatData(rawData, rankings, organism) {
     const formattedData = [];
 
     for (const datum of rawData) {
@@ -34,15 +34,14 @@ class RateConstantsDataTable extends Component {
       }
 
       let rank = "";
-      for (var key in datum.taxon_distance) {
-        if (!Array.isArray(datum.taxon_distance[key])) {
-          rank = "";
-        }
+      console.log(Object.keys(datum.taxon_distance));
+      const keys = Object.keys(datum.taxon_distance);
+      if (keys.length === 4) {
+        const distance = datum.taxon_distance[organism];
+        rank = rankings[distance];
+      } else {
+        rank = "cellular life";
       }
-      //if (datum.taxon_distance !== null){
-      //  rank = datum.taxon_distance[1][0]
-      //}
-      //rank = datum.taxon_distance[1][0]
 
       const formattedDatum = {
         kcat: RateConstantsDataTable.getKcatValues(datum.parameter),

diff --git a/src/scenes/BiochemicalEntityDetails/TaxonomyFilter.js b/src/scenes/BiochemicalEntityDetails/TaxonomyFilter.js
@@ -146,15 +146,6 @@ class TaxonomyFilter extends Component {
     return distance <= maxDistance;
   }
 
-  doesFilterPass2(params) {
-    const maxDistance = this.maxDistance;
-    const distance = this.props.valueGetter(params.node);
-    const list_ranks = [];
-    for (const entry in this.taxonLineage.slice(0, maxDistance + 1)) {
-      list_ranks.push(Object.keys(this.taxonLineage[entry])[0]);
-    }
-    return list_ranks.includes(distance); // <= maxDistance;
-  }
 
   getModel() {
     return {