diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js index 1547003a31..31fbf03797 100644 --- a/awx/ui/static/js/controllers/JobDetail.js +++ b/awx/ui/static/js/controllers/JobDetail.js @@ -111,26 +111,10 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, // process any events sitting in the queue var url, hostId = 0, taskId = 0, playId = 0; - function notEmpty(x) { - return Object.keys(x).length > 0; - } - - function getMaxId(x) { - var keys = Object.keys(x); - keys.sort(); - return keys[keys.length - 1]; - } - // Find the max event.id value in memory - if (notEmpty(scope.hostResults)) { - hostId = getMaxId(scope.hostResults); - } - else if (notEmpty(scope.tasks)) { - taskId = getMaxId(scope.tasks); - } - else if (notEmpty(scope.plays)) { - playId = getMaxId(scope.plays); - } + hostId = (scope.hostResults.length > 0) ? scope.hostResults[scope.hostResults.length - 1] : 0; + taskId = (scope.tasks.length > 0) ? scope.tasks[scope.tasks.length - 1] : 0; + playId = (scope.plays.length > 0) ? scope.plays[scope.plays.length - 1] : 0; lastEventId = Math.max(hostId, taskId, playId); api_complete = true; @@ -198,6 +182,10 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, } scope.removeRefreshJobDetails = scope.$on('LoadJobDetails', function(e, events_url) { // Call to load all the job bits including, plays, tasks, hosts results and host summary + + scope.plays = []; + scope.playsMap = {}; + var url = scope.job.url + 'job_plays/?order_by=id'; Rest.setUrl(url); Rest.get() @@ -205,7 +193,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, data.forEach(function(event, idx) { var status = (event.failed) ? 'failed' : (event.changed) ? 'changed' : 'successful', start = event.started, - end, elapsed, play; + end, elapsed; if (idx < data.length - 1) { // end date = starting date of the next event @@ -224,25 +212,20 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, else { elapsed = '00:00:00'; } - if (scope.playsMap[event.id]) { - play = scope.plays[scope.playsMapp[event.id]]; - play.finished = end; - play.elapsed = elapsed; - play.status = status; - play.playActiveClass = ''; - } - else { - scope.plays.push({ - id: event.id, - name: event.play, - created: start, - finished: end, - status: status, - elapsed: elapsed, - playActiveClass: '' - }); - scope.playsMap[event.id] = scope.plays.length - 1; - } + + scope.plays.push({ + id: event.id, + name: event.play, + created: start, + finished: end, + status: status, + elapsed: elapsed, + playActiveClass: '', + hostCount: 0, + fistTask: null + }); + scope.playsMap[event.id] = scope.plays.length - 1; + scope.host_summary.ok += (data.ok_count) ? data.ok_count : 0; scope.host_summary.changed += (data.changed_count) ? data.changed_count : 0; scope.host_summary.unreachable += (data.unreachable_count) ? data.unreachable_count : 0; diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js index 5691cef2f7..96cdc093f6 100644 --- a/awx/ui/static/js/helpers/JobDetail.js +++ b/awx/ui/static/js/helpers/JobDetail.js @@ -60,9 +60,9 @@ angular.module('JobDetailHelper', ['Utilities', 'RestServices']) }; }]) -.factory('DigestEvent', ['$rootScope', '$log', 'UpdatePlayStatus', 'UpdateHostStatus', 'AddHostResult', 'SelectPlay', 'SelectTask', +.factory('DigestEvent', ['$rootScope', '$log', 'UpdatePlayStatus', 'UpdateHostStatus', 'AddHostResult', 'GetElapsed', 'UpdateTaskStatus', 'DrawGraph', 'LoadHostSummary', 'JobIsFinished', 'AddNewTask', -function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, SelectPlay, SelectTask, GetElapsed, +function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, GetElapsed, UpdateTaskStatus, DrawGraph, LoadHostSummary, JobIsFinished, AddNewTask) { return function(params) { @@ -88,11 +88,17 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se fistTask: null }); scope.playsMap[event.id] = scope.plays.length -1; + if (scope.activePlay && scope.playsMap[scope.activePlay] !== undefined) { + scope.plays[scope.playsMap[scope.activePlay]].playActiveClass = ''; + } + scope.activePlay = event.id; + scope.plays[scope.playsMap[event.id]].playActiveClass = 'active'; scope.tasks = []; scope.tasksMap = {}; scope.hostResults = []; scope.hostResultsMap = {}; - scope.activePlay = event.id; + $('#hosts-table-detail').mCustomScrollbar("update"); + $('#tasks-table-detail').mCustomScrollbar("update"); break; case 'playbook_on_setup': @@ -254,22 +260,33 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se changedStyle: { display: 'none' }, skippedStyle: { display: 'none' } }); - + scope.tasksMap[event.id] = scope.tasks.length - 1; if (scope.tasks.length > scope.tasksMaxRows) { scope.tasks.shift(); } - - if (!scope.playsMap[scope.activePlay].firstTask) { - scope.playsMap[scope.activePlay].firstTask = event.id; + if (!scope.plays[scope.playsMap[scope.activePlay]].firstTask) { + scope.plays[scope.playsMap[scope.activePlay]].firstTask = event.id; } + if (scope.activeTask && scope.tasksMap[scope.activeTask] !== undefined) { + scope.tasks[scope.tasksMap[scope.activeTask]].taskActiveClass = ''; + } + scope.activeTask = event.id; + scope.tasks[scope.tasksMap[event.id]].taskActiveClass = 'active'; scope.hostResults = []; scope.hostResultsMap = {}; - scope.activeTask = event.id; // Not sure if this still works scope.hasRoles = (event.role) ? true : false; + $('#hosts-table-detail').mCustomScrollbar("update"); + $('#tasks-table-detail').mCustomScrollbar("update"); + setTimeout( function() { + scope.auto_scroll = true; + $('#tasks-table-detail').mCustomScrollbar("scrollTo", "bottom"); + + }, 1500); + // Record the first task id UpdatePlayStatus({ scope: scope, @@ -414,7 +431,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se scope.host_summary.total = scope.host_summary.ok + scope.host_summary.changed + scope.host_summary.unreachable + scope.host_summary.failed; - if (scope.hostsMap[host_id]) { + if (scope.hostsMap[host_id] !== undefined) { scope.hosts[scope.hostsMap[host_id]].ok += (status === 'successful') ? 1 : 0; scope.hosts[scope.hostsMap[host_id]].changed += (status === 'changed') ? 1 : 0; scope.hosts[scope.hostsMap[host_id]].unreachable += (status === 'unreachable') ? 1 : 0; @@ -479,7 +496,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se msg = params.message, task; - if (!scope.hostResultsMap[host_id] && scope.hostResults.length < scope.hostTableRows) { + if (scope.hostResultsMap[host_id] === undefined && scope.hostResults.length < scope.hostTableRows) { scope.hostResults.push({ id: event_id, status: status, @@ -506,9 +523,9 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se } // update the task status bar - if (scope.tasksMap[task_id]) { + if (scope.tasksMap[task_id] !== undefined) { task = scope.tasks[scope.tasksMap[task_id]]; - if (task_id === scope.plays[scope.playsMap[scope.activePlays]].firstPlay) { + if (task_id === scope.plays[scope.playsMap[scope.activePlay]].firstTask) { scope.plays[scope.playsMap[scope.activePlay]].hostCount++; task.hostCount++; } @@ -565,17 +582,16 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se var scope = params.scope, id = params.id, callback = params.callback, - clear = false; + clear = true; // Determine if the tasks and hostResults arrays should be initialized - if (scope.search_all_hosts_name || scope.searchAllStatus === 'failed') { - clear = true; - } - else { - clear = (scope.activePlay === id) ? false : true; //are we moving to a new play? - } + //if (scope.search_all_hosts_name || scope.searchAllStatus === 'failed') { + // clear = true; + //} + //else { + // clear = (scope.activePlay === id) ? false : true; //are we moving to a new play? - if (scope.playsMap[scope.activePlay]) { + if (scope.activePlay && scope.playsMap[scope.activePlay] !== undefined) { scope.plays[scope.playsMap[scope.activePlay]].playActiveClass = ''; } if (id) { @@ -600,25 +616,27 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se return function(params) { var scope = params.scope, callback = params.callback, - clear = params.clear, url; - if (clear) { - scope.tasks = []; - scope.tasksMap = {}; - } + scope.tasks = []; + scope.tasksMap = {}; if (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.searchAllStatus === 'failed') ? '&failed=true' : ''; - url += '&page_size=' + scope.tasksMaxRows; + url += '&page_size=' + scope.tasksMaxRows + '&order_by=id'; Rest.setUrl(url); Rest.get() .success(function(data) { data.results.forEach(function(event, idx) { - var end, elapsed, task; + var end, elapsed; + + if (!scope.plays[scope.playsMap[scope.activePlay]].firstTask) { + scope.plays[scope.playsMap[scope.activePlay]].firstTask = event.id; + scope.plays[scope.playsMap[scope.activePlay]].hostCount = (event.host_count) ? event.host_count : 0; + } if (idx < data.length - 1) { // end date = starting date of the next event @@ -626,7 +644,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se } else { // 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) { @@ -639,39 +657,24 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se elapsed = '00:00:00'; } - if (scope.tasksMap[event.id]) { - task = scope.tasks[scope.tasksMap[event.id]]; - task.status = (event.failed) ? 'failed' : (event.changed) ? 'changed' : 'successful'; - task.finished = end; - task.elapsed = elapsed; - task.hostCount = (event.host_count) ? event.host_count : 0; - task.reportedHosts = (event.reported_hosts) ? event.reported_hosts : 0; - task.successfulCount = (event.successful_count) ? event.successful_count : 0; - task.failedCount = (event.failed_count) ? event.failed_count : 0; - task.changedCount = (event.changed_count) ? event.changed_count : 0; - task.skippedCount = (event.skipped_count) ? event.skipped_count : 0; - task.taskActiveClass = ''; - } - else { - scope.tasks.push({ - id: event.id, - play_id: scope.activePlay, - name: event.name, - status: ( (event.failed) ? 'failed' : (event.changed) ? 'changed' : 'successful' ), - created: event.created, - modified: event.modified, - finished: end, - elapsed: elapsed, - hostCount: (event.host_count) ? event.host_count : 0, - reportedHosts: (event.reported_hosts) ? event.reported_hosts : 0, - successfulCount: (event.successful_count) ? event.successful_count : 0, - failedCount: (event.failed_count) ? event.failed_count : 0, - changedCount: (event.changed_count) ? event.changed_count : 0, - skippedCount: (event.skipped_count) ? event.skipped_count : 0, - taskActiveClass: '' - }); - scope.tasksMap[event.id] = scope.tasks.length - 1; - } + scope.tasks.push({ + id: event.id, + play_id: scope.activePlay, + name: event.name, + status: ( (event.failed) ? 'failed' : (event.changed) ? 'changed' : 'successful' ), + created: event.created, + modified: event.modified, + finished: end, + elapsed: elapsed, + hostCount: (event.host_count) ? event.host_count : 0, + reportedHosts: (event.reported_hosts) ? event.reported_hosts : 0, + successfulCount: (event.successful_count) ? event.successful_count : 0, + failedCount: (event.failed_count) ? event.failed_count : 0, + changedCount: (event.changed_count) ? event.changed_count : 0, + skippedCount: (event.skipped_count) ? event.skipped_count : 0, + taskActiveClass: '' + }); + scope.tasksMap[event.id] = scope.tasks.length - 1; SetTaskStyles({ scope: scope, task_id: event.id @@ -708,16 +711,16 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se var scope = params.scope, id = params.id, callback = params.callback, - clear=false; + clear=true; - if (scope.search_all_hosts_name || scope.searchAllStatus === 'failed') { - clear = true; - } - else { - clear = (scope.activeTask === id) ? false : true; - } + //if (scope.search_all_hosts_name || scope.searchAllStatus === 'failed') { + // clear = true; + //} + //else { + // clear = (scope.activeTask === id) ? false : true; + //} - if (scope.activeTask && scope.tasksMap[scope.activeTask]) { + if (scope.activeTask && scope.tasksMap[scope.activeTask] !== undefined) { scope.tasks[scope.tasksMap[scope.activeTask]].taskActiveClass = ''; } if (id) { @@ -798,7 +801,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Se .factory('SelectHost', [ function() { return function(params) { var scope = params.scope; - $('#tasks-table-detail').mCustomScrollbar("update"); + $('#hosts-table-detail').mCustomScrollbar("update"); setTimeout( function() { scope.auto_scroll = true; $('#hosts-table-detail').mCustomScrollbar("scrollTo", "bottom"); diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html index 2e21a9730b..a70e2d4152 100644 --- a/awx/ui/static/partials/job_detail.html +++ b/awx/ui/static/partials/job_detail.html @@ -52,10 +52,10 @@
-
- +
-
+
No matching plays
@@ -86,7 +86,7 @@
@@ -101,7 +101,7 @@
{{ task.successfulCount }}
{{ task.changedCount }}
{{ task.skippedCount }}
{{ task.failedCount }}
No matching hosts
-
+
No matching tasks