diff --git a/packages/iris-grid/src/ColumnStatistics.tsx b/packages/iris-grid/src/ColumnStatistics.tsx index 3b52342261..abba1f49b7 100644 --- a/packages/iris-grid/src/ColumnStatistics.tsx +++ b/packages/iris-grid/src/ColumnStatistics.tsx @@ -170,11 +170,14 @@ class ColumnStatistics extends Component< statistics == null && model.isColumnStatisticsAvailable; const statisticElements = []; - const columnType = column.type.substring(column.type.lastIndexOf('.') + 1); - const description = - column.description === null - ? null - : column.description.substring(column.description.lastIndexOf(' ') + 1); + let columnType = column.type.substring(column.type.lastIndexOf('.') + 1); + let description; + if (column.description != null && column.description !== undefined) { + description = column.type.substring(column.type.lastIndexOf('.') + 1); + columnType = column.description.substring( + column.description.lastIndexOf('.') + 1 + ); + } if (statistics != null) { for (let i = 0; i < statistics.length; i += 1) { const { operation, className, value, type } = statistics[i]; @@ -204,7 +207,7 @@ class ColumnStatistics extends Component<