@finos/legend-query-builder 4.9.4 → 4.10.0

package/src/components/QueryBuilderResultPanel.tsx

@@ -80,6 +80,7 @@ import {
   type QueryBuilderPostFilterTreeNodeData,
   PostFilterConditionState,
   QueryBuilderPostFilterTreeConditionNodeData,
+  PostFilterValueSpecConditionValueState,
 } from '../stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js';
 import {
   QueryBuilderPostFilterOperator_Equal,
@@ -171,13 +172,13 @@ const QueryBuilderGridResultContextMenu = observer(
         .filter(
           (v) =>
             v instanceof QueryBuilderPostFilterTreeConditionNodeData &&
-            v.condition.columnState instanceof
+            v.condition.leftConditionValue instanceof
               QueryBuilderProjectionColumnState,
         )
         .filter(
           (n) =>
             (n as QueryBuilderPostFilterTreeConditionNodeData).condition
-              .columnState.columnName ===
+              .leftConditionValue.columnName ===
               (projectionColumnName ?? projectionColumnState?.columnName) &&
             operators
               .map((op) => op.getLabel())
@@ -231,7 +232,6 @@ const QueryBuilderGridResultContextMenu = observer(
           postFilterConditionState = new PostFilterConditionState(
             postFilterState,
             possibleProjectionColumnState,
-            undefined,
             operator,
           );
 
@@ -249,7 +249,9 @@ const QueryBuilderGridResultContextMenu = observer(
               postFilterConditionState,
             );
 
-          postFilterConditionState.setValue(defaultFilterConditionValue);
+          postFilterConditionState.buildFromValueSpec(
+            defaultFilterConditionValue,
+          );
           updateFilterConditionValue(
             defaultFilterConditionValue as InstanceValue,
             cellData,
@@ -293,62 +295,65 @@ const QueryBuilderGridResultContextMenu = observer(
         existingPostFilterNode as QueryBuilderPostFilterTreeConditionNodeData
       ).condition;
 
-      if (conditionState.operator.getLabel() === operator.getLabel()) {
-        const doesValueAlreadyExist =
-          conditionState.value instanceof InstanceValue &&
-          (conditionState.value instanceof EnumValueInstanceValue
-            ? conditionState.value.values.map((ef) => ef.value.name)
-            : conditionState.value.values
-          ).includes(cellData.value);
-
-        if (!doesValueAlreadyExist) {
-          const currentValueSpecificaton = conditionState.value;
-          const newValueSpecification =
-            conditionState.operator.getDefaultFilterConditionValue(
-              conditionState,
+      const rightSide = conditionState.rightConditionValue;
+      if (rightSide instanceof PostFilterValueSpecConditionValueState) {
+        if (conditionState.operator.getLabel() === operator.getLabel()) {
+          const doesValueAlreadyExist =
+            rightSide.value instanceof InstanceValue &&
+            (rightSide.value instanceof EnumValueInstanceValue
+              ? rightSide.value.values.map((ef) => ef.value.name)
+              : rightSide.value.values
+            ).includes(cellData.value);
+
+          if (!doesValueAlreadyExist) {
+            const currentValueSpecificaton = rightSide.value;
+            const newValueSpecification =
+              conditionState.operator.getDefaultFilterConditionValue(
+                conditionState,
+              );
+            updateFilterConditionValue(
+              newValueSpecification as InstanceValue,
+              cellData,
             );
-          updateFilterConditionValue(
-            newValueSpecification as InstanceValue,
-            cellData,
-          );
-          conditionState.changeOperator(
-            isFilterBy ? postFilterInOperator : postFilterNotInOperator,
-          );
-          instanceValue_setValues(
-            conditionState.value as InstanceValue,
-            [currentValueSpecificaton, newValueSpecification],
-            tdsState.queryBuilderState.observerContext,
-          );
-        }
-      } else {
-        const doesValueAlreadyExist =
-          conditionState.value instanceof InstanceValue &&
-          conditionState.value.values
-            .filter((v) => v instanceof InstanceValue)
-            .map((v) =>
-              v instanceof EnumValueInstanceValue
-                ? v.values.map((ef) => ef.value.name)
-                : (v as InstanceValue).values,
-            )
-            .flat()
-            .includes(cellData.value ?? data?.value);
-
-        if (!doesValueAlreadyExist) {
-          const newValueSpecification = (
-            isFilterBy ? postFilterEqualOperator : postFilterNotEqualOperator
-          ).getDefaultFilterConditionValue(conditionState);
-          updateFilterConditionValue(
-            newValueSpecification as InstanceValue,
-            cellData,
-          );
-          instanceValue_setValues(
-            conditionState.value as InstanceValue,
-            [
-              ...(conditionState.value as InstanceValue).values,
-              newValueSpecification,
-            ],
-            tdsState.queryBuilderState.observerContext,
-          );
+            conditionState.changeOperator(
+              isFilterBy ? postFilterInOperator : postFilterNotInOperator,
+            );
+            instanceValue_setValues(
+              rightSide.value as InstanceValue,
+              [currentValueSpecificaton, newValueSpecification],
+              tdsState.queryBuilderState.observerContext,
+            );
+          }
+        } else {
+          const doesValueAlreadyExist =
+            rightSide.value instanceof InstanceValue &&
+            rightSide.value.values
+              .filter((v) => v instanceof InstanceValue)
+              .map((v) =>
+                v instanceof EnumValueInstanceValue
+                  ? v.values.map((ef) => ef.value.name)
+                  : (v as InstanceValue).values,
+              )
+              .flat()
+              .includes(cellData.value ?? data?.value);
+
+          if (!doesValueAlreadyExist) {
+            const newValueSpecification = (
+              isFilterBy ? postFilterEqualOperator : postFilterNotEqualOperator
+            ).getDefaultFilterConditionValue(conditionState);
+            updateFilterConditionValue(
+              newValueSpecification as InstanceValue,
+              cellData,
+            );
+            instanceValue_setValues(
+              rightSide.value as InstanceValue,
+              [
+                ...(rightSide.value as InstanceValue).values,
+                newValueSpecification,
+              ],
+              tdsState.queryBuilderState.observerContext,
+            );
+          }
         }
       }
     };

package/src/components/__test-utils__/QueryBuilderComponentTestUtils.tsx

@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 
-import { type RenderResult, render, waitFor } from '@testing-library/react';
+import {
+  type RenderResult,
+  render,
+  waitFor,
+  fireEvent,
+  findByText,
+  getByText,
+} from '@testing-library/react';
 import { LogService } from '@finos/legend-shared';
 import { createSpy } from '@finos/legend-shared/test';
 import {
@@ -43,6 +50,23 @@ import {
   TEST__getGenericApplicationConfig,
 } from '../../stores/__test-utils__/QueryBuilderStateTestUtils.js';
 
+export const dragAndDrop = async (
+  source: HTMLElement,
+  drop: HTMLElement,
+  panel: HTMLElement,
+  draggingHoverText?: string,
+): Promise<void> => {
+  fireEvent.dragStart(source);
+  fireEvent.dragEnter(drop);
+  fireEvent.dragOver(drop);
+  if (draggingHoverText) {
+    await findByText(panel, draggingHoverText);
+    fireEvent.drop(getByText(panel, draggingHoverText));
+  } else {
+    fireEvent.dragOver(drop);
+  }
+};
+
 export const TEST__setUpQueryBuilder = async (
   entities: Entity[],
   lambda: RawLambda,

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -61,7 +61,13 @@ import {
 } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
+import React, {
+  forwardRef,
+  useCallback,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { useDrop, useDrag, useDragLayer } from 'react-dnd';
 import { QueryBuilderAggregateColumnState } from '../../stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.js';
 import type { QueryBuilderPostFilterOperator } from '../../stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.js';
@@ -74,6 +80,8 @@ import {
   QueryBuilderPostFilterTreeGroupNodeData,
   QueryBuilderPostFilterTreeBlankConditionNodeData,
   QUERY_BUILDER_POST_FILTER_DND_TYPE,
+  PostFilterValueSpecConditionValueState,
+  PostFilterTDSColumnValueConditionValueState,
 } from '../../stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js';
 import {
   type QueryBuilderProjectionColumnState,
@@ -203,14 +211,14 @@ const QueryBuilderPostFilterGroupConditionEditor = observer(
 
 export const QueryBuilderColumnBadge = observer(
   (props: {
-    postFilterConditionState: PostFilterConditionState;
+    colState: QueryBuilderTDSColumnState;
     onColumnChange: (
       columnState: QueryBuilderProjectionColumnState,
     ) => Promise<void>;
   }) => {
-    const { postFilterConditionState, onColumnChange } = props;
+    const { colState, onColumnChange } = props;
     const applicationStore = useApplicationStore();
-    const type = postFilterConditionState.columnState.getColumnType();
+    const type = colState.getColumnType();
     const handleDrop = useCallback(
       (item: QueryBuilderProjectionColumnDragSource): Promise<void> =>
         onColumnChange(item.columnState),
@@ -261,12 +269,12 @@ export const QueryBuilderColumnBadge = observer(
             )}
             <div
               className="query-builder-column-badge__property"
-              title={`${postFilterConditionState.columnName}`}
+              title={`${colState.columnName}`}
             >
-              {postFilterConditionState.columnName}
+              {colState.columnName}
             </div>
             <QueryBuilderColumnInfoTooltip
-              columnState={postFilterConditionState.columnState}
+              columnState={colState}
               placement="bottom-end"
             >
               <div className="query-builder-column-badge__property__info">
@@ -291,13 +299,15 @@ const QueryBuilderPostFilterConditionEditor = observer(
     const applicationStore = useApplicationStore();
     const changeOperator = (val: QueryBuilderPostFilterOperator) => (): void =>
       node.condition.changeOperator(val);
+    const rightConditionValue = node.condition.rightConditionValue;
     const changeColumn = async (
       columnState: QueryBuilderProjectionColumnState,
     ): Promise<void> => {
       const currentColState =
-        node.condition.columnState instanceof QueryBuilderAggregateColumnState
-          ? node.condition.columnState.projectionColumnState
-          : node.condition.columnState;
+        node.condition.leftConditionValue instanceof
+        QueryBuilderAggregateColumnState
+          ? node.condition.leftConditionValue.projectionColumnState
+          : node.condition.leftConditionValue;
       if (currentColState !== columnState) {
         await flowResult(node.condition.changeColumn(columnState));
       }
@@ -306,12 +316,13 @@ const QueryBuilderPostFilterConditionEditor = observer(
     const handleDrop = useCallback(
       (item: QueryBuilderVariableDragSource): void => {
         const parameterType = item.variable.genericType?.value.rawType;
-        const conditionValueType = node.condition.columnState.getColumnType();
+        const conditionValueType =
+          node.condition.leftConditionValue.getColumnType();
         if (
           conditionValueType &&
           isTypeCompatibleForAssignment(parameterType, conditionValueType)
         ) {
-          node.condition.setValue(item.variable);
+          node.condition.buildFromValueSpec(item.variable);
         } else {
           applicationStore.notificationService.notifyWarning(
             `Incompatible parameter type ${parameterType?.name}. ${parameterType?.name} is not compatible with type ${conditionValueType?.name}.`,
@@ -339,7 +350,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
       [handleDrop],
     );
     const resetNode = (): void => {
-      node.condition.setValue(
+      node.condition.buildFromValueSpec(
         node.condition.operator.getDefaultFilterConditionValue(node.condition),
       );
     };
@@ -355,7 +366,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
       node.condition.typeaheadSearchState.complete();
     };
     const changeValueSpecification = (val: ValueSpecification): void => {
-      node.condition.setValue(val);
+      node.condition.buildFromValueSpec(val);
     };
     const selectorConfig = {
       values: node.condition.typeaheadSearchResults,
@@ -371,6 +382,70 @@ const QueryBuilderPostFilterConditionEditor = observer(
           monitor.getItemType() === QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE),
     }));
 
+    const renderRightVal = (): React.ReactNode => {
+      if (
+        rightConditionValue instanceof PostFilterValueSpecConditionValueState &&
+        rightConditionValue.value
+      ) {
+        return (
+          <div
+            ref={dropConnector}
+            className="query-builder-post-filter-tree__condition-node__value"
+          >
+            <PanelEntryDropZonePlaceholder
+              isDragOver={isFilterValueDragOver}
+              label="Change Filter Value"
+            >
+              <BasicValueSpecificationEditor
+                valueSpecification={rightConditionValue.value}
+                setValueSpecification={changeValueSpecification}
+                graph={graph}
+                obseverContext={queryBuilderState.observerContext}
+                typeCheckOption={{
+                  expectedType: guaranteeNonNullable(
+                    node.condition.leftConditionValue.getColumnType(),
+                  ),
+                }}
+                resetValue={resetNode}
+                selectorConfig={selectorConfig}
+                isConstant={queryBuilderState.constantState.isValueSpecConstant(
+                  rightConditionValue.value,
+                )}
+              />
+            </PanelEntryDropZonePlaceholder>
+          </div>
+        );
+      } else if (
+        rightConditionValue instanceof
+        PostFilterTDSColumnValueConditionValueState
+      ) {
+        const changeRightCol = async (
+          columnState: QueryBuilderProjectionColumnState,
+        ): Promise<void> => {
+          rightConditionValue.changeCol(columnState);
+        };
+        return (
+          <div
+            ref={dropConnector}
+            className="query-builder-post-filter-tree__condition-node__value"
+          >
+            <PanelEntryDropZonePlaceholder
+              isDragOver={isFilterValueDragOver}
+              label="Change Filter Value"
+            >
+              <div className="query-builder-post-filter-tree__condition-node__property">
+                <QueryBuilderColumnBadge
+                  colState={rightConditionValue.tdsColumn}
+                  onColumnChange={changeRightCol}
+                />
+              </div>
+            </PanelEntryDropZonePlaceholder>
+          </div>
+        );
+      }
+      return null;
+    };
+
     return (
       <div className="query-builder-post-filter-tree__node__label__content dnd__entry__container">
         <PanelEntryDropZonePlaceholder
@@ -381,7 +456,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
           <div className="query-builder-post-filter-tree__condition-node">
             <div className="query-builder-post-filter-tree__condition-node__property">
               <QueryBuilderColumnBadge
-                postFilterConditionState={node.condition}
+                colState={node.condition.leftConditionValue}
                 onColumnChange={changeColumn}
               />
             </div>
@@ -414,34 +489,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
                 <CaretDownIcon />
               </div>
             </DropdownMenu>
-            {node.condition.value && (
-              <div
-                ref={dropConnector}
-                className="query-builder-post-filter-tree__condition-node__value"
-              >
-                <PanelEntryDropZonePlaceholder
-                  isDragOver={isFilterValueDragOver}
-                  label="Change Filter Value"
-                >
-                  <BasicValueSpecificationEditor
-                    valueSpecification={node.condition.value}
-                    setValueSpecification={changeValueSpecification}
-                    graph={graph}
-                    obseverContext={queryBuilderState.observerContext}
-                    typeCheckOption={{
-                      expectedType: guaranteeNonNullable(
-                        node.condition.columnState.getColumnType(),
-                      ),
-                    }}
-                    resetValue={resetNode}
-                    selectorConfig={selectorConfig}
-                    isConstant={queryBuilderState.constantState.isValueSpecConstant(
-                      node.condition.value,
-                    )}
-                  />
-                </PanelEntryDropZonePlaceholder>
-              </div>
-            )}
+            {renderRightVal()}
           </div>
         </PanelEntryDropZonePlaceholder>
       </div>
@@ -538,9 +586,8 @@ const QueryBuilderPostFilterTreeNodeContainer = observer(
               postFilterState,
               columnState,
               undefined,
-              undefined,
             );
-            conditionState.setValue(
+            conditionState.buildFromValueSpec(
               conditionState.operator.getDefaultFilterConditionValue(
                 conditionState,
               ),
@@ -648,6 +695,9 @@ const QueryBuilderPostFilterTreeNodeContainer = observer(
       >
         <div
           ref={ref}
+          data-testid={
+            QUERY_BUILDER_TEST_ID.QUERY_BUILDER_POST_FILTER_TREE_NODE_CONTENT
+          }
           className={clsx(
             'tree-view__node__container query-builder-post-filter-tree__node__container',
             {
@@ -679,6 +729,10 @@ const QueryBuilderPostFilterTreeNodeContainer = observer(
             <div
               className={clsx(
                 'tree-view__node__label query-builder-post-filter-tree__node__label',
+                {
+                  'query-builder-post-filter-tree__node__label--expandable':
+                    isExpandable,
+                },
               )}
             >
               {node instanceof QueryBuilderPostFilterTreeGroupNodeData && (
@@ -894,9 +948,8 @@ const QueryBuilderPostFilterPanelContent = observer(
             postFilterState,
             aggregateColumnState ?? columnState,
             undefined,
-            undefined,
           );
-          postFilterConditionState.setValue(
+          postFilterConditionState.buildFromValueSpec(
             postFilterConditionState.operator.getDefaultFilterConditionValue(
               postFilterConditionState,
             ),
@@ -959,7 +1012,7 @@ const QueryBuilderPostFilterPanelContent = observer(
           <div className="panel__header__actions">
             <DropdownMenu
               className="panel__header__action"
-              title="Show Filter Options Menu..."
+              title="Show Post-Filter Options Menu..."
               content={
                 <MenuContent>
                   <MenuContentItem onClick={createCondition}>
@@ -1091,7 +1144,7 @@ export const QueryBuilderPostFilterPanel = observer(
 
     return (
       <div
-        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_POST_FILTER}
+        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_POST_FILTER_PANEL}
         className="panel"
       >
         {fetchStructureImplementation instanceof QueryBuilderTDSState && (

package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx

@@ -688,7 +688,6 @@ const QueryBuilderProjectionColumnEditor = observer(
       }),
       [handleDrop],
     );
-
     return (
       <PanelDnDEntry
         ref={ref}
@@ -732,7 +731,12 @@ const QueryBuilderProjectionColumnEditor = observer(
           onOpen={onContextMenuOpen}
           onClose={onContextMenuClose}
         >
-          <div className="query-builder__projection__column__container">
+          <div
+            data-testid={
+              QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS_PROJECTION_COLUMN
+            }
+            className="query-builder__projection__column__container"
+          >
             <PanelEntryDragHandle
               isDragging={false}
               dragSourceConnector={dragHandleRef}

package/src/stores/QueryBuilderConstantsState.ts

@@ -24,6 +24,12 @@ import {
   buildSourceInformationSourceId,
   ParserError,
   GRAPH_MANAGER_EVENT,
+  SimpleFunctionExpression,
+  PrimitiveInstanceValue,
+  PrimitiveType,
+  extractElementNameFromPath,
+  SUPPORTED_FUNCTIONS,
+  INTERNAL__UnknownValueSpecification,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -70,6 +76,22 @@ export abstract class QueryBuilderConstantExpressionState implements Hashable {
       this.variable.name,
     ]);
   }
+
+  buildLetExpression(): SimpleFunctionExpression {
+    const leftSide = new PrimitiveInstanceValue(
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
+    );
+    leftSide.values = [this.variable.name];
+    const letFunc = new SimpleFunctionExpression(
+      extractElementNameFromPath(SUPPORTED_FUNCTIONS.LET),
+    );
+    letFunc.parametersValues = [leftSide, this.buildLetAssignmentValue()];
+    return letFunc;
+  }
+
+  abstract buildLetAssignmentValue(): ValueSpecification;
 }
 
 export class QueryBuilderSimpleConstantExpressionState
@@ -141,6 +163,10 @@ export class QueryBuilderSimpleConstantExpressionState
     }
   }
 
+  override buildLetAssignmentValue(): ValueSpecification {
+    return this.value;
+  }
+
   override get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
@@ -272,6 +298,10 @@ export class QueryBuilderCalculatedConstantExpressionState
   setValue(val: PlainObject): void {
     this.value = val;
   }
+
+  override buildLetAssignmentValue(): ValueSpecification {
+    return new INTERNAL__UnknownValueSpecification(this.value);
+  }
 }
 
 export class QueryBuilderConstantsState implements Hashable {

package/src/stores/QueryBuilderStateHashUtils.ts

@@ -45,6 +45,8 @@ export enum QUERY_BUILDER_STATE_HASH_STRUCTURE {
   POST_FILTER_TREE_CONDIITION_NODE_DATA = 'POST_FILTER_TREE_CONDITION_NODE_DATA',
   POST_FILTER_TREE_BLANK_CONDITION_NODE_DATA = 'POST_FILTER_TREE_BLANK_CONDITION_NODE_DATA',
   POST_FILTER_CONDITION_STATE = 'POST_FILTER_CONDITION_STATE',
+  POST_FILTER_CONDITION_RIGHT_VALUE = 'POST_FILTER_CONDITION_RIGHT_VALUE',
+  POST_FILTER_CONDITION_RIGHT_VALUE_SPEC = 'POST_FILTER_CONDITION_RIGHT_VALUE_SPEC',
   POST_FILTER_OPERATOR_CONTAIN = 'POST_FILTER_OPERATOR_CONTAIN',
   POST_FILTER_OPERATOR_NOT_CONTAIN = 'POST_FILTER_OPERATOR_NOT_CONTAIN',
   POST_FILTER_OPERATOR_END_WITH = 'POST_FILTER_OPERATOR_END_WITH',

package/src/stores/QueryBuilderValueSpecificationBuilder.ts

@@ -14,14 +14,9 @@
  * limitations under the License.
  */
 
-import {
-  UnsupportedOperationError,
-  guaranteeNonNullable,
-  guaranteeType,
-} from '@finos/legend-shared';
+import { guaranteeNonNullable, guaranteeType } from '@finos/legend-shared';
 import {
   type Class,
-  type ValueSpecification,
   Multiplicity,
   getMilestoneTemporalStereotype,
   extractElementNameFromPath,
@@ -33,11 +28,8 @@ import {
   GenericTypeExplicitReference,
   LambdaFunction,
   SimpleFunctionExpression,
-  PrimitiveInstanceValue,
-  PrimitiveType,
   SUPPORTED_FUNCTIONS,
   RuntimePointer,
-  INTERNAL__UnknownValueSpecification,
 } from '@finos/legend-graph';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import { buildFilterExpression } from './filter/QueryBuilderFilterValueSpecificationBuilder.js';
@@ -46,11 +38,6 @@ 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 {
-  QueryBuilderSimpleConstantExpressionState,
-  type QueryBuilderConstantExpressionState,
-  QueryBuilderCalculatedConstantExpressionState,
-} from './QueryBuilderConstantsState.js';
 import {
   QueryBuilderEmbeddedFromExecutionContextState,
   type QueryBuilderExecutionContextState,
@@ -90,40 +77,6 @@ const buildGetAllVersionsFunction = (
   return _func;
 };
 
-const buildLetExpression = (
-  constantExpressionState: QueryBuilderConstantExpressionState,
-): SimpleFunctionExpression => {
-  const varName = constantExpressionState.variable.name;
-  const leftSide = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
-  );
-  leftSide.values = [varName];
-  const letFunc = new SimpleFunctionExpression(
-    extractElementNameFromPath(SUPPORTED_FUNCTIONS.LET),
-  );
-  let value: ValueSpecification;
-  if (
-    constantExpressionState instanceof QueryBuilderSimpleConstantExpressionState
-  ) {
-    value = constantExpressionState.value;
-  } else if (
-    constantExpressionState instanceof
-    QueryBuilderCalculatedConstantExpressionState
-  ) {
-    value = new INTERNAL__UnknownValueSpecification(
-      constantExpressionState.value,
-    );
-  } else {
-    throw new UnsupportedOperationError(
-      `Can't build let() expression: unsupported constant state`,
-      constantExpressionState,
-    );
-  }
-
-  letFunc.parametersValues = [leftSide, value];
-  return letFunc;
-};
-
 const buildExecutionContextState = (
   executionState: QueryBuilderExecutionContextState,
   lambdaFunction: LambdaFunction,
@@ -237,8 +190,9 @@ export const buildLambdaFunction = (
 
   // build variable expressions
   if (queryBuilderState.constantState.constants.length) {
-    const letExpressions =
-      queryBuilderState.constantState.constants.map(buildLetExpression);
+    const letExpressions = queryBuilderState.constantState.constants.map((e) =>
+      e.buildLetExpression(),
+    );
     lambdaFunction.expressionSequence = [
       ...letExpressions,
       ...lambdaFunction.expressionSequence,

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.ts

@@ -48,7 +48,7 @@ export abstract class QueryBuilderPostFilterOperator implements Hashable {
   isCompatibleWithPostFilterColumn(
     postFilterState: PostFilterConditionState,
   ): boolean {
-    const columnType = postFilterState.columnState.getColumnType();
+    const columnType = postFilterState.leftConditionValue.getColumnType();
     if (columnType) {
       return this.isCompatibleWithType(columnType);
     }