@finos/legend-query-builder 4.15.34 → 4.15.35

package/lib/stores/data-cube/QueryBuilderDataCubeEngine.d.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { V1_AppliedFunction, V1_Lambda, RawLambda, TDSExecutionResult, type GraphManagerState, type PureModel, type V1_ValueSpecification, type ParameterValue } from '@finos/legend-graph';
-import { DataCubeEngine, DataCubeSource, type RelationType, DataCubeQuery, type CompletionItem } from '@finos/legend-data-cube';
+import { V1_Lambda, RawLambda, TDSExecutionResult, V1_AppliedFunction, type GraphManagerState, type PureModel, type V1_ValueSpecification, type ParameterValue } from '@finos/legend-graph';
+import { DataCubeEngine, DataCubeSource, type CompletionItem, DataCubeQuery } from '@finos/legend-data-cube';
 import { LogService, type PlainObject } from '@finos/legend-shared';
 declare class QueryBuilderDataCubeSource extends DataCubeSource {
     mapping?: string | undefined;
@@ -27,20 +27,20 @@ export declare class QueryBuilderDataCubeEngine extends DataCubeEngine {
     readonly mappingPath: string | undefined;
     readonly parameterValues: ParameterValue[] | undefined;
     readonly runtimePath: string | undefined;
-    _parameters: object | undefined;
+    readonly parameters: object | undefined;
     constructor(selectQuery: RawLambda, parameterValues: ParameterValue[] | undefined, mappingPath: string | undefined, runtimePath: string | undefined, graphManagerState: GraphManagerState);
     get sourceLabel(): string;
     get graph(): PureModel;
     private getSourceFunctionExpression;
-    getBaseQuery(): Promise<DataCubeQuery>;
+    generateInitialQuery(): Promise<DataCubeQuery>;
     processQuerySource(value: PlainObject): Promise<QueryBuilderDataCubeSource>;
     private buildRawLambdaFromValueSpec;
     getQueryTypeahead(code: string, baseQuery: V1_Lambda, source: DataCubeSource): Promise<CompletionItem[]>;
     parseValueSpecification(code: string, returnSourceInformation?: boolean): Promise<V1_ValueSpecification>;
     getValueSpecificationCode(value: V1_ValueSpecification, pretty?: boolean | undefined): Promise<string>;
-    getRelationalType(query: RawLambda): Promise<RelationType>;
-    getQueryRelationType(query: V1_Lambda, source: DataCubeSource): Promise<RelationType>;
-    getQueryCodeRelationReturnType(code: string, baseQuery: V1_ValueSpecification, source: DataCubeSource): Promise<RelationType>;
+    getRelationType(query: RawLambda): Promise<import("@finos/legend-graph").RelationTypeMetadata>;
+    getQueryRelationType(query: V1_Lambda, source: DataCubeSource): Promise<import("@finos/legend-graph").RelationTypeMetadata>;
+    getQueryCodeRelationReturnType(code: string, baseQuery: V1_ValueSpecification, source: DataCubeSource): Promise<import("@finos/legend-graph").RelationTypeMetadata>;
     executeQuery(query: V1_Lambda, source: DataCubeSource): Promise<{
         result: TDSExecutionResult;
         executedQuery: string;

package/lib/stores/data-cube/QueryBuilderDataCubeEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderDataCubeEngine.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,kBAAkB,EAClB,SAAS,EACT,SAAS,EAET,kBAAkB,EAKlB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,cAAc,EACd,cAAc,EACd,KAAK,YAAY,EACjB,aAAa,EACb,KAAK,cAAc,EAGpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,UAAU,EACV,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,cAAM,0BAA2B,SAAQ,cAAc;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,qBAAa,0BAA2B,SAAQ,cAAc;IAC5D,QAAQ,CAAC,UAAU,aAAoB;IACvC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;gBAG9B,WAAW,EAAE,SAAS,EACtB,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,EAC7C,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,iBAAiB,EAAE,iBAAiB;IAUtC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,SAAS,CAErB;IAED,OAAO,CAAC,2BAA2B;IAmB7B,YAAY;IAmBZ,kBAAkB,CAAC,KAAK,EAAE,WAAW;IAY3C,OAAO,CAAC,2BAA2B;IAU7B,iBAAiB,CACrB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,cAAc;IAmBT,uBAAuB,CACpC,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,OAAO;IAW7B,yBAAyB,CAC7B,KAAK,EAAE,qBAAqB,EAC5B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS;IAQxB,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;IAS1D,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;IAKpD,8BAA8B,CAC3C,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,MAAM,EAAE,cAAc;IAYT,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;;;;;IAgC3D,qBAAqB,CAC5B,MAAM,EAAE,cAAc,GACrB,kBAAkB,GAAG,SAAS;CAelC"}
+{"version":3,"file":"QueryBuilderDataCubeEngine.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,SAAS,EACT,SAAS,EAET,kBAAkB,EAClB,kBAAkB,EAKlB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,cAAc,EACd,cAAc,EAGd,KAAK,cAAc,EAEnB,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,UAAU,EACV,KAAK,WAAW,EACjB,MAAM,sBAAsB,CAAC;AAE9B,cAAM,0BAA2B,SAAQ,cAAc;IACrD,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,qBAAa,0BAA2B,SAAQ,cAAc;IAC5D,QAAQ,CAAC,UAAU,aAAoB;IACvC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGtC,WAAW,EAAE,SAAS,EACtB,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,EAC7C,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,iBAAiB,EAAE,iBAAiB;IAYtC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,SAAS,CAErB;IAED,OAAO,CAAC,2BAA2B;IAmB7B,oBAAoB;IAmBpB,kBAAkB,CAAC,KAAK,EAAE,WAAW;IAe3C,OAAO,CAAC,2BAA2B;IAU7B,iBAAiB,CACrB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,cAAc;IAmBT,uBAAuB,CACpC,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,OAAO;IAWpB,yBAAyB,CACtC,KAAK,EAAE,qBAAqB,EAC5B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS;IAQxB,eAAe,CAAC,KAAK,EAAE,SAAS;IASvB,oBAAoB,CACjC,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,cAAc;IAMT,8BAA8B,CAC3C,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,MAAM,EAAE,cAAc;IAYT,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc;;;;;IAgC3D,qBAAqB,CAC5B,MAAM,EAAE,cAAc,GACrB,kBAAkB,GAAG,SAAS;CAelC"}

package/lib/stores/data-cube/QueryBuilderDataCubeEngine.js

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SUPPORTED_FUNCTIONS, V1_AppliedFunction, V1_Lambda, RawLambda, RelationalExecutionActivities, TDSExecutionResult, V1_deserializeRawValueSpecification, V1_deserializeValueSpecification, V1_RawLambda, V1_serializeValueSpecification, LAMBDA_PIPE, } from '@finos/legend-graph';
-import { _elementPtr, _functionName, DataCubeEngine, DataCubeSource, DataCubeQuery, _function, DataCubeFunction, } from '@finos/legend-data-cube';
+import { V1_Lambda, RawLambda, RelationalExecutionActivities, TDSExecutionResult, V1_AppliedFunction, V1_deserializeRawValueSpecification, V1_deserializeValueSpecification, V1_RawLambda, V1_serializeValueSpecification, LAMBDA_PIPE, SUPPORTED_FUNCTIONS, } from '@finos/legend-graph';
+import { _elementPtr, DataCubeEngine, DataCubeSource, _function, DataCubeFunction, _functionName, DataCubeQuery, } from '@finos/legend-data-cube';
 import { guaranteeType, isNonNullable, LogService, } from '@finos/legend-shared';
 class QueryBuilderDataCubeSource extends DataCubeSource {
     mapping;
@@ -27,7 +27,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     mappingPath;
     parameterValues;
     runtimePath;
-    _parameters;
+    parameters;
     constructor(selectQuery, parameterValues, mappingPath, runtimePath, graphManagerState) {
         super();
         this.graphState = graphManagerState;
@@ -35,6 +35,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
         this.mappingPath = mappingPath;
         this.runtimePath = runtimePath;
         this.parameterValues = parameterValues;
+        this.parameters = selectQuery.parameters;
     }
     get sourceLabel() {
         return `Query Builder Report`;
@@ -53,9 +54,8 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
         }
         return srcFuncExp;
     }
-    async getBaseQuery() {
+    async generateInitialQuery() {
         const srcFuncExp = this.getSourceFunctionExpression();
-        this._parameters = this.selectInitialQuery.parameters;
         const fromFuncExp = new V1_AppliedFunction();
         fromFuncExp.function = _functionName(SUPPORTED_FUNCTIONS.FROM);
         fromFuncExp.parameters = [srcFuncExp];
@@ -65,16 +65,19 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
         if (this.runtimePath) {
             fromFuncExp.parameters.push(_elementPtr(this.runtimePath));
         }
-        const columns = (await this.getRelationalType(this.selectInitialQuery))
+        const columns = (await this.getRelationType(this.selectInitialQuery))
             .columns;
         const query = new DataCubeQuery();
         query.query = `~[${columns.map((e) => `'${e.name}'`)}]->select()`;
         return query;
     }
     async processQuerySource(value) {
+        // TODO: this is an abnormal usage of this method, this is the place
+        // where we can enforce which source this engine supports, instead
+        // of hardcoding the logic like this.
         const srcFuncExp = this.getSourceFunctionExpression();
         const source = new QueryBuilderDataCubeSource();
-        source.sourceColumns = (await this.getRelationalType(this.selectInitialQuery)).columns;
+        source.columns = (await this.getRelationType(this.selectInitialQuery)).columns;
         source.mapping = this.mappingPath;
         source.runtime = this.runtimePath;
         source.query = srcFuncExp;
@@ -99,22 +102,22 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     async getValueSpecificationCode(value, pretty) {
         return this.graphState.graphManager.valueSpecificationToPureCode(V1_serializeValueSpecification(value, []), pretty);
     }
-    async getRelationalType(query) {
+    async getRelationType(query) {
         const relationType = await this.graphState.graphManager.getLambdaRelationType(query, this.graph);
         return relationType;
     }
     async getQueryRelationType(query, source) {
         const lambda = this.buildRawLambdaFromValueSpec(query);
-        return this.getRelationalType(lambda);
+        return this.getRelationType(lambda);
     }
     async getQueryCodeRelationReturnType(code, baseQuery, source) {
         const queryString = await this.graphState.graphManager.valueSpecificationToPureCode(V1_serializeValueSpecification(baseQuery, []));
         const fullQuery = queryString + code;
-        return this.getRelationalType(await this.graphState.graphManager.pureCodeToLambda(fullQuery));
+        return this.getRelationType(await this.graphState.graphManager.pureCodeToLambda(fullQuery));
     }
     async executeQuery(query, source) {
         const lambda = this.buildRawLambdaFromValueSpec(query);
-        lambda.parameters = this._parameters;
+        lambda.parameters = this.parameters;
         const [executionWithMetadata, queryString] = await Promise.all([
             this.graphState.graphManager.runQuery(lambda, undefined, undefined, this.graph, {
                 parameterValues: this.parameterValues ?? [],

package/lib/stores/data-cube/QueryBuilderDataCubeEngine.js.map

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

package/lib/stores/data-cube/{QueryBuilderDataCubeEngineHelper.d.ts → QueryBuilderDataCubeHelper.d.ts}

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 import { type QueryBuilderState } from '../QueryBuilderState.js';
-import { QueryBuilderDataCubeEngine } from './QueryBuilderDataCubeEngine.js';
-export declare const createDataCubeEngineFromQueryBuilder: (queryBuilderState: QueryBuilderState) => QueryBuilderDataCubeEngine | undefined;
-//# sourceMappingURL=QueryBuilderDataCubeEngineHelper.d.ts.map
+import { QueryBuilderDataCubeViewerState } from './QueryBuilderDataCubeViewerState.js';
+export declare const createDataCubeViewerStateFromQueryBuilder: (queryBuilderState: QueryBuilderState) => Promise<QueryBuilderDataCubeViewerState | undefined>;
+//# sourceMappingURL=QueryBuilderDataCubeHelper.d.ts.map

package/lib/stores/data-cube/QueryBuilderDataCubeHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderDataCubeHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,eAAO,MAAM,yCAAyC,sBACjC,iBAAiB,KACnC,OAAO,CAAC,+BAA+B,GAAG,SAAS,CA+BrD,CAAC"}

package/lib/stores/data-cube/{QueryBuilderDataCubeEngineHelper.js → QueryBuilderDataCubeHelper.js}

@@ -17,21 +17,25 @@ import { QUERY_BUILDER_LAMBDA_WRITER_MODE, } from '../QueryBuilderState.js';
 import { RuntimePointer } from '@finos/legend-graph';
 import { QueryBuilderDataCubeEngine } from './QueryBuilderDataCubeEngine.js';
 import { buildExecutionParameterValues } from '../shared/LambdaParameterState.js';
-export const createDataCubeEngineFromQueryBuilder = (queryBuilderState) => {
-    const runtime = queryBuilderState.executionContextState.runtimeValue instanceof
+import { QueryBuilderDataCubeViewerState } from './QueryBuilderDataCubeViewerState.js';
+export const createDataCubeViewerStateFromQueryBuilder = async (queryBuilderState) => {
+    const runtimePath = queryBuilderState.executionContextState.runtimeValue instanceof
         RuntimePointer
         ? queryBuilderState.executionContextState.runtimeValue.packageableRuntime
             .value.path
         : undefined;
-    if (!runtime) {
+    if (!runtimePath) {
         return undefined;
     }
+    const mappingPath = queryBuilderState.executionContextState.mapping?.path;
     const currentLambdaWriterMode = queryBuilderState.lambdaWriteMode;
     // ensure we write in new tds mode
     queryBuilderState.setLambdaWriteMode(QUERY_BUILDER_LAMBDA_WRITER_MODE.TYPED_FETCH_STRUCTURE);
     const parameterValues = buildExecutionParameterValues(queryBuilderState.parametersState.parameterStates, queryBuilderState.graphManagerState);
-    const queryBuilderEngine = new QueryBuilderDataCubeEngine(queryBuilderState.buildQuery(), parameterValues, queryBuilderState.executionContextState.mapping?.path, runtime, queryBuilderState.graphManagerState);
+    const lambda = queryBuilderState.buildQuery();
+    const engine = new QueryBuilderDataCubeEngine(lambda, parameterValues, mappingPath, runtimePath, queryBuilderState.graphManagerState);
     queryBuilderState.setLambdaWriteMode(currentLambdaWriterMode);
-    return queryBuilderEngine;
+    const query = await engine.generateInitialQuery();
+    return new QueryBuilderDataCubeViewerState(query, engine);
 };
-//# sourceMappingURL=QueryBuilderDataCubeEngineHelper.js.map
+//# sourceMappingURL=QueryBuilderDataCubeHelper.js.map

package/lib/stores/data-cube/QueryBuilderDataCubeHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderDataCubeHelper.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,gCAAgC,GAEjC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,MAAM,CAAC,MAAM,yCAAyC,GAAG,KAAK,EAC5D,iBAAoC,EACkB,EAAE;IACxD,MAAM,WAAW,GACf,iBAAiB,CAAC,qBAAqB,CAAC,YAAY;QACpD,cAAc;QACZ,CAAC,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,YAAY,CAAC,kBAAkB;aACpE,KAAK,CAAC,IAAI;QACf,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,WAAW,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC;IAC1E,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,eAAe,CAAC;IAClE,kCAAkC;IAClC,iBAAiB,CAAC,kBAAkB,CAClC,gCAAgC,CAAC,qBAAqB,CACvD,CAAC;IACF,MAAM,eAAe,GAAG,6BAA6B,CACnD,iBAAiB,CAAC,eAAe,CAAC,eAAe,EACjD,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,0BAA0B,CAC3C,MAAM,EACN,eAAe,EACf,WAAW,EACX,WAAW,EACX,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,iBAAiB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAClD,OAAO,IAAI,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAC5D,CAAC,CAAC"}

package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { DataCubeQuery } from '@finos/legend-data-cube';
+import type { QueryBuilderDataCubeEngine } from './QueryBuilderDataCubeEngine.js';
+export declare class QueryBuilderDataCubeViewerState {
+    query: DataCubeQuery;
+    engine: QueryBuilderDataCubeEngine;
+    constructor(query: DataCubeQuery, engine: QueryBuilderDataCubeEngine);
+}
+//# sourceMappingURL=QueryBuilderDataCubeViewerState.d.ts.map

package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderDataCubeViewerState.d.ts","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,qBAAa,+BAA+B;IAC1C,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,0BAA0B,CAAC;gBAEvB,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,0BAA0B;CAIrE"}

package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export class QueryBuilderDataCubeViewerState {
+    query;
+    engine;
+    constructor(query, engine) {
+        this.query = query;
+        this.engine = engine;
+    }
+}
+//# sourceMappingURL=QueryBuilderDataCubeViewerState.js.map

package/lib/stores/data-cube/QueryBuilderDataCubeViewerState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderDataCubeViewerState.js","sourceRoot":"","sources":["../../../src/stores/data-cube/QueryBuilderDataCubeViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,MAAM,OAAO,+BAA+B;IAC1C,KAAK,CAAgB;IACrB,MAAM,CAA6B;IAEnC,YAAY,KAAoB,EAAE,MAAkC;QAClE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF"}

package/lib/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderRelationProjectValueSpecBuidler.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EAEvB,wBAAwB,EAazB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,yDAAyD,CAAC;AAMjE,eAAO,MAAM,uBAAuB,wBACb,kBAAkB,YAC7B,oBAAoB,YACpB,2BAA2B,KACpC,wBAiFF,CAAC"}
+{"version":3,"file":"QueryBuilderRelationProjectValueSpecBuidler.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,KAAK,kBAAkB,EAEvB,wBAAwB,EAazB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,yDAAyD,CAAC;AAMjE,eAAO,MAAM,uBAAuB,wBACb,kBAAkB,YAC7B,oBAAoB,YACpB,2BAA2B,KACpC,wBA8EF,CAAC"}

package/lib/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ColSpecArray, extractElementNameFromPath, SimpleFunctionExpression, ColSpecArrayInstance, Multiplicity, ColSpec, INTERNAL__UnknownValueSpecification, V1_serializeRawValueSpecification, V1_transformRawLambda, V1_GraphTransformerContextBuilder, GenericType, GenericTypeExplicitReference, Relation_Relation, Relation_RelationalColumn, Relation_RelationType, } from '@finos/legend-graph';
+import { ColSpecArray, extractElementNameFromPath, SimpleFunctionExpression, ColSpecArrayInstance, Multiplicity, ColSpec, INTERNAL__UnknownValueSpecification, V1_serializeRawValueSpecification, V1_transformRawLambda, V1_GraphTransformerContextBuilder, GenericType, GenericTypeExplicitReference, Relation, RelationColumn, RelationType, } from '@finos/legend-graph';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
 import { QueryBuilderDerivationProjectionColumnState, QueryBuilderSimpleProjectionColumnState, } from './QueryBuilderProjectionColumnState.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
@@ -25,7 +25,7 @@ export const buildRelationProjection = (precedingExpression, tdsState, options)
     const instanceVal = new ColSpecArrayInstance(Multiplicity.ONE, undefined);
     const colSepcArray = new ColSpecArray();
     instanceVal.values = [colSepcArray];
-    const relationType = new Relation_RelationType(Relation_RelationType.ID);
+    const relationType = new RelationType(RelationType.ID);
     tdsState.projectionColumns.forEach((projectionColumnState) => {
         const colSpec = new ColSpec();
         colSepcArray.colSpecs.push(colSpec);
@@ -50,10 +50,10 @@ export const buildRelationProjection = (precedingExpression, tdsState, options)
         }
         colSpec.function1 = columnLambda;
         const returnType = guaranteeNonNullable(projectionColumnState.getColumnType(), `Can't create value spec for projection column ${projectionColumnState.columnName}`);
-        relationType.columns.push(new Relation_RelationalColumn(projectionColumnState.columnName, returnType));
+        relationType.columns.push(new RelationColumn(projectionColumnState.columnName, returnType));
     });
     projectFunction.parametersValues = [precedingExpression, instanceVal];
-    const relationGenericType = new GenericType(Relation_Relation.INSTANCE);
+    const relationGenericType = new GenericType(Relation.INSTANCE);
     const relationTypeGenericType = new GenericType(relationType);
     relationGenericType.typeArguments = [
         GenericTypeExplicitReference.create(relationTypeGenericType),

package/lib/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderRelationProjectValueSpecBuidler.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryBuilderRelationProjectValueSpecBuidler.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.15.34",
+  "version": "4.15.35",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -42,15 +42,15 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.15",
-    "@finos/legend-art": "7.1.72",
-    "@finos/legend-code-editor": "2.0.31",
-    "@finos/legend-data-cube": "0.0.36",
-    "@finos/legend-graph": "31.10.65",
-    "@finos/legend-lego": "2.0.33",
-    "@finos/legend-server-depot": "6.0.73",
-    "@finos/legend-shared": "10.0.64",
-    "@finos/legend-storage": "3.0.115",
+    "@finos/legend-application": "16.0.16",
+    "@finos/legend-art": "7.1.73",
+    "@finos/legend-code-editor": "2.0.32",
+    "@finos/legend-data-cube": "0.0.37",
+    "@finos/legend-graph": "32.0.0",
+    "@finos/legend-lego": "2.0.34",
+    "@finos/legend-server-depot": "6.0.74",
+    "@finos/legend-shared": "10.0.65",
+    "@finos/legend-storage": "3.0.116",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.1.0",
     "@types/react": "19.0.2",

package/src/components/QueryBuilder.tsx

@@ -1138,10 +1138,10 @@ export const QueryBuilder = observer(
               </Modal>
             </Dialog>
           )}
-          {queryBuilderState.dataCubeEngine && (
+          {queryBuilderState.dataCubeViewerState && (
             <QueryDataCubeViewer
-              engine={queryBuilderState.dataCubeEngine}
-              close={() => queryBuilderState.setDataCubeEngine(undefined)}
+              state={queryBuilderState.dataCubeViewerState}
+              close={() => queryBuilderState.setDataCubeViewerState(undefined)}
             />
           )}
         </div>

package/src/components/QueryLoader.tsx

@@ -111,14 +111,11 @@ export const QueryLoader = observer(
     const { queryLoaderState, loadActionLabel } = props;
     const applicationStore = useApplicationStore();
     const searchInputRef = useRef<HTMLInputElement>(null);
-    const queryRenameInputRef = useRef<HTMLInputElement>(null);
-    const sortByOptions = Object.values(SORT_BY_OPTIONS).map((op) => ({
-      label: op,
-      value: op,
-    }));
-    const results = queryLoaderState.queries;
+    const searchResults = queryLoaderState.queries;
+
+    // curated template queries
     const curatedTemplateQueries = [
-      ...queryLoaderState.curatedTemplateQuerySepcifications
+      ...queryLoaderState.curatedTemplateQuerySpecifications
         .map((s) =>
           queryLoaderState.queryBuilderState
             ? s.getCuratedTemplateQueries(queryLoaderState.queryBuilderState)
@@ -126,36 +123,22 @@ export const QueryLoader = observer(
         )
         .flat(),
     ].sort((a, b) => a.title.localeCompare(b.title));
-
     const loadCuratedTemplateQuery =
-      queryLoaderState.curatedTemplateQuerySepcifications
+      queryLoaderState.curatedTemplateQuerySpecifications
         // already using an arrow function suggested by @typescript-eslint/unbound-method
         // eslint-disable-next-line
         .map((s) => () => s.loadCuratedTemplateQuery)
         .filter(isNonNullable)[0];
 
+    // search filters
+    const sortOptions = Object.values(SORT_BY_OPTIONS).map((op) => ({
+      label: op,
+      value: op,
+    }));
     const [isMineOnly, setIsMineOnly] = useState(false);
     const [showQueryNameEditInput, setShowQueryNameEditInput] = useState<
       number | undefined
     >();
-    useEffect(() => {
-      queryRenameInputRef.current?.focus();
-      queryRenameInputRef.current?.select();
-    }, [showQueryNameEditInput]);
-    const [queryNameInputValue, setQueryNameInputValue] = useState<string>('');
-    const showEditQueryNameInput =
-      (value: string, idx: number): (() => void) =>
-      (): void => {
-        setQueryNameInputValue(value);
-        setShowQueryNameEditInput(idx);
-      };
-    const hideEditQueryNameInput = (): void => {
-      setShowQueryNameEditInput(undefined);
-      setQueryNameInputValue('');
-    };
-    const changeQueryNameInputValue: React.ChangeEventHandler<
-      HTMLInputElement
-    > = (event) => setQueryNameInputValue(event.target.value);
 
     // search text
     const debouncedLoadQueries = useMemo(
@@ -176,7 +159,7 @@ export const QueryLoader = observer(
         debouncedLoadQueries(event.target.value);
       }
     };
-    const clearQuerySearching = (): void => {
+    const clearSearchResults = (): void => {
       queryLoaderState.setSearchText('');
       debouncedLoadQueries.cancel();
       debouncedLoadQueries('');
@@ -189,7 +172,7 @@ export const QueryLoader = observer(
       debouncedLoadQueries.cancel();
       debouncedLoadQueries(queryLoaderState.searchText);
     };
-    const applySortByAlgorithm = (option: SortByOption): void => {
+    const applySort = (option: SortByOption): void => {
       queryLoaderState.setSortBy(option.value);
       debouncedLoadQueries.cancel();
       debouncedLoadQueries(queryLoaderState.searchText);
@@ -231,7 +214,26 @@ export const QueryLoader = observer(
       searchInputRef.current?.focus();
     }, [queryLoaderState]);
 
-    // actions
+    // query rename
+    const queryRenameInputRef = useRef<HTMLInputElement>(null);
+    useEffect(() => {
+      queryRenameInputRef.current?.focus();
+      queryRenameInputRef.current?.select();
+    }, [showQueryNameEditInput]);
+    const [queryNameInputValue, setQueryNameInputValue] = useState<string>('');
+    const showEditQueryNameInput =
+      (value: string, idx: number): (() => void) =>
+      (): void => {
+        setQueryNameInputValue(value);
+        setShowQueryNameEditInput(idx);
+      };
+    const hideEditQueryNameInput = (): void => {
+      setShowQueryNameEditInput(undefined);
+      setQueryNameInputValue('');
+    };
+    const changeQueryNameInputValue: React.ChangeEventHandler<
+      HTMLInputElement
+    > = (event) => setQueryNameInputValue(event.target.value);
     const renameQuery =
       (query: LightQuery): (() => void) =>
       (): void => {
@@ -244,6 +246,7 @@ export const QueryLoader = observer(
         }
       };
 
+    // other actions
     const deleteQuery =
       (query: LightQuery): (() => void) =>
       (): void => {
@@ -253,7 +256,6 @@ export const QueryLoader = observer(
           );
         }
       };
-
     const showPreview = (
       queryId: string | undefined,
       template?: {
@@ -291,7 +293,7 @@ export const QueryLoader = observer(
                   <button
                     className="query-loader__search__input__clear-btn"
                     tabIndex={-1}
-                    onClick={clearQuerySearching}
+                    onClick={clearSearchResults}
                     title="Clear"
                   >
                     <TimesIcon />
@@ -374,10 +376,11 @@ export const QueryLoader = observer(
                 <div className="query-loader__results__summary">
                   {queryLoaderState.showingDefaultQueries ? (
                     (queryLoaderState.generateDefaultQueriesSummaryText?.(
-                      results,
+                      searchResults,
                     ) ?? 'Refine your search to get better matches')
                   ) : !queryLoaderState.isCuratedTemplateToggled ? (
-                    results.length >= QUERY_LOADER_TYPEAHEAD_SEARCH_LIMIT ? (
+                    searchResults.length >=
+                    QUERY_LOADER_TYPEAHEAD_SEARCH_LIMIT ? (
                       <>
                         {`Found ${QUERY_LOADER_TYPEAHEAD_SEARCH_LIMIT}+ matches`}{' '}
                         <InfoCircleIcon
@@ -386,7 +389,7 @@ export const QueryLoader = observer(
                         />
                       </>
                     ) : (
-                      `Found ${quantifyList(results, 'match', 'matches')}`
+                      `Found ${quantifyList(searchResults, 'match', 'matches')}`
                     )
                   ) : curatedTemplateQueries.length >=
                     QUERY_LOADER_TYPEAHEAD_SEARCH_LIMIT ? (
@@ -414,9 +417,9 @@ export const QueryLoader = observer(
                         </div>
                         <CustomSelectorInput
                           className="query-loader__results__sort-by__selector"
-                          options={sortByOptions}
+                          options={sortOptions}
                           onChange={(option: SortByOption) => {
-                            applySortByAlgorithm(option);
+                            applySort(option);
                           }}
                           value={{
                             label: queryLoaderState.sortBy,
@@ -431,7 +434,7 @@ export const QueryLoader = observer(
                     )}
                 </div>
                 {!queryLoaderState.isCuratedTemplateToggled &&
-                  results
+                  searchResults
                     .slice(0, QUERY_LOADER_TYPEAHEAD_SEARCH_LIMIT)
                     .map((query, idx) => (
                       <div

package/src/components/data-cube/QueryBuilderDataCube.tsx

@@ -24,17 +24,17 @@ import {
   ModalFooterButton,
   TimesIcon,
 } from '@finos/legend-art';
-import type { QueryBuilderDataCubeEngine } from '../../stores/data-cube/QueryBuilderDataCubeEngine.js';
+import type { QueryBuilderDataCubeViewerState } from '../../stores/data-cube/QueryBuilderDataCubeViewerState.js';
 
 export const QueryDataCubeViewer = observer(
   (props: {
-    engine: QueryBuilderDataCubeEngine;
+    state: QueryBuilderDataCubeViewerState;
     close: () => void;
     options?: {
       fullScreen: boolean;
     };
   }) => {
-    const { engine, close, options } = props;
+    const { state, close, options } = props;
     return (
       <Dialog
         open={true}
@@ -72,7 +72,7 @@ export const QueryDataCubeViewer = observer(
                 options?.fullScreen,
             })}
           >
-            <DataCube engine={engine} />
+            <DataCube query={state.query} engine={state.engine} />
           </div>
           {!options?.fullScreen && (
             <ModalFooter>

package/src/components/result/QueryBuilderResultPanel.tsx

@@ -419,15 +419,13 @@ export const QueryBuilderResultPanel = observer(
             ),
         )
       ) {
-        queryParametersState.parameterValuesEditorState.open(
-          (): Promise<void> => {
-            queryBuilderState.openDataCubeEngine();
-            return Promise.resolve();
-          },
-          PARAMETER_SUBMIT_ACTION.DATA_CUBE,
-        );
+        queryParametersState.parameterValuesEditorState.open(async () => {
+          await queryBuilderState.openDataCubeEngine();
+        }, PARAMETER_SUBMIT_ACTION.DATA_CUBE);
       } else {
-        queryBuilderState.openDataCubeEngine();
+        queryBuilderState
+          .openDataCubeEngine()
+          .catch(applicationStore.alertUnhandledError);
       }
     };
     const cancelQuery = applicationStore.guardUnhandledError(() =>