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

package/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts

@@ -15,10 +15,12 @@
  */
 
 import {
+  type AbstractPureGraphManager,
+  type PureProtocolProcessorPlugin,
+  type RawLambda,
   PureModel,
   V1_PureGraphManager,
   PureClientVersion,
-  type AbstractPureGraphManager,
   CoreModel,
   SystemModel,
   V1_Mapping,
@@ -29,13 +31,16 @@ import {
   V1_Class,
   GRAPH_MANAGER_EVENT,
   V1_buildDatasetSpecification,
-  type PureProtocolProcessorPlugin,
   V1_buildModelCoverageAnalysisResult,
+  V1_deserializePackageableElement,
+  V1_transformRawLambda,
+  V1_GraphTransformerContextBuilder,
 } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-storage';
 import {
   ActionState,
   assertErrorThrown,
+  filterByType,
   guaranteeNonEmptyString,
   guaranteeNonNullable,
   guaranteeType,
@@ -49,8 +54,10 @@ import {
   DataSpaceSupportEmail,
 } from '../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
 import {
+  V1_DataSpace,
   V1_DataSpaceSupportCombinedInfo,
   V1_DataSpaceSupportEmail,
+  V1_DataSpaceTemplateExecutable,
 } from '../../../../graph-manager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
 import {
   DataSpaceAnalysisResult,
@@ -101,6 +108,62 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
     return PureClientVersion.V1_0_0;
   }
 
+  getDataSpaceProtocolFromEntity(dataSpaceEntity: Entity): V1_DataSpace {
+    return guaranteeType(
+      V1_deserializePackageableElement(
+        dataSpaceEntity.content,
+        this.graphManager.pluginManager.getPureProtocolProcessorPlugins(),
+      ),
+      V1_DataSpace,
+    );
+  }
+
+  IsTemplateQueryIdValid(dataSpaceEntity: Entity, id: string): boolean {
+    const dataSpaceProtocol =
+      this.getDataSpaceProtocolFromEntity(dataSpaceEntity);
+    return !dataSpaceProtocol.executables
+      ?.filter(filterByType(V1_DataSpaceTemplateExecutable))
+      .map((et) => et.id)
+      .includes(id);
+  }
+
+  async addNewExecutableToDataSpaceEntity(
+    dataSpaceEntity: Entity,
+    executable: {
+      id: string;
+      title: string;
+      mapping: string;
+      runtime: string;
+      query: RawLambda;
+      description?: string;
+    },
+  ): Promise<Entity> {
+    const dataSpaceProtocol =
+      this.getDataSpaceProtocolFromEntity(dataSpaceEntity);
+    const dataSpaceTemplateExecutable = new V1_DataSpaceTemplateExecutable();
+    dataSpaceTemplateExecutable.id = executable.id;
+    dataSpaceTemplateExecutable.title = executable.title;
+    dataSpaceTemplateExecutable.description = executable.description;
+    dataSpaceTemplateExecutable.executionContextKey = guaranteeNonNullable(
+      dataSpaceProtocol.executionContexts.filter(
+        (ec) =>
+          ec.mapping.path === executable.mapping &&
+          ec.defaultRuntime.path === executable.runtime,
+      )[0]?.name,
+      'can`t find a corresponding executatin key based on query`s mapping and runtime in dataspace',
+    );
+    dataSpaceTemplateExecutable.query = V1_transformRawLambda(
+      executable.query,
+      new V1_GraphTransformerContextBuilder(
+        this.graphManager.pluginManager.getPureProtocolProcessorPlugins(),
+      ).build(),
+    );
+    dataSpaceProtocol.executables = dataSpaceProtocol.executables
+      ? [...dataSpaceProtocol.executables, dataSpaceTemplateExecutable]
+      : [dataSpaceTemplateExecutable];
+    return this.graphManager.elementProtocolToEntity(dataSpaceProtocol);
+  }
+
   async analyzeDataSpace(
     dataSpacePath: string,
     entitiesRetriever: () => Promise<Entity[]>,
@@ -496,6 +559,7 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
           executableProtocol.info instanceof V1_DataSpaceTemplateExecutableInfo
         ) {
           const templateExecutableInfo = new DataSpaceTemplateExecutableInfo();
+          templateExecutableInfo.id = executableProtocol.info.id;
           templateExecutableInfo.query = executableProtocol.info.query;
           templateExecutableInfo.executionContextKey =
             executableProtocol.info.executionContextKey;

package/src/graph-manager/protocol/pure/v1/engine/analytics/V1_DataSpaceAnalysis.ts

@@ -254,6 +254,7 @@ const V1_DATA_SPACE_MULTI_EXECUTION_SERVICE_EXECUTABLE_INFO_TYPE =
   'multiExecutionService';
 
 export class V1_DataSpaceTemplateExecutableInfo extends V1_DataSpaceExecutableInfo {
+  id!: string;
   executionContextKey!: string;
 }
 
@@ -264,6 +265,7 @@ const V1_DataSpaceTemplateExecutableInfoModelSchema = (
     _type: usingConstantValueSchema(
       V1_DATA_SPACE_TEMPLATE_EXECUTABLE_INFO_TYPE,
     ),
+    id: primitive(),
     executionContextKey: primitive(),
   });
 

package/src/graph-manager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.ts

@@ -93,12 +93,14 @@ export class V1_DataSpaceTemplateExecutable
   extends V1_DataSpaceExecutable
   implements Hashable
 {
+  id!: string;
   query!: V1_RawLambda;
   executionContextKey?: string;
 
   override get hashCode(): string {
     return hashArray([
       DATA_SPACE_HASH_STRUCTURE.DATA_SPACE_TEMPLATE_EXECUTABLE,
+      this.id,
       this.title,
       this.description ?? '',
       this.query,

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/V1_DSL_DataSpace_ProtocolHelper.ts

@@ -156,6 +156,7 @@ const V1_dataSpaceTemplateExecutableModelSchema = createModelSchema(
     _type: usingConstantValueSchema(V1_DATA_SPACE_TEMPLATE_EXECUTABLE),
     description: optional(primitive()),
     title: primitive(),
+    id: primitive(),
     query: usingModelSchema(V1_rawLambdaModelSchema),
     executionContextKey: optional(primitive()),
   },

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();