X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8d2aebfd3a0e4814b292659710386f949cafe092..d68cb1845e82f44ecf126ae4fd1ba3abc00f4463:/apps/workbench/app/controllers/application_controller.rb diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb index db3d43040c..5b3f3f59ec 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base ERROR_ACTIONS = [:render_error, :render_not_found] + prepend_before_filter :set_current_request_id, except: ERROR_ACTIONS around_filter :thread_clear around_filter :set_thread_api_token # Methods that don't require login should @@ -89,13 +90,14 @@ class ApplicationController < ActionController::Base # exception here than in a template.) unless current_user.nil? begin - build_project_trees + my_starred_projects current_user + build_my_wanted_projects_tree current_user rescue ArvadosApiClient::ApiError # Fall back to the default-setting code later. end end - @my_project_tree ||= [] - @shared_project_tree ||= [] + @starred_projects ||= [] + @my_wanted_projects_tree ||= [] render_error(err_opts) end @@ -114,7 +116,7 @@ class ApplicationController < ActionController::Base # Column names should always be qualified by a table name and a direction is optional, defaulting to asc # (e.g. "collections.name" or "collections.name desc"). # If a column name is specified, that table will be sorted by that column. - # If there are objects from different models that will be shown (such as in Jobs and Pipelines tab), + # If there are objects from different models that will be shown (such as in Pipelines and processes tab), # then a sort column name can optionally be specified for each model, passed as an comma-separated list (e.g. "jobs.script, pipeline_instances.name") # Currently only one sort column name and direction can be specified for each model. def load_filters_and_paging_params @@ -240,6 +242,28 @@ class ApplicationController < ActionController::Base end end + helper_method :next_page_filters + def next_page_filters nextpage_operator + 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]] + end + + next_page_filters + end + def show if !@object return render_not_found("object not found") @@ -444,6 +468,15 @@ class ApplicationController < ActionController::Base end end + helper_method :is_starred + def is_starred + links = Link.where(tail_uuid: current_user.uuid, + head_uuid: @object.uuid, + link_class: 'star') + + return links.andand.any? + end + protected helper_method :strip_token_from_path @@ -736,7 +769,7 @@ class ApplicationController < ActionController::Base helper_method :user_notifications def user_notifications - return [] if @errors or not current_user.andand.is_active + return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_in_dashboard @notifications ||= @@notification_tests.map do |t| t.call(self, current_user) end.compact @@ -818,14 +851,24 @@ class ApplicationController < ActionController::Base pi end - helper_method :finished_pipelines - def finished_pipelines lim - PipelineInstance.limit(lim).order(["finished_at desc"]).filter([["state", "in", ["Complete", "Failed", "Paused"]], ["finished_at", "!=", nil]]) + helper_method :recent_processes + def recent_processes lim + lim = 12 if lim.nil? + + cols = %w(uuid owner_uuid created_at modified_at pipeline_template_uuid name state started_at finished_at) + pipelines = PipelineInstance.select(cols).limit(lim).order(["created_at desc"]) + + crs = ContainerRequest.limit(lim).order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]]) + procs = {} + pipelines.results.each { |pi| procs[pi] = pi.created_at } + crs.results.each { |c| procs[c] = c.created_at } + + Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim) end helper_method :recent_collections def recent_collections lim - c = Collection.limit(lim).order(["modified_at desc"]).filter([["owner_uuid", "is_a", "arvados#group"]]) + c = Collection.limit(lim).order(["modified_at desc"]).results own = {} Group.filter([["uuid", "in", c.map(&:owner_uuid)]]).each do |g| own[g[:uuid]] = g @@ -833,27 +876,63 @@ class ApplicationController < ActionController::Base {collections: c, owners: own} end - helper_method :my_project_tree - def my_project_tree - build_project_trees - @my_project_tree + helper_method :my_starred_projects + def my_starred_projects user + return if @starred_projects + links = Link.filter([['tail_uuid', '=', user.uuid], + ['link_class', '=', 'star'], + ['head_uuid', 'is_a', 'arvados#group']]).select(%w(head_uuid)) + uuids = links.collect { |x| x.head_uuid } + starred_projects = Group.filter([['uuid', 'in', uuids]]).order('name') + @starred_projects = starred_projects.results + end + + # If there are more than 200 projects that are readable by the user, + # build the tree using only the top 200+ projects owned by the user, + # from the top three levels. + # That is: get toplevel projects under home, get subprojects of + # these projects, and so on until we hit the limit. + def my_wanted_projects user, page_size=100 + return @my_wanted_projects if @my_wanted_projects + + from_top = [] + uuids = [user.uuid] + depth = 0 + @too_many_projects = false + @reached_level_limit = false + while from_top.size <= page_size*2 + current_level = Group.filter([['group_class','=','project'], + ['owner_uuid', 'in', uuids]]) + .order('name').limit(page_size*2) + break if current_level.results.size == 0 + @too_many_projects = true if current_level.items_available > current_level.results.size + from_top.concat current_level.results + uuids = current_level.results.collect { |x| x.uuid } + depth += 1 + if depth >= 3 + @reached_level_limit = true + break + end + end + @my_wanted_projects = from_top end - helper_method :shared_project_tree - def shared_project_tree - build_project_trees - @shared_project_tree + helper_method :my_wanted_projects_tree + def my_wanted_projects_tree user, page_size=100 + build_my_wanted_projects_tree user, page_size + [@my_wanted_projects_tree, @too_many_projects, @reached_level_limit] end - def build_project_trees - return if @my_project_tree and @shared_project_tree - parent_of = {current_user.uuid => 'me'} - all_projects.each do |ob| + def build_my_wanted_projects_tree user, page_size=100 + return @my_wanted_projects_tree if @my_wanted_projects_tree + + parent_of = {user.uuid => 'me'} + my_wanted_projects(user, page_size).each do |ob| parent_of[ob.uuid] = ob.owner_uuid end - children_of = {false => [], 'me' => [current_user]} - all_projects.each do |ob| - if ob.owner_uuid != current_user.uuid and + children_of = {false => [], 'me' => [user]} + my_wanted_projects(user, page_size).each do |ob| + if ob.owner_uuid != user.uuid and not parent_of.has_key? ob.owner_uuid parent_of[ob.uuid] = false end @@ -877,11 +956,8 @@ class ApplicationController < ActionController::Base end paths end - @my_project_tree = + @my_wanted_projects_tree = sorted_paths.call buildtree.call(children_of, 'me') - @shared_project_tree = - sorted_paths.call({'Projects shared with me' => - buildtree.call(children_of, false)}) end helper_method :get_object @@ -1138,4 +1214,10 @@ class ApplicationController < ActionController::Base def wiselinks_layout 'body' end + + def set_current_request_id + # Request ID format: '-<9_digits_random_number>' + current_request_id = "#{Time.new.to_i}-#{sprintf('%09d', rand(0..10**9-1))}" + Thread.current[:current_request_id] = current_request_id + end end