X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e843017b451f1270c58539512e227c4da5656e25..5dbf72803717f58b4848b6a6490375450916e84d:/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 d502d5a698..8d15bb1c50 100644 --- a/services/api/app/controllers/arvados/v1/groups_controller.rb +++ b/services/api/app/controllers/arvados/v1/groups_controller.rb @@ -14,7 +14,7 @@ class Arvados::V1::GroupsController < ApplicationController (super rescue {}). merge({ include_trash: { - type: 'boolean', required: false, description: "Include items whose is_trashed attribute is true." + type: 'boolean', required: false, default: false, description: "Include items whose is_trashed attribute is true.", }, }) end @@ -23,7 +23,7 @@ class Arvados::V1::GroupsController < ApplicationController (super rescue {}). merge({ include_trash: { - type: 'boolean', required: false, description: "Show group/project even if its is_trashed attribute is true." + type: 'boolean', required: false, default: false, description: "Show group/project even if its is_trashed attribute is true.", }, }) end @@ -32,13 +32,16 @@ class Arvados::V1::GroupsController < ApplicationController params = _index_requires_parameters. merge({ uuid: { - type: 'string', required: false, default: nil + type: 'string', required: false, default: nil, }, recursive: { - type: 'boolean', required: false, description: 'Include contents from child groups recursively.' + type: 'boolean', required: false, default: false, description: 'Include contents from child groups recursively.', }, include: { - type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid)' + type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid).', + }, + include_old_versions: { + type: 'boolean', required: false, default: false, description: 'Include past collection versions.', } }) params.delete(:select) @@ -53,7 +56,7 @@ class Arvados::V1::GroupsController < ApplicationController type: 'boolean', location: 'query', default: false, - description: 'defer permissions update' + description: 'defer permissions update', } } ) @@ -67,7 +70,7 @@ class Arvados::V1::GroupsController < ApplicationController type: 'boolean', location: 'query', default: false, - description: 'defer permissions update' + description: 'defer permissions update', } } ) @@ -124,9 +127,11 @@ class Arvados::V1::GroupsController < ApplicationController :self_link => "", :offset => @offset, :limit => @limit, - :items_available => @items_available, :items => @objects.as_api_response(nil) } + if params[:count] != 'none' + list[:items_available] = @items_available + end if @extra_included list[:included] = @extra_included.as_api_response(nil, {select: @select}) end @@ -183,6 +188,13 @@ class Arvados::V1::GroupsController < ApplicationController # apply to each table being searched, not "groups". load_limit_offset_order_params(fill_table_names: false) + if params['count'] == 'none' and @offset != 0 and (params['last_object_class'].nil? or params['last_object_class'].empty?) + # can't use offset without getting counts, so + # fall back to count=exact behavior. + params['count'] = 'exact' + set_count_none = true + end + # Trick apply_where_limit_order_params into applying suitable # per-table values. *_all are the real ones we'll apply to the # aggregate set. @@ -204,7 +216,7 @@ class Arvados::V1::GroupsController < ApplicationController table_names = Hash[klasses.collect { |k| [k, k.table_name] }] disabled_methods = Rails.configuration.API.DisabledAPIs - avail_klasses = table_names.select{|k, t| !disabled_methods.include?(t+'.index')} + avail_klasses = table_names.select{|k, t| !disabled_methods[t+'.index']} klasses = avail_klasses.keys request_filters.each do |col, op, val| @@ -241,9 +253,7 @@ class Arvados::V1::GroupsController < ApplicationController seen_last_class = false klasses.each do |klass| - @offset = 0 if seen_last_class # reset offset for the new next type being processed - - # if current klass is same as params['last_object_class'], mark that fact + # check if current klass is same as params['last_object_class'] seen_last_class = true if((params['count'].andand.==('none')) and (params['last_object_class'].nil? or params['last_object_class'].empty? or @@ -252,7 +262,9 @@ class Arvados::V1::GroupsController < ApplicationController # if klasses are specified, skip all other klass types next if wanted_klasses.any? and !wanted_klasses.include?(klass.to_s) - # don't reprocess klass types that were already seen + # if specified, and count=none, then only look at the klass in + # last_object_class. + # for whatever reason, this parameter exists separately from 'wanted_klasses' next if params['count'] == 'none' and !seen_last_class # don't process rest of object types if we already have needed number of objects @@ -268,9 +280,9 @@ class Arvados::V1::GroupsController < ApplicationController @select = nil where_conds = filter_by_owner if klass == Collection - @select = klass.selectable_attributes - ["manifest_text"] + @select = klass.selectable_attributes - ["manifest_text", "unsigned_manifest_text"] elsif klass == Group - where_conds = where_conds.merge(group_class: "project") + where_conds = where_conds.merge(group_class: ["project","filter"]) end @filters = request_filters.map do |col, op, val| @@ -283,20 +295,30 @@ class Arvados::V1::GroupsController < ApplicationController end end.compact - @objects = klass.readable_by(*@read_users, {:include_trash => params[:include_trash]}). - order(request_order).where(where_conds) + @objects = klass.readable_by(*@read_users, { + :include_trash => params[:include_trash], + :include_old_versions => params[:include_old_versions] + }).order(request_order).where(where_conds) if params['exclude_home_project'] @objects = exclude_home @objects, klass end + # Adjust the limit based on number of objects fetched so far klass_limit = limit_all - all_objects.count @limit = klass_limit apply_where_limit_order_params klass + + # This actually fetches the objects klass_object_list = object_list(model_class: klass) + + # If count=none, :items_available will be nil, and offset is + # required to be 0. klass_items_available = klass_object_list[:items_available] || 0 @items_available += klass_items_available @offset = [@offset - klass_items_available, 0].max + + # Add objects to the list of objects to be returned. all_objects += klass_object_list[:items] if klass_object_list[:limit] < klass_limit @@ -320,6 +342,10 @@ class Arvados::V1::GroupsController < ApplicationController @extra_included = included_by_uuid.values end + if set_count_none + params['count'] = 'none' + end + @objects = all_objects @limit = limit_all @offset = offset_all