Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager

[arvados.git] / 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 c55a7253b8bca440b6f58d1059995aeb24406e18..94cbf984897c66753ff6728a7d2f2196d9f540dd 100644 (file)
--- 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 = [] %>
-
-  <div class="pull-right">
-    Current state: <span class="badge badge-info" data-pipeline-state="<%= @object.state %>"><%= @object.state.sub('OnServer', '') %></span>&nbsp;
+  <div class="pull-right" style="padding-left: 1em">
+    Current state: <span class="badge badge-info" data-pipeline-state="<%= @object.state %>">
+      <% if @object.state == "RunningOnServer" %>
+        Active
+      <% else %>
+        <%= @object.state %>
+      <% end %>
+    </span>&nbsp;
   </div>
 
-  <%= render_pipeline_components("running", :json, pipeline_job_uuids: pipeline_job_uuids) %>
-
-  <% if @object.state.in? %w(RunningOnServer RunningOnClient Failed) %>
-
-      <h4>Log messages from jobs</h4>
-      <% log_history = pipeline_log_history((pipeline_job_uuids || []) + [@object.uuid]) %>
-      <div class="arv-log-event-listener arv-log-event-handler-append-logs arv-job-log-window" id="pipeline_event_log_div" data-object-uuids="<%= @object.uuid %> <%=(pipeline_job_uuids || []).join(" ")%>">
-        <% log_history.each do |entry| %>
-          <%=entry%><br/>
-        <% end %>
-      </div>
-
-  <% end %>
+  <%= render_pipeline_components("running", :json) %>
 
 <% else %>
   <%# state is either New or Ready %>