@finos/legend-application-query 5.2.2 → 5.2.5

package/src/components/{QueryBuilderProjectionPanel.tsx → fetch-structure/QueryBuilderProjectionPanel.tsx}

@@ -38,7 +38,7 @@ import {
   type QueryBuilderExplorerTreePropertyNodeData,
   buildPropertyExpressionFromExplorerTreeNodeData,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
-} from '../stores/QueryBuilderExplorerState.js';
+} from '../../stores/explorer/QueryBuilderExplorerState.js';
 import { type DropTargetMonitor, useDrag, useDrop } from 'react-dnd';
 import {
   type QueryBuilderProjectionColumnDragSource,
@@ -46,22 +46,19 @@ import {
   QueryBuilderDerivationProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
-} from '../stores/QueryBuilderProjectionState.js';
-import { QueryBuilderPropertyExpressionBadge } from './QueryBuilderPropertyExpressionEditor.js';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+} from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { QueryResultModifierModal } from './QueryBuilderResultModifierPanel.js';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
-import {
-  type QueryBuilderAggregateOperator,
-  QueryBuilderAggregateColumnState,
-} from '../stores/QueryBuilderAggregationState.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
+import { QueryBuilderAggregateColumnState } from '../../stores/fetch-structure/projection/aggregation/QueryBuilderAggregationState.js';
 import { flowResult } from 'mobx';
-import { QueryBuilderLambdaEditor } from './QueryBuilderLambdaEditor.js';
+import { QueryBuilderLambdaEditor } from '../shared/QueryBuilderLambdaEditor.js';
 import { useApplicationStore } from '@finos/legend-application';
 import {
   type QueryBuilderParameterDragSource,
   QUERY_BUILDER_PARAMETER_DND_TYPE,
-} from '../stores/QueryParametersState.js';
+} from '../../stores/QueryParametersState.js';
 import {
   type ConcreteFunctionDefinition,
   generateFunctionCallString,
@@ -71,10 +68,11 @@ import {
 import {
   type QueryBuilderFunctionsExplorerDragSource,
   QUERY_BUILDER_FUNCTION_DND_TYPE,
-} from '../stores/QueryFunctionsExplorerState.js';
-import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilder_Const.js';
-import { QueryBuilderPostFilterTreeConditionNodeData } from '../stores/QueryBuilderPostFilterState.js';
+} from '../../stores/explorer/QueryFunctionsExplorerState.js';
+import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../QueryBuilder_Const.js';
+import { QueryBuilderPostFilterTreeConditionNodeData } from '../../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import { filterByType } from '@finos/legend-shared';
+import type { QueryBuilderAggregateOperator } from '../../stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.js';
 
 const QueryBuilderProjectionColumnContextMenu = observer(
   forwardRef<
@@ -241,7 +239,7 @@ const QueryBuilderProjectionColumnEditor = observer(
     const projectionState =
       queryBuilderState.fetchStructureState.projectionState;
     const postFilterColumnStates = Array.from(
-      queryBuilderState.postFilterState.nodes.values(),
+      projectionState.postFilterState.nodes.values(),
     )
       .filter(filterByType(QueryBuilderPostFilterTreeConditionNodeData))
       .map((n) => n.condition.columnState);

package/src/components/{QueryBuilderResultModifierPanel.tsx → fetch-structure/QueryBuilderResultModifierPanel.tsx}

@@ -28,9 +28,9 @@ import {
 import {
   COLUMN_SORT_TYPE,
   SortColumnState,
-} from '../stores/QueryResultSetModifierState.js';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
-import type { QueryBuilderProjectionColumnState } from '../stores/QueryBuilderProjectionState.js';
+} from '../../stores/fetch-structure/projection/QueryResultSetModifierState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
+import type { QueryBuilderProjectionColumnState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { useApplicationStore } from '@finos/legend-application';
 
@@ -43,7 +43,9 @@ const ColumnSortEditor = observer(
     const applicationStore = useApplicationStore();
     const projectionState =
       queryBuilderState.fetchStructureState.projectionState;
-    const sortColumns = queryBuilderState.resultSetModifierState.sortColumns;
+    const sortColumns =
+      queryBuilderState.fetchStructureState.projectionState
+        .resultSetModifierState.sortColumns;
     const projectionOptions = projectionState.columns
       .filter(
         (projectionCol) =>
@@ -74,7 +76,10 @@ const ColumnSortEditor = observer(
       );
     };
     const deleteColumnSort = (): void =>
-      queryBuilderState.resultSetModifierState.deleteSortColumn(columnSort);
+      queryBuilderState.fetchStructureState.projectionState.resultSetModifierState.deleteSortColumn(
+        columnSort,
+      );
+
     return (
       <div className="panel__content__form__section__list__item query-builder__projection__options__sort">
         <CustomSelectorInput
@@ -112,7 +117,9 @@ const ColumnSortEditor = observer(
 const ColumnsSortEditor = observer(
   (props: { queryBuilderState: QueryBuilderState }) => {
     const { queryBuilderState } = props;
-    const resultModifier = queryBuilderState.resultSetModifierState;
+    const resultModifier =
+      queryBuilderState.fetchStructureState.projectionState
+        .resultSetModifierState;
     const sortColumns = resultModifier.sortColumns;
     const projectionState =
       queryBuilderState.fetchStructureState.projectionState;
@@ -128,7 +135,6 @@ const ColumnsSortEditor = observer(
     const addValue = (): void => {
       if (projectionOptions.length > 0) {
         const sortColumn = new SortColumnState(
-          queryBuilderState,
           guaranteeNonNullable(projectionOptions[0]).value,
         );
         resultModifier.addSortColumn(sortColumn);
@@ -173,7 +179,9 @@ const ColumnsSortEditor = observer(
 export const QueryResultModifierModal = observer(
   (props: { queryBuilderState: QueryBuilderState }) => {
     const { queryBuilderState } = props;
-    const resultModifier = queryBuilderState.resultSetModifierState;
+    const resultModifier =
+      queryBuilderState.fetchStructureState.projectionState
+        .resultSetModifierState;
     const limitResults = resultModifier.limit;
     const distinct = resultModifier.distinct;
     const close = (): void => resultModifier.setShowModal(false);

package/src/components/{QueryBuilderFilterPanel.tsx → filter/QueryBuilderFilterPanel.tsx}

@@ -47,28 +47,27 @@ import {
   type QueryBuilderFilterConditionDragSource,
   type QueryBuilderFilterDropTarget,
   type QueryBuilderFilterTreeNodeData,
-  type QueryBuilderFilterOperator,
   QUERY_BUILDER_FILTER_DND_TYPE,
   FilterConditionState,
   QueryBuilderFilterTreeConditionNodeData,
   QueryBuilderFilterTreeBlankConditionNodeData,
   QueryBuilderFilterTreeGroupNodeData,
-} from '../stores/QueryBuilderFilterState.js';
+} from '../../stores/filter/QueryBuilderFilterState.js';
 import { useDrag, useDrop } from 'react-dnd';
 import {
   type QueryBuilderExplorerTreeDragSource,
   type QueryBuilderExplorerTreePropertyNodeData,
   buildPropertyExpressionFromExplorerTreeNodeData,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
-} from '../stores/QueryBuilderExplorerState.js';
-import { QueryBuilderPropertyExpressionBadge } from './QueryBuilderPropertyExpressionEditor.js';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+} from '../../stores/explorer/QueryBuilderExplorerState.js';
+import { QueryBuilderPropertyExpressionBadge } from '../QueryBuilderPropertyExpressionEditor.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   assertErrorThrown,
   debounce,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import {
   useApplicationStore,
   BasicValueSpecificationEditor,
@@ -76,17 +75,16 @@ import {
 import {
   type QueryBuilderParameterDragSource,
   QUERY_BUILDER_PARAMETER_DND_TYPE,
-} from '../stores/QueryParametersState.js';
-import {
-  isTypeCompatibleWithConditionValueType,
-  QUERY_BUILDER_GROUP_OPERATION,
-} from '../stores/QueryBuilderOperatorsHelper.js';
+} from '../../stores/QueryParametersState.js';
 import type { ValueSpecification } from '@finos/legend-graph';
 import {
   type QueryBuilderProjectionColumnDragSource,
   QueryBuilderSimpleProjectionColumnState,
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
-} from '../stores/QueryBuilderProjectionState.js';
+} from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderFilterOperator } from '../../stores/filter/QueryBuilderFilterOperator.js';
+import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
+import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 
 const QueryBuilderFilterGroupConditionEditor = observer(
   (props: {
@@ -166,12 +164,7 @@ const QueryBuilderFilterConditionEditor = observer(
         const conditionValueType =
           node.condition.propertyExpressionState.propertyExpression.func
             .genericType.value.rawType;
-        if (
-          isTypeCompatibleWithConditionValueType(
-            parameterType,
-            conditionValueType,
-          )
-        ) {
+        if (isTypeCompatibleForAssignment(parameterType, conditionValueType)) {
           node.condition.setValue(item.variable.parameter);
         } else {
           applicationStore.notifyWarning(
@@ -770,7 +763,7 @@ export const QueryBuilderFilterPanel = observer(
       { isDragOver: boolean }
     >(
       () => ({
-        accept: queryBuilderState.mode.isDnDProjectionToFilterSupported
+        accept: queryBuilderState.mode.isDnDFetchStructureToFilterSupported
           ? [
               QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.ENUM_PROPERTY,
               QUERY_BUILDER_EXPLORER_TREE_DND_TYPE.PRIMITIVE_PROPERTY,

package/src/components/{QueryBuilderLambdaEditor.tsx → shared/QueryBuilderLambdaEditor.tsx}

@@ -18,7 +18,7 @@ import { flowResult } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { type IKeyboardEvent, KeyCode } from 'monaco-editor';
 import { useCallback, useMemo } from 'react';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import type { Type } from '@finos/legend-graph';
 import {
   useApplicationStore,

package/src/index.ts

@@ -49,7 +49,3 @@ export {
   StandardQueryBuilderMode,
   QueryBuilderState,
 } from './stores/QueryBuilderState.js';
-export { QueryBuilderExplorerTreeRootNodeData } from './stores/QueryBuilderExplorerState.js';
-export { FETCH_STRUCTURE_MODE } from './stores/QueryBuilderFetchStructureState.js';
-export { COLUMN_SORT_TYPE } from './stores/QueryResultSetModifierState.js';
-export { QueryBuilderSimpleProjectionColumnState } from './stores/QueryBuilderProjectionState.js';

package/src/stores/LegendQueryBaseStore.ts

@@ -15,14 +15,10 @@
  */
 
 import type { DepotServerClient } from '@finos/legend-server-depot';
-import {
-  type ApplicationStore,
-  LegendApplicationSDLCSetupState,
-} from '@finos/legend-application';
+import type { ApplicationStore } from '@finos/legend-application';
 import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import type { LegendQueryApplicationConfig } from '../application/LegendQueryApplicationConfig.js';
 import type { LegendQueryApplicationPlugin } from './LegendQueryApplicationPlugin.js';
-import type { SDLCServerClient } from '@finos/legend-server-sdlc';
 
 export type LegendQueryApplicationStore = ApplicationStore<
   LegendQueryApplicationConfig,
@@ -33,26 +29,17 @@ export class LegendQueryBaseStore {
   applicationStore: LegendQueryApplicationStore;
   depotServerClient: DepotServerClient;
   pluginManager: LegendQueryPluginManager;
-  applicationSDLCSetupState: LegendApplicationSDLCSetupState;
 
   constructor(
     applicationStore: LegendQueryApplicationStore,
     depotServerClient: DepotServerClient,
-    sdlcServerClient: SDLCServerClient,
     pluginManager: LegendQueryPluginManager,
   ) {
     this.applicationStore = applicationStore;
-    this.applicationSDLCSetupState = new LegendApplicationSDLCSetupState(
-      applicationStore,
-      sdlcServerClient,
-    );
     this.depotServerClient = depotServerClient;
     this.pluginManager = pluginManager;
 
     // Register plugins
-    this.applicationSDLCSetupState.sdlcServerClient.setTracerService(
-      this.applicationStore.tracerService,
-    );
     this.depotServerClient.setTracerService(
       this.applicationStore.tracerService,
     );

package/src/stores/QueryBuilderGroupOperationHelper.ts

@@ -0,0 +1,54 @@
+/**
+ * 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 { matchFunctionName } from '@finos/legend-graph';
+import { UnsupportedOperationError } from '@finos/legend-shared';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../QueryBuilder_Const.js';
+
+export enum QUERY_BUILDER_GROUP_OPERATION {
+  AND = 'and',
+  OR = 'or',
+}
+
+export const fromGroupOperation = (
+  operation: QUERY_BUILDER_GROUP_OPERATION,
+): string => {
+  switch (operation) {
+    case QUERY_BUILDER_GROUP_OPERATION.AND:
+      return QUERY_BUILDER_SUPPORTED_FUNCTIONS.AND;
+    case QUERY_BUILDER_GROUP_OPERATION.OR:
+      return QUERY_BUILDER_SUPPORTED_FUNCTIONS.OR;
+    default:
+      throw new UnsupportedOperationError(
+        `Can't derive function name from group operation '${operation}'`,
+      );
+  }
+};
+
+export const toGroupOperation = (
+  functionName: string,
+): QUERY_BUILDER_GROUP_OPERATION => {
+  if (matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.AND)) {
+    return QUERY_BUILDER_GROUP_OPERATION.AND;
+  } else if (
+    matchFunctionName(functionName, QUERY_BUILDER_SUPPORTED_FUNCTIONS.OR)
+  ) {
+    return QUERY_BUILDER_GROUP_OPERATION.OR;
+  }
+  throw new UnsupportedOperationError(
+    `Can't derive group operation from function name '${functionName}'`,
+  );
+};

package/src/stores/QueryBuilderPreviewDataHelper.ts

@@ -19,21 +19,21 @@ import type {
   AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregationState.js';
-import { QueryBuilderAggregateOperator_Average } from './aggregateOperators/QueryBuilderAggregateOperator_Average.js';
-import { QueryBuilderAggregateOperator_Count } from './aggregateOperators/QueryBuilderAggregateOperator_Count.js';
-import { QueryBuilderAggregateOperator_DistinctCount } from './aggregateOperators/QueryBuilderAggregateOperator_DistinctCount.js';
-import { QueryBuilderAggregateOperator_Max } from './aggregateOperators/QueryBuilderAggregateOperator_Max.js';
-import { QueryBuilderAggregateOperator_Min } from './aggregateOperators/QueryBuilderAggregateOperator_Min.js';
-import { QueryBuilderAggregateOperator_StdDev_Population } from './aggregateOperators/QueryBuilderAggregateOperator_StdDev_Population.js';
-import { QueryBuilderAggregateOperator_StdDev_Sample } from './aggregateOperators/QueryBuilderAggregateOperator_StdDev_Sample.js';
-import { QueryBuilderAggregateOperator_Sum } from './aggregateOperators/QueryBuilderAggregateOperator_Sum.js';
-import { QueryBuilderSimpleProjectionColumnState } from './QueryBuilderProjectionState.js';
+import { QueryBuilderAggregateOperator_Average } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Average.js';
+import { QueryBuilderAggregateOperator_Count } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.js';
+import { QueryBuilderAggregateOperator_DistinctCount } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.js';
+import { QueryBuilderAggregateOperator_Max } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Max.js';
+import { QueryBuilderAggregateOperator_Min } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Min.js';
+import { QueryBuilderAggregateOperator_StdDev_Population } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.js';
+import { QueryBuilderAggregateOperator_StdDev_Sample } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.js';
+import { QueryBuilderAggregateOperator_Sum } from './fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Sum.js';
+import { QueryBuilderSimpleProjectionColumnState } from './fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import {
   COLUMN_SORT_TYPE,
   SortColumnState,
-} from './QueryResultSetModifierState.js';
+} from './fetch-structure/projection/QueryResultSetModifierState.js';
+import type { QueryBuilderAggregateOperator } from './fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.js';
 
 const PREVIEW_DATA_TAKE_LIMIT = 10;
 const PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME = 'Value';
@@ -90,7 +90,7 @@ const createProjectionColumn = (
 const createQueryBuilderState = (
   queryBuilderState: QueryBuilderState,
 ): QueryBuilderState => {
-  const builderState = queryBuilderState.createBareBuilderState();
+  const builderState = queryBuilderState.cloneQueryBuilderState();
   builderState.querySetupState = queryBuilderState.querySetupState;
   return builderState;
 };
@@ -191,15 +191,11 @@ export const buildNonNumericPreviewDataQuery = (
     valueCountProjectionState,
   );
   // result set
-  builderState.resultSetModifierState.limit = PREVIEW_DATA_TAKE_LIMIT;
-  const sortValueCount = new SortColumnState(
-    builderState,
-    valueCountProjectionState,
-  );
+  builderState.fetchStructureState.projectionState.resultSetModifierState.limit =
+    PREVIEW_DATA_TAKE_LIMIT;
+  const sortValueCount = new SortColumnState(valueCountProjectionState);
   sortValueCount.sortType = COLUMN_SORT_TYPE.DESC;
-  builderState.resultSetModifierState.sortColumns = [
-    sortValueCount,
-    new SortColumnState(builderState, valueProjectionColState),
-  ];
+  builderState.fetchStructureState.projectionState.resultSetModifierState.sortColumns =
+    [sortValueCount, new SortColumnState(valueProjectionColState)];
   return builderState.resultState.buildExecutionRawLambda();
 };

package/src/stores/QueryBuilderPropertyEditorState.ts

@@ -52,8 +52,9 @@ import {
   DEFAULT_PROCESSING_DATE_MILESTONING_PARAMETER_NAME,
   INTERNAL__PropagatedValue,
   Association,
+  getGeneratedMilestonedPropertiesForAssociation,
 } from '@finos/legend-graph';
-import { generateDefaultValueForPrimitiveType } from './QueryBuilderValueSpecificationBuilderHelper.js';
+import { generateDefaultValueForPrimitiveType } from './QueryBuilderValueSpecificationHelper.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import type { QueryBuilderSetupState } from './QueryBuilderSetupState.js';
 import { functionExpression_setParametersValues } from '@finos/legend-application';
@@ -67,9 +68,11 @@ export const getDerivedPropertyMilestoningSteoreotype = (
   if (owner instanceof Class) {
     return getMilestoneTemporalStereotype(owner, graph);
   } else if (owner instanceof Association) {
-    if (owner._generatedMilestonedProperties.length) {
+    const generatedMilestonedProperties =
+      getGeneratedMilestonedPropertiesForAssociation(owner, property);
+    if (generatedMilestonedProperties.length) {
       const ownerClass =
-        owner._generatedMilestonedProperties[0]?.genericType.value.rawType;
+        generatedMilestonedProperties[0]?.genericType.value.rawType;
       return getMilestoneTemporalStereotype(
         guaranteeType(ownerClass, Class),
         graph,

package/src/stores/QueryBuilderResultState.ts

@@ -36,7 +36,7 @@ import {
   RawExecutionResult,
   buildRawLambdaFromLambdaFunction,
 } from '@finos/legend-graph';
-import { buildLambdaFunction } from './QueryBuilderLambdaBuilder.js';
+import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import {
   buildParametersLetLambdaFunc,
   ExecutionPlanState,

package/src/stores/QueryBuilderState.ts

@@ -24,23 +24,19 @@ import {
   filterByType,
   hashObject,
 } from '@finos/legend-shared';
-import {
-  type QueryBuilderFilterOperator,
-  QueryBuilderFilterState,
-} from './QueryBuilderFilterState.js';
-import { QueryBuilderFetchStructureState } from './QueryBuilderFetchStructureState.js';
-import { QueryResultSetModifierState } from './QueryResultSetModifierState.js';
+import { QueryBuilderFilterState } from './filter/QueryBuilderFilterState.js';
+import { QueryBuilderFetchStructureState } from './fetch-structure/QueryBuilderFetchStructureState.js';
 import {
   QueryTextEditorMode,
   QueryTextEditorState,
 } from './QueryTextEditorState.js';
 import { QueryBuilderSetupState } from './QueryBuilderSetupState.js';
-import { QueryBuilderExplorerState } from './QueryBuilderExplorerState.js';
+import { QueryBuilderExplorerState } from './explorer/QueryBuilderExplorerState.js';
 import { QueryBuilderResultState } from './QueryBuilderResultState.js';
 import {
   processQueryBuilderLambdaFunction,
   processQueryParameters,
-} from './QueryBuilderLambdaProcessor.js';
+} from './QueryBuilderValueSpecificationProcessor.js';
 import { QueryBuilderUnsupportedState } from './QueryBuilderUnsupportedState.js';
 import {
   type Class,
@@ -62,20 +58,16 @@ import {
   buildLambdaVariableExpressions,
   buildRawLambdaFromLambdaFunction,
 } from '@finos/legend-graph';
-import { buildLambdaFunction } from './QueryBuilderLambdaBuilder.js';
+import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import {
   LambdaParameterState,
   type GenericLegendApplicationStore,
 } from '@finos/legend-application';
-import { QueryBuilderPostFilterState } from './QueryBuilderPostFilterState.js';
-import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
-import { QueryFunctionsExplorerState } from './QueryFunctionsExplorerState.js';
+import { QueryFunctionsExplorerState } from './explorer/QueryFunctionsExplorerState.js';
 import { QueryParametersState } from './QueryParametersState.js';
-import {
-  AGGREGATION_OPERATORS,
-  FILTER_OPERATORS,
-  POST_FILTER_OPERATORS,
-} from './QueryBuilderOperatorLoader.js';
+import type { QueryBuilderFilterOperator } from './filter/QueryBuilderFilterOperator.js';
+import { getQueryBuilderCoreFilterOperators } from './filter/QueryBuilderFilterOperatorLoader.js';
+import { QueryResultSetModifierState } from './fetch-structure/projection/QueryResultSetModifierState.js';
 
 export abstract class QueryBuilderMode {
   abstract get isParametersDisabled(): boolean;
@@ -86,7 +78,7 @@ export abstract class QueryBuilderMode {
    * This flag is for turning on/off dnd from projection panel to filter panel,
    * and will be leveraged when the concepts of workflows are introduced into query builder.
    */
-  get isDnDProjectionToFilterSupported(): boolean {
+  get isDnDFetchStructureToFilterSupported(): boolean {
     return true;
   }
 }
@@ -130,20 +122,18 @@ export class QueryBuilderState {
   queryFunctionsExplorerState: QueryFunctionsExplorerState;
   fetchStructureState: QueryBuilderFetchStructureState;
   filterState: QueryBuilderFilterState;
-  postFilterState: QueryBuilderPostFilterState;
-  resultSetModifierState: QueryResultSetModifierState;
   resultState: QueryBuilderResultState;
   queryTextEditorState: QueryTextEditorState;
   queryUnsupportedState: QueryBuilderUnsupportedState;
   observableContext: ObserverContext;
-  filterOperators: QueryBuilderFilterOperator[] = FILTER_OPERATORS;
-  postFilterOperators: QueryBuilderPostFilterOperator[] = POST_FILTER_OPERATORS;
+  changeDetectionState: QueryBuilderChangeDetectionState;
   isCompiling = false;
   backdrop = false;
   showFunctionPanel = false;
   showParameterPanel = false;
-  showPostFilterPanel = false;
-  changeDetectionState: QueryBuilderChangeDetectionState;
+
+  filterOperators: QueryBuilderFilterOperator[] =
+    getQueryBuilderCoreFilterOperators();
 
   constructor(
     applicationStore: GenericLegendApplicationStore,
@@ -157,8 +147,6 @@ export class QueryBuilderState {
       queryFunctionsExplorerState: observable,
       fetchStructureState: observable,
       filterState: observable,
-      postFilterState: observable,
-      resultSetModifierState: observable,
       resultState: observable,
       queryTextEditorState: observable,
       queryUnsupportedState: observable,
@@ -167,7 +155,6 @@ export class QueryBuilderState {
       mode: observable,
       showFunctionPanel: observable,
       showParameterPanel: observable,
-      showPostFilterPanel: observable,
       changeDetectionState: observable,
       setMode: action,
       resetQueryBuilder: action,
@@ -177,7 +164,6 @@ export class QueryBuilderState {
       setBackdrop: action,
       setShowFunctionPanel: action,
       setShowParameterPanel: action,
-      setShowPostFilterPanel: action,
       changeClass: action,
       changeFetchStructure: action,
       compileQuery: flow,
@@ -190,16 +176,8 @@ export class QueryBuilderState {
     this.explorerState = new QueryBuilderExplorerState(this);
     this.queryParametersState = new QueryParametersState(this);
     this.queryFunctionsExplorerState = new QueryFunctionsExplorerState(this);
-    this.fetchStructureState = new QueryBuilderFetchStructureState(
-      this,
-      AGGREGATION_OPERATORS,
-    );
+    this.fetchStructureState = new QueryBuilderFetchStructureState(this);
     this.filterState = new QueryBuilderFilterState(this, this.filterOperators);
-    this.postFilterState = new QueryBuilderPostFilterState(
-      this,
-      this.postFilterOperators,
-    );
-    this.resultSetModifierState = new QueryResultSetModifierState(this);
     this.resultState = new QueryBuilderResultState(this);
     this.queryTextEditorState = new QueryTextEditorState(this);
     this.queryUnsupportedState = new QueryBuilderUnsupportedState(this);
@@ -226,10 +204,6 @@ export class QueryBuilderState {
     this.showParameterPanel = val;
   }
 
-  setShowPostFilterPanel(val: boolean): void {
-    this.showPostFilterPanel = val;
-  }
-
   getQuery(options?: { keepSourceInformation: boolean }): RawLambda {
     if (!this.isQuerySupported()) {
       const parameters = this.queryParametersState.parameterStates.map((e) =>
@@ -264,21 +238,13 @@ export class QueryBuilderState {
     this.explorerState.refreshTreeData();
     this.queryParametersState = new QueryParametersState(this);
     this.queryFunctionsExplorerState = new QueryFunctionsExplorerState(this);
-    const fetchStructureState = new QueryBuilderFetchStructureState(
-      this,
-      this.fetchStructureState.projectionState.aggregationState.operators,
-    );
+    const fetchStructureState = new QueryBuilderFetchStructureState(this);
     fetchStructureState.setFetchStructureMode(
       this.fetchStructureState.fetchStructureMode,
     );
     this.fetchStructureState = fetchStructureState;
-    this.filterState = new QueryBuilderFilterState(this, this.filterOperators);
-    this.postFilterState = new QueryBuilderPostFilterState(
-      this,
-      this.postFilterOperators,
-    );
-    this.resultSetModifierState = new QueryResultSetModifierState(this);
     this.fetchStructureState.graphFetchTreeState.initialize();
+    this.filterState = new QueryBuilderFilterState(this, this.filterOperators);
   }
 
   initialize(rawLambda: RawLambda, options?: { notifyError: boolean }): void {
@@ -362,6 +328,7 @@ export class QueryBuilderState {
       const variableState = new LambdaParameterState(
         milestoningParameter,
         this.querySetupState.queryBuilderState.observableContext,
+        this.querySetupState.queryBuilderState.graphManagerState.graph,
       );
       variableState.mockParameterValue();
       this.queryParametersState.addParameter(variableState);
@@ -480,8 +447,10 @@ export class QueryBuilderState {
     this.explorerState.refreshTreeData();
   }
 
+  // TODO-BEFORE-PR: consider removing this
   changeFetchStructure(): void {
-    this.resultSetModifierState = new QueryResultSetModifierState(this);
+    this.fetchStructureState.projectionState.resultSetModifierState =
+      new QueryResultSetModifierState(this.fetchStructureState.projectionState);
     const treeData = this.fetchStructureState.graphFetchTreeState.treeData;
     if (!treeData) {
       this.fetchStructureState.graphFetchTreeState.initialize();
@@ -492,7 +461,7 @@ export class QueryBuilderState {
     return this.fetchStructureState.validationIssues;
   }
 
-  createBareBuilderState(): QueryBuilderState {
+  cloneQueryBuilderState(): QueryBuilderState {
     return new QueryBuilderState(
       this.applicationStore,
       this.graphManagerState,

package/src/stores/QueryBuilderTestUtils.ts

@@ -23,6 +23,7 @@ import {
 } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-storage';
 import { jest } from '@jest/globals';
+import { flowResult } from 'mobx';
 import { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import { QueryBuilder_GraphManagerPreset } from '../graphManager/QueryBuilder_GraphManagerPreset.js';
 import {
@@ -87,7 +88,9 @@ export const TEST_setUpQueryBuilderState = async (
         ),
       );
 
-    await queryBuilderState.explorerState.analyzeMappingModelCoverage();
+    await flowResult(
+      queryBuilderState.explorerState.analyzeMappingModelCoverage(),
+    );
   }
   return queryBuilderState;
 };