@finos/legend-application-query 5.2.2 → 5.2.3

package/src/components/{QueryBuilderFunctionsExplorerPanel.tsx → explorer/QueryBuilderFunctionsExplorerPanel.tsx}

@@ -47,7 +47,7 @@ import {
   generateFunctionsExplorerTreeNodeData,
   getFunctionsExplorerTreeNodeChildren,
   QUERY_BUILDER_FUNCTION_DND_TYPE,
-} from '../stores/QueryFunctionsExplorerState.js';
+} from '../../stores/explorer/QueryFunctionsExplorerState.js';
 import { useDrag } from 'react-dnd';
 import {
   ConcreteFunctionDefinition,
@@ -57,7 +57,7 @@ import {
   ROOT_PACKAGE_NAME,
   getMultiplicityDescription,
 } from '@finos/legend-graph';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 
 const isDependencyTreeNode = (
   node: QueryBuilderFunctionsExplorerTreeNodeData,

package/src/components/{QueryBuilderMilestoneEditor.tsx → explorer/QueryBuilderMilestoneEditor.tsx}

@@ -15,11 +15,11 @@
  */
 
 import { observer } from 'mobx-react-lite';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   type QueryBuilderParameterDragSource,
   QUERY_BUILDER_PARAMETER_DND_TYPE,
-} from '../stores/QueryParametersState.js';
+} from '../../stores/QueryParametersState.js';
 import { useCallback } from 'react';
 import {
   type ValueSpecification,
@@ -33,9 +33,9 @@ import {
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { useDrop } from 'react-dnd';
-import { VariableExpressionViewer } from './QueryBuilderParameterPanel.js';
+import { VariableExpressionViewer } from '../QueryBuilderParameterPanel.js';
 import { Dialog, PanelEntryDropZonePlaceholder } from '@finos/legend-art';
-import { generateDefaultValueForPrimitiveType } from '../stores/QueryBuilderValueSpecificationBuilderHelper.js';
+import { generateDefaultValueForPrimitiveType } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { BasicValueSpecificationEditor } from '@finos/legend-application';
 
 const MilestoningParameterEditor = observer(

package/src/components/{QueryBuilderPropertySearchPanel.tsx → explorer/QueryBuilderPropertySearchPanel.tsx}

@@ -40,7 +40,7 @@ import {
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { useDrag } from 'react-dnd';
-import { QUERY_BUILDER_PROPERTY_SEARCH_TYPE } from '../QueryBuilder_Const.js';
+import { QUERY_BUILDER_PROPERTY_SEARCH_TYPE } from '../../QueryBuilder_Const.js';
 import {
   type QueryBuilderExplorerTreeNodeData,
   QueryBuilderExplorerTreePropertyNodeData,
@@ -48,15 +48,15 @@ import {
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
   getQueryBuilderPropertyNodeData,
   type QueryBuilderExplorerState,
-} from '../stores/QueryBuilderExplorerState.js';
-import { prettyPropertyName } from '../stores/QueryBuilderPropertyEditorState.js';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+} from '../../stores/explorer/QueryBuilderExplorerState.js';
+import { prettyPropertyName } from '../../stores/QueryBuilderPropertyEditorState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   QueryBuilderSubclassInfoTooltip,
   renderPropertyTypeIcon,
 } from './QueryBuilderExplorerPanel.js';
-import { QueryBuilderPropertyInfoTooltip } from './QueryBuilderPropertyInfoTooltip.js';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 
 const prettyPropertyNameFromNodeId = (name: string): string => {
   let propNameArray = name.split('.');

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

@@ -21,20 +21,20 @@ import {
   PlusIcon,
   OptionsIcon,
 } from '@finos/legend-art';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { prettyCONSTName } from '@finos/legend-shared';
 import { QueryBuilderProjectionPanel } from './QueryBuilderProjectionPanel.js';
 import { QueryBuilderGraphFetchTreePanel } from './QueryBuilderGraphFetchTreePanel.js';
-import { FETCH_STRUCTURE_MODE } from '../stores/QueryBuilderFetchStructureState.js';
-import { QueryBuilderPostFilterState } from '../stores/QueryBuilderPostFilterState.js';
+import { FETCH_STRUCTURE_MODE } from '../../stores/fetch-structure/QueryBuilderFetchStructureState.js';
+import { QueryBuilderPostFilterState } from '../../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import {
   ActionAlertActionType,
   ActionAlertType,
   useApplicationStore,
 } from '@finos/legend-application';
-import { QueryBuilderProjectionState } from '../stores/QueryBuilderProjectionState.js';
-import { QueryBuilderGraphFetchTreeState } from '../stores/QueryBuilderGraphFetchTreeState.js';
-import { QueryBuilderPanelIssueCountBadge } from './QueryBuilderPanelIssueCountBadge.js';
+import { QueryBuilderProjectionState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
+import { QueryBuilderGraphFetchTreeState } from '../../stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js';
+import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
 
 const QueryBuilderUnsupportedFetchStructure = observer(
   (props: { mode: FETCH_STRUCTURE_MODE }) => {
@@ -61,7 +61,9 @@ export const QueryBuilderFetchStructurePanel = observer(
     const fetchStructureStateMode = fetchStructureState.fetchStructureMode;
     const applicationStore = useApplicationStore();
     const openResultSetModifierEditor = (): void =>
-      queryBuilderState.resultSetModifierState.setShowModal(true);
+      queryBuilderState.fetchStructureState.projectionState.resultSetModifierState.setShowModal(
+        true,
+      );
     const addNewBlankDerivation = (): void =>
       fetchStructureState.projectionState.addNewBlankDerivation();
 
@@ -87,17 +89,21 @@ export const QueryBuilderFetchStructurePanel = observer(
           );
       }
     };
+
     const onChangeFetchStructureMode =
       (fetchMode: FETCH_STRUCTURE_MODE): (() => void) =>
       (): void => {
         const reset = (): void => {
           fetchStructureState.setFetchStructureMode(fetchMode);
           queryBuilderState.changeFetchStructure();
-          queryBuilderState.postFilterState = new QueryBuilderPostFilterState(
-            queryBuilderState,
-            queryBuilderState.postFilterOperators,
+          queryBuilderState.fetchStructureState.projectionState.postFilterState =
+            new QueryBuilderPostFilterState(
+              queryBuilderState.fetchStructureState.projectionState,
+              queryBuilderState.fetchStructureState.projectionState.postFilterOperators,
+            );
+          queryBuilderState.fetchStructureState.projectionState.setShowPostFilterPanel(
+            false,
           );
-          queryBuilderState.setShowPostFilterPanel(false);
         };
         if (fetchStructureState.fetchStructureMode !== fetchMode) {
           switch (fetchMode) {
@@ -111,8 +117,10 @@ export const QueryBuilderFetchStructurePanel = observer(
               ) {
                 applicationStore.setActionAlertInfo({
                   message:
-                    queryBuilderState.showPostFilterPanel &&
-                    queryBuilderState.postFilterState.nodes.size > 0
+                    queryBuilderState.fetchStructureState.projectionState
+                      .showPostFilterPanel &&
+                    queryBuilderState.fetchStructureState.projectionState
+                      .postFilterState.nodes.size > 0
                       ? 'With graph-fetch mode, post filter is not supported. Current projection columns and post filters will be lost when switching to the graph-fetch mode. Do you still want to proceed?'
                       : 'Current projection columns will be lost when switching to the graph-fetch mode. Do you still want to proceed?',
                   type: ActionAlertType.CAUTION,
@@ -125,7 +133,7 @@ export const QueryBuilderFetchStructurePanel = observer(
                           queryBuilderState.fetchStructureState.projectionState =
                             new QueryBuilderProjectionState(
                               queryBuilderState,
-                              queryBuilderState.fetchStructureState.projectionState.aggregationState.operators,
+                              queryBuilderState.fetchStructureState,
                             );
                           reset();
                         },
@@ -161,6 +169,7 @@ export const QueryBuilderFetchStructurePanel = observer(
                           queryBuilderState.fetchStructureState.graphFetchTreeState =
                             new QueryBuilderGraphFetchTreeState(
                               queryBuilderState,
+                              queryBuilderState.fetchStructureState,
                             );
                           reset();
                         },

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

@@ -30,21 +30,21 @@ import {
   InfoCircleIcon,
   PanelDropZone,
 } from '@finos/legend-art';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { isNonNullable } from '@finos/legend-shared';
 import {
   type QueryBuilderGraphFetchTreeData,
   type QueryBuilderGraphFetchTreeNodeData,
   removeNodeRecursively,
   isGraphFetchTreeDataEmpty,
-} from '../stores/QueryBuilderGraphFetchTreeUtil.js';
+} from '../../stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.js';
 import {
   type QueryBuilderExplorerTreeDragSource,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
-} from '../stores/QueryBuilderExplorerState.js';
-import type { QueryBuilderGraphFetchTreeState } from '../stores/QueryBuilderGraphFetchTreeState.js';
-import { getClassPropertyIcon } from './shared/ElementIconUtils.js';
+} from '../../stores/explorer/QueryBuilderExplorerState.js';
+import type { QueryBuilderGraphFetchTreeState } from '../../stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js';
+import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
 
 const QueryBuilderGraphFetchTreeNodeContainer: React.FC<
   TreeNodeContainerProps<

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

@@ -71,13 +71,9 @@ import { flowResult } from 'mobx';
 import { observer } from 'mobx-react-lite';
 import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
 import { useDrop, useDrag } from 'react-dnd';
-import { getColumnMultiplicity } from '../stores/postFilterOperators/QueryBuilderPostFilterOperatorHelper.js';
-import { QueryBuilderAggregateColumnState } from '../stores/QueryBuilderAggregationState.js';
-import {
-  isTypeCompatibleWithConditionValueType,
-  QUERY_BUILDER_GROUP_OPERATION,
-} from '../stores/QueryBuilderOperatorsHelper.js';
-import type { QueryBuilderPostFilterOperator } from '../stores/QueryBuilderPostFilterOperator.js';
+import { getColumnMultiplicity } from '../../stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.js';
+import { QueryBuilderAggregateColumnState } from '../../stores/fetch-structure/projection/aggregation/QueryBuilderAggregationState.js';
+import type { QueryBuilderPostFilterOperator } from '../../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterOperator.js';
 import {
   type QueryBuilderPostFilterTreeNodeData,
   type QueryBuilderPostFilterDropTarget,
@@ -87,19 +83,21 @@ import {
   QueryBuilderPostFilterTreeGroupNodeData,
   QUERY_BUILDER_POST_FILTER_DND_TYPE,
   QueryBuilderPostFilterTreeBlankConditionNodeData,
-} from '../stores/QueryBuilderPostFilterState.js';
+} from '../../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import {
   type QueryBuilderProjectionColumnState,
   type QueryBuilderProjectionColumnDragSource,
   QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE,
   QueryBuilderDerivationProjectionColumnState,
-} from '../stores/QueryBuilderProjectionState.js';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+} from '../../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   type QueryBuilderParameterDragSource,
   QUERY_BUILDER_PARAMETER_DND_TYPE,
-} from '../stores/QueryParametersState.js';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+} from '../../stores/QueryParametersState.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
+import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
+import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 
 const QueryBuilderPostFilterConditionContextMenu = observer(
   forwardRef<
@@ -110,7 +108,8 @@ const QueryBuilderPostFilterConditionContextMenu = observer(
     }
   >(function QueryBuilderPostFilterConditionContextMenu(props, ref) {
     const { queryBuilderState, node } = props;
-    const postFilterState = queryBuilderState.postFilterState;
+    const postFilterState =
+      queryBuilderState.fetchStructureState.projectionState.postFilterState;
     const removeNode = (): void =>
       postFilterState.removeNodeAndPruneBranch(node);
     const createCondition = (): void => {
@@ -291,6 +290,7 @@ export const QueryBuilderColumnBadge = observer(
     ) => Promise<void>;
   }) => {
     const { postFilterConditionState, onColumnChange } = props;
+    const applicationStore = useApplicationStore();
     const type = postFilterConditionState.columnState.getReturnType();
     const handleDrop = useCallback(
       (item: QueryBuilderProjectionColumnDragSource): Promise<void> =>
@@ -306,17 +306,14 @@ export const QueryBuilderColumnBadge = observer(
         accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
         drop: (item, monitor): void => {
           if (!monitor.didDrop()) {
-            handleDrop(item).catch(
-              postFilterConditionState.postFilterState.queryBuilderState
-                .applicationStore.alertUnhandledError,
-            );
+            handleDrop(item).catch(applicationStore.alertUnhandledError);
           } // prevent drop event propagation to accomondate for nested DnD
         },
         collect: (monitor) => ({
           isDragOver: monitor.isOver({ shallow: true }),
         }),
       }),
-      [handleDrop],
+      [applicationStore, handleDrop],
     );
 
     return (
@@ -368,7 +365,8 @@ const QueryBuilderPostFilterConditionEditor = observer(
   }) => {
     const { node, isDragOver } = props;
     const graph =
-      node.condition.postFilterState.queryBuilderState.graphManagerState.graph;
+      node.condition.postFilterState.projectionState.queryBuilderState
+        .graphManagerState.graph;
     const applicationStore = useApplicationStore();
     const changeOperator = (val: QueryBuilderPostFilterOperator) => (): void =>
       node.condition.changeOperator(val);
@@ -391,10 +389,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
         const conditionValueType = node.condition.columnState.getReturnType();
         if (
           conditionValueType &&
-          isTypeCompatibleWithConditionValueType(
-            parameterType,
-            conditionValueType,
-          )
+          isTypeCompatibleForAssignment(parameterType, conditionValueType)
         ) {
           node.condition.setValue(item.variable.parameter);
         } else {
@@ -564,7 +559,8 @@ const QueryBuilderPostFilterTreeNodeContainer = observer(
     const [isSelectedFromContextMenu, setIsSelectedFromContextMenu] =
       useState(false);
     const applicationStore = useApplicationStore();
-    const postFilterState = queryBuilderState.postFilterState;
+    const postFilterState =
+      queryBuilderState.fetchStructureState.projectionState.postFilterState;
     const isExpandable =
       node instanceof QueryBuilderPostFilterTreeGroupNodeData;
     const selectNode = (): void => onNodeSelect?.(node);
@@ -804,7 +800,8 @@ const QueryBuilderPostFilterTreeNodeView = observer(
 const QueryBuilderPostFilterTree = observer(
   (props: { queryBuilderState: QueryBuilderState }) => {
     const { queryBuilderState } = props;
-    const postFilterState = queryBuilderState.postFilterState;
+    const postFilterState =
+      queryBuilderState.fetchStructureState.projectionState.postFilterState;
     const rootNodes = postFilterState.rootIds.map((rootId) =>
       postFilterState.getNode(rootId),
     );
@@ -844,7 +841,8 @@ export const QueryBuilderPostFilterPanel = observer(
   (props: { queryBuilderState: QueryBuilderState }) => {
     const { queryBuilderState } = props;
     const applicationStore = useApplicationStore();
-    const postFilterState = queryBuilderState.postFilterState;
+    const postFilterState =
+      queryBuilderState.fetchStructureState.projectionState.postFilterState;
     const rootNode = postFilterState.getRootNode();
     // actions
     const collapseTree = (): void => {
@@ -955,16 +953,14 @@ export const QueryBuilderPostFilterPanel = observer(
         accept: [QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE],
         drop: (item, monitor): void => {
           if (!monitor.didDrop()) {
-            handleDrop(item).catch(
-              queryBuilderState.applicationStore.alertUnhandledError,
-            );
+            handleDrop(item).catch(applicationStore.alertUnhandledError);
           } // prevent drop event propagation to accomondate for nested DnD
         },
         collect: (monitor) => ({
           isDragOver: monitor.isOver({ shallow: true }),
         }),
       }),
-      [handleDrop],
+      [applicationStore, handleDrop],
     );
     return (
       <div

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,
     );