External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
Making sure we never call the endless scroll queries when programmatically scrolling to the bottom of a list. Eliminate repeated calls to lookup credential names.
This commit is contained in:
Chris Houseknecht
2014-06-18 23:33:12 -04:00
committed by Luke Sneeringer
parent 0fc977648e
commit b4369d1259
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,7 +347,9 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
} }
scope.setSearchAll('host'); scope.setSearchAll('host');
scope.$emit('LoadJobDetails', data.related.job_events); scope.$emit('LoadJobDetails', data.related.job_events);
scope.$emit('GetCredentialNames', data); if (!scope.credential_name) {
scope.$emit('GetCredentialNames', data);
}
}) })
.error(function(data, status) { .error(function(data, status) {
ProcessErrors(scope, data, status, null, { hdr: 'Error!', ProcessErrors(scope, data, status, null, { hdr: 'Error!',
@@ -375,10 +377,10 @@ 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 = true;
$('#plays-table-detail').mCustomScrollbar("update"); $('#plays-table-detail').mCustomScrollbar("update");
setTimeout( function() { setTimeout( function() {
scope.auto_scroll = true; $('#plays-table-detail').mCustomScrollbar("scrollTo", "bottom");
$('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500); }, 500);
}); });
@@ -386,9 +388,9 @@ 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 = true;
$('#tasks-table-detail').mCustomScrollbar("update"); $('#tasks-table-detail').mCustomScrollbar("update");
setTimeout( function() { setTimeout( function() {
scope.auto_scroll = true;
$('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom"); $('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500); }, 500);
}); });
@@ -398,9 +400,9 @@ 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 = true;
$('#hosts-table-detail').mCustomScrollbar("update"); $('#hosts-table-detail').mCustomScrollbar("update");
setTimeout( function() { setTimeout( function() {
scope.auto_scroll = true;
$('#hosts-table-detail').mCustomScrollbar("scrollTo", "bottom"); $('#hosts-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500); }, 500);
}); });
@@ -564,7 +566,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 && scope.activeTask && scope.hostResults.length) { if ((!scope.auto_scroll) && 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 + '&' : '';
@@ -611,7 +613,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 && scope.activeTask && scope.hostResults.length) { if ((!scope.auto_scroll) && 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 + '&' : '';
@@ -658,7 +660,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 && scope.activePlay && scope.tasks.length) { if ((!scope.auto_scroll) && 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() : '';
@@ -676,7 +678,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
} }
else { else {
// no next event (task), get the end time of the play // no next event (task), get the end time of the play
end = scope.plays[scope.activePlay].finished; end = scope.plays[scope.playsMap[scope.activePlay]].finished;
} }
if (end) { if (end) {
elapsed = GetElapsed({ elapsed = GetElapsed({
@@ -736,7 +738,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 && scope.activePlay && scope.tasks.length) { if ((!scope.auto_scroll) && 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() : '';
@@ -754,7 +756,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
} }
else { else {
// no next event (task), get the end time of the play // no next event (task), get the end time of the play
end = scope.plays[scope.activePlay].finished; end = scope.plays[scope.playsMap[scope.activePlay]].finished;
} }
if (end) { if (end) {
elapsed = GetElapsed({ elapsed = GetElapsed({
@@ -812,7 +814,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.HostSummaryOnTotalScroll = function(mcs) { scope.HostSummaryOnTotalScroll = function(mcs) {
var url; var url;
if (!scope.auto_scroll && scope.hosts) { if ((!scope.auto_scroll) && 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&' : '';
@@ -856,7 +858,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.HostSummaryOnTotalScrollBack = function(mcs) { scope.HostSummaryOnTotalScrollBack = function(mcs) {
var url; var url;
if (!scope.auto_scroll && scope.hosts) { if ((!scope.auto_scroll) && 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&' : '';