Fix rendering dependency funtions when loading using minimal graph

finos · Nov 22, 2024 · e0246e8 · e0246e8
1 parent da82302
commit e0246e8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.changeset/fluffy-camels-sparkle.md b/.changeset/fluffy-camels-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@finos/legend-extension-dsl-data-space': patch
+---
+
+Fix rendering dependency funtions when loading using minimal graph
diff --git a/.changeset/lovely-bulldogs-bake.md b/.changeset/lovely-bulldogs-bake.md
@@ -0,0 +1,3 @@
+---
+'@finos/legend-server-depot': patch
+---
diff --git a/...ta-space/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts b/...ta-space/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts
@@ -465,7 +465,7 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
     }
     if (dependencyFunctionInfos.length > 0) {
       const dependencyFunctionInfoMap = new Map<string, FunctionAnalysisInfo>();
-      functionInfos.forEach((funcInfo) => {
+      dependencyFunctionInfos.forEach((funcInfo) => {
         dependencyFunctionInfoMap.set(funcInfo.functionPath, funcInfo);
       });
       dataSpaceAnalysisResult.dependencyFunctionInfos =

diff --git a/packages/legend-server-depot/src/DepotEntityHelper.ts b/packages/legend-server-depot/src/DepotEntityHelper.ts
@@ -18,6 +18,7 @@ import type { StoreProjectData } from './models/StoreProjectData.js';
 import type { EntitiesWithOrigin, Entity } from '@finos/legend-storage';
 import type { DepotServerClient } from './DepotServerClient.js';
 import type { PlainObject } from '@finos/legend-shared';
+import type { ProjectVersionEntities } from './models/ProjectVersionEntities.js';
 
 export const retrieveProjectEntitiesWithDependencies = async (
   project: StoreProjectData,
@@ -45,7 +46,7 @@ export const retrieveProjectEntitiesWithClassifier = async (
 ): Promise<[PlainObject<Entity>[], PlainObject<Entity>[]]> => {
   const [entities, dependencyEntities]: [
     PlainObject<Entity>[],
-    PlainObject<Entity>[],
+    PlainObject<ProjectVersionEntities>[],
   ] = await Promise.all([
     depotServerClient.getEntities(project, versionId, classifier),
     depotServerClient.getDependencyEntities(
@@ -57,5 +58,9 @@ export const retrieveProjectEntitiesWithClassifier = async (
       classifier,
     ),
   ]);
-  return [entities, dependencyEntities];
+
+  return [
+    entities,
+    dependencyEntities.map((e) => e.entities).flat() as PlainObject<Entity>[],
+  ];
 };