@finos/legend-extension-dsl-data-space 10.1.96 → 10.2.1

package/src/stores/query/DataSpaceTemplateQueryCreatorStore.ts

@@ -29,7 +29,6 @@ import {
 import {
   type DepotServerClient,
   StoreProjectData,
-  LATEST_VERSION_ALIAS,
 } from '@finos/legend-server-depot';
 import { filterByType, guaranteeNonNullable, uuid } from '@finos/legend-shared';
 
@@ -58,7 +57,8 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
   readonly artifactId: string;
   readonly versionId: string;
   readonly dataSpacePath: string;
-  readonly templateQueryTitle: string;
+  readonly templateQueryId: string;
+  templateQueryTitle?: string;
 
   constructor(
     applicationStore: LegendQueryApplicationStore,
@@ -67,7 +67,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     artifactId: string,
     versionId: string,
     dataSpacePath: string,
-    templateQueryTitle: string,
+    templateQueryId: string,
   ) {
     super(applicationStore, depotServerClient);
 
@@ -75,7 +75,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     this.artifactId = artifactId;
     this.versionId = versionId;
     this.dataSpacePath = dataSpacePath;
-    this.templateQueryTitle = templateQueryTitle;
+    this.templateQueryId = templateQueryId;
   }
 
   getProjectInfo(): ProjectGAVCoordinates {
@@ -94,8 +94,8 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
     const dataSpaceExecutableTemplate = guaranteeNonNullable(
       dataSpace.executables
         ?.filter(filterByType(DataSpaceExecutableTemplate))
-        .find((executable) => executable.title === this.templateQueryTitle),
-      `Can't find template query with title '${this.templateQueryTitle}'`,
+        .find((executable) => executable.id === this.templateQueryId),
+      `Can't find template query with id '${this.templateQueryId}'`,
     );
     const executionContext = guaranteeNonNullable(
       dataSpaceExecutableTemplate.executionContextKey
@@ -105,7 +105,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
         : dataSpace.defaultExecutionContext,
       `Can't find execution context '${dataSpaceExecutableTemplate.executionContextKey}'`,
     );
-
+    this.templateQueryTitle = dataSpaceExecutableTemplate.title;
     let dataSpaceAnalysisResult;
     try {
       const project = StoreProjectData.serialization.fromJson(
@@ -147,21 +147,9 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
       dataSpace,
       executionContext,
       (dataSpaceInfo: DataSpaceInfo) => {
-        if (dataSpaceInfo.defaultExecutionContext) {
-          this.applicationStore.navigationService.navigator.goToLocation(
-            generateDataSpaceTemplateQueryCreatorRoute(
-              guaranteeNonNullable(dataSpaceInfo.groupId),
-              guaranteeNonNullable(dataSpaceInfo.artifactId),
-              LATEST_VERSION_ALIAS, //always default to latest
-              dataSpaceInfo.path,
-              this.templateQueryTitle,
-            ),
-          );
-        } else {
-          this.applicationStore.notificationService.notifyWarning(
-            `Can't switch data space: default execution context not specified`,
-          );
-        }
+        this.applicationStore.notificationService.notifyWarning(
+          `Can't switch data space to visit current template query`,
+        );
       },
       true,
       dataSpaceAnalysisResult,
@@ -172,7 +160,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
             this.artifactId,
             this.versionId,
             dataSpace.path,
-            this.templateQueryTitle,
+            this.templateQueryId,
           ),
         );
       },
@@ -196,7 +184,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
       defaultName: options?.update
         ? `${extractElementNameFromPath(this.dataSpacePath)}`
         : `New Query for ${extractElementNameFromPath(this.dataSpacePath)}[${
-            this.templateQueryTitle
+            this.templateQueryId
           }]`,
       decorator: (query: Query): void => {
         query.id = uuid();