move to proxy

Author: gzh2003

packages/iris-grid/src/IrisGrid.tsx

@@ -1382,7 +1382,6 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
   getModelTotalsConfig = memoize(
     (
       columns: readonly DhType.Column[],
-      originalColumns: readonly DhType.Column[],
       config: UIRollupConfig | undefined,
       aggregationSettings: AggregationSettings
     ): UITotalsTableConfig | null => {
@@ -1391,18 +1390,6 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
         return null;
       }
 
-      // TODO: evaluate whether this should be moved to proxy model, since it should manage the model transition
-      // When a rollup is being removed the model `columns` still reflects the tree table's columns
-      // while the rollup config has already been cleared. Building a totals config with those stale
-      // column names would cause a server error.
-      if (
-        config != null &&
-        config.columns.length === 0 &&
-        columns !== originalColumns
-      ) {
-        return null;
-      }
-
       // Filter out aggregations without any columns actually selected
       const aggregations = aggregationSettings.aggregations.filter(
         agg => agg.selected.length > 0 || agg.invert
@@ -5248,7 +5235,6 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
                 )}
                 totalsConfig={this.getModelTotalsConfig(
                   model.columns,
-                  model.originalColumns,
                   rollupConfig,
                   aggregationSettings
                 )}

packages/iris-grid/src/IrisGridProxyModel.ts

@@ -11,7 +11,7 @@ import IrisGridTableModel from './IrisGridTableModel';
 import IrisGridPartitionedTableModel from './IrisGridPartitionedTableModel';
 import IrisGridTreeTableModel from './IrisGridTreeTableModel';
 import IrisGridModel from './IrisGridModel';
-import { type ColumnName } from './CommonTypes';
+import { type ColumnName, type UITotalsTableConfig } from './CommonTypes';
 import { isIrisGridTableModelTemplate } from './IrisGridTableModelTemplate';
 import {
   type PartitionConfig,
@@ -431,6 +431,15 @@ class IrisGridProxyModel extends IrisGridModel implements PartitionedGridModel {
     this.setNextModel(modelPromise);
   }
 
+  set totalsConfig(totalsConfig: UITotalsTableConfig | null) {
+    if (this.modelPromise != null) {
+      // Model switch in progress. Don't forward, as the config may reference stale columns.
+      // COLUMNS_CHANGED will reapply the correct config after.
+      return;
+    }
+    this.model.totalsConfig = totalsConfig;
+  }
+
   get isFilterRequired(): boolean {
     return this.originalModel.isFilterRequired;
   }