@finos/legend-application-query 13.8.48 → 13.8.50

package/src/components/data-space/DataSpaceInfo.tsx

@@ -31,7 +31,6 @@ import { type QueryEditorStore } from '../../stores/QueryEditorStore.js';
 import {
   type DataSpace,
   type DataSpaceExecutionContext,
-  DataSpaceQueryBuilderState,
   DataSpaceSupportEmail,
 } from '@finos/legend-extension-dsl-data-space/graph';
 import {
@@ -39,11 +38,13 @@ import {
   EXTERNAL_APPLICATION_NAVIGATION__generateTaxonomyDataspaceViewUrl,
 } from '../../__lib__/LegendQueryNavigation.js';
 import { flowResult } from 'mobx';
-import { assertErrorThrown } from '@finos/legend-shared';
+import { assertErrorThrown, guaranteeType } from '@finos/legend-shared';
 import {
   ConnectionPointer,
+  INTERNAL_ELEMENT_PATH,
   RelationalDatabaseConnection,
 } from '@finos/legend-graph';
+import { LegendQueryDataSpaceQueryBuilderState } from '../../stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js';
 
 export const QueryEditorDataspaceInfoModal = observer(
   (props: {
@@ -55,8 +56,16 @@ export const QueryEditorDataspaceInfoModal = observer(
   }) => {
     const { editorStore, dataspace, executionContext, open, closeModal } =
       props;
+    const queryBuilderState = guaranteeType(
+      editorStore.queryBuilderState,
+      LegendQueryDataSpaceQueryBuilderState,
+      `Data product info modal expects a ${LegendQueryDataSpaceQueryBuilderState.name}`,
+    );
     const projectInfo = editorStore.getProjectInfo();
     const visitElement = async (path: string | undefined): Promise<void> => {
+      if (path?.startsWith(`${INTERNAL_ELEMENT_PATH}::`)) {
+        return;
+      }
       try {
         if (projectInfo) {
           const project = StoreProjectData.serialization.fromJson(
@@ -94,15 +103,14 @@ export const QueryEditorDataspaceInfoModal = observer(
       }
     };
 
-    const dataSpaceAnalysisResult =
-      editorStore.queryBuilderState instanceof DataSpaceQueryBuilderState
-        ? editorStore.queryBuilderState.dataSpaceAnalysisResult
-        : undefined;
+    const dataSpaceAnalysisResult = queryBuilderState.dataSpaceAnalysisResult;
     const dataSpaceMedata = dataSpaceAnalysisResult?.executionContextsIndex.get(
       executionContext.name,
     )?.runtimeMetadata;
     const defaultRuntimeValue = executionContext.defaultRuntime?.value;
     const executionContextMappingValue = executionContext.mapping?.value;
+    const mappingProviderElement =
+      executionContext.mappingProvider?.element.value;
     const connection = defaultRuntimeValue?.runtimeValue.connections.length
       ? defaultRuntimeValue.runtimeValue.connections[0]?.storeConnections?.[0]
           ?.connection instanceof ConnectionPointer
@@ -162,7 +170,7 @@ export const QueryEditorDataspaceInfoModal = observer(
           className="dataspace-info-modal"
         >
           <div className="dataspace-info-modal__header">
-            <ModalTitle title="About Data Product" />
+            <ModalTitle title="About Data Space" />
             <button
               className="btn--dark dataspace-info-modal__header__open-btn"
               title="Close"
@@ -174,7 +182,7 @@ export const QueryEditorDataspaceInfoModal = observer(
               }
               onClick={openInTaxonomy}
             >
-              Open Data Product
+              Open Data Space
             </button>
           </div>
 
@@ -209,9 +217,18 @@ export const QueryEditorDataspaceInfoModal = observer(
               </div>
               <div className="dataspace-info-modal__field">
                 <div className="dataspace-info-modal__field__label">
-                  Mapping
+                  {mappingProviderElement ? 'Data Product' : 'Mapping'}
                 </div>
-                {executionContextMappingValue ? (
+                {mappingProviderElement ? (
+                  <div
+                    className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
+                    onClick={() =>
+                      flowResult(visitElement(mappingProviderElement.path))
+                    }
+                  >
+                    {mappingProviderElement.name}
+                  </div>
+                ) : executionContextMappingValue ? (
                   <div
                     className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
                     onClick={() =>
@@ -299,7 +316,7 @@ export const QueryEditorDataspaceInfoModal = observer(
                   className="dataspace-info-modal__field__value dataspace-info-modal__field__value--linkable"
                   onClick={() => flowResult(visitElement(dataspace.path))}
                 >
-                  Show Data Product Configuration
+                  Show Data Space Configuration
                 </div>
               </div>
               {dataspace.supportInfo instanceof DataSpaceSupportEmail && (

package/src/components/data-space/DataSpaceQuerySetup.tsx

@@ -114,10 +114,10 @@ const DataProductQuerySetupSetupPanelContent = observer(
           <div className="query-builder__setup__config-group__item">
             <label
               className="btn--sm query-builder__setup__config-group__data-product"
-              title="data product"
+              title="data space"
               htmlFor="query-builder__setup__data-space-selector"
             >
-              Data Product
+              Data Space
             </label>
             <CustomSelectorInput
               inputId="query-builder__setup__data-space-selector"
@@ -130,7 +130,7 @@ const DataProductQuerySetupSetupPanelContent = observer(
               }
               onChange={onDataSpaceOptionChange}
               value={selectedDataSpaceOption}
-              placeholder="Search for data product..."
+              placeholder="Search for data space..."
               escapeClearsValue={true}
               darkMode={
                 !applicationStore.layoutService
@@ -142,7 +142,7 @@ const DataProductQuerySetupSetupPanelContent = observer(
               tabIndex={-1}
               className="query-builder__setup__data-space-searcher__btn btn--dark"
               onClick={openDataSpaceAdvancedSearch}
-              title="Open advanced search for data product..."
+              title="Open advanced search for data space..."
             >
               <SearchIcon />
             </button>

package/src/components/data-space/LegendQueryDataSpaceQueryBuilder.tsx

@@ -18,6 +18,7 @@ import { useApplicationStore } from '@finos/legend-application';
 import {
   AnchorLinkIcon,
   CheckIcon,
+  CogIcon,
   compareLabelFn,
   ControlledDropdownMenu,
   createFilter,
@@ -39,6 +40,7 @@ import {
 import {
   buildExecutionContextOption,
   DataSpaceAdvancedSearchModal,
+  formatExecutionContextOptionLabel,
   type ExecutionContextOption,
 } from '@finos/legend-extension-dsl-data-space/application-query';
 import { resolveExecutionContextMapping } from '@finos/legend-extension-dsl-data-space/graph';
@@ -58,7 +60,8 @@ import { guaranteeNonNullable, guaranteeType } from '@finos/legend-shared';
 import { DepotEntityWithOrigin } from '@finos/legend-storage';
 import { flowResult } from 'mobx';
 import { observer } from 'mobx-react-lite';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
+import { LakehouseRuntimeConfigModal } from '../shared/LakehouseRuntimeConfigModal.js';
 import type { DataProductWithLegacyOption } from '../../stores/data-space/DataProductSelectorState.js';
 import { formatDataProductOrSpaceOptionLabel } from '../shared/LegendQueryDataProductOptionLabel.js';
 import type { LegendQueryDataSpaceQueryBuilderState } from '../../stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js';
@@ -132,7 +135,7 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
     // execution context
     const executionContextOptions = guaranteeNonNullable(
       queryBuilderState.dataSpace.executionContexts,
-      `Data product '${queryBuilderState.dataSpace.path}' does not have any execution contexts`,
+      `Data space '${queryBuilderState.dataSpace.path}' does not have any execution contexts`,
     )
       .map(buildExecutionContextOption)
       .sort(compareLabelFn);
@@ -147,17 +150,14 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
       if (option.value === queryBuilderState.executionContext) {
         return;
       }
-      const currentMappingPath = guaranteeNonNullable(
-        queryBuilderState.executionContext.mapping,
-        `Execution context '${queryBuilderState.executionContext.name}' does not have a mapping`,
-      ).value.path;
-      const nextMappingPath = guaranteeNonNullable(
-        option.value.mapping,
-        `Execution context '${option.value.name}' does not have a mapping`,
-      ).value.path;
+      const currentMappingPath = resolveExecutionContextMapping(
+        queryBuilderState.executionContext,
+      )?.path;
       queryBuilderState.setExecutionContext(option.value);
       await queryBuilderState.propagateExecutionContextChange(
-        currentMappingPath === nextMappingPath,
+        currentMappingPath !== undefined &&
+          currentMappingPath ===
+            resolveExecutionContextMapping(option.value)?.path,
       );
       queryBuilderState.onExecutionContextChange?.(option.value);
     };
@@ -200,16 +200,21 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
     });
 
     // class
+    const executionContextMapping = guaranteeNonNullable(
+      resolveExecutionContextMapping(queryBuilderState.executionContext),
+      `Execution context '${queryBuilderState.executionContext.name}' does not have a resolvable mapping`,
+    );
     const classes = resolveUsableDataSpaceClasses(
       queryBuilderState.dataSpace,
-      guaranteeNonNullable(
-        queryBuilderState.executionContext.mapping,
-        `Execution context '${queryBuilderState.executionContext.name}' does not have a mapping`,
-      ).value,
+      executionContextMapping,
       queryBuilderState.graphManagerState,
       queryBuilderState,
     );
 
+    const injectedLakehouseRuntime = queryBuilderState.injectedLakehouseRuntime;
+    const [isLakehouseConfigModalOpen, setIsLakehouseConfigModalOpen] =
+      useState(false);
+
     useEffect(() => {
       flowResult(queryBuilderState.loadEntities()).catch(
         applicationStore.alertUnhandledError,
@@ -227,7 +232,7 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
         <PanelHeader title="properties">
           <PanelHeaderActions>
             <PanelHeaderActionItem
-              title="copy data product query set up link to clipboard"
+              title="copy data space query set up link to clipboard"
               onClick={copyDataSpaceLinkToClipboard}
               disabled={!queryBuilderState.isDataSpaceLinkable}
             >
@@ -254,6 +259,18 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
                       Show Runtime Selector
                     </MenuContentItemLabel>
                   </MenuContentItem>
+                  {injectedLakehouseRuntime && (
+                    <MenuContentItem
+                      onClick={(): void => setIsLakehouseConfigModalOpen(true)}
+                    >
+                      <MenuContentItemIcon>
+                        <CogIcon />
+                      </MenuContentItemIcon>
+                      <MenuContentItemLabel>
+                        Lakehouse Runtime Configuration
+                      </MenuContentItemLabel>
+                    </MenuContentItem>
+                  )}
                 </MenuContent>
               }
               menuProps={{
@@ -269,10 +286,10 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
           <div className="query-builder__setup__config-group__item">
             <label
               className="btn--sm query-builder__setup__config-group__data-product"
-              title="data product"
+              title="data space"
               htmlFor="query-builder__setup__data-space-selector"
             >
-              Data Product
+              Data Space
             </label>
             <CustomSelectorInput
               inputId="query-builder__setup__data-space-selector"
@@ -281,7 +298,7 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
               isLoading={queryBuilderState.loadEntitiesState.isInProgress}
               onChange={onOptionChange}
               value={selectedOption}
-              placeholder="Search for data product..."
+              placeholder="Search for data space..."
               escapeClearsValue={true}
               darkMode={
                 !applicationStore.layoutService
@@ -295,7 +312,7 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
                   tabIndex={-1}
                   className="query-builder__setup__data-space-searcher__btn btn--dark"
                   onClick={openDataSpaceAdvancedSearch}
-                  title="Open advanced search for data product..."
+                  title="Open advanced search for data space..."
                 >
                   <SearchIcon />
                 </button>
@@ -333,6 +350,7 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
                   !applicationStore.layoutService
                     .TEMPORARY__isLightColorThemeEnabled
                 }
+                formatOptionLabel={formatExecutionContextOptionLabel}
               />
             </div>
           )}
@@ -345,25 +363,52 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
               >
                 Runtime
               </label>
-              <CustomSelectorInput
-                inputId="query-builder__setup__runtime-selector"
-                className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-                placeholder="Choose a runtime..."
-                noMatchMessage="No compatible runtime found for specified execution context"
-                options={runtimeOptions}
-                onChange={changeRuntime}
-                value={selectedRuntimeOption}
-                darkMode={
-                  !applicationStore.layoutService
-                    .TEMPORARY__isLightColorThemeEnabled
-                }
-                filterOption={runtimeFilterOption}
-                formatOptionLabel={getRuntimeOptionFormatter({
-                  darkMode:
+              {injectedLakehouseRuntime ? (
+                <div
+                  className="query-builder__setup__config-group__item__selector"
+                  title="Lakehouse runtime — configure via the settings menu"
+                >
+                  <CustomSelectorInput
+                    inputId="query-builder__setup__runtime-selector"
+                    className="panel__content__form__section__dropdown"
+                    options={
+                      selectedRuntimeOption ? [selectedRuntimeOption] : []
+                    }
+                    value={selectedRuntimeOption}
+                    onChange={() => {}}
+                    disabled={true}
+                    darkMode={
+                      !applicationStore.layoutService
+                        .TEMPORARY__isLightColorThemeEnabled
+                    }
+                    formatOptionLabel={getRuntimeOptionFormatter({
+                      darkMode:
+                        !applicationStore.layoutService
+                          .TEMPORARY__isLightColorThemeEnabled,
+                    })}
+                  />
+                </div>
+              ) : (
+                <CustomSelectorInput
+                  inputId="query-builder__setup__runtime-selector"
+                  className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+                  placeholder="Choose a runtime..."
+                  noMatchMessage="No compatible runtime found for specified execution context"
+                  options={runtimeOptions}
+                  onChange={changeRuntime}
+                  value={selectedRuntimeOption}
+                  darkMode={
                     !applicationStore.layoutService
-                      .TEMPORARY__isLightColorThemeEnabled,
-                })}
-              />
+                      .TEMPORARY__isLightColorThemeEnabled
+                  }
+                  filterOption={runtimeFilterOption}
+                  formatOptionLabel={getRuntimeOptionFormatter({
+                    darkMode:
+                      !applicationStore.layoutService
+                        .TEMPORARY__isLightColorThemeEnabled,
+                  })}
+                />
+              )}
             </div>
           )}
           <div className="query-builder__setup__config-group__item">
@@ -375,6 +420,17 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
             />
           </div>
         </div>
+        {injectedLakehouseRuntime && (
+          <LakehouseRuntimeConfigModal
+            lakehouseRuntime={injectedLakehouseRuntime}
+            open={isLakehouseConfigModalOpen}
+            onClose={() => setIsLakehouseConfigModalOpen(false)}
+            darkMode={
+              !applicationStore.layoutService
+                .TEMPORARY__isLightColorThemeEnabled
+            }
+          />
+        )}
       </div>
     );
   },

package/src/stores/QueryEditorStore.ts

@@ -50,6 +50,7 @@ import {
   type ValueSpecification,
   type GraphInitializationReport,
   PackageableRuntime,
+  createPath,
   type QueryInfo,
   GraphManagerState,
   Query,
@@ -69,6 +70,7 @@ import {
   cloneQueryTaggedValue,
   QueryProjectCoordinates,
   CORE_PURE_PATH,
+  INTERNAL_ELEMENT_PATH,
   isValidFullPath,
   QUERY_PROFILE_PATH,
   QueryDataSpaceExecutionContextInfo,
@@ -147,6 +149,7 @@ import {
   DSL_DataSpace_getGraphManagerExtension,
   getOwnDataSpace,
   QUERY_PROFILE_TAG_DATA_SPACE,
+  resolveExecutionContextMapping,
   retrieveAnalyticsResultCache,
   retrieveDataspaceArtifactsCache,
 } from '@finos/legend-extension-dsl-data-space/graph';
@@ -810,7 +813,7 @@ export abstract class QueryEditorStore {
       supportBuildMinimalGraph
     ) {
       try {
-        this.initState.setMessage('Fetching data product analysis result...');
+        this.initState.setMessage('Fetching data space analysis result...');
         const project = StoreProjectData.serialization.fromJson(
           await this.depotServerClient.getProject(groupId, artifactId),
         );
@@ -1142,24 +1145,9 @@ export abstract class QueryEditorStore {
     );
   }
 
-  /**
-   * Resolves the user's lakehouse environment and warehouse, creates a
-   * `LakehouseRuntime`, and wraps it in a `PackageableRuntime`.
-   *
-   * Resolution order:
-   * 1. Check local storage (`LakehouseUserInfo`) for a previously persisted value.
-   * 2. If not found, fetch from the lakehouse contract server via
-   *    `getUserEntitlementEnvs()` and persist the result to local storage.
-   */
-  async createLakehousePackageableRuntime(
-    dataProductPath: string,
-    gav: {
-      groupId: string;
-      artifactId: string;
-      versionId: string;
-    },
-  ): Promise<PackageableRuntime> {
-    // 1. Check local storage for persisted lakehouse user info
+  async resolveLakehouseEnvAndWarehouse(
+    isSnapshot: boolean,
+  ): Promise<{ env: string; warehouse: string }> {
     const persistedInfo = LegendQueryUserDataHelper.getLakehouseUserInfo(
       this.applicationStore.userDataService,
     );
@@ -1167,7 +1155,6 @@ export abstract class QueryEditorStore {
     let userEnvironment: string | undefined = persistedInfo?.env;
     const userWarehouse: string =
       persistedInfo?.snowflakeWarehouse ?? 'LAKEHOUSE_CONSUMER_DEFAULT_WH';
-    // 2. If no persisted environment, fetch from the server
     if (userEnvironment === undefined && this.lakehouseState) {
       try {
         const entitlementEnvs =
@@ -1178,7 +1165,6 @@ export abstract class QueryEditorStore {
         userEnvironment = entitlementEnvs.users
           .map((e) => e.lakehouseEnvironment)
           .at(0);
-        // Persist to local storage for future use
         LegendQueryUserDataHelper.persistLakehouseUserInfo(
           this.applicationStore.userDataService,
           {
@@ -1197,30 +1183,82 @@ export abstract class QueryEditorStore {
 
     if (userEnvironment === undefined) {
       throw new Error(
-        `Can't query data product '${dataProductPath}': unable to resolve lakehouse user environment. ` +
-          `Please ensure your lakehouse entitlements are configured.`,
+        `Unable to resolve lakehouse user environment. Please ensure your lakehouse entitlements are configured.`,
       );
     }
-    if (
-      isSnapshotVersion(gav.versionId) ||
-      gav.versionId === SNAPSHOT_VERSION_ALIAS
-    ) {
+    if (isSnapshot) {
       userEnvironment = decorateEnvWithRealm(
         userEnvironment,
         LakehouseEnvironmentType.PRODUCTION_PARALLEL,
       );
     }
-    const lakehouseRuntime = new LakehouseRuntime(
-      userEnvironment,
-      userWarehouse,
-    );
+    return { env: userEnvironment, warehouse: userWarehouse };
+  }
+
+  async createLakehousePackageableRuntime(
+    dataProductPath: string,
+    gav: {
+      groupId: string;
+      artifactId: string;
+      versionId: string;
+    },
+  ): Promise<PackageableRuntime> {
+    const isSnapshot =
+      isSnapshotVersion(gav.versionId) ||
+      gav.versionId === SNAPSHOT_VERSION_ALIAS;
+    const { env, warehouse } =
+      await this.resolveLakehouseEnvAndWarehouse(isSnapshot);
     const packageableRuntime = new PackageableRuntime(
       `${dataProductPath}_LakehouseRuntime`,
     );
-    packageableRuntime.runtimeValue = lakehouseRuntime;
+    packageableRuntime.runtimeValue = new LakehouseRuntime(env, warehouse);
     return packageableRuntime;
   }
 
+  async createOrGetDataSpaceLakehouseFallbackRuntime(
+    isSnapshot: boolean,
+  ): Promise<PackageableRuntime> {
+    const runtimePath = createPath(INTERNAL_ELEMENT_PATH, 'LakehouseRuntime');
+    const existing =
+      this.graphManagerState.graph.getNullableRuntime(runtimePath);
+    if (existing) {
+      return existing;
+    }
+    const { env, warehouse } =
+      await this.resolveLakehouseEnvAndWarehouse(isSnapshot);
+    const created = new PackageableRuntime('LakehouseRuntime');
+    created.runtimeValue = new LakehouseRuntime(env, warehouse);
+    this.graphManagerState.graph.addElement(created, INTERNAL_ELEMENT_PATH);
+    return created;
+  }
+
+  async attachDataSpaceFallbackRuntimes(
+    dataSpace: DataSpace,
+    dataSpaceAnalysisResult: DataSpaceAnalysisResult | undefined,
+    isSnapshot: boolean,
+  ): Promise<void> {
+    const contexts = dataSpace.executionContexts ?? [];
+    let sharedRuntime: PackageableRuntime | undefined;
+    for (const context of contexts) {
+      const analyticsContext =
+        dataSpaceAnalysisResult?.executionContextsIndex.get(context.name);
+
+      if (
+        context.mappingProvider === undefined ||
+        context.defaultRuntime !== undefined ||
+        (analyticsContext?.compatibleRuntimes.length ?? 0) !== 0
+      ) {
+        continue;
+      }
+      if (!sharedRuntime) {
+        sharedRuntime =
+          await this.createOrGetDataSpaceLakehouseFallbackRuntime(isSnapshot);
+      }
+      context.defaultRuntime =
+        PackageableElementExplicitReference.create(sharedRuntime);
+    }
+  }
+
   /**
    * Centralized method to build a data product query builder state.
    * Used by both the creator flow (new query from data product route/picker)
@@ -1280,7 +1318,10 @@ export abstract class QueryEditorStore {
           versionId,
         },
       );
-      this.graphManagerState.graph.addElement(packageableRuntime, '_internal_');
+      this.graphManagerState.graph.addElement(
+        packageableRuntime,
+        INTERNAL_ELEMENT_PATH,
+      );
     }
     // 6. Create query builder state
     const projectInfo = { groupId, artifactId, versionId };
@@ -1835,7 +1876,7 @@ export class ExistingQueryUpdateState {
  * navigating to a chosen revision. A revision is keyed by its `version`
  * identifier, which is passed as the `revisionId` route param.
  */
-const resolveExecutionContext = (
+export const resolveExecutionContext = (
   dataSpace: DataSpace,
   ex: string | undefined,
   queryMapping: Mapping | undefined,
@@ -1847,20 +1888,22 @@ const resolveExecutionContext = (
   }
   const defaultExecutionContext = dataSpace.defaultExecutionContext;
   if (!defaultExecutionContext) {
-    return undefined;
+    return executionContexts[0];
   }
   if (queryMapping && queryRuntime) {
-    const defaultExecutionContextMapping = defaultExecutionContext.mapping;
+    const defaultExecutionContextMapping = resolveExecutionContextMapping(
+      defaultExecutionContext,
+    );
     const defaultExecutionContextRuntime =
       defaultExecutionContext.defaultRuntime;
     if (
       defaultExecutionContextMapping &&
       defaultExecutionContextRuntime &&
-      defaultExecutionContextMapping.value !== queryMapping &&
+      defaultExecutionContextMapping !== queryMapping &&
       defaultExecutionContextRuntime.value.path !== queryRuntime.path
     ) {
       const matchingExecContexts = executionContexts.filter(
-        (ec) => ec.mapping?.value === queryMapping,
+        (ec) => resolveExecutionContextMapping(ec) === queryMapping,
       );
       if (matchingExecContexts.length > 1) {
         const matchRuntime = matchingExecContexts.find(
@@ -2100,6 +2143,12 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
         exec.dataSpacePath,
         this.graphManagerState.graph,
       );
+      await this.attachDataSpaceFallbackRuntimes(
+        dataSpace,
+        dataSpaceAnalysisResult,
+        isSnapshotVersion(queryInfo.versionId) ||
+          queryInfo.versionId === SNAPSHOT_VERSION_ALIAS,
+      );
       const mapping = queryInfo.mapping
         ? this.graphManagerState.graph.getMapping(queryInfo.mapping)
         : undefined;
@@ -2228,36 +2277,43 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
             this.applicationStore.config.options.queryBuilderConfig,
             sourceInfo,
           );
-        const matchingExecutionContextMapping = guaranteeNonNullable(
-          matchingExecutionContext.mapping,
-          `Execution context '${matchingExecutionContext.name}' does not have a mapping`,
-        );
-        const matchingExecutionContextRuntime = guaranteeNonNullable(
-          matchingExecutionContext.defaultRuntime,
-          `Execution context '${matchingExecutionContext.name}' does not have a default runtime`,
+        const matchingExecutionContextMapping = resolveExecutionContextMapping(
+          matchingExecutionContext,
         );
-        const mappingModelCoverageAnalysisResult =
-          dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
-            matchingExecutionContextMapping.value.path,
+        if (
+          matchingExecutionContext.mappingProvider &&
+          !matchingExecutionContextMapping
+        ) {
+          throw new Error(
+            `Execution context '${matchingExecutionContext.name}' in data space '${dataSpace.path}' sources its mapping from a data product access point group that does not exist.`,
           );
+        }
+        const mappingModelCoverageAnalysisResult =
+          matchingExecutionContextMapping
+            ? dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
+                matchingExecutionContextMapping.path,
+              )
+            : undefined;
         if (mappingModelCoverageAnalysisResult) {
           dataSpaceQueryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
             mappingModelCoverageAnalysisResult;
         }
-        dataSpaceQueryBuilderState.executionContextState.setMapping(
-          matchingExecutionContextMapping.value,
-        );
+        if (matchingExecutionContextMapping) {
+          dataSpaceQueryBuilderState.executionContextState.setMapping(
+            matchingExecutionContextMapping,
+          );
+        }
+        const matchingExecutionContextRuntime =
+          matchingExecutionContext.defaultRuntime
+            ? new RuntimePointer(matchingExecutionContext.defaultRuntime)
+            : undefined;
         dataSpaceQueryBuilderState.executionContextState.setRuntimeValue(
-          new RuntimePointer(
-            PackageableElementExplicitReference.create(
-              matchingExecutionContextRuntime.value,
-            ),
-          ),
+          matchingExecutionContextRuntime,
         );
         return dataSpaceQueryBuilderState;
       } else {
-        throw new UnsupportedOperationError(
-          `Unsupported execution context ${exec.executionKey}`,
+        throw new Error(
+          `Execution context '${exec.executionKey}' does not exist in data space '${dataSpace.path}'.`,
         );
       }
     } else if (exec instanceof QueryExplicitExecutionContextInfo) {
@@ -2347,7 +2403,10 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
         exec.ingestDefinitionPath,
         projectInfo,
       );
-      this.graphManagerState.graph.addElement(adhocRuntime, '_internal_');
+      this.graphManagerState.graph.addElement(
+        adhocRuntime,
+        INTERNAL_ELEMENT_PATH,
+      );
 
       // Tracked separately from the closure on `ingestQueryBuilderState` so
       // the swap callback can capture it directly without forming a self-