Advertise filters param in discovery doc.

[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 c87d60b13beb444b176648813e4cc19b7246fa61..b6997b97595d59c1f3f905995628e34da381e224 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,93 +55,6 @@ class CollectionsController < ApplicationController
     self.response_body = FileStreamer.new opts
   end
 
-  def describe_node(uuid)
-    rsc = ArvadosBase::resource_class_for_uuid uuid
-    "\"#{uuid}\" [label=\"#{rsc}\\n#{uuid}\",href=\"#{url_for rsc}/#{uuid}\"];"    
-  end
-
-  def describe_script(job)
-    #"""\"#{job.script_version}\" [label=\"#{job.script}: #{job.script_version}\"];
-    #   \"#{job.uuid}\" -> \"#{job.script_version}\" [label=\"script\"];"""
-    "\"#{job.uuid}\" [label=\"#{job.script}\\n#{job.script_version}\"];"
-  end
-
-  def job_uuid(job)
-    "#{job.script}\\n#{job.script_version}"
-  end
-
-  def collection_uuid(uuid)
-    m = /([a-f0-9]{32}(\+[0-9]+)?)(\+.*)?/.match(uuid)
-    if m
-      m[1]
-    else
-      nil
-    end
-  end
-
-  def script_param_edges(gr, job, prefix, sp)
-      case sp
-      when Hash
-        sp.each do |k, v|
-        if prefix.size > 0
-          k = prefix + "::" + k.to_s
-        end
-        gr = script_param_edges(gr, job, k.to_s, v)
-      end
-      when Array
-        sp.each do |k|
-          gr = script_param_edges(gr, job, prefix, k)
-        end
-      else
-        m = collection_uuid(sp)
-        v = m if m
-        gr += "\"#{job_uuid(job)}\" -> \"#{v}\" [label=\" #{prefix}\"];"
-        gr = generate_edges(gr, v)
-      end
-    gr
-  end
-
-  def generate_edges(gr, uuid, edge_added = false)
-    m = collection_uuid(uuid)
-    if m  
-      # uuid is a collection
-      uuid = m
-      gr += describe_node(uuid)
-
-      Job.where(output: uuid).each do |job|
-        #gr += describe_node(job_uuid(job)) 
-        gr += "\"#{uuid}\" -> \"#{job_uuid(job)}\" [label=\" output\"];"
-        gr = generate_edges(gr, job.uuid)
-      end
-
-      Job.where(log: uuid).each do |job|
-        #gr += describe_node(job_uuid(job))
-        gr += "\"#{uuid}\" -> \"#{job_uuid(job)}\" [label=\" log\"];"
-        gr = generate_edges(gr, job.uuid)
-      end
-      
-    else
-      # uuid is something else
-      rsc = ArvadosBase::resource_class_for_uuid uuid
-
-      if rsc == Job
-        Job.where(uuid: uuid).each do |job|
-          gr = script_param_edges(gr, job, "", job.script_parameters)
-          #gr += describe_script(job)
-        end
-      else
-        gr += describe_node(uuid)
-      end
-    end
-
-    Link.where(head_uuid: uuid, link_class: "provenance").each do |link|
-      gr += describe_node(link.tail_uuid)
-      gr += "\"#{link.head_uuid}\" -> \"#{link.tail_uuid}\" [label=\" #{link.name}\", href=\"/links/#{link.uuid}\"];"
-      gr = generate_edges(gr, link.tail_uuid)
-    end
-
-    gr
-  end
 
   def show
     return super if !@object
@@ -188,29 +100,11 @@ class CollectionsController < ApplicationController
         @sourcedata[collection.uuid][:collection] = collection
       end
     end
-
-    require 'open3'
     
-    gr = """strict digraph {
-//rankdir=LR;
-node [fontsize=8,shape=box];
-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|
+      @prov_svg = ProvenanceHelper::create_provenance_graph u.provenance, "provenance_svg", {:direction => :top_down, :combine_jobs => :script_only} rescue nil
+      @used_by_svg = ProvenanceHelper::create_provenance_graph u.used_by, "used_by_svg", {: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