X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c7a21e6294f1eb905ace3d717f9dcfb4d4c39f0b..231242b6378abda494f2c684995519a259cfe174:/services/api/app/controllers/arvados/v1/groups_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index da82e81ef8..2356f2eece 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -1,63 +1,100 @@
 class Arvados::V1::GroupsController < ApplicationController
 
   def self._contents_requires_parameters
-    _index_requires_parameters.
+    params = _index_requires_parameters.
       merge({
-              include_linked: {
-                type: 'boolean', required: false, default: false
+              uuid: {
+                type: 'string', required: false, default: nil
               },
             })
+    params.delete(:select)
+    params
+  end
+
+  def render_404_if_no_object
+    if params[:action] == 'contents'
+      if !params[:uuid]
+        # OK!
+        @object = nil
+        true
+      elsif @object
+        # Project group
+        true
+      elsif (@object = User.where(uuid: params[:uuid]).first)
+        # "Home" pseudo-project
+        true
+      else
+        super
+      end
+    else
+      super
+    end
   end
 
   def contents
+    load_searchable_objects
+    send_json({
+      :kind => "arvados#objectList",
+      :etag => "",
+      :self_link => "",
+      :offset => @offset,
+      :limit => @limit,
+      :items_available => @items_available,
+      :items => @objects.as_api_response(nil)
+    })
+  end
+
+  protected
+
+  def load_searchable_objects
     all_objects = []
-    all_available = 0
+    @items_available = 0
 
     # Trick apply_where_limit_order_params into applying suitable
     # per-table values. *_all are the real ones we'll apply to the
     # aggregate set.
     limit_all = @limit
     offset_all = @offset
+    # save the orders from the current request as determined by load_param,
+    # but otherwise discard them because we're going to be getting objects
+    # from many models
+    request_orders = @orders.clone
     @orders = []
 
     [Group,
      Job, PipelineInstance, PipelineTemplate,
      Collection,
      Human, Specimen, Trait].each do |klass|
-      @objects = klass.readable_by(*@read_users)
-      cond_sql = "#{klass.table_name}.owner_uuid = ?"
-      cond_params = [@object.uuid]
-      if params[:include_linked]
-        cond_sql += " OR #{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'} AND links.tail_uuid=#{klass.sanitize @object.uuid})"
+      # If the currently requested orders specifically match the
+      # table_name for the current klass, apply that order.
+      # Otherwise, order by recency.
+      request_order =
+        request_orders.andand.find { |r| r =~ /^#{klass.table_name}\./i } ||
+        "created_at desc"
+
+      @select = nil
+      where_conds = {}
+      where_conds[:owner_uuid] = @object.uuid if @object
+      if klass == Collection
+        @select = klass.selectable_attributes - ["manifest_text"]
+      elsif klass == Group
+        where_conds[:group_class] = "project"
       end
-      @objects = @objects.where(cond_sql, *cond_params).order("#{klass.table_name}.uuid")
+
+      @objects = klass.readable_by(*@read_users).
+        order(request_order).where(where_conds)
       @limit = limit_all - all_objects.count
-      apply_where_limit_order_params
-      items_available = @objects.
-        except(:limit).except(:offset).
-        count(:id, distinct: true)
-      all_available += items_available
-      @offset = [@offset - items_available, 0].max
-
-      all_objects += @objects.to_a
+      apply_where_limit_order_params klass
+      klass_object_list = object_list
+      klass_items_available = klass_object_list[:items_available] || 0
+      @items_available += klass_items_available
+      @offset = [@offset - klass_items_available, 0].max
+      all_objects += klass_object_list[:items]
     end
-    @objects = all_objects || []
-    @links = Link.where('link_class=? and tail_uuid=?'\
-                        ' and head_uuid in (?)',
-                        'name',
-                        @object.uuid,
-                        @objects.collect(&:uuid))
-    @object_list = {
-      :kind  => "arvados#objectList",
-      :etag => "",
-      :self_link => "",
-      :links => @links.as_api_response(nil),
-      :offset => offset_all,
-      :limit => limit_all,
-      :items_available => all_available,
-      :items => @objects.as_api_response(nil)
-    }
-    render json: @object_list
+
+    @objects = all_objects
+    @limit = limit_all
+    @offset = offset_all
   end
 
 end