External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
Things being added to the DOM were passed by reference and not value. Fixed that using json stringify/parse. Now the DOM does not update in real time. Added in updated of summary list and graph. Performing updates every 5 sec.
This commit is contained in:
Chris Houseknecht
2014-06-20 03:07:47 -04:00
parent 5cdba539c6
commit 22a51a18f1
2 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
$rootScope.jobDetailInterval = setInterval(function() { $rootScope.jobDetailInterval = setInterval(function() {
$log.debug('Updating the DOM...'); $log.debug('Updating the DOM...');
UpdateDOM({ scope: scope }); UpdateDOM({ scope: scope });
}, 12000); }, 5000);
} }
}); });

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

@@ -39,30 +39,6 @@
angular.module('JobDetailHelper', ['Utilities', 'RestServices']) angular.module('JobDetailHelper', ['Utilities', 'RestServices'])
.factory('ProcessEventQueue', ['$log', '$rootScope', 'DigestEvent', 'JobIsFinished', function ($log, $rootScope, DigestEvent, JobIsFinished) {
return function(params) {
var scope = params.scope,
eventQueue = params.eventQueue;
function runTheQ() {
var event;
scope.processing = true;
while (!JobIsFinished(scope) && !scope.haltEventQueue && eventQueue.length > 0) {
event = eventQueue.pop();
$log.debug('processing event: ' + event.id);
DigestEvent({ scope: scope, event: event });
}
$log.debug('processing halted');
scope.processing = false;
}
$rootScope.jobDetailInterval = window.setInterval(function() {
$log.debug('checking... processing: ' + scope.processing + ' queue.length: ' + eventQueue.length);
if (!scope.processing && eventQueue.length > 0) {
runTheQ();
}
}, 1000);
};
}])
.factory('DigestEvent', ['$rootScope', '$log', 'UpdatePlayStatus', 'UpdateHostStatus', 'AddHostResult', .factory('DigestEvent', ['$rootScope', '$log', 'UpdatePlayStatus', 'UpdateHostStatus', 'AddHostResult',
'GetElapsed', 'UpdateTaskStatus', 'DrawGraph', 'LoadHostSummary', 'JobIsFinished', 'AddNewTask', 'GetElapsed', 'UpdateTaskStatus', 'DrawGraph', 'LoadHostSummary', 'JobIsFinished', 'AddNewTask',
function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, GetElapsed, function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, GetElapsed,
@@ -942,7 +918,8 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
idx = 0, idx = 0,
result = [], result = [],
newKeys = [], newKeys = [],
keys = Object.keys(scope.jobData.plays); plays = JSON.parse(JSON.stringify(scope.jobData.plays)),
keys = Object.keys(plays);
keys.reverse(); keys.reverse();
for (idx=0; idx < scope.playsMaxRows && idx < keys.length; idx++) { for (idx=0; idx < scope.playsMaxRows && idx < keys.length; idx++) {
newKeys.push(keys[idx]); newKeys.push(keys[idx]);
@@ -950,7 +927,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
newKeys.sort(); newKeys.sort();
idx = 0; idx = 0;
while (idx < newKeys.length) { while (idx < newKeys.length) {
result.push(scope.jobData.plays[newKeys[idx]]); result.push(plays[newKeys[idx]]);
idx++; idx++;
} }
@@ -964,10 +941,11 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
result = [], result = [],
idx, keys, newKeys; idx, keys, newKeys, tasks;
if (scope.activePlay) { if (scope.activePlay) {
keys = Object.keys(scope.jobData.plays[scope.activePlay].tasks); tasks = JSON.parse(JSON.stringify(scope.jobData.plays[scope.activePlay].tasks));
keys = Object.keys(tasks);
keys.reverse(); keys.reverse();
newKeys = []; newKeys = [];
for (idx=0; idx < scope.tasksMaxRows && idx < keys.length; idx++) { for (idx=0; idx < scope.tasksMaxRows && idx < keys.length; idx++) {
@@ -976,7 +954,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
newKeys.sort(); newKeys.sort();
idx = 0; idx = 0;
while (idx < newKeys.length) { while (idx < newKeys.length) {
result.push(scope.jobData.plays[scope.activePlay].tasks[newKeys[idx]]); result.push(tasks[newKeys[idx]]);
idx++; idx++;
} }
} }
@@ -995,7 +973,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
keys; keys;
if (scope.activePlay && scope.activeTask) { if (scope.activePlay && scope.activeTask) {
hostResults = scope.jobData.plays[scope.activePlay].tasks[scope.activeTask].hostResults; hostResults = JSON.parse(JSON.stringify(scope.jobData.plays[scope.activePlay].tasks[scope.activeTask].hostResults));
keys = Object.keys(hostResults); keys = Object.keys(hostResults);
keys.sort(function(a,b) { keys.sort(function(a,b) {
@@ -1008,7 +986,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
}); });
while (idx < keys.length && idx < scope.hostResultsMaxRows) { while (idx < keys.length && idx < scope.hostResultsMaxRows) {
result.push(scope.jobData.plays[scope.activePlay].tasks[scope.activeTask].hostResults[keys[idx]]); result.push(hostResults[keys[idx]]);
idx++; idx++;
} }
} }
@@ -1017,17 +995,51 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
}; };
}]) }])
.factory('UpdateDOM', ['DrawPlays', 'DrawTasks', 'DrawHostResults', function(DrawPlays, DrawTasks, DrawHostResults) { .factory('DrawHostSummaries', [ function() {
return function(params) {
var scope = params.scope,
result = [],
idx = 0,
hostSummaries,
keys;
if (scope.activePlay && scope.activeTask) {
hostSummaries = JSON.parse(JSON.stringify(scope.jobData.hostSummaries));
keys = Object.keys(hostSummaries);
keys.sort(function(a,b) {
if (hostSummaries[a].name > hostSummaries[b].name)
return 1;
if (hostSummaries[a].name < hostSummaries[b].name)
return -1;
// a must be equal to b
return 0;
});
while (idx < keys.length && idx < scope.hostSummariesMaxRows) {
result.push(hostSummaries[keys[idx]]);
idx++;
}
}
scope.hosts = result;
scope.$emit('FixHostResultsScroll');
};
}])
.factory('UpdateDOM', ['DrawPlays', 'DrawTasks', 'DrawHostResults', 'DrawHostSummaries', 'DrawGraph',
function(DrawPlays, DrawTasks, DrawHostResults, DrawHostSummaries, DrawGraph) {
return function(params) { return function(params) {
var scope = params.scope; var scope = params.scope;
DrawPlays({ scope: scope }); DrawPlays({ scope: scope });
DrawTasks({ scope: scope }); DrawTasks({ scope: scope });
DrawHostResults({ scope: scope }); DrawHostResults({ scope: scope });
DrawHostSummaries({ scope: scope });
//if (scope.host_summary.total > 0) { if (scope.host_summary.total > 0) {
// DrawGraph({ scope: scope, resize: true }); DrawGraph({ scope: scope, resize: true });
//} }
}; };
}]) }])