diff --git a/src/api/app/assets/javascripts/webui/request.js b/src/api/app/assets/javascripts/webui/request.js index 06a9ad27067..f3872c7ec23 100644 --- a/src/api/app/assets/javascripts/webui/request.js +++ b/src/api/app/assets/javascripts/webui/request.js @@ -185,13 +185,14 @@ function loadDiffs(element){ }); } -function loadChanges(requestNumber, requestActionId) { // jshint ignore:line - $('.loading-diff').removeClass('invisible'); - var url = '/request/' + requestNumber + '/request_action/' + requestActionId + '/changes'; +function loadChanges(requestNumber, requestActionId, diffToSupersededId) { // jshint ignore:line + $('.tab-content.sourcediff .loading').removeClass('invisible'); + var queryString = diffToSupersededId ? '?diff_to_superseded=' + diffToSupersededId : ''; + var url = '/request/' + requestNumber + '/request_action/' + requestActionId + '/changes' + queryString; $.ajax({ url: url, success: function() { - $('.loading-diff').addClass('invisible'); + $('.tab-content.sourcediff .loading').addClass('invisible'); } }); } diff --git a/src/api/app/components/sourcediff_component.html.haml b/src/api/app/components/sourcediff_component.html.haml index 3546b6b5618..5884c1a4c7a 100644 --- a/src/api/app/components/sourcediff_component.html.haml +++ b/src/api/app/components/sourcediff_component.html.haml @@ -2,9 +2,12 @@ .col - if @action.diff_not_cached .clearfix.mb-2.text-center - .btn.btn-outline-primary.cache-refresh{ title: 'Refresh results', onclick: "loadChanges(#{@bs_request.number}, #{@action.id});" } + .btn.btn-outline-primary.cache-refresh{ title: 'Refresh results', onclick: "loadChanges(#{@bs_request.number}, #{@action.id}, #{@diff_to_superseded&.number});" } Crunching the latest data. Refresh again in a few seconds %i.fas.fa-sync-alt{ id: "cache#0-reload" } + .text-center.p-4.loading.invisible + %i.fas.fa-spinner.fa-spin.me-1 + Loading changes... - else - (@action.webui_sourcediff).each do |sourcediff| .clearfix.mb-2