@finos/legend-data-cube 0.0.7 → 0.0.8

package/lib/stores/{grid → view/grid}/DataCubeGridQueryBuilder.js

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { PRIMITIVE_TYPE } from '@finos/legend-graph';
-import {} from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeQueryFilterGroupOperator, DataCubeQueryFilterOperator, DataCubeFunction, } from '../core/DataCubeQueryEngine.js';
-import { guaranteeNonNullable, isNullable } from '@finos/legend-shared';
-import { _groupByAggCols, _colSpec, _cols, _filter, _function, _lambda, _var, _functionCompositionUnProcessor, } from '../core/DataCubeQueryBuilderUtils.js';
+import { PRIMITIVE_TYPE, V1_ClassInstance, V1_ColSpecArray, V1_GenericTypeInstance, } from '@finos/legend-graph';
+import {} from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeQueryFilterGroupOperator, DataCubeQueryFilterOperator, DataCubeFunction, isPivotResultColumnName, PIVOT_COLUMN_NAME_VALUE_SEPARATOR, } from '../../core/DataCubeQueryEngine.js';
+import { guaranteeNonNullable, guaranteeType, isNullable, uniq, } from '@finos/legend-shared';
+import { _groupByAggCols, _colSpec, _cols, _filter, _function, _lambda, _var, _functionCompositionUnProcessor, _property, } from '../../core/DataCubeQueryBuilderUtils.js';
 import { INTERNAL__GRID_CLIENT_MISSING_VALUE, INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID, } from './DataCubeGridClientEngine.js';
+import { _colSpecArrayParam } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 /*****************************************************************************
  * [GRID]
  *
@@ -28,10 +29,34 @@ import { INTERNAL__GRID_CLIENT_MISSING_VALUE, INTERNAL__GRID_CLIENT_ROW_GROUPING
  * the snapshot, such as in the case of pagination, drilldown (group by).
  *****************************************************************************/
 // --------------------------------- BUILDING BLOCKS ---------------------------------
-function _rowGroupingCountCol() {
+function _aggCountCol() {
     const variable = _var();
     return _colSpec(INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID, _lambda([variable], [variable]), _lambda([variable], [_function(DataCubeFunction.COUNT, [variable])]));
 }
+function _aggCountCastCol(colName) {
+    const variable = _var();
+    return _colSpec(colName, _lambda([variable], [_property(colName, variable)]), _lambda([variable], [_function(DataCubeFunction.SUM, [variable])]));
+}
+// if pivot is present, modify pivot and pivot cast expressions to include
+// count aggregation columns.
+function _addCountAggColumnToPivot(funcMap, countAggColumns) {
+    if (funcMap.pivot && funcMap.pivotCast) {
+        _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
+        const castColumns = guaranteeType(guaranteeType(guaranteeType(funcMap.pivotCast.parameters[0], V1_GenericTypeInstance)
+            .typeArguments[0], V1_ClassInstance).value, V1_ColSpecArray).colSpecs;
+        uniq(castColumns
+            .filter((col) => isPivotResultColumnName(col.name))
+            .map((col) => col.name.substring(0, col.name.lastIndexOf(PIVOT_COLUMN_NAME_VALUE_SEPARATOR))))
+            .map((col) => col +
+            PIVOT_COLUMN_NAME_VALUE_SEPARATOR +
+            INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID)
+            .map((col) => _colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER))
+            .forEach((col) => {
+            castColumns.push(col);
+            countAggColumns.push(col);
+        });
+    }
+}
 // --------------------------------- MAIN ---------------------------------
 export function generateRowGroupingDrilldownExecutableQueryPostProcessor(drilldownValues) {
     return (snapshot, sequence, funcMap, configuration, filterOperations, aggregateOperations) => {
@@ -52,13 +77,13 @@ export function generateRowGroupingDrilldownExecutableQueryPostProcessor(drilldo
                                     value === INTERNAL__GRID_CLIENT_MISSING_VALUE) {
                                     return {
                                         ...groupByColumn,
-                                        operation: DataCubeQueryFilterOperator.IS_NULL,
+                                        operator: DataCubeQueryFilterOperator.IS_NULL,
                                         value: undefined,
                                     };
                                 }
                                 const condition = {
                                     ...groupByColumn,
-                                    operation: DataCubeQueryFilterOperator.EQUAL,
+                                    operator: DataCubeQueryFilterOperator.EQUAL,
                                     value: undefined,
                                 };
                                 switch (groupByColumn.type) {
@@ -107,13 +132,20 @@ export function generateRowGroupingDrilldownExecutableQueryPostProcessor(drilldo
             }
             // modify groupBy() based off the current drilldown level
             if (drilldownValues.length < groupBy.columns.length) {
+                const countAggColumns = [];
+                _addCountAggColumnToPivot(funcMap, countAggColumns);
                 const groupByIdx = sequence.indexOf(funcMap.groupBy);
                 const groupByColumns = groupBy.columns.slice(0, drilldownValues.length + 1);
                 const groupByFunc = _function(DataCubeFunction.GROUP_BY, [
                     _cols(groupByColumns.map((col) => _colSpec(col.name))),
                     _cols([
                         ..._groupByAggCols(groupByColumns, snapshot, configuration, aggregateOperations),
-                        _rowGroupingCountCol(), // get the count for each group
+                        // if pivot is present, add sum aggregation columns for each
+                        // count aggregation column from pivot aggregation
+                        // else, simply add a count aggregation column
+                        ...(countAggColumns.length
+                            ? countAggColumns.map((col) => _aggCountCastCol(col.name))
+                            : [_aggCountCol()]),
                     ]),
                 ]);
                 sequence[groupByIdx] = groupByFunc;

package/lib/stores/view/grid/DataCubeGridQueryBuilder.js.map

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

package/lib/stores/{grid → view/grid}/DataCubeGridQuerySnapshotBuilder.d.ts

@@ -20,8 +20,8 @@
  * of the grid client, AG Grid.
  ***************************************************************************************/
 import type { IServerSideGetRowsRequest } from '@ag-grid-community/core';
-import { type DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
-export declare function getColumnConfiguration(colName: string, configuration: DataCubeConfiguration): import("../core/DataCubeConfiguration.js").DataCubeColumnConfiguration;
+import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
+export declare function getColumnConfiguration(colName: string, configuration: DataCubeConfiguration): import("../../core/DataCubeConfiguration.js").DataCubeColumnConfiguration;
 export declare function buildQuerySnapshot(request: IServerSideGetRowsRequest, baseSnapshot: DataCubeQuerySnapshot): DataCubeQuerySnapshot;
 //# sourceMappingURL=DataCubeGridQuerySnapshotBuilder.d.ts.map

package/lib/stores/view/grid/DataCubeGridQuerySnapshotBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeGridQuerySnapshotBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;yFAKyF;AAEzF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,qCAAqC,CAAC;AAU7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAI5E,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,qBAAqB,6EAMrC;AAID,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,yBAAyB,EAClC,YAAY,EAAE,qBAAqB,yBAgFpC"}

package/lib/stores/{grid → view/grid}/DataCubeGridQuerySnapshotBuilder.js

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { _toCol, } from '../core/DataCubeQuerySnapshot.js';
+import { _toCol, } from '../../core/DataCubeQuerySnapshot.js';
 import { GridClientSortDirection, INTERNAL__GRID_CLIENT_TREE_COLUMN_ID, } from './DataCubeGridClientEngine.js';
-import { DataCubeQuerySortDirection, getPivotResultColumnBaseColumnName, isPivotResultColumnName, } from '../core/DataCubeQueryEngine.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { DataCubeQuerySortDirection, getPivotResultColumnBaseColumnName, isPivotResultColumnName, } from '../../core/DataCubeQueryEngine.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { guaranteeNonNullable, uniqBy } from '@finos/legend-shared';
-import { _pruneExpandedPaths } from '../core/DataCubeQuerySnapshotBuilderUtils.js';
+import { _pruneExpandedPaths } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
 export function getColumnConfiguration(colName, configuration) {
     return guaranteeNonNullable(configuration.columns.find((col) => col.name === colName), `Can't find configuration for column '${colName}'`);
 }
@@ -28,7 +28,7 @@ export function buildQuerySnapshot(request, baseSnapshot) {
     const configuration = DataCubeConfiguration.serialization.fromJson(snapshot.data.configuration);
     // --------------------------------- SELECT ---------------------------------
     snapshot.data.selectColumns = uniqBy([
-        ...configuration.columns.filter((col) => col.isSelected),
+        ...snapshot.data.selectColumns,
         ...request.pivotCols.map((col) => getColumnConfiguration(col.id, configuration)),
         ...request.rowGroupCols.map((col) => getColumnConfiguration(col.id, configuration)),
     ], (col) => col.name).map(_toCol);
@@ -56,17 +56,17 @@ export function buildQuerySnapshot(request, baseSnapshot) {
         // the tree column, all groupBy columns will be sorted in that direction
         .filter((item) => item.colId !== INTERNAL__GRID_CLIENT_TREE_COLUMN_ID)
         .map((item) => ({
-        ..._toCol(getColumnConfiguration(isPivotResultColumnName(item.colId)
+        name: item.colId,
+        type: getColumnConfiguration(isPivotResultColumnName(item.colId)
             ? getPivotResultColumnBaseColumnName(item.colId)
-            : item.colId, configuration)),
+            : item.colId, configuration).type,
         direction: item.sort === GridClientSortDirection.ASCENDING
             ? DataCubeQuerySortDirection.ASCENDING
             : DataCubeQuerySortDirection.DESCENDING,
     }));
     // --------------------------------- CONFIGURATION ---------------------------------
     configuration.pivotLayout.expandedPaths = _pruneExpandedPaths(baseSnapshot.data.groupBy?.columns ?? [], snapshot.data.groupBy?.columns ?? [], configuration.pivotLayout.expandedPaths);
-    snapshot.data.configuration =
-        DataCubeConfiguration.serialization.toJson(configuration);
+    snapshot.data.configuration = configuration.serialize();
     // --------------------------------- FINALIZE ---------------------------------
     return snapshot;
 }

package/lib/stores/view/grid/DataCubeGridQuerySnapshotBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeGridQuerySnapshotBuilder.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EACL,MAAM,GAEP,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,uBAAuB,EACvB,oCAAoC,GACrC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,0BAA0B,EAC1B,kCAAkC,EAClC,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAEtF,MAAM,UAAU,sBAAsB,CACpC,OAAe,EACf,aAAoC;IAEpC,OAAO,oBAAoB,CACzB,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,EACzD,wCAAwC,OAAO,GAAG,CACnD,CAAC;AACJ,CAAC;AAED,2EAA2E;AAE3E,MAAM,UAAU,kBAAkB,CAChC,OAAkC,EAClC,YAAmC;IAEnC,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;IACtC,MAAM,aAAa,GAAG,qBAAqB,CAAC,aAAa,CAAC,QAAQ,CAChE,QAAQ,CAAC,IAAI,CAAC,aAAa,CAC5B,CAAC;IAEF,6EAA6E;IAE7E,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAG,MAAM,CAClC;QACE,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa;QAC9B,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAC/B,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAC9C;QACD,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAC9C;KACF,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAClB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEd,4EAA4E;IAE5E,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM;QAC5C,CAAC,CAAC;YACE,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACrC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CACtD;YACD,wEAAwE;YACxE,iCAAiC;YACjC,WAAW,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,IAAI,EAAE;SACxD;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,+EAA+E;IAE/E,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM;QACjD,CAAC,CAAC;YACE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACxC,MAAM,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CACtD;SACF;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,2EAA2E;IAE3E,QAAQ,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS;QAC3C,8EAA8E;QAC9E,uEAAuE;QACvE,gFAAgF;QAChF,2EAA2E;QAC3E,wEAAwE;SACvE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,oCAAoC,CAAC;SACrE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,KAAK;QAChB,IAAI,EAAE,sBAAsB,CAC1B,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,KAAK,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,KAAK,EACd,aAAa,CACd,CAAC,IAAI;QACN,SAAS,EACP,IAAI,CAAC,IAAI,KAAK,uBAAuB,CAAC,SAAS;YAC7C,CAAC,CAAC,0BAA0B,CAAC,SAAS;YACtC,CAAC,CAAC,0BAA0B,CAAC,UAAU;KAC5C,CAAC,CAAC,CAAC;IAEN,oFAAoF;IAEpF,aAAa,CAAC,WAAW,CAAC,aAAa,GAAG,mBAAmB,CAC3D,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,EACxC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,EACpC,aAAa,CAAC,WAAW,CAAC,aAAa,CACxC,CAAC;IACF,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;IAExD,+EAA+E;IAE/E,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/lib/stores/{grid → view/grid}/DataCubeGridState.d.ts

@@ -16,9 +16,9 @@
 import type { GridApi } from '@ag-grid-community/core';
 import type { DataCubeViewState } from '../DataCubeViewState.js';
 import { DataCubeGridClientServerSideDataSource } from './DataCubeGridClientEngine.js';
-import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
-import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
+import type { DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { DataCubeGridControllerState } from './DataCubeGridControllerState.js';
 import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine.js';
 /**
@@ -50,6 +50,7 @@ export declare class DataCubeGridState extends DataCubeQuerySnapshotController {
     setScrollHintText(val: string | undefined): void;
     get client(): GridApi<any>;
     configureClient(val: GridApi | undefined): void;
+    getSnapshotSubscriberName(): string;
     applySnapshot(snapshot: DataCubeQuerySnapshot, previousSnapshot: DataCubeQuerySnapshot | undefined): Promise<void>;
 }
 //# sourceMappingURL=DataCubeGridState.d.ts.map

package/lib/stores/view/grid/DataCubeGridState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataCubeGridState.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sCAAsC,EAMvC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;;;;;;;;;;;;GAcG;AACH,qBAAa,iBAAkB,SAAQ,+BAA+B;IACpE,QAAQ,CAAC,UAAU,EAAG,2BAA2B,CAAC;IAClD,QAAQ,CAAC,YAAY,EAAG,8BAA8B,CAAC;IACvD,OAAO,CAAC,OAAO,CAAC,CAAsB;IAEtC,gBAAgB,EAAE,sCAAsC,CAAC;IAEzD,kBAAkB,EAAE,qBAAqB,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,mBAAmB,UAAmD;IACtE,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;gBAExB,IAAI,EAAE,iBAAiB;IAyBnC,oBAAoB,CAAC,GAAG,EAAE,OAAO;IAiBjC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAIzC,IAAI,MAAM,iBAET;IAED,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;IAI/B,yBAAyB;IAInB,aAAa,CAC1B,QAAQ,EAAE,qBAAqB,EAC/B,gBAAgB,EAAE,qBAAqB,GAAG,SAAS;CA2CtD"}

package/lib/stores/{grid → view/grid}/DataCubeGridState.js

@@ -16,9 +16,9 @@
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { action, makeObservable, observable } from 'mobx';
 import { DataCubeGridClientServerSideDataSource, INTERNAL__GRID_CLIENT_DEFAULT_CACHE_BLOCK_SIZE, INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID, INTERNAL__GRID_CLIENT_MAX_CACHE_BLOCK_SIZE, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_PAGINATION, computeHashCodeForDataFetchManualTrigger, } from './DataCubeGridClientEngine.js';
-import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
+import { DataCubeQuerySnapshotController } from '../DataCubeQuerySnapshotManager.js';
 import { generateGridOptionsFromSnapshot } from './DataCubeGridConfigurationBuilder.js';
-import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { DataCubeConfiguration } from '../../core/DataCubeConfiguration.js';
 import { DataCubeGridControllerState } from './DataCubeGridControllerState.js';
 import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine.js';
 /**
@@ -86,13 +86,19 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
     configureClient(val) {
         this._client = val;
     }
+    getSnapshotSubscriberName() {
+        return 'grid';
+    }
     async applySnapshot(snapshot, previousSnapshot) {
         const configuration = DataCubeConfiguration.serialization.fromJson(snapshot.data.configuration);
         this.queryConfiguration = configuration;
         this.rowLimit = snapshot.data.limit;
         const gridOptions = generateGridOptionsFromSnapshot(snapshot, configuration, this.view);
         if (this.view.engine.enableDebugMode) {
-            this.view.application.debugProcess(`New Grid Options`, gridOptions);
+            this.view.application.debugProcess(`New Grid Options`, [
+                'Grid Options',
+                gridOptions,
+            ]);
         }
         this.client.updateGridOptions({
             ...gridOptions,

package/lib/stores/view/grid/DataCubeGridState.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-data-cube",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Legend Data Cube",
   "keywords": [
     "legend",
@@ -56,7 +56,7 @@
     "@ag-grid-enterprise/row-grouping": "32.2.2",
     "@ag-grid-enterprise/server-side-row-model": "32.2.2",
     "@ag-grid-enterprise/side-bar": "32.2.2",
-    "@finos/legend-art": "7.1.61",
+    "@finos/legend-art": "7.1.62",
     "@finos/legend-code-editor": "2.0.3",
     "@finos/legend-graph": "31.10.37",
     "@finos/legend-shared": "10.0.57",
@@ -70,7 +70,7 @@
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.1.24",
+    "@finos/legend-dev-utils": "2.1.25",
     "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
     "eslint": "9.12.0",

package/src/components/DataCube.tsx

@@ -16,7 +16,7 @@
 
 import { observer } from 'mobx-react-lite';
 import { useEffect } from 'react';
-import { DataCubeGrid } from './grid/DataCubeGrid.js';
+import { DataCubeGrid } from './view/grid/DataCubeGrid.js';
 import {
   DataCubeIcon,
   DropdownMenu,
@@ -24,11 +24,11 @@ import {
   ProgressBar,
   useDropdownMenu,
 } from '@finos/legend-art';
-import { DataCubeLayoutManager } from './application/DataCubeLayoutManager.js';
-import type { DataCubeViewState } from '../stores/DataCubeViewState.js';
-import { INTERNAL__MonacoEditorWidgetsRoot } from './shared/DataCubePureCodeEditorUtils.js';
+import { DataCubeLayoutManager } from './core/DataCubeLayoutManager.js';
+import type { DataCubeViewState } from '../stores/view/DataCubeViewState.js';
+import { INTERNAL__MonacoEditorWidgetsRoot } from './core/DataCubePureCodeEditorUtils.js';
 import { useDataCube } from './DataCubeProvider.js';
-import { DataCubeBlockingActionAlert } from './application/DataCubeAlert.js';
+import { DataCubeBlockingActionAlert } from './core/DataCubeAlert.js';
 
 const DataCubeStatusBar = observer((props: { view: DataCubeViewState }) => {
   const { view } = props;
@@ -149,6 +149,7 @@ export const DataCube = observer(() => {
       <DataCubeGrid view={view} />
       <DataCubeStatusBar view={view} />
 
+      {/* TODO: move this to upper layer component when we have multi-view support */}
       <DataCubeLayoutManager layout={application.layout} />
       <DataCubeBlockingActionAlert />
       <INTERNAL__MonacoEditorWidgetsRoot />

package/src/components/DataCubeProvider.tsx

@@ -18,8 +18,8 @@ import { createContext, useContext, useEffect } from 'react';
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { DataCubeState } from '../stores/DataCubeState.js';
-import type { DataCubeApplicationEngine } from '../stores/engine/DataCubeApplicationEngine.js';
-import type { DataCubeEngine } from '../stores/engine/DataCubeEngine.js';
+import type { DataCubeApplicationEngine } from '../stores/core/DataCubeApplicationEngine.js';
+import type { DataCubeEngine } from '../stores/core/DataCubeEngine.js';
 
 const DataCubeStateContext = createContext<DataCubeState | undefined>(
   undefined,

package/src/components/core/DataCubeCodeCheckErrorAlert.tsx

@@ -0,0 +1,127 @@
+/**
+ * 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 { DataCubeIcon } from '@finos/legend-art';
+import {
+  CODE_EDITOR_LANGUAGE,
+  CODE_EDITOR_THEME,
+  getBaseCodeEditorOptions,
+  moveCursorToPosition,
+  PURE_CODE_EDITOR_WORD_SEPARATORS,
+  setErrorMarkers,
+} from '@finos/legend-code-editor';
+import { editor as monacoEditorAPI } from 'monaco-editor';
+import { useEffect, useRef, useState } from 'react';
+import { MONACO_EDITOR_OVERFLOW_WIDGETS_ROOT_ID } from './DataCubePureCodeEditorUtils.js';
+import type { DataCubeQueryBuilderError } from '../../stores/core/DataCubeEngine.js';
+
+export function DataCubeCodeCheckErrorAlert(props: {
+  editorModel: monacoEditorAPI.ITextModel;
+  error: DataCubeQueryBuilderError;
+  message: string;
+  text?: string | undefined;
+}) {
+  const { editorModel, error, message, text } = props;
+  const editorRef = useRef<HTMLDivElement>(null);
+  const [editor, setEditor] = useState<
+    monacoEditorAPI.IStandaloneCodeEditor | undefined
+  >();
+
+  useEffect(() => {
+    if (!editor && editorRef.current) {
+      const element = editorRef.current;
+      const newEditor = monacoEditorAPI.create(element, {
+        ...getBaseCodeEditorOptions(),
+        fontSize: 12,
+        language: CODE_EDITOR_LANGUAGE.PURE,
+        theme: CODE_EDITOR_THEME.GITHUB_LIGHT,
+        wordSeparators: PURE_CODE_EDITOR_WORD_SEPARATORS,
+        // Make sure the widgets (tooltips, menus) are not clipped by the container bounds
+        // and fix the problem where widgets are rendered with position=fixed not working well with parent
+        // containers (i.e. the draggable window) which has been transformed
+        // See https://dev.to/salilnaik/the-uncanny-relationship-between-position-fixed-and-transform-property-32f6
+        // See https://github.com/microsoft/monaco-editor/issues/2793#issuecomment-999337740
+        fixedOverflowWidgets: true,
+        overflowWidgetsDomNode: document.getElementById(
+          MONACO_EDITOR_OVERFLOW_WIDGETS_ROOT_ID,
+        )!,
+        readOnly: true,
+        // By design, error markers would not show in read-only mode, use this to force it
+        // See https://github.com/microsoft/monaco-editor/issues/311
+        renderValidationDecorations: 'on',
+      });
+
+      newEditor.setModel(editorModel);
+      setEditor(newEditor);
+    }
+  }, [editor, editorModel]);
+
+  useEffect(() => {
+    if (error.sourceInformation) {
+      setErrorMarkers(editorModel, [
+        {
+          message: error.message,
+          startLineNumber: error.sourceInformation.startLine,
+          startColumn: error.sourceInformation.startColumn,
+          endLineNumber: error.sourceInformation.endLine,
+          endColumn: error.sourceInformation.endColumn,
+        },
+      ]);
+      if (editor) {
+        moveCursorToPosition(editor, {
+          lineNumber: error.sourceInformation.startLine,
+          column: error.sourceInformation.startColumn,
+        });
+      }
+    }
+  }, [editor, editorModel, error]);
+
+  // clean up
+  useEffect(
+    () => (): void => {
+      if (editor) {
+        editor.dispose();
+      }
+    },
+    [editor],
+  );
+
+  return (
+    <div className="h-full w-full overflow-auto">
+      <div className="flex w-full p-6 pb-2.5">
+        <div className="mr-3">
+          <DataCubeIcon.AlertError className="flex-shrink-0 stroke-[0.5px] text-[40px] text-red-500" />
+        </div>
+        <div>
+          <div className="whitespace-break-spaces text-lg">{message}</div>
+          <div className="mt-1 whitespace-break-spaces text-neutral-500">
+            {text}
+          </div>
+        </div>
+      </div>
+      <div className="h-60 justify-center border px-2">
+        <div className="h-full w-full p-2 pt-1">
+          <div className="relative h-full w-full border border-red-500">
+            <div
+              className="absolute left-0 top-0 h-full w-full overflow-hidden"
+              ref={editorRef}
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

package/src/components/{application → core}/DataCubeLayoutManager.tsx

@@ -24,7 +24,7 @@ import {
   WINDOW_DEFAULT_WIDTH,
   type LayoutManagerState,
   type WindowState,
-} from '../../stores/engine/DataCubeLayoutManagerState.js';
+} from '../../stores/core/DataCubeLayoutManagerState.js';
 import { observer } from 'mobx-react-lite';
 
 export const Window = (props: {

package/src/components/{shared → core}/DataCubePureCodeEditorUtils.tsx

@@ -19,8 +19,10 @@ import {
   languages as monacoLanguagesAPI,
   type IPosition,
 } from 'monaco-editor';
-import type { DataCubeViewState } from '../../stores/DataCubeViewState.js';
-import type { CompletionItem } from '../../stores/engine/DataCubeEngine.js';
+import type {
+  CompletionItem,
+  DataCubeEngine,
+} from '../../stores/core/DataCubeEngine.js';
 import type { V1_ValueSpecification } from '@finos/legend-graph';
 
 // Since we render the editor in a window which has been CSS transformed, and monaco-editor renders
@@ -43,7 +45,7 @@ export async function getCodeSuggestions(
   position: IPosition,
   model: monacoEditorAPI.ITextModel,
   prefix: string | undefined,
-  view: DataCubeViewState,
+  engine: DataCubeEngine,
   baseQueryBuilder: () => V1_ValueSpecification,
 ) {
   const textUntilPosition = model.getValueInRange({
@@ -57,7 +59,7 @@ export async function getCodeSuggestions(
   let suggestions: CompletionItem[] = [];
 
   try {
-    suggestions = await view.engine.getQueryTypeahead(
+    suggestions = await engine.getQueryTypeahead(
       (prefix ?? '') + textUntilPosition,
       baseQueryBuilder(),
     );

package/src/components/{application → core}/DataCubeSettingsPanel.tsx

@@ -16,14 +16,13 @@
 
 import { observer } from 'mobx-react-lite';
 import { DataCubeIcon } from '@finos/legend-art';
-import { FormCheckbox, FormNumberInput } from '../shared/DataCubeFormUtils.js';
+import { FormCheckbox, FormNumberInput } from './DataCubeFormUtils.js';
 import {
   DEFAULT_ENABLE_DEBUG_MODE,
-  DEFAULT_ENABLE_ENGINE_DEBUG_MODE,
   DEFAULT_GRID_CLIENT_PURGE_CLOSED_ROW_NODES,
   DEFAULT_GRID_CLIENT_ROW_BUFFER,
   DEFAULT_GRID_CLIENT_SUPPRESS_LARGE_DATASET_WARNING,
-} from '../../stores/engine/DataCubeEngine.js';
+} from '../../stores/core/DataCubeEngine.js';
 import { useState } from 'react';
 import { useDataCube } from '../DataCubeProvider.js';
 
@@ -37,9 +36,6 @@ export const DataCubeSettingsPanel = observer(() => {
   const [enableDebugMode, setEnableDebugMode] = useState(
     engine.enableDebugMode,
   );
-  const [enableEngineDebugMode, setEnableEngineDebugMode] = useState(
-    engine.enableEngineDebugMode,
-  );
   const [gridClientRowBuffer, setGridClientRowBuffer] = useState(
     engine.gridClientRowBuffer,
   );
@@ -52,7 +48,6 @@ export const DataCubeSettingsPanel = observer(() => {
 
   const save = () => {
     engine.setEnableDebugMode(enableDebugMode);
-    engine.setEnableEngineDebugMode(enableEngineDebugMode);
     engine.setGridClientRowBuffer(gridClientRowBuffer);
     engine.setGridClientPurgeClosedRowNodes(gridClientPurgeClosedRowNodes);
     engine.setGridClientSuppressLargeDatasetWarning(
@@ -65,7 +60,6 @@ export const DataCubeSettingsPanel = observer(() => {
       DEFAULT_GRID_CLIENT_PURGE_CLOSED_ROW_NODES,
     );
     setEnableDebugMode(DEFAULT_ENABLE_DEBUG_MODE);
-    setEnableEngineDebugMode(DEFAULT_ENABLE_ENGINE_DEBUG_MODE);
     setGridClientSuppressLargeDatasetWarning(
       DEFAULT_GRID_CLIENT_SUPPRESS_LARGE_DATASET_WARNING,
     );
@@ -172,18 +166,6 @@ export const DataCubeSettingsPanel = observer(() => {
               />
             </div>
           </div>
-          <div className="mt-1.5">
-            <div className="font-medium">Engine Debug Mode: Enabled</div>
-            <div className="flex pr-2">
-              <FormCheckbox
-                label="Enable debug logging in the engine when running data queries, computing query analytics, etc."
-                checked={enableEngineDebugMode}
-                onChange={() =>
-                  setEnableEngineDebugMode(!enableEngineDebugMode)
-                }
-              />
-            </div>
-          </div>
         </div>
       </div>
       <div className="flex h-10 items-center justify-end px-2">

package/src/components/{editor → view/editor}/DataCubeEditor.tsx

@@ -15,7 +15,7 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import { DataCubeEditorTab } from '../../stores/editor/DataCubeEditorState.js';
+import { DataCubeEditorTab } from '../../../stores/view/editor/DataCubeEditorState.js';
 import { DataCubeEditorSortsPanel } from './DataCubeEditorSortsPanel.js';
 import { DataCubeEditorGeneralPropertiesPanel } from './DataCubeEditorGeneralPropertiesPanel.js';
 import { DataCubeEditorColumnsPanel } from './DataCubeEditorColumnsPanel.js';
@@ -23,7 +23,7 @@ import { DataCubeEditorVerticalPivotsPanel } from './DataCubeEditorVerticalPivot
 import { DataCubeEditorHorizontalPivotsPanel } from './DataCubeEditorHorizontalPivotsPanel.js';
 import { DataCubeEditorColumnPropertiesPanel } from './DataCubeEditorColumnPropertiesPanel.js';
 import { cn } from '@finos/legend-art';
-import type { DataCubeViewState } from '../../stores/DataCubeViewState.js';
+import type { DataCubeViewState } from '../../../stores/view/DataCubeViewState.js';
 
 export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
   const { view } = props;