From 4bdbbf71294596108c02688f9d9198f796d808eb Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 19 Jan 2022 11:31:36 +0300
Subject: [PATCH] fix: CB-1548 don't load schema list for every catalog

---
 .../navigator/impl/WebServiceNavigator.java   |  4 +-
 .../ConnectionSelectorController.ts           | 55 +++++++++++++++----
 2 files changed, 46 insertions(+), 13 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 b46777deca..57abea545e 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
@@ -205,7 +205,7 @@ public class WebServiceNavigator implements DBWServiceNavigator {
                 if (catalogObjectInfo != null) {
                     WebCatalog webCatalog = new WebCatalog(catalogObjectInfo);
 
-                    if (contextDefaults != null && contextDefaults.supportsSchemaChange()) {
+                    if (contextDefaults != null && contextDefaults.supportsSchemaChange() && contextDefaults.getDefaultCatalog().getName() == node.getName()) {
                         try {
                             List<WebNavigatorNodeInfo> schemasList = webCatalog.getSchemaList();
                             Collection<? extends DBSObject> objectsCollection = ((DBSObjectContainer) node).getChildren(monitor);
@@ -217,7 +217,7 @@ public class WebServiceNavigator implements DBWServiceNavigator {
                                 if (schemaObject instanceof DBSSchema) {
                                     WebNavigatorNodeInfo schemaNodeInfo = this.getNodeFromObject(connection.getSession(), schemaObject);
 
-                                    if(schemaNodeInfo != null){
+                                    if (schemaNodeInfo != null) {
                                         schemasList.add(schemaNodeInfo);
                                     }
                                 }
diff --git a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
index fa3ad1fb7e..481c942724 100644
--- a/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
+++ b/webapp/packages/core-app/src/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
@@ -51,10 +51,7 @@ export class ConnectionSelectorController {
       !this.optionsPanelService.active
       && (
         this.connectionSelectorService.currentConnectionId !== null
-        || (
-          this.connectionSelectorService.currentConnectionId === null
-          && this.connectionSelectorService.isConnectionChangeable
-        )
+        || this.connectionSelectorService.isConnectionChangeable
       )
     );
   }
@@ -110,11 +107,11 @@ export class ConnectionSelectorController {
   }
 
   constructor(
-    private connectionSelectorService: ConnectionSchemaManagerService,
-    private dbDriverResource: DBDriverResource,
-    private connectionInfo: ConnectionInfoResource,
-    private connectionsManagerService: ConnectionsManagerService,
-    private optionsPanelService: OptionsPanelService,
+    private readonly connectionSelectorService: ConnectionSchemaManagerService,
+    private readonly dbDriverResource: DBDriverResource,
+    private readonly connectionInfo: ConnectionInfoResource,
+    private readonly connectionsManagerService: ConnectionsManagerService,
+    private readonly optionsPanelService: OptionsPanelService,
   ) {
     makeObservable<ConnectionSelectorController, 'currentObjectContainerIcon'>(this, {
       currentConnection: computed,
@@ -182,9 +179,45 @@ export class ConnectionSelectorController {
       return [];
     }
 
+    const schemaList = this.connectionSelectorService.objectContainerList.schemaList
+      .slice()
+      .sort((a, b) => {
+        if (a.name === b.name){
+          return 0;
+        }
+      
+        if (a.name === this.connectionSelectorService.currentObjectSchemaId) {
+          return -1;
+        }
+      
+        if (b.name === this.connectionSelectorService.currentObjectSchemaId) {
+          return 1;
+        }
+
+        return 0;
+      });
+
+    const catalogList = this.connectionSelectorService.objectContainerList.catalogList
+      .slice()
+      .sort((a, b) => {
+        if (a.catalog.name === b.catalog.name){
+          return 0;
+        }
+        
+        if (a.catalog.name === this.connectionSelectorService.currentObjectCatalogId) {
+          return -1;
+        }
+        
+        if (b.catalog.name === this.connectionSelectorService.currentObjectCatalogId) {
+          return 1;
+        }
+  
+        return 0;
+      });
+
     const items: IMenuItem[] = [];
 
-    for (const schema of this.connectionSelectorService.objectContainerList.schemaList) {
+    for (const schema of schemaList) {
       if (!schema.name) {
         continue;
       }
@@ -201,7 +234,7 @@ export class ConnectionSelectorController {
       });
     }
 
-    for (const catalogData of this.connectionSelectorService.objectContainerList.catalogList) {
+    for (const catalogData of catalogList) {
       const catalog = catalogData.catalog;
       if (!catalog.name) {
         continue;