From bcfbe5a284512381fd9923e1705e0db41bd685b6 Mon Sep 17 00:00:00 2001 From: kisantia <31145923+kisantia@users.noreply.github.com> Date: Fri, 8 Mar 2019 09:19:03 -0800 Subject: [PATCH] fix flatfile and dacfx wizard not defaulting to selected connection when launched from command palette (#4344) --- extensions/dacpac/src/wizard/dataTierApplicationWizard.ts | 8 ++++++++ extensions/import/src/wizard/flatFileWizard.ts | 3 +++ 2 files changed, 11 insertions(+) diff --git a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts index 09bb12448f..e65f208445 100644 --- a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts +++ b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts @@ -91,8 +91,16 @@ export class DataTierApplicationWizard { if (!this.connection) { // @TODO: remove cast once azdata update complete - karlb 3/1/2019 this.connection = await azdata.connection.openConnectionDialog(); + + // don't open the wizard if connection dialog is cancelled + if (!this.connection) { + vscode.window.showErrorMessage(localize('dacfx.needConnection', 'Please connect to a server before using this wizard.')); + return; + } } + this.model.serverId = this.connection.connectionId; + this.wizard = azdata.window.createWizard('Data-tier Application Wizard'); let selectOperationWizardPage = azdata.window.createWizardPage(localize('dacFx.selectOperationPageName', 'Select an Operation')); let deployConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.deployConfigPageName', 'Select Deploy Dacpac Settings')); diff --git a/extensions/import/src/wizard/flatFileWizard.ts b/extensions/import/src/wizard/flatFileWizard.ts index 50cbbe5f7e..3954ab2e9d 100644 --- a/extensions/import/src/wizard/flatFileWizard.ts +++ b/extensions/import/src/wizard/flatFileWizard.ts @@ -46,6 +46,9 @@ export class FlatFileWizard { return; } + let currentConnection = await azdata.connection.getCurrentConnection(); + model.serverId = currentConnection.connectionId; + this.wizard = azdata.window.createWizard(localize('flatFileImport.wizardName', 'Import flat file wizard')); let page1 = azdata.window.createWizardPage(localize('flatFileImport.page1Name', 'Specify Input File')); let page2 = azdata.window.createWizardPage(localize('flatFileImport.page2Name', 'Preview Data'));