[ARVADOS] updated: 74d98b5f5cfee651eebfd8c63842a08241dcd736
Git user
git at public.curoverse.com
Fri May 5 15:31:17 EDT 2017
Summary of changes:
.../app/controllers/workflows_controller.rb | 4 +
apps/workbench/app/helpers/provenance_helper.rb | 21 +-
apps/workbench/app/models/container_work_unit.rb | 5 +-
.../app/views/users/_show_activity.html.erb | 2 +-
.../app/views/workflows/_show_definition.html.erb | 86 ++++++++
apps/workbench/test/unit/work_unit_test.rb | 4 +-
...nstall-manual-prerequisites.html.textile.liquid | 5 +-
.../controllers/arvados/v1/schema_controller.rb | 7 +
services/api/config/application.default.yml | 4 +-
services/crunch-run/crunchrun.go | 19 +-
services/crunch-run/crunchrun_test.go | 11 +-
services/crunch-run/logging.go | 234 +++++++++++++++++++--
services/crunch-run/logging_test.go | 43 ++++
services/nodemanager/arvnodeman/jobqueue.py | 8 +-
services/nodemanager/tests/test_jobqueue.py | 2 +-
15 files changed, 407 insertions(+), 48 deletions(-)
create mode 100644 apps/workbench/app/views/workflows/_show_definition.html.erb
via 74d98b5f5cfee651eebfd8c63842a08241dcd736 (commit)
via 5cd02331394595a6e64f19c2cc14c9955c9266dd (commit)
via 3b4325c210516d1f61838fb26e06e0a11c31ce6d (commit)
via 007d2919fc56632bc957d90378ed7a5d3b14aa3c (commit)
via f389a552e9b81de0e2030fe2fddc4852b33f63cc (commit)
via 6fd54bd2d821535231c6b7596146b301232e8976 (commit)
via e42bf96609791323ca21aff9768e31e809cc9439 (commit)
via e4f03346d4498a77d252d2ffb08d1e0246785b5e (commit)
via a4a8d41f6ccd1a0a54f99fb80f3d725922c08ee1 (commit)
via f10431fe2de1037c3c0d51d8238cecf6c1206703 (commit)
via 11208178d6724a93663139565e9dad96ee7f10a3 (commit)
via dd0786de66c5decb8581cb092afb405eb390bca9 (commit)
via 8ed7b6dd5d4df93a3f37096afe6d6f81c2a7ef6e (commit)
via d66c9f93da79b8bfdffdb1684f19ac388c31ce97 (commit)
via f682de562d9c857616f81d48d5cd915748725197 (commit)
via 787e77b30ed6f01ebf3ea74f4212888accf41ecf (commit)
via 8dd7e323798d36e3182c12868c6f1f3dd0eabf96 (commit)
via 3c4b14cf8bbfcea51fefa5d74a0c522547e0bcf4 (commit)
via fe29b56aecc9b5e277dd9a956fb05867827c91c9 (commit)
via e54bce82515daeef450f53aa93d3acae397bfa5f (commit)
via 5d00ecb0932f86e4d2aced3d9258b96522ef38bd (commit)
via 712968da0c8575de1ac6968772999c2439636e2a (commit)
via 3acd5d7f73c24a2ea2d686588be44efb9ac056b2 (commit)
via c5c09df38966595b4f27c402d1e9ae5500d6d201 (commit)
via 455f862a19fe0bcc8ac3c6e685a96faf747ae623 (commit)
via 8622b46a4a6c127a1927d9c2e54febec6a5bf503 (commit)
via 4344941f8410ed21befead8d6b8d2471d291032f (commit)
via 9dabca0eedbc9f842d542fea3463a441140d590c (commit)
via 6e577058389e70fd575580c3e11a122396140700 (commit)
via fd65e0be3f55d48b9d573921ca0757fc51a1dd81 (commit)
via f1fb39153bc234b49ca77674a29abc029b12774a (commit)
via 5e4bf6836d9762ef5552111776dcbade99f2e680 (commit)
from 1586823b65c7ec7656626e491a31f3f9516a4a56 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 74d98b5f5cfee651eebfd8c63842a08241dcd736
Author: radhika <radhika at curoverse.com>
Date: Fri May 5 15:30:46 2017 -0400
10112: add Definition tab to workflow page
diff --git a/apps/workbench/app/controllers/workflows_controller.rb b/apps/workbench/app/controllers/workflows_controller.rb
index a3ba7d6..49dd7ac 100644
--- a/apps/workbench/app/controllers/workflows_controller.rb
+++ b/apps/workbench/app/controllers/workflows_controller.rb
@@ -3,4 +3,8 @@ class WorkflowsController < ApplicationController
Rails.configuration.anonymous_user_token and
'show' == ctrl.action_name
}
+
+ def show_pane_list
+ %w(Definition Advanced)
+ end
end
diff --git a/apps/workbench/app/views/workflows/_show_definition.html.erb b/apps/workbench/app/views/workflows/_show_definition.html.erb
new file mode 100644
index 0000000..f362647
--- /dev/null
+++ b/apps/workbench/app/views/workflows/_show_definition.html.erb
@@ -0,0 +1,86 @@
+<%
+ wf_def = ActiveSupport::HashWithIndifferentAccess.new YAML::load(@object.definition) if @object.definition
+ wf_def = wf_def[:"$graph"].andand[0] || wf_def if wf_def
+
+ items = {}
+ baseCommand = wf_def.andand["baseCommand"]
+ items['baseCommand'] = baseCommand if baseCommand
+
+ args = wf_def.andand["arguments"]
+ items['arguments'] = args if args
+
+ hints = wf_def.andand["hints"]
+ items['hints'] = hints if hints
+
+ inputs = wf_def.andand["inputs"]
+ items['inputs'] = inputs if inputs
+
+ outputs = wf_def.andand["outputs"]
+ items['outputs'] = outputs if outputs
+%>
+
+ <div class="col-md-12">
+ <table style="width:100%;">
+ <col width="15%" />
+ <col width="85%" />
+
+ <% items.each do |k, v| %>
+ <% if ['baseCommand', 'arguments'].include? k %>
+ <tr>
+ <td valign="top">
+ <%= k %>:
+ </td>
+ <td>
+ <div style="max-height:200px; overflow-y:auto;">
+ <%=v%>
+ </div>
+ </td>
+ </tr>
+ <% end %>
+
+ <% if ['inputs', 'outputs'].include? k %>
+ <tr>
+ <td valign="top">
+ <%= k %>:
+ </td>
+ <td>
+ <% val = JSON.pretty_generate(v) %>
+ <div style="max-height:300px; overflow:auto;">
+ <% val.each_line do |l| %>
+ <% text_part = l %>
+ <% match = l.match /\"keep:.*?\"/ %>
+ <% if match %>
+ <% text_part = l[0..l.index("\"keep:")-1] %>
+ <% loc_part = match[0][6..-2] %>
+ <% end %>
+ <span style="white-space: pre-wrap; margin: none;"><%= text_part %><%= if loc_part then link_to_arvados_object_if_readable(loc_part, loc_part, friendly_name: true) end %> <% if loc_part then %> <br/> <% end %></span>
+ <% end %>
+ </div>
+ </td>
+ </tr>
+ <% end %>
+
+ <% if k == 'hints' %>
+ <tr>
+ <td valign="top">
+ <%= k %>:
+ </td>
+ <td>
+ <% val = JSON.pretty_generate(v) %>
+ <div style="max-height:300px; overflow:auto;">
+ <% val.each_line do |l| %>
+ <% text_part = l %>
+ <% match = l.match /\"keep:.*?\"/ %>
+ <% if match %>
+ <% text_part = l[0..l.index("\"keep:")-1] %>
+ <% loc_part = match[0][6..-2] %>
+ <% end %>
+ <span style="white-space: pre-wrap; margin: none;"><%= text_part %><%= if loc_part then link_to_arvados_object_if_readable(loc_part, loc_part, friendly_name: true) end %> <% if loc_part then %> <br/> <% end %></span>
+ <% end %>
+ </div>
+ </td>
+ </tr>
+ <% end %>
+ <% end %>
+ </table>
+ </div>
commit 5cd02331394595a6e64f19c2cc14c9955c9266dd
Merge: d66c9f9 3b4325c
Author: radhika <radhika at curoverse.com>
Date: Fri May 5 13:38:21 2017 -0400
Merge branch 'master' into 10112-workflow-show
commit d66c9f93da79b8bfdffdb1684f19ac388c31ce97
Merge: 1586823 f682de5
Author: radhika <radhika at curoverse.com>
Date: Wed May 3 17:08:07 2017 -0400
Merge branch 'master' into 10112-workflow-show
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list