X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f3f96f2c0c57a7793428d168668f5b4cc130ab4f..e69f517dbd5ad9bac104d42479d8ef2f515b398e:/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 1fc15807c9..d0ecfe9af1 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,6 +90,7 @@ class ApplicationController < ActionController::Base # exception here than in a template.) unless current_user.nil? begin + my_starred_projects current_user build_my_wanted_projects_tree current_user rescue ArvadosApiClient::ApiError # Fall back to the default-setting code later. @@ -96,8 +98,6 @@ class ApplicationController < ActionController::Base end @starred_projects ||= [] @my_wanted_projects_tree ||= [] - @my_project_tree ||= [] - @shared_project_tree ||= [] render_error(err_opts) end @@ -116,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 @@ -242,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") @@ -505,7 +527,7 @@ class ApplicationController < ActionController::Base if not model_class @object = nil elsif not params[:uuid].is_a?(String) - @object = model_class.where(uuid: params[:uuid]).first + @object = object_for_dataclass(model_class, params[:uuid]) elsif params[:uuid].empty? @object = nil elsif (model_class != Link and @@ -513,7 +535,7 @@ class ApplicationController < ActionController::Base @name_link = Link.find(params[:uuid]) @object = model_class.find(@name_link.head_uuid) else - @object = model_class.find(params[:uuid]) + @object = object_for_dataclass(model_class, params[:uuid]) end rescue ArvadosApiClient::NotFoundException, ArvadosApiClient::NotLoggedInException, RuntimeError => error if error.is_a?(RuntimeError) and (error.message !~ /^argument to find\(/) @@ -747,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 @notifications ||= @@notification_tests.map do |t| t.call(self, current_user) end.compact @@ -829,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 @@ -850,7 +882,7 @@ class ApplicationController < ActionController::Base 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 } + uuids = links.collect { |x| x.head_uuid } starred_projects = Group.filter([['uuid', 'in', uuids]]).order('name') @starred_projects = starred_projects.results end @@ -928,57 +960,6 @@ class ApplicationController < ActionController::Base sorted_paths.call buildtree.call(children_of, 'me') end - helper_method :my_project_tree - def my_project_tree - build_project_trees - @my_project_tree - end - - helper_method :shared_project_tree - def shared_project_tree - build_project_trees - @shared_project_tree - 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| - 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 - not parent_of.has_key? ob.owner_uuid - parent_of[ob.uuid] = false - end - children_of[parent_of[ob.uuid]] ||= [] - children_of[parent_of[ob.uuid]] << ob - end - buildtree = lambda do |children_of, root_uuid=false| - tree = {} - children_of[root_uuid].andand.each do |ob| - tree[ob] = buildtree.call(children_of, ob.uuid) - end - tree - end - sorted_paths = lambda do |tree, depth=0| - paths = [] - tree.keys.sort_by { |ob| - ob.is_a?(String) ? ob : ob.friendly_link_name - }.each do |ob| - paths << {object: ob, depth: depth} - paths += sorted_paths.call tree[ob], depth+1 - end - paths - end - @my_project_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 def get_object uuid if @get_object.nil? and @objects @@ -1199,15 +1180,15 @@ class ApplicationController < ActionController::Base # helper method to get object of a given dataclass and uuid helper_method :object_for_dataclass - def object_for_dataclass dataclass, uuid + def object_for_dataclass dataclass, uuid, by_name=nil raise ArgumentError, 'No input argument dataclass' unless (dataclass && uuid) - preload_objects_for_dataclass(dataclass, [uuid]) + preload_objects_for_dataclass(dataclass, [uuid], by_name) @objects_for[uuid] end # helper method to preload objects for given dataclass and uuids helper_method :preload_objects_for_dataclass - def preload_objects_for_dataclass dataclass, uuids + def preload_objects_for_dataclass dataclass, uuids, by_name=nil @objects_for ||= {} raise ArgumentError, 'Argument is not a data class' unless dataclass.is_a? Class @@ -1224,13 +1205,34 @@ class ApplicationController < ActionController::Base uuids.each do |x| @objects_for[x] = nil end - dataclass.where(uuid: uuids).each do |obj| - @objects_for[obj.uuid] = obj + if by_name + dataclass.where(name: uuids).each do |obj| + @objects_for[obj.name] = obj + end + else + dataclass.where(uuid: uuids).each do |obj| + @objects_for[obj.uuid] = obj + end end @objects_for end + # helper method to load objects that are already preloaded + helper_method :load_preloaded_objects + def load_preloaded_objects objs + @objects_for ||= {} + objs.each do |obj| + @objects_for[obj.uuid] = obj + end + end + 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