opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): temporary connection disconnect behavior

Browse Source 
CB-121
This commit is contained in:
Wroud
2020-06-15 13:44:12 +03:00
parent a699d7f875
commit 62f975a5cf
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core/src/app/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
+1 -1
View File
@@ -180,7 +180,7 @@ export class ConnectionSchemaManagerService {
try {
await this.connectionsManagerService.loadConnectionInfoAsync(connectionId);
} catch (exception) {
this.notificationService.logException(exception, 'Can\'t load connection info');
this.notificationService.logException(exception, 'Can\'t load connection info', true);
}
try {
webapp/packages/core/src/app/TopNavBar/ConnectionSchemaManager/ConnectionSelector/ConnectionSelectorController.ts
+1 -1
View File
@@ -41,7 +41,7 @@ export class ConnectionSelectorController {
}
get isConnectionSelectorVisible() {
return !!this.connectionSelectorService.currentConnectionId;
return !!this.currentConnection;
}
get isObjectContainerSelectorVisible() {
return !!this.connectionSelectorService.currentObjectCatalogId
webapp/packages/core/src/app/shared/ConnectionsManager/ConnectionsManagerService.ts
+10 -5
View File
@@ -173,22 +173,27 @@ export class ConnectionsManagerService {
}
async closeNavNodeConnectionAsync(navNodeId: string): Promise<void> {
const node = this.navNodeManagerService.getNode(navNodeId);
if (!node) {
const connectionId = NodeManagerUtils.connectionNodeIdToConnectionId(navNodeId);
const connection = this.getConnectionById(connectionId);
if (!connection) {
return;
}
try {
const connectionId = NodeManagerUtils.connectionNodeIdToConnectionId(navNodeId);
await this.graphQLService.gql.closeConnection({ id: connectionId });
await this.afterConnectionClose(connectionId);
await this.connectionInfo.refresh(true, { connectionId, close: true });
if (node.objectFeatures.includes('dataSourceTemporary')) {
if (connection.features.includes(EConnectionFeature.temporary)) {
const node = this.navNodeManagerService.getNode(navNodeId);
if (!node) {
return;
}
await this.navNodeManagerService.refreshTree(node.parentId);
} else {
await this.navNodeManagerService.refreshNode(navNodeId);
await this.navNodeManagerService.removeTree(navNodeId);
}
await this.navNodeManagerService.removeTree(navNodeId);
} catch (exception) {
this.notificationService.logException(exception, `Can't close connection: ${navNodeId}`);
}