X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c8d04b26dbeb3dd4401788053bf514b9f172a185..9429158c8ecf253a700c7eb4f87ad142a8e1522c:/apps/workbench/app/views/work_units/_component_detail.html.erb?ds=sidebyside 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 7d588bace6..e48a91ec1b 100644 --- a/apps/workbench/app/views/work_units/_component_detail.html.erb +++ b/apps/workbench/app/views/work_units/_component_detail.html.erb @@ -1,16 +1,57 @@ +<%# Copyright (C) The Arvados Authors. All rights reserved. + +SPDX-License-Identifier: AGPL-3.0 %> + +<% + collections = [current_obj.outputs, current_obj.docker_image].flatten.compact.uniq + collections_pdhs = collections.select {|x| !CollectionsHelper.match(x).nil?}.uniq.compact + collections_uuids = collections - collections_pdhs + preload_collections_for_objects collections_uuids if collections_uuids.any? + preload_links_for_objects collections_uuids if collections_uuids.any? + + preload_objects_for_dataclass(Repository, [current_obj.repository], :name) if current_obj.repository + + # if container_X, preload mounted collections + if @object.is_a? Container or @object.is_a? ContainerRequest + # get any collections in mounts + mounts = current_obj.send(:mounts) if current_obj.respond_to?(:mounts) + input_obj = mounts.andand[:"/var/lib/cwl/cwl.input.json"].andand[:content] + if input_obj + input_obj.to_s.scan(/([0-9a-f]{32}\+\d+)/).each {|cs| collections_pdhs += cs} + end + + command = current_obj.send(:command) if current_obj.respond_to?(:command) + if command + command.to_s.scan(/([0-9a-f]{32}\+\d+)/).each {|cs| collections_pdhs += cs} + end + end + + collections_pdhs.compact.uniq + preload_for_pdhs collections_pdhs if collections_pdhs.any? + preload_links_for_objects collections_pdhs if collections_pdhs.any? +%> +
@@ -25,10 +66,12 @@
<%= render_localized_date(val) %>
<% elsif k == :outputs and val.any? %>
<% if val.size == 1 %>
- <%= link_to_arvados_object_if_readable(val[0], 'Output data not available', friendly_name: true) %>
+ <%= link_to_arvados_object_if_readable(val[0], "#{val[0]} (Unavailable)", friendly_name: true) %>
<% else %>
<%= render partial: 'work_units/show_outputs', locals: {id: current_obj.uuid, outputs: val, align:""} %>
<% end %>
+ <% elsif k == :log_collection %>
+ <%= render partial: 'work_units/show_log_link', locals: {wu: current_obj} %>
<% else %>
<%= val %>
<% end %>
@@ -40,7 +83,7 @@
<% end %>
-
+
+
<% if current_obj.parameters and !current_obj.parameters.empty? %>
-
+ script_parameters: <%= JSON.pretty_generate(current_obj.parameters) rescue nil %> |