[ARVADOS] updated: 0da328cc74af2989f811d2970096bd5be5f9776b

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      | 78 ++++++++++++++++++++--
 .../views/application/_projects_tree_menu.html.erb | 15 +++--
 2 files changed, 82 insertions(+), 11 deletions(-)

       via  0da328cc74af2989f811d2970096bd5be5f9776b (commit)
      from  9573ffcfb52ae30c76d5595fbb67005ef50b95fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0da328cc74af2989f811d2970096bd5be5f9776b
Author: radhika <radhika at curoverse.com>
Date:   Fri Feb 5 12:00:58 2016 -0500

    8183: When there are more than 200 readable projects, build the tree in steps;
    fetch projects under home, then subprojects under those projects and so on
    until we exceed the 200 limit. In that case, also display a message in Projects
    dropdown informing the user that all projects are not retrieved.
    The chooser version of the project tree is untouched (and hence not performing well)
    until we have the favorite projects implementation is in place. This is because
    there is no search capability in the chooser dialog and hence no way to choose a
    shared project when the limit is exceeded in this new top-down approach.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index fc3b959..ab018d7 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -89,13 +89,12 @@ class ApplicationController < ActionController::Base
     # exception here than in a template.)
     unless current_user.nil?
       begin
-        build_project_trees
+        build_my_wanted_projects_tree
       rescue ArvadosApiClient::ApiError
         # Fall back to the default-setting code later.
       end
     end
-    @my_project_tree ||= []
-    @shared_project_tree ||= []
+    @my_wanted_projects_tree ||= []
     render_error(err_opts)
   end
 
@@ -833,10 +832,75 @@ class ApplicationController < ActionController::Base
     {collections: c, owners: own}
   end
 
-  helper_method :my_toplevel_projects
-  def my_toplevel_projects
-    @my_toplevel_projects ||= Group.
-      filter([['group_class','=','project'], ['owner_uuid', '=', current_user.uuid]]).order('name').limit(200)
+  # If there are more than 200 projects that are readable by the user,
+  # build the tree using only the top 200+ projects. That is:
+  # get toplevel projects under home, get subprojects under these
+  # projects, and so on until we hit the limit
+  def my_wanted_projects
+    return @my_wanted_projects if @my_wanted_projects
+
+    all = Group.filter([['group_class','=','project']]).order('name').limit(100)
+    if all.items_available > 200
+      @total_projects = all.items_available
+      from_top = []
+      uuids = [current_user.uuid]
+      while from_top.size <= 200
+        current_level = Group.filter([['group_class','=','project'], ['owner_uuid', 'in', uuids]]).order('name').limit(200)
+        break if current_level.results.size == 0
+        from_top.concat current_level.results
+        uuids = current_level.results.collect { |x| x.uuid }
+      end
+      @my_wanted_projects = from_top
+    else
+      if all.results.size == all.items_available
+        @my_wanted_projects = all
+      else
+        @my_wanted_projects = Group.filter([['group_class','=','project']]).order('name')
+      end
+    end
+  end
+
+  helper_method :my_wanted_projects_tree
+  def my_wanted_projects_tree
+    build_my_wanted_projects_tree
+    [@my_wanted_projects_tree, @total_projects]
+  end
+
+  def build_my_wanted_projects_tree
+    return @my_wanted_projects_tree if @my_wanted_projects_tree
+
+    parent_of = {current_user.uuid => 'me'}
+    my_wanted_projects.each do |ob|
+      parent_of[ob.uuid] = ob.owner_uuid
+    end
+    children_of = {false => [], 'me' => [current_user]}
+    my_wanted_projects.each do |ob|
+      if ob.owner_uuid != current_user.uuid and
+          not parent_of.has_key? ob.owner_uuid
+        parent_of[ob.uuid] = false
+      end
+      children_of[parent_of[ob.uuid]] ||= []
+      children_of[parent_of[ob.uuid]] << ob
+    end
+    buildtree = lambda do |children_of, root_uuid=false|
+      tree = {}
+      children_of[root_uuid].andand.each do |ob|
+        tree[ob] = buildtree.call(children_of, ob.uuid)
+      end
+      tree
+    end
+    sorted_paths = lambda do |tree, depth=0|
+      paths = []
+      tree.keys.sort_by { |ob|
+        ob.is_a?(String) ? ob : ob.friendly_link_name
+      }.each do |ob|
+        paths << {object: ob, depth: depth}
+        paths += sorted_paths.call tree[ob], depth+1
+      end
+      paths
+    end
+    @my_wanted_projects_tree =
+      sorted_paths.call buildtree.call(children_of, 'me')
   end
 
   helper_method :my_project_tree
diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 8139bea..acb6030 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,4 +1,4 @@
-<li role="presentation" class="dropdown-header" title="Toplevel projects">
+<li role="presentation" class="dropdown-header">
   My projects
 </li>
 <li>
@@ -6,10 +6,17 @@
     <span style="padding-left: 0">Home</span>
   <% end %>
 </li>
-<% my_toplevel_projects.each do |pnode| %>
+<% my_tree = my_wanted_projects_tree %>
+<% my_tree[0].each do |pnode| %>
+  <% next if pnode[:object].class != Group %>
   <li>
-    <%= project_link_to.call({object: pnode, depth: 1}) do %>
-      <span style="padding-left: 1em"></span><%= pnode[:name] %>
+    <%= project_link_to.call pnode do %>
+      <span style="padding-left: <%= pnode[:depth] %>em"></span><%= pnode[:object].name %>
     <% end %>
   </li>
 <% end %>
+<% if my_tree[1] and my_tree[1] > my_tree[0].size %>
+<li role="presentation" class="dropdown-header">
+  Showing <%= my_tree[0].size %> of your projects out of <%= my_tree[1] %> total projects.
+</li>
+<% end %>

-----------------------------------------------------------------------


hooks/post-receive
--