From b88ad50a75a3f65dd8a4563567a48fd96281b458 Mon Sep 17 00:00:00 2001
From: gconsidine <greg@gregconsidine.com>
Date: Tue, 9 Jan 2018 09:15:54 -0500
Subject: [PATCH] Update style of stdout container

---
 awx/ui/client/features/jobs/_index.less           |  3 ++-
 awx/ui/client/features/output/index.controller.js | 14 ++++++++++----
 awx/ui/client/features/output/index.js            |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/awx/ui/client/features/jobs/_index.less b/awx/ui/client/features/jobs/_index.less
index 1ebec50483..66725e86eb 100644
--- a/awx/ui/client/features/jobs/_index.less
+++ b/awx/ui/client/features/jobs/_index.less
@@ -90,7 +90,8 @@
     }
 
     &-container {
-        max-height: 80vh;
+        height: calc(~"100vh - 240px");
+        overflow-y: scroll;
         font-size: 15px;
         border: 1px solid @at-gray-dark-2x;
         background-color: @at-gray-light-2x;
diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index 0926846e42..b00404b398 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -77,6 +77,9 @@ function JobsIndexController (_job_, JobEventModel, _$sce_, _$timeout_, _$scope_
 
         meta.scroll.height = container[0].scrollHeight;
         meta.scroll.buffer = 100;
+        meta.next = job.get('related.job_events.next');
+        meta.prev = job.get('related.job_events.previous');
+        meta.cursor = job.get('related.job_events.results').length - 1;
 
         container.scroll(onScroll);
     });
@@ -84,8 +87,11 @@ function JobsIndexController (_job_, JobEventModel, _$sce_, _$timeout_, _$scope_
 
 function next () {
     job.next('job_events')
-        .then(data => {
-            console.log(data);
+        .then(() => {
+            meta.next = job.get('related.job_events.next');
+            meta.prev = job.get('related.job_events.previous');
+
+            console.log(job.get('related.job_events.results'));
         });
 }
 
@@ -338,8 +344,8 @@ function onScroll () {
 
         vm.menu.scroll.display = true;
 
-        if (bottom >= meta.scroll.height) {
-            // fetch more lines
+        if (bottom >= meta.scroll.height && meta.next) {
+            next();
         }
     }, 500);
 }
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 62e7309115..630d84a442 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -35,7 +35,7 @@ function JobsRun ($stateExtender, strings) {
                 return new Jobs('get', id)
                     .then(job => job.extend('job_events', {
                         params: {
-                            page_size: 1000,
+                            page_size: 13,
                             order_by: 'start_line'
                         }
                     }));