@finos/legend-data-cube 0.0.7 → 0.0.9

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

@@ -48,11 +48,11 @@ export class DataCubeQueryFilterOperation__StartWithCaseInsensitive extends Data
     return 'startsWith (case-insensitive)';
   }
 
-  override get description(): string {
+  override get description() {
     return 'starts with (case-insensitive)';
   }
 
-  override get operator(): string {
+  override get operator() {
     return DataCubeQueryFilterOperator.START_WITH_CASE_INSENSITIVE;
   }
 

package/src/stores/{core → view}/DataCubeInfoState.ts

@@ -15,12 +15,12 @@
  */
 
 import { action, makeObservable, observable } from 'mobx';
-import type { DataCubeViewState } from '../DataCubeViewState.js';
+import type { DataCubeViewState } from './DataCubeViewState.js';
 import { DataCubeQuerySnapshotController } from './DataCubeQuerySnapshotManager.js';
-import type { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
-import type { DataCubeQuery } from '../engine/DataCubeQuery.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 './DataCubeQueryEngine.js';
+import { DEFAULT_REPORT_NAME } from '../core/DataCubeQueryEngine.js';
 
 /**
  * Unlike other query editor state, this state does not support making any
@@ -45,6 +45,10 @@ export class DataCubeInfoState extends DataCubeQuerySnapshotController {
     this.name = val;
   }
 
+  override getSnapshotSubscriberName() {
+    return 'info';
+  }
+
   override async applySnapshot(
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,

package/src/stores/{core → view}/DataCubeQuerySnapshotManager.ts

@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-import type { DataCubeViewState } from '../DataCubeViewState.js';
-import type { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
+import type { DataCubeViewState } from './DataCubeViewState.js';
+import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
 import {
   IllegalStateError,
   assertErrorThrown,
   deepDiff,
   guaranteeNonNullable,
 } from '@finos/legend-shared';
-import type { DataCubeQuery } from '../engine/DataCubeQuery.js';
+import type { DataCubeQuery } from '../core/DataCubeQuery.js';
 
 // TODO: set a stack depth when we implement undo/redo
 // const DATA_CUBE_MAX_SNAPSHOT_COUNT = 100;
 
 interface DataCubeQuerySnapshotSubscriber {
+  getSnapshotSubscriberName(): string;
   getLatestSnapshot(): DataCubeQuerySnapshot | undefined;
   receiveSnapshot(snapshot: DataCubeQuerySnapshot): Promise<void>;
 }
@@ -43,6 +44,8 @@ export abstract class DataCubeQuerySnapshotController
     this.view = view;
   }
 
+  abstract getSnapshotSubscriberName(): string;
+
   abstract applySnapshot(
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,
@@ -51,22 +54,26 @@ export abstract class DataCubeQuerySnapshotController
   async receiveSnapshot(snapshot: DataCubeQuerySnapshot) {
     const previousSnapshot = this.latestSnapshot;
     this.latestSnapshot = snapshot;
-    await this.applySnapshot(snapshot, previousSnapshot);
+
+    // NOTE: fully clone the snapshot before applying it to avoid any potential
+    // mutation of the snapshot by the subscriber
+    await this.applySnapshot(snapshot.INTERNAL__fullClone(), previousSnapshot);
   }
 
   publishSnapshot(snapshot: DataCubeQuerySnapshot) {
+    const previousSnapshot = this.latestSnapshot;
+    this.latestSnapshot = snapshot;
+
     if (this.view.engine.enableDebugMode) {
       this.view.application.debugProcess(
         `New Snapshot`,
-        '\nSnapshot',
-        snapshot,
-        '\nPrevious Snapshot',
-        this.latestSnapshot ?? {},
-        '\nDiff',
-        deepDiff(this.latestSnapshot ?? {}, snapshot),
+        ['Publisher', this.getSnapshotSubscriberName()],
+        ['Snapshot', snapshot],
+        ['Previous Snapshot', previousSnapshot],
+        ['Diff', deepDiff(previousSnapshot ?? {}, snapshot)],
       );
     }
-    this.latestSnapshot = snapshot;
+
     this.view.snapshotManager.broadcastSnapshot(snapshot);
   }
 
@@ -92,6 +99,16 @@ export class DataCubeQuerySnapshotManager {
   }
 
   registerSubscriber(subscriber: DataCubeQuerySnapshotSubscriber) {
+    const existingSubscriber = this.subscribers.find(
+      (sub) =>
+        sub.getSnapshotSubscriberName() ===
+        subscriber.getSnapshotSubscriberName(),
+    );
+    if (existingSubscriber) {
+      throw new IllegalStateError(
+        `Subscriber with name '${subscriber.getSnapshotSubscriberName()}' already exists`,
+      );
+    }
     this.subscribers.push(subscriber);
   }
 

package/src/stores/{DataCubeViewState.ts → view/DataCubeViewState.ts}

@@ -17,16 +17,16 @@
 import { DataCubeGridState } from './grid/DataCubeGridState.js';
 import { DataCubeEditorState } from './editor/DataCubeEditorState.js';
 import { assertErrorThrown, uuid } from '@finos/legend-shared';
-import { DataCubeQuerySnapshotManager } from './core/DataCubeQuerySnapshotManager.js';
-import { DataCubeInfoState } from './core/DataCubeInfoState.js';
-import { validateAndBuildQuerySnapshot } from './core/DataCubeQuerySnapshotBuilder.js';
+import { DataCubeQuerySnapshotManager } from './DataCubeQuerySnapshotManager.js';
+import { DataCubeInfoState } from './DataCubeInfoState.js';
+import { validateAndBuildQuerySnapshot } from '../core/DataCubeQuerySnapshotBuilder.js';
 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 './engine/DataCubeEngine.js';
-import { type DataCubeApplicationEngine } from './engine/DataCubeApplicationEngine.js';
-import { AlertType } from '../components/application/DataCubeAlert.js';
+import type { DataCubeState } from '../DataCubeState.js';
+import type { DataCubeEngine } from '../core/DataCubeEngine.js';
+import { type DataCubeApplicationEngine } from '../core/DataCubeApplicationEngine.js';
+import { AlertType } from '../../components/core/DataCubeAlert.js';
 
 class DataCubeTask {
   uuid = uuid();
@@ -112,7 +112,7 @@ export class DataCubeViewState {
         result.sourceQuery,
         result.query,
       );
-      initialSnapshot.timestamp = result.timestamp;
+      initialSnapshot.INTERNAL__setTimestamp(result.timestamp);
       this.snapshotManager.broadcastSnapshot(initialSnapshot);
     } catch (error: unknown) {
       assertErrorThrown(error);

package/src/stores/{editor → 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 DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutableColumnConfiguration } from './DataCubeEditorMutableConfiguration.js';
@@ -25,7 +25,7 @@ import {
   guaranteeNonNullable,
   type PlainObject,
 } from '@finos/legend-shared';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 
 export class DataCubeEditorColumnPropertiesPanelState
   implements DataCubeQueryEditorPanelState

package/src/stores/{editor/DataCubeEditorColumnsSelectorState.ts → view/editor/DataCubeEditorColumnSelectorState.ts}

@@ -18,9 +18,9 @@ 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/DataCubeQuerySnapshot.js';
 
-export class DataCubeEditorColumnsSelectorColumnState {
+export class DataCubeEditorColumnSelectorColumnState {
   readonly name: string;
   readonly type: string;
 
@@ -30,8 +30,8 @@ export class DataCubeEditorColumnsSelectorColumnState {
   }
 }
 
-export abstract class DataCubeEditorColumnsSelectorState<
-  T extends DataCubeEditorColumnsSelectorColumnState,
+export abstract class DataCubeEditorColumnSelectorState<
+  T extends DataCubeEditorColumnSelectorColumnState,
 > {
   readonly view!: DataCubeViewState;
   readonly editor!: DataCubeEditorState;
@@ -42,14 +42,14 @@ export abstract class DataCubeEditorColumnsSelectorState<
   selectedColumnsSearchText = '';
 
   readonly onChange?:
-    | ((selector: DataCubeEditorColumnsSelectorState<T>) => void)
+    | ((selector: DataCubeEditorColumnSelectorState<T>) => void)
     | undefined;
 
   constructor(
     editor: DataCubeEditorState,
     options?: {
       onChange?:
-        | ((select: DataCubeEditorColumnsSelectorState<T>) => void)
+        | ((select: DataCubeEditorColumnSelectorState<T>) => void)
         | undefined;
     },
   ) {

package/src/stores/{editor → view/editor}/DataCubeEditorColumnsPanelState.ts

@@ -19,16 +19,16 @@ import type { DataCubeViewState } from '../DataCubeViewState.js';
 import {
   _toCol,
   type DataCubeQuerySnapshot,
-} from '../core/DataCubeQuerySnapshot.js';
+} from '../../core/DataCubeQuerySnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import {
-  DataCubeEditorColumnsSelectorColumnState,
-  DataCubeEditorColumnsSelectorState,
-} from './DataCubeEditorColumnsSelectorState.js';
+  DataCubeEditorColumnSelectorColumnState,
+  DataCubeEditorColumnSelectorState,
+} from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
-import { type DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { type DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 
-export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColumnsSelectorState<DataCubeEditorColumnsSelectorColumnState> {
+export class DataCubeEditorBasicColumnSelectorState extends DataCubeEditorColumnSelectorState<DataCubeEditorColumnSelectorColumnState> {
   showHiddenColumns = false;
 
   constructor(
@@ -36,7 +36,7 @@ export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColum
     options?: {
       onChange?:
         | ((
-            select: DataCubeEditorColumnsSelectorState<DataCubeEditorColumnsSelectorColumnState>,
+            select: DataCubeEditorColumnSelectorState<DataCubeEditorColumnSelectorColumnState>,
           ) => void)
         | undefined;
     },
@@ -52,8 +52,8 @@ export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColum
     });
   }
 
-  override cloneColumn(column: DataCubeEditorColumnsSelectorColumnState) {
-    return new DataCubeEditorColumnsSelectorColumnState(
+  override cloneColumn(column: DataCubeEditorColumnSelectorColumnState) {
+    return new DataCubeEditorColumnSelectorColumnState(
       column.name,
       column.type,
     );
@@ -65,11 +65,11 @@ export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColum
       ...this.editor.leafExtendColumns,
       ...this.editor.groupExtendColumns,
     ].map(
-      (col) => new DataCubeEditorColumnsSelectorColumnState(col.name, col.type),
+      (col) => new DataCubeEditorColumnSelectorColumnState(col.name, col.type),
     );
   }
 
-  override get availableColumnsForDisplay(): DataCubeEditorColumnsSelectorColumnState[] {
+  override get availableColumnsForDisplay(): DataCubeEditorColumnSelectorColumnState[] {
     return super.availableColumnsForDisplay.filter(
       (column) =>
         this.showHiddenColumns ||
@@ -78,7 +78,7 @@ export class DataCubeEditorBasicColumnsSelectorState extends DataCubeEditorColum
     );
   }
 
-  override get selectedColumnsForDisplay(): DataCubeEditorColumnsSelectorColumnState[] {
+  override get selectedColumnsForDisplay(): DataCubeEditorColumnSelectorColumnState[] {
     return super.selectedColumnsForDisplay.filter(
       (column) =>
         this.showHiddenColumns ||
@@ -107,7 +107,7 @@ export class DataCubeEditorColumnsPanelState
 {
   readonly view!: DataCubeViewState;
   readonly editor!: DataCubeEditorState;
-  readonly selector!: DataCubeEditorBasicColumnsSelectorState;
+  readonly selector!: DataCubeEditorBasicColumnSelectorState;
 
   constructor(editor: DataCubeEditorState) {
     makeObservable(this, {
@@ -116,7 +116,7 @@ export class DataCubeEditorColumnsPanelState
 
     this.editor = editor;
     this.view = editor.view;
-    this.selector = new DataCubeEditorBasicColumnsSelectorState(editor, {
+    this.selector = new DataCubeEditorBasicColumnSelectorState(editor, {
       onChange: (selector) => {
         const selectedColumnConfigurations = selector.selectedColumns.map(
           (col) =>
@@ -163,7 +163,7 @@ export class DataCubeEditorColumnsPanelState
         .filter((col) => col.isSelected)
         .map((col) => {
           const column = this.selector.getColumn(col.name);
-          return new DataCubeEditorColumnsSelectorColumnState(
+          return new DataCubeEditorColumnSelectorColumnState(
             column.name,
             column.type,
           );

package/src/stores/{editor → view/editor}/DataCubeEditorGeneralPropertiesPanelState.ts

@@ -16,11 +16,11 @@
 
 import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutableConfiguration } from './DataCubeEditorMutableConfiguration.js';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 
 export class DataCubeEditorGeneralPropertiesPanelState
   implements DataCubeQueryEditorPanelState

package/src/stores/{editor → view/editor}/DataCubeEditorHorizontalPivotsPanelState.ts

@@ -16,29 +16,29 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import {
   DataCubeColumnKind,
   isPivotResultColumnName,
-} from '../core/DataCubeQueryEngine.js';
+} from '../../core/DataCubeQueryEngine.js';
 import {
   _toCol,
   type DataCubeQuerySnapshot,
   type DataCubeQuerySnapshotColumn,
-} from '../core/DataCubeQuerySnapshot.js';
+} from '../../core/DataCubeQuerySnapshot.js';
 import {
-  DataCubeEditorColumnsSelectorColumnState,
-  DataCubeEditorColumnsSelectorState,
-} from './DataCubeEditorColumnsSelectorState.js';
+  DataCubeEditorColumnSelectorColumnState,
+  DataCubeEditorColumnSelectorState,
+} from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { uniqBy } from '@finos/legend-shared';
 
-export class DataCubeEditorHorizontalPivotColumnsSelectorState extends DataCubeEditorColumnsSelectorState<DataCubeEditorColumnsSelectorColumnState> {
+export class DataCubeEditorHorizontalPivotColumnSelectorState extends DataCubeEditorColumnSelectorState<DataCubeEditorColumnSelectorColumnState> {
   override cloneColumn(
-    column: DataCubeEditorColumnsSelectorColumnState,
-  ): DataCubeEditorColumnsSelectorColumnState {
-    return new DataCubeEditorColumnsSelectorColumnState(
+    column: DataCubeEditorColumnSelectorColumnState,
+  ): DataCubeEditorColumnSelectorColumnState {
+    return new DataCubeEditorColumnSelectorColumnState(
       column.name,
       column.type,
     );
@@ -56,7 +56,7 @@ export class DataCubeEditorHorizontalPivotColumnsSelectorState extends DataCubeE
       )
       .map(
         (col) =>
-          new DataCubeEditorColumnsSelectorColumnState(col.name, col.type),
+          new DataCubeEditorColumnSelectorColumnState(col.name, col.type),
       );
   }
 }
@@ -66,7 +66,7 @@ export class DataCubeEditorHorizontalPivotsPanelState
 {
   readonly view!: DataCubeViewState;
   readonly editor!: DataCubeEditorState;
-  readonly selector!: DataCubeEditorHorizontalPivotColumnsSelectorState;
+  readonly selector!: DataCubeEditorHorizontalPivotColumnSelectorState;
 
   castColumns: DataCubeQuerySnapshotColumn[] = [];
 
@@ -81,7 +81,7 @@ export class DataCubeEditorHorizontalPivotsPanelState
 
     this.editor = editor;
     this.view = editor.view;
-    this.selector = new DataCubeEditorHorizontalPivotColumnsSelectorState(
+    this.selector = new DataCubeEditorHorizontalPivotColumnSelectorState(
       editor,
     );
   }
@@ -108,7 +108,7 @@ export class DataCubeEditorHorizontalPivotsPanelState
     this.selector.setSelectedColumns(
       (snapshot.data.pivot?.columns ?? []).map(
         (col) =>
-          new DataCubeEditorColumnsSelectorColumnState(col.name, col.type),
+          new DataCubeEditorColumnSelectorColumnState(col.name, col.type),
       ),
     );
     this.setCastColumns(snapshot.data.pivot?.castColumns ?? []);

package/src/stores/{editor → view/editor}/DataCubeEditorMutableConfiguration.ts

@@ -38,20 +38,20 @@ import {
   DEFAULT_ERROR_FOREGROUND_COLOR,
   DEFAULT_BACKGROUND_COLOR,
   type DataCubeColumnDataType,
-} from '../core/DataCubeQueryEngine.js';
+} from '../../core/DataCubeQueryEngine.js';
 import { type PlainObject, type Writable } from '@finos/legend-shared';
 import { makeObservable, observable, action, computed } from 'mobx';
 import {
   DataCubeColumnConfiguration,
   DataCubeConfiguration,
   DataCubePivotLayoutConfiguration,
-} from '../core/DataCubeConfiguration.js';
-import { buildDefaultColumnConfiguration } from '../core/DataCubeConfigurationBuilder.js';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+} from '../../core/DataCubeConfiguration.js';
+import { buildDefaultColumnConfiguration } from '../../core/DataCubeConfigurationBuilder.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import {
   getAggregateOperation,
   type DataCubeQueryAggregateOperation,
-} from '../core/aggregation/DataCubeQueryAggregateOperation.js';
+} from '../../core/aggregation/DataCubeQueryAggregateOperation.js';
 
 export class DataCubeEditorMutableColumnConfiguration extends DataCubeColumnConfiguration {
   readonly dataType!: DataCubeColumnDataType;
@@ -207,10 +207,6 @@ export class DataCubeEditorMutableColumnConfiguration extends DataCubeColumnConf
     );
   }
 
-  serialize() {
-    return DataCubeColumnConfiguration.serialization.toJson(this);
-  }
-
   get isUsingDefaultStyling() {
     return (
       this.fontFamily === undefined &&
@@ -416,10 +412,6 @@ export class DataCubeEditorMutablePivotLayoutConfiguration extends DataCubePivot
     return configuration;
   }
 
-  serialize() {
-    return DataCubePivotLayoutConfiguration.serialization.toJson(this);
-  }
-
   setExpandedPaths(value: string[]) {
     this.expandedPaths = value;
   }
@@ -577,10 +569,6 @@ export class DataCubeEditorMutableConfiguration extends DataCubeConfiguration {
     this.errorBackgroundColor = DEFAULT_BACKGROUND_COLOR;
   }
 
-  serialize() {
-    return DataCubeConfiguration.serialization.toJson(this);
-  }
-
   setDescription(value: string | undefined) {
     this.description = value;
   }

package/src/stores/{editor → view/editor}/DataCubeEditorPanelState.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
-import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 
 export interface DataCubeQueryEditorPanelState {
   /**

package/src/stores/{editor → view/editor}/DataCubeEditorPivotLayoutPanelState.ts

@@ -16,13 +16,13 @@
 
 import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import { DataCubeEditorMutablePivotLayoutConfiguration } from './DataCubeEditorMutableConfiguration.js';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import type { PlainObject } from '@finos/legend-shared';
-import { _pruneExpandedPaths } from '../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeEditorPivotLayoutPanelState
   implements DataCubeQueryEditorPanelState

package/src/stores/{editor → view/editor}/DataCubeEditorSortsPanelState.ts

@@ -16,24 +16,31 @@
 
 import { action, makeObservable, observable } from 'mobx';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
+import {
+  _toCol,
+  type DataCubeQuerySnapshot,
+} from '../../core/DataCubeQuerySnapshot.js';
 import {
   DataCubeColumnKind,
   DataCubeQuerySortDirection,
-} from '../core/DataCubeQueryEngine.js';
+} from '../../core/DataCubeQueryEngine.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import {
-  DataCubeEditorColumnsSelectorColumnState,
-  DataCubeEditorColumnsSelectorState,
-} from './DataCubeEditorColumnsSelectorState.js';
+  DataCubeEditorColumnSelectorColumnState,
+  DataCubeEditorColumnSelectorState,
+} from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { uniqBy } from '@finos/legend-shared';
 
-export class DataCubeEditorSortColumnState extends DataCubeEditorColumnsSelectorColumnState {
-  direction: string;
+export class DataCubeEditorSortColumnState extends DataCubeEditorColumnSelectorColumnState {
+  direction: DataCubeQuerySortDirection;
 
-  constructor(name: string, type: string, direction: string) {
+  constructor(
+    name: string,
+    type: string,
+    direction: DataCubeQuerySortDirection,
+  ) {
     super(name, type);
 
     makeObservable(this, {
@@ -49,7 +56,7 @@ export class DataCubeEditorSortColumnState extends DataCubeEditorColumnsSelector
   }
 }
 
-export class DataCubeEditorSortColumnsSelectorState extends DataCubeEditorColumnsSelectorState<DataCubeEditorSortColumnState> {
+export class DataCubeEditorSortColumnSelectorState extends DataCubeEditorColumnSelectorState<DataCubeEditorSortColumnState> {
   override cloneColumn(column: DataCubeEditorSortColumnState) {
     return new DataCubeEditorSortColumnState(
       column.name,
@@ -102,12 +109,12 @@ export class DataCubeEditorSortsPanelState
 {
   readonly view!: DataCubeViewState;
   readonly editor!: DataCubeEditorState;
-  readonly selector!: DataCubeEditorColumnsSelectorState<DataCubeEditorSortColumnState>;
+  readonly selector!: DataCubeEditorColumnSelectorState<DataCubeEditorSortColumnState>;
 
   constructor(editor: DataCubeEditorState) {
     this.editor = editor;
     this.view = editor.view;
-    this.selector = new DataCubeEditorSortColumnsSelectorState(editor);
+    this.selector = new DataCubeEditorSortColumnSelectorState(editor);
   }
 
   adaptPropagatedChanges(): void {
@@ -139,8 +146,7 @@ export class DataCubeEditorSortsPanelState
     baseSnapshot: DataCubeQuerySnapshot,
   ) {
     newSnapshot.data.sortColumns = this.selector.selectedColumns.map((col) => ({
-      name: col.name,
-      type: col.type,
+      ..._toCol(col),
       direction: col.direction,
     }));
   }