X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c203e53c2929c2ddf1b079ec077364f8f4d23c40..d68cb1845e82f44ecf126ae4fd1ba3abc00f4463:/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..16212a8d0a 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,17 +1,31 @@ class ProjectsController < ApplicationController - before_filter :set_share_links, if: -> { defined? @object } + before_filter :set_share_links, if: -> { defined? @object and @object} + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + %w(show tab_counts public).include? ctrl.action_name + } def model_class Group end def find_object_by_uuid - if current_user and params[:uuid] == current_user.uuid - @object = current_user.dup - @object.uuid = current_user.uuid + if (current_user and params[:uuid] == current_user.uuid) or + (resource_class_for_uuid(params[:uuid]) == User) + if params[:uuid] != current_user.uuid + @object = User.find(params[:uuid]) + else + @object = current_user.dup + @object.uuid = current_user.uuid + end + class << @object def name - 'Home' + if current_user.uuid == self.uuid + 'Home' + else + "Home for #{self.email}" + end end def description '' @@ -30,19 +44,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 +52,35 @@ 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 = [] + if @object.uuid != current_user.andand.uuid + pane_list << 'Description' + end + 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)]] - }, + :name => 'Pipelines_and_processes', + :filters => [%w(uuid is_a) + [%w(arvados#containerRequest arvados#pipelineInstance)]] + } + pane_list << { :name => 'Pipeline_templates', - :filters => [%w(uuid is_a arvados#pipelineTemplate)] - }, + :filters => [%w(uuid is_a) + [%w(arvados#pipelineTemplate arvados#workflow)]] + } + pane_list << { :name => 'Subprojects', :filters => [%w(uuid is_a arvados#group)] - }, - { :name => 'Other_objects', - :filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]] } - ] + 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 +133,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? '_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 @@ -140,7 +170,7 @@ class ProjectsController < ApplicationController object.destroy end end - while (objects = @object.contents(include_linked: false)).any? + while (objects = @object.contents).any? objects.each do |object| object.update_attributes! owner_uuid: current_user.uuid end @@ -154,7 +184,11 @@ class ProjectsController < ApplicationController end def find_objects_for_index - @objects = all_projects + # We can use the all_projects helper, but we have to dup the + # result -- otherwise, when we apply our per-request filters and + # limits, they will infect the @all_projects cache too (see + # #6640). + @objects = all_projects.dup super end @@ -168,16 +202,25 @@ 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| (val.is_a?(Array) ? val : [val]).each do |type| + filters = @filters - kind_filters + [['uuid', 'is_a', type]] + if type == 'arvados#containerRequest' + filters = filters + [['container_requests.requesting_container_uuid', '=', nil]] + end objects = @object.contents(order: @order, limit: @limit, - include_linked: true, - filters: (@filters - kind_filters + [['uuid', 'is_a', type]]), - offset: @offset) + filters: filters, + ) objects.each do |object| @name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first end @@ -185,16 +228,13 @@ 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 - end + if @objects.any? - @next_page_filters += [['created_at', - nextpage_operator, - @objects.last.created_at]] + @next_page_filters = next_page_filters(nextpage_operator) @next_page_href = url_for(partial: :contents_rows, + limit: @limit, filters: @next_page_filters.to_json) else @next_page_href = nil @@ -202,10 +242,11 @@ class ProjectsController < ApplicationController else @objects = @object.contents(order: @order, limit: @limit, - 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) @@ -271,36 +312,10 @@ class ProjectsController < ApplicationController 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) } + def public # Yes 'public' is the name of the action for public projects + return render_not_found if not Rails.configuration.anonymous_user_token or not Rails.configuration.enable_public_projects_page + @objects = using_specific_api_token Rails.configuration.anonymous_user_token do + Group.where(group_class: 'project').order("updated_at DESC") end end end