@finos/legend-extension-dsl-data-space 6.0.0 → 6.1.2

package/src/graphManager/protocol/pure/v1/V1_DSLDataSpace_PureGraphManagerExtension.ts

@@ -27,6 +27,7 @@ import {
   V1_PureModelContextType,
   V1_PackageableRuntime,
   V1_EngineRuntime,
+  V1_Class,
 } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-storage';
 import {
@@ -34,6 +35,7 @@ import {
   guaranteeNonEmptyString,
   guaranteeNonNullable,
   guaranteeType,
+  isNonNullable,
   uniq,
   type PlainObject,
 } from '@finos/legend-shared';
@@ -100,6 +102,7 @@ export class V1_DSLDataSpace_PureGraphManagerExtension extends DSLDataSpace_Pure
     result.name = analysisResult.name;
     result.package = analysisResult.package;
     result.path = analysisResult.path;
+    result.title = analysisResult.title;
     result.description = analysisResult.description;
 
     result.taggedValues = analysisResult.taggedValues.map((taggedValue) => {
@@ -177,8 +180,42 @@ export class V1_DSLDataSpace_PureGraphManagerExtension extends DSLDataSpace_Pure
     });
 
     // prepare the model context data
-    // scan for models coming from system so we don't duplicate them when building the graph
     const graphEntities = analysisResult.model.elements
+      // NOTE: this is a temporary hack to fix a problem with data space analytics
+      // where the classes for properties are not properly surveyed
+      // We need to wait for the actual fix in backend to be merged and released
+      // See https://github.com/finos/legend-engine/pull/836
+      .concat(
+        uniq(
+          analysisResult.model.elements.flatMap((element) => {
+            if (element instanceof V1_Class) {
+              return element.derivedProperties
+                .map((prop) => prop.returnType)
+                .concat(element.properties.map((prop) => prop.type));
+            }
+            return [];
+          }),
+        )
+          // make sure to not include types already returned by the analysis
+          .filter(
+            (path) =>
+              !analysisResult.model.elements
+                .map((el) => el.path)
+                .includes(path),
+          )
+          .map((path) => {
+            const [pkgPath, name] = resolvePackagePathAndElementName(path);
+            if (!pkgPath) {
+              // exclude package-less elements (i.e. primitive types)
+              return undefined;
+            }
+            const _class = new V1_Class();
+            _class.name = name;
+            _class.package = pkgPath;
+            return _class;
+          })
+          .filter(isNonNullable),
+      )
       .concat(mappingModels)
       .concat(runtimeModels)
       // NOTE: if an element could be found in the graph already it means it comes from system

package/src/graphManager/protocol/pure/v1/engine/analytics/V1_DataSpaceAnalysis.ts

@@ -79,6 +79,7 @@ export class V1_DataSpaceAnalysisResult {
   taggedValues: V1_DataSpaceTaggedValueInfo[] = [];
   stereotypes: V1_DataSpaceStereotypeInfo[] = [];
 
+  title?: string | undefined;
   description?: string | undefined;
   supportInfo?: V1_DataSpaceSupportInfo | undefined;
 
@@ -98,6 +99,7 @@ export class V1_DataSpaceAnalysisResult {
       taggedValues: list(object(V1_DataSpaceTaggedValueInfo)),
       stereotypes: list(object(V1_DataSpaceStereotypeInfo)),
 
+      title: optional(primitive()),
       description: optional(primitive()),
       supportInfo: optionalCustom(
         () => SKIP,

package/src/graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.ts

@@ -65,6 +65,7 @@ export class V1_DataSpace extends V1_PackageableElement implements Hashable {
   executionContexts!: V1_DataSpaceExecutionContext[];
   defaultExecutionContext!: string;
   featuredDiagrams?: V1_PackageableElementPointer[] | undefined;
+  title?: string | undefined;
   description?: string | undefined;
   supportInfo?: V1_DataSpaceSupportInfo | undefined;
 
@@ -76,6 +77,7 @@ export class V1_DataSpace extends V1_PackageableElement implements Hashable {
       hashArray(this.executionContexts),
       this.defaultExecutionContext,
       hashArray((this.featuredDiagrams ?? []).map((pointer) => pointer.path)),
+      this.title ?? '',
       this.description ?? '',
       this.supportInfo ?? '',
     ]);

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts

@@ -157,4 +157,5 @@ export const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
         skipIfEmpty: false,
       }),
   ),
+  title: optional(primitive()),
 });

package/src/stores/DataSpaceViewerState.ts

@@ -37,7 +37,7 @@ export enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
   ENTITLEMENT = 'ENTITLEMENT',
   TEST_DATA = 'TEST_DATA',
   TEST_COVERAGE = 'TEST_COVERAGE',
-  TAGS = 'TAGS',
+  INFO = 'INFO',
   SUPPORT = 'SUPPORT',
 }
 

package/src/stores/query/DataSpaceQueryEditorStore.ts

@@ -111,15 +111,17 @@ export class DataSpaceQueryEditorStore extends QueryEditorStore {
     );
 
     if (this.classPath) {
-      this.queryBuilderState.querySetupState._class =
-        this.queryBuilderState.graphManagerState.graph.getClass(this.classPath);
+      this.queryBuilderState.changeClass(
+        this.queryBuilderState.graphManagerState.graph.getClass(this.classPath),
+      );
       this.queryBuilderState.querySetupState.setClassIsReadOnly(true);
-    }
-    // TODO?: should we set the class here automatically?
+    } else {
+      // TODO?: should we set the class here automatically?
 
-    // initialize query builder state after setting up
-    this.queryBuilderState.resetQueryBuilder();
-    this.queryBuilderState.resetQuerySetup();
+      // initialize query builder state after setting up
+      this.queryBuilderState.resetQueryBuilder();
+      this.queryBuilderState.resetQuerySetup();
+    }
   }
 
   async getExportConfiguration(): Promise<QueryExportConfiguration> {

package/src/stores/query/DataSpaceQuerySetupState.ts

@@ -16,7 +16,7 @@
 
 import type { ClassView } from '@finos/legend-extension-dsl-diagram';
 import type { Class } from '@finos/legend-graph';
-import type { Entity } from '@finos/legend-storage';
+import { type Entity, extractEntityNameFromPath } from '@finos/legend-storage';
 import {
   type QuerySetupStore,
   QuerySetupState,
@@ -33,6 +33,7 @@ import {
   type PlainObject,
   ActionState,
   assertErrorThrown,
+  isString,
 } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
 import type { DataSpaceAnalysisResult } from '../../graphManager/action/analytics/DataSpaceAnalysis.js';
@@ -45,6 +46,8 @@ export interface DataSpaceContext {
   groupId: string;
   artifactId: string;
   versionId: string;
+  title: string | undefined;
+  name: string;
   path: string;
 }
 
@@ -107,6 +110,10 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
           ? SNAPSHOT_VERSION_ALIAS
           : storedEntity.versionId,
         path: storedEntity.entity.path,
+        name: extractEntityNameFromPath(storedEntity.entity.path),
+        title: isString(storedEntity.entity.content.title)
+          ? storedEntity.entity.content.title
+          : undefined,
       }));
       this.loadDataSpacesState.pass();
     } catch (error) {