3235: Merge branch 'master' into 3235-top-nav-site-search

[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 061db6de862ef75b8d5dedcb0d13c76a84f83eb8..b3204bf64e8d52cd3aa9d31315e0129225ef339d 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,24 +1,58 @@
 class JobsController < ApplicationController
+
+  def generate_provenance(jobs)
+    return if params['tab_pane'] != "Provenance"
+
+    nodes = []
+    collections = []
+    jobs.each do |j|
+      nodes << j
+      collections << j[:output]
+      collections.concat(ProvenanceHelper::find_collections(j[:script_parameters]))
+      nodes << {:uuid => j[:script_version]}
+    end
+
+    Collection.where(uuid: collections).each do |c|
+      nodes << c
+    end
+
+    @svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
+      :request => request,
+      :all_script_parameters => true,
+      :script_version_nodes => true}
+  end
+
   def index
     @svg = ""
     if params[:uuid]
-        @jobs = Job.where(uuid: params[:uuid])
-        nodes = []
-        collections = []
-        @jobs.each do |j|
-          nodes << j
-          collections << j[:output]
-          collections.concat(ProvenanceHelper::find_collections(j[:script_parameters]))
-          nodes << {:uuid => j[:script_version]}
-        end
-
-        Collection.where(uuid: collections).each do |c|
-          nodes << c
-        end
-
-      @svg = ProvenanceHelper::create_provenance_graph(nodes, {:all_script_parameters => true, :script_version_nodes => true})
+      @objects = Job.where(uuid: params[:uuid])
+      generate_provenance(@objects)
+      render_index
     else
-      @jobs = Job.all
+      @limit = 20
+      super
     end
   end
+
+  def cancel
+    @object.cancel
+    redirect_to @object
+  end
+
+  def show
+    generate_provenance([@object])
+    super
+  end
+
+  def index_pane_list
+    if params[:uuid]
+      %w(Recent Provenance)
+    else
+      %w(Recent)
+    end
+  end
+
+  def show_pane_list
+    %w(Status Log Details Provenance Advanced)
+  end
 end