diff --git a/qiita_db/artifact.py b/qiita_db/artifact.py index 7b70f35b1..9cc271bbc 100644 --- a/qiita_db/artifact.py +++ b/qiita_db/artifact.py @@ -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 diff --git a/qiita_pet/static/js/networkVue.js b/qiita_pet/static/js/networkVue.js index 95fe5b4f8..f43b521ef 100644 --- a/qiita_pet/static/js/networkVue.js +++ b/qiita_pet/static/js/networkVue.js @@ -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 { @@ -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: { @@ -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, @@ -1097,7 +1101,6 @@ Vue.component('processing-graph', { }; show_loading('processing-network-div'); - $("#processing-network-div").hide(); $("#processing-network-instructions-div").hide(); diff --git a/qiita_pet/templates/workflows.html b/qiita_pet/templates/workflows.html index e2f852585..5ef919571 100644 --- a/qiita_pet/templates/workflows.html +++ b/qiita_pet/templates/workflows.html @@ -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: { @@ -82,6 +82,7 @@