@finos/legend-application-query 13.8.62 → 13.8.63

package/lib/index.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-application-query v13.8.62
+/** @license @finos/legend-application-query v13.8.63
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/light-mode.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-application-query v13.8.62
+/** @license @finos/legend-application-query v13.8.63
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-application-query",
-    "version": "13.8.62",
+    "version": "13.8.63",
     "description": "Legend Query application core",
     "keywords": [
         "legend",
@@ -55,7 +55,6 @@
         "@finos/legend-query-builder": "workspace:*",
         "@finos/legend-server-depot": "workspace:*",
         "@finos/legend-server-lakehouse": "workspace:*",
-        "@finos/legend-server-marketplace": "workspace:*",
         "@finos/legend-shared": "workspace:*",
         "@finos/legend-storage": "workspace:*",
         "@testing-library/dom": "10.4.0",

package/lib/stores/cube/LegendQueryCubeHost.d.ts

@@ -13,37 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CubeEngineClientSettings, type CubeConnectionExplorer, type CubeDataProductCatalog, type CubeEngine, type CubeIngestCatalog, type CubeLakehouseServices, type CubeProjectCatalog, type CubeServiceCatalog, type CubeEngineConfig, type CubeHost, LocalModelCatalog } from '@finos/legend-cube-builder';
+import { LegendCubeHost, type CubeConnectionExplorer, type CubeEngine, type CubeEngineConfig, type CubeLakehouseServices, type CubeProjectCatalog, type LegendCubeHostConfig } from '@finos/legend-cube-builder';
 import type { LegendQueryApplicationConfig } from '../../application/LegendQueryApplicationConfig.js';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
 /** Cube talks to the engine Query's own editor uses, configured the same way */
 export declare const buildLegendQueryCubeEngineConfig: (config: LegendQueryApplicationConfig) => CubeEngineConfig;
+/**
+ * Query's servers, as Cube's host reads them (PLAN §11.18): Query's engine,
+ * depot, lakehouse and marketplace, configured as Query's own, and the
+ * lakehouse environment Query remembers for the viewer
+ */
+export declare const buildLegendQueryCubeHostConfig: (applicationStore: LegendQueryApplicationStore) => LegendCubeHostConfig;
 /**
  * What Cube needs to read and run data products (PLAN §6.8), with Query's
- * lakehouse and depot, configured as Query's own: none when Query has no
- * lakehouse, so an open-source deployment without one offers no data
- * products. With a marketplace server too, its search is used
+ * lakehouse and depot: none when Query has no lakehouse, so an open-source
+ * deployment without one offers no data products
  */
 export declare const buildLegendQueryCubeLakehouseServices: (applicationStore: LegendQueryApplicationStore) => CubeLakehouseServices | undefined;
-/** The published projects in Query's depot, or none without a depot */
-export declare const buildLegendQueryCubeProjectCatalog: (applicationStore: LegendQueryApplicationStore) => CubeProjectCatalog | undefined;
 /**
- * Legend Query as the host of the Cube page (PLAN §3.5): Query's engine and
- * application store, the bundled models, direct database connections read
- * through Query's engine, and, when Query has a lakehouse, its deployed data
- * products (PLAN §6.8). One per visit to the page.
+ * Legend Query as the host of the Cube page (PLAN §3.5): the host a Legend
+ * deployment gives Cube (PLAN §11.18), from Query's config. One per visit to
+ * the page.
  */
-export declare class LegendQueryCubeHost implements CubeHost {
-    readonly applicationStore: LegendQueryApplicationStore;
-    readonly engine: CubeEngine;
-    readonly modelCatalog: LocalModelCatalog;
-    readonly connectionExplorer: CubeConnectionExplorer;
-    readonly dataProductCatalog: CubeDataProductCatalog | undefined;
-    readonly ingestCatalog: CubeIngestCatalog | undefined;
-    readonly projectCatalog: CubeProjectCatalog | undefined;
-    readonly serviceCatalog: CubeServiceCatalog;
-    /** The engine URL and compression Cube's engine clients share, which Dev Settings changes */
-    readonly engineClientSettings: CubeEngineClientSettings;
+export declare class LegendQueryCubeHost extends LegendCubeHost {
     /**
      * Tests give an engine, an explorer and a project catalog; otherwise each
      * is built from Query's config

package/lib/stores/cube/LegendQueryCubeHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryCubeHost.d.ts","sourceRoot":"","sources":["../../../src/stores/cube/LegendQueryCubeHost.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EASL,wBAAwB,EAExB,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAC3B,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,QAAQ,EACb,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACtG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAE9E,gFAAgF;AAChF,eAAO,MAAM,gCAAgC,GAC3C,QAAQ,4BAA4B,KACnC,gBAMD,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,GAChD,kBAAkB,2BAA2B,KAC5C,qBAAqB,GAAG,SAwE1B,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,kCAAkC,GAC7C,kBAAkB,2BAA2B,KAC5C,kBAAkB,GAAG,SAUvB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,QAAQ;IAClD,QAAQ,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;IACvD,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IACzC,QAAQ,CAAC,kBAAkB,EAAE,sBAAsB,CAAC;IACpD,QAAQ,CAAC,kBAAkB,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,aAAa,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,cAAc,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACxD,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC5C,6FAA6F;IAC7F,QAAQ,CAAC,oBAAoB,EAAE,wBAAwB,CAAC;IAExD;;;OAGG;gBAED,gBAAgB,EAAE,2BAA2B,EAC7C,MAAM,CAAC,EAAE,UAAU,EACnB,kBAAkB,CAAC,EAAE,sBAAsB,EAC3C,cAAc,CAAC,EAAE,kBAAkB;CAiDtC"}
+{"version":3,"file":"LegendQueryCubeHost.d.ts","sourceRoot":"","sources":["../../../src/stores/cube/LegendQueryCubeHost.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,cAAc,EACd,KAAK,sBAAsB,EAC3B,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAC1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACtG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AAE9E,gFAAgF;AAChF,eAAO,MAAM,gCAAgC,GAC3C,QAAQ,4BAA4B,KACnC,gBAMD,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,8BAA8B,GACzC,kBAAkB,2BAA2B,KAC5C,oBAyBF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,GAChD,kBAAkB,2BAA2B,KAC5C,qBAAqB,GAAG,SAIxB,CAAC;AAEJ;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,cAAc;IACrD;;;OAGG;gBAED,gBAAgB,EAAE,2BAA2B,EAC7C,MAAM,CAAC,EAAE,UAAU,EACnB,kBAAkB,CAAC,EAAE,sBAAsB,EAC3C,cAAc,CAAC,EAAE,kBAAkB;CAQtC"}

package/lib/stores/cube/LegendQueryCubeHost.js

@@ -13,11 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { buildCubeConnectionExplorer, buildCubeDataProductCatalog, buildCubeEngine, buildCubeIngestCatalog, buildCubeLakehouseEnvironment, buildCubeProjectCatalog, buildCubeServiceCatalog, CubeDataProductEnvironmentType, CubeEngineClientSettings, getCubeRememberedWarehouse, LocalModelCatalog, } from '@finos/legend-cube-builder';
-import { DepotServerClient } from '@finos/legend-server-depot';
-import { LakehouseContractServerClient, LakehouseIngestServerClient, LakehousePlatformServerClient, } from '@finos/legend-server-lakehouse';
-import { MarketplaceServerClient } from '@finos/legend-server-marketplace';
-import { EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl } from '../../__lib__/LegendQueryNavigation.js';
+import { buildLegendCubeLakehouseServices, LegendCubeHost, } from '@finos/legend-cube-builder';
 import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
 /** Cube talks to the engine Query's own editor uses, configured the same way */
 export const buildLegendQueryCubeEngineConfig = (config) => ({
@@ -28,53 +24,22 @@ export const buildLegendQueryCubeEngineConfig = (config) => ({
     useCookieAuthOnly: config.engineUseCookieAuthOnly,
 });
 /**
- * What Cube needs to read and run data products (PLAN §6.8), with Query's
- * lakehouse and depot, configured as Query's own: none when Query has no
- * lakehouse, so an open-source deployment without one offers no data
- * products. With a marketplace server too, its search is used
+ * Query's servers, as Cube's host reads them (PLAN §11.18): Query's engine,
+ * depot, lakehouse and marketplace, configured as Query's own, and the
+ * lakehouse environment Query remembers for the viewer
  */
-export const buildLegendQueryCubeLakehouseServices = (applicationStore) => {
-    const { config, tracerService } = applicationStore;
-    if (!config.lakehouseContractUrl || !config.depotServerUrl) {
-        return undefined;
-    }
-    const contractServerClient = new LakehouseContractServerClient({
-        baseUrl: config.lakehouseContractUrl,
-    });
-    contractServerClient.setTracerService(tracerService);
-    const depotServerClient = new DepotServerClient({
-        serverUrl: config.depotServerUrl,
-    });
-    depotServerClient.setTracerService(tracerService);
-    let marketplaceServerClient;
-    if (config.marketplaceServerUrl) {
-        marketplaceServerClient = new MarketplaceServerClient({
-            serverUrl: config.marketplaceServerUrl,
-            // the client only stores it, never reading it, and Cube calls no subscription route
-            subscriptionUrl: '',
-        });
-        marketplaceServerClient.setTracerService(tracerService);
-    }
-    // ingest data sets need the platform, which names the ingest servers; the
-    // ingest client has no server of its own: each call names one
-    let platformServerClient;
-    let ingestServerClient;
-    if (config.lakehousePlatformUrl) {
-        platformServerClient = new LakehousePlatformServerClient(config.lakehousePlatformUrl);
-        platformServerClient.setTracerService(tracerService);
-        ingestServerClient = new LakehouseIngestServerClient(undefined);
-        ingestServerClient.setTracerService(tracerService);
-    }
+export const buildLegendQueryCubeHostConfig = (applicationStore) => {
+    const { config } = applicationStore;
     return {
-        platformServerClient,
-        ingestServerClient,
-        contractServerClient,
-        depotServerClient,
-        marketplaceServerClient,
-        getAccessToken: () => applicationStore.getAccessToken(),
-        getCurrentUser: () => applicationStore.identityService.currentUser,
-        // the environment Query remembers for the viewer, as Query's editor uses it
-        getPreferredEnvironment: () => LegendQueryUserDataHelper.getLakehouseUserInfo(applicationStore.userDataService)?.env,
+        engine: buildLegendQueryCubeEngineConfig(config),
+        depotServerUrl: config.depotServerUrl,
+        lakehouseContractUrl: config.lakehouseContractUrl,
+        lakehousePlatformUrl: config.lakehousePlatformUrl,
+        marketplaceServerUrl: config.marketplaceServerUrl,
+        // a data product links to the marketplace of its deployment's class;
+        // Query's own links choose by a SNAPSHOT version instead
+        marketplaceApplicationUrl: config.marketplaceApplicationUrl,
+        marketplaceProductionParallelUrl: config.marketplaceProductionParallelUrl,
         // the stereotype Studio and Marketplace mark groups open to everyone with
         enterpriseStereotype: config.options.dataProductConfig?.publicStereotype
             ? {
@@ -82,85 +47,32 @@ export const buildLegendQueryCubeLakehouseServices = (applicationStore) => {
                 value: config.options.dataProductConfig.publicStereotype.stereotype,
             }
             : undefined,
-        // the marketplace of the deployment's class, where its deployment is;
-        // Query's own links choose by a SNAPSHOT version instead
-        getMarketplaceLink: (target) => {
-            const marketplaceUrl = target.environmentType ===
-                CubeDataProductEnvironmentType.PRODUCTION_PARALLEL
-                ? config.marketplaceProductionParallelUrl
-                : config.marketplaceApplicationUrl;
-            return marketplaceUrl
-                ? EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl(marketplaceUrl, target.dataProductId, target.deploymentId, target.accessPointGroup)
-                : undefined;
-        },
+        // the environment Query remembers for the viewer, as Query's editor uses it
+        getPreferredEnvironment: () => LegendQueryUserDataHelper.getLakehouseUserInfo(applicationStore.userDataService)?.env,
     };
 };
-/** The published projects in Query's depot, or none without a depot */
-export const buildLegendQueryCubeProjectCatalog = (applicationStore) => {
-    const { config, tracerService } = applicationStore;
-    if (!config.depotServerUrl) {
-        return undefined;
-    }
-    const depotServerClient = new DepotServerClient({
-        serverUrl: config.depotServerUrl,
-    });
-    depotServerClient.setTracerService(tracerService);
-    return buildCubeProjectCatalog(depotServerClient);
-};
 /**
- * Legend Query as the host of the Cube page (PLAN §3.5): Query's engine and
- * application store, the bundled models, direct database connections read
- * through Query's engine, and, when Query has a lakehouse, its deployed data
- * products (PLAN §6.8). One per visit to the page.
+ * What Cube needs to read and run data products (PLAN §6.8), with Query's
+ * lakehouse and depot: none when Query has no lakehouse, so an open-source
+ * deployment without one offers no data products
+ */
+export const buildLegendQueryCubeLakehouseServices = (applicationStore) => buildLegendCubeLakehouseServices(applicationStore, buildLegendQueryCubeHostConfig(applicationStore));
+/**
+ * Legend Query as the host of the Cube page (PLAN §3.5): the host a Legend
+ * deployment gives Cube (PLAN §11.18), from Query's config. One per visit to
+ * the page.
  */
-export class LegendQueryCubeHost {
-    applicationStore;
-    engine;
-    modelCatalog;
-    connectionExplorer;
-    dataProductCatalog;
-    ingestCatalog;
-    projectCatalog;
-    serviceCatalog;
-    /** The engine URL and compression Cube's engine clients share, which Dev Settings changes */
-    engineClientSettings;
+export class LegendQueryCubeHost extends LegendCubeHost {
     /**
      * Tests give an engine, an explorer and a project catalog; otherwise each
      * is built from Query's config
      */
     constructor(applicationStore, engine, connectionExplorer, projectCatalog) {
-        this.applicationStore = applicationStore;
-        const config = buildLegendQueryCubeEngineConfig(applicationStore.config);
-        this.engineClientSettings = new CubeEngineClientSettings(config);
-        const lakehouse = buildLegendQueryCubeLakehouseServices(applicationStore);
-        this.ingestCatalog = lakehouse
-            ? buildCubeIngestCatalog(config, applicationStore.tracerService, lakehouse, this.engineClientSettings)
-            : undefined;
-        this.engine =
-            engine ??
-                buildCubeEngine(config, applicationStore.tracerService, {
-                    ingestCatalog: this.ingestCatalog,
-                    lakehouseEnvironment: lakehouse
-                        ? buildCubeLakehouseEnvironment(lakehouse)
-                        : undefined,
-                    getRememberedWarehouse: () => getCubeRememberedWarehouse(applicationStore.userDataService),
-                    clientSettings: this.engineClientSettings,
-                });
-        this.dataProductCatalog = lakehouse
-            ? buildCubeDataProductCatalog(lakehouse)
-            : undefined;
-        this.modelCatalog = new LocalModelCatalog(this.engine);
-        // its own client, configured as the engine's
-        this.connectionExplorer =
-            connectionExplorer ??
-                buildCubeConnectionExplorer(config, applicationStore.tracerService, this.engineClientSettings);
-        // the published projects in Query's depot (PLAN §6.3); it reads nothing
-        // until the source dialog's Project tab opens
-        this.projectCatalog =
-            projectCatalog ?? buildLegendQueryCubeProjectCatalog(applicationStore);
-        // the services in the registry of Query's engine (PLAN §6.4), in
-        // progress; it reads nothing until the source dialog's Service tab opens
-        this.serviceCatalog = buildCubeServiceCatalog(config, applicationStore.tracerService, this.engineClientSettings);
+        super(applicationStore, buildLegendQueryCubeHostConfig(applicationStore), {
+            engine,
+            connectionExplorer,
+            projectCatalog,
+        });
     }
 }
 //# sourceMappingURL=LegendQueryCubeHost.js.map

package/lib/stores/cube/LegendQueryCubeHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"LegendQueryCubeHost.js","sourceRoot":"","sources":["../../../src/stores/cube/LegendQueryCubeHost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LegendQueryCubeHost.js","sourceRoot":"","sources":["../../../src/stores/cube/LegendQueryCubeHost.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,gCAAgC,EAChC,cAAc,GAOf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AAIvF,gFAAgF;AAChF,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC9C,MAAoC,EAClB,EAAE,CAAC,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,eAAe;IAC/B,YAAY,EAAE,MAAM,CAAC,oBAAoB;IACzC,eAAe,EAAE,MAAM,CAAC,qBAAqB;IAC7C,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,MAAM,CAAC,uBAAuB;CAClD,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,gBAA6C,EACvB,EAAE;IACxB,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;IACpC,OAAO;QACL,MAAM,EAAE,gCAAgC,CAAC,MAAM,CAAC;QAChD,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;QACjD,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;QACjD,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;QACjD,qEAAqE;QACrE,yDAAyD;QACzD,yBAAyB,EAAE,MAAM,CAAC,yBAAyB;QAC3D,gCAAgC,EAAE,MAAM,CAAC,gCAAgC;QACzE,0EAA0E;QAC1E,oBAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB;YACtE,CAAC,CAAC;gBACE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO;gBAClE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,UAAU;aACpE;YACH,CAAC,CAAC,SAAS;QACb,4EAA4E;QAC5E,uBAAuB,EAAE,GAAG,EAAE,CAC5B,yBAAyB,CAAC,oBAAoB,CAC5C,gBAAgB,CAAC,eAAe,CACjC,EAAE,GAAG;KACT,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAG,CACnD,gBAA6C,EACV,EAAE,CACrC,gCAAgC,CAC9B,gBAAgB,EAChB,8BAA8B,CAAC,gBAAgB,CAAC,CACjD,CAAC;AAEJ;;;;GAIG;AACH,MAAM,OAAO,mBAAoB,SAAQ,cAAc;IACrD;;;OAGG;IACH,YACE,gBAA6C,EAC7C,MAAmB,EACnB,kBAA2C,EAC3C,cAAmC;QAEnC,KAAK,CAAC,gBAAgB,EAAE,8BAA8B,CAAC,gBAAgB,CAAC,EAAE;YACxE,MAAM;YACN,kBAAkB;YAClB,cAAc;SACf,CAAC,CAAC;IACL,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-query",
-  "version": "13.8.62",
+  "version": "13.8.63",
   "description": "Legend Query application core",
   "keywords": [
     "legend",
@@ -47,15 +47,14 @@
     "@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.5",
+    "@finos/legend-cube-builder": "0.0.6",
     "@finos/legend-data-cube": "0.3.129",
-    "@finos/legend-extension-dsl-data-space": "10.4.264",
+    "@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-server-marketplace": "0.2.18",
     "@finos/legend-shared": "11.0.32",
     "@finos/legend-storage": "3.0.154",
     "@testing-library/dom": "10.4.0",

package/src/stores/cube/LegendQueryCubeHost.ts

@@ -15,35 +15,15 @@
  */
 
 import {
-  buildCubeConnectionExplorer,
-  buildCubeDataProductCatalog,
-  buildCubeEngine,
-  buildCubeIngestCatalog,
-  buildCubeLakehouseEnvironment,
-  buildCubeProjectCatalog,
-  buildCubeServiceCatalog,
-  CubeDataProductEnvironmentType,
-  CubeEngineClientSettings,
-  getCubeRememberedWarehouse,
+  buildLegendCubeLakehouseServices,
+  LegendCubeHost,
   type CubeConnectionExplorer,
-  type CubeDataProductCatalog,
   type CubeEngine,
-  type CubeIngestCatalog,
+  type CubeEngineConfig,
   type CubeLakehouseServices,
   type CubeProjectCatalog,
-  type CubeServiceCatalog,
-  type CubeEngineConfig,
-  type CubeHost,
-  LocalModelCatalog,
+  type LegendCubeHostConfig,
 } from '@finos/legend-cube-builder';
-import { DepotServerClient } from '@finos/legend-server-depot';
-import {
-  LakehouseContractServerClient,
-  LakehouseIngestServerClient,
-  LakehousePlatformServerClient,
-} from '@finos/legend-server-lakehouse';
-import { MarketplaceServerClient } from '@finos/legend-server-marketplace';
-import { EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl } from '../../__lib__/LegendQueryNavigation.js';
 import { LegendQueryUserDataHelper } from '../../__lib__/LegendQueryUserDataHelper.js';
 import type { LegendQueryApplicationConfig } from '../../application/LegendQueryApplicationConfig.js';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
@@ -60,60 +40,24 @@ export const buildLegendQueryCubeEngineConfig = (
 });
 
 /**
- * What Cube needs to read and run data products (PLAN §6.8), with Query's
- * lakehouse and depot, configured as Query's own: none when Query has no
- * lakehouse, so an open-source deployment without one offers no data
- * products. With a marketplace server too, its search is used
+ * Query's servers, as Cube's host reads them (PLAN §11.18): Query's engine,
+ * depot, lakehouse and marketplace, configured as Query's own, and the
+ * lakehouse environment Query remembers for the viewer
  */
-export const buildLegendQueryCubeLakehouseServices = (
+export const buildLegendQueryCubeHostConfig = (
   applicationStore: LegendQueryApplicationStore,
-): CubeLakehouseServices | undefined => {
-  const { config, tracerService } = applicationStore;
-  if (!config.lakehouseContractUrl || !config.depotServerUrl) {
-    return undefined;
-  }
-  const contractServerClient = new LakehouseContractServerClient({
-    baseUrl: config.lakehouseContractUrl,
-  });
-  contractServerClient.setTracerService(tracerService);
-  const depotServerClient = new DepotServerClient({
-    serverUrl: config.depotServerUrl,
-  });
-  depotServerClient.setTracerService(tracerService);
-  let marketplaceServerClient: MarketplaceServerClient | undefined;
-  if (config.marketplaceServerUrl) {
-    marketplaceServerClient = new MarketplaceServerClient({
-      serverUrl: config.marketplaceServerUrl,
-      // the client only stores it, never reading it, and Cube calls no subscription route
-      subscriptionUrl: '',
-    });
-    marketplaceServerClient.setTracerService(tracerService);
-  }
-  // ingest data sets need the platform, which names the ingest servers; the
-  // ingest client has no server of its own: each call names one
-  let platformServerClient: LakehousePlatformServerClient | undefined;
-  let ingestServerClient: LakehouseIngestServerClient | undefined;
-  if (config.lakehousePlatformUrl) {
-    platformServerClient = new LakehousePlatformServerClient(
-      config.lakehousePlatformUrl,
-    );
-    platformServerClient.setTracerService(tracerService);
-    ingestServerClient = new LakehouseIngestServerClient(undefined);
-    ingestServerClient.setTracerService(tracerService);
-  }
+): LegendCubeHostConfig => {
+  const { config } = applicationStore;
   return {
-    platformServerClient,
-    ingestServerClient,
-    contractServerClient,
-    depotServerClient,
-    marketplaceServerClient,
-    getAccessToken: () => applicationStore.getAccessToken(),
-    getCurrentUser: () => applicationStore.identityService.currentUser,
-    // the environment Query remembers for the viewer, as Query's editor uses it
-    getPreferredEnvironment: () =>
-      LegendQueryUserDataHelper.getLakehouseUserInfo(
-        applicationStore.userDataService,
-      )?.env,
+    engine: buildLegendQueryCubeEngineConfig(config),
+    depotServerUrl: config.depotServerUrl,
+    lakehouseContractUrl: config.lakehouseContractUrl,
+    lakehousePlatformUrl: config.lakehousePlatformUrl,
+    marketplaceServerUrl: config.marketplaceServerUrl,
+    // a data product links to the marketplace of its deployment's class;
+    // Query's own links choose by a SNAPSHOT version instead
+    marketplaceApplicationUrl: config.marketplaceApplicationUrl,
+    marketplaceProductionParallelUrl: config.marketplaceProductionParallelUrl,
     // the stereotype Studio and Marketplace mark groups open to everyone with
     enterpriseStereotype: config.options.dataProductConfig?.publicStereotype
       ? {
@@ -121,59 +65,33 @@ export const buildLegendQueryCubeLakehouseServices = (
           value: config.options.dataProductConfig.publicStereotype.stereotype,
         }
       : undefined,
-    // the marketplace of the deployment's class, where its deployment is;
-    // Query's own links choose by a SNAPSHOT version instead
-    getMarketplaceLink: (target) => {
-      const marketplaceUrl =
-        target.environmentType ===
-        CubeDataProductEnvironmentType.PRODUCTION_PARALLEL
-          ? config.marketplaceProductionParallelUrl
-          : config.marketplaceApplicationUrl;
-      return marketplaceUrl
-        ? EXTERNAL_APPLICATION_NAVIGATION__generateMarketplaceDataProductUrl(
-            marketplaceUrl,
-            target.dataProductId,
-            target.deploymentId,
-            target.accessPointGroup,
-          )
-        : undefined;
-    },
+    // the environment Query remembers for the viewer, as Query's editor uses it
+    getPreferredEnvironment: () =>
+      LegendQueryUserDataHelper.getLakehouseUserInfo(
+        applicationStore.userDataService,
+      )?.env,
   };
 };
 
-/** The published projects in Query's depot, or none without a depot */
-export const buildLegendQueryCubeProjectCatalog = (
+/**
+ * What Cube needs to read and run data products (PLAN §6.8), with Query's
+ * lakehouse and depot: none when Query has no lakehouse, so an open-source
+ * deployment without one offers no data products
+ */
+export const buildLegendQueryCubeLakehouseServices = (
   applicationStore: LegendQueryApplicationStore,
-): CubeProjectCatalog | undefined => {
-  const { config, tracerService } = applicationStore;
-  if (!config.depotServerUrl) {
-    return undefined;
-  }
-  const depotServerClient = new DepotServerClient({
-    serverUrl: config.depotServerUrl,
-  });
-  depotServerClient.setTracerService(tracerService);
-  return buildCubeProjectCatalog(depotServerClient);
-};
+): CubeLakehouseServices | undefined =>
+  buildLegendCubeLakehouseServices(
+    applicationStore,
+    buildLegendQueryCubeHostConfig(applicationStore),
+  );
 
 /**
- * Legend Query as the host of the Cube page (PLAN §3.5): Query's engine and
- * application store, the bundled models, direct database connections read
- * through Query's engine, and, when Query has a lakehouse, its deployed data
- * products (PLAN §6.8). One per visit to the page.
+ * Legend Query as the host of the Cube page (PLAN §3.5): the host a Legend
+ * deployment gives Cube (PLAN §11.18), from Query's config. One per visit to
+ * the page.
  */
-export class LegendQueryCubeHost implements CubeHost {
-  readonly applicationStore: LegendQueryApplicationStore;
-  readonly engine: CubeEngine;
-  readonly modelCatalog: LocalModelCatalog;
-  readonly connectionExplorer: CubeConnectionExplorer;
-  readonly dataProductCatalog: CubeDataProductCatalog | undefined;
-  readonly ingestCatalog: CubeIngestCatalog | undefined;
-  readonly projectCatalog: CubeProjectCatalog | undefined;
-  readonly serviceCatalog: CubeServiceCatalog;
-  /** The engine URL and compression Cube's engine clients share, which Dev Settings changes */
-  readonly engineClientSettings: CubeEngineClientSettings;
-
+export class LegendQueryCubeHost extends LegendCubeHost {
   /**
    * Tests give an engine, an explorer and a project catalog; otherwise each
    * is built from Query's config
@@ -184,51 +102,10 @@ export class LegendQueryCubeHost implements CubeHost {
     connectionExplorer?: CubeConnectionExplorer,
     projectCatalog?: CubeProjectCatalog,
   ) {
-    this.applicationStore = applicationStore;
-    const config = buildLegendQueryCubeEngineConfig(applicationStore.config);
-    this.engineClientSettings = new CubeEngineClientSettings(config);
-    const lakehouse = buildLegendQueryCubeLakehouseServices(applicationStore);
-    this.ingestCatalog = lakehouse
-      ? buildCubeIngestCatalog(
-          config,
-          applicationStore.tracerService,
-          lakehouse,
-          this.engineClientSettings,
-        )
-      : undefined;
-    this.engine =
-      engine ??
-      buildCubeEngine(config, applicationStore.tracerService, {
-        ingestCatalog: this.ingestCatalog,
-        lakehouseEnvironment: lakehouse
-          ? buildCubeLakehouseEnvironment(lakehouse)
-          : undefined,
-        getRememberedWarehouse: () =>
-          getCubeRememberedWarehouse(applicationStore.userDataService),
-        clientSettings: this.engineClientSettings,
-      });
-    this.dataProductCatalog = lakehouse
-      ? buildCubeDataProductCatalog(lakehouse)
-      : undefined;
-    this.modelCatalog = new LocalModelCatalog(this.engine);
-    // its own client, configured as the engine's
-    this.connectionExplorer =
-      connectionExplorer ??
-      buildCubeConnectionExplorer(
-        config,
-        applicationStore.tracerService,
-        this.engineClientSettings,
-      );
-    // the published projects in Query's depot (PLAN §6.3); it reads nothing
-    // until the source dialog's Project tab opens
-    this.projectCatalog =
-      projectCatalog ?? buildLegendQueryCubeProjectCatalog(applicationStore);
-    // the services in the registry of Query's engine (PLAN §6.4), in
-    // progress; it reads nothing until the source dialog's Service tab opens
-    this.serviceCatalog = buildCubeServiceCatalog(
-      config,
-      applicationStore.tracerService,
-      this.engineClientSettings,
-    );
+    super(applicationStore, buildLegendQueryCubeHostConfig(applicationStore), {
+      engine,
+      connectionExplorer,
+      projectCatalog,
+    });
   }
 }