@finos/legend-data-cube 0.0.6 → 0.0.8

package/lib/stores/{editor → view/editor}/DataCubeEditorSortsPanelState.js

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 import { action, makeObservable, observable } from 'mobx';
-import {} from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeColumnKind, DataCubeQuerySortDirection, } from '../core/DataCubeQueryEngine.js';
-import { DataCubeEditorColumnsSelectorColumnState, DataCubeEditorColumnsSelectorState, } from './DataCubeEditorColumnsSelectorState.js';
+import { _toCol, } from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeColumnKind, DataCubeQuerySortDirection, } from '../../core/DataCubeQueryEngine.js';
+import { DataCubeEditorColumnSelectorColumnState, DataCubeEditorColumnSelectorState, } from './DataCubeEditorColumnSelectorState.js';
 import { uniqBy } from '@finos/legend-shared';
-export class DataCubeEditorSortColumnState extends DataCubeEditorColumnsSelectorColumnState {
+export class DataCubeEditorSortColumnState extends DataCubeEditorColumnSelectorColumnState {
     direction;
     constructor(name, type, direction) {
         super(name, type);
@@ -32,7 +32,7 @@ export class DataCubeEditorSortColumnState extends DataCubeEditorColumnsSelector
         this.direction = val;
     }
 }
-export class DataCubeEditorSortColumnsSelectorState extends DataCubeEditorColumnsSelectorState {
+export class DataCubeEditorSortColumnSelectorState extends DataCubeEditorColumnSelectorState {
     cloneColumn(column) {
         return new DataCubeEditorSortColumnState(column.name, column.type, column.direction);
     }
@@ -64,7 +64,7 @@ export class DataCubeEditorSortsPanelState {
     constructor(editor) {
         this.editor = editor;
         this.view = editor.view;
-        this.selector = new DataCubeEditorSortColumnsSelectorState(editor);
+        this.selector = new DataCubeEditorSortColumnSelectorState(editor);
     }
     adaptPropagatedChanges() {
         this.selector.setSelectedColumns(this.selector.selectedColumns.filter((column) => this.selector.availableColumns.find((col) => col.name === column.name)));
@@ -77,8 +77,7 @@ export class DataCubeEditorSortsPanelState {
     }
     buildSnapshot(newSnapshot, baseSnapshot) {
         newSnapshot.data.sortColumns = this.selector.selectedColumns.map((col) => ({
-            name: col.name,
-            type: col.type,
+            ..._toCol(col),
             direction: col.direction,
         }));
     }

package/lib/stores/view/editor/DataCubeEditorSortsPanelState.js.map

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

package/lib/stores/{editor → view/editor}/DataCubeEditorState.d.ts

@@ -15,14 +15,14 @@
  */
 import type { DataCubeViewState } from '../DataCubeViewState.js';
 import { DataCubeEditorSortsPanelState } from './DataCubeEditorSortsPanelState.js';
-import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
-import { type DataCubeQuerySnapshot, type DataCubeQuerySnapshotColumn, type DataCubeQuerySnapshotExtendedColumn } from '../core/DataCubeQuerySnapshot.js';
+import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
+import { type DataCubeQuerySnapshot, type DataCubeQuerySnapshotColumn, type DataCubeQuerySnapshotExtendedColumn } from '../../core/DataCubeQuerySnapshot.js';
 import { ActionState } from '@finos/legend-shared';
 import { DataCubeEditorGeneralPropertiesPanelState } from './DataCubeEditorGeneralPropertiesPanelState.js';
 import { DataCubeEditorColumnPropertiesPanelState } from './DataCubeEditorColumnPropertiesPanelState.js';
 import { DataCubeEditorColumnsPanelState } from './DataCubeEditorColumnsPanelState.js';
 import { DataCubeEditorVerticalPivotsPanelState } from './DataCubeEditorVerticalPivotsPanelState.js';
-import type { DisplayState } from '../engine/DataCubeLayoutManagerState.js';
+import type { DisplayState } from '../../core/DataCubeLayoutManagerState.js';
 import { DataCubeEditorHorizontalPivotsPanelState } from './DataCubeEditorHorizontalPivotsPanelState.js';
 import { DataCubeEditorPivotLayoutPanelState } from './DataCubeEditorPivotLayoutPanelState.js';
 export declare enum DataCubeEditorTab {
@@ -59,6 +59,7 @@ export declare class DataCubeEditorState extends DataCubeQuerySnapshotController
     constructor(view: DataCubeViewState);
     setCurrentTab(val: DataCubeEditorTab): void;
     applySnapshot(snapshot: DataCubeQuerySnapshot, previousSnapshot: DataCubeQuerySnapshot | undefined): Promise<void>;
+    getSnapshotSubscriberName(): string;
     applyChanges(options?: {
         closeAfterApply?: boolean | undefined;
     }): Promise<void>;

package/lib/stores/view/editor/DataCubeEditorState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeEditorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/editor/DataCubeEditorState.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,KAAK,mCAAmC,EACzC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,WAAW,EAKZ,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,yCAAyC,EAAE,MAAM,gDAAgD,CAAC;AAC3G,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,OAAO,EAAE,sCAAsC,EAAE,MAAM,6CAA6C,CAAC;AACrG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAE7E,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AAI/F,oBAAY,iBAAiB;IAC3B,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,OAAO,YAAY;IACnB,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAED;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,+BAA+B;IACtE,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,cAAwB;IAElD,QAAQ,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;IACtE,QAAQ,CAAC,WAAW,EAAE,mCAAmC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;IAEpE,QAAQ,CAAC,OAAO,EAAE,+BAA+B,CAAC;IAClD,QAAQ,CAAC,gBAAgB,EAAE,wCAAwC,CAAC;IACpE,QAAQ,CAAC,cAAc,EAAE,sCAAsC,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,6BAA6B,CAAC;IAE9C,UAAU,oBAAwC;IAElD,aAAa,EAAE,2BAA2B,EAAE,CAAM;IAClD,iBAAiB,EAAE,mCAAmC,EAAE,CAAM;IAC9D,kBAAkB,EAAE,mCAAmC,EAAE,CAAM;gBAEnD,IAAI,EAAE,iBAAiB;IA6BnC,aAAa,CAAC,GAAG,EAAE,iBAAiB;IAIrB,aAAa,CAC1B,QAAQ,EAAE,qBAAqB,EAC/B,gBAAgB,EAAE,qBAAqB,GAAG,SAAS;IAmB5C,yBAAyB;IAI5B,YAAY,CAAC,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE;CAyFvE"}

package/lib/stores/{editor → view/editor}/DataCubeEditorState.js

@@ -16,19 +16,18 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 import { action, makeObservable, observable } from 'mobx';
 import { DataCubeEditorSortsPanelState } from './DataCubeEditorSortsPanelState.js';
-import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
-import { _toCol, } from '../core/DataCubeQuerySnapshot.js';
-import { ActionState, assertErrorThrown, guaranteeNonNullable, } from '@finos/legend-shared';
+import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
+import { _toCol, } from '../../core/DataCubeQuerySnapshot.js';
+import { ActionState, assertErrorThrown, guaranteeNonNullable, HttpStatus, NetworkClientError, } from '@finos/legend-shared';
 import { DataCubeEditorGeneralPropertiesPanelState } from './DataCubeEditorGeneralPropertiesPanelState.js';
 import { DataCubeEditorColumnPropertiesPanelState } from './DataCubeEditorColumnPropertiesPanelState.js';
 import { DataCubeEditorColumnsPanelState } from './DataCubeEditorColumnsPanelState.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { DataCubeEditorVerticalPivotsPanelState } from './DataCubeEditorVerticalPivotsPanelState.js';
-import { DataCubeEditor } from '../../components/editor/DataCubeEditor.js';
-import { buildExecutableQuery } from '../core/DataCubeQueryBuilder.js';
-import { _lambda } from '../core/DataCubeQueryBuilderUtils.js';
+import { DataCubeEditor } from '../../../components/view/editor/DataCubeEditor.js';
 import { DataCubeEditorHorizontalPivotsPanelState } from './DataCubeEditorHorizontalPivotsPanelState.js';
 import { DataCubeEditorPivotLayoutPanelState } from './DataCubeEditorPivotLayoutPanelState.js';
+import { V1_deserializeValueSpecification } from '@finos/legend-graph';
 export var DataCubeEditorTab;
 (function (DataCubeEditorTab) {
     DataCubeEditorTab["GENERAL_PROPERTIES"] = "General Properties";
@@ -97,8 +96,10 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
         this.verticalPivots.applySnaphot(snapshot, configuration);
         this.sorts.applySnaphot(snapshot, configuration);
     }
+    getSnapshotSubscriberName() {
+        return 'editor';
+    }
     async applyChanges(options) {
-        const task = this.view.newTask('Validate query');
         this.finalizationState.inProgress();
         const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
         const newSnapshot = baseSnapshot.clone();
@@ -116,34 +117,45 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
         // finalize
         newSnapshot.finalize();
         if (newSnapshot.hashCode !== baseSnapshot.hashCode) {
+            const task = this.view.newTask('Validate query');
             // NOTE: Compile the query to validate. This is a helpful check for a lot of different scenarios
             // where the consistency of the query might be thrown off by changes from various parts that the
             // editor does not have full control over (i.e. extended columns, pivot cast columns, etc.)
             // e.g. when a column that group-level extended columns' expressions depend on has been unselected.
+            const tempSnapshot = newSnapshot.clone();
+            // NOTE: in order to obtain the actual pivot result columns information, we need to execute
+            // the query which is expensive in certain cases, so here, we just compute the "optimistic" set
+            // of pivot result columns for casting to guarantee validation is not thronn off.
+            if (tempSnapshot.data.pivot) {
+                tempSnapshot.data.pivot.castColumns =
+                    this.sorts.selector.availableColumns
+                        .filter((col) => !tempSnapshot.data.groupExtendedColumns.find((column) => column.name === col.name))
+                        .map(_toCol);
+            }
+            const codePrefix = `->`;
+            const code = await this.view.engine.getPartialQueryCode(tempSnapshot, true);
             try {
-                const tempSnapshot = newSnapshot.clone();
-                // NOTE: in order to obtain the actual pivot result columns information, we need to execute
-                // the query which is expensive in certain cases, so here, we just compute the "optimistic" set
-                // of pivot result columns for casting to guarantee validation is not thronn off.
-                if (tempSnapshot.data.pivot) {
-                    tempSnapshot.data.pivot.castColumns =
-                        this.sorts.selector.availableColumns
-                            .filter((col) => !tempSnapshot.data.groupExtendedColumns.find((column) => column.name === col.name))
-                            .map(_toCol);
-                }
-                await this.view.engine.getQueryRelationType(_lambda([], [
-                    buildExecutableQuery(tempSnapshot, this.view.engine.filterOperations, this.view.engine.aggregateOperations),
-                ]));
+                await this.view.engine.getQueryCodeRelationReturnType(codePrefix + code, V1_deserializeValueSpecification(tempSnapshot.data.sourceQuery, []));
             }
             catch (error) {
                 assertErrorThrown(error);
-                this.view.application.alertError(error, {
-                    message: `Query Validation Failure: ${error.message}`,
-                });
-                this.view.endTask(task);
+                if (error instanceof NetworkClientError &&
+                    error.response.status === HttpStatus.BAD_REQUEST) {
+                    this.view.application.alertCodeCheckError(error.payload, code, codePrefix, {
+                        message: `Query Validation Failure: Can't safely apply changes. Check the query code below for more details.`,
+                        text: `Error: ${error.message}`,
+                    });
+                }
+                else {
+                    this.view.application.alertError(error, {
+                        message: `Query Validation Failure: Can't safely apply changes.`,
+                        text: `Error: ${error.message}`,
+                    });
+                }
                 return;
             }
             finally {
+                this.view.endTask(task);
                 this.finalizationState.complete();
             }
             this.publishSnapshot(newSnapshot);
@@ -154,7 +166,6 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
         if (options?.closeAfterApply) {
             this.display.close();
         }
-        this.view.endTask(task);
     }
 }
 //# sourceMappingURL=DataCubeEditorState.js.map

package/lib/stores/view/editor/DataCubeEditorState.js.map

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

package/lib/stores/{editor → view/editor}/DataCubeEditorVerticalPivotsPanelState.d.ts

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import type { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeEditorColumnsSelectorColumnState, DataCubeEditorColumnsSelectorState } from './DataCubeEditorColumnsSelectorState.js';
+import type { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeEditorColumnSelectorColumnState, DataCubeEditorColumnSelectorState } from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
-export declare class DataCubeEditorVerticalPivotColumnsSelectorState extends DataCubeEditorColumnsSelectorState<DataCubeEditorColumnsSelectorColumnState> {
-    cloneColumn(column: DataCubeEditorColumnsSelectorColumnState): DataCubeEditorColumnsSelectorColumnState;
-    get availableColumns(): DataCubeEditorColumnsSelectorColumnState[];
+export declare class DataCubeEditorVerticalPivotColumnSelectorState extends DataCubeEditorColumnSelectorState<DataCubeEditorColumnSelectorColumnState> {
+    cloneColumn(column: DataCubeEditorColumnSelectorColumnState): DataCubeEditorColumnSelectorColumnState;
+    get availableColumns(): DataCubeEditorColumnSelectorColumnState[];
 }
 export declare class DataCubeEditorVerticalPivotsPanelState implements DataCubeQueryEditorPanelState {
     readonly view: DataCubeViewState;
     readonly editor: DataCubeEditorState;
-    readonly selector: DataCubeEditorVerticalPivotColumnsSelectorState;
+    readonly selector: DataCubeEditorVerticalPivotColumnSelectorState;
     constructor(editor: DataCubeEditorState);
     adaptPropagatedChanges(): void;
     applySnaphot(snapshot: DataCubeQuerySnapshot, configuration: DataCubeConfiguration): void;

package/lib/stores/view/editor/DataCubeEditorVerticalPivotsPanelState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeEditorVerticalPivotsPanelState.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/editor/DataCubeEditorVerticalPivotsPanelState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,uCAAuC,EACvC,iCAAiC,EAClC,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,qBAAa,8CAA+C,SAAQ,iCAAiC,CAAC,uCAAuC,CAAC;IACnI,WAAW,CAClB,MAAM,EAAE,uCAAuC,GAC9C,uCAAuC;IAO1C,IAAa,gBAAgB,8CAkB5B;CACF;AAED,qBAAa,sCACX,YAAW,6BAA6B;IAExC,QAAQ,CAAC,IAAI,EAAG,iBAAiB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAG,mBAAmB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAG,8CAA8C,CAAC;gBAEvD,MAAM,EAAE,mBAAmB;IAMvC,sBAAsB,IAAI,IAAI;IAQ9B,YAAY,CACV,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB;IAUtC,aAAa,CACX,WAAW,EAAE,qBAAqB,EAClC,YAAY,EAAE,qBAAqB;CAYtC"}

package/lib/stores/{editor → view/editor}/DataCubeEditorVerticalPivotsPanelState.js

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 import { uniqBy } from '@finos/legend-shared';
-import { DataCubeColumnKind } from '../core/DataCubeQueryEngine.js';
-import { _toCol, } from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeEditorColumnsSelectorColumnState, DataCubeEditorColumnsSelectorState, } from './DataCubeEditorColumnsSelectorState.js';
-export class DataCubeEditorVerticalPivotColumnsSelectorState extends DataCubeEditorColumnsSelectorState {
+import { DataCubeColumnKind } from '../../core/DataCubeQueryEngine.js';
+import { _toCol, } from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeEditorColumnSelectorColumnState, DataCubeEditorColumnSelectorState, } from './DataCubeEditorColumnSelectorState.js';
+export class DataCubeEditorVerticalPivotColumnSelectorState extends DataCubeEditorColumnSelectorState {
     cloneColumn(column) {
-        return new DataCubeEditorColumnsSelectorColumnState(column.name, column.type);
+        return new DataCubeEditorColumnSelectorColumnState(column.name, column.type);
     }
     get availableColumns() {
         return this.editor.columnProperties.columns
@@ -28,7 +28,7 @@ export class DataCubeEditorVerticalPivotColumnsSelectorState extends DataCubeEdi
             !this.editor.groupExtendColumns.find((col) => col.name === column.name) &&
             // exclude pivot columns
             !this.editor.horizontalPivots.selector.selectedColumns.find((col) => col.name === column.name))
-            .map((col) => new DataCubeEditorColumnsSelectorColumnState(col.name, col.type));
+            .map((col) => new DataCubeEditorColumnSelectorColumnState(col.name, col.type));
     }
 }
 export class DataCubeEditorVerticalPivotsPanelState {
@@ -38,13 +38,13 @@ export class DataCubeEditorVerticalPivotsPanelState {
     constructor(editor) {
         this.editor = editor;
         this.view = editor.view;
-        this.selector = new DataCubeEditorVerticalPivotColumnsSelectorState(editor);
+        this.selector = new DataCubeEditorVerticalPivotColumnSelectorState(editor);
     }
     adaptPropagatedChanges() {
         this.selector.setSelectedColumns(this.selector.selectedColumns.filter((column) => this.selector.availableColumns.find((col) => col.name === column.name)));
     }
     applySnaphot(snapshot, configuration) {
-        this.selector.setSelectedColumns((snapshot.data.groupBy?.columns ?? []).map((col) => new DataCubeEditorColumnsSelectorColumnState(col.name, col.type)));
+        this.selector.setSelectedColumns((snapshot.data.groupBy?.columns ?? []).map((col) => new DataCubeEditorColumnSelectorColumnState(col.name, col.type)));
     }
     buildSnapshot(newSnapshot, baseSnapshot) {
         newSnapshot.data.groupBy = this.selector.selectedColumns.length

package/lib/stores/view/editor/DataCubeEditorVerticalPivotsPanelState.js.map

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

package/lib/stores/{extend → view/extend}/DataCubeColumnEditorState.d.ts

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 import type { DataCubeViewState } from '../DataCubeViewState.js';
-import type { DisplayState } from '../engine/DataCubeLayoutManagerState.js';
+import type { DisplayState } from '../../core/DataCubeLayoutManagerState.js';
 import { editor as monacoEditorAPI, Uri } from 'monaco-editor';
-import { ActionState } from '@finos/legend-shared';
-import { DataCubeColumnKind } from '../core/DataCubeQueryEngine.js';
-import type { DataCubeQueryBuilderError } from '../engine/DataCubeEngine.js';
+import { ActionState, type PlainObject } from '@finos/legend-shared';
+import { DataCubeColumnKind } from '../../core/DataCubeQueryEngine.js';
+import type { DataCubeQueryBuilderError } from '../../core/DataCubeEngine.js';
 import type { DataCubeExtendManagerState } from './DataCubeExtendManagerState.js';
-import { type V1_ValueSpecification } from '@finos/legend-graph';
-import type { DataCubeColumnConfiguration } from '../core/DataCubeConfiguration.js';
-export declare class DataCubeNewColumnState {
+import { V1_Lambda, type V1_ValueSpecification } from '@finos/legend-graph';
+import type { DataCubeColumnConfiguration } from '../../core/DataCubeConfiguration.js';
+import type { DataCubeQuerySnapshotExtendedColumn } from '../../core/DataCubeQuerySnapshot.js';
+export declare abstract class DataCubeColumnBaseEditorState {
     readonly uuid: string;
     readonly view: DataCubeViewState;
     readonly manager: DataCubeExtendManagerState;
@@ -42,20 +43,44 @@ export declare class DataCubeNewColumnState {
     readonly editorModelUri: Uri;
     codeError?: DataCubeQueryBuilderError | undefined;
     returnType?: string | undefined;
-    constructor(manager: DataCubeExtendManagerState, referenceColumn?: DataCubeColumnConfiguration | undefined);
+    constructor(manager: DataCubeExtendManagerState, name: string, expectedType: string, isGroupLevel: boolean, columnKind: DataCubeColumnKind | undefined);
+    abstract getInitialCode(): Promise<string>;
+    initialize(): Promise<void>;
+    protected abstract newDisplay(state: DataCubeColumnBaseEditorState): DisplayState;
     setName(value: string): void;
     get isNameValid(): boolean;
     setExpectedType(value: string): void;
     get isTypeValid(): boolean;
     setColumnKind(isGroupLevel: boolean, columnKind: DataCubeColumnKind | undefined): void;
-    setCode(value: string): void;
     setEditor(editor: monacoEditorAPI.IStandaloneCodeEditor): void;
     setReturnType(value: string | undefined): void;
     showError(error: DataCubeQueryBuilderError): void;
     clearError(): void;
     buildExtendBaseQuery(): V1_ValueSpecification;
     getReturnType(): Promise<string | undefined>;
-    applyChanges(): Promise<void>;
+    abstract applyChanges(): Promise<void>;
     close(): void;
 }
+export declare class DataCubeNewColumnState extends DataCubeColumnBaseEditorState {
+    private initialCode;
+    constructor(manager: DataCubeExtendManagerState, referenceColumn?: DataCubeColumnConfiguration | undefined);
+    getInitialCode(): Promise<string>;
+    newDisplay(state: DataCubeColumnBaseEditorState): DisplayState;
+    applyChanges(): Promise<void>;
+}
+export declare class DataCubeExistingColumnEditorState extends DataCubeColumnBaseEditorState {
+    readonly initialData: {
+        name: string;
+        type: string;
+        kind: DataCubeColumnKind;
+        isGroupLevel: boolean;
+        mapFn: PlainObject<V1_Lambda>;
+    };
+    constructor(manager: DataCubeExtendManagerState, column: DataCubeQuerySnapshotExtendedColumn, kind: DataCubeColumnKind, isGroupLevel: boolean);
+    get isNameValid(): boolean;
+    getInitialCode(): Promise<string>;
+    newDisplay(state: DataCubeColumnBaseEditorState): DisplayState;
+    reset(): Promise<void>;
+    applyChanges(): Promise<void>;
+}
 //# sourceMappingURL=DataCubeColumnEditorState.d.ts.map

package/lib/stores/view/extend/DataCubeColumnEditorState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeColumnEditorState.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/extend/DataCubeColumnEditorState.tsx"],"names":[],"mappings":"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"}

package/lib/stores/{extend → view/extend}/DataCubeColumnEditorState.js

@@ -14,15 +14,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { action, computed, makeObservable, observable } from 'mobx';
-import { DataCubeColumnCreator } from '../../components/extend/DataCubeColumnEditor.js';
+import { action, computed, makeObservable, observable, override } from 'mobx';
+import { DataCubeColumnCreator } from '../../../components/view/extend/DataCubeColumnEditor.js';
 import { editor as monacoEditorAPI, Uri } from 'monaco-editor';
 import { ActionState, assertErrorThrown, guaranteeNonNullable, HttpStatus, NetworkClientError, uuid, } from '@finos/legend-shared';
-import { buildExecutableQuery } from '../core/DataCubeQueryBuilder.js';
-import { DataCubeColumnDataType, DataCubeColumnKind, DataCubeExtendedColumnType, DEFAULT_LAMBDA_VARIABLE_NAME, getDataType, } from '../core/DataCubeQueryEngine.js';
+import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
+import { DataCubeColumnDataType, DataCubeColumnKind, DEFAULT_LAMBDA_VARIABLE_NAME, getDataType, } from '../../core/DataCubeQueryEngine.js';
 import { clearMarkers, CODE_EDITOR_LANGUAGE, setErrorMarkers, } from '@finos/legend-code-editor';
-import { PRIMITIVE_TYPE, V1_Lambda, V1_serializeValueSpecification, } from '@finos/legend-graph';
-export class DataCubeNewColumnState {
+import { PRIMITIVE_TYPE, V1_deserializeValueSpecification, V1_Lambda, V1_serializeValueSpecification, } from '@finos/legend-graph';
+export class DataCubeColumnBaseEditorState {
     uuid = uuid();
     view;
     manager;
@@ -36,7 +36,7 @@ export class DataCubeNewColumnState {
     expectedType;
     isGroupLevel;
     columnKind;
-    code;
+    code = '';
     codePrefix;
     codeSuffix;
     editor;
@@ -44,7 +44,7 @@ export class DataCubeNewColumnState {
     editorModelUri;
     codeError;
     returnType;
-    constructor(manager, referenceColumn) {
+    constructor(manager, name, expectedType, isGroupLevel, columnKind) {
         makeObservable(this, {
             name: observable,
             setName: action,
@@ -65,29 +65,19 @@ export class DataCubeNewColumnState {
         });
         this.manager = manager;
         this.view = manager.view;
-        this.display = this.view.application.layout.newDisplay('Add New Column', () => _jsx(DataCubeColumnCreator, { state: this }), {
-            x: 50,
-            y: 50,
-            width: 500,
-            height: 300,
-            minWidth: 300,
-            minHeight: 200,
-            center: false,
-        });
-        this.name = `col_${manager.allColumnNames.length + 1}`;
-        this.expectedType = DataCubeColumnDataType.NUMBER;
-        this.isGroupLevel = false;
-        this.columnKind = DataCubeColumnKind.MEASURE;
-        this.code = `${DEFAULT_LAMBDA_VARIABLE_NAME}|`;
+        this.display = this.newDisplay(this);
+        this.name = name;
+        this.expectedType = expectedType;
+        this.isGroupLevel = isGroupLevel;
+        this.columnKind = columnKind;
         this.codePrefix = `->extend(~${this._name}:`;
         this.codeSuffix = `)`;
-        if (referenceColumn) {
-            this.expectedType = getDataType(referenceColumn.type);
-            this.columnKind = referenceColumn.kind;
-            this.code = `${DEFAULT_LAMBDA_VARIABLE_NAME}|$${DEFAULT_LAMBDA_VARIABLE_NAME}.${referenceColumn.name}`;
-        }
         this.editorModelUri = Uri.file(`/${this.uuid}.pure`);
-        this.editorModel = monacoEditorAPI.createModel(this.code, CODE_EDITOR_LANGUAGE.PURE, this.editorModelUri);
+        this.editorModel = monacoEditorAPI.createModel('', CODE_EDITOR_LANGUAGE.PURE, this.editorModelUri);
+    }
+    async initialize() {
+        this.code = await this.getInitialCode();
+        this.editorModel.setValue(this.code);
     }
     setName(value) {
         this.name = value;
@@ -106,9 +96,6 @@ export class DataCubeNewColumnState {
         this.isGroupLevel = isGroupLevel;
         this.columnKind = columnKind;
     }
-    setCode(value) {
-        this.code = value;
-    }
     setEditor(editor) {
         this.editor = editor;
     }
@@ -205,6 +192,37 @@ export class DataCubeNewColumnState {
         }
         return undefined;
     }
+    close() {
+        // dispose the editor and its model to avoid memory leak
+        this.editorModel.dispose();
+        this.editor?.dispose();
+        this.display.close();
+    }
+}
+export class DataCubeNewColumnState extends DataCubeColumnBaseEditorState {
+    initialCode;
+    constructor(manager, referenceColumn) {
+        super(manager, `col_${manager.allColumnNames.length + 1}`, referenceColumn
+            ? getDataType(referenceColumn.type)
+            : DataCubeColumnDataType.NUMBER, false, referenceColumn ? referenceColumn.kind : DataCubeColumnKind.MEASURE);
+        this.initialCode = referenceColumn
+            ? `${DEFAULT_LAMBDA_VARIABLE_NAME}|$${DEFAULT_LAMBDA_VARIABLE_NAME}.${referenceColumn.name}`
+            : `${DEFAULT_LAMBDA_VARIABLE_NAME}|`;
+    }
+    async getInitialCode() {
+        return this.initialCode;
+    }
+    newDisplay(state) {
+        return this.view.application.layout.newDisplay('Add New Column', () => _jsx(DataCubeColumnCreator, { state: this }), {
+            x: 50,
+            y: 50,
+            width: 500,
+            height: 300,
+            minWidth: 300,
+            minHeight: 200,
+            center: false,
+        });
+    }
     async applyChanges() {
         if (!this.validationState.hasCompleted ||
             !this.isNameValid ||
@@ -243,18 +261,97 @@ export class DataCubeNewColumnState {
             return;
         }
         this.manager.addNewColumn({
-            _type: DataCubeExtendedColumnType.SIMPLE,
             name: this.name,
             type: returnType,
-            lambda: V1_serializeValueSpecification(query, []),
+            mapFn: V1_serializeValueSpecification(query, []),
         }, this.isGroupLevel, this.columnKind, this);
         this.close();
     }
-    close() {
-        // dispose the editor and its model to avoid memory leak
-        this.editorModel.dispose();
-        this.editor?.dispose();
-        this.display.close();
+}
+export class DataCubeExistingColumnEditorState extends DataCubeColumnBaseEditorState {
+    initialData;
+    constructor(manager, column, kind, isGroupLevel) {
+        super(manager, column.name, getDataType(column.type), isGroupLevel, kind);
+        makeObservable(this, {
+            initialData: observable.ref,
+            isNameValid: override,
+        });
+        this.initialData = {
+            name: column.name,
+            type: column.type,
+            kind,
+            isGroupLevel: isGroupLevel,
+            mapFn: column.mapFn,
+        };
+    }
+    get isNameValid() {
+        return !this.manager.allColumnNames
+            .filter((colName) => colName !== this.initialData.name)
+            .includes(this.name);
+    }
+    async getInitialCode() {
+        return this.view.engine.getQueryCode(V1_deserializeValueSpecification(this.initialData.mapFn, []), true);
+    }
+    newDisplay(state) {
+        return this.view.application.layout.newDisplay('Edit Column', () => _jsx(DataCubeColumnCreator, { state: this }), {
+            x: 50,
+            y: 50,
+            width: 500,
+            height: 300,
+            minWidth: 300,
+            minHeight: 200,
+            center: false,
+        });
+    }
+    async reset() {
+        this.setName(this.initialData.name);
+        this.setExpectedType(getDataType(this.initialData.type));
+        this.setColumnKind(this.initialData.isGroupLevel, this.initialData.kind);
+        await this.initialize();
+        await this.getReturnType();
+    }
+    async applyChanges() {
+        if (!this.validationState.hasCompleted ||
+            !this.isNameValid ||
+            !this.isTypeValid) {
+            return;
+        }
+        this.finalizationState.inProgress();
+        let query;
+        let returnType;
+        try {
+            [query, returnType] = await Promise.all([
+                this.view.engine.parseQuery(this.code, false),
+                this.getReturnType(), // recompile to get the return type
+            ]);
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.view.application.alertError(error, {
+                message: `Expression Validation Failure: ${error.message}`,
+            });
+            return;
+        }
+        finally {
+            this.finalizationState.complete();
+        }
+        if (!(query instanceof V1_Lambda)) {
+            this.view.application.alertError(new Error(), {
+                message: `Expression Validation Failure: Expression must be a lambda.`,
+            });
+            return;
+        }
+        if (!returnType) {
+            this.view.application.alertError(new Error(), {
+                message: `Expression Validation Failure: Can't compute expression return type.`,
+            });
+            return;
+        }
+        await this.manager.updateColumn(this.initialData.name, {
+            name: this.name,
+            type: returnType,
+            mapFn: V1_serializeValueSpecification(query, []),
+        }, this.isGroupLevel, this.columnKind);
     }
 }
 //# sourceMappingURL=DataCubeColumnEditorState.js.map

package/lib/stores/view/extend/DataCubeColumnEditorState.js.map

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