From dbff82bed58fa3b777f6bfa33081f722e7dd1bce Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Fri, 8 Jul 2022 13:48:01 +0300
Subject: [PATCH] fix(core-app): CB-2190 node parent id detection

---
 .../src/shared/NodesManager/NavNodeInfoResource.ts   |  4 ++--
 .../src/shared/NodesManager/NavTreeResource.ts       | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

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<string, NavNode> {
     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<string, string[]> {
           ...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<string, string[]> {
           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)),
         ]
       );