1 files changed, 13 insertions, 23 deletions
diff --git a/app/graphql/resolvers/work_items_resolver.rb b/app/graphql/resolvers/work_items_resolver.rb
index 0c9aac80274..7115b028481 100644
--- a/app/graphql/resolvers/work_items_resolver.rb
+++ b/app/graphql/resolvers/work_items_resolver.rb
@@ -4,30 +4,19 @@ module Resolvers
   class WorkItemsResolver < BaseResolver
     include SearchArguments
     include LooksAhead
+    include ::WorkItems::SharedFilterArguments
 
-    type Types::WorkItemType.connection_type, null: true
+    argument :iid,
+      GraphQL::Types::String,
+      required: false,
+      description: 'IID of the work item. For example, "1".'
+    argument :sort,
+      Types::WorkItemSortEnum,
+      description: 'Sort work items by criteria.',
+      required: false,
+      default_value: :created_desc
 
-    argument :author_username, GraphQL::Types::String,
-             required: false,
-             description: 'Filter work items by author username.',
-             alpha: { milestone: '15.9' }
-    argument :iid, GraphQL::Types::String,
-             required: false,
-             description: 'IID of the issue. For example, "1".'
-    argument :iids, [GraphQL::Types::String],
-             required: false,
-             description: 'List of IIDs of work items. For example, `["1", "2"]`.'
-    argument :sort, Types::WorkItemSortEnum,
-             description: 'Sort work items by this criteria.',
-             required: false,
-             default_value: :created_desc
-    argument :state, Types::IssuableStateEnum,
-             required: false,
-             description: 'Current state of this work item.'
-    argument :types, [Types::IssueTypeEnum],
-             as: :issue_types,
-             description: 'Filter work items by the given work item types.',
-             required: false
+    type Types::WorkItemType.connection_type, null: true
 
     def resolve_with_lookahead(**args)
       return WorkItem.none if resource_parent.nil?
@@ -66,7 +55,8 @@ module Resolvers
         parent: :work_item_parent,
         children: { work_item_children_by_relative_position: [:author, { project: :project_feature }] },
         labels: :labels,
-        milestone: { milestone: [:project, :group] }
+        milestone: { milestone: [:project, :group] },
+        subscribed: [:assignees, :award_emoji, { notes: [:author, :award_emoji] }]
       }
     end