Merge remote-tracking branch 'origin/master' into 4031-fix-graph-connections

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

diff --git a/apps/workbench/app/controllers/jobs_controller.rb b/apps/workbench/app/controllers/jobs_controller.rb
index 8743a6ffffeb789416de26855e55347034a1dc64..536518277f1ca86da6256af0887a5be9ee7bc560 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,22 +1,32 @@
 class JobsController < ApplicationController
 
   def generate_provenance(jobs)
-    nodes = []
+    return if params['tab_pane'] != "Provenance"
+
+    nodes = {}
     collections = []
+    hashes = []
     jobs.each do |j|
-      nodes << j
-      collections << j[:output]
-      collections.concat(ProvenanceHelper::find_collections(j[:script_parameters]))
-      nodes << {:uuid => j[:script_version]}
+      nodes[j[:uuid]] = j
+      hashes << j[:output]
+      ProvenanceHelper::find_collections(j[:script_parameters]) do |hash, uuid|
+        collections << uuid if uuid
+        hashes << hash if hash
+      end
+      nodes[j[:script_version]] = {:uuid => j[:script_version]}
     end
 
     Collection.where(uuid: collections).each do |c|
-      nodes << c
+      nodes[c[:portable_data_hash]] = c
+    end
+
+    Collection.where(portable_data_hash: hashes).each do |c|
+      nodes[c[:portable_data_hash]] = c
     end
 
     @svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
       :request => request,
-      :all_script_parameters => true, 
+      :all_script_parameters => true,
       :script_version_nodes => true}
   end
 
@@ -25,14 +35,25 @@ class JobsController < ApplicationController
     if params[:uuid]
       @objects = Job.where(uuid: params[:uuid])
       generate_provenance(@objects)
+      render_index
     else
       @limit = 20
       super
     end
   end
 
+  def cancel
+    @object.cancel
+    if params[:return_to]
+      redirect_to params[:return_to]
+    else
+      redirect_to @object
+    end
+  end
+
   def show
     generate_provenance([@object])
+    super
   end
 
   def index_pane_list
@@ -44,6 +65,6 @@ class JobsController < ApplicationController
   end
 
   def show_pane_list
-    %w(Details Provenance Advanced)
+    %w(Status Log Details Provenance Advanced)
   end
 end