Merge branch 'master' into 5720-ajax-loading-error

[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 f77379a33f8bb0d8eb2f63475a528188d795c721..dae57aa0e85ebbe3ccf7ce183a185dcc860b3f0b 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,23 +1,20 @@
 <% if !@object.state.in? ['New', 'Ready'] %>
 
-<% job_uuids = @object.components.map { |k,j| j.is_a? Hash and j[:job].andand[:uuid] }.compact %>
-
-<div id="pipeline-instance-components"
-     class="pane-anchor arv-log-event-listener arv-refresh-on-log-event"
-     href="#pipeline-instance-components-pane"
-     data-pane-content-url="<%= url_for(params.merge(tab_pane: "components_running")) %>"
-     data-object-uuids="<%= @object.uuid %> <%= job_uuids.join(' ') %>"
-     data-load-throttle="5000"
-     >
-  <div id="pipeline-instance-components-pane" class="active">
+  <%
+     job_uuids = @object.components.map { |k,j| j.is_a? Hash and j[:job].andand[:uuid] }.compact
+     throttle = @object.state.start_with?('Running') ? 5000 : 15000
+     %>
+  <div class="arv-log-refresh-control"
+       data-load-throttle="<%= throttle %>"
+       data-object-uuids="<%= @object.uuid %> <%= job_uuids.join(' ') %>"
+       ></div>
 
   <%= render_pipeline_components("running", :json) %>
 
-</div>
-</div>
-
 <% else %>
   <%# state is either New or Ready %>
+  <%= render_unreadable_inputs_present %>
+
   <p><i>Here are all of the pipeline's components (jobs that will need to run in order to complete the pipeline). If you know what you're doing (or you're experimenting) you can modify these parameters before starting the pipeline. Usually, you only need to edit the settings presented on the "Inputs" tab above.</i></p>
 
   <%= render_pipeline_components("editable", :json, editable: true) %>