X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d6d7788c4e6b1d3da88833329b326fd7a3891503..d44a5c508cfa664134daad806d7be9a7cb0bd6ee:/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 c55a7253b8..94cbf98489 100644 --- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb @@ -1,24 +1,16 @@ <% if !@object.state.in? ['New', 'Ready'] %> - <% pipeline_job_uuids = [] %> - -
- Current state: <%= @object.state.sub('OnServer', '') %>  +
+ Current state: + <% if @object.state == "RunningOnServer" %> + Active + <% else %> + <%= @object.state %> + <% end %> +  
- <%= render_pipeline_components("running", :json, pipeline_job_uuids: pipeline_job_uuids) %> - - <% if @object.state.in? %w(RunningOnServer RunningOnClient Failed) %> - -

Log messages from jobs

- <% log_history = pipeline_log_history((pipeline_job_uuids || []) + [@object.uuid]) %> -
"> - <% log_history.each do |entry| %> - <%=entry%>
- <% end %> -
- - <% end %> + <%= render_pipeline_components("running", :json) %> <% else %> <%# state is either New or Ready %>