Skip to content
Snippets Groups Projects
Commit 2ce8182f authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix broken pivot table due to null dimension values. Be more defensive. Resolves #2440

parent c9d606fa
No related branches found
No related tags found
No related merge requests found
......@@ -92,7 +92,7 @@ var DataGrid = {
}
var colDef = _.clone(data.cols[cellCol]);
colDef['name'] = colDef['display_name'] = formatValue(val, { column: data.cols[pivotCol] });
colDef['name'] = colDef['display_name'] = formatValue(val, { column: data.cols[pivotCol] }) || "";
return colDef;
});
......
......@@ -217,8 +217,8 @@ export default class TableInteractive extends Component {
tableHeaderRenderer(columnIndex) {
var column = this.props.data.cols[columnIndex],
colVal = (column && column.display_name && column.display_name.toString()) ||
(column && column.name && column.name.toString());
colVal = (column && column.display_name && String(column.display_name)) ||
(column && column.name && String(column.name)) || "";
if (column.unit && column.unit !== "default") {
colVal += ": " + capitalize(column.unit.replace(/-/g, " "))
......@@ -265,7 +265,8 @@ export default class TableInteractive extends Component {
}
var tableColumns = this.props.data.cols.map((column, idx) => {
var colVal = (column !== null) ? column.name.toString() : null;
var colVal = (column && column.display_name && String(column.display_name)) ||
(column && column.name && String(column.name)) || "";
var colWidth = this.state.columnWidths[idx];
if (!colWidth) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment