Merge pull request #3773 from influxdata/fix/logs-scrolling

Fix/logs scrolling
pull/10616/head
Iris Scholten 2018-06-26 10:40:19 -07:00 committed by GitHub
commit ecb4322e40
2 changed files with 13 additions and 8 deletions

View File

@ -299,14 +299,15 @@ class LogsTable extends Component<Props, State> {
private handleScroll = scrollInfo => { private handleScroll = scrollInfo => {
const {scrollLeft, scrollTop} = scrollInfo const {scrollLeft, scrollTop} = scrollInfo
const previousScrolltop = this.state.scrollTop
this.setState({scrollLeft, scrollTop})
if (scrollTop === 0) { if (scrollTop === 0) {
this.props.onScrolledToTop() this.props.onScrolledToTop()
} else if (scrollTop !== this.state.scrollTop) { } else if (scrollTop !== previousScrolltop) {
this.props.onScrollVertical() this.props.onScrollVertical()
} }
this.setState({scrollLeft, scrollTop})
} }
private headerRenderer = ({key, style, columnIndex}) => { private headerRenderer = ({key, style, columnIndex}) => {
@ -346,7 +347,7 @@ class LogsTable extends Component<Props, State> {
className={classnames('logs-viewer--cell', { className={classnames('logs-viewer--cell', {
highlight: highlightRow, highlight: highlightRow,
})} })}
title={`Filter by "${formattedValue}"`} title={`Filter by '${formattedValue}'`}
style={{...style, padding: '5px'}} style={{...style, padding: '5px'}}
key={key} key={key}
data-index={rowIndex} data-index={rowIndex}

View File

@ -32,11 +32,15 @@ export const formatColumnValue = (
case 'timestamp': case 'timestamp':
return moment(+value / 1000000).format('YYYY/MM/DD HH:mm:ss') return moment(+value / 1000000).format('YYYY/MM/DD HH:mm:ss')
case 'message': case 'message':
if (value.indexOf(' ') > charLimit - 5) { if (value) {
return _.truncate(value, {length: charLimit - 5}).replace('\\n', '') if (value.indexOf(' ') > charLimit - 5) {
} else { return _.truncate(value, {length: charLimit - 5}).replace('\\n', '')
return value.replace('\\n', '') } else {
return value.replace('\\n', '')
}
} }
return ''
default: default:
return value return value
} }