Merge branch 'dc/group-list-performance' into 'master'

Parameter to prevent searching project level work items

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166781



Merged-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>
Approved-by: Alexandru Croitor <acroitor@gitlab.com>
Approved-by: Omar Qunsul <oqunsul@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Reviewed-by: Mario Celi <mcelicalderon@gitlab.com>
Co-authored-by: Donald Cook <dcook@gitlab.com>

app/finders/work_items/work_items_finder.rb

@@ -118,7 +118,7 @@ def root_ancestor_group
     end
 
     def project_namespaces
-      return unless include_descendants?
+      return if !include_descendants? || exclude_projects?
 
       projects = Project.in_namespace(params.group.self_and_descendant_ids)
       projects = projects.id_in(params[:projects]) if params[:projects]
@@ -142,6 +142,11 @@ def include_ancestors?
       params.fetch(:include_ancestors, false)
     end
     strong_memoize_attr :include_ancestors?
+
+    def exclude_projects?
+      params.fetch(:exclude_projects, false)
+    end
+    strong_memoize_attr :exclude_projects?
   end
 end
 

app/graphql/resolvers/namespaces/work_items_resolver.rb

@@ -14,6 +14,12 @@ class WorkItemsResolver < ::Resolvers::WorkItemsResolver
         default_value: false,
         description: 'Include work items from descendant groups and projects.'
 
+      argument :exclude_projects, GraphQL::Types::Boolean,
+        required: false,
+        default_value: false,
+        description: 'Exclude work items from projects within the group.',
+        alpha: { milestone: '17.5' }
+
       def ready?(**args)
         super && resource_parent.namespace_work_items_enabled?
       end

doc/api/graphql/reference/index.md

@@ -24594,6 +24594,7 @@ Returns [`WorkItemStateCountsType`](#workitemstatecountstype).
 | <a id="groupworkitemstatecountsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee wildcard. Incompatible with `assigneeUsernames`. |
 | <a id="groupworkitemstatecountsauthorusername"></a>`authorUsername` | [`String`](#string) | Filter work items by author username. |
 | <a id="groupworkitemstatecountsconfidential"></a>`confidential` | [`Boolean`](#boolean) | Filter for confidential work items. If `false`, excludes confidential work items. If `true`, returns only confidential work items. |
+| <a id="groupworkitemstatecountsexcludeprojects"></a>`excludeProjects` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.5. **Status**: Experiment. Exclude work items from projects within the group. |
 | <a id="groupworkitemstatecountsiid"></a>`iid` | [`String`](#string) | IID of the work item. For example, "1". |
 | <a id="groupworkitemstatecountsiids"></a>`iids` | [`[String!]`](#string) | List of IIDs of work items. For example, `["1", "2"]`. |
 | <a id="groupworkitemstatecountsin"></a>`in` | [`[IssuableSearchableField!]`](#issuablesearchablefield) | Specify the fields to perform the search in. Defaults to `[TITLE, DESCRIPTION]`. Requires the `search` argument.'. |
@@ -24650,6 +24651,7 @@ four standard [pagination arguments](#pagination-arguments):
 | <a id="groupworkitemsassigneewildcardid"></a>`assigneeWildcardId` | [`AssigneeWildcardId`](#assigneewildcardid) | Filter by assignee wildcard. Incompatible with `assigneeUsernames`. |
 | <a id="groupworkitemsauthorusername"></a>`authorUsername` | [`String`](#string) | Filter work items by author username. |
 | <a id="groupworkitemsconfidential"></a>`confidential` | [`Boolean`](#boolean) | Filter for confidential work items. If `false`, excludes confidential work items. If `true`, returns only confidential work items. |
+| <a id="groupworkitemsexcludeprojects"></a>`excludeProjects` **{warning-solid}** | [`Boolean`](#boolean) | **Introduced** in GitLab 17.5. **Status**: Experiment. Exclude work items from projects within the group. |
 | <a id="groupworkitemsiid"></a>`iid` | [`String`](#string) | IID of the work item. For example, "1". |
 | <a id="groupworkitemsiids"></a>`iids` | [`[String!]`](#string) | List of IIDs of work items. For example, `["1", "2"]`. |
 | <a id="groupworkitemsin"></a>`in` | [`[IssuableSearchableField!]`](#issuablesearchablefield) | Specify the fields to perform the search in. Defaults to `[TITLE, DESCRIPTION]`. Requires the `search` argument.'. |

spec/finders/work_items/work_items_finder_spec.rb

@@ -118,6 +118,16 @@
           )
         end
       end
+
+      context 'when exclude_projects is true' do
+        before do
+          params[:exclude_projects] = true
+        end
+
+        it 'does not include work items from projects' do
+          expect(items).to contain_exactly(group_work_item, subgroup_work_item)
+        end
+      end
     end
 
     context 'when include_ancestors is true' do