Merge branch 'master' into 2798-go-keep-client

[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 a42a734394243d7deeab805e195348ef5e9d15fd..d54cd4961e944108f719348eb21fe497f6facee3 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -3,25 +3,23 @@ class PipelineInstancesController < ApplicationController
   before_filter :find_objects_by_uuid, only: :compare
   include PipelineInstancesHelper
 
-  def show
-    @pipelines = [@object]
-
-    if params[:compare]
-      PipelineInstance.where(uuid: params[:compare]).each do |p|
-        @pipelines << p
-      end
-    end
-
+  def graph(pipelines)
     count = {}    
     provenance = {}
     pips = {}
     n = 1
 
-    @pipelines.each do |p|
+    pipelines.each do |p|
       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
@@ -39,7 +37,7 @@ 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
@@ -49,11 +47,27 @@ class PipelineInstancesController < ApplicationController
       n = n << 1
     end
 
+    return provenance, pips
+  end
+
+  def show
+    @pipelines = [@object]
+
+    if params[:compare]
+      PipelineInstance.where(uuid: params[:compare]).each do |p|
+        @pipelines << p
+      end
+    end
+
+    provenance, pips = graph(@pipelines)
+
     @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 }
+    super
   end
 
   def compare
@@ -88,10 +102,11 @@ 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] ||= {}
-          score[k][vstr] = (score[k][vstr.to_s] || 0) + 1
+          score[k][vstr] = (score[k][vstr] || 0) + 1
           highscore[k] ||= 0
           if score[k][vstr] == highscore[k]
             # tie for first place = no "normal"
@@ -106,12 +121,37 @@ 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))
         end
       end
     end
+
+    provenance, pips = graph(@objects)
+
+    @pipelines = @objects
+
+    @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
+
+  def show_pane_list
+    %w(Components Graph Attributes Metadata JSON API)
+  end
+
+  def compare_pane_list 
+    %w(Compare Graph)
+  end 
+
+  def index
+    @limit = 20
+    super
   end
 
   protected