From 3c144c7bab735ad411dbcdfb996592a6d29ebfa5 Mon Sep 17 00:00:00 2001 From: Wroud Date: Wed, 23 Sep 2020 00:03:32 +0300 Subject: [PATCH] chore(core-app): parseNodeParentId function --- .../src/shared/NodesManager/NavNodeManagerService.ts | 10 ++++++++++ .../plugin-ddl-viewer/src/DdlViewerTabService.ts | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts index e649adc58e..651eec3ae5 100644 --- a/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts +++ b/webapp/packages/core-app/src/shared/NodesManager/NavNodeManagerService.ts @@ -414,3 +414,13 @@ export class NavNodeManagerService extends Bootstrap { return true; } } + +export function parseNodeParentId(nodeId: string): string { + const parentId = nodeId.slice(0, nodeId.lastIndexOf('/')); + + if (parentId === 'database:/') { + return ROOT_NODE_PATH; + } + + return parentId; +} diff --git a/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts b/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts index ec14b6bbe1..d7cb96b5dd 100644 --- a/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts +++ b/webapp/packages/plugin-ddl-viewer/src/DdlViewerTabService.ts @@ -42,7 +42,7 @@ export class DdlViewerTabService { tabId: ddlViewerTabId, title: 'DDL', icon: '/icons/DDL.svg', - onActivate: () => this.activateDDLTab(nodeId, node?.parentId!), + onActivate: () => this.activateDDLTab(nodeId, node?.parentId as string), panel: () => ddlViewer(nodeId), }; return ddlTab;