Skip to content

Commit a5981ee

Browse files
authored
fixes after qiita-rc review (#3104)
* fixes after qiita-rc review * make it a little less responsive [skip ci]
1 parent 5ecb41f commit a5981ee

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

qiita_db/artifact.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,8 +1214,10 @@ def _add_edge(edges, src, dest):
12141214
nodes[job.id] = ('job', job)
12151215

12161216
elif n_type == 'job':
1217-
# Ignore the generate summary jobs
1218-
if n_obj.command.name == 'Generate HTML summary':
1217+
# Ignore the generate summary and delete jobs
1218+
# (they don't create new artifacts)
1219+
if n_obj.command.name in {'Generate HTML summary',
1220+
'delete_artifact'}:
12191221
continue
12201222
jstatus = n_obj.status
12211223
# If the job is in success we don't need to do anything

qiita_pet/static/js/networkVue.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ function formatNodeLabel(label) {
4444
**/
4545
function toggleNetworkGraph() {
4646
if($("#processing-network-div").css('display') == 'none' ) {
47-
$("#processing-network-instructions-div").show();
47+
// if we are displayin the waiting page, do not show the instructions
48+
if (!$("#processing-network-div").html().includes('waiting')){
49+
$("#processing-network-instructions-div").show();
50+
}
4851
$("#processing-network-div").show();
4952
$("#show-hide-network-btn").text("Hide");
5053
} else {
@@ -736,8 +739,8 @@ Vue.component('processing-graph', {
736739
'shape': 'data(shape)',
737740
'text-opacity': 0.7,
738741
'text-wrap': "wrap",
739-
'border-color': '#BBBBBB',
740-
'border-width': '1px'
742+
'border-color': '#333',
743+
'border-width': '3px'
741744
}}, {
742745
selector: 'edge',
743746
style: {
@@ -761,6 +764,7 @@ Vue.component('processing-graph', {
761764
container: container,
762765
minZoom: 1e-50,
763766
maxZoom: 2,
767+
wheelSensitivity: .3,
764768
layout: layout, style: style,
765769
elements: {
766770
nodes: vm.nodes,
@@ -1100,7 +1104,6 @@ Vue.component('processing-graph', {
11001104
};
11011105

11021106
show_loading('processing-network-div');
1103-
$("#processing-network-div").hide();
11041107
$("#processing-network-instructions-div").hide();
11051108

11061109

qiita_pet/templates/workflows.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
'background-color': 'data(color)',
1818
'text-opacity': 0.7,
1919
'text-wrap': "wrap",
20-
'border-color': '#BBBBBB',
21-
'border-width': '1px'
20+
'border-color': '#333',
21+
'border-width': '3px'
2222
}}, {
2323
selector: 'edge',
2424
style: {
@@ -82,6 +82,7 @@ <h4>
8282
<script type="text/javascript">
8383
var cy_network_{{i}} = cytoscape({
8484
container: document.getElementById('workflow_{{i}}'),
85+
wheelSensitivity: .3,
8586
layout: layout, style: style,
8687
elements: {
8788
nodes: [

0 commit comments

Comments
 (0)