Merge pull request #203 from stephenshank/busted-phyloalignment-hotfix

Busted phyloalignment hotfix
veg · Oct 17, 2019 · 0996263 · 0996263
2 parents c4bf714 + aec2b32
commit 0996263
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "url": "git://github.com/veg/hyphy-vision.git"
   },
   "main": "dist/hyphyvision.js",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.3.1",
     "alignment.js": "0.0.1",

diff --git a/src/jsx/busted.jsx b/src/jsx/busted.jsx
@@ -927,7 +927,11 @@ class BUSTEDAlignmentTreeERWidget extends React.Component {
     }
   }
   render() {
-    if (!this.state.tree) return <div />;
+    const has_tree = Boolean(this.state.tree),
+      has_evidence_ratios = !_.isEmpty(this.props.evidence_ratios),
+      has_fasta = Boolean(this.props.fasta),
+      has_data = has_tree && has_evidence_ratios & has_fasta;
+    if (!has_data) return <div />;
     const { site_size } = this.props,
       phylotree_props = {
         width: 200,