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.

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

update from upstream nextstrain/auspice #8

Merged
merged 41 commits into from
Jul 6, 2021

Commits on Mar 30, 2021

  1. Configuration menu
    Copy the full SHA
    7b9495b View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2021

  1. Configuration menu
    Copy the full SHA
    15c76af View commit details
    Browse the repository at this point in the history
  2. lint appeasment

    rneher committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    edeb19a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Configuration menu
    Copy the full SHA
    a98451e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    17a4aba View commit details
    Browse the repository at this point in the history
  3. remove unassigned variable

    rneher committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    eb7f7b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2021

  1. Merge pull request #1325 from nextstrain/explore-normalization-fix

    Make frequencies tend to 0 in absence of data
    rneher authored Apr 10, 2021
    Configuration menu
    Copy the full SHA
    a0e9080 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. Allow continuous colorings to define anchor points

    The schema currently allows datasets to provide a scale for non-
    continuous scales where specific trait values are given colour hexes
    (missing values are given greys by auspice).
    
    Here we extend this to continuous scales by interpreting the same
    data structure as anchor points which we interpolate between using
    the same method as we currently use for generating default continuous
    color scales (d3's `interpolateRgb`)
    jameshadfield committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    c3bdee1 View commit details
    Browse the repository at this point in the history
  2. Allow legend entries to be user-defined

    This allows continuous colour scales to define custom legend
    entries, via a `legend` key in the JSON. This allows control
    over the values in the scale which we use as legend elements,
    the displayed text, and the range of values which each entry covers.
    
    Bounds are enforced to be non-overlapping. If overlapping bounds
    are detected, we revert to Auspice dynamically generating these.
    (This is a requirement for future work which will map continuous
    tip values to a legend entry, which will allow pie-chart display
    using the legend swatches.)
    jameshadfield committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    07507b1 View commit details
    Browse the repository at this point in the history
  3. Legend bound matching is (a, b] for continuous scales

    This restores the algorithm used to associate a hovered legend
    item to tips for continuous variables. Commit
    0f37b1a (Mar 2018) incorrectly changed
    this to `tip \in [a, b]` rather than the intended (and documented)
    `tip \in (a, b]`.
    
    This takes on more importance given that the previous commit allows
    user-defined bounds.
    
    Note that the frequencies panel already used `(a, b]` matching, so now
    the legend matching mirrors this.
    jameshadfield committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    09d3a99 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa94ea2 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. Merge pull request #1340 from nextstrain/continous-color-scale-improv…

    …ements
    
    Continous color scale improvements
    jameshadfield authored Apr 30, 2021
    Configuration menu
    Copy the full SHA
    a9c0c3f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. Configuration menu
    Copy the full SHA
    78ca4cb View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. GitHub Action to create nextstrain.org PR

    This action will run on each auspice PR and create a corresponding
    PR on nextstrain.org which includes a commit using the version
    of auspice from this (auspice) PR. This functionality is extremely
    useful for auspice development as it will allow us to use a Heroku
    review app to test auspice in the context of nextstrain.org
    
    There are a number of future improvements to implement:
    
    * New auspice releases (tagged commits on `release` branch)
    would ideally create a PR on nextstrain.org which could be merged
    to update the version of auspice there.
    
    * Other consumers of auspice (e.g. auspice.us) could be added to this
    GitHub Action.
    jameshadfield committed May 20, 2021
    Configuration menu
    Copy the full SHA
    142754c View commit details
    Browse the repository at this point in the history

Commits on May 21, 2021

  1. Merge pull request #1347 from nextstrain/automate-prs

    GitHub Action to create nextstrain.org PR
    jameshadfield authored May 21, 2021
    Configuration menu
    Copy the full SHA
    e47d9e2 View commit details
    Browse the repository at this point in the history
  2. Allow non-continuous scatterplot variables

    This implements a requested improvement to the original
    scatterplot implementation. The implementation hinges on two changes:
    (1) The collection of values for a given variable (e.g. x-var) need
    to be computed and passed to PhyloTree to act as the scale's domain.
    We reuse the colorScale machinery here, which could be optimised
    (see todo messages in code), but this has the advantage that the
    domain ordering matches the legend (unless user supplied).
    (2) PhyloTree needed to be modified to use non-linear scales, in this
    case `pointScale`.
    
    This commit should be fully functional, however there are some
    future improvements to be made:
    
    (i) Grid text is obscured and unreadable when there are many entries
    in the domain.
    (ii) Genotypes and Boolean scales are not yet available.
    (iii) Jitter should be added to nodes to avoid obfuscation.
    jameshadfield committed May 21, 2021
    Configuration menu
    Copy the full SHA
    09407cf View commit details
    Browse the repository at this point in the history
  3. Layout changes occur via redux thunk

    This commit is in preparation for allowing genotype to be a scatterplot
    variable. This will complicate the allowable scatterplot variables
    and force these to update upon colorBy changes. This is much cleaner
    if layout is changed in a thunk.
    jameshadfield committed May 21, 2021
    Configuration menu
    Copy the full SHA
    e40b03f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. Allow genotype to be scatterplot variable

    Genotype is treated differently to other colorings in two important
    ways: (1) it can change value, for instance when changing the
    colorby to another genotype position and (2) it is stored in a
    different place to other colorings. These require scatterplot logic
    to be more complex as actions are no longer separate - we now require
    a NEW_COLOURS action to potentially update the layout which was
    formerly within the remit of the CHANGE_LAYOUT actions. This is
    achieved through a middleware layer.
    
    This implementation makes it clear that jitter and better domain
    spacing are crucial for scatterplots.
    jameshadfield committed May 24, 2021
    Configuration menu
    Copy the full SHA
    d55a888 View commit details
    Browse the repository at this point in the history
  2. Improve padding for categorical scatterplot variables

    This prevents nodes falling on the axis itself or at the very end of
    the grid, which was especially noticeable for traits with small domains.
    jameshadfield committed May 24, 2021
    Configuration menu
    Copy the full SHA
    442dd0b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    898a387 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1346 from nextstrain/ordinal-scatterplots

    Allow non-continuous scatterplot variables
    jameshadfield authored May 24, 2021
    Configuration menu
    Copy the full SHA
    b58f148 View commit details
    Browse the repository at this point in the history
  5. Apply clipping to first column of legend

    We have had issues in the past with legend values from column 1 overflowing into column 2. For instance, issue #899 was fixed by PR #914 which implemented a maximum character limit for legend names. This solution can produce misleading views, such as those described in #1306.
    
    This solution implements a clipping mask for column 1, avoiding the complication of limiting the string size. Column 2 already has similar behaviour because the SVG element of the legend itself performs the clipping.
    jameshadfield committed May 24, 2021
    Configuration menu
    Copy the full SHA
    e370dd6 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1328 from nextstrain/legend-overflow-text

    Apply clipping to first column of legend
    jameshadfield authored May 24, 2021
    Configuration menu
    Copy the full SHA
    797090f View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1344 from didithilmy/filter-search-alg

    Use filterOptions to modify filter search algorithm
    jameshadfield authored May 24, 2021
    Configuration menu
    Copy the full SHA
    d4dd955 View commit details
    Browse the repository at this point in the history
  8. changelog

    jameshadfield committed May 24, 2021
    Configuration menu
    Copy the full SHA
    5d1232e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    db9d174 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2021

  1. Always show regression toggle for clock layout

    Fixes a bug where the ability to toggle regression lines was hidden for clock views. (The ability to hide this toggle is only intended for scatter layouts, where we should not expose the toggle unless both axes are showing continuous variables.)
    jameshadfield committed May 29, 2021
    Configuration menu
    Copy the full SHA
    e56079f View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Merge pull request #1352 from nextstrain/regression-clock-fix

    Always show regression toggle for clock layout
    jameshadfield authored Jun 1, 2021
    Configuration menu
    Copy the full SHA
    7e40fdf View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Adjust grayscale color ramp

    The existing grayscale color ramp (used for values absent in an explicitly specified color scale) had values that were too dark and threw off the overall color balance. This commit narrows the grayscale color ramp to be more in line with pastel color ramp.
    trvrb committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    f506932 View commit details
    Browse the repository at this point in the history
  2. Inject a bit of color into the "grayscale" color ramp

    This adds a bit of blue into the grayscale color ramp. Still reads as mostly gray, but no colors seem to exist more in the same universe as canonical auspice color ramp.
    trvrb committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    bdceae6 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2021

  1. Merge pull request #1353 from nextstrain/grayscale-ramp

    Adjust grayscale color ramp
    jameshadfield authored Jun 5, 2021
    Configuration menu
    Copy the full SHA
    d1801b1 View commit details
    Browse the repository at this point in the history
  2. changelog

    jameshadfield committed Jun 5, 2021
    Configuration menu
    Copy the full SHA
    c2e89c7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5132a1c View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Configuration menu
    Copy the full SHA
    7af7fd7 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2021

  1. Merge pull request #1364 from nextstrain/footer-styling

    Styling adjustments to footer text
    trvrb authored Jul 3, 2021
    Configuration menu
    Copy the full SHA
    00a8e81 View commit details
    Browse the repository at this point in the history
  2. Remove metadata download from GISAID datasets

    This commit uses dataProvenance in metadata to identify datasets using "GISAID" data. For these datasets, the full metadata download is swapped to an "acknowledgments" download that only includes the following fields:
     - strain
     - gisaid_epi_isl
     - genbank_accession
     - originating_lab
     - submitting_lab
     - author
    trvrb committed Jul 3, 2021
    Configuration menu
    Copy the full SHA
    19d7784 View commit details
    Browse the repository at this point in the history
  3. Cleanup metadata headers

    This commit cleans up naming of metadata headers in downloaded metadata TSV. It does the following:
    1. Keeps headers as input into "augur export" rather than renaming by title. Thus it has "originating_lab" rather than "Originating lab", "pango_lineage" rather than "PANGO lineage", etc... This should make it easier for people to process downloaded metadata from Auspice alongside metadata provisioned by Nextstrain (via GISAID or via S3).
    2. Makes "date" the second column as this is often what's most important. I couldn't figure out a way to intelligently order remaining fields. My first thought was to use metadata.colorings, but this isn't sorted.
    3. Fixes "accession". It had been exporting as "[object Object]".
    trvrb committed Jul 3, 2021
    Configuration menu
    Copy the full SHA
    9fc5051 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Merge pull request #1366 from nextstrain/gisaid-metadata-download

    Remove metadata download from GISAID datasets
    trvrb authored Jul 6, 2021
    Configuration menu
    Copy the full SHA
    f1f9824 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1367 from nextstrain/metadata-header

    Cleanup metadata headers
    trvrb authored Jul 6, 2021
    Configuration menu
    Copy the full SHA
    7db03a6 View commit details
    Browse the repository at this point in the history
  3. Update changelog

    trvrb committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    ed01d98 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6fbd8eb View commit details
    Browse the repository at this point in the history