X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/22dc7d543f4b484b8dc658292ddf0afef00fb98a..35336cd73e444534cb2eda20e3730464cc4e6553:/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 a97a97d90a..61351d6449 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -1,9 +1,13 @@ class ApplicationController < ActionController::Base + respond_to :html, :json, :js protect_from_forgery around_filter :thread_clear - around_filter :thread_with_api_token, :except => [:render_exception, :render_not_found] + around_filter :thread_with_mandatory_api_token, :except => [:render_exception, :render_not_found] + around_filter :thread_with_optional_api_token before_filter :find_object_by_uuid, :except => [:index, :render_exception, :render_not_found] before_filter :check_user_agreements, :except => [:render_exception, :render_not_found] + before_filter :check_user_notifications, :except => [:render_exception, :render_not_found] + theme :select_theme begin rescue_from Exception, @@ -20,14 +24,19 @@ class ApplicationController < ActionController::Base def unprocessable(message=nil) @errors ||= [] + @errors << message if message render_error status: 422 end def render_error(opts) respond_to do |f| - f.html { render opts.merge(controller: 'application', action: 'error') } + # json must come before html here, so it gets used as the + # default format when js is requested by the client. This lets + # ajax:error callback parse the response correctly, even though + # the browser can't. f.json { render opts.merge(json: {success: false, errors: @errors}) } + f.html { render opts.merge(controller: 'application', action: 'error') } end end @@ -37,7 +46,7 @@ class ApplicationController < ActionController::Base if @object.andand.errors.andand.full_messages.andand.any? @errors = @object.errors.full_messages else - @errors = [e.inspect] + @errors = [e.to_s] end self.render_error status: 422 end @@ -48,12 +57,12 @@ class ApplicationController < ActionController::Base self.render_error status: 404 end - def index - @objects ||= model_class.all + @objects ||= model_class.limit(200).all respond_to do |f| f.json { render json: @objects } f.html { render } + f.js { render } end end @@ -70,6 +79,7 @@ class ApplicationController < ActionController::Base redirect_to params[:return_to] || @object end } + f.js { render } end end @@ -98,14 +108,27 @@ class ApplicationController < ActionController::Base end def create - @object ||= model_class.new params[model_class.to_s.singularize.to_sym] + @object ||= model_class.new params[model_class.to_s.underscore.singularize] @object.save! - redirect_to(params[:return_to] || @object) + + respond_to do |f| + f.json { render json: @object } + f.html { + redirect_to(params[:return_to] || @object) + } + f.js { render } + end end def destroy if @object.destroy - redirect_to(params[:return_to] || :back) + respond_to do |f| + f.json { render json: @object } + f.html { + redirect_to(params[:return_to] || :back) + } + f.js { render } + end else self.render_error status: 422 end @@ -124,6 +147,19 @@ class ApplicationController < ActionController::Base controller_name.classify.constantize end + def breadcrumb_page_name + (@breadcrumb_page_name || + (@object.friendly_link_name if @object.respond_to? :friendly_link_name)) + end + + def index_pane_list + %w(Recent) + end + + def show_pane_list + %w(Attributes Metadata JSON API) + end + protected def find_object_by_uuid @@ -140,10 +176,12 @@ class ApplicationController < ActionController::Base def thread_clear Thread.current[:arvados_api_token] = nil Thread.current[:user] = nil + Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/) yield + Rails.cache.delete_matched(/^request_#{Thread.current.object_id}_/) end - def thread_with_api_token + def thread_with_api_token(login_optional = false) begin try_redirect_to_login = true if params[:api_token] @@ -181,19 +219,25 @@ class ApplicationController < ActionController::Base logger.debug "No token received, session is #{session.inspect}" end if try_redirect_to_login - respond_to do |f| - f.html { - if request.method == 'GET' - redirect_to $arvados_api_client.arvados_login_url(return_to: request.url) - else - flash[:error] = "Either you are not logged in, or your session has timed out. I can't automatically log you in and re-attempt this request." - redirect_to :back - end - } - f.json { - @errors = ['You do not seem to be logged in. You did not supply an API token with this request, and your session (if any) has timed out.'] - self.render_error status: 422 - } + unless login_optional + respond_to do |f| + f.html { + if request.method == 'GET' + redirect_to $arvados_api_client.arvados_login_url(return_to: request.url) + else + flash[:error] = "Either you are not logged in, or your session has timed out. I can't automatically log you in and re-attempt this request." + redirect_to :back + end + } + f.json { + @errors = ['You do not seem to be logged in. You did not supply an API token with this request, and your session (if any) has timed out.'] + self.render_error status: 422 + } + end + else + # login is optional for this route so go on to the regular controller + Thread.current[:arvados_api_token] = nil + yield end end ensure @@ -202,6 +246,25 @@ class ApplicationController < ActionController::Base end end + def thread_with_mandatory_api_token + thread_with_api_token do + yield + end + end + + # This runs after thread_with_mandatory_api_token in the filter chain. + def thread_with_optional_api_token + if Thread.current[:arvados_api_token] + # We are already inside thread_with_mandatory_api_token. + yield + else + # We skipped thread_with_mandatory_api_token. Use the optional version. + thread_with_api_token(true) do + yield + end + end + end + def verify_api_token begin Link.where(uuid: 'just-verifying-my-api-token') @@ -226,7 +289,7 @@ class ApplicationController < ActionController::Base if not @signed_ua_uuids.index ua.uuid Collection.find(ua.uuid) end - end + end.compact if @required_user_agreements.empty? # No agreements to sign. Perhaps we just need to ask? current_user.activate @@ -241,4 +304,66 @@ class ApplicationController < ActionController::Base end true end + + def select_theme + return Rails.configuration.arvados_theme + end + + @@notification_tests = [] + + @@notification_tests.push lambda { |controller, current_user| + AuthorizedKey.limit(1).where(authorized_user_uuid: current_user.uuid).each do + return nil + end + return lambda { |view| + view.render partial: 'notifications/ssh_key_notification' + } + } + + #@@notification_tests.push lambda { |controller, current_user| + # Job.limit(1).where(created_by: current_user.uuid).each do + # return nil + # end + # return lambda { |view| + # view.render partial: 'notifications/jobs_notification' + # } + #} + + @@notification_tests.push lambda { |controller, current_user| + Collection.limit(1).where(created_by: current_user.uuid).each do + return nil + end + return lambda { |view| + view.render partial: 'notifications/collections_notification' + } + } + + @@notification_tests.push lambda { |controller, current_user| + PipelineInstance.limit(1).where(created_by: current_user.uuid).each do + return nil + end + return lambda { |view| + view.render partial: 'notifications/pipelines_notification' + } + } + + def check_user_notifications + @notification_count = 0 + @notifications = [] + + if current_user + @showallalerts = false + @@notification_tests.each do |t| + a = t.call(self, current_user) + if a + @notification_count += 1 + @notifications.push a + end + end + end + + if @notification_count == 0 + @notification_count = '' + end + end end