@finos/legend-query-builder 4.0.8 → 4.0.10

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -56,7 +56,7 @@ import {
   QueryBuilderFilterTreeBlankConditionNodeData,
   QueryBuilderFilterTreeGroupNodeData,
 } from '../../stores/filter/QueryBuilderFilterState.js';
-import { useDrag, useDrop } from 'react-dnd';
+import { useDrag, useDragLayer, useDrop } from 'react-dnd';
 import {
   type QueryBuilderExplorerTreeDragSource,
   type QueryBuilderExplorerTreePropertyNodeData,
@@ -88,12 +88,26 @@ import {
 } from '../shared/BasicValueSpecificationEditor.js';
 import { QueryBuilderTelemetryHelper } from '../../__lib__/QueryBuilderTelemetryHelper.js';
 
+export const IS_DRAGGABLE_FILTER_DND_TYPES_FETCH_SUPPORTED = [
+  QUERY_BUILDER_FILTER_DND_TYPE.CONDITION,
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
+  QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
+];
+
+export const IS_DRAGGABLE_FILTER_DND_TYPES = [
+  QUERY_BUILDER_FILTER_DND_TYPE.CONDITION,
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
+  QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
+];
+
 const QueryBuilderFilterGroupConditionEditor = observer(
   (props: {
     node: QueryBuilderFilterTreeGroupNodeData;
     isDragOver: boolean;
+    showDroppableSuggestion: boolean;
   }) => {
-    const { node, isDragOver } = props;
+    const { node, isDragOver, showDroppableSuggestion } = props;
     const switchOperation: React.MouseEventHandler<HTMLDivElement> = (
       event,
     ): void => {
@@ -105,30 +119,31 @@ const QueryBuilderFilterGroupConditionEditor = observer(
       );
     };
     return (
-      <div className="query-builder-filter-tree__node__label__content">
-        <PanelEntryDropZonePlaceholder
-          showPlaceholder={isDragOver}
-          label="Add to Logical Group"
-          className="query-builder__dnd__placeholder"
-        >
+      <div className="query-builder-filter-tree__node__label__content dnd__entry__container">
+        {showDroppableSuggestion && (
           <div
-            className={clsx('query-builder-filter-tree__group-node', {
-              'query-builder-filter-tree__group-node--and':
-                node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.AND,
-              'query-builder-filter-tree__group-node--or':
-                node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.OR,
+            className={clsx('dnd__entry--droppable__indicator ', {
+              'dnd__entry--droppable__indicator--dragover': isDragOver,
             })}
-            title="Switch Operation"
-            onClick={switchOperation}
-          >
-            <div className="query-builder-filter-tree__group-node__label">
-              {node.groupOperation}
-            </div>
-            <button className="query-builder-filter-tree__group-node__action">
-              <FilledTriangleIcon />
-            </button>
+          ></div>
+        )}
+        <div
+          className={clsx('query-builder-filter-tree__group-node', {
+            'query-builder-filter-tree__group-node--and':
+              node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.AND,
+            'query-builder-filter-tree__group-node--or':
+              node.groupOperation === QUERY_BUILDER_GROUP_OPERATION.OR,
+          })}
+          title="Switch Operation"
+          onClick={switchOperation}
+        >
+          <div className="query-builder-filter-tree__group-node__label">
+            {node.groupOperation}
           </div>
-        </PanelEntryDropZonePlaceholder>
+          <button className="query-builder-filter-tree__group-node__action">
+            <FilledTriangleIcon />
+          </button>
+        </div>
       </div>
     );
   },
@@ -190,6 +205,7 @@ const QueryBuilderFilterConditionEditor = observer(
       }),
       [handleDrop],
     );
+
     const resetNode = (): void => {
       node.condition.setValue(
         node.condition.operator.getDefaultFilterConditionValue(node.condition),
@@ -215,8 +231,29 @@ const QueryBuilderFilterConditionEditor = observer(
       reloadValues: debouncedTypeaheadSearch,
       cleanUpReloadValues,
     };
+
+    const { showDroppableSuggestion } = useDragLayer((monitor) => ({
+      showDroppableSuggestion:
+        monitor.isDragging() &&
+        (queryBuilderState.TEMPORARY__isDnDFetchStructureToFilterSupported
+          ? IS_DRAGGABLE_FILTER_DND_TYPES_FETCH_SUPPORTED
+          : IS_DRAGGABLE_FILTER_DND_TYPES
+        ).includes(monitor.getItemType()?.toString() ?? ''),
+    }));
+
     return (
-      <div className="query-builder-filter-tree__node__label__content">
+      <div className="query-builder-filter-tree__node__label__content dnd__entry__container">
+        {showDroppableSuggestion && (
+          <div
+            className={clsx(
+              'dnd__entry--droppable__indicator dnd__entry-potential__oiodropzone__indicator--full',
+              {
+                'dnd__entry--droppable__indicator--dragover': isDragOver,
+              },
+            )}
+          ></div>
+        )}
+
         <PanelEntryDropZonePlaceholder
           showPlaceholder={isDragOver}
           label="Add New Logical Group"
@@ -299,8 +336,9 @@ const QueryBuilderFilterBlankConditionEditor = observer(
   (props: {
     node: QueryBuilderFilterTreeBlankConditionNodeData;
     isDragOver: boolean;
+    showDroppableSuggestion: boolean;
   }) => {
-    const { isDragOver } = props;
+    const { isDragOver, showDroppableSuggestion } = props;
     return (
       <div className="query-builder-filter-tree__node__label__content">
         <PanelEntryDropZonePlaceholder
@@ -308,6 +346,9 @@ const QueryBuilderFilterBlankConditionEditor = observer(
           label="Create Condition"
           className="query-builder__dnd__placeholder"
         >
+          {showDroppableSuggestion && (
+            <div className="query-builder-filter-tree__blank-node--droppable"></div>
+          )}
           <div className="query-builder-filter-tree__blank-node">blank</div>
         </PanelEntryDropZonePlaceholder>
       </div>
@@ -390,11 +431,31 @@ const QueryBuilderFilterTreeNodeContainer = observer(
     // Drag and Drop
     const handleDrop = useCallback(
       (item: QueryBuilderFilterDropTarget, type: string): void => {
-        if (
-          Object.values<string>(QUERY_BUILDER_FILTER_DND_TYPE).includes(type)
-        ) {
-          // const dropNode = (item as QueryBuilderFilterConditionDragSource).node;
-          // TODO: re-arrange
+        if (QUERY_BUILDER_FILTER_DND_TYPE.CONDITION === type) {
+          const nodeBeingDragged = (
+            item as QueryBuilderFilterConditionDragSource
+          ).node;
+
+          const newCreatedNode = new QueryBuilderFilterTreeConditionNodeData(
+            undefined,
+            (
+              filterState.nodes.get(
+                nodeBeingDragged.id,
+              ) as QueryBuilderFilterTreeConditionNodeData
+            ).condition,
+          );
+
+          if (node instanceof QueryBuilderFilterTreeBlankConditionNodeData) {
+            filterState.replaceBlankNodeWithNode(newCreatedNode, node);
+            filterState.removeNodeAndPruneBranch(nodeBeingDragged);
+          } else if (node instanceof QueryBuilderFilterTreeConditionNodeData) {
+            filterState.newGroupWithConditionFromNode(newCreatedNode, node);
+
+            filterState.removeNodeAndPruneBranch(nodeBeingDragged);
+          } else if (node instanceof QueryBuilderFilterTreeGroupNodeData) {
+            filterState.addNodeFromNode(newCreatedNode, node);
+            filterState.removeNodeAndPruneBranch(nodeBeingDragged);
+          }
         } else {
           let filterConditionState: FilterConditionState;
           try {
@@ -469,17 +530,8 @@ const QueryBuilderFilterTreeNodeContainer = observer(
       () => ({
         accept:
           queryBuilderState.TEMPORARY__isDnDFetchStructureToFilterSupported
-            ? [
-                ...Object.values(QUERY_BUILDER_FILTER_DND_TYPE),
-                QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
-                QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-                QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
-              ]
-            : [
-                ...Object.values(QUERY_BUILDER_FILTER_DND_TYPE),
-                QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
-                QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,
-              ],
+            ? IS_DRAGGABLE_FILTER_DND_TYPES_FETCH_SUPPORTED
+            : IS_DRAGGABLE_FILTER_DND_TYPES,
         drop: (item, monitor): void => {
           if (!monitor.didDrop()) {
             handleDrop(item, monitor.getItemType() as string);
@@ -508,6 +560,15 @@ const QueryBuilderFilterTreeNodeContainer = observer(
     dragConnector(dropConnector(ref));
     useDragPreviewLayer(dragPreviewConnector);
 
+    const { showDroppableSuggestion } = useDragLayer((monitor) => ({
+      showDroppableSuggestion:
+        monitor.isDragging() &&
+        (queryBuilderState.TEMPORARY__isDnDFetchStructureToFilterSupported
+          ? IS_DRAGGABLE_FILTER_DND_TYPES_FETCH_SUPPORTED
+          : IS_DRAGGABLE_FILTER_DND_TYPES
+        ).includes(monitor.getItemType()?.toString() ?? ''),
+    }));
+
     // context menu
     const onContextMenuOpen = (): void => setIsSelectedFromContextMenu(true);
     const onContextMenuClose = (): void => setIsSelectedFromContextMenu(false);
@@ -566,6 +627,7 @@ const QueryBuilderFilterTreeNodeContainer = observer(
               {node instanceof QueryBuilderFilterTreeGroupNodeData && (
                 <QueryBuilderFilterGroupConditionEditor
                   node={node}
+                  showDroppableSuggestion={showDroppableSuggestion}
                   isDragOver={isDragOver}
                 />
               )}
@@ -579,6 +641,7 @@ const QueryBuilderFilterTreeNodeContainer = observer(
                 <QueryBuilderFilterBlankConditionEditor
                   node={node}
                   isDragOver={isDragOver}
+                  showDroppableSuggestion={showDroppableSuggestion}
                 />
               )}
             </div>
@@ -747,6 +810,16 @@ export const QueryBuilderFilterPanel = observer(
         );
       }
     };
+
+    const { showDroppableSuggestion } = useDragLayer((monitor) => ({
+      showDroppableSuggestion:
+        monitor.isDragging() &&
+        (queryBuilderState.TEMPORARY__isDnDFetchStructureToFilterSupported
+          ? IS_DRAGGABLE_FILTER_DND_TYPES_FETCH_SUPPORTED
+          : IS_DRAGGABLE_FILTER_DND_TYPES
+        ).includes(monitor.getItemType()?.toString() ?? ''),
+    }));
+
     // Drag and Drop
     const handleDrop = useCallback(
       (item: QueryBuilderFilterDropTarget, type: string): void => {
@@ -795,6 +868,7 @@ export const QueryBuilderFilterPanel = observer(
       },
       [applicationStore, filterState],
     );
+
     const [{ isDragOver }, dropTargetConnector] = useDrop<
       QueryBuilderExplorerTreeDragSource,
       void,
@@ -913,7 +987,11 @@ export const QueryBuilderFilterPanel = observer(
         </div>
         <PanelContent>
           <PanelDropZone
-            isDragOver={isDragOver}
+            isDragOver={isDragOver && filterState.isEmpty}
+            showDroppableSuggestion={
+              showDroppableSuggestion && filterState.isEmpty
+            }
+            className="query-builder__panel--droppable"
             dropTargetConnector={dropTargetConnector}
           >
             {filterState.isEmpty && (
@@ -933,6 +1011,20 @@ export const QueryBuilderFilterPanel = observer(
                 <QueryBuilderFilterTree queryBuilderState={queryBuilderState} />
               </>
             )}
+
+            {showDroppableSuggestion && !filterState.isEmpty && (
+              <div
+                ref={dropTargetConnector}
+                className={clsx(
+                  'query-builder-post-filter-tree__blank-node--droppable--tall',
+                  {
+                    'dnd__entry--droppable__indicator--dragover': isDragOver,
+                  },
+                )}
+              >
+                Add filter to main group
+              </div>
+            )}
           </PanelDropZone>
         </PanelContent>
       </div>

package/src/graph-manager/protocol/pure/v1/V1_QueryBuilder_PureGraphManagerExtension.ts

@@ -25,7 +25,6 @@ import {
   V1_PureMultiExecution,
   V1_Service,
   V1_PackageableRuntime,
-  type V1_PackageableElement,
   type PureModel,
   V1_PureGraphManager,
   PureClientVersion,
@@ -72,10 +71,10 @@ export class V1_QueryBuilder_PureGraphManagerExtension extends QueryBuilder_Pure
         entities,
         dependencyEntitiesIndex,
         (entity: Entity): boolean =>
-          ((entity.content as PlainObject<V1_PackageableElement>)
-            ._type as string) === V1_MAPPING_ELEMENT_PROTOCOL_TYPE ||
-          ((entity.content as PlainObject<V1_PackageableElement>)
-            ._type as string) === V1_PACKAGEABLE_RUNTIME_ELEMENT_PROTOCOL_TYPE,
+          (entity.content._type as string) ===
+            V1_MAPPING_ELEMENT_PROTOCOL_TYPE ||
+          (entity.content._type as string) ===
+            V1_PACKAGEABLE_RUNTIME_ELEMENT_PROTOCOL_TYPE,
       );
       // handle mapping includes
       const mappings = [

package/src/stores/QueryBuilderResultState.ts

@@ -37,6 +37,7 @@ import {
   buildRawLambdaFromLambdaFunction,
   reportGraphAnalytics,
   extractExecutionResultValues,
+  TDSExecutionResult,
 } from '@finos/legend-graph';
 import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
@@ -56,6 +57,17 @@ export interface ExportDataInfo {
   serializationFormat?: EXECUTION_SERIALIZATION_FORMAT | undefined;
 }
 
+export interface QueryBuilderTDSResultCellData {
+  value: string | number | boolean | null | undefined;
+  columnName: string;
+  coordinates: QueryBuilderTDSResultCellCoordinate;
+}
+
+export interface QueryBuilderTDSResultCellCoordinate {
+  rowIndex: number;
+  colIndex: number;
+}
+
 export class QueryBuilderResultState {
   readonly queryBuilderState: QueryBuilderState;
   readonly exportDataState = ActionState.create();
@@ -70,6 +82,10 @@ export class QueryBuilderResultState {
   latestRunHashCode?: string | undefined;
   queryRunPromise: Promise<ExecutionResult> | undefined = undefined;
 
+  selectedCells: QueryBuilderTDSResultCellData[];
+  mousedOverCell: QueryBuilderTDSResultCellData | null = null;
+  isSelectingCells: boolean;
+
   constructor(queryBuilderState: QueryBuilderState) {
     makeObservable(this, {
       executionResult: observable,
@@ -78,18 +94,28 @@ export class QueryBuilderResultState {
       latestRunHashCode: observable,
       queryRunPromise: observable,
       isGeneratingPlan: observable,
+      selectedCells: observable,
+      mousedOverCell: observable,
       isRunningQuery: observable,
+      isSelectingCells: observable,
+      setIsSelectingCells: action,
       setIsRunningQuery: action,
       setExecutionResult: action,
       setExecutionDuration: action,
       setPreviewLimit: action,
+      addCellData: action,
+      setSelectedCells: action,
+      setMouseOverCell: action,
       setQueryRunPromise: action,
+
       exportData: flow,
       runQuery: flow,
       cancelQuery: flow,
       generatePlan: flow,
     });
+    this.isSelectingCells = false;
 
+    this.selectedCells = [];
     this.queryBuilderState = queryBuilderState;
     this.executionPlanState = new ExecutionPlanState(
       this.queryBuilderState.applicationStore,
@@ -97,6 +123,10 @@ export class QueryBuilderResultState {
     );
   }
 
+  setIsSelectingCells = (val: boolean): void => {
+    this.isSelectingCells = val;
+  };
+
   setIsRunningQuery = (val: boolean): void => {
     this.isRunningQuery = val;
   };
@@ -113,12 +143,64 @@ export class QueryBuilderResultState {
     this.previewLimit = Math.max(1, val);
   };
 
+  addCellData = (val: QueryBuilderTDSResultCellData): void => {
+    this.selectedCells.push(val);
+  };
+
+  setSelectedCells = (val: QueryBuilderTDSResultCellData[]): void => {
+    this.selectedCells = val;
+  };
+
+  setMouseOverCell = (val: QueryBuilderTDSResultCellData | null): void => {
+    this.mousedOverCell = val;
+  };
+
   setQueryRunPromise = (
     promise: Promise<ExecutionResult> | undefined,
   ): void => {
     this.queryRunPromise = promise;
   };
 
+  findColumnFromCoordinates = (
+    colIndex: number,
+  ): string | number | boolean | null | undefined => {
+    if (
+      !this.executionResult ||
+      !(this.executionResult instanceof TDSExecutionResult)
+    ) {
+      return undefined;
+    }
+    return this.executionResult.result.columns[colIndex];
+  };
+
+  findRowFromRowIndex = (
+    rowIndex: number,
+  ): (string | number | boolean | null)[] => {
+    if (
+      !this.executionResult ||
+      !(this.executionResult instanceof TDSExecutionResult)
+    ) {
+      return [''];
+    }
+    return this.executionResult.result.rows[rowIndex]?.values ?? [''];
+  };
+
+  findResultValueFromCoordinates = (
+    resultCoordinate: [number, number],
+  ): string | number | boolean | null | undefined => {
+    const rowIndex = resultCoordinate[0];
+    const colIndex = resultCoordinate[1];
+
+    if (
+      !this.executionResult ||
+      !(this.executionResult instanceof TDSExecutionResult)
+    ) {
+      return undefined;
+    }
+
+    return this.executionResult.result.rows[rowIndex]?.values[colIndex];
+  };
+
   get checkForStaleResults(): boolean {
     if (this.latestRunHashCode !== this.queryBuilderState.hashCode) {
       return true;

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

@@ -569,6 +569,7 @@ export class QueryBuilderPostFilterState
         undefined,
         QUERY_BUILDER_GROUP_OPERATION.AND,
       );
+
       groupNode.addChildNode(rootNode);
       groupNode.addChildNode(node);
       this.rootIds = [groupNode.id];

package/src/stores/shared/LambdaParameterState.ts

@@ -235,6 +235,7 @@ export class LambdaParameterState implements Hashable {
         this.parameter,
         this.graph,
         this.observerContext,
+        { useCurrentDateDependentFunctions: true },
       ),
     );
   }

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -41,16 +41,22 @@ import {
   Multiplicity,
   CORE_PURE_PATH,
   buildRawLambdaFromLambdaFunction,
+  getValueSpecificationReturnType,
 } from '@finos/legend-graph';
-import { Randomizer, UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  Randomizer,
+  UnsupportedOperationError,
+  returnUndefOnError,
+} from '@finos/legend-shared';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationHelper.js';
 import {
   instanceValue_setValues,
   valueSpecification_setGenericType,
 } from './ValueSpecificationModifierHelper.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
-
-const VAR_DEFAULT_NAME = 'var';
+import {
+  QUERY_BUILDER_PURE_PATH,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../graph/QueryBuilderMetaModelConst.js';
 
 export const createSupportedFunctionExpression = (
   supportedFuncName: string,
@@ -63,52 +69,60 @@ export const createSupportedFunctionExpression = (
   );
   return funcExpression;
 };
+export const buildPrimitiveInstanceValue = (
+  graph: PureModel,
+  type: PRIMITIVE_TYPE,
+  value: unknown,
+  observerContext: ObserverContext,
+): PrimitiveInstanceValue => {
+  const instance = new PrimitiveInstanceValue(
+    GenericTypeExplicitReference.create(
+      new GenericType(graph.getPrimitiveType(type)),
+    ),
+  );
+  instanceValue_setValues(instance, [value], observerContext);
+  return instance;
+};
 
 const createMockPrimitiveValueSpecification = (
   primitiveType: PrimitiveType,
-  propertyName: string,
+  graph: PureModel,
   observerContext: ObserverContext,
+  options?: {
+    useCurrentDateDependentFunctions?: boolean;
+  },
 ): ValueSpecification => {
   const primitiveTypeName = primitiveType.name;
-  if (
-    primitiveTypeName === PRIMITIVE_TYPE.DATE ||
-    primitiveTypeName === PRIMITIVE_TYPE.DATETIME
-  ) {
-    return createSupportedFunctionExpression(
-      QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
-      PrimitiveType.DATETIME,
-    );
-  } else if (primitiveTypeName === PRIMITIVE_TYPE.STRICTDATE) {
-    return createSupportedFunctionExpression(
-      QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
-      PrimitiveType.STRICTDATE,
+  if (options?.useCurrentDateDependentFunctions) {
+    if (
+      primitiveTypeName === PRIMITIVE_TYPE.DATE ||
+      primitiveTypeName === PRIMITIVE_TYPE.DATETIME
+    ) {
+      return createSupportedFunctionExpression(
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.NOW,
+        PrimitiveType.DATETIME,
+      );
+    } else if (primitiveTypeName === PRIMITIVE_TYPE.STRICTDATE) {
+      return createSupportedFunctionExpression(
+        QUERY_BUILDER_SUPPORTED_FUNCTIONS.TODAY,
+        PrimitiveType.STRICTDATE,
+      );
+    }
+  }
+  if (primitiveTypeName === PRIMITIVE_TYPE.DATE) {
+    return buildPrimitiveInstanceValue(
+      graph,
+      PRIMITIVE_TYPE.STRICTDATE,
+      generateDefaultValueForPrimitiveType(primitiveTypeName),
+      observerContext,
     );
   }
-  const primitiveInstanceValue = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(primitiveType)),
+  return buildPrimitiveInstanceValue(
+    graph,
+    primitiveTypeName as PRIMITIVE_TYPE,
+    generateDefaultValueForPrimitiveType(primitiveTypeName as PRIMITIVE_TYPE),
+    observerContext,
   );
-  const randomizer = new Randomizer();
-  let value: string | boolean | number;
-  switch (primitiveType.name) {
-    case PRIMITIVE_TYPE.BOOLEAN:
-      value = randomizer.getRandomItemInCollection([true, false]) ?? true;
-      break;
-    case PRIMITIVE_TYPE.FLOAT:
-      value = randomizer.getRandomFloat();
-      break;
-    case PRIMITIVE_TYPE.DECIMAL:
-      value = randomizer.getRandomDouble();
-      break;
-    case PRIMITIVE_TYPE.NUMBER:
-    case PRIMITIVE_TYPE.INTEGER:
-      value = randomizer.getRandomWholeNumber(100);
-      break;
-    case PRIMITIVE_TYPE.STRING:
-    default:
-      value = `${propertyName} ${randomizer.getRandomWholeNumber(100)}`;
-  }
-  instanceValue_setValues(primitiveInstanceValue, [value], observerContext);
-  return primitiveInstanceValue;
 };
 
 export const createMockEnumerationProperty = (
@@ -116,21 +130,6 @@ export const createMockEnumerationProperty = (
 ): string =>
   new Randomizer().getRandomItemInCollection(enumeration.values)?.name ?? '';
 
-export const buildPrimitiveInstanceValue = (
-  graph: PureModel,
-  type: PRIMITIVE_TYPE,
-  value: unknown,
-  observerContext: ObserverContext,
-): PrimitiveInstanceValue => {
-  const instance = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(
-      new GenericType(graph.getPrimitiveType(type)),
-    ),
-  );
-  instanceValue_setValues(instance, [value], observerContext);
-  return instance;
-};
-
 export const buildDefaultInstanceValue = (
   graph: PureModel,
   type: Type,
@@ -219,6 +218,9 @@ export const generateVariableExpressionMockValue = (
   parameter: VariableExpression,
   graph: PureModel,
   observerContext: ObserverContext,
+  options?: {
+    useCurrentDateDependentFunctions?: boolean;
+  },
 ): ValueSpecification | undefined => {
   const varType = parameter.genericType?.value.rawType;
   const multiplicity = parameter.multiplicity;
@@ -231,8 +233,9 @@ export const generateVariableExpressionMockValue = (
   if (varType instanceof PrimitiveType) {
     return createMockPrimitiveValueSpecification(
       varType,
-      VAR_DEFAULT_NAME,
+      graph,
       observerContext,
+      options,
     );
   } else if (varType instanceof Enumeration) {
     const enumValueInstance = new EnumValueInstanceValue(
@@ -272,3 +275,23 @@ export const getValueSpecificationStringValue = (
   }
   return undefined;
 };
+
+export const valueSpecReturnTDS = (
+  val: ValueSpecification,
+  graph: PureModel,
+): boolean => {
+  const retunType = returnUndefOnError(() =>
+    getValueSpecificationReturnType(val),
+  );
+  const tdsType = returnUndefOnError(() =>
+    graph.getClass(QUERY_BUILDER_PURE_PATH.TDS_TABULAR_DATASET),
+  );
+  const tdsRowType = returnUndefOnError(() =>
+    graph.getClass(QUERY_BUILDER_PURE_PATH.TDS_ROW),
+  );
+  // FIXME: we sometimes return tds row when tds is the return type of the lambda. We do this to properly build post filters.
+  // We should fix this to properly build filter functions after a tds function
+  return Boolean(
+    retunType && tdsType && (retunType === tdsType || retunType === tdsRowType),
+  );
+};