X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4be4c3e8ee1645a59b5769ffd9ce7abdc6da03cd..21598295f38998d8028aaa117f192de6b5758808:/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 cf9f22334e..ee3ac4d681 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -7,18 +7,19 @@ 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 # skip_around_filter :require_thread_api_token around_filter :require_thread_api_token, except: ERROR_ACTIONS + before_filter :ensure_arvados_api_exists, only: [:index, :show] before_filter :set_cache_buster before_filter :accept_uuid_as_id_param, except: ERROR_ACTIONS before_filter :check_user_agreements, except: ERROR_ACTIONS before_filter :check_user_profile, except: ERROR_ACTIONS before_filter :load_filters_and_paging_params, except: ERROR_ACTIONS before_filter :find_object_by_uuid, except: [:create, :index, :choose] + ERROR_ACTIONS - before_filter :set_client_session_id, except: ERROR_ACTIONS theme :select_theme begin @@ -32,12 +33,6 @@ class ApplicationController < ActionController::Base with: :render_exception) end - def set_client_session_id - # Session ID format: '-<9_digits_random_number>' - client_session_id = "#{Time.new.to_i}-#{sprintf('%09d', rand(0..10**9-1))}" - Thread.current[:client_session_id] = client_session_id - end - def set_cache_buster response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate" response.headers["Pragma"] = "no-cache" @@ -219,6 +214,13 @@ class ApplicationController < ActionController::Base end end + def ensure_arvados_api_exists + if model_class.is_a?(Class) && model_class < ArvadosBase && !model_class.api_exists?(params['action'].to_sym) + @errors = ["#{params['action']} method is not supported for #{params['controller']}"] + return render_error(status: 404) + end + end + def index find_objects_for_index if !@objects render_index @@ -532,16 +534,17 @@ class ApplicationController < ActionController::Base begin if not model_class @object = nil + elsif params[:uuid].nil? or params[:uuid].empty? + @object = nil elsif not params[:uuid].is_a?(String) @object = model_class.where(uuid: params[:uuid]).first - elsif params[:uuid].empty? - @object = nil elsif (model_class != Link and resource_class_for_uuid(params[:uuid]) == Link) @name_link = Link.find(params[:uuid]) @object = model_class.find(@name_link.head_uuid) else @object = model_class.find(params[:uuid]) + load_preloaded_objects [@object] end rescue ArvadosApiClient::NotFoundException, ArvadosApiClient::NotLoggedInException, RuntimeError => error if error.is_a?(RuntimeError) and (error.message !~ /^argument to find\(/) @@ -765,7 +768,11 @@ class ApplicationController < ActionController::Base } @@notification_tests.push lambda { |controller, current_user| - PipelineInstance.limit(1).where(created_by: current_user.uuid).each do + if PipelineInstance.api_exists?(:index) + PipelineInstance.limit(1).where(created_by: current_user.uuid).each do + return nil + end + else return nil end return lambda { |view| @@ -775,7 +782,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 @@ -861,11 +868,14 @@ class ApplicationController < ActionController::Base def recent_processes lim lim = 12 if lim.nil? - pipelines = PipelineInstance.limit(lim).order(["created_at desc"]) + procs = {} + if PipelineInstance.api_exists?(:index) + 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"]) + pipelines.results.each { |pi| procs[pi] = pi.created_at } + end 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) @@ -873,7 +883,7 @@ class ApplicationController < ActionController::Base 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 @@ -897,7 +907,7 @@ class ApplicationController < ActionController::Base # 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 + def my_wanted_projects(user, page_size=100) return @my_wanted_projects if @my_wanted_projects from_top = [] @@ -912,7 +922,7 @@ class ApplicationController < ActionController::Base 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 } + uuids = current_level.results.collect(&:uuid) depth += 1 if depth >= 3 @reached_level_limit = true @@ -923,12 +933,12 @@ class ApplicationController < ActionController::Base end helper_method :my_wanted_projects_tree - def my_wanted_projects_tree user, page_size=100 - build_my_wanted_projects_tree user, page_size + 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_my_wanted_projects_tree user, page_size=100 + 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'} @@ -1185,15 +1195,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_attr=nil raise ArgumentError, 'No input argument dataclass' unless (dataclass && uuid) - preload_objects_for_dataclass(dataclass, [uuid]) + preload_objects_for_dataclass(dataclass, [uuid], by_attr) @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_attr=nil @objects_for ||= {} raise ArgumentError, 'Argument is not a data class' unless dataclass.is_a? Class @@ -1210,13 +1220,36 @@ 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_attr and ![:uuid, :name].include?(by_attr) + raise ArgumentError, "Preloading only using lookups by uuid or name are supported: #{by_attr}" + elsif by_attr and by_attr == :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