X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/aafa79beddaf4a1e94a502eda1f668ebec39e3d3..3b3c3a0869c2cf528b9e1c45c969bbbd47f6446e:/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 f68250ba15..0a40f58f21 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -13,6 +13,7 @@ class ApplicationController < ActionController::Base # 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 @@ -213,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 @@ -224,11 +232,18 @@ class ApplicationController < ActionController::Base objects = @objects end if objects.respond_to?(:result_offset) and - objects.respond_to?(:result_limit) and - objects.respond_to?(:items_available) + objects.respond_to?(:result_limit) next_offset = objects.result_offset + objects.result_limit - if next_offset < objects.items_available + if objects.respond_to?(:items_available) and (next_offset < objects.items_available) next_offset + elsif @objects.results.size > 0 and (params[:count] == 'none' or + (params[:controller] == 'search' and params[:action] == 'choose')) + last_object_class = @objects.last.class + if params['last_object_class'].nil? or params['last_object_class'] == last_object_class.to_s + next_offset + else + @objects.select{|obj| obj.class == last_object_class}.size + end else nil end @@ -760,7 +775,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| @@ -856,12 +875,14 @@ class ApplicationController < ActionController::Base 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"]) + 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) @@ -893,7 +914,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 = [] @@ -908,7 +929,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 @@ -919,12 +940,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'} @@ -1213,8 +1234,15 @@ class ApplicationController < ActionController::Base @objects_for[obj.name] = obj end else + key_prefix = "request_#{Thread.current.object_id}_#{dataclass.to_s}_" dataclass.where(uuid: uuids).each do |obj| @objects_for[obj.uuid] = obj + if dataclass == Collection + # The collecions#index defaults to "all attributes except manifest_text" + # Hence, this object is not suitable for preloading the find() cache. + else + Rails.cache.write(key_prefix + obj.uuid, obj.as_json) + end end end @objects_for @@ -1229,6 +1257,49 @@ class ApplicationController < ActionController::Base end end + # helper method to get the names of collection files selected + helper_method :selected_collection_files + def selected_collection_files params + link_uuids, coll_ids = params["selection"].partition do |sel_s| + ArvadosBase::resource_class_for_uuid(sel_s) == Link + end + + unless link_uuids.empty? + Link.select([:head_uuid]).where(uuid: link_uuids).each do |link| + if ArvadosBase::resource_class_for_uuid(link.head_uuid) == Collection + coll_ids << link.head_uuid + end + end + end + + uuids = [] + pdhs = [] + source_paths = Hash.new { |hash, key| hash[key] = [] } + coll_ids.each do |coll_id| + if m = CollectionsHelper.match(coll_id) + key = m[1] + m[2] + pdhs << key + source_paths[key] << m[4] + elsif m = CollectionsHelper.match_uuid_with_optional_filepath(coll_id) + key = m[1] + uuids << key + source_paths[key] << m[4] + end + end + + unless pdhs.empty? + Collection.where(portable_data_hash: pdhs.uniq). + select([:uuid, :portable_data_hash]).each do |coll| + unless source_paths[coll.portable_data_hash].empty? + uuids << coll.uuid + source_paths[coll.uuid] = source_paths.delete(coll.portable_data_hash) + end + end + end + + [uuids, source_paths] + end + def wiselinks_layout 'body' end