From 91e565904250030b72e5a5c6c074f49be90bfb96 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 26 Mar 2018 00:17:32 -0400 Subject: [PATCH] rename to engine service The rename reflects the fact that this service is now driven by an external caller after being initialized with hooks. --- .../{stream.service.js => engine.service.js} | 8 +++--- .../features/output/index.controller.js | 28 +++++++++---------- awx/ui/client/features/output/index.js | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) rename awx/ui/client/features/output/{stream.service.js => engine.service.js} (97%) diff --git a/awx/ui/client/features/output/stream.service.js b/awx/ui/client/features/output/engine.service.js similarity index 97% rename from awx/ui/client/features/output/stream.service.js rename to awx/ui/client/features/output/engine.service.js index 216d31ddc5..c8b0fd662a 100644 --- a/awx/ui/client/features/output/stream.service.js +++ b/awx/ui/client/features/output/engine.service.js @@ -1,7 +1,7 @@ const JOB_END = 'playbook_on_stats'; const MAX_LAG = 120; -function JobStreamService ($q) { +function JobEventEngine ($q) { this.init = ({ resource, scroll, page, onEventFrame, onStart, onStop }) => { this.resource = resource; this.scroll = scroll; @@ -105,7 +105,7 @@ function JobStreamService ($q) { } }; - this.pushEventData = data => { + this.pushEvent = data => { this.lag++; this.chain = this.chain @@ -221,6 +221,6 @@ function JobStreamService ($q) { this.isDone = () => this.state.ended; } -JobStreamService.$inject = ['$q']; +JobEventEngine.$inject = ['$q']; -export default JobStreamService; +export default JobEventEngine; diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js index cc5827b2b1..45581b876e 100644 --- a/awx/ui/client/features/output/index.controller.js +++ b/awx/ui/client/features/output/index.controller.js @@ -13,7 +13,7 @@ let qs; let render; let resource; let scroll; -let stream; +let engine; let vm; @@ -25,7 +25,7 @@ function JobsIndexController ( _page_, _scroll_, _render_, - _stream_, + _engine_, _$scope_, _$compile_, _$q_, @@ -43,7 +43,7 @@ function JobsIndexController ( page = _page_; scroll = _scroll_; render = _render_; - stream = _stream_; + engine = _engine_; moment = _moment_; @@ -113,7 +113,7 @@ function init (pageMode) { render.init({ get: () => resource.model.get(`related.${resource.related}.results`), compile: html => $compile(html)($scope), - isStreamActive: stream.isActive + isStreamActive: engine.isActive }); scroll.init({ @@ -122,7 +122,7 @@ function init (pageMode) { next, }); - stream.init({ + engine.init({ page, scroll, resource, @@ -178,7 +178,7 @@ function handleSocketEvent (scope, data) { statsEvent = data; } - stream.pushEventData(data); + engine.pushEvent(data); } function devClear (pageMode) { @@ -228,10 +228,10 @@ function previous () { }); } -function append (events, stream) { +function append (events, engine) { return render.append(events) .then(count => { - page.updateLineCount(count, stream); + page.updateLineCount(count, engine); }); } @@ -292,15 +292,15 @@ function scrollHome () { } function scrollEnd () { - if (stream.isActive()) { - if (stream.isTransitioning()) { + if (engine.isActive()) { + if (engine.isTransitioning()) { return $q.resolve(); } - if (stream.isPaused()) { - stream.resume(); + if (engine.isPaused()) { + engine.resume(); } else { - stream.pause(); + engine.pause(); } return $q.resolve(); @@ -450,7 +450,7 @@ JobsIndexController.$inject = [ 'JobPageService', 'JobScrollService', 'JobRenderService', - 'JobStreamService', + 'JobEventEngine', '$scope', '$compile', '$q', diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js index de5a06a295..ec1e756f69 100644 --- a/awx/ui/client/features/output/index.js +++ b/awx/ui/client/features/output/index.js @@ -6,7 +6,7 @@ import Controller from '~features/output/index.controller'; import PageService from '~features/output/page.service'; import RenderService from '~features/output/render.service'; import ScrollService from '~features/output/scroll.service'; -import StreamService from '~features/output/stream.service'; +import EngineService from '~features/output/engine.service'; import DetailsDirective from '~features/output/details.directive'; import SearchKeyDirective from '~features/output/search-key.directive'; @@ -208,7 +208,7 @@ angular .service('JobStrings', Strings) .service('JobPageService', PageService) .service('JobScrollService', ScrollService) - .service('JobStreamService', StreamService) + .service('JobEventEngine', EngineService) .directive('atDetails', DetailsDirective) .directive('atSearchKey', SearchKeyDirective) .directive('atStats', StatsDirective)