@finos/legend-query-builder 4.14.46 → 4.14.48

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

@@ -700,7 +700,7 @@ const QueryBuilderProjectionColumnEditor = observer(
         aggregateColumnState.operator instanceof
           QueryBuilderAggregateOperator_Percentile &&
         aggregateColumnState.operator.percentile !== undefined
-        ? (aggregateColumnState.operator.percentile * 100).toString()
+        ? aggregateColumnState.operator.percentile.toString()
         : '',
     );
     const [acending, setAcending] = useState(
@@ -904,7 +904,7 @@ const QueryBuilderProjectionColumnEditor = observer(
                         percentileOperator.setPercentile(undefined);
                       } else {
                         percentileOperator.setPercentile(
-                          Number(percentileValue) / 100,
+                          Number(percentileValue),
                         );
                       }
                       if (acending !== undefined && continuous !== undefined) {
@@ -1342,27 +1342,118 @@ export const QueryBuilderTDSPanel = observer(
           >
             <div className="query-builder__projection__result-modifier-prompt__header">
               <button
-                className="query-builder__projection__result-modifier-prompt__header__label"
+                className="query-builder__projection__result-modifier-prompt__header__label editable-value"
                 onClick={openResultSetModifierEditor}
-                title="Configure result set modifiers..."
+                title="Configure Query Options..."
               >
                 <CogIcon className="query-builder__projection__result-modifier-prompt__header__label__icon" />
                 <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                  Query Options
+                  {tdsState.isQueryOptionsSet
+                    ? 'Query Options'
+                    : 'Set Query Options'}
                 </div>
               </button>
+              <div className="query-builder__projection__result-modifier-prompt__divider">
+                {tdsState.isQueryOptionsSet && ' - '}
+              </div>
+              {tdsState.queryBuilderState.milestoningState
+                .isAllVersionsEnabled &&
+                !tdsState.queryBuilderState.milestoningState
+                  .isAllVersionsInRangeEnabled && (
+                  <div className="query-builder__projection__result-modifier-prompt__group">
+                    <div className="query-builder__projection__result-modifier-prompt__group__label">
+                      All Versions
+                    </div>
+                    <button
+                      className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                      onClick={openResultSetModifierEditor}
+                    >
+                      <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                        Yes
+                      </div>
+                    </button>
+                  </div>
+                )}
+              {tdsState.queryBuilderState.milestoningState
+                .isAllVersionsInRangeEnabled &&
+                tdsState.queryBuilderState.milestoningState.startDate &&
+                tdsState.queryBuilderState.milestoningState.endDate && (
+                  <div className="query-builder__projection__result-modifier-prompt__group">
+                    <div className="query-builder__projection__result-modifier-prompt__group__label">
+                      All Versions
+                    </div>
+                    <button
+                      className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                      onClick={openResultSetModifierEditor}
+                    >
+                      <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                        (
+                        {getNameOfValueSpecification(
+                          tdsState.queryBuilderState.milestoningState.startDate,
+                          tdsState.queryBuilderState,
+                        )}{' '}
+                        -{' '}
+                        {getNameOfValueSpecification(
+                          tdsState.queryBuilderState.milestoningState.endDate,
+                          tdsState.queryBuilderState,
+                        )}
+                        )
+                      </div>
+                    </button>
+                  </div>
+                )}
+              {tdsState.queryBuilderState.milestoningState.businessDate && (
+                <div className="query-builder__projection__result-modifier-prompt__group">
+                  <div className="query-builder__projection__result-modifier-prompt__group__label">
+                    Business Date
+                  </div>
+                  <button
+                    className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                    onClick={openResultSetModifierEditor}
+                  >
+                    <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                      {getNameOfValueSpecification(
+                        tdsState.queryBuilderState.milestoningState
+                          .businessDate,
+                        tdsState.queryBuilderState,
+                      )}
+                    </div>
+                  </button>
+                </div>
+              )}
+              {tdsState.queryBuilderState.milestoningState.processingDate && (
+                <div className="query-builder__projection__result-modifier-prompt__group">
+                  <div className="query-builder__projection__result-modifier-prompt__group__label">
+                    Processing Date
+                  </div>
+                  <button
+                    className="query-builder__projection__result-modifier-prompt__header__label editable-value"
+                    onClick={openResultSetModifierEditor}
+                  >
+                    <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                      {getNameOfValueSpecification(
+                        tdsState.queryBuilderState.milestoningState
+                          .processingDate,
+                        tdsState.queryBuilderState,
+                      )}
+                    </div>
+                  </button>
+                </div>
+              )}
             </div>
             {tdsState.resultSetModifierState.limit && (
               <div className="query-builder__projection__result-modifier-prompt__group">
                 <div className="query-builder__projection__result-modifier-prompt__group__label">
                   Max Rows
                 </div>
-                <div
-                  className="query-builder__projection__result-modifier-prompt__group__content"
+                <button
+                  className="query-builder__projection__result-modifier-prompt__header__label editable-value"
                   onClick={openResultSetModifierEditor}
                 >
-                  {tdsState.resultSetModifierState.limit}
-                </div>
+                  <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                    {tdsState.resultSetModifierState.limit}
+                  </div>
+                </button>
               </div>
             )}
             {tdsState.resultSetModifierState.distinct && (
@@ -1370,12 +1461,14 @@ export const QueryBuilderTDSPanel = observer(
                 <div className="query-builder__projection__result-modifier-prompt__group__label">
                   Eliminate Duplicate Rows
                 </div>
-                <div
-                  className="query-builder__projection__result-modifier-prompt__group__content"
+                <button
+                  className="query-builder__projection__result-modifier-prompt__header__label editable-value"
                   onClick={openResultSetModifierEditor}
                 >
-                  Yes
-                </div>
+                  <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                    Yes
+                  </div>
+                </button>
               </div>
             )}
             {tdsState.resultSetModifierState.sortColumns.length > 0 && (
@@ -1385,13 +1478,15 @@ export const QueryBuilderTDSPanel = observer(
                 </div>
                 {tdsState.resultSetModifierState.sortColumns.map(
                   (columnState) => (
-                    <div
-                      className="query-builder__projection__result-modifier-prompt__group__content"
+                    <button
                       key={columnState.columnState.uuid}
+                      className="query-builder__projection__result-modifier-prompt__header__label editable-value"
                       onClick={openResultSetModifierEditor}
                     >
-                      {`${columnState.columnState.columnName} ${columnState.sortType}`}
-                    </div>
+                      <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                        {`${columnState.columnState.columnName} ${columnState.sortType}`}
+                      </div>
+                    </button>
                   ),
                 )}
               </div>
@@ -1401,12 +1496,14 @@ export const QueryBuilderTDSPanel = observer(
                 <div className="query-builder__projection__result-modifier-prompt__group__label">
                   Slice
                 </div>
-                <div
-                  className="query-builder__projection__result-modifier-prompt__group__content"
+                <button
+                  className="query-builder__projection__result-modifier-prompt__header__label editable-value"
                   onClick={openResultSetModifierEditor}
                 >
-                  {`${tdsState.resultSetModifierState.slice[0]},${tdsState.resultSetModifierState.slice[1]}`}
-                </div>
+                  <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                    {`${tdsState.resultSetModifierState.slice[0]},${tdsState.resultSetModifierState.slice[1]}`}
+                  </div>
+                </button>
               </div>
             )}
             {tdsState.queryBuilderState.watermarkState.value && (

package/src/components/result/tds/QueryBuilderTDSGridResult.tsx

@@ -45,6 +45,7 @@ import { QueryBuilderTDSState } from '../../../stores/fetch-structure/tds/QueryB
 import { DEFAULT_LOCALE } from '../../../graph-manager/QueryBuilderConst.js';
 import {
   assertErrorThrown,
+  isBoolean,
   isNumber,
   isString,
   isValidURL,
@@ -147,6 +148,8 @@ const QueryResultCellRenderer = observer(
         return Intl.NumberFormat(DEFAULT_LOCALE, {
           maximumFractionDigits: 4,
         }).format(Number(cellValue));
+      } else if (isBoolean(cellValue)) {
+        return String(cellValue);
       }
       return cellValue;
     };

package/src/components/result/tds/QueryBuilderTDSResultShared.tsx

@@ -42,7 +42,6 @@ import {
   assertErrorThrown,
   guaranteeNonNullable,
   filterByType,
-  isBoolean,
 } from '@finos/legend-shared';
 import { forwardRef } from 'react';
 import {
@@ -127,12 +126,8 @@ export const getRowDataFromExecutionResult = (
     const row: QueryBuilderTDSRowDataType = {};
     const cols = executionResult.result.columns;
     _row.values.forEach((value, colIdx) => {
-      // `ag-grid` shows `false` value as empty string so we have
-      // call `.toString()` to avoid this behavior.
-      // See https://github.com/finos/legend-studio/issues/1008
-      row[cols[colIdx] as string] = isBoolean(value) ? String(value) : value;
+      row[cols[colIdx] as string] = value;
     });
-
     row.rowNumber = rowIdx;
     return row;
   });

package/src/components/result/tds/QueryBuilderTDSSimpleGridResult.tsx

@@ -32,7 +32,12 @@ import {
 } from './QueryBuilderTDSResultShared.js';
 import { QueryBuilderTDSState } from '../../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import { DEFAULT_LOCALE } from '../../../graph-manager/QueryBuilderConst.js';
-import { isNumber, isString, isValidURL } from '@finos/legend-shared';
+import {
+  isBoolean,
+  isNumber,
+  isString,
+  isValidURL,
+} from '@finos/legend-shared';
 import type {
   QueryBuilderTDSResultCellCoordinate,
   QueryBuilderTDSResultCellData,
@@ -57,6 +62,8 @@ const QueryResultCellRenderer = observer(
         return Intl.NumberFormat(DEFAULT_LOCALE, {
           maximumFractionDigits: 4,
         }).format(Number(cellValue));
+      } else if (isBoolean(cellValue)) {
+        return String(cellValue);
       }
       return cellValue;
     };

package/src/graph-manager/QueryBuilderConfig.ts

@@ -28,10 +28,16 @@ export class QueryBuilderConfig {
    */
   TEMPORARY__enableGridEnterpriseMode = false;
 
+  /**
+   * This is the URL of the LegendAI service
+   */
+  legendAIServiceURL = '';
+
   static readonly serialization = new SerializationFactory(
     createModelSchema(QueryBuilderConfig, {
       TEMPORARY__disableQueryBuilderChat: optional(primitive()),
       TEMPORARY__enableGridEnterpriseMode: optional(primitive()),
+      legendAIServiceURL: optional(primitive()),
     }),
   );
 }

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -63,6 +63,7 @@ import {
   validateMilestoningPropertyExpressionChain,
 } from './milestoning/QueryBuilderMilestoningHelper.js';
 import { instanceValue_setValues } from './shared/ValueSpecificationModifierHelper.js';
+import type { QueryBuilderState } from './QueryBuilderState.js';
 
 export const getNonCollectionValueSpecificationType = (
   valueSpecification: ValueSpecification,
@@ -329,6 +330,7 @@ export const buildGenericLambdaFunctionInstanceValue = (
 export const validatePropertyExpressionChain = (
   propertyExpression: AbstractPropertyExpression,
   graph: PureModel,
+  queryBuilderState: QueryBuilderState,
 ): void => {
   if (
     propertyExpression.func.value.genericType.value.rawType instanceof Class &&
@@ -355,6 +357,7 @@ export const validatePropertyExpressionChain = (
           sourceStereotype,
           targetStereotype,
           propertyExpression,
+          queryBuilderState,
         );
       }
     }

package/src/stores/QueryLoaderState.ts

@@ -43,6 +43,7 @@ import type {
 } from './QueryBuilder_LegendApplicationPlugin_Extension.js';
 
 export const QUERY_LOADER_TYPEAHEAD_SEARCH_LIMIT = 50;
+export const QUERY_LOADER_DEFAULT_QUERY_SEARCH_LIMIT = 10;
 
 export class QueryLoaderState {
   readonly applicationStore: GenericLegendApplicationStore;

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -147,6 +147,7 @@ export class QueryBuilderTDSState
       TEMPORARY__showPostFetchStructurePanel: computed,
       derivations: computed,
       hasParserError: computed,
+      isQueryOptionsSet: computed,
       addColumn: action,
       moveColumn: action,
       removeAllColumns: action,
@@ -361,6 +362,16 @@ export class QueryBuilderTDSState
     return fetchStructureValidationIssues;
   }
 
+  get isQueryOptionsSet(): boolean {
+    return (
+      this.resultSetModifierState.limit !== undefined ||
+      this.queryBuilderState.milestoningState.isMilestonedQuery ||
+      this.resultSetModifierState.slice !== undefined ||
+      this.resultSetModifierState.sortColumns.length > 0 ||
+      this.resultSetModifierState.distinct
+    );
+  }
+
   get tdsColumns(): QueryBuilderTDSColumnState[] {
     const aggregationStateCols = this.aggregationState.columns.map(
       (c) => c.projectionColumnState,

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Percentile.ts

@@ -107,7 +107,9 @@ export class QueryBuilderAggregateOperator_Percentile
     variableName: string,
     graph: PureModel,
   ): ValueSpecification {
-    const percentileValue = this.percentile ?? 0;
+    const percentileValue = this.percentile
+      ? Number((this.percentile / 100).toFixed(10))
+      : 0;
     const expression = new SimpleFunctionExpression(
       extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.PERCENTILE),
     );
@@ -193,7 +195,9 @@ export class QueryBuilderAggregateOperator_Percentile
         PrimitiveInstanceValue,
         `Can't process percentile() expression: percentile() expects arugment #2 to be a primitive instance value`,
       );
-      currentOperator.percentile = percentile.values[0] as number;
+      currentOperator.percentile = parseFloat(
+        ((percentile.values[0] as number) * 100).toFixed(10),
+      );
 
       if (expression.parametersValues.length === 4) {
         const acending = guaranteeType(

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -159,6 +159,7 @@ export const processTDSProjectionColumnPropertyExpression = (
       validatePropertyExpressionChain(
         currentPropertyExpression,
         queryBuilderState.graphManagerState.graph,
+        queryBuilderState,
       );
       currentPropertyExpression = guaranteeNonNullable(
         currentPropertyExpression.parametersValues[0],

package/src/stores/filter/QueryBuilderFilterStateBuilder.ts

@@ -309,6 +309,7 @@ const processFilterTree = (
         validatePropertyExpressionChain(
           currentPropertyExpression,
           filterState.queryBuilderState.graphManagerState.graph,
+          filterState.queryBuilderState,
         );
       }
     }

package/src/stores/milestoning/QueryBuilderBitemporalMilestoningImplementation.ts

@@ -23,18 +23,21 @@ import {
   MILESTONING_STEREOTYPE,
   INTERNAL__PropagatedValue,
   PrimitiveType,
+  VariableExpression,
 } from '@finos/legend-graph';
 import {
   UnsupportedOperationError,
   assertTrue,
   guaranteeNonNullable,
   guaranteeType,
+  isNonNullable,
 } from '@finos/legend-shared';
 import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderDerivedPropertyExpressionState } from '../QueryBuilderPropertyEditorState.js';
 import { createSupportedFunctionExpression } from '../shared/ValueSpecificationEditorHelper.js';
 import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
 
 export class QueryBuilderBitemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
   getMilestoningDate(index?: number): ValueSpecification | undefined {
@@ -70,6 +73,26 @@ export class QueryBuilderBitemporalMilestoningImplementation extends QueryBuilde
     this.milestoningState.queryBuilderState.setShowParametersPanel(true);
   }
 
+  buildParameterStatesFromMilestoningParameters(): LambdaParameterState[] {
+    const businessState =
+      this.milestoningState.buildParameterStateFromMilestoningParameter(
+        this.milestoningState.businessDate &&
+          this.milestoningState.businessDate instanceof VariableExpression
+          ? this.milestoningState.businessDate.name
+          : BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+      );
+
+    const processingState =
+      this.milestoningState.buildParameterStateFromMilestoningParameter(
+        this.milestoningState.processingDate &&
+          this.milestoningState.processingDate instanceof VariableExpression
+          ? this.milestoningState.processingDate.name
+          : PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+      );
+
+    return [businessState, processingState].filter(isNonNullable);
+  }
+
   processGetAllParamaters(parameterValues: ValueSpecification[]): void {
     assertTrue(
       parameterValues.length === 3,

package/src/stores/milestoning/QueryBuilderBusinessTemporalMilestoningImplementation.ts

@@ -22,6 +22,7 @@ import {
   MILESTONING_STEREOTYPE,
   INTERNAL__PropagatedValue,
   PrimitiveType,
+  VariableExpression,
 } from '@finos/legend-graph';
 import {
   UnsupportedOperationError,
@@ -32,6 +33,7 @@ import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { createSupportedFunctionExpression } from '../shared/ValueSpecificationEditorHelper.js';
 import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
 
 export class QueryBuilderBusinessTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
   getMilestoningDate(): ValueSpecification | undefined {
@@ -54,6 +56,17 @@ export class QueryBuilderBusinessTemporalMilestoningImplementation extends Query
     this.milestoningState.queryBuilderState.setShowParametersPanel(true);
   }
 
+  buildParameterStatesFromMilestoningParameters(): LambdaParameterState[] {
+    const state =
+      this.milestoningState.buildParameterStateFromMilestoningParameter(
+        this.milestoningState.businessDate &&
+          this.milestoningState.businessDate instanceof VariableExpression
+          ? this.milestoningState.businessDate.name
+          : BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+      );
+    return state ? [state] : [];
+  }
+
   processGetAllParamaters(parameterValues: ValueSpecification[]): void {
     assertTrue(
       parameterValues.length === 2,

package/src/stores/milestoning/QueryBuilderMilestoningHelper.ts

@@ -294,6 +294,7 @@ export const validateMilestoningPropertyExpressionChain = (
   sourceStereotype: MILESTONING_STEREOTYPE | undefined,
   targetStereotype: MILESTONING_STEREOTYPE,
   propertyExpression: AbstractPropertyExpression,
+  queryBuilderState: QueryBuilderState,
 ): void => {
   if (
     sourceStereotype !== MILESTONING_STEREOTYPE.BITEMPORAL &&
@@ -316,10 +317,54 @@ export const validateMilestoningPropertyExpressionChain = (
           `Property of milestoning sterotype '${MILESTONING_STEREOTYPE.BITEMPORAL}' should not have more than two parameters`,
         );
       }
+      queryBuilderState.milestoningState.setProcessingDate(
+        propertyExpression.parametersValues[1],
+      );
+      queryBuilderState.milestoningState.setBusinessDate(
+        propertyExpression.parametersValues[2],
+      );
     } else if (propertyExpression.parametersValues.length !== 2) {
       throw new UnsupportedOperationError(
         `Property of milestoning sterotype '${targetStereotype}' should have exactly one parameter`,
       );
     }
+    if (targetStereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
+      queryBuilderState.milestoningState.setBusinessDate(
+        propertyExpression.parametersValues[1],
+      );
+    } else if (
+      targetStereotype === MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL
+    ) {
+      queryBuilderState.milestoningState.setProcessingDate(
+        propertyExpression.parametersValues[1],
+      );
+    }
+  }
+  // we still need to do a loose milestoningState initialization for other cases e.g. the getAllVersion is used
+  else {
+    if (
+      propertyExpression.parametersValues.length === 3 &&
+      targetStereotype === MILESTONING_STEREOTYPE.BITEMPORAL
+    ) {
+      queryBuilderState.milestoningState.setProcessingDate(
+        propertyExpression.parametersValues[1],
+      );
+      queryBuilderState.milestoningState.setBusinessDate(
+        propertyExpression.parametersValues[2],
+      );
+    }
+    if (propertyExpression.parametersValues.length === 2) {
+      if (targetStereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
+        queryBuilderState.milestoningState.setBusinessDate(
+          propertyExpression.parametersValues[1],
+        );
+      } else if (
+        targetStereotype === MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL
+      ) {
+        queryBuilderState.milestoningState.setProcessingDate(
+          propertyExpression.parametersValues[1],
+        );
+      }
+    }
   }
 };

package/src/stores/milestoning/QueryBuilderMilestoningImplementation.ts

@@ -22,6 +22,7 @@ import type {
 } from '@finos/legend-graph';
 import type { QueryBuilderDerivedPropertyExpressionState } from '../QueryBuilderPropertyEditorState.js';
 import type { QueryBuilderMilestoningState } from './QueryBuilderMilestoningState.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
 
 export abstract class QueryBuilderMilestoningImplementation {
   milestoningState: QueryBuilderMilestoningState;
@@ -88,4 +89,6 @@ export abstract class QueryBuilderMilestoningImplementation {
     idx?: number,
     derivedPropertyExpressionState?: QueryBuilderDerivedPropertyExpressionState,
   ): ValueSpecification;
+
+  abstract buildParameterStatesFromMilestoningParameters(): LambdaParameterState[];
 }

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -75,7 +75,7 @@ export class QueryBuilderMilestoningState implements Hashable {
       startDate: observable,
       endDate: observable,
       showMilestoningEditor: observable,
-      isMilestonedQuery: computed,
+
       setProcessingDate: action,
       setBusinessDate: action,
       setStartDate: action,
@@ -87,6 +87,10 @@ export class QueryBuilderMilestoningState implements Hashable {
       initializeAllVersionsInRangeParameters: action,
       clearAllVersionsInRangeParameters: action,
       clearGetAllParameters: action,
+
+      isAllVersionsEnabled: computed,
+      isAllVersionsInRangeEnabled: computed,
+      isMilestonedQuery: computed,
       hashCode: computed,
     });
 
@@ -380,9 +384,9 @@ export class QueryBuilderMilestoningState implements Hashable {
         this.queryBuilderState.parametersState.parameterStates.find(
           (p) => p.parameter === this.startDate,
         );
-      this.queryBuilderState.parametersState.removeParameter(
-        guaranteeNonNullable(paramState),
-      );
+      if (paramState) {
+        this.queryBuilderState.parametersState.removeParameter(paramState);
+      }
     }
     if (
       this.endDate instanceof VariableExpression &&
@@ -394,9 +398,9 @@ export class QueryBuilderMilestoningState implements Hashable {
         this.queryBuilderState.parametersState.parameterStates.find(
           (p) => p.parameter === this.endDate,
         );
-      this.queryBuilderState.parametersState.removeParameter(
-        guaranteeNonNullable(paramState),
-      );
+      if (paramState) {
+        this.queryBuilderState.parametersState.removeParameter(paramState);
+      }
     }
     this.setStartDate(undefined);
     this.setEndDate(undefined);
@@ -422,6 +426,36 @@ export class QueryBuilderMilestoningState implements Hashable {
     }
   }
 
+  buildParameterStateFromMilestoningParameter(
+    parameterName: string,
+  ): LambdaParameterState | undefined {
+    const milestoningParameter = new VariableExpression(
+      parameterName,
+      Multiplicity.ONE,
+      GenericTypeExplicitReference.create(new GenericType(PrimitiveType.DATE)),
+    );
+    const paramState =
+      this.queryBuilderState.parametersState.parameterStates.find(
+        (p) => p.variableName === parameterName,
+      );
+    if (paramState) {
+      return paramState;
+    } else if (
+      !this.queryBuilderState.constantState.constants.find(
+        (c) => c.variable.name === parameterName,
+      )
+    ) {
+      const variableState = new LambdaParameterState(
+        milestoningParameter,
+        this.queryBuilderState.observerContext,
+        this.queryBuilderState.graphManagerState.graph,
+      );
+      variableState.mockParameterValue();
+      return variableState;
+    }
+    return undefined;
+  }
+
   buildMilestoningParameter(parameterName: string): ValueSpecification {
     const milestoningParameter = new VariableExpression(
       parameterName,

package/src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts

@@ -21,6 +21,7 @@ import {
   type AbstractPropertyExpression,
   INTERNAL__PropagatedValue,
   PrimitiveType,
+  VariableExpression,
 } from '@finos/legend-graph';
 import {
   UnsupportedOperationError,
@@ -31,6 +32,7 @@ import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { createSupportedFunctionExpression } from '../shared/ValueSpecificationEditorHelper.js';
 import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+import type { LambdaParameterState } from '../shared/LambdaParameterState.js';
 
 export class QueryBuilderProcessingTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
   getMilestoningDate(): ValueSpecification | undefined {
@@ -53,6 +55,17 @@ export class QueryBuilderProcessingTemporalMilestoningImplementation extends Que
     this.milestoningState.queryBuilderState.setShowParametersPanel(true);
   }
 
+  buildParameterStatesFromMilestoningParameters(): LambdaParameterState[] {
+    const state =
+      this.milestoningState.buildParameterStateFromMilestoningParameter(
+        this.milestoningState.processingDate &&
+          this.milestoningState.processingDate instanceof VariableExpression
+          ? this.milestoningState.processingDate.name
+          : PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+      );
+    return state ? [state] : [];
+  }
+
   processGetAllParamaters(parameterValues: ValueSpecification[]): void {
     assertTrue(
       parameterValues.length === 2,