@finos/legend-data-cube 0.1.4 → 0.1.5

package/src/stores/view/DataCubeViewState.ts

@@ -19,22 +19,29 @@ import { DataCubeEditorState } from './editor/DataCubeEditorState.js';
 import {
   ActionState,
   assertErrorThrown,
+  deepEqual,
   IllegalStateError,
 } from '@finos/legend-shared';
-import { DataCubeQuerySnapshotService } from '../services/DataCubeQuerySnapshotService.js';
+import { DataCubeSnapshotService } from '../services/DataCubeSnapshotService.js';
 import { DataCubeInfoState } from './DataCubeInfoState.js';
-import { validateAndBuildQuerySnapshot } from '../core/DataCubeQuerySnapshotBuilder.js';
+import { validateAndBuildSnapshot } from '../core/DataCubeSnapshotBuilder.js';
 import { DataCubeFilterEditorState } from './filter/DataCubeFilterEditorState.js';
 import { DataCubeExtendManagerState } from './extend/DataCubeExtendManagerState.js';
 import type { DataCubeState } from '../DataCubeState.js';
 import { type DataCubeEngine } from '../core/DataCubeEngine.js';
 import type { DataCubeSource } from '../core/model/DataCubeSource.js';
-import { DataCubeQuery } from '../core/model/DataCubeQuery.js';
+import { DataCubeSpecification } from '../core/model/DataCubeSpecification.js';
 import { DataCubeTaskService } from '../services/DataCubeTaskService.js';
 import type { DataCubeLogService } from '../services/DataCubeLogService.js';
 import { DataCubeConfiguration } from '../core/model/DataCubeConfiguration.js';
-import type { DataCubeLayoutService } from '../services/DataCubeLayoutService.js';
-import type { DataCubeAlertService } from '../services/DataCubeAlertService.js';
+import {
+  DEFAULT_ALERT_WINDOW_CONFIG,
+  type DataCubeLayoutService,
+} from '../services/DataCubeLayoutService.js';
+import {
+  AlertType,
+  type DataCubeAlertService,
+} from '../services/DataCubeAlertService.js';
 import type { DataCubeSettingService } from '../services/DataCubeSettingService.js';
 import { CachedDataCubeSource } from '../core/model/CachedDataCubeSource.js';
 import { DataCubeSettingKey } from '../../__lib__/DataCubeSetting.js';
@@ -48,7 +55,7 @@ export class DataCubeViewState {
   readonly layoutService: DataCubeLayoutService;
   readonly alertService: DataCubeAlertService;
   readonly settingService: DataCubeSettingService;
-  readonly snapshotService: DataCubeQuerySnapshotService;
+  readonly snapshotService: DataCubeSnapshotService;
 
   readonly info: DataCubeInfoState;
   readonly editor: DataCubeEditorState;
@@ -60,7 +67,8 @@ export class DataCubeViewState {
   readonly processCacheState = ActionState.create();
 
   private _source?: DataCubeSource | undefined;
-  private _originalSource?: DataCubeSource | undefined;
+  private _initialSource?: DataCubeSource | undefined;
+  private _initialSpecification?: DataCubeSpecification | undefined;
 
   constructor(dataCube: DataCubeState) {
     this.dataCube = dataCube;
@@ -71,9 +79,9 @@ export class DataCubeViewState {
     this.alertService = dataCube.alertService;
     this.settingService = dataCube.settingService;
     // NOTE: snapshot manager must be instantiated before subscribers
-    this.snapshotService = new DataCubeQuerySnapshotService(
-      this.engine,
+    this.snapshotService = new DataCubeSnapshotService(
       this.logService,
+      this.settingService,
     );
 
     this.info = new DataCubeInfoState(this);
@@ -83,14 +91,14 @@ export class DataCubeViewState {
     this.extend = new DataCubeExtendManagerState(this);
   }
 
-  getOriginalSource() {
-    return this._originalSource;
+  getInitialSource() {
+    return this._initialSource;
   }
 
-  async generateDataCubeQuery() {
-    const snapshot = this.snapshotService.currentSnapshot;
-    const query = new DataCubeQuery();
-    query.source = this.dataCube.query.source;
+  async generateSpecification() {
+    const snapshot = this.snapshotService.getCurrentSnapshot();
+    const query = new DataCubeSpecification();
+    query.source = this.dataCube.specification.source;
     query.configuration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,
     );
@@ -105,6 +113,61 @@ export class DataCubeViewState {
     return this._source;
   }
 
+  updateName(name: string) {
+    const baseSnapshot = this.snapshotService.getCurrentSnapshot();
+    const snapshot = baseSnapshot.clone();
+
+    const configuration = DataCubeConfiguration.serialization.fromJson(
+      baseSnapshot.data.configuration,
+    );
+    if (configuration.name === name) {
+      return;
+    }
+    configuration.name = name;
+    snapshot.data.configuration = configuration.serialize();
+
+    snapshot.finalize();
+    if (snapshot.hashCode !== baseSnapshot.hashCode) {
+      this.snapshotService.broadcastSnapshot(snapshot);
+    }
+  }
+
+  async applySpecification(specification: DataCubeSpecification) {
+    const task = this.taskService.newTask('Applying specification...');
+
+    try {
+      if (!this._initialSource || !this._initialSpecification) {
+        throw new Error(`DataCube is not initialized`);
+      }
+      if (!deepEqual(specification.source, this._initialSpecification.source)) {
+        throw new Error(`Can't apply specification with different source`);
+      }
+      const partialQuery = await this.engine.parseValueSpecification(
+        specification.query,
+      );
+      const snapshot = await validateAndBuildSnapshot(
+        partialQuery,
+        this._initialSource,
+        specification,
+        this.engine,
+      );
+      snapshot.finalize();
+      if (
+        snapshot.hashCode !== this.snapshotService.getCurrentSnapshot().hashCode
+      ) {
+        this.snapshotService.broadcastSnapshot(snapshot);
+      }
+    } catch (error) {
+      assertErrorThrown(error);
+      this.alertService.alertError(error, {
+        message: `Specification Application Failure: ${error.message}`,
+      });
+      this.initializeState.fail();
+    } finally {
+      this.taskService.endTask(task);
+    }
+  }
+
   async initializeCache() {
     this.processCacheState.inProgress();
     const task = this.taskService.newTask('Initializing cache...');
@@ -129,7 +192,7 @@ export class DataCubeViewState {
       this.alertService.alertError(error, {
         message: `Cache Processing Failure: ${error.message}`,
       });
-      this._source = this._originalSource;
+      this._source = this._initialSource;
       this.processCacheState.fail();
     } finally {
       this.taskService.endTask(task);
@@ -141,7 +204,7 @@ export class DataCubeViewState {
       return;
     }
     const cachedSource = this._source;
-    this._source = this._originalSource;
+    this._source = this._initialSource;
 
     this.processCacheState.inProgress();
     const task = this.taskService.newTask('Disposing cache...');
@@ -159,7 +222,7 @@ export class DataCubeViewState {
     }
   }
 
-  async initialize(query: DataCubeQuery) {
+  async initialize(specification: DataCubeSpecification) {
     this.initializeState.inProgress();
     const task = this.taskService.newTask('Initializing...');
 
@@ -176,18 +239,75 @@ export class DataCubeViewState {
           this.snapshotService.registerSubscriber(state);
         }),
       );
-      const source = await this.engine.processQuerySource(query.source);
+      const source = await this.engine.processSource(specification.source);
       this._source = source;
-      this._originalSource = source;
+      this._initialSource = source;
+      this._initialSpecification = specification;
       const partialQuery = await this.engine.parseValueSpecification(
-        query.query,
+        specification.query,
       );
-      const initialSnapshot = await validateAndBuildQuerySnapshot(
+      const initialSnapshot = await validateAndBuildSnapshot(
         partialQuery,
         source,
-        query,
+        specification,
         this.engine,
       );
+
+      // auto-enable cache if specified before broadcasting the first snapshot
+      // so first data-fetches will be against cache
+      if (specification.options?.autoEnableCache) {
+        await this.grid.setCachingEnabled(true, {
+          suppressWarning: true,
+        });
+
+        if (
+          this.settingService.getBooleanValue(
+            DataCubeSettingKey.GRID_CLIENT__SHOW_AUTO_ENABLE_CACHE_PERFORMANCE_WARNING,
+          )
+        ) {
+          this.alertService.alert({
+            message: `Caching is auto-enabled for this DataCube`,
+            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.\n\nYou can disable caching if needed, otherwise, please proceed with caution.`,
+            type: AlertType.WARNING,
+            actions: [
+              {
+                label: 'OK',
+                handler: () => {},
+              },
+              {
+                label: 'Disable Caching',
+                handler: () => {
+                  this.grid
+                    .setCachingEnabled(false, {
+                      suppressWarning: true,
+                    })
+                    .catch((error) =>
+                      this.alertService.alertUnhandledError(error),
+                    );
+                },
+              },
+              {
+                label: 'Dismiss Warning',
+                handler: () => {
+                  this.settingService.updateValue(
+                    this.dataCube.api,
+                    DataCubeSettingKey.GRID_CLIENT__SHOW_AUTO_ENABLE_CACHE_PERFORMANCE_WARNING,
+                    false,
+                  );
+                },
+              },
+            ],
+            windowConfig: {
+              ...DEFAULT_ALERT_WINDOW_CONFIG,
+              width: 600,
+              height: 300,
+              minWidth: 300,
+              minHeight: 150,
+            },
+          });
+        }
+      }
+
       this.snapshotService.broadcastSnapshot(initialSnapshot);
       this.dataCube.options?.onViewInitialized?.({
         api: this.dataCube.api,

package/src/stores/view/editor/DataCubeEditorColumnPropertiesPanelState.ts

@@ -16,7 +16,7 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutableColumnConfiguration } from './DataCubeEditorMutableConfiguration.js';
@@ -79,7 +79,7 @@ export class DataCubeEditorColumnPropertiesPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.setColumns(
@@ -98,10 +98,7 @@ export class DataCubeEditorColumnPropertiesPanelState
     }
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     newSnapshot.data.configuration = {
       ...newSnapshot.data.configuration,
       columns: this.columns.map((column) => column.serialize()),

package/src/stores/view/editor/DataCubeEditorColumnsPanelState.ts

@@ -15,7 +15,7 @@
  */
 
 import { action, makeObservable, observable, override } from 'mobx';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { _findCol, _toCol } from '../../core/model/DataCubeColumn.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import {
@@ -149,7 +149,7 @@ export class DataCubeEditorColumnsPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.selector.setSelectedColumns(
@@ -167,10 +167,7 @@ export class DataCubeEditorColumnsPanelState
     );
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     this.propagateChanges();
     // NOTE: these columns make up just part of the set of columns we want to fetch with `select()`.
     // Subsequently, we need to include columns used for horizontal pivots and vertical pivots.

package/src/stores/view/editor/DataCubeEditorGeneralPropertiesPanelState.ts

@@ -15,7 +15,7 @@
  */
 
 import { action, makeObservable, observable } from 'mobx';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutableConfiguration } from './DataCubeEditorMutableConfiguration.js';
@@ -43,7 +43,7 @@ export class DataCubeEditorGeneralPropertiesPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.setLimit(
@@ -56,10 +56,7 @@ export class DataCubeEditorGeneralPropertiesPanelState
     );
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     const data = newSnapshot.data;
     data.limit =
       this.limit === undefined || this.limit < 0 ? undefined : this.limit;

package/src/stores/view/editor/DataCubeEditorHorizontalPivotsPanelState.ts

@@ -21,7 +21,7 @@ import {
   DataCubeQuerySortDirection,
   isPivotResultColumnName,
 } from '../../core/DataCubeQueryEngine.js';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import {
   _findCol,
   _toCol,
@@ -117,7 +117,7 @@ export class DataCubeEditorHorizontalPivotsPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.selector.setSelectedColumns(
@@ -135,10 +135,7 @@ export class DataCubeEditorHorizontalPivotsPanelState
     this.setCastColumns(snapshot.data.pivot?.castColumns ?? []);
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     newSnapshot.data.pivot = this.selector.selectedColumns.length
       ? {
           columns: this.selector.selectedColumns.map(_toCol),

package/src/stores/view/editor/DataCubeEditorMutableConfiguration.ts

@@ -47,7 +47,7 @@ import {
   DataCubeConfiguration,
   DataCubePivotLayoutConfiguration,
 } from '../../core/model/DataCubeConfiguration.js';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { type DataCubeQueryAggregateOperation } from '../../core/aggregation/DataCubeQueryAggregateOperation.js';
 
 export class DataCubeEditorMutableColumnConfiguration extends DataCubeColumnConfiguration {
@@ -56,7 +56,7 @@ export class DataCubeEditorMutableColumnConfiguration extends DataCubeColumnConf
 
   static create(
     json: PlainObject<DataCubeColumnConfiguration>,
-    snapshot: DataCubeQuerySnapshot | undefined,
+    snapshot: DataCubeSnapshot | undefined,
     aggregateOperations: DataCubeQueryAggregateOperation[],
   ): DataCubeEditorMutableColumnConfiguration {
     const configuration = Object.assign(

package/src/stores/view/editor/DataCubeEditorPanelState.ts

@@ -15,14 +15,14 @@
  */
 
 import type { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
-import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import type { DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 
 export interface DataCubeQueryEditorPanelState {
   /**
    * Update the editor state based on the snapshot
    */
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ): void;
 
@@ -31,7 +31,7 @@ export interface DataCubeQueryEditorPanelState {
    * @returns whether the snapshot should be updated or not
    */
   buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
+    newSnapshot: DataCubeSnapshot,
+    baseSnapshot: DataCubeSnapshot,
   ): void;
 }

package/src/stores/view/editor/DataCubeEditorPivotLayoutPanelState.ts

@@ -15,13 +15,13 @@
  */
 
 import { action, makeObservable, observable } from 'mobx';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutablePivotLayoutConfiguration } from './DataCubeEditorMutableConfiguration.js';
 import type { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import type { PlainObject } from '@finos/legend-shared';
-import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeSnapshotBuilderUtils.js';
 
 export class DataCubeEditorPivotLayoutPanelState
   implements DataCubeQueryEditorPanelState
@@ -41,7 +41,7 @@ export class DataCubeEditorPivotLayoutPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.pivotLayout = DataCubeEditorMutablePivotLayoutConfiguration.create(
@@ -49,10 +49,7 @@ export class DataCubeEditorPivotLayoutPanelState
     );
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     this.pivotLayout.setExpandedPaths(
       _pruneExpandedPaths(
         baseSnapshot.data.groupBy?.columns ?? [],

package/src/stores/view/editor/DataCubeEditorSortsPanelState.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { _findCol, _toCol } from '../../core/model/DataCubeColumn.js';
 import {
   DataCubeColumnKind,
@@ -96,7 +96,7 @@ export class DataCubeEditorSortsPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.selector.setSelectedColumns(
@@ -111,10 +111,7 @@ export class DataCubeEditorSortsPanelState
     );
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     newSnapshot.data.sortColumns = this.selector.selectedColumns.map((col) => ({
       ..._toCol(col),
       direction: col.direction,

package/src/stores/view/editor/DataCubeEditorState.tsx

@@ -17,11 +17,11 @@
 import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
 import { DataCubeEditorSortsPanelState } from './DataCubeEditorSortsPanelState.js';
-import { DataCubeQuerySnapshotController } from '../../services/DataCubeQuerySnapshotService.js';
+import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
 import {
-  type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotExtendedColumn,
-} from '../../core/DataCubeQuerySnapshot.js';
+  type DataCubeSnapshot,
+  type DataCubeSnapshotExtendedColumn,
+} from '../../core/DataCubeSnapshot.js';
 import {
   _findCol,
   _toCol,
@@ -62,7 +62,7 @@ export enum DataCubeEditorTab {
  * It could also host other form editor states like filter editors, but due to ergonomic
  * reasons, those have been separated out into their own respective query editor states.
  */
-export class DataCubeEditorState extends DataCubeQuerySnapshotController {
+export class DataCubeEditorState extends DataCubeSnapshotController {
   readonly view: DataCubeViewState;
   readonly display: DisplayState;
   readonly finalizationState = ActionState.create();
@@ -79,8 +79,8 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
   currentTab = DataCubeEditorTab.GENERAL_PROPERTIES;
 
   sourceColumns: DataCubeColumn[] = [];
-  leafExtendColumns: DataCubeQuerySnapshotExtendedColumn[] = [];
-  groupExtendColumns: DataCubeQuerySnapshotExtendedColumn[] = [];
+  leafExtendColumns: DataCubeSnapshotExtendedColumn[] = [];
+  groupExtendColumns: DataCubeSnapshotExtendedColumn[] = [];
 
   constructor(view: DataCubeViewState) {
     super(view.engine, view.settingService, view.snapshotService);
@@ -118,8 +118,8 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
   }
 
   override async applySnapshot(
-    snapshot: DataCubeQuerySnapshot,
-    previousSnapshot: DataCubeQuerySnapshot | undefined,
+    snapshot: DataCubeSnapshot,
+    previousSnapshot: DataCubeSnapshot | undefined,
   ) {
     this.sourceColumns = snapshot.data.sourceColumns;
     this.leafExtendColumns = snapshot.data.leafExtendedColumns;

package/src/stores/view/editor/DataCubeEditorVerticalPivotsPanelState.ts

@@ -17,7 +17,7 @@
 import { uniqBy } from '@finos/legend-shared';
 import type { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import { DataCubeColumnKind } from '../../core/DataCubeQueryEngine.js';
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
 import { _findCol, _toCol } from '../../core/model/DataCubeColumn.js';
 import {
   DataCubeEditorColumnSelectorColumnState,
@@ -74,7 +74,7 @@ export class DataCubeEditorVerticalPivotsPanelState
   }
 
   applySnaphot(
-    snapshot: DataCubeQuerySnapshot,
+    snapshot: DataCubeSnapshot,
     configuration: DataCubeConfiguration,
   ) {
     this.selector.setSelectedColumns(
@@ -85,10 +85,7 @@ export class DataCubeEditorVerticalPivotsPanelState
     );
   }
 
-  buildSnapshot(
-    newSnapshot: DataCubeQuerySnapshot,
-    baseSnapshot: DataCubeQuerySnapshot,
-  ) {
+  buildSnapshot(newSnapshot: DataCubeSnapshot, baseSnapshot: DataCubeSnapshot) {
     newSnapshot.data.groupBy = this.selector.selectedColumns.length
       ? {
           columns: this.selector.selectedColumns.map(_toCol),

package/src/stores/view/extend/DataCubeColumnEditorState.tsx

@@ -46,7 +46,7 @@ import {
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
 import type { DataCubeColumnConfiguration } from '../../core/model/DataCubeConfiguration.js';
-import type { DataCubeQuerySnapshotExtendedColumn } from '../../core/DataCubeQuerySnapshot.js';
+import type { DataCubeSnapshotExtendedColumn } from '../../core/DataCubeSnapshot.js';
 import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
 import { _findCol } from '../../core/model/DataCubeColumn.js';
 
@@ -404,7 +404,7 @@ export class DataCubeExistingColumnEditorState extends DataCubeColumnBaseEditorS
 
   constructor(
     manager: DataCubeExtendManagerState,
-    column: DataCubeQuerySnapshotExtendedColumn,
+    column: DataCubeSnapshotExtendedColumn,
     kind: DataCubeColumnKind,
     isGroupLevel: boolean,
   ) {

package/src/stores/view/extend/DataCubeExtendManagerState.tsx

@@ -16,9 +16,9 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import {
-  type DataCubeQuerySnapshot,
-  type DataCubeQuerySnapshotExtendedColumn,
-} from '../../core/DataCubeQuerySnapshot.js';
+  type DataCubeSnapshot,
+  type DataCubeSnapshotExtendedColumn,
+} from '../../core/DataCubeSnapshot.js';
 import {
   _findCol,
   _toCol,
@@ -32,7 +32,7 @@ import {
   uniqBy,
 } from '@finos/legend-shared';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import { DataCubeQuerySnapshotController } from '../../services/DataCubeQuerySnapshotService.js';
+import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
 import {
   DataCubeConfiguration,
   type DataCubeColumnConfiguration,
@@ -53,9 +53,9 @@ import { EngineError } from '@finos/legend-graph';
 class DataCubeQueryExtendedColumnState {
   readonly name: string;
   readonly type: string;
-  readonly data: DataCubeQuerySnapshotExtendedColumn;
+  readonly data: DataCubeSnapshotExtendedColumn;
 
-  constructor(data: DataCubeQuerySnapshotExtendedColumn) {
+  constructor(data: DataCubeSnapshotExtendedColumn) {
     this.name = data.name;
     this.type = data.type;
     this.data = data;
@@ -65,7 +65,7 @@ class DataCubeQueryExtendedColumnState {
 /**
  * This query editor state backs the form editor for extend columns, i.e. creating new columns.
  */
-export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController {
+export class DataCubeExtendManagerState extends DataCubeSnapshotController {
   readonly view: DataCubeViewState;
 
   columnConfigurations: DataCubeColumnConfiguration[] = [];
@@ -165,7 +165,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
   }
 
   addNewColumn(
-    column: DataCubeQuerySnapshotExtendedColumn,
+    column: DataCubeSnapshotExtendedColumn,
     isGroupLevel: boolean,
     columnKind: DataCubeColumnKind | undefined,
     editor: DataCubeNewColumnState,
@@ -193,7 +193,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
 
   async updateColumn(
     columnName: string,
-    updatedColumn: DataCubeQuerySnapshotExtendedColumn,
+    updatedColumn: DataCubeSnapshotExtendedColumn,
     isGroupLevel: boolean,
     columnKind: DataCubeColumnKind | undefined,
   ) {
@@ -416,8 +416,8 @@ export class DataCubeExtendManagerState 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,