Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench

[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 98ae0e6472f6476d9b253a86c32777c2c32db844..a8a35b510b4b93fbf6905a5c8cb85602b3bfc7bb 100644 (file)
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -13,7 +13,7 @@ class PipelineInstancesController < ApplicationController
       collections = []
 
       p.components.each do |k, v|
-        j = v[:job]
+        j = v[:job] || next
 
         uuid = j[:uuid].intern
         provenance[uuid] = j
@@ -31,7 +31,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
@@ -45,6 +45,12 @@ class PipelineInstancesController < ApplicationController
   end
 
   def show
+    if @object.components.empty? and @object.pipeline_template_uuid
+      template = PipelineTemplate.find(@object.pipeline_template_uuid)
+      @object.components= template.components
+      @object.save
+    end
+
     @pipelines = [@object]
 
     if params[:compare]
@@ -60,6 +66,7 @@ class PipelineInstancesController < ApplicationController
       :combine_jobs => :script_and_version,
       :script_version_nodes => true,
       :pips => pips }
+    super
   end
 
   def compare
@@ -94,10 +101,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"
@@ -112,6 +120,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))
@@ -121,6 +130,8 @@ class PipelineInstancesController < ApplicationController
 
     provenance, pips = graph(@objects)
 
+    @pipelines = @objects
+
     @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
       :all_script_parameters => true, 
       :combine_jobs => :script_and_version,
@@ -128,6 +139,14 @@ class PipelineInstancesController < ApplicationController
       :pips => pips }
   end
 
+  def show_pane_list
+    %w(Components Graph Attributes Metadata JSON API)
+  end
+
+  def compare_pane_list 
+    %w(Compare Graph)
+  end 
+
   protected
   def for_comparison v
     if v.is_a? Hash or v.is_a? Array