Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 999 #1011

Merged
merged 2 commits into from
Apr 2, 2020
Merged

Issue 999 #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c565b5a
Don't show sampling date ranges if nothing was sampled
wsuchy Mar 27, 2020
73a7df8
fixed reduce function to support 1 element list
wsuchy Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/info/info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const createSummary = (mainTreeNumTips, nodes, filters, visibility, visib
let summary = ""; /* text returned from this function */

/* Number of genomes & their date range */
if (branchLengthsToDisplay !== "divOnly") {
if (branchLengthsToDisplay !== "divOnly" && nSelectedSamples > 0) {
summary += t(
"Showing {{x}} of {{y}} genomes sampled between {{from}} and {{to}}.",
{
Expand Down
4 changes: 1 addition & 3 deletions src/util/treeVisibilityHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ export const getVisibleDateRange = (nodes, visibility) => nodes
.filter((node, idx) => (visibility[idx] === NODE_VISIBLE && !node.hasChildren))
.reduce((acc, node) => {
const nodeDate = getTraitFromNode(node, "num_date");
if (nodeDate && nodeDate < acc[0]) return [nodeDate, acc[1]];
if (nodeDate && nodeDate > acc[1]) return [acc[0], nodeDate];
return acc;
return nodeDate ? [Math.min(nodeDate, acc[0]), Math.max(nodeDate, acc[1])] : acc;
}, [100000, -100000]);

export const strainNameToIdx = (nodes, name) => {
Expand Down