Search subgroups on dashboard and explore views

1 files changed, 8 insertions, 3 deletions

diff --git a/app/controllers/concerns/group_tree.rb b/app/controllers/concerns/group_tree.rb
index 6d5682ff769..d094216aa58 100644
--- a/app/controllers/concerns/group_tree.rb
+++ b/app/controllers/concerns/group_tree.rb
@@ -1,8 +1,12 @@
 module GroupTree
   def render_group_tree(groups)
-    # Only show root groups if no parent-id is given
-    @groups = groups.where(parent_id: params[:parent_id])
-    @groups = @groups.search(params[:filter]) if params[:filter].present?
+    if params[:filter].present?
+      @groups = Gitlab::GroupHierarchy.new(groups).all_groups
+      @groups = @groups.search(params[:filter])
+    else
+      # Only show root groups if no parent-id is given
+      @groups = groups.where(parent_id: params[:parent_id])
+    end
     @groups = @groups.includes(:route)
     @groups = @groups.sort(@sort = params[:sort])
     @groups = @groups.page(params[:page])
@@ -12,6 +16,7 @@ module GroupTree
       format.json do
         serializer = GroupChildSerializer.new(current_user: current_user)
                        .with_pagination(request, response)
+        serializer.expand_hierarchy if params[:filter].present?
         render json: serializer.represent(@groups)
       end
     end