@finos/legend-extension-dsl-data-space 3.0.4 → 4.0.2

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts

@@ -37,6 +37,7 @@ import {
   UnsupportedOperationError,
   usingConstantValueSchema,
   usingModelSchema,
+  optionalCustom,
 } from '@finos/legend-shared';
 import {
   type V1_DataSpaceSupportInfo,
@@ -96,11 +97,10 @@ const V1_deserializeSupportInfo = (
 
 export const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
   _type: usingConstantValueSchema(V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE),
-  artifactId: primitive(),
   defaultExecutionContext: primitive(),
   description: optional(primitive()),
   executionContexts: list(object(V1_dataSpaceExecutionContextModelSchema)),
-  featuredDiagrams: custom(
+  featuredDiagrams: optionalCustom(
     (values) =>
       serializeArray(
         values,
@@ -121,7 +121,6 @@ export const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
         },
       ),
   ),
-  groupId: primitive(),
   name: primitive(),
   package: primitive(),
   stereotypes: custom(
@@ -158,5 +157,4 @@ export const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
         skipIfEmpty: false,
       }),
   ),
-  versionId: primitive(),
 });

package/src/stores/DataSpaceViewerState.ts

@@ -28,9 +28,9 @@ import type {
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { action, computed, makeObservable, observable } from 'mobx';
 import type {
-  ResolvedDataSpace,
-  ResolvedDataSpaceExecutionContext,
-} from '../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+  DataSpace,
+  DataSpaceExecutionContext,
+} from '../models/metamodels/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
 
 export enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
   MODELS_OVERVIEW = 'MODELS_OVERVIEW',
@@ -44,14 +44,14 @@ export enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
 
 export class DataSpaceViewerState {
   graphManagerState: GraphManagerState;
-  dataSpaceGroupId: string;
-  dataSpaceArtifactId: string;
-  dataSpaceVersionId: string;
-  dataSpace: ResolvedDataSpace;
+  groupId: string;
+  artifactId: string;
+  versionId: string;
+  dataSpace: DataSpace;
   _renderer?: DiagramRenderer | undefined;
   currentDiagram?: Diagram | undefined;
   currentActivity = DATA_SPACE_VIEWER_ACTIVITY_MODE.MODELS_OVERVIEW;
-  currentExecutionContext: ResolvedDataSpaceExecutionContext;
+  currentExecutionContext: DataSpaceExecutionContext;
   currentRuntime: PackageableRuntime;
   viewProject?:
     | ((
@@ -65,10 +65,10 @@ export class DataSpaceViewerState {
 
   constructor(
     graphManagerState: GraphManagerState,
-    dataSpaceGroupId: string,
-    dataSpaceArtifactId: string,
-    dataSpaceVersionId: string,
-    dataSpace: ResolvedDataSpace,
+    groupId: string,
+    artifactId: string,
+    versionId: string,
+    dataSpace: DataSpace,
     options?: {
       viewProject?: (
         groupId: string,
@@ -95,13 +95,13 @@ export class DataSpaceViewerState {
 
     this.graphManagerState = graphManagerState;
     this.dataSpace = dataSpace;
-    this.dataSpaceGroupId = dataSpaceGroupId;
-    this.dataSpaceArtifactId = dataSpaceArtifactId;
-    this.dataSpaceVersionId = dataSpaceVersionId;
+    this.groupId = groupId;
+    this.artifactId = artifactId;
+    this.versionId = versionId;
     this.currentExecutionContext = this.dataSpace.defaultExecutionContext;
     this.currentRuntime =
       this.dataSpace.defaultExecutionContext.defaultRuntime.value;
-    this.currentDiagram = this.dataSpace.featuredDiagrams.length
+    this.currentDiagram = this.dataSpace.featuredDiagrams?.length
       ? (
           this.dataSpace
             .featuredDiagrams[0] as PackageableElementReference<Diagram>
@@ -125,7 +125,7 @@ export class DataSpaceViewerState {
   }
 
   get featuredDiagrams(): Diagram[] {
-    return this.dataSpace.featuredDiagrams.map((ref) => ref.value);
+    return this.dataSpace.featuredDiagrams?.map((ref) => ref.value) ?? [];
   }
 
   get diagrams(): Diagram[] {
@@ -183,7 +183,7 @@ export class DataSpaceViewerState {
     this.currentActivity = val;
   }
 
-  setCurrentExecutionContext(val: ResolvedDataSpaceExecutionContext): void {
+  setCurrentExecutionContext(val: DataSpaceExecutionContext): void {
     this.currentExecutionContext = val;
     this.currentRuntime = val.defaultRuntime.value;
   }

package/src/stores/query/DataSpaceQuerySetupState.ts

@@ -16,7 +16,6 @@
 
 import type { ClassView } from '@finos/legend-extension-dsl-diagram';
 import { type Class, QueryTaggedValue } from '@finos/legend-graph';
-import type { Entity } from '@finos/legend-model-storage';
 import {
   type QuerySetupStore,
   CreateQueryInfoState,
@@ -25,7 +24,6 @@ import {
 } from '@finos/legend-query';
 import {
   type StoredEntity,
-  generateGAVCoordinates,
   DepotScope,
   ProjectData,
   SNAPSHOT_VERSION_ALIAS,
@@ -35,53 +33,37 @@ import {
   type PlainObject,
   ActionState,
   assertErrorThrown,
-  guaranteeNonNullable,
 } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import {
-  DATA_SPACE_ELEMENT_CLASSIFIER_PATH,
-  getResolvedDataSpace,
-} from '../../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+import { getDataSpace } from '../../graphManager/DSLDataSpace_GraphManagerHelper.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
 
-export type LightDataSpace = Entity & {
+export interface DataSpaceContext {
   groupId: string;
   artifactId: string;
   versionId: string;
   path: string;
-  content: {
-    groupId: string;
-    artifactId: string;
-    versionId: string;
-  };
-};
+}
 
 const QUERY_PROFILE_PATH = 'meta::pure::profiles::query';
 const QUERY_PROFILE_TAG_DATA_SPACE = 'dataSpace';
-const DATA_SPACE_ID_DELIMITER = '@';
 
 export const createQueryDataSpaceTaggedValue = (
   dataSpacePath: string,
-  groupId: string,
-  artifactId: string,
-  versionId: string,
 ): QueryTaggedValue => {
   const taggedValue = new QueryTaggedValue();
   taggedValue.profile = QUERY_PROFILE_PATH;
   taggedValue.tag = QUERY_PROFILE_TAG_DATA_SPACE;
-  taggedValue.value = `${generateGAVCoordinates(
-    groupId,
-    artifactId,
-    versionId,
-  )}${DATA_SPACE_ID_DELIMITER}${dataSpacePath}`;
+  taggedValue.value = dataSpacePath;
   return taggedValue;
 };
 
 export class DataSpaceQuerySetupState extends QuerySetupState {
-  dataSpaces: LightDataSpace[] = [];
+  dataSpaces: DataSpaceContext[] = [];
   loadDataSpacesState = ActionState.create();
   setUpDataSpaceState = ActionState.create();
-  currentDataSpace?: LightDataSpace | undefined;
+  currentDataSpace?: DataSpaceContext | undefined;
   dataSpaceViewerState?: DataSpaceViewerState | undefined;
   toGetSnapShot = false;
 
@@ -102,7 +84,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
     });
   }
 
-  setCurrentDataSpace(val: LightDataSpace | undefined): void {
+  setCurrentDataSpace(val: DataSpaceContext | undefined): void {
     this.currentDataSpace = val;
   }
 
@@ -134,33 +116,14 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
             limit: 10,
           },
         )) as StoredEntity[]
-      ).map(
-        (storedEntity) =>
-          ({
-            ...storedEntity.entity,
-            groupId: storedEntity.groupId,
-            artifactId: storedEntity.artifactId,
-            versionId: this.toGetSnapShot
-              ? SNAPSHOT_VERSION_ALIAS
-              : storedEntity.versionId,
-            path: storedEntity.entity.path,
-            content: {
-              ...storedEntity.entity.content,
-              groupId: guaranteeNonNullable(
-                storedEntity.entity.content.groupId,
-                `Data space 'groupId' field is missing`,
-              ),
-              artifactId: guaranteeNonNullable(
-                storedEntity.entity.content.artifactId,
-                `Data space 'artifactId' field is missing`,
-              ),
-              versionId: guaranteeNonNullable(
-                storedEntity.entity.content.versionId,
-                `Data space 'versionId' field is missing`,
-              ),
-            },
-          } as LightDataSpace),
-      );
+      ).map((storedEntity) => ({
+        groupId: storedEntity.groupId,
+        artifactId: storedEntity.artifactId,
+        versionId: this.toGetSnapShot
+          ? SNAPSHOT_VERSION_ALIAS
+          : storedEntity.versionId,
+        path: storedEntity.entity.path,
+      }));
       this.loadDataSpacesState.pass();
     } catch (error) {
       assertErrorThrown(error);
@@ -169,7 +132,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
     }
   }
 
-  *setUpDataSpace(dataSpace: LightDataSpace): GeneratorFn<void> {
+  *setUpDataSpace(dataSpace: DataSpaceContext): GeneratorFn<void> {
     if (this.queryStore.initState.isInInitialState) {
       yield flowResult(this.queryStore.initialize());
     } else if (this.queryStore.initState.isInProgress) {
@@ -180,25 +143,22 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
       const projectData = ProjectData.serialization.fromJson(
         (yield flowResult(
           this.queryStore.depotServerClient.getProject(
-            dataSpace.content.groupId,
-            dataSpace.content.artifactId,
+            dataSpace.groupId,
+            dataSpace.artifactId,
           ),
         )) as PlainObject<ProjectData>,
       );
 
       yield flowResult(
-        this.queryStore.buildGraph(projectData, dataSpace.content.versionId),
-      );
-      const resolvedDataSpace = getResolvedDataSpace(
-        dataSpace.content,
-        this.queryStore.graphManagerState.graph,
+        this.queryStore.buildGraph(projectData, dataSpace.versionId),
       );
+
       this.dataSpaceViewerState = new DataSpaceViewerState(
         this.queryStore.graphManagerState,
         dataSpace.groupId,
         dataSpace.artifactId,
         dataSpace.versionId,
-        resolvedDataSpace,
+        getDataSpace(dataSpace.path, this.queryStore.graphManagerState.graph),
         {
           viewProject: (
             groupId: string,
@@ -230,32 +190,29 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
       const projectData = ProjectData.serialization.fromJson(
         (yield flowResult(
           this.queryStore.depotServerClient.getProject(
-            this.dataSpaceViewerState.dataSpace.groupId,
-            this.dataSpaceViewerState.dataSpace.artifactId,
+            this.dataSpaceViewerState.groupId,
+            this.dataSpaceViewerState.artifactId,
           ),
         )) as PlainObject<ProjectData>,
       );
       const queryInfoState = new CreateQueryInfoState(
         this.queryStore,
         projectData,
-        this.dataSpaceViewerState.dataSpace.versionId,
+        this.dataSpaceViewerState.versionId,
         this.dataSpaceViewerState.currentExecutionContext.mapping.value,
         this.dataSpaceViewerState.currentRuntime,
       );
       queryInfoState.taggedValues = [
         createQueryDataSpaceTaggedValue(
           this.dataSpaceViewerState.dataSpace.path,
-          this.dataSpaceViewerState.dataSpaceGroupId,
-          this.dataSpaceViewerState.dataSpaceArtifactId,
-          this.dataSpaceViewerState.dataSpaceVersionId,
         ),
       ];
       this.queryStore.setQueryInfoState(queryInfoState);
       this.queryStore.applicationStore.navigator.goTo(
         generateCreateQueryRoute(
-          this.dataSpaceViewerState.dataSpace.groupId,
-          this.dataSpaceViewerState.dataSpace.artifactId,
-          this.dataSpaceViewerState.dataSpace.versionId,
+          this.dataSpaceViewerState.groupId,
+          this.dataSpaceViewerState.artifactId,
+          this.dataSpaceViewerState.versionId,
           this.dataSpaceViewerState.currentExecutionContext.mapping.value.path,
           this.dataSpaceViewerState.currentRuntime.path,
           _class?.path,