ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix default connection group by changing ordering of groups (#11303)

Browse Source
This commit is contained in:
Anthony Dresser
2020-07-13 13:25:05 -07:00
committed by GitHub
parent 286c021df9
commit 351ab2f40f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/services/connection/browser/connectionController.ts
View File

@@ -147,9 +147,6 @@ export class ConnectionController implements IConnectionComponentController {
private getAllServerGroups(providers?: string[]): IConnectionProfileGroup[] { private getAllServerGroups(providers?: string[]): IConnectionProfileGroup[] {
let connectionGroupRoot = this._connectionManagementService.getConnectionGroups(providers); let connectionGroupRoot = this._connectionManagementService.getConnectionGroups(providers);
let allGroups: IConnectionProfileGroup[] = []; let allGroups: IConnectionProfileGroup[] = [];
if (connectionGroupRoot && connectionGroupRoot.length > 0) {
this.flattenGroups(connectionGroupRoot[0], allGroups);
}
let defaultGroupId: string; let defaultGroupId: string;
if (connectionGroupRoot && connectionGroupRoot.length > 0 && ConnectionProfileGroup.isRoot(connectionGroupRoot[0].name)) { if (connectionGroupRoot && connectionGroupRoot.length > 0 && ConnectionProfileGroup.isRoot(connectionGroupRoot[0].name)) {
defaultGroupId = connectionGroupRoot[0].id; defaultGroupId = connectionGroupRoot[0].id;
@@ -158,6 +155,9 @@ export class ConnectionController implements IConnectionComponentController {
} }
allGroups.push(assign({}, this._connectionWidget.DefaultServerGroup, { id: defaultGroupId })); allGroups.push(assign({}, this._connectionWidget.DefaultServerGroup, { id: defaultGroupId }));
allGroups.push(this._connectionWidget.NoneServerGroup); allGroups.push(this._connectionWidget.NoneServerGroup);
if (connectionGroupRoot && connectionGroupRoot.length > 0) {
this.flattenGroups(connectionGroupRoot[0], allGroups);
}
connectionGroupRoot.forEach(cpg => cpg.dispose()); connectionGroupRoot.forEach(cpg => cpg.dispose());
return allGroups; return allGroups;
} }