@finos/legend-application-query 13.8.56 → 13.8.58

package/src/components/Core_LegendQueryApplicationPlugin.tsx

@@ -79,7 +79,6 @@ import {
   type QueryBuilderPropagateExecutionContextChangeHelper,
   QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS,
   type QueryExportUsageConfiguration,
-  type TemplateQueryPanelContentRenderer,
   DataProductQueryBuilderState,
 } from '@finos/legend-query-builder';
 import {
@@ -137,9 +136,7 @@ import { observer } from 'mobx-react-lite';
 import { useQueryEditorStore } from './QueryEditorStoreProvider.js';
 import { useLegendQueryApplicationStore } from './LegendQueryFrameworkProvider.js';
 import { LegendQueryDataSpaceQueryBuilderState } from '../stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.js';
-import { LegendQueryDataProductQueryBuilderState } from '../stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js';
 import { IngestLegendQueryBuilderState } from '../stores/ingest/IngestLegendQueryBuilderState.js';
-import { renderDataProductSampleQueryPanelContent } from './data-product/DataProductSampleQueryPanel.js';
 
 const isDataProductOrIngestQuery = (
   queryBuilderState: QueryBuilderState,
@@ -1294,18 +1291,4 @@ export class Core_LegendQueryApplicationPlugin extends LegendQueryApplicationPlu
       },
     ];
   }
-
-  // TODO: create plugin for DataProducts
-  getExtraTemplateQueryPanelContentRenderer(): TemplateQueryPanelContentRenderer[] {
-    return [
-      (queryBuilderState: QueryBuilderState): React.ReactNode => {
-        if (
-          queryBuilderState instanceof LegendQueryDataProductQueryBuilderState
-        ) {
-          return renderDataProductSampleQueryPanelContent(queryBuilderState);
-        }
-        return undefined;
-      },
-    ];
-  }
 }

package/src/components/LegendQueryWebApplication.tsx

@@ -41,7 +41,6 @@ import { flowResult } from 'mobx';
 import { LEGACY_DATA_SPACE_QUERY_ROUTE_PATTERN } from '../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import { DataSpaceTemplateQueryCreator } from './data-space/DataSpaceTemplateQueryCreator.js';
 import { QueryCreator } from './data-space/DataProductQueryCreator.js';
-import { DataProductSampleQueryCreator } from './data-product/DataProductSampleQueryCreator.js';
 import { IngestQueryCreator } from './ingest/IngestQueryCreator.js';
 import { ExistingQueryDataCubeViewer } from './data-cube/ExistingQueryDataCubeViewer.js';
 import { DataSpaceArtifactInspector } from './DataSpaceArtifactInspector.js';
@@ -106,10 +105,6 @@ const LegendQueryWebApplicationRouter = observer(() => {
             path={LEGEND_QUERY_ROUTE_PATTERN.DATA_CUBE_EXISTING_QUERY}
             element={<ExistingQueryDataCubeViewer />}
           />
-          <Route
-            path={LEGEND_QUERY_ROUTE_PATTERN.DATA_PRODUCT_SAMPLE_QUERY}
-            element={<DataProductSampleQueryCreator />}
-          />
           <Route
             path={LEGEND_QUERY_ROUTE_PATTERN.DATA_PRODUCT}
             element={<QueryCreator />}

package/src/components/__test-utils__/QueryEditorComponentTestUtils.tsx

@@ -34,15 +34,12 @@ import {
   QueryExplicitExecutionContext,
   QueryDataSpaceExecutionContext,
   QueryDataProductModelAccessExecutionContext,
-  QueryDataProductNativeExecutionContext,
   PackageableElementExplicitReference,
   QueryDataSpaceExecutionContextInfo,
   QueryExplicitExecutionContextInfo,
   QueryDataProductModelAccessExecutionContextInfo,
-  QueryDataProductNativeExecutionContextInfo,
   ModelAccessPointGroup,
   V1_PureGraphManager,
-  type V1_DataProductArtifact,
 } from '@finos/legend-graph';
 import { DepotServerClient } from '@finos/legend-server-depot';
 import {
@@ -77,7 +74,6 @@ import {
 } from '@finos/legend-application/browser';
 import {
   generateExistingQueryEditorRoute,
-  generateDataProductSampleQueryRoute,
   LEGEND_QUERY_ROUTE_PATTERN,
 } from '../../__lib__/LegendQueryNavigation.js';
 import {
@@ -92,8 +88,6 @@ import {
 import { LegendQueryDataProductQueryBuilderState } from '../../stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.js';
 import { DataProductSelectorState } from '../../stores/data-space/DataProductSelectorState.js';
 import { DataSpaceTemplateQueryCreatorStore } from '../../stores/data-space/DataSpaceTemplateQueryCreatorStore.js';
-import { DataProductSampleQueryCreatorStore } from '../../stores/data-product/DataProductSampleQueryCreatorStore.js';
-import { DataProductSampleQueryCreator } from '../data-product/DataProductSampleQueryCreator.js';
 
 const TEST_QUERY_ID = 'test-query-id';
 const TEST_GROUP_ID = 'test-group';
@@ -101,8 +95,6 @@ const TEST_ARTIFACT_ID = 'test-artifact';
 const TEST_VERSION_ID = 'test-version';
 const TEST_TEMPLATE_QUERY_ID = 'templateQuery';
 const TEST_DATA_SPACE_PATH = 'domain::COVIDDatapace';
-const TEST_SAMPLE_QUERY_ID = 'sampleQuery';
-const TEST_DATA_PRODUCT_PATH = 'test::MyDataProduct';
 export const TEST_QUERY_NAME = 'MyTestQuery';
 
 export const TEST__provideMockedQueryEditorStore = (customization?: {
@@ -846,425 +838,3 @@ export const TEST__setUpDataProductExistingQueryEditor = async (
     ),
   };
 };
-
-export const TEST__setUpDataProductNativeExistingQueryEditor = async (
-  MOCK__editorStore: ExistingQueryEditorStore,
-  dataProductPath: string,
-  executionKey: string,
-  lambda: RawLambda,
-  entities: PlainObject<Entity>[],
-  artifact?: V1_DataProductArtifact | undefined,
-): Promise<{
-  renderResult: RenderResult;
-  queryBuilderState: QueryBuilderState;
-}> => {
-  const projectData = {
-    id: 'test-id',
-    groupId: 'test.group',
-    artifactId: 'test-artifact',
-    projectId: 'test-project-id',
-    versions: ['0.0.0'],
-    latestVersion: '0.0.0',
-  };
-
-  const lightQuery = new LightQuery();
-  lightQuery.name = TEST_QUERY_NAME;
-  lightQuery.id = TEST_QUERY_ID;
-  lightQuery.versionId = '0.0.0';
-  lightQuery.groupId = 'test.group';
-  lightQuery.artifactId = 'test-artifact';
-  lightQuery.owner = 'test-artifact';
-  lightQuery.isCurrentUserQuery = true;
-
-  const graphManagerState = MOCK__editorStore.graphManagerState;
-
-  await graphManagerState.graphManager.initialize({
-    env: 'test',
-    tabSize: 2,
-    clientConfig: {},
-  });
-
-  await graphManagerState.initializeSystem();
-  await graphManagerState.graphManager.buildGraph(
-    graphManagerState.graph,
-    entities as unknown as Entity[],
-    graphManagerState.graphBuildState,
-  );
-
-  const query = new Query();
-  query.name = lightQuery.name;
-  query.id = lightQuery.id;
-  query.versionId = lightQuery.versionId;
-  query.groupId = lightQuery.groupId;
-  query.artifactId = lightQuery.artifactId;
-  query.owner = lightQuery.owner;
-  query.isCurrentUserQuery = lightQuery.isCurrentUserQuery;
-  const execContext = new QueryDataProductNativeExecutionContext();
-  execContext.dataProductPath = dataProductPath;
-  execContext.executionKey = executionKey;
-  query.executionContext = execContext;
-  query.content = 'some content';
-
-  const execContextInfo = new QueryDataProductNativeExecutionContextInfo();
-  execContextInfo.dataProductPath = dataProductPath;
-  execContextInfo.executionKey = executionKey;
-
-  const queryInfo: QueryInfo = {
-    name: TEST_QUERY_NAME,
-    id: TEST_QUERY_ID,
-    versionId: '0.0.0',
-    groupId: 'test.group',
-    artifactId: 'test-artifact',
-    executionContext: execContextInfo,
-    content: 'some content',
-    isCurrentUserQuery: true,
-  };
-
-  // Resolve the data product and execution state from the built graph
-  const dataProduct = graphManagerState.graph.getDataProduct(dataProductPath);
-  const nativeAccess = guaranteeNonNullable(
-    dataProduct.nativeModelAccess,
-    `Data product '${dataProductPath}' has no native model access`,
-  );
-  const executionState = guaranteeNonNullable(
-    nativeAccess.nativeModelExecutionContexts.find(
-      (ctx) => ctx.key === executionKey,
-    ),
-    `Can't find native execution context '${executionKey}'`,
-  );
-
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getProject',
-  ).mockResolvedValue(projectData);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getEntities',
-  ).mockResolvedValue(entities);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getEntitiesByClassifier',
-  ).mockResolvedValue([]);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getEntitiesSummaryByClassifier',
-  ).mockResolvedValue([]);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getVersions',
-  ).mockResolvedValue([projectData.latestVersion]);
-  createSpy(graphManagerState.graphManager, 'getLightQuery').mockResolvedValue(
-    lightQuery,
-  );
-  createSpy(graphManagerState.graphManager, 'getQueryInfo').mockResolvedValue(
-    queryInfo,
-  );
-  createSpy(
-    graphManagerState.graphManager,
-    'pureCodeToLambda',
-  ).mockResolvedValue(new RawLambda(lambda.parameters, lambda.body));
-  createSpy(graphManagerState.graphManager, 'getQuery').mockResolvedValue(
-    query,
-  );
-  createSpy(
-    graphManagerState.graphManager,
-    'analyzeMappingModelCoverage',
-  ).mockResolvedValue(
-    graphManagerState.graphManager.buildMappingModelCoverageAnalysisResult(
-      { mappedEntities: [] },
-      executionState.mapping.value,
-    ),
-  );
-
-  // Build the query builder state that buildDataProductQueryBuilderState would return
-  const mockQueryBuilderState = new LegendQueryDataProductQueryBuilderState(
-    MOCK__editorStore.applicationStore,
-    graphManagerState,
-    QueryBuilderDataBrowserWorkflow.INSTANCE,
-    new QueryBuilderActionConfig_QueryApplication(MOCK__editorStore),
-    dataProduct,
-    artifact,
-    executionState,
-    MOCK__editorStore.depotServerClient,
-    { groupId: 'test.group', artifactId: 'test-artifact', versionId: '0.0.0' },
-    async () => {
-      /* no-op for tests */
-    },
-    async () => {
-      throw new Error('Not implemented in tests');
-    },
-    new DataProductSelectorState(
-      MOCK__editorStore.depotServerClient,
-      MOCK__editorStore.applicationStore,
-    ),
-    undefined,
-    undefined,
-    MOCK__editorStore.applicationStore.config.options.queryBuilderConfig,
-    {
-      groupId: 'test.group',
-      artifactId: 'test-artifact',
-      versionId: '0.0.0',
-      dataProduct: dataProductPath,
-    },
-  );
-  mockQueryBuilderState.initWithDataProduct(
-    dataProduct,
-    undefined,
-    executionState,
-  );
-
-  MOCK__editorStore.buildGraph = createMock();
-  MOCK__editorStore.buildFullGraph = createMock();
-  MOCK__editorStore.fetchDataProductArtifact = createMock();
-  (
-    MOCK__editorStore.fetchDataProductArtifact as ReturnType<typeof createMock>
-  ).mockResolvedValue({});
-  MOCK__editorStore.buildDataProductQueryBuilderState = createMock();
-  (
-    MOCK__editorStore.buildDataProductQueryBuilderState as ReturnType<
-      typeof createMock
-    >
-  ).mockResolvedValue(mockQueryBuilderState);
-  graphManagerState.graphManager.initialize = createMock();
-
-  const renderResult = render(
-    <ApplicationStoreProvider store={MOCK__editorStore.applicationStore}>
-      <TEST__BrowserEnvironmentProvider
-        initialEntries={[generateExistingQueryEditorRoute(lightQuery.id)]}
-      >
-        <LegendQueryFrameworkProvider>
-          <Routes>
-            <Route
-              path={LEGEND_QUERY_ROUTE_PATTERN.EDIT_EXISTING_QUERY}
-              element={<ExistingQueryEditor />}
-            />
-          </Routes>
-        </LegendQueryFrameworkProvider>
-      </TEST__BrowserEnvironmentProvider>
-    </ApplicationStoreProvider>,
-  );
-  await waitFor(() =>
-    renderResult.getByTestId(QUERY_BUILDER_TEST_ID.QUERY_BUILDER),
-  );
-
-  return {
-    renderResult,
-    queryBuilderState: guaranteeNonNullable(
-      MOCK__editorStore.queryBuilderState,
-      `Query builder state should have been initialized`,
-    ),
-  };
-};
-
-export const TEST__provideMockedDataProductSampleQueryCreatorStore =
-  (customization?: {
-    mock?: DataProductSampleQueryCreatorStore;
-    applicationStore?: LegendQueryApplicationStore;
-    pluginManager?: LegendQueryPluginManager;
-    extraPlugins?: AbstractPlugin[];
-    extraPresets?: AbstractPreset[];
-  }): DataProductSampleQueryCreatorStore => {
-    const pluginManager =
-      customization?.pluginManager ?? LegendQueryPluginManager.create();
-    pluginManager
-      .usePlugins([
-        new Core_LegendQueryApplicationPlugin(),
-        ...(customization?.extraPlugins ?? []),
-      ])
-      .usePresets([...(customization?.extraPresets ?? [])])
-      .install();
-    const applicationStore =
-      customization?.applicationStore ??
-      new ApplicationStore(
-        TEST__getTestLegendQueryApplicationConfig(),
-        pluginManager,
-      );
-    const depotServerClient = new DepotServerClient({
-      serverUrl: applicationStore.config.depotServerUrl,
-    });
-    depotServerClient.setTracerService(applicationStore.tracerService);
-    const value =
-      customization?.mock ??
-      new DataProductSampleQueryCreatorStore(
-        applicationStore,
-        depotServerClient,
-        TEST_GROUP_ID,
-        TEST_ARTIFACT_ID,
-        TEST_VERSION_ID,
-        TEST_DATA_PRODUCT_PATH,
-        TEST_SAMPLE_QUERY_ID,
-        { fips: 'value' },
-      );
-    const MOCK__QueryEditorStoreProvider = require('../QueryEditorStoreProvider.js'); // eslint-disable-line @typescript-eslint/no-require-imports,@typescript-eslint/no-unsafe-assignment
-    MOCK__QueryEditorStoreProvider.useQueryEditorStore = createMock();
-    MOCK__QueryEditorStoreProvider.useQueryEditorStore.mockReturnValue(value);
-    return value;
-  };
-
-export const TEST__setUpDataProductSampleQueryEditor = async (
-  MOCK__editorStore: DataProductSampleQueryCreatorStore,
-  dataProductPath: string,
-  executionKey: string,
-  lambda: RawLambda,
-  entities: PlainObject<Entity>[],
-  artifact: V1_DataProductArtifact,
-): Promise<{
-  renderResult: RenderResult;
-  queryBuilderState: QueryBuilderState;
-}> => {
-  const projectData = {
-    id: 'test-id',
-    groupId: MOCK__editorStore.groupId,
-    artifactId: MOCK__editorStore.artifactId,
-    projectId: 'test-project-id',
-    versions: [MOCK__editorStore.versionId],
-    latestVersion: MOCK__editorStore.versionId,
-  };
-
-  const graphManagerState = MOCK__editorStore.graphManagerState;
-
-  await graphManagerState.graphManager.initialize({
-    env: 'test',
-    tabSize: 2,
-    clientConfig: {},
-  });
-  await graphManagerState.initializeSystem();
-  await graphManagerState.graphManager.buildGraph(
-    graphManagerState.graph,
-    entities as unknown as Entity[],
-    graphManagerState.graphBuildState,
-  );
-
-  const dataProduct = graphManagerState.graph.getDataProduct(dataProductPath);
-  const nativeAccess = guaranteeNonNullable(
-    dataProduct.nativeModelAccess,
-    `Data product '${dataProductPath}' has no native model access`,
-  );
-  const executionState = guaranteeNonNullable(
-    nativeAccess.nativeModelExecutionContexts.find(
-      (ctx) => ctx.key === executionKey,
-    ),
-    `Can't find native execution context '${executionKey}'`,
-  );
-
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getProject',
-  ).mockResolvedValue(projectData);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getEntities',
-  ).mockResolvedValue(entities);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getEntitiesByClassifier',
-  ).mockResolvedValue([]);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getEntitiesSummaryByClassifier',
-  ).mockResolvedValue([]);
-  createSpy(
-    MOCK__editorStore.depotServerClient,
-    'getVersions',
-  ).mockResolvedValue([projectData.latestVersion]);
-  createSpy(
-    graphManagerState.graphManager,
-    'pureCodeToLambda',
-  ).mockResolvedValue(new RawLambda(lambda.parameters, lambda.body));
-  createSpy(
-    graphManagerState.graphManager,
-    'analyzeMappingModelCoverage',
-  ).mockResolvedValue(
-    graphManagerState.graphManager.buildMappingModelCoverageAnalysisResult(
-      { mappedEntities: [] },
-      executionState.mapping.value,
-    ),
-  );
-
-  const mockQueryBuilderState = new LegendQueryDataProductQueryBuilderState(
-    MOCK__editorStore.applicationStore,
-    graphManagerState,
-    QueryBuilderDataBrowserWorkflow.INSTANCE,
-    new QueryBuilderActionConfig_QueryApplication(MOCK__editorStore),
-    dataProduct,
-    artifact,
-    executionState,
-    MOCK__editorStore.depotServerClient,
-    {
-      groupId: MOCK__editorStore.groupId,
-      artifactId: MOCK__editorStore.artifactId,
-      versionId: MOCK__editorStore.versionId,
-    },
-    async () => {
-      /* no-op for tests */
-    },
-    async () => {
-      throw new Error('Not implemented in tests');
-    },
-    new DataProductSelectorState(
-      MOCK__editorStore.depotServerClient,
-      MOCK__editorStore.applicationStore,
-    ),
-    undefined,
-    undefined,
-    MOCK__editorStore.applicationStore.config.options.queryBuilderConfig,
-    {
-      groupId: MOCK__editorStore.groupId,
-      artifactId: MOCK__editorStore.artifactId,
-      versionId: MOCK__editorStore.versionId,
-      dataProduct: dataProductPath,
-    },
-  );
-  mockQueryBuilderState.initWithDataProduct(
-    dataProduct,
-    undefined,
-    executionState,
-  );
-
-  MOCK__editorStore.buildGraph = createMock();
-  MOCK__editorStore.fetchDataProductArtifact = createMock();
-  (
-    MOCK__editorStore.fetchDataProductArtifact as ReturnType<typeof createMock>
-  ).mockResolvedValue(artifact);
-  MOCK__editorStore.buildDataProductQueryBuilderState = createMock();
-  (
-    MOCK__editorStore.buildDataProductQueryBuilderState as ReturnType<
-      typeof createMock
-    >
-  ).mockResolvedValue(mockQueryBuilderState);
-  graphManagerState.graphManager.initialize = createMock();
-
-  const sampleQueryRoute = generateDataProductSampleQueryRoute(
-    MOCK__editorStore.groupId,
-    MOCK__editorStore.artifactId,
-    MOCK__editorStore.versionId,
-    dataProductPath,
-    MOCK__editorStore.templateQueryId,
-  );
-
-  const renderResult = render(
-    <ApplicationStoreProvider store={MOCK__editorStore.applicationStore}>
-      <TEST__BrowserEnvironmentProvider initialEntries={[sampleQueryRoute]}>
-        <LegendQueryFrameworkProvider>
-          <Routes>
-            <Route
-              path={LEGEND_QUERY_ROUTE_PATTERN.DATA_PRODUCT_SAMPLE_QUERY}
-              element={<DataProductSampleQueryCreator />}
-            />
-          </Routes>
-        </LegendQueryFrameworkProvider>
-      </TEST__BrowserEnvironmentProvider>
-    </ApplicationStoreProvider>,
-  );
-  await waitFor(() =>
-    renderResult.getByTestId(QUERY_BUILDER_TEST_ID.QUERY_BUILDER),
-  );
-
-  return {
-    renderResult,
-    queryBuilderState: guaranteeNonNullable(
-      MOCK__editorStore.queryBuilderState,
-      `Query builder state should have been initialized`,
-    ),
-  };
-};

package/src/index.ts

@@ -32,7 +32,6 @@ export {
   generateExistingQueryEditorRoute,
   generateServiceQueryCreatorRoute,
   generateDataProductRoute,
-  generateDataProductNativeRoute,
   generateDataProductModelRoute,
   generateDataProductLakehouseRoute,
   LEGEND_QUERY_ROUTE_PATTERN,

package/src/stores/QueryEditorStore.ts

@@ -43,7 +43,6 @@ import {
 } from '@finos/legend-shared';
 import {
   type LightQuery,
-  type NativeModelExecutionContext,
   type RawLambda,
   type Runtime,
   type Service,
@@ -76,7 +75,6 @@ import {
   QUERY_PROFILE_PATH,
   QueryDataSpaceExecutionContextInfo,
   QueryExplicitExecutionContextInfo,
-  QueryDataProductNativeExecutionContextInfo,
   QueryDataProductModelAccessExecutionContextInfo,
   QueryDataProductLakehouseExecutionContextInfo,
   QueryIngestExecutionContextInfo,
@@ -1068,31 +1066,6 @@ export abstract class QueryEditorStore {
     artifact: V1_DataProductArtifact,
     executionContextId: string | undefined,
   ): string {
-    // Try native execution contexts first
-    if (artifact.nativeModelAccess) {
-      const native = artifact.nativeModelAccess;
-      if (executionContextId) {
-        const matchingContext = native.nativeModelExecutionContexts.find(
-          (ctx) => ctx.key === executionContextId,
-        );
-        if (matchingContext) {
-          return matchingContext.mapping;
-        }
-      }
-      // Fall back to default execution context
-      const defaultContext = native.nativeModelExecutionContexts.find(
-        (ctx) => ctx.key === native.defaultExecutionContext,
-      );
-      if (defaultContext) {
-        return defaultContext.mapping;
-      }
-      // Fall back to first context
-      const firstContext = native.nativeModelExecutionContexts[0];
-      if (firstContext) {
-        return firstContext.mapping;
-      }
-    }
-
     // Try model access point groups
     const modelGroups = artifact.accessPointGroups.filter(
       (g): g is V1_ModelAccessPointGroupInfo =>
@@ -1197,48 +1170,25 @@ export abstract class QueryEditorStore {
 
   /**
    * Resolves the execution state for a data product by looking up `accessId`
-   * in both model access point groups (by `id`) and native execution contexts
-   * (by `key`). Throws if no matching state is found.
+   * in both model access point groups (by `id`) and lakehouse access points
+   * (by `id`). Throws if no matching state is found.
    */
   resolveDataProductExecutionState(
     dataProduct: DataProduct,
     accessId: string | undefined,
-  ):
-    | NativeModelExecutionContext
-    | ModelAccessPointGroup
-    | LakehouseAccessPoint {
-    // Search model access point groups
+  ): ModelAccessPointGroup | LakehouseAccessPoint {
     const modelGroups = dataProduct.accessPointGroups.filter(
       filterByType(ModelAccessPointGroup),
     );
+    const lakehouseAccessPoints = dataProduct.accessPointGroups
+      .flatMap((group) => group.accessPoints)
+      .filter(filterByType(LakehouseAccessPoint));
+
     if (accessId) {
       const matchingGroup = modelGroups.find((g) => g.id === accessId);
       if (matchingGroup) {
         return matchingGroup;
       }
-    }
-    // Search native model execution contexts
-    const nativeAccess = dataProduct.nativeModelAccess;
-    if (nativeAccess && accessId) {
-      const matchingContext = nativeAccess.nativeModelExecutionContexts.find(
-        (ctx) => ctx.key === accessId,
-      );
-      if (matchingContext) {
-        return matchingContext;
-      }
-    }
-
-    // Fall back: prioritize first model access point group over native default
-    const firstGroup = modelGroups[0];
-    if (firstGroup) {
-      return firstGroup;
-    }
-
-    // Search lakehouse access points
-    const lakehouseAccessPoints = dataProduct.accessPointGroups
-      .flatMap((group) => group.accessPoints)
-      .filter(filterByType(LakehouseAccessPoint));
-    if (accessId) {
       const matchingLakehouseAP = lakehouseAccessPoints.find(
         (ap) => ap.id === accessId,
       );
@@ -1248,8 +1198,8 @@ export abstract class QueryEditorStore {
     }
 
     return guaranteeNonNullable(
-      modelGroups[0] ?? nativeAccess?.defaultExecutionContext,
-      `Can't resolve execution state for data product '${dataProduct.path}'${accessId ? ` with access ID '${accessId}'` : ''}. Data product must have model access point groups or native model access.`,
+      modelGroups[0] ?? lakehouseAccessPoints[0],
+      `Can't resolve execution state for data product '${dataProduct.path}'${accessId ? ` with access ID '${accessId}'` : ''}. Data product must have model access point groups or lakehouse access points.`,
     );
   }
 
@@ -2195,8 +2145,6 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
         dataSpaceTaggedValue !== undefined ||
         queryInfo?.executionContext instanceof
           QueryDataSpaceExecutionContextInfo ||
-        queryInfo?.executionContext instanceof
-          QueryDataProductNativeExecutionContextInfo ||
         queryInfo?.executionContext instanceof
           QueryDataProductModelAccessExecutionContextInfo ||
         queryInfo?.executionContext instanceof
@@ -2505,18 +2453,12 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
       );
       return classQueryBuilderState;
     } else if (
-      exec instanceof QueryDataProductNativeExecutionContextInfo ||
       exec instanceof QueryDataProductModelAccessExecutionContextInfo ||
       exec instanceof QueryDataProductLakehouseExecutionContextInfo
     ) {
       let executionContextId: string;
       let accessType: DataProductAccessType;
-      if (exec instanceof QueryDataProductNativeExecutionContextInfo) {
-        executionContextId = exec.executionKey;
-        accessType = DataProductAccessType.NATIVE;
-      } else if (
-        exec instanceof QueryDataProductModelAccessExecutionContextInfo
-      ) {
+      if (exec instanceof QueryDataProductModelAccessExecutionContextInfo) {
         executionContextId = exec.accessPointGroupId;
         accessType = DataProductAccessType.MODEL;
       } else {

package/src/stores/data-product/query-builder/DataProductArtifactHelper.ts

@@ -34,19 +34,7 @@ export const resolveDefaultDataProductAccessType = (
     };
   }
 
-  // start on ModelAPG if it exists, then fallback to native access
-  const nativeAccess = dataProductArtifact.nativeModelAccess;
-  if (nativeAccess) {
-    const defaultKey = nativeAccess.defaultExecutionContext;
-    const native =
-      nativeAccess.nativeModelExecutionContexts.find(
-        (ctx) => ctx.key === defaultKey,
-      ) ?? nativeAccess.nativeModelExecutionContexts[0];
-    if (native) {
-      return { type: DataProductAccessType.NATIVE, id: native.key };
-    }
-  }
   throw new Error(
-    `Data Product not supported for querying on legend query ${dataProductArtifact.dataProduct.path}. Must contain a model access point or native model access.`,
+    `Data Product not supported for querying on legend query ${dataProductArtifact.dataProduct.path}. Must contain a model access point.`,
   );
 };