@finos/legend-query-builder 4.9.3 → 4.10.0

package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js.map

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

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

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

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

@@ -217,9 +217,23 @@ export class QueryBuilderDerivationProjectionColumnState extends QueryBuilderPro
         const variable = projectionParameter[0];
         assertNonEmptyString(variable.name);
         // assign variable to query class
-        const rawVariableExpression = new RawVariableExpression(variable.name, Multiplicity.ONE, PackageableElementExplicitReference.create(guaranteeNonNullable(this.tdsState.queryBuilderState.class)));
-        const _rawVariableExpression = this.tdsState.queryBuilderState.graphManagerState.graphManager.serializeRawValueSpecification(rawVariableExpression);
-        const isolatedLambda = new RawLambda([_rawVariableExpression], this.lambda.body);
+        const queryBuilderState = this.tdsState.queryBuilderState;
+        const rawVariableExpression = new RawVariableExpression(variable.name, Multiplicity.ONE, PackageableElementExplicitReference.create(guaranteeNonNullable(queryBuilderState.class)));
+        const _rawVariableExpression = queryBuilderState.graphManagerState.graphManager.serializeRawValueSpecification(rawVariableExpression);
+        const parameters = queryBuilderState.parametersState.parameterStates.map((_param) => queryBuilderState.graphManagerState.graphManager.serializeValueSpecification(_param.parameter));
+        const letExpressions = queryBuilderState.constantState.constants
+            .map((_const) => _const.buildLetExpression())
+            .map((expres) => queryBuilderState.graphManagerState.graphManager.serializeValueSpecification(expres));
+        let lambdaBody = this.lambda.body;
+        if (letExpressions.length) {
+            if (Array.isArray(this.lambda.body)) {
+                lambdaBody = [...letExpressions, ...this.lambda.body];
+            }
+            else {
+                lambdaBody = [...letExpressions, this.lambda.body];
+            }
+        }
+        const isolatedLambda = new RawLambda([_rawVariableExpression, ...parameters], lambdaBody);
         return isolatedLambda;
     }
     setLambdaReturnType(type) {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "4.9.3",
+  "version": "4.10.0",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -42,10 +42,10 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "15.0.44",
-    "@finos/legend-art": "7.0.44",
-    "@finos/legend-graph": "31.3.4",
-    "@finos/legend-lego": "1.1.37",
+    "@finos/legend-application": "15.0.45",
+    "@finos/legend-art": "7.0.45",
+    "@finos/legend-graph": "31.3.5",
+    "@finos/legend-lego": "1.1.39",
     "@finos/legend-server-depot": "6.0.31",
     "@finos/legend-shared": "10.0.27",
     "@finos/legend-storage": "3.0.77",

package/src/__lib__/QueryBuilderTesting.ts

@@ -20,6 +20,7 @@ export enum QUERY_BUILDER_TEST_ID {
   QUERY_BUILDER = 'query__builder',
   QUERY_BUILDER_SETUP = 'query__builder__setup',
   QUERY_BUILDER_TDS = 'query__builder__tds',
+  QUERY_BUILDER_TDS_PROJECTION_COLUMN = 'QUERY_BUILDER_TDS_PROJECTION_COLUMN',
   QUERY_BUILDER_TDS_RESULT_MODIFIER_PROMPT = 'query-builder__tds__result-modifier-prompt',
   QUERY_BUILDER_GRAPH_FETCH = 'query__builder__graph__fetch',
   // filter panel
@@ -27,7 +28,9 @@ export enum QUERY_BUILDER_TEST_ID {
   QUERY_BUILDER_FILTER_TREE = 'query__builder__filter__tree',
   QUERY_BUILDER_FILTER_TREE_NODE = 'query__builder__filter__tree__node',
   QUERY_BUILDER_FILTER_TREE_NODE_CONTENT = 'query__builder__filter__tree__node-content',
-  QUERY_BUILDER_POST_FILTER = 'query__builder__post-filter',
+  // post filter
+  QUERY_BUILDER_POST_FILTER_PANEL = 'query__builder__post__filter-panel',
+  QUERY_BUILDER_POST_FILTER_TREE_NODE_CONTENT = 'query__builder__post__filter-tree-node__content',
   QUERY_BUILDER_WINDOW_GROUPBY = 'query__builder__window',
   QUERY_BUILDER_EXPLORER = 'query__builder__explorer',
   QUERY_BUILDER_PROPERTY_SEARCH_PANEL = 'query__builder__property__search__panel',

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 && (