X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c203e53c2929c2ddf1b079ec077364f8f4d23c40..a11c56ef66604a9117e3db8c2fa2273c98f88b51:/apps/workbench/app/controllers/projects_controller.rb diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb index 323f2a189a..abba785f07 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,5 +1,9 @@ class ProjectsController < ApplicationController before_filter :set_share_links, if: -> { defined? @object } + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + %w(show tab_counts).include? ctrl.action_name + } def model_class Group @@ -30,19 +34,6 @@ class ProjectsController < ApplicationController end end - def set_share_links - @user_is_manager = false - @share_links = [] - if @object.uuid != current_user.uuid - begin - @share_links = Link.permissions_for(@object) - @user_is_manager = true - rescue ArvadosApiClient::AccessForbiddenException, - ArvadosApiClient::NotFoundException - end - end - end - def index_pane_list %w(Projects) end @@ -51,27 +42,32 @@ class ProjectsController < ApplicationController # us to tell the interface to get counts for each pane (using :filters). # It also seems to me that something like these could be used to configure the contents of the panes. def show_pane_list - pane_list = [ + pane_list = [] + pane_list << { :name => 'Data_collections', :filters => [%w(uuid is_a arvados#collection)] - }, + } + pane_list << { :name => 'Jobs_and_pipelines', :filters => [%w(uuid is_a) + [%w(arvados#job arvados#pipelineInstance)]] - }, + } + pane_list << { :name => 'Pipeline_templates', :filters => [%w(uuid is_a arvados#pipelineTemplate)] - }, + } + pane_list << { :name => 'Subprojects', :filters => [%w(uuid is_a arvados#group)] - }, - { :name => 'Other_objects', + } if current_user + pane_list << + { + :name => 'Other_objects', :filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]] - } - ] + } if current_user pane_list << { :name => 'Sharing', :count => @share_links.count } if @user_is_manager pane_list << { :name => 'Advanced' } @@ -124,11 +120,32 @@ class ProjectsController < ApplicationController @removed_uuids << link.uuid link.destroy end - if item.owner_uuid == @object.uuid + + # If this object has the 'expires_at' attribute, then simply mark it + # expired. + if item.attributes.include?("expires_at") + item.update_attributes expires_at: Time.now + @removed_uuids << item.uuid + elsif item.owner_uuid == @object.uuid # Object is owned by this project. Remove it from the project by # changing owner to the current user. - item.update_attributes owner_uuid: current_user.uuid - @removed_uuids << item.uuid + begin + item.update_attributes owner_uuid: current_user.uuid + @removed_uuids << item.uuid + rescue ArvadosApiClient::ApiErrorResponseException => e + if e.message.include? 'collection_owner_uuid_name_unique' + rename_to = item.name + ' removed from ' + + (@object.name ? @object.name : @object.uuid) + + ' at ' + Time.now.to_s + updates = {} + updates[:name] = rename_to + updates[:owner_uuid] = current_user.uuid + item.update_attributes updates + @removed_uuids << item.uuid + else + raise + end + end end end end @@ -168,7 +185,13 @@ class ProjectsController < ApplicationController # page, and use the last item on this page as a filter for # retrieving the next page. Ideally the API would do this for # us, but it doesn't (yet). - nextpage_operator = /\bdesc$/i =~ @order[0] ? '<' : '>' + + # To avoid losing items that have the same created_at as the + # last item on this page, we retrieve an overlapping page with a + # "created_at <= last_created_at" filter, then remove duplicates + # with a "uuid not in [...]" filter (see below). + nextpage_operator = /\bdesc$/i =~ @order[0] ? '<=' : '>=' + @objects = [] @name_link_for = {} kind_filters.each do |attr,op,val| @@ -177,7 +200,7 @@ class ProjectsController < ApplicationController limit: @limit, include_linked: true, filters: (@filters - kind_filters + [['uuid', 'is_a', type]]), - offset: @offset) + ) objects.each do |object| @name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first end @@ -185,16 +208,27 @@ class ProjectsController < ApplicationController end end @objects = @objects.to_a.sort_by(&:created_at) - @objects.reverse! if nextpage_operator == '<' + @objects.reverse! if nextpage_operator == '<=' @objects = @objects[0..@limit-1] @next_page_filters = @filters.reject do |attr,op,val| - attr == 'created_at' and op == nextpage_operator + (attr == 'created_at' and op == nextpage_operator) or + (attr == 'uuid' and op == 'not in') end + if @objects.any? + last_created_at = @objects.last.created_at + + last_uuids = [] + @objects.each do |obj| + last_uuids << obj.uuid if obj.created_at.eql?(last_created_at) + end + @next_page_filters += [['created_at', nextpage_operator, - @objects.last.created_at]] + last_created_at]] + @next_page_filters += [['uuid', 'not in', last_uuids]] @next_page_href = url_for(partial: :contents_rows, + limit: @limit, filters: @next_page_filters.to_json) else @next_page_href = nil @@ -205,7 +239,9 @@ class ProjectsController < ApplicationController include_linked: true, filters: @filters, offset: @offset) - @next_page_href = next_page_href(partial: :contents_rows) + @next_page_href = next_page_href(partial: :contents_rows, + filters: @filters.to_json, + order: @order.to_json) end preload_links_for_objects(@objects.to_a) @@ -270,37 +306,4 @@ class ProjectsController < ApplicationController end objects_and_names end - - def share_with - if not params[:uuids].andand.any? - @errors = ["No user/group UUIDs specified to share with."] - return render_error(status: 422) - end - results = {"success" => [], "errors" => []} - params[:uuids].each do |shared_uuid| - begin - Link.create(tail_uuid: shared_uuid, link_class: "permission", - name: "can_read", head_uuid: @object.uuid) - rescue ArvadosApiClient::ApiError => error - error_list = error.api_response.andand[:errors] - if error_list.andand.any? - results["errors"] += error_list.map { |e| "#{shared_uuid}: #{e}" } - else - error_code = error.api_status || "Bad status" - results["errors"] << "#{shared_uuid}: #{error_code} response" - end - else - results["success"] << shared_uuid - end - end - if results["errors"].empty? - results.delete("errors") - status = 200 - else - status = 422 - end - respond_to do |f| - f.json { render(json: results, status: status) } - end - end end