From 59d7968ea2d749693ec147c16e00353b1d020d88 Mon Sep 17 00:00:00 2001
From: Brandon Farmer <bthesorceror@gmail.com>
Date: Fri, 13 Jul 2018 14:39:48 -0700
Subject: [PATCH] Lock to top when live updating

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

diff --git a/ui/src/logs/components/LogsTable.tsx b/ui/src/logs/components/LogsTable.tsx
index 7c881eaf72..83ac77445e 100644
--- a/ui/src/logs/components/LogsTable.tsx
+++ b/ui/src/logs/components/LogsTable.tsx
@@ -101,7 +101,7 @@ class LogsTable extends Component<Props, State> {
       scrollTop = 0
     }
 
-    if (scrollToRow) {
+    if (_.isNumber(scrollToRow)) {
       scrollTop = calculateScrollTop(scrollToRow)
     }
 
@@ -285,7 +285,7 @@ class LogsTable extends Component<Props, State> {
       },
     }
 
-    if (scrollToRow) {
+    if (_.isNumber(scrollToRow)) {
       result.scrollToRow = scrollToRow
     }
 
diff --git a/ui/src/logs/containers/LogsPage.tsx b/ui/src/logs/containers/LogsPage.tsx
index 749e834e30..8ea6960b11 100644
--- a/ui/src/logs/containers/LogsPage.tsx
+++ b/ui/src/logs/containers/LogsPage.tsx
@@ -214,6 +214,10 @@ class LogsPage extends Component<Props, State> {
   }
 
   private get tableScrollToRow() {
+    if (this.liveUpdatingStatus === LiveUpdating.Play) {
+      return 0
+    }
+
     if (this.loadingNewer && this.props.newRowsAdded) {
       this.loadingNewer = false
       return this.props.newRowsAdded || 0
@@ -285,7 +289,7 @@ class LogsPage extends Component<Props, State> {
   }
 
   private get isSpecificTimeRange(): boolean {
-    return !!getDeep(this.props, 'timeRange.upper', false)
+    return !!getDeep(this.props, 'tableTime.custom', false)
   }
 
   private startUpdating = () => {