@finos/legend-data-cube 0.1.3 → 0.1.5

package/src/stores/view/filter/DataCubeFilterEditorState.tsx

@@ -19,7 +19,7 @@ import {
   DataCubeQueryFilterGroupOperator,
   DataCubeQueryFilterOperator,
 } from '../../core/DataCubeQueryEngine.js';
-import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import type { DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { deepClone, at, guaranteeNonNullable } from '@finos/legend-shared';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
 import {
@@ -28,9 +28,9 @@ import {
   DataCubeFilterEditorConditionGroupTreeNode,
   DataCubeFilterEditorConditionTreeNode,
   buildFilterEditorTree,
-  buildFilterQuerySnapshot,
+  buildFilterSnapshot,
 } from '../../core/filter/DataCubeQueryFilterEditorState.js';
-import { DataCubeQuerySnapshotController } from '../../services/DataCubeQuerySnapshotService.js';
+import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
 import {
   DataCubeConfiguration,
   type DataCubeColumnConfiguration,
@@ -43,7 +43,7 @@ import { _findCol } from '../../core/model/DataCubeColumn.js';
  * This query editor state backs the form editor for filter. It batches changes made
  * to the filter in the form editor.
  */
-export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
+export class DataCubeFilterEditorState extends DataCubeSnapshotController {
   private readonly _view: DataCubeViewState;
 
   readonly display: DisplayState;
@@ -288,8 +288,8 @@ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
   }
 
   override async applySnapshot(
-    snapshot: DataCubeQuerySnapshot,
-    previousSnapshot: DataCubeQuerySnapshot | undefined,
+    snapshot: DataCubeSnapshot,
+    previousSnapshot: DataCubeSnapshot | undefined,
   ): Promise<void> {
     const configuration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,
@@ -317,7 +317,7 @@ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
     const newSnapshot = baseSnapshot.clone();
 
     newSnapshot.data.filter = this.tree.root
-      ? buildFilterQuerySnapshot(this.tree.root)
+      ? buildFilterSnapshot(this.tree.root)
       : undefined;
 
     newSnapshot.finalize();

package/src/stores/view/grid/DataCubeGridClientEngine.ts

@@ -31,27 +31,28 @@ import {
   pruneObject,
 } from '@finos/legend-shared';
 import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
-import { PureClientVersion, type TabularDataSet } from '@finos/legend-graph';
+import {
+  PRIMITIVE_TYPE,
+  PureClientVersion,
+  type TabularDataSet,
+} from '@finos/legend-graph';
 import { makeObservable, observable, runInAction } from 'mobx';
 import type {
   DataCubeConfiguration,
   DataCubeConfigurationColorKey,
 } from '../../core/model/DataCubeConfiguration.js';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { _findCol, _sortByColName } from '../../core/model/DataCubeColumn.js';
 import { isPivotResultColumnName } from '../../core/DataCubeQueryEngine.js';
-import { buildQuerySnapshot } from './DataCubeGridQuerySnapshotBuilder.js';
+import { buildSnapshotFromGridState } from './DataCubeGridSnapshotBuilder.js';
 import { AlertType } from '../../services/DataCubeAlertService.js';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import {
-  _aggCountCol,
-  buildGridDataFetchExecutableQuery,
-} from './DataCubeGridQueryBuilder.js';
-import { _colSpecArrayParam } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { buildGridDataFetchExecutableQuery } from './DataCubeGridQueryBuilder.js';
 import { DataCubeSettingKey } from '../../../__lib__/DataCubeSetting.js';
 import { DEFAULT_ALERT_WINDOW_CONFIG } from '../../services/DataCubeLayoutService.js';
 import type { DataCubeExecutionResult } from '../../core/DataCubeEngine.js';
 import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
+import { sum } from 'mathjs';
 
 type DataCubeGridClientCellValue = string | number | boolean | null | undefined;
 type DataCubeGridClientRowData = {
@@ -136,8 +137,7 @@ export const INTERNAL__GRID_CLIENT_ROOT_AGGREGATION_COLUMN_ID =
   'INTERNAL__rootAggregation';
 export const INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID =
   'INTERNAL__dataFetchManualTrigger';
-export const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID =
-  'INTERNAL__count';
+export const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID = 'count';
 
 export enum DataCubeGridClientPinnedAlignement {
   LEFT = 'left',
@@ -178,7 +178,7 @@ export function getDataForAllFilteredNodes<T>(client: GridApi<T>): T[] {
  * This is used to manually trigger server-side row model data source getRows() method.
  */
 export function computeHashCodeForDataFetchManualTrigger(
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
 ) {
   return hashObject(
@@ -214,7 +214,7 @@ export function computeHashCodeForDataFetchManualTrigger(
 
 function buildRowData(
   result: TabularDataSet,
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
 ): DataCubeGridClientRowData[] {
   return result.rows.map((_row, rowIdx) => {
     const row: DataCubeGridClientRowData = {};
@@ -228,17 +228,19 @@ function buildRowData(
           ? value
           : INTERNAL__GRID_CLIENT_MISSING_VALUE;
       if (snapshot.data.pivot && snapshot.data.groupBy) {
-        row[INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID] =
-          result.columns
-            .filter(
-              (col) =>
-                isPivotResultColumnName(col) &&
-                col.endsWith(
-                  INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID,
-                ),
-            )
-            .map((col) => (row[col] as number | undefined) ?? 0)
-            .reduce((a, b) => a + b, 0);
+        row[INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID] = Number(
+          sum(
+            result.columns
+              .filter(
+                (col) =>
+                  isPivotResultColumnName(col) &&
+                  col.endsWith(
+                    INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID,
+                  ),
+              )
+              .map((col) => (row[col] as number | undefined) ?? 0),
+          ).toString(),
+        );
       }
     });
     return row;
@@ -246,7 +248,7 @@ function buildRowData(
 }
 
 async function getCastColumns(
-  currentSnapshot: DataCubeQuerySnapshot,
+  currentSnapshot: DataCubeSnapshot,
   view: DataCubeViewState,
 ) {
   if (!currentSnapshot.data.pivot) {
@@ -260,15 +262,7 @@ async function getCastColumns(
   snapshot.data.groupExtendedColumns = [];
   snapshot.data.sortColumns = [];
   snapshot.data.limit = 0;
-  const query = buildExecutableQuery(snapshot, view.source, view.engine, {
-    postProcessor: (_snapshot, sequence, funcMap, configuration, engine) => {
-      // when both pivot and groupBy present, we need to account for the count column
-      // in the cast expression
-      if (funcMap.pivot && currentSnapshot.data.groupBy) {
-        _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
-      }
-    },
-  });
+  const query = buildExecutableQuery(snapshot, view.source, view.engine);
 
   const result = await view.engine.executeQuery(
     _lambda([], [query]),
@@ -285,10 +279,15 @@ async function getCastColumns(
     },
   );
 
-  return result.result.builder.columns.map((column) => ({
-    name: column.name,
-    type: column.type as string,
-  }));
+  return result.result.builder.columns.map((column) => {
+    const type = column.type as string;
+    return {
+      name: column.name,
+      // FIXME: this is a workaround to help plan generation does not handle well decimal type
+      // Remove this once https://github.com/finos/legend-engine/pull/3400 is productionized
+      type: type === PRIMITIVE_TYPE.DECIMAL ? PRIMITIVE_TYPE.FLOAT : type,
+    };
+  });
 }
 
 export type DataCubeGridClientDataFetchRequest = {
@@ -345,7 +344,7 @@ export class DataCubeGridClientServerSideDataSource
 
     // only recompute the snapshot if this is not a drilldown request
     if (isTopLevelRequest) {
-      newSnapshot = buildQuerySnapshot(request, currentSnapshot);
+      newSnapshot = buildSnapshotFromGridState(request, currentSnapshot);
 
       // NOTE: if h-pivot is enabled, update the cast columns
       // and panels which might be affected by this (e.g. sorts)
@@ -399,6 +398,7 @@ export class DataCubeGridClientServerSideDataSource
       this._grid.isPaginationEnabled,
     );
     let result: DataCubeExecutionResult;
+    let rowData: DataCubeGridClientRowData[];
 
     try {
       result = await this._view.engine.executeQuery(
@@ -415,6 +415,7 @@ export class DataCubeGridClientServerSideDataSource
             : undefined,
         },
       );
+      rowData = buildRowData(result.result.result, newSnapshot);
     } catch (error) {
       assertErrorThrown(error);
       this._view.alertService.alertError(error, {
@@ -425,7 +426,6 @@ export class DataCubeGridClientServerSideDataSource
       return;
     }
 
-    const rowData = buildRowData(result.result.result, newSnapshot);
     if (
       this._view.settingService.getBooleanValue(
         DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE,

package/src/stores/view/grid/DataCubeGridConfigurationBuilder.tsx

@@ -18,13 +18,13 @@
  * [GRID]
  *
  * These are utilities used to build the configuration for the grid client,
- * AG Grid, from the query snapshot.
+ * AG Grid, from the snapshot.
  ***************************************************************************************/
 
 import {
-  type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotPivot,
-} from '../../core/DataCubeQuerySnapshot.js';
+  type DataCubeSnapshot,
+  type DataCubeSnapshotPivot,
+} from '../../core/DataCubeSnapshot.js';
 import {
   _findCol,
   _toCol,
@@ -147,7 +147,7 @@ function DataCubeGridLoadingCellRenderer(
 
 type ColumnData = {
   name: string;
-  snapshot: DataCubeQuerySnapshot;
+  snapshot: DataCubeSnapshot;
   column: DataCubeColumnConfiguration;
   configuration: DataCubeConfiguration;
 };
@@ -346,7 +346,7 @@ function _displaySpec(columnData: ColumnData) {
 }
 
 function _groupDisplaySpec(
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
 ) {
   // TODO?: we can technically alternate the styling based on the column at various drilldown level
@@ -633,7 +633,7 @@ export function generateBaseGridOptions(view: DataCubeViewState): GridOptions {
 
 function generatePivotResultColumnHeaderTooltip(
   id: string,
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
 ) {
   const values = id.split(PIVOT_COLUMN_NAME_VALUE_SEPARATOR);
@@ -665,7 +665,7 @@ function generatePivotResultColumnHeaderTooltip(
 
 function generateDefinitionForPivotResultColumns(
   pivotResultColumns: DataCubeColumn[],
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
 ) {
   const columns = pivotResultColumns
@@ -793,7 +793,7 @@ function generateDefinitionForPivotResultColumns(
  */
 function rearrangePivotResultColumns(
   pivotResultColumns: DataCubeColumn[],
-  pivotData: DataCubeQuerySnapshotPivot,
+  pivotData: DataCubeSnapshotPivot,
   configuration: DataCubeConfiguration,
 ) {
   try {
@@ -832,7 +832,7 @@ function rearrangePivotResultColumns(
 }
 
 export function generateColumnDefs(
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
 ) {
   // NOTE: only show columns which are fetched in select() as we
@@ -923,7 +923,7 @@ export function generateColumnDefs(
 }
 
 export function generateGridOptionsFromSnapshot(
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   configuration: DataCubeConfiguration,
   view: DataCubeViewState,
 ): GridOptions {
@@ -989,7 +989,7 @@ export function generateGridOptionsFromSnapshot(
     // -------------------------------------- EVENT HANDLERS --------------------------------------
     // NOTE: make sure the event source must not be 'api' since these handlers are meant for direct
     // user interaction with the grid. Actions through context menu (i.e. grid controller) or programatic
-    // update of the grid options due to change in query snapshot should not trigger these handlers.
+    // update of the grid options due to change in snapshot should not trigger these handlers.
 
     onColumnPinned: (event) => {
       if (event.source !== 'api' && event.column) {

package/src/stores/view/grid/DataCubeGridControllerState.ts

@@ -22,15 +22,15 @@ import {
 } from '@finos/legend-shared';
 import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import {
-  type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotSortColumn,
-} from '../../core/DataCubeQuerySnapshot.js';
+  type DataCubeSnapshot,
+  type DataCubeSnapshotSortColumn,
+} from '../../core/DataCubeSnapshot.js';
 import {
   _findCol,
   _toCol,
   type DataCubeColumn,
 } from '../../core/model/DataCubeColumn.js';
-import { DataCubeQuerySnapshotController } from '../../services/DataCubeQuerySnapshotService.js';
+import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
 import {
   type DataCubeColumnPinPlacement,
   DataCubeColumnKind,
@@ -49,13 +49,13 @@ import type { DataCubeViewState } from '../DataCubeViewState.js';
 import { generateMenuBuilder } from './DataCubeGridMenuBuilder.js';
 import {
   buildFilterEditorTree,
-  buildFilterQuerySnapshot,
+  buildFilterSnapshot,
   DataCubeFilterEditorConditionGroupTreeNode,
   type DataCubeFilterEditorConditionTreeNode,
   type DataCubeFilterEditorTree,
   type DataCubeFilterEditorTreeNode,
 } from '../../core/filter/DataCubeQueryFilterEditorState.js';
-import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeSnapshotBuilderUtils.js';
 
 /**
  * This query editor state is responsible for capturing updates to the data cube query
@@ -72,7 +72,7 @@ import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtil
  * we MUST NEVER use the editor here, as it could potentially create illegal state
  * while the editor is still in the middle of a modification that has not been applied.
  */
-export class DataCubeGridControllerState extends DataCubeQuerySnapshotController {
+export class DataCubeGridControllerState extends DataCubeSnapshotController {
   readonly view: DataCubeViewState;
 
   constructor(view: DataCubeViewState) {
@@ -342,7 +342,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
   // --------------------------------- SORT ---------------------------------
 
-  sortColumns: DataCubeQuerySnapshotSortColumn[] = [];
+  sortColumns: DataCubeSnapshotSortColumn[] = [];
 
   getSortableColumn(colName: string | undefined) {
     if (!colName) {
@@ -399,8 +399,8 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
   }
 
   override async applySnapshot(
-    snapshot: DataCubeQuerySnapshot,
-    previousSnapshot: DataCubeQuerySnapshot | undefined,
+    snapshot: DataCubeSnapshot,
+    previousSnapshot: DataCubeSnapshot | undefined,
   ) {
     this.configuration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,
@@ -430,7 +430,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     this.menuBuilder = generateMenuBuilder(this);
   }
 
-  private propagateChanges(baseSnapshot: DataCubeQuerySnapshot) {
+  private propagateChanges(baseSnapshot: DataCubeSnapshot) {
     this.verticalPivotColumns = this.verticalPivotColumns.filter(
       (col) => !_findCol(this.horizontalPivotColumns, col.name),
     );
@@ -496,7 +496,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     snapshot.data.configuration = this.configuration.serialize();
 
     snapshot.data.filter = this.filterTree.root
-      ? buildFilterQuerySnapshot(this.filterTree.root)
+      ? buildFilterSnapshot(this.filterTree.root)
       : undefined;
     snapshot.data.selectColumns = this.selectColumns;
     snapshot.data.pivot = this.horizontalPivotColumns.length

package/src/stores/view/grid/DataCubeGridQueryBuilder.ts

@@ -22,8 +22,9 @@ import {
   V1_GenericType,
   V1_RelationType,
   V1_getGenericTypeFullPath,
+  V1_createRelationTypeColumn,
 } from '@finos/legend-graph';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import {
   DataCubeQueryFilterGroupOperator,
   DataCubeQueryFilterOperator,
@@ -60,7 +61,7 @@ import {
   type DataCubeGridClientDataFetchRequest,
 } from './DataCubeGridClientEngine.js';
 import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
-import { _colSpecArrayParam } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _colSpecArrayParam } from '../../core/DataCubeSnapshotBuilderUtils.js';
 import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
 import type { DataCubeSource } from '../../core/model/DataCubeSource.js';
 import type { DataCubeEngine } from '../../core/DataCubeEngine.js';
@@ -102,14 +103,15 @@ function _addCountAggColumnToPivot(
 ): void {
   if (funcMap.pivot && funcMap.pivotCast) {
     _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
-    const castColumns = guaranteeType(
+    const relationType = guaranteeType(
       guaranteeType(
         guaranteeType(funcMap.pivotCast.parameters[0], V1_GenericTypeInstance)
           .genericType.typeArguments[0],
         V1_GenericType,
       ).rawType,
       V1_RelationType,
-    ).columns.map((column) =>
+    );
+    const castColumns = relationType.columns.map((column) =>
       _colSpec(
         column.name,
         undefined,
@@ -133,10 +135,14 @@ function _addCountAggColumnToPivot(
           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);
+        // Here we directly modify the list of cast columns in the relation type
+        relationType.columns.push(
+          V1_createRelationTypeColumn(col, PRIMITIVE_TYPE.INTEGER),
+        );
+        countAggColumns.push(
+          _colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER),
+        );
       });
   }
 }
@@ -145,7 +151,7 @@ function _addCountAggColumnToPivot(
 
 export function buildGridDataFetchExecutableQuery(
   request: DataCubeGridClientDataFetchRequest,
-  snapshot: DataCubeQuerySnapshot,
+  snapshot: DataCubeSnapshot,
   source: DataCubeSource,
   engine: DataCubeEngine,
   enablePagination: boolean,
@@ -186,7 +192,7 @@ function generateGridDataFetchExecutableQueryPostProcessor(
   request: DataCubeGridClientDataFetchRequest,
 ) {
   return (
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     sequence: V1_AppliedFunction[],
     funcMap: DataCubeQueryFunctionMap,
     configuration: DataCubeConfiguration,

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

@@ -17,11 +17,11 @@
 /***************************************************************************************
  * [GRID]
  *
- * These are utilities used to build the query snapshot from the internal state
- * of the grid client, AG Grid.
+ * These are utilities used to build the snapshot from the internal state of the grid
+ * client, AG Grid.
  ***************************************************************************************/
 
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { _toCol } from '../../core/model/DataCubeColumn.js';
 import {
   DataCubeGridClientSortDirection,
@@ -36,7 +36,7 @@ import {
 } from '../../core/DataCubeQueryEngine.js';
 import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import { guaranteeNonNullable, uniqBy } from '@finos/legend-shared';
-import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeSnapshotBuilderUtils.js';
 
 export function getColumnConfiguration(
   colName: string,
@@ -50,9 +50,9 @@ export function getColumnConfiguration(
 
 // --------------------------------- MAIN ---------------------------------
 
-export function buildQuerySnapshot(
+export function buildSnapshotFromGridState(
   request: DataCubeGridClientDataFetchRequest,
-  baseSnapshot: DataCubeQuerySnapshot,
+  baseSnapshot: DataCubeSnapshot,
 ) {
   const snapshot = baseSnapshot.clone();
   const configuration = DataCubeConfiguration.serialization.fromJson(

package/src/stores/view/grid/DataCubeGridState.ts

@@ -31,8 +31,8 @@ import {
   computeHashCodeForDataFetchManualTrigger,
   INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_CACHING,
 } from './DataCubeGridClientEngine.js';
-import { DataCubeQuerySnapshotController } from '../../services/DataCubeQuerySnapshotService.js';
-import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
+import type { DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { generateGridOptionsFromSnapshot } from './DataCubeGridConfigurationBuilder.js';
 import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import { DataCubeGridControllerState } from './DataCubeGridControllerState.js';
@@ -56,7 +56,7 @@ import { AlertType } from '../../services/DataCubeAlertService.js';
  * row model datasource, so without the companion grid controller, these changes will not
  * trigger publishing a new snapshot, hence not propagated.
  */
-export class DataCubeGridState extends DataCubeQuerySnapshotController {
+export class DataCubeGridState extends DataCubeSnapshotController {
   private readonly _view: DataCubeViewState;
 
   readonly controller: DataCubeGridControllerState;
@@ -126,7 +126,12 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
     });
   }
 
-  async setCachingEnabled(val: boolean) {
+  async setCachingEnabled(
+    val: boolean,
+    options?: {
+      suppressWarning?: boolean | undefined;
+    },
+  ) {
     if (val === this.isCachingEnabled) {
       return;
     }
@@ -172,11 +177,12 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
     if (
       this._settingService.getBooleanValue(
         DataCubeSettingKey.GRID_CLIENT__SHOW_CACHE_PERFORMANCE_WARNING,
-      )
+      ) &&
+      !options?.suppressWarning
     ) {
       this._view.alertService.alert({
         message: `Confirm you want to proceed with caching`,
-        text: `When enabled, the source dataset will be cached locally in order to boost query performance. But depending on computational resource available to your environment, sometimes, caching can negatively impact the overall performance, and can even lead to crashes.\nDo you still want to proceed?`,
+        text: `When enabled, the source dataset will be cached locally in order to boost query performance. But depending on computational resource available to your environment, sometimes, caching can negatively impact the overall performance, and can even lead to crashes.\n\nOverall, caching is still an experimental feature where we only support queries with simple execution plans, certain queries might not work, in which case, you can abort by turning off caching.\n\nDo you still want to proceed?`,
         type: AlertType.WARNING,
         actions: [
           {
@@ -208,7 +214,7 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
         windowConfig: {
           ...DEFAULT_ALERT_WINDOW_CONFIG,
           width: 600,
-          height: 210,
+          height: 300,
           minWidth: 300,
           minHeight: 150,
         },
@@ -243,8 +249,8 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
   }
 
   override async applySnapshot(
-    snapshot: DataCubeQuerySnapshot,
-    previousSnapshot: DataCubeQuerySnapshot | undefined,
+    snapshot: DataCubeSnapshot,
+    previousSnapshot: DataCubeSnapshot | undefined,
   ) {
     const configuration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,

package/tsconfig.json

@@ -60,9 +60,9 @@
     "./src/stores/core/DataCubeQueryBuilder.ts",
     "./src/stores/core/DataCubeQueryBuilderUtils.ts",
     "./src/stores/core/DataCubeQueryEngine.ts",
-    "./src/stores/core/DataCubeQuerySnapshot.ts",
-    "./src/stores/core/DataCubeQuerySnapshotBuilder.ts",
-    "./src/stores/core/DataCubeQuerySnapshotBuilderUtils.ts",
+    "./src/stores/core/DataCubeSnapshot.ts",
+    "./src/stores/core/DataCubeSnapshotBuilder.ts",
+    "./src/stores/core/DataCubeSnapshotBuilderUtils.ts",
     "./src/stores/core/aggregation/DataCubeQueryAggregateOperation.ts",
     "./src/stores/core/filter/DataCubeQueryFilterEditorState.ts",
     "./src/stores/core/filter/DataCubeQueryFilterOperation.ts",
@@ -70,11 +70,11 @@
     "./src/stores/core/model/CachedDataCubeSource.ts",
     "./src/stores/core/model/DataCubeColumn.ts",
     "./src/stores/core/model/DataCubeConfiguration.ts",
-    "./src/stores/core/model/DataCubeQuery.ts",
     "./src/stores/core/model/DataCubeSource.ts",
+    "./src/stores/core/model/DataCubeSpecification.ts",
     "./src/stores/services/DataCubeLogService.ts",
     "./src/stores/services/DataCubeNavigationService.ts",
-    "./src/stores/services/DataCubeQuerySnapshotService.ts",
+    "./src/stores/services/DataCubeSnapshotService.ts",
     "./src/stores/services/DataCubeTaskService.ts",
     "./src/stores/services/DataCubeTelemetryService.ts",
     "./src/stores/view/DataCubeInfoState.ts",
@@ -93,7 +93,7 @@
     "./src/stores/view/grid/DataCubeGridClientExportEngine.ts",
     "./src/stores/view/grid/DataCubeGridControllerState.ts",
     "./src/stores/view/grid/DataCubeGridQueryBuilder.ts",
-    "./src/stores/view/grid/DataCubeGridQuerySnapshotBuilder.ts",
+    "./src/stores/view/grid/DataCubeGridSnapshotBuilder.ts",
     "./src/stores/view/grid/DataCubeGridState.ts",
     "./src/index.tsx",
     "./src/components/DataCube.tsx",

package/lib/stores/core/DataCubeQuerySnapshot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeQuerySnapshot.d.ts","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAKL,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,MAAM,oCAAoC,GAAG,cAAc,GAAG;IAClE,KAAK,EAAE,sBAAsB,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,CACR,oCAAoC,GACpC,2BAA2B,CAC9B,EAAE,CAAC;IACJ,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,cAAc,GAAG;IACjE,QAAQ,CAAC,EAAE,WAAW,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAC;IACvD,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,cAAc,GAAG;IAClE,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,cAAc,GAAG;IAC7D,SAAS,EAAE,0BAA0B,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,sCAAsC,GAAG;IACnD,QAAQ,EAAE,qBAAqB,CAAC;IAChC,eAAe,CAAC,EAAE,oCAAoC,EAAE,GAAG,SAAS,CAAC;IACrE,gBAAgB,CAAC,EAAE,+BAA+B,EAAE,GAAG,SAAS,CAAC;IACjE,iBAAiB,CAAC,EAAE,oCAAoC,EAAE,GAAG,SAAS,CAAC;IACvE,kBAAkB,CAAC,EAAE,+BAA+B,EAAE,GAAG,SAAS,CAAC;CACpE,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,aAAa,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAClD,aAAa,EAAE,cAAc,EAAE,CAAC;IAChC,mBAAmB,EAAE,mCAAmC,EAAE,CAAC;IAC3D,MAAM,CAAC,EAAE,2BAA2B,GAAG,SAAS,CAAC;IACjD,aAAa,EAAE,cAAc,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,4BAA4B,GAAG,SAAS,CAAC;IACnD,KAAK,CAAC,EAAE,0BAA0B,GAAG,SAAS,CAAC;IAC/C,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAC/C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAEF,qBAAa,qBAAqB;IAChC,QAAQ,CAAC,IAAI,SAAU;IACvB,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAEzC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAC,CAAqB;IAEvC,OAAO;IAeP,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,qBAAqB,CAAC;IAI/D;;;;;;;;OAQG;IACH,iBAAiB;IAIjB,aAAa;IAIb,WAAW;IAIX,QAAQ;IAiBR,IAAI,QAAQ,WAKX;IAED,KAAK;IAQL;;;OAGG;IACH,mBAAmB;IAYnB,SAAS;;;;;;;CAUV"}

package/lib/stores/core/DataCubeQuerySnapshot.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeQuerySnapshot.js","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"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"}

package/lib/stores/core/DataCubeQuerySnapshotBuilder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeQuerySnapshotBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/core/DataCubeQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;yFAMyF;AAEzF,OAAO,EAKL,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,qBAAqB,EAItB,MAAM,4BAA4B,CAAC;AAmCpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAgR1D;;;;;GAKG;AACH,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,qBAAqB,EACnC,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,aAAa,EACxB,MAAM,EAAE,cAAc,kCAiQvB"}