Get the sourceColumn working with totals correctly

- Now it doesn't crash when you add aggregations
deephaven · Nov 21, 2023 · 93cf84d · 93cf84d
1 parent 559d4d6
commit 93cf84d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/iris-grid/src/IrisGridTableModelTemplate.ts b/packages/iris-grid/src/IrisGridTableModelTemplate.ts
@@ -1001,11 +1001,6 @@ class IrisGridTableModelTemplate<
    * @param row Row index to get the source column from
    */
   sourceColumn(column: ModelIndex, row: ModelIndex): Column {
-    const proxyCell = this.sourceForCell(column, row);
-    if (proxyCell.column !== column) {
-      return this.columns[proxyCell.column];
-    }
-
     const totalsRow = this.totalsRow(row);
     if (totalsRow != null) {
       const operation = this.totals?.operationOrder[totalsRow];
@@ -1023,12 +1018,10 @@ class IrisGridTableModelTemplate<
             this.totals?.operationOrder.length === 1) &&
             col.name === tableColumn.name)
       );
-      if (totalsColumn == null) {
-        throw new Error(
-          `Unable to find totals column for ${tableColumn.name} with operation ${operation}`
-        );
+      if (totalsColumn != null) {
+        return totalsColumn;
       }
-      return totalsColumn;
+      // There may be cases were the totals table doesn't have a column, such as when there's a virtual column
     }
     return this.columns[column];
   }

diff --git a/packages/iris-grid/src/IrisGridTreeTableModel.ts b/packages/iris-grid/src/IrisGridTreeTableModel.ts
@@ -202,6 +202,15 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
     return { column: column + depth, row };
   }
 
+  sourceColumn(column: ModelIndex, row: ModelIndex): Column {
+    if (column >= this.virtualColumns.length) {
+      return super.sourceColumn(column, row);
+    }
+
+    const depth = this.depthForRow(row);
+    return this.columns[column + depth];
+  }
+
   getClearFilterRange(column: ModelIndex): BoundedAxisRange | null {
     if (column >= this.virtualColumns.length) {
       return super.getClearFilterRange(column);