X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fa9fc5ab6440415542badc8bee0b144d698ec5cc..0eb72b526bf8bbb011551ecf019f604e17a534f1:/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 c4600f2c0f..c010123ea0 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class ProjectsController < ApplicationController before_filter :set_share_links, if: -> { defined? @object and @object} skip_around_filter :require_thread_api_token, if: proc { |ctrl| @@ -10,12 +14,22 @@ class ProjectsController < ApplicationController 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 '' @@ -43,6 +57,21 @@ class ProjectsController < ApplicationController # 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 = [] + + procs = ["arvados#containerRequest"] + procs_pane_name = 'Processes' + if PipelineInstance.api_exists?(:index) + procs << "arvados#pipelineInstance" + procs_pane_name = 'Pipelines_and_processes' + end + + workflows = ["arvados#workflow"] + workflows_pane_name = 'Workflows' + if PipelineTemplate.api_exists?(:index) + workflows << "arvados#pipelineTemplate" + workflows_pane_name = 'Pipeline_templates' + end + if @object.uuid != current_user.andand.uuid pane_list << 'Description' end @@ -53,13 +82,13 @@ class ProjectsController < ApplicationController } pane_list << { - :name => 'Jobs_and_pipelines', - :filters => [%w(uuid is_a) + [%w(arvados#job arvados#pipelineInstance)]] + :name => procs_pane_name, + :filters => [%w(uuid is_a) + [procs]] } pane_list << { - :name => 'Pipeline_templates', - :filters => [%w(uuid is_a arvados#pipelineTemplate)] + :name => workflows_pane_name, + :filters => [%w(uuid is_a) + [workflows]] } pane_list << { @@ -124,10 +153,9 @@ class ProjectsController < ApplicationController link.destroy end - # 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 + if item.class == Collection + # Use delete API on collections + item.destroy @removed_uuids << item.uuid elsif item.owner_uuid == @object.uuid # Object is owned by this project. Remove it from the project by @@ -136,7 +164,7 @@ class ProjectsController < ApplicationController item.update_attributes owner_uuid: current_user.uuid @removed_uuids << item.uuid rescue ArvadosApiClient::ApiErrorResponseException => e - if e.message.include? '_owner_uuid_name_unique' + if e.message.include? '_owner_uuid_' rename_to = item.name + ' removed from ' + (@object.name ? @object.name : @object.uuid) + ' at ' + Time.now.to_s @@ -174,7 +202,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 @@ -199,9 +231,17 @@ class ProjectsController < ApplicationController @name_link_for = {} kind_filters.each do |attr,op,val| (val.is_a?(Array) ? val : [val]).each do |type| + klass = type.split('#')[-1] + klass[0] = klass[0].capitalize + next if(!Object.const_get(klass).api_exists?(:index)) + + 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, - filters: (@filters - kind_filters + [['uuid', 'is_a', type]]), + filters: filters, ) objects.each do |object| @name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first @@ -212,23 +252,9 @@ class ProjectsController < ApplicationController @objects = @objects.to_a.sort_by(&:created_at) @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) 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, - last_created_at]] - @next_page_filters += [['uuid', 'not in', last_uuids]] + @next_page_filters = next_page_filters(nextpage_operator) @next_page_href = url_for(partial: :contents_rows, limit: @limit, filters: @next_page_filters.to_json) @@ -309,7 +335,7 @@ class ProjectsController < ApplicationController end def public # Yes 'public' is the name of the action for public projects - return render_not_found if not Rails.configuration.anonymous_user_token + 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