From 2aa7a145d40caa7b2727d12a01eaf9c4250316d7 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Thu, 10 Oct 2019 11:21:13 -0700 Subject: [PATCH] Fix connection group input not correctly selecting nested groups (#7625) --- .../services/connection/browser/connectionWidget.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sql/workbench/services/connection/browser/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts index 6e209771ca..a29dd3a75b 100644 --- a/src/sql/workbench/services/connection/browser/connectionWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts @@ -547,7 +547,12 @@ export class ConnectionWidget extends lifecycle.Disposable { if (this._serverGroupSelectBox) { this._serverGroupOptions = connectionGroups; this._serverGroupOptions.push(this._addNewServerGroup); - this._serverGroupSelectBox.setOptions(this._serverGroupOptions.map(g => g.name)); + this._serverGroupSelectBox.setOptions(this._serverGroupOptions.map(g => { + if (g instanceof ConnectionProfileGroup) { + return g.fullName; + } + return g.name; + })); if (groupName) { this._serverGroupSelectBox.selectWithOptionName(groupName); this._previousGroupOption = this._serverGroupSelectBox.value;