Commit c767f35c authored by Phil Hughes's avatar Phil Hughes

Updated based on feedback

parent 3b6e2a68
...@@ -8,10 +8,11 @@ class @MergeRequestWidget ...@@ -8,10 +8,11 @@ class @MergeRequestWidget
constructor: (@opts) -> constructor: (@opts) ->
@firstCICheck = true @firstCICheck = true
@getCIStatus()
notifyPermissions()
@readyForCICheck = true @readyForCICheck = true
# clear the build poller clearInterval @fetchBuildStatusInterval
@pollCIStatus()
notifyPermissions()
mergeInProgress: (deleteSourceBranch = false)-> mergeInProgress: (deleteSourceBranch = false)->
$.ajax $.ajax
...@@ -39,11 +40,19 @@ class @MergeRequestWidget ...@@ -39,11 +40,19 @@ class @MergeRequestWidget
else else
status status
getCIStatus: -> pollCIStatus: ->
_this = @
@fetchBuildStatusInterval = setInterval ( => @fetchBuildStatusInterval = setInterval ( =>
return if not @readyForCICheck return if not @readyForCICheck
@getCIStatus(true)
@readyForCICheck = false
), 5000
getCIStatus: (showNotification) ->
_this = @
$('.ci-widget-fetching').show()
$.getJSON @opts.ci_status_url, (data) => $.getJSON @opts.ci_status_url, (data) =>
@readyForCICheck = true @readyForCICheck = true
...@@ -52,10 +61,11 @@ class @MergeRequestWidget ...@@ -52,10 +61,11 @@ class @MergeRequestWidget
@opts.ci_status = data.status @opts.ci_status = data.status
if data.status isnt @opts.ci_status if data.status isnt @opts.ci_status
@showCIState data.status @showCIStatus data.status
if data.coverage if data.coverage
@showCICoverage data.coverage @showCICoverage data.coverage
if showNotification
message = @opts.ci_message.replace('{{status}}', @ciLabelForStatus(data.status)) message = @opts.ci_message.replace('{{status}}', @ciLabelForStatus(data.status))
message = message.replace('{{sha}}', data.sha) message = message.replace('{{sha}}', data.sha)
message = message.replace('{{title}}', data.title) message = message.replace('{{title}}', data.title)
...@@ -71,17 +81,7 @@ class @MergeRequestWidget ...@@ -71,17 +81,7 @@ class @MergeRequestWidget
@opts.ci_status = data.status @opts.ci_status = data.status
@readyForCICheck = false showCIStatus: (state) ->
), 5000
getCIState: ->
$('.ci-widget-fetching').show()
$.getJSON @opts.ci_status_url, (data) =>
@showCIState data.status
if data.coverage
@showCICoverage data.coverage
showCIState: (state) ->
$('.ci_widget').hide() $('.ci_widget').hide()
allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"] allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"]
if state in allowed_states if state in allowed_states
......
- if @ci_commit or @merge_request.has_ci? - if @ci_commit
.mr-widget-heading .mr-widget-heading
- if @merge_request.has_ci? - %w[success skipped canceled failed running pending].each do |status|
.ci_widget.ci-widget-fetching .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @ci_commit.status == status) }
= icon('spinner spin') = ci_icon_for_status(status)
%span %span
Checking CI status for #{@merge_request.last_commit_short_sha}… CI build
= ci_label_for_status(status)
for
- commit = @merge_request.last_commit
= 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
.mr-widget-heading
- %w[success skipped canceled failed running pending].each do |status| - %w[success skipped canceled failed running pending].each do |status|
.ci_widget{ class: "ci-#{status}", style: ("display:none" unless status == @ci_commit.status) } .ci_widget{class: "ci-#{status}", style: "display:none"}
= ci_icon_for_status(status) = ci_icon_for_status(status)
%span %span
CI build CI build
...@@ -16,11 +28,13 @@ ...@@ -16,11 +28,13 @@
= succeed "." do = succeed "." do
= link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace" = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace"
%span.ci-coverage %span.ci-coverage
- if details_path = builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) - if details_path = ci_build_details_path(@merge_request)
= link_to "View details", details_path, :"data-no-turbolink" => "data-no-turbolink" = 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 .ci_widget
- # Remove in later versions when services like Jenkins will set CI status via Commit status API = icon("spinner spin")
Checking CI status for #{@merge_request.last_commit_short_sha}…
.ci_widget.ci-not_found{style: "display:none"} .ci_widget.ci-not_found{style: "display:none"}
= icon("times-circle") = icon("times-circle")
Could not find CI status for #{@merge_request.last_commit_short_sha}. Could not find CI status for #{@merge_request.last_commit_short_sha}.
...@@ -31,5 +45,5 @@ ...@@ -31,5 +45,5 @@
:javascript :javascript
$(function() { $(function() {
merge_request_widget.getCIState(); merge_request_widget.getCIStatus(false);
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment