Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix checking for empty data in tableGraph 

Co-authored-by: Deniz Kusefoglu <denix@influxdata.com>
pull/3030/head
Iris Scholten 2018-03-21 14:50:38 -07:00
parent 717c707929
commit df56ee7312
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/src/dashboards/components/TableOptions.tsx
View File

@ -119,6 +119,7 @@ export class TableOptions extends PureComponent<Props, {}> {
sortBy.internalName === field.internalName
? {...sortBy, displayName: field.displayName}
: sortBy
handleUpdateTableOptions({
...tableOptions,
fieldNames: updatedFields,

15
ui/src/shared/components/TableGraph.js
View File

@ -41,13 +41,13 @@ const processData = (
verticalTimeAxis,
fieldNames
) => {
const filteredData = filterInvisibleColumns(data, fieldNames)
const sortIndex = _.indexOf(filteredData[0], sortFieldName)
const sortIndex = _.indexOf(data[0], sortFieldName)
const sortedData = [
filteredData[0],
..._.orderBy(_.drop(filteredData, 1), sortIndex, [direction]),
data[0],
..._.orderBy(_.drop(data, 1), sortIndex, [direction]),
]
const processedData = verticalTimeAxis ? sortedData : _.unzip(sortedData)
const filteredData = filterInvisibleColumns(sortedData, fieldNames)
const processedData = verticalTimeAxis ? filteredData : _.unzip(filteredData)
return {processedData}
}
@ -273,7 +273,7 @@ class TableGraph extends Component {
const verticalTimeAxis = _.get(tableOptions, 'verticalTimeAxis', true)
const columnCount = _.get(processedData, ['0', 'length'], 0)
const rowCount = processedData.length
const rowCount = columnCount === 0 ? 0 : processedData.length
const COLUMN_MIN_WIDTH = 98
const COLUMN_MAX_WIDTH = 500
const ROW_HEIGHT = 30
@ -289,14 +289,13 @@ class TableGraph extends Component {
!hoveringThisTable && verticalTimeAxis ? hoverTimeIndex : undefined
const scrollToColumn =
!hoveringThisTable && !verticalTimeAxis ? hoverTimeIndex : undefined
return (
<div
className="table-graph-container"
ref={gridContainer => (this.gridContainer = gridContainer)}
onMouseOut={this.handleMouseOut}
>
{!_.isEmpty(processedData) &&
{rowCount > 0 &&
<ColumnSizer
columnCount={columnCount}
columnMaxWidth={COLUMN_MAX_WIDTH}