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 a5fed9d9a368cbc7194d4db2b50e7cd2de19de62..d46ec0354ccba317211342dd60c0c0d692ba4333 100644 (file)
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,44 +1,46 @@
 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
-    @collections = Collection.limit(100).to_hash
-    @links = Link.eager.limit(100).where(head_kind: 'arvados#collection', link_class: 'resources', name: 'wants') |
-      Link.eager.limit(100).where(tail_kind: 'arvados#collection', link_class: 'data_origin')
-    @collections.merge!(Collection.
-                        limit(100).
-                        where(uuid: @links.select{|x|x.head_kind=='arvados#collection'}.collect(&:head_uuid) |
-                              @links.select{|x|x.tail_kind=='arvados#collection'}.collect(&:tail_uuid)).
-                        to_hash)
+    if params[:search].andand.length.andand > 0
+      tags = Link.where(any: ['contains', params[:search]])
+      @collections = (Collection.where(uuid: tags.collect(&:head_uuid)) |
+                      Collection.where(any: ['contains', params[:search]])).
+        uniq { |c| c.uuid }
+    else
+      @collections = Collection.limit(100)
+    end
+    @links = Link.limit(1000).
+      where(head_uuid: @collections.collect(&:uuid))
     @collection_info = {}
-    @collections.each do |uuid, c|
-      ci = (@collection_info[uuid] ||= {uuid: uuid})
-      ci[:created_at] = c.created_at
+    @collections.each do |c|
+      @collection_info[c.uuid] = {
+        tag_links: [],
+        wanted: false,
+        wanted_by_me: false,
+        provenance: [],
+        links: []
+      }
     end
-    @links.each do |l|
-      if l.head_kind == 'arvados#collection'
-        c = (@collection_info[l.head_uuid] ||= {uuid: l.head_uuid})
-        if l.link_class == 'resources' and l.name == 'wants'
-          if l.head.respond_to? :created_at
-            c[:created_at] = l.head.created_at
-          end
-          c[:wanted] = true
-          if l.owner_uuid == current_user.uuid
-            c[:wanted_by_me] = true
-          end
-        end
-      end
-      if l.tail_kind == 'arvados#collection'
-        c = (@collection_info[l.tail_uuid] ||= {uuid: l.tail_uuid})
-        if l.link_class == 'data_origin'
-          c[:origin] = l
-        end
+    @links.each do |link|
+      @collection_info[link.head_uuid] ||= {}
+      info = @collection_info[link.head_uuid]
+      case link.link_class
+      when 'tag'
+        info[:tag_links] << link
+      when 'resources'
+        info[:wanted] = true
+        info[:wanted_by_me] ||= link.tail_uuid == current_user.uuid
+      when 'provenance'
+        info[:provenance] << link.name
       end
+      info[:links] << link
     end
+    @request_url = request.url
   end
 
   def show_file
@@ -48,9 +50,12 @@ class CollectionsController < ApplicationController
     end
     self.response.headers['Content-Type'] =
       Rack::Mime::MIME_TYPES[ext] || 'application/octet-stream'
+    self.response.headers['Content-Length'] = params[:size] if params[:size]
+    self.response.headers['Content-Disposition'] = params[:disposition] if params[:disposition]
     self.response_body = FileStreamer.new opts
   end
 
+
   def show
     return super if !@object
     @provenance = []
@@ -95,6 +100,19 @@ class CollectionsController < ApplicationController
         @sourcedata[collection.uuid][:collection] = collection
       end
     end
+    
+    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
   end
 
   protected
@@ -121,7 +139,7 @@ class CollectionsController < ApplicationController
           yield buf
         end
       end
-      Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}: $?") if $? != 0
+      Rails.logger.warn("#{@opts[:uuid]}/#{@opts[:file]}: #{$?}") if $? != 0
     end
   end
 end