diff --git a/ui/src/logs/components/LogsTable.tsx b/ui/src/logs/components/LogsTable.tsx index 83ac77445..41bd72d44 100644 --- a/ui/src/logs/components/LogsTable.tsx +++ b/ui/src/logs/components/LogsTable.tsx @@ -346,7 +346,12 @@ class LogsTable extends Component { } const data = getValuesFromData(this.props.tableInfiniteData.forward) - const firstTime = getDeep(data, '0.0', new Date().getTime() / 1000) + const backwardData = getValuesFromData(this.props.tableInfiniteData.forward) + const firstTime = getDeep( + data, + '0.0', + getDeep(backwardData, '0.0', new Date().getTime()) + ) const {firstQueryTime} = this.state if (firstQueryTime && firstQueryTime > firstTime) { return @@ -364,11 +369,12 @@ class LogsTable extends Component { } const data = getValuesFromData(this.props.tableInfiniteData.backward) + const forwardData = getValuesFromData(this.props.tableInfiniteData.forward) const lastTime = getDeep( data, `${data.length - 1}.0`, - new Date().getTime() / 1000 + getDeep(forwardData, `${forwardData.length - 1}.0`, new Date().getTime()) ) // Guard against fetching on scrolling back up then down