From c4e437c3bfadf86d177a31b068b152f1c56f93ca Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Fri, 11 Sep 2020 00:04:11 +0300
Subject: [PATCH] chore(core-app): remove closeConnection nav type

---
 .../NodesManager/NavNodeManagerService.ts     |  3 +-
 .../src/DataViewerTabService.ts               |  3 --
 .../src/ObjectViewerTabService.ts             | 46 +++++++++----------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
index c52c715771..9edb723678 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts
@@ -28,7 +28,6 @@ import { NodeManagerUtils } from './NodeManagerUtils';
 
 export enum NavigationType {
   open,
-  closeConnection
 }
 
 export interface NavNodeKey {
@@ -272,7 +271,7 @@ export class NavNodeManagerService extends Bootstrap {
     let name: string | undefined;
     let icon: string | undefined;
 
-    if (NodeManagerUtils.isDatabaseObject(nodeId) && data.type !== NavigationType.closeConnection) {
+    if (NodeManagerUtils.isDatabaseObject(nodeId)) {
       const node = await this.loadNode({ nodeId, parentId });
 
       name = node.name;
diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
index 4926ce6d93..8552506358 100644
--- a/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
+++ b/webapp/packages/plugin-data-viewer/src/DataViewerTabService.ts
@@ -61,9 +61,6 @@ export class DataViewerTabService {
         trySwitchPage,
       } = await contexts.getContext(this.objectViewerTabService.objectViewerTabContext);
 
-      if (nodeInfo.type === NavigationType.closeConnection) {
-        return;
-      }
       const node = await this.navNodeManagerService.loadNode(nodeInfo);
 
       if (!this.navNodeManagerService.isNodeHasData(node)) {
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
index e31d8016a3..c6c90bfe9a 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
@@ -62,7 +62,7 @@ export class ObjectViewerTabService {
       });
   }
 
-  registerTabHandler() {
+  registerTabHandler(): void {
     this.navNodeManagerService.navigator.addHandler(this.navigationHandler.bind(this));
     this.connectionInfoResource.onItemAdd.subscribe(this.updateConnectionInfoTabs.bind(this));
     this.navNodeManagerService.navNodeInfoResource.onItemAdd.subscribe(this.updateTabs.bind(this));
@@ -76,31 +76,29 @@ export class ObjectViewerTabService {
     const tabInfo = await contexts.getContext(this.navigationTabsService.navigationTabContext);
     const nodeInfo = await contexts.getContext(this.navNodeManagerService.navigationNavNodeContext);
 
-    if (data.type !== NavigationType.closeConnection) {
     // check if tab already exist for object
-      const tab = this.navigationTabsService.findTab(
-        isObjectViewerTab(tab => tab.handlerState.objectId === nodeInfo.nodeId)
-      );
+    const tab = this.navigationTabsService.findTab(
+      isObjectViewerTab(tab => tab.handlerState.objectId === nodeInfo.nodeId)
+    );
 
-      if (tab) {
-        tab.handlerState.tabIcon = nodeInfo.icon;
-        tab.handlerState.tabTitle = nodeInfo.name;
-        tabInfo.registerTab(tab);
-      } else {
-        tabInfo.openNewTab<IObjectViewerTabState>({
-          handlerId: objectViewerTabHandlerKey,
-          handlerState: {
-            objectId: nodeInfo.nodeId,
-            parentId: nodeInfo.parentId,
-            parents: await nodeInfo.getParents(),
-            folderId: nodeInfo.folderId,
-            pageId: '',
-            pagesState: new Map(),
-            tabIcon: nodeInfo.icon,
-            tabTitle: nodeInfo.name,
-          },
-        });
-      }
+    if (tab) {
+      tab.handlerState.tabIcon = nodeInfo.icon;
+      tab.handlerState.tabTitle = nodeInfo.name;
+      tabInfo.registerTab(tab);
+    } else {
+      tabInfo.openNewTab<IObjectViewerTabState>({
+        handlerId: objectViewerTabHandlerKey,
+        handlerState: {
+          objectId: nodeInfo.nodeId,
+          parentId: nodeInfo.parentId,
+          parents: await nodeInfo.getParents(),
+          folderId: nodeInfo.folderId,
+          pageId: '',
+          pagesState: new Map(),
+          tabIcon: nodeInfo.icon,
+          tabTitle: nodeInfo.name,
+        },
+      });
     }
     const getPage = () => {
       if (!tabInfo.tab) {