@finos/legend-extension-dsl-data-space 10.1.17 → 10.1.18

package/src/stores/query/DataSpaceQueryCreatorStore.ts

@@ -46,7 +46,10 @@ import {
   QUERY_PROFILE_TAG_DATA_SPACE,
 } from '../../graph/DSL_DataSpace_MetaModelConst.js';
 import { getDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
-import { DataSpaceQueryBuilderState } from './DataSpaceQueryBuilderState.js';
+import {
+  DataSpaceQueryBuilderState,
+  DataSpaceProjectInfo,
+} from './DataSpaceQueryBuilderState.js';
 import type { DataSpaceInfo } from './DataSpaceInfo.js';
 import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
 import type { DataSpaceExecutionContext } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
@@ -143,12 +146,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
     } catch {
       // do nothing
     }
-    const queryBuilderState = new DataSpaceQueryBuilderState(
-      this.applicationStore,
-      this.graphManagerState,
-      this.depotServerClient,
-      dataSpace,
-      executionContext,
+    const projectInfo = new DataSpaceProjectInfo(
       this.groupId,
       this.artifactId,
       this.versionId,
@@ -157,13 +155,20 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
         this.applicationStore,
         this.depotServerClient,
       ),
+    );
+    const queryBuilderState = new DataSpaceQueryBuilderState(
+      this.applicationStore,
+      this.graphManagerState,
+      this.depotServerClient,
+      dataSpace,
+      executionContext,
       (dataSpaceInfo: DataSpaceInfo) => {
         if (dataSpaceInfo.defaultExecutionContext) {
           this.applicationStore.navigationService.navigator.goToLocation(
             generateDataSpaceQueryCreatorRoute(
-              dataSpaceInfo.groupId,
-              dataSpaceInfo.artifactId,
-              dataSpaceInfo.versionId,
+              guaranteeNonNullable(dataSpaceInfo.groupId),
+              guaranteeNonNullable(dataSpaceInfo.artifactId),
+              guaranteeNonNullable(dataSpaceInfo.versionId),
               dataSpaceInfo.path,
               dataSpaceInfo.defaultExecutionContext,
               undefined,
@@ -176,6 +181,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
           );
         }
       },
+      true,
       dataSpaceAnalysisResult,
       (ec: DataSpaceExecutionContext) => {
         // runtime should already be set
@@ -202,9 +208,9 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
         const runtimePointer = guaranteeType(runtimeValue, RuntimePointer);
         queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateDataSpaceQueryCreatorRoute(
-            queryBuilderState.groupId,
-            queryBuilderState.artifactId,
-            queryBuilderState.versionId,
+            guaranteeNonNullable(queryBuilderState.projectInfo).groupId,
+            guaranteeNonNullable(queryBuilderState.projectInfo).artifactId,
+            guaranteeNonNullable(queryBuilderState.projectInfo).versionId,
             queryBuilderState.dataSpace.path,
             queryBuilderState.executionContext.name,
             runtimePointer.packageableRuntime.value ===
@@ -223,9 +229,9 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
         );
         queryBuilderState.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateDataSpaceQueryCreatorRoute(
-            queryBuilderState.groupId,
-            queryBuilderState.artifactId,
-            queryBuilderState.versionId,
+            guaranteeNonNullable(queryBuilderState.projectInfo).groupId,
+            guaranteeNonNullable(queryBuilderState.projectInfo).artifactId,
+            guaranteeNonNullable(queryBuilderState.projectInfo).versionId,
             queryBuilderState.dataSpace.path,
             queryBuilderState.executionContext.name,
             runtimePointer.packageableRuntime.value ===
@@ -236,6 +242,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
           ),
         );
       },
+      projectInfo,
     );
     queryBuilderState.setExecutionContext(executionContext);
     queryBuilderState.propagateExecutionContextChange(executionContext);

package/src/stores/query/DataSpaceQuerySetupStore.ts

@@ -37,6 +37,7 @@ import type { ProjectGAVCoordinates } from '@finos/legend-storage';
 import {
   ActionState,
   assertErrorThrown,
+  guaranteeNonNullable,
   UnsupportedOperationError,
   type GeneratorFn,
 } from '@finos/legend-shared';
@@ -175,9 +176,9 @@ export class DataSpaceQuerySetupStore extends QueryEditorStore {
         if (dataSpaceInfo.defaultExecutionContext) {
           this.applicationStore.navigationService.navigator.goToLocation(
             generateDataSpaceQueryCreatorRoute(
-              dataSpaceInfo.groupId,
-              dataSpaceInfo.artifactId,
-              dataSpaceInfo.versionId,
+              guaranteeNonNullable(dataSpaceInfo.groupId),
+              guaranteeNonNullable(dataSpaceInfo.artifactId),
+              guaranteeNonNullable(dataSpaceInfo.versionId),
               dataSpaceInfo.path,
               dataSpaceInfo.defaultExecutionContext,
               undefined,

package/tsconfig.json

@@ -96,6 +96,7 @@
     "./src/components/query/DataSpaceQuerySetup.tsx",
     "./src/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.tsx",
     "./src/components/studio/DataSpacePreviewAction.tsx",
+    "./src/components/studio/DataSpaceQueryAction.tsx",
     "./src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_SystemModels.json"
   ],
   "include": [