@finos/legend-query-builder 4.5.0 → 4.6.0

package/lib/stores/filter/QueryBuilderFilterStateBuilder.js.map

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

package/lib/stores/filter/QueryBuilderFilterValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderFilterValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,EAEL,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,KAAK,uBAAuB,EAM7B,MAAM,8BAA8B,CAAC;AA0ItC,eAAO,MAAM,qBAAqB,gBACnB,uBAAuB,kBACpB,cAAc,KAC7B,IA4BF,CAAC"}
+{"version":3,"file":"QueryBuilderFilterValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,EAEL,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,KAAK,uBAAuB,EAM7B,MAAM,8BAA8B,CAAC;AAuJtC,eAAO,MAAM,qBAAqB,gBACnB,uBAAuB,kBACpB,cAAc,KAC7B,IA4BF,CAAC"}

package/lib/stores/filter/QueryBuilderFilterValueSpecificationBuilder.js

@@ -20,6 +20,7 @@ import { fromGroupOperation } from '../QueryBuilderGroupOperationHelper.js';
 import { QueryBuilderFilterTreeConditionNodeData, QueryBuilderFilterTreeGroupNodeData, QueryBuilderFilterTreeExistsNodeData, QueryBuilderFilterTreeOperationNodeData, } from './QueryBuilderFilterState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilderConfig.js';
+import { buildPropertyExpressionChain } from '../QueryBuilderValueSpecificationBuilderHelper.js';
 const buildFilterConditionExpression = (filterState, node) => {
     if (node instanceof QueryBuilderFilterTreeConditionNodeData) {
         const parentNode = node.parentId
@@ -70,7 +71,10 @@ const buildFilterConditionExpression = (filterState, node) => {
                 ? guaranteeType(filterState.nodes.get(guaranteeNonNullable(parentNode.parentId)), QueryBuilderFilterTreeOperationNodeData)
                 : undefined;
         }
-        const propertyExpression = guaranteeNonNullable(node.propertyExpression);
+        const lambdaParameterName = node.parentId
+            ? guaranteeType(filterState.nodes.get(guaranteeNonNullable(node.parentId)), QueryBuilderFilterTreeOperationNodeData).lambdaParameterName
+            : undefined;
+        const propertyExpression = guaranteeNonNullable(buildPropertyExpressionChain(node.propertyExpressionState.propertyExpression, node.propertyExpressionState.queryBuilderState, lambdaParameterName ?? filterState.lambdaParameterName));
         const clauses = node.childrenIds
             .map((e) => filterState.nodes.get(e))
             .filter(isNonNullable)

package/lib/stores/filter/QueryBuilderFilterValueSpecificationBuilder.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -44,8 +44,8 @@
   "dependencies": {
     "@finos/legend-application": "15.0.40",
     "@finos/legend-art": "7.0.40",
-    "@finos/legend-graph": "31.2.0",
-    "@finos/legend-lego": "1.1.27",
+    "@finos/legend-graph": "31.2.1",
+    "@finos/legend-lego": "1.1.29",
     "@finos/legend-server-depot": "6.0.29",
     "@finos/legend-shared": "10.0.25",
     "@finos/legend-storage": "3.0.75",

package/src/__lib__/QueryBuilderTesting.ts

@@ -27,6 +27,7 @@ export enum QUERY_BUILDER_TEST_ID {
   QUERY_BUILDER_EXPLORER = 'query__builder__explorer',
   QUERY_BUILDER_PROPERTY_SEARCH_PANEL = 'query__builder__property__search__panel',
   QUERY_BUILDER_RESULT_PANEL = 'query__builder__result__panel',
+  QUERY_BUILDER_RESULT_ANALYTICS = 'query__builder__result__analytics',
   QUERY_BUILDER_PARAMETERS = 'query-builder__parameters',
   QUERY_BUILDER_CONSTANTS = 'query-builder__constants',
 }

package/src/components/QueryBuilderConstantExpressionPanel.tsx

@@ -45,19 +45,22 @@ import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { DEFAULT_CONSTANT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
-import { QueryBuilderConstantExpressionState } from '../stores/QueryBuilderConstantsState.js';
+import {
+  type QueryBuilderConstantExpressionState,
+  QueryBuilderSimpleConstantExpressionState,
+} from '../stores/QueryBuilderConstantsState.js';
 import { buildDefaultInstanceValue } from '../stores/shared/ValueSpecificationEditorHelper.js';
 import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
 import { QUERY_BUILDER_TEST_ID } from '../__lib__/QueryBuilderTesting.js';
 import { QUERY_BUILDER_DOCUMENTATION_KEY } from '../__lib__/QueryBuilderDocumentation.js';
-import { useState } from 'react';
+import React, { useState } from 'react';
 import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
 
 // NOTE: We currently only allow constant variables for primitive types of multiplicity ONE.
 // This is why we don't show multiplicity in the editor.
 const QueryBuilderConstantExpressionEditor = observer(
-  (props: { constantState: QueryBuilderConstantExpressionState }) => {
+  (props: { constantState: QueryBuilderSimpleConstantExpressionState }) => {
     const { constantState } = props;
     const queryBuilderState = constantState.queryBuilderState;
     const applicationStore = queryBuilderState.applicationStore;
@@ -232,7 +235,7 @@ export const QueryBuilderConstantExpressionPanel = observer(
           Multiplicity.ONE,
         );
         variableEx.genericType = defaultVal.genericType;
-        const constState = new QueryBuilderConstantExpressionState(
+        const constState = new QueryBuilderSimpleConstantExpressionState(
           queryBuilderState,
           variableEx,
           defaultVal,
@@ -241,6 +244,15 @@ export const QueryBuilderConstantExpressionPanel = observer(
       }
     };
 
+    const renderConstantModal = (
+      val: QueryBuilderConstantExpressionState,
+    ): React.ReactNode => {
+      if (val instanceof QueryBuilderSimpleConstantExpressionState) {
+        return <QueryBuilderConstantExpressionEditor constantState={val} />;
+      }
+      return null;
+    };
+
     return (
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_CONSTANTS}
@@ -300,11 +312,8 @@ export const QueryBuilderConstantExpressionPanel = observer(
             )}
           </>
         </div>
-        {constantState.selectedConstant && (
-          <QueryBuilderConstantExpressionEditor
-            constantState={constantState.selectedConstant}
-          />
-        )}
+        {constantState.selectedConstant &&
+          renderConstantModal(constantState.selectedConstant)}
       </div>
     );
   },

package/src/components/QueryBuilderResultPanel.tsx

@@ -1069,7 +1069,10 @@ export const QueryBuilderResultPanel = observer(
               </div>
             )}
 
-            <div className="query-builder__result__analytics">
+            <div
+              data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_RESULT_ANALYTICS}
+              className="query-builder__result__analytics"
+            >
               {resultDescription ?? ''}
             </div>
             {executionResult && resultState.checkForStaleResults && (

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -45,6 +45,7 @@ import {
   MoreVerticalIcon,
   MenuContentItemIcon,
   MenuContentItemLabel,
+  InfoCircleIcon,
 } from '@finos/legend-art';
 import {
   type QueryBuilderFilterConditionDragSource,
@@ -66,7 +67,10 @@ import {
   buildPropertyExpressionFromExplorerTreeNodeData,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
-import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
+import {
+  QueryBuilderPropertyExpressionBadge,
+  QueryBuilderPropertyExpressionEditor,
+} from '../QueryBuilderPropertyExpressionEditor.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   assertErrorThrown,
@@ -242,9 +246,12 @@ export const buildFilterTreeWithExists = (
       const parentPropertyChainIndex = existsLambdaPropertyChains.findIndex(
         (p) =>
           p instanceof AbstractPropertyExpression &&
-          p.func.value === targetDropNode.propertyExpression.func.value &&
+          p.func.value ===
+            targetDropNode.propertyExpressionState.propertyExpression.func
+              .value &&
           p.func.ownerReference.value.path ===
-            targetDropNode.propertyExpression.func.ownerReference.value.path,
+            targetDropNode.propertyExpressionState.propertyExpression.func
+              .ownerReference.value.path,
       );
       if (parentPropertyChainIndex >= 0) {
         parentNode = targetDropNode;
@@ -281,9 +288,10 @@ export const buildFilterTreeWithExists = (
             cn instanceof QueryBuilderFilterTreeExistsNodeData &&
             p.func.value ===
               guaranteeType(cn, QueryBuilderFilterTreeExistsNodeData)
-                .propertyExpression.func.value &&
+                .propertyExpressionState.propertyExpression.func.value &&
             p.func.ownerReference.value.path ===
-              cn.propertyExpression.func.ownerReference.value.path,
+              cn.propertyExpressionState.propertyExpression.func.ownerReference
+                .value.path,
         );
         if (parentPropertyChainIndex >= 0) {
           parentNode = targetDropNode;
@@ -302,7 +310,7 @@ export const buildFilterTreeWithExists = (
   // 3. Create exists tree node for all the property chains and add them to the filter tree
   for (let i = 0; i < existsLambdaPropertyChains.length - 1; ++i) {
     const existsNode: QueryBuilderFilterTreeExistsNodeData =
-      new QueryBuilderFilterTreeExistsNodeData(parentNode?.id);
+      new QueryBuilderFilterTreeExistsNodeData(filterState, parentNode?.id);
     existsNode.setPropertyExpression(
       existsLambdaPropertyChains[i] as AbstractPropertyExpression,
     );
@@ -456,6 +464,15 @@ const QueryBuilderFilterExistsConditionEditor = observer(
     isDroppable: boolean;
   }) => {
     const { node, humanizePropertyName, isDragOver, isDroppable } = props;
+    const hasDerivedPropertyInExpression = Boolean(
+      node.propertyExpressionState.derivedPropertyExpressionStates.length,
+    );
+    const isValid = node.propertyExpressionState.isValid;
+    const setDerivedPropertyArguments = (): void => {
+      if (hasDerivedPropertyInExpression) {
+        node.propertyExpressionState.setIsEditingDerivedProperty(true);
+      }
+    };
 
     return (
       <div className="query-builder-filter-tree__node__label__content dnd__entry__container">
@@ -470,13 +487,32 @@ const QueryBuilderFilterExistsConditionEditor = observer(
           >
             <div className="query-builder-filter-tree__exists-node__label">
               {getPropertyChainName(
-                node.propertyExpression,
+                node.propertyExpressionState.propertyExpression,
                 humanizePropertyName,
               )}
             </div>
             <div className="query-builder-filter-tree__exists-node__exists--label">
               exists
             </div>
+            {hasDerivedPropertyInExpression && (
+              <button
+                className={clsx(
+                  'query-builder-filter-tree__exists-node__exists--label__action',
+                  {
+                    'query-builder-filter-tree__exists-node__exists--label__action--error':
+                      !isValid,
+                  },
+                )}
+                tabIndex={-1}
+                onClick={setDerivedPropertyArguments}
+                title="Set Derived Property Argument(s)..."
+              >
+                {!isValid && <InfoCircleIcon />} (...)
+              </button>
+            )}
+            <QueryBuilderPropertyExpressionEditor
+              propertyExpressionState={node.propertyExpressionState}
+            />
           </div>
         </PanelEntryDropZonePlaceholder>
       </div>

package/src/components/shared/BasicValueSpecificationEditor.tsx

@@ -121,7 +121,7 @@ export const VariableInfoTooltip: React.FC<{
               Type
             </div>
             <div className="value-spec-paramater__tooltip__item__value">
-              {type?.name ?? ''}
+              {type?.name ?? '(unknown)'}
             </div>
           </div>
           <div className="value-spec-paramater__tooltip__item">

package/src/components/shared/CustomDatePicker.tsx

@@ -840,22 +840,21 @@ const AbsoluteTimeValueSpecificationEditor: React.FC<{
   const updateAbsoluteTimeValue: React.ChangeEventHandler<HTMLInputElement> = (
     event,
   ) => {
+    //
+    const value = new Date(event.target.value).getUTCSeconds()
+      ? event.target.value
+      : `${event.target.value}:00`;
     if (valueSpecification instanceof SimpleFunctionExpression) {
       setValueSpecification(
         buildPrimitiveInstanceValue(
           graph,
           PRIMITIVE_TYPE.DATETIME,
-          event.target.value,
+          value,
           observerContext,
         ),
       );
     } else {
-      instanceValue_setValue(
-        valueSpecification,
-        event.target.value,
-        0,
-        observerContext,
-      );
+      instanceValue_setValue(valueSpecification, value, 0, observerContext);
       if (
         valueSpecification.genericType.value.rawType.path !==
         PRIMITIVE_TYPE.DATETIME

package/src/components/shared/QueryBuilderVariableSelector.tsx

@@ -24,9 +24,10 @@ import {
   useDragPreviewLayer,
 } from '@finos/legend-art';
 import {
-  SimpleFunctionExpression,
   type ValueSpecification,
+  SimpleFunctionExpression,
   type VariableExpression,
+  INTERNAL__UnknownValueSpecification,
 } from '@finos/legend-graph';
 import { observer } from 'mobx-react-lite';
 import { useDrag } from 'react-dnd';
@@ -62,11 +63,12 @@ export const VariableViewer = observer(
         if (possibleDateLabel) {
           return possibleDateLabel;
         }
+      } else if (value instanceof INTERNAL__UnknownValueSpecification) {
+        return '(calculated)';
       }
       return getValueSpecificationStringValue(value);
     };
-
-    const valueString = constantValue
+    const constantValueString = constantValue
       ? getNameOfValue(constantValue)
       : undefined;
     const name = variable.name;
@@ -75,6 +77,15 @@ export const VariableViewer = observer(
     const isVariableUsed = queryBuilderState.isVariableUsed(variable);
     const deleteDisabled = isReadOnly || isVariableUsed;
     const deleteTitle = isVariableUsed ? 'Used in query' : 'Remove';
+
+    const isEditDisabled =
+      isReadOnly ||
+      constantValue instanceof INTERNAL__UnknownValueSpecification;
+
+    const editMessage =
+      constantValue instanceof INTERNAL__UnknownValueSpecification
+        ? 'Calculated constants can only be edited via text mode'
+        : 'Edit';
     const editVariable = (): void => {
       actions?.editVariable();
     };
@@ -115,14 +126,14 @@ export const VariableViewer = observer(
           </div>
           <div className="query-builder__variables__variable__label">
             {name}
-            {valueString ? (
+            {constantValueString ? (
               <div className="query-builder__constants__value">
-                {valueString}
+                {constantValueString}
               </div>
             ) : (
               <div className="query-builder__variables__variable__type">
                 <div className="query-builder__variables__variable__type__label">
-                  {typeName}
+                  {typeName ?? 'unknown'}
                 </div>
               </div>
             )}
@@ -133,9 +144,9 @@ export const VariableViewer = observer(
             <button
               className="query-builder__variables__variable__action"
               tabIndex={-1}
-              disabled={isReadOnly}
+              disabled={isEditDisabled}
               onClick={editVariable}
-              title="Edit"
+              title={editMessage}
             >
               <PencilIcon />
             </button>

package/src/stores/QueryBuilderConstantsState.ts

@@ -17,6 +17,7 @@
 import {
   type Type,
   type ValueSpecification,
+  type INTERNAL__UnknownValueSpecification,
   GenericType,
   GenericTypeExplicitReference,
   observe_ValueSpecification,
@@ -37,7 +38,7 @@ import type { QueryBuilderState } from './QueryBuilderState.js';
 import { buildDefaultInstanceValue } from './shared/ValueSpecificationEditorHelper.js';
 import { valueSpecification_setGenericType } from './shared/ValueSpecificationModifierHelper.js';
 
-export class QueryBuilderConstantExpressionState implements Hashable {
+export abstract class QueryBuilderConstantExpressionState implements Hashable {
   readonly queryBuilderState: QueryBuilderState;
   readonly uuid = uuid();
   variable: VariableExpression;
@@ -48,13 +49,36 @@ export class QueryBuilderConstantExpressionState implements Hashable {
     variable: VariableExpression,
     value: ValueSpecification,
   ) {
+    this.queryBuilderState = queryBuilderState;
+    this.variable = variable;
+    this.value = value;
+  }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
+      this.variable.name,
+      this.value,
+    ]);
+  }
+}
+
+export class QueryBuilderSimpleConstantExpressionState
+  extends QueryBuilderConstantExpressionState
+  implements Hashable
+{
+  constructor(
+    queryBuilderState: QueryBuilderState,
+    variable: VariableExpression,
+    value: ValueSpecification,
+  ) {
+    super(queryBuilderState, variable, value);
     makeObservable(this, {
       variable: observable,
       value: observable,
       setValueSpec: action,
       changeValSpecType: action,
     });
-    this.queryBuilderState = queryBuilderState;
     this.value = observe_ValueSpecification(
       value,
       this.queryBuilderState.observerContext,
@@ -63,7 +87,6 @@ export class QueryBuilderConstantExpressionState implements Hashable {
       variable,
       this.queryBuilderState.observerContext,
     );
-    this.variable = variable;
   }
 
   changeValSpecType(type: Type): void {
@@ -106,13 +129,24 @@ export class QueryBuilderConstantExpressionState implements Hashable {
       );
     }
   }
+}
 
-  get hashCode(): string {
-    return hashArray([
-      QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
-      this.variable.name,
-      this.value,
-    ]);
+export class QueryBuilderCalculatedConstantExpressionState
+  extends QueryBuilderConstantExpressionState
+  implements Hashable
+{
+  declare value: INTERNAL__UnknownValueSpecification;
+
+  constructor(
+    queryBuilderState: QueryBuilderState,
+    variable: VariableExpression,
+    value: INTERNAL__UnknownValueSpecification,
+  ) {
+    super(queryBuilderState, variable, value);
+    makeObservable(this, {
+      variable: observable,
+      value: observable,
+    });
   }
 }
 

package/src/stores/QueryBuilderStateBuilder.ts

@@ -31,7 +31,7 @@ import {
   type GraphFetchTreeInstanceValue,
   type ValueSpecificationVisitor,
   InstanceValue,
-  type INTERNAL__UnknownValueSpecification,
+  INTERNAL__UnknownValueSpecification,
   type LambdaFunction,
   type KeyExpressionInstanceValue,
   matchFunctionName,
@@ -81,7 +81,11 @@ import {
 import { LambdaParameterState } from './shared/LambdaParameterState.js';
 import { processTDS_OLAPGroupByExpression } from './fetch-structure/tds/window/QueryBuilderWindowStateBuilder.js';
 import { processWatermarkExpression } from './watermark/QueryBuilderWatermarkStateBuilder.js';
-import { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
+import {
+  type QueryBuilderConstantExpressionState,
+  QueryBuilderCalculatedConstantExpressionState,
+  QueryBuilderSimpleConstantExpressionState,
+} from './QueryBuilderConstantsState.js';
 import { checkIfEquivalent } from './milestoning/QueryBuilderMilestoningHelper.js';
 import type { QueryBuilderParameterValue } from './QueryBuilderParametersState.js';
 import { QueryBuilderEmbeddedFromExecutionContextState } from './QueryBuilderExecutionContextState.js';
@@ -143,12 +147,20 @@ const processLetExpression = (
   );
   // process right side (value)
   const rightSide = guaranteeNonNullable(parameters[1]);
-  // final
-  const constantExpression = new QueryBuilderConstantExpressionState(
-    queryBuilderState,
-    varExp,
-    rightSide,
-  );
+  let constantExpression: QueryBuilderConstantExpressionState;
+  if (rightSide instanceof INTERNAL__UnknownValueSpecification) {
+    constantExpression = new QueryBuilderCalculatedConstantExpressionState(
+      queryBuilderState,
+      varExp,
+      rightSide,
+    );
+  } else {
+    constantExpression = new QueryBuilderSimpleConstantExpressionState(
+      queryBuilderState,
+      varExp,
+      rightSide,
+    );
+  }
   queryBuilderState.constantState.setShowConstantPanel(true);
   queryBuilderState.constantState.addConstant(constantExpression);
 };

package/src/stores/QueryBuilderValueSpecificationBuilder.ts

@@ -40,7 +40,7 @@ import type { QueryBuilderFetchStructureState } from './fetch-structure/QueryBui
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValueSpecificationBuilder.js';
 import { buildExecutionQueryFromLambdaFunction } from './shared/LambdaParameterState.js';
-import type { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
+import { type QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
 import {
   QueryBuilderEmbeddedFromExecutionContextState,
   type QueryBuilderExecutionContextState,

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -343,16 +343,21 @@ export class QueryBuilderFilterTreeExistsNodeData
   extends QueryBuilderFilterTreeOperationNodeData
   implements Hashable
 {
-  propertyExpression!: AbstractPropertyExpression;
+  readonly filterState: QueryBuilderFilterState;
+  propertyExpressionState!: QueryBuilderPropertyExpressionState;
 
-  constructor(parentId: string | undefined) {
+  constructor(
+    filterState: QueryBuilderFilterState,
+    parentId: string | undefined,
+  ) {
     super(parentId);
 
     makeObservable(this, {
-      propertyExpression: observable,
+      propertyExpressionState: observable,
       setPropertyExpression: action,
     });
 
+    this.filterState = filterState;
     this.isOpen = true;
   }
 
@@ -361,7 +366,10 @@ export class QueryBuilderFilterTreeExistsNodeData
   }
 
   setPropertyExpression(val: AbstractPropertyExpression): void {
-    this.propertyExpression = val;
+    this.propertyExpressionState = new QueryBuilderPropertyExpressionState(
+      this.filterState.queryBuilderState,
+      val,
+    );
   }
 
   get hashCode(): string {
@@ -369,7 +377,7 @@ export class QueryBuilderFilterTreeExistsNodeData
       QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_TREE_EXISTS_NODE_DATA,
       this.parentId ?? '',
       hashArray(this.childrenIds),
-      this.propertyExpression,
+      this.propertyExpressionState.propertyExpression,
       this.lambdaParameterName ?? '',
     ]);
   }

package/src/stores/filter/QueryBuilderFilterStateBuilder.ts

@@ -120,6 +120,7 @@ const processFilterTree = (
       propertyExpression.func.value.multiplicity.upperBound > 1
     ) {
       const existsNode = new QueryBuilderFilterTreeExistsNodeData(
+        filterState,
         parentFilterNodeId,
       );
       const lambdaFunctionInstance = guaranteeType(

package/src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts

@@ -37,6 +37,7 @@ import {
 } from './QueryBuilderFilterState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilderConfig.js';
+import { buildPropertyExpressionChain } from '../QueryBuilderValueSpecificationBuilderHelper.js';
 
 const buildFilterConditionExpression = (
   filterState: QueryBuilderFilterState,
@@ -110,7 +111,19 @@ const buildFilterConditionExpression = (
           )
         : undefined;
     }
-    const propertyExpression = guaranteeNonNullable(node.propertyExpression);
+    const lambdaParameterName = node.parentId
+      ? guaranteeType(
+          filterState.nodes.get(guaranteeNonNullable(node.parentId)),
+          QueryBuilderFilterTreeOperationNodeData,
+        ).lambdaParameterName
+      : undefined;
+    const propertyExpression = guaranteeNonNullable(
+      buildPropertyExpressionChain(
+        node.propertyExpressionState.propertyExpression,
+        node.propertyExpressionState.queryBuilderState,
+        lambdaParameterName ?? filterState.lambdaParameterName,
+      ),
+    );
     const clauses = node.childrenIds
       .map((e) => filterState.nodes.get(e))
       .filter(isNonNullable)