Merge branch '426520-update-the-graphql-resolver' into 'master'

Add `includeArchived: true | false` to `groupProjects` graphQL

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



Merged-by: Suraj Tripathi <stripathi@gitlab.com>
Approved-by: Suraj Tripathi <stripathi@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>
Approved-by: Russell Dickenson <rdickenson@gitlab.com>
Co-authored-by: Michael Becker <11881043-wandering_person@users.noreply.gitlab.com>

app/graphql/resolvers/namespace_projects_resolver.rb

@@ -7,6 +7,11 @@ class NamespaceProjectsResolver < BaseResolver
              default_value: false,
              description: 'Include also subgroup projects.'
 
+    argument :include_archived, GraphQL::Types::Boolean,
+             required: false,
+             default_value: true,
+             description: 'Include also archived projects.'
+
     argument :not_aimed_for_deletion, GraphQL::Types::Boolean,
              required: false,
              default_value: false,
@@ -65,6 +70,7 @@ def namespace
     def finder_params(args)
       {
         include_subgroups: args.dig(:include_subgroups),
+        include_archived: args.dig(:include_archived),
         not_aimed_for_deletion: args.dig(:not_aimed_for_deletion),
         sort: args.dig(:sort),
         search: args.dig(:search),

doc/api/graphql/reference/index.md

@@ -20240,6 +20240,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="groupprojectshascodecoverage"></a>`hasCodeCoverage` | [`Boolean`](#boolean) | Returns only the projects which have code coverage. |
 | <a id="groupprojectshasvulnerabilities"></a>`hasVulnerabilities` | [`Boolean`](#boolean) | Returns only the projects which have vulnerabilities. |
 | <a id="groupprojectsids"></a>`ids` | [`[ID!]`](#id) | Filter projects by IDs. |
+| <a id="groupprojectsincludearchived"></a>`includeArchived` | [`Boolean`](#boolean) | Include also archived projects. |
 | <a id="groupprojectsincludesubgroups"></a>`includeSubgroups` | [`Boolean`](#boolean) | Include also subgroup projects. |
 | <a id="groupprojectsnotaimedfordeletion"></a>`notAimedForDeletion` | [`Boolean`](#boolean) | Include projects that are not aimed for deletion. |
 | <a id="groupprojectssbomcomponentid"></a>`sbomComponentId` | [`ID`](#id) | Return only the projects related to the specified SBOM component. |
@@ -23297,6 +23298,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="namespaceprojectshascodecoverage"></a>`hasCodeCoverage` | [`Boolean`](#boolean) | Returns only the projects which have code coverage. |
 | <a id="namespaceprojectshasvulnerabilities"></a>`hasVulnerabilities` | [`Boolean`](#boolean) | Returns only the projects which have vulnerabilities. |
 | <a id="namespaceprojectsids"></a>`ids` | [`[ID!]`](#id) | Filter projects by IDs. |
+| <a id="namespaceprojectsincludearchived"></a>`includeArchived` | [`Boolean`](#boolean) | Include also archived projects. |
 | <a id="namespaceprojectsincludesubgroups"></a>`includeSubgroups` | [`Boolean`](#boolean) | Include also subgroup projects. |
 | <a id="namespaceprojectsnotaimedfordeletion"></a>`notAimedForDeletion` | [`Boolean`](#boolean) | Include projects that are not aimed for deletion. |
 | <a id="namespaceprojectssbomcomponentid"></a>`sbomComponentId` | [`ID`](#id) | Return only the projects related to the specified SBOM component. |

spec/graphql/resolvers/namespace_projects_resolver_spec.rb

@@ -25,7 +25,7 @@
     let(:group) { create(:group) }
     let(:namespace) { group }
     let(:project1) { create(:project, namespace: namespace) }
-    let(:project2) { create(:project, namespace: namespace) }
+    let(:project2) { create(:project, :archived, namespace: namespace) }
     let(:project3) { create(:project, namespace: namespace, marked_for_deletion_at: 1.day.ago, pending_delete: true) }
     let(:nested_group) { create(:group, parent: group) }
     let(:nested_project) { create(:project, group: nested_group) }
@@ -54,6 +54,12 @@
         expect(resolve_projects(arg)).to contain_exactly(project1, project2)
       end
 
+      it 'can filter out archived projects' do
+        arg = { include_archived: false }
+
+        expect(resolve_projects(arg)).to contain_exactly(project1, project3)
+      end
+
       it 'finds all projects not aimed for deletion including the subgroups' do
         args[:not_aimed_for_deletion] = true