@finos/legend-query-builder 0.1.1 → 0.2.0

package/src/components/shared/LambdaParameterValuesEditor.tsx

@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useApplicationStore } from '@finos/legend-application';
+import { Dialog } from '@finos/legend-art';
+import {
+  type PureModel,
+  type ValueSpecification,
+  PRIMITIVE_TYPE,
+  type ObserverContext,
+} from '@finos/legend-graph';
+import { prettyCONSTName } from '@finos/legend-shared';
+import { observer } from 'mobx-react-lite';
+import type { LambdaParametersState } from '../../stores/shared/LambdaParameterState.js';
+import { BasicValueSpecificationEditor } from './BasicValueSpecificationEditor.js';
+
+// TODO we may want to further componentize this by removing the dialog wrapper
+export const LambdaParameterValuesEditor = observer(
+  (props: {
+    graph: PureModel;
+    observerContext: ObserverContext;
+    lambdaParametersState: LambdaParametersState;
+  }) => {
+    const { lambdaParametersState, graph, observerContext } = props;
+    const valuesEdtiorState = lambdaParametersState.parameterValuesEditorState;
+    const close = (): void => valuesEdtiorState.close();
+    const applicationStore = useApplicationStore();
+    const submitAction = valuesEdtiorState.submitAction;
+    const submit = applicationStore.guardUnhandledError(async () => {
+      if (submitAction) {
+        close();
+        await submitAction.handler();
+      }
+    });
+    return (
+      <Dialog
+        open={Boolean(valuesEdtiorState.showModal)}
+        onClose={close}
+        classes={{
+          root: 'editor-modal__root-container',
+          container: 'editor-modal__container',
+          paper: 'editor-modal__content',
+        }}
+      >
+        <div className="modal modal--dark editor-modal lambda-parameter-values__modal">
+          <div className="modal__header">
+            <div className="modal__title">Set Parameter Values</div>
+          </div>
+          <div className="modal__body lambda-parameter-values__modal__body">
+            {lambdaParametersState.parameterStates.map((paramState) => {
+              const stringType = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
+              const variableType = paramState.variableType ?? stringType;
+              return (
+                <div
+                  key={paramState.uuid}
+                  className="panel__content__form__section"
+                >
+                  <div className="lambda-parameter-values__value__label">
+                    <div className="lambda-parameter-values__value__label__name">
+                      {paramState.parameter.name}
+                    </div>
+                    <div className="lambda-parameter-values__value__label__type">
+                      {variableType.name}
+                    </div>
+                  </div>
+                  {paramState.value && (
+                    <BasicValueSpecificationEditor
+                      valueSpecification={paramState.value}
+                      setValueSpecification={(
+                        val: ValueSpecification,
+                      ): void => {
+                        paramState.setValue(val);
+                      }}
+                      graph={graph}
+                      obseverContext={observerContext}
+                      typeCheckOption={{
+                        expectedType: variableType,
+                        match:
+                          variableType ===
+                          graph.getPrimitiveType(PRIMITIVE_TYPE.DATETIME),
+                      }}
+                      className="query-builder__parameters__value__editor"
+                      resetValue={(): void => paramState.mockParameterValue()}
+                    />
+                  )}
+                </div>
+              );
+            })}
+          </div>
+          <div className="modal__footer">
+            {submitAction && (
+              <button
+                className="btn modal__footer__close-btn"
+                title={submitAction.label}
+                onClick={submit}
+              >
+                {prettyCONSTName(submitAction.label)}
+              </button>
+            )}
+            <button className="btn modal__footer__close-btn" onClick={close}>
+              Close
+            </button>
+          </div>
+        </div>
+      </Dialog>
+    );
+  },
+);

package/src/components/shared/QueryBuilderLambdaEditor.tsx

@@ -20,12 +20,12 @@ import { type IKeyboardEvent, KeyCode } from 'monaco-editor';
 import { useCallback, useMemo } from 'react';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import type { Type } from '@finos/legend-graph';
+import { useApplicationStore } from '@finos/legend-application';
+import type { LambdaEditorState } from '../../stores/shared/LambdaEditorState.js';
 import {
-  useApplicationStore,
-  LambdaEditor,
-  type LambdaEditorState,
   type LambdaEditorOnKeyDownEventHandler,
-} from '@finos/legend-application';
+  LambdaEditor,
+} from './LambdaEditor.js';
 
 export const QueryBuilderLambdaEditor = observer(
   (props: {
@@ -67,7 +67,7 @@ export const QueryBuilderLambdaEditor = observer(
     } = props;
     const applicationStore = useApplicationStore();
     const backdropSetter = useCallback(
-      (val: boolean) => queryBuilderState.setBackdrop(val),
+      (val: boolean) => queryBuilderState.setShowBackdrop(val),
       [queryBuilderState],
     );
     const onKeyDownEventHandlers: LambdaEditorOnKeyDownEventHandler[] = useMemo(

package/src/graphManager/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -21,7 +21,8 @@ import {
   V1_buildGetAllFunctionExpression,
   V1_buildGroupByFunctionExpression,
   V1_buildProjectFunctionExpression,
-} from './v1/V1_QueryBuilder_FunctionExpressionBuilder.js';
+  V1_buildSubTypePropertyExpressionTypeInference,
+} from './v1/V1_QueryValueSpecificationBuilderHelper.js';
 import {
   type V1_GraphBuilderContext,
   type V1_ProcessingContext,
@@ -36,7 +37,6 @@ import {
   extractElementNameFromPath,
   V1_buildGenericFunctionExpression,
 } from '@finos/legend-graph';
-import { V1_buildSubTypePropertyExpressionTypeInference } from './v1/V1_QueryBuilder_PropertyExpressionTypeInferenceBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilderSupportedFunctions.js';
 
 export class QueryBuilder_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {

package/src/graphManager/protocol/pure/v1/{V1_QueryBuilder_FunctionExpressionBuilder.ts → V1_QueryValueSpecificationBuilderHelper.ts}

@@ -28,12 +28,12 @@ import {
   type V1_ValueSpecification,
   type ValueSpecification,
   type SimpleFunctionExpression,
+  type Type,
   V1_buildBaseSimpleFunctionExpression,
   V1_buildGenericFunctionExpression,
   extractElementNameFromPath,
   V1_AppliedProperty,
   CollectionInstanceValue,
-  Multiplicity,
   INTERNAL__UnknownValueSpecification,
   V1_Variable,
   V1_serializeValueSpecification,
@@ -240,7 +240,7 @@ export const V1_buildExistsFunctionExpression = (
   precedingExpression.genericType = guaranteeType(
     precedingExpression,
     AbstractPropertyExpression,
-  ).func.genericType;
+  ).func.value.genericType;
   const lambda = parameters[1];
   if (lambda instanceof V1_Lambda) {
     lambda.parameters.forEach((variable): void => {
@@ -390,7 +390,7 @@ export const V1_buildProjectFunctionExpression = (
 
   // build column expressions taking into account of derivation
   const processedColumnExpressions = new CollectionInstanceValue(
-    new Multiplicity(
+    compileContext.graph.getMultiplicity(
       columnExpressions.multiplicity.lowerBound,
       columnExpressions.multiplicity.upperBound,
     ),
@@ -510,7 +510,7 @@ export const V1_buildGroupByFunctionExpression = (
 
   // build column expressions taking into account of derivation
   const processedColumnExpressions = new CollectionInstanceValue(
-    new Multiplicity(
+    compileContext.graph.getMultiplicity(
       columnExpressions.multiplicity.lowerBound,
       columnExpressions.multiplicity.upperBound,
     ),
@@ -532,7 +532,7 @@ export const V1_buildGroupByFunctionExpression = (
 
   // build aggregation expressions taking into account of derivation
   const processedAggregationExpressions = new CollectionInstanceValue(
-    new Multiplicity(
+    compileContext.graph.getMultiplicity(
       aggregationExpressions.multiplicity.lowerBound,
       aggregationExpressions.multiplicity.upperBound,
     ),
@@ -569,3 +569,10 @@ export const V1_buildGroupByFunctionExpression = (
   );
   return [expression, processedParams];
 };
+
+export const V1_buildSubTypePropertyExpressionTypeInference = (
+  inferredVariable: SimpleFunctionExpression,
+): Type | undefined =>
+  inferredVariable.parametersValues.filter(
+    (param) => param instanceof InstanceValue,
+  )[0]?.genericType?.value.rawType;

package/src/index.ts

@@ -40,3 +40,14 @@ export type { MappingRuntimeCompatibilityAnalysisResult } from './graphManager/a
 export * from './stores/ServiceInfo.js';
 export * from './components/ServiceQuerySetupUtils.js';
 export * from './components/QuerySetupUtils.js';
+
+// ------------------------------------------- Shared components -------------------------------------------
+
+export * from './components/shared/LambdaEditor.js';
+export * from './components/shared/BasicValueSpecificationEditor.js';
+export * from './components/shared/LambdaParameterValuesEditor.js';
+
+export { LambdaEditorState } from './stores/shared/LambdaEditorState.js';
+export * from './stores/shared/LambdaParameterState.js';
+export * from './stores/shared/ValueSpecificationModifierHelper.js';
+export * from './stores/shared/ValueSpecificationEditorHelper.js';

package/src/stores/QueryBuilderMilestoningState.ts

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import { LambdaParameterState } from '@finos/legend-application';
 import {
-  DEFAULT_BUSINESS_DATE_MILESTONING_PARAMETER_NAME,
-  DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
+  BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+  PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
   GenericType,
   GenericTypeExplicitReference,
   getMilestoneTemporalStereotype,
@@ -32,6 +31,7 @@ import { type Hashable, hashArray } from '@finos/legend-shared';
 import { action, computed, makeObservable, observable } from 'mobx';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
+import { LambdaParameterState } from './shared/LambdaParameterState.js';
 
 export class QueryBuilderMilestoningState implements Hashable {
   queryBuilderState: QueryBuilderState;
@@ -70,7 +70,7 @@ export class QueryBuilderMilestoningState implements Hashable {
       case MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL: {
         this.setBusinessDate(
           this.buildMilestoningParameter(
-            DEFAULT_BUSINESS_DATE_MILESTONING_PARAMETER_NAME,
+            BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
         break;
@@ -78,7 +78,7 @@ export class QueryBuilderMilestoningState implements Hashable {
       case MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL: {
         this.setProcessingDate(
           this.buildMilestoningParameter(
-            DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
+            PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
         break;
@@ -86,12 +86,12 @@ export class QueryBuilderMilestoningState implements Hashable {
       case MILESTONING_STEREOTYPE.BITEMPORAL: {
         this.setProcessingDate(
           this.buildMilestoningParameter(
-            DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
+            PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
         this.setBusinessDate(
           this.buildMilestoningParameter(
-            DEFAULT_BUSINESS_DATE_MILESTONING_PARAMETER_NAME,
+            BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
         break;

package/src/stores/QueryBuilderParametersState.ts

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import {
-  LambdaParametersState,
-  type LambdaParameterState,
-} from '@finos/legend-application';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { observable, makeObservable, action, override } from 'mobx';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
+import {
+  type LambdaParameterState,
+  LambdaParametersState,
+} from './shared/LambdaParameterState.js';
 
 export const QUERY_BUILDER_PARAMETER_DND_TYPE = 'PARAMETER';
 

package/src/stores/QueryBuilderPropertyEditorState.ts

@@ -50,18 +50,23 @@ import {
   observe_AbstractPropertyExpression,
   GenericTypeExplicitReference,
   GenericType,
-  DEFAULT_BUSINESS_DATE_MILESTONING_PARAMETER_NAME,
-  DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
+  BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+  PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
   INTERNAL__PropagatedValue,
   Association,
   getGeneratedMilestonedPropertiesForAssociation,
+  PropertyExplicitReference,
 } from '@finos/legend-graph';
 import { generateDefaultValueForPrimitiveType } from './QueryBuilderValueSpecificationHelper.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
-import { functionExpression_setParametersValues } from '@finos/legend-application';
 import type { QueryBuilderMilestoningState } from './QueryBuilderMilestoningState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
+import {
+  propertyExpression_setFunc,
+  functionExpression_setParametersValues,
+  instanceValue_setValues,
+} from './shared/ValueSpecificationModifierHelper.js';
 
 export const getDerivedPropertyMilestoningSteoreotype = (
   property: DerivedProperty,
@@ -168,13 +173,13 @@ export const generateMilestonedPropertyParameterValue = (
     derivedPropertyExpressionState.queryBuilderState.graphManagerState.graph,
   );
   const temporalTarget =
-    derivedPropertyExpressionState.propertyExpression.func.genericType.value
-      .rawType instanceof Class &&
-    derivedPropertyExpressionState.propertyExpression.func._OWNER
+    derivedPropertyExpressionState.propertyExpression.func.value.genericType
+      .value.rawType instanceof Class &&
+    derivedPropertyExpressionState.propertyExpression.func.value._OWNER
       ._generatedMilestonedProperties.length !== 0
       ? getMilestoneTemporalStereotype(
-          derivedPropertyExpressionState.propertyExpression.func.genericType
-            .value.rawType,
+          derivedPropertyExpressionState.propertyExpression.func.value
+            .genericType.value.rawType,
           derivedPropertyExpressionState.queryBuilderState.graphManagerState
             .graph,
         )
@@ -213,31 +218,27 @@ export const generateMilestonedPropertyParameterValue = (
       if (!milestoningState.businessDate) {
         milestoningState.setBusinessDate(
           derivedPropertyExpressionState.queryBuilderState.milestoningState.buildMilestoningParameter(
-            DEFAULT_BUSINESS_DATE_MILESTONING_PARAMETER_NAME,
+            BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
       }
-      const parameter = new INTERNAL__PropagatedValue(
-        derivedPropertyExpressionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-          TYPICAL_MULTIPLICITY_TYPE.ONE,
-        ),
+      const parameter = new INTERNAL__PropagatedValue(() =>
+        guaranteeNonNullable(milestoningState.businessDate),
       );
-      parameter.getValue = (): ValueSpecification =>
-        guaranteeNonNullable(milestoningState.businessDate);
       return parameter;
     }
     case MILESTONING_STEREOTYPE.BITEMPORAL: {
       if (!milestoningState.processingDate) {
         milestoningState.setProcessingDate(
           derivedPropertyExpressionState.queryBuilderState.milestoningState.buildMilestoningParameter(
-            DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
+            PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
       }
       if (!milestoningState.businessDate) {
         milestoningState.setBusinessDate(
           derivedPropertyExpressionState.queryBuilderState.milestoningState.buildMilestoningParameter(
-            DEFAULT_BUSINESS_DATE_MILESTONING_PARAMETER_NAME,
+            BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
       }
@@ -252,13 +253,9 @@ export const generateMilestonedPropertyParameterValue = (
             AbstractPropertyExpression,
           ).parametersValues[1];
         }
-        const parameter = new INTERNAL__PropagatedValue(
-          derivedPropertyExpressionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-            TYPICAL_MULTIPLICITY_TYPE.ONE,
-          ),
+        const parameter = new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(milestoningState.processingDate),
         );
-        parameter.getValue = (): ValueSpecification =>
-          guaranteeNonNullable(milestoningState.processingDate);
         return parameter;
       } else {
         if (
@@ -276,13 +273,9 @@ export const generateMilestonedPropertyParameterValue = (
             AbstractPropertyExpression,
           ).parametersValues[1];
         }
-        const parameter = new INTERNAL__PropagatedValue(
-          derivedPropertyExpressionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-            TYPICAL_MULTIPLICITY_TYPE.ONE,
-          ),
+        const parameter = new INTERNAL__PropagatedValue(() =>
+          guaranteeNonNullable(milestoningState.businessDate),
         );
-        parameter.getValue = (): ValueSpecification =>
-          guaranteeNonNullable(milestoningState.businessDate);
         return parameter;
       }
     }
@@ -290,17 +283,13 @@ export const generateMilestonedPropertyParameterValue = (
       if (!milestoningState.processingDate) {
         milestoningState.setProcessingDate(
           derivedPropertyExpressionState.queryBuilderState.milestoningState.buildMilestoningParameter(
-            DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
+            PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
           ),
         );
       }
-      const parameter = new INTERNAL__PropagatedValue(
-        derivedPropertyExpressionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
-          TYPICAL_MULTIPLICITY_TYPE.ONE,
-        ),
+      const parameter = new INTERNAL__PropagatedValue(() =>
+        guaranteeNonNullable(milestoningState.processingDate),
       );
-      parameter.getValue = (): ValueSpecification =>
-        guaranteeNonNullable(milestoningState.processingDate);
       return parameter;
     }
     default:
@@ -315,7 +304,7 @@ export const getPropertyChainName = (
   const propertyNameDecorator = humanizePropertyName
     ? prettyPropertyName
     : (val: string): string => val;
-  const chunks = [propertyNameDecorator(propertyExpression.func.name)];
+  const chunks = [propertyNameDecorator(propertyExpression.func.value.name)];
   let currentExpression: ValueSpecification | undefined = propertyExpression;
   while (currentExpression instanceof AbstractPropertyExpression) {
     currentExpression = getNullableFirstElement(
@@ -341,7 +330,7 @@ export const getPropertyChainName = (
       );
     }
     if (currentExpression instanceof AbstractPropertyExpression) {
-      chunks.unshift(propertyNameDecorator(currentExpression.func.name));
+      chunks.unshift(propertyNameDecorator(currentExpression.func.value.name));
     }
   }
   const processedChunks: string[] = [];
@@ -367,14 +356,14 @@ export const getPropertyChainName = (
 export const getPropertyPath = (
   propertyExpression: AbstractPropertyExpression,
 ): string => {
-  const propertyNameChain = [propertyExpression.func.name];
+  const propertyNameChain = [propertyExpression.func.value.name];
   let currentExpression: ValueSpecification | undefined = propertyExpression;
   while (currentExpression instanceof AbstractPropertyExpression) {
     currentExpression = getNullableFirstElement(
       currentExpression.parametersValues,
     );
     if (currentExpression instanceof AbstractPropertyExpression) {
-      propertyNameChain.unshift(currentExpression.func.name);
+      propertyNameChain.unshift(currentExpression.func.value.name);
     }
   }
   return propertyNameChain.join('.');
@@ -416,9 +405,9 @@ export const generateValueSpecificationForParameter = (
         parameter.multiplicity,
       );
       if (type.name !== PRIMITIVE_TYPE.LATESTDATE) {
-        primitiveInstanceValue.values = [
+        instanceValue_setValues(primitiveInstanceValue, [
           generateDefaultValueForPrimitiveType(type.name as PRIMITIVE_TYPE),
-        ];
+        ]);
       }
       return primitiveInstanceValue;
     } else if (type instanceof Enumeration) {
@@ -430,7 +419,7 @@ export const generateValueSpecificationForParameter = (
         const enumValueRef = EnumValueExplicitReference.create(
           type.values[0] as Enum,
         );
-        enumValueInstanceValue.values = [enumValueRef];
+        instanceValue_setValues(enumValueInstanceValue, [enumValueRef]);
       }
       return enumValueInstanceValue;
     }
@@ -506,7 +495,7 @@ export class QueryBuilderDerivedPropertyExpressionState {
     );
     this.queryBuilderState = queryBuilderState;
     this.derivedProperty = guaranteeType(
-      propertyExpression.func,
+      propertyExpression.func.value,
       DerivedProperty,
     );
     // build the parameters of the derived properties
@@ -525,7 +514,7 @@ export class QueryBuilderDerivedPropertyExpressionState {
   }
 
   get property(): AbstractProperty {
-    return this.propertyExpression.func;
+    return this.propertyExpression.func.value;
   }
 
   get parameterValues(): ValueSpecification[] {
@@ -620,29 +609,33 @@ export class QueryBuilderPropertyExpressionState implements Hashable {
     while (currentExpression instanceof AbstractPropertyExpression) {
       // Check if the property chain can results in column that have multiple values
       if (
-        currentExpression.func.multiplicity.upperBound === undefined ||
-        currentExpression.func.multiplicity.upperBound > 1
+        currentExpression.func.value.multiplicity.upperBound === undefined ||
+        currentExpression.func.value.multiplicity.upperBound > 1
       ) {
         requiresExistsHandling = true;
       }
       // check if the property is milestoned
       if (
-        currentExpression.func.genericType.value.rawType instanceof Class &&
-        currentExpression.func._OWNER._generatedMilestonedProperties.length !==
-          0
+        currentExpression.func.value.genericType.value.rawType instanceof
+          Class &&
+        currentExpression.func.value._OWNER._generatedMilestonedProperties
+          .length !== 0
       ) {
-        const name = currentExpression.func.name;
-        const func =
-          currentExpression.func._OWNER._generatedMilestonedProperties.find(
+        const name = currentExpression.func.value.name;
+        const property =
+          currentExpression.func.value._OWNER._generatedMilestonedProperties.find(
             (e) => e.name === name,
           );
-        if (func) {
-          currentExpression.func = func;
+        if (property) {
+          propertyExpression_setFunc(
+            currentExpression,
+            PropertyExplicitReference.create(property),
+          );
         }
       }
 
       // Create states to hold derived properties' parameters and arguments for editing
-      if (currentExpression.func instanceof DerivedProperty) {
+      if (currentExpression.func.value instanceof DerivedProperty) {
         const derivedPropertyExpressionState =
           new QueryBuilderDerivedPropertyExpressionState(
             this.queryBuilderState,

package/src/stores/QueryBuilderResultState.ts

@@ -37,10 +37,8 @@ import {
   buildRawLambdaFromLambdaFunction,
 } from '@finos/legend-graph';
 import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
-import {
-  buildParametersLetLambdaFunc,
-  ExecutionPlanState,
-} from '@finos/legend-application';
+import { ExecutionPlanState } from '@finos/legend-application';
+import { buildParametersLetLambdaFunc } from './shared/LambdaParameterState.js';
 
 const DEFAULT_LIMIT = 1000;
 

package/src/stores/QueryBuilderState.ts

@@ -84,7 +84,7 @@ export abstract class QueryBuilderState {
   observableContext: ObserverContext;
 
   queryCompileState = ActionState.create();
-  backdrop = false;
+  showBackdrop = false;
   showFunctionsExplorerPanel = false;
   showParametersPanel = false;
 
@@ -109,7 +109,7 @@ export abstract class QueryBuilderState {
       resultState: observable,
       textEditorState: observable,
       unsupportedQueryState: observable,
-      backdrop: observable,
+      showBackdrop: observable,
       showFunctionsExplorerPanel: observable,
       showParametersPanel: observable,
       changeDetectionState: observable,
@@ -121,7 +121,7 @@ export abstract class QueryBuilderState {
       isQuerySupported: computed,
       validationIssues: computed,
 
-      setBackdrop: action,
+      setShowBackdrop: action,
       setShowFunctionsExplorerPanel: action,
       setShowParametersPanel: action,
       setClass: action,
@@ -185,8 +185,8 @@ export abstract class QueryBuilderState {
     return true;
   }
 
-  setBackdrop(val: boolean): void {
-    this.backdrop = val;
+  setShowBackdrop(val: boolean): void {
+    this.showBackdrop = val;
   }
 
   setShowFunctionsExplorerPanel(val: boolean): void {
@@ -246,13 +246,14 @@ export abstract class QueryBuilderState {
     this.resetQueryContent();
     this.setClass(val);
     this.explorerState.refreshTreeData();
-    this.milestoningState.updateMilestoningConfiguration();
     this.fetchStructureState.implementation.onClassChange(val);
+    this.milestoningState.updateMilestoningConfiguration();
   }
 
   changeMapping(val: Mapping): void {
     this.resetQueryResult();
     this.resetQueryContent();
+    this.milestoningState.updateMilestoningConfiguration();
     this.setMapping(val);
   }
 

package/src/stores/QueryBuilderStateBuilder.ts

@@ -50,7 +50,6 @@ import {
   type ValueSpecification,
 } from '@finos/legend-graph';
 import { processTDSPostFilterExpression } from './fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.js';
-import { LambdaParameterState } from '@finos/legend-application';
 import { processFilterExpression } from './filter/QueryBuilderFilterStateBuilder.js';
 import {
   processTDSAggregateExpression,
@@ -70,6 +69,7 @@ import {
   processTDSTakeExpression,
 } from './fetch-structure/projection/QueryBuilderProjectionStateBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graphManager/QueryBuilderSupportedFunctions.js';
+import { LambdaParameterState } from './shared/LambdaParameterState.js';
 
 const processGetAllExpression = (
   expression: SimpleFunctionExpression,

package/src/stores/QueryBuilderTextEditorState.ts

@@ -29,7 +29,8 @@ import {
 } from '@finos/legend-shared';
 import { observable, action, flow, makeObservable, flowResult } from 'mobx';
 import type { QueryBuilderState } from './QueryBuilderState.js';
-import { LambdaEditorState, TAB_SIZE } from '@finos/legend-application';
+import { TAB_SIZE } from '@finos/legend-application';
+import { LambdaEditorState } from './shared/LambdaEditorState.js';
 
 export class QueryBuilderRawLambdaState {
   lambda: RawLambda;