@finos/legend-application-query 5.2.2 → 5.2.3

package/lib/stores/{filterOperators → filter/operators}/QueryBuilderFilterOperator_StartWith.d.ts

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryBuilderFilterOperator, type QueryBuilderFilterState, type FilterConditionState } from '../QueryBuilderFilterState.js';
+import type { QueryBuilderFilterState, FilterConditionState } from '../QueryBuilderFilterState.js';
+import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { type ValueSpecification, type SimpleFunctionExpression } from '@finos/legend-graph';
 export declare class QueryBuilderFilterOperator_StartWith extends QueryBuilderFilterOperator {
     getLabel(filterConditionState: FilterConditionState): string;

package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_StartWith.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAc7B,qBAAa,oCAAqC,SAAQ,0BAA0B;IAClF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAOV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAOV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAsBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAOrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAQpC;AAED,qBAAa,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM;IAI5D,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB;IAQZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;CAMpC"}

package/lib/stores/{filterOperators → filter/operators}/QueryBuilderFilterOperator_StartWith.js

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { QueryBuilderFilterOperator, } from '../QueryBuilderFilterState.js';
+import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorHelper.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { buildNotExpression, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
+import { buildNotExpression, generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
 export class QueryBuilderFilterOperator_StartWith extends QueryBuilderFilterOperator {
     getLabel(filterConditionState) {
         return 'starts with';

package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderFilterOperator_StartWith.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,EAGd,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iCAAiC,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,EACL,kBAAkB,EAClB,oCAAoC,EACpC,sCAAsC,EACtC,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AAEvD,MAAM,OAAO,oCAAqC,SAAQ,0BAA0B;IAClF,QAAQ,CAAC,oBAA0C;QACjD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,OAAO,cAAc,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK;YACrC,CAAC,CAAC,sCAAsC,CAAC,oBAAoB,CAAC,KAAK,CAAC;YACpE,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,cAAc,CAAC,MAAM,KAAK,IAAI,EAAE,IAAI,CAAC;IAC9C,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,GAChB,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,IAAI;aACjE,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,QAAQ,YAAY,CAAC,IAAI,EAAE;YACzB,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC1B,OAAO,2BAA2B,CAChC,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,CAAC,IAAI,EACjB,oCAAoC,CAAC,YAAY,CAAC,IAAI,CAAC,CACxD,CAAC;aACH;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,CAC3D,oBAAoB,CACrB,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC7D,CAAC;SACL;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,WAAW,CAC9C,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,WAAW,EAC7C,IAAI,CACL,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,CAAC,oBAA0C;QAC1D,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C;QAE1C,OAAO,kBAAkB,CACvB,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;aACjE,KAAK,EACR,KAAK,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,CAC3D,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -46,11 +46,10 @@
     "@ag-grid-community/client-side-row-model": "28.1.0",
     "@ag-grid-community/core": "28.1.0",
     "@ag-grid-community/react": "28.1.0",
-    "@finos/legend-application": "7.1.1",
+    "@finos/legend-application": "7.1.2",
     "@finos/legend-art": "3.0.1",
-    "@finos/legend-graph": "14.0.1",
+    "@finos/legend-graph": "14.0.2",
     "@finos/legend-server-depot": "3.0.6",
-    "@finos/legend-server-sdlc": "4.0.8",
     "@finos/legend-shared": "6.0.1",
     "@finos/legend-storage": "3.0.5",
     "@testing-library/react": "13.3.0",

package/src/application/LegendQueryApplicationConfig.ts

@@ -66,7 +66,7 @@ export interface LegendQueryApplicationConfigurationData
     TEMPORARY__useLegacyDepotServerAPIRoutes?: boolean;
   };
   engine: { url: string; queryUrl?: string };
-  studio: { url: string; sdlcUrl: string };
+  studio: { url: string };
 }
 
 export class LegendQueryApplicationConfig extends LegendApplicationConfig {
@@ -76,7 +76,6 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
   readonly engineQueryServerUrl?: string | undefined;
   readonly depotServerUrl: string;
   readonly studioUrl: string;
-  readonly sdlcUrl: string;
   readonly TEMPORARY__useLegacyDepotServerAPIRoutes?: boolean | undefined;
 
   constructor(
@@ -101,10 +100,6 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
       input.configData.studio.url,
       `Can't configure application: 'studio.url' field is missing or empty`,
     );
-    this.sdlcUrl = guaranteeNonEmptyString(
-      input.configData.studio.sdlcUrl,
-      `Can't configure application: 'studio.sdlcUrl' field is missing or empty`,
-    );
     this.TEMPORARY__useLegacyDepotServerAPIRoutes =
       input.configData.depot.TEMPORARY__useLegacyDepotServerAPIRoutes;
 

package/src/components/LegendQueryApplication.tsx

@@ -33,23 +33,13 @@ import type { LegendQueryApplicationConfig } from '../application/LegendQueryApp
 import {
   LegendQueryBaseStoreProvider,
   useLegendQueryApplicationStore,
-  useLegendQueryBaseStore,
 } from './LegendQueryBaseStoreProvider.js';
-import { SDLCServerClientProvider } from '@finos/legend-server-sdlc';
-import { useEffect } from 'react';
-import { flowResult } from 'mobx';
 
 const LegendQueryApplicationRoot = observer(() => {
-  const baseStore = useLegendQueryBaseStore();
   const applicationStore = useLegendQueryApplicationStore();
   const extraApplicationPageEntries = applicationStore.pluginManager
     .getApplicationPlugins()
     .flatMap((plugin) => plugin.getExtraApplicationPageEntries?.() ?? []);
-  useEffect(() => {
-    flowResult(
-      baseStore.applicationSDLCSetupState.initializeSDLCServerClient(),
-    ).catch(applicationStore.alertUnhandledError);
-  }, [applicationStore, baseStore]);
 
   return (
     <div className="app">
@@ -96,26 +86,19 @@ export const LegendQueryApplication = observer(
     const { config, pluginManager } = props;
 
     return (
-      <SDLCServerClientProvider
+      <DepotServerClientProvider
         config={{
-          env: config.env,
-          serverUrl: config.sdlcUrl,
+          serverUrl: config.depotServerUrl,
+          TEMPORARY__useLegacyDepotServerAPIRoutes:
+            config.TEMPORARY__useLegacyDepotServerAPIRoutes,
         }}
       >
-        <DepotServerClientProvider
-          config={{
-            serverUrl: config.depotServerUrl,
-            TEMPORARY__useLegacyDepotServerAPIRoutes:
-              config.TEMPORARY__useLegacyDepotServerAPIRoutes,
-          }}
-        >
-          <LegendQueryBaseStoreProvider pluginManager={pluginManager}>
-            <LegendApplicationComponentFrameworkProvider>
-              <LegendQueryApplicationRoot />
-            </LegendApplicationComponentFrameworkProvider>
-          </LegendQueryBaseStoreProvider>
-        </DepotServerClientProvider>
-      </SDLCServerClientProvider>
+        <LegendQueryBaseStoreProvider pluginManager={pluginManager}>
+          <LegendApplicationComponentFrameworkProvider>
+            <LegendQueryApplicationRoot />
+          </LegendApplicationComponentFrameworkProvider>
+        </LegendQueryBaseStoreProvider>
+      </DepotServerClientProvider>
     );
   },
 );

package/src/components/LegendQueryBaseStoreProvider.tsx

@@ -26,7 +26,6 @@ import {
   type ApplicationStore,
   useApplicationStore,
 } from '@finos/legend-application';
-import { useSDLCServerClient } from '@finos/legend-server-sdlc';
 
 export const useLegendQueryApplicationStore = (): ApplicationStore<
   LegendQueryApplicationConfig,
@@ -47,13 +46,11 @@ export const LegendQueryBaseStoreProvider: React.FC<{
 }> = ({ children, pluginManager }) => {
   const applicationStore = useLegendQueryApplicationStore();
   const depotServerClient = useDepotServerClient();
-  const sdlcServerClient = useSDLCServerClient();
   const store = useLocalObservable(
     () =>
       new LegendQueryBaseStore(
         applicationStore,
         depotServerClient,
-        sdlcServerClient,
         pluginManager,
       ),
   );

package/src/components/QueryBuilder.tsx

@@ -33,21 +33,22 @@ import {
   CaretDownIcon,
   CogIcon,
 } from '@finos/legend-art';
-import { QueryBuilderFilterPanel } from './QueryBuilderFilterPanel.js';
-import { QueryBuilderExplorerPanel } from './QueryBuilderExplorerPanel.js';
+import { QueryBuilderFilterPanel } from './filter/QueryBuilderFilterPanel.js';
+import { QueryBuilderExplorerPanel } from './explorer/QueryBuilderExplorerPanel.js';
 import { QueryBuilderSetupPanel } from './QueryBuilderSetupPanel.js';
 import { QueryBuilderResultPanel } from './QueryBuilderResultPanel.js';
 import { QueryBuilderTextEditor } from './QueryBuilderTextEditor.js';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
 import { QueryTextEditorMode } from '../stores/QueryTextEditorState.js';
-import { QueryBuilderFetchStructurePanel } from './QueryBuilderFetchStructurePanel.js';
+import { QueryBuilderFetchStructurePanel } from './fetch-structure/QueryBuilderFetchStructurePanel.js';
 import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
 import { flowResult } from 'mobx';
 import { QueryBuilderUnsupportedQueryEditor } from './QueryBuilderUnsupportedQueryEditor.js';
 import { useApplicationStore } from '@finos/legend-application';
 import { QueryBuilderParameterPanel } from './QueryBuilderParameterPanel.js';
-import { QueryBuilderPostFilterPanel } from './QueryBuilderPostFilterPanel.js';
-import { QueryBuilderFunctionsExplorerPanel } from './QueryBuilderFunctionsExplorerPanel.js';
+import { QueryBuilderPostFilterPanel } from './fetch-structure/QueryBuilderPostFilterPanel.js';
+import { QueryBuilderFunctionsExplorerPanel } from './explorer/QueryBuilderFunctionsExplorerPanel.js';
+import { FETCH_STRUCTURE_MODE } from '../stores/fetch-structure/QueryBuilderFetchStructureState.js';
 
 enum QUERY_BUILDER_HOTKEY {
   COMPILE = 'COMPILE',
@@ -141,8 +142,9 @@ export const QueryBuilder = observer(
       );
     };
     const toggleShowPostFilterPanel = (): void => {
-      queryBuilderState.setShowPostFilterPanel(
-        !queryBuilderState.showPostFilterPanel,
+      queryBuilderState.fetchStructureState.projectionState.setShowPostFilterPanel(
+        !queryBuilderState.fetchStructureState.projectionState
+          .showPostFilterPanel,
       );
     };
 
@@ -195,14 +197,17 @@ export const QueryBuilder = observer(
                   <MenuContentItem
                     onClick={toggleShowPostFilterPanel}
                     disabled={
-                      queryBuilderState.fetchStructureState.isGraphFetchMode() ||
+                      queryBuilderState.fetchStructureState
+                        .fetchStructureMode !==
+                        FETCH_STRUCTURE_MODE.PROJECTION ||
                       Array.from(
-                        queryBuilderState.postFilterState.nodes.values(),
+                        queryBuilderState.fetchStructureState.projectionState.postFilterState.nodes.values(),
                       ).length > 0
                     }
                   >
                     <MenuContentItemIcon>
-                      {queryBuilderState.showPostFilterPanel ? (
+                      {queryBuilderState.fetchStructureState.projectionState
+                        .showPostFilterPanel ? (
                         <CheckIcon />
                       ) : null}
                     </MenuContentItemIcon>
@@ -334,12 +339,14 @@ export const QueryBuilder = observer(
                       </ResizablePanel>
                       <ResizablePanelSplitter />
                       <ResizablePanel minSize={300}>
-                        {!queryBuilderState.showPostFilterPanel && (
+                        {!queryBuilderState.fetchStructureState.projectionState
+                          .showPostFilterPanel && (
                           <QueryBuilderFilterPanel
                             queryBuilderState={queryBuilderState}
                           />
                         )}
-                        {queryBuilderState.showPostFilterPanel && (
+                        {queryBuilderState.fetchStructureState.projectionState
+                          .showPostFilterPanel && (
                           <ResizablePanelGroup orientation="horizontal">
                             <ResizablePanel minSize={300}>
                               <QueryBuilderFilterPanel

package/src/components/QueryBuilderParameterPanel.tsx

@@ -343,6 +343,7 @@ export const QueryBuilderParameterPanel = observer(
             ),
           ),
           queryBuilderState.observableContext,
+          queryBuilderState.graphManagerState.graph,
         );
         queryParameterState.setSelectedParameter(parmaterState);
         parmaterState.mockParameterValue();

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -35,8 +35,8 @@ import {
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
   type QueryBuilderExplorerTreeDragSource,
   type QueryBuilderExplorerTreePropertyNodeData,
-} from '../stores/QueryBuilderExplorerState.js';
-import { QueryBuilderPropertyInfoTooltip } from './QueryBuilderPropertyInfoTooltip.js';
+} from '../stores/explorer/QueryBuilderExplorerState.js';
+import { QueryBuilderPropertyInfoTooltip } from './shared/QueryBuilderPropertyInfoTooltip.js';
 import { VariableExpressionViewer } from './QueryBuilderParameterPanel.js';
 import {
   type QueryBuilderParameterDragSource,

package/src/components/QueryBuilderResultPanel.tsx

@@ -63,21 +63,21 @@ import type { CellMouseOverEvent } from '@ag-grid-community/core';
 import {
   QueryBuilderDerivationProjectionColumnState,
   QueryBuilderProjectionColumnState,
-} from '../stores/QueryBuilderProjectionState.js';
+} from '../stores/fetch-structure/projection/QueryBuilderProjectionColumnState.js';
 import {
   type QueryBuilderPostFilterTreeNodeData,
   PostFilterConditionState,
   QueryBuilderPostFilterTreeConditionNodeData,
-} from '../stores/QueryBuilderPostFilterState.js';
+} from '../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.js';
 import {
   QueryBuilderPostFilterOperator_Equal,
   QueryBuilderPostFilterOperator_NotEqual,
-} from '../stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.js';
+} from '../stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js';
 import {
   QueryBuilderPostFilterOperator_In,
   QueryBuilderPostFilterOperator_NotIn,
-} from '../stores/postFilterOperators/QueryBuilderPostFilterOperator_In.js';
-import type { QueryBuilderPostFilterOperator } from '../stores/QueryBuilderPostFilterOperator.js';
+} from '../stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.js';
+import type { QueryBuilderPostFilterOperator } from '../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterOperator.js';
 
 const QueryBuilderResultContextMenu = observer(
   forwardRef<
@@ -94,7 +94,8 @@ const QueryBuilderResultContextMenu = observer(
     const postFilterNotEqualOperator =
       new QueryBuilderPostFilterOperator_NotEqual();
     const postFilterNotInOperator = new QueryBuilderPostFilterOperator_NotIn();
-    const postFilterState = queryBuilderState.postFilterState;
+    const postFilterState =
+      queryBuilderState.fetchStructureState.projectionState.postFilterState;
     const projectionColumnState = guaranteeNonNullable(
       queryBuilderState.fetchStructureState.projectionState.columns
         .filter((c) => c.columnName === event?.column.getColId())
@@ -251,7 +252,9 @@ const QueryBuilderResultContextMenu = observer(
     };
 
     const filterByOrOut = (isFilterBy: boolean): void => {
-      queryBuilderState.setShowPostFilterPanel(true);
+      queryBuilderState.fetchStructureState.projectionState.setShowPostFilterPanel(
+        true,
+      );
       const existingPostFilterNode = getExistingPostFilterNode(
         isFilterBy
           ? [postFilterEqualOperator, postFilterInOperator]

package/src/components/QueryBuilderSetupPanel.tsx

@@ -49,7 +49,7 @@ import {
   buildElementOption,
   useApplicationStore,
 } from '@finos/legend-application';
-import { MilestoningParametersEditor } from './QueryBuilderMilestoneEditor.js';
+import { MilestoningParametersEditor } from './explorer/QueryBuilderMilestoneEditor.js';
 import { useState } from 'react';
 
 const getParameterValue = (

package/src/components/QueryBuilderTextEditor.tsx

@@ -20,7 +20,7 @@ import { clsx, Dialog } from '@finos/legend-art';
 import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
 import { QueryTextEditorMode } from '../stores/QueryTextEditorState.js';
 import { flowResult } from 'mobx';
-import { QueryBuilderLambdaEditor } from './QueryBuilderLambdaEditor.js';
+import { QueryBuilderLambdaEditor } from './shared/QueryBuilderLambdaEditor.js';
 import {
   EDITOR_LANGUAGE,
   TextInputEditor,

package/src/components/QueryEditorComponentTestUtils.tsx

@@ -42,11 +42,6 @@ import {
   WebApplicationNavigator,
   TEST__getTestApplicationStore,
 } from '@finos/legend-application';
-import {
-  type SDLCServerClient,
-  TEST__SDLCServerClientProvider,
-  TEST__getTestSDLCServerClient,
-} from '@finos/legend-server-sdlc';
 import { TEST__getTestLegendQueryApplicationConfig } from '../stores/QueryEditorStoreTestUtils.js';
 import { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import { ExistingQueryEditor } from './QueryEditor.js';
@@ -73,8 +68,6 @@ export const TEST__provideMockedQueryEditorStore = (customization?: {
   mock?: ExistingQueryEditorStore;
   applicationStore?: LegendQueryApplicationStore;
   depotServerClient?: DepotServerClient;
-  sdlcServerClient?: SDLCServerClient;
-
   graphManagerState?: GraphManagerState;
   pluginManager?: LegendQueryPluginManager;
 }): ExistingQueryEditorStore => {
@@ -89,7 +82,6 @@ export const TEST__provideMockedQueryEditorStore = (customization?: {
           pluginManager,
         ),
       customization?.depotServerClient ?? TEST__getTestDepotServerClient(),
-      customization?.sdlcServerClient ?? TEST__getTestSDLCServerClient(),
       pluginManager,
       TEST_QUERY_ID,
     );
@@ -174,8 +166,6 @@ export const TEST__setUpQueryEditor = async (
       );
   }
   MOCK__editorStore.buildGraph = jest.fn<TEMPORARY__JestMock>();
-  // TODO: we need to think of how we will mock these calls when we modularize
-  // See https://github.com/finos/legend-studio/issues/731
   MOCK__editorStore.graphManagerState.graphManager.initialize =
     jest.fn<TEMPORARY__JestMock>();
   MOBX__disableSpyOrMock();
@@ -193,13 +183,11 @@ export const TEST__setUpQueryEditor = async (
         config={TEST__getTestLegendQueryApplicationConfig()}
         pluginManager={LegendQueryPluginManager.create()}
       >
-        <TEST__SDLCServerClientProvider>
-          <TEST__DepotServerClientProvider>
-            <TEST__LegendQueryBaseStoreProvider>
-              <ExistingQueryEditor />
-            </TEST__LegendQueryBaseStoreProvider>
-          </TEST__DepotServerClientProvider>
-        </TEST__SDLCServerClientProvider>
+        <TEST__DepotServerClientProvider>
+          <TEST__LegendQueryBaseStoreProvider>
+            <ExistingQueryEditor />
+          </TEST__LegendQueryBaseStoreProvider>
+        </TEST__DepotServerClientProvider>
       </TEST__ApplicationStoreProvider>
     </Router>,
   );

package/src/components/QueryEditorStoreProvider.tsx

@@ -31,7 +31,6 @@ import {
   useLegendQueryApplicationStore,
   useLegendQueryBaseStore,
 } from './LegendQueryBaseStoreProvider.js';
-import { useSDLCServerClient } from '@finos/legend-server-sdlc';
 
 export const QueryEditorStoreContext = createContext<
   QueryEditorStore | undefined
@@ -43,14 +42,12 @@ export const ExistingQueryEditorStoreProvider: React.FC<{
 }> = ({ children, queryId }) => {
   const applicationStore = useLegendQueryApplicationStore();
   const depotServerClient = useDepotServerClient();
-  const sdlcServerClient = useSDLCServerClient();
   const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new ExistingQueryEditorStore(
         applicationStore,
         depotServerClient,
-        sdlcServerClient,
         baseStore.pluginManager,
         queryId,
       ),
@@ -72,14 +69,12 @@ export const CreateQueryEditorStoreProvider: React.FC<{
   const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
   const applicationStore = useLegendQueryApplicationStore();
   const depotServerClient = useDepotServerClient();
-  const sdlcServerClient = useSDLCServerClient();
   const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new CreateQueryEditorStore(
         applicationStore,
         depotServerClient,
-        sdlcServerClient,
         baseStore.pluginManager,
         groupId,
         artifactId,
@@ -105,14 +100,12 @@ export const ServiceQueryEditorStoreProvider: React.FC<{
   const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
   const applicationStore = useLegendQueryApplicationStore();
   const depotServerClient = useDepotServerClient();
-  const sdlcServerClient = useSDLCServerClient();
   const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new ServiceQueryEditorStore(
         applicationStore,
         depotServerClient,
-        sdlcServerClient,
         baseStore.pluginManager,
         groupId,
         artifactId,

package/src/components/QuerySetupStoreProvider.tsx

@@ -23,7 +23,6 @@ import {
   useLegendQueryApplicationStore,
   useLegendQueryBaseStore,
 } from './LegendQueryBaseStoreProvider.js';
-import { useSDLCServerClient } from '@finos/legend-server-sdlc';
 
 const QuerySetupStoreContext = createContext<QuerySetupStore | undefined>(
   undefined,
@@ -35,13 +34,11 @@ export const QuerySetupStoreProvider: React.FC<{
   const applicationStore = useLegendQueryApplicationStore();
   const depotServerClient = useDepotServerClient();
   const baseStore = useLegendQueryBaseStore();
-  const sdlcServerClient = useSDLCServerClient();
   const store = useLocalObservable(
     () =>
       new QuerySetupStore(
         applicationStore,
         depotServerClient,
-        sdlcServerClient,
         baseStore.pluginManager,
       ),
   );

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

@@ -55,18 +55,15 @@ import {
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
   QueryBuilderExplorerTreeRootNodeData,
   QueryBuilderExplorerTreePropertyNodeData,
-  buildPropertyExpressionFromExplorerTreeNodeData,
   QueryBuilderExplorerTreeSubTypeNodeData,
   getQueryBuilderPropertyNodeData,
   getQueryBuilderSubTypeNodeData,
-} from '../stores/QueryBuilderExplorerState.js';
+} from '../../stores/explorer/QueryBuilderExplorerState.js';
 import { useDrag } from 'react-dnd';
-import { QueryBuilderPropertyInfoTooltip } from './QueryBuilderPropertyInfoTooltip.js';
-import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
-import { addQueryBuilderPropertyNode } from '../stores/QueryBuilderGraphFetchTreeUtil.js';
-import { QueryBuilderSimpleProjectionColumnState } from '../stores/QueryBuilderProjectionState.js';
+import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
+import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { flowResult } from 'mobx';
-import { prettyPropertyName } from '../stores/QueryBuilderPropertyEditorState.js';
+import { prettyPropertyName } from '../../stores/QueryBuilderPropertyEditorState.js';
 import {
   type Type,
   type Multiplicity,
@@ -84,8 +81,8 @@ import {
   isElementDeprecated,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
-import { getClassPropertyIcon } from './shared/ElementIconUtils.js';
-import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
+import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
+import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { filterByType, guaranteeNonNullable } from '@finos/legend-shared';
 import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
 
@@ -247,35 +244,9 @@ const QueryBuilderExplorerContextMenu = observer(
     const applicationStore = useApplicationStore();
     const viewType = (): void =>
       applicationStore.notifyUnsupportedFeature('View Type');
-    const addNodeToFetchStructure = (): void => {
-      if (
-        node instanceof QueryBuilderExplorerTreePropertyNodeData &&
-        !(node.type instanceof Class)
-      ) {
-        if (queryBuilderState.fetchStructureState.isGraphFetchMode()) {
-          queryBuilderState.fetchStructureState.graphFetchTreeState.addProperty(
-            node,
-          );
-        } else if (queryBuilderState.fetchStructureState.isProjectionMode()) {
-          const projectionState =
-            queryBuilderState.fetchStructureState.projectionState;
-          projectionState.addColumn(
-            new QueryBuilderSimpleProjectionColumnState(
-              projectionState,
-              buildPropertyExpressionFromExplorerTreeNodeData(
-                queryBuilderState.explorerState.nonNullableTreeData,
-                node,
-                projectionState.queryBuilderState.graphManagerState.graph,
-                queryBuilderState.explorerState.propertySearchPanelState
-                  .allMappedPropertyNodes,
-              ),
-              projectionState.queryBuilderState.explorerState.humanizePropertyName,
-            ),
-          );
-        }
-      }
-    };
-    const addAllChildrenToFetchStructure = (): void => {
+    const addNodeToFetchStructure = (): void =>
+      queryBuilderState.fetchStructureState.fetchProperty(node);
+    const addNodeChildrenToFetchStructure = (): void => {
       openNode();
       if (node.type instanceof Class) {
         // NOTE: here we require the node to already been expanded so the child nodes are generated
@@ -292,43 +263,9 @@ const QueryBuilderExplorerContextMenu = observer(
               !(childNode.type instanceof Class) &&
               childNode.mappingData.mapped,
           );
-        if (queryBuilderState.fetchStructureState.isGraphFetchMode()) {
-          const graphFetchTreeData =
-            queryBuilderState.fetchStructureState.graphFetchTreeState.treeData;
-          if (graphFetchTreeData) {
-            nodesToAdd.forEach((nodeToAdd) =>
-              addQueryBuilderPropertyNode(
-                graphFetchTreeData,
-                queryBuilderState.explorerState.nonNullableTreeData,
-                nodeToAdd,
-                queryBuilderState,
-              ),
-            );
-            queryBuilderState.fetchStructureState.graphFetchTreeState.setGraphFetchTree(
-              {
-                ...graphFetchTreeData,
-              },
-            );
-          }
-        } else if (queryBuilderState.fetchStructureState.isProjectionMode()) {
-          nodesToAdd.forEach((nodeToAdd) => {
-            const projectionState =
-              queryBuilderState.fetchStructureState.projectionState;
-            projectionState.addColumn(
-              new QueryBuilderSimpleProjectionColumnState(
-                projectionState,
-                buildPropertyExpressionFromExplorerTreeNodeData(
-                  queryBuilderState.explorerState.nonNullableTreeData,
-                  nodeToAdd,
-                  projectionState.queryBuilderState.graphManagerState.graph,
-                  queryBuilderState.explorerState.propertySearchPanelState
-                    .allMappedPropertyNodes,
-                ),
-                projectionState.queryBuilderState.explorerState.humanizePropertyName,
-              ),
-            );
-          });
-        }
+        nodesToAdd.forEach((nodeToAdd) =>
+          queryBuilderState.fetchStructureState.fetchProperty(nodeToAdd),
+        );
       }
     };
 
@@ -341,7 +278,7 @@ const QueryBuilderExplorerContextMenu = observer(
             </MenuContentItem>
           )}
         {node.type instanceof Class && (
-          <MenuContentItem onClick={addAllChildrenToFetchStructure}>
+          <MenuContentItem onClick={addNodeChildrenToFetchStructure}>
             Add Properties to Fetch Structure
           </MenuContentItem>
         )}
@@ -459,11 +396,9 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
     const onContextMenuClose = (): void => setIsSelectedFromContextMenu(false);
     const previewData = (): void => {
       if (node instanceof QueryBuilderExplorerTreePropertyNodeData) {
-        flowResult(
-          queryBuilderState.fetchStructureState.projectionState.previewData(
-            node,
-          ),
-        ).catch(applicationStore.alertUnhandledError);
+        flowResult(explorerState.previewData(node)).catch(
+          applicationStore.alertUnhandledError,
+        );
       }
     };
 
@@ -479,12 +414,7 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
             node={node}
           />
         }
-        disabled={
-          !showContextMenu ||
-          // NOTE: this might make it hard to modularize
-          // See https://github.com/finos/legend-studio/issues/731
-          queryBuilderState.fetchStructureState.projectionState.hasParserError
-        }
+        disabled={!showContextMenu || queryBuilderState.backdrop}
         menuProps={{ elevation: 7 }}
         onOpen={onContextMenuOpen}
         onClose={onContextMenuClose}
@@ -841,11 +771,7 @@ export const QueryBuilderExplorerPanel = observer(
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_EXPLORER}
         className={clsx('panel query-builder__explorer', {
-          // NOTE: this might make it hard to modularize
-          // See https://github.com/finos/legend-studio/issues/731
-          backdrop__element:
-            queryBuilderState.fetchStructureState.projectionState
-              .hasParserError,
+          backdrop__element: queryBuilderState.backdrop,
         })}
       >
         <div className="panel__header">