added default config for timeSeries since it is not the same (#1852)

* Edit alert WIP

* A couple alert edit bugs

* Hook up dashboard refresh notification

* Hook onchange event to other agent service calls

* Switch update handler to scalar value

* Add null check on handler callback

CHANGELOG.md

@@ -22,7 +22,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

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/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.1",
   "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,117 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 {
+	ownerUri: string;
+	dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
+	id: number;
+	name: string;
+	originalName: string;
+	delayBetweenResponses: number;
+	eventDescriptionKeyword: string;
+	eventSource: string;
+	hasNotification: number;
+	includeEventDescription: string;
+	isEnabled: boolean;
+	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;
+	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: sqlops.AlertType.sqlServerEvent, //this.alertType,
+			wmiEventNamespace: this.wmiEventNamespace,
+			wmiEventQuery: this.wmiEventQuery
+		};
+	}
+}

extensions/agent/src/data/jobData.ts

@@ -6,8 +6,9 @@
 
 import * as sqlops from 'sqlops';
 import { AgentUtils } from '../agentUtils';
+import { IAgentDialogData, AgentDialogMode } from '../interfaces';
 
-export class CreateJobData {
+export class JobData implements IAgentDialogData {
 
 	private readonly JobCompletionActionCondition_Always: string = 'When the job completes';
 	private readonly JobCompletionActionCondition_OnFailure: string = 'When the job fails';
@@ -19,10 +20,10 @@ export class CreateJobData {
 	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 enabled: boolean = true;
 	public description: string;
@@ -39,7 +40,7 @@ export class CreateJobData {
 	public jobSchedules: sqlops.AgentJobScheduleInfo[];
 	public alerts: sqlops.AgentAlertInfo[];
 
-	constructor(ownerUri: string) {
+	constructor(ownerUri: string, private _agentService: sqlops.AgentServicesProvider = null) {
 		this._ownerUri = ownerUri;
 	}
 

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,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  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) {
+		this.ownerUri = ownerUri;
+	}
+
+	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,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  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) {
+		this.ownerUri = ownerUri;
+	}
+
+	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,355 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+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');
+
+	// 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 AlertTypeSqlServerEventString: string = localize('alertDialog.SqlServerEventAlert', 'SQL Server event alert');
+	private static readonly AlertTypePerformanceConditionString: string = localize('alertDialog.PerformanceCondition', 'SQL Server performance condition alert');
+	private static readonly AlertTypeWmiEventString: string = localize('alertDialog.WmiEvent', 'WMI event alert');
+	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 AlertTypes: string[]  = [
+		AlertDialog.AlertTypeSqlServerEventString,
+		AlertDialog.AlertTypePerformanceConditionString,
+		AlertDialog.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 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;
+
+	constructor(ownerUri: string, alertInfo: sqlops.AgentAlertInfo = null) {
+		super(ownerUri,
+			new AlertData(ownerUri, alertInfo),
+			alertInfo ? AlertDialog.EditDialogTitle : AlertDialog.CreateDialogTitle);
+	}
+
+	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
+		let databases = await AgentUtils.getDatabases(this.ownerUri);
+		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(databases);
+		this.initializeResponseTab();
+		this.initializeOptionsTab();
+
+		dialog.content = [this.generalTab, this.responseTab, this.optionsTab];
+	}
+
+	private initializeGeneralTab(databases: string[]) {
+		this.generalTab.registerContent(async view => {
+			this.nameTextBox = view.modelBuilder.inputBox().component();
+
+			this.enabledCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.EnabledCheckboxLabel
+				}).component();
+
+			this.databaseDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: databases[0],
+					values: databases
+				}).component();
+
+			this.typeDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: AlertDialog.AlertTypes[0],
+					values: AlertDialog.AlertTypes
+				}).component();
+
+			this.severityDropDown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: AlertDialog.AlertSeverities[0],
+					values: AlertDialog.AlertSeverities
+				}).component();
+
+			this.raiseAlertMessageCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.RaiseIfMessageContainsLabel
+				}).component();
+
+			this.raiseAlertMessageTextBox = view.modelBuilder.inputBox().component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.nameTextBox,
+					title: AlertDialog.NameLabel
+				}, {
+					component: this.enabledCheckBox,
+					title: ''
+				}, {
+					component: this.typeDropDown,
+					title: AlertDialog.TypeLabel
+				}, {
+					component: this.databaseDropDown,
+					title: AlertDialog.DatabaseLabel
+				}, {
+					component: this.severityDropDown,
+					title: AlertDialog.SeverityLabel
+				}, {
+					component: this.raiseAlertMessageCheckBox,
+					title: ''
+				}, {
+					component: this.raiseAlertMessageTextBox,
+					title: AlertDialog.MessageTextLabel
+				}
+			]).withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+
+			this.nameTextBox.value = this.model.name;
+			this.enabledCheckBox.checked = this.model.isEnabled;
+		});
+	}
+
+	private initializeResponseTab() {
+		this.responseTab.registerContent(async view => {
+			this.executeJobCheckBox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: AlertDialog.ExecuteJobCheckBoxLabel
+				}).component();
+
+			this.executeJobTextBox = view.modelBuilder.inputBox().component();
+
+			this.newJobButton = view.modelBuilder.button().withProperties({
+					label: AlertDialog.NewJobButtonLabel,
+					width: 80
+				}).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
+				}).component();
+
+			this.newOperatorButton = view.modelBuilder.button().withProperties({
+					label: this.newOperatorButton,
+					width: 80
+				}).component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.executeJobCheckBox,
+					title: ''
+				}, {
+					component: this.executeJobTextBox,
+					title: AlertDialog.ExecuteJobTextBoxLabel
+				}, {
+					component: this.newJobButton,
+					title: AlertDialog.NewJobButtonLabel
+				}, {
+					component: this.notifyOperatorsCheckBox,
+					title: ''
+				}, {
+					component: this.operatorsTable,
+					title: AlertDialog.OperatorListLabel,
+					actions: [this.newOperatorButton]
+				}]).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().component();
+
+			this.delaySecondsTextBox = view.modelBuilder.inputBox().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);
+		this.model.databaseName = this.getDropdownValue(this.databaseDropDown);
+		this.model.severity = this.getSeverityNumber();
+		this.model.messageId = undefined;
+
+		let raiseIfError = this.raiseAlertMessageCheckBox.checked;
+		if (raiseIfError) {
+			let messageText = this.raiseAlertMessageTextBox.value;
+		}
+	}
+}

extensions/agent/src/dialogs/jobDialog.ts

@@ -4,18 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 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 {
+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 static readonly DialogTitle: string = 'New Job';
 	private readonly GeneralTabText: string = 'General';
 	private readonly StepsTabText: string = 'Steps';
 	private readonly SchedulesTabText: string = 'Schedules';
@@ -57,7 +56,6 @@ export class CreateJobDialog {
 	private readonly NewAlertButtonString: string = 'New Alert';
 
 	// 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;
@@ -99,15 +97,11 @@ export class CreateJobDialog {
 	private alertsTable: sqlops.TableComponent;
 	private newAlertButton: sqlops.ButtonComponent;
 
-	private model: CreateJobData;
-
 	constructor(ownerUri: string) {
-		this.model = new CreateJobData(ownerUri);
+		super(ownerUri, new JobData(ownerUri), JobDialog.DialogTitle);
 	}
 
-	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 +113,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,8 +124,6 @@ export class CreateJobDialog {
 
 			return validationResult.valid;
 		});
-
-		sqlops.window.modelviewdialog.openDialog(this.dialog);
 	}
 
 	private initializeGeneralTab() {
@@ -200,7 +188,7 @@ export class CreateJobDialog {
 			}).component();
 
 			this.newStepButton.onDidClick((e)=>{
-				let stepDialog = new CreateStepDialog(this.model.ownerUri, '', '', 1, this.model);
+				let stepDialog = new JobStepDialog(this.model.ownerUri, '', '', 1, this.model);
 				stepDialog.openNewStepDialog();
 			});
 
@@ -247,10 +235,10 @@ export class CreateJobDialog {
 			}).component();
 
 			this.newAlertButton.onDidClick((e)=>{
-				let alertDialog = new CreateAlertDialog(this.model.ownerUri);
+				let alertDialog = new AlertDialog(this.model.ownerUri);
 				alertDialog.onSuccess((dialogModel) => {
 				});
-				alertDialog.showDialog();
+				alertDialog.openDialog();
 			});
 
 			let formModel = view.modelBuilder.formContainer()
@@ -421,34 +409,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

@@ -5,16 +5,18 @@
 'use strict';
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
-import { CreateStepData } from '../data/createStepData';
+import { JobStepData } from '../data/jobStepData';
 import { AgentUtils } from '../agentUtils';
-import { CreateJobData } from '../data/createJobData';
+import { JobData } from '../data/jobData';
+const path = require('path');
 
-export class CreateStepDialog {
+export class JobStepDialog {
 
 	// TODO: localize
 	// Top level
 	//
 	private static readonly DialogTitle: string = 'New Job Step';
+	private static readonly FileBrowserDialogTitle: string = 'Locate Database Files - ';
 	private static readonly OkButtonText: string = 'OK';
 	private static readonly CancelButtonText: string = 'Cancel';
 	private static readonly GeneralTabText: string = 'General';
@@ -35,44 +37,59 @@ export class CreateStepDialog {
 	private static readonly QuitJobReportingFailure: string = '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;
+
+	// Dropdowns
 	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 fileTypeDropdown: sqlops.DropDownComponent;
+
+	// Buttons
 	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;
+	// 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;
 
-	private jobModel: CreateJobData;
-
 	constructor(
 		ownerUri: string,
 		jobName: string,
 		server: string,
 		stepId: number,
-		jobModel?: CreateJobData
+		jobModel?: JobData
 	) {
-		this.model = new CreateStepData(ownerUri);
+		this.model = new JobStepData(ownerUri);
 		this.stepId = stepId;
 		this.ownerUri = ownerUri;
 		this.jobName = jobName;
@@ -81,24 +98,24 @@ export class CreateStepDialog {
 	}
 
 	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 = sqlops.window.modelviewdialog.createDialog(JobStepDialog.DialogTitle);
+		this.generalTab = sqlops.window.modelviewdialog.createTab(JobStepDialog.GeneralTabText);
+		this.advancedTab = sqlops.window.modelviewdialog.createTab(JobStepDialog.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;
+		this.dialog.okButton.label = JobStepDialog.OkButtonText;
+		this.dialog.cancelButton.label = JobStepDialog.CancelButtonText;
 	}
 
 	private createCommands(view, queryProvider: sqlops.QueryProvider) {
 		this.openButton = view.modelBuilder.button()
 			.withProperties({
-				label: CreateStepDialog.OpenCommandText,
+				label: JobStepDialog.OpenCommandText,
 				width: '80px'
 			}).component();
 		this.parseButton = view.modelBuilder.button()
 			.withProperties({
-				label: CreateStepDialog.ParseCommandText,
+				label: JobStepDialog.ParseCommandText,
 				width: '80px'
 			}).component();
 		this.parseButton.onDidClick(e => {
@@ -122,13 +139,13 @@ export class CreateStepDialog {
 			.component();
 		this.nextButton = view.modelBuilder.button()
 			.withProperties({
-				label: CreateStepDialog.NextButtonText,
+				label: JobStepDialog.NextButtonText,
 				enabled: false,
 				width: '80px'
 			}).component();
 		this.previousButton = view.modelBuilder.button()
 			.withProperties({
-				label: CreateStepDialog.PreviousButtonText,
+				label: JobStepDialog.PreviousButtonText,
 				enabled: false,
 				width: '80px'
 			}).component();
@@ -142,8 +159,8 @@ export class CreateStepDialog {
 			this.nameTextBox.required = true;
 			this.typeDropdown = view.modelBuilder.dropDown()
 				.withProperties({
-					value: CreateStepDialog.TSQLScript,
-					values: [CreateStepDialog.TSQLScript]
+					value: JobStepDialog.TSQLScript,
+					values: [JobStepDialog.TSQLScript]
 				})
 				.component();
 			this.runAsDropdown = view.modelBuilder.dropDown()
@@ -154,8 +171,8 @@ export class CreateStepDialog {
 				.component();
 			this.runAsDropdown.enabled = false;
 			this.typeDropdown.onValueChanged((type) => {
-				if (type.selected !== CreateStepDialog.TSQLScript) {
-					this.runAsDropdown.value = CreateStepDialog.AgentServiceAccount;
+				if (type.selected !== JobStepDialog.TSQLScript) {
+					this.runAsDropdown.value = JobStepDialog.AgentServiceAccount;
 					this.runAsDropdown.values = [this.runAsDropdown.value];
 				} else {
 					this.runAsDropdown.value = '';
@@ -234,15 +251,15 @@ export class CreateStepDialog {
 		this.advancedTab.registerContent(async (view) => {
 			this.successActionDropdown = view.modelBuilder.dropDown()
 				.withProperties({
-					value: CreateStepDialog.NextStep,
-					values: [CreateStepDialog.NextStep, CreateStepDialog.QuitJobReportingSuccess, CreateStepDialog.QuitJobReportingFailure]
+					value: JobStepDialog.NextStep,
+					values: [JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess, JobStepDialog.QuitJobReportingFailure]
 				})
 				.component();
 			let retryFlexContainer = this.createRetryCounters(view);
 			this.failureActionDropdown = view.modelBuilder.dropDown()
 				.withProperties({
-					value: CreateStepDialog.QuitJobReportingFailure,
-					values: [CreateStepDialog.QuitJobReportingFailure, CreateStepDialog.NextStep, CreateStepDialog.QuitJobReportingSuccess]
+					value: JobStepDialog.QuitJobReportingFailure,
+					values: [JobStepDialog.QuitJobReportingFailure, JobStepDialog.NextStep, JobStepDialog.QuitJobReportingSuccess]
 				})
 				.component();
 			let optionsGroup = this.createTSQLOptions(view);
@@ -272,13 +289,13 @@ export class CreateStepDialog {
 				.withFormItems(
 					[{
 						component: this.successActionDropdown,
-						title: CreateStepDialog.SuccessAction
+						title: JobStepDialog.SuccessAction
 					}, {
 						component: retryFlexContainer,
 						title: ''
 					}, {
 						component: this.failureActionDropdown,
-						title: CreateStepDialog.FailureAction
+						title: JobStepDialog.FailureAction
 					}, {
 						component: optionsGroup,
 						title: 'Transact-SQL script (T-SQL)'
@@ -344,12 +361,63 @@ export class CreateStepDialog {
 		return retryFlexContainer;
 	}
 
+	private openFileBrowserDialog() {
+		let fileBrowserTitle = JobStepDialog.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: 'All Files (*)',
+					values: ['All Files (*)']
+				})
+				.component();
+			this.fileBrowserNameBox = view.modelBuilder.inputBox()
+				.withProperties({})
+				.component();
+			let fileBrowserContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.fileBrowserTree,
+					title: ''
+				}, {
+					component: this.selectedPathTextBox,
+					title: 'Selected path:'
+				}, {
+					component: this.fileTypeDropdown,
+					title: 'Files of type:'
+				}, {
+					component: this.fileBrowserNameBox,
+					title: 'File name:'
+				}
+			]).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 = JobStepDialog.OkButtonText;
+		this.fileBrowserDialog.cancelButton.label = JobStepDialog.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: '100px',
+				width: '150px',
 				inputType: 'text'
 			}).component();
 		let outputViewButton = view.modelBuilder.button()
@@ -407,6 +475,7 @@ export class CreateStepDialog {
 		this.model.retryInterval = +this.retryIntervalBox.value;
 		this.model.failureAction = this.failureActionDropdown.value as string;
 		this.model.outputFileName = this.outputFileNameBox.value;
+		this.model.appendToLogFile = this.appendToExistingFileCheckbox.checked;
 		await this.model.save();
 	}
 

extensions/agent/src/dialogs/operatorDialog.ts

@@ -0,0 +1,405 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 DialogTitle: string = localize('createOperator.createOperator', 'Create 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');
+
+	// 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) {
+		super(ownerUri, new OperatorData(ownerUri), OperatorDialog.DialogTitle);
+	}
+
+	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: 'Workday begin'
+				}]).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: 'Workday end'
+				}]).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'
+				}).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: 'Workday begin'
+				}]).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: 'Workday end'
+				}]).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: 'Workday begin'
+				}]).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: 'Workday end'
+				}]).component();
+
+			let pagerSundayCheckboxContainer = view.modelBuilder.flexContainer()
+				.withLayout({
+					flexFlow: 'row',
+					alignItems: 'baseline'
+				}).withItems([this.pagerSundayCheckBox, sundayStartInputContainer, sundayEndInputContainer])
+				.component();
+
+			let checkBoxContainer = view.modelBuilder.formContainer()
+				.withFormItems([{
+					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: ''
+				}]).component();
+
+			let pagerContainer = view.modelBuilder.flexContainer()
+				.withLayout({
+					flexFlow: 'row'
+				}).withItems([checkBoxContainer])
+				.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
+				}, {
+					component: pagerContainer,
+					title: ''
+				}]).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/proxyDialog.ts

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 DialogTitle: string = localize('createProxy.createAlert', 'Create Alert');
+	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 SubsystemsTableLabel: string = localize('createProxy.Subsystems', 'Subsystems');
+	private static readonly SubsystemNameColumnLabel: string = localize('createProxy.SubsystemName', 'Subsystem');
+
+	// UI Components
+	private generalTab: sqlops.window.modelviewdialog.DialogTab;
+
+	// General tab controls
+	private proxyNameTextBox: sqlops.InputBoxComponent;
+	private credentialNameTextBox: sqlops.InputBoxComponent;
+	private descriptionTextBox: sqlops.InputBoxComponent;
+	private subsystemsTable: sqlops.TableComponent;
+
+	constructor(ownerUri: string) {
+		super(ownerUri, new ProxyData(ownerUri), ProxyDialog.DialogTitle);
+	}
+
+	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().component();
+
+			this.credentialNameTextBox = view.modelBuilder.inputBox().component();
+
+			this.descriptionTextBox = view.modelBuilder.inputBox().component();
+
+			this.subsystemsTable = view.modelBuilder.table()
+				.withProperties({
+					columns: [
+						ProxyDialog.SubsystemNameColumnLabel
+					],
+					data: [],
+					height: 500
+				}).component();
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: this.proxyNameTextBox,
+					title: ProxyDialog.ProxyNameTextBoxLabel
+				}, {
+					component: this.credentialNameTextBox,
+					title: ProxyDialog.CredentialNameTextBoxLabel
+				}, {
+					component: this.descriptionTextBox,
+					title: ProxyDialog.DescriptionTextBoxLabel
+				}, {
+					component: this.subsystemsTable,
+					title: ProxyDialog.SubsystemsTableLabel
+				}]).withLayout({ width: '100%' }).component();
+
+			await view.initializeModel(formModel);
+		});
+	}
+
+	protected updateModel() {
+		this.model.accountName = this.proxyNameTextBox.value;
+		this.model.credentialName = this.credentialNameTextBox.value;
+		this.model.description = this.descriptionTextBox.value;
+	}
+}

extensions/agent/src/dialogs/scheduleDialog.ts

@@ -7,9 +7,9 @@
 
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
-import { CreateScheduleData } from '../data/createScheduleData';
+import { ScheduleData } from '../data/scheduleData';
 
-export class CreateScheduleDialog {
+export class ScheduleDialog {
 
 	// Top level
 	private readonly DialogTitle: string = 'New Schedule';
@@ -20,13 +20,13 @@ export class CreateScheduleDialog {
 	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() {

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

@@ -3,10 +3,13 @@
  *  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 { CreateAlertDialog } from './dialogs/createAlertDialog';
-import { CreateJobDialog } from './dialogs/createJobDialog';
-import { CreateStepDialog } from './dialogs/createStepDialog';
+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';
 
 /**
@@ -25,24 +28,28 @@ export class MainController {
      */
     public activate(): void {
         vscode.commands.registerCommand('agent.openCreateJobDialog', (ownerUri: string) => {
-            let dialog = new CreateJobDialog(ownerUri);
-            dialog.showDialog();
+            let dialog = new JobDialog(ownerUri);
+            dialog.openDialog();
         });
         vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, jobId: string, server: string, stepId: number) => {
-			let dialog = new CreateStepDialog(ownerUri, jobId, server, stepId);
+			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.openCreateAlertDialog', (ownerUri: string) => {
-            let dialog = new CreateAlertDialog(ownerUri);
-            dialog.showDialog();
+        vscode.commands.registerCommand('agent.openAlertDialog', (ownerUri: string, alertInfo: sqlops.AgentAlertInfo) => {
+            let dialog = new AlertDialog(ownerUri, alertInfo);
+            dialog.openDialog();
         });
         vscode.commands.registerCommand('agent.openCreateOperatorDialog', (ownerUri: string) => {
+            let dialog = new OperatorDialog(ownerUri);
+            dialog.openDialog();
         });
         vscode.commands.registerCommand('agent.openCreateProxyDialog', (ownerUri: string) => {
+            let dialog = new ProxyDialog(ownerUri);
+            dialog.openDialog();
         });
     }
 

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

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. 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, testAgentService);
+		data.save();
+	});
+});

extensions/agent/src/test/testAgentService.ts

@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. 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;
+	}
+
+	// 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/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.4",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.1.zip",
 		"Windows_64": "win-x64-netcoreapp2.1.zip",

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);
@@ -371,7 +427,10 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentProxyRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => r,
+				r => {
+					fireOnUpdated();
+					return r;
+				},
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -401,7 +460,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 +479,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 +497,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);
@@ -467,7 +535,8 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			getJobSchedules,
 			createJobSchedule,
 			updateJobSchedule,
-			deleteJobSchedule
+			deleteJobSchedule,
+			registerOnUpdated
 		});
 	}
 }

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",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {
     "name": "Microsoft Corporation"

src/sql/base/common/strings.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.
+ *--------------------------------------------------------------------------------------------*/
+'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;';
+			default: return match;
+		}
+	});
+}

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

@@ -130,7 +130,7 @@ 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.');
+		let noAccountLabel = localize('accountDialog.noAccountLabel', 'There is no linked account. Please add an account.');
 		noAccountTitle.innerHTML = noAccountLabel;
 
 		// Show the add account button for the first provider

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);
+				}
+			}));
 		});
 	}
 

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/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/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.ts

@@ -27,8 +27,9 @@ 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 * 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 +61,7 @@ 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;
+	private stringsFormat: any = format;
 
 	// tslint:disable-next-line:no-unused-variable
 	private dataIcons: IGridIcon[] = [
@@ -302,7 +303,7 @@ export class QueryComponent extends GridParentComponent implements OnInit, OnDes
 						// Push row values onto end of gridData for slickgrid
 						gridData.push({
 							values: rows.rows[row].map(c => {
-								return mixin({ ariaLabel: c.displayValue }, c);
+								return mixin({ ariaLabel: escape(c.displayValue) }, c);
 							})
 						});
 					}

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

@@ -18,6 +18,7 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service';
 import { AgentJobInfo, AgentJobHistoryInfo } from 'sqlops';
 import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
 
 
 export const DASHBOARD_SELECTOR: string = 'agentview-component';
@@ -56,8 +57,15 @@ export class AgentViewComponent {
 	};
 
 	constructor(
-		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef) {
+		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
+		@Inject(IJobManagementService) jobManagementService: IJobManagementService) {
 		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,25 @@ 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>;
-
-	getJobHistory(connectionUri: string, jobID: string): Thenable<sqlops.AgentJobHistoryResult>;
+	deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus>;
 
 	jobAction(connectionUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus>;
-
 	addToCache(server: string, cache: JobCacheObject);
-
 	jobCacheObjectMap:  { [server: string]: JobCacheObject; };
 }

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

@@ -0,0 +1,445 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Action } from 'vs/base/common/actions';
+import * as nls from 'vs/nls';
+import * as sqlops from 'sqlops';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import Severity from 'vs/base/common/severity';
+import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component';
+import { IJobManagementService } from '../common/interfaces';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { JobsViewComponent } from '../views/jobsView.component';
+import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component';
+import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component';
+import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component';
+
+export enum JobActions {
+	Run = 'run',
+	Stop = 'stop'
+}
+
+export interface IJobActionInfo {
+	ownerUri: string;
+	targetObject: any;
+}
+
+// Job actions
+
+export class JobsRefreshAction extends Action {
+	public static ID = 'jobaction.refresh';
+	public static LABEL = nls.localize('jobaction.refresh', "Refresh");
+
+	constructor(
+	) {
+		super(JobsRefreshAction.ID, JobsRefreshAction.LABEL, 'refreshIcon');
+	}
+
+	public run(context: JobsViewComponent): TPromise<boolean> {
+		return new TPromise<boolean>((resolve, reject) => {
+			if (context) {
+				context.refreshJobs();
+				resolve(true);
+			} else {
+				reject(false);
+			}
+		});
+	}
+}
+
+export class NewJobAction extends Action {
+	public static ID = 'jobaction.newJob';
+	public static LABEL = nls.localize('jobaction.newJob', "New Job");
+
+	constructor(
+	) {
+		super(NewJobAction.ID, NewJobAction.LABEL, 'newStepIcon');
+	}
+
+	public run(context: JobsViewComponent): TPromise<boolean> {
+		return new TPromise<boolean>((resolve, reject) => {
+			try {
+				context.openCreateJobDialog();
+				resolve(true);
+			} catch (e) {
+				reject(e);
+			}
+		});
+	}
+}
+
+export class RunJobAction extends Action {
+	public static ID = 'jobaction.runJob';
+	public static LABEL = nls.localize('jobaction.run', "Run");
+
+	constructor(
+		@INotificationService private notificationService: INotificationService,
+		@IJobManagementService private jobManagementService: IJobManagementService
+	) {
+		super(RunJobAction.ID, RunJobAction.LABEL, 'runJobIcon');
+	}
+
+	public run(context: JobHistoryComponent): TPromise<boolean> {
+		let jobName = context.agentJobInfo.name;
+		let ownerUri = context.ownerUri;
+		return new TPromise<boolean>((resolve, reject) => {
+			this.jobManagementService.jobAction(ownerUri, jobName, JobActions.Run).then(result => {
+				if (result.success) {
+					var startMsg = nls.localize('jobSuccessfullyStarted', ': The job was successfully started.');
+					this.notificationService.notify({
+						severity: Severity.Info,
+						message: jobName+ startMsg
+					});
+					resolve(true);
+				} else {
+					this.notificationService.notify({
+						severity: Severity.Error,
+						message: result.errorMessage
+					});
+					resolve(false);
+				}
+			});
+		});
+	}
+}
+
+export class StopJobAction extends Action {
+	public static ID = 'jobaction.stopJob';
+	public static LABEL = nls.localize('jobaction.stop', "Stop");
+
+	constructor(
+		@INotificationService private notificationService: INotificationService,
+		@IJobManagementService private jobManagementService: IJobManagementService
+	) {
+		super(StopJobAction.ID, StopJobAction.LABEL, 'stopJobIcon');
+	}
+
+	public run(context: JobHistoryComponent): TPromise<boolean> {
+		let jobName = context.agentJobInfo.name;
+		let ownerUri = context.ownerUri;
+		return new TPromise<boolean>((resolve, reject) => {
+			this.jobManagementService.jobAction(ownerUri, jobName, JobActions.Stop).then(result => {
+				if (result.success) {
+						var stopMsg = nls.localize('jobSuccessfullyStopped', ': The job was successfully stopped.');
+						this.notificationService.notify({
+							severity: Severity.Info,
+							message: jobName+ stopMsg
+						});
+					resolve(true);
+				} else {
+					this.notificationService.notify({
+						severity: Severity.Error,
+						message: result.errorMessage
+					});
+					resolve(false);
+				}
+			});
+		});
+	}
+}
+
+export class EditJobAction extends Action {
+	public static ID = 'jobaction.editJob';
+	public static LABEL = nls.localize('jobaction.editJob', "Edit Job");
+
+	constructor() {
+		super(EditJobAction.ID, EditJobAction.LABEL);
+	}
+
+	public run(actionInfo: IJobActionInfo): TPromise<boolean> {
+		return TPromise.as(true);
+	}
+}
+
+export class DeleteJobAction extends Action {
+	public static ID = 'jobaction.deleteJob';
+	public static LABEL = nls.localize('jobaction.deleteJob', "Delete Job");
+
+	constructor(
+		@INotificationService private _notificationService: INotificationService,
+		@IJobManagementService private _jobService: IJobManagementService
+	) {
+		super(DeleteJobAction.ID, DeleteJobAction.LABEL);
+	}
+
+	public run(actionInfo: IJobActionInfo): TPromise<boolean> {
+		let self = this;
+		let job = actionInfo.targetObject as sqlops.AgentJobInfo;
+		self._notificationService.prompt(
+			Severity.Info,
+			nls.localize('jobaction.deleteJobConfirm,', "Are you sure you'd like to delete the job '{0}'?", job.name),
+			[{
+				label: DeleteJobAction.LABEL,
+				run: () => {
+					self._jobService.deleteJob(actionInfo.ownerUri, actionInfo.targetObject).then(result => {
+						if (!result || !result.success) {
+							let errorMessage = nls.localize("jobaction.failedToDeleteJob", "Could not delete job '{0}'.\nError: {1}",
+								job.name, result.errorMessage ? result.errorMessage : 'Unknown error');
+							self._notificationService.error(errorMessage);
+						}
+					});
+				}
+			}, {
+				label: DeleteAlertAction.CancelLabel,
+				run: () => { }
+			}]
+		);
+		return TPromise.as(true);
+	}
+}
+
+// Step Actions
+
+export class NewStepAction extends Action {
+	public static ID = 'jobaction.newStep';
+	public static LABEL = nls.localize('jobaction.newStep', "New Step");
+
+	constructor(
+		@ICommandService private _commandService: ICommandService
+	) {
+		super(NewStepAction.ID, NewStepAction.LABEL, 'newStepIcon');
+	}
+
+	public run(context: JobHistoryComponent): TPromise<boolean> {
+		let ownerUri = context.ownerUri;
+		let jobName = context.agentJobInfo.name;
+		let server = context.serverName;
+		let stepId = 0;
+		if (context.agentJobHistoryInfo && context.agentJobHistoryInfo.steps) {
+			stepId = context.agentJobHistoryInfo.steps.length + 1;
+		}
+		return new TPromise<boolean>((resolve, reject) => {
+			resolve(this._commandService.executeCommand('agent.openNewStepDialog', ownerUri, jobName, server, stepId));
+		});
+	}
+}
+
+// Alert Actions
+
+export class NewAlertAction extends Action {
+	public static ID = 'jobaction.newAlert';
+	public static LABEL = nls.localize('jobaction.newAlert', "New Alert");
+
+	constructor(
+	) {
+		super(NewAlertAction.ID, NewAlertAction.LABEL, 'newStepIcon');
+	}
+
+	public run(context: AlertsViewComponent): TPromise<boolean> {
+		return new TPromise<boolean>((resolve, reject) => {
+			try {
+				context.openCreateAlertDialog();
+				resolve(true);
+			} catch (e) {
+				reject(e);
+			}
+		});
+	}
+}
+
+export class EditAlertAction extends Action {
+	public static ID = 'jobaction.editAlert';
+	public static LABEL = nls.localize('jobaction.editAlert', "Edit Alert");
+
+	constructor(
+		@ICommandService private _commandService: ICommandService
+	) {
+		super(EditAlertAction.ID, EditAlertAction.LABEL);
+	}
+
+	public run(actionInfo: IJobActionInfo): TPromise<boolean> {
+		this._commandService.executeCommand(
+			'agent.openAlertDialog',
+			 actionInfo.ownerUri,
+			 actionInfo.targetObject);
+		return TPromise.as(true);
+	}
+}
+
+export class DeleteAlertAction extends Action {
+	public static ID = 'jobaction.deleteAlert';
+	public static LABEL = nls.localize('jobaction.deleteAlert', "Delete Alert");
+	public static CancelLabel = nls.localize('jobaction.Cancel', "Cancel");
+
+	constructor(
+		@INotificationService private _notificationService: INotificationService,
+		@IJobManagementService private _jobService: IJobManagementService
+	) {
+		super(DeleteAlertAction.ID, DeleteAlertAction.LABEL);
+	}
+
+	public run(actionInfo: IJobActionInfo): TPromise<boolean> {
+		let self = this;
+		let alert = actionInfo.targetObject as sqlops.AgentAlertInfo;
+		self._notificationService.prompt(
+			Severity.Info,
+			nls.localize('jobaction.deleteAlertConfirm,', "Are you sure you'd like to delete the alert '{0}'?", alert.name),
+			[{
+				label: DeleteAlertAction.LABEL,
+				run: () => {
+					self._jobService.deleteAlert(actionInfo.ownerUri, actionInfo.targetObject).then(result => {
+						if (!result || !result.success) {
+							let errorMessage = nls.localize("jobaction.failedToDeleteAlert", "Could not delete alert '{0}'.\nError: {1}",
+								alert.name, result.errorMessage ? result.errorMessage : 'Unknown error');
+							self._notificationService.error(errorMessage);
+						}
+					});
+				}
+			}, {
+				label: DeleteAlertAction.CancelLabel,
+				run: () => { }
+			}]
+		);
+		return TPromise.as(true);
+	}
+}
+
+// Operator Actions
+
+export class NewOperatorAction extends Action {
+	public static ID = 'jobaction.newOperator';
+	public static LABEL = nls.localize('jobaction.newOperator', "New Operator");
+
+	constructor(
+	) {
+		super(NewOperatorAction.ID, NewOperatorAction.LABEL, 'newStepIcon');
+	}
+
+	public run(context: OperatorsViewComponent): TPromise<boolean> {
+		return new TPromise<boolean>((resolve, reject) => {
+			try {
+				context.openCreateOperatorDialog();
+				resolve(true);
+			} catch (e) {
+				reject(e);
+			}
+		});
+	}
+}
+
+export class EditOperatorAction extends Action {
+	public static ID = 'jobaction.editAlert';
+	public static LABEL = nls.localize('jobaction.editOperator', "Edit Operator");
+
+	constructor() {
+		super(EditOperatorAction.ID, EditOperatorAction.LABEL);
+	}
+
+	public run(info: any): TPromise<boolean> {
+		return TPromise.as(true);
+	}
+}
+
+export class DeleteOperatorAction extends Action {
+	public static ID = 'jobaction.deleteOperator';
+	public static LABEL = nls.localize('jobaction.deleteOperator', "Delete Operator");
+
+	constructor(
+		@INotificationService private _notificationService: INotificationService,
+		@IJobManagementService private _jobService: IJobManagementService
+	) {
+		super(DeleteOperatorAction.ID, DeleteOperatorAction.LABEL);
+	}
+
+	public run(actionInfo: IJobActionInfo): TPromise<boolean> {
+		let self = this;
+		let operator = actionInfo.targetObject as sqlops.AgentOperatorInfo;
+		self._notificationService.prompt(
+			Severity.Info,
+			nls.localize('jobaction.deleteOperatorConfirm,', "Are you sure you'd like to delete the operator '{0}'?", operator.name),
+			[{
+				label: DeleteOperatorAction.LABEL,
+				run: () => {
+					self._jobService.deleteOperator(actionInfo.ownerUri, actionInfo.targetObject).then(result => {
+						if (!result || !result.success) {
+							let errorMessage = nls.localize("jobaction.failedToDeleteOperator", "Could not delete operator '{0}'.\nError: {1}",
+								operator.name, result.errorMessage ? result.errorMessage : 'Unknown error');
+							self._notificationService.error(errorMessage);
+						}
+					});
+				}
+			}, {
+				label: DeleteAlertAction.CancelLabel,
+				run: () => { }
+			}]
+		);
+		return TPromise.as(true);
+	}
+}
+
+
+// Proxy Actions
+
+export class NewProxyAction extends Action {
+	public static ID = 'jobaction.newProxy';
+	public static LABEL = nls.localize('jobaction.newProxy', "New Proxy");
+
+	constructor(
+	) {
+		super(NewProxyAction.ID, NewProxyAction.LABEL, 'newStepIcon');
+	}
+
+	public run(context: ProxiesViewComponent): TPromise<boolean> {
+		return new TPromise<boolean>((resolve, reject) => {
+			try {
+				context.openCreateProxyDialog();
+				resolve(true);
+			} catch (e) {
+				reject(e);
+			}
+		});
+	}
+}
+
+export class EditProxyAction extends Action {
+	public static ID = 'jobaction.editProxy';
+	public static LABEL = nls.localize('jobaction.editProxy', "Edit Proxy");
+
+	constructor() {
+		super(EditProxyAction.ID, EditProxyAction.LABEL);
+	}
+
+	public run(info: any): TPromise<boolean> {
+		return TPromise.as(true);
+	}
+}
+
+export class DeleteProxyAction extends Action {
+	public static ID = 'jobaction.deleteProxy';
+	public static LABEL = nls.localize('jobaction.deleteProxy', "Delete Proxy");
+
+	constructor(
+		@INotificationService private _notificationService: INotificationService,
+		@IJobManagementService private _jobService: IJobManagementService
+	) {
+		super(DeleteProxyAction.ID, DeleteProxyAction.LABEL);
+	}
+
+	public run(actionInfo: IJobActionInfo): TPromise<boolean> {
+		let self = this;
+		let proxy = actionInfo.targetObject as sqlops.AgentProxyInfo;
+		self._notificationService.prompt(
+			Severity.Info,
+			nls.localize('jobaction.deleteProxyConfirm,', "Are you sure you'd like to delete the proxy '{0}'?", proxy.accountName),
+			[{
+				label: DeleteProxyAction.LABEL,
+				run: () => {
+					self._jobService.deleteProxy(actionInfo.ownerUri, actionInfo.targetObject).then(result => {
+						if (!result || !result.success) {
+							let errorMessage = nls.localize("jobaction.failedToDeleteProxy", "Could not delete proxy '{0}'.\nError: {1}",
+								proxy.accountName, result.errorMessage ? result.errorMessage : 'Unknown error');
+								self._notificationService.error(errorMessage);
+						}
+					});
+				}
+			}, {
+				label: DeleteAlertAction.CancelLabel,
+				run: () => { }
+			}]
+		);
+		return TPromise.as(true);
+	}
+}

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

@@ -10,11 +10,14 @@ import * as sqlops from 'sqlops';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
 import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
-
+import { Event, Emitter } from 'vs/base/common/event';
 
 export class JobManagementService implements IJobManagementService {
 	_serviceBrand: any;
 
+	private _onDidChange = new Emitter<void>();
+	public readonly onDidChange: Event<void> = this._onDidChange.event;
+
 	private _providers: { [handle: string]: sqlops.AgentServicesProvider; } = Object.create(null);
 	private _jobCacheObject : {[server: string]: JobCacheObject; } = {};
 
@@ -23,30 +26,57 @@ export class JobManagementService implements IJobManagementService {
 	) {
 	}
 
+	public fireOnDidChange(): void {
+		this._onDidChange.fire(void 0);
+	}
+
 	public getJobs(connectionUri: string): Thenable<sqlops.AgentJobsResult> {
 		return this._runAction(connectionUri, (runner) => {
 			return runner.getJobs(connectionUri);
 		});
 	}
 
+	public deleteJob(connectionUri: string, job: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus> {
+		return this._runAction(connectionUri, (runner) => {
+			return runner.deleteJob(connectionUri, job);
+		});
+	}
+
 	public getAlerts(connectionUri: string): Thenable<sqlops.AgentAlertsResult> {
 		return this._runAction(connectionUri, (runner) => {
 			return runner.getAlerts(connectionUri);
 		});
 	}
 
+	public deleteAlert(connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus> {
+		return this._runAction(connectionUri, (runner) => {
+			return runner.deleteAlert(connectionUri, alert);
+		});
+	}
+
 	public getOperators(connectionUri: string): Thenable<sqlops.AgentOperatorsResult> {
 		return this._runAction(connectionUri, (runner) => {
 			return runner.getOperators(connectionUri);
 		});
 	}
 
+	public deleteOperator(connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus> {
+		return this._runAction(connectionUri, (runner) => {
+			return runner.deleteOperator(connectionUri, operator);
+		});
+	}
+
 	public getProxies(connectionUri: string): Thenable<sqlops.AgentProxiesResult> {
 		return this._runAction(connectionUri, (runner) => {
 			return runner.getProxies(connectionUri);
 		});
 	}
 
+	public deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus>  {
+		return this._runAction(connectionUri, (runner) => {
+			return runner.deleteProxy(connectionUri, proxy);
+		});
+	}
 
 	public getJobHistory(connectionUri: string, jobID: string): Thenable<sqlops.AgentJobHistoryResult> {
 		return this._runAction(connectionUri, (runner) => {
@@ -60,7 +90,6 @@ export class JobManagementService implements IJobManagementService {
 		});
 	}
 
-
 	private _runAction<T>(uri: string, action: (handler: sqlops.AgentServicesProvider) => Thenable<T>): Thenable<T> {
 		let providerId: string = this._connectionService.getProviderIdFromUri(uri);
 

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

@@ -7,7 +7,7 @@
 
 import * as nls from 'vs/nls';
 
-export class AgentJobUtilities {
+export class JobManagementUtilities {
 
 	public static startIconClass: string = 'action-label icon runJobIcon';
 	public static stopIconClass: string = 'action-label icon stopJobIcon';
@@ -63,8 +63,8 @@ export class AgentJobUtilities {
 	}
 
 	public static getActionIconClassName(startIcon: HTMLElement, stopIcon: HTMLElement, executionStatus: number) {
-		this.setRunnable(startIcon, AgentJobUtilities.startIconClass.length);
-		this.setRunnable(stopIcon, AgentJobUtilities.stopIconClass.length);
+		this.setRunnable(startIcon, JobManagementUtilities.startIconClass.length);
+		this.setRunnable(stopIcon, JobManagementUtilities.stopIconClass.length);
 		switch (executionStatus) {
 			case(1): // executing
 				startIcon.className += ' non-runnable';

src/sql/parts/jobManagement/common/media/alert.svg

@@ -1 +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:#212121;}</style></defs><title>blocker</title><polygon class="cls-1" points="0.99 3.99 -0.01 3.99 -0.01 0.03 3.98 0.03 3.98 1.03 0.99 1.03 0.99 3.99"/><polygon class="cls-1" points="16.01 3.99 15.01 3.99 15.01 1.03 12.02 1.03 12.02 0.03 16.01 0.03 16.01 3.99"/><polygon class="cls-1" points="16.01 15.97 12.02 15.97 12.02 14.97 15.01 14.97 15.01 12.01 16.01 12.01 16.01 15.97"/><polygon class="cls-1" points="4 15.97 0.01 15.97 0.01 12.01 1.01 12.01 1.01 14.97 4 14.97 4 15.97"/><path class="cls-1" d="M8.41,3.18A4.82,4.82,0,1,0,13.23,8,4.83,4.83,0,0,0,8.41,3.18Zm0,.74A4.08,4.08,0,0,1,12.49,8a4,4,0,0,1-.85,2.47L5.69,5A4,4,0,0,1,8.41,3.93Zm0,8.15A4.08,4.08,0,0,1,4.34,8a4,4,0,0,1,.85-2.47L11.14,11A4,4,0,0,1,8.41,12.07Z"/></svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>jobalert</title><path d="M16,2.24V7.58A5.38,5.38,0,0,0,15,6.5V4.3L12.8,5.39l-.64-.11a5,5,0,0,0-.65,0l-.36,0-.36,0,4.11-2.05H1.12L7.87,6.61,7.49,7a4.7,4.7,0,0,0-.34.39L1,4.3v6.94H6a4.64,4.64,0,0,0,.07.5c0,.17.07.33.11.5H0v-10Zm-4.5,4a4.35,4.35,0,0,1,1.75.36A4.53,4.53,0,0,1,15.64,9a4.49,4.49,0,0,1,0,3.5,4.53,4.53,0,0,1-2.39,2.39,4.49,4.49,0,0,1-3.5,0,4.53,4.53,0,0,1-2.39-2.39,4.49,4.49,0,0,1,0-3.5A4.53,4.53,0,0,1,9.75,6.59,4.35,4.35,0,0,1,11.5,6.24Zm0,8A3.38,3.38,0,0,0,12.86,14a3.53,3.53,0,0,0,1.86-1.86,3.49,3.49,0,0,0,0-2.73,3.53,3.53,0,0,0-1.86-1.86,3.49,3.49,0,0,0-2.73,0A3.53,3.53,0,0,0,8.28,9.37a3.49,3.49,0,0,0,0,2.73A3.53,3.53,0,0,0,10.14,14,3.38,3.38,0,0,0,11.5,14.24Zm-.5-6h1v3H11Zm0,4h1v1H11Z"/></svg>

src/sql/parts/jobManagement/common/media/alert_inverse.svg

@@ -1 +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>blocker_inverse</title><polygon class="cls-1" points="0.99 3.99 -0.01 3.99 -0.01 0.03 3.98 0.03 3.98 1.03 0.99 1.03 0.99 3.99"/><polygon class="cls-1" points="16.01 3.99 15.01 3.99 15.01 1.03 12.02 1.03 12.02 0.03 16.01 0.03 16.01 3.99"/><polygon class="cls-1" points="16.01 15.97 12.02 15.97 12.02 14.97 15.01 14.97 15.01 12.01 16.01 12.01 16.01 15.97"/><polygon class="cls-1" points="4 15.97 0.01 15.97 0.01 12.01 1.01 12.01 1.01 14.97 4 14.97 4 15.97"/><path class="cls-1" d="M8.41,3.18A4.82,4.82,0,1,0,13.23,8,4.83,4.83,0,0,0,8.41,3.18Zm0,.74A4.08,4.08,0,0,1,12.49,8a4,4,0,0,1-.85,2.47L5.69,5A4,4,0,0,1,8.41,3.93Zm0,8.15A4.08,4.08,0,0,1,4.34,8a4,4,0,0,1,.85-2.47L11.14,11A4,4,0,0,1,8.41,12.07Z"/></svg>
+<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>jobalert_inverse</title><path class="cls-1" d="M16,2.24V7.58A5.38,5.38,0,0,0,15,6.5V4.3L12.8,5.39l-.64-.11a5,5,0,0,0-.65,0l-.36,0-.36,0,4.11-2.05H1.12L7.87,6.61,7.49,7a4.7,4.7,0,0,0-.34.39L1,4.3v6.94H6a4.64,4.64,0,0,0,.07.5c0,.17.07.33.11.5H0v-10Zm-4.5,4a4.35,4.35,0,0,1,1.75.36A4.53,4.53,0,0,1,15.64,9a4.49,4.49,0,0,1,0,3.5,4.53,4.53,0,0,1-2.39,2.39,4.49,4.49,0,0,1-3.5,0,4.53,4.53,0,0,1-2.39-2.39,4.49,4.49,0,0,1,0-3.5A4.53,4.53,0,0,1,9.75,6.59,4.35,4.35,0,0,1,11.5,6.24Zm0,8A3.38,3.38,0,0,0,12.86,14a3.53,3.53,0,0,0,1.86-1.86,3.49,3.49,0,0,0,0-2.73,3.53,3.53,0,0,0-1.86-1.86,3.49,3.49,0,0,0-2.73,0A3.53,3.53,0,0,0,8.28,9.37a3.49,3.49,0,0,0,0,2.73A3.53,3.53,0,0,0,10.14,14,3.38,3.38,0,0,0,11.5,14.24Zm-.5-6h1v3H11Zm0,4h1v1H11Z"/></svg>

src/sql/parts/jobManagement/common/media/jobs.css

@@ -22,7 +22,7 @@ jobhistory-component {
 }
 
 .job-heading-container {
-    height: 49px;
+    height: 50px;
     border-bottom: 3px solid #f4f4f4;
     display: -webkit-box;
 }
@@ -315,3 +315,28 @@ table.jobprevruns > tbody {
 	width : 100%;
     display: block;
 }
+
+.vs .action-label.icon.refreshIcon {
+	background-image: url('refresh.svg');
+}
+
+.vs-dark .action-label.icon.refreshIcon,
+.hc-black .action-label.icon.refreshIcon  {
+	background-image: url('refresh_inverse.svg');
+}
+
+.actionbar-container .monaco-action-bar > ul.actions-container {
+	padding-top: 10px;
+}
+
+jobsview-component .actionbar-container {
+    height: 40px;
+}
+
+.actionbar-container .monaco-action-bar > ul.actions-container > li.action-item {
+	padding-left: 20px;
+}
+
+jobsview-component .jobview-grid .slick-cell.error-row {
+    opacity: 0;
+}

src/sql/parts/jobManagement/common/media/operator.svg

@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>security</title><path d="M6,8a4.88,4.88,0,0,0-1.33.18,5.11,5.11,0,0,0-1.2.5,5,5,0,0,0-1.79,1.79,5.11,5.11,0,0,0-.5,1.2A4.88,4.88,0,0,0,1,13H0a5.9,5.9,0,0,1,.28-1.79,6.12,6.12,0,0,1,2-2.94,5.33,5.33,0,0,1,1.58-.88,4.18,4.18,0,0,1-.79-.65,4,4,0,0,1-.59-.8A4.05,4.05,0,0,1,2.13,5a4,4,0,0,1,.18-2.57A4,4,0,0,1,4.44.31a4,4,0,0,1,3.12,0A4,4,0,0,1,9.69,2.44,4,4,0,0,1,9.87,5a4.05,4.05,0,0,1-.37.93,4,4,0,0,1-.59.8,4.18,4.18,0,0,1-.79.65,6.14,6.14,0,0,1,1,.5,5.73,5.73,0,0,1,.91.69l-.68.74a5,5,0,0,0-1.57-1A4.93,4.93,0,0,0,6,8ZM3,4a2.92,2.92,0,0,0,.23,1.17,3,3,0,0,0,1.6,1.6,3,3,0,0,0,2.33,0,3,3,0,0,0,1.6-1.6,3,3,0,0,0,0-2.33,3,3,0,0,0-1.6-1.6,3,3,0,0,0-2.33,0,3,3,0,0,0-1.6,1.6A2.92,2.92,0,0,0,3,4Zm12,8a2.45,2.45,0,0,1,0,1l1,.4-.38.93-1-.41a2.59,2.59,0,0,1-.67.67l.41,1-.93.38L13,15a2.45,2.45,0,0,1-1,0l-.4,1-.93-.38.41-1a2.59,2.59,0,0,1-.67-.67l-1,.41-.38-.93,1-.4a2.45,2.45,0,0,1,0-1l-1-.4.38-.93,1,.41a2.59,2.59,0,0,1,.67-.67l-.41-1,.93-.38.4,1a2.45,2.45,0,0,1,1,0l.4-1,.93.38-.41,1a2.59,2.59,0,0,1,.67.67l1-.41.38.93ZM12.5,14a1.47,1.47,0,0,0,.59-.12,1.49,1.49,0,0,0,.8-.8,1.52,1.52,0,0,0,0-1.17,1.49,1.49,0,0,0-.8-.8,1.52,1.52,0,0,0-1.17,0,1.49,1.49,0,0,0-.8.8,1.52,1.52,0,0,0,0,1.17,1.49,1.49,0,0,0,.8.8A1.47,1.47,0,0,0,12.5,14Z"/></svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>operator</title><path d="M10.36,9.41a7.54,7.54,0,0,1,1.9,1.05A7,7,0,0,1,13.73,12,6.9,6.9,0,0,1,15,16H14a5.79,5.79,0,0,0-.47-2.33,6.07,6.07,0,0,0-3.2-3.2A5.79,5.79,0,0,0,8,10a5.79,5.79,0,0,0-2.33.47,6.07,6.07,0,0,0-3.2,3.2A5.79,5.79,0,0,0,2,16H1a6.89,6.89,0,0,1,2.74-5.54,7.54,7.54,0,0,1,1.9-1.05A5.07,5.07,0,0,1,4,8a4.24,4.24,0,0,1-.73-.06,1.92,1.92,0,0,1-.64-.23,1.25,1.25,0,0,1-.45-.46A1.48,1.48,0,0,1,2,6.5v-3a1.47,1.47,0,0,1,.12-.59,1.49,1.49,0,0,1,.8-.8A1.47,1.47,0,0,1,3.5,2a1.4,1.4,0,0,1,.45.07,4.88,4.88,0,0,1,.8-.87,5.21,5.21,0,0,1,1-.65A4.95,4.95,0,0,1,8,0,4.88,4.88,0,0,1,9.95.39a5,5,0,0,1,2.66,2.66A4.88,4.88,0,0,1,13,5a4.93,4.93,0,0,1-.18,1.34,5,5,0,0,1-.53,1.23,5.12,5.12,0,0,1-.83,1A4.73,4.73,0,0,1,10.36,9.41ZM3,6.5a.51.51,0,0,0,.5.5H4V3.5a.5.5,0,0,0-.85-.35A.48.48,0,0,0,3,3.5ZM5.35,8a3.92,3.92,0,0,0,1.23.74A4,4,0,0,0,8,9a3.85,3.85,0,0,0,1.55-.32,4.05,4.05,0,0,0,2.13-2.13A3.85,3.85,0,0,0,12,5a3.85,3.85,0,0,0-.32-1.55A4.05,4.05,0,0,0,9.55,1.32,3.85,3.85,0,0,0,8,1a4,4,0,0,0-1.83.45A4,4,0,0,0,4.75,2.67a1.47,1.47,0,0,1,.18.51A5.75,5.75,0,0,1,5,3.91q0,.41,0,.85t0,.87q0,.42,0,.78T5,7H7.5a.5.5,0,0,1,0,1Z"/></svg>

src/sql/parts/jobManagement/common/media/operator_inverse.svg

@@ -1 +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>security_inverse</title><path class="cls-1" d="M6,8a4.88,4.88,0,0,0-1.33.18,5.11,5.11,0,0,0-1.2.5,5,5,0,0,0-1.79,1.79,5.11,5.11,0,0,0-.5,1.2A4.88,4.88,0,0,0,1,13H0a5.9,5.9,0,0,1,.28-1.79,6.12,6.12,0,0,1,2-2.94,5.33,5.33,0,0,1,1.58-.88,4.18,4.18,0,0,1-.79-.65,4,4,0,0,1-.59-.8A4.05,4.05,0,0,1,2.13,5a4,4,0,0,1,.18-2.57A4,4,0,0,1,4.44.31a4,4,0,0,1,3.12,0A4,4,0,0,1,9.69,2.44,4,4,0,0,1,9.87,5a4.05,4.05,0,0,1-.37.93,4,4,0,0,1-.59.8,4.18,4.18,0,0,1-.79.65,6.14,6.14,0,0,1,1,.5,5.73,5.73,0,0,1,.91.69l-.68.74a5,5,0,0,0-1.57-1A4.93,4.93,0,0,0,6,8ZM3,4a2.92,2.92,0,0,0,.23,1.17,3,3,0,0,0,1.6,1.6,3,3,0,0,0,2.33,0,3,3,0,0,0,1.6-1.6,3,3,0,0,0,0-2.33,3,3,0,0,0-1.6-1.6,3,3,0,0,0-2.33,0,3,3,0,0,0-1.6,1.6A2.92,2.92,0,0,0,3,4Zm12,8a2.45,2.45,0,0,1,0,1l1,.4-.38.93-1-.41a2.59,2.59,0,0,1-.67.67l.41,1-.93.38L13,15a2.45,2.45,0,0,1-1,0l-.4,1-.93-.38.41-1a2.59,2.59,0,0,1-.67-.67l-1,.41-.38-.93,1-.4a2.45,2.45,0,0,1,0-1l-1-.4.38-.93,1,.41a2.59,2.59,0,0,1,.67-.67l-.41-1,.93-.38.4,1a2.45,2.45,0,0,1,1,0l.4-1,.93.38-.41,1a2.59,2.59,0,0,1,.67.67l1-.41.38.93ZM12.5,14a1.47,1.47,0,0,0,.59-.12,1.49,1.49,0,0,0,.8-.8,1.52,1.52,0,0,0,0-1.17,1.49,1.49,0,0,0-.8-.8,1.52,1.52,0,0,0-1.17,0,1.49,1.49,0,0,0-.8.8,1.52,1.52,0,0,0,0,1.17,1.49,1.49,0,0,0,.8.8A1.47,1.47,0,0,0,12.5,14Z"/></svg>
+<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>operator_inverse</title><path class="cls-1" d="M10.36,9.41a7.54,7.54,0,0,1,1.9,1.05A7,7,0,0,1,13.73,12,6.9,6.9,0,0,1,15,16H14a5.79,5.79,0,0,0-.47-2.33,6.07,6.07,0,0,0-3.2-3.2A5.79,5.79,0,0,0,8,10a5.79,5.79,0,0,0-2.33.47,6.07,6.07,0,0,0-3.2,3.2A5.79,5.79,0,0,0,2,16H1a6.89,6.89,0,0,1,2.74-5.54,7.54,7.54,0,0,1,1.9-1.05A5.07,5.07,0,0,1,4,8a4.24,4.24,0,0,1-.73-.06,1.92,1.92,0,0,1-.64-.23,1.25,1.25,0,0,1-.45-.46A1.48,1.48,0,0,1,2,6.5v-3a1.47,1.47,0,0,1,.12-.59,1.49,1.49,0,0,1,.8-.8A1.47,1.47,0,0,1,3.5,2a1.4,1.4,0,0,1,.45.07,4.88,4.88,0,0,1,.8-.87,5.21,5.21,0,0,1,1-.65A4.95,4.95,0,0,1,8,0,4.88,4.88,0,0,1,9.95.39a5,5,0,0,1,2.66,2.66A4.88,4.88,0,0,1,13,5a4.93,4.93,0,0,1-.18,1.34,5,5,0,0,1-.53,1.23,5.12,5.12,0,0,1-.83,1A4.73,4.73,0,0,1,10.36,9.41ZM3,6.5a.51.51,0,0,0,.5.5H4V3.5a.5.5,0,0,0-.85-.35A.48.48,0,0,0,3,3.5ZM5.35,8a3.92,3.92,0,0,0,1.23.74A4,4,0,0,0,8,9a3.85,3.85,0,0,0,1.55-.32,4.05,4.05,0,0,0,2.13-2.13A3.85,3.85,0,0,0,12,5a3.85,3.85,0,0,0-.32-1.55A4.05,4.05,0,0,0,9.55,1.32,3.85,3.85,0,0,0,8,1a4,4,0,0,0-1.83.45A4,4,0,0,0,4.75,2.67a1.47,1.47,0,0,1,.18.51A5.75,5.75,0,0,1,5,3.91q0,.41,0,.85t0,.87q0,.42,0,.78T5,7H7.5a.5.5,0,0,1,0,1Z"/></svg>

src/sql/parts/jobManagement/common/media/proxy.svg

@@ -1 +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:#101e23;}.cls-2{fill:#4bb8d1;}.cls-3{fill:#0c1011;}</style></defs><title>health</title><path class="cls-1" d="M12.58,1.51A6.36,6.36,0,0,0,8,3.9,6.32,6.32,0,0,0,3.41,1.51,3.81,3.81,0,0,0,0,5.35,5.7,5.7,0,0,0,.64,7.88h.72l0-.08A5.18,5.18,0,0,1,.64,5.39c.07-1.25.87-3.14,2.8-3.23h.12A5.81,5.81,0,0,1,7.73,4.63L8,5.06l.27-.43a5.72,5.72,0,0,1,4.28-2.47c1.93.09,2.73,2,2.8,3.23a5.15,5.15,0,0,1-.64,2.34l0,0a2.38,2.38,0,0,1-.34.68,19.45,19.45,0,0,1-6.57,6.06,11.11,11.11,0,0,1-1.25-.81c-.34-.25-.66-.52-1-.8h0a22.83,22.83,0,0,1-2.76-3H2a18.68,18.68,0,0,0,5.76,5.29h0l0,0h0c3.49-1.63,7-5.73,7.49-7.18V8A5.85,5.85,0,0,0,16,5.35,3.81,3.81,0,0,0,12.58,1.51Z"/><path class="cls-1" d="M1.41,8l-.1-.15h0Z"/><path class="cls-1" d="M7.79,15.22v0h0Z"/><path class="cls-1" d="M7.76,15.23h0v0Z"/><path class="cls-1" d="M14.72,7.73l0,0a.13.13,0,0,0,0,0Z"/><path class="cls-2" d="M12.62,8.7v.12a.48.48,0,0,1-.48.48H8.66l0,.07L7.38,12.65h0A.72.72,0,0,1,6,12.53V9.44H6V6.6L5,9.05H5a.56.56,0,0,1-.52.37H.92V8.36H4.13l0-.07L5.41,5h0a.72.72,0,0,1,1.42.12V8.22h0v2.84L7.77,8.6h0a.56.56,0,0,1,.52-.37h3.84A.48.48,0,0,1,12.62,8.7Z"/><path class="cls-3" d="M12.62,8.7v.12a.48.48,0,0,1-.48.48H8.66l0,.07L7.38,12.65h0A.72.72,0,0,1,6,12.53V9.44H6V6.6L5,9.05H5a.56.56,0,0,1-.52.37H.92V8.36H4.13l0-.07L5.41,5h0a.72.72,0,0,1,1.42.12V8.22h0v2.84L7.77,8.6h0a.56.56,0,0,1,.52-.37h3.84A.48.48,0,0,1,12.62,8.7Z"/></svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>proxy_account</title><path d="M12.23,7a3,3,0,0,0-3.39-.77,3,3,0,0,0-1.6,1.6A2.93,2.93,0,0,0,7,9a3,3,0,0,1-1.23,2.41,4.31,4.31,0,0,1,.66.42,4.2,4.2,0,0,1,.57.53V15a2.93,2.93,0,0,0-.23-1.16,3,3,0,0,0-1.6-1.6,3,3,0,0,0-2.33,0,3,3,0,0,0-1.6,1.6A2.93,2.93,0,0,0,1,15H0a3.92,3.92,0,0,1,.16-1.11,4.11,4.11,0,0,1,.45-1,3.87,3.87,0,0,1,.7-.84,4.2,4.2,0,0,1,.92-.63,3,3,0,0,1-1-3.58,3,3,0,0,1,1.6-1.6A2.92,2.92,0,0,1,4,6,3,3,0,0,1,6.41,7.23,4.12,4.12,0,0,1,8.23,5.41,3,3,0,0,1,7,3a2.93,2.93,0,0,1,.23-1.16A3,3,0,0,1,8.83.23a3,3,0,0,1,2.33,0,3,3,0,0,1,1.6,1.6,3,3,0,0,1-.09,2.52,2.94,2.94,0,0,1-.9,1.06,4.07,4.07,0,0,1,1,.67,4,4,0,0,1,.73.92ZM4,11a1.94,1.94,0,0,0,.78-.16A2,2,0,0,0,5.84,9.78a2,2,0,0,0,0-1.55A2,2,0,0,0,4.78,7.16a2,2,0,0,0-1.55,0A2,2,0,0,0,2.16,8.22a2,2,0,0,0,0,1.55,2,2,0,0,0,1.07,1.07A1.94,1.94,0,0,0,4,11ZM8,3a1.94,1.94,0,0,0,.16.78A2,2,0,0,0,9.22,4.84a2,2,0,0,0,1.55,0,2,2,0,0,0,1.07-1.07,2,2,0,0,0,0-1.55,2,2,0,0,0-1.07-1.07,2,2,0,0,0-1.55,0A2,2,0,0,0,8.16,2.22,1.94,1.94,0,0,0,8,3Zm8,7v6H8V10h2V8h4v2Zm-1,1H9v1h6Zm0,2H14v1H13V13H11v1H10V13H9v2h6Zm-4-3h2V9H11Z"/></svg>

src/sql/parts/jobManagement/common/media/proxy_inverse.svg

@@ -1 +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;}.cls-2{fill:#101e23;}.cls-3{fill:#4bb8d1;}</style></defs><title>health_inverse</title><path class="cls-1" d="M12.58,1.51A6.36,6.36,0,0,0,8,3.9,6.32,6.32,0,0,0,3.41,1.51,3.81,3.81,0,0,0,0,5.35,5.7,5.7,0,0,0,.64,7.88h.72l0-.08A5.18,5.18,0,0,1,.64,5.39c.07-1.25.87-3.14,2.8-3.23h.12A5.81,5.81,0,0,1,7.73,4.63L8,5.06l.27-.43a5.72,5.72,0,0,1,4.28-2.47c1.93.09,2.73,2,2.8,3.23a5.15,5.15,0,0,1-.64,2.34l0,0a2.38,2.38,0,0,1-.34.68,19.45,19.45,0,0,1-6.57,6.06,11.11,11.11,0,0,1-1.25-.81c-.34-.25-.66-.52-1-.8h0a22.83,22.83,0,0,1-2.76-3H2a18.68,18.68,0,0,0,5.76,5.29h0l0,0h0c3.49-1.63,7-5.73,7.49-7.18V8A5.85,5.85,0,0,0,16,5.35,3.81,3.81,0,0,0,12.58,1.51Z"/><path class="cls-2" d="M1.41,8l-.1-.15h0Z"/><path class="cls-2" d="M7.79,15.22v0h0Z"/><path class="cls-2" d="M7.76,15.23h0v0Z"/><path class="cls-2" d="M14.72,7.73l0,0a.13.13,0,0,0,0,0Z"/><path class="cls-3" d="M12.62,8.7v.12a.48.48,0,0,1-.48.48H8.66l0,.07L7.38,12.65h0A.72.72,0,0,1,6,12.53V9.44H6V6.6L5,9.05H5a.56.56,0,0,1-.52.37H.92V8.36H4.13l0-.07L5.41,5h0a.72.72,0,0,1,1.42.12V8.22h0v2.84L7.77,8.6h0a.56.56,0,0,1,.52-.37h3.84A.48.48,0,0,1,12.62,8.7Z"/><path class="cls-1" d="M12.62,8.7v.12a.48.48,0,0,1-.48.48H8.66l0,.07L7.38,12.65h0A.72.72,0,0,1,6,12.53V9.44H6V6.6L5,9.05H5a.56.56,0,0,1-.52.37H.92V8.36H4.13l0-.07L5.41,5h0a.72.72,0,0,1,1.42.12V8.22h0v2.84L7.77,8.6h0a.56.56,0,0,1,.52-.37h3.84A.48.48,0,0,1,12.62,8.7Z"/></svg>
+<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>proxy_account_inverse</title><path class="cls-1" d="M12.23,7a3,3,0,0,0-3.39-.77,3,3,0,0,0-1.6,1.6A2.93,2.93,0,0,0,7,9a3,3,0,0,1-1.23,2.41,4.31,4.31,0,0,1,.66.42,4.2,4.2,0,0,1,.57.53V15a2.93,2.93,0,0,0-.23-1.16,3,3,0,0,0-1.6-1.6,3,3,0,0,0-2.33,0,3,3,0,0,0-1.6,1.6A2.93,2.93,0,0,0,1,15H0a3.92,3.92,0,0,1,.16-1.11,4.11,4.11,0,0,1,.45-1A3.87,3.87,0,0,1,1.3,12a4.2,4.2,0,0,1,.92-.63,3,3,0,0,1-1-3.58,3,3,0,0,1,1.6-1.6A2.92,2.92,0,0,1,4,6,3,3,0,0,1,6.41,7.23,4.12,4.12,0,0,1,8.23,5.41,3,3,0,0,1,7,3a2.93,2.93,0,0,1,.23-1.16A3,3,0,0,1,8.83.23a3,3,0,0,1,2.33,0,3,3,0,0,1,1.6,1.6,3,3,0,0,1-.09,2.52,2.94,2.94,0,0,1-.9,1.06,4.07,4.07,0,0,1,1,.67,4,4,0,0,1,.73.92ZM4,11a1.94,1.94,0,0,0,.78-.16A2,2,0,0,0,5.84,9.78a2,2,0,0,0,0-1.55A2,2,0,0,0,4.78,7.16a2,2,0,0,0-1.55,0A2,2,0,0,0,2.16,8.22a2,2,0,0,0,0,1.55,2,2,0,0,0,1.07,1.07A1.94,1.94,0,0,0,4,11ZM8,3a1.94,1.94,0,0,0,.16.78A2,2,0,0,0,9.22,4.84a2,2,0,0,0,1.55,0,2,2,0,0,0,1.07-1.07,2,2,0,0,0,0-1.55,2,2,0,0,0-1.07-1.07,2,2,0,0,0-1.55,0A2,2,0,0,0,8.16,2.22,1.94,1.94,0,0,0,8,3Zm8,7v6H8V10h2V8h4v2Zm-1,1H9v1h6Zm0,2H14v1H13V13H11v1H10V13H9v2h6Zm-4-3h2V9H11Z"/></svg>

src/sql/parts/jobManagement/common/media/refresh.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:#212121;}</style></defs><title>refresh</title><path class="cls-1" d="M12.51,1.59a8.06,8.06,0,0,1,3.06,4A7.83,7.83,0,0,1,16,8.2a7.91,7.91,0,0,1-.29,2.12,8.13,8.13,0,0,1-.8,1.91A8,8,0,0,1,12,15.11a8.1,8.1,0,0,1-1.91.8,8.06,8.06,0,0,1-4.25,0A8.08,8.08,0,0,1,4,15.11a8,8,0,0,1-2.87-2.87,8.07,8.07,0,0,1-.8-1.91,8,8,0,0,1,0-4.25,8.11,8.11,0,0,1,.82-1.94,7.86,7.86,0,0,1,1.3-1.66A8,8,0,0,1,4.14,1.2H2V.2H6v4H5V1.88A7,7,0,0,0,1.28,6.24a7,7,0,0,0,0,3.82,7,7,0,0,0,1.8,3.09A7,7,0,0,0,6.14,15a7,7,0,0,0,3.71,0,7,7,0,0,0,1.67-.71,7,7,0,0,0,3.22-4.18,7,7,0,0,0-.13-4.12,7.07,7.07,0,0,0-2.68-3.52,6.78,6.78,0,0,0-2.07-1l.27-1A7.67,7.67,0,0,1,12.51,1.59Z"/></svg>

src/sql/parts/jobManagement/common/media/refresh_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>refresh_inverse</title><path class="cls-1" d="M12.51,1.59a8.06,8.06,0,0,1,3.06,4A7.83,7.83,0,0,1,16,8.2a7.91,7.91,0,0,1-.29,2.12,8.13,8.13,0,0,1-.8,1.91A8,8,0,0,1,12,15.11a8.1,8.1,0,0,1-1.91.8,8.06,8.06,0,0,1-4.25,0A8.08,8.08,0,0,1,4,15.11a8,8,0,0,1-2.87-2.87,8.07,8.07,0,0,1-.8-1.91,8,8,0,0,1,0-4.25,8.11,8.11,0,0,1,.82-1.94,7.86,7.86,0,0,1,1.3-1.66A8,8,0,0,1,4.14,1.2H2V.2H6v4H5V1.88A7,7,0,0,0,1.28,6.24a7,7,0,0,0,0,3.82,7,7,0,0,0,1.8,3.09A7,7,0,0,0,6.14,15a7,7,0,0,0,3.71,0,7,7,0,0,0,1.67-.71,7,7,0,0,0,3.22-4.18,7,7,0,0,0-.13-4.12,7.07,7.07,0,0,0-2.68-3.52,6.78,6.78,0,0,0-2.07-1l.27-1A7.67,7.67,0,0,1,12.51,1.59Z"/></svg>

src/sql/parts/jobManagement/views/alertsView.component.html

@@ -9,9 +9,7 @@
 	<h1 class="job-heading" *ngIf="_isCloud === true">No Alerts Available</h1>
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
-<div class="jobs-view-toolbar">
-	<div (click)="refreshJobs()" tabindex="0"><div class="small icon refresh"></div><span>{{RefreshText}}</span></div>
-	<div (click)="openCreateJobDialog()" tabindex="0"><div class="small icon new"></div><span>{{NewAlertText}}</span></div>
-</div>
+
+<div #actionbarContainer class="actionbar-container"></div>
 
 <div #jobalertsgrid class="jobview-grid"></div>

src/sql/parts/jobManagement/views/alertsView.component.ts

@@ -12,17 +12,24 @@ import 'vs/css!../common/media/jobs';
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!sql/base/browser/ui/table/media/table';
 
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked } from '@angular/core';
-import * as sqlops from 'sqlops';
+import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
+import * as sqlops from 'sqlops';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
-import * as dom from 'vs/base/browser/dom';
-import { IJobManagementService } from '../common/interfaces';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
+import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/parts/jobManagement/common/jobActions';
+import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IAction } from 'vs/base/common/actions';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
 export const VIEW_SELECTOR: string = 'jobalertsview-component';
 export const ROW_HEIGHT: number = 45;
 
@@ -31,7 +38,7 @@ export const ROW_HEIGHT: number = 45;
 	templateUrl: decodeURI(require.toUrl('./alertsView.component.html')),
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => AlertsViewComponent) }],
 })
-export class AlertsViewComponent implements AfterContentChecked {
+export class AlertsViewComponent extends JobManagementView implements OnInit {
 
 	private columns: Array<Slick.Column<any>> = [
 		{ name: nls.localize('jobAlertColumns.name', 'Name'), field: 'name', width: 200, id: 'name' },
@@ -44,61 +51,44 @@ export class AlertsViewComponent implements AfterContentChecked {
 	private options: Slick.GridOptions<any> = {
 		syncColumnCellResize: true,
 		enableColumnReorder: false,
-		rowHeight: 45,
+		rowHeight: ROW_HEIGHT,
 		enableCellNavigation: true,
 		editable: false
 	};
 
 	private dataView: any;
+	private _isCloud: boolean;
 
 	@ViewChild('jobalertsgrid') _gridEl: ElementRef;
-	private isVisible: boolean = false;
-	private isInitialized: boolean = false;
-	private isRefreshing: boolean = false;
-	private _table: Table<any>;
-	public alerts: sqlops.AgentAlertInfo[];
-	private _serverName: string;
-	private _isCloud: boolean;
-	private _showProgressWheel: boolean;
 
-	private NewAlertText: string = nls.localize('jobAlertToolbar-NewJob', "New Alert");
-	private RefreshText: string = nls.localize('jobAlertToolbar-Refresh', "Refresh");
+	public alerts: sqlops.AgentAlertInfo[];
+	public contextAction = NewAlertAction;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _dashboardService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
 		@Inject(forwardRef(() => AgentViewComponent)) private _agentViewComponent: AgentViewComponent,
 		@Inject(IJobManagementService) private _jobManagementService: IJobManagementService,
-		@Inject(IThemeService) private _themeService: IThemeService,
-		@Inject(ICommandService) private _commandService: ICommandService
-	) {
-		this._isCloud = this._dashboardService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+		@Inject(ICommandService) private _commandService: ICommandService,
+		@Inject(IInstantiationService) instantiationService: IInstantiationService,
+		@Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface,
+		@Inject(IContextMenuService) contextMenuService: IContextMenuService,
+		@Inject(IKeybindingService)  keybindingService: IKeybindingService) {
+		super(commonService, contextMenuService, keybindingService, instantiationService);
+		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
 	}
 
+	ngOnInit(){
+		// set base class elements
+		this._visibilityElement = this._gridEl;
+		this._parentComponent = this._agentViewComponent;
+	 }
+
 	public layout() {
 		this._table.layout(new dom.Dimension(dom.getContentWidth(this._gridEl.nativeElement), dom.getContentHeight(this._gridEl.nativeElement)));
 	}
 
-	ngAfterContentChecked() {
-		if (this.isVisible === false && this._gridEl.nativeElement.offsetParent !== null) {
-			this.isVisible = true;
-			if (!this.isInitialized) {
-				this._showProgressWheel = true;
-				this.onFirstVisible(false);
-				this.isInitialized = true;
-			}
-		} else if (this.isVisible === true && this._agentViewComponent.refresh === true) {
-			this._showProgressWheel = true;
-			this.onFirstVisible(false);
-			this.isRefreshing = true;
-			this._agentViewComponent.refresh = false;
-		} else if (this.isVisible === true && this._gridEl.nativeElement.offsetParent === null) {
-			this.isVisible = false;
-		}
-	}
-
-	onFirstVisible(cached?: boolean) {
+	onFirstVisible() {
 		let self = this;
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
@@ -115,14 +105,27 @@ export class AlertsViewComponent implements AfterContentChecked {
 		this.dataView = new Slick.Data.DataView();
 
 		$(this._gridEl.nativeElement).empty();
+		$(this.actionBarContainer.nativeElement).empty();
+		this.initActionBar();
 		this._table = new Table(this._gridEl.nativeElement, undefined, columns, this.options);
 		this._table.grid.setData(this.dataView, true);
 
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+		this._register(this._table.onContextMenu((e: DOMEvent, data: Slick.OnContextMenuEventArgs<any>) => {
+			self.openContextMenu(e);
+		}));
+
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._jobManagementService.getAlerts(ownerUri).then((result) => {
 			if (result && result.alerts) {
 				self.alerts = result.alerts;
 				self.onAlertsAvailable(result.alerts);
+			} else {
+				// TODO: handle error
+			}
+
+			this._showProgressWheel = false;
+			if (this.isVisible) {
+				this._cd.detectChanges();
 			}
 		});
 	}
@@ -144,14 +147,24 @@ export class AlertsViewComponent implements AfterContentChecked {
 		this.dataView.endUpdate();
 		this._table.autosizeColumns();
 		this._table.resizeCanvas();
-
-		this._showProgressWheel = false;
-		this._cd.detectChanges();
 	}
 
-	private openCreateJobDialog() {
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
-		this._commandService.executeCommand('agent.openCreateAlertDialog', ownerUri);
+	protected getTableActions(): TPromise<IAction[]> {
+		let actions: IAction[] = [];
+		actions.push(this._instantiationService.createInstance(EditAlertAction));
+		actions.push(this._instantiationService.createInstance(DeleteAlertAction));
+		return TPromise.as(actions);
+	}
+
+	protected getCurrentTableObject(rowIndex: number): any {
+		return (this.alerts && this.alerts.length >= rowIndex)
+			? this.alerts[rowIndex]
+			: undefined;
+	}
+
+	public openCreateAlertDialog() {
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
+		this._commandService.executeCommand('agent.openAlertDialog', ownerUri);
 	}
 
 	private refreshJobs() {

src/sql/parts/jobManagement/views/jobActions.ts

@@ -1,116 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { Action } from 'vs/base/common/actions';
-import * as nls from 'vs/nls';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import Severity from 'vs/base/common/severity';
-import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component';
-import { IJobManagementService } from '../common/interfaces';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IConnectionManagementService } from '../../connection/common/connectionManagement';
-
-export enum JobActions {
-	Run = 'run',
-	Stop = 'stop',
-	NewStep = 'newStep'
-}
-
-export class RunJobAction extends Action {
-	public static ID = 'jobaction.runJob';
-	public static LABEL = nls.localize('jobaction.run', "Run");
-
-	constructor(
-		@INotificationService private notificationService: INotificationService,
-		@IJobManagementService private jobManagementService: IJobManagementService
-	) {
-		super(RunJobAction.ID, RunJobAction.LABEL, 'runJobIcon');
-	}
-
-	public run(context: JobHistoryComponent): TPromise<boolean> {
-		let jobName = context.agentJobInfo.name;
-		let ownerUri = context.ownerUri;
-		return new TPromise<boolean>((resolve, reject) => {
-			this.jobManagementService.jobAction(ownerUri, jobName, JobActions.Run).then(result => {
-				if (result.success) {
-					var startMsg = nls.localize('jobSuccessfullyStarted', ': The job was successfully started.');
-					this.notificationService.notify({
-						severity: Severity.Info,
-						message: jobName+ startMsg
-					});
-					resolve(true);
-				} else {
-					this.notificationService.notify({
-						severity: Severity.Error,
-						message: result.errorMessage
-					});
-					resolve(false);
-				}
-			});
-		});
-	}
-}
-
-export class StopJobAction extends Action {
-	public static ID = 'jobaction.stopJob';
-	public static LABEL = nls.localize('jobaction.stop', "Stop");
-
-	constructor(
-		@INotificationService private notificationService: INotificationService,
-		@IJobManagementService private jobManagementService: IJobManagementService
-	) {
-		super(StopJobAction.ID, StopJobAction.LABEL, 'stopJobIcon');
-	}
-
-	public run(context: JobHistoryComponent): TPromise<boolean> {
-		let jobName = context.agentJobInfo.name;
-		let ownerUri = context.ownerUri;
-		return new TPromise<boolean>((resolve, reject) => {
-			this.jobManagementService.jobAction(ownerUri, jobName, JobActions.Stop).then(result => {
-				if (result.success) {
-						var stopMsg = nls.localize('jobSuccessfullyStopped', ': The job was successfully stopped.');
-						this.notificationService.notify({
-							severity: Severity.Info,
-							message: jobName+ stopMsg
-						});
-					resolve(true);
-				} else {
-					this.notificationService.notify({
-						severity: Severity.Error,
-						message: result.errorMessage
-					});
-					resolve(false);
-				}
-			});
-		});
-	}
-}
-
-export class NewStepAction extends Action {
-	public static ID = 'jobaction.newStep';
-	public static LABEL = nls.localize('jobaction.newStep', "New Step");
-
-	constructor(
-		@INotificationService private notificationService: INotificationService,
-		@ICommandService private _commandService: ICommandService,
-		@IConnectionManagementService private _connectionService
-	) {
-		super(NewStepAction.ID, NewStepAction.LABEL, 'newStepIcon');
-	}
-
-	public run(context: JobHistoryComponent): TPromise<boolean> {
-		let ownerUri = context.ownerUri;
-		let jobName = context.agentJobInfo.name;
-		let server = context.serverName;
-		let stepId = 0;
-		if (context.agentJobHistoryInfo && context.agentJobHistoryInfo.steps) {
-			stepId = context.agentJobHistoryInfo.steps.length + 1;
-		}
-		return new TPromise<boolean>((resolve, reject) => {
-			resolve(this._commandService.executeCommand('agent.openNewStepDialog', ownerUri, jobName, server, stepId));
-		});
-	}
-}

src/sql/parts/jobManagement/views/jobHistory.component.ts

@@ -5,18 +5,19 @@
 
 import 'vs/css!./jobHistory';
 import 'vs/css!sql/media/icons/common-icons';
-import { OnInit, OnChanges, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core';
+
 import * as sqlops from 'sqlops';
-import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar';
-import { RunJobAction, StopJobAction, NewStepAction } from 'sql/parts/jobManagement/views/jobActions';
-import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService';
-import { AgentJobUtilities } from '../common/agentJobUtilities';
-import { IJobManagementService } from '../common/interfaces';
-import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
+import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core';
+import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
+import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
+import { RunJobAction, StopJobAction, NewStepAction } from 'sql/parts/jobManagement/common/jobActions';
+import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService';
+import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
 import { JobHistoryController, JobHistoryDataSource,
 	JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow } from 'sql/parts/jobManagement/views/jobHistoryTree';
-import { JobStepsViewRow } from './jobStepsViewTree';
+import { JobStepsViewRow } from 'sql/parts/jobManagement/views/jobStepsViewTree';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
@@ -209,8 +210,8 @@ export class JobHistoryComponent extends Disposable implements OnInit {
 				self._stepRows = self.agentJobHistoryInfo.steps.map(step => {
 					let stepViewRow = new JobStepsViewRow();
 					stepViewRow.message = step.message;
-					stepViewRow.runStatus = AgentJobUtilities.convertToStatusString(step.runStatus);
-					self._runStatus = AgentJobUtilities.convertToStatusString(self.agentJobHistoryInfo.runStatus);
+					stepViewRow.runStatus = JobManagementUtilities.convertToStatusString(step.runStatus);
+					self._runStatus = JobManagementUtilities.convertToStatusString(self.agentJobHistoryInfo.runStatus);
 					stepViewRow.stepName = step.stepName;
 					stepViewRow.stepID = step.stepId.toString();
 					return stepViewRow;
@@ -253,7 +254,7 @@ export class JobHistoryComponent extends Disposable implements OnInit {
 	private convertToJobHistoryRow(historyInfo: sqlops.AgentJobHistoryInfo): JobHistoryRow {
 		let jobHistoryRow = new JobHistoryRow();
 		jobHistoryRow.runDate = this.formatTime(historyInfo.runDate);
-		jobHistoryRow.runStatus = AgentJobUtilities.convertToStatusString(historyInfo.runStatus);
+		jobHistoryRow.runStatus = JobManagementUtilities.convertToStatusString(historyInfo.runStatus);
 		jobHistoryRow.instanceID = historyInfo.instanceId;
 		return jobHistoryRow;
 	}
@@ -269,7 +270,7 @@ export class JobHistoryComponent extends Disposable implements OnInit {
 	private setActions(): void {
 		let startIcon: HTMLElement = $('.action-label.icon.runJobIcon').get(0);
 		let stopIcon: HTMLElement = $('.action-label.icon.stopJobIcon').get(0);
-		AgentJobUtilities.getActionIconClassName(startIcon, stopIcon, this.agentJobInfo.currentExecutionStatus);
+		JobManagementUtilities.getActionIconClassName(startIcon, stopIcon, this.agentJobInfo.currentExecutionStatus);
 	}
 
 

src/sql/parts/jobManagement/views/jobHistory.css

@@ -243,7 +243,6 @@ jobhistory-component > .jobhistory-heading-container > .icon.in-progress {
 
 jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #f4f4f4;
-	padding-top: 10px;
 }
 
 .vs-dark jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {

src/sql/parts/jobManagement/views/jobManagementView.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 { ElementRef, AfterContentChecked, ViewChild } from '@angular/core';
+import { Table } from 'sql/base/browser/ui/table/table';
+import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
+import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
+import { IAction, Action } from 'vs/base/common/actions';
+import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Taskbar } from '../../../base/browser/ui/taskbar/taskbar';
+import { JobsRefreshAction } from 'sql/parts/jobManagement/common/jobActions';
+
+export abstract class JobManagementView extends Disposable implements AfterContentChecked {
+	protected isVisible: boolean = false;
+	protected isInitialized: boolean = false;
+	protected isRefreshing: boolean = false;
+	protected _showProgressWheel: boolean;
+	protected _visibilityElement: ElementRef;
+	protected _parentComponent: AgentViewComponent;
+	protected _table: Table<any>;
+	protected _actionBar: Taskbar;
+	public contextAction: any;
+
+	@ViewChild('actionbarContainer') protected actionBarContainer: ElementRef;
+
+	constructor(
+		protected _commonService: CommonServiceInterface,
+		protected _contextMenuService: IContextMenuService,
+		protected _keybindingService: IKeybindingService,
+		protected _instantiationService: IInstantiationService) {
+		super();
+	}
+
+	ngAfterContentChecked() {
+		if (this._visibilityElement && this._parentComponent) {
+			if (this.isVisible === false && this._visibilityElement.nativeElement.offsetParent !== null) {
+				this.isVisible = true;
+				if (!this.isInitialized) {
+					this._showProgressWheel = true;
+					this.onFirstVisible();
+					this.isInitialized = true;
+				}
+			} else if (this.isVisible === true && this._parentComponent.refresh === true) {
+				this._showProgressWheel = true;
+				this.onFirstVisible();
+				this.isRefreshing = true;
+				this._parentComponent.refresh = false;
+			} else if (this.isVisible === true && this._visibilityElement.nativeElement.offsetParent === null) {
+				this.isVisible = false;
+			}
+		}
+	}
+
+	abstract onFirstVisible();
+
+	protected openContextMenu(event): void {
+		let grid = this._table.grid;
+		let rowIndex = grid.getCellFromEvent(event).row;
+
+		let targetObject = this.getCurrentTableObject(rowIndex);
+		let actions = this.getTableActions();
+		if (actions) {
+			let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
+			let actionContext= {
+				ownerUri: ownerUri,
+				targetObject: targetObject
+			};
+
+			let anchor = { x: event.pageX + 1, y: event.pageY };
+			this._contextMenuService.showContextMenu({
+				getAnchor: () => anchor,
+				getActions: () => actions,
+				getKeyBinding: (action) => this._keybindingFor(action),
+				getActionsContext: () => (actionContext)
+			});
+		}
+	}
+
+	protected _keybindingFor(action: IAction): ResolvedKeybinding {
+		var [kb] = this._keybindingService.lookupKeybindings(action.id);
+		return kb;
+	}
+
+	protected getTableActions(): TPromise<IAction[]> {
+		return undefined;
+	}
+
+	protected getCurrentTableObject(rowIndex: number): any {
+		return undefined;
+	}
+
+	protected initActionBar() {
+		let refreshAction = this._instantiationService.createInstance(JobsRefreshAction);
+		let newAction: Action = this._instantiationService.createInstance(this.contextAction);
+		let taskbar = <HTMLElement>this.actionBarContainer.nativeElement;
+		this._actionBar = new Taskbar(taskbar, this._contextMenuService);
+		this._actionBar.context = this;
+		this._actionBar.setContent([
+			{ action: refreshAction },
+			{ action: newAction }
+		]);
+	}
+}

src/sql/parts/jobManagement/views/jobStepsViewTree.ts

@@ -3,18 +3,15 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {
-	NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptAlterAction,
-	BackupAction, ManageActionContext, BaseActionContext, ManageAction, RestoreAction
-} from 'sql/workbench/common/actions';
+
+import * as DOM from 'vs/base/browser/dom';
 import * as tree from 'vs/base/parts/tree/browser/tree';
 import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
 import { Promise, TPromise } from 'vs/base/common/winjs.base';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { generateUuid } from 'vs/base/common/uuid';
-import * as DOM from 'vs/base/browser/dom';
 import { AgentJobHistoryInfo } from 'sqlops';
-import { AgentJobUtilities } from 'sql/parts/jobManagement/common/agentJobUtilities';
+import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities';
 
 export class JobStepsViewRow {
 	public stepID: string;
@@ -99,7 +96,7 @@ export class JobStepsViewRenderer implements tree.IRenderer {
 	private _statusIcon: HTMLElement;
 
 	public getHeight(tree: tree.ITree, element: JobStepsViewRow): number {
-		return 22 * Math.ceil(element.message.length/AgentJobUtilities.jobMessageLength);
+		return 22 * Math.ceil(element.message.length/JobManagementUtilities.jobMessageLength);
 	}
 
 	public getTemplateId(tree: tree.ITree, element: JobStepsViewRow | JobStepsViewModel): string {

src/sql/parts/jobManagement/views/jobsView.component.html

@@ -9,9 +9,7 @@
 	<h1 class="job-heading" *ngIf="_isCloud === true">No Jobs Available</h1>
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
-<div class="jobs-view-toolbar">
-	<div (click)="refreshJobs()" tabindex="0"><div class="small icon refresh"></div><span>{{RefreshText}}</span></div>
-	<div (click)="openCreateJobDialog()" tabindex="0"><div class="small icon new"></div><span>{{NewJobText}}</span></div>
-</div>
+
+<div #actionbarContainer class="actionbar-container"></div>
 
 <div #jobsgrid class="jobview-grid"></div>

src/sql/parts/jobManagement/views/jobsView.component.ts

@@ -12,22 +12,29 @@ import 'vs/css!../common/media/jobs';
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!sql/base/browser/ui/table/media/table';
 
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked } from '@angular/core';
 import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
 import * as nls from 'vs/nls';
+import * as dom from 'vs/base/browser/dom';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
+import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview';
 import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService';
-import { AgentJobUtilities } from 'sql/parts/jobManagement/common/agentJobUtilities';
+import { EditJobAction, DeleteJobAction, NewJobAction } from 'sql/parts/jobManagement/common/jobActions';
+import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities';
 import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin';
-import * as dom from 'vs/base/browser/dom';
-import { IJobManagementService } from '../common/interfaces';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
+import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IAction } from 'vs/base/common/actions';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
 export const JOBSVIEW_SELECTOR: string = 'jobsview-component';
 export const ROW_HEIGHT: number = 45;
 
@@ -37,11 +44,7 @@ export const ROW_HEIGHT: number = 45;
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => JobsViewComponent) }],
 })
 
-export class JobsViewComponent implements AfterContentChecked {
-
-	private _jobCacheObject: JobCacheObject;
-
-	private _disposables = new Array<vscode.Disposable>();
+export class JobsViewComponent extends JobManagementView implements OnInit  {
 
 	private columns: Array<Slick.Column<any>> = [
 		{
@@ -68,48 +71,38 @@ export class JobsViewComponent implements AfterContentChecked {
 		}
 	];
 
-
-	private options: Slick.GridOptions<any> = {
-		syncColumnCellResize: true,
-		enableColumnReorder: false,
-		rowHeight: 45,
-		enableCellNavigation: true,
-		editable: true
-	};
-
+	private _jobCacheObject: JobCacheObject;
 	private rowDetail: RowDetailView;
 	private filterPlugin: any;
 	private dataView: any;
-
-	@ViewChild('jobsgrid') _gridEl: ElementRef;
-	private isVisible: boolean = false;
-	private isInitialized: boolean = false;
-	private isRefreshing: boolean = false;
-	private _table: Table<any>;
-	public jobs: sqlops.AgentJobInfo[];
-	public jobHistories: { [jobId: string]: sqlops.AgentJobHistoryInfo[]; } = Object.create(null);
 	private _serverName: string;
 	private _isCloud: boolean;
-	private _showProgressWheel: boolean;
 	private filterStylingMap: { [columnName: string]: [any]; } = {};
 	private filterStack = ['start'];
 	private filterValueMap: { [columnName: string]: string[]; } = {};
 	private sortingStylingMap: { [columnName: string]: any; } = {};
 
-	private NewJobText: string = nls.localize("jobsToolbar-NewJob", "New Job");
-	private RefreshText: string = nls.localize("jobsToolbar-Refresh", "Refresh");
+	public jobs: sqlops.AgentJobInfo[];
+	public jobHistories: { [jobId: string]: sqlops.AgentJobHistoryInfo[]; } = Object.create(null);
+	public contextAction = NewJobAction;
+
+	@ViewChild('jobsgrid') _gridEl: ElementRef;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _dashboardService: CommonServiceInterface,
+		@Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
 		@Inject(forwardRef(() => AgentViewComponent)) private _agentViewComponent: AgentViewComponent,
 		@Inject(IJobManagementService) private _jobManagementService: IJobManagementService,
 		@Inject(IThemeService) private _themeService: IThemeService,
-		@Inject(ICommandService) private _commandService: ICommandService
+		@Inject(ICommandService) private _commandService: ICommandService,
+		@Inject(IInstantiationService) instantiationService: IInstantiationService,
+		@Inject(IContextMenuService) contextMenuService: IContextMenuService,
+		@Inject(IKeybindingService)  keybindingService: IKeybindingService,
 	) {
+		super(commonService, contextMenuService, keybindingService, instantiationService);
 		let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap;
-		this._serverName = _dashboardService.connectionManagementService.connectionInfo.connectionProfile.serverName;
+		this._serverName = commonService.connectionManagementService.connectionInfo.connectionProfile.serverName;
 		let jobCache = jobCacheObjectMap[this._serverName];
 		if (jobCache) {
 			this._jobCacheObject = jobCache;
@@ -118,46 +111,27 @@ export class JobsViewComponent implements AfterContentChecked {
 			this._jobCacheObject.serverName = this._serverName;
 			this._jobManagementService.addToCache(this._serverName, this._jobCacheObject);
 		}
-		this._isCloud = this._dashboardService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+	}
+
+	ngOnInit(){
+		// set base class elements
+		this._visibilityElement = this._gridEl;
+		this._parentComponent = this._agentViewComponent;
 	}
 
 	public layout() {
 		this._table.layout(new dom.Dimension(dom.getContentWidth(this._gridEl.nativeElement), dom.getContentHeight(this._gridEl.nativeElement)));
 	}
 
-	ngAfterContentChecked() {
-		if (this.isVisible === false && this._gridEl.nativeElement.offsetParent !== null) {
-			this.isVisible = true;
-			if (!this.isInitialized) {
-				if (this._jobCacheObject.serverName === this._serverName && this._jobCacheObject.jobs.length > 0) {
-					this._showProgressWheel = true;
-					this.jobs = this._jobCacheObject.jobs;
-					this.onFirstVisible(true);
-					this.isInitialized = true;
-				} else {
-					this._showProgressWheel = true;
-					this.onFirstVisible(false);
-					this.isInitialized = true;
-				}
-			}
-		} else if (this.isVisible === true && this._agentViewComponent.refresh === true) {
-			this._showProgressWheel = true;
-			this.onFirstVisible(false);
-			this.isRefreshing = true;
-			this._agentViewComponent.refresh = false;
-		} /*else if (this.isVisible === true && this._agentViewComponent.refresh === false) {
-			if (!this.isRefreshing) {
-				this._showProgressWheel = true;
-				this.onFirstVisible(true);
-			}
-			this.isRefreshing = false;
-		}*/ else if (this.isVisible === true && this._gridEl.nativeElement.offsetParent === null) {
-			this.isVisible = false;
-		}
-	}
-
-	onFirstVisible(cached?: boolean) {
+	onFirstVisible() {
 		let self = this;
+		let cached: boolean = false;
+		if (this._jobCacheObject.serverName === this._serverName && this._jobCacheObject.jobs.length > 0) {
+			cached = true;
+			this.jobs = this._jobCacheObject.jobs;
+		}
+
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
 			return column;
@@ -184,10 +158,13 @@ export class JobsViewComponent implements AfterContentChecked {
 		});
 		this.rowDetail = rowDetail;
 		columns.unshift(this.rowDetail.getColumnDefinition());
+
 		let filterPlugin = new HeaderFilter({}, this._themeService);
 		this.filterPlugin = filterPlugin;
 		$(this._gridEl.nativeElement).empty();
-		this._table = new Table(this._gridEl.nativeElement, undefined, columns, this.options);
+		$(this.actionBarContainer.nativeElement).empty();
+		this.initActionBar();
+		this._table = new Table(this._gridEl.nativeElement, undefined, columns, options);
 		this._table.grid.setData(this.dataView, true);
 		this._table.grid.onClick.subscribe((e, args) => {
 			let job = self.getJob(args);
@@ -195,15 +172,31 @@ export class JobsViewComponent implements AfterContentChecked {
 			self._agentViewComponent.agentJobInfo = job;
 			self._agentViewComponent.showHistory = true;
 		});
+
+		this._register(this._table.onContextMenu((e: DOMEvent, data: Slick.OnContextMenuEventArgs<any>) => {
+			self.openContextMenu(e);
+		}));
+
 		if (cached && this._agentViewComponent.refresh !== true) {
 			this.onJobsAvailable(null);
+			this._showProgressWheel = false;
+			if (this.isVisible) {
+				this._cd.detectChanges();
+			}
 		} else {
-			let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+			let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 			this._jobManagementService.getJobs(ownerUri).then((result) => {
 				if (result && result.jobs) {
 					self.jobs = result.jobs;
 					self._jobCacheObject.jobs = self.jobs;
 					self.onJobsAvailable(result.jobs);
+				} else {
+					// TODO: handle error
+				}
+
+				this._showProgressWheel = false;
+				if (this.isVisible) {
+					this._cd.detectChanges();
 				}
 			});
 		}
@@ -222,14 +215,14 @@ export class JobsViewComponent implements AfterContentChecked {
 					id: job.jobId,
 					jobId: job.jobId,
 					name: job.name,
-					lastRun: AgentJobUtilities.convertToLastRun(job.lastRun),
-					nextRun: AgentJobUtilities.convertToNextRun(job.nextRun),
-					enabled: AgentJobUtilities.convertToResponse(job.enabled),
-					currentExecutionStatus: AgentJobUtilities.convertToExecutionStatusString(job.currentExecutionStatus),
+					lastRun: JobManagementUtilities.convertToLastRun(job.lastRun),
+					nextRun: JobManagementUtilities.convertToNextRun(job.nextRun),
+					enabled: JobManagementUtilities.convertToResponse(job.enabled),
+					currentExecutionStatus: JobManagementUtilities.convertToExecutionStatusString(job.currentExecutionStatus),
 					category: job.category,
-					runnable: AgentJobUtilities.convertToResponse(job.runnable),
-					hasSchedule: AgentJobUtilities.convertToResponse(job.hasSchedule),
-					lastRunOutcome: AgentJobUtilities.convertToStatusString(job.lastRunOutcome)
+					runnable: JobManagementUtilities.convertToResponse(job.runnable),
+					hasSchedule: JobManagementUtilities.convertToResponse(job.hasSchedule),
+					lastRunOutcome: JobManagementUtilities.convertToStatusString(job.lastRunOutcome)
 				};
 			});
 		}
@@ -326,6 +319,7 @@ export class JobsViewComponent implements AfterContentChecked {
 				this.expandJobs(false);
 			}
 		});
+
 		this.filterPlugin.onCommand.subscribe((e, args: any) => {
 			this.columnSort(args.column.name, args.command === 'sort-asc');
 		});
@@ -345,15 +339,10 @@ export class JobsViewComponent implements AfterContentChecked {
 			let currentTarget = e.currentTarget;
 			currentTarget.title = currentTarget.innerText;
 		});
-		this._showProgressWheel = false;
-
-		if (this.isVisible) {
-			this._cd.detectChanges();
-		}
 
 		const self = this;
 		$(window).resize(() => {
-			let jobsViewToolbar = $('jobsview-component .jobs-view-toolbar').get(0);
+			let jobsViewToolbar = $('jobsview-component .actionbar-container').get(0);
 			let statusBar = $('.part.statusbar').get(0);
 			if (jobsViewToolbar && statusBar) {
 				let toolbarBottom = jobsViewToolbar.getBoundingClientRect().bottom;
@@ -362,6 +351,7 @@ export class JobsViewComponent implements AfterContentChecked {
 				self._table.resizeCanvas();
 			}
 		});
+
 		this._table.grid.onColumnsResized.subscribe((e, data: any) => {
 			let nameWidth: number = data.grid.getColumnWidths()[1];
 			// adjust job name when resized
@@ -376,6 +366,7 @@ export class JobsViewComponent implements AfterContentChecked {
 				self.createJobChart(job.jobId, previousRuns);
 			});
 		});
+
 		$('#jobsDiv .jobview-grid .monaco-table .slick-viewport .grid-canvas .ui-widget-content.slick-row').hover((e1) =>
 			this.highlightErrorRows(e1), (e2) => this.hightlightNonErrorRows(e2));
 
@@ -383,6 +374,7 @@ export class JobsViewComponent implements AfterContentChecked {
 			$('#jobsDiv .jobview-grid .monaco-table .slick-viewport .grid-canvas .ui-widget-content.slick-row').hover((e1) =>
 				this.highlightErrorRows(e1), (e2) => this.hightlightNonErrorRows(e2));
 		});
+
 		// cache the dataview for future use
 		this._jobCacheObject.dataView = this.dataView;
 		this.filterValueMap['start'] = [[], this.dataView.getItems()];
@@ -533,7 +525,7 @@ export class JobsViewComponent implements AfterContentChecked {
 	private loadJobHistories(): void {
 		if (this.jobs) {
 			let erroredJobs = 0;
-			let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+			let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 			let separatedJobs = this.separateFailingJobs();
 			// grab histories of the failing jobs first
 			// so they can be expanded quicker
@@ -560,7 +552,7 @@ export class JobsViewComponent implements AfterContentChecked {
 	private checkPreviousFilters(item): boolean {
 		for (let column in this.filterValueMap) {
 			if (column !== 'start' && this.filterValueMap[column][0].length > 0) {
-				if (!_.contains(this.filterValueMap[column][0], item[AgentJobUtilities.convertColNameToField(column)])) {
+				if (!_.contains(this.filterValueMap[column][0], item[JobManagementUtilities.convertColNameToField(column)])) {
 					return false;
 				}
 			}
@@ -647,7 +639,7 @@ export class JobsViewComponent implements AfterContentChecked {
 		}
 		let maxDuration: number = 0;
 		jobHistories.forEach(history => {
-			let historyDuration = AgentJobUtilities.convertDurationToSeconds(history.runDuration);
+			let historyDuration = JobManagementUtilities.convertDurationToSeconds(history.runDuration);
 			if (historyDuration > maxDuration) {
 				maxDuration = historyDuration;
 			}
@@ -657,7 +649,7 @@ export class JobsViewComponent implements AfterContentChecked {
 		let chartHeights = [];
 		for (let i = 0; i < jobHistories.length; i++) {
 			let duration = jobHistories[i].runDuration;
-			let chartHeight = (maxBarHeight * AgentJobUtilities.convertDurationToSeconds(duration)) / maxDuration;
+			let chartHeight = (maxBarHeight * JobManagementUtilities.convertDurationToSeconds(duration)) / maxDuration;
 			chartHeights.push(`${chartHeight}px`);
 		}
 		return chartHeights;
@@ -829,12 +821,33 @@ export class JobsViewComponent implements AfterContentChecked {
 		}
 	}
 
-	private openCreateJobDialog() {
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+	protected getTableActions(): TPromise<IAction[]> {
+		let actions: IAction[] = [];
+		actions.push(this._instantiationService.createInstance(EditJobAction));
+		actions.push(this._instantiationService.createInstance(DeleteJobAction));
+		return TPromise.as(actions);
+	}
+
+	protected getCurrentTableObject(rowIndex: number): any {
+		let data = this._table.grid.getData();
+		if (!data || rowIndex >= data.getLength()) {
+			return undefined;
+		}
+
+		let jobId =  data.getItem(rowIndex).jobId;
+		let job = this.jobs.filter(job => {
+			return job.jobId === jobId;
+		});
+
+		return job && job.length > 0 ? job[0] : undefined;
+	}
+
+	public openCreateJobDialog() {
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._commandService.executeCommand('agent.openCreateJobDialog', ownerUri);
 	}
 
-	private refreshJobs() {
+	public refreshJobs() {
 		this._agentViewComponent.refresh = true;
 	}
 }

src/sql/parts/jobManagement/views/operatorsView.component.html

@@ -9,9 +9,7 @@
 	<h1 class="job-heading" *ngIf="_isCloud === true">No Operators Available</h1>
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
-<div class="jobs-view-toolbar">
-	<div (click)="refreshJobs()" tabindex="0"><div class="small icon refresh"></div><span>{{RefreshText}}</span></div>
-	<div (click)="openCreateOperatorDialog()" tabindex="0"><div class="small icon new"></div><span>{{NewOperatorText}}</span></div>
-</div>
+
+<div #actionbarContainer class="actionbar-container"></div>
 
 <div #operatorsgrid class="joboperatorsview-grid"></div>

src/sql/parts/jobManagement/views/operatorsView.component.ts

@@ -12,17 +12,24 @@ import 'vs/css!../common/media/jobs';
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!sql/base/browser/ui/table/media/table';
 
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked } from '@angular/core';
-import * as sqlops from 'sqlops';
+import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
+import * as sqlops from 'sqlops';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
-import * as dom from 'vs/base/browser/dom';
-import { IJobManagementService } from '../common/interfaces';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
+import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/parts/jobManagement/common/jobActions';
+import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IAction } from 'vs/base/common/actions';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
 export const VIEW_SELECTOR: string = 'joboperatorsview-component';
 export const ROW_HEIGHT: number = 45;
 
@@ -32,7 +39,7 @@ export const ROW_HEIGHT: number = 45;
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => OperatorsViewComponent) }],
 })
 
-export class OperatorsViewComponent implements AfterContentChecked {
+export class OperatorsViewComponent extends JobManagementView implements OnInit {
 
 	private columns: Array<Slick.Column<any>> = [
 		{ name: nls.localize('jobOperatorsView.name', 'Name'), field: 'name', width: 200, id: 'name' },
@@ -43,61 +50,46 @@ export class OperatorsViewComponent implements AfterContentChecked {
 	private options: Slick.GridOptions<any> = {
 		syncColumnCellResize: true,
 		enableColumnReorder: false,
-		rowHeight: 45,
+		rowHeight: ROW_HEIGHT,
 		enableCellNavigation: true,
 		editable: false
 	};
 
 	private dataView: any;
-
-	@ViewChild('operatorsgrid') _gridEl: ElementRef;
-	private isVisible: boolean = false;
-	private isInitialized: boolean = false;
-	private isRefreshing: boolean = false;
-	private _table: Table<any>;
-	public operators: sqlops.AgentOperatorInfo[];
 	private _serverName: string;
 	private _isCloud: boolean;
-	private _showProgressWheel: boolean;
 
-	private NewOperatorText: string = nls.localize('jobOperatorToolbar-NewItem', "New Operator");
-	private RefreshText: string = nls.localize('jobOperatorToolbar-Refresh', "Refresh");
+	@ViewChild('operatorsgrid') _gridEl: ElementRef;
+
+	public operators: sqlops.AgentOperatorInfo[];
+	public contextAction = NewOperatorAction;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _dashboardService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
 		@Inject(forwardRef(() => AgentViewComponent)) private _agentViewComponent: AgentViewComponent,
 		@Inject(IJobManagementService) private _jobManagementService: IJobManagementService,
-		@Inject(IThemeService) private _themeService: IThemeService,
-		@Inject(ICommandService) private _commandService: ICommandService
+		@Inject(ICommandService) private _commandService: ICommandService,
+		@Inject(IInstantiationService) instantiationService: IInstantiationService,
+		@Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface,
+		@Inject(IContextMenuService) contextMenuService: IContextMenuService,
+		@Inject(IKeybindingService)  keybindingService: IKeybindingService
 	) {
-		this._isCloud = this._dashboardService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+		super(commonService, contextMenuService, keybindingService, instantiationService);
+		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+	}
+
+	ngOnInit(){
+		// set base class elements
+		this._visibilityElement = this._gridEl;
+		this._parentComponent = this._agentViewComponent;
 	}
 
 	public layout() {
 		this._table.layout(new dom.Dimension(dom.getContentWidth(this._gridEl.nativeElement), dom.getContentHeight(this._gridEl.nativeElement)));
 	}
 
-	ngAfterContentChecked() {
-		if (this.isVisible === false && this._gridEl.nativeElement.offsetParent !== null) {
-			this.isVisible = true;
-			if (!this.isInitialized) {
-				this._showProgressWheel = true;
-				this.onFirstVisible(false);
-				this.isInitialized = true;
-			}
-		} else if (this.isVisible === true && this._agentViewComponent.refresh === true) {
-			this._showProgressWheel = true;
-			this.onFirstVisible(false);
-			this.isRefreshing = true;
-			this._agentViewComponent.refresh = false;
-		} else if (this.isVisible === true && this._gridEl.nativeElement.offsetParent === null) {
-			this.isVisible = false;
-		}
-	}
-
-	onFirstVisible(cached?: boolean) {
+	onFirstVisible() {
 		let self = this;
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
@@ -114,14 +106,27 @@ export class OperatorsViewComponent implements AfterContentChecked {
 		this.dataView = new Slick.Data.DataView();
 
 		$(this._gridEl.nativeElement).empty();
+		$(this.actionBarContainer.nativeElement).empty();
+		this.initActionBar();
 		this._table = new Table(this._gridEl.nativeElement, undefined, columns, this.options);
 		this._table.grid.setData(this.dataView, true);
 
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+		this._register(this._table.onContextMenu((e: DOMEvent, data: Slick.OnContextMenuEventArgs<any>) => {
+			self.openContextMenu(e);
+		}));
+
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._jobManagementService.getOperators(ownerUri).then((result) => {
 			if (result && result.operators) {
 				self.operators = result.operators;
 				self.onOperatorsAvailable(result.operators);
+			} else {
+				// TODO: handle error
+			}
+
+			this._showProgressWheel = false;
+			if (this.isVisible) {
+				this._cd.detectChanges();
 			}
 		});
 	}
@@ -141,13 +146,23 @@ export class OperatorsViewComponent implements AfterContentChecked {
 		this.dataView.endUpdate();
 		this._table.autosizeColumns();
 		this._table.resizeCanvas();
-
-		this._showProgressWheel = false;
-		this._cd.detectChanges();
 	}
 
-	private openCreateOperatorDialog() {
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+	protected getTableActions(): TPromise<IAction[]> {
+		let actions: IAction[] = [];
+		actions.push(this._instantiationService.createInstance(EditOperatorAction));
+		actions.push(this._instantiationService.createInstance(DeleteOperatorAction));
+		return TPromise.as(actions);
+	}
+
+	protected getCurrentTableObject(rowIndex: number): any {
+		return (this.operators && this.operators.length >= rowIndex)
+			? this.operators[rowIndex]
+			: undefined;
+	}
+
+	public openCreateOperatorDialog() {
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._commandService.executeCommand('agent.openCreateOperatorDialog', ownerUri);
 	}
 

src/sql/parts/jobManagement/views/proxiesView.component.html

@@ -9,9 +9,7 @@
 	<h1 class="job-heading" *ngIf="_isCloud === true">No Proxies Available</h1>
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>
-<div class="jobs-view-toolbar">
-	<div (click)="refreshJobs()" tabindex="0"><div class="small icon refresh"></div><span>{{RefreshText}}</span></div>
-	<div (click)="openCreateProxyDialog()" tabindex="0"><div class="small icon new"></div><span>{{NewProxyText}}</span></div>
-</div>
+
+<div #actionbarContainer class="actionbar-container"></div>
 
 <div #proxiesgrid class="jobproxiesview-grid"></div>

src/sql/parts/jobManagement/views/proxiesView.component.ts

@@ -12,17 +12,24 @@ import 'vs/css!../common/media/jobs';
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!sql/base/browser/ui/table/media/table';
 
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked } from '@angular/core';
+import * as dom from 'vs/base/browser/dom';
 import * as sqlops from 'sqlops';
 import * as nls from 'vs/nls';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
-import * as dom from 'vs/base/browser/dom';
-import { IJobManagementService } from '../common/interfaces';
+import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
+import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/parts/jobManagement/common/jobActions';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
+import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IAction } from 'vs/base/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
 export const VIEW_SELECTOR: string = 'jobproxiesview-component';
 export const ROW_HEIGHT: number = 45;
 
@@ -32,7 +39,10 @@ export const ROW_HEIGHT: number = 45;
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => ProxiesViewComponent) }],
 })
 
-export class ProxiesViewComponent implements AfterContentChecked {
+export class ProxiesViewComponent extends JobManagementView implements OnInit {
+
+	private NewProxyText: string = nls.localize('jobProxyToolbar-NewItem', "New Proxy");
+	private RefreshText: string = nls.localize('jobProxyToolbar-Refresh', "Refresh");
 
 	private columns: Array<Slick.Column<any>> = [
 		{ name: nls.localize('jobProxiesView.accountName', 'Account Name'), field: 'accountName', width: 200, id: 'accountName' },
@@ -42,61 +52,46 @@ export class ProxiesViewComponent implements AfterContentChecked {
 	private options: Slick.GridOptions<any> = {
 		syncColumnCellResize: true,
 		enableColumnReorder: false,
-		rowHeight: 45,
+		rowHeight: ROW_HEIGHT,
 		enableCellNavigation: true,
 		editable: false
 	};
 
 	private dataView: any;
-
-	@ViewChild('proxiesgrid') _gridEl: ElementRef;
-	private isVisible: boolean = false;
-	private isInitialized: boolean = false;
-	private isRefreshing: boolean = false;
-	private _table: Table<any>;
-	public proxies: sqlops.AgentProxyInfo[];
 	private _serverName: string;
 	private _isCloud: boolean;
-	private _showProgressWheel: boolean;
 
-	private NewProxyText: string = nls.localize('jobProxyToolbar-NewItem', "New Proxy");
-	private RefreshText: string = nls.localize('jobProxyToolbar-Refresh', "Refresh");
+	public proxies: sqlops.AgentProxyInfo[];
+	public readonly contextAction = NewProxyAction;
+
+	@ViewChild('proxiesgrid') _gridEl: ElementRef;
 
 	constructor(
-		@Inject(forwardRef(() => CommonServiceInterface)) private _dashboardService: CommonServiceInterface,
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
 		@Inject(forwardRef(() => AgentViewComponent)) private _agentViewComponent: AgentViewComponent,
 		@Inject(IJobManagementService) private _jobManagementService: IJobManagementService,
-		@Inject(IThemeService) private _themeService: IThemeService,
-		@Inject(ICommandService) private _commandService: ICommandService
+		@Inject(ICommandService) private _commandService: ICommandService,
+		@Inject(IInstantiationService) instantiationService: IInstantiationService,
+		@Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface,
+		@Inject(IContextMenuService) contextMenuService: IContextMenuService,
+		@Inject(IKeybindingService)  keybindingService: IKeybindingService
 	) {
-		this._isCloud = this._dashboardService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+		super(commonService, contextMenuService, keybindingService, instantiationService);
+		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
+	}
+
+	ngOnInit(){
+		// set base class elements
+		this._visibilityElement = this._gridEl;
+		this._parentComponent = this._agentViewComponent;
 	}
 
 	public layout() {
 		this._table.layout(new dom.Dimension(dom.getContentWidth(this._gridEl.nativeElement), dom.getContentHeight(this._gridEl.nativeElement)));
 	}
 
-	ngAfterContentChecked() {
-		if (this.isVisible === false && this._gridEl.nativeElement.offsetParent !== null) {
-			this.isVisible = true;
-			if (!this.isInitialized) {
-				this._showProgressWheel = true;
-				this.onFirstVisible(false);
-				this.isInitialized = true;
-			}
-		} else if (this.isVisible === true && this._agentViewComponent.refresh === true) {
-			this._showProgressWheel = true;
-			this.onFirstVisible(false);
-			this.isRefreshing = true;
-			this._agentViewComponent.refresh = false;
-		} else if (this.isVisible === true && this._gridEl.nativeElement.offsetParent === null) {
-			this.isVisible = false;
-		}
-	}
-
-	onFirstVisible(cached?: boolean) {
+	onFirstVisible() {
 		let self = this;
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
@@ -113,14 +108,27 @@ export class ProxiesViewComponent implements AfterContentChecked {
 		this.dataView = new Slick.Data.DataView();
 
 		$(this._gridEl.nativeElement).empty();
+		$(this.actionBarContainer.nativeElement).empty();
+		this.initActionBar();
 		this._table = new Table(this._gridEl.nativeElement, undefined, columns, this.options);
 		this._table.grid.setData(this.dataView, true);
 
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+		this._register(this._table.onContextMenu((e: DOMEvent, data: Slick.OnContextMenuEventArgs<any>) => {
+			self.openContextMenu(e);
+		}));
+
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._jobManagementService.getProxies(ownerUri).then((result) => {
 			if (result && result.proxies) {
 				self.proxies = result.proxies;
 				self.onProxiesAvailable(result.proxies);
+			} else {
+				// TODO: handle error
+			}
+
+			this._showProgressWheel = false;
+			if (this.isVisible) {
+				this._cd.detectChanges();
 			}
 		});
 	}
@@ -128,7 +136,7 @@ export class ProxiesViewComponent implements AfterContentChecked {
 	private onProxiesAvailable(proxies: sqlops.AgentProxyInfo[]) {
 		let items: any = proxies.map((item) => {
 			return {
-				id: item.id,
+				id: item.accountName,
 				accountName: item.accountName,
 				credentialName: item.credentialName
 			};
@@ -139,13 +147,23 @@ export class ProxiesViewComponent implements AfterContentChecked {
 		this.dataView.endUpdate();
 		this._table.autosizeColumns();
 		this._table.resizeCanvas();
-
-		this._showProgressWheel = false;
-		this._cd.detectChanges();
 	}
 
-	private openCreateProxyDialog() {
-		let ownerUri: string = this._dashboardService.connectionManagementService.connectionInfo.ownerUri;
+	protected getTableActions(): TPromise<IAction[]> {
+		let actions: IAction[] = [];
+		actions.push(this._instantiationService.createInstance(EditProxyAction));
+		actions.push(this._instantiationService.createInstance(DeleteProxyAction));
+		return TPromise.as(actions);
+	}
+
+	protected getCurrentTableObject(rowIndex: number): any {
+		return (this.proxies && this.proxies.length >= rowIndex)
+			? this.proxies[rowIndex]
+			: undefined;
+	}
+
+	public openCreateProxyDialog() {
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._commandService.executeCommand('agent.openCreateProxyDialog', ownerUri);
 	}
 

src/sql/parts/modelComponents/button.component.ts

@@ -103,6 +103,8 @@ export default class ButtonComponent extends ComponentWithIconBase implements IC
 					buttonFocusOutline: focusBorder,
 					buttonForeground: foreground
 				}));
+			} else {
+				super.updateIcon();
 			}
 		}
 	}

src/sql/parts/modelComponents/button.css

@@ -6,4 +6,5 @@
 modelview-button a.monaco-button.monaco-text-button.icon {
 	background-repeat: no-repeat;
 	background-position: 0% 50%;
+	background-size: contain;
 }

src/sql/parts/modelComponents/card.component.html

@@ -5,10 +5,10 @@
 
 		<ng-container *ngIf="isVerticalButton">
 			<div class="card-vertical-button">
-				<div *ngIf="iconPath" class="iconContainer"><div [class]="iconClass" [style.width]="iconWidth" [style.height]="iconHeight"></div>
-				<hr/>
-				<h4 class="card-label">{{label}}</h4>
+				<div *ngIf="iconPath" class="iconContainer">
+					<div [class]="iconClass" [style.maxWidth]="iconWidth" [style.maxHeight]="iconHeight"></div>
 				</div>
+				<h4 class="card-label">{{label}}</h4>
 			</div>
 		</ng-container>
 

src/sql/parts/modelComponents/card.css

@@ -6,11 +6,11 @@
 	width: auto;
 	margin: 15px;
 	border-width: 1px;
-    border-style: solid;
+	border-style: solid;
 
-    text-align: left;
-    vertical-align: top;
-    box-shadow: rgba(120, 120, 120, 0.75) 0px 0px 6px;
+	text-align: left;
+	vertical-align: top;
+	box-shadow: rgba(120, 120, 120, 0.75) 0px 0px 6px;
 }
 
 .model-card.selected {
@@ -39,7 +39,9 @@
 
 .model-card .card-vertical-button {
 	position: relative;
-	display: inline-block;
+	display: flex;
+	flex-direction: column;
+	text-align: center;
 	height: auto;
 	width: auto;
 	padding: 5px 5px 5px 5px;
@@ -58,16 +60,27 @@
 }
 
 .model-card .iconContainer {
-	width: 100%;
-	height: 50px;
-	text-align: center;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	flex-grow: 1;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
 	padding: 10px 0px 10px 0px;
+	border-color: rgb(214, 214, 214);
 }
 
 .model-card .cardIcon {
 	display: inline-block;
-	width: 40px;
-	height: 40px;
+	flex-grow: 1;
+	width: 100%;
+	height: 100%;
+	max-width: 50px;
+	max-height: 50px;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: contain;
 }
 
 .model-card .card-status {

src/sql/parts/modelComponents/checkbox.component.ts

@@ -4,18 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	ViewChild, ElementRef, OnDestroy, AfterViewInit
 } from '@angular/core';
 
 import * as sqlops from 'sqlops';
-import { Event, Emitter } from 'vs/base/common/event';
 
 import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
 import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
 import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { attachInputBoxStyler, attachListStyler } from 'vs/platform/theme/common/styler';
 
 @Component({
 	selector: 'modelview-checkbox',

src/sql/parts/modelComponents/componentWithIconBase.ts

@@ -5,7 +5,7 @@
 
 import {
 	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, OnInit, QueryList
+	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, OnInit, QueryList, AfterViewInit
 } from '@angular/core';
 
 import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
@@ -50,6 +50,7 @@ export abstract class ComponentWithIconBase extends ComponentBase {
 			const iconDark = this.getDarkIconPath(this.iconPath) || icon;
 			createCSSRule(`.icon.${this._iconClass}`, `background-image: url("${icon}")`);
 			createCSSRule(`.vs-dark .icon.${this._iconClass}, .hc-black .icon.${this._iconClass}`, `background-image: url("${iconDark}")`);
+			this._changeRef.detectChanges();
 		}
 	}
 
@@ -90,14 +91,13 @@ export abstract class ComponentWithIconBase extends ComponentBase {
 	}
 
 	public get iconHeight(): number | string {
-		return this.getPropertyOrDefault<sqlops.ComponentWithIcon, number | string>((props) => props.iconHeight, '40px');
+		return this.getPropertyOrDefault<sqlops.ComponentWithIcon, number | string>((props) => props.iconHeight, '50px');
 	}
 
 	public get iconWidth(): number | string {
-		return this.getPropertyOrDefault<sqlops.ComponentWithIcon, number | string>((props) => props.iconWidth, '40px');
+		return this.getPropertyOrDefault<sqlops.ComponentWithIcon, number | string>((props) => props.iconWidth, '50px');
 	}
 
-
 	ngOnDestroy(): void {
 		if (this._iconClass) {
 			removeCSSRulesContainingSelector(this._iconClass);

src/sql/parts/modelComponents/components.contribution.ts

@@ -19,6 +19,7 @@ import WebViewComponent from './webview.component';
 import TableComponent from './table.component';
 import TextComponent from './text.component';
 import LoadingComponent from './loadingComponent.component';
+import FileBrowserTreeComponent from './fileBrowserTree.component';
 import { registerComponentType } from 'sql/platform/dashboard/common/modelComponentRegistry';
 import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes';
 
@@ -70,3 +71,6 @@ registerComponentType(TABLE_COMPONENT, ModelComponentTypes.Table, TableComponent
 
 export const LOADING_COMPONENT = 'loading-component';
 registerComponentType(LOADING_COMPONENT, ModelComponentTypes.LoadingComponent, LoadingComponent);
+
+export const FILEBROWSERTREE_COMPONENT = 'filebrowsertree-component';
+registerComponentType(FILEBROWSERTREE_COMPONENT, ModelComponentTypes.FileBrowserTree, FileBrowserTreeComponent);

src/sql/parts/modelComponents/fileBrowserTree.component.ts

@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import {
+	Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit
+} from '@angular/core';
+
+import * as sqlops from 'sqlops';
+
+import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
+import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { FileBrowserViewModel } from '../fileBrowser/fileBrowserViewModel';
+import { FileNode } from 'sql/parts/fileBrowser/common/fileNode';
+import { FileBrowserTreeView } from '../fileBrowser/fileBrowserTreeView';
+
+@Component({
+	selector: 'modelview-fileBrowserTree',
+	template: `
+		<div #fileBrowserTree [style.width]="getWidth()" [style.height]="getHeight()"></div>
+	`
+})
+export default class FileBrowserTreeComponent extends ComponentBase implements IComponent, OnDestroy, AfterViewInit {
+	@Input() descriptor: IComponentDescriptor;
+	@Input() modelStore: IModelStore;
+	private _treeView: FileBrowserTreeView;
+	private _viewModel: FileBrowserViewModel;
+	private _fileFilters: [{label: string, filters: string[]}] = [
+		{ label: 'All Files', filters: ['*'] }
+	];
+
+	@ViewChild('fileBrowserTree', { read: ElementRef }) private _treeContainer: ElementRef;
+	constructor(
+		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
+		@Inject(IInstantiationService) private _instantiationService: IInstantiationService) {
+		super(changeRef);
+	}
+
+	ngOnInit(): void {
+		this.baseInit();
+	}
+
+	ngAfterViewInit(): void {
+		this._viewModel = this._instantiationService.createInstance(FileBrowserViewModel);
+		this._viewModel.onAddFileTree(args => this.handleOnAddFileTree(args.rootNode, args.selectedNode, args.expandedNodes));
+		this._viewModel.onPathValidate(args => this.handleOnValidate(args.succeeded, args.message));
+	}
+
+	public initialize() {
+		this._viewModel.initialize(this.ownerUri, '', this._fileFilters, 'Backup');
+		this._treeView = this._instantiationService.createInstance(FileBrowserTreeView);
+		this._treeView.setOnClickedCallback((arg) => {
+			this.onClicked(arg);
+		});
+		this._treeView.setOnDoubleClickedCallback((arg) => this.onDoubleClicked(arg));
+		this._register(this._treeView);
+		this._viewModel.openFileBrowser(0, false);
+	}
+
+	private onClicked(selectedNode: FileNode) {
+		this._onEventEmitter.fire({
+			eventType: ComponentEventType.onDidChange,
+			args: { fullPath: selectedNode.fullPath, isFile: selectedNode.isFile }
+		});
+	}
+
+	private onDoubleClicked(selectedNode: FileNode) {
+		if (selectedNode.isFile === true) {
+		}
+	}
+
+	private handleOnAddFileTree(rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]) {
+		this.updateFileTree(rootNode, selectedNode, expandedNodes);
+	}
+
+	private updateFileTree(rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]): void {
+		this._treeView.renderBody(this._treeContainer.nativeElement, rootNode, selectedNode, expandedNodes);
+		this._treeView.setVisible(true);
+		this.layoutTree();
+		this._changeRef.detectChanges();
+	}
+
+
+	private handleOnValidate(succeeded: boolean, errorMessage: string) {
+		if (succeeded === false) {
+			if (errorMessage === '') {
+				errorMessage = 'The provided path is invalid.';
+			}
+		}
+	}
+
+	public validate(): Thenable<boolean> {
+		return super.validate().then(valid => {
+			// TODO: tree validation?
+			return valid;
+		});
+	}
+
+	ngOnDestroy(): void {
+		this.baseDestroy();
+	}
+
+	/// IComponent implementation
+
+	public layout(): void {
+		this._changeRef.detectChanges();
+	}
+
+	public setLayout(): void {
+		// TODO allow configuring the look and feel
+		this.layout();
+	}
+
+	private layoutTree(): void {
+		this._treeView.layout(700);
+	}
+
+	public setProperties(properties: { [key: string]: any; }): void {
+		super.setProperties(properties);
+		this.validate();
+		if (this.ownerUri) {
+			this.initialize();
+		}
+	}
+
+	// CSS-bound properties
+	public get ownerUri(): string {
+		return this.getPropertyOrDefault<sqlops.FileBrowserTreeProperties, string>((props) => props.ownerUri, '');
+	}
+
+	public set ownerUri(newValue: string) {
+		this.setPropertyFromUI<sqlops.FileBrowserTreeProperties, string>((props, value) => props.ownerUri = value, newValue);
+	}
+}

src/sql/parts/modelComponents/formContainer.component.ts

@@ -22,13 +22,15 @@ import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/do
 export interface TitledFormItemLayout {
 	title: string;
 	actions?: string[];
-	isFormComponent: Boolean;
+	isFormComponent: boolean;
 	horizontal: boolean;
 	componentWidth?: number | string;
 	componentHeight?: number | string;
 	titleFontSize?: number | string;
 	required?: boolean;
 	info?: string;
+	isInGroup?: boolean;
+	isGroupLabel?: boolean;
 }
 
 export interface FormLayout {
@@ -43,10 +45,16 @@ class FormItem {
 	template: `
 		<div #container *ngIf="items" class="form-table" [style.padding]="getFormPadding()" [style.width]="getFormWidth()" [style.height]="getFormHeight()">
 			<ng-container *ngFor="let item of items">
+			<div class="form-row" *ngIf="isGroupLabel(item)">
+				<div class="form-item-row form-group-label">
+					<model-component-wrapper [descriptor]="item.descriptor" [modelStore]="modelStore">
+					</model-component-wrapper>
+				</div>
+			</div>
 			<div class="form-row" *ngIf="isFormComponent(item)" [style.height]="getRowHeight(item)">
 
 					<ng-container *ngIf="isHorizontal(item)">
-						<div class="form-cell" [style.font-size]="getItemTitleFontSize(item)">
+						<div class="form-cell" [style.font-size]="getItemTitleFontSize(item)" [ngClass]="{'form-group-item': isInGroup(item)}">
 							{{getItemTitle(item)}}<span class="form-required" *ngIf="isItemRequired(item)">*</span>
 							<span class="icon info form-info" *ngIf="itemHasInfo(item)" [title]="getItemInfo(item)"></span>
 						</div>
@@ -65,7 +73,7 @@ class FormItem {
 							</div>
 						</div>
 					</ng-container>
-					<div class="form-vertical-container" *ngIf="isVertical(item)" [style.height]="getRowHeight(item)">
+					<div class="form-vertical-container" *ngIf="isVertical(item)" [style.height]="getRowHeight(item)" [ngClass]="{'form-group-item': isInGroup(item)}">
 						<div class="form-item-row" [style.font-size]="getItemTitleFontSize(item)">
 							{{getItemTitle(item)}}<span class="form-required" *ngIf="isItemRequired(item)">*</span>
 							<span class="icon info form-info" *ngIf="itemHasInfo(item)" [title]="getItemInfo(item)"></span>
@@ -190,11 +198,19 @@ export default class FormContainer extends ContainerBase<FormItemLayout> impleme
 		return [];
 	}
 
-	private isFormComponent(item: FormItem): Boolean {
+	private isGroupLabel(item: FormItem): boolean {
+		return item && item.config && item.config.isGroupLabel;
+	}
+
+	private isInGroup(item: FormItem): boolean {
+		return item && item.config && item.config.isInGroup;
+	}
+
+	private isFormComponent(item: FormItem): boolean {
 		return item && item.config && item.config.isFormComponent;
 	}
 
-	private itemHasActions(item: FormItem): Boolean {
+	private itemHasActions(item: FormItem): boolean {
 		let itemConfig = item.config;
 		return itemConfig && itemConfig.actions !== undefined && itemConfig.actions.length > 0;
 	}

src/sql/parts/modelComponents/formLayout.css

@@ -56,3 +56,12 @@
 	padding-right: 5px;
 	display: table-cell;
 }
+
+.form-group-item .form-item-row,
+.form-group-item.form-cell {
+	padding-left: 30px;
+}
+
+.form-group-label {
+	padding-bottom: 0px;
+}

src/sql/parts/modelComponents/text.component.ts

@@ -5,15 +5,14 @@
 
 import 'vs/css!./radioButton';
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
-	ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
+	Component, Input, Inject, ChangeDetectorRef, forwardRef,
+	OnDestroy, AfterViewInit
 } from '@angular/core';
 
 import * as sqlops from 'sqlops';
-import { Event, Emitter } from 'vs/base/common/event';
 
 import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
-import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
+import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
 
 @Component({

src/sql/parts/profiler/editor/controller/profilerTableEditor.ts

@@ -21,12 +21,12 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEditorAction } from 'vs/editor/common/editorCommon';
 import { IOverlayWidget } from 'vs/editor/browser/editorBrowser';
 import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState';
-import { Builder } from 'vs/base/browser/builder';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Dimension } from 'vs/base/browser/dom';
+import { textFormatter } from 'sql/parts/grid/services/sharedServices';
 
 export class ProfilerTableEditor extends BaseEditor implements IProfilerController, ITableController {
 
@@ -89,7 +89,10 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
 			this._columnListener.dispose();
 		}
 		this._columnListener = input.onColumnsChanged(e => {
-			this._profilerTable.columns = e;
+			this._profilerTable.columns = e.map(e => {
+				e.formatter = textFormatter;
+				return e;
+			});
 			this._profilerTable.autosizeColumns();
 		});
 		if (this._stateListener) {

src/sql/parts/profiler/editor/profilerEditor.ts

@@ -16,14 +16,14 @@ import { ProfilerTableEditor } from './controller/profilerTableEditor';
 import * as Actions from 'sql/parts/profiler/contrib/profilerActions';
 import { CONTEXT_PROFILER_EDITOR, PROFILER_TABLE_COMMAND_SEARCH } from './interfaces';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
+import { textFormatter } from 'sql/parts/grid/services/sharedServices';
 
 import * as DOM from 'vs/base/browser/dom';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { Builder } from 'vs/base/browser/builder';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { IWorkbenchThemeService, VS_DARK_THEME, VS_HC_THEME } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ProfilerResourceEditor } from './profilerResourceEditor';
 import { SplitView, View, Orientation, IViewOptions } from 'sql/base/browser/ui/splitview/splitview';
@@ -44,6 +44,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe
 import { CommonFindController, FindStartFocusAction } from 'vs/editor/contrib/find/findController';
 import * as types from 'vs/base/common/types';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
+import { DARK, HIGH_CONTRAST } from 'vs/platform/theme/common/themeService';
 
 class BasicView extends View {
 	private _previousSize: number;
@@ -219,6 +220,20 @@ export class ProfilerEditor extends BaseEditor {
 		profilerTableContainer.style.height = '100%';
 		profilerTableContainer.style.overflow = 'hidden';
 		profilerTableContainer.style.position = 'relative';
+		let theme = this.themeService.getTheme();
+		if (theme.type === DARK) {
+			DOM.addClass(profilerTableContainer, VS_DARK_THEME);
+		} else if (theme.type === HIGH_CONTRAST) {
+			DOM.addClass(profilerTableContainer, VS_HC_THEME);
+		}
+		this.themeService.onThemeChange(e => {
+			DOM.removeClasses(profilerTableContainer, VS_DARK_THEME, VS_HC_THEME);
+			if (e.type === DARK) {
+				DOM.addClass(profilerTableContainer, VS_DARK_THEME);
+			} else if (e.type === HIGH_CONTRAST) {
+				DOM.addClass(profilerTableContainer, VS_HC_THEME);
+			}
+		});
 		this._profilerTableEditor = this._instantiationService.createInstance(ProfilerTableEditor);
 		this._profilerTableEditor.createEditor(profilerTableContainer);
 		this._profilerTableEditor.onSelectedRowsChanged((e, args) => {
@@ -271,12 +286,14 @@ export class ProfilerEditor extends BaseEditor {
 			{
 				id: 'label',
 				name: nls.localize('label', "Label"),
-				field: 'label'
+				field: 'label',
+				formatter: textFormatter
 			},
 			{
 				id: 'value',
 				name: nls.localize('profilerEditor.value', "Value"),
-				field: 'value'
+				field: 'value',
+				formatter: textFormatter
 			}
 		], { forceFitColumns: true });
 

src/sql/parts/query/common/rowCountStatus.ts

@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
+import { IQueryModelService } from '../execution/queryModel';
+import QueryRunner from 'sql/parts/query/execution/queryRunner';
+
+import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
+import { IDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorCloseEvent } from 'vs/workbench/common/editor';
+import { append, $, hide, show } from 'vs/base/browser/dom';
+import * as nls from 'vs/nls';
+
+export class RowCountStatusBarItem implements IStatusbarItem {
+
+	private _element: HTMLElement;
+	private _flavorElement: HTMLElement;
+
+	private dispose: IDisposable;
+
+	constructor(
+		@IWorkbenchEditorService private _editorService: IWorkbenchEditorService,
+		@IEditorGroupService private _editorGroupService: IEditorGroupService,
+		@IQueryModelService private _queryModelService: IQueryModelService
+	) { }
+
+	render(container: HTMLElement): IDisposable {
+		let disposables = [
+			this._editorGroupService.onEditorsChanged(this._onEditorsChanged, this),
+			this._editorGroupService.getStacksModel().onEditorClosed(this._onEditorClosed, this)
+		];
+
+		this._element = append(container, $('.query-statusbar-group'));
+		this._flavorElement = append(this._element, $('a.editor-status-selection'));
+		this._flavorElement.title = nls.localize('rowStatus', "Row Count");
+		hide(this._flavorElement);
+
+		this._showStatus();
+
+		return combinedDisposable(disposables);
+	}
+
+	private _onEditorsChanged() {
+		this._showStatus();
+	}
+
+	private _onEditorClosed(event: IEditorCloseEvent) {
+		hide(this._flavorElement);
+	}
+
+	// Show/hide query status for active editor
+	private _showStatus(): void {
+		hide(this._flavorElement);
+		dispose(this.dispose);
+		let activeEditor = this._editorService.getActiveEditor();
+		if (activeEditor) {
+			let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input);
+			if (currentUri) {
+				let queryRunner = this._queryModelService.getQueryRunner(currentUri);
+				if (queryRunner) {
+					if (queryRunner.hasCompleted) {
+						this._displayValue(queryRunner);
+					} else if (queryRunner.isExecuting) {
+						this.dispose = queryRunner.addListener('complete', () => {
+							this._displayValue(queryRunner);
+						});
+					}
+				} else {
+					this.dispose = this._queryModelService.onRunQueryComplete(e => {
+						if (e === currentUri) {
+							this._displayValue(this._queryModelService.getQueryRunner(currentUri));
+						}
+					});
+				}
+			}
+		}
+	}
+
+	private _displayValue(runner: QueryRunner) {
+		let number = runner.batchSets.reduce((p, c) => {
+			return p + c.resultSetSummaries.reduce((rp, rc) => {
+				return rp + rc.rowCount;
+			}, 0);
+		}, 0);
+		this._flavorElement.innerText = nls.localize('rowCount', "{0} rows", number);
+		show(this._flavorElement);
+	}
+}

src/sql/parts/query/execution/queryModel.ts

@@ -30,6 +30,8 @@ export const IQueryModelService = createDecorator<IQueryModelService>(SERVICE_ID
 export interface IQueryModelService {
 	_serviceBrand: any;
 
+	getQueryRunner(uri: string): QueryRunner;
+
 	getConfig(): Promise<{ [key: string]: any }>;
 	getShortcuts(): Promise<any>;
 	getQueryRows(uri: string, rowStart: number, numberOfRows: number, batchId: number, resultId: number): Thenable<ResultSetSubset>;

src/sql/parts/query/execution/queryModelService.ts

@@ -13,6 +13,7 @@ import { IQueryModelService } from 'sql/parts/query/execution/queryModel';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { QueryStatusbarItem } from 'sql/parts/query/execution/queryStatus';
 import { SqlFlavorStatusbarItem } from 'sql/parts/query/common/flavorStatus';
+import { RowCountStatusBarItem } from 'sql/parts/query/common/rowCountStatus';
 
 import * as sqlops from 'sqlops';
 import { ISlickRange } from 'angular2-slickgrid';
@@ -85,6 +86,13 @@ export class QueryModelService implements IQueryModelService {
 		this._onEditSessionReady = new Emitter<sqlops.EditSessionReadyParams>();
 
 		// Register Statusbar items
+
+		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
+			RowCountStatusBarItem,
+			statusbar.StatusbarAlignment.RIGHT,
+			100 /* Should appear to the right of the SQL editor status */
+		));
+
 		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
 			QueryStatusbarItem,
 			statusbar.StatusbarAlignment.RIGHT,
@@ -345,7 +353,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public disposeQuery(ownerUri: string): void {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			queryRunner.disposeQuery();
 		}
@@ -437,7 +445,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public disposeEdit(ownerUri: string): Thenable<void> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.disposeEdit(ownerUri);
 		}
@@ -446,7 +454,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<sqlops.EditUpdateCellResult> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.updateCell(ownerUri, rowId, columnId, newValue).then((result) => result, error => {
 				this._notificationService.notify({
@@ -461,7 +469,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public commitEdit(ownerUri): Thenable<void> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.commitEdit(ownerUri).then(() => { }, error => {
 				this._notificationService.notify({
@@ -476,7 +484,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public createRow(ownerUri: string): Thenable<sqlops.EditCreateRowResult> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.createRow(ownerUri);
 		}
@@ -485,7 +493,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public deleteRow(ownerUri: string, rowId: number): Thenable<void> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.deleteRow(ownerUri, rowId);
 		}
@@ -494,7 +502,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<sqlops.EditRevertCellResult> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.revertCell(ownerUri, rowId, columnId);
 		}
@@ -503,7 +511,7 @@ export class QueryModelService implements IQueryModelService {
 
 	public revertRow(ownerUri: string, rowId: number): Thenable<void> {
 		// Get existing query runner
-		let queryRunner = this._getQueryRunner(ownerUri);
+		let queryRunner = this.getQueryRunner(ownerUri);
 		if (queryRunner) {
 			return queryRunner.revertRow(ownerUri, rowId);
 		}
@@ -512,7 +520,7 @@ export class QueryModelService implements IQueryModelService {
 
 	// PRIVATE METHODS //////////////////////////////////////////////////////
 
-	private _getQueryRunner(ownerUri): QueryRunner {
+	public getQueryRunner(ownerUri): QueryRunner {
 		let queryRunner: QueryRunner = undefined;
 		if (this._queryInfoMap.has(ownerUri)) {
 			let existingRunner = this._getQueryInfo(ownerUri).queryRunner;

src/sql/services/capabilities/capabilitiesService.ts

@@ -20,6 +20,9 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 
 export const SERVICE_ID = 'capabilitiesService';
 export const HOST_NAME = 'sqlops';
@@ -101,7 +104,9 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ
 	public readonly onCapabilitiesRegistered = this._onCapabilitiesRegistered.event;
 
 	constructor(
-		@IStorageService private _storageService: IStorageService
+		@IStorageService private _storageService: IStorageService,
+		@IExtensionService extensionService: IExtensionService,
+		@IExtensionManagementService extentionManagementService: IExtensionManagementService
 	) {
 		super();
 
@@ -114,12 +119,35 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ
 			this.handleConnectionProvider({ id: v[0], properties: v[1] });
 		});
 		// register for when new extensions are added
-		connectionRegistry.onNewProvider(this.handleConnectionProvider, this);
+		this._register(connectionRegistry.onNewProvider(this.handleConnectionProvider, this));
 
 		// handle adding already known capabilities (could have caching problems)
 		Object.entries(this.capabilities.connectionProviderCache).map(v => {
 			this.handleConnectionProvider({ id: v[0], properties: v[1] }, false);
 		});
+
+		extensionService.whenInstalledExtensionsRegistered().then(() => {
+			this.cleanupProviders();
+		});
+
+		this._register(extentionManagementService.onDidUninstallExtension(({ identifier }) => {
+			let extensionid = getIdFromLocalExtensionId(identifier.id);
+			extensionService.getExtensions().then(i => {
+				let extension = i.find(c => c.id === extensionid);
+				let id = extension.contributes['connectionProvider'].providerId;
+				delete this.capabilities.connectionProviderCache[id];
+			});
+		}));
+	}
+
+	private cleanupProviders(): void {
+		let knownProviders = Object.keys(connectionRegistry.providers);
+		for (let key in this.capabilities.connectionProviderCache) {
+			if (!knownProviders.includes(key)) {
+				this._providers.delete(key);
+				delete this.capabilities.connectionProviderCache[key];
+			}
+		}
 	}
 
 	private handleConnectionProvider(e: { id: string, properties: ConnectionProviderProperties }, isNew = true): void {

src/sql/sqlops.d.ts

@@ -1131,7 +1131,7 @@ declare module 'sqlops' {
 		frequencyTypes: FrequencyTypes;
 		frequencySubDayTypes: FrequencySubDayTypes;
 		frequencySubDayInterval: number;
-		frequencyRelativeIntervals; FrequencyRelativeIntervals;
+		frequencyRelativeIntervals: FrequencyRelativeIntervals;
 		frequencyRecurrenceFactor: number;
 		frequencyInterval: number;
 		dateCreated: string;
@@ -1384,12 +1384,13 @@ declare module 'sqlops' {
 		updateProxy(ownerUri: string, originalProxyName: string, proxyInfo: AgentProxyInfo): Thenable<UpdateAgentOperatorResult>;
 		deleteProxy(ownerUri: string, proxyInfo: AgentProxyInfo): Thenable<ResultStatus>;
 
-
 		// Job Schedule management methods
 		getJobSchedules(ownerUri: string): Thenable<AgentJobSchedulesResult>;
 		createJobSchedule(ownerUri: string, scheduleInfo: AgentJobScheduleInfo): Thenable<CreateAgentJobScheduleResult>;
 		updateJobSchedule(ownerUri: string, originalScheduleName: string, scheduleInfo: AgentJobScheduleInfo): Thenable<UpdateAgentJobScheduleResult>;
 		deleteJobSchedule(ownerUri: string, scheduleInfo: AgentJobScheduleInfo): Thenable<ResultStatus>;
+
+		registerOnUpdated(handler: () => any): void;
 	}
 
 	// Task service interfaces ----------------------------------------------------------------------------

src/sql/sqlops.proposed.d.ts

@@ -35,6 +35,7 @@ declare module 'sqlops' {
 		groupContainer(): GroupBuilder;
 		toolbarContainer(): ToolbarBuilder;
 		loadingComponent(): LoadingComponentBuilder;
+		fileBrowserTree(): ComponentBuilder<FileBrowserTreeComponent>;
 	}
 
 	export interface ComponentBuilder<T extends Component> {
@@ -81,7 +82,7 @@ declare module 'sqlops' {
 	}
 
 	export interface FormBuilder extends ContainerBuilder<FormContainer, FormLayout, FormItemLayout> {
-		withFormItems(components: FormComponent[], itemLayout?: FormItemLayout): ContainerBuilder<FormContainer, FormLayout, FormItemLayout>;
+		withFormItems(components: (FormComponent | FormComponentGroup)[], itemLayout?: FormItemLayout): FormBuilder;
 
 		/**
 		 * Creates a collection of child components and adds them all to this container
@@ -89,7 +90,7 @@ declare module 'sqlops' {
 		 * @param formComponents the definitions
 		 * @param {*} [itemLayout] Optional layout for the child items
 		 */
-		addFormItems(formComponents: Array<FormComponent>, itemLayout?: FormItemLayout): void;
+		addFormItems(formComponents: Array<FormComponent | FormComponentGroup>, itemLayout?: FormItemLayout): void;
 
 		/**
 		 * Creates a child component and adds it to this container.
@@ -97,7 +98,7 @@ declare module 'sqlops' {
 		 * @param formComponent the component to be added
 		 * @param {*} [itemLayout] Optional layout for this child item
 		 */
-		addFormItem(formComponent: FormComponent, itemLayout?: FormItemLayout): void;
+		addFormItem(formComponent: FormComponent | FormComponentGroup, itemLayout?: FormItemLayout): void;
 	}
 
 	export interface Component {
@@ -136,6 +137,21 @@ declare module 'sqlops' {
 		required?: boolean;
 	}
 
+	/**
+	 * Used to create a group of components in a form layout
+	 */
+	export interface FormComponentGroup {
+		/**
+		 * The form components to display in the group along with optional layouts for each item
+		 */
+		components: (FormComponent & { layout?: FormItemLayout })[];
+
+		/**
+		 * The title of the group, displayed above its components
+		 */
+		title: string;
+	}
+
 	export interface ToolbarComponent {
 		component: Component;
 		title?: string;
@@ -362,6 +378,10 @@ declare module 'sqlops' {
 		selectedRows?: number[];
 	}
 
+	export interface FileBrowserTreeProperties extends ComponentProperties {
+		ownerUri: string;
+	}
+
 	export interface CheckBoxProperties {
 		checked?: boolean;
 		label?: string;
@@ -471,6 +491,10 @@ declare module 'sqlops' {
 		onRowSelected: vscode.Event<any>;
 	}
 
+	export interface FileBrowserTreeComponent extends Component, FileBrowserTreeProperties {
+		onDidChange: vscode.Event<any>;
+	}
+
 	export interface WebViewComponent extends Component {
 		html: string;
 		message: any;

src/sql/workbench/api/common/sqlExtHostTypes.ts

@@ -144,7 +144,8 @@ export enum ModelComponentTypes {
 	Form,
 	Group,
 	Toolbar,
-	LoadingComponent
+	LoadingComponent,
+	FileBrowserTree
 }
 
 export interface IComponentShape {

src/sql/workbench/api/node/extHostDataProtocol.ts

@@ -555,6 +555,13 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
 		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).jobAction(ownerUri, jobName, action);
 	}
 
+	/**
+	 * Deletes a job
+	 */
+	$deleteJob(handle: number, ownerUri: string, job: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus> {
+		throw this._resolveProvider<sqlops.AgentServicesProvider>(handle).deleteJob(ownerUri, job);
+	}
+
 	/**
 	 * Get Agent Alerts list
 	 */
@@ -562,6 +569,13 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
 		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).getAlerts(ownerUri);
 	}
 
+	/**
+	 * Deletes an alert
+	 */
+	$deleteAlert(handle: number, ownerUri: string, alert: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus> {
+		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).deleteAlert(ownerUri, alert);
+	}
+
 	/**
 	 * Get Agent Oeprators list
 	 */
@@ -569,10 +583,31 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
 		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).getOperators(ownerUri);
 	}
 
+	/**
+	 * Deletes an operator
+	 */
+	$deleteOperator(handle: number, ownerUri: string, operator: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus> {
+		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).deleteOperator(ownerUri, operator);
+	}
+
 	/**
 	 * Get Agent Proxies list
 	 */
 	$getProxies(handle: number, ownerUri: string): Thenable<sqlops.AgentProxiesResult>  {
 		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).getProxies(ownerUri);
 	}
+
+	/**
+	 * Deletes a proxy
+	 */
+	$deleteProxy(handle: number, ownerUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus> {
+		return this._resolveProvider<sqlops.AgentServicesProvider>(handle).deleteProxy(ownerUri, proxy);
+	}
+
+	/**
+	 * SQL Agent job data update notification
+	 */
+	public $onJobDataUpdated(handle: Number): void {
+		this._proxy.$onJobDataUpdated(handle);
+	}
 }

src/sql/workbench/api/node/extHostModelView.ts

@@ -7,7 +7,6 @@
 import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
 import { Emitter } from 'vs/base/common/event';
 import { deepClone } from 'vs/base/common/objects';
-import { IActionDescriptor } from 'vs/editor/standalone/browser/standaloneCodeEditor';
 import URI from 'vs/base/common/uri';
 import * as nls from 'vs/nls';
 
@@ -15,7 +14,7 @@ import * as vscode from 'vscode';
 import * as sqlops from 'sqlops';
 
 import { SqlMainContext, ExtHostModelViewShape, MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { IItemConfig, ModelComponentTypes, IComponentShape, IComponentEventArgs, ComponentEventType, CardType } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { IItemConfig, ModelComponentTypes, IComponentShape, IComponentEventArgs, ComponentEventType} from 'sql/workbench/api/common/sqlExtHostTypes';
 
 class ModelBuilderImpl implements sqlops.ModelBuilder {
 	private nextComponentId: number;
@@ -41,7 +40,7 @@ class ModelBuilderImpl implements sqlops.ModelBuilder {
 
 	formContainer(): sqlops.FormBuilder {
 		let id = this.getNextComponentId();
-		let container = new FormContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Form, id);
+		let container = new FormContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Form, id, this);
 		this._componentBuilders.set(id, container);
 		return container;
 	}
@@ -158,6 +157,13 @@ class ModelBuilderImpl implements sqlops.ModelBuilder {
 		return builder;
 	}
 
+	fileBrowserTree(): sqlops.ComponentBuilder<sqlops.FileBrowserTreeComponent> {
+		let id = this.getNextComponentId();
+		let builder: ComponentBuilderImpl<sqlops.FileBrowserTreeComponent> = this.getComponentBuilder(new FileBrowserTreeComponentWrapper(this._proxy, this._handle, id), id);
+		this._componentBuilders.set(id, builder);
+		return builder;
+	}
+
 	getComponentBuilder<T extends sqlops.Component>(component: ComponentWrapper, id: string): ComponentBuilderImpl<T> {
 		let componentBuilder: ComponentBuilderImpl<T> = new ComponentBuilderImpl<T>(component);
 		this._componentBuilders.set(id, componentBuilder);
@@ -242,14 +248,12 @@ class ContainerBuilderImpl<T extends sqlops.Component, TLayout, TItemLayout> ext
 }
 
 class FormContainerBuilder extends ContainerBuilderImpl<sqlops.FormContainer, sqlops.FormLayout, sqlops.FormItemLayout> implements sqlops.FormBuilder {
-	withFormItems(components: sqlops.FormComponent[], itemLayout?: sqlops.FormItemLayout): sqlops.ContainerBuilder<sqlops.FormContainer, sqlops.FormLayout, sqlops.FormItemLayout> {
-		this._component.itemConfigs = components.map(item => {
-			return this.convertToItemConfig(item, itemLayout);
-		});
+	constructor(proxy: MainThreadModelViewShape, handle: number, type: ModelComponentTypes, id: string, private _builder: ModelBuilderImpl) {
+		super(proxy, handle, type, id);
+	}
 
-		components.forEach(formItem => {
-			this.addComponentActions(formItem, itemLayout);
-		});
+	withFormItems(components: (sqlops.FormComponent | sqlops.FormComponentGroup)[], itemLayout?: sqlops.FormItemLayout): sqlops.FormBuilder {
+		this.addFormItems(components, itemLayout);
 		return this;
 	}
 
@@ -283,16 +287,31 @@ class FormContainerBuilder extends ContainerBuilderImpl<sqlops.FormContainer, sq
 		}
 	}
 
-	addFormItems(formComponents: Array<sqlops.FormComponent>, itemLayout?: sqlops.FormItemLayout): void {
+	addFormItems(formComponents: Array<sqlops.FormComponent | sqlops.FormComponentGroup>, itemLayout?: sqlops.FormItemLayout): void {
 		formComponents.forEach(formComponent => {
 			this.addFormItem(formComponent, itemLayout);
 		});
 	}
 
-	addFormItem(formComponent: sqlops.FormComponent, itemLayout?: sqlops.FormItemLayout): void {
-		let itemImpl = this.convertToItemConfig(formComponent, itemLayout);
-		this._component.addItem(formComponent.component as ComponentWrapper, itemImpl.config);
-		this.addComponentActions(formComponent, itemLayout);
+	addFormItem(formComponent: sqlops.FormComponent | sqlops.FormComponentGroup, itemLayout?: sqlops.FormItemLayout): void {
+		let componentGroup = formComponent as sqlops.FormComponentGroup;
+		if (componentGroup && componentGroup.components !== undefined) {
+			let labelComponent = this._builder.text().component();
+			labelComponent.value = componentGroup.title;
+			this._component.addItem(labelComponent, { isGroupLabel: true });
+			componentGroup.components.forEach(component => {
+				let layout = component.layout || itemLayout;
+				let itemConfig = this.convertToItemConfig(component, layout);
+				itemConfig.config.isInGroup = true;
+				this._component.addItem(component.component as ComponentWrapper, itemConfig.config);
+				this.addComponentActions(component, layout);
+			});
+		} else {
+			formComponent = formComponent as sqlops.FormComponent;
+			let itemImpl = this.convertToItemConfig(formComponent, itemLayout);
+			this._component.addItem(formComponent.component as ComponentWrapper, itemImpl.config);
+			this.addComponentActions(formComponent, itemLayout);
+		}
 	}
 }
 
@@ -960,6 +979,28 @@ class LoadingComponentWrapper extends ComponentWrapper implements sqlops.Loading
 	}
 }
 
+class FileBrowserTreeComponentWrapper extends ComponentWrapper implements sqlops.FileBrowserTreeComponent {
+
+	constructor(proxy: MainThreadModelViewShape, handle: number, id: string) {
+		super(proxy, handle, ModelComponentTypes.FileBrowserTree, id);
+		this.properties = {};
+		this._emitterMap.set(ComponentEventType.onDidChange, new Emitter<any>());
+	}
+
+	public get ownerUri(): string {
+		return this.properties['ownerUri'];
+	}
+
+	public set ownerUri(value: string) {
+		this.setProperty('ownerUri', value);
+	}
+
+	public get onDidChange(): vscode.Event<any> {
+		let emitter = this._emitterMap.get(ComponentEventType.onDidChange);
+		return emitter && emitter.event;
+	}
+}
+
 class ModelViewImpl implements sqlops.ModelView {
 
 	public onClosedEmitter = new Emitter<any>();

src/sql/workbench/api/node/mainThreadDataProtocol.ts

@@ -345,15 +345,27 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
 			jobAction(connectionUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus> {
 				return self._proxy.$jobAction(handle, connectionUri, jobName, action);
 			},
+			deleteJob(connectionUri: string, jobInfo: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus> {
+				return self._proxy.$deleteJob(handle, connectionUri, jobInfo);
+			},
 			getAlerts(connectionUri: string): Thenable<sqlops.AgentAlertsResult> {
 				return self._proxy.$getAlerts(handle, connectionUri);
 			},
+			deleteAlert(connectionUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus> {
+				return self._proxy.$deleteAlert(handle, connectionUri, alertInfo);
+			},
 			getOperators(connectionUri: string): Thenable<sqlops.AgentOperatorsResult> {
 				return self._proxy.$getOperators(handle, connectionUri);
 			},
+			deleteOperator(connectionUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus> {
+				return self._proxy.$deleteOperator(handle, connectionUri, operatorInfo);
+			},
 			getProxies(connectionUri: string): Thenable<sqlops.AgentProxiesResult> {
 				return self._proxy.$getProxies(handle, connectionUri);
-			}
+			},
+			deleteProxy(connectionUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus> {
+				return self._proxy.$deleteProxy(handle, connectionUri, proxyInfo);
+			},
 		});
 
 		return undefined;
@@ -448,6 +460,11 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape {
 		this._profilerService.onSessionStopped(response);
 	}
 
+	// SQL Server Agent handlers
+	public $onJobDataUpdated(handle: Number): void {
+		this._jobManagementService.fireOnDidChange();
+	}
+
 	public $unregisterProvider(handle: number): TPromise<any> {
 		let capabilitiesRegistration = this._capabilitiesRegistrations[handle];
 		if (capabilitiesRegistration) {

src/sql/workbench/api/node/mainThreadQueryEditor.ts

@@ -9,9 +9,7 @@ import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
 import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-import { IConnectableInput, IConnectionManagementService, IConnectionCompletionOptions,
-	ConnectionType , RunQueryOnConnectionMode
-} from 'sql/parts/connection/common/connectionManagement';
+import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/parts/connection/common/connectionManagement';
 import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
 import { QueryEditor } from 'sql/parts/query/editor/queryEditor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -41,12 +39,13 @@ export class MainThreadQueryEditor implements MainThreadQueryEditorShape {
 
 	public $connect(fileUri: string, connectionId: string): Thenable<void> {
 		return new Promise<void>((resolve, reject) => {
+			let editor = this._editorService.getVisibleEditors().find(editor => editor.input.getResource().toString() === fileUri);
 			let options: IConnectionCompletionOptions = {
-				params: { connectionType: ConnectionType.editor, runQueryOnCompletion: RunQueryOnConnectionMode.none },
+				params: { connectionType: ConnectionType.editor, runQueryOnCompletion: RunQueryOnConnectionMode.none, input: editor ? editor.input as any : undefined },
 				saveTheConnection: false,
 				showDashboard: false,
 				showConnectionDialogOnError: true,
-				showFirewallRuleOnError: true
+				showFirewallRuleOnError: true,
 			};
 			if (connectionId) {
 				let connection = this._connectionManagementService.getActiveConnections().filter(c => c.id === connectionId);
@@ -54,7 +53,7 @@ export class MainThreadQueryEditor implements MainThreadQueryEditorShape {
 					this._connectionManagementService.connect(connection[0], fileUri, options).then(() => {
 						resolve();
 					}).catch(error => {
-						reject();
+						reject(error);
 					});
 				} else {
 					resolve();

src/sql/workbench/api/node/sqlExtHost.api.impl.ts

@@ -265,6 +265,10 @@ export function createApiFactory(
 			};
 
 			let registerAgentServicesProvider = (provider: sqlops.AgentServicesProvider): vscode.Disposable => {
+				provider.registerOnUpdated(() => {
+					extHostDataProvider.$onJobDataUpdated(provider.handle);
+				});
+
 				return extHostDataProvider.$registerAgentServiceProvider(provider);
 			};
 

src/sql/workbench/api/node/sqlExtHost.protocol.ts

@@ -338,20 +338,40 @@ export abstract class ExtHostDataProtocolShape {
 	 */
 	$jobAction(handle: number, ownerUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus> { throw ni(); }
 
+	/**
+	 * Deletes a job
+	 */
+	$deleteJob(handle: number, ownerUri: string, job: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus> { throw ni(); }
+
 	/**
 	 * Get Agent Alerts list
 	 */
 	$getAlerts(handle: number, connectionUri: string): Thenable<sqlops.AgentAlertsResult> { throw ni(); }
 
+	/**
+	 * Deletes  an alert
+	 */
+	$deleteAlert(handle: number, connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus> { throw ni(); }
+
 	/**
 	 * Get Agent Oeprators list
 	 */
 	$getOperators(handle: number, connectionUri: string): Thenable<sqlops.AgentOperatorsResult> { throw ni(); }
 
+	/**
+	 * Deletes  an operator
+	 */
+	$deleteOperator(handle: number, connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus> { throw ni(); }
+
 	/**
 	 * Get Agent Proxies list
 	 */
 	$getProxies(handle: number, connectionUri: string): Thenable<sqlops.AgentProxiesResult> { throw ni(); }
+
+	/**
+	 * Deletes  a proxy
+	 */
+	$deleteProxy(handle: number, connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus> { throw ni(); }
 }
 
 /**
@@ -436,6 +456,7 @@ export interface MainThreadDataProtocolShape extends IDisposable {
 	$onScriptingComplete(handle: number, message: sqlops.ScriptingCompleteResult): void;
 	$onSessionEventsAvailable(handle: number, response: sqlops.ProfilerSessionEvents): void;
 	$onSessionStopped(handle: number, response: sqlops.ProfilerSessionStoppedParams): void;
+	$onJobDataUpdated(handle: Number): void;
 
 	/**
 	 * Callback when a session has completed initialization

src/sqltest/workbench/api/extHostModelView.test.ts

@@ -10,7 +10,8 @@ import { ExtHostModelView } from 'sql/workbench/api/node/extHostModelView';
 import { MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
 import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
 import { Deferred } from 'sql/base/common/promise';
-import { IComponentShape, IItemConfig, ComponentEventType, IComponentEventArgs } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { IComponentShape, IItemConfig, ComponentEventType, IComponentEventArgs, ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { TitledFormItemLayout } from 'sql/parts/modelComponents/formContainer.component';
 
 'use strict';
 
@@ -35,7 +36,8 @@ suite('ExtHostModelView Validation Tests', () => {
 			$setLayout: (handle: number, componentId: string, layout: any) => undefined,
 			$setProperties: (handle: number, componentId: string, properties: { [key: string]: any }) => undefined,
 			$registerEvent: (handle: number, componentId: string) => undefined,
-			dispose: () => undefined
+			dispose: () => undefined,
+			$validate: (handle: number, componentId: string) => undefined
 		}, MockBehavior.Loose);
 		let mainContext = <IMainContext>{
 			getProxy: proxyType => mockProxy.object
@@ -130,6 +132,8 @@ suite('ExtHostModelView Validation Tests', () => {
 	});
 
 	test('Setting a form component as required initializes the model with the component required', () => {
+		mockProxy.setup(x => x.$addToContainer(It.isAny(), It.isAny(), It.isAny())).returns(() => Promise.resolve());
+
 		// Set up the input component with required initially set to false
 		let inputComponent = modelView.modelBuilder.inputBox().component();
 		inputComponent.required = false;
@@ -148,4 +152,65 @@ suite('ExtHostModelView Validation Tests', () => {
 			return rootComponent.itemConfigs.length === 1 && rootComponent.itemConfigs[0].componentShape.id === inputComponent.id && rootComponent.itemConfigs[0].componentShape.properties['required'] === true;
 		})), Times.once());
 	});
+
+	test('Form component groups are handled correctly by adding each item in the group and a label to the form', () => {
+		// Set up the mock proxy to save the component that gets initialized so that it can be verified
+		let rootComponent: IComponentShape;
+		mockProxy.setup(x => x.$initializeModel(It.isAny(), It.isAny())).callback((handle, componentShape) => rootComponent = componentShape);
+		mockProxy.setup(x => x.$addToContainer(It.isAny(), It.isAny(), It.isAny())).returns(() => Promise.resolve());
+
+		// Set up the form with a top level component and a group
+		let topLevelList = modelView.modelBuilder.listBox().component();
+		let groupInput = modelView.modelBuilder.inputBox().component();
+		let groupDropdown = modelView.modelBuilder.dropDown().component();
+
+		let topLevelInputFormComponent: sqlops.FormComponent = { component: topLevelList, title: 'top_level_input' };
+		let groupInputFormComponent: sqlops.FormComponent = { component: groupInput, title: 'group_input' };
+		let groupDropdownFormComponent: sqlops.FormComponent = { component: groupDropdown, title: 'group_dropdown' };
+
+		let groupTitle = 'group_title';
+
+		// Give the group a default layout and add one just for the input component too
+		let defaultLayout: sqlops.FormItemLayout = {
+			horizontal: true
+		};
+		let groupInputLayout: sqlops.FormItemLayout = {
+			horizontal: false
+		};
+
+		// If I build a form that has a group with a default layout where one item in the group has its own layout
+		let formContainer = modelView.modelBuilder.formContainer().withFormItems([
+			topLevelInputFormComponent,
+			{
+				components: [
+					Object.assign(groupInputFormComponent, { layout: groupInputLayout }),
+					groupDropdownFormComponent
+				],
+				title: groupTitle
+			}
+		], defaultLayout).component();
+		modelView.initializeModel(formContainer);
+
+		// Then all the items plus a group label are added and have the correct layouts
+		assert.equal(rootComponent.itemConfigs.length, 4);
+		let listBoxConfig = rootComponent.itemConfigs[0];
+		let groupLabelConfig = rootComponent.itemConfigs[1];
+		let inputBoxConfig = rootComponent.itemConfigs[2];
+		let dropdownConfig = rootComponent.itemConfigs[3];
+
+		// Verify that the correct items were added
+		assert.equal(listBoxConfig.componentShape.type, ModelComponentTypes.ListBox);
+		assert.equal(groupLabelConfig.componentShape.type, ModelComponentTypes.Text);
+		assert.equal(inputBoxConfig.componentShape.type, ModelComponentTypes.InputBox);
+		assert.equal(dropdownConfig.componentShape.type, ModelComponentTypes.DropDown);
+
+		// Verify that the group title was set up correctly
+		assert.equal(groupLabelConfig.componentShape.properties['value'], groupTitle);
+		assert.equal((groupLabelConfig.config as TitledFormItemLayout).isGroupLabel, true);
+
+		// Verify that the components' layouts are correct
+		assert.equal((listBoxConfig.config as sqlops.FormItemLayout).horizontal, defaultLayout.horizontal);
+		assert.equal((inputBoxConfig.config as sqlops.FormItemLayout).horizontal, groupInputLayout.horizontal);
+		assert.equal((dropdownConfig.config as sqlops.FormItemLayout).horizontal, defaultLayout.horizontal);
+	});
 });