@finos/legend-application-query 13.8.8 → 13.8.10

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

@@ -22,6 +22,7 @@ import {
   type QueryBuilderActionConfig,
   type QueryBuilderConfig,
   type QueryBuilderWorkflowState,
+  LakehouseDataProductExecutionState,
 } from '@finos/legend-query-builder';
 import { renderLegendDataProductQueryBuilderSetupPanelContent } from '../../../components/data-product/LegendQueryDataProductQueryBuilder.js';
 import type { LegendQueryApplicationStore } from '../../LegendQueryBaseStore.js';
@@ -36,6 +37,7 @@ import type {
 } from '@finos/legend-storage';
 import {
   LegendSDLC,
+  type PackageableRuntime,
   type Class,
   type DataProduct,
   type GraphManagerState,
@@ -43,10 +45,12 @@ import {
   type NativeModelExecutionContext,
   type PackageableElement,
   type V1_DataProductArtifact,
+  type LakehouseAccessPoint,
 } from '@finos/legend-graph';
 import {
   generateDataProductNativeRoute,
   generateDataProductModelRoute,
+  generateDataProductLakehouseRoute,
 } from '../../../__lib__/LegendQueryNavigation.js';
 import { compareLabelFn } from '@finos/legend-art';
 import type { DataProductSelectorState } from '../../data-space/DataProductSelectorState.js';
@@ -62,6 +66,10 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
     | ((val: ResolvedDataSpaceEntityWithOrigin) => void)
     | undefined;
   productSelectorState: DataProductSelectorState;
+  createLakehousePackageableRuntime: (
+    dataProductPath: string,
+    gav: { groupId: string; artifactId: string; versionId: string },
+  ) => Promise<PackageableRuntime>;
 
   constructor(
     applicationStore: LegendQueryApplicationStore,
@@ -70,17 +78,21 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
     actionConfig: QueryBuilderActionConfig,
     dataProduct: DataProduct,
     artifact: V1_DataProductArtifact | undefined,
-    executionState: NativeModelExecutionContext | ModelAccessPointGroup,
+    executionState:
+      | NativeModelExecutionContext
+      | ModelAccessPointGroup
+      | LakehouseAccessPoint,
     depotServerClient: DepotServerClient,
     project: ProjectGAVCoordinates,
     onDataProductChange: (val: DepotEntityWithOrigin) => Promise<void>,
+    createLakehousePackageableRuntime: (
+      dataProductPath: string,
+      gav: { groupId: string; artifactId: string; versionId: string },
+    ) => Promise<PackageableRuntime>,
     productSelectorState: DataProductSelectorState,
     onLegacyDataSpaceChange?:
       | ((val: ResolvedDataSpaceEntityWithOrigin) => void)
       | undefined,
-    onExecutionContextChange?:
-      | ((val: NativeModelExecutionContext) => void)
-      | undefined,
     onClassChange?: ((val: Class) => void) | undefined,
     config?: QueryBuilderConfig | undefined,
     sourceInfo?: QueryableSourceInfo | undefined,
@@ -95,7 +107,6 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
       executionState,
       undefined,
       onDataProductChange,
-      onExecutionContextChange,
       onClassChange,
       config,
       sourceInfo,
@@ -104,6 +115,7 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
     this.depotServerClient = depotServerClient;
     this.productSelectorState = productSelectorState;
     this.onLegacyDataSpaceChange = onLegacyDataSpaceChange;
+    this.createLakehousePackageableRuntime = createLakehousePackageableRuntime;
   }
 
   override handleDataProductChange(val: DepotEntityWithOrigin): void {
@@ -117,6 +129,46 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
     }
   }
 
+  override async prepareAccessForExecution(): Promise<void> {
+    const origin = this.graphManagerState.graph.origin;
+    if (
+      this.executionState instanceof
+        ModelAccessPointDataProductExecutionState &&
+      origin instanceof LegendSDLC
+    ) {
+      const packageableRuntime = await this.createLakehousePackageableRuntime(
+        this.dataProduct.path,
+        {
+          groupId: origin.groupId,
+          artifactId: origin.artifactId,
+          versionId: origin.versionId,
+        },
+      );
+      this.graphManagerState.graph.addElement(packageableRuntime, '_internal_');
+
+      if (!this.executionState.adhocRuntime) {
+        this.executionState.withAdhocRuntime();
+      }
+
+      this.executionState.changeSelectedRuntime(packageableRuntime);
+    } else if (
+      this.executionState instanceof LakehouseDataProductExecutionState &&
+      origin instanceof LegendSDLC
+    ) {
+      const packageableRuntime = await this.createLakehousePackageableRuntime(
+        this.dataProduct.path,
+        {
+          groupId: origin.groupId,
+          artifactId: origin.artifactId,
+          versionId: origin.versionId,
+        },
+      );
+      this.graphManagerState.graph.addElement(packageableRuntime, '_internal_');
+      this.executionState.changeSelectedRuntime(packageableRuntime);
+    }
+    await super.prepareAccessForExecution();
+  }
+
   override get dataProductOptions(): DataProductOption[] {
     const graphOptions = super.dataProductOptions;
     const depotOptions: DataProductOption[] = [
@@ -154,8 +206,9 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
 
   override get floatingExecutionElements(): PackageableElement[] | undefined {
     if (
-      this.executionState instanceof
-        ModelAccessPointDataProductExecutionState &&
+      (this.executionState instanceof
+        ModelAccessPointDataProductExecutionState ||
+        this.executionState instanceof LakehouseDataProductExecutionState) &&
       this.executionState.adhocRuntime &&
       this.graphManagerState.graph.origin !== undefined &&
       this.executionState.selectedRuntime !== undefined
@@ -189,6 +242,16 @@ export class LegendQueryDataProductQueryBuilderState extends DataProductQueryBui
           execState.exectionValue.id,
         ),
       );
+    } else if (execState instanceof LakehouseDataProductExecutionState) {
+      route = this.applicationStore.navigationService.navigator.generateAddress(
+        generateDataProductLakehouseRoute(
+          this.project.groupId,
+          this.project.artifactId,
+          this.project.versionId,
+          dataProduct.path,
+          execState.exectionValue.id,
+        ),
+      );
     } else {
       this.applicationStore.notificationService.notifyError(
         'Data Product link is not available for this execution type.',

package/src/stores/data-space/DataProductQueryCreatorStore.ts

@@ -155,7 +155,7 @@ export class QueryableDataProduct extends LegendQueryableElement {
   ) {
     super(groupId, artifactId, versionId);
     this.dataProductPath = dataProductPath;
-    this.dataProductType = dataProductType;
+    this.dataProductType = dataProductType.toLowerCase();
     this.id = id;
   }
 

package/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts

@@ -14,36 +14,14 @@
  * limitations under the License.
  */
 
-import {
-  type Query,
-  type QuerySearchSpecification,
-  type RawLambda,
-  type ValueSpecification,
-  QueryProjectCoordinates,
-  extractElementNameFromPath,
-} from '@finos/legend-graph';
-import { type DepotServerClient } from '@finos/legend-server-depot';
-import {
-  assertErrorThrown,
-  IllegalStateError,
-  LogEvent,
-  uuid,
-  type GeneratorFn,
-} from '@finos/legend-shared';
+import { IllegalStateError } from '@finos/legend-shared';
 import {
   type QueryBuilderState,
   QueryBuilderDataBrowserWorkflow,
 } from '@finos/legend-query-builder';
-import {
-  type ProjectGAVCoordinates,
-  parseGACoordinates,
-} from '@finos/legend-storage';
-import {
-  type QueryPersistConfiguration,
-  QueryBuilderActionConfig_QueryApplication,
-  QueryEditorStore,
-} from '../QueryEditorStore.js';
+import { QueryBuilderActionConfig_QueryApplication } from '../QueryEditorStore.js';
 import type { LegendQueryApplicationStore } from '../LegendQueryBaseStore.js';
+import type { DepotServerClient } from '@finos/legend-server-depot';
 import { generateDataSpaceTemplateQueryCreatorRoute } from '../../__lib__/DSL_DataSpace_LegendQueryNavigation.js';
 import {
   DataSpacePackageableElementExecutable,
@@ -53,22 +31,14 @@ import {
 } from '@finos/legend-extension-dsl-data-space/graph';
 import {
   type ResolvedDataSpaceEntityWithOrigin,
-  createQueryClassTaggedValue,
   createQueryDataSpaceTaggedValue,
 } from '@finos/legend-extension-dsl-data-space/application';
 import { LegendQueryDataSpaceQueryBuilderState } from './query-builder/LegendQueryDataSpaceQueryBuilderState.js';
 import { DataProductSelectorState } from './DataProductSelectorState.js';
-import { processQueryParameters } from '../../components/utils/QueryParameterUtils.js';
-import { LEGEND_QUERY_APP_EVENT } from '../../__lib__/LegendQueryEvent.js';
+import { BaseTemplateQueryCreatorStore } from '../BaseTemplateQueryCreatorStore.js';
 
-export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
-  readonly groupId: string;
-  readonly artifactId: string;
-  readonly versionId: string;
+export class DataSpaceTemplateQueryCreatorStore extends BaseTemplateQueryCreatorStore {
   readonly dataSpacePath: string;
-  readonly templateQueryId: string;
-  templateQueryTitle?: string;
-  urlQueryParamValues: Record<string, string> | undefined;
 
   constructor(
     applicationStore: LegendQueryApplicationStore,
@@ -80,22 +50,16 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     templateQueryId: string,
     urlQueryParamValues: Record<string, string> | undefined,
   ) {
-    super(applicationStore, depotServerClient);
-
-    this.groupId = groupId;
-    this.artifactId = artifactId;
-    this.versionId = versionId;
+    super(
+      applicationStore,
+      depotServerClient,
+      groupId,
+      artifactId,
+      versionId,
+      templateQueryId,
+      urlQueryParamValues,
+    );
     this.dataSpacePath = dataSpacePath;
-    this.templateQueryId = templateQueryId;
-    this.urlQueryParamValues = urlQueryParamValues;
-  }
-
-  getProjectInfo(): ProjectGAVCoordinates {
-    return {
-      groupId: this.groupId,
-      artifactId: this.artifactId,
-      versionId: this.versionId,
-    };
   }
 
   override getEditorRoute(): string {
@@ -108,8 +72,22 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     );
   }
 
-  override *buildGraph(): GeneratorFn<void> {
-    // do nothing
+  override getEntityPath(): string {
+    return this.dataSpacePath;
+  }
+
+  override getSearchTaggedValues(): {
+    profile: string;
+    tag: string;
+    value: string;
+  }[] {
+    return [createQueryDataSpaceTaggedValue(this.dataSpacePath)];
+  }
+
+  override getQueryDecoratorTaggedValues():
+    | { profile: string; tag: string; value: string }[]
+    | undefined {
+    return undefined;
   }
 
   async initializeQueryBuilderState(): Promise<QueryBuilderState> {
@@ -232,81 +210,8 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     queryBuilderState.setExecutionContext(executionContext);
     await queryBuilderState.propagateExecutionContextChange(true);
 
-    let defaultParameters: Map<string, ValueSpecification> | undefined =
-      undefined;
-    const processedQueryParamValues = processQueryParameters(
-      query,
-      undefined,
-      this.urlQueryParamValues,
-      this.graphManagerState,
-    );
-    if (processedQueryParamValues?.size) {
-      try {
-        defaultParameters =
-          await this.graphManagerState.graphManager.pureCodeToValueSpecifications(
-            processedQueryParamValues,
-            this.graphManagerState.graph,
-          );
-      } catch (error) {
-        assertErrorThrown(error);
-        this.applicationStore.logService.error(
-          LogEvent.create(LEGEND_QUERY_APP_EVENT.GENERIC_FAILURE),
-          `Error resolving preset query param values: ${error.message}`,
-        );
-      }
-    }
+    const defaultParameters = await this.resolveDefaultParameters(query);
     queryBuilderState.initializeWithQuery(query, defaultParameters);
     return queryBuilderState;
   }
-
-  getPersistConfiguration(
-    lambda: RawLambda,
-    options?: { update?: boolean | undefined },
-  ): QueryPersistConfiguration {
-    return {
-      defaultName: options?.update
-        ? `${extractElementNameFromPath(this.dataSpacePath)}`
-        : `New Query for ${extractElementNameFromPath(this.dataSpacePath)}[${
-            this.templateQueryId
-          }]`,
-      decorator: (query: Query): void => {
-        query.id = uuid();
-        query.groupId = this.groupId;
-        query.artifactId = this.artifactId;
-        query.versionId = this.versionId;
-        if (this.queryBuilderState?.sourceClass) {
-          query.taggedValues = [
-            createQueryClassTaggedValue(
-              this.queryBuilderState.sourceClass.path,
-            ),
-          ];
-        }
-      },
-    };
-  }
-
-  override decorateSearchSpecification(
-    val: QuerySearchSpecification,
-  ): QuerySearchSpecification {
-    const currentProjectCoordinates = new QueryProjectCoordinates();
-    currentProjectCoordinates.groupId = this.groupId;
-    currentProjectCoordinates.artifactId = this.artifactId;
-    val.projectCoordinates = [
-      // either get queries for the current project
-      currentProjectCoordinates,
-      // or any of its dependencies
-      ...Array.from(
-        this.graphManagerState.graph.dependencyManager.projectDependencyModelsIndex.keys(),
-      ).map((dependencyKey) => {
-        const { groupId, artifactId } = parseGACoordinates(dependencyKey);
-        const coordinates = new QueryProjectCoordinates();
-        coordinates.groupId = groupId;
-        coordinates.artifactId = artifactId;
-        return coordinates;
-      }),
-    ];
-    val.taggedValues = [createQueryDataSpaceTaggedValue(this.dataSpacePath)];
-    val.combineTaggedValuesCondition = true;
-    return val;
-  }
 }

package/tsconfig.json

@@ -67,6 +67,7 @@
     "./src/components/data-product/QueryDataProductUtil.ts",
     "./src/components/data-space/QueryDataSpaceUtil.ts",
     "./src/components/utils/QueryParameterUtils.ts",
+    "./src/stores/BaseTemplateQueryCreatorStore.ts",
     "./src/stores/CloneServiceQuerySetupStore.ts",
     "./src/stores/CreateMappingQuerySetupStore.ts",
     "./src/stores/EditExistingQuerySetupStore.ts",
@@ -78,6 +79,7 @@
     "./src/stores/UpdateExistingServiceQuerySetupStore.ts",
     "./src/stores/__test-utils__/LegendQueryApplicationTestUtils.ts",
     "./src/stores/data-cube/ExistingQueryDataCubeViewer.ts",
+    "./src/stores/data-product/DataProductSampleQueryCreatorStore.ts",
     "./src/stores/data-product/query-builder/DataProductArtifactHelper.ts",
     "./src/stores/data-product/query-builder/LegendQueryDataProductQueryBuilderState.ts",
     "./src/stores/data-space/DataProductQueryCreatorStore.ts",
@@ -105,6 +107,8 @@
     "./src/components/data-cube/ExistingQueryDataCubeViewer.tsx",
     "./src/components/data-cube/ExistingQueryEditorStoreProviderProvider.tsx",
     "./src/components/data-product/DataProductInfo.tsx",
+    "./src/components/data-product/DataProductSampleQueryCreator.tsx",
+    "./src/components/data-product/DataProductSampleQueryPanel.tsx",
     "./src/components/data-product/LegendQueryDataProductQueryBuilder.tsx",
     "./src/components/data-space/DataProductQueryCreator.tsx",
     "./src/components/data-space/DataSpaceInfo.tsx",