External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 21:37:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
When live event processing is happening (job is not in a completed state) infinite scroll is now disabled. This keeps the programmatic scroll to bottom from tripping an API call.
This commit is contained in:
Chris Houseknecht
2014-06-20 10:29:00 -04:00
parent 22a51a18f1
commit c074d81c95
1 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
awx/ui/static/js/controllers/JobDetail.js
View File

@@ -30,6 +30,8 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.tasksMaxRows = 15; scope.tasksMaxRows = 15;
scope.playsMaxRows = 15; scope.playsMaxRows = 15;
scope.liveEventProcessing = true; // control play/pause state of event processing
scope.search_all_tasks = []; scope.search_all_tasks = [];
scope.search_all_plays = []; scope.search_all_plays = [];
scope.job_status = {}; scope.job_status = {};
@@ -96,6 +98,8 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
var url; var url;
Wait('stop'); Wait('stop');
if (JobIsFinished(scope)) { if (JobIsFinished(scope)) {
$scope.liveEventProcessing = false; // signal that event processing is over and endless scroll
// should be enabled
url = scope.job.related.job_events + '?event=playbook_on_stats'; url = scope.job.related.job_events + '?event=playbook_on_stats';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
@@ -107,7 +111,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
}); });
} }
UpdateDOM({ scope: scope }); UpdateDOM({ scope: scope });
DrawGraph({ scope: scope, resize: false });
}) })
.error(function(data, status) { .error(function(data, status) {
ProcessErrors(scope, data, status, null, { hdr: 'Error!', ProcessErrors(scope, data, status, null, { hdr: 'Error!',
@@ -119,7 +122,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
} }
else { else {
api_complete = true; //trigger events to start processing api_complete = true; //trigger events to start processing
$rootScope.jobDetailInterval = setInterval(function() { $rootScope.jobDetailInterval = setInterval(function() {
$log.debug('Updating the DOM...'); $log.debug('Updating the DOM...');
UpdateDOM({ scope: scope }); UpdateDOM({ scope: scope });
@@ -399,7 +401,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.removeLoadJob(); scope.removeLoadJob();
} }
scope.removeLoadJobRow = scope.$on('LoadJob', function() { scope.removeLoadJobRow = scope.$on('LoadJob', function() {
//Wait('start'); Wait('start');
// Load the job record // Load the job record
Rest.setUrl(GetBasePath('jobs') + job_id + '/'); Rest.setUrl(GetBasePath('jobs') + job_id + '/');
Rest.get() Rest.get()
@@ -469,10 +471,8 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.removeFixPlaysScroll(); scope.removeFixPlaysScroll();
} }
scope.removeFixPlaysScroll = scope.$on('FixPlaysScroll', function() { scope.removeFixPlaysScroll = scope.$on('FixPlaysScroll', function() {
scope.auto_scroll_plays = true;
$('#plays-table-detail').mCustomScrollbar("update"); $('#plays-table-detail').mCustomScrollbar("update");
setTimeout( function() { setTimeout( function() {
scope.auto_scroll_plays = true;
$('#plays-table-detail').mCustomScrollbar("scrollTo", "bottom"); $('#plays-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500); }, 500);
}); });
@@ -481,10 +481,8 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.removeFixTasksScroll(); scope.removeFixTasksScroll();
} }
scope.removeFixTasksScroll = scope.$on('FixTasksScroll', function() { scope.removeFixTasksScroll = scope.$on('FixTasksScroll', function() {
scope.auto_scroll_tasks = true;
$('#tasks-table-detail').mCustomScrollbar("update"); $('#tasks-table-detail').mCustomScrollbar("update");
setTimeout( function() { setTimeout( function() {
scope.auto_scroll_tasks = true;
$('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom"); $('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500); }, 500);
}); });
@@ -493,10 +491,8 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.removeFixHostResultsScroll(); scope.removeFixHostResultsScroll();
} }
scope.removeFixHostResultsScroll = scope.$on('FixHostResultsScroll', function() { scope.removeFixHostResultsScroll = scope.$on('FixHostResultsScroll', function() {
scope.auto_scroll_results = true;
$('#hosts-table-detail').mCustomScrollbar("update"); $('#hosts-table-detail').mCustomScrollbar("update");
setTimeout( function() { setTimeout( function() {
scope.auto_scroll_results = true;
$('#hosts-table-detail').mCustomScrollbar("scrollTo", "bottom"); $('#hosts-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500); }, 500);
}); });
@@ -646,7 +642,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls down (or forward in time) // Called when user scrolls down (or forward in time)
var url, mcs = arguments[0]; var url, mcs = arguments[0];
scope.$apply(function() { scope.$apply(function() {
if ((!scope.auto_scroll_results) && scope.activeTask && scope.hostResults.length) { if ((!scope.liveEventProcessing) && scope.activeTask && scope.hostResults.length) {
scope.auto_scroll = true; scope.auto_scroll = true;
url = GetBasePath('jobs') + job_id + '/job_events/?parent=' + scope.activeTask + '&'; url = GetBasePath('jobs') + job_id + '/job_events/?parent=' + scope.activeTask + '&';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : ''; url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
@@ -683,9 +679,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
msg: 'Call to ' + url + '. GET returned: ' + status }); msg: 'Call to ' + url + '. GET returned: ' + status });
}); });
} }
else {
scope.auto_scroll_results = false;
}
}); });
}, 300); }, 300);
@@ -693,7 +686,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls up (or back in time) // Called when user scrolls up (or back in time)
var url, mcs = arguments[0]; var url, mcs = arguments[0];
scope.$apply(function() { scope.$apply(function() {
if ((!scope.auto_scroll_results) && scope.activeTask && scope.hostResults.length) { if ((!scope.liveEventProcessing) && scope.activeTask && scope.hostResults.length) {
scope.auto_scroll = true; scope.auto_scroll = true;
url = GetBasePath('jobs') + job_id + '/job_events/?parent=' + scope.activeTask + '&'; url = GetBasePath('jobs') + job_id + '/job_events/?parent=' + scope.activeTask + '&';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : ''; url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
@@ -730,9 +723,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
msg: 'Call to ' + url + '. GET returned: ' + status }); msg: 'Call to ' + url + '. GET returned: ' + status });
}); });
} }
else {
scope.auto_scroll_results = false;
}
}); });
}, 300); }, 300);
@@ -741,7 +731,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls down (or forward in time) // Called when user scrolls down (or forward in time)
var url, mcs = arguments[0]; var url, mcs = arguments[0];
scope.$apply(function() { scope.$apply(function() {
if ((!scope.auto_scroll_tasks) && scope.activePlay && scope.tasks.length) { if ((!scope.liveEventProcessing) && scope.activePlay && scope.tasks.length) {
scope.auto_scroll = true; scope.auto_scroll = true;
url = scope.job.url + 'job_tasks/?event_id=' + scope.activePlay; url = scope.job.url + 'job_tasks/?event_id=' + scope.activePlay;
url += (scope.search_all_tasks.length > 0) ? '&id__in=' + scope.search_all_tasks.join() : ''; url += (scope.search_all_tasks.length > 0) ? '&id__in=' + scope.search_all_tasks.join() : '';
@@ -823,7 +813,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls up (or back in time) // Called when user scrolls up (or back in time)
var url, mcs = arguments[0]; var url, mcs = arguments[0];
scope.$apply(function() { scope.$apply(function() {
if ((!scope.auto_scroll_tasks) && scope.activePlay && scope.tasks.length) { if ((!scope.liveEventProcessing) && scope.activePlay && scope.tasks.length) {
scope.auto_scroll = true; scope.auto_scroll = true;
url = scope.job.url + 'job_tasks/?event_id=' + scope.activePlay; url = scope.job.url + 'job_tasks/?event_id=' + scope.activePlay;
url += (scope.search_all_tasks.length > 0) ? '&id__in=' + scope.search_all_tasks.join() : ''; url += (scope.search_all_tasks.length > 0) ? '&id__in=' + scope.search_all_tasks.join() : '';
@@ -895,15 +885,12 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
msg: 'Call to ' + url + '. GET returned: ' + status }); msg: 'Call to ' + url + '. GET returned: ' + status });
}); });
} }
else { });
scope.auto_scroll_tasks = false;
}
});
}, 300); }, 300);
scope.HostSummaryOnTotalScroll = function(mcs) { scope.HostSummaryOnTotalScroll = function(mcs) {
var url; var url;
if ((!scope.auto_scroll_summary) && scope.hosts) { if ((!scope.liveEventProcessing) && scope.hosts) {
url = GetBasePath('jobs') + job_id + '/job_host_summaries/?'; url = GetBasePath('jobs') + job_id + '/job_host_summaries/?';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : ''; url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : ''; url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : '';
@@ -940,14 +927,11 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
msg: 'Call to ' + url + '. GET returned: ' + status }); msg: 'Call to ' + url + '. GET returned: ' + status });
}); });
} }
else {
scope.auto_scroll_summary = false;
}
}; };
scope.HostSummaryOnTotalScrollBack = function(mcs) { scope.HostSummaryOnTotalScrollBack = function(mcs) {
var url; var url;
if ((!scope.auto_scroll_summary) && scope.hosts) { if ((!scope.liveEventProcessing) && scope.hosts) {
url = GetBasePath('jobs') + job_id + '/job_host_summaries/?'; url = GetBasePath('jobs') + job_id + '/job_host_summaries/?';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : ''; url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : ''; url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : '';
@@ -984,9 +968,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
msg: 'Call to ' + url + '. GET returned: ' + status }); msg: 'Call to ' + url + '. GET returned: ' + status });
}); });
} }
else {
scope.auto_scroll_summary = false;
}
}; };
scope.searchAllByHost = function() { scope.searchAllByHost = function() {