Skip to content

fixes after qiita-rc review #3104

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

Merged
antgonza merged 2 commits into from
May 11, 2021
Merged

fixes after qiita-rc review #3104

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
3c1c6cc
fixes after qiita-rc review
antgonza May 7, 2021
b5707dd
make it a little less responsive [skip ci]
antgonza May 8, 2021
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
6 changes: 4 additions & 2 deletions qiita_db/artifact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,8 +1214,10 @@ def _add_edge(edges, src, dest):
nodes[job.id] = ('job', job)

elif n_type == 'job':
# Ignore the generate summary jobs
if n_obj.command.name == 'Generate HTML summary':
# Ignore the generate summary and delete jobs
# (they don't create new artifacts)
if n_obj.command.name in {'Generate HTML summary',
'delete_artifact'}:
continue
jstatus = n_obj.status
# If the job is in success we don't need to do anything
Expand Down
11 changes: 7 additions & 4 deletions qiita_pet/static/js/networkVue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ function formatNodeLabel(label) {
**/
function toggleNetworkGraph() {
if($("#processing-network-div").css('display') == 'none' ) {
$("#processing-network-instructions-div").show();
// if we are displayin the waiting page, do not show the instructions
if (!$("#processing-network-div").html().includes('waiting')){
$("#processing-network-instructions-div").show();
}
$("#processing-network-div").show();
$("#show-hide-network-btn").text("Hide");
} else {
Expand Down Expand Up @@ -736,8 +739,8 @@ Vue.component('processing-graph', {
'shape': 'data(shape)',
'text-opacity': 0.7,
'text-wrap': "wrap",
'border-color': '#BBBBBB',
'border-width': '1px'
'border-color': '#333',
'border-width': '3px'
}}, {
selector: 'edge',
style: {
Expand All @@ -761,6 +764,7 @@ Vue.component('processing-graph', {
container: container,
minZoom: 1e-50,
maxZoom: 2,
wheelSensitivity: .3,
layout: layout, style: style,
elements: {
nodes: vm.nodes,
Expand Down Expand Up @@ -1097,7 +1101,6 @@ Vue.component('processing-graph', {
};

show_loading('processing-network-div');
$("#processing-network-div").hide();
$("#processing-network-instructions-div").hide();


Expand Down
5 changes: 3 additions & 2 deletions qiita_pet/templates/workflows.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
'background-color': 'data(color)',
'text-opacity': 0.7,
'text-wrap': "wrap",
'border-color': '#BBBBBB',
'border-width': '1px'
'border-color': '#333',
'border-width': '3px'
}}, {
selector: 'edge',
style: {
Expand Down Expand Up @@ -82,6 +82,7 @@ <h4>
<script type="text/javascript">
var cy_network_{{i}} = cytoscape({
container: document.getElementById('workflow_{{i}}'),
wheelSensitivity: .3,
layout: layout, style: style,
elements: {
nodes: [
Expand Down