1 files changed, 3 insertions, 16 deletions
diff --git a/app/graphql/resolvers/groups_resolver.rb b/app/graphql/resolvers/groups_resolver.rb
index 6cfdba240f0..902b5279364 100644
--- a/app/graphql/resolvers/groups_resolver.rb
+++ b/app/graphql/resolvers/groups_resolver.rb
@@ -4,31 +4,18 @@ module Resolvers
   class GroupsResolver < BaseResolver
     include ResolvesGroups
 
-    type Types::GroupType, null: true
-
-    argument :include_parent_descendants, GraphQL::Types::Boolean,
-             required: false,
-             description: 'List of descendant groups of the parent group.',
-             default_value: true
-
-    argument :owned, GraphQL::Types::Boolean,
-             required: false,
-             description: 'Limit result to groups owned by authenticated user.'
+    type "Types::GroupConnection", null: true
 
     argument :search, GraphQL::Types::String,
              required: false,
              description: 'Search query for group name or group full path.'
 
-    alias_method :parent, :object
-
     private
 
     # rubocop: disable CodeReuse/ActiveRecord
-    def resolve_groups(args)
-      return Group.none unless parent.present?
-
+    def resolve_groups(**args)
       GroupsFinder
-        .new(context[:current_user], args.merge(parent: parent))
+        .new(context[:current_user], args)
         .execute
         .reorder(name: :asc)
     end