@finos/legend-data-cube 0.0.9 → 0.0.11

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotContain.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -56,7 +54,7 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
     return DataCubeQueryFilterOperator.NOT_CONTAIN;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -68,7 +66,7 @@ export class DataCubeQueryFilterOperation__NotContain extends DataCubeQueryFilte
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEndWith.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -56,7 +54,7 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
     return DataCubeQueryFilterOperator.NOT_END_WITH;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -68,7 +66,7 @@ export class DataCubeQueryFilterOperation__NotEndWith extends DataCubeQueryFilte
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqual.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -56,7 +54,7 @@ export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterO
     return DataCubeQueryFilterOperator.NOT_EQUAL;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       DataCubeColumnDataType.TEXT,
       DataCubeColumnDataType.NUMBER,
@@ -78,7 +76,7 @@ export class DataCubeQueryFilterOperation__NotEqual extends DataCubeQueryFilterO
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualCaseInsensitive.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -57,7 +55,7 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataC
     return DataCubeQueryFilterOperator.NOT_EQUAL_CASE_INSENSITIVE;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -69,7 +67,7 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitive extends DataC
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn.tsx

@@ -16,10 +16,8 @@
 
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -55,7 +53,7 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn extends
     return DataCubeQueryFilterOperator.NOT_EQUAL_CASE_INSENSITIVE_COLUMN;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -67,7 +65,7 @@ export class DataCubeQueryFilterOperation__NotEqualCaseInsensitiveColumn extends
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: DataCubeOperationAdvancedValueType.COLUMN,
       value: column.name,

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotEqualColumn.tsx

@@ -16,10 +16,8 @@
 
 import { type V1_AppliedFunction } from '@finos/legend-graph';
 import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -55,7 +53,7 @@ export class DataCubeQueryFilterOperation__NotEqualColumn extends DataCubeQueryF
     return DataCubeQueryFilterOperator.NOT_EQUAL_COLUMN;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [
       DataCubeColumnDataType.TEXT,
       DataCubeColumnDataType.NUMBER,
@@ -72,7 +70,7 @@ export class DataCubeQueryFilterOperation__NotEqualColumn extends DataCubeQueryF
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: DataCubeOperationAdvancedValueType.COLUMN,
       value: column.name,

package/src/stores/core/filter/DataCubeQueryFilterOperation__NotStartWith.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -56,7 +54,7 @@ export class DataCubeQueryFilterOperation__NotStartWith extends DataCubeQueryFil
     return DataCubeQueryFilterOperator.NOT_START_WITH;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -68,7 +66,7 @@ export class DataCubeQueryFilterOperation__NotStartWith extends DataCubeQueryFil
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/filter/DataCubeQueryFilterOperation__StartWith.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -55,7 +53,7 @@ export class DataCubeQueryFilterOperation__StartWith extends DataCubeQueryFilter
     return DataCubeQueryFilterOperator.START_WITH;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -67,7 +65,7 @@ export class DataCubeQueryFilterOperation__StartWith extends DataCubeQueryFilter
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/filter/DataCubeQueryFilterOperation__StartWithCaseInsensitive.tsx

@@ -19,10 +19,8 @@ import {
   DataCubeQueryFilterOperation,
   generateDefaultFilterConditionPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
-import type {
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotFilterCondition,
-} from '../DataCubeQuerySnapshot.js';
+import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
+import type { DataCubeColumn } from '../models/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
@@ -56,7 +54,7 @@ export class DataCubeQueryFilterOperation__StartWithCaseInsensitive extends Data
     return DataCubeQueryFilterOperator.START_WITH_CASE_INSENSITIVE;
   }
 
-  isCompatibleWithColumn(column: DataCubeQuerySnapshotColumn) {
+  isCompatibleWithColumn(column: DataCubeColumn) {
     return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
   }
 
@@ -68,7 +66,7 @@ export class DataCubeQueryFilterOperation__StartWithCaseInsensitive extends Data
     );
   }
 
-  generateDefaultValue(column: DataCubeQuerySnapshotColumn) {
+  generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
       value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),

package/src/stores/core/models/DataCubeColumn.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export type DataCubeColumn = {
+  name: string;
+  type: string;
+};
+
+export function _findCol<T extends DataCubeColumn>(
+  cols: T[] | undefined,
+  name: string,
+): T | undefined {
+  return cols?.find((c) => c.name === name);
+}
+
+export function _toCol(col: { name: string; type: string }): DataCubeColumn {
+  return { name: col.name, type: col.type };
+}
+
+export const _sortByColName = (a: { name: string }, b: { name: string }) =>
+  a.name.localeCompare(b.name);

package/src/stores/core/{DataCubeConfiguration.ts → models/DataCubeConfiguration.ts}

@@ -40,7 +40,8 @@ import {
   type DataCubeOperationValue,
   DEFAULT_PIVOT_STATISTIC_COLUMN_NAME,
   DEFAULT_TREE_COLUMN_SORT_DIRECTION,
-} from './DataCubeQueryEngine.js';
+  DEFAULT_REPORT_NAME,
+} from '../DataCubeQueryEngine.js';
 import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
 import { createModelSchema, list, optional, primitive, raw } from 'serializr';
 
@@ -178,6 +179,7 @@ export class DataCubePivotLayoutConfiguration {
 }
 
 export class DataCubeConfiguration {
+  name = DEFAULT_REPORT_NAME;
   description?: string | undefined;
   columns: DataCubeColumnConfiguration[] = [];
 
@@ -242,6 +244,7 @@ export class DataCubeConfiguration {
       fontUnderline: optional(primitive()),
       gridLineColor: primitive(),
       initialExpandLevel: optional(primitive()),
+      name: primitive(),
       negativeBackgroundColor: primitive(),
       negativeForegroundColor: primitive(),
       normalBackgroundColor: primitive(),

package/src/stores/core/models/DataCubeQuery.ts

@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  SerializationFactory,
+  usingModelSchema,
+  type PlainObject,
+} from '@finos/legend-shared';
+import { createModelSchema, primitive } from 'serializr';
+import { DataCubeConfiguration } from './DataCubeConfiguration.js';
+
+export class DataCubeQuery {
+  query!: string;
+  configuration?: PlainObject | undefined;
+
+  constructor(configuration?: PlainObject | undefined) {
+    this.configuration = configuration;
+  }
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(DataCubeQuery, {
+      configuration: usingModelSchema(
+        DataCubeConfiguration.serialization.schema,
+      ),
+      query: primitive(),
+    }),
+  );
+}

package/src/stores/core/models/DataCubeSource.ts

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { V1_ValueSpecification } from '@finos/legend-graph';
+import type { DataCubeColumn } from './DataCubeColumn.js';
+
+export abstract class DataCubeSource {
+  sourceColumns: DataCubeColumn[] = [];
+  query!: V1_ValueSpecification;
+}
+
+export class INTERNAL__DataCubeSource extends DataCubeSource {}

package/src/stores/view/DataCubeInfoState.ts

@@ -18,9 +18,7 @@ import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from './DataCubeViewState.js';
 import { DataCubeQuerySnapshotController } from './DataCubeQuerySnapshotManager.js';
 import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
-import type { DataCubeQuery } from '../core/DataCubeQuery.js';
-import { formatDate } from '@finos/legend-shared';
-import { DEFAULT_REPORT_NAME } from '../core/DataCubeQueryEngine.js';
+import { DataCubeConfiguration } from '../core/models/DataCubeConfiguration.js';
 
 /**
  * Unlike other query editor state, this state does not support making any
@@ -28,21 +26,17 @@ import { DEFAULT_REPORT_NAME } from '../core/DataCubeQueryEngine.js';
  * from the latest snapshot to help display latest static info about the query.
  */
 export class DataCubeInfoState extends DataCubeQuerySnapshotController {
-  baseQuery!: DataCubeQuery;
-  name = DEFAULT_REPORT_NAME;
-  private editionStartTime?: number | undefined;
+  name = '';
+  // TODO: filter preview text
 
   constructor(view: DataCubeViewState) {
     super(view);
 
-    makeObservable<DataCubeInfoState, 'setName'>(this, {
+    makeObservable(this, {
       name: observable,
-      setName: action,
-    });
-  }
 
-  private setName(val: string) {
-    this.name = val;
+      applySnapshot: action,
+    });
   }
 
   override getSnapshotSubscriberName() {
@@ -54,12 +48,16 @@ export class DataCubeInfoState extends DataCubeQuerySnapshotController {
     previousSnapshot: DataCubeQuerySnapshot | undefined,
   ) {
     const data = snapshot.data;
-    this.setName(data.name);
-    if (!this.editionStartTime) {
-      this.editionStartTime = snapshot.timestamp;
-    }
-    this.view.application.setWindowTitle(
-      `\u229E ${data.name}${this.editionStartTime ? ` - ${formatDate(new Date(this.editionStartTime), 'HH:mm:ss EEE MMM dd yyyy')}` : ''}`,
+    const configuration = DataCubeConfiguration.serialization.fromJson(
+      data.configuration,
     );
+
+    if (configuration.name !== this.name) {
+      this.name = configuration.name;
+      // TODO: make sure we only call this for the main view of data cube when we support multi views
+      this.view.dataCube.onNameChanged?.(this.name, this.view.source);
+    }
+
+    // TODO: filter preview text
   }
 }

package/src/stores/view/DataCubeQuerySnapshotManager.ts

@@ -22,7 +22,7 @@ import {
   deepDiff,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
-import type { DataCubeQuery } from '../core/DataCubeQuery.js';
+import type { DataCubeQuery } from '../core/models/DataCubeQuery.js';
 
 // TODO: set a stack depth when we implement undo/redo
 // const DATA_CUBE_MAX_SNAPSHOT_COUNT = 100;
@@ -64,8 +64,8 @@ export abstract class DataCubeQuerySnapshotController
     const previousSnapshot = this.latestSnapshot;
     this.latestSnapshot = snapshot;
 
-    if (this.view.engine.enableDebugMode) {
-      this.view.application.debugProcess(
+    if (this.view.dataCube.settings.enableDebugMode) {
+      this.view.engine.debugProcess(
         `New Snapshot`,
         ['Publisher', this.getSnapshotSubscriberName()],
         ['Snapshot', snapshot],
@@ -141,7 +141,7 @@ export class DataCubeQuerySnapshotManager {
 
   broadcastSnapshot(snapshot: DataCubeQuerySnapshot) {
     if (!snapshot.isFinalized()) {
-      this.view.application.logIllegalStateError(
+      this.view.engine.logIllegalStateError(
         `Snapshot must be finalized before broadcasting`,
       );
       return;
@@ -152,7 +152,7 @@ export class DataCubeQuerySnapshotManager {
       if (currentSnapshot?.uuid !== snapshot.uuid) {
         subscriber.receiveSnapshot(snapshot).catch((error: unknown) => {
           assertErrorThrown(error);
-          this.view.application.logIllegalStateError(
+          this.view.engine.logIllegalStateError(
             `Error occured while subscribers receiving and applying new snapshot should be handled gracefully`,
             error,
           );

package/src/stores/view/DataCubeViewState.ts

@@ -16,7 +16,11 @@
 
 import { DataCubeGridState } from './grid/DataCubeGridState.js';
 import { DataCubeEditorState } from './editor/DataCubeEditorState.js';
-import { assertErrorThrown, uuid } from '@finos/legend-shared';
+import {
+  assertErrorThrown,
+  IllegalStateError,
+  uuid,
+} from '@finos/legend-shared';
 import { DataCubeQuerySnapshotManager } from './DataCubeQuerySnapshotManager.js';
 import { DataCubeInfoState } from './DataCubeInfoState.js';
 import { validateAndBuildQuerySnapshot } from '../core/DataCubeQuerySnapshotBuilder.js';
@@ -24,9 +28,12 @@ import { action, makeObservable, observable } from 'mobx';
 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 DataCubeApplicationEngine } from '../core/DataCubeApplicationEngine.js';
+import type {
+  DataCubeEngine,
+  DataCubeInitialInput,
+} from '../core/DataCubeEngine.js';
 import { AlertType } from '../../components/core/DataCubeAlert.js';
+import type { DataCubeSource } from '../core/models/DataCubeSource.js';
 
 class DataCubeTask {
   uuid = uuid();
@@ -45,7 +52,6 @@ class DataCubeTask {
 
 export class DataCubeViewState {
   readonly dataCube: DataCubeState;
-  readonly application: DataCubeApplicationEngine;
   readonly engine: DataCubeEngine;
 
   readonly snapshotManager: DataCubeQuerySnapshotManager;
@@ -58,6 +64,8 @@ export class DataCubeViewState {
 
   readonly runningTasks = new Map<string, DataCubeTask>();
 
+  private _source?: DataCubeSource | undefined;
+
   constructor(dataCube: DataCubeState) {
     makeObservable(this, {
       runningTasks: observable,
@@ -66,7 +74,7 @@ export class DataCubeViewState {
     });
 
     this.dataCube = dataCube;
-    this.application = dataCube.application;
+    this.engine = dataCube.engine;
     this.engine = dataCube.engine;
 
     // NOTE: snapshot manager must be instantiated before subscribers
@@ -79,6 +87,13 @@ export class DataCubeViewState {
     this.extend = new DataCubeExtendManagerState(this);
   }
 
+  get source(): DataCubeSource {
+    if (!this._source) {
+      throw new IllegalStateError('Source is not initialized');
+    }
+    return this._source;
+  }
+
   newTask(name: string) {
     const task = new DataCubeTask(name);
     this.runningTasks.set(task.uuid, task);
@@ -91,7 +106,7 @@ export class DataCubeViewState {
     return task;
   }
 
-  async initialize() {
+  async initialize(initialInput?: DataCubeInitialInput | undefined) {
     const task = this.newTask('Initializing');
     try {
       await Promise.all(
@@ -106,19 +121,31 @@ export class DataCubeViewState {
           this.snapshotManager.registerSubscriber(state);
         }),
       );
-      const result = await this.engine.getBaseQuery();
+      const input = initialInput ?? (await this.engine.getInitialInput());
+      if (!input) {
+        this.dataCube.alertAction({
+          message: `Initialization Failure: No initial input provided`,
+          prompt: `Make sure to either specify the initial input when setting up DataCube or the initial input getter in engine.`,
+          type: AlertType.ERROR,
+          actions: [],
+        });
+        return;
+      }
+      this._source = input.source;
+      const partialQuery = await this.engine.parseValueSpecification(
+        input.query.query,
+      );
       const initialSnapshot = validateAndBuildQuerySnapshot(
-        result.partialQuery,
-        result.sourceQuery,
-        result.query,
+        partialQuery,
+        this.source,
+        input.query,
       );
-      initialSnapshot.INTERNAL__setTimestamp(result.timestamp);
       this.snapshotManager.broadcastSnapshot(initialSnapshot);
     } catch (error: unknown) {
       assertErrorThrown(error);
-      this.application.alertAction({
+      this.dataCube.alertAction({
         message: `Initialization Failure: ${error.message}`,
-        prompt: `Resolve the issue and reload the application.`,
+        prompt: `Resolve the issue and reload the engine.`,
         type: AlertType.ERROR,
         actions: [],
       });

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

@@ -25,7 +25,7 @@ import {
   guaranteeNonNullable,
   type PlainObject,
 } from '@finos/legend-shared';
-import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 
 export class DataCubeEditorColumnPropertiesPanelState
   implements DataCubeQueryEditorPanelState

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

@@ -18,7 +18,7 @@ import { makeObservable, observable, action, computed } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { _sortByColName } from '../../core/DataCubeQuerySnapshot.js';
+import { _sortByColName } from '../../core/models/DataCubeColumn.js';
 
 export class DataCubeEditorColumnSelectorColumnState {
   readonly name: string;

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

@@ -16,17 +16,15 @@
 
 import { action, makeObservable, observable, override } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import {
-  _toCol,
-  type DataCubeQuerySnapshot,
-} from '../../core/DataCubeQuerySnapshot.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { _toCol } from '../../core/models/DataCubeColumn.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import {
   DataCubeEditorColumnSelectorColumnState,
   DataCubeEditorColumnSelectorState,
 } from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
-import { type DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import { type DataCubeConfiguration } from '../../core/models/DataCubeConfiguration.js';
 
 export class DataCubeEditorBasicColumnSelectorState extends DataCubeEditorColumnSelectorState<DataCubeEditorColumnSelectorColumnState> {
   showHiddenColumns = false;