X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/24e38a335377c878955e302cd11b2097cd7c5e07..a3222e35cda68c8e48a17921c33ac37ecb5c3bac:/apps/workbench/app/views/pipeline_instances/_show_components.html.erb diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb index 24579c9b4b..c55a7253b8 100644 --- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb @@ -1,171 +1,28 @@ -<% content_for :css do %> - .pipeline_color_legend { - padding-left: 1em; - padding-right: 1em; - } -table.pipeline-components-table { - width: 100%; - table-layout: fixed; - overflow: hidden; -} +<% if !@object.state.in? ['New', 'Ready'] %> -table.pipeline-components-table thead th { - text-align: bottom; -} -table.pipeline-components-table div.progress { - margin-bottom: 0; -} + <% pipeline_job_uuids = [] %> -table.pipeline-components-table td { - overflow: hidden; - text-overflow: ellipsis; -} +
- component - | - script, version - | - progress - <%= link_to '(refresh)', request.fullpath, class: 'refresh', remote: true, method: 'get' %> - | - | - output - | -
---|---|---|---|---|
- <% label = if pj[:job].andand[:uuid] - if pj[:job][:success] == true - 'label-success' - elsif pj[:job][:success] == false - 'label-danger' - elsif pj[:job][:running] == true - 'label-info' - else - 'label-default' - end - else - 'label-default' - end %> - <% if pj[:job].andand[:uuid] %> - <%= link_to pj[:name], job_url(id: pj[:job][:uuid]), class: "label #{label}" %> - <% else %> - <%= pj[:name] %> - <% end %> + <% if @object.state.in? %w(RunningOnServer RunningOnClient Failed) %> - |
- <%= pj[:script] %>
- <%= pj[:script_version] %> - | - <%= pj[:progress_bar] %> - |
- <% if pj[:job].andand[:cancelled_at] %>
- cancelled
- <% elsif pj[:failed] %>
- failed
- <% elsif pj[:result] == 'queued' %>
- queued
+ Log messages from jobs+ <% log_history = pipeline_log_history((pipeline_job_uuids || []) + [@object.uuid]) %> +">
+ <% log_history.each do |entry| %>
+ <%=entry%> <% end %> - | - <%= link_to_if_arvados_object pj[:output] %> - | -
- component - | - script - | - parameter - | - value - | -
---|---|---|---|
<%= k %> | - -<%= render_editable_subattribute @object, :components, [k, :script], template_value[:script] %> | - -script version | - -- <%= render_editable_subattribute @object, :components, [k, :script_version], template_value[:script_version] %> - | -
- | - - | <%= p %> | -<%= render_editable_subattribute @object, :components, [k, :script_parameters, p.to_sym], tv %> | - <% end %> -