diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavNodeInfoResource.ts b/webapp/packages/core-app/src/shared/NodesManager/NavNodeInfoResource.ts index 97da5814fc..e712269972 100644 --- a/webapp/packages/core-app/src/shared/NodesManager/NavNodeInfoResource.ts +++ b/webapp/packages/core-app/src/shared/NodesManager/NavNodeInfoResource.ts @@ -129,11 +129,11 @@ export class NavNodeInfoResource extends CachedMapResource { return this.data; } - navNodeInfoToNavNode(node: NavNodeInfo, parentId?: string): NavNode { + navNodeInfoToNavNode(node: NavNodeInfo, parentId?: string, requestPath?: string): NavNode { return { ...node, objectFeatures: node.object?.features || [], - parentId: parentId || this.get(node.id)?.parentId || ROOT_NODE_PATH, + parentId: parentId ?? this.get(node.id)?.parentId ?? requestPath ?? ROOT_NODE_PATH, }; } diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts b/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts index 5b30cc7b12..665f962e38 100644 --- a/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts +++ b/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts @@ -512,7 +512,11 @@ export class NavTreeResource extends CachedMapResource { ...data.map(data => data.parentPath), ...data.map(data => data.navNodeChildren.map(node => node.id)).flat(), ]), [ - ...data.map(data => this.navNodeInfoResource.navNodeInfoToNavNode(data.navNodeInfo)).flat(), + ...data.map(data => this.navNodeInfoResource.navNodeInfoToNavNode( + data.navNodeInfo, + undefined, + data.parentPath + )).flat(), ...data.map( data => data.navNodeChildren.map( node => this.navNodeInfoResource.navNodeInfoToNavNode(node, data.parentPath) @@ -537,7 +541,11 @@ export class NavTreeResource extends CachedMapResource { data.parentPath, ...data.navNodeChildren.map(node => node.id), ]), [ - this.navNodeInfoResource.navNodeInfoToNavNode(data.navNodeInfo), + this.navNodeInfoResource.navNodeInfoToNavNode( + data.navNodeInfo, + undefined, + data.parentPath + ), ...data.navNodeChildren.map(node => this.navNodeInfoResource.navNodeInfoToNavNode(node, data.parentPath)), ] );