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

Results page tweaks #699

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Results page tweaks #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a1d91c
Display download options for uncollapsable graphs
tadast Nov 15, 2023
9a27dd1
Bump testing dependencies
tadast Nov 15, 2023
ad1943b
Improve results page labels
tadast Nov 15, 2023
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
50 changes: 25 additions & 25 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
GEM
remote: http://rubygems.org/
specs:
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
capybara (3.39.2)
Expand All @@ -29,7 +29,7 @@ GEM
capybara (>= 1.0, < 4)
launchy
coderay (1.1.3)
diff-lcs (1.3)
diff-lcs (1.5.0)
docile (1.3.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
Expand All @@ -45,13 +45,13 @@ GEM
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
netrc (0.11.0)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
ox (2.14.16)
parallel (1.23.0)
Expand All @@ -60,34 +60,34 @@ GEM
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
racc (1.7.1)
rack (2.2.7)
public_suffix (5.0.3)
racc (1.7.3)
rack (2.2.8)
rack-protection (2.2.4)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rainbow (3.1.1)
regexp_parser (2.8.0)
regexp_parser (2.8.2)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.0)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.50.2)
json (~> 2.3)
parallel (~> 1.10)
Expand All @@ -103,7 +103,7 @@ GEM
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
selenium-webdriver (4.10.0)
selenium-webdriver (4.15.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand All @@ -124,7 +124,7 @@ GEM
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
webrick (1.8.1)
websocket (1.2.9)
websocket (1.2.10)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -138,7 +138,7 @@ DEPENDENCIES
rack-test (~> 1.0, >= 1.0.0)
rspec (~> 3.7, >= 3.7.0)
rubocop (~> 1.50, >= 1.50.1)
selenium-webdriver (~> 4.10.0, >= 4.10.0)
selenium-webdriver (~> 4.15.0, >= 4.15.0)
sequenceserver!
simplecov (~> 0.17.0, >= 0.17.0)

Expand Down
2 changes: 1 addition & 1 deletion public/css/grapher.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ svg .axis path,
font-weight: bold;
}

/* Graphical overview of hits */
/* Graphical overview of aligning hit sequences to the query */
.alignment-overview.svg-container {
text-align: center;
}
Expand Down
4 changes: 2 additions & 2 deletions public/js/circos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Graph {
}

static name() {
return 'Queries and their top hits: chord diagram';
return 'Chord diagram of queries and their top hits';
}

static className() {
Expand Down Expand Up @@ -412,7 +412,7 @@ class Graph {
.attr('dy', '-0.25em')
.attr('x', -175)
.style('font-size', '14px')
.text('Circos looks great with less than 16 queries');
.text('Chord diagram looks great with fewer than 16 queries');
}

layoutReset() {
Expand Down
2 changes: 1 addition & 1 deletion public/js/grapher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function Grapher(Graph) {
</div>;
} else {
return <div className="grapher-header">
<h4 className="caption" > </h4>
{!this.state.collapsed && this.graphLinksJSX()}
</div>;
}
}
Expand Down
2 changes: 1 addition & 1 deletion public/js/hits_overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Graph {
}

static name() {
return 'Graphical overview of hits';
return 'Graphical overview of aligning hit sequences to the query';
}

static className() {
Expand Down
2 changes: 1 addition & 1 deletion public/js/length_distribution.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Graph {
}

static name() {
return 'Length distribution of matching sequences';
return 'Length distribution of matching hit sequences';
}

static className() {
Expand Down
2 changes: 1 addition & 1 deletion public/js/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ class HitsTable extends Component {
<div className="table-hit-overview">
<h4 className="caption" data-toggle="collapse" data-target={'#Query_' + this.props.query.number + 'HT_' + this.props.query.number}>
<i className="fa fa-minus-square-o"></i>&nbsp;
<span>Sequences producing significant alignments</span>
<span>Hit sequences producing significant alignments</span>
</h4>
<div className="collapsed in" id={'Query_' + this.props.query.number + 'HT_' + this.props.query.number}>
<table
Expand Down
10 changes: 5 additions & 5 deletions public/sequenceserver-report.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions public/sequenceserver-search.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sequenceserver.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rack-test', '~> 1.0', '>= 1.0.0')
s.add_development_dependency('rspec', '~> 3.7', '>= 3.7.0')
s.add_development_dependency('rubocop', '~> 1.50', '>= 1.50.1')
s.add_development_dependency('selenium-webdriver', '~> 4.10.0', '>= 4.10.0')
s.add_development_dependency('selenium-webdriver', '~> 4.15.0', '>= 4.15.0')
s.add_development_dependency('simplecov', '~> 0.17.0', '>= 0.17.0')

# gem
Expand Down
20 changes: 10 additions & 10 deletions spec/blast_versions/blast_2.2.30/import_spec_capybara_local_2.2.30.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
# Click on the Circos expanding button, wait for animation, click on the
# download of PNG/SVG file and test that it initiated a file download in a
# right format.
page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -101,7 +101,7 @@
# Click on the Length distribution expanding button, wait for animation,
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.
page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -192,7 +192,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -212,7 +212,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -306,7 +306,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -326,7 +326,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -421,7 +421,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -442,7 +442,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -536,7 +536,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -557,7 +557,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down
20 changes: 10 additions & 10 deletions spec/blast_versions/blast_2.2.31/import_spec_capybara_local_2.2.31.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -106,7 +106,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -200,7 +200,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -220,7 +220,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -314,7 +314,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -334,7 +334,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -425,7 +425,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -446,7 +446,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down Expand Up @@ -540,7 +540,7 @@
# download of PNG/SVG file and test that it initiated a file download in a
# right format.

page.should have_content('Queries and their top hits: chord diagram')
page.should have_content('Chord diagram of queries and their top hits')
page.execute_script("$('.circos > .grapher-header > h4').click()")
sleep 1

Expand All @@ -561,7 +561,7 @@
# click on the download of PNG/SVG file and test that it initiated a file
# download in a right format.

page.should have_content('Length distribution of matching sequences')
page.should have_content('Length distribution of matching hit sequences')
page.execute_script("$('.length-distribution > .grapher-header > h4').click()")
sleep 1

Expand Down
Loading
Loading