@finos/legend-query-builder 4.15.0 → 4.15.2

package/src/components/shared/CustomDatePicker.tsx

@@ -1007,11 +1007,8 @@ const CustomDateInstanceValueEditor: React.FC<{
             value: t.toString(),
             label: t.toString(),
           }))}
-          onChange={(val: {
-            label: string;
-            value: CUSTOM_DATE_OPTION_UNIT;
-          }): void => {
-            setUnitValue(val.value);
+          onChange={(val: { label: string; value: string }): void => {
+            setUnitValue(val.value as CUSTOM_DATE_OPTION_UNIT);
             changeValue(
               durationValue,
               val.value,
@@ -1032,11 +1029,8 @@ const CustomDateInstanceValueEditor: React.FC<{
             value: t.toString(),
             label: t.toString(),
           }))}
-          onChange={(val: {
-            label: string;
-            value: CUSTOM_DATE_OPTION_DIRECTION;
-          }): void => {
-            setDirectionValue(val.value);
+          onChange={(val: { label: string; value: string }): void => {
+            setDirectionValue(val.value as CUSTOM_DATE_OPTION_DIRECTION);
             changeValue(
               durationValue,
               unitValue,
@@ -1059,11 +1053,10 @@ const CustomDateInstanceValueEditor: React.FC<{
               label: t.toString(),
             }),
           )}
-          onChange={(val: {
-            label: string;
-            value: CUSTOM_DATE_OPTION_REFERENCE_MOMENT;
-          }): void => {
-            setReferenceMomentValueValue(val.value);
+          onChange={(val: { label: string; value: string }): void => {
+            setReferenceMomentValueValue(
+              val.value as CUSTOM_DATE_OPTION_REFERENCE_MOMENT,
+            );
             changeValue(durationValue, unitValue, directionValue, val.value);
           }}
           value={{ value: referenceMomentValue, label: referenceMomentValue }}
@@ -1128,7 +1121,7 @@ const CustomFirstDayOfValueSpecificationEditor: React.FC<{
     <div className="value-spec-editor__date-picker__custom-date">
       <div className="value-spec-editor__date-picker__custom-date__input">
         <CustomSelectorInput
-          ref={selectorRef}
+          inputRef={selectorRef}
           placeholder="Choose a unit..."
           className="value-spec-editor__date-picker__custom-date__input-dropdown value-spec-editor__date-picker__custom-date__input-dropdown--full"
           options={Object.values(CUSTOM_DATE_FIRST_DAY_OF_UNIT).map((t) => ({
@@ -1197,7 +1190,7 @@ const CustomPreviousDayOfWeekValueSpecificationEditor: React.FC<{
     <div className="value-spec-editor__date-picker__custom-date">
       <div className="value-spec-editor__date-picker__custom-date__input">
         <CustomSelectorInput
-          ref={selectorRef}
+          inputRef={selectorRef}
           placeholder="Choose a day..."
           className="value-spec-editor__date-picker__custom-date__input-dropdown value-spec-editor__date-picker__custom-date__input-dropdown--full"
           options={Object.values(CUSTOM_DATE_DAY_OF_WEEK).map((t) => ({

package/src/components/workflows/ClassQueryBuilder.tsx

@@ -90,8 +90,9 @@ const ClassQueryBuilderSetupPanelContent = observer(
     const mappingFilterOption = createFilter({
       ignoreCase: true,
       ignoreAccents: false,
-      stringify: (option: PackageableElementOption<Mapping>): string =>
-        option.value.path,
+      stringify: (option: {
+        data: PackageableElementOption<Mapping>;
+      }): string => option.data.value.path,
     });
 
     // runtime
@@ -124,9 +125,9 @@ const ClassQueryBuilderSetupPanelContent = observer(
     const runtimeFilterOption = createFilter({
       ignoreCase: true,
       ignoreAccents: false,
-      stringify: (option: { value: Runtime }): string =>
-        option.value instanceof RuntimePointer
-          ? option.value.packageableRuntime.value.path
+      stringify: (option: { data: { value: Runtime } }): string =>
+        option.data.value instanceof RuntimePointer
+          ? option.data.value.packageableRuntime.value.path
           : 'custom',
     });
 

package/src/components/workflows/MappingQueryBuilder.tsx

@@ -76,8 +76,9 @@ const MappingQueryBuilderSetupPanelContent = observer(
     const mappingFilterOption = createFilter({
       ignoreCase: true,
       ignoreAccents: false,
-      stringify: (option: PackageableElementOption<Mapping>): string =>
-        option.value.path,
+      stringify: (option: {
+        data: PackageableElementOption<Mapping>;
+      }): string => option.data.value.path,
     });
 
     // runtime
@@ -111,9 +112,9 @@ const MappingQueryBuilderSetupPanelContent = observer(
     const runtimeFilterOption = createFilter({
       ignoreCase: true,
       ignoreAccents: false,
-      stringify: (option: { value: Runtime }): string =>
-        guaranteeType(option.value, RuntimePointer).packageableRuntime.value
-          .path,
+      stringify: (option: { data: { value: Runtime } }): string =>
+        guaranteeType(option.data.value, RuntimePointer).packageableRuntime
+          .value.path,
     });
 
     // class

package/src/stores/data-cube/QueryBuilderDataCubeApplicationEngine.ts

@@ -19,10 +19,7 @@ import {
   shouldDisplayVirtualAssistantDocumentationEntry,
   type GenericLegendApplicationStore,
 } from '@finos/legend-application';
-import {
-  DataCubeApplicationEngine,
-  type ActionAlert,
-} from '@finos/legend-data-cube';
+import { DataCubeApplicationEngine } from '@finos/legend-data-cube';
 import { LogEvent, type DocumentationEntry } from '@finos/legend-shared';
 
 export class QueryBuilderDataCubeApplicationEngine extends DataCubeApplicationEngine {
@@ -58,14 +55,6 @@ export class QueryBuilderDataCubeApplicationEngine extends DataCubeApplicationEn
     this.application.layoutService.setWindowTitle(title);
   }
 
-  alertAction(alertInfo: ActionAlert | undefined) {
-    this.currentActionAlert = alertInfo;
-  }
-
-  alertUnhandledError(error: Error) {
-    this.application.alertUnhandledError(error);
-  }
-
   logDebug(message: string, ...data: unknown[]) {
     this.application.logService.debug(
       LogEvent.create(APPLICATION_EVENT.DEBUG),

package/src/stores/data-cube/QueryBuilderDataCubeEngine.ts

@@ -28,6 +28,7 @@ import {
   type GraphManagerState,
   type PureModel,
   type V1_ValueSpecification,
+  type ParameterValue,
 } from '@finos/legend-graph';
 import {
   _elementPtr,
@@ -67,9 +68,13 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
   readonly graphState: GraphManagerState;
   readonly selectInitialQuery: RawLambda;
   readonly mappingPath: string | undefined;
+  readonly parameterValues: ParameterValue[] | undefined;
   readonly runtimePath: string;
+  _parameters: object | undefined;
+
   constructor(
     selectQuery: RawLambda,
+    parameterValues: ParameterValue[] | undefined,
     mappingPath: string | undefined,
     runtimePath: string,
     graphManagerState: GraphManagerState,
@@ -79,6 +84,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     this.selectInitialQuery = selectQuery;
     this.mappingPath = mappingPath;
     this.runtimePath = runtimePath;
+    this.parameterValues = parameterValues;
   }
 
   get sourceLabel(): string {
@@ -105,6 +111,7 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     ) {
       srcFuncExp = srcFuncExp.body[0];
     }
+    this._parameters = this.selectInitialQuery.parameters;
     const fromFuncExp = new V1_AppliedFunction();
     fromFuncExp.function = _functionName(SUPPORTED_FUNCTIONS.FROM);
     fromFuncExp.parameters = [srcFuncExp];
@@ -159,6 +166,8 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     // we return undefined as we assume the grid license is set at the application level where query builder is built
     return Promise.resolve({
       gridClientLicense: undefined,
+      simpleSampleDataTableName: '',
+      complexSampleDataTableName: '',
     });
   }
   override async getQueryTypeahead(
@@ -191,6 +200,16 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     );
   }
 
+  override getQueryCode(
+    query: V1_ValueSpecification,
+    pretty?: boolean | undefined,
+  ): Promise<string> {
+    return this.graphState.graphManager.valueSpecificationToPureCode(
+      V1_serializeValueSpecification(query, []),
+      pretty,
+    );
+  }
+
   override getQueryRelationType(
     query: V1_ValueSpecification,
   ): Promise<RelationType> {
@@ -227,12 +246,16 @@ export class QueryBuilderDataCubeEngine extends DataCubeEngine {
     executedSQL: string;
   }> {
     const lambda = this.buildRawLambdaFromValueSpec(query);
+    lambda.parameters = this._parameters;
     const [executionWithMetadata, queryString] = await Promise.all([
       this.graphState.graphManager.runQuery(
         lambda,
         undefined,
         undefined,
         this.graph,
+        {
+          parameterValues: this.parameterValues ?? [],
+        },
       ),
       this.graphState.graphManager.lambdaToPureCode(lambda),
     ]);

package/src/stores/data-cube/QueryBuilderDataCubeEngineHelper.ts

@@ -15,9 +15,13 @@
  */
 
 import { type DataCubeEngine } from '@finos/legend-data-cube';
-import type { QueryBuilderState } from '../QueryBuilderState.js';
+import {
+  QUERY_BUILDER_LAMBDA_WRITER_MODE,
+  type QueryBuilderState,
+} from '../QueryBuilderState.js';
 import { RuntimePointer } from '@finos/legend-graph';
 import { QueryBuilderDataCubeEngine } from './QueryBuilderDataCubeEngine.js';
+import { buildExecutionParameterValues } from '../shared/LambdaParameterState.js';
 
 export const createDataCubeEngineFromQueryBuilder = (
   queryBuilderState: QueryBuilderState,
@@ -31,11 +35,22 @@ export const createDataCubeEngineFromQueryBuilder = (
   if (!runtime) {
     return undefined;
   }
+  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,
   );
+  queryBuilderState.setLambdaWriteMode(currentLambdaWriterMode);
   return queryBuilderEngine;
 };

package/src/stores/shared/LambdaParameterState.ts

@@ -60,6 +60,7 @@ import {
 export enum PARAMETER_SUBMIT_ACTION {
   RUN = 'RUN',
   EXPORT = 'EXPORT',
+  DATA_CUBE = 'DATA_CUBE',
 }
 
 enum LAMABA_PARAMETER_HASH_STRUCTURE {