X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/19f9424903f6b4997dc5a6c299faf70d5fdf4744..3e95703e7444c1d2077eba748740ebe3df94b1d5:/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 3e238a5ada..e9bc006a36 100644 --- a/services/api/app/controllers/arvados/v1/groups_controller.rb +++ b/services/api/app/controllers/arvados/v1/groups_controller.rb @@ -10,6 +10,8 @@ class Arvados::V1::GroupsController < ApplicationController skip_before_action :find_object_by_uuid, only: :shared skip_before_action :render_404_if_no_object, only: :shared + TRASHABLE_CLASSES = ['project'] + def self._index_requires_parameters (super rescue {}). merge({ @@ -32,13 +34,16 @@ class Arvados::V1::GroupsController < ApplicationController params = _index_requires_parameters. merge({ uuid: { - type: 'string', required: false, default: nil, + type: 'string', required: false, default: '', }, recursive: { 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) @@ -96,6 +101,15 @@ class Arvados::V1::GroupsController < ApplicationController end end + def destroy + if !TRASHABLE_CLASSES.include?(@object.group_class) + @object.destroy + show + else + super # Calls destroy from TrashableController module + end + end + def render_404_if_no_object if params[:action] == 'contents' if !params[:uuid] @@ -124,9 +138,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 +199,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. @@ -240,10 +263,11 @@ class Arvados::V1::GroupsController < ApplicationController included_by_uuid = {} seen_last_class = false - klasses.each do |klass| - @offset = 0 if seen_last_class # reset offset for the new next type being processed + error_by_class = {} + any_success = false - # if current klass is same as params['last_object_class'], mark that fact + klasses.each do |klass| + # 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 +276,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 +294,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 +309,42 @@ 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 + + begin + apply_where_limit_order_params klass + rescue ArgumentError => e + if e.inspect =~ /Invalid attribute '.+' for operator '.+' in filter/ or + e.inspect =~ /Invalid attribute '.+' for subproperty filter/ + error_by_class[klass.name] = e + next + end + raise + else + any_success = true + end + + # 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 @@ -316,17 +364,27 @@ class Arvados::V1::GroupsController < ApplicationController end end + # Only error out when every searchable object type errored out + if !any_success && error_by_class.size > 0 + error_msg = error_by_class.collect do |klass, err| + "#{err} on object type #{klass}" + end.join("\n") + raise ArgumentError.new(error_msg) + end + if params["include"] @extra_included = included_by_uuid.values end + if set_count_none + params['count'] = 'none' + end + @objects = all_objects @limit = limit_all @offset = offset_all end - protected - def exclude_home objectlist, klass # select records that are readable by current user AND # the owner_uuid is a user (but not the current user) OR