External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
Endless scrolling queries appear to no longer be firing when programmatically scrolling to the end of list.
This commit is contained in:
Chris Houseknecht 2014-06-19 00:17:05 -04:00 committed by Luke Sneeringer
parent b4369d1259
commit 5a461a5471
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,9 +377,10 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.removeFixPlaysScroll();
}
scope.removeFixPlaysScroll = scope.$on('FixPlaysScroll', function() {
scope.auto_scroll = true;
scope.auto_scroll_plays = true;
$('#plays-table-detail').mCustomScrollbar("update");
setTimeout( function() {
scope.auto_scroll_plays = true;
$('#plays-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500);
});
@ -388,26 +389,26 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.removeFixTasksScroll();
}
scope.removeFixTasksScroll = scope.$on('FixTasksScroll', function() {
scope.auto_scroll = true;
scope.auto_scroll_tasks = true;
$('#tasks-table-detail').mCustomScrollbar("update");
setTimeout( function() {
scope.auto_scroll_tasks = true;
$('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500);
});
if (scope.removeFixHostResultsScroll) {
scope.removeFixHostResultsScroll();
}
scope.removeFixHostResultsScroll = scope.$on('FixHostResultsScroll', function() {
scope.auto_scroll = true;
scope.auto_scroll_results = true;
$('#hosts-table-detail').mCustomScrollbar("update");
setTimeout( function() {
scope.auto_scroll_results = true;
$('#hosts-table-detail').mCustomScrollbar("scrollTo", "bottom");
}, 500);
});
scope.adjustSize = function() {
var height, ww = $(window).width();
if (ww < 1240) {
@ -481,6 +482,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
};
scope.selectPlay = function(id) {
scope.auto_scroll_plays = false;
SelectPlay({
scope: scope,
id: id
@ -488,6 +490,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
};
scope.selectTask = function(id) {
scope.auto_scroll_tasks = false;
SelectTask({
scope: scope,
id: id
@ -566,7 +569,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls down (or forward in time)
var url, mcs = arguments[0];
scope.$apply(function() {
if ((!scope.auto_scroll) && scope.activeTask && scope.hostResults.length) {
if ((!scope.auto_scroll_results) && scope.activeTask && scope.hostResults.length) {
scope.auto_scroll = true;
url = GetBasePath('jobs') + job_id + '/job_events/?parent=' + scope.activeTask + '&';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
@ -604,7 +607,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
});
}
else {
scope.auto_scroll = false;
scope.auto_scroll_results = false;
}
});
}, 300);
@ -613,7 +616,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls up (or back in time)
var url, mcs = arguments[0];
scope.$apply(function() {
if ((!scope.auto_scroll) && scope.activeTask && scope.hostResults.length) {
if ((!scope.auto_scroll_results) && scope.activeTask && scope.hostResults.length) {
scope.auto_scroll = true;
url = GetBasePath('jobs') + job_id + '/job_events/?parent=' + scope.activeTask + '&';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
@ -651,7 +654,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
});
}
else {
scope.auto_scroll = false;
scope.auto_scroll_results = false;
}
});
}, 300);
@ -660,7 +663,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls down (or forward in time)
var url, mcs = arguments[0];
scope.$apply(function() {
if ((!scope.auto_scroll) && scope.activePlay && scope.tasks.length) {
if ((!scope.auto_scroll_tasks) && scope.activePlay && scope.tasks.length) {
scope.auto_scroll = true;
url = scope.job.url + 'job_tasks/?event_id=' + scope.activePlay;
url += (scope.search_all_tasks.length > 0) ? '&id__in=' + scope.search_all_tasks.join() : '';
@ -729,7 +732,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
});
}
else {
scope.auto_scroll = false;
scope.auto_scroll_tasks = false;
}
});
}, 300);
@ -738,7 +741,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
// Called when user scrolls up (or back in time)
var url, mcs = arguments[0];
scope.$apply(function() {
if ((!scope.auto_scroll) && scope.activePlay && scope.tasks.length) {
if ((!scope.auto_scroll_tasks) && scope.activePlay && scope.tasks.length) {
scope.auto_scroll = true;
url = scope.job.url + 'job_tasks/?event_id=' + scope.activePlay;
url += (scope.search_all_tasks.length > 0) ? '&id__in=' + scope.search_all_tasks.join() : '';
@ -807,14 +810,14 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
});
}
else {
scope.auto_scroll = false;
scope.auto_scroll_tasks = false;
}
});
}, 300);
scope.HostSummaryOnTotalScroll = function(mcs) {
var url;
if ((!scope.auto_scroll) && scope.hosts) {
if ((!scope.auto_scroll_summary) && scope.hosts) {
url = GetBasePath('jobs') + job_id + '/job_host_summaries/?';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : '';
@ -852,13 +855,13 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
});
}
else {
scope.auto_scroll = false;
scope.auto_scroll_summary = false;
}
};
scope.HostSummaryOnTotalScrollBack = function(mcs) {
var url;
if ((!scope.auto_scroll) && scope.hosts) {
if ((!scope.auto_scroll_summary) && scope.hosts) {
url = GetBasePath('jobs') + job_id + '/job_host_summaries/?';
url += (scope.search_all_hosts_name) ? 'host__name__icontains=' + scope.search_all_hosts_name + '&' : '';
url += (scope.searchAllStatus === 'failed') ? 'failed=true&' : '';
@ -896,7 +899,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
});
}
else {
scope.auto_scroll = false;
scope.auto_scroll_summary = false;
}
};

1
awx/ui/static/js/helpers/JobDetail.js
View File

@ -516,6 +516,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
scope.hostResults.forEach(function(result, idx) {
scope.hostResultsMap[result.id] = idx;
});
scope.$emit('FixHostResultsScroll');
}
// update the task status bar