@finos/legend-application-query 13.8.63 → 13.8.65

package/lib/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js

@@ -14,23 +14,30 @@
  * limitations under the License.
  */
 import { DataSpaceQueryBuilderState, ResolvedDataSpaceEntityWithOrigin, } from '@finos/legend-extension-dsl-data-space/application';
-import { DataSpaceServiceExecutableInfo, } from '@finos/legend-extension-dsl-data-space/graph';
+import { DataSpaceServiceExecutableInfo, resolveExecutionContextMapping, } from '@finos/legend-extension-dsl-data-space/graph';
 import { generateDataSpaceQueryCreatorRoute, generateDataSpaceTemplateQueryCreatorRoute, } from '../../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { DataSpaceAdvancedSearchState, } from '@finos/legend-extension-dsl-data-space/application-query';
 import { resolveVersion, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
-import { GraphDataWithOrigin, INTERNAL_ELEMENT_PATH, LakehouseRuntime, LegendSDLC, RuntimePointer, } from '@finos/legend-graph';
+import { GraphDataWithOrigin, INTERNAL_ELEMENT_PATH, LakehouseRuntime, LegendSDLC, PackageableElementExplicitReference, RuntimePointer, getMappingCompatibleRuntimes, } from '@finos/legend-graph';
 import {} from '@finos/legend-query-builder';
 import { renderLegendQueryDataSpaceQueryBuilderSetupPanelContent } from '../../../components/data-space/LegendQueryDataSpaceQueryBuilder.js';
 import { QueryBuilderActionConfig_QueryApplication } from '../../QueryEditorStore.js';
 import { createViewProjectHandler, createViewSDLCProjectHandler, } from '../DataSpaceQueryBuilderHelper.js';
-import {} from '@finos/legend-shared';
+import { LogEvent, assertErrorThrown, } from '@finos/legend-shared';
 import { action, flowResult, makeObservable, observable, reaction } from 'mobx';
+import { LegendQueryUserDataHelper } from '../../../__lib__/LegendQueryUserDataHelper.js';
+import { createDataSpaceRuntimePreferenceId } from '../../../__lib__/LegendQueryUserDataSpaceHelper.js';
+import { LEGEND_QUERY_APP_EVENT } from '../../../__lib__/LegendQueryEvent.js';
 export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilderState {
     depotServerClient;
     project;
     onDataProductChange;
     productSelectorState;
     injectedLakehouseRuntime;
+    /**
+     * The runtime this user saved for the current execution context, if any
+     */
+    savedRuntimePath;
     TEMPORARY__setupPanelContentRenderer = () => renderLegendQueryDataSpaceQueryBuilderSetupPanelContent(this);
     constructor(applicationStore, graphManagerState, workflow, actionConfig, dataSpace, executionContext, isLightGraphEnabled, depotServerClient, project, prioritizeEntityFunc, onDataSpaceChange, productSelectorState, onDataProductChange, dataSpaceAnalysisResult, onExecutionContextChange, onRuntimeChange, onClassChange, config, sourceInfo) {
         super(applicationStore, graphManagerState, workflow, actionConfig, dataSpace, executionContext, isLightGraphEnabled, prioritizeEntityFunc, onDataSpaceChange, dataSpaceAnalysisResult, onExecutionContextChange, onRuntimeChange, onClassChange, config, sourceInfo);
@@ -41,13 +48,123 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
         this.injectedLakehouseRuntime = this.resolveInjectedLakehouseRuntime();
         makeObservable(this, {
             injectedLakehouseRuntime: observable,
+            savedRuntimePath: observable,
             setInjectedLakehouseRuntime: action,
+            setSavedRuntimePath: action,
         });
         reaction(() => this.executionContextState.runtimeValue, () => this.setInjectedLakehouseRuntime(this.resolveInjectedLakehouseRuntime()));
     }
     setInjectedLakehouseRuntime(val) {
         this.injectedLakehouseRuntime = val;
     }
+    setSavedRuntimePath(val) {
+        this.savedRuntimePath = val;
+    }
+    /**
+     * The runtimes that can run the mapping of the current execution context
+     */
+    get compatibleRuntimes() {
+        const mapping = resolveExecutionContextMapping(this.executionContext);
+        if (!mapping) {
+            return [];
+        }
+        const analyzedExecutionContext = this.dataSpaceAnalysisResult
+            ? Array.from(this.dataSpaceAnalysisResult.executionContextsIndex.values()).find((context) => context.mapping.path === mapping.path)
+            : undefined;
+        return (analyzedExecutionContext?.compatibleRuntimes ??
+            getMappingCompatibleRuntimes(mapping, this.graphManagerState.usableRuntimes));
+    }
+    get currentRuntimePath() {
+        const runtime = this.executionContextState.runtimeValue;
+        return runtime instanceof RuntimePointer
+            ? runtime.packageableRuntime.value.path
+            : undefined;
+    }
+    get defaultRuntimePath() {
+        return this.executionContext.defaultRuntime?.value.path;
+    }
+    get runtimePreferenceId() {
+        return createDataSpaceRuntimePreferenceId(this.project.groupId, this.project.artifactId, this.dataSpace.path, this.executionContext.name);
+    }
+    /**
+     * Switches to the runtime this user picked for the current execution context
+     * before, if any. A saved runtime that can no longer run the context, e.g.
+     * removed in a newer version of the project, is forgotten.
+     *
+     * Returns whether the saved runtime is in use.
+     */
+    applySavedRuntime() {
+        this.setSavedRuntimePath(undefined);
+        const savedRuntimePath = LegendQueryUserDataHelper.getDataSpaceRuntimePreference(this.applicationStore.userDataService, this.runtimePreferenceId);
+        if (!savedRuntimePath) {
+            return false;
+        }
+        const runtime = this.compatibleRuntimes.find((compatibleRuntime) => compatibleRuntime.path === savedRuntimePath);
+        if (!runtime || savedRuntimePath === this.defaultRuntimePath) {
+            this.forgetSavedRuntime();
+            return false;
+        }
+        // mark the choice as used again, so choices in use are not the ones
+        // dropped when the list is full
+        this.saveRuntime(savedRuntimePath);
+        if (this.currentRuntimePath !== savedRuntimePath) {
+            this.changeRuntime(new RuntimePointer(PackageableElementExplicitReference.create(runtime)));
+        }
+        // a runtime other than the default is never applied out of sight
+        this.setShowRuntimeSelector(true);
+        return true;
+    }
+    /**
+     * Saves the runtime this user picked in the setup panel for the current
+     * execution context. Picking the context's default runtime forgets the choice.
+     */
+    rememberRuntime(runtime) {
+        if (!(runtime instanceof RuntimePointer)) {
+            return;
+        }
+        const packageableRuntime = runtime.packageableRuntime.value;
+        // runtimes Query builds for the session, e.g. the lakehouse fallback, are
+        // not found again by their path
+        if (packageableRuntime.package?.path === INTERNAL_ELEMENT_PATH) {
+            return;
+        }
+        if (packageableRuntime.path === this.defaultRuntimePath) {
+            this.forgetSavedRuntime();
+            return;
+        }
+        this.saveRuntime(packageableRuntime.path);
+    }
+    /**
+     * Goes back to the default runtime of the current execution context and
+     * forgets the runtime this user saved for it
+     */
+    resetToDefaultRuntime() {
+        const defaultRuntime = this.executionContext.defaultRuntime;
+        if (defaultRuntime) {
+            this.changeRuntime(new RuntimePointer(defaultRuntime));
+        }
+        this.forgetSavedRuntime();
+    }
+    saveRuntime(runtimePath) {
+        this.setSavedRuntimePath(runtimePath);
+        try {
+            LegendQueryUserDataHelper.persistDataSpaceRuntimePreference(this.applicationStore.userDataService, this.runtimePreferenceId, runtimePath);
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.applicationStore.logService.warn(LogEvent.create(LEGEND_QUERY_APP_EVENT.LOCAL_STORAGE_PERSIST_ERROR), error.message);
+        }
+    }
+    forgetSavedRuntime() {
+        this.setSavedRuntimePath(undefined);
+        try {
+            LegendQueryUserDataHelper.removeDataSpaceRuntimePreference(this.applicationStore.userDataService, this.runtimePreferenceId);
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.applicationStore.logService.warn(LogEvent.create(LEGEND_QUERY_APP_EVENT.LOCAL_STORAGE_PERSIST_ERROR), error.message);
+        }
+    }
     resolveInjectedLakehouseRuntime() {
         const runtime = this.executionContextState.runtimeValue;
         if (!(runtime instanceof RuntimePointer)) {

package/lib/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js.map

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryDataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../../src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LegendQueryDataSpaceQueryBuilderState.js","sourceRoot":"","sources":["../../../../src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,0BAA0B,EAC1B,iCAAiC,GAClC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAEL,8BAA8B,EAI9B,8BAA8B,GAC/B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EACL,kCAAkC,EAClC,0CAA0C,GAC3C,MAAM,yDAAyD,CAAC;AACjE,OAAO,EACL,4BAA4B,GAE7B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EACL,cAAc,EACd,sBAAsB,GAEvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,UAAU,EACV,mCAAmC,EACnC,cAAc,EACd,4BAA4B,GAO7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIN,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,uDAAuD,EAAE,MAAM,oEAAoE,CAAC;AAE7I,OAAO,EAAE,yCAAyC,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAEL,QAAQ,EACR,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAOhF,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EAAE,kCAAkC,EAAE,MAAM,oDAAoD,CAAC;AACxG,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,MAAM,OAAO,qCAAsC,SAAQ,0BAA0B;IAEnF,iBAAiB,CAAoB;IACrC,OAAO,CAAwB;IACtB,mBAAmB,CAAuC;IACnE,oBAAoB,CAA2B;IAE/C,wBAAwB,CAA+B;IACvD;;OAEG;IACH,gBAAgB,CAAqB;IAE5B,oCAAoC,GAAG,GAAoB,EAAE,CACpE,uDAAuD,CAAC,IAAI,CAAC,CAAC;IAEhE,YACE,gBAA6C,EAC7C,iBAAoC,EACpC,QAAmC,EACnC,YAAsC,EACtC,SAAoB,EACpB,gBAA2C,EAC3C,mBAA4B,EAC5B,iBAAoC,EACpC,OAA8B,EAC9B,oBAEa,EACb,iBAEkB,EAClB,oBAA8C,EAC9C,mBAAyD,EACzD,uBAA6D,EAC7D,wBAEa,EACb,eAAsD,EACtD,aAAkD,EAClD,MAAuC,EACvC,UAA4C;QAE5C,KAAK,CACH,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,eAAe,EACf,aAAa,EACb,MAAM,EACN,UAAU,CACX,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,+BAA+B,EAAE,CAAC;QAEvE,cAAc,CAAC,IAAI,EAAE;YACnB,wBAAwB,EAAE,UAAU;YACpC,gBAAgB,EAAE,UAAU;YAC5B,2BAA2B,EAAE,MAAM;YACnC,mBAAmB,EAAE,MAAM;SAC5B,CAAC,CAAC;QAEH,QAAQ,CACN,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAC7C,GAAG,EAAE,CACH,IAAI,CAAC,2BAA2B,CAC9B,IAAI,CAAC,+BAA+B,EAAE,CACvC,CACJ,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,GAAiC;QAC3D,IAAI,CAAC,wBAAwB,GAAG,GAAG,CAAC;IACtC,CAAC;IAED,mBAAmB,CAAC,GAAuB;QACzC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,IAAI,kBAAkB;QACpB,MAAM,OAAO,GAAG,8BAA8B,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACtE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,wBAAwB,GAAG,IAAI,CAAC,uBAAuB;YAC3D,CAAC,CAAC,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAC7D,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;YAC5D,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,CACL,wBAAwB,EAAE,kBAAkB;YAC5C,4BAA4B,CAC1B,OAAO,EACP,IAAI,CAAC,iBAAiB,CAAC,cAAc,CACtC,CACF,CAAC;IACJ,CAAC;IAED,IAAI,kBAAkB;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC;QACxD,OAAO,OAAO,YAAY,cAAc;YACtC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI;YACvC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC;IAC1D,CAAC;IAED,IAAY,mBAAmB;QAC7B,OAAO,kCAAkC,CACvC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC3B,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,iBAAiB;QACf,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,gBAAgB,GACpB,yBAAyB,CAAC,6BAA6B,CACrD,IAAI,CAAC,gBAAgB,CAAC,eAAe,EACrC,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACJ,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAC1C,CAAC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,KAAK,gBAAgB,CACnE,CAAC;QACF,IAAI,CAAC,OAAO,IAAI,gBAAgB,KAAK,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7D,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,oEAAoE;QACpE,gCAAgC;QAChC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,kBAAkB,KAAK,gBAAgB,EAAE,CAAC;YACjD,IAAI,CAAC,aAAa,CAChB,IAAI,cAAc,CAAC,mCAAmC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CACxE,CAAC;QACJ,CAAC;QACD,iEAAiE;QACjE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,eAAe,CAAC,OAAgB;QAC9B,IAAI,CAAC,CAAC,OAAO,YAAY,cAAc,CAAC,EAAE,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAC5D,0EAA0E;QAC1E,gCAAgC;QAChC,IAAI,kBAAkB,CAAC,OAAO,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC/D,OAAO;QACT,CAAC;QACD,IAAI,kBAAkB,CAAC,IAAI,KAAK,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,qBAAqB;QACnB,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;QAC5D,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAEO,WAAW,CAAC,WAAmB;QACrC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,CAAC;YACH,yBAAyB,CAAC,iCAAiC,CACzD,IAAI,CAAC,gBAAgB,CAAC,eAAe,EACrC,IAAI,CAAC,mBAAmB,EACxB,WAAW,CACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CACnC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,EACnE,KAAK,CAAC,OAAO,CACd,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,CAAC;YACH,yBAAyB,CAAC,gCAAgC,CACxD,IAAI,CAAC,gBAAgB,CAAC,eAAe,EACrC,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,CACnC,QAAQ,CAAC,MAAM,CAAC,sBAAsB,CAAC,2BAA2B,CAAC,EACnE,KAAK,CAAC,OAAO,CACd,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,+BAA+B;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC;QACxD,IAAI,CAAC,CAAC,OAAO,YAAY,cAAc,CAAC,EAAE,CAAC;YACzC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAC5D,IAAI,kBAAkB,CAAC,OAAO,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC/D,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,kBAAkB,CAAC,YAAY,YAAY,gBAAgB;YAChE,CAAC,CAAC,kBAAkB,CAAC,YAAY;YACjC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,gCAAgC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAa,qBAAqB;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,UAAU,CACnB,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CACvC,CAAC;IACJ,CAAC;IAED,IAAa,mBAAmB;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CACT,UAA2D,EAC3D,QAA6C;QAE7C,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC;QAC3B,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,4BAA4B;QACnC,MAAM,WAAW,GACf,IAAI,CAAC,aAAa,CAAC,YAAY;YAC/B,yCAAyC;YACvC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW;YAC7C,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,WAAW,GAAG,WAAW,EAAE,cAAc,EAAE,CAAC;QAClD,IAAI,SAAiB,CAAC;QACtB,IAAI,WAAW,EAAE,CAAC;YAChB,SAAS,GAAG,WAAW,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;YAC/C,MAAM,WAAW,GACf,IAAI,CAAC,qBAAqB,CAAC,YAAY,YAAY,cAAc;gBAC/D,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK;qBAC7D,IAAI;gBACT,CAAC,CAAC,SAAS,CAAC;YAChB,SAAS,GAAG,kCAAkC,CAC5C,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,IAAI,CAAC,OAAO,CAAC,SAAS,EACtB,SAAS,CAAC,IAAI,EACd,gBAAgB,CAAC,IAAI,EACrB,WAAW,EACX,IAAI,CAAC,WAAW,EAAE,IAAI,CACvB,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GACT,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAC/D,SAAS,CACV,CAAC;QAEJ,SAAS,CAAC,SAAS;aAChB,SAAS,CAAC,KAAK,CAAC;aAChB,KAAK,CAAC,GAAG,EAAE,CACV,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,WAAW,CACnD,2DAA2D,CAC5D,CACF,CAAC;QAEJ,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,aAAa,CACrD,oDAAoD,CACrD,CAAC;IACJ,CAAC;IAED,IAAa,uBAAuB;QAClC,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI;YAClD,KAAK,EAAE,IAAI,iCAAiC,CAC1C;gBACE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;gBAC7B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;aAClC,EACD,IAAI,CAAC,SAAS,CAAC,KAAK,EACpB,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,SAAS,CAAC,IAAI,EACnB,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE,IAAI,CAC7C;SACF,CAAC;IACJ,CAAC;IAEQ,CAAC,YAAY;QACpB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,sEAAsE;gBACtE,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;oBAClD,MAAM,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC7D,CAAC;gBACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC;gBAC7D,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAChC,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAEQ,kBAAkB,CACzB,SAAoB,EACpB,QAA2C;QAE3C,IAAI,UAAU,CAAC;QACf,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACrB,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,CAAC;iBAAM,IAAI,QAAQ,CAAC,IAAI,YAAY,8BAA8B,EAAE,CAAC;gBACnE,UAAU,GAAG,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YAC5D,CAAC;QACH,CAAC;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,aAAa,CACrD,0CAA0C,CAC3C,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,YAAY,CAC5D,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAC/D,0CAA0C,CACxC,IAAI,CAAC,OAAO,CAAC,OAAO,EACpB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,IAAI,CAAC,OAAO,CAAC,SAAS,EACtB,SAAS,CAAC,IAAI,EACd,UAAU,CACX,CACF,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAEQ,uBAAuB,CAAC,SAAoB;QACnD,IAAI,CAAC,mBAAmB,GAAG,IAAI,4BAA4B,CACzD,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,EACtB;YACE,WAAW,EAAE,wBAAwB,CAAC,IAAI,CAAC,gBAAgB,CAAC;YAC5D,eAAe,EAAE,4BAA4B,CAC3C,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,CACvB;SACF,EACD,IAAI,iCAAiC,CACnC;YACE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YACnC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;SAClC,EACD,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,uBAAuB,EAAE,IAAI,CACxC,EACD,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,sBAAsB,CAClD,CAAC;IACJ,CAAC;IAEQ,YAAY;QACnB,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAa,yBAAyB;QACpC,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC;QACxD,OAAO,OAAO,YAAY,cAAc;YACtC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC;YACpC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.8.63",
+  "version": "13.8.65",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -44,19 +44,18 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.129",
-    "@finos/legend-art": "7.1.169",
-    "@finos/legend-code-editor": "2.0.211",
-    "@finos/legend-cube-builder": "0.0.6",
-    "@finos/legend-data-cube": "0.3.129",
-    "@finos/legend-extension-dsl-data-space": "10.4.265",
-    "@finos/legend-graph": "32.8.0",
-    "@finos/legend-lego": "2.0.231",
-    "@finos/legend-query-builder": "4.19.20",
-    "@finos/legend-server-depot": "6.1.24",
-    "@finos/legend-server-lakehouse": "0.4.0",
-    "@finos/legend-shared": "11.0.32",
-    "@finos/legend-storage": "3.0.154",
+    "@finos/legend-application": "16.0.130",
+    "@finos/legend-art": "7.1.170",
+    "@finos/legend-code-editor": "2.0.213",
+    "@finos/legend-data-cube": "0.3.131",
+    "@finos/legend-extension-dsl-data-space": "10.4.267",
+    "@finos/legend-graph": "32.9.0",
+    "@finos/legend-lego": "2.0.233",
+    "@finos/legend-query-builder": "4.19.22",
+    "@finos/legend-server-depot": "6.1.25",
+    "@finos/legend-server-lakehouse": "0.4.2",
+    "@finos/legend-shared": "11.0.33",
+    "@finos/legend-storage": "3.0.155",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@types/react": "19.0.10",
@@ -71,7 +70,7 @@
     "serializr": "3.0.3"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.2.9",
+    "@finos/legend-dev-utils": "2.2.11",
     "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
     "eslint": "9.22.0",

package/src/__lib__/LegendQueryNavigation.ts

@@ -65,8 +65,6 @@ export const LEGEND_QUERY_ROUTE_PATTERN = Object.freeze({
   // Developer-only diagnostic page for inspecting depot DataSpace
   // analytics artifact sizes. See `DataSpaceArtifactInspector`.
   DEV_DATA_SPACE_INSPECTOR: '/dev/dataspace-inspector',
-  // Legend Cube, the canvas query builder
-  CUBE: '/cube',
 });
 
 // DataProduct

package/src/__lib__/LegendQueryUserDataHelper.ts

@@ -15,7 +15,11 @@
  */
 
 import type { UserDataService } from '@finos/legend-application';
-import { returnUndefOnError } from '@finos/legend-shared';
+import {
+  isPlainObject,
+  isString,
+  returnUndefOnError,
+} from '@finos/legend-shared';
 import {
   createSimpleSchema,
   deserialize,
@@ -30,6 +34,7 @@ import {
   createVisitedDataProductId,
   type VisitedLegacyDataProduct,
   type VisitedDataProduct,
+  type DataSpaceRuntimePreference,
 } from './LegendQueryUserDataSpaceHelper.js';
 import type { ResolvedDataSpaceEntityWithOrigin } from '@finos/legend-extension-dsl-data-space/application';
 
@@ -38,6 +43,7 @@ export enum LEGEND_QUERY_USER_DATA_KEY {
   RECENTLY_VIEWED_LEGACY_DATAPRODUCTS = 'query-editor.recent-dataSpaces',
   RECENTLY_VIEWED_DATAPRODUCTS = 'query-editor.recent-dataProducts',
   USER_LAKEHOUSE_INFO = 'query-editor.lakehouse-info',
+  DATASPACE_RUNTIME_PREFERENCES = 'query-editor.dataSpace-runtimes',
 }
 
 export interface LakehouseUserInfo {
@@ -48,6 +54,7 @@ export interface LakehouseUserInfo {
 export const USER_DATA_RECENTLY_VIEWED_QUERIES_LIMIT = 10;
 export const USER_DATA_QUERY_DATASPACE_LIMIT = 10;
 export const USER_DATA_QUERY_DATAPRODUCT_LIMIT = 50;
+export const USER_DATA_QUERY_DATASPACE_RUNTIME_LIMIT = 50;
 
 type SavedData = string[];
 
@@ -285,6 +292,70 @@ export class LegendQueryUserDataHelper {
     return false;
   }
 
+  // DataSpace runtime preferences
+  static getDataSpaceRuntimePreferences(
+    service: UserDataService,
+  ): DataSpaceRuntimePreference[] {
+    const data: unknown = service.getObjectValue(
+      LEGEND_QUERY_USER_DATA_KEY.DATASPACE_RUNTIME_PREFERENCES,
+    );
+    // read on every data space load, so a malformed value is ignored rather
+    // than failing the load
+    return Array.isArray(data)
+      ? data.filter(
+          (preference): preference is DataSpaceRuntimePreference =>
+            isPlainObject(preference) &&
+            isString(preference.id) &&
+            isString(preference.runtimePath),
+        )
+      : [];
+  }
+
+  static getDataSpaceRuntimePreference(
+    service: UserDataService,
+    id: string,
+  ): string | undefined {
+    return LegendQueryUserDataHelper.getDataSpaceRuntimePreferences(
+      service,
+    ).find((preference) => preference.id === id)?.runtimePath;
+  }
+
+  /**
+   * Saves the runtime for the given id, or marks it as used again, moving it to
+   * the front so the choices in use are not the ones dropped at the limit
+   */
+  static persistDataSpaceRuntimePreference(
+    service: UserDataService,
+    id: string,
+    runtimePath: string,
+    limit = USER_DATA_QUERY_DATASPACE_RUNTIME_LIMIT,
+  ): void {
+    const preferences =
+      LegendQueryUserDataHelper.getDataSpaceRuntimePreferences(service).filter(
+        (preference) => preference.id !== id,
+      );
+    preferences.unshift({ id, runtimePath, lastUsedAt: Date.now() });
+    service.persistValue(
+      LEGEND_QUERY_USER_DATA_KEY.DATASPACE_RUNTIME_PREFERENCES,
+      preferences.slice(0, limit),
+    );
+  }
+
+  static removeDataSpaceRuntimePreference(
+    service: UserDataService,
+    id: string,
+  ): void {
+    const preferences =
+      LegendQueryUserDataHelper.getDataSpaceRuntimePreferences(service);
+    const remaining = preferences.filter((preference) => preference.id !== id);
+    if (remaining.length !== preferences.length) {
+      service.persistValue(
+        LEGEND_QUERY_USER_DATA_KEY.DATASPACE_RUNTIME_PREFERENCES,
+        remaining,
+      );
+    }
+  }
+
   // DataProducts
   static getRecentlyVisitedDataProducts(
     service: UserDataService,

package/src/__lib__/LegendQueryUserDataSpaceHelper.ts

@@ -146,3 +146,24 @@ export const createSimpleVisitedDataProduct = (
   deploymentId,
   lastViewedAt: Date.now(),
 });
+
+/**
+ * The runtime a user picked for an execution context of a data space, so it is
+ * used again the next time they query it, instead of the context's default
+ */
+export interface DataSpaceRuntimePreference {
+  id: string;
+  runtimePath: string;
+  lastUsedAt?: number | undefined;
+}
+
+export const createDataSpaceRuntimePreferenceId = (
+  groupId: string,
+  artifactId: string,
+  dataSpace: string,
+  executionContext: string,
+): string =>
+  // like visited data spaces, a choice holds for every version of the project
+  createVisitedDataSpaceId(groupId, artifactId, dataSpace) +
+  GAV_DELIMITER +
+  executionContext;

package/src/application/Core_LegendQuery_LegendApplicationPlugin.ts

@@ -18,12 +18,9 @@ import {
   Core_LegendApplicationPlugin,
   LEGEND_APPLICATION_COLOR_THEME,
   LEGEND_APPLICATION_SETTING_KEY,
-  collectKeyedCommandConfigEntriesFromConfig,
   collectSettingConfigurationEntriesFromConfig,
-  type KeyedCommandConfigEntry,
   type SettingConfigurationEntry,
 } from '@finos/legend-application';
-import { LEGEND_CUBE_COMMAND_CONFIG } from '@finos/legend-cube-builder';
 
 export const LEGEND_QUERY_APPLICATION_SETTING_CONFIG = {
   [LEGEND_APPLICATION_SETTING_KEY.COLOR_THEME]: {
@@ -38,15 +35,4 @@ export class Core_LegendQuery_LegendApplicationPlugin extends Core_LegendApplica
       LEGEND_QUERY_APPLICATION_SETTING_CONFIG,
     );
   }
-
-  /**
-   * The Cube page's shortcuts (F9, Ctrl/Cmd+Z): a Legend application binds
-   * keys only through its plugins, and the page registers the commands only
-   * while it is open (PLAN §3.5)
-   */
-  override getExtraKeyedCommandConfigEntries(): KeyedCommandConfigEntry[] {
-    return collectKeyedCommandConfigEntriesFromConfig(
-      LEGEND_CUBE_COMMAND_CONFIG,
-    );
-  }
 }

package/src/application/LegendQueryApplicationConfig.ts

@@ -26,7 +26,6 @@ import {
   LegendApplicationConfig,
   type LegendApplicationConfigurationInput,
   type LegendApplicationConfigurationData,
-  StereotypeConfig,
 } from '@finos/legend-application';
 import {
   createModelSchema,
@@ -69,23 +68,6 @@ export class ServiceRegistrationEnvironmentConfig {
   );
 }
 
-/**
- * Data products, as Legend Studio and Legend Marketplace configure them:
- * Query reads only the stereotype that marks access point groups open to
- * everyone in the organization, which Legend Cube's access badges use
- */
-export class LegendQueryDataProductConfig {
-  publicStereotype: StereotypeConfig | undefined;
-
-  static readonly serialization = new SerializationFactory(
-    createModelSchema(LegendQueryDataProductConfig, {
-      publicStereotype: optional(
-        usingModelSchema(StereotypeConfig.serialization.schema),
-      ),
-    }),
-  );
-}
-
 class LegendQueryApplicationCoreOptions {
   /**
    * Provides service registration environment configs.
@@ -126,9 +108,6 @@ class LegendQueryApplicationCoreOptions {
    */
   enableOauthFlow = false;
 
-  /** Data products, as Studio and Marketplace configure them (`options.dataProductConfig`) */
-  dataProductConfig: LegendQueryDataProductConfig | undefined;
-
   private static readonly serialization = new SerializationFactory(
     createModelSchema(LegendQueryApplicationCoreOptions, {
       TEMPORARY__serviceRegistrationConfig: list(
@@ -143,9 +122,6 @@ class LegendQueryApplicationCoreOptions {
         usingModelSchema(LegendQueryOIDCConfiguration.serialization.schema),
       ),
       enableOauthFlow: optional(primitive()),
-      dataProductConfig: optional(
-        usingModelSchema(LegendQueryDataProductConfig.serialization.schema),
-      ),
     }),
   );
 
@@ -182,19 +158,9 @@ export interface LegendQueryApplicationConfigurationData
   marketplace?: {
     url: string;
     productionParallelUrl: string;
-    /**
-     * The marketplace server, whose search Legend Cube's data product tab
-     * uses: the URL Legend Marketplace's own config names `marketplace.url`
-     */
-    serverUrl?: string;
   };
   lakehouse?: {
     url: string;
-    /**
-     * The lakehouse platform, which names the ingest servers: Legend Cube's
-     * ingest data sets need it, as Data Cube's and Marketplace's do
-     */
-    platformUrl?: string;
   };
   legendAI?: {
     url?: string;
@@ -214,9 +180,7 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
   readonly dataCubeApplicationUrl?: string;
   readonly marketplaceApplicationUrl?: string;
   readonly marketplaceProductionParallelUrl?: string;
-  readonly marketplaceServerUrl?: string;
   readonly lakehouseContractUrl?: string;
-  readonly lakehousePlatformUrl?: string;
   readonly legendAIUrl?: string;
   readonly legendAIAgentUrl?: string;
   readonly studioInstances: LegendStudioApplicationInstanceConfigurationData[] =
@@ -296,11 +260,6 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
           input.configData.marketplace.productionParallelUrl,
         );
     }
-    if (input.configData.marketplace?.serverUrl) {
-      this.marketplaceServerUrl = LegendApplicationConfig.resolveAbsoluteUrl(
-        input.configData.marketplace.serverUrl,
-      );
-    }
 
     // lakehouse
     if (input.configData.lakehouse?.url) {
@@ -308,11 +267,6 @@ export class LegendQueryApplicationConfig extends LegendApplicationConfig {
         input.configData.lakehouse.url,
       );
     }
-    if (input.configData.lakehouse?.platformUrl) {
-      this.lakehousePlatformUrl = LegendApplicationConfig.resolveAbsoluteUrl(
-        input.configData.lakehouse.platformUrl,
-      );
-    }
 
     // legend AI (AI-assisted features such as query title/description suggester)
     if (input.configData.legendAI?.url) {

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -1262,7 +1262,13 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
             : undefined;
           if (runtime) {
             dataSpaceQueryBuilderState.changeRuntime(runtime);
-          } else {
+          }
+          // the runtime this user picked for the context before wins over its default
+          const isSavedRuntimeApplied =
+            dataSpaceQueryBuilderState instanceof
+              LegendQueryDataSpaceQueryBuilderState &&
+            dataSpaceQueryBuilderState.applySavedRuntime();
+          if (!runtime && !isSavedRuntimeApplied) {
             dataSpaceQueryBuilderState.applicationStore.notificationService.notifyWarning(
               `Execution context '${executionContext.name}' does not have a default runtime`,
             );

package/src/components/LegendQueryWebApplication.tsx

@@ -44,7 +44,6 @@ import { QueryCreator } from './data-space/DataProductQueryCreator.js';
 import { IngestQueryCreator } from './ingest/IngestQueryCreator.js';
 import { ExistingQueryDataCubeViewer } from './data-cube/ExistingQueryDataCubeViewer.js';
 import { DataSpaceArtifactInspector } from './DataSpaceArtifactInspector.js';
-import { LegendQueryCubeRoute } from './cube/LegendQueryCubeRoute.js';
 import {
   AuthProvider,
   withAuthenticationRequired,
@@ -138,19 +137,6 @@ const LegendQueryWebApplicationRouter = observer(() => {
             element={<DataSpaceArtifactInspector />}
           />
 
-          {/*
-            Legend Cube is a proof of concept: it is only mounted where the
-            config turns on non-production features
-            (`extensions.core.NonProductionFeatureFlag`), so production
-            deployments don't show it yet.
-          */}
-          {applicationStore.config.options.NonProductionFeatureFlag && (
-            <Route
-              path={LEGEND_QUERY_ROUTE_PATTERN.CUBE}
-              element={<LegendQueryCubeRoute />}
-            />
-          )}
-
           {/* LEGACY DATA SPACE */}
           <Route
             path={generateExtensionUrlPattern(

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

@@ -32,6 +32,7 @@ import {
   PanelHeaderActionItem,
   PanelHeaderActions,
   SearchIcon,
+  UndoIcon,
 } from '@finos/legend-art';
 import {
   ResolvedDataSpaceEntityWithOrigin,
@@ -45,10 +46,8 @@ import {
 } from '@finos/legend-extension-dsl-data-space/application-query';
 import { resolveExecutionContextMapping } from '@finos/legend-extension-dsl-data-space/graph';
 import {
-  getMappingCompatibleRuntimes,
   PackageableElementExplicitReference,
   RuntimePointer,
-  type PackageableRuntime,
   type Runtime,
 } from '@finos/legend-graph';
 import {
@@ -67,25 +66,6 @@ import { formatDataProductOrSpaceOptionLabel } from '../shared/LegendQueryDataPr
 import type { LegendQueryDataSpaceQueryBuilderState } from '../../stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js';
 import { LegendQueryTelemetryHelper } from '../../__lib__/LegendQueryTelemetryHelper.js';
 
-const resolveExecutionContextRuntimes = (
-  queryBuilderState: LegendQueryDataSpaceQueryBuilderState,
-): PackageableRuntime[] => {
-  const currentMapping = guaranteeNonNullable(
-    resolveExecutionContextMapping(queryBuilderState.executionContext),
-    `Execution context '${queryBuilderState.executionContext.name}' does not have a resolvable mapping`,
-  );
-  if (queryBuilderState.dataSpaceAnalysisResult) {
-    const executionContext = Array.from(
-      queryBuilderState.dataSpaceAnalysisResult.executionContextsIndex.values(),
-    ).find((e) => e.mapping.path === currentMapping.path);
-    return guaranteeNonNullable(executionContext).compatibleRuntimes;
-  }
-  return getMappingCompatibleRuntimes(
-    currentMapping,
-    queryBuilderState.graphManagerState.usableRuntimes,
-  );
-};
-
 /**
  * LegendQuery-specific DataSpace query builder setup panel. Unlike the base
  * DataSpaceQueryBuilderSetupPanelContent, this component explicitly knows about
@@ -194,7 +174,7 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
     };
 
     // runtime
-    const runtimeOptions = resolveExecutionContextRuntimes(queryBuilderState)
+    const runtimeOptions = queryBuilderState.compatibleRuntimes
       .map(
         (rt) =>
           new RuntimePointer(PackageableElementExplicitReference.create(rt)),
@@ -214,8 +194,23 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
         return;
       }
       queryBuilderState.changeRuntime(option.value);
+      queryBuilderState.rememberRuntime(option.value);
       queryBuilderState.onRuntimeChange?.(option.value);
     };
+    // a runtime other than the context's default can always be undone here
+    const defaultRuntimePath = queryBuilderState.defaultRuntimePath;
+    const isUsingSavedRuntime =
+      queryBuilderState.currentRuntimePath !== undefined &&
+      queryBuilderState.currentRuntimePath ===
+        queryBuilderState.savedRuntimePath;
+    const canResetRuntime =
+      defaultRuntimePath !== undefined &&
+      queryBuilderState.currentRuntimePath !== defaultRuntimePath;
+    const resetRuntimeTitle = `${
+      isUsingSavedRuntime
+        ? 'Using the runtime you picked for this context. '
+        : ''
+    }Use the context's default runtime '${defaultRuntimePath}' instead`;
     const runtimeFilterOption = createFilter({
       ignoreCase: true,
       ignoreAccents: false,
@@ -434,6 +429,18 @@ const LegendQueryDataSpaceQueryBuilderSetupPanelContent = observer(
                   })}
                 />
               )}
+              {canResetRuntime && !injectedLakehouseRuntime && (
+                <button
+                  tabIndex={-1}
+                  className="query-builder__setup__runtime-reset__btn btn--dark"
+                  onClick={(): void =>
+                    queryBuilderState.resetToDefaultRuntime()
+                  }
+                  title={resetRuntimeTitle}
+                >
+                  <UndoIcon />
+                </button>
+              )}
             </div>
           )}
           <div className="query-builder__setup__config-group__item">