From a699d7f875189aa6dc81fc01d3ada5a0fc35c1be Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Sun, 14 Jun 2020 13:57:43 +0300
Subject: [PATCH] fix(core): connection info access

---
 .../NavigationTree/NavigationTreeNode/useNavigationTree.ts   | 4 +++-
 .../core/src/app/NavigationTree/NavigationTreeService.ts     | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/core/src/app/NavigationTree/NavigationTreeNode/useNavigationTree.ts b/webapp/packages/core/src/app/NavigationTree/NavigationTreeNode/useNavigationTree.ts
index 1985355b02..90df0fe399 100644
--- a/webapp/packages/core/src/app/NavigationTree/NavigationTreeNode/useNavigationTree.ts
+++ b/webapp/packages/core/src/app/NavigationTree/NavigationTreeNode/useNavigationTree.ts
@@ -15,6 +15,7 @@ import { useConnectionInfo } from '../../shared/ConnectionsManager/useConnection
 import { NavNode } from '../../shared/NodesManager/EntityTypes';
 import { EObjectFeature } from '../../shared/NodesManager/EObjectFeature';
 import { NavNodeManagerService } from '../../shared/NodesManager/NavNodeManagerService';
+import { NodeManagerUtils } from '../../shared/NodesManager/NodeManagerUtils';
 import { useNode } from '../../shared/NodesManager/useNode';
 import { useChildren } from '../../shared/useChildren';
 import { NavigationTreeService } from '../NavigationTreeService';
@@ -37,7 +38,8 @@ export function useNavigationTree(nodeId: string, parentId: string) {
   let isExpandedFiltered = isExpanded;
 
   if (node.objectFeatures.includes(EObjectFeature.dataSource)) {
-    const { connectionInfo } = useConnectionInfo(nodeId);
+    const connectionId = NodeManagerUtils.connectionNodeIdToConnectionId(nodeId);
+    const { connectionInfo } = useConnectionInfo(connectionId);
     if (!connectionInfo?.features.includes(EConnectionFeature.connected)) {
       isExpandedFiltered = false;
     }
diff --git a/webapp/packages/core/src/app/NavigationTree/NavigationTreeService.ts b/webapp/packages/core/src/app/NavigationTree/NavigationTreeService.ts
index d8a5bb83d3..a065295886 100644
--- a/webapp/packages/core/src/app/NavigationTree/NavigationTreeService.ts
+++ b/webapp/packages/core/src/app/NavigationTree/NavigationTreeService.ts
@@ -15,6 +15,7 @@ import { NotificationService } from '@dbeaver/core/eventsLog';
 import { ConnectionsManagerService } from '../shared/ConnectionsManager/ConnectionsManagerService';
 import { EObjectFeature } from '../shared/NodesManager/EObjectFeature';
 import { NavNodeManagerService, ROOT_NODE_PATH } from '../shared/NodesManager/NavNodeManagerService';
+import { NodeManagerUtils } from '../shared/NodesManager/NodeManagerUtils';
 
 @injectable()
 export class NavigationTreeService {
@@ -38,7 +39,9 @@ export class NavigationTreeService {
       const node = this.navNodeManagerService.getNode(id);
 
       if (node?.objectFeatures.includes(EObjectFeature.dataSource)) {
-        await this.connectionsManagerService.refreshConnectionInfoAsync(id);
+        await this.connectionsManagerService.refreshConnectionInfoAsync(
+          NodeManagerUtils.connectionNodeIdToConnectionId(id)
+        );
       }
       return true;
     } catch (exception) {