2961: Don't call #render_index from #index on folders_controller because #index

[arvados.git] / apps / workbench / app / controllers / pipeline_instances_controller.rb

diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 60a380d359ca33196a4b9130a7b986cf34458ac3..500927bdb62ba240301382cc0239a50f308d34ab 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -4,7 +4,9 @@ class PipelineInstancesController < ApplicationController
   include PipelineInstancesHelper
 
   def graph(pipelines)
-    count = {}    
+    return nil, nil if params['tab_pane'] != "Graph"
+
+    count = {}
     provenance = {}
     pips = {}
     n = 1
@@ -13,7 +15,13 @@ class PipelineInstancesController < ApplicationController
       collections = []
 
       p.components.each do |k, v|
-        j = v[:job]
+        j = v[:job] || next
+
+        # The graph is interested in whether the component is
+        # indicated as persistent, more than whether the job
+        # satisfying it (which could have been reused, or someone
+        # else's) is.
+        j[:output_is_persistent] = v[:output_is_persistent]
 
         uuid = j[:uuid].intern
         provenance[uuid] = j
@@ -31,13 +39,13 @@ class PipelineInstancesController < ApplicationController
         pips[uuid] |= n
       end
 
-      Collection.where(uuid: collections).each do |c|
+      Collection.where(uuid: collections.compact).each do |c|
         uuid = c.uuid.intern
         provenance[uuid] = c
         pips[uuid] = 0 unless pips[uuid] != nil
         pips[uuid] |= n
       end
-      
+
       n = n << 1
     end
 
@@ -54,12 +62,16 @@ class PipelineInstancesController < ApplicationController
     end
 
     provenance, pips = graph(@pipelines)
+    if provenance
+      @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+        :request => request,
+        :all_script_parameters => true,
+        :combine_jobs => :script_and_version,
+        :script_version_nodes => true,
+        :pips => pips }
+    end
 
-    @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
-      :all_script_parameters => true, 
-      :combine_jobs => :script_and_version,
-      :script_version_nodes => true,
-      :pips => pips }
+    super
   end
 
   def compare
@@ -94,6 +106,7 @@ class PipelineInstancesController < ApplicationController
       highscore = {}           # attr => how common "normal" is
       score = {}               # attr => { value => how common }
       row[:components].each do |pj|
+        next if pj.nil?
         pj.each do |k,v|
           vstr = for_comparison v
           score[k] ||= {}
@@ -112,6 +125,7 @@ class PipelineInstancesController < ApplicationController
 
       # Add a hash in component[:is_normal]: { attr => is_the_value_normal? }
       row[:components].each do |pj|
+        next if pj.nil?
         pj[:is_normal] = {}
         pj.each do |k,v|
           pj[:is_normal][k] = (normal.has_key?(k) && normal[k] == for_comparison(v))
@@ -124,19 +138,29 @@ class PipelineInstancesController < ApplicationController
     @pipelines = @objects
 
     @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
-      :all_script_parameters => true, 
+      :request => request,
+      :all_script_parameters => true,
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
       :pips => pips }
   end
 
   def show_pane_list
-    %w(components graph attributes metadata json api)
+    panes = %w(Components Graph Attributes Metadata JSON API)
+    if @object and @object.state.in? ['New', 'Ready']
+      panes = %w(Inputs) + panes
+    end
+    panes
   end
 
-  def compare_pane_list 
-    %w(text_compare graph)
-  end 
+  def compare_pane_list
+    %w(Compare Graph)
+  end
+
+  def index
+    @limit = 20
+    super
+  end
 
   protected
   def for_comparison v