CB-3280 skip project node for extensions (#1573)

This commit is contained in:
Alexander Skoblikov
2023-03-30 14:16:55 +03:00
committed by GitHub
parent a59128772c
commit 78e16f3ffc
@@ -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<WebNavigatorNodeInfo> 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));
}