Updated to fix issues risen during feedback

Correctly updates the on-screen CI text feedback

1 files changed, 21 insertions, 34 deletions

diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index ccb2f9fa77e..2ee8e2de0e8 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,23 +1,12 @@
-- if @ci_commit
-  .mr-widget-heading
-    .ci_widget{class: "ci-#{@ci_commit.status}"}
-      = ci_status_icon(@ci_commit)
-      %span
-        Build
-        %span.ci-status-label
-          = ci_status_label(@ci_commit)
-      for
-      = succeed "." do
-        = link_to @ci_commit.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @ci_commit.sha), class: "monospace"
-      %span.ci-coverage
-      = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
-
-- elsif @merge_request.has_ci?
-  - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
-  - # Remove in later versions when services like Jenkins will set CI status via Commit status API
+- if @ci_commit or @merge_request.has_ci?
   .mr-widget-heading
+    - if @merge_request.has_ci?
+      .ci_widget.ci-widget-fetching
+        = icon('spinner spin')
+        %span
+          Checking CI status for #{@merge_request.last_commit_short_sha}…
     - %w[success skipped canceled failed running pending].each do |status|
-      .ci_widget{class: "ci-#{status}", style: "display:none"}
+      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless status == @ci_commit.status) }
         = ci_icon_for_status(status)
         %span
           CI build
@@ -27,22 +16,20 @@
         = succeed "." do
           = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace"
         %span.ci-coverage
-        - if details_path = ci_build_details_path(@merge_request)
+        - if details_path = builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
           = link_to "View details", details_path, :"data-no-turbolink" => "data-no-turbolink"
+    - if @merge_request.has_ci?
+      - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
+      - # Remove in later versions when services like Jenkins will set CI status via Commit status API
+      .ci_widget.ci-not_found{style: "display:none"}
+        = icon("times-circle")
+        Could not find CI status for #{@merge_request.last_commit_short_sha}.
 
-    .ci_widget
-      = icon("spinner spin")
-      Checking CI status for #{@merge_request.last_commit_short_sha}…
-
-    .ci_widget.ci-not_found{style: "display:none"}
-      = icon("times-circle")
-      Could not find CI status for #{@merge_request.last_commit_short_sha}.
-
-    .ci_widget.ci-error{style: "display:none"}
-      = icon("times-circle")
-      Could not connect to the CI server. Please check your settings and try again.
+      .ci_widget.ci-error{style: "display:none"}
+        = icon("times-circle")
+        Could not connect to the CI server. Please check your settings and try again.
 
-  :javascript
-    $(function() {
-      merge_request_widget.getCiStatus();
-    });
+      :javascript
+        $(function() {
+          merge_request_widget.getCIState();
+        });