Merge branch 'master' into 2257-inequality-conditions

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

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index e7d29e45f9c66e92cfbaaff758a37bc23346ea5a..d46ec0354ccba317211342dd60c0c0d692ba4333 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,11 +1,10 @@
 class CollectionsController < ApplicationController
-  skip_before_filter :find_object_by_uuid, :only => [:graph]
+  skip_before_filter :find_object_by_uuid, :only => [:provenance]
   skip_before_filter :check_user_agreements, :only => [:show_file]
 
-  def graph
-    index
+  def show_pane_list
+    %w(Files Attributes Metadata Provenance_graph Used_by JSON API)
   end
-
   def index
     if params[:search].andand.length.andand > 0
       tags = Link.where(any: ['contains', params[:search]])
@@ -20,7 +19,7 @@ class CollectionsController < ApplicationController
     @collection_info = {}
     @collections.each do |c|
       @collection_info[c.uuid] = {
-        tags: [],
+        tag_links: [],
         wanted: false,
         wanted_by_me: false,
         provenance: [],
@@ -32,7 +31,7 @@ class CollectionsController < ApplicationController
       info = @collection_info[link.head_uuid]
       case link.link_class
       when 'tag'
-        info[:tags] << link.name
+        info[:tag_links] << link
       when 'resources'
         info[:wanted] = true
         info[:wanted_by_me] ||= link.tail_uuid == current_user.uuid
@@ -56,53 +55,6 @@ class CollectionsController < ApplicationController
     self.response_body = FileStreamer.new opts
   end
 
-  def generate_edges(gr, uuid, edge_added = false)
-    m = /([a-f0-9]{32}(\+[0-9]+)?)(\+.*)?/.match(uuid)
-    if m  
-      # uuid is a collection
-      uuid = m[1]
-      gr += "\"#{uuid}\" [href=\"#{collection_path uuid}\"];"
-
-      Job.where(output: uuid).each do |job|
-        gr += "\"#{job.uuid}\" [href=\"#{job_path job.uuid}\"];"
-        gr += "\"#{uuid}\" -> \"#{job.uuid}\" [label=\" output\"];"
-        gr = generate_edges(gr, job.uuid)
-      end
-
-      Job.where(log: uuid).each do |job|
-        gr += "\"#{job.uuid}\" [href=\"#{job_path job.uuid}\"];"
-        gr += "\"#{uuid}\" -> \"#{job.uuid}\" [label=\" log\"];"
-        gr = generate_edges(gr, job.uuid)
-      end
-      
-    else
-      # uuid is something else
-      rsc = ArvadosBase::resource_class_for_uuid uuid
-      gr += "\"#{uuid}\" [href=\"#{rsc}/#{uuid}\"];"
-      
-      if rsc.to_s == "Job"
-        Job.where(uuid: uuid).each do |job|
-          job.script_parameters.each do |k, v|
-            gr += "\"#{job.uuid}\" [href=\"#{job_path job.uuid}\"];"
-            gr += "\"#{job.uuid}\" -> \"#{v}\" [label=\" #{k}\"];"
-            gr = generate_edges(gr, v)
-          end
-        end
-      end
-     
-      gr
-    end
-
-    Link.where(head_uuid: uuid, link_class: "provenance", name: "provided").each do |link|
-      rsc = ArvadosBase::resource_class_for_uuid link.tail_uuid
-      puts "rsc is #{rsc}"
-      gr += "\"#{link.tail_uuid}\" [href=\"#{rsc}/#{link.tail_uuid}\"];"
-      gr += "\"#{link.head_uuid}\" -> \"#{link.tail_uuid}\" [label=\" provided\"];"
-      generate_edges(gr, link.tail_uuid)
-    end
-
-    gr
-  end
 
   def show
     return super if !@object
@@ -148,28 +100,19 @@ class CollectionsController < ApplicationController
         @sourcedata[collection.uuid][:collection] = collection
       end
     end
-
-    require 'open3'
     
-    gr = "digraph {"
-    gr += "node [fontsize=8];"
-    gr += "edge [dir=back,fontsize=8];"
-    
-    gr = generate_edges(gr, @object.uuid)
-
-    gr += "}"
-    @prov_svg = ""
-
-    Open3.popen2("dot", "-Tsvg") do |stdin, stdout, wait_thr|
-      stdin.print(gr)
-      stdin.close
-      wait_thr.value
-      @prov_svg = stdout.read()
-      stdout.close()
+    Collection.where(uuid: @object.uuid).each do |u|
+      puts request
+      @prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg", 
+                                                            {:request => request,
+                                                              :direction => :bottom_up, 
+                                                              :combine_jobs => :script_only}) rescue nil
+      @used_by_svg = ProvenanceHelper::create_provenance_graph(u.used_by, "used_by_svg", 
+                                                               {:request => request,
+                                                                 :direction => :top_down, 
+                                                                 :combine_jobs => :script_only, 
+                                                                 :pdata_only => true}) rescue nil
     end
-
-    @prov_svg = @prov_svg.sub(/<\?xml.*?\?>/m, "")
-    @prov_svg = @prov_svg.sub(/<!DOCTYPE.*?>/m, "")
   end
 
   protected