X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/03812184bfa1ab7f17960ef48ff30798333bdd54..55b94087ff4590c54cf1f43d941c6cb24153dded:/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 3e458bf33c..3b8aa9aab5 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -145,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
@@ -454,59 +463,74 @@ class ApplicationController < ActionController::Base
   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]
+
+    @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 ||= {}
+
+    raise ArgumentError, 'Argument is not an array' unless objects_and_uuids.is_a? Array
+    return @all_links_for if objects_and_uuids.empty?
+
+    uuids = objects_and_uuids.collect { |x| x.is_a?(String) ? x : x.uuid }
+
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_links_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       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|
+    Link.filter([['head_uuid', 'in', uuids]]).each do |link|
       @all_links_for[link.head_uuid] << link
     end
+    @all_links_for
   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_objects_of_type
-  def get_objects_of_type dataclass, size
-    # if the objects_map_for has a value for this dataclass, and the size used
-    # to retrieve those objects is greater than 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
+  helper_method :get_n_objects_of_class
+  def get_n_objects_of_class dataclass, size
+    @objects_map_for ||= {}
+
+    raise ArgumentError, 'Argument is not a data class' unless dataclass.is_a? Class
+    raise ArgumentError, 'Argument is not a valid limit size' unless (size && size>0)
 
-    return @objects_map_for[dataclass]
+    # if the objects_map_for has a value for this dataclass, and the
+    # size used to retrieve those objects is equal, return it
+    size_key = "#{dataclass.name}_size"
+    if @objects_map_for[dataclass.name] && @objects_map_for[size_key] &&
+        (@objects_map_for[size_key] == size)
+      return @objects_map_for[dataclass.name]
+    end
+
+    @objects_map_for[size_key] = size
+    @objects_map_for[dataclass.name] = dataclass.limit(size)
   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]
+    @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 ||= {}
+
+    raise ArgumentError, 'Argument is not an array' unless uuids.is_a? Array
+    return @all_collections_for if uuids.empty?
+
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_collections_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
 
@@ -518,29 +542,43 @@ class ApplicationController < ActionController::Base
     Collection.where(uuid: uuids).each do |collection|
       @all_collections_for[collection.uuid] << collection
     end
+    @all_collections_for
   end
 
   # helper method to get log collections for the given log
   helper_method :log_collections_for_object
   def log_collections_for_object log
+    preload_log_collections_for_objects([log])
+
+    uuid = log
     fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(log)
-    uuid = fixup[1]
-    preload_log_collections_for_objects([uuid])
-    @all_log_collections_for[uuid]
+    if fixup && fixup.size>1
+      uuid = fixup[1]
+    end
+
+    @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
+    @all_log_collections_for ||= {}
+
+    raise ArgumentError, 'Argument is not an array' unless logs.is_a? Array
+    return @all_log_collections_for if logs.empty?
+
     uuids = []
     logs.each do |log|
       fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(log)
-      uuids << fixup[1]
+      if fixup && fixup.size>1
+        uuids << fixup[1]
+      else
+        uuids << log
+      end
     end
 
-    @all_log_collections_for ||= {}
+    # if already preloaded for all of these uuids, return
     if not uuids.select { |x| @all_log_collections_for[x].nil? }.any?
-      # already preloaded for all of these uuids
       return
     end
 
@@ -552,6 +590,33 @@ class ApplicationController < ActionController::Base
     Collection.where(uuid: uuids).each do |collection|
       @all_log_collections_for[collection.uuid] << collection
     end
+    @all_log_collections_for
+  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 ||= {}
+
+    raise ArgumentError, 'Argument is not an array' unless uuids.is_a? Array
+    return @all_collections_for if uuids.empty?
+
+    # 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
+    @objects_for
   end
 
 end