From d7e251dc2f26b2ce347c36b7a942eacdb8e982d2 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Mon, 10 Jan 2022 10:59:49 +0300 Subject: [PATCH] dbeaver/dbeaver-ee#1350 Sort nodes in CB navigator --- .../service/navigator/impl/WebServiceNavigator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ef53ce9b37..17256d6f53 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 @@ -66,7 +66,7 @@ public class WebServiceNavigator implements DBWServiceNavigator { DBNModel navigatorModel = session.getNavigatorModel(); if (isRootPath) { DBNProject projectNode = navigatorModel.getRoot().getProjectNode(session.getSingletonProject()); - nodeChildren = projectNode.getDatabases().getChildren(monitor); + nodeChildren = DBNUtils.getNodeChildrenFiltered(monitor, projectNode.getDatabases(), true); if (SHOW_EXTRA_NODES) { // Inject extra nodes. Disabled because we use different root path for extra nodes List extraNodes = projectNode.getExtraNodes(); @@ -82,7 +82,7 @@ public class WebServiceNavigator implements DBWServiceNavigator { if (!parentNode.hasChildren(false)) { return EMPTY_NODE_LIST; } - nodeChildren = parentNode.getChildren(monitor); + nodeChildren = DBNUtils.getNodeChildrenFiltered(monitor, parentNode, true); } if (nodeChildren == null) { return EMPTY_NODE_LIST;