X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/77d3ed33f525bd6859580954c6d7b9b36b394b98..620a10bed55b85294baad9dba965ea8dad59e884:/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 b62838f655..c9a761fe23 100644 --- a/apps/workbench/app/controllers/application_controller.rb +++ b/apps/workbench/app/controllers/application_controller.rb @@ -7,14 +7,11 @@ class ApplicationController < ActionController::Base ERROR_ACTIONS = [:render_error, :render_not_found] around_filter :thread_clear - around_filter(:thread_with_mandatory_api_token, - except: [:index, :show] + ERROR_ACTIONS) + around_filter :thread_with_mandatory_api_token, except: ERROR_ACTIONS around_filter :thread_with_optional_api_token before_filter :check_user_agreements, except: ERROR_ACTIONS before_filter :check_user_notifications, except: ERROR_ACTIONS - around_filter :using_reader_tokens, only: [:index, :show] before_filter :find_object_by_uuid, except: [:index] + ERROR_ACTIONS - before_filter :check_my_folders, :except => ERROR_ACTIONS theme :select_theme begin @@ -123,21 +120,21 @@ class ApplicationController < ActionController::Base end def update - updates = params[@object.class.to_s.underscore.singularize.to_sym] - updates.keys.each do |attr| + @updates ||= params[@object.class.to_s.underscore.singularize.to_sym] + @updates.keys.each do |attr| if @object.send(attr).is_a? Hash - if updates[attr].is_a? String - updates[attr] = Oj.load updates[attr] + if @updates[attr].is_a? String + @updates[attr] = Oj.load @updates[attr] end if params[:merge] || params["merge_#{attr}".to_sym] # Merge provided Hash with current Hash, instead of # replacing. - updates[attr] = @object.send(attr).with_indifferent_access. - deep_merge(updates[attr].with_indifferent_access) + @updates[attr] = @object.send(attr).with_indifferent_access. + deep_merge(@updates[attr].with_indifferent_access) end end end - if @object.update_attributes updates + if @object.update_attributes @updates show else self.render_error status: 422 @@ -148,9 +145,18 @@ class ApplicationController < ActionController::Base @new_resource_attrs ||= params[model_class.to_s.underscore.singularize] @new_resource_attrs ||= {} @new_resource_attrs.reject! { |k,v| k.to_s == 'uuid' } - @object ||= model_class.new @new_resource_attrs - @object.save! - show + @object ||= model_class.new @new_resource_attrs, params["options"] + if @object.save + respond_to do |f| + f.json { render json: @object.attributes.merge(href: url_for(@object)) } + f.html { + redirect_to @object + } + f.js { render } + end + else + self.render_error status: 422 + end end def destroy @@ -214,23 +220,6 @@ class ApplicationController < ActionController::Base false # For convenience to return from callbacks end - def using_reader_tokens(login_optional=false) - if params[:reader_tokens].is_a?(Array) and params[:reader_tokens].any? - Thread.current[:reader_tokens] = params[:reader_tokens] - end - begin - yield - rescue ArvadosApiClient::NotLoggedInException - if login_optional - raise - else - return redirect_to_login - end - ensure - Thread.current[:reader_tokens] = nil - end - end - def using_specific_api_token(api_token) start_values = {} [:arvados_api_token, :user].each do |key| @@ -423,15 +412,6 @@ class ApplicationController < ActionController::Base } } - def check_my_folders - @my_top_level_folders = lambda do - @top_level_folders ||= Group. - filter([['group_class','=','folder'], - ['owner_uuid','=',current_user.uuid]]). - sort_by { |x| x.name || '' } - end - end - def check_user_notifications @notification_count = 0 @notifications = [] @@ -451,4 +431,161 @@ class ApplicationController < ActionController::Base @notification_count = '' end end + + helper_method :my_folders + def my_folders + return @my_folders if @my_folders + @my_folders = [] + root_of = {} + Group.filter([['group_class','=','folder']]).each do |g| + root_of[g.uuid] = g.owner_uuid + @my_folders << g + end + done = false + while not done + done = true + root_of = root_of.each_with_object({}) do |(child, parent), h| + if root_of[parent] + h[child] = root_of[parent] + done = false + else + h[child] = parent + end + end + end + @my_folders = @my_folders.select do |g| + root_of[g.uuid] == current_user.uuid + end + end + + # helper method to get links for given object or uuid + helper_method :links_for_object + def links_for_object object_or_uuid + uuid = object_or_uuid.is_a?(String) ? object_or_uuid : object_or_uuid.uuid + preload_links_for_objects([object_or_uuid]) + @all_links_for[uuid] + end + + # helper method to preload links for given objects and uuids + helper_method :preload_links_for_objects + def preload_links_for_objects objects_and_uuids + uuids = objects_and_uuids.collect { |x| x.is_a?(String) ? x : x.uuid } + @all_links_for ||= {} + + # if already preloaded for all of these uuids, return + if not uuids.select { |x| @all_links_for[x].nil? }.any? + return + end + + uuids.each do |x| + @all_links_for[x] = [] + end + # TODO: make sure we get every page of results from API server + Link.filter([['head_uuid','in',uuids]]).each do |link| + @all_links_for[link.head_uuid] << link + end + end + + # helper method to get a certain number of objects of a specific type + # this can be used to replace any uses of: "dataclass.limit(n)" + helper_method :get_n_objects_of_class + def get_n_objects_of_class dataclass, size + # if the objects_map_for has a value for this dataclass, and the size used + # to retrieve those objects is greater than or equal to size, return it + size_key = "#{dataclass}_size" + if @objects_map_for && @objects_map_for[dataclass] && @objects_map_for[size_key] && + (@objects_map_for[size_key] >= size) + return @objects_map_for[dataclass] + end + + @objects_map_for = {} + @objects_map_for[dataclass] = dataclass.limit(size) + @objects_map_for[size_key] = size + + return @objects_map_for[dataclass] + end + + # helper method to get collections for the given uuid + helper_method :collections_for_object + def collections_for_object uuid + preload_collections_for_objects([uuid]) + @all_collections_for[uuid] + end + + # helper method to preload collections for the given uuids + helper_method :preload_collections_for_objects + def preload_collections_for_objects uuids + @all_collections_for ||= {} + + # if already preloaded for all of these uuids, return + if not uuids.select { |x| @all_collections_for[x].nil? }.any? + return + end + + uuids.each do |x| + @all_collections_for[x] = [] + end + + # TODO: make sure we get every page of results from API server + Collection.where(uuid: uuids).each do |collection| + @all_collections_for[collection.uuid] << collection + end + end + + # helper method to get log collections for the given log + helper_method :log_collections_for_object + def log_collections_for_object log + fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(log) + uuid = fixup[1] + preload_log_collections_for_objects([uuid]) + @all_log_collections_for[uuid] + end + + # helper method to preload collections for the given uuids + helper_method :preload_log_collections_for_objects + def preload_log_collections_for_objects logs + uuids = [] + logs.each do |log| + fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(log) + uuids << fixup[1] + end + + # if already preloaded for all of these uuids, return + @all_log_collections_for ||= {} + if not uuids.select { |x| @all_log_collections_for[x].nil? }.any? + return + end + + uuids.each do |x| + @all_log_collections_for[x] = [] + end + + # TODO: make sure we get every page of results from API server + Collection.where(uuid: uuids).each do |collection| + @all_log_collections_for[collection.uuid] << collection + end + end + + # helper method to get object of a given dataclass and uuid + helper_method :object_for_dataclass + def object_for_dataclass dataclass, uuid + preload_objects_for_dataclass(dataclass, [uuid]) + @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 + @objects_for ||= {} + + # if already preloaded for all of these uuids, return + if not uuids.select { |x| @objects_for[x].nil? }.any? + return + end + + dataclass.where(uuid: uuids).each do |obj| + @objects_for[obj.uuid] = obj + end + end + end