Add connection API method to get URI (#2021)

Extensibility updates

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## Version 0.31.4
+* Release date: July 19, 2018
+* Release status: Public Preview
+
+## What's new in this version
+* SQL Server Agent for SQL Operations Studio extension improvements
+  * Added view of Alerts, Operators, and Proxies and icons on left pane
+  * Added dialogs for New Job, New Job Step, New Alert, and New Operator
+  * Added Delete Job, Delete Alert, and Delete Operator (right-click)
+  * Added Previous Runs visualization
+  * Added Filters for each column name
+* SQL Server Profiler for SQL Operations Studio extension improvements
+  * Added Hotkeys to quickly launch and start/stop Profiler
+  * Added 5 Default Templates to view Extended Events
+  * Added Server/Database connection name
+  * Added support for Azure SQL Database instances
+  * Added suggestion to exit Profiler when tab is closed when Profiler is still running
+* Release of Combine Scripts Extension
+* Wizard and Dialog Extensibility
+* Fix GitHub Issues
+
 ## Version 0.30.6
 * Release date: June 20, 2018
 * Release status: Public Preview
@@ -22,7 +43,7 @@ The May release is focused on stabilization and bug fixes leading up to the Buil
 
 * Announcing **Redgate SQL Search** extension available in Extension Manager
 * Community Localization available for 10 languages: **German, Spanish, French, Italian, Japanese, Korean, Portuguese, Russian, Simplified Chinese and Traditional Chinese!**
-* **GDPR-compliant** build has reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement)
+* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement)
 * Extension Manager has improved Marketplace experience to easily discover community extensions
 * SQL Agent extension Jobs and Job History view improvement
 * Updates for **whoisactive** and **Server Reports** extensions

README.md

@@ -8,12 +8,12 @@ SQL Operations Studio is a data management tool that enables you to work with SQ
 
 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=875602
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=875603
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=875604
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=875605
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=875606
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=875607
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2005949
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2005950
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2005959
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2005960
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2006083
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2006084
 
 Go to our [download page](https://aka.ms/sqlopsstudio) for more specific instructions.
 
@@ -85,7 +85,7 @@ We would like to thank all our users who raised issues, and in particular the fo
   * Chinese  (Traditional): Bruce Chen, Chiayi Yen, Kevin Yang,  Winnie Lin, 保哥 Will,  謝政廷
   * Korean: Do-Kyun Kim, Evelyn Kim, Helen Jung, Hong Jmee, jeongwoo choi, Jun Hyoung Lee, Jungsun Kim정선, Justin Yoo, Kavrith mucha, Kiwoong Youm, MinGyu Ju,  MVP_JUNO BEA, Sejun Kim, SOONMAN KWON, sung man ko, Yeongrak Choi, younggun kim, Youngjae Kim, 소영 이
   * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
-  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi   
+  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi
 
 
 And of course we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/ThirdPartyNotices.txt)

build/win32/code.iss

@@ -61,6 +61,7 @@ Type: filesandordirs; Name: "{app}\_"
 
 [Tasks]
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#NameShort}}"; GroupDescription: "{cm:Other}"; Flags: unchecked
 Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
@@ -82,6 +83,13 @@ Root: HKCR; Subkey: "{#RegValueName}SourceFile\DefaultIcon"; ValueType: string;
 Root: HKCR; Subkey: "{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
 Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
 
+Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+
 [Code]
 // Don't allow installing conflicting architectures
 function InitializeSetup(): Boolean;

extensions/agent/client/src/dialogs/createAlertDialog.ts

@@ -1,149 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import { CreateAlertData } from '../data/createAlertData';
-
-export class CreateAlertDialog {
-
-	// Top level
-	private readonly DialogTitle: string = 'Create Alert';
-	private readonly OkButtonText: string = 'OK';
-	private readonly CancelButtonText: string = 'Cancel';
-	private readonly GeneralTabText: string = 'Response';
-	private readonly ResponseTabText: string = 'Steps';
-	private readonly OptionsTabText: string = 'Options';
-	private readonly HistoryTabText: string = 'History';
-
-	// General tab strings
-	private readonly NameTextBoxLabel: string = 'Name';
-
-	// Response tab strings
-	private readonly ExecuteJobTextBoxLabel: string = 'Execute Job';
-
-	// Options tab strings
-	private readonly AdditionalMessageTextBoxLabel: string = 'Additional notification message to send';
-
-	// History tab strings
-	private readonly ResetCountTextBoxLabel: string = 'Reset Count';
-
-	// UI Components
-	private dialog: sqlops.window.modelviewdialog.Dialog;
-	private generalTab: sqlops.window.modelviewdialog.DialogTab;
-	private responseTab: sqlops.window.modelviewdialog.DialogTab;
-	private optionsTab: sqlops.window.modelviewdialog.DialogTab;
-	private historyTab: sqlops.window.modelviewdialog.DialogTab;
-	private schedulesTable: sqlops.TableComponent;
-
-	// General tab controls
-	private nameTextBox: sqlops.InputBoxComponent;
-
-	// Response tab controls
-	private executeJobTextBox: sqlops.InputBoxComponent;
-
-	// Options tab controls
-	private additionalMessageTextBox: sqlops.InputBoxComponent;
-
-	// History tab controls
-	private resetCountTextBox: sqlops.InputBoxComponent;
-
-	private model: CreateAlertData;
-
-	private _onSuccess: vscode.EventEmitter<CreateAlertData> = new vscode.EventEmitter<CreateAlertData>();
-	public readonly onSuccess: vscode.Event<CreateAlertData> = this._onSuccess.event;
-
-	constructor(ownerUri: string) {
-		this.model = new CreateAlertData(ownerUri);
-	}
-
-	public async showDialog() {
-		await this.model.initialize();
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
-		this.generalTab = sqlops.window.modelviewdialog.createTab(this.GeneralTabText);
-		this.responseTab = sqlops.window.modelviewdialog.createTab(this.ResponseTabText);
-		this.optionsTab = sqlops.window.modelviewdialog.createTab(this.OptionsTabText);
-		this.historyTab = sqlops.window.modelviewdialog.createTab(this.HistoryTabText);
-
-		this.initializeGeneralTab();
-		this.initializeResponseTab();
-		this.initializeOptionsTab();
-		this.initializeHistoryTab();
-
-		this.dialog.content = [this.generalTab, this.responseTab, this.optionsTab, this.historyTab];
-		this.dialog.okButton.onClick(async () => await this.execute());
-		this.dialog.cancelButton.onClick(async () => await this.cancel());
-		this.dialog.okButton.label = this.OkButtonText;
-		this.dialog.cancelButton.label = this.CancelButtonText;
-
-		sqlops.window.modelviewdialog.openDialog(this.dialog);
-	}
-
-	private initializeGeneralTab() {
-		this.generalTab.registerContent(async view => {
-			this.nameTextBox = view.modelBuilder.inputBox().component();
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.nameTextBox,
-					title: this.NameTextBoxLabel
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-		});
-	}
-
-	private initializeResponseTab() {
-		this.responseTab.registerContent(async view => {
-			this.executeJobTextBox = view.modelBuilder.inputBox().component();
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.executeJobTextBox,
-					title: this.ExecuteJobTextBoxLabel
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-		});
-	}
-
-	private initializeOptionsTab() {
-		this.optionsTab.registerContent(async view => {
-			this.additionalMessageTextBox = view.modelBuilder.inputBox().component();
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.additionalMessageTextBox,
-					title: this.AdditionalMessageTextBoxLabel
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-		});
-	}
-
-	private initializeHistoryTab() {
-		this.historyTab.registerContent(async view => {
-			this.resetCountTextBox = view.modelBuilder.inputBox().component();
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.resetCountTextBox,
-					title: this.ResetCountTextBoxLabel
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-		});
-	}
-
-	private async execute() {
-		this.updateModel();
-		await this.model.save();
-		this._onSuccess.fire(this.model);
-	}
-
-	private async cancel() {
-	}
-
-	private updateModel() {
-	}
-}

extensions/agent/client/src/dialogs/createStepDialog.ts

@@ -1,421 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import { CreateStepData } from '../data/createStepData';
-import { AgentUtils } from '../agentUtils';
-import { CreateJobData } from '../data/createJobData';
-
-export class CreateStepDialog {
-
-	// TODO: localize
-	// Top level
-	//
-	private static readonly DialogTitle: string = 'New Job Step';
-	private static readonly OkButtonText: string = 'OK';
-	private static readonly CancelButtonText: string = 'Cancel';
-	private static readonly GeneralTabText: string = 'General';
-	private static readonly AdvancedTabText: string = 'Advanced';
-	private static readonly OpenCommandText: string = 'Open...';
-	private static readonly ParseCommandText: string = 'Parse';
-	private static readonly NextButtonText: string = 'Next';
-	private static readonly PreviousButtonText: string = 'Previous';
-	private static readonly SuccessAction: string = 'On success action';
-	private static readonly FailureAction: string = 'On failure action';
-
-
-	// Dropdown options
-	private static readonly TSQLScript: string = 'Transact-SQL script (T-SQL)';
-	private static readonly AgentServiceAccount: string = 'SQL Server Agent Service Account';
-	private static readonly NextStep: string = 'Go to the next step';
-	private static readonly QuitJobReportingSuccess: string = 'Quit the job reporting success';
-	private static readonly QuitJobReportingFailure: string = 'Quit the job reporting failure';
-
-	// UI Components
-	//
-	private dialog: sqlops.window.modelviewdialog.Dialog;
-	private generalTab: sqlops.window.modelviewdialog.DialogTab;
-	private advancedTab: sqlops.window.modelviewdialog.DialogTab;
-	private nameTextBox: sqlops.InputBoxComponent;
-	private typeDropdown: sqlops.DropDownComponent;
-	private runAsDropdown: sqlops.DropDownComponent;
-	private databaseDropdown: sqlops.DropDownComponent;
-	private successActionDropdown: sqlops.DropDownComponent;
-	private failureActionDropdown: sqlops.DropDownComponent;
-	private commandTextBox: sqlops.InputBoxComponent;
-	private openButton: sqlops.ButtonComponent;
-	private parseButton: sqlops.ButtonComponent;
-	private nextButton: sqlops.ButtonComponent;
-	private previousButton: sqlops.ButtonComponent;
-	private retryAttemptsBox: sqlops.InputBoxComponent;
-	private retryIntervalBox: sqlops.InputBoxComponent;
-	private appendToExistingFileCheckbox: sqlops.CheckBoxComponent;
-	private logToTableCheckbox: sqlops.CheckBoxComponent;
-	private outputFileNameBox: sqlops.InputBoxComponent;
-	private outputFileBrowserButton: sqlops.ButtonComponent;
-
-	private model: CreateStepData;
-	private ownerUri: string;
-	private jobName: string;
-	private server: string;
-	private stepId: number;
-
-	private jobModel: CreateJobData;
-
-	constructor(
-		ownerUri: string,
-		jobName: string,
-		server: string,
-		stepId: number,
-		jobModel?: CreateJobData
-	) {
-		this.model = new CreateStepData(ownerUri);
-		this.stepId = stepId;
-		this.ownerUri = ownerUri;
-		this.jobName = jobName;
-		this.server = server;
-		this.jobModel = jobModel;
-	}
-
-	private initializeUIComponents() {
-		this.dialog = sqlops.window.modelviewdialog.createDialog(CreateStepDialog.DialogTitle);
-		this.generalTab = sqlops.window.modelviewdialog.createTab(CreateStepDialog.GeneralTabText);
-		this.advancedTab = sqlops.window.modelviewdialog.createTab(CreateStepDialog.AdvancedTabText);
-		this.dialog.content = [this.generalTab, this.advancedTab];
-		this.dialog.okButton.onClick(async () => await this.execute());
-		this.dialog.okButton.label = CreateStepDialog.OkButtonText;
-		this.dialog.cancelButton.label = CreateStepDialog.CancelButtonText;
-	}
-
-	private createCommands(view, queryProvider: sqlops.QueryProvider) {
-		this.openButton = view.modelBuilder.button()
-			.withProperties({
-				label: CreateStepDialog.OpenCommandText,
-				width: '80px'
-			}).component();
-		this.parseButton = view.modelBuilder.button()
-			.withProperties({
-				label: CreateStepDialog.ParseCommandText,
-				width: '80px'
-			}).component();
-		this.parseButton.onDidClick(e => {
-			if (this.commandTextBox.value) {
-				queryProvider.parseSyntax(this.ownerUri, this.commandTextBox.value).then(result => {
-					if (result && result.parseable) {
-						this.dialog.message = { text: 'The command was successfully parsed.', level: 2};
-					} else if (result && !result.parseable) {
-						this.dialog.message = { text: 'The command failed' };
-					}
-				});
-			}
-		});
-		this.commandTextBox = view.modelBuilder.inputBox()
-			.withProperties({
-				height: 300,
-				width: 400,
-				multiline: true,
-				inputType: 'text'
-			})
-			.component();
-		this.nextButton = view.modelBuilder.button()
-			.withProperties({
-				label: CreateStepDialog.NextButtonText,
-				enabled: false,
-				width: '80px'
-			}).component();
-		this.previousButton = view.modelBuilder.button()
-			.withProperties({
-				label: CreateStepDialog.PreviousButtonText,
-				enabled: false,
-				width: '80px'
-			}).component();
-	}
-
-	private createGeneralTab(databases: string[], queryProvider: sqlops.QueryProvider) {
-		this.generalTab.registerContent(async (view) => {
-			this.nameTextBox = view.modelBuilder.inputBox()
-				.withProperties({
-				}).component();
-			this.nameTextBox.required = true;
-			this.typeDropdown = view.modelBuilder.dropDown()
-				.withProperties({
-					value: CreateStepDialog.TSQLScript,
-					values: [CreateStepDialog.TSQLScript]
-				})
-				.component();
-			this.runAsDropdown = view.modelBuilder.dropDown()
-				.withProperties({
-					value: '',
-					values: ['']
-				})
-				.component();
-			this.runAsDropdown.enabled = false;
-			this.typeDropdown.onValueChanged((type) => {
-				if (type.selected !== CreateStepDialog.TSQLScript) {
-					this.runAsDropdown.value = CreateStepDialog.AgentServiceAccount;
-					this.runAsDropdown.values = [this.runAsDropdown.value];
-				} else {
-					this.runAsDropdown.value = '';
-					this.runAsDropdown.values = [''];
-				}
-			});
-			this.databaseDropdown = view.modelBuilder.dropDown()
-				.withProperties({
-					value: databases[0],
-					values: databases
-				}).component();
-
-			// create the commands section
-			this.createCommands(view, queryProvider);
-
-			let buttonContainer = view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'row',
-				justifyContent: 'space-between',
-				width: 420
-			}).withItems([this.openButton, this.parseButton, this.previousButton, this.nextButton], {
-				flex: '1 1 50%'
-			}).component();
-
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.nameTextBox,
-					title: 'Step name'
-				}, {
-					component: this.typeDropdown,
-					title: 'Type'
-				}, {
-					component: this.runAsDropdown,
-					title: 'Run as'
-				}, {
-					component: this.databaseDropdown,
-					title: 'Database'
-				}, {
-					component: this.commandTextBox,
-					title: 'Command',
-					actions: [buttonContainer]
-				}], {
-						horizontal: false,
-						componentWidth: 420
-					}).component();
-			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
-			formWrapper.loading = false;
-			await view.initializeModel(formWrapper);
-		});
-	}
-
-	private createRunAsUserOptions(view) {
-		let userInputBox = view.modelBuilder.inputBox()
-			.withProperties({ inputType: 'text', width: '100px' }).component();
-		let viewButton = view.modelBuilder.button()
-			.withProperties({ label: '...', width: '20px' }).component();
-		let viewButtonContainer = view.modelBuilder.flexContainer()
-			.withLayout({ width: 100, textAlign: 'right' })
-			.withItems([viewButton], { flex: '1 1 50%' }).component();
-		let userInputBoxContainer = view.modelBuilder.flexContainer()
-			.withLayout({ width: 200, textAlign: 'left' })
-			.withItems([userInputBox], { flex: '1 1 50%' }).component();
-		let runAsUserContainer = view.modelBuilder.flexContainer()
-			.withLayout({ width: 200 })
-			.withItems([userInputBoxContainer, viewButtonContainer], { flex: '1 1 50%' })
-			.component();
-		let runAsUserForm = view.modelBuilder.formContainer()
-			.withFormItems([{
-				component: runAsUserContainer,
-				title: 'Run as user'
-			}], { horizontal: true, componentWidth: 200 }).component();
-		return runAsUserForm;
-	}
-
-	private createAdvancedTab() {
-		this.advancedTab.registerContent(async (view) => {
-			this.successActionDropdown = view.modelBuilder.dropDown()
-				.withProperties({
-					value: CreateStepDialog.NextStep,
-					values: [CreateStepDialog.NextStep, CreateStepDialog.QuitJobReportingSuccess, CreateStepDialog.QuitJobReportingFailure]
-				})
-				.component();
-			let retryFlexContainer = this.createRetryCounters(view);
-			this.failureActionDropdown = view.modelBuilder.dropDown()
-				.withProperties({
-					value: CreateStepDialog.QuitJobReportingFailure,
-					values: [CreateStepDialog.QuitJobReportingFailure, CreateStepDialog.NextStep, CreateStepDialog.QuitJobReportingSuccess]
-				})
-				.component();
-			let optionsGroup = this.createTSQLOptions(view);
-			let viewButton = view.modelBuilder.button()
-				.withProperties({ label: 'View', width: '50px' }).component();
-			viewButton.enabled = false;
-			this.logToTableCheckbox = view.modelBuilder.checkBox()
-				.withProperties({
-					label: 'Log to table'
-				}).component();
-			let appendToExistingEntryInTableCheckbox = view.modelBuilder.checkBox()
-				.withProperties({ label: 'Append output to existing entry in table' }).component();
-			appendToExistingEntryInTableCheckbox.enabled = false;
-			this.logToTableCheckbox.onChanged(e => {
-				viewButton.enabled = e;
-				appendToExistingEntryInTableCheckbox.enabled = e;
-			});
-			let appendCheckboxContainer = view.modelBuilder.groupContainer()
-				.withItems([appendToExistingEntryInTableCheckbox]).component();
-			let logToTableContainer = view.modelBuilder.flexContainer()
-				.withLayout({ flexFlow: 'row', justifyContent: 'space-between', width: 300 })
-				.withItems([this.logToTableCheckbox, viewButton]).component();
-			let logStepOutputHistoryCheckbox = view.modelBuilder.checkBox()
-				.withProperties({ label: 'Include step output in history' }).component();
-			let runAsUserOptions = this.createRunAsUserOptions(view);
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems(
-					[{
-						component: this.successActionDropdown,
-						title: CreateStepDialog.SuccessAction
-					}, {
-						component: retryFlexContainer,
-						title: ''
-					}, {
-						component: this.failureActionDropdown,
-						title: CreateStepDialog.FailureAction
-					}, {
-						component: optionsGroup,
-						title: 'Transact-SQL script (T-SQL)'
-					}, {
-						component: logToTableContainer,
-						title: ''
-					}, {
-						component: appendCheckboxContainer,
-						title: '                            '
-					}, {
-						component: logStepOutputHistoryCheckbox,
-						title: ''
-					}, {
-						component: runAsUserOptions,
-						title: ''
-					}], {
-						componentWidth: 400
-					}).component();
-
-			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
-			formWrapper.loading = false;
-			view.initializeModel(formWrapper);
-		});
-	}
-
-	private createRetryCounters(view) {
-		this.retryAttemptsBox = view.modelBuilder.inputBox()
-		.withValidation(component => component.value >= 0)
-		.withProperties({
-			inputType: 'number'
-		})
-		.component();
-		this.retryIntervalBox = view.modelBuilder.inputBox()
-			.withValidation(component => component.value >= 0)
-			.withProperties({
-				inputType: 'number'
-			}).component();
-
-		let retryAttemptsContainer = view.modelBuilder.formContainer()
-			.withFormItems(
-				[{
-					component: this.retryAttemptsBox,
-					title: 'Retry Attempts'
-				}], {
-					horizontal: false
-				})
-			.component();
-
-		let retryIntervalContainer = view.modelBuilder.formContainer()
-			.withFormItems(
-				[{
-					component: this.retryIntervalBox,
-					title: 'Retry Interval (minutes)'
-					}], {
-					horizontal: false
-				})
-			.component();
-
-		let retryFlexContainer = view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'row',
-			}).withItems([retryAttemptsContainer, retryIntervalContainer]).component();
-		return retryFlexContainer;
-	}
-
-	private createTSQLOptions(view) {
-		this.outputFileBrowserButton = view.modelBuilder.button()
-			.withProperties({ width: '20px', label: '...' }).component();
-		this.outputFileNameBox = view.modelBuilder.inputBox()
-			.withProperties({
-				width: '100px',
-				inputType: 'text'
-			}).component();
-		let outputViewButton = view.modelBuilder.button()
-			.withProperties({
-				width: '50px',
-				label: 'View'
-			}).component();
-		outputViewButton.enabled = false;
-		let outputButtonContainer = view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'row',
-				textAlign: 'right',
-				width: 120
-			}).withItems([this.outputFileBrowserButton, outputViewButton], { flex: '1 1 50%' }).component();
-		let outputFlexBox = view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'row',
-				width: 350
-			}).withItems([this.outputFileNameBox, outputButtonContainer], {
-				flex: '1 1 50%'
-			}).component();
-		this.appendToExistingFileCheckbox = view.modelBuilder.checkBox()
-			.withProperties({
-				label: 'Append output to existing file'
-			}).component();
-		this.appendToExistingFileCheckbox.enabled = false;
-		this.outputFileNameBox.onTextChanged((input) => {
-			if (input !== '') {
-				this.appendToExistingFileCheckbox.enabled = true;
-			} else {
-				this.appendToExistingFileCheckbox.enabled = false;
-			}
-		});
-		let outputFileForm = view.modelBuilder.formContainer()
-			.withFormItems([{
-				component: outputFlexBox,
-				title: 'Output file'
-			}, {
-				component: this.appendToExistingFileCheckbox,
-				title: ''
-			}], { horizontal: true, componentWidth: 200 }).component();
-		return outputFileForm;
-	}
-
-	private async execute() {
-		this.model.jobName = this.jobName;
-		this.model.id = this.stepId;
-		this.model.server = this.server;
-		this.model.stepName = this.nameTextBox.value;
-		this.model.subSystem = this.typeDropdown.value as string;
-		this.model.databaseName = this.databaseDropdown.value as string;
-		this.model.script = this.commandTextBox.value;
-		this.model.successAction = this.successActionDropdown.value as string;
-		this.model.retryAttempts = +this.retryAttemptsBox.value;
-		this.model.retryInterval = +this.retryIntervalBox.value;
-		this.model.failureAction = this.failureActionDropdown.value as string;
-		this.model.outputFileName = this.outputFileNameBox.value;
-		await this.model.save();
-	}
-
-	public async openNewStepDialog() {
-		let databases = await AgentUtils.getDatabases(this.ownerUri);
-		let queryProvider = await AgentUtils.getQueryProvider();
-		this.initializeUIComponents();
-		this.createGeneralTab(databases, queryProvider);
-		this.createAdvancedTab();
-		sqlops.window.modelviewdialog.openDialog(this.dialog);
-	}
-}

extensions/agent/client/src/mainController.ts

@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-import * as vscode from 'vscode';
-import { CreateAlertDialog } from './dialogs/createAlertDialog';
-import { CreateJobDialog } from './dialogs/createJobDialog';
-import { CreateStepDialog } from './dialogs/createStepDialog';
-import { PickScheduleDialog } from './dialogs/pickScheduleDialog';
-
-/**
- * The main controller class that initializes the extension
- */
-export class MainController {
-    protected _context: vscode.ExtensionContext;
-
-    // PUBLIC METHODS //////////////////////////////////////////////////////
-    public constructor(context: vscode.ExtensionContext) {
-        this._context = context;
-    }
-
-    /**
-     * Activates the extension
-     */
-    public activate(): void {
-        vscode.commands.registerCommand('agent.openCreateJobDialog', (ownerUri: string) => {
-            let dialog = new CreateJobDialog(ownerUri);
-            dialog.showDialog();
-        });
-        vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, jobId: string, server: string, stepId: number) => {
-			let dialog = new CreateStepDialog(ownerUri, jobId, server, stepId);
-			dialog.openNewStepDialog();
-        });
-        vscode.commands.registerCommand('agent.openPickScheduleDialog', (ownerUri: string) => {
-            let dialog = new PickScheduleDialog(ownerUri);
-            dialog.showDialog();
-        });
-        vscode.commands.registerCommand('agent.openCreateAlertDialog', (ownerUri: string) => {
-            let dialog = new CreateAlertDialog(ownerUri);
-            dialog.showDialog();
-        });
-        vscode.commands.registerCommand('agent.openCreateOperatorDialog', (ownerUri: string) => {
-        });
-        vscode.commands.registerCommand('agent.openCreateProxyDialog', (ownerUri: string) => {
-        });
-    }
-
-    /**
-     * Deactivates the extension
-     */
-    public deactivate(): void {
-    }
-}

extensions/agent/package.json

@@ -1,8 +1,8 @@
 {
   "name": "agent",
   "displayName": "SQL Server Agent",
-  "description": "Manage and troubleshoot SQL Server Agent jobs (early preview)",
-  "version": "0.29.0",
+  "description": "Manage and troubleshoot SQL Server Agent jobs",
+  "version": "0.31.4",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt",
@@ -14,7 +14,7 @@
   "activationEvents": [
     "*"
   ],
-  "main": "./client/out/main",
+  "main": "./out/main",
   "repository": {
     "type": "git",
     "url": "https://github.com/Microsoft/sqlopsstudio.git"
@@ -46,5 +46,12 @@
         }
       }
     ]
-  }
+  },
+  "dependencies": {
+    "vscode-nls": "^3.2.1"
+  },
+  "devDependencies": {
+		"mocha-junit-reporter": "^1.17.0",
+		"mocha-multi-reporters": "^1.1.7"
+	}
 }

extensions/agent/src/data/alertData.ts

@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as nls from 'vscode-nls';
+import * as vscode from 'vscode';
+import * as sqlops from 'sqlops';
+import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
+
+const localize = nls.loadMessageBundle();
+
+export class AlertData implements IAgentDialogData {
+	public static readonly AlertTypeSqlServerEventString: string = localize('alertData.DefaultAlertTypString', 'SQL Server event alert');
+	public static readonly AlertTypePerformanceConditionString: string = localize('alertDialog.PerformanceCondition', 'SQL Server performance condition alert');
+	public static readonly AlertTypeWmiEventString: string = localize('alertDialog.WmiEvent', 'WMI event alert');
+	public static readonly DefaultAlertTypeString: string =  AlertData.AlertTypeSqlServerEventString;
+
+	ownerUri: string;
+	dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
+	id: number;
+	name: string;
+	originalName: string;
+	delayBetweenResponses: number;
+	eventDescriptionKeyword: string;
+	eventSource: string;
+	hasNotification: number;
+	includeEventDescription: string;
+	isEnabled: boolean = true;
+	jobId: string;
+	jobName: string;
+	lastOccurrenceDate: string;
+	lastResponseDate: string;
+	messageId: number;
+	notificationMessage: string;
+	occurrenceCount: number;
+	performanceCondition: string;
+	severity: number;
+	databaseName: string;
+	countResetDate: string;
+	categoryName: string;
+	alertType: string = AlertData.DefaultAlertTypeString;
+	wmiEventNamespace: string;
+	wmiEventQuery: string;
+
+	constructor(ownerUri:string, alertInfo: sqlops.AgentAlertInfo) {
+		this.ownerUri = ownerUri;
+
+		if (alertInfo) {
+			this.dialogMode = AgentDialogMode.EDIT;
+			this.id = alertInfo.id;
+			this.name = alertInfo.name;
+			this.originalName = alertInfo.name;
+			this.delayBetweenResponses = alertInfo.delayBetweenResponses;
+			this.eventDescriptionKeyword = alertInfo.eventDescriptionKeyword;
+			this.eventSource = alertInfo.eventSource;
+			this.hasNotification = alertInfo.hasNotification;
+			this.includeEventDescription = alertInfo.includeEventDescription.toString();
+			this.isEnabled = alertInfo.isEnabled;
+			this.jobId = alertInfo.jobId;
+			this.jobName = alertInfo.jobName;
+			this.lastOccurrenceDate = alertInfo.lastOccurrenceDate;
+			this.lastResponseDate = alertInfo.lastResponseDate;
+			this.messageId = alertInfo.messageId;
+			this.notificationMessage = alertInfo.notificationMessage;
+			this.occurrenceCount = alertInfo.occurrenceCount;
+			this.performanceCondition = alertInfo.performanceCondition;
+			this.severity = alertInfo.severity;
+			this.databaseName = alertInfo.databaseName;
+			this.countResetDate = alertInfo.countResetDate;
+			this.categoryName = alertInfo.categoryName;
+			this.alertType = alertInfo.alertType.toString();
+			this.wmiEventNamespace = alertInfo.wmiEventNamespace;
+			this.wmiEventQuery = alertInfo.wmiEventQuery;
+		}
+	}
+
+	public async initialize() {
+	}
+
+	public async save() {
+		let agentService = await AgentUtils.getAgentService();
+		let result = this.dialogMode === AgentDialogMode.CREATE
+			? await agentService.createAlert(this.ownerUri,  this.toAgentAlertInfo())
+			: await agentService.updateAlert(this.ownerUri, this.originalName, this.toAgentAlertInfo());
+
+		if (!result || !result.success) {
+			vscode.window.showErrorMessage(
+				localize('alertData.saveErrorMessage', "Alert update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
+		}
+	}
+
+	public toAgentAlertInfo(): sqlops.AgentAlertInfo {
+		return {
+			id: this.id,
+			name: this.name,
+			delayBetweenResponses: this.delayBetweenResponses,
+			eventDescriptionKeyword: this.eventDescriptionKeyword,
+			eventSource: this.eventSource,
+			hasNotification: this.hasNotification,
+			includeEventDescription: sqlops.NotifyMethods.none, // this.includeEventDescription,
+			isEnabled: this.isEnabled,
+			jobId: this.jobId,
+			jobName: this.jobName,
+			lastOccurrenceDate: this.lastOccurrenceDate,
+			lastResponseDate: this.lastResponseDate,
+			messageId: this.messageId,
+			notificationMessage: this.notificationMessage,
+			occurrenceCount: this.occurrenceCount,
+			performanceCondition: this.performanceCondition,
+			severity: this.severity,
+			databaseName: this.databaseName,
+			countResetDate: this.countResetDate,
+			categoryName: this.categoryName,
+			alertType: AlertData.getAlertTypeFromString(this.alertType),
+			wmiEventNamespace: this.wmiEventNamespace,
+			wmiEventQuery: this.wmiEventQuery
+		};
+	}
+
+	private static getAlertTypeFromString(alertTypeString: string): sqlops.AlertType {
+		if (alertTypeString === AlertData.AlertTypePerformanceConditionString) {
+			return sqlops.AlertType.sqlServerPerformanceCondition;
+		} else if (alertTypeString === AlertData.AlertTypeWmiEventString) {
+			return sqlops.AlertType.wmiEvent;
+		} else {
+			return sqlops.AlertType.sqlServerEvent;
+		}
+	}
+}

extensions/agent/src/data/jobData.ts

@@ -4,26 +4,32 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import * as nls from 'vscode-nls';
 import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
 import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
 
-export class CreateJobData {
+const localize = nls.loadMessageBundle();
 
-	private readonly JobCompletionActionCondition_Always: string = 'When the job completes';
-	private readonly JobCompletionActionCondition_OnFailure: string = 'When the job fails';
-	private readonly JobCompletionActionCondition_OnSuccess: string = 'When the job succeeds';
+export class JobData implements IAgentDialogData {
+
+	private readonly JobCompletionActionCondition_Always: string =  localize('jobData.whenJobCompletes', 'When the job completes');
+	private readonly JobCompletionActionCondition_OnFailure: string = localize('jobData.whenJobFails', 'When the job fails');
+	private readonly JobCompletionActionCondition_OnSuccess: string = localize('jobData.whenJobSucceeds', 'When the job succeeds');
 
 	// Error Messages
-	private readonly CreateJobErrorMessage_NameIsEmpty = 'Job name must be provided';
+	private readonly CreateJobErrorMessage_NameIsEmpty = localize('jobData.jobNameRequired', 'Job name must be provided');
 
 	private _ownerUri: string;
 	private _jobCategories: string[];
 	private _operators: string[];
-	private _agentService: sqlops.AgentServicesProvider;
 	private _defaultOwner: string;
 	private _jobCompletionActionConditions: sqlops.CategoryValue[];
 
+	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
 	public name: string;
+	public originalName: string;
 	public enabled: boolean = true;
 	public description: string;
 	public category: string;
@@ -39,8 +45,21 @@ export class CreateJobData {
 	public jobSchedules: sqlops.AgentJobScheduleInfo[];
 	public alerts: sqlops.AgentAlertInfo[];
 
-	constructor(ownerUri: string) {
+	constructor(
+		ownerUri: string,
+		jobInfo: sqlops.AgentJobInfo = undefined,
+		private _agentService: sqlops.AgentServicesProvider = undefined) {
+
 		this._ownerUri = ownerUri;
+		if (jobInfo) {
+			this.dialogMode = AgentDialogMode.EDIT;
+			this.name = jobInfo.name;
+			this.originalName = jobInfo.name;
+			this.owner = jobInfo.owner;
+			this.category = jobInfo.category;
+			this.description = jobInfo.description;
+			this.enabled = jobInfo.enabled;
+		}
 	}
 
 	public get jobCategories(): string[] {
@@ -91,7 +110,39 @@ export class CreateJobData {
 	}
 
 	public async save() {
-		await this._agentService.createJob(this.ownerUri, {
+		let jobInfo: sqlops.AgentJobInfo = this.toAgentJobInfo();
+		let result = this.dialogMode === AgentDialogMode.CREATE
+			? await this._agentService.createJob(this.ownerUri,  jobInfo)
+			: await this._agentService.updateJob(this.ownerUri, this.originalName, jobInfo);
+
+		if (!result || !result.success) {
+			vscode.window.showErrorMessage(
+				localize('jobData.saveErrorMessage', "Job update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
+		}
+	}
+
+	public validate(): { valid: boolean, errorMessages: string[] } {
+		let validationErrors: string[] = [];
+
+		if (!(this.name && this.name.trim())) {
+			validationErrors.push(this.CreateJobErrorMessage_NameIsEmpty);
+		}
+
+		return {
+			valid: validationErrors.length === 0,
+			errorMessages: validationErrors
+		};
+	}
+
+	public addJobSchedule(schedule: sqlops.AgentJobScheduleInfo) {
+		let existingSchedule = this.jobSchedules.find(item => item.name === schedule.name);
+		if (!existingSchedule) {
+			this.jobSchedules.push(schedule);
+		}
+	}
+
+	public toAgentJobInfo(): sqlops.AgentJobInfo {
+		return {
 			name: this.name,
 			owner: this.owner,
 			description: this.description,
@@ -121,30 +172,6 @@ export class CreateJobData {
 			lastRun: '',
 			nextRun: '',
 			jobId: ''
-		}).then(result => {
-			if (!result.success) {
-				console.info(result.errorMessage);
-			}
-		});
-	}
-
-	public validate(): { valid: boolean, errorMessages: string[] } {
-		let validationErrors: string[] = [];
-
-		if (!(this.name && this.name.trim())) {
-			validationErrors.push(this.CreateJobErrorMessage_NameIsEmpty);
-		}
-
-		return {
-			valid: validationErrors.length === 0,
-			errorMessages: validationErrors
 		};
 	}
-
-	public addJobSchedule(schedule: sqlops.AgentJobScheduleInfo) {
-		let existingSchedule = this.jobSchedules.find(item => item.name === schedule.name);
-		if (!existingSchedule) {
-			this.jobSchedules.push(schedule);
-		}
-	}
 }

extensions/agent/src/data/jobStepData.ts

@@ -5,8 +5,10 @@
 'use strict';
 
 import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
 
-export class CreateStepData {
+export class JobStepData implements IAgentDialogData {
+	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
 	public ownerUri: string;
 	public jobId: string; //
 	public jobName: string;
@@ -37,6 +39,9 @@ export class CreateStepData {
 		this.ownerUri = ownerUri;
 	}
 
+	public async initialize() {
+	}
+
 	public async save() {
 		let agentService = await AgentUtils.getAgentService();
 		agentService.createJobStep(this.ownerUri, {

extensions/agent/src/data/operatorData.ts

@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as sqlops from 'sqlops';
+import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
+
+export class OperatorData implements IAgentDialogData {
+	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
+	ownerUri: string;
+	name: string;
+	id: number;
+	emailAddress: string;
+	enabled: boolean;
+	lastEmailDate: string;
+	lastNetSendDate: string;
+	lastPagerDate: string;
+	pagerAddress: string;
+	categoryName: string;
+	pagerDays: string;
+	saturdayPagerEndTime: string;
+	saturdayPagerStartTime: string;
+	sundayPagerEndTime: string;
+	sundayPagerStartTime: string;
+	netSendAddress: string;
+	weekdayPagerStartTime: string;
+	weekdayPagerEndTime: string;
+
+	constructor(ownerUri:string, operatorInfo: sqlops.AgentOperatorInfo) {
+		this.ownerUri = ownerUri;
+
+		if (operatorInfo) {
+			this.dialogMode = AgentDialogMode.EDIT;
+			this.name = operatorInfo.name;
+			this.enabled = operatorInfo.enabled;
+		}
+	}
+
+	public async initialize() {
+	}
+
+	public async save() {
+		let agentService = await AgentUtils.getAgentService();
+		let result = await agentService.createOperator(this.ownerUri,  this.toAgentOperatorInfo());
+		if (!result || !result.success) {
+			// TODO handle error here
+		}
+	}
+
+	public toAgentOperatorInfo(): sqlops.AgentOperatorInfo {
+		return {
+			name: this.name,
+			id: this.id,
+			emailAddress: this.emailAddress,
+			enabled: this.enabled,
+			lastEmailDate: this.lastEmailDate,
+			lastNetSendDate: this.lastNetSendDate,
+			lastPagerDate: this.lastPagerDate,
+			pagerAddress: this.pagerAddress,
+			categoryName: this.categoryName,
+			pagerDays: sqlops.WeekDays.weekDays, //this.pagerDays,
+			saturdayPagerEndTime: this.saturdayPagerEndTime,
+			saturdayPagerStartTime: this.saturdayPagerStartTime,
+			sundayPagerEndTime: this.sundayPagerEndTime,
+			sundayPagerStartTime: this.sundayPagerStartTime,
+			netSendAddress: this.netSendAddress,
+			weekdayPagerStartTime: this.weekdayPagerStartTime,
+			weekdayPagerEndTime: this.weekdayPagerEndTime
+		};
+	}
+}

extensions/agent/src/data/pickScheduleData.ts

@@ -6,8 +6,10 @@
 
 import * as sqlops from 'sqlops';
 import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
 
-export class PickScheduleData {
+export class PickScheduleData implements IAgentDialogData {
+	public dialogMode: AgentDialogMode = AgentDialogMode.VIEW;
 	public ownerUri: string;
 	public schedules: sqlops.AgentJobScheduleInfo[];
 	public selectedSchedule: sqlops.AgentJobScheduleInfo;

extensions/agent/src/data/proxyData.ts

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as sqlops from 'sqlops';
+import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
+
+export class ProxyData implements IAgentDialogData {
+	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
+	ownerUri: string;
+	id: number;
+	accountName: string;
+	description: string;
+	credentialName: string;
+	credentialIdentity: string;
+	credentialId: number;
+	isEnabled: boolean;
+
+	constructor(ownerUri:string, proxyInfo: sqlops.AgentProxyInfo) {
+		this.ownerUri = ownerUri;
+
+		if (proxyInfo) {
+			this.accountName = proxyInfo.accountName;
+			this.credentialName = proxyInfo.credentialName;
+			this.description = proxyInfo.description;
+		}
+	}
+
+	public async initialize() {
+	}
+
+	public async save() {
+		let agentService = await AgentUtils.getAgentService();
+		let result = await agentService.createProxy(this.ownerUri,  this.toAgentProxyInfo());
+		if (!result || !result.success) {
+			// TODO handle error here
+		}
+	}
+
+	public toAgentProxyInfo(): sqlops.AgentProxyInfo {
+		return {
+			id: this.id,
+			accountName: this.accountName,
+			description: this.description,
+			credentialName: this.credentialName,
+			credentialIdentity: this.credentialIdentity,
+			credentialId: this.credentialId,
+			isEnabled: this.isEnabled
+		};
+	}
+}

extensions/agent/src/data/scheduleData.ts

@@ -6,8 +6,10 @@
 
 import * as sqlops from 'sqlops';
 import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
 
-export class CreateScheduleData {
+export class ScheduleData implements IAgentDialogData {
+	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
 	public ownerUri: string;
 	public schedules: sqlops.AgentJobScheduleInfo[];
 	public selectedSchedule: sqlops.AgentJobScheduleInfo;

extensions/agent/src/dialogs/agentDialog.ts

@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as nls from 'vscode-nls';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
+
+const localize = nls.loadMessageBundle();
+
+export abstract class AgentDialog<T extends IAgentDialogData> {
+
+	private static readonly OkButtonText: string = localize('agentDialog.OK', 'OK');
+	private static readonly CancelButtonText: string = localize('agentDialog.Cancel', 'Cancel');
+
+	protected _onSuccess: vscode.EventEmitter<T> = new vscode.EventEmitter<T>();
+	public readonly onSuccess: vscode.Event<T> = this._onSuccess.event;
+	public dialog: sqlops.window.modelviewdialog.Dialog;
+
+	constructor(public ownerUri: string, public model: T, public title: string) {
+	}
+
+	public get dialogMode(): AgentDialogMode {
+		return this.model.dialogMode;
+	}
+
+	protected abstract async updateModel();
+
+	protected abstract async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog);
+
+	public async openDialog() {
+		this.dialog = sqlops.window.modelviewdialog.createDialog(this.title);
+
+		await this.model.initialize();
+
+		await this.initializeDialog(this.dialog);
+
+		this.dialog.okButton.label = AgentDialog.OkButtonText;
+		this.dialog.okButton.onClick(async () => await this.execute());
+
+		this.dialog.cancelButton.label = AgentDialog.CancelButtonText;
+		this.dialog.cancelButton.onClick(async () => await this.cancel());
+
+		sqlops.window.modelviewdialog.openDialog(this.dialog);
+	}
+
+	protected async execute() {
+		this.updateModel();
+		let success = await this.model.save();
+		if (success) {
+			this._onSuccess.fire(this.model);
+		}
+	}
+
+	protected async cancel() {
+	}
+
+	protected getActualConditionValue(checkbox: sqlops.CheckBoxComponent, dropdown: sqlops.DropDownComponent): sqlops.JobCompletionActionCondition {
+		return checkbox.checked ? Number(this.getDropdownValue(dropdown)) : sqlops.JobCompletionActionCondition.Never;
+	}
+
+	protected getDropdownValue(dropdown: sqlops.DropDownComponent): string {
+		return (typeof dropdown.value === 'string') ? dropdown.value : dropdown.value.name;
+	}
+
+	protected setConditionDropdownSelectedValue(dropdown: sqlops.DropDownComponent, selectedValue: number) {
+		let idx: number = 0;
+		for (idx = 0; idx < dropdown.values.length; idx++) {
+			if (Number((<sqlops.CategoryValue>dropdown.values[idx]).name) === selectedValue) {
+				dropdown.value = dropdown.values[idx];
+				break;
+			}
+		}
+	}
+}

extensions/agent/src/dialogs/alertDialog.ts

@@ -0,0 +1,528 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as nls from 'vscode-nls';
+import * as sqlops from 'sqlops';
+import { AgentDialog } from './agentDialog';
+import { AgentUtils } from '../agentUtils';
+import { AlertData } from '../data/alertData';
+import { OperatorDialog } from './operatorDialog';
+import { JobDialog } from './jobDialog';
+
+const localize = nls.loadMessageBundle();
+
+export class AlertDialog extends AgentDialog<AlertData> {
+
+	// Top level
+	private static readonly CreateDialogTitle: string = localize('alertDialog.createAlert', 'Create Alert');
+	private static readonly EditDialogTitle: string = localize('alertDialog.editAlert', 'Edit Alert');
+	private static readonly GeneralTabText: string = localize('alertDialog.General', 'General');
+	private static readonly ResponseTabText: string = localize('alertDialog.Response', 'Response');
+	private static readonly OptionsTabText: string = localize('alertDialog.Options', 'Options');
+	private static readonly EventAlertText: string = localize('alertDialog.eventAlert', 'Event alert definition');
+
+	// General tab strings
+	private static readonly NameLabel: string = localize('alertDialog.Name', 'Name');
+	private static readonly TypeLabel: string = localize('alertDialog.Type', 'Type');
+	private static readonly EnabledCheckboxLabel: string = localize('alertDialog.Enabled', 'Enabled');
+	private static readonly DatabaseLabel: string = localize('alertDialog.DatabaseName', 'Database name');
+	private static readonly ErrorNumberLabel: string = localize('alertDialog.ErrorNumber', 'Error number');
+	private static readonly SeverityLabel: string = localize('alertDialog.Severity', 'Severity');
+	private static readonly RaiseIfMessageContainsLabel: string = localize('alertDialog.RaiseAlertContains', 'Raise alert when message contains');
+	private static readonly MessageTextLabel: string = localize('alertDialog.MessageText', 'Message text');
+	private static readonly AlertSeverity001Label: string = localize('alertDialog.Severity001', '001 - Miscellaneous System Information');
+	private static readonly AlertSeverity002Label: string = localize('alertDialog.Severity002', '002 - Reserved');
+	private static readonly AlertSeverity003Label: string = localize('alertDialog.Severity003', '003 - Reserved');
+	private static readonly AlertSeverity004Label: string = localize('alertDialog.Severity004', '004 - Reserved');
+	private static readonly AlertSeverity005Label: string = localize('alertDialog.Severity005', '005 - Reserved');
+	private static readonly AlertSeverity006Label: string = localize('alertDialog.Severity006', '006 - Reserved');
+	private static readonly AlertSeverity007Label: string = localize('alertDialog.Severity007', '007 - Notification: Status Information');
+	private static readonly AlertSeverity008Label: string = localize('alertDialog.Severity008', '008 - Notification: User Intervention Required');
+	private static readonly AlertSeverity009Label: string = localize('alertDialog.Severity009', '009 - User Defined');
+	private static readonly AlertSeverity010Label: string = localize('alertDialog.Severity010', '010 - Information');
+	private static readonly AlertSeverity011Label: string = localize('alertDialog.Severity011', '011 - Specified Database Object Not Found');
+	private static readonly AlertSeverity012Label: string = localize('alertDialog.Severity012', '012 - Unused');
+	private static readonly AlertSeverity013Label: string = localize('alertDialog.Severity013', '013 - User Transaction Syntax Error');
+	private static readonly AlertSeverity014Label: string = localize('alertDialog.Severity014', '014 - Insufficient Permission');
+	private static readonly AlertSeverity015Label: string = localize('alertDialog.Severity015', '015 - Syntax Error in SQL Statements');
+	private static readonly AlertSeverity016Label: string = localize('alertDialog.Severity016', '016 - Miscellaneous User Error');
+	private static readonly AlertSeverity017Label: string = localize('alertDialog.Severity017', '017 - Insufficient Resources');
+	private static readonly AlertSeverity018Label: string = localize('alertDialog.Severity018', '018 - Nonfatal Internal Error');
+	private static readonly AlertSeverity019Label: string = localize('alertDialog.Severity019', '019 - Fatal Error in Resource');
+	private static readonly AlertSeverity020Label: string = localize('alertDialog.Severity020', '020 - Fatal Error in Current Process');
+	private static readonly AlertSeverity021Label: string = localize('alertDialog.Severity021', '021 - Fatal Error in Database Processes');
+	private static readonly AlertSeverity022Label: string = localize('alertDialog.Severity022', '022 - Fatal Error: Table Integrity Suspect');
+	private static readonly AlertSeverity023Label: string = localize('alertDialog.Severity023', '023 - Fatal Error: Database Integrity Suspect');
+	private static readonly AlertSeverity024Label: string = localize('alertDialog.Severity024', '024 - Fatal Error: Hardware Error');
+	private static readonly AlertSeverity025Label: string = localize('alertDialog.Severity025', '025 - Fatal Error');
+	private static readonly AllDatabases: string = localize('alertDialog.AllDatabases', '<all databases>');
+
+	private static readonly AlertTypes: string[]  = [
+		AlertData.AlertTypeSqlServerEventString,
+		// Disabled until next release
+		// AlertData.AlertTypePerformanceConditionString,
+		// AlertData.AlertTypeWmiEventString
+	];
+
+	private static readonly AlertSeverities: string[]  = [
+		AlertDialog.AlertSeverity001Label,
+		AlertDialog.AlertSeverity002Label,
+		AlertDialog.AlertSeverity003Label,
+		AlertDialog.AlertSeverity004Label,
+		AlertDialog.AlertSeverity005Label,
+		AlertDialog.AlertSeverity006Label,
+		AlertDialog.AlertSeverity007Label,
+		AlertDialog.AlertSeverity008Label,
+		AlertDialog.AlertSeverity009Label,
+		AlertDialog.AlertSeverity010Label,
+		AlertDialog.AlertSeverity011Label,
+		AlertDialog.AlertSeverity012Label,
+		AlertDialog.AlertSeverity013Label,
+		AlertDialog.AlertSeverity014Label,
+		AlertDialog.AlertSeverity015Label,
+		AlertDialog.AlertSeverity016Label,
+		AlertDialog.AlertSeverity017Label,
+		AlertDialog.AlertSeverity018Label,
+		AlertDialog.AlertSeverity019Label,
+		AlertDialog.AlertSeverity020Label,
+		AlertDialog.AlertSeverity021Label,
+		AlertDialog.AlertSeverity022Label,
+		AlertDialog.AlertSeverity023Label,
+		AlertDialog.AlertSeverity024Label,
+		AlertDialog.AlertSeverity025Label
+	];
+
+	// Response tab strings
+	private static readonly ExecuteJobCheckBoxLabel: string = localize('alertDialog.ExecuteJob', 'Execute Job');
+	private static readonly ExecuteJobTextBoxLabel: string = localize('alertDialog.ExecuteJobName', 'Job Name');
+	private static readonly NotifyOperatorsTextBoxLabel: string =  localize('alertDialog.NotifyOperators', 'Notify Operators');
+	private static readonly NewJobButtonLabel: string =  localize('alertDialog.NewJob', 'New Job');
+	private static readonly OperatorListLabel: string =  localize('alertDialog.OperatorList', 'Operator List');
+	private static readonly OperatorNameColumnLabel: string =  localize('alertDialog.OperatorName', 'Operator');
+	private static readonly OperatorEmailColumnLabel: string =  localize('alertDialog.OperatorEmail', 'E-mail');
+	private static readonly OperatorPagerColumnLabel: string =  localize('alertDialog.OperatorPager', 'Pager');
+	private static readonly NewOperatorButtonLabel: string =  localize('alertDialog.NewOperator', 'New Operator');
+
+	// Options tab strings
+	private static readonly IncludeErrorInEmailCheckBoxLabel: string =  localize('alertDialog.IncludeErrorInEmail', 'Include alert error text in e-mail');
+	private static readonly IncludeErrorInPagerCheckBoxLabel: string =  localize('alertDialog.IncludeErrorInPager', 'Include alert error text in pager');
+	private static readonly AdditionalMessageTextBoxLabel: string =  localize('alertDialog.AdditionalNotification', 'Additional notification message to send');
+	private static readonly DelayBetweenResponsesTextBoxLabel: string =  localize('alertDialog.DelayBetweenResponse', 'Delay between responses');
+	private static readonly DelayMinutesTextBoxLabel: string =  localize('alertDialog.DelayMinutes', 'Delay Minutes');
+	private static readonly DelaySecondsTextBoxLabel: string =  localize('alertDialog.DelaySeconds', 'Delay Seconds');
+
+	// UI Components
+	private generalTab: sqlops.window.modelviewdialog.DialogTab;
+	private responseTab: sqlops.window.modelviewdialog.DialogTab;
+	private optionsTab: sqlops.window.modelviewdialog.DialogTab;
+
+	// General tab controls
+	private nameTextBox: sqlops.InputBoxComponent;
+	private typeDropDown: sqlops.DropDownComponent;
+	private severityDropDown: sqlops.DropDownComponent;
+	private databaseDropDown: sqlops.DropDownComponent;
+	private enabledCheckBox: sqlops.CheckBoxComponent;
+	private errorNumberRadioButton: sqlops.RadioButtonComponent;
+	private severityRadioButton: sqlops.RadioButtonComponent;
+	private errorNumberTextBox: sqlops.InputBoxComponent;
+
+	private raiseAlertMessageCheckBox: sqlops.CheckBoxComponent;
+	private raiseAlertMessageTextBox: sqlops.InputBoxComponent;
+
+	// Response tab controls
+	private executeJobTextBox: sqlops.InputBoxComponent;
+	private executeJobCheckBox: sqlops.CheckBoxComponent;
+	private newJobButton: sqlops.ButtonComponent;
+	private notifyOperatorsCheckBox: sqlops.CheckBoxComponent;
+	private operatorsTable: sqlops.TableComponent;
+	private newOperatorButton: sqlops.ButtonComponent;
+
+	// Options tab controls
+	private additionalMessageTextBox: sqlops.InputBoxComponent;
+	private includeErrorInEmailTextBox: sqlops.CheckBoxComponent;
+	private includeErrorInPagerTextBox: sqlops.CheckBoxComponent;
+	private delayMinutesTextBox: sqlops.InputBoxComponent;
+	private delaySecondsTextBox: sqlops.InputBoxComponent;
+
+	private jobs: string[];
+	private databases: string[];
+
+	constructor(ownerUri: string, alertInfo: sqlops.AgentAlertInfo = undefined, jobs: string[]) {
+		super(ownerUri,
+			new AlertData(ownerUri, alertInfo),
+			alertInfo ? AlertDialog.EditDialogTitle : AlertDialog.CreateDialogTitle);
+			this.jobs = jobs;
+	}
+
+	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
+		this.databases = await AgentUtils.getDatabases(this.ownerUri);
+		this.databases.unshift(AlertDialog.AllDatabases);
+
+		this.generalTab = sqlops.window.modelviewdialog.createTab(AlertDialog.GeneralTabText);
+		this.responseTab = sqlops.window.modelviewdialog.createTab(AlertDialog.ResponseTabText);
+		this.optionsTab = sqlops.window.modelviewdialog.createTab(AlertDialog.OptionsTabText);
+
+		this.initializeGeneralTab(this.databases, dialog);
+		this.initializeResponseTab();
+		this.initializeOptionsTab();
+
+		dialog.content = [this.generalTab, this.responseTab, this.optionsTab];
+	}
+
+	private initializeGeneralTab(databases: string[], dialog: sqlops.window.modelviewdialog.Dialog) {
+		this.generalTab.registerContent(async view => {
+			// create controls
+			this.nameTextBox = view.modelBuilder.inputBox().component();
+			this.nameTextBox.required = true;
+			this.nameTextBox.onTextChanged(() => {
+				if (this.nameTextBox.value.length > 0) {
+					dialog.okButton.enabled = true;
+				} else {
+					dialog.okButton.enabled = false;
+				}
+			});
+			this.enabledCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.EnabledCheckboxLabel
+				}).component();
+
+			this.enabledCheckBox.checked = true;
+
+			this.databaseDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: databases[0],
+					values: databases,
+					width: '100%'
+				}).component();
+
+			this.typeDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: '',
+					values: AlertDialog.AlertTypes,
+					width: '100%'
+				}).component();
+
+			this.severityRadioButton = view.modelBuilder.radioButton()
+				.withProperties({
+					value: 'serverity',
+					name: 'alertTypeOptions',
+					label: AlertDialog.SeverityLabel,
+					checked: true
+				}).component();
+			this.severityRadioButton.checked = true;
+
+			this.severityDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: AlertDialog.AlertSeverities[0],
+					values: AlertDialog.AlertSeverities,
+					width: '100%'
+				}).component();
+
+			this.errorNumberRadioButton = view.modelBuilder.radioButton()
+				.withProperties({
+					value: 'errorNumber',
+					name: 'alertTypeOptions',
+					label: AlertDialog.ErrorNumberLabel
+				}).component();
+
+			this.errorNumberTextBox = view.modelBuilder.inputBox()
+				.withProperties({
+					width: '100%'
+				})
+				.component();
+			this.errorNumberTextBox.enabled = false;
+
+			this.errorNumberRadioButton.onDidClick(() => {
+				this.errorNumberTextBox.enabled = true;
+				this.severityDropDown.enabled = false;
+			});
+
+			this.severityRadioButton.onDidClick(() => {
+				this.errorNumberTextBox.enabled = false;
+				this.severityDropDown.enabled = true;
+			});
+
+			this.raiseAlertMessageCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.RaiseIfMessageContainsLabel
+				}).component();
+
+			this.raiseAlertMessageTextBox = view.modelBuilder.inputBox().component();
+			this.raiseAlertMessageTextBox.enabled = false;
+
+			this.raiseAlertMessageCheckBox.onChanged(() => {
+				this.raiseAlertMessageTextBox.enabled = this.raiseAlertMessageCheckBox.checked;
+			});
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.nameTextBox,
+					title: AlertDialog.NameLabel
+				}, {
+					component: this.enabledCheckBox,
+					title: ''
+				}, {
+					component: this.typeDropDown,
+					title: AlertDialog.TypeLabel
+				}, {
+					components: [{
+						component: this.databaseDropDown,
+						title: AlertDialog.DatabaseLabel
+					},
+					{
+						component: this.severityRadioButton,
+						title: ''
+					},
+					{
+						component: this.severityDropDown,
+						title: ''
+					},
+					{
+						component: this.errorNumberRadioButton,
+						title: ''
+					},
+					{
+						component: this.errorNumberTextBox,
+						title: ''
+					},
+					{
+						component: this.raiseAlertMessageCheckBox,
+						title: ''
+					}, {
+						component: this.raiseAlertMessageTextBox,
+						title: AlertDialog.MessageTextLabel
+					}],
+					title: AlertDialog.EventAlertText
+				}
+			]).withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+
+			// initialize control values
+			this.nameTextBox.value = this.model.name;
+			this.raiseAlertMessageTextBox.value = this.model.eventDescriptionKeyword;
+			this.typeDropDown.value = this.model.alertType;
+			this.enabledCheckBox.checked = this.model.isEnabled;
+
+			if (this.model.messageId > 0) {
+				this.errorNumberRadioButton.checked = true;
+				this.errorNumberTextBox.value = this.model.messageId.toString();
+			}
+
+			if (this.model.severity > 0) {
+				this.severityRadioButton.checked = true;
+				this.severityDropDown.value = this.severityDropDown.values[this.model.severity-1];
+			}
+
+			if (this.model.databaseName) {
+				let idx = this.databases.indexOf(this.model.databaseName);
+				if (idx >= 0) {
+					this.databaseDropDown.value = this.databases[idx];
+				}
+			}
+		});
+	}
+
+	private initializeResponseTab() {
+		this.responseTab.registerContent(async view => {
+			this.executeJobCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.ExecuteJobCheckBoxLabel
+				}).component();
+
+			this.executeJobTextBox = view.modelBuilder.inputBox()
+				.withProperties({ width: 375 })
+				.component();
+			this.executeJobTextBox.enabled = false;
+			this.newJobButton = view.modelBuilder.button().withProperties({
+					label: AlertDialog.NewJobButtonLabel,
+					width: 80
+				}).component();
+			this.newJobButton.enabled = false;
+			this.newJobButton.onDidClick(() => {
+				let jobDialog = new JobDialog(this.ownerUri);
+				jobDialog.openDialog();
+			});
+
+			this.executeJobCheckBox.onChanged(() => {
+				if (this.executeJobCheckBox.checked) {
+					this.executeJobTextBox.enabled = true;
+					this.newJobButton.enabled = true;
+				} else {
+					this.executeJobTextBox.enabled = false;
+					this.newJobButton.enabled = false;
+				}
+			});
+
+			let executeJobContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.executeJobTextBox,
+					title: AlertDialog.ExecuteJobTextBoxLabel
+				}, {
+					component: this.newJobButton,
+					title: AlertDialog.NewJobButtonLabel
+				}], { componentWidth: '100%'}).component();
+
+			this.notifyOperatorsCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.NotifyOperatorsTextBoxLabel
+				}).component();
+
+			this.operatorsTable = view.modelBuilder.table()
+				.withProperties({
+					columns: [
+						AlertDialog.OperatorNameColumnLabel,
+						AlertDialog.OperatorEmailColumnLabel,
+						AlertDialog.OperatorPagerColumnLabel
+					],
+					data: [],
+					height: 500,
+					width: 375
+				}).component();
+
+			this.newOperatorButton = view.modelBuilder.button().withProperties({
+					label: AlertDialog.NewOperatorButtonLabel,
+					width: 80
+				}).component();
+
+			this.operatorsTable.enabled = false;
+			this.newOperatorButton.enabled = false;
+
+			this.newOperatorButton.onDidClick(() => {
+				let operatorDialog = new OperatorDialog(this.ownerUri);
+				operatorDialog.openDialog();
+			});
+
+			this.notifyOperatorsCheckBox.onChanged(() => {
+				if (this.notifyOperatorsCheckBox.checked) {
+					this.operatorsTable.enabled = true;
+					this.newOperatorButton.enabled = true;
+				} else {
+					this.operatorsTable.enabled = false;
+					this.newOperatorButton.enabled = false;
+				}
+			});
+
+			let notifyOperatorContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.operatorsTable,
+					title: AlertDialog.OperatorListLabel
+				}, {
+					component: this.newOperatorButton,
+					title: ''
+				}], { componentWidth: '100%'}).component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.executeJobCheckBox,
+					title: ''
+				}, {
+					component: executeJobContainer,
+					title: ''
+				}, {
+					component: this.notifyOperatorsCheckBox,
+					title: ''
+				}, {
+					component: notifyOperatorContainer,
+					title: ''
+				}])
+				.withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+		});
+	}
+
+	private initializeOptionsTab() {
+		this.optionsTab.registerContent(async view => {
+
+			this.includeErrorInEmailTextBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.IncludeErrorInEmailCheckBoxLabel
+				}).component();
+
+			this.includeErrorInPagerTextBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.IncludeErrorInPagerCheckBoxLabel
+				}).component();
+
+			this.additionalMessageTextBox = view.modelBuilder.inputBox().component();
+
+			this.delayMinutesTextBox = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'number',
+					placeHolder: 0
+				})
+				.component();
+
+			this.delaySecondsTextBox = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'number',
+					placeHolder: 0
+				})
+				.component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.includeErrorInEmailTextBox,
+					title: ''
+				}, {
+					component: this.includeErrorInPagerTextBox,
+					title: ''
+				}, {
+					component: this.additionalMessageTextBox,
+					title: AlertDialog.AdditionalMessageTextBoxLabel
+				}, {
+					component: this.delayMinutesTextBox,
+					title: AlertDialog.DelayMinutesTextBoxLabel
+				}, {
+					component: this.delaySecondsTextBox,
+					title: AlertDialog.DelaySecondsTextBoxLabel
+				}]).withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+		});
+	}
+
+	private getSeverityNumber(): number {
+		let selected = this.getDropdownValue(this.severityDropDown);
+		let severityNumber: number = 0;
+		if (selected) {
+			let index = AlertDialog.AlertSeverities.indexOf(selected);
+			if (index >= 0) {
+				severityNumber = index + 1;
+			}
+		}
+		return severityNumber;
+	}
+
+	protected updateModel() {
+		this.model.name = this.nameTextBox.value;
+		this.model.isEnabled = this.enabledCheckBox.checked;
+
+		this.model.alertType = this.getDropdownValue(this.typeDropDown);
+		let databaseName = this.getDropdownValue(this.databaseDropDown);
+		this.model.databaseName = (databaseName !== AlertDialog.AllDatabases) ? databaseName : undefined;
+
+		if (this.severityRadioButton.checked) {
+			this.model.severity = this.getSeverityNumber();
+			this.model.messageId = 0;
+		} else {
+			this.model.severity = 0;
+			this.model.messageId = +this.errorNumberTextBox.value;
+		}
+
+		if (this.raiseAlertMessageCheckBox.checked) {
+			this.model.eventDescriptionKeyword = this.raiseAlertMessageTextBox.value;
+		} else {
+			this.model.eventDescriptionKeyword = '';
+		}
+		let minutes  = this.delayMinutesTextBox.value ? +this.delayMinutesTextBox.value : 0;
+		let seconds = this.delaySecondsTextBox.value ? +this.delaySecondsTextBox : 0;
+		this.model.delayBetweenResponses = minutes + seconds;
+
+	}
+}

extensions/agent/src/dialogs/jobDialog.ts

@@ -3,61 +3,67 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
+import * as nls from 'vscode-nls';
 import * as sqlops from 'sqlops';
-import { CreateJobData } from '../data/createJobData';
-import { CreateStepDialog } from './createStepDialog';
+import { JobData } from '../data/jobData';
+import { JobStepDialog } from './jobStepDialog';
 import { PickScheduleDialog } from './pickScheduleDialog';
-import { CreateAlertDialog } from './createAlertDialog';
+import { AlertDialog } from './alertDialog';
+import { AgentDialog } from './agentDialog';
 
-export class CreateJobDialog {
+const localize = nls.loadMessageBundle();
+
+export class JobDialog extends AgentDialog<JobData>  {
 
 	// TODO: localize
 	// Top level
-	private readonly DialogTitle: string = 'New Job';
-	private readonly OkButtonText: string = 'OK';
-	private readonly CancelButtonText: string = 'Cancel';
-	private readonly GeneralTabText: string = 'General';
-	private readonly StepsTabText: string = 'Steps';
-	private readonly SchedulesTabText: string = 'Schedules';
-	private readonly AlertsTabText: string = 'Alerts';
-	private readonly NotificationsTabText: string = 'Notifications';
+	private static readonly CreateDialogTitle: string = localize('jobDialog.newJob', 'New Job');
+	private static readonly EditDialogTitle: string = localize('jobDialog.editJob', 'Edit Job');
+	private readonly GeneralTabText: string = localize('jobDialog.general', 'General');
+	private readonly StepsTabText: string = localize('jobDialog.steps', 'Steps');
+	private readonly SchedulesTabText: string = localize('jobDialog.schedules', 'Schedules');
+	private readonly AlertsTabText: string = localize('jobDialog.alerts', 'Alerts');
+	private readonly NotificationsTabText: string = localize('jobDialog.notifications', 'Notifications');
+	private readonly BlankJobNameErrorText: string = localize('jobDialog.blankJobNameError', 'The name of the job cannot be blank.');
 
 	// General tab strings
-	private readonly NameTextBoxLabel: string = 'Name';
-	private readonly OwnerTextBoxLabel: string = 'Owner';
-	private readonly CategoryDropdownLabel: string = 'Category';
-	private readonly DescriptionTextBoxLabel: string = 'Description';
-	private readonly EnabledCheckboxLabel: string = 'Enabled';
+	private readonly NameTextBoxLabel: string = localize('jobDialog.name', 'Name');
+	private readonly OwnerTextBoxLabel: string = localize('jobDialog.owner', 'Owner');
+	private readonly CategoryDropdownLabel: string = localize('jobDialog.category', 'Category');
+	private readonly DescriptionTextBoxLabel: string = localize('jobDialog.description', 'Description');
+	private readonly EnabledCheckboxLabel: string = localize('jobDialog.enabled', 'Enabled');
 
 	// Steps tab strings
-	private readonly JobStepsTopLabelString: string = 'Job step list';
-	private readonly StepsTable_StepColumnString: string = 'Step';
-	private readonly StepsTable_NameColumnString: string = 'Name';
-	private readonly StepsTable_TypeColumnString: string = 'Type';
-	private readonly StepsTable_SuccessColumnString: string = 'On Success';
-	private readonly StepsTable_FailureColumnString: string = 'On Failure';
-	private readonly NewStepButtonString: string = 'New...';
-	private readonly InsertStepButtonString: string = 'Insert...';
-	private readonly EditStepButtonString: string = 'Edit';
-	private readonly DeleteStepButtonString: string = 'Delete';
+	private readonly JobStepsTopLabelString: string = localize('jobDialog.jobStepList', 'Job step list');
+	private readonly StepsTable_StepColumnString: string = localize('jobDialog.step', 'Step');
+	private readonly StepsTable_NameColumnString: string = localize('jobDialog.name', 'Name');
+	private readonly StepsTable_TypeColumnString: string = localize('jobDialog.type', 'Type');
+	private readonly StepsTable_SuccessColumnString: string = localize('jobDialog.onSuccess', 'On Success');
+	private readonly StepsTable_FailureColumnString: string = localize('jobDialog.onFailure', 'On Failure');
+	private readonly NewStepButtonString: string = localize('jobDialog.new', 'New...');
+	private readonly EditStepButtonString: string = localize('jobDialog.edit', 'Edit');
+	private readonly DeleteStepButtonString: string = localize('jobDialog.delete', 'Delete');
+	private readonly MoveStepUpButtonString: string = localize('jobDialog.moveUp', 'Move Step Up');
+	private readonly MoveStepDownButtonString: string = localize('jobDialog.moveDown', 'Move Step Up');
 
 	// Notifications tab strings
-	private readonly NotificationsTabTopLabelString: string = 'Actions to perform when the job completes';
-	private readonly EmailCheckBoxString: string = 'Email';
-	private readonly PagerCheckBoxString: string = 'Page';
-	private readonly EventLogCheckBoxString: string = 'Write to the Windows Application event log';
-	private readonly DeleteJobCheckBoxString: string = 'Automatically delete job';
+	private readonly NotificationsTabTopLabelString: string = localize('jobDialog.notificationsTabTop', 'Actions to perform when the job completes');
+	private readonly EmailCheckBoxString: string = localize('jobDialog.email', 'Email');
+	private readonly PagerCheckBoxString: string = localize('jobDialog.page', 'Page');
+	private readonly EventLogCheckBoxString: string = localize('jobDialog.eventLogCheckBoxLabel', 'Write to the Windows Application event log');
+	private readonly DeleteJobCheckBoxString: string = localize('jobDialog.deleteJobLabel', 'Automatically delete job');
 
 	// Schedules tab strings
-	private readonly SchedulesTopLabelString: string = 'Schedules list';
-	private readonly PickScheduleButtonString: string = 'Pick Schedule';
+	private readonly SchedulesTopLabelString: string = localize('jobDialog.schedulesaLabel', 'Schedules list');
+	private readonly PickScheduleButtonString: string = localize('jobDialog.pickSchedule', 'Pick Schedule');
+	private readonly ScheduleNameLabelString: string = localize('jobDialog.scheduleNameLabel', 'Schedule Name');
 
 	// Alerts tab strings
-	private readonly AlertsTopLabelString: string = 'Alerts list';
-	private readonly NewAlertButtonString: string = 'New Alert';
+	private readonly AlertsTopLabelString: string = localize('jobDialog.alertsList', 'Alerts list');
+	private readonly NewAlertButtonString: string = localize('jobDialog.newAlert', 'New Alert');
+	private readonly AlertNameLabelString: string = localize('jobDialog.alertNameLabel', 'Alert Name');
 
 	// UI Components
-	private dialog: sqlops.window.modelviewdialog.Dialog;
 	private generalTab: sqlops.window.modelviewdialog.DialogTab;
 	private stepsTab: sqlops.window.modelviewdialog.DialogTab;
 	private alertsTab: sqlops.window.modelviewdialog.DialogTab;
@@ -74,7 +80,8 @@ export class CreateJobDialog {
 	// Steps tab controls
 	private stepsTable: sqlops.TableComponent;
 	private newStepButton: sqlops.ButtonComponent;
-	private insertStepButton: sqlops.ButtonComponent;
+	private moveStepUpButton: sqlops.ButtonComponent;
+	private moveStepDownButton: sqlops.ButtonComponent;
 	private editStepButton: sqlops.ButtonComponent;
 	private deleteStepButton: sqlops.ButtonComponent;
 
@@ -99,15 +106,14 @@ export class CreateJobDialog {
 	private alertsTable: sqlops.TableComponent;
 	private newAlertButton: sqlops.ButtonComponent;
 
-	private model: CreateJobData;
-
-	constructor(ownerUri: string) {
-		this.model = new CreateJobData(ownerUri);
+	constructor(ownerUri: string, jobInfo: sqlops.AgentJobInfo = undefined) {
+		super(
+			ownerUri,
+			new JobData(ownerUri, jobInfo),
+			jobInfo ? JobDialog.EditDialogTitle : JobDialog.CreateDialogTitle);
 	}
 
-	public async showDialog() {
-		await this.model.initialize();
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
+	protected async initializeDialog() {
 		this.generalTab = sqlops.window.modelviewdialog.createTab(this.GeneralTabText);
 		this.stepsTab = sqlops.window.modelviewdialog.createTab(this.StepsTabText);
 		this.alertsTab = sqlops.window.modelviewdialog.createTab(this.AlertsTabText);
@@ -119,10 +125,6 @@ export class CreateJobDialog {
 		this.initializeSchedulesTab();
 		this.initializeNotificationsTab();
 		this.dialog.content = [this.generalTab, this.stepsTab, this.schedulesTab, this.alertsTab, this.notificationsTab];
-		this.dialog.okButton.onClick(async () => await this.execute());
-		this.dialog.cancelButton.onClick(async () => await this.cancel());
-		this.dialog.okButton.label = this.OkButtonText;
-		this.dialog.cancelButton.label = this.CancelButtonText;
 
 		this.dialog.registerCloseValidator(() => {
 			this.updateModel();
@@ -134,13 +136,17 @@ export class CreateJobDialog {
 
 			return validationResult.valid;
 		});
-
-		sqlops.window.modelviewdialog.openDialog(this.dialog);
 	}
 
 	private initializeGeneralTab() {
 		this.generalTab.registerContent(async view => {
 			this.nameTextBox = view.modelBuilder.inputBox().component();
+			this.nameTextBox.required = true;
+			this.nameTextBox.onTextChanged(() => {
+				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
+					this.dialog.message = null;
+				}
+			});
 			this.ownerTextBox = view.modelBuilder.inputBox().component();
 			this.categoryDropdown = view.modelBuilder.dropDown().component();
 			this.descriptionTextBox = view.modelBuilder.inputBox().withProperties({
@@ -171,11 +177,18 @@ export class CreateJobDialog {
 
 			await view.initializeModel(formModel);
 
+			this.nameTextBox.value = this.model.name;
 			this.ownerTextBox.value = this.model.defaultOwner;
 			this.categoryDropdown.values = this.model.jobCategories;
-			this.categoryDropdown.value = this.model.jobCategories[0];
+
+			let idx: number = undefined;
+			if (this.model.category && this.model.category !== '') {
+				idx = this.model.jobCategories.indexOf(this.model.category);
+			}
+			this.categoryDropdown.value = this.model.jobCategories[idx > 0 ? idx : 0];
+
 			this.enabledCheckBox.checked = this.model.enabled;
-			this.descriptionTextBox.value = '';
+			this.descriptionTextBox.value = this.model.description;
 		});
 	}
 
@@ -191,24 +204,38 @@ export class CreateJobDialog {
 						this.StepsTable_FailureColumnString
 					],
 					data: [],
-					height: 800
+					height: 430
 				}).component();
 
+			this.moveStepUpButton = view.modelBuilder.button()
+				.withProperties({
+					label: this.MoveStepUpButtonString,
+					width: 80
+				}).component();
+
+			this.moveStepDownButton = view.modelBuilder.button()
+				.withProperties({
+					label: this.MoveStepDownButtonString,
+					width: 80
+				}).component();
+
+			this.moveStepUpButton.enabled = false;
+			this.moveStepDownButton.enabled = false;
+
 			this.newStepButton = view.modelBuilder.button().withProperties({
 				label: this.NewStepButtonString,
 				width: 80
 			}).component();
 
 			this.newStepButton.onDidClick((e)=>{
-				let stepDialog = new CreateStepDialog(this.model.ownerUri, '', '', 1, this.model);
-				stepDialog.openNewStepDialog();
+				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
+					let stepDialog = new JobStepDialog(this.model.ownerUri, this.nameTextBox.value, '' , 1, this.model);
+					stepDialog.openNewStepDialog();
+				} else {
+					this.dialog.message = { text: this.BlankJobNameErrorText };
+				}
 			});
 
-			this.insertStepButton = view.modelBuilder.button().withProperties({
-				label: this.InsertStepButtonString,
-				width: 80
-			}).component();
-
 			this.editStepButton = view.modelBuilder.button().withProperties({
 				label: this.EditStepButtonString,
 				width: 80
@@ -223,7 +250,7 @@ export class CreateJobDialog {
 				.withFormItems([{
 					component: this.stepsTable,
 					title: this.JobStepsTopLabelString,
-					actions: [this.newStepButton, this.insertStepButton, this.editStepButton, this.deleteStepButton]
+					actions: [this.moveStepUpButton, this.moveStepDownButton, this.newStepButton, this.editStepButton, this.deleteStepButton]
 				}]).withLayout({ width: '100%' }).component();
 			await view.initializeModel(formModel);
 		});
@@ -234,10 +261,10 @@ export class CreateJobDialog {
 			this.alertsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						'Alert Name'
+						this.AlertNameLabelString
 					],
 					data: [],
-					height: 600,
+					height: 430,
 					width: 400
 				}).component();
 
@@ -247,10 +274,10 @@ export class CreateJobDialog {
 			}).component();
 
 			this.newAlertButton.onDidClick((e)=>{
-				let alertDialog = new CreateAlertDialog(this.model.ownerUri);
+				let alertDialog = new AlertDialog(this.model.ownerUri, null, []);
 				alertDialog.onSuccess((dialogModel) => {
 				});
-				alertDialog.showDialog();
+				alertDialog.openDialog();
 			});
 
 			let formModel = view.modelBuilder.formContainer()
@@ -269,11 +296,11 @@ export class CreateJobDialog {
 			this.schedulesTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						'Schedule Name'
+						this.ScheduleNameLabelString
 					],
 					data: [],
-					height: 600,
-					width: 400
+					height: 430,
+					width: 420
 				}).component();
 
 			this.pickScheduleButton = view.modelBuilder.button().withProperties({
@@ -373,21 +400,23 @@ export class CreateJobDialog {
 
 			let formModel = view.modelBuilder.formContainer().withFormItems([
 				{
-					component: this.notificationsTabTopLabel,
-					title: ''
-				}, {
-					component: emailContainer,
-					title: ''
-				}, {
-					component: pagerContainer,
-					title: ''
-				}, {
-					component: eventLogContainer,
-					title: ''
-				}, {
-					component: deleteJobContainer,
-					title: ''
-				}]).withLayout({ width: '100%' }).component();
+					components:
+					[{
+						component: emailContainer,
+						title: ''
+					},
+					{
+						component: pagerContainer,
+						title: ''
+					},
+					{
+						component: eventLogContainer,
+						title: ''
+					},
+					{
+						component: deleteJobContainer,
+						title: ''
+					}], title: this.NotificationsTabTopLabelString}]).withLayout({ width: '100%' }).component();
 
 			await view.initializeModel(formModel);
 			this.emailConditionDropdown.values = this.model.JobCompletionActionConditions;
@@ -421,34 +450,7 @@ export class CreateJobDialog {
 		});
 	}
 
-	private async execute() {
-		this.updateModel();
-		await this.model.save();
-	}
-
-	private async cancel() {
-
-	}
-
-	private getActualConditionValue(checkbox: sqlops.CheckBoxComponent, dropdown: sqlops.DropDownComponent): sqlops.JobCompletionActionCondition {
-		return checkbox.checked ? Number(this.getDropdownValue(dropdown)) : sqlops.JobCompletionActionCondition.Never;
-	}
-
-	private getDropdownValue(dropdown: sqlops.DropDownComponent): string {
-		return (typeof dropdown.value === 'string') ? dropdown.value : dropdown.value.name;
-	}
-
-	private setConditionDropdownSelectedValue(dropdown: sqlops.DropDownComponent, selectedValue: number) {
-		let idx: number = 0;
-		for (idx = 0; idx < dropdown.values.length; idx++) {
-			if (Number((<sqlops.CategoryValue>dropdown.values[idx]).name) === selectedValue) {
-				dropdown.value = dropdown.values[idx];
-				break;
-			}
-		}
-	}
-
-	private updateModel() {
+	protected updateModel() {
 		this.model.name = this.nameTextBox.value;
 		this.model.owner = this.ownerTextBox.value;
 		this.model.enabled = this.enabledCheckBox.checked;

extensions/agent/src/dialogs/jobStepDialog.ts

@@ -0,0 +1,510 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+import * as nls from 'vscode-nls';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import { JobStepData } from '../data/jobStepData';
+import { AgentUtils } from '../agentUtils';
+import { JobData } from '../data/jobData';
+const path = require('path');
+
+const localize = nls.loadMessageBundle();
+
+export class JobStepDialog {
+
+	// TODO: localize
+	// Top level
+	//
+	private readonly DialogTitle: string = localize('jobStepDialog.newJobStep', 'New Job Step');
+	private readonly FileBrowserDialogTitle: string = localize('jobStepDialog.fileBrowserTitle', 'Locate Database Files - ');
+	private readonly OkButtonText: string = localize('jobStepDialog.ok', 'OK');
+	private readonly CancelButtonText: string = localize('jobStepDialog.cancel', 'Cancel');
+	private readonly GeneralTabText: string = localize('jobStepDialog.general', 'General');
+	private readonly AdvancedTabText: string = localize('jobStepDialog.advanced', 'Advanced');
+	private readonly OpenCommandText: string = localize('jobStepDialog.open', 'Open...');
+	private readonly ParseCommandText: string = localize('jobStepDialog.parse','Parse');
+	private readonly NextButtonText: string = localize('jobStepDialog.next', 'Next');
+	private readonly PreviousButtonText: string = localize('jobStepDialog.previous','Previous');
+	private readonly SuccessfulParseText: string = localize('jobStepDialog.successParse', 'The command was successfully parsed.');
+	private readonly FailureParseText: string = localize('jobStepDialog.failParse', 'The command failed.');
+	private readonly BlankStepNameErrorText: string = localize('jobStepDialog.blankStepName', 'The step name cannot be left blank');
+
+	// General Control Titles
+	private readonly StepNameLabelString: string = localize('jobStepDialog.stepNameLabel', 'Step Name');
+	private readonly TypeLabelString: string = localize('jobStepDialog.typeLabel', 'Type');
+	private readonly RunAsLabelString: string = localize('jobStepDialog.runAsLabel', 'Run as');
+	private readonly DatabaseLabelString: string = localize('jobStepDialog.databaseLabel', 'Database');
+	private readonly CommandLabelString: string = localize('jobStepDialog.commandLabel', 'Command');
+
+	// Advanced Control Titles
+	private readonly SuccessActionLabel: string = localize('jobStepDialog.successAction', 'On success action');
+	private readonly FailureActionLabel: string = localize('jobStepDialog.failureAction', 'On failure action');
+	private readonly RunAsUserLabel: string = localize('jobStepDialog.runAsUser', 'Run as user');
+	private readonly RetryAttemptsLabel: string = localize('jobStepDialog.retryAttempts', 'Retry Attempts');
+	private readonly RetryIntervalLabel: string = localize('jobStepDialog.retryInterval', 'Retry Interval (minutes)');
+	private readonly LogToTableLabel: string = localize('jobStepDialog.logToTable', 'Log to table');
+	private readonly AppendExistingTableEntryLabel: string = localize('jobStepDialog.appendExistingTableEntry', 'Append output to exisiting entry in table');
+	private readonly IncludeStepOutputHistoryLabel: string = localize('jobStepDialog.includeStepOutputHistory', 'Include step output in history');
+	private readonly OutputFileNameLabel: string = localize('jobStepDialog.outputFile', 'Output File');
+	private readonly AppendOutputToFileLabel: string = localize('jobStepDialog.appendOutputToFile', 'Append output to existing file');
+
+	// File Browser Control Titles
+	private readonly SelectedPathLabelString: string = localize('jobStepDialog.selectedPath', 'Selected path');
+	private readonly FilesOfTypeLabelString: string = localize('jobStepDialog.filesOfType', 'Files of type');
+	private readonly FileNameLabelString: string = localize('jobStepDialog.fileName', 'File name');
+	private readonly AllFilesLabelString: string = localize('jobStepDialog.allFiles', 'All Files (*)');
+
+	// Dropdown options
+	private readonly TSQLScript: string = localize('jobStepDialog.TSQL', 'Transact-SQL script (T-SQL)');
+	private readonly AgentServiceAccount: string = localize('jobStepDialog.agentServiceAccount', 'SQL Server Agent Service Account');
+	private readonly NextStep: string = localize('jobStepDialog.nextStep', 'Go to the next step');
+	private readonly QuitJobReportingSuccess: string = localize('jobStepDialog.quitJobSuccess', 'Quit the job reporting success');
+	private readonly QuitJobReportingFailure: string = localize('jobStepDialog.quitJobFailure', 'Quit the job reporting failure');
+
+	// UI Components
+
+	// Dialogs
+	private dialog: sqlops.window.modelviewdialog.Dialog;
+	private fileBrowserDialog: sqlops.window.modelviewdialog.Dialog;
+
+	// Dialog tabs
+	private generalTab: sqlops.window.modelviewdialog.DialogTab;
+	private advancedTab: sqlops.window.modelviewdialog.DialogTab;
+
+	//Input boxes
+	private nameTextBox: sqlops.InputBoxComponent;
+	private commandTextBox: sqlops.InputBoxComponent;
+	private selectedPathTextBox: sqlops.InputBoxComponent;
+	private retryAttemptsBox: sqlops.InputBoxComponent;
+	private retryIntervalBox: sqlops.InputBoxComponent;
+	private outputFileNameBox: sqlops.InputBoxComponent;
+	private fileBrowserNameBox: sqlops.InputBoxComponent;
+	private userInputBox: sqlops.InputBoxComponent;
+
+	// Dropdowns
+	private typeDropdown: sqlops.DropDownComponent;
+	private runAsDropdown: sqlops.DropDownComponent;
+	private databaseDropdown: sqlops.DropDownComponent;
+	private successActionDropdown: sqlops.DropDownComponent;
+	private failureActionDropdown: sqlops.DropDownComponent;
+	private fileTypeDropdown: sqlops.DropDownComponent;
+
+	// Buttons
+	private openButton: sqlops.ButtonComponent;
+	private parseButton: sqlops.ButtonComponent;
+	private nextButton: sqlops.ButtonComponent;
+	private previousButton: sqlops.ButtonComponent;
+	private outputFileBrowserButton: sqlops.ButtonComponent;
+
+	// Checkbox
+	private appendToExistingFileCheckbox: sqlops.CheckBoxComponent;
+	private logToTableCheckbox: sqlops.CheckBoxComponent;
+
+	private fileBrowserTree: sqlops.FileBrowserTreeComponent;
+	private jobModel: JobData;
+	private model: JobStepData;
+	private ownerUri: string;
+	private jobName: string;
+	private server: string;
+	private stepId: number;
+
+	constructor(
+		ownerUri: string,
+		jobName: string,
+		server: string,
+		stepId: number,
+		jobModel?: JobData
+	) {
+		this.model = new JobStepData(ownerUri);
+		this.stepId = stepId;
+		this.ownerUri = ownerUri;
+		this.jobName = jobName;
+		this.server = server;
+		this.jobModel = jobModel;
+	}
+
+	private initializeUIComponents() {
+		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
+		this.generalTab = sqlops.window.modelviewdialog.createTab(this.GeneralTabText);
+		this.advancedTab = sqlops.window.modelviewdialog.createTab(this.AdvancedTabText);
+		this.dialog.content = [this.generalTab, this.advancedTab];
+		this.dialog.okButton.onClick(async () => await this.execute());
+		this.dialog.okButton.label = this.OkButtonText;
+		this.dialog.cancelButton.label = this.CancelButtonText;
+	}
+
+	private createCommands(view, queryProvider: sqlops.QueryProvider) {
+		this.openButton = view.modelBuilder.button()
+			.withProperties({
+				label: this.OpenCommandText,
+				width: '80px',
+				isFile: true
+			}).component();
+		this.parseButton = view.modelBuilder.button()
+			.withProperties({
+				label: this.ParseCommandText,
+				width: '80px',
+				isFile: false
+			}).component();
+		this.openButton.onDidClick(e => {
+			let queryContent = e;
+			this.commandTextBox.value = queryContent;
+		});
+		this.parseButton.onDidClick(e => {
+			if (this.commandTextBox.value) {
+				queryProvider.parseSyntax(this.ownerUri, this.commandTextBox.value).then(result => {
+					if (result && result.parseable) {
+						this.dialog.message = { text: this.SuccessfulParseText, level: 2};
+					} else if (result && !result.parseable) {
+						this.dialog.message = { text: this.FailureParseText };
+					}
+				});
+			}
+		});
+		this.commandTextBox = view.modelBuilder.inputBox()
+			.withProperties({
+				height: 300,
+				width: 400,
+				multiline: true,
+				inputType: 'text'
+			})
+			.component();
+		this.nextButton = view.modelBuilder.button()
+			.withProperties({
+				label: this.NextButtonText,
+				enabled: false,
+				width: '80px'
+			}).component();
+		this.previousButton = view.modelBuilder.button()
+			.withProperties({
+				label: this.PreviousButtonText,
+				enabled: false,
+				width: '80px'
+			}).component();
+	}
+
+	private createGeneralTab(databases: string[], queryProvider: sqlops.QueryProvider) {
+		this.generalTab.registerContent(async (view) => {
+			this.nameTextBox = view.modelBuilder.inputBox()
+				.withProperties({
+				}).component();
+			this.nameTextBox.required = true;
+			this.nameTextBox.onTextChanged(() => {
+				if (this.nameTextBox.value.length > 0) {
+					this.dialog.message = null;
+				}
+			});
+
+			this.typeDropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: this.TSQLScript,
+					values: [this.TSQLScript]
+				})
+				.component();
+			this.runAsDropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: '',
+					values: ['']
+				})
+				.component();
+			this.runAsDropdown.enabled = false;
+			this.typeDropdown.onValueChanged((type) => {
+				if (type.selected !== this.TSQLScript) {
+					this.runAsDropdown.value = this.AgentServiceAccount;
+					this.runAsDropdown.values = [this.runAsDropdown.value];
+				} else {
+					this.runAsDropdown.value = '';
+					this.runAsDropdown.values = [''];
+				}
+			});
+			this.databaseDropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: databases[0],
+					values: databases
+				}).component();
+
+			// create the commands section
+			this.createCommands(view, queryProvider);
+
+			let buttonContainer = view.modelBuilder.flexContainer()
+			.withLayout({
+				flexFlow: 'row',
+				justifyContent: 'space-between',
+				width: 420
+			}).withItems([this.openButton, this.parseButton, this.previousButton, this.nextButton], {
+				flex: '1 1 50%'
+			}).component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.nameTextBox,
+					title: this.StepNameLabelString
+				}, {
+					component: this.typeDropdown,
+					title: this.TypeLabelString
+				}, {
+					component: this.runAsDropdown,
+					title: this.RunAsLabelString
+				}, {
+					component: this.databaseDropdown,
+					title: this.DatabaseLabelString
+				}, {
+					component: this.commandTextBox,
+					title: this.CommandLabelString,
+					actions: [buttonContainer]
+				}], {
+						horizontal: false,
+						componentWidth: 420
+					}).component();
+			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
+			formWrapper.loading = false;
+			await view.initializeModel(formWrapper);
+		});
+	}
+
+	private createAdvancedTab() {
+		this.advancedTab.registerContent(async (view) => {
+			this.successActionDropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					width: '100%',
+					value: this.NextStep,
+					values: [this.NextStep, this.QuitJobReportingSuccess, this.QuitJobReportingFailure]
+				})
+				.component();
+			let retryFlexContainer = this.createRetryCounters(view);
+
+			this.failureActionDropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: this.QuitJobReportingFailure,
+					values: [this.QuitJobReportingFailure, this.NextStep, this.QuitJobReportingSuccess]
+				})
+				.component();
+			let optionsGroup = this.createTSQLOptions(view);
+			this.logToTableCheckbox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: this.LogToTableLabel
+				}).component();
+			let appendToExistingEntryInTableCheckbox = view.modelBuilder.checkBox()
+				.withProperties({ label: this.AppendExistingTableEntryLabel }).component();
+			appendToExistingEntryInTableCheckbox.enabled = false;
+			this.logToTableCheckbox.onChanged(e => {
+				appendToExistingEntryInTableCheckbox.enabled = e;
+			});
+			let appendCheckboxContainer = view.modelBuilder.groupContainer()
+				.withItems([appendToExistingEntryInTableCheckbox]).component();
+			let logToTableContainer = view.modelBuilder.flexContainer()
+				.withLayout({ flexFlow: 'row', justifyContent: 'space-between', width: 300 })
+				.withItems([this.logToTableCheckbox]).component();
+			let logStepOutputHistoryCheckbox = view.modelBuilder.checkBox()
+				.withProperties({ label: this.IncludeStepOutputHistoryLabel }).component();
+			this.userInputBox = view.modelBuilder.inputBox()
+				.withProperties({ inputType: 'text', width: '100%' }).component();
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems(
+					[{
+						component: this.successActionDropdown,
+						title: this.SuccessActionLabel
+					}, {
+						component: retryFlexContainer,
+						title: ''
+					}, {
+						component: this.failureActionDropdown,
+						title: this.FailureActionLabel
+					}, {
+						component: optionsGroup,
+						title: this.TSQLScript
+					}, {
+						component: logToTableContainer,
+						title: ''
+					}, {
+						component: appendCheckboxContainer,
+						title: '                            '
+					}, {
+						component: logStepOutputHistoryCheckbox,
+						title: ''
+					}, {
+						component: this.userInputBox,
+						title: this.RunAsUserLabel
+					}], {
+						componentWidth: 400
+					}).component();
+
+			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
+			formWrapper.loading = false;
+			view.initializeModel(formWrapper);
+		});
+	}
+
+	private createRetryCounters(view) {
+		this.retryAttemptsBox = view.modelBuilder.inputBox()
+			.withValidation(component => component.value >= 0)
+			.withProperties({
+				inputType: 'number',
+				width: '100%',
+				placeHolder: '0'
+			})
+			.component();
+		this.retryIntervalBox = view.modelBuilder.inputBox()
+			.withValidation(component => component.value >= 0)
+			.withProperties({
+				inputType: 'number',
+				width: '100%',
+				placeHolder: '0'
+			}).component();
+
+		let retryAttemptsContainer = view.modelBuilder.formContainer()
+			.withFormItems(
+			[{
+				component: this.retryAttemptsBox,
+				title: this.RetryAttemptsLabel
+			}], {
+				horizontal: false,
+				componentWidth: '100%'
+			})
+			.component();
+
+		let retryIntervalContainer = view.modelBuilder.formContainer()
+			.withFormItems(
+				[{
+					component: this.retryIntervalBox,
+					title: this.RetryIntervalLabel
+					}], {
+					horizontal: false
+				})
+			.component();
+
+		let retryFlexContainer = view.modelBuilder.flexContainer()
+			.withLayout({
+				flexFlow: 'row',
+			}).withItems([retryAttemptsContainer, retryIntervalContainer]).component();
+		return retryFlexContainer;
+	}
+
+	private openFileBrowserDialog() {
+		let fileBrowserTitle = this.FileBrowserDialogTitle + `${this.server}`;
+		this.fileBrowserDialog = sqlops.window.modelviewdialog.createDialog(fileBrowserTitle);
+		let fileBrowserTab = sqlops.window.modelviewdialog.createTab('File Browser');
+		this.fileBrowserDialog.content =  [fileBrowserTab];
+		fileBrowserTab.registerContent(async (view) => {
+			this.fileBrowserTree = view.modelBuilder.fileBrowserTree()
+				.withProperties({ ownerUri: this.ownerUri, width: 420, height: 700 })
+				.component();
+			this.selectedPathTextBox = view.modelBuilder.inputBox()
+				.withProperties({ inputType: 'text'})
+				.component();
+			this.fileBrowserTree.onDidChange((args) => {
+				this.selectedPathTextBox.value = args.fullPath;
+				this.fileBrowserNameBox.value = args.isFile ? path.win32.basename(args.fullPath) : '';
+			});
+			this.fileTypeDropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: this.AllFilesLabelString,
+					values: [this.AllFilesLabelString]
+				})
+				.component();
+			this.fileBrowserNameBox = view.modelBuilder.inputBox()
+				.withProperties({})
+				.component();
+			let fileBrowserContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.fileBrowserTree,
+					title: ''
+				}, {
+					component: this.selectedPathTextBox,
+					title: this.SelectedPathLabelString
+				}, {
+					component: this.fileTypeDropdown,
+					title: this.FilesOfTypeLabelString
+				}, {
+					component: this.fileBrowserNameBox,
+					title: this.FileNameLabelString
+				}
+			]).component();
+			view.initializeModel(fileBrowserContainer);
+		});
+		this.fileBrowserDialog.okButton.onClick(() => {
+			this.outputFileNameBox.value = path.join(path.dirname(this.selectedPathTextBox.value), this.fileBrowserNameBox.value);
+		});
+		this.fileBrowserDialog.okButton.label = this.OkButtonText;
+		this.fileBrowserDialog.cancelButton.label = this.CancelButtonText;
+		sqlops.window.modelviewdialog.openDialog(this.fileBrowserDialog);
+	}
+
+	private createTSQLOptions(view) {
+		this.outputFileBrowserButton = view.modelBuilder.button()
+			.withProperties({ width: '20px', label: '...' }).component();
+		this.outputFileBrowserButton.onDidClick(() => this.openFileBrowserDialog());
+		this.outputFileNameBox = view.modelBuilder.inputBox()
+			.withProperties({
+				width: 250,
+				inputType: 'text'
+			}).component();
+		let outputButtonContainer = view.modelBuilder.flexContainer()
+			.withLayout({
+				flexFlow: 'row',
+				textAlign: 'right',
+				width: '100%'
+			}).withItems([this.outputFileBrowserButton], { flex: '1 1 50%' }).component();
+		let outputFlexBox = view.modelBuilder.flexContainer()
+			.withLayout({
+				flexFlow: 'row',
+				width: 350
+			}).withItems([this.outputFileNameBox, outputButtonContainer], {
+				flex: '1 1 50%'
+			}).component();
+		this.appendToExistingFileCheckbox = view.modelBuilder.checkBox()
+			.withProperties({
+				label: this.AppendOutputToFileLabel
+			}).component();
+		this.appendToExistingFileCheckbox.enabled = false;
+		this.outputFileNameBox.onTextChanged((input) => {
+			if (input !== '') {
+				this.appendToExistingFileCheckbox.enabled = true;
+			} else {
+				this.appendToExistingFileCheckbox.enabled = false;
+			}
+		});
+		let outputFileForm = view.modelBuilder.formContainer()
+			.withFormItems([{
+				component: outputFlexBox,
+				title: this.OutputFileNameLabel
+			}, {
+				component: this.appendToExistingFileCheckbox,
+				title: ''
+			}], { horizontal: false, componentWidth: 200 }).component();
+		return outputFileForm;
+	}
+
+	protected execute() {
+		this.model.stepName = this.nameTextBox.value;
+		if (!this.model.stepName || this.model.stepName.length === 0) {
+			this.dialog.message = this.dialog.message = { text: this.BlankStepNameErrorText };
+			return;
+		}
+		this.model.jobName = this.jobName;
+		this.model.id = this.stepId;
+		this.model.server = this.server;
+		this.model.stepName = this.nameTextBox.value;
+		this.model.subSystem = this.typeDropdown.value as string;
+		this.model.databaseName = this.databaseDropdown.value as string;
+		this.model.script = this.commandTextBox.value;
+		this.model.successAction = this.successActionDropdown.value as string;
+		this.model.retryAttempts = this.retryAttemptsBox.value ? +this.retryAttemptsBox.value : 0;
+		this.model.retryInterval = +this.retryIntervalBox.value ? +this.retryIntervalBox.value : 0;
+		this.model.failureAction = this.failureActionDropdown.value as string;
+		this.model.outputFileName = this.outputFileNameBox.value;
+		this.model.appendToLogFile = this.appendToExistingFileCheckbox.checked;
+	}
+
+	public async openNewStepDialog() {
+		let databases = await AgentUtils.getDatabases(this.ownerUri);
+		let queryProvider = await AgentUtils.getQueryProvider();
+		this.initializeUIComponents();
+		this.createGeneralTab(databases, queryProvider);
+		this.createAdvancedTab();
+		sqlops.window.modelviewdialog.openDialog(this.dialog);
+	}
+}

extensions/agent/src/dialogs/operatorDialog.ts

@@ -0,0 +1,404 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import { OperatorData } from '../data/operatorData';
+import * as nls from 'vscode-nls';
+import { AgentDialog } from './agentDialog';
+
+const localize = nls.loadMessageBundle();
+
+export class OperatorDialog extends AgentDialog<OperatorData> {
+
+	// Top level
+	private static readonly CreateDialogTitle: string = localize('createOperator.createOperator', 'Create Operator');
+	private static readonly EditDialogTitle: string = localize('createOperator.editOperator', 'Edit Operator');
+	private static readonly GeneralTabText: string = localize('createOperator.General', 'General');
+	private static readonly NotificationsTabText: string = localize('createOperator.Notifications', 'Notifications');
+
+	// General tab strings
+	private static readonly NameLabel: string = localize('createOperator.Name', 'Name');
+	private static readonly EnabledCheckboxLabel: string = localize('createOperator.Enabled', 'Enabled');
+	private static readonly EmailNameTextLabel: string = localize('createOperator.EmailName', 'E-mail Name');
+	private static readonly PagerEmailNameTextLabel: string = localize('createOperator.PagerEmailName', 'Pager E-mail Name');
+	private static readonly PagerMondayCheckBoxLabel: string = localize('createOperator.PagerMondayCheckBox', 'Monday');
+	private static readonly PagerTuesdayCheckBoxLabel: string = localize('createOperator.PagerTuesdayCheckBox', 'Tuesday');
+	private static readonly PagerWednesdayCheckBoxLabel: string = localize('createOperator.PagerWednesdayCheckBox', 'Wednesday');
+	private static readonly PagerThursdayCheckBoxLabel: string = localize('createOperator.PagerThursdayCheckBox', 'Thursday');
+	private static readonly PagerFridayCheckBoxLabel: string = localize('createOperator.PagerFridayCheckBox', 'Friday  ');
+	private static readonly PagerSaturdayCheckBoxLabel: string = localize('createOperator.PagerSaturdayCheckBox', 'Saturday');
+	private static readonly PagerSundayCheckBoxLabel: string = localize('createOperator.PagerSundayCheckBox', 'Sunday');
+	private static readonly WorkdayBeginLabel: string = localize('createOperator.workdayBegin', 'Workday begin');
+	private static readonly WorkdayEndLabel: string = localize('createOperator.workdayEnd', 'Workday end');
+	private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schdule');
+
+	// Notifications tab strings
+	private static readonly AlertsTableLabel: string = localize('createOperator.AlertListHeading', 'Alert list');
+	private static readonly AlertNameColumnLabel: string = localize('createOperator.AlertNameColumnLabel', 'Alert name');
+	private static readonly AlertEmailColumnLabel: string = localize('createOperator.AlertEmailColumnLabel', 'E-mail');
+	private static readonly AlertPagerColumnLabel: string = localize('createOperator.AlertPagerColumnLabel', 'Pager');
+
+	// UI Components
+	private generalTab: sqlops.window.modelviewdialog.DialogTab;
+	private notificationsTab: sqlops.window.modelviewdialog.DialogTab;
+
+	// General tab controls
+	private nameTextBox: sqlops.InputBoxComponent;
+	private enabledCheckBox: sqlops.CheckBoxComponent;
+	private emailNameTextBox: sqlops.InputBoxComponent;
+	private pagerEmailNameTextBox: sqlops.InputBoxComponent;
+	private pagerMondayCheckBox: sqlops.CheckBoxComponent;
+	private pagerTuesdayCheckBox: sqlops.CheckBoxComponent;
+	private pagerWednesdayCheckBox: sqlops.CheckBoxComponent;
+	private pagerThursdayCheckBox: sqlops.CheckBoxComponent;
+	private pagerFridayCheckBox: sqlops.CheckBoxComponent;
+	private pagerSaturdayCheckBox: sqlops.CheckBoxComponent;
+	private pagerSundayCheckBox: sqlops.CheckBoxComponent;
+	private weekdayPagerStartTimeInput: sqlops.InputBoxComponent;
+	private weekdayPagerEndTimeInput: sqlops.InputBoxComponent;
+	private saturdayPagerStartTimeInput: sqlops.InputBoxComponent;
+	private saturdayPagerEndTimeInput: sqlops.InputBoxComponent;
+	private sundayPagerStartTimeInput: sqlops.InputBoxComponent;
+	private sundayPagerEndTimeInput: sqlops.InputBoxComponent;
+
+	// Notification tab controls
+	private alertsTable: sqlops.TableComponent;
+
+	constructor(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo = undefined) {
+		super(
+			ownerUri,
+			new OperatorData(ownerUri, operatorInfo),
+			operatorInfo ? OperatorDialog.EditDialogTitle : OperatorDialog.CreateDialogTitle);
+	}
+
+	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
+		this.generalTab = sqlops.window.modelviewdialog.createTab(OperatorDialog.GeneralTabText);
+		this.notificationsTab = sqlops.window.modelviewdialog.createTab(OperatorDialog.NotificationsTabText);
+
+		this.initializeGeneralTab();
+		this.initializeNotificationTab();
+
+		this.dialog.content = [this.generalTab, this.notificationsTab];
+	}
+
+	private initializeGeneralTab() {
+		this.generalTab.registerContent(async view => {
+
+			this.nameTextBox = view.modelBuilder.inputBox().component();
+
+			this.enabledCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.EnabledCheckboxLabel
+				}).component();
+			this.enabledCheckBox.checked = true;
+			this.emailNameTextBox = view.modelBuilder.inputBox().component();
+
+			this.pagerEmailNameTextBox = view.modelBuilder.inputBox().component();
+
+			this.enabledCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.EnabledCheckboxLabel
+				}).component();
+
+			this.pagerMondayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerMondayCheckBoxLabel
+				}).component();
+
+			this.pagerMondayCheckBox.onChanged(() => {
+				if (this.pagerMondayCheckBox.checked) {
+					this.weekdayPagerStartTimeInput.enabled = true;
+					this.weekdayPagerEndTimeInput.enabled = true;
+				} else {
+					if (!this.pagerTuesdayCheckBox.checked && !this.pagerWednesdayCheckBox.checked &&
+						!this.pagerThursdayCheckBox.checked && !this.pagerFridayCheckBox.checked) {
+						this.weekdayPagerStartTimeInput.enabled = false;
+						this.weekdayPagerEndTimeInput.enabled = false;
+					}
+				}
+			});
+
+			this.pagerTuesdayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerTuesdayCheckBoxLabel
+				}).component();
+
+
+			this.pagerTuesdayCheckBox.onChanged(() => {
+				if (this.pagerTuesdayCheckBox .checked) {
+					this.weekdayPagerStartTimeInput.enabled = true;
+					this.weekdayPagerEndTimeInput.enabled = true;
+				} else {
+					if (!this.pagerMondayCheckBox.checked && !this.pagerWednesdayCheckBox.checked &&
+						!this.pagerThursdayCheckBox.checked && !this.pagerFridayCheckBox.checked) {
+						this.weekdayPagerStartTimeInput.enabled = false;
+						this.weekdayPagerEndTimeInput.enabled = false;
+					}
+				}
+			});
+
+			this.pagerWednesdayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerWednesdayCheckBoxLabel
+				}).component();
+
+			this.pagerWednesdayCheckBox.onChanged(() => {
+				if (this.pagerWednesdayCheckBox .checked) {
+					this.weekdayPagerStartTimeInput.enabled = true;
+					this.weekdayPagerEndTimeInput.enabled = true;
+				} else {
+					if (!this.pagerMondayCheckBox.checked && !this.pagerTuesdayCheckBox.checked &&
+						!this.pagerThursdayCheckBox.checked && !this.pagerFridayCheckBox.checked) {
+						this.weekdayPagerStartTimeInput.enabled = false;
+						this.weekdayPagerEndTimeInput.enabled = false;
+					}
+				}
+			});
+
+			this.pagerThursdayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerThursdayCheckBoxLabel
+				}).component();
+
+			this.pagerThursdayCheckBox.onChanged(() => {
+				if (this.pagerThursdayCheckBox .checked) {
+					this.weekdayPagerStartTimeInput.enabled = true;
+					this.weekdayPagerEndTimeInput.enabled = true;
+				} else {
+					if (!this.pagerMondayCheckBox.checked && !this.pagerWednesdayCheckBox.checked &&
+						!this.pagerTuesdayCheckBox.checked && !this.pagerFridayCheckBox.checked) {
+						this.weekdayPagerStartTimeInput.enabled = false;
+						this.weekdayPagerEndTimeInput.enabled = false;
+					}
+				}
+			});
+
+			this.weekdayPagerStartTimeInput = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'time',
+					placeHolder: '08:00:00',
+				}).component();
+			this.weekdayPagerStartTimeInput.enabled = false;
+			let weekdayStartInputContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.weekdayPagerStartTimeInput,
+					title: OperatorDialog.WorkdayBeginLabel
+				}]).component();
+
+			this.weekdayPagerEndTimeInput = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'time',
+					placeHolder: '06:00:00'
+				}).component();
+			this.weekdayPagerEndTimeInput.enabled = false;
+			let weekdayEndInputContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.weekdayPagerEndTimeInput,
+					title: OperatorDialog.WorkdayEndLabel
+				}]).component();
+
+			this.pagerFridayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerFridayCheckBoxLabel,
+					width: 80
+				}).component();
+			this.pagerFridayCheckBox.onChanged(() => {
+				if (this.pagerFridayCheckBox.checked) {
+					this.weekdayPagerStartTimeInput.enabled = true;
+					this.weekdayPagerEndTimeInput.enabled = true;
+				} else {
+					if (!this.pagerMondayCheckBox.checked && !this.pagerWednesdayCheckBox.checked &&
+						!this.pagerThursdayCheckBox.checked && !this.pagerTuesdayCheckBox.checked) {
+						this.weekdayPagerStartTimeInput.enabled = false;
+						this.weekdayPagerEndTimeInput.enabled = false;
+					}
+				}
+			});
+
+			let pagerFridayCheckboxContainer = view.modelBuilder.flexContainer()
+				.withLayout({
+					flexFlow: 'row',
+					alignItems: 'baseline',
+					width: '100%'
+				}).withItems([this.pagerFridayCheckBox, weekdayStartInputContainer, weekdayEndInputContainer])
+				.component();
+
+			this.pagerSaturdayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerSaturdayCheckBoxLabel,
+					width: 80
+				}).component();
+
+			this.pagerSaturdayCheckBox.onChanged(() => {
+				if (this.pagerSaturdayCheckBox.checked) {
+					this.saturdayPagerStartTimeInput.enabled = true;
+					this.saturdayPagerEndTimeInput.enabled = true;
+				} else {
+					this.saturdayPagerStartTimeInput.enabled = false;
+					this.saturdayPagerEndTimeInput.enabled = false;
+				}
+			});
+
+			this.saturdayPagerStartTimeInput = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'time',
+					placeHolder: '08:00:00'
+				}).component();
+			this.saturdayPagerStartTimeInput.enabled = false;
+			let saturdayStartInputContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.saturdayPagerStartTimeInput,
+					title: OperatorDialog.WorkdayBeginLabel
+				}]).component();
+
+			this.saturdayPagerEndTimeInput = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'time',
+					placeHolder: '06:00:00'
+				}).component();
+			this.saturdayPagerEndTimeInput.enabled = false;
+			let saturdayEndInputContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.saturdayPagerEndTimeInput,
+					title: OperatorDialog.WorkdayEndLabel
+				}]).component();
+
+			let pagerSaturdayCheckboxContainer = view.modelBuilder.flexContainer()
+				.withLayout({
+					flexFlow: 'row',
+					alignItems: 'baseline'
+				}).withItems([this.pagerSaturdayCheckBox, saturdayStartInputContainer, saturdayEndInputContainer])
+				.component();
+
+			this.pagerSundayCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: OperatorDialog.PagerSundayCheckBoxLabel,
+					width: 80
+				}).component();
+
+			this.pagerSundayCheckBox.onChanged(() => {
+				if (this.pagerSundayCheckBox.checked) {
+					this.sundayPagerStartTimeInput.enabled = true;
+					this.sundayPagerEndTimeInput.enabled = true;
+				} else {
+					this.sundayPagerStartTimeInput.enabled = false;
+					this.sundayPagerEndTimeInput.enabled = false;
+				}
+			});
+
+			this.sundayPagerStartTimeInput = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'time',
+					placeHolder: '08:00:00'
+				}).component();
+			this.sundayPagerStartTimeInput.enabled = false;
+			let sundayStartInputContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.sundayPagerStartTimeInput,
+					title: OperatorDialog.WorkdayBeginLabel
+				}]).component();
+
+			this.sundayPagerEndTimeInput = view.modelBuilder.inputBox()
+				.withProperties({
+					inputType: 'time',
+					placeHolder: '06:00:00'
+				}).component();
+			this.sundayPagerEndTimeInput.enabled = false;
+			let sundayEndInputContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.sundayPagerEndTimeInput,
+					title: OperatorDialog.WorkdayEndLabel
+				}]).component();
+
+			let pagerSundayCheckboxContainer = view.modelBuilder.flexContainer()
+				.withLayout({
+					flexFlow: 'row',
+					alignItems: 'baseline'
+				}).withItems([this.pagerSundayCheckBox, sundayStartInputContainer, sundayEndInputContainer])
+				.component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.nameTextBox,
+					title: OperatorDialog.NameLabel
+				}, {
+					component: this.enabledCheckBox,
+					title: ''
+				}, {
+					component: this.emailNameTextBox,
+					title: OperatorDialog.EmailNameTextLabel
+				}, {
+					component: this.pagerEmailNameTextBox,
+					title: OperatorDialog.PagerEmailNameTextLabel
+				}, {
+					components: [{
+						component: this.pagerMondayCheckBox,
+						title: ''
+					}, {
+						component: this.pagerTuesdayCheckBox,
+						title: ''
+					}, {
+						component: this.pagerWednesdayCheckBox,
+						title: ''
+					}, {
+						component: this.pagerThursdayCheckBox,
+						title: ''
+					}, {
+						component: pagerFridayCheckboxContainer,
+						title: ''
+					}, {
+						component: pagerSaturdayCheckboxContainer,
+						title: ''
+					}, {
+						component: pagerSundayCheckboxContainer,
+						title: ''
+					}] ,
+					title: OperatorDialog.PagerDutyScheduleLabel
+				}]).withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+		});
+	}
+
+	private initializeNotificationTab() {
+		this.notificationsTab.registerContent(async view => {
+
+			this.alertsTable = view.modelBuilder.table()
+				.withProperties({
+					columns: [
+						OperatorDialog.AlertNameColumnLabel,
+						OperatorDialog.AlertEmailColumnLabel,
+						OperatorDialog.AlertPagerColumnLabel
+					],
+					data: [],
+					height: 500
+				}).component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.alertsTable,
+					title: OperatorDialog.AlertsTableLabel
+				}]).withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+		});
+	}
+
+	protected updateModel() {
+		this.model.name = this.nameTextBox.value;
+		this.model.enabled = this.enabledCheckBox.checked;
+		this.model.emailAddress = this.emailNameTextBox.value;
+		this.model.pagerAddress = this.pagerEmailNameTextBox.value;
+		this.model.weekdayPagerStartTime = this.weekdayPagerStartTimeInput.value;
+		this.model.weekdayPagerEndTime = this.weekdayPagerEndTimeInput.value;
+		this.model.saturdayPagerStartTime = this.saturdayPagerStartTimeInput.value;
+		this.model.saturdayPagerEndTime = this.saturdayPagerEndTimeInput.value;
+		this.model.sundayPagerStartTime = this.sundayPagerStartTimeInput.value;
+		this.model.sundayPagerEndTime = this.sundayPagerEndTimeInput.value;
+	}
+}

extensions/agent/src/dialogs/pickScheduleDialog.ts

@@ -4,18 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
  'use strict';
+import * as nls from 'vscode-nls';
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
 import { PickScheduleData } from '../data/pickScheduleData';
 
+const localize = nls.loadMessageBundle();
+
 export class PickScheduleDialog {
 
 	// TODO: localize
 	// Top level
-	private readonly DialogTitle: string = 'Job Schedules';
-	private readonly OkButtonText: string = 'OK';
-	private readonly CancelButtonText: string = 'Cancel';
-	private readonly SchedulesTabText: string = 'Schedules';
+	private readonly DialogTitle: string = localize('pickSchedule.jobSchedules', 'Job Schedules');
+	private readonly OkButtonText: string = localize('pickSchedule.ok', 'OK');
+	private readonly CancelButtonText: string = localize('pickSchedule.cancel', 'Cancel');
+	private readonly ScheduleNameLabelText: string = localize('pickSchedule.scheduleName', 'Schedule Name');
+	private readonly SchedulesLabelText: string = localize('pickSchedule.schedules', 'Schedules');
 
 	// UI Components
 	private dialog: sqlops.window.modelviewdialog.Dialog;
@@ -38,7 +42,6 @@ export class PickScheduleDialog {
 		this.dialog.cancelButton.onClick(async () => await this.cancel());
 		this.dialog.okButton.label = this.OkButtonText;
 		this.dialog.cancelButton.label = this.CancelButtonText;
-
 		sqlops.window.modelviewdialog.openDialog(this.dialog);
 	}
 
@@ -47,17 +50,17 @@ export class PickScheduleDialog {
 			this.schedulesTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						'Schedule Name'
+						this.ScheduleNameLabelText
 					],
 					data: [],
-					height: 600,
-					width: 400
+					height: '80em',
+					width: '40em'
 				}).component();
 
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
 					component: this.schedulesTable,
-					title: 'Schedules'
+					title: this.SchedulesLabelText
 				}]).withLayout({ width: '100%' }).component();
 
 			await view.initializeModel(formModel);

extensions/agent/src/dialogs/proxyDialog.ts

@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as nls from 'vscode-nls';
+import * as sqlops from 'sqlops';
+import { AgentDialog } from './agentDialog';
+import { ProxyData } from '../data/proxyData';
+
+const localize = nls.loadMessageBundle();
+
+export class ProxyDialog extends AgentDialog<ProxyData>  {
+
+	// Top level
+	private static readonly CreateDialogTitle: string = localize('createProxy.createProxy', 'Create Proxy');
+	private static readonly EditDialogTitle: string = localize('createProxy.editProxy', 'Edit Proxy');
+	private static readonly GeneralTabText: string = localize('createProxy.General', 'General');
+
+	// General tab strings
+	private static readonly ProxyNameTextBoxLabel: string = localize('createProxy.ProxyName', 'Proxy name');
+	private static readonly CredentialNameTextBoxLabel: string = localize('createProxy.CredentialName', 'Credential name');
+	private static readonly DescriptionTextBoxLabel: string = localize('createProxy.Description', 'Description');
+	private static readonly SubsystemLabel: string = localize('createProxy.SubsystemName', 'Subsystem');
+	private static readonly OperatingSystemLabel: string = localize('createProxy.OperatingSystem', 'Operating system (CmdExec)');
+	private static readonly ReplicationSnapshotLabel: string = localize('createProxy.ReplicationSnapshot', 'Replication Snapshot');
+	private static readonly ReplicationTransactionLogLabel: string = localize('createProxy.ReplicationTransactionLog', 'Replication Transaction-Log Reader');
+	private static readonly ReplicationDistributorLabel: string = localize('createProxy.ReplicationDistributor', 'Replication Distributor');
+	private static readonly ReplicationMergeLabel: string = localize('createProxy.ReplicationMerge', 'Replication Merge');
+	private static readonly ReplicationQueueReaderLabel: string = localize('createProxy.ReplicationQueueReader', 'Replication Queue Reader');
+	private static readonly SSASQueryLabel: string = localize('createProxy.SSASQueryLabel', 'SQL Server Analysis Services Query');
+	private static readonly SSASCommandLabel: string = localize('createProxy.SSASCommandLabel', 'SQL Server Analysis Services Command');
+	private static readonly SSISPackageLabel: string = localize('createProxy.SSISPackage', 'SQL Server Integration Services Package');
+	private static readonly PowerShellLabel: string = localize('createProxy.PowerShell', 'PowerShell');
+	private static readonly SubSystemHeadingLabel: string = localize('createProxy.subSystemHeading', 'Active to the following subsytems');
+
+	// UI Components
+	private generalTab: sqlops.window.modelviewdialog.DialogTab;
+
+	// General tab controls
+	private proxyNameTextBox: sqlops.InputBoxComponent;
+	private credentialNameDropDown: sqlops.DropDownComponent;
+	private descriptionTextBox: sqlops.InputBoxComponent;
+	private subsystemCheckBox: sqlops.CheckBoxComponent;
+	private operatingSystemCheckBox: sqlops.CheckBoxComponent;
+	private replicationSnapshotCheckBox: sqlops.CheckBoxComponent;
+	private replicationTransactionLogCheckBox: sqlops.CheckBoxComponent;
+	private replicationDistributorCheckBox: sqlops.CheckBoxComponent;
+	private replicationMergeCheckbox: sqlops.CheckBoxComponent;
+	private replicationQueueReaderCheckbox: sqlops.CheckBoxComponent;
+	private sqlQueryCheckBox: sqlops.CheckBoxComponent;
+	private sqlCommandCheckBox: sqlops.CheckBoxComponent;
+	private sqlIntegrationServicesPackageCheckbox: sqlops.CheckBoxComponent;
+	private powershellCheckBox: sqlops.CheckBoxComponent;
+
+	private credentials: sqlops.CredentialInfo[];
+
+	constructor(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo = undefined, credentials: sqlops.CredentialInfo[]) {
+		super(
+			ownerUri,
+			new ProxyData(ownerUri, proxyInfo),
+			proxyInfo ? ProxyDialog.EditDialogTitle : ProxyDialog.CreateDialogTitle);
+		this.credentials = credentials;
+	}
+
+	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
+		this.generalTab = sqlops.window.modelviewdialog.createTab(ProxyDialog.GeneralTabText);
+
+
+		this.initializeGeneralTab();
+
+		this.dialog.content = [this.generalTab];
+	}
+
+	private initializeGeneralTab() {
+		this.generalTab.registerContent(async view => {
+
+			this.proxyNameTextBox = view.modelBuilder.inputBox()
+				.withProperties({width: 420})
+				.component();
+
+			this.credentialNameDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					width: 432,
+					value: '',
+					editable: true,
+					values: this.credentials.length > 0 ? this.credentials.map(c => c.name) : ['']
+				})
+				.component();
+
+			this.descriptionTextBox = view.modelBuilder.inputBox()
+				.withProperties({
+					width: 420,
+					multiline: true,
+					height: 300
+				})
+				.component();
+
+			this.subsystemCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.SubsystemLabel
+				}).component();
+
+			this.subsystemCheckBox.onChanged(() => {
+				if (this.subsystemCheckBox.checked) {
+					this.operatingSystemCheckBox.checked = true;
+					this.replicationSnapshotCheckBox.checked = true;
+					this.replicationTransactionLogCheckBox.checked = true;
+					this.replicationDistributorCheckBox.checked = true;
+					this.replicationMergeCheckbox.checked = true;
+					this.replicationQueueReaderCheckbox.checked = true;
+					this.sqlQueryCheckBox.checked = true;
+					this.sqlCommandCheckBox.checked = true;
+					this.sqlIntegrationServicesPackageCheckbox.checked = true;
+					this.powershellCheckBox.checked = true;
+				} else {
+					this.operatingSystemCheckBox.checked = false;
+					this.replicationSnapshotCheckBox.checked = false;
+					this.replicationTransactionLogCheckBox.checked = false;
+					this.replicationDistributorCheckBox.checked = false;
+					this.replicationMergeCheckbox.checked = false;
+					this.replicationQueueReaderCheckbox.checked = false;
+					this.sqlQueryCheckBox.checked = false;
+					this.sqlCommandCheckBox.checked = false;
+					this.sqlIntegrationServicesPackageCheckbox.checked = false;
+					this.powershellCheckBox.checked = false;
+				}
+			});
+
+			this.operatingSystemCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.OperatingSystemLabel
+				}).component();
+
+			this.replicationSnapshotCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.ReplicationSnapshotLabel
+				}).component();
+
+			this.replicationTransactionLogCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.ReplicationTransactionLogLabel
+				}).component();
+
+			this.replicationDistributorCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.ReplicationDistributorLabel
+				}).component();
+
+			this.replicationMergeCheckbox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.ReplicationMergeLabel
+				}).component();
+
+			this.replicationQueueReaderCheckbox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.ReplicationQueueReaderLabel
+				}).component();
+
+			this.sqlQueryCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.SSASQueryLabel
+				}).component();
+
+			this.sqlCommandCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.SSASCommandLabel
+				}).component();
+
+			this.sqlIntegrationServicesPackageCheckbox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.SSISPackageLabel
+				}).component();
+
+			this.powershellCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: ProxyDialog.PowerShellLabel
+				}).component();
+
+			let checkBoxContainer = view.modelBuilder.groupContainer()
+				.withItems([this.operatingSystemCheckBox, this.replicationSnapshotCheckBox,
+				this.replicationTransactionLogCheckBox, this.replicationDistributorCheckBox, this.replicationMergeCheckbox,
+				this.replicationQueueReaderCheckbox, this.sqlQueryCheckBox, this.sqlCommandCheckBox, this.sqlIntegrationServicesPackageCheckbox,
+				this.powershellCheckBox])
+				.component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.proxyNameTextBox,
+					title: ProxyDialog.ProxyNameTextBoxLabel
+				}, {
+					component: this.credentialNameDropDown,
+					title: ProxyDialog.CredentialNameTextBoxLabel
+				}, {
+					component: this.descriptionTextBox,
+					title: ProxyDialog.DescriptionTextBoxLabel
+				}]).withLayout({ width: 420 }).component();
+
+			await view.initializeModel(formModel);
+
+			this.proxyNameTextBox.value = this.model.accountName;
+			this.credentialNameDropDown.value = this.model.credentialName;
+			this.descriptionTextBox.value = this.model.description;
+		});
+	}
+
+
+	protected updateModel() {
+		this.model.accountName = this.proxyNameTextBox.value;
+		this.model.credentialName = this.credentialNameDropDown.value as string;
+		this.model.credentialId = this.credentials.find(
+			c => c.name === this.model.credentialName).id;
+		this.model.credentialIdentity = this.credentials.find(
+			c => c.name === this.model.credentialName).identity;
+		this.model.description = this.descriptionTextBox.value;
+	}
+}

extensions/agent/src/dialogs/scheduleDialog.ts

@@ -4,29 +4,33 @@
  *--------------------------------------------------------------------------------------------*/
 
 'use strict';
-
+import * as nls from 'vscode-nls';
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
-import { CreateScheduleData } from '../data/createScheduleData';
+import { ScheduleData } from '../data/scheduleData';
 
-export class CreateScheduleDialog {
+const localize = nls.loadMessageBundle();
+
+export class ScheduleDialog {
 
 	// Top level
-	private readonly DialogTitle: string = 'New Schedule';
-	private readonly OkButtonText: string = 'OK';
-	private readonly CancelButtonText: string = 'Cancel';
+	private readonly DialogTitle: string = localize('scheduleDialog.newSchedule', 'New Schedule');
+	private readonly OkButtonText: string = localize('scheduleDialog.ok', 'OK');
+	private readonly CancelButtonText: string = localize('scheduleDialog.cancel', 'Cancel');
+	private readonly ScheduleNameText: string = localize('scheduleDialog.scheduleName', 'Schedule Name');
+	private readonly SchedulesLabelText: string = localize('scheduleDialog.schedules', 'Schedules');
 
 	// UI Components
 	private dialog: sqlops.window.modelviewdialog.Dialog;
 	private schedulesTable: sqlops.TableComponent;
 
-	private model: CreateScheduleData;
+	private model: ScheduleData;
 
-	private _onSuccess: vscode.EventEmitter<CreateScheduleData> = new vscode.EventEmitter<CreateScheduleData>();
-	public readonly onSuccess: vscode.Event<CreateScheduleData> = this._onSuccess.event;
+	private _onSuccess: vscode.EventEmitter<ScheduleData> = new vscode.EventEmitter<ScheduleData>();
+	public readonly onSuccess: vscode.Event<ScheduleData> = this._onSuccess.event;
 
 	constructor(ownerUri: string) {
-		this.model = new CreateScheduleData(ownerUri);
+		this.model = new ScheduleData(ownerUri);
 	}
 
 	public async showDialog() {
@@ -46,7 +50,7 @@ export class CreateScheduleDialog {
 			this.schedulesTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						'Schedule Name'
+						this.ScheduleNameText
 					],
 					data: [],
 					height: 600,
@@ -56,7 +60,7 @@ export class CreateScheduleDialog {
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
 					component: this.schedulesTable,
-					title: 'Schedules'
+					title: this.SchedulesLabelText
 				}]).withLayout({ width: '100%' }).component();
 
 			await view.initializeModel(formModel);

extensions/agent/src/interfaces.ts

@@ -4,22 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as sqlops from 'sqlops';
-import { AgentUtils } from '../agentUtils';
-
-export class CreateAlertData {
-	public ownerUri: string;
-	private _alert: sqlops.AgentAlertInfo;
-
-	constructor(ownerUri:string) {
-		this.ownerUri = ownerUri;
-	}
-
-	public async initialize() {
-		let agentService = await AgentUtils.getAgentService();
-
-	}
-
-	public async save() {
-	}
+export enum AgentDialogMode {
+	CREATE = 1,
+	EDIT = 2,
+	VIEW = 3
+}
+
+export interface IAgentDialogData {
+	dialogMode: AgentDialogMode;
+	initialize(): void;
+	save(): void;
 }

extensions/agent/src/mainController.ts

@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as nls from 'vscode-nls';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import { AlertDialog } from './dialogs/alertDialog';
+import { JobDialog } from './dialogs/jobDialog';
+import { OperatorDialog } from './dialogs/operatorDialog';
+import { ProxyDialog } from './dialogs/proxyDialog';
+import { JobStepDialog } from './dialogs/jobStepDialog';
+import { PickScheduleDialog } from './dialogs/pickScheduleDialog';
+
+const localize = nls.loadMessageBundle();
+
+/**
+ * The main controller class that initializes the extension
+ */
+export class MainController {
+    protected _context: vscode.ExtensionContext;
+
+    // PUBLIC METHODS //////////////////////////////////////////////////////
+    public constructor(context: vscode.ExtensionContext) {
+        this._context = context;
+    }
+
+    public static showNotYetImplemented(): void {
+        vscode.window.showInformationMessage(
+            localize('mainController.notImplemented', "This feature is under development.  Check-out the latest insiders build if you'd like to try out the most recent changes!"));
+    }
+
+    /**
+     * Activates the extension
+     */
+    public activate(): void {
+        vscode.commands.registerCommand('agent.openJobDialog', (ownerUri: string, jobInfo: sqlops.AgentJobInfo) => {
+            let dialog = new JobDialog(ownerUri, jobInfo);
+            dialog.openDialog();
+        });
+        vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, jobId: string, server: string, stepId: number) => {
+			let dialog = new JobStepDialog(ownerUri, jobId, server, stepId);
+			dialog.openNewStepDialog();
+        });
+        vscode.commands.registerCommand('agent.openPickScheduleDialog', (ownerUri: string) => {
+            let dialog = new PickScheduleDialog(ownerUri);
+            dialog.showDialog();
+        });
+        vscode.commands.registerCommand('agent.openAlertDialog', (ownerUri: string, alertInfo: sqlops.AgentAlertInfo, jobs: string[]) => {
+            let dialog = new AlertDialog(ownerUri, alertInfo, jobs);
+            dialog.openDialog();
+        });
+        vscode.commands.registerCommand('agent.openOperatorDialog', (ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo) => {
+            let dialog = new OperatorDialog(ownerUri, operatorInfo);
+            dialog.openDialog();
+        });
+        vscode.commands.registerCommand('agent.openProxyDialog', (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo, credentials: sqlops.CredentialInfo[]) => {
+            //@TODO: reenable create proxy after snapping July release (7/14/18)
+            // let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials);
+            // dialog.openDialog();
+            MainController.showNotYetImplemented();
+        });
+    }
+
+    /**
+     * Deactivates the extension
+     */
+    public deactivate(): void {
+    }
+}

extensions/agent/src/test/agent.test.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import * as sqlops from 'sqlops';
+import { JobData } from '../data/jobData';
+import { TestAgentService } from './testAgentService';
+
+const testOwnerUri = 'agent://testuri';
+
+suite('Agent extension', () => {
+	test('Create Job Data', async () => {
+		let testAgentService = new TestAgentService();
+		let data = new JobData(testOwnerUri, undefined, testAgentService);
+		data.save();
+	});
+});

extensions/agent/src/test/testAgentService.ts

@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import * as sqlops from 'sqlops';
+
+export class TestAgentService implements sqlops.AgentServicesProvider {
+	handle?: number;
+	readonly providerId: string = 'Test Provider';
+
+	// Job management methods
+	getJobs(ownerUri: string): Thenable<sqlops.AgentJobsResult> {
+		return undefined;
+	}
+	getJobHistory(ownerUri: string, jobId: string): Thenable<sqlops.AgentJobHistoryResult> {
+		return undefined;
+	}
+	jobAction(ownerUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+	createJob(ownerUri: string, jobInfo: sqlops.AgentJobInfo): Thenable<sqlops.CreateAgentJobResult> {
+		return undefined;
+	}
+	updateJob(ownerUri: string, originalJobName: string, jobInfo: sqlops.AgentJobInfo): Thenable<sqlops.UpdateAgentJobResult> {
+		return undefined;
+	}
+	deleteJob(ownerUri: string, jobInfo: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+	getJobDefaults(ownerUri: string): Thenable<sqlops.AgentJobDefaultsResult> {
+		return undefined;
+	}
+
+	// Job Step management methods
+	createJobStep(ownerUri: string, jobInfo: sqlops.AgentJobStepInfo): Thenable<sqlops.CreateAgentJobStepResult> {
+		return undefined;
+	}
+	updateJobStep(ownerUri: string, originalJobStepName: string, jobInfo: sqlops.AgentJobStepInfo): Thenable<sqlops.UpdateAgentJobStepResult> {
+		return undefined;
+	}
+	deleteJobStep(ownerUri: string, jobInfo: sqlops.AgentJobStepInfo): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+
+	// Alert management methods
+	getAlerts(ownerUri: string): Thenable<sqlops.AgentAlertsResult> {
+		return undefined;
+	}
+	createAlert(ownerUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable<sqlops.CreateAgentAlertResult> {
+		return undefined;
+	}
+	updateAlert(ownerUri: string, originalAlertName: string, alertInfo: sqlops.AgentAlertInfo): Thenable<sqlops.UpdateAgentAlertResult> {
+		return undefined;
+	}
+	deleteAlert(ownerUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+
+	// Operator management methods
+	getOperators(ownerUri: string): Thenable<sqlops.AgentOperatorsResult> {
+		return undefined;
+	}
+	createOperator(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable<sqlops.CreateAgentOperatorResult> {
+		return undefined;
+	}
+	updateOperator(ownerUri: string, originalOperatorName: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable<sqlops.UpdateAgentOperatorResult> {
+		return undefined;
+	}
+	deleteOperator(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+
+	// Proxy management methods
+	getProxies(ownerUri: string): Thenable<sqlops.AgentProxiesResult> {
+		return undefined;
+	}
+	createProxy(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable<sqlops.CreateAgentOperatorResult> {
+		return undefined;
+	}
+	updateProxy(ownerUri: string, originalProxyName: string, proxyInfo: sqlops.AgentProxyInfo): Thenable<sqlops.UpdateAgentOperatorResult> {
+		return undefined;
+	}
+	deleteProxy(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+
+	// Agent Credential method
+	getCredentials(ownerUri: string): Thenable<sqlops.GetCredentialsResult> {
+		return undefined;
+	}
+
+	// Job Schedule management methods
+	getJobSchedules(ownerUri: string): Thenable<sqlops.AgentJobSchedulesResult> {
+		return undefined;
+	}
+	createJobSchedule(ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.CreateAgentJobScheduleResult> {
+		return undefined;
+	}
+	updateJobSchedule(ownerUri: string, originalScheduleName: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.UpdateAgentJobScheduleResult> {
+		return undefined;
+	}
+	deleteJobSchedule(ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.ResultStatus> {
+		return undefined;
+	}
+
+	registerOnUpdated(handler: () => any): void {
+	}
+}

extensions/agent/src/typings/ref.d.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../../src/sql/sqlops.d.ts'/>
-/// <reference path='../../../../../src/sql/sqlops.proposed.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../src/sql/sqlops.d.ts'/>
+/// <reference path='../../../../src/sql/sqlops.proposed.d.ts'/>
 /// <reference types='@types/node'/>

extensions/mssql/package.json

@@ -658,9 +658,9 @@
     }
   },
   "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.1.9",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.0",
     "opener": "^1.4.3",
-    "service-downloader": "github:anthonydresser/service-downloader#0.1.2",
+    "service-downloader": "github:anthonydresser/service-downloader#0.1.4",
     "vscode-extension-telemetry": "^0.0.15"
   },
   "devDependencies": {

extensions/mssql/snippets/mssql.json

@@ -8,9 +8,9 @@
 			"GO",
 			"-- Create the new database if it does not exist already",
 			"IF NOT EXISTS (",
-			"\tSELECT name",
+			"\tSELECT [name]",
 			"\t\tFROM sys.databases",
-			"\t\tWHERE name = N'${1:DatabaseName}'",
+			"\t\tWHERE [name] = N'${1:DatabaseName}'",
 			")",
 			"CREATE DATABASE ${1:DatabaseName}",
 			"GO"
@@ -29,9 +29,9 @@
 			"-- ALTER DATABASE ${1:DatabaseName} SET SINGLE_USER WITH ROLLBACK IMMEDIATE;",
 			"-- Drop the database if it exists",
 			"IF EXISTS (",
-			"  SELECT name",
+			"  SELECT [name]",
 			"   FROM sys.databases",
-			"   WHERE name = N'${1:DatabaseName}'",
+			"   WHERE [name] = N'${1:DatabaseName}'",
 			")",
 			"DROP DATABASE ${1:DatabaseName}",
 			"GO"
@@ -42,38 +42,33 @@
 	"Create a new Table": {
 		"prefix": "sqlCreateTable",
 		"body": [
-			"-- Create a new table called '${1:TableName}' in schema '${2:SchemaName}'",
+			"-- Create a new table called '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
 			"-- Drop the table if it already exists",
-			"IF OBJECT_ID('${2:SchemaName}.${1:TableName}', 'U') IS NOT NULL",
-			"DROP TABLE ${2:SchemaName}.${1:TableName}",
+			"IF OBJECT_ID('[${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]', 'U') IS NOT NULL",
+			"DROP TABLE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"GO",
-			"-- Create the table in the specified schema",
-			"CREATE TABLE ${2:SchemaName}.${1:TableName}",
+			"-- Create the table in the specified database and schema",
+			"CREATE TABLE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"(",
-			"\t${1:TableName}Id INT NOT NULL PRIMARY KEY, -- primary key column",
-			"\t$3Column1 [NVARCHAR](50) NOT NULL,",
-			"\t$4Column2 [NVARCHAR](50) NOT NULL",
-			"\t-- specify more columns here",
+			"\t[${4:ColumnName}]Id INT NOT NULL PRIMARY KEY, -- Primary Key column",
+			"\t[${5:ColumnName1}] [NVARCHAR](50) NOT NULL,",
+			"\t[${6:ColumnName2}] [NVARCHAR](50) NOT NULL",
+			"\t-- Specify more columns here",
 			");",
 			"GO"
 		],
 		"description": "Create a new Table"
 	},
 
+
 	"Drop a Table": {
 		"prefix": "sqlDropTable",
 		"body": [
-			"-- Drop the table '${1:TableName}' in schema '${2:SchemaName}'",
-			"IF EXISTS (",
-			"\tSELECT *",
-			"\t\tFROM sys.tables",
-			"\t\tJOIN sys.schemas",
-			"\t\t\tON sys.tables.schema_id = sys.schemas.schema_id",
-			"\tWHERE sys.schemas.name = N'${2:SchemaName}'",
-			"\t\tAND sys.tables.name = N'${1:TableName}'",
-			")",
-			"\tDROP TABLE ${2:SchemaName}.${1:TableName}",
-			"GO"
+				"-- Drop a table called '${3:TableName}' in schema '${2:SchemaName}' in Database '${1:DatabaseName}'",
+				"-- Drop the table if it already exists",
+				"IF OBJECT_ID('[${1:DatabaseName}].[${2:SchemaName}].[${3:TableName}]', 'U') IS NOT NULL",
+				"DROP TABLE [${1:DatabaseName}].[${2:SchemaName}].[${3:TableName}]",
+				"GO"
 		],
 		"description": "Drop a Table"
 	},
@@ -81,9 +76,9 @@
 	"Add a new column to a Table": {
 		"prefix": "sqlAddColumn",
 		"body": [
-			"-- Add a new column '${1:NewColumnName}' to table '${2:TableName}' in schema '${3:SchemaName}'",
-			"ALTER TABLE ${3:SchemaName}.${2:TableName}",
-			"\tADD ${1:NewColumnName} /*new_column_name*/ int /*new_column_datatype*/ NULL /*new_column_nullability*/",
+			"-- Add a new column '[${1:NewColumnName}]' to table '[${2:TableName}]' in schema '[${3:SchemaName}]' in database '[${4:DatabaseName}]'",
+			"ALTER TABLE [${4:DatabaseName}].[${3:SchemaName}].[${2:TableName}]",
+			"\tADD [${1:NewColumnName}] /*new_column_name*/ ${5:int} /*new_column_datatype*/ ${6:NULL} /*new_column_nullability*/",
 			"GO"
 		],
 		"description": "Add a new column to a Table"
@@ -92,9 +87,9 @@
 	"Drop a column from a Table": {
 		"prefix": "sqlDropColumn",
 		"body": [
-			"-- Drop '${1:ColumnName}' from table '${2:TableName}' in schema '${3:SchemaName}'",
-			"ALTER TABLE ${3:SchemaName}.${2:TableName}",
-			"\tDROP COLUMN ${1:ColumnName}",
+			"-- Drop '[${1:ColumnName}]' from table '[${2:TableName}]' in schema '[${3:SchemaName}]' in database '[${4:DatabaseName}]'",
+			"ALTER TABLE [${4:DatabaseName}].[${3:SchemaName}].[${2:TableName}]",
+			"\tDROP COLUMN [${1:ColumnName}]",
 			"GO"
 		],
 		"description": "Add a new column to a Table"
@@ -103,9 +98,9 @@
 	"Select rows from a Table or a View": {
 		"prefix": "sqlSelect",
 		"body": [
-			"-- Select rows from a Table or View '${1:TableOrViewName}' in schema '${2:SchemaName}'",
-			"SELECT * FROM ${2:SchemaName}.${1:TableOrViewName}",
-			"WHERE $3\t/* add search conditions here */",
+			"-- Select rows from a Table or View '[${1:TableOrViewName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"SELECT * FROM [${3:DatabaseName}].[${2:SchemaName}].[${1:TableOrViewName}]",
+			"WHERE ${4:/* add search conditions here */}",
 			"GO"
 		],
 		"description": "Select rows from a Table or a View"
@@ -114,19 +109,19 @@
 	"Insert rows into a Table": {
 		"prefix": "sqlInsertRows",
 		"body": [
-			"-- Insert rows into table '${1:TableName}'",
-			"INSERT INTO ${1:TableName}",
-			"( -- columns to insert data into",
-			" $2[Column1], [Column2], [Column3]",
+			"-- Insert rows into table '${1:TableName}' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"INSERT INTO [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
+			"( -- Columns to insert data into",
+			" ${4:[ColumnName1], [ColumnName2], [ColumnName3]}",
 			")",
 			"VALUES",
-			"( -- first row: values for the columns in the list above",
-			" $3Column1_Value, Column2_Value, Column3_Value",
+			"( -- First row: values for the columns in the list above",
+			" ${5:ColumnValue1, ColumnValue2, ColumnValue3}",
 			"),",
-			"( -- second row: values for the columns in the list above",
-			" $4Column1_Value, Column2_Value, Column3_Value",
+			"( -- Second row: values for the columns in the list above",
+			" ${6:ColumnValue1, ColumnValue2, ColumnValue3}",
 			")",
-			"-- add more rows here",
+			"-- Add more rows here",
 			"GO"
 		],
 		"description": "Insert rows into a Table"
@@ -135,9 +130,9 @@
 	"Delete rows from a Table": {
 		"prefix": "sqlDeleteRows",
 		"body": [
-			"-- Delete rows from table '${1:TableName}'",
-			"DELETE FROM ${1:TableName}",
-			"WHERE $2\t/* add search conditions here */",
+			"-- Delete rows from table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"DELETE FROM [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
+			"WHERE ${4:/* add search conditions here */}",
 			"GO"
 		],
 		"description": "Delete rows from a Table"
@@ -146,13 +141,13 @@
 	"Update rows in a Table": {
 		"prefix": "sqlUpdateRows",
 		"body": [
-			"-- Update rows in table '${1:TableName}'",
-			"UPDATE ${1:TableName}",
+			"-- Update rows in table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"UPDATE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"SET",
-			"\t$2[Colum1] = Colum1_Value,",
-			"\t$3[Colum2] = Colum2_Value",
-			"\t-- add more columns and values here",
-			"WHERE $4\t/* add search conditions here */",
+			"\t[${4:ColumnName1}] = ${5:ColumnValue1},",
+			"\t[${6:ColumnName2}] = ${7:ColumnValue2}",
+			"\t-- Add more columns and values here",
+			"WHERE ${8:/* add search conditions here */}",
 			"GO"
 		],
 		"description": "Update rows in a Table"
@@ -207,8 +202,8 @@
 		"prefix": "sqlListTablesAndViews",
 		"body": [
 			"-- Get a list of tables and views in the current database",
-			"SELECT table_catalog [database], table_schema [schema], table_name name, table_type type",
-			"FROM information_schema.tables",
+			"SELECT table_catalog [database], table_schema [schema], table_name [name], table_type [type]",
+			"FROM INFORMATION_SCHEMA.TABLES",
 			"GO"
 		],
 		"description": "List tables and vies in the current database"
@@ -218,7 +213,7 @@
 		"prefix": "sqlListDatabases",
 		"body": [
 			"-- Get a list of databases",
-			"SELECT name FROM sys.databases",
+			"SELECT [name] FROM sys.databases",
 			"GO"
 		],
 		"description": "List databases"
@@ -232,8 +227,8 @@
 			"\tTableName = tbl.table_schema + '.' + tbl.table_name, ",
 			"\tColumnName = col.column_name, ",
 			"\tColumnDataType = col.data_type",
-			"FROM information_schema.tables tbl",
-			"INNER JOIN information_schema.columns col ",
+			"FROM INFORMATION_SCHEMA.TABLES tbl",
+			"INNER JOIN INFORMATION_SCHEMA.COLUMNS col ",
 			"\tON col.table_name = tbl.table_name",
 			"\tAND col.table_schema = tbl.table_schema",
 			"",
@@ -247,20 +242,20 @@
 		"prefix": "sqlCursor",
 		"body": [
 			"-- Declare a cursor for a Table or a View '${1:TableOrViewName}' in schema '${2:SchemaName}'",
-			"DECLARE @Column1 NVARCHAR(50), @Column2 NVARCHAR(50)",
+			"DECLARE @ColumnName1 NVARCHAR(50), @ColumnName2 NVARCHAR(50)",
 			"",
 			"DECLARE db_cursor CURSOR FOR",
-			"SELECT Column1, Column2",
+			"SELECT ColumnName1, Column2",
 			"FROM $2.$1",
 			"",
 			"OPEN db_cursor",
-			"FETCH NEXT FROM db_cursor INTO @Column1, @Column2",
+			"FETCH NEXT FROM db_cursor INTO @ColumnName1, @ColumnName2",
 			"",
 			"WHILE @@FETCH_STATUS = 0",
 			"BEGIN",
 			"\t-- add instructions to be executed for every row",
 			"\t$3",
-			"\tFETCH NEXT FROM db_cursor INTO @Column1, @Column2",
+			"\tFETCH NEXT FROM db_cursor INTO @ColumnName1, @ColumnName2",
 			"END",
 			"",
 			"CLOSE db_cursor",
@@ -303,5 +298,34 @@
 			"GO"
 		],
 		"description": "Get Space Used by Tables"
-	}
+	},
+
+	"Create a new Index": {
+		"prefix": "sqlCreateIndex",
+		"body": [
+			"-- Create a nonclustered index with or without a unique constraint",
+			"-- Or create a clustered index on table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"CREATE ${5:/*UNIQUE or CLUSTERED*/} INDEX IX_${4:IndexName} ON [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}] ([${6:ColumnName1}] DESC /*Change sort order as needed*/",
+			"GO"
+		],
+		"description": "Create a new Index"
+	},
+
+	"Create a new Temporary Table": {
+		"prefix": "sqlCreateTempTable",
+		"body": [
+			"-- Drop a temporary table called '#${1:TableName}'",
+			"-- Drop the table if it already exists",
+			"IF OBJECT_ID('tempDB..#${1:TableName}', 'U') IS NOT NULL",
+			"DROP TABLE #${1:TableName}",
+			"GO",
+			"-- Create the temporary table from a physical table called '${4:TableName}' in schema '${3:SchemaName}' in database '${2:DatabaseName}'",
+			"SELECT *",
+			"INTO #${1:TableName}",
+			"FROM [${2:DatabaseName}].[${3:[SchemaName}].[${4:TableName}]",
+			"WHERE ${5:/* add search conditions here */}"
+		],
+		"description": "Create a new Temporary Table"
+	},
+
 }

extensions/mssql/src/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "1.5.0-alpha.2",
+	"version": "1.5.0-alpha.14",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.1.zip",
 		"Windows_64": "win-x64-netcoreapp2.1.zip",

extensions/mssql/src/contracts.ts

@@ -148,6 +148,11 @@ export interface DeleteAgentProxyParams {
 	proxy: sqlops.AgentProxyInfo;
 }
 
+// Agent Credentials parameters
+export interface GetCredentialsParams {
+	ownerUri: string;
+}
+
 // Job Schedule management parameters
 export interface AgentJobScheduleParams {
 	ownerUri: string;
@@ -262,6 +267,11 @@ export namespace DeleteAgentProxyRequest {
 	export const type = new RequestType<DeleteAgentProxyParams, sqlops.ResultStatus, void, void>('agent/deleteproxy');
 }
 
+// Agent Credentials request
+export namespace AgentCredentialsRequest {
+	export const type = new RequestType<GetCredentialsParams, sqlops.GetCredentialsResult, void, void>('security/credentials');
+}
+
 // Job Schedules requests
 export namespace AgentJobSchedulesRequest {
 	export const type = new RequestType<AgentJobScheduleParams, sqlops.AgentJobSchedulesResult, void, void>('agent/schedules');

extensions/mssql/src/features.ts

@@ -35,6 +35,8 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 		contracts.AgentJobActionRequest.type
 	];
 
+	private onUpdatedHandler: () => any;
+
 	constructor(client: SqlOpsDataClient) {
 		super(client, AgentServicesFeature.messagesTypes);
 	}
@@ -53,6 +55,18 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 
 	protected registerProvider(options: undefined): Disposable {
 		const client = this._client;
+		let self = this;
+
+		// On updated registration
+		let registerOnUpdated = (handler: () => any): void => {
+			self.onUpdatedHandler = handler;
+		};
+
+		let fireOnUpdated = (): void => {
+			if (self.onUpdatedHandler) {
+				self.onUpdatedHandler();
+			}
+		};
 
 		// Job management methods
 		let getJobs = (ownerUri: string): Thenable<sqlops.AgentJobsResult> => {
@@ -96,7 +110,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentJobRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -112,7 +129,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentJobRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -127,7 +147,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentJobRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -157,7 +180,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentJobStepRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -173,7 +199,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentJobStepRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -188,7 +217,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentJobStepRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -218,7 +250,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentAlertRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -234,7 +269,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentAlertRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -249,7 +287,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentAlertRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -279,7 +320,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentOperatorRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -295,7 +339,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentOperatorRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -310,7 +357,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentOperatorRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -340,7 +390,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentProxyRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -356,7 +409,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentProxyRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -370,6 +426,24 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 				proxy: proxyInfo
 			};
 			let requestType = contracts.DeleteAgentProxyRequest.type;
+			return client.sendRequest(requestType, params).then(
+				r => {
+					fireOnUpdated();
+					return r;
+				},
+				e => {
+					client.logFailedRequest(requestType, e);
+					return Promise.resolve(undefined);
+				}
+			);
+		};
+
+		// Agent Credential Method
+		let  getCredentials = (ownerUri: string): Thenable<sqlops.GetCredentialsResult>  => {
+			let params: contracts.GetCredentialsParams = {
+				ownerUri: ownerUri
+			};
+			let requestType = contracts.AgentCredentialsRequest.type;
 			return client.sendRequest(requestType, params).then(
 				r => r,
 				e => {
@@ -379,6 +453,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			);
 		};
 
+
 		// Job Schedule management methods
 		let  getJobSchedules = (ownerUri: string): Thenable<sqlops.AgentJobSchedulesResult>  => {
 			let params: contracts.AgentJobScheduleParams = {
@@ -401,7 +476,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentJobScheduleRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -417,7 +495,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentJobScheduleRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -432,7 +513,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentJobScheduleRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -464,10 +548,12 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			createProxy,
 			updateProxy,
 			deleteProxy,
+			getCredentials,
 			getJobSchedules,
 			createJobSchedule,
 			updateJobSchedule,
-			deleteJobSchedule
+			deleteJobSchedule,
+			registerOnUpdated
 		});
 	}
 }

extensions/mssql/src/telemetry.ts

@@ -44,22 +44,6 @@ export class Telemetry {
 	private static platformInformation: PlatformInformation;
 	private static disabled: boolean;
 
-	// Get the unique ID for the current user of the extension
-	public static getUserId(): Promise<string> {
-		return new Promise<string>(resolve => {
-			// Generate the user id if it has not been created already
-			if (typeof this.userId === 'undefined') {
-				let id = Utils.generateUserId();
-				id.then(newId => {
-					this.userId = newId;
-					resolve(this.userId);
-				});
-			} else {
-				resolve(this.userId);
-			}
-		});
-	}
-
 	public static getPlatformInformation(): Promise<PlatformInformation> {
 		if (this.platformInformation) {
 			return Promise.resolve(this.platformInformation);
@@ -143,8 +127,7 @@ export class Telemetry {
 		}
 
 		// Augment the properties structure with additional common properties before sending
-		Promise.all([this.getUserId(), this.getPlatformInformation()]).then(() => {
-			properties['userId'] = this.userId;
+		Promise.all([this.getPlatformInformation()]).then(() => {
 			properties['distribution'] = (this.platformInformation && this.platformInformation.distribution) ?
 				`${this.platformInformation.distribution.name}, ${this.platformInformation.distribution.version}` : '';
 

extensions/mssql/yarn.lock

@@ -49,9 +49,9 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.1.9":
-  version "0.1.9"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/a1a79895cb79658b75d78aa5cfd745855019148d"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.0":
+  version "0.2.0"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/c7a691c7fc5ad54a147090784a7f11efda301f4b"
   dependencies:
     vscode-languageclient "3.5.0"
 
@@ -296,9 +296,9 @@ semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-"service-downloader@github:anthonydresser/service-downloader#0.1.2":
-  version "0.1.2"
-  resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/2aa9b336b6442e17e24693ddc907030575539798"
+"service-downloader@github:anthonydresser/service-downloader#0.1.4":
+  version "0.1.4"
+  resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/3c0abdf8603aca85d2eacfac3c547173e41bf0c7"
   dependencies:
     decompress "^4.2.0"
     eventemitter2 "^5.0.1"

extensions/profiler/package.json

@@ -2,7 +2,7 @@
   "name": "profiler",
   "displayName": "SQL Server Profiler",
   "description": "SQL Server Profiler for SQL Operations Studio",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt",

extensions/sql/language-configuration.json

@@ -12,8 +12,9 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""],
-		["'", "'"]
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "N'", "close": "'", "notIn": ["string", "comment"] },
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"] }
 	],
 	"surroundingPairs": [
 		["{", "}"],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.31.1",
+  "version": "0.32.2",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {
     "name": "Microsoft Corporation"
@@ -34,7 +34,7 @@
     "@angular/router": "~4.1.3",
     "@angular/upgrade": "~4.1.3",
     "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.11",
+    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.3.12",
     "applicationinsights": "0.18.0",
     "chart.js": "^2.6.0",
     "fast-plist": "0.1.2",
@@ -43,8 +43,8 @@
     "getmac": "1.0.7",
     "graceful-fs": "4.1.11",
     "html-query-plan": "git://github.com/anthonydresser/html-query-plan.git#2.4",
-    "http-proxy-agent": "0.2.7",
-    "https-proxy-agent": "0.3.6",
+    "http-proxy-agent": "^2.1.0",
+    "https-proxy-agent": "^2.2.1",
     "iconv-lite": "0.4.19",
     "jquery": "3.1.0",
     "jschardet": "1.6.0",
@@ -60,7 +60,7 @@
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.4.0",
     "semver": "4.3.6",
-    "slickgrid": "github:anthonydresser/SlickGrid#2.3.22",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.25",
     "spdlog": "0.6.0",
     "sudo-prompt": "^8.0.0",
     "svg.js": "^2.2.5",

product.json

@@ -30,6 +30,7 @@
 	"gettingStartedUrl": "https://go.microsoft.com/fwlink/?linkid=862039",
 	"releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=875578",
 	"documentationUrl": "https://go.microsoft.com/fwlink/?linkid=862277",
+	"vscodeVersion": "1.23.1",
 	"commit": "9ca6200018fc206d67a47229f991901a8a453781",
 	"date": "2017-12-15T12:00:00.000Z",
 	"recommendedExtensions": [
@@ -42,4 +43,4 @@
 	"extensionsGallery": {
 		"serviceUrl": "https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery.json"
 	}
-}
+}

samples/sqlservices/src/controllers/mainController.ts

@@ -69,10 +69,10 @@ export default class MainController implements vscode.Disposable {
 
 	private async getTabContent(view: sqlops.ModelView, customButton1: sqlops.window.modelviewdialog.Button, customButton2: sqlops.window.modelviewdialog.Button, componentWidth: number | string): Promise<void> {
 		let inputBox = view.modelBuilder.inputBox()
-		.withProperties({
-			multiline: true,
-			height: 100
-		}).component();
+			.withProperties({
+				multiline: true,
+				height: 100
+			}).component();
 		let inputBoxWrapper = view.modelBuilder.loadingComponent().withItem(inputBox).component();
 		inputBoxWrapper.loading = false;
 		customButton1.onClick(() => {
@@ -145,8 +145,8 @@ export default class MainController implements vscode.Disposable {
 				component: inputBox4,
 				title: 'inputBox4'
 			}], {
-				horizontal: true
-			}).component();
+					horizontal: true
+				}).component();
 		let groupModel1 = view.modelBuilder.groupContainer()
 			.withLayout({
 			}).withItems([
@@ -178,8 +178,8 @@ export default class MainController implements vscode.Disposable {
 		}).component();
 
 		let declarativeTable = view.modelBuilder.declarativeTable()
-		.withProperties({
-			columns: [{
+			.withProperties({
+				columns: [{
 					displayName: 'Column 1',
 					valueType: sqlops.DeclarativeDataType.string,
 					width: '20px',
@@ -204,12 +204,12 @@ export default class MainController implements vscode.Disposable {
 						{ name: 'options2', displayName: 'option 2' }
 					]
 				}
-			],
-			data: [
-				['Data00', 'Data01', false, 'options2'],
-				['Data10', 'Data11', true, 'options1']
-			]
-		}).component();
+				],
+				data: [
+					['Data00', 'Data01', false, 'options2'],
+					['Data10', 'Data11', true, 'options1']
+				]
+			}).component();
 
 		declarativeTable.onDataChanged(e => {
 			inputBox2.value = e.row.toString() + ' ' + e.column.toString() + ' ' + e.value.toString();
@@ -223,7 +223,7 @@ export default class MainController implements vscode.Disposable {
 				height: 150
 			}).withItems([
 				radioButton, groupModel1, radioButton2]
-			, { flex: '1 1 50%' }).component();
+				, { flex: '1 1 50%' }).component();
 		let formModel = view.modelBuilder.formContainer()
 			.withFormItems([{
 				component: inputBoxWrapper,
@@ -254,9 +254,9 @@ export default class MainController implements vscode.Disposable {
 				component: listBox,
 				title: 'List Box'
 			}], {
-				horizontal: false,
-				componentWidth: componentWidth
-			}).component();
+					horizontal: false,
+					componentWidth: componentWidth
+				}).component();
 		let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
 		formWrapper.loading = false;
 		customButton2.onClick(() => {
@@ -285,7 +285,6 @@ export default class MainController implements vscode.Disposable {
 		tab1.registerContent(async (view) => {
 			await this.getTabContent(view, customButton1, customButton2, 400);
 		});
-
 		sqlops.window.modelviewdialog.openDialog(dialog);
 	}
 
@@ -302,6 +301,18 @@ export default class MainController implements vscode.Disposable {
 		page1.registerContent(async (view) => {
 			await this.getTabContent(view, customButton1, customButton2, 800);
 		});
+		/*
+		wizard.registerOperation({
+			displayName: 'test task',
+			description: 'task description',
+			isCancelable: true
+		}, op => {
+			op.updateStatus(sqlops.TaskStatus.InProgress);
+			op.updateStatus(sqlops.TaskStatus.InProgress, 'Task is running');
+			setTimeout(() => {
+				op.updateStatus(sqlops.TaskStatus.Succeeded);
+			}, 5000);
+		});*/
 		wizard.pages = [page1, page2];
 		wizard.open();
 	}
@@ -344,15 +355,32 @@ export default class MainController implements vscode.Disposable {
 				webview2.message = count;
 			});
 
-			let flexModel = view.modelBuilder.flexContainer()
-				.withLayout({
-					flexFlow: 'column',
-					alignItems: 'flex-start',
-					height: 500
-				}).withItems([
-					webview1, webview2
-				], { flex: '1 1 50%' })
+			let editor1 = view.modelBuilder.editor()
+				.withProperties({
+					content: 'select * from sys.tables'
+				})
 				.component();
+
+			let editor2 = view.modelBuilder.editor()
+				.withProperties({
+					content: 'print("Hello World !")',
+					languageMode: 'python'
+				})
+				.component();
+
+			let flexModel = view.modelBuilder.flexContainer().component();
+			flexModel.addItem(editor1, { flex: '1' });
+			flexModel.addItem(editor2, { flex: '1' });
+			flexModel.setLayout({
+				flexFlow: 'column',
+				alignItems: 'stretch',
+				height: '100%'
+			});
+
+			view.onClosed((params) => {
+				vscode.window.showInformationMessage('editor1: language: ' + editor1.languageMode + ' Content1: ' + editor1.content);
+				vscode.window.showInformationMessage('editor2: language: ' + editor2.languageMode + ' Content2: ' + editor2.content);
+			});
 			await view.initializeModel(flexModel);
 		});
 		editor.openEditor();
@@ -379,13 +407,14 @@ export default class MainController implements vscode.Disposable {
 			let monitorLightPath = vscode.Uri.file(path.join(__dirname, '..', 'media', 'monitor.svg'));
 			let monitorIcon = {
 				light: monitorLightPath,
-				dark: path.join(__dirname, '..', 'media', 'monitor_inverse.svg') };
+				dark: path.join(__dirname, '..', 'media', 'monitor_inverse.svg')
+			};
 
 			let monitorButton = view.modelBuilder.button()
-					.withProperties({
-						label: 'Monitor',
-						iconPath: monitorIcon
-					}).component();
+				.withProperties({
+					label: 'Monitor',
+					iconPath: monitorIcon
+				}).component();
 			let toolbarModel = view.modelBuilder.toolbarContainer()
 				.withToolbarItems([{
 					component: inputBox,

src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts

@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import {
+	Component, Inject, forwardRef, ElementRef, OnInit, Input,
+	Output, OnChanges, SimpleChanges, EventEmitter
+} from '@angular/core';
+
+import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown';
+import { AngularDisposable } from 'sql/base/common/lifecycle';
+
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { attachEditableDropdownStyler } from 'sql/common/theme/styler';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+
+@Component({
+	selector: 'editable-select-box',
+	template: ''
+})
+export class EditableDropDown extends AngularDisposable implements OnInit, OnChanges {
+	private _selectbox: Dropdown;
+
+	@Input() options: string[];
+	@Input() selectedOption: string;
+	@Input() onlyEmitOnChange = false;
+
+	@Output() onDidSelect = new EventEmitter<string>();
+
+	private _previousVal: string;
+
+	constructor(
+		@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
+		@Inject(IThemeService) private themeService: IThemeService,
+		@Inject(IContextViewService) private contextViewService: IContextViewService
+	) {
+		super();
+	}
+
+	ngOnInit(): void {
+		let dropdownOptions: IDropdownOptions = {
+			values: [],
+			strictSelection: false,
+			placeholder: '',
+			maxHeight: 125,
+			ariaLabel: '',
+			actionLabel: ''
+		};
+		this._selectbox = new Dropdown(this._el.nativeElement, this.contextViewService, this.themeService, dropdownOptions);
+		this._selectbox.values = this.options;
+		this._selectbox.value = this.selectedOption;
+
+		this._selectbox.onValueChange(e => {
+			if (this.onlyEmitOnChange) {
+				if (this._previousVal !== e) {
+					this.onDidSelect.emit(e);
+					this._previousVal = e;
+				}
+			} else {
+				this.onDidSelect.emit(e);
+			}
+		});
+		this._register(attachEditableDropdownStyler(this._selectbox, this.themeService));
+	}
+
+	ngOnChanges(changes: SimpleChanges): void {
+	}
+
+	public get value(): string {
+		return this._selectbox.value;
+	}
+}

src/sql/base/browser/ui/inputBox/inputBox.ts

@@ -63,13 +63,13 @@ export class InputBox extends vsInputBox {
 		this.enabledInputBorder = this.inputBorder;
 		this.disabledInputBackground = styles.disabledInputBackground;
 		this.disabledInputForeground = styles.disabledInputForeground;
+		this.updateInputEnabledDisabledColors();
+		this.applyStyles();
 	}
 
 	public enable(): void {
 		super.enable();
-		this.inputBackground = this.enabledInputBackground;
-		this.inputForeground = this.enabledInputForeground;
-		this.inputBorder = this.enabledInputBorder;
+		this.updateInputEnabledDisabledColors();
 		this.applyStyles();
 	}
 
@@ -89,9 +89,7 @@ export class InputBox extends vsInputBox {
 
 	public disable(): void {
 		super.disable();
-		this.inputBackground = this.disabledInputBackground;
-		this.inputForeground = this.disabledInputForeground;
-		this.inputBorder = this.disabledInputBorder;
+		this.updateInputEnabledDisabledColors();
 		this.applyStyles();
 	}
 
@@ -121,4 +119,11 @@ export class InputBox extends vsInputBox {
 			super.showMessage(message, force);
 		}
 	}
+
+	private updateInputEnabledDisabledColors(): void {
+		let enabled = this.isEnabled();
+		this.inputBackground = enabled ? this.enabledInputBackground : this.disabledInputBackground;
+		this.inputForeground = enabled ? this.enabledInputForeground : this.disabledInputForeground;
+		this.inputBorder = enabled ? this.enabledInputBorder : this.disabledInputBorder;
+	}
 }

src/sql/base/browser/ui/modal/dialogHelper.ts

@@ -17,7 +17,7 @@ export function appendRow(container: Builder, label: string, labelClass: string,
 	container.element('tr', {}, (rowContainer) => {
 		rowContainer.element('td', { class: labelClass }, (labelCellContainer) => {
 			labelCellContainer.div({}, (labelContainer) => {
-				labelContainer.innerHtml(label);
+				labelContainer.text(label);
 			});
 		});
 		rowContainer.element('td', { class: cellContainerClass }, (inputCellContainer) => {
@@ -33,7 +33,7 @@ export function appendRowLink(container: Builder, label: string, labelClass: str
 	container.element('tr', {}, (rowContainer) => {
 		rowContainer.element('td', { class: labelClass }, (labelCellContainer) => {
 			labelCellContainer.div({}, (labelContainer) => {
-				labelContainer.innerHtml(label);
+				labelContainer.text(label);
 			});
 		});
 		rowContainer.element('td', { class: cellContainerClass }, (inputCellContainer) => {

src/sql/base/browser/ui/modal/modal.ts

@@ -170,7 +170,7 @@ export abstract class Modal extends Disposable implements IThemable {
 				}
 				modalHeader.div({ class: 'modal-title' }, (modalTitle) => {
 					this._modalTitle = modalTitle;
-					modalTitle.innerHtml(this._title);
+					modalTitle.text(this._title);
 				});
 			});
 			parts.push(this._modalHeaderSection.getHTMLElement());
@@ -433,7 +433,7 @@ export abstract class Modal extends Disposable implements IThemable {
 	 */
 	protected set title(title: string) {
 		if (this._title !== undefined) {
-			this._modalTitle.innerHtml(title);
+			this._modalTitle.text(title);
 		}
 	}
 

src/sql/base/browser/ui/modal/optionsDialog.ts

@@ -150,8 +150,8 @@ export class OptionsDialog extends Modal {
 
 	private onOptionLinkClicked(optionName: string): void {
 		var option = this._optionElements[optionName].option;
-		this._optionTitle.innerHtml(option.displayName);
-		this._optionDescription.innerHtml(option.description);
+		this._optionTitle.text(option.displayName);
+		this._optionDescription.text(option.description);
 	}
 
 	private fillInOptions(container: Builder, options: sqlops.ServiceOption[]): void {

src/sql/base/browser/ui/panel/tab.component.ts

@@ -5,8 +5,9 @@
 import { Component, Input, ContentChild, OnDestroy, TemplateRef, ChangeDetectorRef, forwardRef, Inject } from '@angular/core';
 
 import { Action } from 'vs/base/common/actions';
+import { Disposable } from 'vs/base/common/lifecycle';
 
-export abstract class TabChild {
+export abstract class TabChild extends Disposable {
 	public abstract layout(): void;
 }
 
@@ -19,7 +20,7 @@ export abstract class TabChild {
 	`
 })
 export class TabComponent implements OnDestroy {
-	@ContentChild(TabChild) private _child: TabChild;
+	private _child: TabChild;
 	@ContentChild(TemplateRef) templateRef;
 	@Input() public title: string;
 	@Input() public canClose: boolean;
@@ -29,19 +30,30 @@ export class TabComponent implements OnDestroy {
 	@Input() public identifier: string;
 	@Input() private visibilityType: 'if' | 'visibility' = 'if';
 	private rendered = false;
+	private destroyed: boolean = false;
+
+
+	@ContentChild(TabChild) private set child(tab: TabChild) {
+		this._child = tab;
+		if (this.active && this._child) {
+			this._child.layout();
+		}
+	}
 
 	constructor(
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef
 	) { }
 
 	public set active(val: boolean) {
-		this._active = val;
-		if (this.active) {
-			this.rendered = true;
-		}
-		this._cd.detectChanges();
-		if (this.active && this._child) {
-			this._child.layout();
+		if (!this.destroyed) {
+			this._active = val;
+			if (this.active) {
+				this.rendered = true;
+			}
+			this._cd.detectChanges();
+			if (this.active && this._child) {
+				this._child.layout();
+			}
 		}
 	}
 
@@ -50,6 +62,7 @@ export class TabComponent implements OnDestroy {
 	}
 
 	ngOnDestroy() {
+		this.destroyed = true;
 		if (this.actions && this.actions.length > 0) {
 			this.actions.forEach((action) => action.dispose());
 		}
@@ -74,6 +87,8 @@ export class TabComponent implements OnDestroy {
 	}
 
 	public layout() {
-		this._child.layout();
+		if (this._child) {
+			this._child.layout();
+		}
 	}
 }

src/sql/base/browser/ui/panel/tabHeader.component.ts

@@ -62,7 +62,7 @@ export class TabHeaderComponent extends Disposable implements AfterContentInit,
 			tabLabelcontainer.classList.add(this.tab.iconClass);
 		} else {
 			tabLabelcontainer.className = 'tabLabel';
-			tabLabelcontainer.innerHTML = this.tab.title;
+			tabLabelcontainer.textContent = this.tab.title;
 		}
 		tabLabelcontainer.title = this.tab.title;
 	}

src/sql/base/browser/ui/table/media/table.css

@@ -84,7 +84,7 @@
 {
     border: 1px solid #BFBDBD;
     font-size: 8pt;
-    height: 400px;
+    height: 250px;
     margin-top: 6px;
     overflow: scroll;
     padding: 4px;

src/sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin.ts

@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+
+/**
+ * Implements the various additional navigation  keybindings we want out of slickgrid
+ */
+export class AdditionalKeyBindings<T> implements Slick.Plugin<T> {
+	private grid: Slick.Grid<T>;
+	private handler = new Slick.EventHandler();
+
+	public init(grid: Slick.Grid<T>) {
+		this.grid = grid;
+		this.handler.subscribe(this.grid.onKeyDown, (e, args) => this.handleKeyDown(e, args));
+	}
+
+	public destroy() {
+		this.handler.unsubscribeAll();
+	}
+
+	private handleKeyDown(e: KeyboardEvent, args: Slick.OnKeyDownEventArgs<T>): void {
+		let event = new StandardKeyboardEvent(e);
+		let handled = true;
+
+		if (event.equals(KeyCode.RightArrow | KeyMod.CtrlCmd)) {
+			this.grid.setActiveCell(args.row, this.grid.getColumns().length - 1);
+		} else if (event.equals(KeyCode.LeftArrow | KeyMod.CtrlCmd)) {
+			// account for row column
+			if (this.grid.canCellBeActive(args.row, 0)) {
+				this.grid.setActiveCell(args.row, 0);
+			} else {
+				this.grid.setActiveCell(args.row, 1);
+			}
+		} else if (event.equals(KeyCode.UpArrow | KeyMod.CtrlCmd)) {
+			this.grid.setActiveCell(0, args.cell);
+		} else if (event.equals(KeyCode.DownArrow | KeyMod.CtrlCmd)) {
+			this.grid.setActiveCell(this.grid.getDataLength() - 1, args.cell);
+		} else if (event.equals(KeyCode.Home | KeyMod.CtrlCmd)) {
+			// account for row column
+			if (this.grid.canCellBeActive(0, 0)) {
+				this.grid.setActiveCell(0, 0);
+			} else {
+				this.grid.setActiveCell(0, 1);
+			}
+		} else if (event.equals(KeyCode.End | KeyMod.CtrlCmd)) {
+			this.grid.setActiveCell(this.grid.getDataLength() - 1, this.grid.getColumns().length - 1);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			e.preventDefault();
+			e.stopPropagation();
+			e.stopImmediatePropagation();
+		}
+	}
+
+}

src/sql/base/browser/ui/table/plugins/autoSizeColumns.plugin.ts

@@ -16,7 +16,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
 	private _context: CanvasRenderingContext2D;
 	private _options: IAutoColumnSizeOptions;
 
-	constructor(options: IAutoColumnSizeOptions) {
+	constructor(options: IAutoColumnSizeOptions = defaultOptions) {
 		this._options = mixin(options, defaultOptions, false);
 	}
 

src/sql/base/browser/ui/table/plugins/cellSelectionModel.plugin.ts

@@ -0,0 +1,192 @@
+// Drag select selection model gist taken from https://gist.github.com/skoon/5312536
+// heavily modified
+
+import { mixin } from 'vs/base/common/objects';
+import { isUndefinedOrNull } from 'vs/base/common/types';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+
+require.__$__nodeRequire('slickgrid/plugins/slick.cellrangedecorator');
+require.__$__nodeRequire('slickgrid/plugins/slick.cellrangeselector');
+
+export interface ICellRangeSelector<T> extends Slick.Plugin<T> {
+	onCellRangeSelected: Slick.Event<{ range: Slick.Range }>;
+	onBeforeCellRangeSelected: Slick.Event<Slick.Cell>;
+}
+
+export interface ICellSelectionModelOptions {
+	cellRangeSelector?: any;
+	selectActiveCell?: boolean;
+}
+
+const defaults: ICellSelectionModelOptions = {
+	selectActiveCell: true
+};
+
+export class CellSelectionModel<T> implements Slick.SelectionModel<T, Array<Slick.Range>> {
+	private grid: Slick.Grid<T>;
+	private selector: ICellRangeSelector<T>;
+	private ranges: Array<Slick.Range> = [];
+
+	public onSelectedRangesChanged = new Slick.Event<Array<Slick.Range>>();
+
+	constructor(private options: ICellSelectionModelOptions = defaults) {
+		this.options = mixin(this.options, defaults, false);
+
+		if (this.options.cellRangeSelector) {
+			this.selector = this.options.cellRangeSelector;
+		} else {
+			// this is added by the noderequires above
+			this.selector = new (<any>Slick).CellRangeSelector({ selectionCss: { 'border': '2px dashed grey' } });
+		}
+	}
+
+	public init(grid: Slick.Grid<T>) {
+		this.grid = grid;
+		this.grid.onActiveCellChanged.subscribe((e, args) => this.handleActiveCellChange(e, args));
+		this.grid.onKeyDown.subscribe(e => this.handleKeyDown(e));
+		this.grid.onHeaderClick.subscribe((e: MouseEvent, args) => this.handleHeaderClick(e, args));
+		this.grid.registerPlugin(this.selector);
+		this.selector.onCellRangeSelected.subscribe((e, args) => this.handleCellRangeSelected(e, args));
+		this.selector.onBeforeCellRangeSelected.subscribe((e, args) => this.handleBeforeCellRangeSelected(e, args));
+	}
+
+	public destroy() {
+		this.grid.onActiveCellChanged.unsubscribe((e, args) => this.handleActiveCellChange(e, args));
+		this.grid.onKeyDown.unsubscribe(e => this.handleKeyDown(e));
+		this.selector.onCellRangeSelected.unsubscribe((e, args) => this.handleCellRangeSelected(e, args));
+		this.selector.onBeforeCellRangeSelected.unsubscribe((e, args) => this.handleBeforeCellRangeSelected(e, args));
+		this.grid.unregisterPlugin(this.selector);
+	}
+
+	private removeInvalidRanges(ranges: Array<Slick.Range>): Array<Slick.Range> {
+		let result: Array<Slick.Range> = [];
+
+		for (let i = 0; i < ranges.length; i++) {
+			let r = ranges[i];
+			if (this.grid.canCellBeSelected(r.fromRow, r.fromCell) && this.grid.canCellBeSelected(r.toRow, r.toCell)) {
+				result.push(r);
+			} else if (this.grid.canCellBeSelected(r.fromRow, r.fromCell + 1) && this.grid.canCellBeSelected(r.toRow, r.toCell)) {
+				// account for number row
+				result.push(new Slick.Range(r.fromRow, r.fromCell + 1, r.toRow, r.toCell));
+			}
+		}
+
+		return result;
+	}
+
+	public setSelectedRanges(ranges: Array<Slick.Range>): void {
+		// simple check for: empty selection didn't change, prevent firing onSelectedRangesChanged
+		if ((!this.ranges || this.ranges.length === 0) && (!ranges || ranges.length === 0)) {
+			return;
+		}
+
+		this.ranges = this.removeInvalidRanges(ranges);
+		this.onSelectedRangesChanged.notify(this.ranges);
+	}
+
+	public getSelectedRanges() {
+		return this.ranges;
+	}
+
+	private handleBeforeCellRangeSelected(e, args: Slick.Cell) {
+		if (this.grid.getEditorLock().isActive()) {
+			e.stopPropagation();
+			return false;
+		}
+		return true;
+	}
+
+	private handleCellRangeSelected(e, args: { range: Slick.Range }) {
+		this.grid.setActiveCell(args.range.fromRow, args.range.fromCell, false, false, true);
+		this.setSelectedRanges([args.range]);
+	}
+
+	private handleActiveCellChange(e, args) {
+		if (this.options.selectActiveCell && !isUndefinedOrNull(args.row) && !isUndefinedOrNull(args.cell)) {
+			this.setSelectedRanges([new Slick.Range(args.row, args.cell)]);
+		} else if (!this.options.selectActiveCell) {
+			// clear the previous selection once the cell changes
+			this.setSelectedRanges([]);
+		}
+	}
+
+	private handleHeaderClick(e: MouseEvent, args: Slick.OnHeaderClickEventArgs<T>) {
+		if (!isUndefinedOrNull(args.column)) {
+			let columnIndex = this.grid.getColumnIndex(args.column.id);
+			if (this.grid.canCellBeSelected(0, columnIndex)) {
+				let ranges: Array<Slick.Range>;
+				if (e.shiftKey) {
+					ranges = this.getSelectedRanges();
+					ranges.push(new Slick.Range(0, columnIndex, this.grid.getDataLength() - 1, columnIndex));
+				} else {
+					ranges = [new Slick.Range(0, columnIndex, this.grid.getDataLength() - 1, columnIndex)];
+				}
+				this.grid.setActiveCell(0, columnIndex);
+				this.setSelectedRanges(ranges);
+			}
+		}
+	}
+
+	private handleKeyDown(e) {
+		/***
+		 * Кey codes
+		 * 37 left
+		 * 38 up
+		 * 39 right
+		 * 40 down
+		 */
+		let ranges, last;
+		let active = this.grid.getActiveCell();
+		let metaKey = e.ctrlKey || e.metaKey;
+
+		if (active && e.shiftKey && !metaKey && !e.altKey &&
+			(e.which === 37 || e.which === 39 || e.which === 38 || e.which === 40)) {
+
+			ranges = this.getSelectedRanges();
+			if (!ranges.length) {
+				ranges.push(new Slick.Range(active.row, active.cell));
+			}
+
+			// keyboard can work with last range only
+			last = ranges.pop();
+
+			// can't handle selection out of active cell
+			if (!last.contains(active.row, active.cell)) {
+				last = new Slick.Range(active.row, active.cell);
+			}
+
+			let dRow = last.toRow - last.fromRow,
+				dCell = last.toCell - last.fromCell,
+				// walking direction
+				dirRow = active.row === last.fromRow ? 1 : -1,
+				dirCell = active.cell === last.fromCell ? 1 : -1;
+
+			if (e.which === 37) {
+				dCell -= dirCell;
+			} else if (e.which === 39) {
+				dCell += dirCell;
+			} else if (e.which === 38) {
+				dRow -= dirRow;
+			} else if (e.which === 40) {
+				dRow += dirRow;
+			}
+
+			// define new selection range
+			let new_last = new Slick.Range(active.row, active.cell, active.row + dirRow * dRow, active.cell + dirCell * dCell);
+			if (this.removeInvalidRanges([new_last]).length) {
+				ranges.push(new_last);
+				let viewRow = dirRow > 0 ? new_last.toRow : new_last.fromRow;
+				let viewCell = dirCell > 0 ? new_last.toCell : new_last.fromCell;
+				this.grid.scrollRowIntoView(viewRow, false);
+				this.grid.scrollCellIntoView(viewRow, viewCell, false);
+			} else {
+				ranges.push(last);
+			}
+
+			this.setSelectedRanges(ranges);
+
+			e.preventDefault();
+			e.stopPropagation();
+		}
+	}
+}

src/sql/base/browser/ui/table/plugins/dragCellSelectionModel.plugin.ts

@@ -1,364 +0,0 @@
-// Drag select selection model gist taken from https://gist.github.com/skoon/5312536
-// heavily modified
-
-import { clone } from 'sql/base/common/objects';
-
-export class DragCellSelectionModel<T> implements Slick.SelectionModel<T, Array<Slick.Range>> {
-	private readonly keyColResizeIncr = 5;
-
-	private _grid: Slick.Grid<T>;
-	private _ranges: Array<Slick.Range> = [];
-	private _dragging = false;
-	private _handler = new Slick.EventHandler();
-
-	public onSelectedRangesChanged = new Slick.Event<Slick.Range[]>();
-
-	public init(grid: Slick.Grid<T>): void {
-		this._grid = grid;
-		this._handler.subscribe(this._grid.onActiveCellChanged, (e: Event, data: Slick.OnActiveCellChangedEventArgs<T>) => this.handleActiveCellChange(e, data));
-		this._handler.subscribe(this._grid.onKeyDown, (e: JQueryInputEventObject) => this.handleKeyDown(e));
-		this._handler.subscribe(this._grid.onClick, (e: MouseEvent) => this.handleClick(e));
-		this._handler.subscribe(this._grid.onDrag, (e: MouseEvent) => this.handleDrag(e));
-		this._handler.subscribe(this._grid.onDragInit, (e: MouseEvent) => this.handleDragInit(e));
-		this._handler.subscribe(this._grid.onDragStart, (e: MouseEvent) => this.handleDragStart(e));
-		this._handler.subscribe(this._grid.onDragEnd, (e: MouseEvent) => this.handleDragEnd(e));
-		this._handler.subscribe(this._grid.onHeaderClick, (e: MouseEvent, args: Slick.OnHeaderClickEventArgs<T>) => this.handleHeaderClick(e, args));
-	}
-
-	public destroy(): void {
-		this._handler.unsubscribeAll();
-	}
-
-	private rangesToRows(ranges: Array<Slick.Range>): Array<number> {
-		let rows = [];
-		for (let i = 0; i < ranges.length; i++) {
-			for (let j = ranges[i].fromRow; j <= ranges[i].toRow; j++) {
-				rows.push(j);
-			}
-		}
-		return rows;
-	}
-
-	private rowsToRanges(rows: Array<number>): Array<Slick.Range> {
-		let ranges = [];
-		let lastCell = this._grid.getColumns().length - 1;
-		for (let i = 0; i < rows.length; i++) {
-			ranges.push(new Slick.Range(rows[i], 0, rows[i], lastCell));
-		}
-		return ranges;
-	}
-
-	public getSelectedRows(): Array<number> {
-		return this.rangesToRows(this._ranges);
-	}
-
-	public setSelectedRows(rows: Array<number>) {
-		this.setSelectedRanges(this.rowsToRanges(rows));
-	}
-
-	public setSelectedRanges(ranges: Array<Slick.Range>) {
-		this._ranges = ranges;
-		this.onSelectedRangesChanged.notify(this._ranges);
-	}
-
-	public getSelectedRanges(): Array<Slick.Range> {
-		return this._ranges;
-	}
-
-	private handleActiveCellChange(e: Event, data: Slick.OnActiveCellChangedEventArgs<T>) { }
-
-	private isNavigationKey(e: BaseJQueryEventObject) {
-		// Nave keys (home, end, arrows) are all in sequential order so use a
-		switch (e.which) {
-			case $.ui.keyCode.HOME:
-			case $.ui.keyCode.END:
-			case $.ui.keyCode.LEFT:
-			case $.ui.keyCode.UP:
-			case $.ui.keyCode.RIGHT:
-			case $.ui.keyCode.DOWN:
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	private navigateLeft(e: JQueryInputEventObject, activeCell: Slick.Cell) {
-		if (activeCell.cell > 1) {
-			let isHome = e.which === $.ui.keyCode.HOME;
-			let newActiveCellColumn = isHome ? 1 : activeCell.cell - 1;
-			// Unsure why but for range, must record 1 index less than expected
-			let newRangeColumn = newActiveCellColumn - 1;
-
-			if (e.shiftKey) {
-				let last = this._ranges.pop();
-
-				// If we are on the rightmost edge of the range and we navigate left,
-				// we want to deselect the rightmost cell
-				if (last.fromCell <= newRangeColumn) { last.toCell -= 1; }
-
-				let fromRow = Math.min(activeCell.row, last.fromRow);
-				let fromCell = Math.min(newRangeColumn, last.fromCell);
-				let toRow = Math.max(activeCell.row, last.toRow);
-				let toCell = Math.max(newRangeColumn, last.toCell);
-				this._ranges = [new Slick.Range(fromRow, fromCell, toRow, toCell)];
-			} else {
-				this._ranges = [new Slick.Range(activeCell.row, newRangeColumn, activeCell.row, newRangeColumn)];
-			}
-
-			this._grid.setActiveCell(activeCell.row, newActiveCellColumn);
-			this.setSelectedRanges(this._ranges);
-		}
-	}
-
-	private navigateRight(e: JQueryInputEventObject, activeCell: Slick.Cell) {
-		let columnLength = this._grid.getColumns().length;
-		if (activeCell.cell < columnLength) {
-			let isEnd = e.which === $.ui.keyCode.END;
-			let newActiveCellColumn = isEnd ? columnLength : activeCell.cell + 1;
-			// Unsure why but for range, must record 1 index less than expected
-			let newRangeColumn = newActiveCellColumn - 1;
-			if (e.shiftKey) {
-				let last = this._ranges.pop();
-
-				// If we are on the leftmost edge of the range and we navigate right,
-				// we want to deselect the leftmost cell
-				if (newRangeColumn <= last.toCell) { last.fromCell += 1; }
-
-				let fromRow = Math.min(activeCell.row, last.fromRow);
-				let fromCell = Math.min(newRangeColumn, last.fromCell);
-				let toRow = Math.max(activeCell.row, last.toRow);
-				let toCell = Math.max(newRangeColumn, last.toCell);
-
-				this._ranges = [new Slick.Range(fromRow, fromCell, toRow, toCell)];
-			} else {
-				this._ranges = [new Slick.Range(activeCell.row, newRangeColumn, activeCell.row, newRangeColumn)];
-			}
-			this._grid.setActiveCell(activeCell.row, newActiveCellColumn);
-			this.setSelectedRanges(this._ranges);
-		}
-	}
-
-	private handleKeyDown(e: JQueryInputEventObject) {
-		let activeCell = this._grid.getActiveCell();
-
-		if (activeCell) {
-			// navigation keys
-			if (this.isNavigationKey(e)) {
-				e.stopImmediatePropagation();
-				if (e.ctrlKey || e.metaKey) {
-					let event = new CustomEvent('gridnav', {
-						detail: {
-							which: e.which,
-							ctrlKey: e.ctrlKey,
-							metaKey: e.metaKey,
-							shiftKey: e.shiftKey,
-							altKey: e.altKey
-						}
-					});
-					window.dispatchEvent(event);
-					return;
-				}
-				// end key
-				if (e.which === $.ui.keyCode.END) {
-					this.navigateRight(e, activeCell);
-				}
-				// home key
-				if (e.which === $.ui.keyCode.HOME) {
-					this.navigateLeft(e, activeCell);
-				}
-				// left arrow
-				if (e.which === $.ui.keyCode.LEFT) {
-					// column resize
-					if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
-						let allColumns = clone(this._grid.getColumns());
-						allColumns[activeCell.cell - 1].width = allColumns[activeCell.cell - 1].width - this.keyColResizeIncr;
-						this._grid.setColumnWidths(allColumns);
-					} else {
-						this.navigateLeft(e, activeCell);
-					}
-					// up arrow
-				} else if (e.which === $.ui.keyCode.UP && activeCell.row > 0) {
-					if (e.shiftKey) {
-						let last = this._ranges.pop();
-
-						// If we are on the bottommost edge of the range and we navigate up,
-						// we want to deselect the bottommost row
-						let newRangeRow = activeCell.row - 1;
-						if (last.fromRow <= newRangeRow) { last.toRow -= 1; }
-
-						let fromRow = Math.min(activeCell.row - 1, last.fromRow);
-						let fromCell = Math.min(activeCell.cell - 1, last.fromCell);
-						let toRow = Math.max(newRangeRow, last.toRow);
-						let toCell = Math.max(activeCell.cell - 1, last.toCell);
-						this._ranges = [new Slick.Range(fromRow, fromCell, toRow, toCell)];
-					} else {
-						this._ranges = [new Slick.Range(activeCell.row - 1, activeCell.cell - 1, activeCell.row - 1, activeCell.cell - 1)];
-					}
-					this._grid.setActiveCell(activeCell.row - 1, activeCell.cell);
-					this.setSelectedRanges(this._ranges);
-					// right arrow
-				} else if (e.which === $.ui.keyCode.RIGHT) {
-					// column resize
-					if ((e.ctrlKey || e.metaKey) && e.shiftKey) {
-						let allColumns = clone(this._grid.getColumns());
-						allColumns[activeCell.cell - 1].width = allColumns[activeCell.cell - 1].width + this.keyColResizeIncr;
-						this._grid.setColumnWidths(allColumns);
-					} else {
-						this.navigateRight(e, activeCell);
-					}
-					// down arrow
-				} else if (e.which === $.ui.keyCode.DOWN && activeCell.row < this._grid.getDataLength() - 1) {
-					if (e.shiftKey) {
-						let last = this._ranges.pop();
-
-						// If we are on the topmost edge of the range and we navigate down,
-						// we want to deselect the topmost row
-						let newRangeRow = activeCell.row + 1;
-						if (newRangeRow <= last.toRow) { last.fromRow += 1; }
-
-						let fromRow = Math.min(activeCell.row + 1, last.fromRow);
-						let fromCell = Math.min(activeCell.cell - 1, last.fromCell);
-						let toRow = Math.max(activeCell.row + 1, last.toRow);
-						let toCell = Math.max(activeCell.cell - 1, last.toCell);
-						this._ranges = [new Slick.Range(fromRow, fromCell, toRow, toCell)];
-					} else {
-						this._ranges = [new Slick.Range(activeCell.row + 1, activeCell.cell - 1, activeCell.row + 1, activeCell.cell - 1)];
-					}
-					this._grid.setActiveCell(activeCell.row + 1, activeCell.cell);
-					this.setSelectedRanges(this._ranges);
-				}
-			}
-		}
-	}
-
-	private handleHeaderClick(e: MouseEvent, args: Slick.OnHeaderClickEventArgs<T>) {
-		let columnIndex = this._grid.getColumnIndex(args.column.id);
-		if (e.ctrlKey || e.metaKey) {
-			this._ranges.push(new Slick.Range(0, columnIndex, this._grid.getDataLength() - 1, columnIndex));
-			this._grid.setActiveCell(0, columnIndex + 1);
-		} else if (e.shiftKey && this._ranges.length) {
-			let last = this._ranges.pop().fromCell;
-			let from = Math.min(columnIndex, last);
-			let to = Math.max(columnIndex, last);
-			this._ranges = [];
-			for (let i = from; i <= to; i++) {
-				if (i !== last) {
-					this._ranges.push(new Slick.Range(0, i, this._grid.getDataLength() - 1, i));
-				}
-			}
-			this._ranges.push(new Slick.Range(0, last, this._grid.getDataLength() - 1, last));
-		} else {
-			this._ranges = [new Slick.Range(0, columnIndex, this._grid.getDataLength() - 1, columnIndex)];
-			this._grid.resetActiveCell();
-		}
-		this.setSelectedRanges(this._ranges);
-		e.stopImmediatePropagation();
-		return true;
-	}
-
-	private handleClick(e: MouseEvent) {
-		let cell = this._grid.getCellFromEvent(e);
-		if (!cell || !this._grid.canCellBeActive(cell.row, cell.cell)) {
-			return false;
-		}
-
-		if (!e.ctrlKey && !e.shiftKey && !e.metaKey) {
-			if (cell.cell !== 0) {
-				this._ranges = [new Slick.Range(cell.row, cell.cell - 1, cell.row, cell.cell - 1)];
-				this.setSelectedRanges(this._ranges);
-				this._grid.setActiveCell(cell.row, cell.cell);
-				return true;
-			} else {
-				this._ranges = [new Slick.Range(cell.row, 0, cell.row, this._grid.getColumns().length - 1)];
-				this.setSelectedRanges(this._ranges);
-				this._grid.setActiveCell(cell.row, 1);
-				return true;
-			}
-		}
-		else if (this._grid.getOptions().multiSelect) {
-			if (e.ctrlKey || e.metaKey) {
-				if (cell.cell === 0) {
-					this._ranges.push(new Slick.Range(cell.row, 0, cell.row, this._grid.getColumns().length - 1));
-					this._grid.setActiveCell(cell.row, 1);
-				} else {
-					this._ranges.push(new Slick.Range(cell.row, cell.cell - 1, cell.row, cell.cell - 1));
-					this._grid.setActiveCell(cell.row, cell.cell);
-				}
-			} else if (this._ranges.length && e.shiftKey) {
-				let last = this._ranges.pop();
-				if (cell.cell === 0) {
-					let fromRow = Math.min(cell.row, last.fromRow);
-					let toRow = Math.max(cell.row, last.fromRow);
-					this._ranges = [new Slick.Range(fromRow, 0, toRow, this._grid.getColumns().length - 1)];
-				} else {
-					let fromRow = Math.min(cell.row, last.fromRow);
-					let fromCell = Math.min(cell.cell - 1, last.fromCell);
-					let toRow = Math.max(cell.row, last.toRow);
-					let toCell = Math.max(cell.cell - 1, last.toCell);
-					this._ranges = [new Slick.Range(fromRow, fromCell, toRow, toCell)];
-				}
-			}
-		}
-
-		this.setSelectedRanges(this._ranges);
-
-		return true;
-	}
-
-	private handleDragInit(e: MouseEvent) {
-		e.stopImmediatePropagation();
-	}
-
-	private handleDragStart(e: MouseEvent) {
-		let cell = this._grid.getCellFromEvent(e);
-		e.stopImmediatePropagation();
-		this._dragging = true;
-		if (e.ctrlKey || e.metaKey) {
-			this._ranges.push(new Slick.Range(cell.row, cell.cell));
-			this._grid.setActiveCell(cell.row, cell.cell);
-		} else if (this._ranges.length && e.shiftKey) {
-			let last = this._ranges.pop();
-			let fromRow = Math.min(cell.row, last.fromRow);
-			let fromCell = Math.min(cell.cell - 1, last.fromCell);
-			let toRow = Math.max(cell.row, last.toRow);
-			let toCell = Math.max(cell.cell - 1, last.toCell);
-			this._ranges = [new Slick.Range(fromRow, fromCell, toRow, toCell)];
-		} else {
-			this._ranges = [new Slick.Range(cell.row, cell.cell)];
-			this._grid.setActiveCell(cell.row, cell.cell);
-		}
-		this.setSelectedRanges(this._ranges);
-	}
-
-	private handleDrag(e: MouseEvent) {
-		if (this._dragging) {
-			let cell = this._grid.getCellFromEvent(e);
-			let activeCell = this._grid.getActiveCell();
-			if (!cell || !this._grid.canCellBeActive(cell.row, cell.cell)) {
-				return false;
-			}
-
-			this._ranges.pop();
-
-			if (activeCell.cell === 0) {
-				let lastCell = this._grid.getColumns().length - 1;
-				let firstRow = Math.min(cell.row, activeCell.row);
-				let lastRow = Math.max(cell.row, activeCell.row);
-				this._ranges.push(new Slick.Range(firstRow, 0, lastRow, lastCell));
-			} else {
-				let firstRow = Math.min(cell.row, activeCell.row);
-				let lastRow = Math.max(cell.row, activeCell.row);
-				let firstColumn = Math.min(cell.cell - 1, activeCell.cell - 1);
-				let lastColumn = Math.max(cell.cell - 1, activeCell.cell - 1);
-				this._ranges.push(new Slick.Range(firstRow, firstColumn, lastRow, lastColumn));
-			}
-			this.setSelectedRanges(this._ranges);
-			return true;
-		}
-		return false;
-	}
-
-	private handleDragEnd(e: MouseEvent) {
-		this._dragging = false;
-	}
-}

src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts

@@ -6,6 +6,7 @@ import { mixin } from 'vs/base/common/objects';
 import { SlickGrid } from 'angular2-slickgrid';
 import { Button } from '../../button/button';
 import { attachButtonStyler } from 'sql/common/theme/styler';
+import { escape } from 'sql/base/common/strings';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 export class HeaderFilter {
@@ -174,7 +175,7 @@ export class HeaderFilter {
 			if (filterItems[i] && filterItems[i].indexOf('Error:') < 0) {
 				filterOptions += '<label><input type="checkbox" value="' + i + '"'
 				+ (filtered ? ' checked="checked"' : '')
-				+ '/>' + filterItems[i] + '</label>';
+				+ '/>' + escape(filterItems[i]) + '</label>';
 			}
 		}
 		let $filter = $('<div class="filter">')

src/sql/base/browser/ui/table/plugins/rowDetailView.ts

@@ -1,5 +1,6 @@
 // Adopted and converted to typescript from https://github.com/6pac/SlickGrid/blob/master/plugins/slick.rowdetailview.js
 // heavily modified
+import { escape } from 'sql/base/common/strings';
 import { mixin } from 'vs/base/common/objects';
 import * as nls from 'vs/nls';
 
@@ -354,7 +355,7 @@ export class RowDetailView {
 			html.push("style='height:", dataContext._height, "px;"); //set total height of padding
 			html.push("top:", rowHeight, "px'>");             //shift detail below 1st row
 			html.push("<div id='detailViewContainer_", dataContext.id, "'  class='detail-container' style='max-height:" + (dataContext._height - rowHeight + bottomMargin) + "px'>"); //sub ctr for custom styling
-			html.push("<div id='innerDetailView_", dataContext.id, "'>", dataContext._detailContent, "</div></div>");
+			html.push("<div id='innerDetailView_", dataContext.id, "'>", escape(dataContext._detailContent), "</div></div>");
 			//&omit a final closing detail container </div> that would come next
 
 			return html.join('');

src/sql/base/browser/ui/table/plugins/rowNumberColumn.plugin.ts

@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { range } from 'vs/base/common/arrays';
+
+export interface IRowNumberColumnOptions {
+	numberOfRows: number;
+	cssClass?: string;
+}
+
+const sizePerDigit = 15;
+
+export class RowNumberColumn<T> implements Slick.Plugin<T> {
+	private handler = new Slick.EventHandler();
+	private grid: Slick.Grid<T>;
+
+
+	constructor(private options: IRowNumberColumnOptions) {
+	}
+
+	public init(grid: Slick.Grid<T>) {
+		this.grid = grid;
+		this.handler
+			.subscribe(this.grid.onClick, (e, args) => this.handleClick(e, args))
+			.subscribe(this.grid.onHeaderClick, (e, args) => this.handleHeaderClick(e, args));
+	}
+
+	public destroy() {
+		this.handler.unsubscribeAll();
+	}
+
+	private handleClick(e: MouseEvent, args: Slick.OnClickEventArgs<T>): void {
+		if (this.grid.getColumns()[args.cell].id === 'rowNumber') {
+			this.grid.setActiveCell(args.row, 1);
+			this.grid.setSelectedRows([args.row]);
+		}
+	}
+
+	private handleHeaderClick(e: MouseEvent, args: Slick.OnHeaderClickEventArgs<T>): void {
+		if (args.column.id === 'rowNumber') {
+			this.grid.setActiveCell(0, 1);
+			this.grid.setSelectedRows(range(this.grid.getDataLength()));
+		}
+	}
+
+	public getColumnDefinition(): Slick.Column<T> {
+		return {
+			id: 'rowNumber',
+			name: '',
+			field: 'rowNumber',
+			width: this.options.numberOfRows.toString().length * sizePerDigit,
+			resizable: false,
+			cssClass: this.options.cssClass,
+			focusable: false,
+			selectable: false,
+			formatter: (r, c, v, cd, dc) => this.formatter(r, c, v, cd, dc)
+		};
+	}
+
+	private formatter(row, cell, value, columnDef: Slick.Column<T>, dataContext): string {
+		if (dataContext) {
+			return `<span>${row}</span>`;
+		}
+		return null;
+	}
+}

src/sql/base/browser/ui/table/tableDataView.ts

@@ -14,7 +14,7 @@ export interface IFindPosition {
 	row: number;
 }
 
-export function defaultSort<T>(args: Slick.OnSortEventArgs<T>, data: Array<T>): Array<T> {
+function defaultSort<T>(args: Slick.OnSortEventArgs<T>, data: Array<T>): Array<T> {
 	let field = args.sortCol.field;
 	let sign = args.sortAsc ? 1 : -1;
 	return data.sort((a, b) => (a[field] === b[field] ? 0 : (a[field] > b[field] ? 1 : -1)) * sign);

src/sql/base/browser/ui/taskbar/taskbar.ts

@@ -82,7 +82,7 @@ export class Taskbar {
 	public static createTaskbarText(inputText: string): HTMLElement {
 		let element = document.createElement('div');
 		element.className = 'taskbarTextSeparator';
-		element.innerHTML = inputText;
+		element.textContent = inputText;
 		return element;
 	}
 

src/sql/base/common/strings.ts

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+/**
+ * Converts HTML characters inside the string to use entities instead. Makes the string safe from
+ * being used e.g. in HTMLElement.innerHTML.
+ */
+export function escape(html: string): string {
+	return html.replace(/[<|>|&|"]/g, function (match) {
+		switch (match) {
+			case '<': return '&lt;';
+			case '>': return '&gt;';
+			case '&': return '&amp;';
+			case '"': return '&quot;';
+			case '\'': return '&#39';
+			default: return match;
+		}
+	});
+}

src/sql/common/constants.ts

@@ -13,3 +13,6 @@ export const SerializationDisabled = 'Saving results into different format disab
  */
 export const RestoreFeatureName = 'restore';
 export const BackupFeatureName = 'backup';
+
+export const MssqlProviderId = 'MSSQL';
+

src/sql/media/icons/common-icons.css

@@ -81,6 +81,15 @@
 	content: url("status_info.svg");
 }
 
+.vs .icon.help {
+	content: url("help.svg");
+}
+
+.vs-dark .icon.help,
+.hc-black .icon.help {
+	content: url("help_inverse.svg");
+}
+
 .vs .icon.success,
 .vs-dark .icon.success,
 .hc-black .icon.success {

src/sql/media/icons/help.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>help_16x16</title><path d="M10.13.45A8.14,8.14,0,0,1,12,1.23a8,8,0,0,1,1.62,1.21A7.8,7.8,0,0,1,14.91,4a7.59,7.59,0,0,1,.81,1.85,7.6,7.6,0,0,1,0,4.12,7.59,7.59,0,0,1-.81,1.85,7.8,7.8,0,0,1-1.25,1.57A8,8,0,0,1,12,14.62a8.2,8.2,0,0,1-8.08,0,8,8,0,0,1-1.62-1.21,7.8,7.8,0,0,1-1.25-1.57A7.63,7.63,0,0,1,.28,10a7.6,7.6,0,0,1,0-4.12A7.63,7.63,0,0,1,1.09,4,7.8,7.8,0,0,1,2.34,2.44,8,8,0,0,1,4,1.23,8.26,8.26,0,0,1,10.13.45Zm-.27,14a7.17,7.17,0,0,0,1.67-.69,7,7,0,0,0,1.41-1.06,6.75,6.75,0,0,0,1.8-3,6.59,6.59,0,0,0,0-3.6,6.75,6.75,0,0,0-1.8-3,7,7,0,0,0-1.41-1.06,7.17,7.17,0,0,0-1.67-.69,7.21,7.21,0,0,0-3.72,0,7.17,7.17,0,0,0-1.67.69A7,7,0,0,0,3.05,3.13,6.82,6.82,0,0,0,2,4.5a6.72,6.72,0,0,0-.71,1.62,6.59,6.59,0,0,0,0,3.6A6.72,6.72,0,0,0,2,11.35a6.82,6.82,0,0,0,1.09,1.37,7,7,0,0,0,1.41,1.06,7.17,7.17,0,0,0,1.67.69,7.21,7.21,0,0,0,3.72,0ZM9,4a2.75,2.75,0,0,1,.85.56,2.61,2.61,0,0,1,.57.82,2.44,2.44,0,0,1,.21,1,2.08,2.08,0,0,1-.16.85,2.82,2.82,0,0,1-.4.65,4.28,4.28,0,0,1-.51.53c-.18.16-.36.32-.51.48a2.55,2.55,0,0,0-.4.51,1.19,1.19,0,0,0-.16.61v.52H7.46V10a2.09,2.09,0,0,1,.16-.85A2.86,2.86,0,0,1,8,8.5,4.28,4.28,0,0,1,8.54,8c.18-.16.36-.32.51-.48A2.51,2.51,0,0,0,9.45,7a1.18,1.18,0,0,0,.16-.61,1.49,1.49,0,0,0-.13-.61,1.56,1.56,0,0,0-.34-.49A1.63,1.63,0,0,0,8,4.81a1.63,1.63,0,0,0-1.14.45,1.57,1.57,0,0,0-.34.49,1.49,1.49,0,0,0-.13.61H5.32a2.41,2.41,0,0,1,.21-1,2.68,2.68,0,0,1,.58-.82A2.77,2.77,0,0,1,7,4a2.62,2.62,0,0,1,1-.21A2.65,2.65,0,0,1,9,4ZM8.54,12.6H7.46v-1H8.54Z"/></svg>

src/sql/media/icons/help_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>help_inverse_16x16</title><path class="cls-1" d="M10.13.45A8.14,8.14,0,0,1,12,1.23a8,8,0,0,1,1.62,1.21A7.8,7.8,0,0,1,14.91,4a7.59,7.59,0,0,1,.81,1.85,7.6,7.6,0,0,1,0,4.12,7.59,7.59,0,0,1-.81,1.85,7.8,7.8,0,0,1-1.25,1.57A8,8,0,0,1,12,14.62a8.2,8.2,0,0,1-8.08,0,8,8,0,0,1-1.62-1.21,7.8,7.8,0,0,1-1.25-1.57A7.63,7.63,0,0,1,.28,10a7.6,7.6,0,0,1,0-4.12A7.63,7.63,0,0,1,1.09,4,7.8,7.8,0,0,1,2.34,2.44,8,8,0,0,1,4,1.23,8.26,8.26,0,0,1,10.13.45Zm-.27,14a7.17,7.17,0,0,0,1.67-.69,7,7,0,0,0,1.41-1.06,6.75,6.75,0,0,0,1.8-3,6.59,6.59,0,0,0,0-3.6,6.75,6.75,0,0,0-1.8-3,7,7,0,0,0-1.41-1.06,7.17,7.17,0,0,0-1.67-.69,7.21,7.21,0,0,0-3.72,0,7.17,7.17,0,0,0-1.67.69A7,7,0,0,0,3.05,3.13,6.82,6.82,0,0,0,2,4.5a6.72,6.72,0,0,0-.71,1.62,6.59,6.59,0,0,0,0,3.6A6.72,6.72,0,0,0,2,11.35a6.82,6.82,0,0,0,1.09,1.37,7,7,0,0,0,1.41,1.06,7.17,7.17,0,0,0,1.67.69,7.21,7.21,0,0,0,3.72,0ZM9,4a2.75,2.75,0,0,1,.85.56,2.61,2.61,0,0,1,.57.82,2.44,2.44,0,0,1,.21,1,2.08,2.08,0,0,1-.16.85,2.82,2.82,0,0,1-.4.65,4.28,4.28,0,0,1-.51.53c-.18.16-.36.32-.51.48a2.55,2.55,0,0,0-.4.51,1.19,1.19,0,0,0-.16.61v.52H7.46V10a2.09,2.09,0,0,1,.16-.85A2.86,2.86,0,0,1,8,8.5,4.28,4.28,0,0,1,8.54,8c.18-.16.36-.32.51-.48A2.51,2.51,0,0,0,9.45,7a1.18,1.18,0,0,0,.16-.61,1.49,1.49,0,0,0-.13-.61,1.56,1.56,0,0,0-.34-.49A1.63,1.63,0,0,0,8,4.81a1.63,1.63,0,0,0-1.14.45,1.57,1.57,0,0,0-.34.49,1.49,1.49,0,0,0-.13.61H5.32a2.41,2.41,0,0,1,.21-1,2.68,2.68,0,0,1,.58-.82A2.77,2.77,0,0,1,7,4a2.62,2.62,0,0,1,1-.21A2.65,2.65,0,0,1,9,4ZM8.54,12.6H7.46v-1H8.54Z"/></svg>

src/sql/parts/accountManagement/accountDialog/accountDialog.ts

@@ -130,8 +130,8 @@ export class AccountDialog extends Modal {
 
 		this._noaccountViewContainer = DOM.$('div.no-account-view');
 		let noAccountTitle = DOM.append(this._noaccountViewContainer, DOM.$('.no-account-view-label'));
-		let noAccountLabel = localize('accountDialog.noAccountLabel', 'There is no linked account. Please add an acount.');
-		noAccountTitle.innerHTML = noAccountLabel;
+		let noAccountLabel = localize('accountDialog.noAccountLabel', 'There is no linked account. Please add an account.');
+		noAccountTitle.innerText = noAccountLabel;
 
 		// Show the add account button for the first provider
 		// Todo: If we have more than 1 provider, need to show all add account buttons for all providers

src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts

@@ -100,7 +100,7 @@ export class AutoOAuthDialog extends Modal {
 		let inputBox: InputBox;
 		container.div({ class: 'dialog-input-section' }, (inputContainer) => {
 			inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
-				labelContainer.innerHtml(label);
+				labelContainer.text(label);
 			});
 
 			inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {

src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts

@@ -145,7 +145,7 @@ export class FirewallRuleDialog extends Modal {
 			subnetIPRangeSection = subnetIPRangeContainer.getHTMLElement();
 			subnetIPRangeContainer.div({ 'class': 'dialog-input-section' }, (inputContainer) => {
 				inputContainer.div({ 'class': 'dialog-label' }, (labelContainer) => {
-					labelContainer.innerHtml(LocalizedStrings.FROM);
+					labelContainer.text(LocalizedStrings.FROM);
 				});
 
 				inputContainer.div({ 'class': 'dialog-input' }, (inputCellContainer) => {
@@ -155,7 +155,7 @@ export class FirewallRuleDialog extends Modal {
 				});
 
 				inputContainer.div({ 'class': 'dialog-label' }, (labelContainer) => {
-					labelContainer.innerHtml(LocalizedStrings.TO);
+					labelContainer.text(LocalizedStrings.TO);
 				});
 
 				inputContainer.div({ 'class': 'dialog-input' }, (inputCellContainer) => {
@@ -234,7 +234,7 @@ export class FirewallRuleDialog extends Modal {
 			className += ' header';
 		}
 		container.div({ 'class': className }, (labelContainer) => {
-			labelContainer.innerHtml(content);
+			labelContainer.text(content);
 		});
 	}
 

src/sql/parts/connection/common/connectionContextKey.ts

@@ -8,7 +8,7 @@
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IConnectionProfile } from 'sqlops';
 
-export class ConnectionContextkey implements IContextKey<IConnectionProfile> {
+export class ConnectionContextKey implements IContextKey<IConnectionProfile> {
 
 	static Provider = new RawContextKey<string>('connectionProvider', undefined);
 	static Server = new RawContextKey<string>('serverName', undefined);
@@ -23,10 +23,10 @@ export class ConnectionContextkey implements IContextKey<IConnectionProfile> {
 	constructor(
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
-		this._providerKey = ConnectionContextkey.Provider.bindTo(contextKeyService);
-		this._serverKey = ConnectionContextkey.Server.bindTo(contextKeyService);
-		this._databaseKey = ConnectionContextkey.Database.bindTo(contextKeyService);
-		this._connectionKey = ConnectionContextkey.Connection.bindTo(contextKeyService);
+		this._providerKey = ConnectionContextKey.Provider.bindTo(contextKeyService);
+		this._serverKey = ConnectionContextKey.Server.bindTo(contextKeyService);
+		this._databaseKey = ConnectionContextKey.Database.bindTo(contextKeyService);
+		this._connectionKey = ConnectionContextKey.Connection.bindTo(contextKeyService);
 	}
 
 	set(value: IConnectionProfile) {

src/sql/parts/connection/common/connectionManagement.ts

@@ -152,10 +152,12 @@ export interface IConnectionManagementService {
 
 	getAdvancedProperties(): sqlops.ConnectionOption[];
 
-	getConnectionId(connectionProfile: IConnectionProfile): string;
+	getConnectionUri(connectionProfile: IConnectionProfile): string;
 
 	getFormattedUri(uri: string, connectionProfile: IConnectionProfile): string;
 
+	getConnectionUriFromId(connectionId: string): string;
+
 	isConnected(fileUri: string): boolean;
 
 	/**
@@ -174,7 +176,7 @@ export interface IConnectionManagementService {
 
 	disconnectEditor(owner: IConnectableInput, force?: boolean): Promise<boolean>;
 
-	disconnect(connection: ConnectionProfile): Promise<void>;
+	disconnect(connection: IConnectionProfile): Promise<void>;
 
 	disconnect(ownerUri: string): Promise<void>;
 
@@ -208,7 +210,7 @@ export interface IConnectionManagementService {
 	 */
 	cancelEditorConnection(owner: IConnectableInput): Thenable<boolean>;
 
-	showDashboard(connection: ConnectionProfile): Thenable<boolean>;
+	showDashboard(connection: IConnectionProfile): Thenable<boolean>;
 
 	closeDashboard(uri: string): void;
 
@@ -216,7 +218,7 @@ export interface IConnectionManagementService {
 
 	hasRegisteredServers(): boolean;
 
-	canChangeConnectionConfig(profile: ConnectionProfile, newGroupID: string): boolean;
+	canChangeConnectionConfig(profile: IConnectionProfile, newGroupID: string): boolean;
 
 	getTabColorForUri(uri: string): string;
 
@@ -320,12 +322,13 @@ export enum MetadataType {
 }
 
 export enum TaskStatus {
-	notStarted = 0,
-	inProgress = 1,
-	succeeded = 2,
-	succeededWithWarning = 3,
-	failed = 4,
-	canceled = 5
+	NotStarted = 0,
+	InProgress = 1,
+	Succeeded = 2,
+	SucceededWithWarning = 3,
+	Failed = 4,
+	Canceled = 5,
+	Canceling = 6
 }
 
 export interface IConnectionParams {

src/sql/parts/connection/common/connectionManagementService.ts

@@ -553,7 +553,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		});
 	}
 
-	public showDashboard(connection: ConnectionProfile): Thenable<boolean> {
+	public showDashboard(connection: IConnectionProfile): Thenable<boolean> {
 		return this.showDashboardForConnectionManagementInfo(connection);
 	}
 
@@ -648,6 +648,15 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		return this._connectionStatusManager.getActiveConnectionProfiles();
 	}
 
+	public getConnectionUriFromId(connectionId: string): string {
+		let connection = this.getActiveConnections().find(connection => connection.id === connectionId);
+		if (connection) {
+			return this.getConnectionUri(connection);
+		} else {
+			return undefined;
+		}
+	}
+
 	public saveProfileGroup(profile: IConnectionProfileGroup): Promise<string> {
 		TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.AddServerGroup);
 		return new Promise<string>((resolve, reject) => {
@@ -704,7 +713,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		return false;
 	}
 
-	public getConnectionId(connectionProfile: IConnectionProfile): string {
+	public getConnectionUri(connectionProfile: IConnectionProfile): string {
 		return this._connectionStatusManager.getOriginalOwnerUri(Utils.generateUri(connectionProfile));
 	}
 
@@ -716,7 +725,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 	 */
 	public getFormattedUri(uri: string, connectionProfile: IConnectionProfile): string {
 		if (this._connectionStatusManager.isDefaultTypeUri(uri)) {
-			return this.getConnectionId(connectionProfile);
+			return this.getConnectionUri(connectionProfile);
 		} else {
 			return uri;
 		}

src/sql/parts/connection/common/connectionStore.ts

@@ -240,7 +240,7 @@ export class ConnectionStore {
 				return connectionProfile;
 			} else {
 				return undefined;
-			};
+			}
 		});
 	}
 
@@ -352,7 +352,7 @@ export class ConnectionStore {
 		list.unshift(savedProfile);
 
 		let newList = list.map(c => {
-			let connectionProfile = c ? c.toIConnectionProfile() : undefined;;
+			let connectionProfile = c ? c.toIConnectionProfile() : undefined;
 			return connectionProfile;
 		});
 		return newList.filter(n => n !== undefined);
@@ -372,7 +372,7 @@ export class ConnectionStore {
 		});
 
 		let newList = list.map(c => {
-			let connectionProfile = c ? c.toIConnectionProfile() : undefined;;
+			let connectionProfile = c ? c.toIConnectionProfile() : undefined;
 			return connectionProfile;
 		});
 		return newList.filter(n => n !== undefined);

src/sql/parts/connection/connectionDialog/connectionController.ts

@@ -63,7 +63,7 @@ export class ConnectionController implements IConnectionComponentController {
 		tempProfile.password = password;
 		tempProfile.groupFullName = '';
 		tempProfile.saveProfile = false;
-		let uri = this._connectionManagementService.getConnectionId(tempProfile);
+		let uri = this._connectionManagementService.getConnectionUri(tempProfile);
 		return new Promise<string[]>((resolve, reject) => {
 			if (this._databaseCache.has(uri)) {
 				let cachedDatabases: string[] = this._databaseCache.get(uri);

src/sql/parts/connection/connectionDialog/connectionDialogService.ts

@@ -280,26 +280,23 @@ export class ConnectionDialogService implements IConnectionDialogService {
 
 		return new Promise<void>((resolve, reject) => {
 			// only create the provider maps first time the dialog gets called
-			let capabilitiesPromise: Promise<void> = Promise.resolve();
 			if (this._providerTypes.length === 0) {
 				entries(this._capabilitiesService.providers).forEach(p => {
 					this._providerTypes.push(p[1].connection.displayName);
 					this._providerNameToDisplayNameMap[p[0]] = p[1].connection.displayName;
 				});
 			}
-			capabilitiesPromise.then(s => {
-				this.updateModelServerCapabilities(model);
-				// If connecting from a query editor set "save connection" to false
-				if (params && params.input && params.connectionType === ConnectionType.editor) {
-					this._model.saveProfile = false;
-				}
+			this.updateModelServerCapabilities(model);
+			// If connecting from a query editor set "save connection" to false
+			if (params && params.input && params.connectionType === ConnectionType.editor) {
+				this._model.saveProfile = false;
+			}
 
-				resolve(this.showDialogWithModel().then(() => {
-					if (connectionResult && connectionResult.errorMessage) {
-						this.showErrorDialog(Severity.Error, this._connectionErrorTitle, connectionResult.errorMessage, connectionResult.callStack);
-					}
-				}));
-			}, e => reject(e));
+			resolve(this.showDialogWithModel().then(() => {
+				if (connectionResult && connectionResult.errorMessage) {
+					this.showErrorDialog(Severity.Error, this._connectionErrorTitle, connectionResult.errorMessage, connectionResult.callStack);
+				}
+			}));
 		});
 	}
 
@@ -342,9 +339,9 @@ export class ConnectionDialogService implements IConnectionDialogService {
 		if (!platform.isWindows && types.isString(message) && message.toLowerCase().includes('kerberos') && message.toLowerCase().includes('kinit')) {
 			message = [
 				localize('kerberosErrorStart', "Connection failed due to Kerberos error."),
-				localize('kerberosHelpLink', "&nbsp;Help configuring Kerberos is available at ") + helpLink,
-				localize('kerberosKinit', "&nbsp;If you have previously connected you may need to re-run kinit.")
-			].join('<br/>');
+				localize('kerberosHelpLink', "Help configuring Kerberos is available at {0}", helpLink),
+				localize('kerberosKinit', "If you have previously connected you may need to re-run kinit.")
+			].join('\r\n');
 			actions.push(new Action('Kinit', 'Run kinit', null, true, () => {
 				this._connectionDialog.close();
 				this._clipboardService.writeText('kinit\r');

src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts

@@ -262,7 +262,7 @@ export class ConnectionDialogWidget extends Modal {
 			let recentHistoryLabel = localize('recentHistory', 'Recent history');
 			recentConnectionContainer.div({ class: 'recent-titles-container' }, (container) => {
 				container.div({ class: 'connection-history-label' }, (recentTitle) => {
-					recentTitle.innerHtml(recentHistoryLabel);
+					recentTitle.text(recentHistoryLabel);
 				});
 				container.div({ class: 'connection-history-actions' }, (actionsContainer) => {
 					this._actionbar = this._register(new ActionBar(actionsContainer.getHTMLElement(), { animated: false }));
@@ -303,7 +303,7 @@ export class ConnectionDialogWidget extends Modal {
 		this._noRecentConnectionBuilder.div({ class: 'connection-recent-content' }, (noRecentConnectionContainer) => {
 			let noRecentHistoryLabel = localize('noRecentConnections', 'No recent connection');
 			noRecentConnectionContainer.div({ class: 'no-recent-connections' }, (noRecentTitle) => {
-				noRecentTitle.innerHtml(noRecentHistoryLabel);
+				noRecentTitle.text(noRecentHistoryLabel);
 			});
 		});
 	}
@@ -335,7 +335,7 @@ export class ConnectionDialogWidget extends Modal {
 		this._noSavedConnectionBuilder.div({ class: 'connection-saved-content' }, (noSavedConnectionContainer) => {
 			let noSavedConnectionLabel = localize('noSavedConnections', 'No saved connection');
 			noSavedConnectionContainer.div({ class: 'no-saved-connections' }, (titleContainer) => {
-				titleContainer.innerHtml(noSavedConnectionLabel);
+				titleContainer.text(noSavedConnectionLabel);
 			});
 		});
 	}

src/sql/parts/connection/connectionDialog/media/connectionDialog.css

@@ -22,6 +22,7 @@
 	border-top-color: transparent;
 	height: calc(100% - 350px);
 	display: block;
+	min-height: 120px;
 }
 
 .connection-recent, .connection-saved {

src/sql/parts/dashboard/common/interfaces.ts

@@ -32,22 +32,10 @@ export abstract class DashboardTab extends TabChild implements OnDestroy {
 	public enableEdit(): void {
 		// no op
 	}
-
-	private _toDispose: IDisposable[] = [];
-
 	constructor() {
 		super();
 	}
 
-	public dispose(): void {
-		this._toDispose = dispose(this._toDispose);
-	}
-
-	protected _register<T extends IDisposable>(t: T): T {
-		this._toDispose.push(t);
-		return t;
-	}
-
 	ngOnDestroy() {
 		this.dispose();
 	}

src/sql/parts/dashboard/containers/dashboardErrorContainer.component.ts

@@ -40,7 +40,7 @@ export class DashboardErrorContainer extends DashboardTab implements AfterViewIn
 
 	ngAfterViewInit() {
 		let errorMessage = this._errorMessageContainer.nativeElement as HTMLElement;
-		errorMessage.innerHTML = nls.localize('dashboardNavSection_loadTabError', 'The "{0}" section has invalid content. Please contact extension owner.', this.tab.title);
+		errorMessage.innerText = nls.localize('dashboardNavSection_loadTabError', 'The "{0}" section has invalid content. Please contact extension owner.', this.tab.title);
 	}
 
 	public get id(): string {

src/sql/parts/dashboard/dashboard.module.ts

@@ -57,13 +57,14 @@ import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsV
 import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component';
 import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component';
+import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editabledropdown.component';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component';
 
 let baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer,
 	DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent,
 	ComponentHostDirective, BreadcrumbComponent, ControlHostContent, DashboardControlHostContainer,
 	JobsViewComponent, AgentViewComponent, JobHistoryComponent, JobStepsViewComponent, AlertsViewComponent, ProxiesViewComponent, OperatorsViewComponent,
-	DashboardModelViewContainer, ModelComponentWrapper, Checkbox, SelectBox, InputBox,];
+	DashboardModelViewContainer, ModelComponentWrapper, Checkbox, EditableDropDown, SelectBox, InputBox,];
 
 /* Panel */
 import { PanelModule } from 'sql/base/browser/ui/panel/panel.module';

src/sql/parts/dashboard/dashboardEditor.ts

@@ -18,7 +18,7 @@ import { DashboardModule } from './dashboard.module';
 import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';
 import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams';
 import { DASHBOARD_SELECTOR } from 'sql/parts/dashboard/dashboard.component';
-import { ConnectionContextkey } from 'sql/parts/connection/common/connectionContextKey';
+import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey';
 import { IDashboardService } from 'sql/services/dashboard/common/dashboardService';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
 import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
@@ -71,6 +71,7 @@ export class DashboardEditor extends BaseEditor {
 	 * To be called when the container of this editor changes size.
 	 */
 	public layout(dimension: DOM.Dimension): void {
+		this._dashboardService.layout(dimension);
 	}
 
 	public setInput(input: DashboardInput, options: EditorOptions): TPromise<void> {
@@ -110,7 +111,7 @@ export class DashboardEditor extends BaseEditor {
 		let serverInfo = this._connMan.getConnectionInfo(this.input.uri).serverInfo;
 		this._dashboardService.changeToDashboard({ profile, serverInfo });
 		let scopedContextService = this._contextKeyService.createScoped(input.container);
-		let connectionContextKey = new ConnectionContextkey(scopedContextService);
+		let connectionContextKey = new ConnectionContextKey(scopedContextService);
 		connectionContextKey.set(input.connectionProfile);
 
 		let params: IDashboardComponentParams = {

src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog.ts

@@ -163,7 +163,7 @@ export class NewDashboardTabDialog extends Modal {
 		this._noExtensionViewContainer = DOM.$('.no-extension-view');
 		let noExtensionTitle = DOM.append(this._noExtensionViewContainer, DOM.$('.no-extensionTab-label'));
 		let noExtensionLabel = localize('newdashboardTabDialog.noExtensionLabel', 'No dashboard extensions are installed at this time. Go to Extension Manager to explore recommended extensions.');
-		noExtensionTitle.innerHTML = noExtensionLabel;
+		noExtensionTitle.textContent = noExtensionLabel;
 
 		DOM.append(container, this._noExtensionViewContainer);
 	}

src/sql/parts/dashboard/widgets/explorer/explorerTree.ts

@@ -15,7 +15,6 @@ import {
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
 import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo';
 import * as Constants from 'sql/parts/connection/common/constants';
-import { OEAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions';
 import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
 import { IScriptingService } from 'sql/services/scripting/scriptingService';
 

src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts

@@ -16,7 +16,7 @@ const properties: IJSONSchema = {
 	properties: {
 		yAxisMin: {
 			type: 'number',
-			description: nls.localize('yAxisMin', "Minumum value of the y axis")
+			description: nls.localize('yAxisMin', "Minimum value of the y axis")
 		},
 		yAxisMax: {
 			type: 'number',
@@ -28,7 +28,7 @@ const properties: IJSONSchema = {
 		},
 		xAxisMin: {
 			type: 'number',
-			description: nls.localize('xAxisMin', "Minumum value of the x axis")
+			description: nls.localize('xAxisMin', "Minimum value of the x axis")
 		},
 		xAxisMax: {
 			type: 'number',

src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts

@@ -11,8 +11,8 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work
 import { IInsightsView, IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
-import { DragCellSelectionModel } from 'sql/base/browser/ui/table/plugins/dragCellSelectionModel.plugin';
-import { attachTableStyler} from 'sql/common/theme/styler';
+import { attachTableStyler } from 'sql/common/theme/styler';
+import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
 
 @Component({
 	template: ''
@@ -63,7 +63,7 @@ export default class TableInsight extends Disposable implements IInsightsView, O
 	private createTable() {
 		if (!this.table) {
 			this.table = new Table(this._elementRef.nativeElement, this.dataView, this.columns, { showRowNumber: true });
-			this.table.setSelectionModel(new DragCellSelectionModel());
+			this.table.setSelectionModel(new CellSelectionModel());
 			this._register(attachTableStyler(this.table, this.themeService));
 		}
 	}

src/sql/parts/disasterRecovery/backup/common/backupServiceImp.ts

@@ -146,7 +146,7 @@ export class BackupUiService implements IBackupUiService {
 
 		let backupOptions = this.getOptions(this._currentProvider);
 		return new TPromise<void>(() => {
-			let uri = this._connectionManagementService.getConnectionId(connection)
+			let uri = this._connectionManagementService.getConnectionUri(connection)
 			+ ProviderConnectionInfo.idSeparator
 			+ ConnectionUtils.ConnectionUriBackupIdAttributeName
 			+ ProviderConnectionInfo.nameValueSeparator

src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts

@@ -179,8 +179,8 @@ export class RestoreDialogController implements IRestoreDialogController {
 	private isSuccessfulRestore(response: TaskNode): boolean {
 		return (response.taskName === this._restoreTaskName &&
 			response.message === this._restoreCompleted &&
-			(response.status === TaskStatus.succeeded ||
-				response.status === TaskStatus.succeededWithWarning) &&
+			(response.status === TaskStatus.Succeeded ||
+				response.status === TaskStatus.SucceededWithWarning) &&
 			(response.taskExecutionMode === TaskExecutionMode.execute ||
 				response.taskExecutionMode === TaskExecutionMode.executeAndScript));
 	}
@@ -293,7 +293,7 @@ export class RestoreDialogController implements IRestoreDialogController {
 		return new TPromise<void>((resolve, reject) => {
 			let result: void;
 
-			this._ownerUri = this._connectionService.getConnectionId(connection)
+			this._ownerUri = this._connectionService.getConnectionUri(connection)
 				+ ProviderConnectionInfo.idSeparator
 				+ Utils.ConnectionUriRestoreIdAttributeName
 				+ ProviderConnectionInfo.nameValueSeparator

src/sql/parts/disasterRecovery/restore/restoreDialog.ts

@@ -226,7 +226,7 @@ export class RestoreDialog extends Modal {
 
 			destinationContainer.div({ class: 'dialog-input-section' }, (inputContainer) => {
 				inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
-					labelContainer.innerHtml(LocalizedStrings.TARGETDATABASE);
+					labelContainer.text(LocalizedStrings.TARGETDATABASE);
 				});
 
 				inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {
@@ -471,7 +471,7 @@ export class RestoreDialog extends Modal {
 			className += ' header';
 		}
 		container.div({ class: className }, (labelContainer) => {
-			labelContainer.innerHtml(content);
+			labelContainer.text(content);
 		});
 	}
 
@@ -535,7 +535,7 @@ export class RestoreDialog extends Modal {
 		let selectBox: SelectBox;
 		container.div({ class: 'dialog-input-section' }, (inputContainer) => {
 			inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
-				labelContainer.innerHtml(label);
+				labelContainer.text(label);
 			});
 
 			inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {

src/sql/parts/fileBrowser/fileBrowserTreeView.ts

@@ -23,7 +23,7 @@ import { ITree } from 'vs/base/parts/tree/browser/tree';
 /**
  * Implements tree view for file browser
  */
-export class FileBrowserTreeView {
+export class FileBrowserTreeView implements IDisposable {
 	private _tree: ITree;
 	private _toDispose: IDisposable[] = [];
 

src/sql/parts/grid/common/interfaces.ts

@@ -4,7 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IColumnDefinition, IObservableCollection, IGridDataRow } from 'angular2-slickgrid';
+import { ISlickColumn, IObservableCollection, IGridDataRow } from 'angular2-slickgrid';
 
 export interface ISlickRange {
 	fromCell: number;
@@ -42,7 +42,7 @@ export interface IGridIcon {
 
 export interface IGridDataSet {
 	dataRows: IObservableCollection<IGridDataRow>;
-	columnDefinitions: IColumnDefinition[];
+	columnDefinitions: ISlickColumn<any>[];
 	resized: any; // EventEmitter<any>;
 	totalRows: number;
 	batchId: number;

src/sql/parts/grid/services/sharedServices.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as Strings from 'vs/base/common/strings';
+import { escape } from 'sql/base/common/strings';
 
 export class DBCellValue {
 	displayValue: string;
@@ -25,7 +25,7 @@ export function hyperLinkFormatter(row: number, cell: any, value: any, columnDef
 		valueToDisplay = 'NULL';
 		if (!value.isNull) {
 			cellClasses += ' xmlLink';
-			valueToDisplay = Strings.escape(value.displayValue);
+			valueToDisplay = escape(value.displayValue);
 			return `<a class="${cellClasses}" href="#" >${valueToDisplay}</a>`;
 		} else {
 			cellClasses += ' missing-value';
@@ -44,12 +44,12 @@ export function textFormatter(row: number, cell: any, value: any, columnDef: any
 	if (DBCellValue.isDBCellValue(value)) {
 		valueToDisplay = 'NULL';
 		if (!value.isNull) {
-			valueToDisplay = Strings.escape(value.displayValue.replace(/(\r\n|\n|\r)/g, ' '));
+			valueToDisplay = escape(value.displayValue.replace(/(\r\n|\n|\r)/g, ' '));
 		} else {
 			cellClasses += ' missing-value';
 		}
 	} else if (typeof value === 'string') {
-		valueToDisplay = Strings.escape(value);
+		valueToDisplay = escape(value);
 	}
 
 	return `<span title="${valueToDisplay}" class="${cellClasses}">${valueToDisplay}</span>`;

src/sql/parts/grid/views/editData/editData.component.html

@@ -17,14 +17,13 @@
 						showDataTypeIcon="false"
 						showHeader="true"
 						[resized]="dataSet.resized"
-						[plugins]="slickgridPlugins"
+						[plugins]="plugins[i]"
 						(activeCellChanged)="onActiveCellChanged($event)"
 						(cellEditBegin)="onCellEditBegin($event)"
 						(cellEditExit)="onCellEditEnd($event)"
 						(rowEditBegin)="onRowEditBegin($event)"
 						(rowEditExit)="onRowEditEnd($event)"
 						(contextMenu)="openContextMenu($event, dataSet.batchId, dataSet.resultId, i)"
-						[isColumnEditable]="onIsColumnEditable"
 						[isCellEditValid]="onIsCellEditValid"
 						[overrideCellFn]="overrideCellFn"
 						enableEditing="true"

src/sql/parts/grid/views/editData/editData.component.ts

@@ -24,6 +24,10 @@ import { error } from 'sql/base/common/log';
 import { clone, mixin } from 'sql/base/common/objects';
 import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
 import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
+import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin';
+import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
+import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin';
+import { escape } from 'sql/base/common/strings';
 
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
@@ -35,7 +39,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-
 export const EDITDATA_SELECTOR: string = 'editdata-component';
 
 @Component({
@@ -65,6 +68,7 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 	private newRowVisible: boolean;
 	private removingNewRow: boolean;
 	private rowIdMappings: { [gridRowId: number]: number } = {};
+	protected plugins = new Array<Array<Slick.Plugin<any>>>();
 
 	// Edit Data functions
 	public onActiveCellChanged: (event: { row: number, column: number }) => void;
@@ -166,17 +170,6 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 
 		this.onRowEditEnd = (event: { row: number }): void => { };
 
-		this.onIsColumnEditable = (column: number): boolean => {
-			let result = false;
-			// Check that our variables exist
-			if (column !== undefined && !!this.dataSet && !!this.dataSet.columnDefinitions[column]) {
-				result = this.dataSet.columnDefinitions[column].isEditable;
-			}
-
-			// If no column definition exists then the row is not editable
-			return result;
-		};
-
 		this.overrideCellFn = (rowNumber, columnId, value?, data?): string => {
 			let returnVal = '';
 			if (Services.DBCellValue.isDBCellValue(value)) {
@@ -196,9 +189,9 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 						self.idMapping[rowIndex] = row.id;
 						rowIndex++;
 						return {
-							values: row.cells.map(c => {
-								return mixin({ ariaLabel: c.displayValue }, c);
-							}), row: row.id
+							values: [{}].concat(row.cells.map(c => {
+								return mixin({ ariaLabel: escape(c.displayValue) }, c);
+							})), row: row.id
 						};
 					});
 
@@ -350,6 +343,8 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 		let maxHeight = this.getMaxHeight(resultSet.rowCount);
 		let minHeight = this.getMinHeight(resultSet.rowCount);
 
+		let rowNumberColumn = new RowNumberColumn({ numberOfRows: resultSet.rowCount });
+
 		// Store the result set from the event
 		let dataSet: IGridDataSet = {
 			resized: undefined,
@@ -364,21 +359,23 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 				this.loadDataFunction,
 				index => { return { values: [] }; }
 			),
-			columnDefinitions: resultSet.columnInfo.map((c, i) => {
+			columnDefinitions: [rowNumberColumn.getColumnDefinition()].concat(resultSet.columnInfo.map((c, i) => {
 				let isLinked = c.isXml || c.isJson;
 				let linkType = c.isXml ? 'xml' : 'json';
+
 				return {
 					id: i.toString(),
 					name: c.columnName === 'Microsoft SQL Server 2005 XML Showplan'
 						? 'XML Showplan'
-						: c.columnName,
-					type: self.stringToFieldType('string'),
+						: escape(c.columnName),
+					field: i.toString(),
 					formatter: isLinked ? Services.hyperLinkFormatter : Services.textFormatter,
 					asyncPostRender: isLinked ? self.linkHandler(linkType) : undefined,
 					isEditable: c.isUpdatable
 				};
-			})
+			}))
 		};
+		self.plugins.push([rowNumberColumn, new AutoColumnSize(), new AdditionalKeyBindings()]);
 		self.dataSet = dataSet;
 
 		// Create a dataSet to render without rows to reduce DOM size

src/sql/parts/grid/views/gridParentComponent.ts

@@ -26,6 +26,7 @@ import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents';
 import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/parts/query/common/queryContext';
 import { error } from 'sql/base/common/log';
 import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
+import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin';
 
 import { IAction } from 'vs/base/common/actions';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
@@ -33,8 +34,6 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
-import { DragCellSelectionModel } from 'sql/base/browser/ui/table/plugins/dragCellSelectionModel.plugin';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -42,14 +41,8 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 export abstract class GridParentComponent {
 	// CONSTANTS
 	// tslint:disable:no-unused-variable
-	protected get selectionModel(): DragCellSelectionModel<any> {
-		return new DragCellSelectionModel<any>();
-	}
-	protected get slickgridPlugins(): Array<any> {
-		return [
-			new AutoColumnSize<any>({})
-		];
-	}
+
+	protected get selectionModel() { return new CellSelectionModel(); }
 	protected _rowHeight = 29;
 	protected _defaultNumShowingRows = 8;
 	protected Constants = Constants;
@@ -94,7 +87,6 @@ export abstract class GridParentComponent {
 	public onRowEditBegin: (event: { row: number }) => void;
 	public onRowEditEnd: (event: { row: number }) => void;
 	public onIsCellEditValid: (row: number, column: number, newValue: any) => boolean;
-	public onIsColumnEditable: (column: number) => boolean;
 	public overrideCellFn: (rowNumber, columnId, value?, data?) => string;
 	public loadDataFunction: (offset: number, count: number) => Promise<IGridDataRow[]>;
 
@@ -244,21 +236,25 @@ export abstract class GridParentComponent {
 		this.messagesFocussedContextKey.set(false);
 	}
 
+	protected getSelection(index?: number): ISlickRange[] {
+		let selection = this.slickgrids.toArray()[index || this.activeGrid].getSelectedRanges();
+		selection = selection.map(c => { return <ISlickRange>{ fromCell: c.fromCell - 1, toCell: c.toCell - 1, toRow: c.toRow, fromRow: c.fromRow }; });
+		return selection;
+	}
+
 	private copySelection(): void {
 		let messageText = this.getMessageText();
 		if (messageText.length > 0) {
 			this.clipboardService.writeText(messageText);
 		} else {
 			let activeGrid = this.activeGrid;
-			let selection = this.slickgrids.toArray()[activeGrid].getSelectedRanges();
-			this.dataService.copyResults(selection, this.renderedDataSets[activeGrid].batchId, this.renderedDataSets[activeGrid].resultId);
+			this.dataService.copyResults(this.getSelection(activeGrid), this.renderedDataSets[activeGrid].batchId, this.renderedDataSets[activeGrid].resultId);
 		}
 	}
 
 	private copyWithHeaders(): void {
 		let activeGrid = this.activeGrid;
-		let selection = this.slickgrids.toArray()[activeGrid].getSelectedRanges();
-		this.dataService.copyResults(selection, this.renderedDataSets[activeGrid].batchId,
+		this.dataService.copyResults(this.getSelection(activeGrid), this.renderedDataSets[activeGrid].batchId,
 			this.renderedDataSets[activeGrid].resultId, true);
 	}
 
@@ -372,8 +368,7 @@ export abstract class GridParentComponent {
 		let activeGrid = this.activeGrid;
 		let batchId = this.renderedDataSets[activeGrid].batchId;
 		let resultId = this.renderedDataSets[activeGrid].resultId;
-		let selection = this.slickgrids.toArray()[activeGrid].getSelectedRanges();
-		this.dataService.sendSaveRequest({ batchIndex: batchId, resultSetNumber: resultId, format: format, selection: selection });
+		this.dataService.sendSaveRequest({ batchIndex: batchId, resultSetNumber: resultId, format: format, selection: this.getSelection(activeGrid) });
 	}
 
 	protected _keybindingFor(action: IAction): ResolvedKeybinding {
@@ -385,7 +380,7 @@ export abstract class GridParentComponent {
 		let slick: any = this.slickgrids.toArray()[index];
 		let grid = slick._grid;
 
-		let selection = this.slickgrids.toArray()[index].getSelectedRanges();
+		let selection = this.getSelection(index);
 
 		if (selection && selection.length === 0) {
 			let cell = (grid as Slick.Grid<any>).getCellFromEvent(event);
@@ -423,7 +418,9 @@ export abstract class GridParentComponent {
 		let self = this;
 		return (gridIndex: number) => {
 			self.activeGrid = gridIndex;
-			self.slickgrids.toArray()[this.activeGrid].selection = true;
+			let grid = self.slickgrids.toArray()[self.activeGrid];
+			grid.setActive();
+			grid.selection = true;
 		};
 	}
 
@@ -433,22 +430,6 @@ export abstract class GridParentComponent {
 		}
 	}
 
-	/**
-	 * Used to convert the string to a enum compatible with SlickGrid
-	 */
-	protected stringToFieldType(input: string): FieldType {
-		let fieldtype: FieldType;
-		switch (input) {
-			case 'string':
-				fieldtype = FieldType.String;
-				break;
-			default:
-				fieldtype = FieldType.String;
-				break;
-		}
-		return fieldtype;
-	}
-
 	/**
 	 * Makes a resultset take up the full result height if this is not already true
 	 * Otherwise rerenders the result sets from default

src/sql/parts/grid/views/query/chartViewer.component.ts

@@ -5,13 +5,12 @@
 import 'vs/css!sql/parts/grid/views/query/chartViewer';
 
 import {
-	Component, Inject, ViewContainerRef, forwardRef, OnInit,
-	ComponentFactoryResolver, ViewChild, OnDestroy, Input, ElementRef, ChangeDetectorRef
+	Component, Inject, forwardRef, OnInit, ComponentFactoryResolver, ViewChild,
+	OnDestroy, Input, ElementRef, ChangeDetectorRef
 } from '@angular/core';
 import { NgGridItemConfig } from 'angular2-grid';
 
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
 import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive';
 import { IGridDataSet } from 'sql/parts/grid/common/interfaces';
 import { IInsightData, IInsightsView, IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces';
@@ -32,7 +31,6 @@ import {
 } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component';
 
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import Severity from 'vs/base/common/severity';
 import URI from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
@@ -87,21 +85,17 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction
 	private _saveAction: SaveImageAction;
 	private _chartConfig: ILineConfig;
 	private _disposables: Array<IDisposable> = [];
-	private _dataSet: IGridDataSet;
 	private _executeResult: IInsightData;
 	private _chartComponent: ChartInsight;
 
-	private localizedStrings = LocalizedStrings;
-	private insightRegistry = insightRegistry;
+	protected localizedStrings = LocalizedStrings;
+	protected insightRegistry = insightRegistry;
 
 	@ViewChild(ComponentHostDirective) private componentHost: ComponentHostDirective;
 	@ViewChild('taskbarContainer', { read: ElementRef }) private taskbarContainer;
-	@ViewChild('chartTypesContainer', { read: ElementRef }) private chartTypesElement;
-	@ViewChild('legendContainer', { read: ElementRef }) private legendElement;
 
 	constructor(
 		@Inject(forwardRef(() => ComponentFactoryResolver)) private _componentFactoryResolver: ComponentFactoryResolver,
-		@Inject(forwardRef(() => ViewContainerRef)) private _viewContainerRef: ViewContainerRef,
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
 		@Inject(IInstantiationService) private instantiationService: IInstantiationService,
 		@Inject(INotificationService) private notificationService: INotificationService,
@@ -123,15 +117,25 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction
 	}
 
 	private setDefaultChartConfig() {
-		this._chartConfig = <ILineConfig>{
-			dataDirection: 'vertical',
-			dataType: 'number',
-			legendPosition: 'none',
-			labelFirstColumn: false
-		};
+		let defaultChart = this.getDefaultChartType();
+		if (defaultChart === 'timeSeries') {
+			this._chartConfig = <ILineConfig>{
+				dataDirection: 'vertical',
+				dataType: 'point',
+				legendPosition: 'none',
+				labelFirstColumn: false
+			};
+		} else {
+			this._chartConfig = <ILineConfig>{
+				dataDirection: 'vertical',
+				dataType: 'number',
+				legendPosition: 'none',
+				labelFirstColumn: false
+			};
+		}
 	}
 
-	private getDefaultChartType(): string {
+	protected getDefaultChartType(): string {
 		let defaultChartType = Constants.chartTypeHorizontalBar;
 		if (this.configurationService) {
 			let chartSettings = WorkbenchUtils.getSqlConfigSection(this.configurationService, 'chart');
@@ -300,22 +304,18 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction
 		return undefined;
 	}
 
-	private get showDataDirection(): boolean {
+	protected get showDataDirection(): boolean {
 		return ['pie', 'horizontalBar', 'bar', 'doughnut'].some(item => item === this.chartTypesSelectBox.value) || (this.chartTypesSelectBox.value === 'line' && this.dataType === 'number');
 	}
 
-	private get showLabelFirstColumn(): boolean {
+	protected get showLabelFirstColumn(): boolean {
 		return this.dataDirection === 'horizontal' && this.dataType !== 'point';
 	}
 
-	private get showColumnsAsLabels(): boolean {
+	protected get showColumnsAsLabels(): boolean {
 		return this.dataDirection === 'vertical' && this.dataType !== 'point';
 	}
 
-	private get showDataType(): boolean {
-		return this.chartTypesSelectBox.value === 'line';
-	}
-
 	public get dataDirection(): DataDirection {
 		return this._chartConfig.dataDirection;
 	}
@@ -326,7 +326,6 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction
 
 	@Input() set dataSet(dataSet: IGridDataSet) {
 		// Setup the execute result
-		this._dataSet = dataSet;
 		this._executeResult = <IInsightData>{};
 		this._executeResult.columns = dataSet.columnDefinitions.map(def => def.name);
 		this._executeResult.rows = dataSet.dataRows.getRange(0, dataSet.dataRows.getLength()).map(gridRow => {
@@ -356,4 +355,4 @@ export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewAction
 	ngOnDestroy() {
 		this._disposables.forEach(i => i.dispose());
 	}
-}
+}

src/sql/parts/grid/views/query/query.component.html

@@ -10,9 +10,9 @@
 		<span> {{LocalizedConstants.resultPaneLabel}} </span>
 		<span class="queryResultsShortCut"> {{resultShortcut}} </span>
 	</div>
-	<div id="results" *ngIf="renderedDataSets.length > 0" class="results vertBox scrollable"
-		 (onScroll)="onScroll($event)" [scrollEnabled]="scrollEnabled" [class.hidden]="!resultActive"
-		 (focusin)="onGridFocus()" (focusout)="onGridFocusout()">
+	<div #resultsScrollBox id="results" *ngIf="renderedDataSets.length > 0" class="results vertBox scrollable"
+		(onScroll)="onScroll($event)" [scrollEnabled]="scrollEnabled" [class.hidden]="!resultActive"
+		(focusin)="onGridFocus()" (focusout)="onGridFocusout()">
 		<div class="boxRow content horzBox slickgrid" *ngFor="let dataSet of renderedDataSets; let i = index"
 			[style.max-height]="dataSet.maxHeight" [style.min-height]="dataSet.minHeight">
 			<slick-grid #slickgrid id="slickgrid_{{i}}" [columnDefinitions]="dataSet.columnDefinitions"
@@ -20,12 +20,11 @@
 						[dataRows]="dataSet.dataRows"
 						(contextMenu)="openContextMenu($event, dataSet.batchId, dataSet.resultId, i)"
 						enableAsyncPostRender="true"
-						showDataTypeIcon="false"
 						showHeader="true"
 						[resized]="dataSet.resized"
 						(mousedown)="navigateToGrid(i)"
 						[selectionModel]="selectionModel"
-						[plugins]="slickgridPlugins"
+						[plugins]="plugins[i]"
 						class="boxCol content vertBox slickgrid"
 						[rowHeight]="rowHeight">
 			</slick-grid>

src/sql/parts/grid/views/query/query.component.ts

@@ -15,7 +15,7 @@ import {
 	ElementRef, QueryList, ChangeDetectorRef, OnInit, OnDestroy, Component, Inject,
 	ViewChildren, forwardRef, EventEmitter, Input, ViewChild
 } from '@angular/core';
-import { IGridDataRow, SlickGrid, VirtualizedCollection } from 'angular2-slickgrid';
+import { IGridDataRow, SlickGrid, VirtualizedCollection, ISlickRange } from 'angular2-slickgrid';
 
 import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants';
 import * as Services from 'sql/parts/grid/services/sharedServices';
@@ -27,8 +27,12 @@ import { error } from 'sql/base/common/log';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { clone, mixin } from 'sql/base/common/objects';
 import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
+import { escape } from 'sql/base/common/strings';
+import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin';
+import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
+import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin';
 
-import * as strings from 'vs/base/common/strings';
+import { format } from 'vs/base/common/strings';
 import * as DOM from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -60,7 +64,9 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 
 	// create a function alias to use inside query.component
 	// tslint:disable-next-line:no-unused-variable
-	private stringsFormat: any = strings.format;
+	protected stringsFormat: any = format;
+
+	protected plugins = new Array<Array<Slick.Plugin<any>>>();
 
 	// tslint:disable-next-line:no-unused-variable
 	private dataIcons: IGridIcon[] = [
@@ -85,7 +91,7 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 			icon: () => { return 'saveCsv'; },
 			hoverText: () => { return LocalizedConstants.saveCSVLabel; },
 			functionality: (batchId, resultId, index) => {
-				let selection = this.slickgrids.toArray()[index].getSelectedRanges();
+				let selection = this.getSelection(index);
 				if (selection.length <= 1) {
 					this.handleContextClick({ type: 'savecsv', batchId: batchId, resultId: resultId, index: index, selection: selection });
 				} else {
@@ -98,7 +104,7 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 			icon: () => { return 'saveJson'; },
 			hoverText: () => { return LocalizedConstants.saveJSONLabel; },
 			functionality: (batchId, resultId, index) => {
-				let selection = this.slickgrids.toArray()[index].getSelectedRanges();
+				let selection = this.getSelection(index);
 				if (selection.length <= 1) {
 					this.handleContextClick({ type: 'savejson', batchId: batchId, resultId: resultId, index: index, selection: selection });
 				} else {
@@ -111,7 +117,7 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 			icon: () => { return 'saveExcel'; },
 			hoverText: () => { return LocalizedConstants.saveExcelLabel; },
 			functionality: (batchId, resultId, index) => {
-				let selection = this.slickgrids.toArray()[index].getSelectedRanges();
+				let selection = this.getSelection(index);
 				if (selection.length <= 1) {
 					this.handleContextClick({ type: 'saveexcel', batchId: batchId, resultId: resultId, index: index, selection: selection });
 				} else {
@@ -155,6 +161,13 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 	public showChartRequested: EventEmitter<IGridDataSet> = new EventEmitter<IGridDataSet>();
 	public goToNextQueryOutputTabRequested: EventEmitter<void> = new EventEmitter<void>();
 
+	private savedViewState: {
+		gridSelections: ISlickRange[][];
+		resultsScroll: number;
+		messagePaneScroll: number;
+		slickGridScrolls: { vertical: number; horizontal: number }[];
+	};
+
 	@Input() public queryParameters: IQueryComponentParams;
 
 	@ViewChildren('slickgrid') slickgrids: QueryList<SlickGrid>;
@@ -162,6 +175,8 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 	@ViewChild('resultsPane', { read: ElementRef }) private _resultsPane: ElementRef;
 	@ViewChild('queryLink', { read: ElementRef }) private _queryLinkElement: ElementRef;
 	@ViewChild('messagesContainer', { read: ElementRef }) private _messagesContainer: ElementRef;
+	@ViewChild('resultsScrollBox', { read: ElementRef }) private _resultsScrollBox: ElementRef;
+	@ViewChildren('slickgrid', { read: ElementRef }) private _slickgridElements: QueryList<ElementRef>;
 	constructor(
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef,
 		@Inject(forwardRef(() => ChangeDetectorRef)) cd: ChangeDetectorRef,
@@ -219,6 +234,10 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 			}
 			self._cd.detectChanges();
 		});
+
+		this.queryParameters.onSaveViewState(() => this.saveViewState());
+		this.queryParameters.onRestoreViewState(() => this.restoreViewState());
+
 		this.dataService.onAngularLoaded();
 	}
 
@@ -301,9 +320,9 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 					for (let row = 0; row < rows.rows.length; row++) {
 						// Push row values onto end of gridData for slickgrid
 						gridData.push({
-							values: rows.rows[row].map(c => {
-								return mixin({ ariaLabel: c.displayValue }, c);
-							})
+							values: [{}].concat(rows.rows[row].map(c => {
+								return mixin({ ariaLabel: escape(c.displayValue) }, c);
+							}))
 						});
 					}
 
@@ -330,6 +349,8 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 			minHeight = minHeightNumber.toString() + 'px';
 		}
 
+		let rowNumberColumn = new RowNumberColumn({ numberOfRows: resultSet.rowCount });
+
 		// Store the result set from the event
 		let dataSet: IGridDataSet = {
 			resized: undefined,
@@ -344,20 +365,22 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 				loadDataFunction,
 				index => { return { values: [] }; }
 			),
-			columnDefinitions: resultSet.columnInfo.map((c, i) => {
+			columnDefinitions: [rowNumberColumn.getColumnDefinition()].concat(resultSet.columnInfo.map((c, i) => {
 				let isLinked = c.isXml || c.isJson;
 				let linkType = c.isXml ? 'xml' : 'json';
+
 				return {
 					id: i.toString(),
 					name: c.columnName === 'Microsoft SQL Server 2005 XML Showplan'
 						? 'XML Showplan'
-						: c.columnName,
-					type: self.stringToFieldType('string'),
+						: escape(c.columnName),
+					field: i.toString(),
 					formatter: isLinked ? Services.hyperLinkFormatter : Services.textFormatter,
 					asyncPostRender: isLinked ? self.linkHandler(linkType) : undefined
 				};
-			})
+			}))
 		};
+		self.plugins.push([rowNumberColumn, new AutoColumnSize(), new AdditionalKeyBindings()]);
 		self.dataSets.push(dataSet);
 
 		// check if the resultset is for a query plan
@@ -641,6 +664,43 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 		}
 	}
 
+	private saveViewState(): void {
+		let gridSelections = this.slickgrids.map(grid => grid.getSelectedRanges());
+		let resultsScrollElement = (this._resultsScrollBox.nativeElement as HTMLElement);
+		let resultsScroll = resultsScrollElement.scrollTop;
+		let messagePaneScroll = (this._messagesContainer.nativeElement as HTMLElement).scrollTop;
+		let slickGridScrolls = this._slickgridElements.map(element => {
+			// Get the slick grid's viewport element and save its scroll position
+			let scrollElement = (element.nativeElement as HTMLElement).children[0].children[3];
+			return {
+				vertical: scrollElement.scrollTop,
+				horizontal: scrollElement.scrollLeft
+			};
+		});
+
+		this.savedViewState = {
+			gridSelections,
+			messagePaneScroll,
+			resultsScroll,
+			slickGridScrolls
+		};
+	}
+
+	private restoreViewState(): void {
+		if (this.savedViewState) {
+			this.slickgrids.forEach((grid, index) => grid.selection = this.savedViewState.gridSelections[index]);
+			(this._resultsScrollBox.nativeElement as HTMLElement).scrollTop = this.savedViewState.resultsScroll;
+			(this._messagesContainer.nativeElement as HTMLElement).scrollTop = this.savedViewState.messagePaneScroll;
+			this._slickgridElements.forEach((element, index) => {
+				let scrollElement = (element.nativeElement as HTMLElement).children[0].children[3];
+				let savedScroll = this.savedViewState.slickGridScrolls[index];
+				scrollElement.scrollTop = savedScroll.vertical;
+				scrollElement.scrollLeft = savedScroll.horizontal;
+			});
+			this.savedViewState = undefined;
+		}
+	}
+
 	layout() {
 		this.resizeGrids();
 	}

src/sql/parts/jobManagement/agent/agentView.component.ts

@@ -7,17 +7,11 @@ import 'vs/css!../common/media/jobs';
 import 'sql/parts/dashboard/common/dashboardPanelStyles';
 
 import * as nls from 'vs/nls';
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core';
-import * as Utils from 'sql/parts/connection/common/utils';
-import { RefreshWidgetAction, EditDashboardAction } from 'sql/parts/dashboard/common/actions';
-import { IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import * as themeColors from 'vs/workbench/common/theme';
-import { DashboardPage } from 'sql/parts/dashboard/common/dashboardPage.component';
-import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
-import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service';
-import { AgentJobInfo, AgentJobHistoryInfo } from 'sqlops';
+import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core';
+import { AgentJobInfo } from 'sqlops';
 import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
+import { IDashboardService } from 'sql/services/dashboard/common/dashboardService';
 
 
 export const DASHBOARD_SELECTOR: string = 'agentview-component';
@@ -31,12 +25,6 @@ export class AgentViewComponent {
 
 	@ViewChild(PanelComponent) private _panel: PanelComponent;
 
-	// tslint:disable:no-unused-variable
-	private readonly jobsComponentTitle: string = nls.localize('jobview.Jobs', "Jobs");
-	private readonly alertsComponentTitle: string = nls.localize('jobview.Alerts', "Alerts");
-	private readonly proxiesComponentTitle: string = nls.localize('jobview.Proxies', "Proxies");
-	private readonly operatorsComponentTitle: string = nls.localize('jobview.Operators', "Operators");
-
 	private _showHistory: boolean = false;
 	private _jobId: string = null;
 	private _agentJobInfo: AgentJobInfo = null;
@@ -48,6 +36,11 @@ export class AgentViewComponent {
 	public proxiesIconClass: string = 'proxiesview-icon';
 	public operatorsIconClass: string = 'operatorsview-icon';
 
+	private readonly jobsComponentTitle: string = nls.localize('jobview.Jobs', "Jobs");
+	private readonly alertsComponentTitle: string = nls.localize('jobview.Alerts', "Alerts");
+	private readonly proxiesComponentTitle: string = nls.localize('jobview.Proxies', "Proxies");
+	private readonly operatorsComponentTitle: string = nls.localize('jobview.Operators', "Operators");
+
 	// tslint:disable-next-line:no-unused-variable
 	private readonly panelOpt: IPanelOptions = {
 		showTabsWhenOne: true,
@@ -56,8 +49,16 @@ export class AgentViewComponent {
 	};
 
 	constructor(
-		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef) {
+		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
+		@Inject(IJobManagementService) jobManagementService: IJobManagementService,
+		@Inject(IDashboardService) dashboardService: IDashboardService,) {
 		this._expanded = new Map<string, string>();
+
+		let self = this;
+		jobManagementService.onDidChange((args) => {
+			self.refresh = true;
+			self._cd.detectChanges();
+		});
 	}
 
 	/**

src/sql/parts/jobManagement/common/interfaces.ts

@@ -8,6 +8,7 @@
 import * as sqlops from 'sqlops';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { JobCacheObject } from './jobManagementService';
+import { Event } from 'vs/base/common/event';
 
 export const SERVICE_ID = 'jobManagementService';
 
@@ -15,22 +16,27 @@ export const IJobManagementService = createDecorator<IJobManagementService>(SERV
 
 export interface IJobManagementService {
 	_serviceBrand: any;
+	onDidChange: Event<void>;
 
 	registerProvider(providerId: string, provider: sqlops.AgentServicesProvider): void;
+	fireOnDidChange(): void;
 
 	getJobs(connectionUri: string): Thenable<sqlops.AgentJobsResult>;
+	getJobHistory(connectionUri: string, jobID: string): Thenable<sqlops.AgentJobHistoryResult>;
+	deleteJob(connectionUri: string, job: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus>;
 
 	getAlerts(connectionUri: string): Thenable<sqlops.AgentAlertsResult>;
+	deleteAlert(connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus>;
 
 	getOperators(connectionUri: string): Thenable<sqlops.AgentOperatorsResult>;
+	deleteOperator(connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus>;
 
 	getProxies(connectionUri: string): Thenable<sqlops.AgentProxiesResult>;
+	deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus>;
 
-	getJobHistory(connectionUri: string, jobID: string): Thenable<sqlops.AgentJobHistoryResult>;
+	getCredentials(connectionUri: string): Thenable<sqlops.GetCredentialsResult>;
 
 	jobAction(connectionUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus>;
-
 	addToCache(server: string, cache: JobCacheObject);
-
 	jobCacheObjectMap:  { [server: string]: JobCacheObject; };
 }