@finos/legend-application-query 13.8.6 → 13.8.8

package/src/stores/QueryEditorStore.ts

@@ -1231,7 +1231,11 @@ export abstract class QueryEditorStore {
       sourceInfo,
     );
     // Pass pre-resolved state to avoid double-resolution
-    queryBuilderState.initWithDataProduct(dataProduct, resolvedState);
+    queryBuilderState.initWithDataProduct(
+      dataProduct,
+      undefined,
+      resolvedState,
+    );
 
     // 7. Wire in mapping coverage result
     const mappingCoverageResult =
@@ -1252,7 +1256,9 @@ export abstract class QueryEditorStore {
             execValue,
             queryBuilderState,
           ).withAdhocRuntime();
-    queryBuilderState.changeMapping(queryBuilderState.executionState.mapping);
+    if (queryBuilderState.executionState.mapping) {
+      queryBuilderState.changeMapping(queryBuilderState.executionState.mapping);
+    }
     queryBuilderState.changeRuntime(
       new RuntimePointer(
         PackageableElementExplicitReference.create(packageableRuntime),

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

@@ -33,15 +33,6 @@ export const resolveDefaultDataProductAccessType = (
       id: modelAcessGroup.id,
     };
   }
-
-  // const native =
-  //   dataProductArtifact.nativeModelAccess?.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.`,
   );

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

@@ -512,7 +512,7 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
 
     // set class if already chosen
     if (queryableDataSpace.classPath) {
-      queryBuilderState.changeClass(
+      queryBuilderState.changeSourceElement(
         this.graphManagerState.graph.getClass(queryableDataSpace.classPath),
       );
     }
@@ -661,9 +661,11 @@ export class DataProductQueryCreatorStore extends QueryEditorStore {
           query.artifactId = element.artifactId;
           query.versionId = element.versionId;
           const taggedValues = [];
-          if (this.queryBuilderState?.class) {
+          if (this.queryBuilderState?.sourceClass) {
             taggedValues.push(
-              createQueryClassTaggedValue(this.queryBuilderState.class.path),
+              createQueryClassTaggedValue(
+                this.queryBuilderState.sourceClass.path,
+              ),
             );
           }
           if (element instanceof QueryableDataProduct) {

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

@@ -274,9 +274,11 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
         query.groupId = this.groupId;
         query.artifactId = this.artifactId;
         query.versionId = this.versionId;
-        if (this.queryBuilderState?.class) {
+        if (this.queryBuilderState?.sourceClass) {
           query.taggedValues = [
-            createQueryClassTaggedValue(this.queryBuilderState.class.path),
+            createQueryClassTaggedValue(
+              this.queryBuilderState.sourceClass.path,
+            ),
           ];
         }
       },

package/src/stores/data-space/query-builder/LegendQueryDataSpaceQueryBuilderState.ts

@@ -187,7 +187,7 @@ export class LegendQueryDataSpaceQueryBuilderState extends DataSpaceQueryBuilder
         dataSpace.path,
         executionContext.name,
         runtimePath,
-        this.class?.path,
+        this.sourceClass?.path,
       );
     }
     const route =