@finos/legend-query-builder 4.18.2 → 4.18.4

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
 
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_In.ts

@@ -56,9 +56,7 @@ export class QueryBuilderFilterOperator_In
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       (normalizedType !== undefined &&
@@ -82,9 +80,7 @@ export class QueryBuilderFilterOperator_In
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const rightSide = filterConditionState.rightConditionValue;
     // `in`/`not in` does not support right hand value being column state as the multipliticy for columns are [0..1]
     if (rightSide instanceof FilterValueSpecConditionValueState) {
@@ -147,9 +143,7 @@ export class QueryBuilderFilterOperator_In
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     return new CollectionInstanceValue(
       Multiplicity.ONE,
       GenericTypeExplicitReference.create(new GenericType(propertyType)),

package/src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import type {
-  QueryBuilderFilterState,
-  FilterConditionState,
+import {
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+  FilterPropertyExpressionSourceState,
 } from '../QueryBuilderFilterState.js';
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
@@ -50,11 +51,13 @@ export class QueryBuilderFilterOperator_IsEmpty
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     // First check if property is optional
     if (
+      !(
+        filterConditionState.sourceState instanceof
+        FilterPropertyExpressionSourceState
+      ) ||
       !isPropertyExpressionChainOptional(
         filterConditionState.propertyExpressionState.propertyExpression,
       )

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_LessThan
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_LessThan
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
 
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_LessThan
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_LessThan
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_LessThanEqual
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
 
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_LessThanEqual
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts

@@ -55,8 +55,7 @@ export class QueryBuilderFilterOperator_StartWith
   ): boolean {
     return (
       getStandardPrimitiveTypeEquivalent(
-        filterConditionState.propertyExpressionState.propertyExpression.func
-          .value.genericType.value.rawType,
+        filterConditionState.leftConditionType,
       ) === PRIMITIVE_TYPE.STRING
     );
   }
@@ -78,9 +77,7 @@ export class QueryBuilderFilterOperator_StartWith
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildDefaultInstanceValue(

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -51,6 +51,7 @@ import { QueryBuilderAggregateColumnState } from '../fetch-structure/tds/aggrega
 import {
   QueryBuilderFilterTreeConditionNodeData,
   QueryBuilderFilterTreeExistsNodeData,
+  FilterPropertyExpressionSourceState,
 } from '../filter/QueryBuilderFilterState.js';
 
 export class QueryBuilderMilestoningState implements Hashable {
@@ -153,13 +154,18 @@ export class QueryBuilderMilestoningState implements Hashable {
       }
       this.queryBuilderState.filterState.nodes.forEach((node) => {
         if (node instanceof QueryBuilderFilterTreeConditionNodeData) {
-          node.condition.propertyExpressionState.derivedPropertyExpressionStates[0]?.parameterValues.forEach(
-            (p) => {
-              if (p instanceof INTERNAL__PropagatedValue) {
-                p.isPropagatedValue = false;
-              }
-            },
-          );
+          if (
+            node.condition.sourceState instanceof
+            FilterPropertyExpressionSourceState
+          ) {
+            node.condition.sourceState.propertyExpressionState.derivedPropertyExpressionStates[0]?.parameterValues.forEach(
+              (p) => {
+                if (p instanceof INTERNAL__PropagatedValue) {
+                  p.isPropagatedValue = false;
+                }
+              },
+            );
+          }
         } else if (node instanceof QueryBuilderFilterTreeExistsNodeData) {
           if (
             node.propertyExpressionState.derivedPropertyExpressionStates[0] &&

package/src/stores/workflows/accessor/AccessorQueryBuilderState.ts

@@ -19,10 +19,12 @@ import {
   type PackageableRuntime,
   type AccessorOwner,
   type Accessor,
+  type RawLambda,
   IngestDefinition,
   Database,
   PackageableElementExplicitReference,
   RuntimePointer,
+  buildRawLambdaFromLambdaFunction,
   type TEMPORARY_IngestContent,
 } from '@finos/legend-graph';
 import { QueryBuilderState } from '../../QueryBuilderState.js';
@@ -39,6 +41,7 @@ import { buildElementOption } from '@finos/legend-lego/graph-editor';
 import { getCompatibleRuntimesFromAccessorOwner } from './AccessorQueryBuilderHelper.js';
 import { QueryBuilderEmbeddedFromExecutionContextState } from '../../QueryBuilderExecutionContextState.js';
 import { QueryBuilderTDSState } from '../../fetch-structure/tds/QueryBuilderTDSState.js';
+import { buildLambdaFunction } from '../../QueryBuilderValueSpecificationBuilder.js';
 
 export interface AccessorOwnerOption {
   label: string;
@@ -147,11 +150,9 @@ export class AccessorQueryBuilderState extends QueryBuilderState {
   }
 
   /**
-   * In accessor mode, the filter panel does not support relation columns,
-   * so we hide it and show the post-filter panel instead.
+   * In accessor mode, configure both filter and post-filter panels to be visible.
    */
   private configureFilterPanelsForAccessor(): void {
-    this.filterState.setShowPanel(false);
     const tdsState = this.fetchStructureState.implementation;
     if (tdsState instanceof QueryBuilderTDSState) {
       tdsState.setShowPostFilterPanel(true);
@@ -197,4 +198,17 @@ export class AccessorQueryBuilderState extends QueryBuilderState {
       new RuntimePointer(PackageableElementExplicitReference.create(val)),
     );
   }
+
+  override buildQueryForPersistence(): RawLambda {
+    if (!this.isQuerySupported) {
+      return this.buildQuery();
+    }
+    return buildRawLambdaFromLambdaFunction(
+      buildLambdaFunction(this, {
+        skipExecutionContext: true,
+        useTypedRelationFunctions: this.isFetchStructureTyped,
+      }),
+      this.graphManagerState,
+    );
+  }
 }

package/src/stores/workflows/dataProduct/DataProductQueryBuilderState.ts

@@ -54,8 +54,10 @@ import {
   GenericTypeExplicitReference,
   findLakehouseAccessPointGroup,
   type PureModel,
-  DataProductAccessType,
+  V1_RelationType,
+  V1_getGenericTypeFullPath,
   LegendSDLC,
+  DataProductAccessType,
 } from '@finos/legend-graph';
 import { QueryBuilderState } from '../../QueryBuilderState.js';
 
@@ -83,22 +85,58 @@ import { compareLabelFn } from '@finos/legend-art';
 import { QueryBuilderEmbeddedFromExecutionContextState } from '../../QueryBuilderExecutionContextState.js';
 import { buildLambdaFunction } from '../../QueryBuilderValueSpecificationBuilder.js';
 
-export const buildDataProductAccessor = (
-  relationMetadata: RelationTypeMetadata,
+export const resolveDataProductAccessor = (
   dataProduct: DataProduct,
   accessPoint: LakehouseAccessPoint,
   graph: PureModel,
+  artifact: V1_DataProductArtifact | undefined,
+  relationMetadata?: RelationTypeMetadata | undefined,
 ): DataProductAccessor => {
   const relationType = new RelationType(accessPoint.title ?? accessPoint.id);
-  relationType.columns = relationMetadata.columns.map(
-    (col) =>
-      new RelationColumn(
-        col.name,
-        GenericTypeExplicitReference.create(
-          new GenericType(graph.getType(col.type)),
-        ),
+  if (artifact) {
+    const artifactGroup = artifact.accessPointGroups.find((apg) =>
+      apg.accessPointImplementations.some(
+        (apImpl) => apImpl.id === accessPoint.id,
       ),
-  );
+    );
+    const artifactImpl = artifactGroup?.accessPointImplementations.find(
+      (apImpl) => apImpl.id === accessPoint.id,
+    );
+    const v1RelationType = artifactImpl?.lambdaGenericType?.typeArguments
+      .map((typeArg) => typeArg.rawType)
+      .find((rawType) => rawType instanceof V1_RelationType);
+    if (v1RelationType) {
+      relationType.columns = v1RelationType.columns.map(
+        (col) =>
+          new RelationColumn(
+            col.name,
+            GenericTypeExplicitReference.create(
+              new GenericType(
+                graph.getType(V1_getGenericTypeFullPath(col.genericType)),
+              ),
+            ),
+          ),
+      );
+      return new DataProductAccessor(
+        dataProduct.path,
+        artifactGroup?.id,
+        accessPoint.id,
+        relationType,
+        dataProduct,
+      );
+    }
+  }
+  if (relationMetadata) {
+    relationType.columns = relationMetadata.columns.map(
+      (col) =>
+        new RelationColumn(
+          col.name,
+          GenericTypeExplicitReference.create(
+            new GenericType(graph.getType(col.type)),
+          ),
+        ),
+    );
+  }
   const groupResult = findLakehouseAccessPointGroup(
     dataProduct,
     accessPoint.id,
@@ -272,7 +310,9 @@ export class LakehouseDataProductExecutionState extends DataProductExecutionStat
     queryBuilderState: DataProductQueryBuilderState,
   ) {
     super(executionState, queryBuilderState);
-    makeObservable(this, {});
+    makeObservable(this, {
+      withAdhocRuntime: observable,
+    });
     this.selectedRuntime = this.compatibleRuntimes[0];
   }
 
@@ -281,6 +321,11 @@ export class LakehouseDataProductExecutionState extends DataProductExecutionStat
     this.queryBuilderState.changeRuntime(val);
   }
 
+  withAdhocRuntime(): LakehouseDataProductExecutionState {
+    this.adhocRuntime = true;
+    return this;
+  }
+
   override get label(): string {
     return this.exectionValue.title ?? this.exectionValue.id;
   }
@@ -413,6 +458,17 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
           ),
         ),
       );
+    } else if (
+      this.executionState instanceof LakehouseDataProductExecutionState &&
+      this.executionState.selectedRuntime
+    ) {
+      this.changeRuntime(
+        new RuntimePointer(
+          PackageableElementExplicitReference.create(
+            this.executionState.selectedRuntime,
+          ),
+        ),
+      );
     }
   }
 
@@ -614,7 +670,9 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
     ) {
       const execContext = new QueryDataProductLakehouseExecutionContext();
       execContext.dataProductPath = this.dataProduct.path;
+      execContext.accessGroupId = this.executionState.exectionValue.__owner.id;
       execContext.accessPointId = this.executionState.exectionValue.id;
+
       return execContext;
     }
     return super.getQueryExecutionContext();
@@ -765,16 +823,18 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
   ): Promise<void> {
     this.setExecutionState(val);
     if (val instanceof LakehouseAccessPoint) {
-      const relationMetadata =
-        await this.graphManagerState.graphManager.getLambdaRelationType(
-          val.func,
-          this.graphManagerState.graph,
-        );
-      const accessor = buildDataProductAccessor(
-        relationMetadata,
+      const relationMetadata = !this.dataProductArtifact
+        ? await this.graphManagerState.graphManager.getLambdaRelationType(
+            val.func,
+            this.graphManagerState.graph,
+          )
+        : undefined;
+      const accessor = resolveDataProductAccessor(
         this.dataProduct,
         val,
         this.graphManagerState.graph,
+        this.dataProductArtifact,
+        relationMetadata,
       );
       this.setSourceElement(accessor);
     }
@@ -942,6 +1002,11 @@ export class DataProductQueryBuilderState extends QueryBuilderState {
         ) {
           accessPointId = this.executionState.exectionValue.key;
           dataProductAccessType = DataProductAccessType.NATIVE;
+        } else if (
+          this.executionState instanceof LakehouseDataProductExecutionState
+        ) {
+          accessPointId = this.executionState.exectionValue.id;
+          dataProductAccessType = DataProductAccessType.LAKEHOUSE;
         } else {
           accessPointId = (
             this.executionState as ModelAccessPointDataProductExecutionState