From 2a5a97fc35b5cf4c20bf7d8b11524c7718ba3ca2 Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Fri, 8 Apr 2016 13:19:02 -0400 Subject: [PATCH] refactor Event Summary view to resolve #1245 --- awx/ui/client/legacy-styles/job-details.less | 2 +- awx/ui/client/src/helpers/JobDetail.js | 213 +++--------------- awx/ui/client/src/helpers/JobSubmission.js | 6 +- .../host-summary/host-summary-factory.js | 0 .../host-summary/host-summary.block.less | 10 + .../host-summary/host-summary.controller.js | 147 ++++++++---- .../host-summary/host-summary.partial.html | 123 +++++----- .../src/job-detail/job-detail.controller.js | 167 ++------------ .../src/job-detail/job-detail.partial.html | 2 +- 9 files changed, 227 insertions(+), 443 deletions(-) delete mode 100644 awx/ui/client/src/job-detail/host-summary/host-summary-factory.js create mode 100644 awx/ui/client/src/job-detail/host-summary/host-summary.block.less diff --git a/awx/ui/client/legacy-styles/job-details.less b/awx/ui/client/legacy-styles/job-details.less index d3cc2bae50..d4a21a9421 100644 --- a/awx/ui/client/legacy-styles/job-details.less +++ b/awx/ui/client/legacy-styles/job-details.less @@ -503,7 +503,7 @@ } #graph-section svg{ - margin-top: 15px; + margin: 0 auto; } path.slice{ diff --git a/awx/ui/client/src/helpers/JobDetail.js b/awx/ui/client/src/helpers/JobDetail.js index 4911981939..3a98789f7d 100644 --- a/awx/ui/client/src/helpers/JobDetail.js +++ b/awx/ui/client/src/helpers/JobDetail.js @@ -40,9 +40,9 @@ export default angular.module('JobDetailHelper', ['Utilities', 'RestServices', 'ModalDialog']) .factory('DigestEvent', ['$rootScope', '$log', 'UpdatePlayStatus', 'UpdateHostStatus', 'AddHostResult', - 'GetElapsed', 'UpdateTaskStatus', 'DrawGraph', 'LoadHostSummary', 'JobIsFinished', 'AddNewTask', 'AddNewPlay', + 'GetElapsed', 'UpdateTaskStatus', 'JobIsFinished', 'AddNewTask', 'AddNewPlay', function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, GetElapsed, - UpdateTaskStatus, DrawGraph, LoadHostSummary, JobIsFinished, AddNewTask, AddNewPlay) { + UpdateTaskStatus, JobIsFinished, AddNewTask, AddNewPlay) { return function(params) { var scope = params.scope, @@ -185,7 +185,7 @@ export default }; }]) - .factory('GetElapsed', [ function() { + .factory('GetElapsed', ['moment', function(moment) { return function(params) { var start = params.start, end = params.end, @@ -299,7 +299,7 @@ export default }; }]) - .factory('AddNewTask', ['DrawGraph', 'UpdatePlayStatus', 'SetActivePlay', 'SetActiveTask', function(DrawGraph, UpdatePlayStatus, SetActivePlay, SetActiveTask) { + .factory('AddNewTask', ['UpdatePlayStatus', 'SetActivePlay', 'SetActiveTask', function(UpdatePlayStatus, SetActivePlay, SetActiveTask) { return function(params) { var scope = params.scope, event = params.event, @@ -351,7 +351,7 @@ export default }; }]) - .factory('UpdateJobStatus', ['GetElapsed', 'Empty', 'JobIsFinished', function(GetElapsed, Empty, JobIsFinished) { + .factory('UpdateJobStatus', ['moment', 'GetElapsed', 'Empty', 'JobIsFinished', function(moment, GetElapsed, Empty, JobIsFinished) { return function(params) { var scope = params.scope, failed = params.failed, @@ -363,17 +363,17 @@ export default scope.job_status.status = 'failed'; } if (JobIsFinished(scope) && !Empty(modified)) { - scope.job_status.finished = modified; + scope.job_status.finished = moment(modified).format('l'); } if (!Empty(started) && Empty(scope.job_status.started)) { - scope.job_status.started = started; + scope.job_status.started = moment(started).format('l'); } if (!Empty(scope.job_status.finished) && !Empty(scope.job_status.started)) { scope.job_status.elapsed = GetElapsed({ - start: scope.job_status.started, - end: scope.job_status.finished + start: started, + end: finished }); - } + } }; }]) @@ -959,127 +959,39 @@ export default }; }]) - // Refresh the list of hosts in the hosts summary section - .factory('ReloadHostSummaryList', ['Rest', 'ProcessErrors', function(Rest, ProcessErrors) { - return function(params) { - var scope = params.scope, - callback = params.callback, - url; - - url = scope.job.related.job_host_summaries + '?'; - url += (scope.search_host_summary_name) ? 'host_name__icontains=' + scope.search_host_summary_name + '&': ''; - url += (scope.search_host_summary_status === 'failed') ? 'failed=true&' : ''; - url += '&page_size=' + scope.hostSummariesMaxRows + '&order=host_name'; - scope.hosts = []; - scope.hostSummariesLoading = true; - - Rest.setUrl(url); - Rest.get() - .success(function(data) { - scope.next_host_summaries = data.next; - scope.hosts = []; - data.results.forEach(function(event) { - var name; - if (event.host_name) { - name = event.host_name; - } - else { - name = ""; - } - scope.hosts.push({ - id: name, - name: event.host_name, - ok: event.ok, - changed: event.changed, - unreachable: event.dark, - failed: event.failures, - status: (event.failed) ? 'failed' : 'successful' - }); - }); - - scope.hostSummariesLoading = false; - if (callback) { - scope.$emit(callback); - } - }) - .error(function(data, status) { - ProcessErrors(scope, data, status, null, { hdr: 'Error!', - msg: 'Call to ' + url + '. GET returned: ' + status }); - }); - }; - }]) - - .factory('LoadHostSummary', [ function() { - return function(params) { - var scope = params.scope, - data = params.data, - host; - scope.host_summary.ok = 0; - for (host in data.ok) { - if (!data.changed[host] && !data.dark[host] && !data.failures[host]) { - scope.host_summary.ok += 1; - } - } - scope.host_summary.changed = 0; - for (host in data.changed) { - if (!data.dark[host] && !data.failures[host]) { - scope.host_summary.changed += 1; - } - } - scope.host_summary.unreachable = 0; - for (host in data.dark) { - scope.host_summary.unreachable += 1; - } - scope.host_summary.failed = 0; - for (host in data.failures) { - scope.host_summary.failed += 1; - } - scope.host_summary.total = scope.host_summary.ok + scope.host_summary.changed + - scope.host_summary.unreachable + scope.host_summary.failed; - }; - }]) - - .factory('DrawGraph', ['DonutChart', function(DonutChart) { return function(params) { - var scope = params.scope, + var count = params.count, graph_data = []; - // Ready the data - if (scope.host_summary.ok) { + if (count.ok.length > 0) { graph_data.push({ label: 'OK', - value: scope.host_summary.ok, + value: count.ok.length, color: '#60D66F' }); } - if (scope.host_summary.changed) { + if (count.changed.length > 0) { graph_data.push({ label: 'CHANGED', - value: scope.host_summary.changed, + value: count.changed.length, color: '#FF9900' }); } - if (scope.host_summary.unreachable) { + if (count.unreachable.length > 0) { graph_data.push({ label: 'UNREACHABLE', - value: scope.host_summary.unreachable, + value: count.unreachable.length, color: '#FF0000' }); } - if (scope.host_summary.failed) { + if (count.failed.length > 0) { graph_data.push({ label: 'FAILED', - value: scope.host_summary.failed, + value: count.failed.length, color: '#ff5850' }); } - scope.graph_data = graph_data; - var total_count = 0, gd_obj; - for (gd_obj in graph_data) { - total_count += graph_data[gd_obj].value; - } - scope.total_count_for_graph = total_count; DonutChart({ data: graph_data }); @@ -1121,44 +1033,42 @@ export default "font-family": 'Open Sans', "font-style": "normal", "font-weight":400, - "src": "url(/static/assets/OpenSans-Regular.ttf)" + "src": "url(/static/assets/OpenSans-Regular.ttf)", + "width": 500, + "height": 300, }); d3.select(element.find(".nv-label text")[0]) - .attr("class", "DashboardGraphs-hostStatusLabel--successful") + .attr("class", "HostSummary-graph--successful") .style({ "font-family": 'Open Sans', - "text-anchor": "start", "font-size": "16px", "text-transform" : "uppercase", "fill" : colors[0], "src": "url(/static/assets/OpenSans-Regular.ttf)" }); d3.select(element.find(".nv-label text")[1]) - .attr("class", "DashboardGraphs-hostStatusLabel--failed") + .attr("class", "HostSummary-graph--changed") .style({ "font-family": 'Open Sans', - "text-anchor" : "end !imporant", "font-size": "16px", "text-transform" : "uppercase", "fill" : colors[1], "src": "url(/static/assets/OpenSans-Regular.ttf)" }); d3.select(element.find(".nv-label text")[2]) - .attr("class", "DashboardGraphs-hostStatusLabel--successful") + .attr("class", "HostSummary-graph--failed") .style({ "font-family": 'Open Sans', - "text-anchor" : "end !imporant", "font-size": "16px", "text-transform" : "uppercase", "fill" : colors[2], "src": "url(/static/assets/OpenSans-Regular.ttf)" }); d3.select(element.find(".nv-label text")[3]) - .attr("class", "DashboardGraphs-hostStatusLabel--failed") + .attr("class", "HostSummary-graph--unreachable") .style({ "font-family": 'Open Sans', - "text-anchor" : "end !imporant", "font-size": "16px", "text-transform" : "uppercase", "fill" : colors[3], @@ -1399,68 +1309,8 @@ export default }; }]) - .factory('DrawHostSummaries', [ function() { - return function(params) { - var scope = params.scope, - result = [], - filteredListA = [], - filteredListB = [], - idx = 0, - hostSummaries, - key, - keys = Object.keys(scope.jobData.hostSummaries); - if (keys.length > 0) { - hostSummaries = JSON.parse(JSON.stringify(scope.jobData.hostSummaries)); - if (scope.search_host_summary_name) { - for (key in hostSummaries) { - if (hostSummaries[key].name.indexOf(scope.search_host_summary_name) > 0) { - filteredListA[key] = hostSummaries[key]; - } - } - } - else { - filteredListA = hostSummaries; - } - - if (scope.search_host_summary_status === 'failed') { - for (key in filteredListA) { - if (filteredListA[key].status === 'failed' || filteredListA[key].status === 'unreachable') { - filteredListB[key] = filteredListA[key]; - } - } - } - else { - filteredListB = filteredListA; - } - - keys = Object.keys(filteredListB); - - keys.sort(function(a,b) { - if (filteredListB[a].name > filteredListB[b].name) { - return 1; - } - if (filteredListB[a].name < filteredListB[b].name) { - return -1; - } - // a must be equal to b - return 0; - }); - - while (idx < keys.length && result.length < scope.hostSummariesMaxRows) { - result.push(filteredListB[keys[idx]]); - idx++; - } - } - setTimeout( function() { - scope.$apply( function() { - scope.hosts = result; - }); - }); - }; - }]) - - .factory('UpdateDOM', ['DrawPlays', 'DrawTasks', 'DrawHostResults', 'DrawHostSummaries', 'DrawGraph', - function(DrawPlays, DrawTasks, DrawHostResults, DrawHostSummaries, DrawGraph) { + .factory('UpdateDOM', ['DrawPlays', 'DrawTasks', 'DrawHostResults', + function(DrawPlays, DrawTasks, DrawHostResults) { return function(params) { var scope = params.scope; if (!scope.pauseLiveEvents) { @@ -1469,17 +1319,10 @@ export default DrawHostResults({ scope: scope }); } - DrawHostSummaries({ scope: scope }); - setTimeout(function() { scope.playsLoading = false; scope.tasksLoading = false; scope.hostResultsLoading = false; - scope.LoadHostSummaries = false; },100); - - if (scope.host_summary.total > 0) { - DrawGraph({ scope: scope, resize: true }); - } }; }]); diff --git a/awx/ui/client/src/helpers/JobSubmission.js b/awx/ui/client/src/helpers/JobSubmission.js index 37caa00329..e357e5d436 100644 --- a/awx/ui/client/src/helpers/JobSubmission.js +++ b/awx/ui/client/src/helpers/JobSubmission.js @@ -752,9 +752,9 @@ function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm, * */ // Submit request to run a playbook - .factory('PlaybookRun', ['$location','$stateParams', 'LaunchJob', 'PromptForPasswords', 'Rest', 'GetBasePath', 'Alert', 'ProcessErrors', 'Wait', 'Empty', + .factory('PlaybookRun', ['$location', '$state', '$stateParams', 'LaunchJob', 'PromptForPasswords', 'Rest', 'GetBasePath', 'Alert', 'ProcessErrors', 'Wait', 'Empty', 'PromptForCredential', 'PromptForVars', 'PromptForSurvey' , 'CreateLaunchDialog', - function ($location, $stateParams, LaunchJob, PromptForPasswords, Rest, GetBasePath, Alert, ProcessErrors, Wait, Empty, + function ($location, $state, $stateParams, LaunchJob, PromptForPasswords, Rest, GetBasePath, Alert, ProcessErrors, Wait, Empty, PromptForCredential, PromptForVars, PromptForSurvey, CreateLaunchDialog) { return function (params) { var //parent_scope = params.scope, @@ -803,8 +803,8 @@ function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm, var job = data.job || data.system_job; if((scope.portalMode===false || scope.$parent.portalMode===false ) && Empty(data.system_job) || (base === 'home')){ - $location.path('/jobs/' + job); // use $state.go with reload: true option to re-instantiate sockets in + $state.go('jobDetail', {id: job}, {reload: true}) } }); diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary-factory.js b/awx/ui/client/src/job-detail/host-summary/host-summary-factory.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.block.less b/awx/ui/client/src/job-detail/host-summary/host-summary.block.less new file mode 100644 index 0000000000..de182dcbc5 --- /dev/null +++ b/awx/ui/client/src/job-detail/host-summary/host-summary.block.less @@ -0,0 +1,10 @@ +.HostSummary-graph--successful{ + text-anchor: start !important; +} +.HostSummary-graph--failed{ + text-anchor: end !important; +} +.HostSummary-graph--changed{ + text-anchor: end !important; +} +.HostSUmmary-graph--unreachable{} \ No newline at end of file diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js b/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js index 2af1b81443..a457c21ed7 100644 --- a/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js +++ b/awx/ui/client/src/job-detail/host-summary/host-summary.controller.js @@ -5,49 +5,114 @@ *************************************************/ export default - ['$scope', '$rootScope', '$stateParams', 'JobDetailService', 'jobSocket', function($scope, $rootScope, $stateParams, JobDetailService, jobSocket){ + ['$scope', '$rootScope', '$stateParams', 'Wait', 'JobDetailService', 'jobSocket', 'DrawGraph', function($scope, $rootScope, $stateParams, Wait, JobDetailService, jobSocket, DrawGraph){ - // the job_events socket should be substituted for a job_host_summary socket post 3.0 var page_size = 200; - var socketListener = function(){ - console.log(jobSocket) - jobSocket.on('summary_complete', function(data) { - JobDetailService.getJob($stateParams.id).success(function(res){ - console.log('job at summary_complete.', res) - }); - }); - jobSocket.on('status_changed', function(data) { - JobDetailService.getJob($stateParams.id).success(function(res){ - console.log('job at data.stats.', data.status, res) - }); - JobDetailService.getJobHostSummaries($stateParams.id, {}).success(function(res){ - console.log('jobhostSummaries at summary_complete.', data.status, res) - }); - }); - } - $scope.loading = $scope.hosts.length > 0 ? false : true; - $scope.done = true; - $scope.events = []; - $scope.$watchCollection('events', function(c){ - var filtered = $scope.events.filter(function(event){ - return ((event.failed || event.changed || - 'runner_on_ok' || 'runner_on_async_ok' || - 'runner_on_unreachable' || 'runner_on_skipped') - && event.host_name != ''); - }); - var grouped = _.groupBy(filtered, 'host_name'); - //$scope.hosts = - }); + $scope.loading = $scope.hosts.length > 0 ? false : true; + $scope.filter = 'all'; + $scope.search = null; - $scope.search = function(host_name){}; - $scope.filter = function(filter){}; - - var init = function(){ - socketListener(); - JobDetailService.getJobHostSummaries($stateParams.id, {}).success(function(res){ - console.log('jobhostSummaries at init.', res) - }); + var buildTooltips = function(hosts){ + var count = { + ok : _.filter(hosts, function(o){ + return o.changed === 0 && o.ok > 0; + }), + skipped : _.filter(hosts, function(o){ + return o.skipped > 0; + }), + unreachable : _.filter(hosts, function(o){ + return o.dark > 0; + }), + failed : _.filter(hosts, function(o){ + return o.failed === true; + }), + changed : _.filter(hosts, function(o){ + return o.changed > 0; + }) + }; + var tooltips = { + 0: 'No host events were ', + 1: ' host event was ', + 2: ' host events were ' + }; + return {count, tooltips} }; - init(); - }]; \ No newline at end of file + var socketListener = function(){ + // emitted by the API in the same function used to persist host summary data + // JobEvent.update_host_summary_from_stats() from /awx/main.models.jobs.py + jobSocket.on('summary_complete', function(data) { + // discard socket msgs we don't care about in this context + if ($stateParams.id === data['unified_job_id']){ + JobDetailService.getJobHostSummaries($stateParams.id, {page_size: page_size}) + .success(function(res){ + init() + }); + } + }); + // UnifiedJob.def socketio_emit_status() from /awx/main.models.unified_jobs.py + jobSocket.on('status_changed', function(data) { + if ($stateParams.id === data['unified_job_id']){ + $scope.status = data['status']; + } + }); + }; + + $scope.search = function(){ + Wait('start') + JobDetailService.getJobHostSummaries($stateParams.id, { + page_size: page_size, + host_name__icontains: $scope.searchTerm, + }).success(function(res){ + $scope.hosts = res.results; + $scope.next = res.next; + Wait('stop') + }) + }; + $scope.setFilter = function(filter){ + $scope.filter = filter; + var getAll = function(){ + Wait('start'); + JobDetailService.getJobHostSummaries($stateParams.id, { + page_size: page_size + }).success(function(res){ + Wait('stop') + $scope.hosts = res.results; + $scope.next = res.next; + }); + }; + var getFailed = function(){ + Wait('start'); + JobDetailService.getJobHostSummaries($stateParams.id, { + page_size: page_size, + failed: true + }).success(function(res){ + Wait('stop') + $scope.hosts = res.results; + $scope.next = res.next; + }); + } + var get = filter == 'all' ? getAll() : getFailed() + }; + + $scope.$watchCollection('hosts', function(curr, prev){ + $scope.tooltips = buildTooltips(curr); + DrawGraph({count: $scope.tooltips.count, resize:true}); + }); + + var init = function(){ + Wait('start'); + JobDetailService.getJobHostSummaries($stateParams.id, {page_size: page_size}) + .success(function(res){ + $scope.hosts = res.results; + $scope.next = res.next; + Wait('stop'); + }); + JobDetailService.getJob($stateParams.id) + .success(function(res){ + $scope.status = status; + }); + }; + socketListener(); + init(); + }]; \ No newline at end of file diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html b/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html index d86c5b3545..f44b4540ca 100644 --- a/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html +++ b/awx/ui/client/src/job-detail/host-summary/host-summary.partial.html @@ -1,66 +1,71 @@ -
+
+
+
+
+
+ + -
-
-
- - - -
-
-
-
- - -
-
-
+
+
+
+
+
+ + +
+
+
-
- - - - - - - -
HostsCompleted Tasks
-
+
+ + + + + + + +
HostsCompleted Tasks
+
-
- - - - - - - - - - - - - - - - -
- {{ host.name }} - - {{ host.ok }} - {{ host.changed }} - {{ host.unreachable }} - {{ host.failed }} -
Waiting...
Loading...
No matching hosts
-
+
+ + + + + + + + + + + + + + + + +
+ {{ host.host_name }} + + {{ host.ok }} + {{ host.changed }} + {{ host.skipped }} + {{ host.dark }} + {{ host.failures }} +
Waiting...
Loading...
No matching hosts
+
- + -
+
-
- -
+
+ +
diff --git a/awx/ui/client/src/job-detail/job-detail.controller.js b/awx/ui/client/src/job-detail/job-detail.controller.js index cbedbde7cb..9a004fdc8f 100644 --- a/awx/ui/client/src/job-detail/job-detail.controller.js +++ b/awx/ui/client/src/job-detail/job-detail.controller.js @@ -13,8 +13,7 @@ export default [ '$location', '$rootScope', '$filter', '$scope', '$compile', '$stateParams', '$log', 'ClearScope', 'GetBasePath', 'Wait', - 'ProcessErrors', 'SelectPlay', 'SelectTask', 'Socket', 'GetElapsed', - 'DrawGraph', 'LoadHostSummary', 'ReloadHostSummaryList', + 'ProcessErrors', 'SelectPlay', 'SelectTask', 'Socket', 'GetElapsed', 'JobIsFinished', 'SetTaskStyles', 'DigestEvent', 'UpdateDOM', 'DeleteJob', 'PlaybookRun', 'LoadPlays', 'LoadTasks', 'HostsEdit', 'ParseVariableString', 'GetChoices', 'fieldChoices', 'fieldLabels', @@ -22,8 +21,8 @@ export default function( $location, $rootScope, $filter, $scope, $compile, $stateParams, $log, ClearScope, GetBasePath, Wait, ProcessErrors, - SelectPlay, SelectTask, Socket, GetElapsed, DrawGraph, - LoadHostSummary, ReloadHostSummaryList, JobIsFinished, + SelectPlay, SelectTask, Socket, GetElapsed, + JobIsFinished, SetTaskStyles, DigestEvent, UpdateDOM, DeleteJob, PlaybookRun, LoadPlays, LoadTasks, HostsEdit, ParseVariableString, GetChoices, fieldChoices, @@ -192,7 +191,6 @@ export default scope.searchPlaysEnabled = true; scope.searchTasksEnabled = true; scope.searchHostsEnabled = true; - scope.searchHostSummaryEnabled = true; scope.search_play_status = 'all'; scope.search_task_status = 'all'; scope.search_host_status = 'all'; @@ -291,10 +289,6 @@ export default }; JobDetailService.getRelatedJobEvents(scope.job.id, params) .success(function(data) { - LoadHostSummary({ - scope: scope, - data: data.results[0].event_data - }); UpdateDOM({ scope: scope }); }) .error(function(data, status) { @@ -623,7 +617,6 @@ export default scope.playsLoading = true; scope.tasksLoading = true; scope.hostResultsLoading = true; - scope.LoadHostSummaries = true; // Load the job record JobDetailService.getJob(job_id) @@ -749,10 +742,6 @@ export default // First time. User just loaded page. scope.$emit('LoadJob'); } - else { - // Check if the graph needs to redraw - setTimeout(function() { DrawGraph({ scope: scope, resize: true }); }, 500); - } }); scope.adjustSize = function() { @@ -800,7 +789,6 @@ export default // Summary table height adjusting. height = ($('#job-detail-container').height() / 2) - $('#hosts-summary-section .JobDetail-searchHeaderRow').outerHeight() - $('#hosts-summary-section .table-header').outerHeight() - 20; - // $('#hosts-summary-table').height(height); //$('#hosts-summary-table').mCustomScrollbar("update"); scope.$emit('RefreshCompleted'); }; @@ -850,52 +838,6 @@ export default } }; - scope.toggleSummary = function(hide) { - var docw, doch, height = $('#job-detail-container').height(), slide_width; - if (!hide) { - docw = $(window).width(); - doch = $(window).height(); - slide_width = (docw < 840) ? '100%' : '80%'; - $('#summary-button').hide(); - $('.overlay').css({ - width: $(document).width(), - height: $(document).height() - }).show(); - - // Adjust the summary table height - $('#job-summary-container .job_well').height(height - 18).css({ - 'box-shadow': '-3px 3px 5px 0 #ccc' - }); - height = Math.floor($('#job-detail-container').height() * 0.5) - - $('#hosts-summary-section .header').outerHeight() - - $('#hosts-summary-section .table-header').outerHeight() - - $('#hide-summary-button').outerHeight() - - $('#summary-search-section').outerHeight() - - $('#hosts-summary-section .header').outerHeight() - - $('#hosts-summary-section .legend').outerHeight(); - $('#hosts-summary-table').height(height - 50); - //$('#hosts-summary-table').mCustomScrollbar("update"); - - $('#hide-summary-button').show(); - - $('#job-summary-container').css({ - top: 0, - right: 0, - width: slide_width, - 'z-index': 1090, - 'padding-right': '15px', - 'padding-left': '15px' - }).show('slide', {'direction': 'right'}); - - setTimeout(function() { DrawGraph({ scope: scope, resize: true }); }, 500); - } - else { - $('.overlay').hide(); - $('#summary-button').show(); - $('#job-summary-container').hide('slide', {'direction': 'right'}); - } - }; - scope.objectIsEmpty = function(obj) { if (angular.isObject(obj)) { return (Object.keys(obj).length > 0) ? false : true; @@ -903,6 +845,17 @@ export default return true; }; + scope.toggleLessEvents = function() { + if (!scope.lessEvents) { + $('#events-summary').slideUp(200); + scope.lessEvents = true; + } + else { + $('#events-summary').slideDown(200); + scope.lessEvents = false; + } + }; + scope.toggleLessStatus = function() { if (!scope.lessStatus) { $('#job-status-form').slideUp(200); @@ -925,18 +878,6 @@ export default } }; - scope.toggleLessEvents = function() { - if (!scope.lessEvents) { - $('#events-summary').slideUp(200); - scope.lessEvents = true; - } - else { - $('#events-summary').slideDown(200); - scope.lessEvents = false; - DrawGraph({scope:scope}); - } - }; - scope.filterPlayStatus = function() { scope.search_play_status = (scope.search_play_status === 'all') ? 'failed' : 'all'; if (!scope.liveEventProcessing || scope.pauseLiveEvents) { @@ -1017,86 +958,6 @@ export default } }; - scope.searchHostsKeyPress = function(e) { - if (e.keyCode === 13) { - scope.searchHosts(); - e.stopPropagation(); - } - }; - - scope.searchHostSummary = function() { - if (scope.search_host_summary_name) { - scope.searchHostSummaryEnabled = false; - } - else { - scope.searchHostSummaryEnabled = true; - } - if (!scope.liveEventProcessing || scope.pauseLiveEvents) { - ReloadHostSummaryList({ - scope: scope - }); - } - }; - - scope.searchHostSummaryKeyPress = function(e) { - if (e.keyCode === 13) { - scope.searchHostSummary(); - e.stopPropagation(); - } - }; - - scope.filterTaskStatus = function() { - scope.search_task_status = (scope.search_task_status === 'all') ? 'failed' : 'all'; - if (!scope.liveEventProcessing || scope.pauseLiveEvents) { - LoadTasks({ - scope: scope - }); - } - }; - - scope.filterHostStatus = function() { - scope.search_host_status = (scope.search_host_status === 'all') ? 'failed' : 'all'; - if (!scope.liveEventProcessing || scope.pauseLiveEvents) { - var params = { - parent: scope.selectedTask, - event__startswith: 'runner', - page_size: scope.hostResultsMaxRows, - order: 'host_name,counter' - } - if (scope.search_host_status === 'failed'){ - params.failed = true; - } - scope.hostResultsLoading = true; - JobDetailService.getRelatedJobEvents(scope.job.id, params).success(function(res){ - scope.hostResults = JobDetailService.processHostEvents(res.results) - scope.hostResultsLoading = false; - }); - } - }; - - scope.filterHostSummaryStatus = function() { - scope.search_host_summary_status = (scope.search_host_summary_status === 'all') ? 'failed' : 'all'; - if (!scope.liveEventProcessing || scope.pauseLiveEvents) { - // /api/v1/jobs/11/job_host_summaries/?failed=true&&page_size=200&order=host_name - var params = { - page_size: scope.hostSummariesMaxRows, - order: 'host_name' - } - if (scope.search_host_summary_status === 'failed'){ - params.failed = true; - } - /* - JobDetailService.getJobHostSummaries(scope.job.id, params).success(function(res){ - scope.next_host_summaries = res.next; - scope.hosts = res.results; - console.log(res.results) - }); - */ - ReloadHostSummaryList({ - scope: scope - }); - } - }; if (scope.removeDeleteFinished) { scope.removeDeleteFinished(); diff --git a/awx/ui/client/src/job-detail/job-detail.partial.html b/awx/ui/client/src/job-detail/job-detail.partial.html index 616b463386..8d723b4dd8 100644 --- a/awx/ui/client/src/job-detail/job-detail.partial.html +++ b/awx/ui/client/src/job-detail/job-detail.partial.html @@ -389,7 +389,7 @@ -