From bcf14ed0f5dc99bd9fc76cf7fe50672ef2f215cb Mon Sep 17 00:00:00 2001
From: Brandon Farmer <bthesorceror@gmail.com>
Date: Fri, 13 Jul 2018 17:05:13 -0700
Subject: [PATCH 1/2] Fetch more when scrolling

---
 ui/src/logs/actions/index.ts         |  2 +-
 ui/src/logs/components/LogsTable.tsx |  4 +---
 ui/src/logs/containers/LogsPage.tsx  | 19 ++++++++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ui/src/logs/actions/index.ts b/ui/src/logs/actions/index.ts
index 67d8509fa9..b44f797e79 100644
--- a/ui/src/logs/actions/index.ts
+++ b/ui/src/logs/actions/index.ts
@@ -32,7 +32,7 @@ import {
   TimeMarker,
 } from 'src/types/logs'
 
-export const INITIAL_LIMIT = 100
+export const INITIAL_LIMIT = 1000
 
 const defaultTableData: TableData = {
   columns: [
diff --git a/ui/src/logs/components/LogsTable.tsx b/ui/src/logs/components/LogsTable.tsx
index 23f3b9fbac..6c50e1fd3d 100644
--- a/ui/src/logs/components/LogsTable.tsx
+++ b/ui/src/logs/components/LogsTable.tsx
@@ -157,8 +157,6 @@ class LogsTable extends Component<Props, State> {
       isMessageVisible,
       visibleColumnsCount,
     }
-
-    this.loadMoreAboveRows = _.throttle(this.loadMoreAboveRows, 50)
   }
 
   public componentDidUpdate() {
@@ -314,7 +312,7 @@ class LogsTable extends Component<Props, State> {
 
       this.setState({scrollTop})
 
-      if (scrollTop < 200 && scrollTop < previousTop) {
+      if (scrollTop < 200 && scrollTop <= previousTop) {
         this.loadMoreAboveRows()
       }
 
diff --git a/ui/src/logs/containers/LogsPage.tsx b/ui/src/logs/containers/LogsPage.tsx
index 8ea6960b11..88f21ab0af 100644
--- a/ui/src/logs/containers/LogsPage.tsx
+++ b/ui/src/logs/containers/LogsPage.tsx
@@ -155,7 +155,9 @@ class LogsPage extends Component<Props, State> {
       this.fetchNewDataset()
     }
 
-    this.startUpdating()
+    if (getDeep<string>(this.props, 'timeRange.timeOption', '') === 'now') {
+      this.startUpdating()
+    }
   }
 
   public componentWillUnmount() {
@@ -235,7 +237,12 @@ class LogsPage extends Component<Props, State> {
 
   private handleChooseCustomTime = async (time: string) => {
     this.props.setTableCustomTime(time)
-    this.setState({hasScrolled: false})
+    const liveUpdating = LiveUpdating.Pause
+
+    this.setState({
+      hasScrolled: false,
+      liveUpdating,
+    })
 
     await this.props.setTimeMarker({
       timeOption: time,
@@ -254,10 +261,13 @@ class LogsPage extends Component<Props, State> {
         .toISOString(),
     }
 
+    let liveUpdating = LiveUpdating.Pause
     if (time === 0) {
       timeOption = {timeOption: 'now'}
+      liveUpdating = LiveUpdating.Play
     }
 
+    this.setState({liveUpdating})
     await this.props.setTimeMarker(timeOption)
     this.handleSetTimeBounds()
   }
@@ -482,8 +492,11 @@ class LogsPage extends Component<Props, State> {
     this.props.setNamespaceAsync(namespace)
   }
 
-  private fetchNewDataset() {
+  private turnOnUpdating() {
     this.setState({liveUpdating: LiveUpdating.Play})
+  }
+
+  private fetchNewDataset() {
     this.props.executeQueriesAsync()
   }
 

From a570fd7c89d6320bd3ac6050cce21d76ae2c581d Mon Sep 17 00:00:00 2001
From: Brandon Farmer <bthesorceror@gmail.com>
Date: Fri, 13 Jul 2018 17:12:23 -0700
Subject: [PATCH 2/2] Remove unused functions

---
 ui/src/logs/containers/LogsPage.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/src/logs/containers/LogsPage.tsx b/ui/src/logs/containers/LogsPage.tsx
index 88f21ab0af..9c3c52acff 100644
--- a/ui/src/logs/containers/LogsPage.tsx
+++ b/ui/src/logs/containers/LogsPage.tsx
@@ -492,10 +492,6 @@ class LogsPage extends Component<Props, State> {
     this.props.setNamespaceAsync(namespace)
   }
 
-  private turnOnUpdating() {
-    this.setState({liveUpdating: LiveUpdating.Play})
-  }
-
   private fetchNewDataset() {
     this.props.executeQueriesAsync()
   }