Avoid uncaught exception in TableGraph

error-handling
Christopher Henn 2018-09-28 13:29:47 -07:00 committed by Chris Henn
parent 63c9172172
commit 27fcc0dd21
1 changed files with 9 additions and 1 deletions

View File

@ -29,6 +29,7 @@ import {
TimeSeriesServerResponse, TimeSeriesServerResponse,
TimeSeriesValue, TimeSeriesValue,
TimeSeriesToTableGraphReturnType, TimeSeriesToTableGraphReturnType,
InfluxQLQueryType,
} from 'src/types/series' } from 'src/types/series'
import {ColorString} from 'src/types/colors' import {ColorString} from 'src/types/colors'
import { import {
@ -83,6 +84,7 @@ interface State {
transformedData: TimeSeriesValue[][] transformedData: TimeSeriesValue[][]
sortedTimeVals: TimeSeriesValue[] sortedTimeVals: TimeSeriesValue[]
sortedLabels: Label[] sortedLabels: Label[]
influxQLQueryType: InfluxQLQueryType
hoveredColumnIndex: number hoveredColumnIndex: number
hoveredRowIndex: number hoveredRowIndex: number
timeColumnWidth: number timeColumnWidth: number
@ -115,6 +117,7 @@ class TableGraph extends PureComponent<Props, State> {
transformedData: [[]], transformedData: [[]],
sortedTimeVals: [], sortedTimeVals: [],
sortedLabels: [], sortedLabels: [],
influxQLQueryType: InfluxQLQueryType.DataQuery,
hoveredColumnIndex: NULL_ARRAY_INDEX, hoveredColumnIndex: NULL_ARRAY_INDEX,
hoveredRowIndex: NULL_ARRAY_INDEX, hoveredRowIndex: NULL_ARRAY_INDEX,
sort: {field: sortField, direction: DEFAULT_SORT_DIRECTION}, sort: {field: sortField, direction: DEFAULT_SORT_DIRECTION},
@ -303,7 +306,11 @@ class TableGraph extends PureComponent<Props, State> {
) )
} }
const data = _.get(result, 'data', this.state.data) const data = _.get(result, 'data', this.state.data)
const influxQLQueryType = _.get(result, 'influxQLQueryType', null) const influxQLQueryType = _.get(
result,
'influxQLQueryType',
this.state.influxQLQueryType
)
if (_.isEmpty(data[0])) { if (_.isEmpty(data[0])) {
return return
@ -397,6 +404,7 @@ class TableGraph extends PureComponent<Props, State> {
this.setState({ this.setState({
data, data,
sortedLabels, sortedLabels,
influxQLQueryType,
transformedData, transformedData,
sortedTimeVals, sortedTimeVals,
sort, sort,