diff --git a/packages/iris-grid/src/ColumnStatistics.tsx b/packages/iris-grid/src/ColumnStatistics.tsx index 344915fde6..15c7219144 100644 --- a/packages/iris-grid/src/ColumnStatistics.tsx +++ b/packages/iris-grid/src/ColumnStatistics.tsx @@ -30,7 +30,7 @@ interface ColumnStatisticsProps { interface ColumnStatisticsState { error: unknown; loading: boolean; - statistics: Statistic[] | null; + statistics: readonly Statistic[] | null; numRows: number; } @@ -81,7 +81,7 @@ class ColumnStatistics extends Component< cancelablePromise: CancelablePromise | null; maybeGenerateStatistics(): void { - const { model } = this.props; + const { column, model } = this.props; const numRows = model.rowCount - @@ -89,7 +89,7 @@ class ColumnStatistics extends Component< model.floatingBottomRowCount - model.floatingTopRowCount; this.setState({ numRows }); - if (!model.isColumnStatisticsAvailable) { + if (!model.isColumnStatisticsAvailable || column.isProxy === true) { this.setState({ loading: false }); } else if (numRows < ColumnStatistics.AUTO_GENERATE_LIMIT) { this.handleGenerateStatistics(); diff --git a/packages/iris-grid/src/CrossColumnSearch.tsx b/packages/iris-grid/src/CrossColumnSearch.tsx index 0243562b60..0d446f3182 100644 --- a/packages/iris-grid/src/CrossColumnSearch.tsx +++ b/packages/iris-grid/src/CrossColumnSearch.tsx @@ -17,6 +17,7 @@ import type { import { TableUtils } from '@deephaven/jsapi-utils'; import './CrossColumnSearch.scss'; import { ColumnName } from './CommonTypes'; +import { DisplayColumn } from './IrisGridModel'; interface CrossColumnSearchProps { value: string; @@ -27,7 +28,7 @@ interface CrossColumnSearchProps { selectedColumns: readonly ColumnName[], invertSelection: boolean ) => void; - columns: readonly Column[]; + columns: readonly DisplayColumn[]; } interface CrossColumnSearchState { @@ -233,23 +234,27 @@ class CrossColumnSearch extends PureComponent<
Searched Columns
- {columns.map(column => ( - - this.toggleColumn(column.name)} - > - {column.name} - + {columns.map(column => { + if (column.isProxy === true) return null; - {column.type.substring(column.type.lastIndexOf('.') + 1)} - - ))} + return ( + + this.toggleColumn(column.name)} + > + {column.name} + + + {column.type.substring(column.type.lastIndexOf('.') + 1)} + + ); + })}