Merge branch '342747-hide-empty-row-if-no-badge' into 'master'

Hide badge row if there are no pipeline badges

See merge request gitlab-org/gitlab!72538

app/helpers/ci/pipelines_helper.rb

@@ -67,6 +67,17 @@ module Ci
       ]
     end
 
+    def has_pipeline_badges?(pipeline)
+      pipeline.child? ||
+        pipeline.latest? ||
+        pipeline.merge_train_pipeline? ||
+        pipeline.has_yaml_errors? ||
+        pipeline.failure_reason? ||
+        pipeline.auto_devops_source? ||
+        pipeline.detached_merge_request_pipeline? ||
+        pipeline.stuck?
+    end
+
     private
 
     def warning_markdown(pipeline)

app/views/projects/pipelines/_info.html.haml

@@ -17,45 +17,46 @@
     - if @pipeline.queued_duration
       = "(queued for #{time_interval_in_words(@pipeline.queued_duration)})"
 
-  .well-segment.qa-pipeline-badges
-    .icon-container
-      = sprite_icon('flag')
-    - if @pipeline.child?
-      %span.js-pipeline-child.badge.badge-pill.gl-badge.sm.badge-primary.has-tooltip{ title: s_("Pipelines|This is a child pipeline within the parent pipeline") }
-        = s_('Pipelines|Child pipeline')
-        = surround '(', ')' do
-          = link_to s_('Pipelines|parent'), pipeline_path(@pipeline.triggered_by_pipeline), class: 'text-white text-underline'
-    - if @pipeline.latest?
-      %span.js-pipeline-url-latest.badge.badge-pill.gl-badge.sm.badge-success.has-tooltip{ title: _("Latest pipeline for the most recent commit on this branch") }
-        latest
-    - if @pipeline.merge_train_pipeline?
-      %span.js-pipeline-url-train.badge.badge-pill.gl-badge.sm.badge-info.has-tooltip{ title: _("This is a merge train pipeline") }
-        train
-    - if @pipeline.has_yaml_errors?
-      %span.js-pipeline-url-yaml.badge.badge-pill.gl-badge.sm.badge-danger.has-tooltip{ title: @pipeline.yaml_errors }
-        yaml invalid
-    - if @pipeline.failure_reason?
-      %span.js-pipeline-url-failure.badge.badge-pill.gl-badge.sm.badge-danger.has-tooltip{ title: @pipeline.failure_reason }
-        error
-    - if @pipeline.auto_devops_source?
-      - popover_title_text = html_escape(_('This pipeline makes use of a predefined CI/CD configuration enabled by %{b_open}Auto DevOps.%{b_close}')) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe }
-      - popover_content_url = help_page_path('topics/autodevops/index.md')
-      - popover_content_text = _('Learn more about Auto DevOps')
-      %a.js-pipeline-url-autodevops.badge.badge-pill.gl-badge.sm.badge-info.autodevops-badge{ href: "#", tabindex: "0", role: "button", data: { container: "body",
-        toggle: "popover",
-        placement: "top",
-        html: "true",
-        triggers: "focus",
-        title: "<div class='gl-font-weight-normal gl-line-height-normal'>#{popover_title_text}</div>",
-        content: "<a href='#{popover_content_url}' target='_blank' rel='noopener noreferrer nofollow'>#{popover_content_text}</a>",
-      } }
-        Auto DevOps
-    - if @pipeline.detached_merge_request_pipeline?
-      %span.js-pipeline-url-mergerequest.badge.badge-pill.gl-badge.sm.badge-info.has-tooltip{ title: _('Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more in the documentation for Pipelines for Merged Results.') }
-        detached
-    - if @pipeline.stuck?
-      %span.js-pipeline-url-stuck.badge.badge-pill.gl-badge.sm.badge-warning
-        stuck
+  - if has_pipeline_badges?(@pipeline)
+    .well-segment.qa-pipeline-badges
+      .icon-container
+        = sprite_icon('flag')
+      - if @pipeline.child?
+        %span.js-pipeline-child.badge.badge-pill.gl-badge.sm.badge-primary.has-tooltip{ title: s_("Pipelines|This is a child pipeline within the parent pipeline") }
+          = s_('Pipelines|Child pipeline')
+          = surround '(', ')' do
+            = link_to s_('Pipelines|parent'), pipeline_path(@pipeline.triggered_by_pipeline), class: 'text-white text-underline'
+      - if @pipeline.latest?
+        %span.js-pipeline-url-latest.badge.badge-pill.gl-badge.sm.badge-success.has-tooltip{ title: _("Latest pipeline for the most recent commit on this branch") }
+          latest
+      - if @pipeline.merge_train_pipeline?
+        %span.js-pipeline-url-train.badge.badge-pill.gl-badge.sm.badge-info.has-tooltip{ title: _("This is a merge train pipeline") }
+          train
+      - if @pipeline.has_yaml_errors?
+        %span.js-pipeline-url-yaml.badge.badge-pill.gl-badge.sm.badge-danger.has-tooltip{ title: @pipeline.yaml_errors }
+          yaml invalid
+      - if @pipeline.failure_reason?
+        %span.js-pipeline-url-failure.badge.badge-pill.gl-badge.sm.badge-danger.has-tooltip{ title: @pipeline.failure_reason }
+          error
+      - if @pipeline.auto_devops_source?
+        - popover_title_text = html_escape(_('This pipeline makes use of a predefined CI/CD configuration enabled by %{b_open}Auto DevOps.%{b_close}')) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe }
+        - popover_content_url = help_page_path('topics/autodevops/index.md')
+        - popover_content_text = _('Learn more about Auto DevOps')
+        %a.js-pipeline-url-autodevops.badge.badge-pill.gl-badge.sm.badge-info.autodevops-badge{ href: "#", tabindex: "0", role: "button", data: { container: "body",
+          toggle: "popover",
+          placement: "top",
+          html: "true",
+          triggers: "focus",
+          title: "<div class='gl-font-weight-normal gl-line-height-normal'>#{popover_title_text}</div>",
+          content: "<a href='#{popover_content_url}' target='_blank' rel='noopener noreferrer nofollow'>#{popover_content_text}</a>",
+        } }
+          Auto DevOps
+      - if @pipeline.detached_merge_request_pipeline?
+        %span.js-pipeline-url-mergerequest.badge.badge-pill.gl-badge.sm.badge-info.has-tooltip{ title: _('Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more in the documentation for Pipelines for Merged Results.') }
+          detached
+      - if @pipeline.stuck?
+        %span.js-pipeline-url-stuck.badge.badge-pill.gl-badge.sm.badge-warning
+          stuck
 
   .well-segment.branch-info
     .icon-container.commit-icon

spec/helpers/ci/pipelines_helper_spec.rb

@@ -71,4 +71,26 @@ RSpec.describe Ci::PipelinesHelper do
       it { expect(has_gitlab_ci?).to eq(result) }
     end
   end
+
+  describe 'has_pipeline_badges?' do
+    let(:pipeline) { create(:ci_empty_pipeline) }
+
+    subject { helper.has_pipeline_badges?(pipeline) }
+
+    context 'when pipeline has a badge' do
+      before do
+        pipeline.drop!(:config_error)
+      end
+
+      it 'shows pipeline badges' do
+        expect(subject).to eq(true)
+      end
+    end
+
+    context 'when pipeline has no badges' do
+      it 'shows pipeline badges' do
+        expect(subject).to eq(false)
+      end
+    end
+  end
 end