X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7f3ed5e22e01b9cc8efe9ebfc79a2591b37b14d7..b6f73f7acffa9b2f37c78826ff6cee89987a7edc:/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 1e06b0a9ea..600af8d60b 100644 --- a/apps/workbench/app/controllers/projects_controller.rb +++ b/apps/workbench/app/controllers/projects_controller.rb @@ -1,4 +1,6 @@ class ProjectsController < ApplicationController + before_filter :set_share_links, if: -> { defined? @object } + def model_class Group end @@ -28,15 +30,69 @@ 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 + # Returning an array of hashes instead of an array of strings will allow + # 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 - if @user_is_manager - %w(Data_collections Jobs_and_pipelines Pipeline_templates Subprojects Other_objects Sharing Advanced) - else - %w(Data_collections Jobs_and_pipelines Pipeline_templates Subprojects Other_objects Advanced) + pane_list = [ + { + :name => 'Data_collections', + :filters => [%w(uuid is_a arvados#collection)] + }, + { + :name => 'Jobs_and_pipelines', + :filters => [%w(uuid is_a) + [%w(arvados#job arvados#pipelineInstance)]] + }, + { + :name => 'Pipeline_templates', + :filters => [%w(uuid is_a arvados#pipelineTemplate)] + }, + { + :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 => 'Sharing', + :count => @share_links.count } if @user_is_manager + pane_list << { :name => 'Advanced' } + end + + # Called via AJAX and returns Javascript that populates tab counts into tab titles. + # References #show_pane_list action which should return an array of hashes each with :name + # and then optionally a :filters to run or a straight up :count + # + # This action could easily be moved to the ApplicationController to genericize the tab_counts behaviour, + # but one or more new routes would have to be created, the js.erb would also have to be moved + def tab_counts + @tab_counts = {} + show_pane_list.each do |pane| + if pane.is_a?(Hash) + if pane[:count] + @tab_counts[pane[:name]] = pane[:count] + elsif pane[:filters] + @tab_counts[pane[:name]] = @object.contents(filters: pane[:filters]).items_available + end + end end end @@ -71,8 +127,23 @@ class ProjectsController < ApplicationController if 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 @@ -112,7 +183,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| @@ -121,7 +198,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 @@ -129,16 +206,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 @@ -149,7 +237,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) @@ -160,17 +250,6 @@ class ProjectsController < ApplicationController return render_not_found("object not found") end - @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 - if params[:partial] load_contents_objects respond_to do |f|