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

Fix track ordering of hierarchical track selector to more closely match the config.json #3808

Merged
merged 2 commits into from
Jul 14, 2023

Conversation

cmdcolin
Copy link
Collaborator

The current code for the ordering of tracks in the hierarchical track selector has a line that uses splice to make sure that "tracks are grouped together above category nodes".

If this is not done (e.g. if splice is changed to a push), then tracks can appear after category nodes which is a bit odd

Here are some screenshots showing the different configurations

With push instead of splice:
Untitled

Current main:
image

This branch:
image

@github-actions github-actions bot added the needs label triage Needs a label to show in changelog (breaking, enhancement, bug, documentation, or internal) label Jul 14, 2023
@cmdcolin
Copy link
Collaborator Author

Addresses some concerns from #26 but does not technically fix that issue, since that includes collapse by default and alt sorts

@cmdcolin cmdcolin added bug Something isn't working and removed needs label triage Needs a label to show in changelog (breaking, enhancement, bug, documentation, or internal) labels Jul 14, 2023
@cmdcolin
Copy link
Collaborator Author

cmdcolin commented Jul 14, 2023

code for creating the test_order config.json

jbrowse add-assembly volvox/volvox.fa --load copy --out test_order
for i in {1..5}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i toplevel"; done;
for i in {1..5}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i cat1" --category cat1; done;
for i in {1..5}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i cat1 cat2" --category cat1,cat2; done;
for i in {1..5}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i cat3" --category cat3; done;
for i in {1..5}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i cat3 cat4" --category cat3,cat4; done;
for i in {6..10}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i toplevel"; done;
for i in {6..10}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i cat1" --category cat1; done;
for i in {6..10}; do echo $i; jbrowse add-track volvox/volvox-sorted.bam --load inPlace --out test_order --trackId "$i cat1 cat2" --category cat1,cat2; done;

@cmdcolin cmdcolin force-pushed the fix_track_ordering branch from ecf1bed to cb9b05a Compare July 14, 2023 17:06
@codecov
Copy link

codecov bot commented Jul 14, 2023

Codecov Report

Merging #3808 (cb9b05a) into main (03c381d) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #3808   +/-   ##
=======================================
  Coverage   64.46%   64.46%           
=======================================
  Files         990      990           
  Lines       29580    29581    +1     
  Branches     7096     7097    +1     
=======================================
+ Hits        19068    19070    +2     
+ Misses      10347    10346    -1     
  Partials      165      165           
Impacted Files Coverage Δ
...TrackSelectorWidget/components/tree/TrackLabel.tsx 80.00% <100.00%> (ø)
...ement/src/HierarchicalTrackSelectorWidget/model.ts 84.34% <100.00%> (+0.13%) ⬆️

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@cmdcolin cmdcolin merged commit eefa039 into main Jul 14, 2023
@cmdcolin cmdcolin deleted the fix_track_ordering branch July 14, 2023 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant