@finos/legend-extension-dsl-data-space 1.0.2 → 1.0.7

package/src/models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.ts

@@ -21,8 +21,8 @@ import {
   V1_DataSpaceExecutionContext,
   V1_DataSpaceSupportEmail,
 } from './v1/model/packageableElements/dataSpace/V1_DataSpace';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   uuid,
   guaranteeNonEmptyString,
   guaranteeNonNullable,
@@ -36,30 +36,27 @@ import {
   V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE,
 } from './v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper';
 import { getDataSpace } from '../../../graphManager/DSLDataSpace_GraphManagerHelper';
-import type { DataSpaceSupportInfo } from '../../metamodels/pure/model/packageableElements/dataSpace/DataSpace';
 import {
+  type DataSpaceSupportInfo,
   DataSpace,
   DataSpaceExecutionContext,
   DataSpaceSupportEmail,
 } from '../../metamodels/pure/model/packageableElements/dataSpace/DataSpace';
-import type {
-  GraphPluginManager,
-  Mapping,
-  PackageableElement,
-  PackageableElementReference,
-  PackageableRuntime,
-  PureModel,
-  V1_ElementProtocolClassifierPathGetter,
-  V1_ElementProtocolDeserializer,
-  V1_ElementProtocolSerializer,
-  V1_ElementTransformer,
-  V1_GraphBuilderContext,
-  V1_GraphTransformerContext,
-  V1_PackageableElement,
-  V1_PureModelContextData,
-  V1_TaggedValue,
-} from '@finos/legend-graph';
 import {
+  type Mapping,
+  type PackageableElement,
+  type PackageableElementReference,
+  type PackageableRuntime,
+  type PureModel,
+  type V1_ElementProtocolClassifierPathGetter,
+  type V1_ElementProtocolDeserializer,
+  type V1_ElementProtocolSerializer,
+  type V1_ElementTransformer,
+  type V1_GraphBuilderContext,
+  type V1_GraphTransformerContext,
+  type V1_PackageableElement,
+  type V1_PureModelContextData,
+  type V1_TaggedValue,
   V1_taggedValueSchema,
   PackageableElementExplicitReference,
   V1_PackageableElementPointer,
@@ -88,10 +85,6 @@ export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProces
     );
   }
 
-  install(pluginManager: GraphPluginManager): void {
-    pluginManager.registerPureProtocolProcessorPlugin(this);
-  }
-
   override V1_getExtraElementBuilders(): V1_ElementBuilder<V1_PackageableElement>[] {
     return [
       new V1_ElementBuilder<V1_DataSpace>({

package/src/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DataSpace.ts

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { DATA_SPACE_HASH_STRUCTURE } from '../../../../../../DSLDataSpace_ModelUtils';
-import type {
-  V1_PackageableElementPointer,
-  V1_PackageableElementVisitor,
-  V1_StereotypePtr,
-  V1_TaggedValue,
+import {
+  V1_PackageableElement,
+  type V1_PackageableElementPointer,
+  type V1_PackageableElementVisitor,
+  type V1_StereotypePtr,
+  type V1_TaggedValue,
 } from '@finos/legend-graph';
-import { V1_PackageableElement } from '@finos/legend-graph';
 
 export abstract class V1_DataSpaceSupportInfo implements Hashable {
   abstract get hashCode(): string;

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

@@ -25,22 +25,22 @@ import {
   serialize,
   SKIP,
 } from 'serializr';
-import type { V1_StereotypePtr } from '@finos/legend-graph';
 import {
+  type V1_StereotypePtr,
   V1_stereotypePtrSchema,
   V1_taggedValueSchema,
   V1_packageableElementPointerDeserializerSchema,
 } from '@finos/legend-graph';
-import type { PlainObject } from '@finos/legend-shared';
 import {
+  type PlainObject,
   deserializeArray,
   serializeArray,
   UnsupportedOperationError,
   usingConstantValueSchema,
   usingModelSchema,
 } from '@finos/legend-shared';
-import type { V1_DataSpaceSupportInfo } from '../../model/packageableElements/dataSpace/V1_DataSpace';
 import {
+  type V1_DataSpaceSupportInfo,
   V1_DataSpace,
   V1_DataSpaceExecutionContext,
   V1_DataSpaceSupportEmail,

package/src/stores/DataSpaceViewerState.ts

@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-import type {
-  ClassView,
-  DiagramRenderer,
-} from '@finos/legend-extension-dsl-diagram';
 import {
+  type ClassView,
+  type DiagramRenderer,
   Diagram,
   DIAGRAM_INTERACTION_MODE,
 } from '@finos/legend-extension-dsl-diagram';

package/src/stores/query/DataSpaceQuerySetupState.ts

@@ -15,22 +15,24 @@
  */
 
 import type { ClassView } from '@finos/legend-extension-dsl-diagram';
-import type { Class } from '@finos/legend-graph';
+import { type Class, QueryTaggedValue } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-model-storage';
-import type { QuerySetupStore } from '@finos/legend-query';
 import {
+  type QuerySetupStore,
   CreateQueryInfoState,
   QuerySetupState,
   generateCreateQueryRoute,
 } from '@finos/legend-query';
-import type { StoredEntity } from '@finos/legend-server-depot';
 import {
+  type StoredEntity,
+  generateGAVCoordinates,
   DepotScope,
   ProjectData,
   SNAPSHOT_VERSION_ALIAS,
 } from '@finos/legend-server-depot';
-import type { GeneratorFn, PlainObject } from '@finos/legend-shared';
 import {
+  type GeneratorFn,
+  type PlainObject,
   ActionState,
   assertErrorThrown,
   guaranteeNonNullable,
@@ -54,10 +56,32 @@ export type LightDataSpace = Entity & {
   };
 };
 
+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}`;
+  return taggedValue;
+};
+
 export class DataSpaceQuerySetupState extends QuerySetupState {
   dataSpaces: LightDataSpace[] = [];
   loadDataSpacesState = ActionState.create();
   setUpDataSpaceState = ActionState.create();
+  setUpDataSpaceStatusText?: string | undefined;
   currentDataSpace?: LightDataSpace | undefined;
   dataSpaceViewerState?: DataSpaceViewerState | undefined;
   toGetSnapShot = false;
@@ -69,6 +93,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
       dataSpaces: observable,
       currentDataSpace: observable.ref,
       dataSpaceViewerState: observable,
+      setUpDataSpaceStatusText: observable,
       toGetSnapShot: observable,
       setCurrentDataSpace: action,
       setDataSpaceViewerState: action,
@@ -154,6 +179,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
     }
     this.setUpDataSpaceState.inProgress();
     try {
+      this.setUpDataSpaceStatusText = `Fetching information for data space...`;
       const projectData = ProjectData.serialization.fromJson(
         (yield flowResult(
           this.queryStore.depotServerClient.getProject(
@@ -162,6 +188,8 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
           ),
         )) as PlainObject<ProjectData>,
       );
+
+      this.setUpDataSpaceStatusText = `Building graph...`;
       yield flowResult(
         this.queryStore.buildGraph(projectData, dataSpace.content.versionId),
       );
@@ -198,6 +226,8 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
       assertErrorThrown(error);
       this.setUpDataSpaceState.fail();
       this.queryStore.applicationStore.notifyError(error);
+    } finally {
+      this.setUpDataSpaceStatusText = undefined;
     }
   }
 
@@ -218,7 +248,14 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
         this.dataSpaceViewerState.currentExecutionContext.mapping.value,
         this.dataSpaceViewerState.currentRuntime,
       );
-      queryInfoState.class = _class;
+      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(
@@ -227,6 +264,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
           this.dataSpaceViewerState.dataSpace.versionId,
           this.dataSpaceViewerState.currentExecutionContext.mapping.value.path,
           this.dataSpaceViewerState.currentRuntime.path,
+          _class?.path,
         ),
       );
       this.setupStore.setSetupState(undefined);