@finos/legend-application-query 13.8.29 → 13.8.31

package/lib/stores/ingest/IngestQueryGraphHelper.js

@@ -0,0 +1,72 @@
+/**
+ * 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 { resolveVersion, } from '@finos/legend-server-depot';
+import { CORE_PURE_PATH, createGraphBuilderReport, IngestDefinition, LegendSDLC, } from '@finos/legend-graph';
+import { guaranteeType } from '@finos/legend-shared';
+/**
+ * Shared helpers for ingest-backed query flows (creator + existing-query
+ * loader). Centralizes how we list / cache / swap ingest definitions in the
+ * graph so both flows stay in lockstep.
+ *
+ * Why these live outside the stores: both
+ * {@link IngestQueryCreatorStore} (deep-link flow) and
+ * {@link ExistingQueryEditorStore} (saved-query flow) need to:
+ *   1. fetch every ingest entity in a project version (cheap, classifier-
+ *      scoped depot call) so the source dropdown can list them all, and
+ *   2. build only the active ingest into the graph, swapping it out when the
+ *      user picks a different one.
+ * Keeping the logic in one module avoids the two stores drifting apart.
+ */
+/**
+ * Fetch every {@link IngestDefinition} entity for a project version via the
+ * classifier-scoped variant of `getVersionEntities`. The endpoint returns
+ * {@link EntityWithOrigin}-shaped payloads (entity wrapped with GAV) rather
+ * than raw entities, so we unwrap explicitly.
+ *
+ * Filters by `classifierPath` defensively in case the server returns extras.
+ */
+export const fetchIngestEntitiesByClassifier = async (depotServerClient, groupId, artifactId, versionId) => {
+    const wrapped = (await depotServerClient.getVersionEntities(groupId, artifactId, resolveVersion(versionId), CORE_PURE_PATH.INGEST_DEFINITION));
+    const entities = wrapped
+        .map((w) => w.entity)
+        .filter((e) => e.classifierPath === CORE_PURE_PATH.INGEST_DEFINITION);
+    return new Map(entities.map((e) => [e.path, e]));
+};
+/**
+ * Build the given ingest entity into `graph`. If `currentPath` is provided
+ * and resolves to an existing ingest on the graph, that ingest is removed
+ * first — this is the swap path used when the user picks a different ingest
+ * from the source dropdown.
+ *
+ * The SDLC origin is only set when the graph has none yet, so subsequent
+ * swaps (which run after the initial graph build set the origin) don't
+ * clobber it.
+ */
+export const swapIngestInGraph = async (graphManagerState, entity, options) => {
+    if (options.currentPath !== undefined) {
+        const current = graphManagerState.graph.ingests.find((i) => i.path === options.currentPath);
+        if (current) {
+            graphManagerState.graph.deleteElement(current);
+        }
+    }
+    await graphManagerState.graphManager.buildGraph(graphManagerState.graph, [entity], graphManagerState.graphBuildState, graphManagerState.graph.origin === undefined
+        ? {
+            origin: new LegendSDLC(options.groupId, options.artifactId, resolveVersion(options.versionId)),
+        }
+        : undefined, createGraphBuilderReport());
+    return guaranteeType(graphManagerState.graph.getElement(entity.path), IngestDefinition, `Can't find ingest definition '${entity.path}' after build`);
+};
+//# sourceMappingURL=IngestQueryGraphHelper.js.map

package/lib/stores/ingest/IngestQueryGraphHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IngestQueryGraphHelper.js","sourceRoot":"","sources":["../../../src/stores/ingest/IngestQueryGraphHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,cAAc,GACf,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,gBAAgB,EAChB,UAAU,GACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD;;;;;;;;;;;;;GAaG;AAEH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,iBAAoC,EACpC,OAAe,EACf,UAAkB,EAClB,SAAiB,EACa,EAAE;IAChC,MAAM,OAAO,GAAG,CAAC,MAAM,iBAAiB,CAAC,kBAAkB,CACzD,OAAO,EACP,UAAU,EACV,cAAc,CAAC,SAAS,CAAC,EACzB,cAAc,CAAC,iBAAiB,CACjC,CAAkC,CAAC;IACpC,MAAM,QAAQ,GAAG,OAAO;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACxE,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,iBAAoC,EACpC,MAAc,EACd,OAKC,EAC0B,EAAE;IAC7B,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,WAAW,CACtC,CAAC;QACF,IAAI,OAAO,EAAE,CAAC;YACZ,iBAAiB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IACD,MAAM,iBAAiB,CAAC,YAAY,CAAC,UAAU,CAC7C,iBAAiB,CAAC,KAAK,EACvB,CAAC,MAAM,CAAC,EACR,iBAAiB,CAAC,eAAe,EACjC,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS;QAC1C,CAAC,CAAC;YACE,MAAM,EAAE,IAAI,UAAU,CACpB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,UAAU,EAClB,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAClC;SACF;QACH,CAAC,CAAC,SAAS,EACb,wBAAwB,EAAE,CAC3B,CAAC;IACF,OAAO,aAAa,CAClB,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAC/C,gBAAgB,EAChB,iCAAiC,MAAM,CAAC,IAAI,eAAe,CAC5D,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.8.29",
+  "version": "13.8.31",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -44,18 +44,18 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.113",
-    "@finos/legend-art": "7.1.154",
-    "@finos/legend-code-editor": "2.0.183",
-    "@finos/legend-data-cube": "0.3.100",
-    "@finos/legend-extension-dsl-data-space": "10.4.232",
-    "@finos/legend-graph": "32.6.14",
-    "@finos/legend-lego": "2.0.203",
-    "@finos/legend-query-builder": "4.18.22",
-    "@finos/legend-server-depot": "6.1.14",
-    "@finos/legend-server-lakehouse": "0.3.63",
+    "@finos/legend-application": "16.0.115",
+    "@finos/legend-art": "7.1.155",
+    "@finos/legend-code-editor": "2.0.185",
+    "@finos/legend-data-cube": "0.3.102",
+    "@finos/legend-extension-dsl-data-space": "10.4.234",
+    "@finos/legend-graph": "32.6.16",
+    "@finos/legend-lego": "2.0.205",
+    "@finos/legend-query-builder": "4.18.24",
+    "@finos/legend-server-depot": "6.1.15",
+    "@finos/legend-server-lakehouse": "0.3.65",
     "@finos/legend-shared": "11.0.26",
-    "@finos/legend-storage": "3.0.147",
+    "@finos/legend-storage": "3.0.148",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@types/react": "19.0.10",
@@ -70,7 +70,7 @@
     "serializr": "3.0.3"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.2.6",
+    "@finos/legend-dev-utils": "2.2.7",
     "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
     "eslint": "9.22.0",

package/src/__lib__/LegendQueryEvent.ts

@@ -24,6 +24,9 @@ export enum LEGEND_QUERY_APP_EVENT {
   RENAME_QUERY__SUCCESS = 'query-editor.rename.query.success',
   INITIALIZE_QUERY_STATE__SUCCESS = 'query-editor.initialize-query-state.success',
   LEGENDAI_QUERY_CHAT__OPENED = 'query-editor.legendai-query-chat.opened',
+  LEGENDAI_QUERY_SUGGEST__LAUNCH = 'query-editor.legendai-query-suggest.launch',
+  LEGENDAI_QUERY_SUGGEST__APPLY = 'query-editor.legendai-query-suggest.apply',
+  LEGENDAI_QUERY_SUGGEST__DISCARD = 'query-editor.legendai-query-suggest.discard',
 
   VIEW_PROJECT__LAUNCH = 'query-editor.view-project.launch',
   VIEW_SDLC_PROJECT__LAUNCH = 'query-editor.view-sdlc-project.launch',

package/src/__lib__/LegendQueryNavigation.ts

@@ -47,6 +47,12 @@ export enum DATA_PRODUCT_SAMPLE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN {
   SAMPLE_QUERY_ID = 'sampleQueryId',
 }
 
+export enum INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN {
+  GAV = 'gav',
+  INGEST_DEFINITION_PATH = 'ingestDefinitionPath',
+  DATA_SET = 'dataSet',
+}
+
 export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
   DEFAULT: '/',
   SETUP: '/setup',
@@ -62,6 +68,7 @@ export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
   DATA_CUBE_EXISTING_QUERY: `/edit/:${LEGEND_QUERY_ROUTE_PATTERN_TOKEN.QUERY_ID}/cube`,
   DATA_PRODUCT: `/data-product/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_TYPE}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH}/:${DATA_PRODUCT_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_ACCESS_ID}`,
   DATA_PRODUCT_SAMPLE_QUERY: `/data-product/native/sample-query/:${DATA_PRODUCT_SAMPLE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${DATA_PRODUCT_SAMPLE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_PRODUCT_PATH}/:${DATA_PRODUCT_SAMPLE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.SAMPLE_QUERY_ID}`,
+  INGEST_QUERY: `/ingest/:${INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV}/:${INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.INGEST_DEFINITION_PATH}/:${INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SET}`,
   // Developer-only diagnostic page for inspecting depot DataSpace
   // analytics artifact sizes. See `DataSpaceArtifactInspector`.
   DEV_DATA_SPACE_INSPECTOR: '/dev/dataspace-inspector',
@@ -82,6 +89,12 @@ export type DataProductSampleQueryPathParams = {
   [DATA_PRODUCT_SAMPLE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.SAMPLE_QUERY_ID]: string;
 };
 
+export type IngestQueryCreatorPathParams = {
+  [INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]: string;
+  [INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.INGEST_DEFINITION_PATH]: string;
+  [INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SET]: string;
+};
+
 /**
  * Generates a data product route for the given access type.
  */
@@ -168,6 +181,28 @@ export const generateDataProductSampleQueryRoute = (
       sampleQueryId,
   });
 
+// TODO: figure out where this URL should be generated from. Candidates:
+//   - a "create ingest query" entry point in the query setup landing page
+//   - a deep-link from the ingest definition page in Legend Studio
+// Once decided, wire callers here.
+export const generateIngestQueryCreatorRoute = (
+  groupId: string,
+  artifactId: string,
+  versionId: string,
+  ingestDefinitionPath: string,
+  dataSet: string,
+): string =>
+  generatePath(LEGEND_QUERY_ROUTE_PATTERN.INGEST_QUERY, {
+    [INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.GAV]: generateGAVCoordinates(
+      groupId,
+      artifactId,
+      versionId,
+    ),
+    [INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.INGEST_DEFINITION_PATH]:
+      ingestDefinitionPath,
+    [INGEST_QUERY_CREATOR_ROUTE_PATTERN_TOKEN.DATA_SET]: dataSet,
+  });
+
 // setup
 
 export enum LEGEND_QUERY_SETUP_QUERY_PARAM_TOKEN {

package/src/__lib__/LegendQueryTelemetryHelper.ts

@@ -112,4 +112,19 @@ export class LegendQueryTelemetryHelper {
   static logEvent_QueryChatOpened(service: TelemetryService): void {
     service.logEvent(LEGEND_QUERY_APP_EVENT.LEGENDAI_QUERY_CHAT__OPENED, {});
   }
+
+  static logEvent_QueryAISuggestLaunched(service: TelemetryService): void {
+    service.logEvent(LEGEND_QUERY_APP_EVENT.LEGENDAI_QUERY_SUGGEST__LAUNCH, {});
+  }
+
+  static logEvent_QueryAISuggestApplied(service: TelemetryService): void {
+    service.logEvent(LEGEND_QUERY_APP_EVENT.LEGENDAI_QUERY_SUGGEST__APPLY, {});
+  }
+
+  static logEvent_QueryAISuggestDiscarded(service: TelemetryService): void {
+    service.logEvent(
+      LEGEND_QUERY_APP_EVENT.LEGENDAI_QUERY_SUGGEST__DISCARD,
+      {},
+    );
+  }
 }

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -135,6 +135,7 @@ import { useQueryEditorStore } from './QueryEditorStoreProvider.js';
 import { useLegendQueryApplicationStore } from './LegendQueryFrameworkProvider.js';
 import { LegendQueryDataSpaceQueryBuilderState } from '../stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js';
 import { LegendQueryDataProductQueryBuilderState } from '../stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js';
+import { IngestLegendQueryBuilderState } from '../stores/ingest/IngestLegendQueryBuilderState.js';
 import { renderDataProductSampleQueryPanelContent } from './data-product/DataProductSampleQueryPanel.js';
 
 export const QUERY_DATACUBE_USAGE_TITLE = 'Legend DataCube';
@@ -647,6 +648,25 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
         },
         icon: <InfoCircleIcon />,
       },
+      {
+        key: 'about-ingest',
+        title: 'About Ingest',
+        label: 'About Ingestion Data Set',
+        disableFunc: (queryBuilderState): boolean =>
+          !(queryBuilderState instanceof IngestLegendQueryBuilderState),
+        onClick: (queryBuilderState): void => {
+          if (
+            queryBuilderState.workflowState.actionConfig instanceof
+              QueryBuilderActionConfig_QueryApplication &&
+            queryBuilderState instanceof IngestLegendQueryBuilderState
+          ) {
+            queryBuilderState.workflowState.actionConfig.editorStore.setShowIngestInfo(
+              true,
+            );
+          }
+        },
+        icon: <InfoCircleIcon />,
+      },
     ];
   }
 

package/src/components/LegendQueryWebApplication.tsx

@@ -42,6 +42,7 @@ import { LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN } from '../__lib__/DSL_DataSpace_
 import { DataSpaceTemplateQueryCreator } from './data-space/DataSpaceTemplateQueryCreator.js';
 import { QueryCreator } from './data-space/DataProductQueryCreator.js';
 import { DataProductSampleQueryCreator } from './data-product/DataProductSampleQueryCreator.js';
+import { IngestQueryCreator } from './ingest/IngestQueryCreator.js';
 import { ExistingQueryDataCubeViewer } from './data-cube/ExistingQueryDataCubeViewer.js';
 import { DataSpaceArtifactInspector } from './DataSpaceArtifactInspector.js';
 import {
@@ -113,6 +114,19 @@ const LegendQueryWebApplicationRouter = observer(() => {
             path={LEGEND_QUERY_ROUTE_PATTERN.DATA_PRODUCT}
             element={<QueryCreator />}
           />
+          {/*
+            Ingest query creator. Resolves `ingestDefinitionPath` and
+            `dataSet` from the route, fetches only the ingest definition
+            entity from Depot (no full graph build), and opens the editor
+            with a `QueryIngestExecutionContext`. The creator store builds
+            an adhoc lakehouse runtime (user env + consumer warehouse) and
+            selects it on the query builder state so execution works without
+            a packaged runtime.
+          */}
+          <Route
+            path={LEGEND_QUERY_ROUTE_PATTERN.INGEST_QUERY}
+            element={<IngestQueryCreator />}
+          />
           <Route
             path={LEGEND_QUERY_ROUTE_PATTERN.CREATE_FROM_SERVICE_QUERY}
             element={<ServiceQueryCreator />}

package/src/components/QueryEditor.tsx

@@ -98,6 +98,8 @@ import {
 import { LegendQueryInfo } from './LegendQueryAppInfo.js';
 import { QueryEditorDataspaceInfoModal } from './data-space/DataSpaceInfo.js';
 import { QueryEditorDataProductInfoModal } from './data-product/DataProductInfo.js';
+import { QueryEditorIngestInfoModal } from './ingest/IngestInfo.js';
+import { IngestLegendQueryBuilderState } from '../stores/ingest/IngestLegendQueryBuilderState.js';
 import { DataSpaceQueryBuilderState } from '@finos/legend-extension-dsl-data-space/application';
 import { LegendQueryBareQueryBuilderState } from '../stores/data-space/LegendQueryBareQueryBuilderState.js';
 import { extractQueryParams } from './utils/QueryParameterUtils.js';
@@ -180,6 +182,9 @@ const CreateQueryDialog = observer(() => {
     if (!aiSuggester || !editorStore.queryBuilderState || !legendAIUrl) {
       return;
     }
+    LegendQueryTelemetryHelper.logEvent_QueryAISuggestLaunched(
+      applicationStore.telemetryService,
+    );
     setIsSuggestingWithAI(true);
     setAISuggestion(undefined);
     try {
@@ -196,10 +201,19 @@ const CreateQueryDialog = observer(() => {
     if (!aiSuggestion) {
       return;
     }
+    LegendQueryTelemetryHelper.logEvent_QueryAISuggestApplied(
+      applicationStore.telemetryService,
+    );
     createQueryState.setQueryName(aiSuggestion.title);
     createQueryState.setQueryDescription(aiSuggestion.description);
     setAISuggestion(undefined);
   };
+  const discardAISuggestion = (): void => {
+    LegendQueryTelemetryHelper.logEvent_QueryAISuggestDiscarded(
+      applicationStore.telemetryService,
+    );
+    setAISuggestion(undefined);
+  };
 
   const debouncedLoadQueries = useMemo(
     () =>
@@ -324,7 +338,7 @@ const CreateQueryDialog = observer(() => {
               <ModalFooterButton
                 text="Dismiss"
                 type="secondary"
-                onClick={(): void => setAISuggestion(undefined)}
+                onClick={discardAISuggestion}
               />
             </>
           ) : (
@@ -1210,6 +1224,16 @@ export const QueryEditor = observer(() => {
             closeModal={() => editorStore.setShowDataProductInfo(false)}
           />
         )}
+      {editorStore.showIngestInfo &&
+        editorStore.queryBuilderState instanceof
+          IngestLegendQueryBuilderState && (
+          <QueryEditorIngestInfoModal
+            editorStore={editorStore}
+            queryBuilderState={editorStore.queryBuilderState}
+            open={editorStore.showIngestInfo}
+            closeModal={() => editorStore.setShowIngestInfo(false)}
+          />
+        )}
       {isExistingQuery &&
         editorStore.updateState.showQueryInfo &&
         editorStore.query && (

package/src/components/data-product/LegendQueryDataProductQueryBuilder.tsx

@@ -24,150 +24,25 @@ import {
   AnchorLinkIcon,
   CogIcon,
   ControlledDropdownMenu,
-  Dialog,
   MenuContent,
   MenuContentItem,
   MenuContentItemIcon,
   MenuContentItemLabel,
-  Modal,
-  ModalBody,
-  ModalFooter,
-  ModalFooterButton,
-  ModalHeader,
-  ModalHeaderActions,
-  ModalTitle,
   MoreVerticalIcon,
   PanelHeader,
   PanelHeaderActionItem,
   PanelHeaderActions,
-  TimesIcon,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { LakehouseRuntime } from '@finos/legend-graph';
 import { useEffect, useState } from 'react';
 import type { LegendQueryDataProductQueryBuilderState } from '../../stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js';
 import { formatDataProductOptionLabel } from '../shared/LegendQueryDataProductOptionLabel.js';
-import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
+import { LakehouseRuntimeConfigModal } from '../shared/LakehouseRuntimeConfigModal.js';
 
 /**
  * Modal for editing LakehouseRuntime configuration (environment and warehouse).
  */
-const LakehouseRuntimeConfigModal = observer(
-  (props: {
-    executionState:
-      | ModelAccessPointDataProductExecutionState
-      | LakehouseDataProductExecutionState;
-    open: boolean;
-    onClose: () => void;
-    darkMode: boolean;
-  }) => {
-    const { executionState, open, onClose, darkMode } = props;
-    const lakehouseRuntime =
-      executionState.selectedRuntime?.runtimeValue instanceof LakehouseRuntime
-        ? executionState.selectedRuntime.runtimeValue
-        : undefined;
-    const [env, setEnv] = useState(lakehouseRuntime?.environment ?? '');
-    const [warehouse, setWarehouse] = useState(
-      lakehouseRuntime?.warehouse ?? '',
-    );
-
-    // sync local state when the modal opens or the runtime changes
-    useEffect(() => {
-      if (open && lakehouseRuntime) {
-        setEnv(lakehouseRuntime.environment ?? '');
-        setWarehouse(lakehouseRuntime.warehouse ?? '');
-      }
-    }, [open, lakehouseRuntime]);
-
-    const applicationStore = useApplicationStore();
-
-    const handleApply = (): void => {
-      if (lakehouseRuntime) {
-        const newEnv = env || undefined;
-        const newWarehouse = warehouse || undefined;
-        const hasChanged =
-          newEnv !== lakehouseRuntime.environment ||
-          newWarehouse !== lakehouseRuntime.warehouse;
-        lakehouseRuntime.environment = newEnv;
-        lakehouseRuntime.warehouse = newWarehouse;
-        if (hasChanged) {
-          LegendQueryUserDataHelper.persistLakehouseUserInfo(
-            applicationStore.userDataService,
-            {
-              env: newEnv,
-              snowflakeWarehouse: newWarehouse,
-            },
-          );
-        }
-      }
-      onClose();
-    };
-
-    if (!lakehouseRuntime) {
-      return null;
-    }
-
-    return (
-      <Dialog onClose={onClose} open={open}>
-        <Modal darkMode={darkMode}>
-          <ModalHeader>
-            <ModalTitle
-              icon={<CogIcon />}
-              title="Lakehouse Runtime Configuration"
-            />
-            <ModalHeaderActions>
-              <button
-                className="modal__header__action"
-                tabIndex={-1}
-                onClick={onClose}
-              >
-                <TimesIcon />
-              </button>
-            </ModalHeaderActions>
-          </ModalHeader>
-          <ModalBody>
-            <div className="panel__content__form__section">
-              <div className="panel__content__form__section__header__label">
-                Environment
-              </div>
-              <input
-                className="panel__content__form__section__input input--dark input--small"
-                spellCheck={false}
-                value={env}
-                placeholder="(optional)"
-                onChange={(e) => setEnv(e.target.value)}
-              />
-            </div>
-            <div className="panel__content__form__section">
-              <div className="panel__content__form__section__header__label">
-                Warehouse
-              </div>
-              <input
-                className="panel__content__form__section__input input--dark input--small"
-                spellCheck={false}
-                value={warehouse}
-                placeholder="(optional)"
-                onChange={(e) => setWarehouse(e.target.value)}
-              />
-            </div>
-          </ModalBody>
-          <ModalFooter>
-            <ModalFooterButton
-              text="Apply"
-              onClick={handleApply}
-              type="primary"
-            />
-            <ModalFooterButton
-              text="Cancel"
-              onClick={onClose}
-              type="secondary"
-            />
-          </ModalFooter>
-        </Modal>
-      </Dialog>
-    );
-  },
-);
 
 const LegendDataProductQueryBuilderSetupPanelContent = observer(
   (props: { queryBuilderState: LegendQueryDataProductQueryBuilderState }) => {
@@ -256,7 +131,12 @@ const LegendDataProductQueryBuilderSetupPanelContent = observer(
         {(executionState instanceof ModelAccessPointDataProductExecutionState ||
           executionState instanceof LakehouseDataProductExecutionState) && (
           <LakehouseRuntimeConfigModal
-            executionState={executionState}
+            lakehouseRuntime={
+              executionState.selectedRuntime?.runtimeValue instanceof
+              LakehouseRuntime
+                ? executionState.selectedRuntime.runtimeValue
+                : undefined
+            }
             open={isLakehouseConfigModalOpen}
             onClose={() => setIsLakehouseConfigModalOpen(false)}
             darkMode={