Merge branch '382074-project-jobs-resolver-filter-by-with-artifacts' into 'master'

Filter out jobs with no artifacts

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



Merged-by: Steve Abrams <sabrams@gitlab.com>
Approved-by: Tianwen Chen <tchen@gitlab.com>
Approved-by: Philip Joyce <pjoyce@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>
Approved-by: Coung Ngo <cngo@gitlab.com>
Approved-by: Pavel Shutsin <pshutsin@gitlab.com>
Approved-by: Steve Abrams <sabrams@gitlab.com>
Reviewed-by: Pavel Shutsin <pshutsin@gitlab.com>
Reviewed-by: Tianwen Chen <tchen@gitlab.com>
Co-authored-by: mfluharty <mfluharty@gitlab.com>

app/assets/javascripts/artifacts/graphql/queries/get_job_artifacts.query.graphql

@@ -10,6 +10,7 @@ query getJobArtifacts(
   project(fullPath: $projectPath) {
     id
     jobs(
+      withArtifacts: true
       statuses: [SUCCESS, FAILED]
       first: $firstPageSize
       last: $lastPageSize

app/finders/ci/jobs_finder.rb

@@ -16,6 +16,7 @@ def initialize(current_user:, pipeline: nil, project: nil, runner: nil, params:
 
     def execute
       builds = init_collection.order_id_desc
+      builds = filter_by_with_artifacts(builds)
       filter_by_scope(builds)
     rescue Gitlab::Access::AccessDeniedError
       type.none
@@ -72,6 +73,14 @@ def filter_by_scope(builds)
       end
     end
 
+    def filter_by_with_artifacts(builds)
+      if params[:with_artifacts]
+        builds.with_erasable_artifacts
+      else
+        builds
+      end
+    end
+
     def filter_by_statuses!(builds)
       unknown_statuses = params[:scope] - ::CommitStatus::AVAILABLE_STATUSES
       raise ArgumentError, 'Scope contains invalid value(s)' unless unknown_statuses.empty?

app/graphql/resolvers/project_jobs_resolver.rb

@@ -14,10 +14,18 @@ class ProjectJobsResolver < BaseResolver
               required: false,
               description: 'Filter jobs by status.'
 
+    argument :with_artifacts, ::GraphQL::Types::Boolean,
+              required: false,
+              description: 'Filter by artifacts presence.'
+
     alias_method :project, :object
 
-    def resolve_with_lookahead(statuses: nil)
-      jobs = ::Ci::JobsFinder.new(current_user: current_user, project: project, params: { scope: statuses }).execute
+    def resolve_with_lookahead(statuses: nil, with_artifacts: nil)
+      jobs = ::Ci::JobsFinder.new(
+        current_user: current_user, project: project, params: {
+          scope: statuses, with_artifacts: with_artifacts
+        }
+      ).execute
 
       apply_lookahead(jobs)
     end

doc/api/graphql/reference/index.md

@@ -17666,6 +17666,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="projectjobsstatuses"></a>`statuses` | [`[CiJobStatus!]`](#cijobstatus) | Filter jobs by status. |
+| <a id="projectjobswithartifacts"></a>`withArtifacts` | [`Boolean`](#boolean) | Filter by artifacts presence. |
 ##### `Project.label`

spec/finders/ci/jobs_finder_spec.rb

@@ -99,6 +99,33 @@
     end
   end
 
+  context 'when artifacts are present for some jobs' do
+    let_it_be(:job_with_artifacts) { create(:ci_build, :success, pipeline: pipeline, name: 'test') }
+    let_it_be(:artifact) { create(:ci_job_artifact, job: job_with_artifacts) }
+
+    subject { described_class.new(current_user: user, project: project, params: params).execute }
+
+    before do
+      project.add_maintainer(user)
+    end
+
+    context 'when with_artifacts is true' do
+      let(:params) { { with_artifacts: true } }
+
+      it 'returns only jobs with artifacts' do
+        expect(subject).to match_array([job_with_artifacts])
+      end
+    end
+
+    context 'when with_artifacts is false' do
+      let(:params) { { with_artifacts: false } }
+
+      it 'returns all jobs' do
+        expect(subject).to match_array([successful_job, job_with_artifacts])
+      end
+    end
+  end
+
   context 'when pipeline is present' do
     before_all do
       project.add_maintainer(user)

spec/graphql/types/project_type_spec.rb

@@ -492,7 +492,7 @@
     subject { described_class.fields['jobs'] }
 
     it { is_expected.to have_graphql_type(Types::Ci::JobType.connection_type) }
-    it { is_expected.to have_graphql_arguments(:statuses) }
+    it { is_expected.to have_graphql_arguments(:statuses, :with_artifacts) }
   end
 
   describe 'ci_template field' do