Fix fetching all user projects [SCI-2787]

app/controllers/experiments_controller.rb

@@ -349,7 +349,7 @@ class ExperimentsController < ApplicationController
   end
 
   def load_projects_tree
-    @projects_tree = current_user.projects_tree(current_team, nil)
+    @projects_tree = current_user.projects_tree(current_team)
   end
 
   def check_view_permissions

app/controllers/my_modules_controller.rb

@@ -661,7 +661,7 @@ class MyModulesController < ApplicationController
   end
 
   def load_projects_tree
-    @projects_tree = current_user.projects_tree(current_team, nil)
+    @projects_tree = current_user.projects_tree(current_team)
   end
 
   def check_manage_permissions

app/controllers/projects_controller.rb

@@ -357,7 +357,9 @@ class ProjectsController < ApplicationController
       @current_team = current_team if current_team
       @current_team ||= current_user.teams.first
       @current_sort ||= 'new'
-      @projects_tree = current_user.projects_tree(@current_team, @current_sort)
+      @projects_tree = current_user.projects_tree(
+        @current_team, @current_filter, @current_sort
+      )
     else
       @projects_tree = []
     end

app/models/user.rb

@@ -350,7 +350,7 @@ class User < ApplicationRecord
     result || []
   end
 
-  def projects_tree(team, sort_by = nil)
+  def projects_tree(team, filter_by = nil, sort_by = nil)
     result = team.projects.includes(active_experiments: :active_my_modules)
     unless is_admin_of_team?(team)
       # Only admins see all projects of the team
@@ -359,19 +359,25 @@ class User < ApplicationRecord
       )
     end
 
-    sort =
+    result = case filter_by
-      case sort_by
+             when 'archived'
-      when 'old'
+               result.where(archived: true)
-        { created_at: :asc }
+             when 'active'
-      when 'atoz'
+               result.where(archived: false)
-        { name: :asc }
+             else
-      when 'ztoa'
+               result
-        { name: :desc }
+             end
-      else
+    sort = case sort_by
-        { created_at: :desc }
+           when 'old'
-      end
+             { created_at: :asc }
-
+           when 'atoz'
-    result.where(archived: false).distinct.order(sort)
+             { name: :asc }
+           when 'ztoa'
+             { name: :desc }
+           else
+             { created_at: :desc }
+           end
+    result.distinct.order(sort)
   end
 
   # Finds all activities of user that is assigned to project. If user