opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-13 07:47:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into devel

Browse Source
This commit is contained in:
Serge Rider
2021-09-16 16:31:30 +03:00
parent 416c97f5e3 4f3eb5a7a3
commit 8ab3cbbed4
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-connections/src/Administration/Connections/ConnectionsAdministrationService.ts
+3 -3
View File
@@ -10,8 +10,8 @@ import { AdministrationItemService, AdministrationItemType } from '@cloudbeaver/
import { PlaceholderContainer } from '@cloudbeaver/core-blocks';
import { injectable, Bootstrap } from '@cloudbeaver/core-di';
import { NotificationService } from '@cloudbeaver/core-events';
import { SessionDataResource } from '@cloudbeaver/core-root';
import { ConnectionInfoResource } from '../../ConnectionInfoResource';
import { DBDriverResource } from '../../DBDriverResource';
import { NetworkHandlerResource } from '../../NetworkHandlerResource';
import { DatabaseConnection, ConnectionsResource } from '../ConnectionsResource';
@@ -36,7 +36,7 @@ export class ConnectionsAdministrationService extends Bootstrap {
private connectionsResource: ConnectionsResource,
private dbDriverResource: DBDriverResource,
private readonly createConnectionService: CreateConnectionService,
private readonly connectionInfoResource: ConnectionInfoResource,
private readonly sessionDataResource: SessionDataResource,
private readonly networkHandlerResource: NetworkHandlerResource
) {
super();
@@ -73,7 +73,7 @@ export class ConnectionsAdministrationService extends Bootstrap {
private async refreshUserConnections(configuration: boolean, outside: boolean): Promise<void> {
if (outside) {
this.connectionsResource.cleanNewFlags();
await this.connectionInfoResource.refreshUserConnections();
await this.sessionDataResource.refresh();
}
}
webapp/packages/core-connections/src/ConnectionInfoResource.ts
+4 -6
View File
@@ -97,13 +97,11 @@ export class ConnectionInfoResource extends CachedMapResource<string, Connection
...this.getIncludesMap(),
});
runInAction(() => {
const unrestoredConnectionIdList = Array.from(this.data.values())
.map(connection => connection.id)
.filter(connectionId => !connections.some(connection => connection.id === connectionId));
const unrestoredConnectionIdList = Array.from(this.data.values())
.map(connection => connection.id)
.filter(connectionId => !connections.some(connection => connection.id === connectionId));
this.delete(resourceKeyList(unrestoredConnectionIdList));
});
this.delete(resourceKeyList(unrestoredConnectionIdList));
await this.addList(connections);
});