[ARVADOS] updated: 2516e999249684e82e55c6519b54114764193963
Git user
git at public.curoverse.com
Thu May 4 21:31:46 EDT 2017
Summary of changes:
.../app/helpers/container_requests_helper.rb | 26 ----------------
apps/workbench/app/models/container_work_unit.rb | 4 +++
apps/workbench/app/models/work_unit.rb | 4 +++
.../views/work_units/_component_detail.html.erb | 35 +++++++++++++---------
.../views/work_units/_show_mount_inputs.html.erb | 12 --------
.../app/views/work_units/_show_table_data.html.erb | 4 +--
6 files changed, 31 insertions(+), 54 deletions(-)
delete mode 100644 apps/workbench/app/helpers/container_requests_helper.rb
delete mode 100644 apps/workbench/app/views/work_units/_show_mount_inputs.html.erb
via 2516e999249684e82e55c6519b54114764193963 (commit)
from c3aa32a866ac5a833675888ca8106ea4a6581bc4 (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 2516e999249684e82e55c6519b54114764193963
Author: radhika <radhika at curoverse.com>
Date: Thu May 4 21:31:18 2017 -0400
10645: mount inputs display
diff --git a/apps/workbench/app/helpers/container_requests_helper.rb b/apps/workbench/app/helpers/container_requests_helper.rb
deleted file mode 100644
index ec6c604..0000000
--- a/apps/workbench/app/helpers/container_requests_helper.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module ContainerRequestsHelper
-
- # yields collection id (pdh or uuid), and full file_path
- def cr_input_collections(path, &b)
- case path
- when ArvadosBase
- path.class.columns.each do |c|
- cr_input_collections(path[c.name.to_sym], &b)
- end
- when Hash
- path.each do |k, v|
- cr_input_collections(v, &b)
- end
- when Array
- path.each do |v|
- cr_input_collections(v, &b)
- end
- when String
- if m = /[a-f0-9]{32}\+\d+/.match(path)
- yield m[0], path.split('keep:')[-1]
- elsif m = /[0-9a-z]{5}-4zz18-[0-9a-z]{15}/.match(path)
- yield m[0], path.split('keep:')[-1]
- end
- end
- end
-end
diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index 8748785..49d214d 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -53,6 +53,10 @@ class ContainerWorkUnit < ProxyWorkUnit
get(:container_uuid)
end
+ def requesting_container_uuid
+ get(:requesting_container_uuid)
+ end
+
def priority
@proxied.priority
end
diff --git a/apps/workbench/app/models/work_unit.rb b/apps/workbench/app/models/work_unit.rb
index e10f8b7..3755446 100644
--- a/apps/workbench/app/models/work_unit.rb
+++ b/apps/workbench/app/models/work_unit.rb
@@ -188,6 +188,10 @@ class WorkUnit
# container_uuid of a container_request
end
+ def requesting_container_uuid
+ # requesting_container_uuid of a container_request
+ end
+
def log_object_uuids
# object uuids for live log
end
diff --git a/apps/workbench/app/views/work_units/_component_detail.html.erb b/apps/workbench/app/views/work_units/_component_detail.html.erb
index 189c162..6aa5a9c 100644
--- a/apps/workbench/app/views/work_units/_component_detail.html.erb
+++ b/apps/workbench/app/views/work_units/_component_detail.html.erb
@@ -68,10 +68,10 @@
repo = nil unless repo.andand.http_fetch_url
%>
<% [:priority, :script, :repository, :script_version, :supplied_script_version, :nondeterministic,
- :runtime_constraints].each do |k| %>
+ :runtime_constraints, :requesting_container_uuid].each do |k| %>
<% val = current_obj.send(k) if current_obj.respond_to?(k) %>
<% if val %>
- <tr>
+ <tr valign="top">
<td style="padding-right: 1em">
<%= k.to_s %>:
</td>
@@ -84,6 +84,8 @@
<%= link_to val, show_repository_commit_path(id: repo.uuid, commit: current_obj.script_version) %>
<% elsif k == :runtime_constraints and val.any? %>
<%= render partial: 'work_units/show_table_data', locals: {id: current_obj.uuid, name: k, data_map: val} %>
+ <% elsif k.to_s.end_with? 'uuid' %>
+ <%= link_to_arvados_object_if_readable(val, val, friendly_name: true) %>
<% else %>
<%= val %>
<% end %>
@@ -147,12 +149,12 @@
<% val = current_obj.send(k) if current_obj.respond_to?(k) %>
<% if val %>
<tr>
- <td style="padding-right: 1em">
+ <td valign="top">
<%= k.to_s %>:
</td>
<td>
<% if k == :command %>
- <div style="max-height:200px; border:1px solid; overflow-y:auto; padding-left: 1em; padding-right: 1em">
+ <div style="max-height:200px; overflow-y:auto; padding-left: 2em">
<%=val%>
</div>
<% else %>
@@ -165,21 +167,26 @@
<%
mounts = current_obj.send(:mounts) if current_obj.respond_to?(:mounts)
- input_obj =mounts.andand[:"/var/lib/cwl/cwl.input.json"].andand[:content] || mounts || {}
- mnt_inputs = []
- cr_input_collections(input_obj) do |_, path|
- mnt_inputs << path
- end
- mnt_inputs = mnt_inputs.uniq.compact
+ input_obj = mounts.andand[:"/var/lib/cwl/cwl.input.json"].andand[:content]
+ mnt_inputs = JSON.pretty_generate(input_obj) if input_obj
%>
<tr>
- <% if mnt_inputs.any? %>
- <td style="padding-right: 1em">
+ <% if mnt_inputs %>
+ <td valign="top">
input_mounts:
</td>
<td>
- <%= render partial: 'work_units/show_mount_inputs',
- locals: {id: current_obj.uuid, name: 'mount-inputs', inputs: mnt_inputs} %>
+ <div style="max-height:200px; overflow:auto; padding-left: 1em">
+ <% mnt_inputs.each_line do |l| %>
+ <% text_part = l %>
+ <% match = l.match /\"keep:.*?\"/ %>
+ <% if match %>
+ <% text_part = l[0..l.index("\"keep:")-1] %>
+ <% location_part = match[0][6..-2] %>
+ <% end %>
+ <span style="white-space: pre; margin: none;"><%= text_part %><%= if location_part then link_to_arvados_object_if_readable(location_part, location_part, friendly_name: true) end %> <% if location_part then %> <br/> <% end %></span>
+ <% end %>
+ </div>
</td>
<% end %>
</tr>
diff --git a/apps/workbench/app/views/work_units/_show_mount_inputs.html.erb b/apps/workbench/app/views/work_units/_show_mount_inputs.html.erb
deleted file mode 100644
index 8e66363..0000000
--- a/apps/workbench/app/views/work_units/_show_mount_inputs.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="data-table <%=name%>-table" id="<%=name%>-table" style="max-height:300px; border:1px solid; overflow-y:auto;">
- <table>
- <% inputs.each do |i|%>
- <tr>
- <td style="padding-left: 1em; padding-right: 1em">
- <%= link_to_if_arvados_object i, friendly_name: true %>
- </td>
- </tr>
- <% end %>
- </table>
-</div>
-
diff --git a/apps/workbench/app/views/work_units/_show_table_data.html.erb b/apps/workbench/app/views/work_units/_show_table_data.html.erb
index 96658b6..c445f8d 100644
--- a/apps/workbench/app/views/work_units/_show_table_data.html.erb
+++ b/apps/workbench/app/views/work_units/_show_table_data.html.erb
@@ -1,8 +1,8 @@
-<div class="data-table <%=name%>-table" id="<%=name%>-table" style="max-height:150px; border:1px solid; overflow-y:auto;">
+<div class="data-table <%=name%>-table" id="<%=name%>-table" style="max-height: 150px; overflow-y: auto;">
<table>
<% data_map.each do |k, v|%>
<tr>
- <td style="padding-left: 1em; padding-right: 1em">
+ <td>
<%= k.to_s %>
</td>
<td style="padding-left: 1em; padding-right: 1em">
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list