diff --git a/extensions/datavirtualization/package.json b/extensions/datavirtualization/package.json index 84d7022119..3c071b6259 100644 --- a/extensions/datavirtualization/package.json +++ b/extensions/datavirtualization/package.json @@ -2,7 +2,7 @@ "name": "datavirtualization", "displayName": "%title.datavirtualization%", "description": "%config.extensionDescription%", - "version": "1.13.1", + "version": "1.13.2", "publisher": "Microsoft", "icon": "resources/extension.png", "aiKey": "29a207bb14f84905966a8f22524cb730-25407f35-11b6-4d4e-8114-ab9e843cb52f-7380", diff --git a/extensions/datavirtualization/src/command.ts b/extensions/datavirtualization/src/command.ts index 5f1d9e0941..8acc9ee642 100644 --- a/extensions/datavirtualization/src/command.ts +++ b/extensions/datavirtualization/src/command.ts @@ -6,11 +6,9 @@ import * as vscode from 'vscode'; import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); import { ApiWrapper } from './apiWrapper'; import { TreeNode } from './treeNodes'; -import { QuestionTypes, IPrompter, IQuestion } from './prompts/question'; import * as utils from './utils'; import * as constants from './constants'; import { AppContext } from './appContext'; @@ -121,55 +119,3 @@ export abstract class Command extends vscode.Disposable { return [{ command: command, type: 'unknown', editor: editor }, args]; } } - -export abstract class ProgressCommand extends Command { - static progressId = 0; - constructor(private command: string, protected prompter: IPrompter, appContext: AppContext) { - super(command, appContext); - } - - protected async executeWithProgress( - execution: (cancelToken: vscode.CancellationTokenSource) => Promise, - label: string, - isCancelable: boolean = false, - onCanceled?: () => void - ): Promise { - let disposables: vscode.Disposable[] = []; - const tokenSource = new vscode.CancellationTokenSource(); - const statusBarItem = this.apiWrapper.createStatusBarItem(vscode.StatusBarAlignment.Left); - disposables.push(vscode.Disposable.from(statusBarItem)); - statusBarItem.text = localize('progress', '$(sync~spin) {0}...', label); - if (isCancelable) { - const cancelCommandId = `cancelProgress${ProgressCommand.progressId++}`; - disposables.push(this.apiWrapper.registerCommand(cancelCommandId, async () => { - if (await this.confirmCancel()) { - tokenSource.cancel(); - } - })); - statusBarItem.tooltip = localize('cancelTooltip', 'Cancel'); - statusBarItem.command = cancelCommandId; - } - statusBarItem.show(); - - try { - await execution(tokenSource); - } catch (error) { - if (isCancelable && onCanceled && tokenSource.token.isCancellationRequested) { - // The error can be assumed to be due to cancelation occurring. Do the callback - onCanceled(); - } else { - throw error; - } - } finally { - disposables.forEach(d => d.dispose()); - } - } - - private async confirmCancel(): Promise { - return await this.prompter.promptSingle({ - type: QuestionTypes.confirm, - message: localize('cancel', 'Cancel operation?'), - default: true - }); - } -} diff --git a/extensions/datavirtualization/src/wizards/wizardCommands.ts b/extensions/datavirtualization/src/wizards/wizardCommands.ts index 6fda3875e0..7f4fa29b41 100644 --- a/extensions/datavirtualization/src/wizards/wizardCommands.ts +++ b/extensions/datavirtualization/src/wizards/wizardCommands.ts @@ -98,5 +98,6 @@ export class OpenMssqlHdfsTableFromFileWizardCommand extends Command { function convertIConnectionProfile(profile: azdata.IConnectionProfile): azdata.connection.ConnectionProfile { const connection = azdata.connection.ConnectionProfile.createFrom(profile.options); connection.providerId = profile.providerName; + connection.databaseName = profile.databaseName; return connection; }