@finos/legend-data-cube 0.1.32 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/DataCubeStatusBar.d.ts.map +1 -1
- package/lib/components/DataCubeStatusBar.js +4 -2
- package/lib/components/DataCubeStatusBar.js.map +1 -1
- package/lib/components/view/editor/DataCubeEditor.d.ts.map +1 -1
- package/lib/components/view/editor/DataCubeEditor.js +12 -1
- package/lib/components/view/editor/DataCubeEditor.js.map +1 -1
- package/lib/components/view/grid/DataCubeMultidimensionalGrid.d.ts.map +1 -1
- package/lib/components/view/grid/DataCubeMultidimensionalGrid.js +40 -2
- package/lib/components/view/grid/DataCubeMultidimensionalGrid.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/lib/stores/core/DataCubeQueryBuilder.d.ts +12 -0
- package/lib/stores/core/DataCubeQueryBuilder.d.ts.map +1 -1
- package/lib/stores/core/DataCubeQueryBuilder.js +141 -4
- package/lib/stores/core/DataCubeQueryBuilder.js.map +1 -1
- package/lib/stores/core/DataCubeQueryBuilderUtils.d.ts +2 -0
- package/lib/stores/core/DataCubeQueryBuilderUtils.d.ts.map +1 -1
- package/lib/stores/core/DataCubeQueryBuilderUtils.js +18 -1
- package/lib/stores/core/DataCubeQueryBuilderUtils.js.map +1 -1
- package/lib/stores/core/DataCubeQueryEngine.d.ts +6 -0
- package/lib/stores/core/DataCubeQueryEngine.d.ts.map +1 -1
- package/lib/stores/core/DataCubeQueryEngine.js +9 -0
- package/lib/stores/core/DataCubeQueryEngine.js.map +1 -1
- package/lib/stores/core/DataCubeSnapshot.d.ts +2 -0
- package/lib/stores/core/DataCubeSnapshot.d.ts.map +1 -1
- package/lib/stores/core/DataCubeSnapshot.js.map +1 -1
- package/lib/stores/core/DataCubeSnapshotBuilder.js +1 -0
- package/lib/stores/core/DataCubeSnapshotBuilder.js.map +1 -1
- package/lib/stores/core/model/DataCubeSpecification.d.ts +2 -0
- package/lib/stores/core/model/DataCubeSpecification.d.ts.map +1 -1
- package/lib/stores/core/model/DataCubeSpecification.js +3 -0
- package/lib/stores/core/model/DataCubeSpecification.js.map +1 -1
- package/lib/stores/view/DataCubeViewState.d.ts.map +1 -1
- package/lib/stores/view/DataCubeViewState.js +1 -0
- package/lib/stores/view/DataCubeViewState.js.map +1 -1
- package/lib/stores/view/editor/DataCubeEditorDimensionsPanelState.d.ts.map +1 -1
- package/lib/stores/view/editor/DataCubeEditorDimensionsPanelState.js +8 -4
- package/lib/stores/view/editor/DataCubeEditorDimensionsPanelState.js.map +1 -1
- package/lib/stores/view/editor/DataCubeEditorState.d.ts.map +1 -1
- package/lib/stores/view/editor/DataCubeEditorState.js +1 -0
- package/lib/stores/view/editor/DataCubeEditorState.js.map +1 -1
- package/lib/stores/view/grid/DataCubeGridClientEngine.d.ts +163 -1
- package/lib/stores/view/grid/DataCubeGridClientEngine.d.ts.map +1 -1
- package/lib/stores/view/grid/DataCubeGridClientEngine.js +142 -3
- package/lib/stores/view/grid/DataCubeGridClientEngine.js.map +1 -1
- package/lib/stores/view/grid/DataCubeGridConfigurationBuilder.d.ts +155 -1
- package/lib/stores/view/grid/DataCubeGridConfigurationBuilder.d.ts.map +1 -1
- package/lib/stores/view/grid/DataCubeGridConfigurationBuilder.js +170 -2
- package/lib/stores/view/grid/DataCubeGridConfigurationBuilder.js.map +1 -1
- package/lib/stores/view/grid/DataCubeGridControllerState.d.ts.map +1 -1
- package/lib/stores/view/grid/DataCubeGridControllerState.js +5 -3
- package/lib/stores/view/grid/DataCubeGridControllerState.js.map +1 -1
- package/lib/stores/view/grid/DataCubeGridDimensionalTree.d.ts +54 -0
- package/lib/stores/view/grid/DataCubeGridDimensionalTree.d.ts.map +1 -0
- package/lib/stores/view/grid/DataCubeGridDimensionalTree.js +264 -0
- package/lib/stores/view/grid/DataCubeGridDimensionalTree.js.map +1 -0
- package/lib/stores/view/grid/DataCubeGridMenuBuilder.d.ts +1 -0
- package/lib/stores/view/grid/DataCubeGridMenuBuilder.d.ts.map +1 -1
- package/lib/stores/view/grid/DataCubeGridMenuBuilder.js +207 -1
- package/lib/stores/view/grid/DataCubeGridMenuBuilder.js.map +1 -1
- package/lib/stores/view/grid/DataCubeGridQueryBuilder.d.ts +2 -0
- package/lib/stores/view/grid/DataCubeGridQueryBuilder.d.ts.map +1 -1
- package/lib/stores/view/grid/DataCubeGridQueryBuilder.js +7 -1
- package/lib/stores/view/grid/DataCubeGridQueryBuilder.js.map +1 -1
- package/lib/stores/view/grid/DataCubeGridState.d.ts +6 -1
- package/lib/stores/view/grid/DataCubeGridState.d.ts.map +1 -1
- package/lib/stores/view/grid/DataCubeGridState.js +38 -2
- package/lib/stores/view/grid/DataCubeGridState.js.map +1 -1
- package/package.json +2 -2
- package/src/components/DataCubeStatusBar.tsx +9 -2
- package/src/components/view/editor/DataCubeEditor.tsx +16 -1
- package/src/components/view/grid/DataCubeMultidimensionalGrid.tsx +63 -1
- package/src/stores/core/DataCubeQueryBuilder.ts +256 -2
- package/src/stores/core/DataCubeQueryBuilderUtils.ts +22 -0
- package/src/stores/core/DataCubeQueryEngine.ts +10 -0
- package/src/stores/core/DataCubeSnapshot.ts +2 -0
- package/src/stores/core/DataCubeSnapshotBuilder.ts +1 -1
- package/src/stores/core/model/DataCubeSpecification.ts +5 -0
- package/src/stores/view/DataCubeViewState.ts +1 -0
- package/src/stores/view/editor/DataCubeEditorDimensionsPanelState.ts +9 -7
- package/src/stores/view/editor/DataCubeEditorState.tsx +1 -0
- package/src/stores/view/grid/DataCubeGridClientEngine.ts +268 -6
- package/src/stores/view/grid/DataCubeGridConfigurationBuilder.tsx +244 -3
- package/src/stores/view/grid/DataCubeGridControllerState.ts +10 -2
- package/src/stores/view/grid/DataCubeGridDimensionalTree.ts +438 -0
- package/src/stores/view/grid/DataCubeGridMenuBuilder.tsx +257 -0
- package/src/stores/view/grid/DataCubeGridQueryBuilder.ts +22 -1
- package/src/stores/view/grid/DataCubeGridState.ts +92 -2
- package/tsconfig.json +1 -0
|
@@ -21,7 +21,7 @@ import { _groupByAggCols, _colSpec, _cols, _filter, _function, _lambda, _var, _f
|
|
|
21
21
|
import { INTERNAL__GRID_CLIENT_MISSING_VALUE, INTERNAL__GRID_CLIENT_ROOT_AGGREGATION_COLUMN_ID, INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID, } from './DataCubeGridClientEngine.js';
|
|
22
22
|
import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
|
|
23
23
|
import { _colSpecArrayParam } from '../../core/DataCubeSnapshotBuilderUtils.js';
|
|
24
|
-
import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
|
|
24
|
+
import { buildDimensionalExecutableQuery, buildExecutableQuery, } from '../../core/DataCubeQueryBuilder.js';
|
|
25
25
|
/*****************************************************************************
|
|
26
26
|
* [GRID]
|
|
27
27
|
*
|
|
@@ -90,6 +90,12 @@ export function buildGridDataFetchExecutableQuery(request, snapshot, source, eng
|
|
|
90
90
|
: undefined,
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
|
+
export function buildDimensionalGridDataFetchExecutableQuery(snapshot, source, engine, nodes) {
|
|
94
|
+
//TODO: Try to remove this cloning
|
|
95
|
+
const processedSnapshot = snapshot.clone();
|
|
96
|
+
//TODO: check if we need to show root aggregation in this mode
|
|
97
|
+
return buildDimensionalExecutableQuery(processedSnapshot, source, engine, nodes);
|
|
98
|
+
}
|
|
93
99
|
function generateGridDataFetchExecutableQueryPostProcessor(request) {
|
|
94
100
|
return (snapshot, sequence, funcMap, configuration, engine) => {
|
|
95
101
|
const _unprocess = _functionCompositionUnProcessor(sequence, funcMap);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataCubeGridQueryBuilder.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EACd,sBAAsB,EAGtB,cAAc,EACd,eAAe,EACf,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAyB,MAAM,gCAAgC,CAAC;AACvE,OAAO,EACL,gCAAgC,EAChC,2BAA2B,EAC3B,gBAAgB,EAEhB,uBAAuB,EACvB,iCAAiC,EACjC,0BAA0B,EAC1B,kCAAkC,GACnC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,IAAI,GACL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,eAAe,EACf,QAAQ,EACR,KAAK,EACL,OAAO,EACP,SAAS,EACT,OAAO,EACP,IAAI,EACJ,+BAA+B,EAC/B,SAAS,EACT,WAAW,EACX,IAAI,GACL,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,mCAAmC,EACnC,gDAAgD,EAChD,sDAAsD,GAEvD,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,
|
|
1
|
+
{"version":3,"file":"DataCubeGridQueryBuilder.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { type DebouncedFunc } from '@finos/legend-shared';
|
|
17
|
-
import type { GridApi } from 'ag-grid-community';
|
|
17
|
+
import type { CellDoubleClickedEvent, GridApi } from 'ag-grid-community';
|
|
18
18
|
import type { DataCubeViewState } from '../DataCubeViewState.js';
|
|
19
19
|
import { DataCubeGridClientServerSideDataSource } from './DataCubeGridClientEngine.js';
|
|
20
20
|
import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
|
|
@@ -22,6 +22,7 @@ import type { DataCubeSnapshot } from '../../core/DataCubeSnapshot.js';
|
|
|
22
22
|
import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
|
|
23
23
|
import { DataCubeGridControllerState } from './DataCubeGridControllerState.js';
|
|
24
24
|
import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine.js';
|
|
25
|
+
import { type DataCubeDimensionalMetadata } from './DataCubeGridDimensionalTree.js';
|
|
25
26
|
/**
|
|
26
27
|
* This query editor state is responsible for syncing the internal state of ag-grid
|
|
27
28
|
* server-side row model data source with the data cube query state. When new snapshot
|
|
@@ -58,6 +59,10 @@ export declare class DataCubeGridState extends DataCubeSnapshotController {
|
|
|
58
59
|
get isClientConfigured(): boolean;
|
|
59
60
|
get client(): GridApi<any>;
|
|
60
61
|
configureClient(val: GridApi | undefined): Promise<void>;
|
|
62
|
+
configureDimensionGridClient(val: GridApi | undefined): Promise<void>;
|
|
63
|
+
retrieveDrilloutData(metadata: Map<string, DataCubeDimensionalMetadata>, dimension: string): Promise<void>;
|
|
64
|
+
retrieveDrilldownData(data?: CellDoubleClickedEvent): Promise<void>;
|
|
65
|
+
private _applyDimensionalSnapshot;
|
|
61
66
|
getSnapshotSubscriberName(): string;
|
|
62
67
|
applySnapshot(snapshot: DataCubeSnapshot, previousSnapshot: DataCubeSnapshot | undefined): Promise<void>;
|
|
63
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataCubeGridState.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"DataCubeGridState.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sCAAsC,EAQvC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AASrF,OAAO,EAKL,KAAK,2BAA2B,EACjC,MAAM,kCAAkC,CAAC;AAE1C;;;;;;;;;;;;;;GAcG;AACH,qBAAa,iBAAkB,SAAQ,0BAA0B;IAC/D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAE1C,QAAQ,CAAC,UAAU,EAAE,2BAA2B,CAAC;IAEjD,QAAQ,CAAC,YAAY,EAAE,8BAA8B,CAAC;IACtD,OAAO,CAAC,OAAO,CAAC,CAAsB;IACtC,gBAAgB,EAAE,sCAAsC,CAAC;IAEzD,aAAa,EAAE,qBAAqB,CAA+B;IACnE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,mBAAmB,UAAmD;IACtE,gBAAgB,UAAgD;IAChE,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAGpC,0BAA0B,CAAC,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC;gBAE3C,IAAI,EAAE,iBAAiB;IA+BnC,oBAAoB,CAAC,GAAG,EAAE,OAAO;IA2B3B,iBAAiB,CACrB,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE;QACR,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KACvC;IA0GH,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAIzC,IAAI,kBAAkB,YAErB;IAED,IAAI,MAAM,iBAET;IAEK,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;IAexC,4BAA4B,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS;IAoBrD,oBAAoB,CACxB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,EAClD,SAAS,EAAE,MAAM;IAeb,qBAAqB,CAAC,IAAI,CAAC,EAAE,sBAAsB;YAe3C,yBAAyB;IA0B9B,yBAAyB;IAInB,aAAa,CAC1B,QAAQ,EAAE,gBAAgB,EAC1B,gBAAgB,EAAE,gBAAgB,GAAG,SAAS;CA8DjD"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { debounce, guaranteeNonNullable, StopWatch, } from '@finos/legend-shared';
|
|
17
17
|
import { action, makeObservable, observable, runInAction } from 'mobx';
|
|
18
|
-
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, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_CACHING, } from './DataCubeGridClientEngine.js';
|
|
18
|
+
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, INTERNAL__GRID_CLIENT_DEFAULT_ENABLE_CACHING, fetchDimensionalQueryRows, } from './DataCubeGridClientEngine.js';
|
|
19
19
|
import { DataCubeSnapshotController } from '../../services/DataCubeSnapshotService.js';
|
|
20
20
|
import { generateGridOptionsFromSnapshot } from './DataCubeGridConfigurationBuilder.js';
|
|
21
21
|
import { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
|
|
@@ -24,8 +24,9 @@ import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine
|
|
|
24
24
|
import { DataCubeSettingKey } from '../../../__lib__/DataCubeSetting.js';
|
|
25
25
|
import { DEFAULT_ALERT_WINDOW_CONFIG } from '../../services/DataCubeLayoutService.js';
|
|
26
26
|
import { AlertType } from '../../services/DataCubeAlertService.js';
|
|
27
|
-
import { DataCubeGridMode } from '../../core/DataCubeQueryEngine.js';
|
|
27
|
+
import { DataCubeClientModelOption, DataCubeGridMode, } from '../../core/DataCubeQueryEngine.js';
|
|
28
28
|
import { DataCubeEvent } from '../../../__lib__/DataCubeEvent.js';
|
|
29
|
+
import { cloneDimensionalTree, hydrateDataCubeDimensionalTree, removeSubtreeNode, } from './DataCubeGridDimensionalTree.js';
|
|
29
30
|
/**
|
|
30
31
|
* This query editor state is responsible for syncing the internal state of ag-grid
|
|
31
32
|
* server-side row model data source with the data cube query state. When new snapshot
|
|
@@ -188,6 +189,41 @@ export class DataCubeGridState extends DataCubeSnapshotController {
|
|
|
188
189
|
await this.applySnapshot(latestSnapshot, undefined);
|
|
189
190
|
}
|
|
190
191
|
}
|
|
192
|
+
async configureDimensionGridClient(val) {
|
|
193
|
+
this._client = val;
|
|
194
|
+
this.debouncedAutoResizeColumns = debounce(() => val?.autoSizeAllColumns(), 100);
|
|
195
|
+
const latestSnapshot = this.getLatestSnapshot();
|
|
196
|
+
if (latestSnapshot) {
|
|
197
|
+
if (!latestSnapshot.data.dimensionalTree) {
|
|
198
|
+
latestSnapshot.data.dimensionalTree = hydrateDataCubeDimensionalTree(DataCubeConfiguration.serialization.fromJson(latestSnapshot.data.configuration));
|
|
199
|
+
}
|
|
200
|
+
await this._applyDimensionalSnapshot(latestSnapshot);
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
async retrieveDrilloutData(metadata, dimension) {
|
|
204
|
+
const latestSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
|
|
205
|
+
const previousTree = cloneDimensionalTree(guaranteeNonNullable(latestSnapshot.data.dimensionalTree));
|
|
206
|
+
removeSubtreeNode(guaranteeNonNullable(latestSnapshot.data.dimensionalTree), dimension, guaranteeNonNullable(metadata.get(dimension)?.column), guaranteeNonNullable(metadata.get(dimension)?.groupByNodes));
|
|
207
|
+
await this._applyDimensionalSnapshot(latestSnapshot, previousTree);
|
|
208
|
+
}
|
|
209
|
+
async retrieveDrilldownData(data) {
|
|
210
|
+
const latestSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
|
|
211
|
+
const previousTree = cloneDimensionalTree(guaranteeNonNullable(latestSnapshot.data.dimensionalTree));
|
|
212
|
+
latestSnapshot.data.dimensionalTree = hydrateDataCubeDimensionalTree(DataCubeConfiguration.serialization.fromJson(latestSnapshot.data.configuration), data, latestSnapshot.data.dimensionalTree);
|
|
213
|
+
await this._applyDimensionalSnapshot(latestSnapshot, previousTree);
|
|
214
|
+
}
|
|
215
|
+
async _applyDimensionalSnapshot(snapshot, previousTree) {
|
|
216
|
+
this._client?.hideOverlay();
|
|
217
|
+
this._client?.setGridOption(DataCubeClientModelOption.LOADING, true);
|
|
218
|
+
const result = await fetchDimensionalQueryRows(snapshot, this._view, previousTree);
|
|
219
|
+
this._client?.setGridOption(DataCubeClientModelOption.ROW_DATA, result.rowData);
|
|
220
|
+
this._client?.setGridOption(DataCubeClientModelOption.COLUMN_DEFS, result.columnDefs);
|
|
221
|
+
if (result.rowData.length === 0) {
|
|
222
|
+
this._client?.showNoRowsOverlay();
|
|
223
|
+
}
|
|
224
|
+
this._client?.setGridOption(DataCubeClientModelOption.LOADING, false);
|
|
225
|
+
this.publishSnapshot(snapshot);
|
|
226
|
+
}
|
|
191
227
|
getSnapshotSubscriberName() {
|
|
192
228
|
return 'grid';
|
|
193
229
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataCubeGridState.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,QAAQ,EACR,oBAAoB,EACpB,SAAS,GAEV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAGvE,OAAO,EACL,sCAAsC,EACtC,8CAA8C,EAC9C,yDAAyD,EACzD,0CAA0C,EAC1C,+CAA+C,EAC/C,wCAAwC,EACxC,4CAA4C,
|
|
1
|
+
{"version":3,"file":"DataCubeGridState.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-data-cube",
|
|
3
|
-
"version": "0.1
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"description": "Legend DataCube",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"test:watch": "jest --watch"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@finos/legend-art": "7.1.
|
|
45
|
+
"@finos/legend-art": "7.1.96",
|
|
46
46
|
"@finos/legend-code-editor": "2.0.69",
|
|
47
47
|
"@finos/legend-graph": "32.1.27",
|
|
48
48
|
"@finos/legend-shared": "11.0.11",
|
|
@@ -20,7 +20,10 @@ import type { DataCubeViewState } from '../stores/view/DataCubeViewState.js';
|
|
|
20
20
|
import type { TaskManager } from '../stores/services/DataCubeTaskService.js';
|
|
21
21
|
import { at } from '@finos/legend-shared';
|
|
22
22
|
import { DataCubeEvent } from '../__lib__/DataCubeEvent.js';
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
DataCubeOpenEditorSource,
|
|
25
|
+
isDimensionalGridMode,
|
|
26
|
+
} from '../stores/core/DataCubeQueryEngine.js';
|
|
24
27
|
|
|
25
28
|
export const DataCubeStatusBar = observer(
|
|
26
29
|
(props: {
|
|
@@ -71,7 +74,11 @@ export const DataCubeStatusBar = observer(
|
|
|
71
74
|
view?.filter.display.open();
|
|
72
75
|
logOpeningFilterEditor();
|
|
73
76
|
}}
|
|
74
|
-
disabled={
|
|
77
|
+
disabled={
|
|
78
|
+
!view ||
|
|
79
|
+
// TODO: add support for filtering in dimensional grid mode
|
|
80
|
+
isDimensionalGridMode(view.info.configuration.gridMode)
|
|
81
|
+
}
|
|
75
82
|
>
|
|
76
83
|
<DataCubeIcon.TableFilter className="text-lg" />
|
|
77
84
|
<div className="pl-0.5 underline">Filter</div>
|
|
@@ -28,6 +28,8 @@ import { FormButton } from '../../core/DataCubeFormUtils.js';
|
|
|
28
28
|
import { useDataCube } from '../../DataCubeProvider.js';
|
|
29
29
|
import { DataCubeEditorDimensionsPanel } from './DataCubeEditorDimensionsPanel.js';
|
|
30
30
|
import { DataCubeEvent } from '../../../__lib__/DataCubeEvent.js';
|
|
31
|
+
import { isDimensionalGridMode } from '../../../stores/core/DataCubeQueryEngine.js';
|
|
32
|
+
import { useEffect } from 'react';
|
|
31
33
|
|
|
32
34
|
export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
|
|
33
35
|
const dataCube = useDataCube();
|
|
@@ -45,6 +47,8 @@ export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
|
|
|
45
47
|
DataCubeEditorTab.GENERAL_PROPERTIES,
|
|
46
48
|
DataCubeEditorTab.COLUMN_PROPERTIES,
|
|
47
49
|
];
|
|
50
|
+
//TODO: Add support to make changes to other tabs for dimensional grid mode
|
|
51
|
+
const dimensionTabs = [DataCubeEditorTab.DIMENSIONS];
|
|
48
52
|
|
|
49
53
|
const logApplyChangesFromPropertiesEditor = (): void => {
|
|
50
54
|
view.dataCube.telemetryService.sendTelemetry(
|
|
@@ -53,6 +57,13 @@ export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
|
|
|
53
57
|
);
|
|
54
58
|
};
|
|
55
59
|
|
|
60
|
+
//TODO: remove this once we have more editors deisabled for
|
|
61
|
+
useEffect(() => {
|
|
62
|
+
if (isDimensionalGridMode(view.info.configuration.gridMode)) {
|
|
63
|
+
editor.setCurrentTab(DataCubeEditorTab.DIMENSIONS);
|
|
64
|
+
}
|
|
65
|
+
}, [view, editor]);
|
|
66
|
+
|
|
56
67
|
return (
|
|
57
68
|
<>
|
|
58
69
|
<div className="relative h-[calc(100%_-_40px)] w-full px-2 pt-8">
|
|
@@ -61,8 +72,12 @@ export const DataCubeEditor = observer((props: { view: DataCubeViewState }) => {
|
|
|
61
72
|
<button
|
|
62
73
|
key={tab}
|
|
63
74
|
onClick={() => editor.setCurrentTab(tab)}
|
|
75
|
+
disabled={
|
|
76
|
+
isDimensionalGridMode(view.info.configuration.gridMode) &&
|
|
77
|
+
!dimensionTabs.includes(tab)
|
|
78
|
+
}
|
|
64
79
|
className={cn(
|
|
65
|
-
'relative flex h-6 items-center justify-center whitespace-nowrap border border-b-0 border-l-0 border-neutral-300 px-2 first:border-l focus:z-10',
|
|
80
|
+
'relative flex h-6 items-center justify-center whitespace-nowrap border border-b-0 border-l-0 border-neutral-300 px-2 first:border-l focus:z-10 disabled:text-neutral-400',
|
|
66
81
|
{
|
|
67
82
|
'-top-0.5 h-[27px] border-b-0 bg-white': tab === selectedTab,
|
|
68
83
|
},
|
|
@@ -16,11 +16,73 @@
|
|
|
16
16
|
|
|
17
17
|
import { observer } from 'mobx-react-lite';
|
|
18
18
|
import type { DataCubeViewState } from '../../../stores/view/DataCubeViewState.js';
|
|
19
|
+
import { DataCubeGridStyleController } from './DataCubeGrid.js';
|
|
20
|
+
import { AgGridReact } from 'ag-grid-react';
|
|
21
|
+
import { generateDimensionalBaseGridOptions } from '../../../stores/view/grid/DataCubeGridConfigurationBuilder.js';
|
|
22
|
+
import { AllCommunityModule } from 'ag-grid-community';
|
|
23
|
+
import { AllEnterpriseModule } from 'ag-grid-enterprise';
|
|
24
|
+
|
|
25
|
+
const __INTERNAL__original_console_error = console.error; // eslint-disable-line no-console
|
|
26
|
+
|
|
27
|
+
const DataCubeMultidimensionalGridClient = observer(
|
|
28
|
+
(props: { view: DataCubeViewState }) => {
|
|
29
|
+
const { view } = props;
|
|
30
|
+
const grid = view.grid;
|
|
31
|
+
|
|
32
|
+
// eslint-disable-next-line no-process-env
|
|
33
|
+
if (process.env.NODE_ENV !== 'production' && !grid.isClientConfigured) {
|
|
34
|
+
// eslint-disable-next-line no-console
|
|
35
|
+
console.error = (message?: unknown) => {
|
|
36
|
+
console.debug(`%c ${message}`, 'color: silver'); // eslint-disable-line no-console
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
// We use the client row model to showcase multi-dimensionality;
|
|
41
|
+
// Tree Data cannot be used in this case as the aggregation works on multiple columns
|
|
42
|
+
// https://www.ag-grid.com/javascript-data-grid/row-models/#client-side
|
|
43
|
+
return (
|
|
44
|
+
<div className="relative h-[calc(100%_-_20px)] w-full">
|
|
45
|
+
<AgGridReact
|
|
46
|
+
theme="legacy"
|
|
47
|
+
className="data-cube-grid ag-theme-quartz"
|
|
48
|
+
context={{
|
|
49
|
+
view,
|
|
50
|
+
}}
|
|
51
|
+
columnDefs={[]}
|
|
52
|
+
rowData={[]}
|
|
53
|
+
onCellDoubleClicked={(event) => {
|
|
54
|
+
grid
|
|
55
|
+
.retrieveDrilldownData(event)
|
|
56
|
+
.catch((error) => view.alertService.alertUnhandledError(error));
|
|
57
|
+
}}
|
|
58
|
+
onGridReady={(params) => {
|
|
59
|
+
grid
|
|
60
|
+
.configureDimensionGridClient(params.api)
|
|
61
|
+
.catch((error) => view.alertService.alertUnhandledError(error));
|
|
62
|
+
// eslint-disable-next-line no-process-env
|
|
63
|
+
if (process.env.NODE_ENV !== 'production') {
|
|
64
|
+
// restore original error logging
|
|
65
|
+
console.error = __INTERNAL__original_console_error; // eslint-disable-line no-console
|
|
66
|
+
}
|
|
67
|
+
}}
|
|
68
|
+
modules={[AllCommunityModule, AllEnterpriseModule]}
|
|
69
|
+
{...generateDimensionalBaseGridOptions(view)}
|
|
70
|
+
/>
|
|
71
|
+
</div>
|
|
72
|
+
);
|
|
73
|
+
},
|
|
74
|
+
);
|
|
19
75
|
|
|
20
76
|
export const DataCubeMultidimensionalGrid = observer(
|
|
21
77
|
(props: { view: DataCubeViewState }) => {
|
|
78
|
+
const view = props.view;
|
|
79
|
+
const configuration = props.view.grid.configuration;
|
|
80
|
+
|
|
22
81
|
return (
|
|
23
|
-
<div className="
|
|
82
|
+
<div className="h-[calc(100%_-_48px)] w-full">
|
|
83
|
+
<DataCubeGridStyleController configuration={configuration} />
|
|
84
|
+
<DataCubeMultidimensionalGridClient view={view} />
|
|
85
|
+
</div>
|
|
24
86
|
);
|
|
25
87
|
},
|
|
26
88
|
);
|
|
@@ -23,13 +23,21 @@
|
|
|
23
23
|
|
|
24
24
|
import {
|
|
25
25
|
PRIMITIVE_TYPE,
|
|
26
|
+
V1_AppliedProperty,
|
|
27
|
+
V1_CString,
|
|
26
28
|
V1_Lambda,
|
|
29
|
+
V1_Variable,
|
|
27
30
|
type V1_AppliedFunction,
|
|
28
31
|
} from '@finos/legend-graph';
|
|
29
|
-
import {
|
|
32
|
+
import {
|
|
33
|
+
type DataCubeSnapshot,
|
|
34
|
+
type DataCubeSnapshotExtendedColumn,
|
|
35
|
+
type DataCubeSnapshotGroupBy,
|
|
36
|
+
} from './DataCubeSnapshot.js';
|
|
30
37
|
import { at, guaranteeType } from '@finos/legend-shared';
|
|
31
38
|
import {
|
|
32
39
|
DataCubeFunction,
|
|
40
|
+
DataCubeQueryFilterGroupOperator,
|
|
33
41
|
DataCubeQuerySortDirection,
|
|
34
42
|
type DataCubeQueryFunctionMap,
|
|
35
43
|
} from './DataCubeQueryEngine.js';
|
|
@@ -49,10 +57,15 @@ import {
|
|
|
49
57
|
_var,
|
|
50
58
|
_functionCompositionProcessor,
|
|
51
59
|
_extendRootAggregation,
|
|
60
|
+
_flattenFilterSnapshot,
|
|
52
61
|
} from './DataCubeQueryBuilderUtils.js';
|
|
53
62
|
import type { DataCubeSource } from './model/DataCubeSource.js';
|
|
54
|
-
import { _findCol } from './model/DataCubeColumn.js';
|
|
63
|
+
import { _findCol, _toCol } from './model/DataCubeColumn.js';
|
|
55
64
|
import type { DataCubeEngine } from './DataCubeEngine.js';
|
|
65
|
+
import {
|
|
66
|
+
DIMENSIONAL_L0_COLUMN,
|
|
67
|
+
type DataCubeDimensionalNode,
|
|
68
|
+
} from '../view/grid/DataCubeGridDimensionalTree.js';
|
|
56
69
|
|
|
57
70
|
export function buildExecutableQuery(
|
|
58
71
|
snapshot: DataCubeSnapshot,
|
|
@@ -312,3 +325,244 @@ export function buildExecutableQuery(
|
|
|
312
325
|
}
|
|
313
326
|
return at(sequence, sequence.length - 1);
|
|
314
327
|
}
|
|
328
|
+
|
|
329
|
+
export function buildDimensionalExecutableQuery(
|
|
330
|
+
snapshot: DataCubeSnapshot,
|
|
331
|
+
source: DataCubeSource,
|
|
332
|
+
engine: DataCubeEngine,
|
|
333
|
+
nodes: DataCubeDimensionalNode[],
|
|
334
|
+
options?: {
|
|
335
|
+
postProcessor?: (
|
|
336
|
+
snapshot: DataCubeSnapshot,
|
|
337
|
+
sequence: V1_AppliedFunction[],
|
|
338
|
+
funcMap: DataCubeQueryFunctionMap,
|
|
339
|
+
configuration: DataCubeConfiguration,
|
|
340
|
+
engine: DataCubeEngine,
|
|
341
|
+
) => void;
|
|
342
|
+
rootAggregation?:
|
|
343
|
+
| {
|
|
344
|
+
columnName: string;
|
|
345
|
+
}
|
|
346
|
+
| undefined;
|
|
347
|
+
pagination?:
|
|
348
|
+
| {
|
|
349
|
+
start: number;
|
|
350
|
+
end: number;
|
|
351
|
+
}
|
|
352
|
+
| undefined;
|
|
353
|
+
skipExecutionContext?: boolean;
|
|
354
|
+
},
|
|
355
|
+
) {
|
|
356
|
+
const data = snapshot.data;
|
|
357
|
+
const configuration = DataCubeConfiguration.serialization.fromJson(
|
|
358
|
+
data.configuration,
|
|
359
|
+
);
|
|
360
|
+
const sequence: V1_AppliedFunction[] = [];
|
|
361
|
+
const funcMap: DataCubeQueryFunctionMap = {};
|
|
362
|
+
const _process = _functionCompositionProcessor(sequence, funcMap);
|
|
363
|
+
|
|
364
|
+
// ------------------------------ DIMENSIONS -------------------------------------
|
|
365
|
+
|
|
366
|
+
if (data.dimensionalTree && nodes.length > 0) {
|
|
367
|
+
const dimensionColNames = configuration.dimensions.dimensions.flatMap(
|
|
368
|
+
(col) => col.columns,
|
|
369
|
+
);
|
|
370
|
+
|
|
371
|
+
// removing columns which have been added to represent diimensions
|
|
372
|
+
configuration.columns = configuration.columns.map((col) => {
|
|
373
|
+
if (dimensionColNames.includes(col.name)) {
|
|
374
|
+
col.isSelected = false;
|
|
375
|
+
}
|
|
376
|
+
return col;
|
|
377
|
+
});
|
|
378
|
+
|
|
379
|
+
// Adding dimensions to the extended column
|
|
380
|
+
nodes.forEach((node) => {
|
|
381
|
+
const lambda = new V1_Lambda();
|
|
382
|
+
const parameter = new V1_Variable();
|
|
383
|
+
parameter.name = 'temp';
|
|
384
|
+
if (node.column === DIMENSIONAL_L0_COLUMN) {
|
|
385
|
+
const defaultValue = new V1_CString();
|
|
386
|
+
defaultValue.value = node.column;
|
|
387
|
+
lambda.body = [defaultValue];
|
|
388
|
+
} else {
|
|
389
|
+
const defaultValue = new V1_AppliedProperty();
|
|
390
|
+
defaultValue.parameters = [parameter];
|
|
391
|
+
defaultValue.property = node.column;
|
|
392
|
+
lambda.body = [defaultValue];
|
|
393
|
+
}
|
|
394
|
+
lambda.parameters = [parameter];
|
|
395
|
+
data.leafExtendedColumns.unshift({
|
|
396
|
+
name: node.dimension,
|
|
397
|
+
type: PRIMITIVE_TYPE.STRING,
|
|
398
|
+
mapFn: engine.serializeValueSpecification(lambda),
|
|
399
|
+
} satisfies DataCubeSnapshotExtendedColumn);
|
|
400
|
+
});
|
|
401
|
+
|
|
402
|
+
// Adding dimensions to selected list
|
|
403
|
+
data.selectColumns = data.selectColumns.filter(
|
|
404
|
+
(col) => !dimensionColNames.includes(col.name),
|
|
405
|
+
);
|
|
406
|
+
|
|
407
|
+
const dimensionCols = nodes.map((col) =>
|
|
408
|
+
_toCol({ name: col.dimension, type: PRIMITIVE_TYPE.STRING }),
|
|
409
|
+
);
|
|
410
|
+
data.selectColumns.unshift(...dimensionCols);
|
|
411
|
+
|
|
412
|
+
// Adding filter based on group by nodes
|
|
413
|
+
const groupByNodes = nodes.flatMap((x) => x.groupByNodes);
|
|
414
|
+
if (groupByNodes.length > 0) {
|
|
415
|
+
const filter = [
|
|
416
|
+
_flattenFilterSnapshot(nodes.flatMap((x) => x.groupByNodes)),
|
|
417
|
+
];
|
|
418
|
+
if (data.filter) {
|
|
419
|
+
filter.push(data.filter);
|
|
420
|
+
data.filter = {
|
|
421
|
+
groupOperator: DataCubeQueryFilterGroupOperator.AND,
|
|
422
|
+
conditions: filter,
|
|
423
|
+
};
|
|
424
|
+
} else {
|
|
425
|
+
data.filter = filter.at(0);
|
|
426
|
+
}
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
// Adding dimensions to groupby
|
|
430
|
+
if (data.groupBy) {
|
|
431
|
+
data.groupBy.columns.unshift(...dimensionCols);
|
|
432
|
+
} else {
|
|
433
|
+
data.groupBy = {
|
|
434
|
+
columns: dimensionCols,
|
|
435
|
+
} satisfies DataCubeSnapshotGroupBy;
|
|
436
|
+
}
|
|
437
|
+
}
|
|
438
|
+
|
|
439
|
+
// --------------------------------- LEAF-LEVEL EXTEND ---------------------------------
|
|
440
|
+
|
|
441
|
+
if (data.leafExtendedColumns.length) {
|
|
442
|
+
_process(
|
|
443
|
+
'leafExtend',
|
|
444
|
+
data.leafExtendedColumns.map((col) =>
|
|
445
|
+
_function(DataCubeFunction.EXTEND, [
|
|
446
|
+
_cols([
|
|
447
|
+
_colSpec(
|
|
448
|
+
col.name,
|
|
449
|
+
guaranteeType(
|
|
450
|
+
engine.deserializeValueSpecification(col.mapFn),
|
|
451
|
+
V1_Lambda,
|
|
452
|
+
),
|
|
453
|
+
col.reduceFn
|
|
454
|
+
? guaranteeType(
|
|
455
|
+
engine.deserializeValueSpecification(col.reduceFn),
|
|
456
|
+
V1_Lambda,
|
|
457
|
+
)
|
|
458
|
+
: undefined,
|
|
459
|
+
),
|
|
460
|
+
]),
|
|
461
|
+
]),
|
|
462
|
+
),
|
|
463
|
+
);
|
|
464
|
+
}
|
|
465
|
+
|
|
466
|
+
// --------------------------------- FILTER ---------------------------------
|
|
467
|
+
|
|
468
|
+
if (data.filter) {
|
|
469
|
+
_process(
|
|
470
|
+
'filter',
|
|
471
|
+
_function(DataCubeFunction.FILTER, [
|
|
472
|
+
_lambda([_var()], [_filter(data.filter, engine.filterOperations)]),
|
|
473
|
+
]),
|
|
474
|
+
);
|
|
475
|
+
}
|
|
476
|
+
|
|
477
|
+
// --------------------------------- SELECT ---------------------------------
|
|
478
|
+
|
|
479
|
+
if (data.selectColumns.length) {
|
|
480
|
+
_process(
|
|
481
|
+
'select',
|
|
482
|
+
_function(DataCubeFunction.SELECT, [
|
|
483
|
+
_cols(data.selectColumns.map((col) => _colSpec(col.name))),
|
|
484
|
+
]),
|
|
485
|
+
);
|
|
486
|
+
}
|
|
487
|
+
|
|
488
|
+
// --------------------------------- PIVOT ---------------------------------
|
|
489
|
+
|
|
490
|
+
// TODO: rethink pivots for dimensional grid mode
|
|
491
|
+
|
|
492
|
+
// --------------------------------- GROUP BY ---------------------------------
|
|
493
|
+
|
|
494
|
+
if (data.groupBy) {
|
|
495
|
+
const groupBy = data.groupBy;
|
|
496
|
+
if (configuration.showRootAggregation && options?.rootAggregation) {
|
|
497
|
+
sequence.push(_extendRootAggregation(options.rootAggregation.columnName));
|
|
498
|
+
}
|
|
499
|
+
_process(
|
|
500
|
+
'groupBy',
|
|
501
|
+
_function(DataCubeFunction.GROUP_BY, [
|
|
502
|
+
_cols(groupBy.columns.map((col) => _colSpec(col.name))),
|
|
503
|
+
_cols(
|
|
504
|
+
_groupByAggCols(
|
|
505
|
+
groupBy.columns,
|
|
506
|
+
snapshot,
|
|
507
|
+
configuration,
|
|
508
|
+
engine.aggregateOperations,
|
|
509
|
+
),
|
|
510
|
+
),
|
|
511
|
+
]),
|
|
512
|
+
);
|
|
513
|
+
_process(
|
|
514
|
+
'groupBySort',
|
|
515
|
+
_function(DataCubeFunction.SORT, [
|
|
516
|
+
_collection(
|
|
517
|
+
groupBy.columns.map((col) =>
|
|
518
|
+
_function(
|
|
519
|
+
configuration.treeColumnSortDirection ===
|
|
520
|
+
DataCubeQuerySortDirection.ASCENDING
|
|
521
|
+
? DataCubeFunction.ASCENDING
|
|
522
|
+
: DataCubeFunction.DESCENDING,
|
|
523
|
+
[_col(col.name)],
|
|
524
|
+
),
|
|
525
|
+
),
|
|
526
|
+
),
|
|
527
|
+
]),
|
|
528
|
+
);
|
|
529
|
+
}
|
|
530
|
+
|
|
531
|
+
// --------------------------------- GROUP-LEVEL EXTEND ---------------------------------
|
|
532
|
+
|
|
533
|
+
// TODO: implement group level extends for dimensional grid mode
|
|
534
|
+
|
|
535
|
+
// --------------------------------- SORT ---------------------------------
|
|
536
|
+
|
|
537
|
+
// TODO: implement sort for dimensional grid mode
|
|
538
|
+
|
|
539
|
+
// --------------------------------- LIMIT ---------------------------------
|
|
540
|
+
|
|
541
|
+
// TODO: rethink limits for dimensional grid mode
|
|
542
|
+
|
|
543
|
+
// --------------------------------- SLICE ---------------------------------
|
|
544
|
+
|
|
545
|
+
// TODO: rethink slice for dimensional grid mode
|
|
546
|
+
// slice can lead to incorrect view of data for dimensionality
|
|
547
|
+
|
|
548
|
+
// --------------------------------- FINALIZE ---------------------------------
|
|
549
|
+
|
|
550
|
+
if (!options?.skipExecutionContext) {
|
|
551
|
+
const executionContext = engine.buildExecutionContext(source);
|
|
552
|
+
if (executionContext) {
|
|
553
|
+
sequence.push(executionContext);
|
|
554
|
+
}
|
|
555
|
+
}
|
|
556
|
+
|
|
557
|
+
options?.postProcessor?.(snapshot, sequence, funcMap, configuration, engine);
|
|
558
|
+
|
|
559
|
+
if (sequence.length === 0) {
|
|
560
|
+
return source.query;
|
|
561
|
+
}
|
|
562
|
+
for (let i = 0; i < sequence.length; i++) {
|
|
563
|
+
at(sequence, i).parameters.unshift(
|
|
564
|
+
i === 0 ? source.query : at(sequence, i - 1),
|
|
565
|
+
);
|
|
566
|
+
}
|
|
567
|
+
return at(sequence, sequence.length - 1);
|
|
568
|
+
}
|