From 78e16f3ffcbe9642aff3e5053ace5c3085114011 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Thu, 30 Mar 2023 13:16:55 +0200 Subject: [PATCH] CB-3280 skip project node for extensions (#1573) --- .../service/navigator/impl/WebServiceNavigator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java index add8a4d7ef..3046da892d 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java @@ -56,7 +56,6 @@ import org.jkiss.dbeaver.model.websocket.WSConstants; import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty; import org.jkiss.dbeaver.model.websocket.event.resource.WSResourceProperty; import org.jkiss.dbeaver.runtime.DBWorkbench; -import org.jkiss.utils.ArrayUtils; import org.jkiss.utils.CommonUtils; import java.util.*; @@ -149,11 +148,16 @@ public class WebServiceNavigator implements DBWServiceNavigator { throw new DBWebException("Node '" + nodePath + "' not found"); } + boolean shouldSkipProjectNode = nodePath.startsWith(DBNNode.NodePathType.ext.getPrefix()); List nodeParents = new ArrayList<>(); for (DBNNode parent = node.getParentNode(); parent != null && !(parent instanceof DBNRoot); parent = parent.getParentNode()) { + //FIXME remove after node path refactoring if (parent instanceof DBNProjectDatabases) { continue; } + if (parent instanceof DBNProject && shouldSkipProjectNode) { + continue; + } nodeParents.add(new WebNavigatorNodeInfo(session, parent)); }