Merge pull request #1681 from nextstrain/fix-blank-metadata

download: use the `node.shell.inView` property
nextstrain · Aug 20, 2023 · 337c28e · 337c28e
2 parents 84485a1 + 8304cdf
commit 337c28e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/components/download/downloadButtons.js b/src/components/download/downloadButtons.js
@@ -136,7 +136,7 @@ function Button({name, description, icon, onClick}) {
 
 function getNumUniqueAuthors(nodes, nodeVisibilities) {
   const authors = new Set(nodes
-    .filter((n, i) => nodeVisibilities[i] === NODE_VISIBLE && n.inView)
+    .filter((n, i) => nodeVisibilities[i] === NODE_VISIBLE && n.shell.inView)
     .map((n) => getFullAuthorInfoFromNode(n))
     .filter((a) => a && a.value)
     .map((a) => a.value)

diff --git a/src/components/download/helperFunctions.js b/src/components/download/helperFunctions.js
@@ -22,7 +22,7 @@ const treeToNewick = (tree, temporal, internalNodeNames=false, nodeAnnotation=()
   const getXVal = temporal ? (n) => getTraitFromNode(n, "num_date") : getDivFromNode;
 
   function recurse(node, parentX) {
-    if (!node.inView || tree.visibility[node.arrayIdx]!==NODE_VISIBLE) {
+    if (!node.shell.inView || tree.visibility[node.arrayIdx]!==NODE_VISIBLE) {
       return "";
     }
     if (node.hasChildren) {
@@ -176,7 +176,7 @@ export const authorTSV = (dispatch, filePrefix, tree) => {
   const UNKNOWN = "unknown";
   const info = {};
   tree.nodes
-    .filter((n, i) => tree.visibility[i] === NODE_VISIBLE && n.inView)
+    .filter((n, i) => tree.visibility[i] === NODE_VISIBLE && n.shell.inView)
     .filter((n) => !n.hasChildren).forEach((n) => {
       const author = getFullAuthorInfoFromNode(n);
       if (!author) return;
@@ -221,7 +221,7 @@ export const strainTSV = (dispatch, filePrefix, nodes, nodeVisibilities) => {
   for (const [i, node] of nodes.entries()) {
     if (node.hasChildren) continue; /* we only consider tips */
 
-    if (nodeVisibilities[i] !== NODE_VISIBLE || !node.inView) {
+    if (nodeVisibilities[i] !== NODE_VISIBLE || !node.shell.inView) {
       continue;
     }
 
@@ -313,7 +313,7 @@ export const acknowledgmentsTSV = (dispatch, filePrefix, nodes, nodeVisibilities
   for (const [i, node] of nodes.entries()) {
     if (node.hasChildren) continue; /* we only consider tips */
 
-    if (nodeVisibilities[i] !== NODE_VISIBLE || !node.inView) {
+    if (nodeVisibilities[i] !== NODE_VISIBLE || !node.shell.inView) {
       continue;
     }