@finos/legend-data-cube 0.0.7 → 0.0.8

package/src/stores/{grid → view/grid}/DataCubeGridConfigurationBuilder.tsx

@@ -25,7 +25,7 @@ import {
   _findCol,
   type DataCubeQuerySnapshot,
   type DataCubeQuerySnapshotColumn,
-} from '../core/DataCubeQuerySnapshot.js';
+} from '../../core/DataCubeQuerySnapshot.js';
 import type {
   ColDef,
   ColGroupDef,
@@ -69,7 +69,7 @@ import {
 import type {
   DataCubeColumnConfiguration,
   DataCubeConfiguration,
-} from '../core/DataCubeConfiguration.js';
+} from '../../core/DataCubeConfiguration.js';
 import {
   DataCubeColumnDataType,
   DataCubeColumnPinPlacement,
@@ -82,7 +82,7 @@ import {
   PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
   isPivotResultColumnName,
   TREE_COLUMN_VALUE_SEPARATOR,
-} from '../core/DataCubeQueryEngine.js';
+} from '../../core/DataCubeQueryEngine.js';
 import type { CustomLoadingCellRendererProps } from '@ag-grid-community/react';
 import { DataCubeIcon } from '@finos/legend-art';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
@@ -331,7 +331,6 @@ function _displaySpec(columnData: ColumnData) {
       params.value !== INTERNAL__GRID_CLIENT_MISSING_VALUE
         ? `Value = ${params.value === '' ? "''" : params.value === true ? 'TRUE' : params.value === false ? 'FALSE' : params.value}`
         : `Missing Value`,
-    loadingCellRenderer: DataCubeGridLoadingCellRenderer,
     cellRenderer: getCellRenderer(columnData),
   } satisfies ColDef;
 }
@@ -390,7 +389,6 @@ function _groupDisplaySpec(
       }
       return null;
     },
-    loadingCellRenderer: DataCubeGridLoadingCellRenderer,
   } satisfies ColDef;
 }
 
@@ -594,7 +592,12 @@ export function generateBaseGridOptions(view: DataCubeViewState): GridOptions {
     suppressDragLeaveHidesColumns: true, // disable this since it's quite easy to accidentally hide columns while moving
     // -------------------------------------- SERVER SIDE ROW MODEL --------------------------------------
     suppressScrollOnNewData: true,
-    suppressServerSideFullWidthLoadingRow: true, // make sure each column has its own loading indicator instead of the whole row
+    // NOTE: use row loader instead of showing loader in each cell to improve performance
+    // otherwise, when we have many columns (i.e. when pivoting), the app could freeze.
+    loadingCellRenderer: DataCubeGridLoadingCellRenderer,
+    // By default, when row-grouping is active, ag-grid's caching mechanism causes sort
+    // to not work properly for pivot result columns, so we must disable this mechanism.
+    serverSideSortAllLevels: true,
     // -------------------------------------- SELECTION --------------------------------------
     cellSelection: true,
     // -------------------------------------- SIDEBAR --------------------------------------
@@ -709,6 +712,7 @@ function generateDefinitionForPivotResultColumns(
             menuTabs: [],
 
             ..._displaySpec(columnData),
+            ..._sortSpec(columnData),
             ..._sizeSpec(columnData),
 
             // disallow pinning and moving pivot result columns
@@ -787,8 +791,12 @@ export function generateColumnDefs(
   // which are grouped must be present in the column definitions, so even
   // when some of these might not be selected explicitly by the users, they
   // must still be included in the column definitions, and made hidden instead.
-  const columns = configuration.columns.filter((col) =>
-    snapshot.data.selectColumns.find((column) => column.name === col.name),
+  const columns = configuration.columns.filter(
+    (col) =>
+      snapshot.data.selectColumns.find((column) => column.name === col.name) ??
+      snapshot.data.groupExtendedColumns.find(
+        (column) => column.name === col.name,
+      ),
   );
   let pivotResultColumns: DataCubeQuerySnapshotColumn[] = [];
 
@@ -850,7 +858,7 @@ export function generateGridOptionsFromSnapshot(
   configuration: DataCubeConfiguration,
   view: DataCubeViewState,
 ): GridOptions {
-  const gridOptions = {
+  return {
     isServerSideGroupOpenByDefault: (params) => {
       if (
         configuration.initialExpandLevel !== undefined &&
@@ -955,7 +963,6 @@ export function generateGridOptionsFromSnapshot(
       // See https://www.ag-grid.com/react-data-grid/grouping-custom-group-columns/
       colId: INTERNAL__GRID_CLIENT_TREE_COLUMN_ID,
       headerName: '',
-      cellRenderer: 'agGroupCellRenderer',
       cellRendererParams: {
         suppressCount: !configuration.showLeafCount,
       },
@@ -974,8 +981,6 @@ export function generateGridOptionsFromSnapshot(
       // aggregation
       showRowGroup: true,
       suppressSpanHeaderHeight: true,
-    } satisfies ColDef,
+    } as ColDef,
   } satisfies GridOptions;
-
-  return gridOptions;
 }

package/src/stores/{grid → view/grid}/DataCubeGridControllerState.ts

@@ -20,14 +20,14 @@ import {
   uniq,
   uniqBy,
 } from '@finos/legend-shared';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import {
   _toCol,
   type DataCubeQuerySnapshot,
   type DataCubeQuerySnapshotColumn,
   type DataCubeQuerySnapshotSortColumn,
-} from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
+} from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
 import {
   type DataCubeQuerySortDirection,
   type DataCubeColumnPinPlacement,
@@ -35,7 +35,7 @@ import {
   DataCubeQueryFilterGroupOperator,
   isPivotResultColumnName,
   getPivotResultColumnBaseColumnName,
-} from '../core/DataCubeQueryEngine.js';
+} from '../../core/DataCubeQueryEngine.js';
 import type {
   GetContextMenuItemsParams,
   GetMainMenuItemsParams,
@@ -50,8 +50,8 @@ import {
   type DataCubeFilterEditorConditionTreeNode,
   type DataCubeFilterEditorTree,
   type DataCubeFilterEditorTreeNode,
-} from '../core/filter/DataCubeQueryFilterEditorState.js';
-import { _pruneExpandedPaths } from '../core/DataCubeQuerySnapshotBuilderUtils.js';
+} from '../../core/filter/DataCubeQueryFilterEditorState.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 
 /**
  * This query editor state is responsible for capturing updates to the data cube query
@@ -346,41 +346,26 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     ].find((col) => col.name === colName);
   }
 
-  private getActionableSortColumn(
-    colName: string,
-    direction: DataCubeQuerySortDirection,
-  ) {
-    const column = this.getSortableColumn(colName);
-    if (!column) {
-      return undefined;
-    }
-    const sortColumn = this.sortColumns.find((col) => col.name === colName);
-    if (sortColumn && sortColumn.direction !== direction) {
-      return sortColumn;
-    }
-    if (!sortColumn) {
-      return { ...column, direction };
-    }
-    return undefined;
-  }
-
   setSortByColumn(colName: string, direction: DataCubeQuerySortDirection) {
-    const column = this.getActionableSortColumn(colName, direction);
+    const column = this.getSortableColumn(colName);
     if (!column) {
       return;
     }
-    column.direction = direction;
-    this.sortColumns = [column];
+    this.sortColumns = [
+      {
+        ...column,
+        direction,
+      },
+    ];
     this.applyChanges();
   }
 
   addSortByColumn(colName: string, direction: DataCubeQuerySortDirection) {
-    const column = this.getActionableSortColumn(colName, direction);
+    const column = this.getSortableColumn(colName);
     if (!column) {
       return;
     }
-    column.direction = direction;
-    this.sortColumns = [...this.sortColumns, column];
+    this.sortColumns = [...this.sortColumns, { ...column, direction }];
     this.applyChanges();
   }
 
@@ -396,12 +381,14 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
   // --------------------------------- MAIN ---------------------------------
 
+  override getSnapshotSubscriberName() {
+    return 'grid-controller';
+  }
+
   override async applySnapshot(
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,
   ) {
-    const newSnapshot = snapshot.clone();
-
     this.configuration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,
     );
@@ -416,16 +403,16 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
         )
       : undefined;
 
-    this.selectColumns = newSnapshot.data.selectColumns;
-    this.leafExtendedColumns = newSnapshot.data.leafExtendedColumns;
-    this.groupExtendedColumns = newSnapshot.data.groupExtendedColumns;
+    this.selectColumns = snapshot.data.selectColumns;
+    this.leafExtendedColumns = snapshot.data.leafExtendedColumns;
+    this.groupExtendedColumns = snapshot.data.groupExtendedColumns;
 
-    this.horizontalPivotColumns = newSnapshot.data.pivot?.columns ?? [];
-    this.horizontalPivotCastColumns = newSnapshot.data.pivot?.castColumns ?? [];
+    this.horizontalPivotColumns = snapshot.data.pivot?.columns ?? [];
+    this.horizontalPivotCastColumns = snapshot.data.pivot?.castColumns ?? [];
 
-    this.verticalPivotColumns = newSnapshot.data.groupBy?.columns ?? [];
+    this.verticalPivotColumns = snapshot.data.groupBy?.columns ?? [];
 
-    this.sortColumns = newSnapshot.data.sortColumns;
+    this.sortColumns = snapshot.data.sortColumns;
 
     this.menuBuilder = generateMenuBuilder(this);
   }
@@ -443,7 +430,13 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
     this.selectColumns = uniqBy(
       [
-        ...this.configuration.columns.filter((col) => col.isSelected),
+        ...this.configuration.columns.filter(
+          (col) =>
+            col.isSelected &&
+            !this.groupExtendedColumns.find(
+              (column) => column.name === col.name,
+            ),
+        ),
         ...this.horizontalPivotColumns,
         ...this.verticalPivotColumns,
       ],
@@ -488,9 +481,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
     this.propagateChanges(baseSnapshot);
 
-    snapshot.data.configuration = DataCubeConfiguration.serialization.toJson(
-      this.configuration,
-    );
+    snapshot.data.configuration = this.configuration.serialize();
 
     snapshot.data.filter = this.filterTree.root
       ? buildFilterQuerySnapshot(this.filterTree.root)

package/src/stores/{grid → view/grid}/DataCubeGridMenuBuilder.tsx

@@ -19,7 +19,7 @@ import type {
   GetMainMenuItemsParams,
   MenuItemDef,
 } from '@ag-grid-community/core';
-import { WIP_GridMenuItem } from '../../components/grid/DataCubeGridShared.js';
+import { WIP_GridMenuItem } from '../../../components/view/grid/DataCubeGridShared.js';
 import {
   DataCubeQuerySortDirection,
   DataCubeColumnPinPlacement,
@@ -29,7 +29,7 @@ import {
   DataCubeQueryFilterOperator,
   isPivotResultColumnName,
   getPivotResultColumnBaseColumnName,
-} from '../core/DataCubeQueryEngine.js';
+} from '../../core/DataCubeQueryEngine.js';
 import {
   guaranteeIsNumber,
   isNonNullable,
@@ -42,8 +42,8 @@ import {
   INTERNAL__GRID_CLIENT_TREE_COLUMN_ID,
 } from './DataCubeGridClientEngine.js';
 import { PRIMITIVE_TYPE } from '@finos/legend-graph';
-import type { DataCubeColumnConfiguration } from '../core/DataCubeConfiguration.js';
-import { DataCubeFilterEditorConditionTreeNode } from '../core/filter/DataCubeQueryFilterEditorState.js';
+import type { DataCubeColumnConfiguration } from '../../core/DataCubeConfiguration.js';
+import { DataCubeFilterEditorConditionTreeNode } from '../../core/filter/DataCubeQueryFilterEditorState.js';
 import { DataCubeEditorTab } from '../editor/DataCubeEditorState.js';
 
 function toFilterValue(
@@ -208,12 +208,6 @@ export function generateMenuBuilder(
                       DataCubeQuerySortDirection.ASCENDING,
                     ),
                 },
-                {
-                  name: 'Ascending Absolute',
-                  menuItem: WIP_GridMenuItem,
-                  cssClasses: ['!opacity-100'],
-                  disabled: true,
-                },
                 {
                   name: 'Descending',
                   action: () =>
@@ -222,12 +216,6 @@ export function generateMenuBuilder(
                       DataCubeQuerySortDirection.DESCENDING,
                     ),
                 },
-                {
-                  name: 'Descending Absolute',
-                  menuItem: WIP_GridMenuItem,
-                  cssClasses: ['!opacity-100'],
-                  disabled: true,
-                },
                 {
                   name: 'Clear Sort',
                   disabled: !controller.sortColumns.find(
@@ -251,12 +239,6 @@ export function generateMenuBuilder(
                       DataCubeQuerySortDirection.ASCENDING,
                     ),
                 },
-                {
-                  name: 'Add Ascending Absolute',
-                  menuItem: WIP_GridMenuItem,
-                  cssClasses: ['!opacity-100'],
-                  disabled: true,
-                },
                 {
                   name: 'Add Descending',
                   disabled: Boolean(
@@ -272,12 +254,6 @@ export function generateMenuBuilder(
                       DataCubeQuerySortDirection.DESCENDING,
                     ),
                 },
-                {
-                  name: 'Add Descending Absolute',
-                  menuItem: WIP_GridMenuItem,
-                  cssClasses: ['!opacity-100'],
-                  disabled: true,
-                },
                 'separator',
               ]
             : []),
@@ -608,13 +584,21 @@ export function generateMenuBuilder(
         subMenu: [
           {
             name: `Add New Column...`,
-            action: () => extend.openNewColumnEditor(),
+            action: () => {
+              extend
+                .openNewColumnEditor()
+                .catch((error) => application.alertUnhandledError(error));
+            },
           },
           ...(columnConfiguration && columnName
             ? [
                 {
                   name: `Extend Column ${columnName}...`,
-                  action: () => extend.openNewColumnEditor(columnConfiguration),
+                  action: () => {
+                    extend
+                      .openNewColumnEditor(columnConfiguration)
+                      .catch((error) => application.alertUnhandledError(error));
+                  },
                 },
               ]
             : []),
@@ -623,46 +607,24 @@ export function generateMenuBuilder(
                 'separator',
                 {
                   name: `Edit Column ${columnName}...`,
-                  menuItem: WIP_GridMenuItem,
-                  cssClasses: ['!opacity-100'],
-                  disabled: true,
+                  action: () => {
+                    extend
+                      .openExistingColumnEditor(columnName)
+                      .catch((error) => application.alertUnhandledError(error));
+                  },
                 },
                 {
                   name: `Delete Column ${columnName}`,
-                  menuItem: WIP_GridMenuItem,
-                  cssClasses: ['!opacity-100'],
-                  disabled: true,
+                  action: () => {
+                    extend
+                      .deleteColumn(columnName)
+                      .catch((error) => application.alertUnhandledError(error));
+                  },
                 },
               ]
             : []),
         ],
       },
-      {
-        name: 'Custom Groupings',
-        menuItem: WIP_GridMenuItem,
-        cssClasses: ['!opacity-100'],
-        disabled: true,
-        subMenu: [
-          {
-            name: `Add New Grouping...`,
-            menuItem: WIP_GridMenuItem,
-            cssClasses: ['!opacity-100'],
-            disabled: true,
-          },
-          {
-            name: `Edit {column}`,
-            menuItem: WIP_GridMenuItem,
-            cssClasses: ['!opacity-100'],
-            disabled: true,
-          },
-          {
-            name: `Remove {column}`,
-            menuItem: WIP_GridMenuItem,
-            cssClasses: ['!opacity-100'],
-            disabled: true,
-          },
-        ],
-      },
       'separator',
       {
         name: 'Resize',

package/src/stores/{grid → view/grid}/DataCubeGridQueryBuilder.ts

@@ -14,15 +14,29 @@
  * limitations under the License.
  */
 
-import { PRIMITIVE_TYPE, type V1_AppliedFunction } from '@finos/legend-graph';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import {
+  PRIMITIVE_TYPE,
+  V1_ClassInstance,
+  V1_ColSpecArray,
+  V1_GenericTypeInstance,
+  type V1_ColSpec,
+  type V1_AppliedFunction,
+} from '@finos/legend-graph';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import {
   DataCubeQueryFilterGroupOperator,
   DataCubeQueryFilterOperator,
   DataCubeFunction,
   type DataCubeQueryFunctionMap,
-} from '../core/DataCubeQueryEngine.js';
-import { guaranteeNonNullable, isNullable } from '@finos/legend-shared';
+  isPivotResultColumnName,
+  PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
+} from '../../core/DataCubeQueryEngine.js';
+import {
+  guaranteeNonNullable,
+  guaranteeType,
+  isNullable,
+  uniq,
+} from '@finos/legend-shared';
 import {
   _groupByAggCols,
   _colSpec,
@@ -32,14 +46,16 @@ import {
   _lambda,
   _var,
   _functionCompositionUnProcessor,
-} from '../core/DataCubeQueryBuilderUtils.js';
+  _property,
+} from '../../core/DataCubeQueryBuilderUtils.js';
 import {
   INTERNAL__GRID_CLIENT_MISSING_VALUE,
   INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID,
 } from './DataCubeGridClientEngine.js';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
-import type { DataCubeQueryFilterOperation } from '../core/filter/DataCubeQueryFilterOperation.js';
-import type { DataCubeQueryAggregateOperation } from '../core/aggregation/DataCubeQueryAggregateOperation.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeQueryFilterOperation } from '../../core/filter/DataCubeQueryFilterOperation.js';
+import type { DataCubeQueryAggregateOperation } from '../../core/aggregation/DataCubeQueryAggregateOperation.js';
+import { _colSpecArrayParam } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 
 /*****************************************************************************
  * [GRID]
@@ -52,7 +68,7 @@ import type { DataCubeQueryAggregateOperation } from '../core/aggregation/DataCu
 
 // --------------------------------- BUILDING BLOCKS ---------------------------------
 
-function _rowGroupingCountCol() {
+function _aggCountCol() {
   const variable = _var();
   return _colSpec(
     INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID,
@@ -60,6 +76,56 @@ function _rowGroupingCountCol() {
     _lambda([variable], [_function(DataCubeFunction.COUNT, [variable])]),
   );
 }
+
+function _aggCountCastCol(colName: string) {
+  const variable = _var();
+  return _colSpec(
+    colName,
+    _lambda([variable], [_property(colName, variable)]),
+    _lambda([variable], [_function(DataCubeFunction.SUM, [variable])]),
+  );
+}
+
+// if pivot is present, modify pivot and pivot cast expressions to include
+// count aggregation columns.
+function _addCountAggColumnToPivot(
+  funcMap: DataCubeQueryFunctionMap,
+  countAggColumns: V1_ColSpec[],
+): void {
+  if (funcMap.pivot && funcMap.pivotCast) {
+    _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
+    const castColumns = guaranteeType(
+      guaranteeType(
+        guaranteeType(funcMap.pivotCast.parameters[0], V1_GenericTypeInstance)
+          .typeArguments[0],
+        V1_ClassInstance,
+      ).value,
+      V1_ColSpecArray,
+    ).colSpecs;
+    uniq(
+      castColumns
+        .filter((col) => isPivotResultColumnName(col.name))
+        .map((col) =>
+          col.name.substring(
+            0,
+            col.name.lastIndexOf(PIVOT_COLUMN_NAME_VALUE_SEPARATOR),
+          ),
+        ),
+    )
+      .map(
+        (col) =>
+          col +
+          PIVOT_COLUMN_NAME_VALUE_SEPARATOR +
+          INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID,
+      )
+      .map((col) => _colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER))
+      .forEach((col) => {
+        castColumns.push(col);
+        countAggColumns.push(col);
+      });
+  }
+}
+
 // --------------------------------- MAIN ---------------------------------
 
 export function generateRowGroupingDrilldownExecutableQueryPostProcessor(
@@ -102,13 +168,13 @@ export function generateRowGroupingDrilldownExecutableQueryPostProcessor(
                       ) {
                         return {
                           ...groupByColumn,
-                          operation: DataCubeQueryFilterOperator.IS_NULL,
+                          operator: DataCubeQueryFilterOperator.IS_NULL,
                           value: undefined,
                         };
                       }
                       const condition = {
                         ...groupByColumn,
-                        operation: DataCubeQueryFilterOperator.EQUAL,
+                        operator: DataCubeQueryFilterOperator.EQUAL,
                         value: undefined,
                       };
                       switch (groupByColumn.type) {
@@ -162,6 +228,9 @@ export function generateRowGroupingDrilldownExecutableQueryPostProcessor(
 
       // modify groupBy() based off the current drilldown level
       if (drilldownValues.length < groupBy.columns.length) {
+        const countAggColumns: V1_ColSpec[] = [];
+        _addCountAggColumnToPivot(funcMap, countAggColumns);
+
         const groupByIdx = sequence.indexOf(funcMap.groupBy);
         const groupByColumns = groupBy.columns.slice(
           0,
@@ -176,7 +245,13 @@ export function generateRowGroupingDrilldownExecutableQueryPostProcessor(
               configuration,
               aggregateOperations,
             ),
-            _rowGroupingCountCol(), // get the count for each group
+
+            // if pivot is present, add sum aggregation columns for each
+            // count aggregation column from pivot aggregation
+            // else, simply add a count aggregation column
+            ...(countAggColumns.length
+              ? countAggColumns.map((col) => _aggCountCastCol(col.name))
+              : [_aggCountCol()]),
           ]),
         ]);
         sequence[groupByIdx] = groupByFunc;

package/src/stores/{grid → view/grid}/DataCubeGridQuerySnapshotBuilder.ts

@@ -25,7 +25,7 @@ import type { IServerSideGetRowsRequest } from '@ag-grid-community/core';
 import {
   _toCol,
   type DataCubeQuerySnapshot,
-} from '../core/DataCubeQuerySnapshot.js';
+} from '../../core/DataCubeQuerySnapshot.js';
 import {
   GridClientSortDirection,
   INTERNAL__GRID_CLIENT_TREE_COLUMN_ID,
@@ -34,10 +34,10 @@ import {
   DataCubeQuerySortDirection,
   getPivotResultColumnBaseColumnName,
   isPivotResultColumnName,
-} from '../core/DataCubeQueryEngine.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+} from '../../core/DataCubeQueryEngine.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { guaranteeNonNullable, uniqBy } from '@finos/legend-shared';
-import { _pruneExpandedPaths } from '../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 
 export function getColumnConfiguration(
   colName: string,
@@ -64,7 +64,7 @@ export function buildQuerySnapshot(
 
   snapshot.data.selectColumns = uniqBy(
     [
-      ...configuration.columns.filter((col) => col.isSelected),
+      ...snapshot.data.selectColumns,
       ...request.pivotCols.map((col) =>
         getColumnConfiguration(col.id, configuration),
       ),
@@ -108,14 +108,13 @@ export function buildQuerySnapshot(
     // the tree column, all groupBy columns will be sorted in that direction
     .filter((item) => item.colId !== INTERNAL__GRID_CLIENT_TREE_COLUMN_ID)
     .map((item) => ({
-      ..._toCol(
-        getColumnConfiguration(
-          isPivotResultColumnName(item.colId)
-            ? getPivotResultColumnBaseColumnName(item.colId)
-            : item.colId,
-          configuration,
-        ),
-      ),
+      name: item.colId,
+      type: getColumnConfiguration(
+        isPivotResultColumnName(item.colId)
+          ? getPivotResultColumnBaseColumnName(item.colId)
+          : item.colId,
+        configuration,
+      ).type,
       direction:
         item.sort === GridClientSortDirection.ASCENDING
           ? DataCubeQuerySortDirection.ASCENDING
@@ -129,8 +128,7 @@ export function buildQuerySnapshot(
     snapshot.data.groupBy?.columns ?? [],
     configuration.pivotLayout.expandedPaths,
   );
-  snapshot.data.configuration =
-    DataCubeConfiguration.serialization.toJson(configuration);
+  snapshot.data.configuration = configuration.serialize();
 
   // --------------------------------- FINALIZE ---------------------------------
 

package/src/stores/{grid → view/grid}/DataCubeGridState.ts

@@ -26,10 +26,10 @@ import {
   INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_PAGINATION,
   computeHashCodeForDataFetchManualTrigger,
 } from './DataCubeGridClientEngine.js';
-import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
-import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
+import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import { generateGridOptionsFromSnapshot } from './DataCubeGridConfigurationBuilder.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { DataCubeGridControllerState } from './DataCubeGridControllerState.js';
 import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine.js';
 
@@ -114,6 +114,10 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
     this._client = val;
   }
 
+  override getSnapshotSubscriberName() {
+    return 'grid';
+  }
+
   override async applySnapshot(
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,
@@ -130,7 +134,10 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
       this.view,
     );
     if (this.view.engine.enableDebugMode) {
-      this.view.application.debugProcess(`New Grid Options`, gridOptions);
+      this.view.application.debugProcess(`New Grid Options`, [
+        'Grid Options',
+        gridOptions,
+      ]);
     }
     this.client.updateGridOptions({
       ...gridOptions,