From d59411c191c83136be38fc8ec7c255baca1856a2 Mon Sep 17 00:00:00 2001
From: Kim Santiago <31145923+kisantia@users.noreply.github.com>
Date: Wed, 27 May 2020 18:14:29 -0700
Subject: [PATCH] a few fixes for dacpac extension (#10595)

---
 extensions/dacpac/src/wizard/api/basePage.ts         |  9 ++++++++-
 extensions/dacpac/src/wizard/api/dacFxConfigPage.ts  |  2 +-
 .../dacpac/src/wizard/dataTierApplicationWizard.ts   | 12 +++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/extensions/dacpac/src/wizard/api/basePage.ts b/extensions/dacpac/src/wizard/api/basePage.ts
index 159bdf2f27..e480f7bd6e 100644
--- a/extensions/dacpac/src/wizard/api/basePage.ts
+++ b/extensions/dacpac/src/wizard/api/basePage.ts
@@ -76,7 +76,14 @@ export abstract class BasePage {
 				usr = loc.defaultText;
 			}
 
-			let finalName = `${srv} (${usr})`;
+			let finalName;
+			// show connection name if there is one
+			if (c.options.connectionName) {
+				finalName = `${c.options.connectionName}`;
+			} else {
+				finalName = `${srv} (${usr})`;
+			}
+
 			return {
 				connection: c,
 				displayName: finalName,
diff --git a/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts b/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
index 2e29917748..aa51d620d9 100644
--- a/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
+++ b/extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
@@ -108,7 +108,7 @@ export abstract class DacFxConfigPage extends BasePage {
 
 		// Handle database changes
 		this.databaseDropdown.onValueChanged(async () => {
-			this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name;
+			this.model.database = <string>this.databaseDropdown.value;
 			this.fileTextBox.value = this.generateFilePathFromDatabaseAndTimestamp();
 			this.model.filePath = this.fileTextBox.value;
 		});
diff --git a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
index d89d24b25b..f34728b637 100644
--- a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
+++ b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
@@ -98,9 +98,15 @@ export class DataTierApplicationWizard {
 
 		this.connection = await azdata.connection.getCurrentConnection();
 		if (!this.connection || (profile && this.connection.connectionId !== profile.id)) {
-			// @TODO: remove cast once azdata update complete - karlb 3/1/2019
-			this.connection = <azdata.connection.ConnectionProfile><any>await azdata.connection.openConnectionDialog(undefined, profile);
-
+			// check if there are any active connections
+			const connections = await azdata.connection.getConnections(true);
+			if (connections.length > 0) {
+				// set connection to the first one in the list
+				this.connection = connections[0];
+			} else {
+				// @TODO: remove cast once azdata update complete - karlb 3/1/2019
+				this.connection = <azdata.connection.ConnectionProfile><any>await azdata.connection.openConnectionDialog(undefined, profile);
+			}
 			// don't open the wizard if connection dialog is cancelled
 			if (!this.connection) {
 				return;