X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/db7c2ba7523fbce1dc47ea1a715a738a28b3bb3b..3aaefcb3c76ff470b475d950398d01255e87712a:/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 23b8788bcb..6d139cd5fd 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class ApplicationController < ActionController::Base include ArvadosApiClientHelper include ApplicationHelper @@ -7,25 +11,24 @@ 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 + around_action :thread_clear + around_action :set_current_request_id + around_action :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 + # skip_around_action :require_thread_api_token + around_action :require_thread_api_token, except: ERROR_ACTIONS + before_action :ensure_arvados_api_exists, only: [:index, :show] + before_action :set_cache_buster + before_action :accept_uuid_as_id_param, except: ERROR_ACTIONS + before_action :check_user_agreements, except: ERROR_ACTIONS + before_action :check_user_profile, except: ERROR_ACTIONS + before_action :load_filters_and_paging_params, except: ERROR_ACTIONS + before_action :find_object_by_uuid, except: [:create, :index, :choose] + ERROR_ACTIONS theme :select_theme begin rescue_from(ActiveRecord::RecordNotFound, ActionController::RoutingError, - ActionController::UnknownController, AbstractController::ActionNotFound, with: :render_not_found) rescue_from(Exception, @@ -58,6 +61,7 @@ class ApplicationController < ActionController::Base # the browser can't. f.json { render opts.merge(json: {success: false, errors: @errors}) } f.html { render({action: 'error'}.merge(opts)) } + f.all { render({action: 'error', formats: 'text'}.merge(opts)) } end end @@ -222,6 +226,7 @@ class ApplicationController < ActionController::Base end def index + @objects = nil if !defined?(@objects) find_objects_for_index if !@objects render_index end @@ -318,6 +323,7 @@ class ApplicationController < ActionController::Base end def choose + @objects = nil if !defined?(@objects) params[:limit] ||= 40 respond_to do |f| if params[:partial] @@ -349,6 +355,9 @@ class ApplicationController < ActionController::Base def update @updates ||= params[@object.resource_param_name.to_sym] + if @updates.is_a? ActionController::Parameters + @updates = @updates.to_unsafe_hash + end @updates.keys.each do |attr| if @object.send(attr).is_a? Hash if @updates[attr].is_a? String @@ -357,6 +366,9 @@ class ApplicationController < ActionController::Base if params[:merge] || params["merge_#{attr}".to_sym] # Merge provided Hash with current Hash, instead of # replacing. + if @updates[attr].is_a? ActionController::Parameters + @updates[attr] = @updates[attr].to_unsafe_hash + end @updates[attr] = @object.send(attr).with_indifferent_access. deep_merge(@updates[attr].with_indifferent_access) end @@ -487,7 +499,7 @@ class ApplicationController < ActionController::Base def is_starred links = Link.where(tail_uuid: current_user.uuid, head_uuid: @object.uuid, - link_class: 'star') + link_class: 'star').with_count("none") return links.andand.any? end @@ -532,7 +544,7 @@ class ApplicationController < ActionController::Base def accept_uuid_as_id_param - if params[:id] and params[:id].match /\D/ + if params[:id] and params[:id].match(/\D/) params[:uuid] = params.delete :id end end @@ -569,6 +581,19 @@ class ApplicationController < ActionController::Base Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/) end + def set_current_request_id + response.headers['X-Request-Id'] = + Thread.current[:request_id] = + "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19] + yield + Thread.current[:request_id] = nil + end + + def append_info_to_payload(payload) + super + payload[:request_id] = response.headers['X-Request-Id'] + end + # Set up the thread with the given API token and associated user object. def load_api_token(new_token) Thread.current[:arvados_api_token] = new_token @@ -731,14 +756,14 @@ class ApplicationController < ActionController::Base def missing_required_profile? missing_required = false - profile_config = Rails.configuration.user_profile_form_fields - if current_user && profile_config + profile_config = Rails.configuration.Workbench.UserProfileFormFields + if current_user && !profile_config.empty? current_user_profile = current_user.prefs[:profile] - profile_config.kind_of?(Array) && profile_config.andand.each do |entry| - if entry['required'] + profile_config.each do |k, entry| + if entry[:Required] if !current_user_profile || - !current_user_profile[entry['key'].to_sym] || - current_user_profile[entry['key'].to_sym].empty? + !current_user_profile[k] || + current_user_profile[k].empty? missing_required = true break end @@ -750,14 +775,14 @@ class ApplicationController < ActionController::Base end def select_theme - return Rails.configuration.arvados_theme + return Rails.configuration.Workbench.Theme end @@notification_tests = [] @@notification_tests.push lambda { |controller, current_user| - return nil if Rails.configuration.shell_in_a_box_url - AuthorizedKey.limit(1).where(authorized_user_uuid: current_user.uuid).each do + return nil if Rails.configuration.Services.WebShell.ExternalURL != URI("") + AuthorizedKey.limit(1).with_count('none').where(authorized_user_uuid: current_user.uuid).each do return nil end return lambda { |view| @@ -766,7 +791,7 @@ class ApplicationController < ActionController::Base } @@notification_tests.push lambda { |controller, current_user| - Collection.limit(1).where(created_by: current_user.uuid).each do + Collection.limit(1).with_count('none').where(created_by: current_user.uuid).each do return nil end return lambda { |view| @@ -776,7 +801,7 @@ class ApplicationController < ActionController::Base @@notification_tests.push lambda { |controller, current_user| if PipelineInstance.api_exists?(:index) - PipelineInstance.limit(1).where(created_by: current_user.uuid).each do + PipelineInstance.limit(1).with_count('none').where(created_by: current_user.uuid).each do return nil end else @@ -789,7 +814,8 @@ class ApplicationController < ActionController::Base helper_method :user_notifications def user_notifications - return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications + @errors = nil if !defined?(@errors) + return [] if @errors or not current_user.andand.is_active or not Rails.configuration.Workbench.ShowUserNotifications @notifications ||= @@notification_tests.map do |t| t.call(self, current_user) end.compact @@ -836,7 +862,7 @@ class ApplicationController < ActionController::Base helper_method :recent_jobs_and_pipelines def recent_jobs_and_pipelines (Job.limit(10) | - PipelineInstance.limit(10)). + PipelineInstance.limit(10).with_count("none")). sort_by do |x| (x.finished_at || x.started_at rescue nil) || x.modified_at || x.created_at end.reverse @@ -844,7 +870,7 @@ class ApplicationController < ActionController::Base helper_method :running_pipelines def running_pipelines - pi = PipelineInstance.order(["started_at asc", "created_at asc"]).filter([["state", "in", ["RunningOnServer", "RunningOnClient"]]]) + pi = PipelineInstance.order(["started_at asc", "created_at asc"]).with_count("none").filter([["state", "in", ["RunningOnServer", "RunningOnClient"]]]) jobs = {} pi.each do |pl| pl.components.each do |k,v| @@ -855,7 +881,7 @@ class ApplicationController < ActionController::Base end if jobs.keys.any? - Job.filter([["uuid", "in", jobs.keys]]).each do |j| + Job.filter([["uuid", "in", jobs.keys]]).with_count("none").each do |j| jobs[j[:uuid]] = j end @@ -878,11 +904,11 @@ class ApplicationController < ActionController::Base 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 = PipelineInstance.select(cols).limit(lim).order(["created_at desc"]).with_count("none") pipelines.results.each { |pi| procs[pi] = pi.created_at } end - crs = ContainerRequest.limit(lim).order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]]) + crs = ContainerRequest.limit(lim).with_count("none").order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]]) crs.results.each { |c| procs[c] = c.created_at } Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim) @@ -890,9 +916,9 @@ class ApplicationController < ActionController::Base helper_method :recent_collections def recent_collections lim - c = Collection.limit(lim).order(["modified_at desc"]).results + c = Collection.limit(lim).with_count("none").order(["modified_at desc"]).results own = {} - Group.filter([["uuid", "in", c.map(&:owner_uuid)]]).each do |g| + Group.filter([["uuid", "in", c.map(&:owner_uuid)]]).with_count("none").each do |g| own[g[:uuid]] = g end {collections: c, owners: own} @@ -900,12 +926,12 @@ class ApplicationController < ActionController::Base helper_method :my_starred_projects def my_starred_projects user - return if @starred_projects - links = Link.filter([['tail_uuid', '=', user.uuid], + return if defined?(@starred_projects) && @starred_projects + links = Link.filter([['owner_uuid', 'in', ["#{Rails.configuration.ClusterID}-j7d0g-publicfavorites", user.uuid]], ['link_class', '=', 'star'], - ['head_uuid', 'is_a', 'arvados#group']]).select(%w(head_uuid)) + ['head_uuid', 'is_a', 'arvados#group']]).with_count("none").select(%w(head_uuid)) uuids = links.collect { |x| x.head_uuid } - starred_projects = Group.filter([['uuid', 'in', uuids]]).order('name') + starred_projects = Group.filter([['uuid', 'in', uuids]]).order('name').with_count("none") @starred_projects = starred_projects.results end @@ -915,7 +941,7 @@ class ApplicationController < ActionController::Base # 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 + return @my_wanted_projects if defined?(@my_wanted_projects) && @my_wanted_projects from_top = [] uuids = [user.uuid] @@ -946,7 +972,7 @@ class ApplicationController < ActionController::Base end def build_my_wanted_projects_tree(user, page_size=100) - return @my_wanted_projects_tree if @my_wanted_projects_tree + return @my_wanted_projects_tree if defined?(@my_wanted_projects_tree) && @my_wanted_projects_tree parent_of = {user.uuid => 'me'} my_wanted_projects(user, page_size).each do |ob| @@ -961,10 +987,10 @@ class ApplicationController < ActionController::Base children_of[parent_of[ob.uuid]] ||= [] children_of[parent_of[ob.uuid]] << ob end - buildtree = lambda do |children_of, root_uuid=false| + buildtree = lambda do |chldrn_of, root_uuid=false| tree = {} - children_of[root_uuid].andand.each do |ob| - tree[ob] = buildtree.call(children_of, ob.uuid) + chldrn_of[root_uuid].andand.each do |ob| + tree[ob] = buildtree.call(chldrn_of, ob.uuid) end tree end @@ -1058,7 +1084,7 @@ class ApplicationController < ActionController::Base end # TODO: make sure we get every page of results from API server - Link.filter([['head_uuid', 'in', uuids]]).each do |link| + Link.filter([['head_uuid', 'in', uuids]]).with_count("none").each do |link| @all_links_for[link.head_uuid] << link end @all_links_for @@ -1111,7 +1137,7 @@ class ApplicationController < ActionController::Base end # TODO: make sure we get every page of results from API server - Collection.where(uuid: uuids).each do |collection| + Collection.where(uuid: uuids).with_count("none").each do |collection| @all_collections_for[collection.uuid] << collection end @all_collections_for @@ -1161,7 +1187,7 @@ class ApplicationController < ActionController::Base end # TODO: make sure we get every page of results from API server - Collection.where(uuid: uuids).each do |collection| + Collection.where(uuid: uuids).with_count("none").each do |collection| @all_log_collections_for[collection.uuid] << collection end @all_log_collections_for @@ -1194,7 +1220,7 @@ class ApplicationController < ActionController::Base @all_pdhs_for[x] = [] end - Collection.select(%w(portable_data_hash)).where(portable_data_hash: pdhs).distinct().each do |collection| + Collection.select(%w(portable_data_hash)).where(portable_data_hash: pdhs).distinct().with_count("none").each do |collection| @all_pdhs_for[collection.portable_data_hash] << collection end @all_pdhs_for @@ -1234,8 +1260,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 @@ -1250,13 +1283,50 @@ class ApplicationController < ActionController::Base end end - def wiselinks_layout - 'body' + # 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).with_count("none").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).with_count("none"). + 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 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 + def wiselinks_layout + 'body' end end