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

Add data layers #129

Merged
merged 68 commits into from
Apr 7, 2020
Merged

Add data layers #129

merged 68 commits into from
Apr 7, 2020

Commits on Oct 11, 2019

  1. Add custom ranking to layout algorithm

    @richardwestenra
    richardwestenra committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    64a770d View commit details
    Browse the repository at this point in the history

  2. Add demo 'layers' dataset

    @richardwestenra
    richardwestenra committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    f93cca9 View commit details
    Browse the repository at this point in the history

  3. Add ranker toggle

    @richardwestenra
    richardwestenra committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    3565b23 View commit details
    Browse the repository at this point in the history

  4. Install WIP dagre PR branch

    @richardwestenra
    richardwestenra committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    4b2f042 View commit details
    Browse the repository at this point in the history

  5. 🌈

    @richardwestenra
    richardwestenra committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    f32e31b View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2019

  1. Add ranking bands

    @richardwestenra
    richardwestenra committed Oct 14, 2019
    Configuration menu
    Copy the full SHA
    c48fc7b View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. Merge branch 'develop' into prototype/custom-ranking

    @richardwestenra
    richardwestenra committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    e139461 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2020

  1. Fix dagre git URL in package.json + lockfile

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    fda2a2b View commit details
    Browse the repository at this point in the history

  2. Fix layers mock data path

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    ea1986c View commit details
    Browse the repository at this point in the history

  3. Fix App proptype error

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    5102938 View commit details
    Browse the repository at this point in the history

  4. Fix ranker toggler

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    c746b51 View commit details
    Browse the repository at this point in the history

  5. Change bands to only show on hover

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    0e483a3 View commit details
    Browse the repository at this point in the history

  6. Remove circles that were reintroduced in merge

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    f5703de View commit details
    Browse the repository at this point in the history

  7. Add zoom extent

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    63f7141 View commit details
    Browse the repository at this point in the history

  8. Move bands calculation into a selector

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    1542348 View commit details
    Browse the repository at this point in the history

  9. Improve band height calculation

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    69acdac View commit details
    Browse the repository at this point in the history

  10. Add layer names

    @richardwestenra
    richardwestenra committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    3cc9453 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. Remove rainbow colours from bands

    @richardwestenra
    richardwestenra committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    bc80fa1 View commit details
    Browse the repository at this point in the history

  2. Rename bands to layers

    @richardwestenra
    richardwestenra committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    84bc4f4 View commit details
    Browse the repository at this point in the history

  3. Distinguish between rank and layer

    @richardwestenra
    richardwestenra committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    2671cf3 View commit details
    Browse the repository at this point in the history

  4. Move layer styles & selector into separate files

    @richardwestenra
    richardwestenra committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    719d020 View commit details
    Browse the repository at this point in the history

  5. Allow multiple ranks per layer

    @richardwestenra
    richardwestenra committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    b9a993e View commit details
    Browse the repository at this point in the history

  6. Remove node fill rainbow colours

    @richardwestenra
    richardwestenra committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    4c966bd View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Add release note

    @richardwestenra
    richardwestenra committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    3a0085f View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Revert "Add release note" 

    This reverts commit 3a0085f.
    @richardwestenra
    richardwestenra committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    c45ed3b View commit details
    Browse the repository at this point in the history

  2. Add backwards-compatibility for layers/ranker

    @richardwestenra
    richardwestenra committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    982144a View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Add TODO comments for temporary code 

    There are a few features that I've added for testing, which will be removed before merging
    @richardwestenra
    richardwestenra committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    149babb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into prototype/custom-ranking

    @richardwestenra
    richardwestenra committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    a66828c View commit details
    Browse the repository at this point in the history

  3. Fix animation delay bug 

    This line was causing an extra delay when transitioning chart nodes. I've no idea why I added it in the first place, but removing it fixes everything and it doesn't seem to break anything so idk guess it's fixed 🤷‍♂️
    @richardwestenra
    richardwestenra committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    0e98eb0 View commit details
    Browse the repository at this point in the history

  4. Break D3 draw function into multiple functions 

    Simplify the code and make it easier to follow
    @richardwestenra
    richardwestenra committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    3fae2ca View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Move layer name labels to left side

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    0750800 View commit details
    Browse the repository at this point in the history

  2. Add button to toggle layers

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    7650e85 View commit details
    Browse the repository at this point in the history

  3. Remove ranker toggle

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    a3be92f View commit details
    Browse the repository at this point in the history

  4. Fix filtered-layer bug

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    450aba1 View commit details
    Browse the repository at this point in the history

  5. Add JSDoc comment

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    9aa74db View commit details
    Browse the repository at this point in the history

  6. Animate layer label dx when toggling sidebar

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    c82df25 View commit details
    Browse the repository at this point in the history

  7. Remove leftover layer label bg rect

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    608ff1a View commit details
    Browse the repository at this point in the history

  8. Make layer labels HTML elements, add BG gradient

    @richardwestenra
    richardwestenra committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    c14f774 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Calculate custom node ranks with batching-toposort 

    Use 'batching-toposort' npm package to determine the vertical positioning (i.e. rank) for each node, while taking layers into account
    @richardwestenra
    richardwestenra committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    0bea7ba View commit details
    Browse the repository at this point in the history

  2. Remove ranks from mock dataset

    @richardwestenra
    richardwestenra committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    b982c29 View commit details
    Browse the repository at this point in the history

  3. Move node/edge disabled selectors to new file 

    These selectors are foundational and were causing circular imports between the node and edge selector files, so it's easier to keep them in their own file
    @richardwestenra
    richardwestenra committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    39fc0ef View commit details
    Browse the repository at this point in the history

  4. Move rank calculation into new file

    @richardwestenra
    richardwestenra committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    b3b2ef0 View commit details
    Browse the repository at this point in the history

  5. Insert ranks directly into formatted node objects

    @richardwestenra
    richardwestenra committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    7e89f00 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Fix bug with non-sequential layers 

    If the layer IDs were not numbers, or if a mid-level layer were dropped, then some of the layers ended up getting a y/height of NaN. This commit fixes this by adding a selector to calculate visible layer IDs only, and then use this for calculating ranks and layers
    @richardwestenra
    richardwestenra committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    8ff2630 View commit details
    Browse the repository at this point in the history

  2. Prevent errors when no nodes are present 

    Fixes bug introduced in #124
    @richardwestenra
    richardwestenra committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    1ce21f2 View commit details
    Browse the repository at this point in the history

  3. Fix layers on light theme

    @richardwestenra
    richardwestenra committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    08e7f14 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Add new layers icon

    @richardwestenra
    richardwestenra committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    8b12358 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Limit zoom translate 

    Prevent users from panning too far up/down/left/right
    @richardwestenra
    richardwestenra committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    92e857a View commit details
    Browse the repository at this point in the history

  2. Add layer tags to mock dataset

    @richardwestenra
    richardwestenra committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    a307d38 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Don't calculate ranks if layers are hidden

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    8b3f48d View commit details
    Browse the repository at this point in the history

  2. Set !state.visible.layers if dataset has no layers

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    a38d3b0 View commit details
    Browse the repository at this point in the history

  3. Save visible state to localStorage 

    Fixes bug in sidebar storage
    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3ac91d2 View commit details
    Browse the repository at this point in the history

  4. Reducer layer band opacity

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3a37f06 View commit details
    Browse the repository at this point in the history

  5. Update visible btn props, e.g. visible.layerBtn 

    Plus add missing buttons to app proptypes
    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    6c949e1 View commit details
    Browse the repository at this point in the history

  6. Fix broken tests

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    05e97ad View commit details
    Browse the repository at this point in the history

  7. Add tests for layers selector

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    f2c708c View commit details
    Browse the repository at this point in the history

  8. Add rank tests

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    b465230 View commit details
    Browse the repository at this point in the history

  9. Revert temporary rank/layer name in tooltip text

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    0633987 View commit details
    Browse the repository at this point in the history

  10. Improve action/reducer test coverage

    @richardwestenra
    richardwestenra committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    87f1a17 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Change origin branch for Dagre 

    Use a branch on a fork owned by a team-member, so we have more control and have more assurance that it won't be deleted
    @richardwestenra
    richardwestenra committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    561adc2 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Merge branch 'develop' into prototype/custom-ranking

    @richardwestenra
    richardwestenra committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    d6d4c9b View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary 'draw' argument

    @richardwestenra
    richardwestenra committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    392e702 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Merge branch 'develop' into prototype/custom-ranking

    @richardwestenra
    richardwestenra committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    a0b9e18 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Improve test naming

    @richardwestenra
    richardwestenra committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    c59365d View commit details
    Browse the repository at this point in the history

  2. Improve variable naming

    @richardwestenra
    richardwestenra committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    137979c View commit details
    Browse the repository at this point in the history

  3. Improve getNodeDisabledTag tests 

    Also improve animals mock data tags
    @richardwestenra
    richardwestenra committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    80f0f12 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Don't run layout if !nodes.length

    @richardwestenra
    richardwestenra committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    78dbf90 View commit details
    Browse the repository at this point in the history

  2. Update test name

    @richardwestenra
    richardwestenra committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    b32e849 View commit details
    Browse the repository at this point in the history