From 16b5047b1f504d26c8330ef57c9b382976581c0a Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 9 Feb 2017 16:56:02 -0500 Subject: [PATCH] more job results performance stuff --- awx/ui/client/src/job-results/event-queue.service.js | 10 +++++++--- .../client/src/job-results/job-results.controller.js | 6 +++--- .../src/shared/smart-search/smart-search.block.less | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/job-results/event-queue.service.js b/awx/ui/client/src/job-results/event-queue.service.js index 02c99ff9a5..6982b71e7b 100644 --- a/awx/ui/client/src/job-results/event-queue.service.js +++ b/awx/ui/client/src/job-results/event-queue.service.js @@ -52,10 +52,14 @@ export default ['jobResultsService', 'parseStdoutService', function(jobResultsSe }, // populates the event queue populate: function(event) { - val.queue[event.counter] = val.munge(event); + if (event) { + val.queue[event.counter] = val.munge(event); - if (!val.queue[event.counter].processed) { - return val.munge(event); + if (!val.queue[event.counter].processed) { + return val.munge(event); + } else { + return {}; + } } else { return {}; } diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index d19e7a919d..cd0cb61626 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -586,10 +586,10 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy var buffer = []; var processBuffer = function() { - buffer.forEach((event, i) => { - processEvent(event); + for (let i = 0; i < 20; i++) { + processEvent(buffer[i]); buffer.splice(i, 1); - }); + } }; var bufferInterval; diff --git a/awx/ui/client/src/shared/smart-search/smart-search.block.less b/awx/ui/client/src/shared/smart-search/smart-search.block.less index 43eb62ea92..3e6c4a11d1 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.block.less +++ b/awx/ui/client/src/shared/smart-search/smart-search.block.less @@ -237,7 +237,8 @@ // Additional modal specific styles -.modal-body, #add-permissions-modal { +.modal-body, #add-permissions-modal, +.JobResults { .SmartSearch-searchTermContainer { width: 100%; }