Merge branch 'master' into release/0.30

.vscode/settings.json

@@ -38,6 +38,5 @@
 			}
 		}
 	],
-	"typescript.tsdk": "node_modules/typescript/lib",
-	"git.ignoreLimitWarning": true
+	"typescript.tsdk": "node_modules/typescript/lib"
 }

CHANGELOG.md

@@ -1,39 +1,5 @@
 # Change Log
 
-## Version 0.31.4
-* Release date: July 19, 2018
-* Release status: Public Preview
-
-## What's new in this version
-* SQL Server Agent for SQL Operations Studio extension improvements
-  * Added view of Alerts, Operators, and Proxies and icons on left pane
-  * Added dialogs for New Job, New Job Step, New Alert, and New Operator
-  * Added Delete Job, Delete Alert, and Delete Operator (right-click)
-  * Added Previous Runs visualization
-  * Added Filters for each column name
-* SQL Server Profiler for SQL Operations Studio extension improvements
-  * Added Hotkeys to quickly launch and start/stop Profiler
-  * Added 5 Default Templates to view Extended Events
-  * Added Server/Database connection name
-  * Added support for Azure SQL Database instances
-  * Added suggestion to exit Profiler when tab is closed when Profiler is still running
-* Release of Combine Scripts Extension
-* Wizard and Dialog Extensibility
-* Fix GitHub Issues
-
-## Version 0.30.6
-* Release date: June 20, 2018
-* Release status: Public Preview
-
-## What's new in this version
-* **SQL Server Profiler for SQL Operations Studio  *Preview*** extension initial release
-* The new **SQL Data Warehouse** extension includes rich customizable dashboard widgets surfacing insights to your data warehouse. This unlocks key scenarios around managing and tuning your data warehouse to ensure it is optimized for consistent performance.
-* **Edit Data "Filtering and Sorting"** support
-* **SQL Server Agent for SQL Operations Studio *Preview*** extension enhancements for Jobs and Job History views
-* Improved **Wizard & Dialog UI Builder Framework** extensibility APIs
-* Update VS Code Platform source code integrating [March 2018 (1.22)](https://code.visualstudio.com/updates/v1_22) and [April 2018 (1.23)](https://code.visualstudio.com/updates/v1_23)  releases
-* Fix GitHub Issues
-
 ## Version 0.29.3
 * Release date: May 7, 2018
 * Release status: Public Preview
@@ -43,7 +9,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!**
-* 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)
+* **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)
 * Extension Manager has improved Marketplace experience to easily discover community extensions
 * SQL Agent extension Jobs and Job History view improvement
 * Updates for **whoisactive** and **Server Reports** extensions

README.md

@@ -4,16 +4,16 @@
 
 SQL Operations Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
 
-**Download SQL Operations Studio June Public Preview**
+**Download SQL Operations Studio May Public Preview**
 
 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2005949
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2005950
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2005959
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2005960
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2006083
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2006084
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=873386
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=873387
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=873388
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=873389
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=873390
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=873391
 
 Go to our [download page](https://aka.ms/sqlopsstudio) for more specific instructions.
 
@@ -61,7 +61,6 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 ## Contributions and "thank you"
 We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
 
-* lanceklinger `Fix for double clicking column handle in results table #1504`
 * westerncj for `Removed duplicate contribution from README.md (#753)`
 * ntovas for `Fix for duplicate extensions shown in "Save File" dialog. (#779)`
 * SebastianPfliegel for `Add cursor snippet (#475)`
@@ -85,7 +84,7 @@ We would like to thank all our users who raised issues, and in particular the fo
   * Chinese  (Traditional): Bruce Chen, Chiayi Yen, Kevin Yang,  Winnie Lin, 保哥 Will,  謝政廷
   * Korean: Do-Kyun Kim, Evelyn Kim, Helen Jung, Hong Jmee, jeongwoo choi, Jun Hyoung Lee, Jungsun Kim정선, Justin Yoo, Kavrith mucha, Kiwoong Youm, MinGyu Ju,  MVP_JUNO BEA, Sejun Kim, SOONMAN KWON, sung man ko, Yeongrak Choi, younggun kim, Youngjae Kim, 소영 이
   * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
-  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi
+  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi   
 
 
 And of course we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/ThirdPartyNotices.txt)

extensions/agent/client/src/main.ts

@@ -6,10 +6,12 @@
 
 import vscode = require('vscode');
 import { MainController } from './mainController';
+import { ApiWrapper } from './apiWrapper';
 export let controller: MainController;
 
 export function activate(context: vscode.ExtensionContext) {
-	controller = new MainController(context);
+	let apiWrapper = new ApiWrapper();
+	controller = new MainController(context, apiWrapper);
 	controller.activate();
 }
 

extensions/agent/client/src/mainController.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as vscode from 'vscode';
+import * as data from 'sqlops';
+import { ApiWrapper } from './apiWrapper';
+
+/**
+ * The main controller class that initializes the extension
+ */
+export class MainController  {
+    protected _apiWrapper: ApiWrapper;
+    protected _context: vscode.ExtensionContext;
+
+    // PUBLIC METHODS //////////////////////////////////////////////////////
+    public constructor(context: vscode.ExtensionContext, apiWrapper?: ApiWrapper) {
+        this._apiWrapper = apiWrapper || new ApiWrapper();
+        this._context = context;
+
+        console.log('Got: ' + apiWrapper);
+    }
+
+    /**
+     * Deactivates the extension
+     */
+    public deactivate(): void {
+    }
+
+    public activate(): void {
+
+        this._apiWrapper.registerWebviewProvider('data-management-agent', webview => {
+            webview.html = '<div><h1>SQL Agent</h1></div>';
+        });
+    }
+}

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

@@ -2,16 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-export enum AgentDialogMode {
-	CREATE = 1,
-	EDIT = 2,
-	VIEW = 3
-}
-
-export interface IAgentDialogData {
-	dialogMode: AgentDialogMode;
-	initialize(): void;
-	save(): void;
-}
+/// <reference path='../../../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../../../src/sql/sqlops.d.ts'/>
+/// <reference types='@types/node'/>

extensions/agent/package.json

@@ -1,20 +1,23 @@
 {
   "name": "agent",
   "displayName": "SQL Server Agent",
-  "description": "Manage and troubleshoot SQL Server Agent jobs",
-  "version": "0.31.4",
+  "description": "Manage and troubleshoot SQL Server Agent jobs (early preview)",
+  "version": "0.29.0",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt",
   "icon": "images/sqlserver.png",
   "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
   "engines": {
-      "vscode": "0.10.x"
+    "vscode": "0.10.x"
   },
   "activationEvents": [
     "*"
   ],
-  "main": "./out/main",
+  "main": "./client/out/main",
+  "scripts": {
+    "compile": "gulp compile-extension:agent-client"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Microsoft/sqlopsstudio.git"
@@ -26,32 +29,22 @@
     "outputChannels": [
       "sqlagent"
     ],
-    "commands": [
-      {
-        "command": "agent.openNewStepDialog",
-        "title": "agent.openNewStepDialog"
-      }
-    ],
     "dashboard.tabs": [
-      {
-        "id": "data-management-agent",
-        "description": "Manage and troubleshoot SQL Agent jobs",
-        "provider": "MSSQL",
-        "title": "SQL Agent",
-        "when": "connectionProvider == 'MSSQL' && !mssql:iscloud",
-        "container": {
-          "controlhost-container": {
-            "type": "agent"
-          }
+        {
+            "id": "data-management-agent",
+            "description": "Manage and troubleshoot SQL Agent jobs",
+            "provider": "MSSQL",
+            "title": "SQL Agent",
+            "when": "connectionProvider == 'MSSQL' && !mssql:iscloud",
+            "container": {
+                "controlhost-container": {
+                  "type": "agent"
+                }
+            }
         }
-      }
     ]
   },
-  "dependencies": {
-    "vscode-nls": "^3.2.1"
-  },
   "devDependencies": {
-		"mocha-junit-reporter": "^1.17.0",
-		"mocha-multi-reporters": "^1.1.7"
-	}
+    "vscode": "1.0.1"
+  }
 }

extensions/agent/src/agentUtils.ts

@@ -1,38 +0,0 @@
-'use strict';
-
-import * as sqlops from 'sqlops';
-
-export class AgentUtils {
-
-	private static _agentService: sqlops.AgentServicesProvider;
-	private static _connectionService: sqlops.ConnectionProvider;
-	private static _queryProvider: sqlops.QueryProvider;
-
-	public static async getAgentService(): Promise<sqlops.AgentServicesProvider> {
-		if (!AgentUtils._agentService) {
-			let currentConnection = await sqlops.connection.getCurrentConnection();
-			this._agentService = sqlops.dataprotocol.getProvider<sqlops.AgentServicesProvider>(currentConnection.providerName, sqlops.DataProviderType.AgentServicesProvider);
-		}
-		return AgentUtils._agentService;
-	}
-
-	public static async getDatabases(ownerUri: string): Promise<string[]> {
-		if (!AgentUtils._connectionService) {
-			let currentConnection = await sqlops.connection.getCurrentConnection();
-			this._connectionService = sqlops.dataprotocol.getProvider<sqlops.ConnectionProvider>(currentConnection.providerName, sqlops.DataProviderType.ConnectionProvider);
-		}
-		return AgentUtils._connectionService.listDatabases(ownerUri).then(result => {
-			if (result && result.databaseNames && result.databaseNames.length > 0) {
-				return result.databaseNames;
-			}
-		});
-	}
-
-	public static async getQueryProvider(): Promise<sqlops.QueryProvider> {
-		if (!AgentUtils._queryProvider) {
-			let currentConnection = await sqlops.connection.getCurrentConnection();
-			this._queryProvider = sqlops.dataprotocol.getProvider<sqlops.QueryProvider>(currentConnection.providerName, sqlops.DataProviderType.QueryProvider);
-		}
-		return this._queryProvider;
-	}
-}

extensions/agent/src/data/alertData.ts

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

extensions/agent/src/data/jobData.ts

@@ -1,177 +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 nls from 'vscode-nls';
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import { AgentUtils } from '../agentUtils';
-import { IAgentDialogData, AgentDialogMode } from '../interfaces';
-
-const localize = nls.loadMessageBundle();
-
-export class JobData implements IAgentDialogData {
-
-	private readonly JobCompletionActionCondition_Always: string =  localize('jobData.whenJobCompletes', 'When the job completes');
-	private readonly JobCompletionActionCondition_OnFailure: string = localize('jobData.whenJobFails', 'When the job fails');
-	private readonly JobCompletionActionCondition_OnSuccess: string = localize('jobData.whenJobSucceeds', 'When the job succeeds');
-
-	// Error Messages
-	private readonly CreateJobErrorMessage_NameIsEmpty = localize('jobData.jobNameRequired', 'Job name must be provided');
-
-	private _ownerUri: string;
-	private _jobCategories: string[];
-	private _operators: string[];
-	private _defaultOwner: string;
-	private _jobCompletionActionConditions: sqlops.CategoryValue[];
-
-	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
-	public name: string;
-	public originalName: string;
-	public enabled: boolean = true;
-	public description: string;
-	public category: string;
-	public categoryId: number;
-	public owner: string;
-	public emailLevel: sqlops.JobCompletionActionCondition = sqlops.JobCompletionActionCondition.OnFailure;
-	public pageLevel: sqlops.JobCompletionActionCondition = sqlops.JobCompletionActionCondition.OnFailure;
-	public eventLogLevel: sqlops.JobCompletionActionCondition = sqlops.JobCompletionActionCondition.OnFailure;
-	public deleteLevel: sqlops.JobCompletionActionCondition = sqlops.JobCompletionActionCondition.OnSuccess;
-	public operatorToEmail: string;
-	public operatorToPage: string;
-	public jobSteps: sqlops.AgentJobStepInfo[];
-	public jobSchedules: sqlops.AgentJobScheduleInfo[];
-	public alerts: sqlops.AgentAlertInfo[];
-
-	constructor(
-		ownerUri: string,
-		jobInfo: sqlops.AgentJobInfo = undefined,
-		private _agentService: sqlops.AgentServicesProvider = undefined) {
-
-		this._ownerUri = ownerUri;
-		if (jobInfo) {
-			this.dialogMode = AgentDialogMode.EDIT;
-			this.name = jobInfo.name;
-			this.originalName = jobInfo.name;
-			this.owner = jobInfo.owner;
-			this.category = jobInfo.category;
-			this.description = jobInfo.description;
-			this.enabled = jobInfo.enabled;
-		}
-	}
-
-	public get jobCategories(): string[] {
-		return this._jobCategories;
-	}
-
-	public get operators(): string[] {
-		return this._operators;
-	}
-
-	public get ownerUri(): string {
-		return this._ownerUri;
-	}
-
-	public get defaultOwner(): string {
-		return this._defaultOwner;
-	}
-
-	public get JobCompletionActionConditions(): sqlops.CategoryValue[] {
-		return this._jobCompletionActionConditions;
-	}
-
-	public async initialize() {
-		this._agentService = await AgentUtils.getAgentService();
-		let jobDefaults = await this._agentService.getJobDefaults(this.ownerUri);
-		if (jobDefaults && jobDefaults.success) {
-			this._jobCategories = jobDefaults.categories.map((cat) => {
-				return cat.name;
-			});
-
-			this._defaultOwner = jobDefaults.owner;
-
-			this._operators = ['', this._defaultOwner];
-		}
-
-		this._jobCompletionActionConditions = [{
-			displayName: this.JobCompletionActionCondition_OnSuccess,
-			name: sqlops.JobCompletionActionCondition.OnSuccess.toString()
-		}, {
-			displayName: this.JobCompletionActionCondition_OnFailure,
-			name: sqlops.JobCompletionActionCondition.OnFailure.toString()
-		}, {
-			displayName: this.JobCompletionActionCondition_Always,
-			name: sqlops.JobCompletionActionCondition.Always.toString()
-		}];
-
-		this.jobSchedules = [];
-	}
-
-	public async save() {
-		let jobInfo: sqlops.AgentJobInfo = this.toAgentJobInfo();
-		let result = this.dialogMode === AgentDialogMode.CREATE
-			? await this._agentService.createJob(this.ownerUri,  jobInfo)
-			: await this._agentService.updateJob(this.ownerUri, this.originalName, jobInfo);
-
-		if (!result || !result.success) {
-			vscode.window.showErrorMessage(
-				localize('jobData.saveErrorMessage', "Job update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
-		}
-	}
-
-	public validate(): { valid: boolean, errorMessages: string[] } {
-		let validationErrors: string[] = [];
-
-		if (!(this.name && this.name.trim())) {
-			validationErrors.push(this.CreateJobErrorMessage_NameIsEmpty);
-		}
-
-		return {
-			valid: validationErrors.length === 0,
-			errorMessages: validationErrors
-		};
-	}
-
-	public addJobSchedule(schedule: sqlops.AgentJobScheduleInfo) {
-		let existingSchedule = this.jobSchedules.find(item => item.name === schedule.name);
-		if (!existingSchedule) {
-			this.jobSchedules.push(schedule);
-		}
-	}
-
-	public toAgentJobInfo(): sqlops.AgentJobInfo {
-		return {
-			name: this.name,
-			owner: this.owner,
-			description: this.description,
-			EmailLevel: this.emailLevel,
-			PageLevel: this.pageLevel,
-			EventLogLevel: this.eventLogLevel,
-			DeleteLevel: this.deleteLevel,
-			OperatorToEmail: this.operatorToEmail,
-			OperatorToPage: this.operatorToPage,
-			enabled: this.enabled,
-			category: this.category,
-			Alerts: this.alerts,
-			JobSchedules: this.jobSchedules,
-			JobSteps: this.jobSteps,
-			// The properties below are not collected from UI
-			// We could consider using a seperate class for create job request
-			//
-			currentExecutionStatus: 0,
-			lastRunOutcome: 0,
-			currentExecutionStep: '',
-			hasTarget: true,
-			hasSchedule: false,
-			hasStep: false,
-			runnable: true,
-			categoryId: 0,
-			categoryType: 1, // LocalJob, hard-coding the value, corresponds to the target tab in SSMS
-			lastRun: '',
-			nextRun: '',
-			jobId: ''
-		};
-	}
-}

extensions/agent/src/data/jobStepData.ts

@@ -1,76 +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 { AgentUtils } from '../agentUtils';
-import { IAgentDialogData, AgentDialogMode } from '../interfaces';
-
-export class JobStepData implements IAgentDialogData {
-	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
-	public ownerUri: string;
-	public jobId: string; //
-	public jobName: string;
-	public script: string; //
-	public scriptName: string;
-	public stepName: string; //
-	public subSystem: string; //
-	public id: number;
-	public failureAction: string; //
-	public successAction: string; //
-	public failStepId: number;
-	public successStepId: number;
-	public command: string;
-	public commandExecutionSuccessCode: number;
-	public databaseName: string; //
-	public databaseUserName: string;
-	public server: string;
-	public outputFileName: string; //
-	public appendToLogFile: boolean;
-	public appendToStepHist: boolean;
-	public writeLogToTable: boolean;
-	public appendLogToTable: boolean;
-	public retryAttempts: number; //
-	public retryInterval: number; //
-	public proxyName: string;
-
-	constructor(ownerUri:string) {
-		this.ownerUri = ownerUri;
-	}
-
-	public async initialize() {
-	}
-
-	public async save() {
-		let agentService = await AgentUtils.getAgentService();
-		agentService.createJobStep(this.ownerUri, {
-			jobId: this.jobId,
-			jobName: this.jobName,
-			script: this.script,
-			scriptName: this.scriptName,
-			stepName: this.stepName,
-			subSystem: this.subSystem,
-			id: 1,
-			failureAction: this.failureAction,
-			successAction: this.successAction,
-			failStepId: this.failStepId,
-			successStepId: this.successStepId,
-			command: this.command,
-			commandExecutionSuccessCode: this.commandExecutionSuccessCode,
-			databaseName: this.databaseName,
-			databaseUserName: this.databaseUserName,
-			server: this.server,
-			outputFileName: this.outputFileName,
-			appendToLogFile: this.appendToLogFile,
-			appendToStepHist: this.appendToStepHist,
-			writeLogToTable: this.writeLogToTable,
-			appendLogToTable: this.appendLogToTable,
-			retryAttempts: this.retryAttempts,
-			retryInterval: this.retryInterval,
-			proxyName: this.proxyName
-		}).then(result => {
-			console.info(result);
-		});
-	}
-}

extensions/agent/src/data/operatorData.ts

@@ -1,74 +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 { AgentUtils } from '../agentUtils';
-import { IAgentDialogData, AgentDialogMode } from '../interfaces';
-
-export class OperatorData implements IAgentDialogData {
-	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
-	ownerUri: string;
-	name: string;
-	id: number;
-	emailAddress: string;
-	enabled: boolean;
-	lastEmailDate: string;
-	lastNetSendDate: string;
-	lastPagerDate: string;
-	pagerAddress: string;
-	categoryName: string;
-	pagerDays: string;
-	saturdayPagerEndTime: string;
-	saturdayPagerStartTime: string;
-	sundayPagerEndTime: string;
-	sundayPagerStartTime: string;
-	netSendAddress: string;
-	weekdayPagerStartTime: string;
-	weekdayPagerEndTime: string;
-
-	constructor(ownerUri:string, operatorInfo: sqlops.AgentOperatorInfo) {
-		this.ownerUri = ownerUri;
-
-		if (operatorInfo) {
-			this.dialogMode = AgentDialogMode.EDIT;
-			this.name = operatorInfo.name;
-			this.enabled = operatorInfo.enabled;
-		}
-	}
-
-	public async initialize() {
-	}
-
-	public async save() {
-		let agentService = await AgentUtils.getAgentService();
-		let result = await agentService.createOperator(this.ownerUri,  this.toAgentOperatorInfo());
-		if (!result || !result.success) {
-			// TODO handle error here
-		}
-	}
-
-	public toAgentOperatorInfo(): sqlops.AgentOperatorInfo {
-		return {
-			name: this.name,
-			id: this.id,
-			emailAddress: this.emailAddress,
-			enabled: this.enabled,
-			lastEmailDate: this.lastEmailDate,
-			lastNetSendDate: this.lastNetSendDate,
-			lastPagerDate: this.lastPagerDate,
-			pagerAddress: this.pagerAddress,
-			categoryName: this.categoryName,
-			pagerDays: sqlops.WeekDays.weekDays, //this.pagerDays,
-			saturdayPagerEndTime: this.saturdayPagerEndTime,
-			saturdayPagerStartTime: this.saturdayPagerStartTime,
-			sundayPagerEndTime: this.sundayPagerEndTime,
-			sundayPagerStartTime: this.sundayPagerStartTime,
-			netSendAddress: this.netSendAddress,
-			weekdayPagerStartTime: this.weekdayPagerStartTime,
-			weekdayPagerEndTime: this.weekdayPagerEndTime
-		};
-	}
-}

extensions/agent/src/data/pickScheduleData.ts

@@ -1,31 +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 { AgentUtils } from '../agentUtils';
-import { IAgentDialogData, AgentDialogMode } from '../interfaces';
-
-export class PickScheduleData implements IAgentDialogData {
-	public dialogMode: AgentDialogMode = AgentDialogMode.VIEW;
-	public ownerUri: string;
-	public schedules: sqlops.AgentJobScheduleInfo[];
-	public selectedSchedule: sqlops.AgentJobScheduleInfo;
-
-	constructor(ownerUri:string) {
-		this.ownerUri = ownerUri;
-	}
-
-	public async initialize() {
-		let agentService = await AgentUtils.getAgentService();
-		let result = await agentService.getJobSchedules(this.ownerUri);
-		if (result && result.success) {
-			this.schedules = result.schedules;
-		}
-	}
-
-	public async save() {
-	}
-}

extensions/agent/src/data/proxyData.ts

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

extensions/agent/src/data/scheduleData.ts

@@ -1,31 +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 { AgentUtils } from '../agentUtils';
-import { IAgentDialogData, AgentDialogMode } from '../interfaces';
-
-export class ScheduleData implements IAgentDialogData {
-	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
-	public ownerUri: string;
-	public schedules: sqlops.AgentJobScheduleInfo[];
-	public selectedSchedule: sqlops.AgentJobScheduleInfo;
-
-	constructor(ownerUri:string) {
-		this.ownerUri = ownerUri;
-	}
-
-	public async initialize() {
-		let agentService = await AgentUtils.getAgentService();
-		let result = await agentService.getJobSchedules(this.ownerUri);
-		if (result && result.success) {
-			this.schedules = result.schedules;
-		}
-	}
-
-	public async save() {
-	}
-}

extensions/agent/src/dialogs/agentDialog.ts

@@ -1,78 +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 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

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

extensions/agent/src/dialogs/jobDialog.ts

@@ -1,466 +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 nls from 'vscode-nls';
-import * as sqlops from 'sqlops';
-import { JobData } from '../data/jobData';
-import { JobStepDialog } from './jobStepDialog';
-import { PickScheduleDialog } from './pickScheduleDialog';
-import { AlertDialog } from './alertDialog';
-import { AgentDialog } from './agentDialog';
-
-const localize = nls.loadMessageBundle();
-
-export class JobDialog extends AgentDialog<JobData>  {
-
-	// TODO: localize
-	// Top level
-	private static readonly CreateDialogTitle: string = localize('jobDialog.newJob', 'New Job');
-	private static readonly EditDialogTitle: string = localize('jobDialog.editJob', 'Edit Job');
-	private readonly GeneralTabText: string = localize('jobDialog.general', 'General');
-	private readonly StepsTabText: string = localize('jobDialog.steps', 'Steps');
-	private readonly SchedulesTabText: string = localize('jobDialog.schedules', 'Schedules');
-	private readonly AlertsTabText: string = localize('jobDialog.alerts', 'Alerts');
-	private readonly NotificationsTabText: string = localize('jobDialog.notifications', 'Notifications');
-	private readonly BlankJobNameErrorText: string = localize('jobDialog.blankJobNameError', 'The name of the job cannot be blank.');
-
-	// General tab strings
-	private readonly NameTextBoxLabel: string = localize('jobDialog.name', 'Name');
-	private readonly OwnerTextBoxLabel: string = localize('jobDialog.owner', 'Owner');
-	private readonly CategoryDropdownLabel: string = localize('jobDialog.category', 'Category');
-	private readonly DescriptionTextBoxLabel: string = localize('jobDialog.description', 'Description');
-	private readonly EnabledCheckboxLabel: string = localize('jobDialog.enabled', 'Enabled');
-
-	// Steps tab strings
-	private readonly JobStepsTopLabelString: string = localize('jobDialog.jobStepList', 'Job step list');
-	private readonly StepsTable_StepColumnString: string = localize('jobDialog.step', 'Step');
-	private readonly StepsTable_NameColumnString: string = localize('jobDialog.name', 'Name');
-	private readonly StepsTable_TypeColumnString: string = localize('jobDialog.type', 'Type');
-	private readonly StepsTable_SuccessColumnString: string = localize('jobDialog.onSuccess', 'On Success');
-	private readonly StepsTable_FailureColumnString: string = localize('jobDialog.onFailure', 'On Failure');
-	private readonly NewStepButtonString: string = localize('jobDialog.new', 'New...');
-	private readonly EditStepButtonString: string = localize('jobDialog.edit', 'Edit');
-	private readonly DeleteStepButtonString: string = localize('jobDialog.delete', 'Delete');
-	private readonly MoveStepUpButtonString: string = localize('jobDialog.moveUp', 'Move Step Up');
-	private readonly MoveStepDownButtonString: string = localize('jobDialog.moveDown', 'Move Step Up');
-
-	// Notifications tab strings
-	private readonly NotificationsTabTopLabelString: string = localize('jobDialog.notificationsTabTop', 'Actions to perform when the job completes');
-	private readonly EmailCheckBoxString: string = localize('jobDialog.email', 'Email');
-	private readonly PagerCheckBoxString: string = localize('jobDialog.page', 'Page');
-	private readonly EventLogCheckBoxString: string = localize('jobDialog.eventLogCheckBoxLabel', 'Write to the Windows Application event log');
-	private readonly DeleteJobCheckBoxString: string = localize('jobDialog.deleteJobLabel', 'Automatically delete job');
-
-	// Schedules tab strings
-	private readonly SchedulesTopLabelString: string = localize('jobDialog.schedulesaLabel', 'Schedules list');
-	private readonly PickScheduleButtonString: string = localize('jobDialog.pickSchedule', 'Pick Schedule');
-	private readonly ScheduleNameLabelString: string = localize('jobDialog.scheduleNameLabel', 'Schedule Name');
-
-	// Alerts tab strings
-	private readonly AlertsTopLabelString: string = localize('jobDialog.alertsList', 'Alerts list');
-	private readonly NewAlertButtonString: string = localize('jobDialog.newAlert', 'New Alert');
-	private readonly AlertNameLabelString: string = localize('jobDialog.alertNameLabel', 'Alert Name');
-
-	// UI Components
-	private generalTab: sqlops.window.modelviewdialog.DialogTab;
-	private stepsTab: sqlops.window.modelviewdialog.DialogTab;
-	private alertsTab: sqlops.window.modelviewdialog.DialogTab;
-	private schedulesTab: sqlops.window.modelviewdialog.DialogTab;
-	private notificationsTab: sqlops.window.modelviewdialog.DialogTab;
-
-	// General tab controls
-	private nameTextBox: sqlops.InputBoxComponent;
-	private ownerTextBox: sqlops.InputBoxComponent;
-	private categoryDropdown: sqlops.DropDownComponent;
-	private descriptionTextBox: sqlops.InputBoxComponent;
-	private enabledCheckBox: sqlops.CheckBoxComponent;
-
-	// Steps tab controls
-	private stepsTable: sqlops.TableComponent;
-	private newStepButton: sqlops.ButtonComponent;
-	private moveStepUpButton: sqlops.ButtonComponent;
-	private moveStepDownButton: sqlops.ButtonComponent;
-	private editStepButton: sqlops.ButtonComponent;
-	private deleteStepButton: sqlops.ButtonComponent;
-
-	// Notifications tab controls
-	private notificationsTabTopLabel: sqlops.TextComponent;
-	private emailCheckBox: sqlops.CheckBoxComponent;
-	private emailOperatorDropdown: sqlops.DropDownComponent;
-	private emailConditionDropdown: sqlops.DropDownComponent;
-	private pagerCheckBox: sqlops.CheckBoxComponent;
-	private pagerOperatorDropdown: sqlops.DropDownComponent;
-	private pagerConditionDropdown: sqlops.DropDownComponent;
-	private eventLogCheckBox: sqlops.CheckBoxComponent;
-	private eventLogConditionDropdown: sqlops.DropDownComponent;
-	private deleteJobCheckBox: sqlops.CheckBoxComponent;
-	private deleteJobConditionDropdown: sqlops.DropDownComponent;
-
-	// Schedule tab controls
-	private schedulesTable: sqlops.TableComponent;
-	private pickScheduleButton: sqlops.ButtonComponent;
-
-	// Alert tab controls
-	private alertsTable: sqlops.TableComponent;
-	private newAlertButton: sqlops.ButtonComponent;
-
-	constructor(ownerUri: string, jobInfo: sqlops.AgentJobInfo = undefined) {
-		super(
-			ownerUri,
-			new JobData(ownerUri, jobInfo),
-			jobInfo ? JobDialog.EditDialogTitle : JobDialog.CreateDialogTitle);
-	}
-
-	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);
-		this.schedulesTab = sqlops.window.modelviewdialog.createTab(this.SchedulesTabText);
-		this.notificationsTab = sqlops.window.modelviewdialog.createTab(this.NotificationsTabText);
-		this.initializeGeneralTab();
-		this.initializeStepsTab();
-		this.initializeAlertsTab();
-		this.initializeSchedulesTab();
-		this.initializeNotificationsTab();
-		this.dialog.content = [this.generalTab, this.stepsTab, this.schedulesTab, this.alertsTab, this.notificationsTab];
-
-		this.dialog.registerCloseValidator(() => {
-			this.updateModel();
-			let validationResult = this.model.validate();
-			if (!validationResult.valid) {
-				// TODO: Show Error Messages
-				console.error(validationResult.errorMessages.join(','));
-			}
-
-			return validationResult.valid;
-		});
-	}
-
-	private initializeGeneralTab() {
-		this.generalTab.registerContent(async view => {
-			this.nameTextBox = view.modelBuilder.inputBox().component();
-			this.nameTextBox.required = true;
-			this.nameTextBox.onTextChanged(() => {
-				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
-					this.dialog.message = null;
-				}
-			});
-			this.ownerTextBox = view.modelBuilder.inputBox().component();
-			this.categoryDropdown = view.modelBuilder.dropDown().component();
-			this.descriptionTextBox = view.modelBuilder.inputBox().withProperties({
-				multiline: true,
-				height: 200
-			}).component();
-			this.enabledCheckBox = view.modelBuilder.checkBox()
-				.withProperties({
-					label: this.EnabledCheckboxLabel
-				}).component();
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.nameTextBox,
-					title: this.NameTextBoxLabel
-				}, {
-					component: this.ownerTextBox,
-					title: this.OwnerTextBoxLabel
-				}, {
-					component: this.categoryDropdown,
-					title: this.CategoryDropdownLabel
-				}, {
-					component: this.descriptionTextBox,
-					title: this.DescriptionTextBoxLabel
-				}, {
-					component: this.enabledCheckBox,
-					title: ''
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-
-			this.nameTextBox.value = this.model.name;
-			this.ownerTextBox.value = this.model.defaultOwner;
-			this.categoryDropdown.values = this.model.jobCategories;
-
-			let idx: number = undefined;
-			if (this.model.category && this.model.category !== '') {
-				idx = this.model.jobCategories.indexOf(this.model.category);
-			}
-			this.categoryDropdown.value = this.model.jobCategories[idx > 0 ? idx : 0];
-
-			this.enabledCheckBox.checked = this.model.enabled;
-			this.descriptionTextBox.value = this.model.description;
-		});
-	}
-
-	private initializeStepsTab() {
-		this.stepsTab.registerContent(async view => {
-			this.stepsTable = view.modelBuilder.table()
-				.withProperties({
-					columns: [
-						this.StepsTable_StepColumnString,
-						this.StepsTable_NameColumnString,
-						this.StepsTable_TypeColumnString,
-						this.StepsTable_SuccessColumnString,
-						this.StepsTable_FailureColumnString
-					],
-					data: [],
-					height: 430
-				}).component();
-
-			this.moveStepUpButton = view.modelBuilder.button()
-				.withProperties({
-					label: this.MoveStepUpButtonString,
-					width: 80
-				}).component();
-
-			this.moveStepDownButton = view.modelBuilder.button()
-				.withProperties({
-					label: this.MoveStepDownButtonString,
-					width: 80
-				}).component();
-
-			this.moveStepUpButton.enabled = false;
-			this.moveStepDownButton.enabled = false;
-
-			this.newStepButton = view.modelBuilder.button().withProperties({
-				label: this.NewStepButtonString,
-				width: 80
-			}).component();
-
-			this.newStepButton.onDidClick((e)=>{
-				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
-					let stepDialog = new JobStepDialog(this.model.ownerUri, this.nameTextBox.value, '' , 1, this.model);
-					stepDialog.openNewStepDialog();
-				} else {
-					this.dialog.message = { text: this.BlankJobNameErrorText };
-				}
-			});
-
-			this.editStepButton = view.modelBuilder.button().withProperties({
-				label: this.EditStepButtonString,
-				width: 80
-			}).component();
-
-			this.deleteStepButton = view.modelBuilder.button().withProperties({
-				label: this.DeleteStepButtonString,
-				width: 80
-			}).component();
-
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.stepsTable,
-					title: this.JobStepsTopLabelString,
-					actions: [this.moveStepUpButton, this.moveStepDownButton, this.newStepButton, this.editStepButton, this.deleteStepButton]
-				}]).withLayout({ width: '100%' }).component();
-			await view.initializeModel(formModel);
-		});
-	}
-
-	private initializeAlertsTab() {
-		this.alertsTab.registerContent(async view => {
-			this.alertsTable = view.modelBuilder.table()
-				.withProperties({
-					columns: [
-						this.AlertNameLabelString
-					],
-					data: [],
-					height: 430,
-					width: 400
-				}).component();
-
-			this.newAlertButton = view.modelBuilder.button().withProperties({
-				label: this.NewAlertButtonString,
-				width: 80
-			}).component();
-
-			this.newAlertButton.onDidClick((e)=>{
-				let alertDialog = new AlertDialog(this.model.ownerUri, null, []);
-				alertDialog.onSuccess((dialogModel) => {
-				});
-				alertDialog.openDialog();
-			});
-
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.alertsTable,
-					title: this.AlertsTopLabelString,
-					actions: [this.newAlertButton]
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-		});
-	}
-
-	private initializeSchedulesTab() {
-		this.schedulesTab.registerContent(async view => {
-			this.schedulesTable = view.modelBuilder.table()
-				.withProperties({
-					columns: [
-						this.ScheduleNameLabelString
-					],
-					data: [],
-					height: 430,
-					width: 420
-				}).component();
-
-			this.pickScheduleButton = view.modelBuilder.button().withProperties({
-				label: this.PickScheduleButtonString,
-				width: 80
-			}).component();
-
-			this.pickScheduleButton.onDidClick((e)=>{
-				let pickScheduleDialog = new PickScheduleDialog(this.model.ownerUri);
-				pickScheduleDialog.onSuccess((dialogModel) => {
-					let selectedSchedule = dialogModel.selectedSchedule;
-					if (selectedSchedule) {
-						this.model.addJobSchedule(selectedSchedule);
-						this.populateScheduleTable();
-					}
-				});
-				pickScheduleDialog.showDialog();
-			});
-
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.schedulesTable,
-					title: this.SchedulesTopLabelString,
-					actions: [this.pickScheduleButton]
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-
-			this.populateScheduleTable();
-		});
-	}
-
-	private populateScheduleTable() {
-		if (this.model.jobSchedules) {
-			let data: any[][] = [];
-			for (let i = 0; i < this.model.jobSchedules.length; ++i) {
-				let schedule = this.model.jobSchedules[i];
-				data[i] = [ schedule.name ];
-			}
-			this.schedulesTable.data = data;
-		}
-	}
-
-	private initializeNotificationsTab() {
-		this.notificationsTab.registerContent(async view => {
-
-			this.notificationsTabTopLabel = view.modelBuilder.text().withProperties({ value: this.NotificationsTabTopLabelString }).component();
-			this.emailCheckBox = view.modelBuilder.checkBox().withProperties({
-				label: this.EmailCheckBoxString,
-				width: 80
-			}).component();
-
-			this.pagerCheckBox = view.modelBuilder.checkBox().withProperties({
-				label: this.PagerCheckBoxString,
-				width: 80
-			}).component();
-			this.eventLogCheckBox = view.modelBuilder.checkBox().withProperties({
-				label: this.EventLogCheckBoxString,
-				width: 250
-			}).component();
-			this.deleteJobCheckBox = view.modelBuilder.checkBox().withProperties({
-				label: this.DeleteJobCheckBoxString,
-				width: 250
-			}).component();
-
-			this.emailCheckBox.onChanged(() => {
-				this.emailConditionDropdown.enabled = this.emailCheckBox.checked;
-				this.emailOperatorDropdown.enabled = this.emailCheckBox.checked;
-			});
-
-			this.pagerCheckBox.onChanged(() => {
-				this.pagerConditionDropdown.enabled = this.pagerCheckBox.checked;
-				this.pagerOperatorDropdown.enabled = this.pagerCheckBox.checked;
-			});
-			this.eventLogCheckBox.onChanged(() => {
-				this.eventLogConditionDropdown.enabled = this.eventLogCheckBox.checked;
-			});
-
-			this.deleteJobCheckBox.onChanged(() => {
-				this.deleteJobConditionDropdown.enabled = this.deleteJobCheckBox.checked;
-			});
-
-			this.emailOperatorDropdown = view.modelBuilder.dropDown().withProperties({ width: 150 }).component();
-			this.pagerOperatorDropdown = view.modelBuilder.dropDown().withProperties({ width: 150 }).component();
-			this.emailConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: 150 }).component();
-			this.pagerConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: 150 }).component();
-			this.eventLogConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: 150 }).component();
-			this.deleteJobConditionDropdown = view.modelBuilder.dropDown().withProperties({ width: 150 }).component();
-
-			let emailContainer = this.createRowContainer(view).withItems([this.emailCheckBox, this.emailOperatorDropdown, this.emailConditionDropdown]).component();
-
-			let pagerContainer = this.createRowContainer(view).withItems([this.pagerCheckBox, this.pagerOperatorDropdown, this.pagerConditionDropdown]).component();
-
-			let eventLogContainer = this.createRowContainer(view).withItems([this.eventLogCheckBox, this.eventLogConditionDropdown]).component();
-
-			let deleteJobContainer = this.createRowContainer(view).withItems([this.deleteJobCheckBox, this.deleteJobConditionDropdown]).component();
-
-			let formModel = view.modelBuilder.formContainer().withFormItems([
-				{
-					components:
-					[{
-						component: emailContainer,
-						title: ''
-					},
-					{
-						component: pagerContainer,
-						title: ''
-					},
-					{
-						component: eventLogContainer,
-						title: ''
-					},
-					{
-						component: deleteJobContainer,
-						title: ''
-					}], title: this.NotificationsTabTopLabelString}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-			this.emailConditionDropdown.values = this.model.JobCompletionActionConditions;
-			this.pagerConditionDropdown.values = this.model.JobCompletionActionConditions;
-			this.eventLogConditionDropdown.values = this.model.JobCompletionActionConditions;
-			this.deleteJobConditionDropdown.values = this.model.JobCompletionActionConditions;
-			this.setConditionDropdownSelectedValue(this.emailConditionDropdown, this.model.emailLevel);
-			this.setConditionDropdownSelectedValue(this.pagerConditionDropdown, this.model.pageLevel);
-			this.setConditionDropdownSelectedValue(this.eventLogConditionDropdown, this.model.eventLogLevel);
-			this.setConditionDropdownSelectedValue(this.deleteJobConditionDropdown, this.model.deleteLevel);
-			this.emailOperatorDropdown.values = this.model.operators;
-			this.pagerOperatorDropdown.values = this.model.operators;
-			this.emailCheckBox.checked = false;
-			this.pagerCheckBox.checked = false;
-			this.eventLogCheckBox.checked = false;
-			this.deleteJobCheckBox.checked = false;
-			this.emailOperatorDropdown.enabled = false;
-			this.pagerOperatorDropdown.enabled = false;
-			this.emailConditionDropdown.enabled = false;
-			this.pagerConditionDropdown.enabled = false;
-			this.eventLogConditionDropdown.enabled = false;
-			this.deleteJobConditionDropdown.enabled = false;
-		});
-	}
-
-	private createRowContainer(view: sqlops.ModelView): sqlops.FlexBuilder {
-		return view.modelBuilder.flexContainer().withLayout({
-			flexFlow: 'row',
-			alignItems: 'left',
-			justifyContent: 'space-between'
-		});
-	}
-
-	protected updateModel() {
-		this.model.name = this.nameTextBox.value;
-		this.model.owner = this.ownerTextBox.value;
-		this.model.enabled = this.enabledCheckBox.checked;
-		this.model.description = this.descriptionTextBox.value;
-		this.model.category = this.getDropdownValue(this.categoryDropdown);
-		this.model.emailLevel = this.getActualConditionValue(this.emailCheckBox, this.emailConditionDropdown);
-		this.model.operatorToEmail = this.getDropdownValue(this.emailOperatorDropdown);
-		this.model.operatorToPage = this.getDropdownValue(this.pagerOperatorDropdown);
-		this.model.pageLevel = this.getActualConditionValue(this.pagerCheckBox, this.pagerConditionDropdown);
-		this.model.eventLogLevel = this.getActualConditionValue(this.eventLogCheckBox, this.eventLogConditionDropdown);
-		this.model.deleteLevel = this.getActualConditionValue(this.deleteJobCheckBox, this.deleteJobConditionDropdown);
-	}
-}

extensions/agent/src/dialogs/jobStepDialog.ts

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

extensions/agent/src/dialogs/operatorDialog.ts

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

extensions/agent/src/dialogs/pickScheduleDialog.ts

@@ -1,95 +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 nls from 'vscode-nls';
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import { PickScheduleData } from '../data/pickScheduleData';
-
-const localize = nls.loadMessageBundle();
-
-export class PickScheduleDialog {
-
-	// TODO: localize
-	// Top level
-	private readonly DialogTitle: string = localize('pickSchedule.jobSchedules', 'Job Schedules');
-	private readonly OkButtonText: string = localize('pickSchedule.ok', 'OK');
-	private readonly CancelButtonText: string = localize('pickSchedule.cancel', 'Cancel');
-	private readonly ScheduleNameLabelText: string = localize('pickSchedule.scheduleName', 'Schedule Name');
-	private readonly SchedulesLabelText: string = localize('pickSchedule.schedules', 'Schedules');
-
-	// UI Components
-	private dialog: sqlops.window.modelviewdialog.Dialog;
-	private schedulesTable: sqlops.TableComponent;
-
-	private model: PickScheduleData;
-
-	private _onSuccess: vscode.EventEmitter<PickScheduleData> = new vscode.EventEmitter<PickScheduleData>();
-	public readonly onSuccess: vscode.Event<PickScheduleData> = this._onSuccess.event;
-
-	constructor(ownerUri: string) {
-		this.model = new PickScheduleData(ownerUri);
-	}
-
-	public async showDialog() {
-		await this.model.initialize();
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
-		this.initializeContent();
-		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 initializeContent() {
-		this.dialog.registerContent(async view => {
-			this.schedulesTable = view.modelBuilder.table()
-				.withProperties({
-					columns: [
-						this.ScheduleNameLabelText
-					],
-					data: [],
-					height: '80em',
-					width: '40em'
-				}).component();
-
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.schedulesTable,
-					title: this.SchedulesLabelText
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-
-			if (this.model.schedules) {
-				let data: any[][] = [];
-				for (let i = 0; i < this.model.schedules.length; ++i) {
-					let schedule = this.model.schedules[i];
-					data[i] = [ schedule.name ];
-				}
-				this.schedulesTable.data = data;
-			}
-		});
-	}
-
-	private async execute() {
-		this.updateModel();
-		await this.model.save();
-		this._onSuccess.fire(this.model);
-	}
-
-	private async cancel() {
-	}
-
-	private updateModel() {
-		let selectedRows = this.schedulesTable.selectedRows;
-		if (selectedRows && selectedRows.length > 0) {
-			let selectedRow = selectedRows[0];
-			this.model.selectedSchedule = this.model.schedules[selectedRow];
-		}
-	}
-}

extensions/agent/src/dialogs/proxyDialog.ts

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

extensions/agent/src/dialogs/scheduleDialog.ts

@@ -1,95 +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 nls from 'vscode-nls';
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import { ScheduleData } from '../data/scheduleData';
-
-const localize = nls.loadMessageBundle();
-
-export class ScheduleDialog {
-
-	// Top level
-	private readonly DialogTitle: string = localize('scheduleDialog.newSchedule', 'New Schedule');
-	private readonly OkButtonText: string = localize('scheduleDialog.ok', 'OK');
-	private readonly CancelButtonText: string = localize('scheduleDialog.cancel', 'Cancel');
-	private readonly ScheduleNameText: string = localize('scheduleDialog.scheduleName', 'Schedule Name');
-	private readonly SchedulesLabelText: string = localize('scheduleDialog.schedules', 'Schedules');
-
-	// UI Components
-	private dialog: sqlops.window.modelviewdialog.Dialog;
-	private schedulesTable: sqlops.TableComponent;
-
-	private model: ScheduleData;
-
-	private _onSuccess: vscode.EventEmitter<ScheduleData> = new vscode.EventEmitter<ScheduleData>();
-	public readonly onSuccess: vscode.Event<ScheduleData> = this._onSuccess.event;
-
-	constructor(ownerUri: string) {
-		this.model = new ScheduleData(ownerUri);
-	}
-
-	public async showDialog() {
-		await this.model.initialize();
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
-		this.initializeContent();
-		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 initializeContent() {
-		this.dialog.registerContent(async view => {
-			this.schedulesTable = view.modelBuilder.table()
-				.withProperties({
-					columns: [
-						this.ScheduleNameText
-					],
-					data: [],
-					height: 600,
-					width: 400
-				}).component();
-
-			let formModel = view.modelBuilder.formContainer()
-				.withFormItems([{
-					component: this.schedulesTable,
-					title: this.SchedulesLabelText
-				}]).withLayout({ width: '100%' }).component();
-
-			await view.initializeModel(formModel);
-
-			if (this.model.schedules) {
-				let data: any[][] = [];
-				for (let i = 0; i < this.model.schedules.length; ++i) {
-					let schedule = this.model.schedules[i];
-					data[i] = [ schedule.name ];
-				}
-				this.schedulesTable.data = data;
-			}
-		});
-	}
-
-	private async execute() {
-		this.updateModel();
-		await this.model.save();
-		this._onSuccess.fire(this.model);
-	}
-
-	private async cancel() {
-	}
-
-	private updateModel() {
-		let selectedRows = this.schedulesTable.selectedRows;
-		if (selectedRows && selectedRows.length > 0) {
-			let selectedRow = selectedRows[0];
-			this.model.selectedSchedule = this.model.schedules[selectedRow];
-		}
-	}
-}

extensions/agent/src/mainController.ts

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

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

@@ -1,21 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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, undefined, testAgentService);
-		data.save();
-	});
-});

extensions/agent/src/test/testAgentService.ts

@@ -1,110 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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;
-	}
-
-	// Agent Credential method
-	getCredentials(ownerUri: string): Thenable<sqlops.GetCredentialsResult> {
-		return undefined;
-	}
-
-	// Job Schedule management methods
-	getJobSchedules(ownerUri: string): Thenable<sqlops.AgentJobSchedulesResult> {
-		return undefined;
-	}
-	createJobSchedule(ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.CreateAgentJobScheduleResult> {
-		return undefined;
-	}
-	updateJobSchedule(ownerUri: string, originalScheduleName: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.UpdateAgentJobScheduleResult> {
-		return undefined;
-	}
-	deleteJobSchedule(ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.ResultStatus> {
-		return undefined;
-	}
-
-	registerOnUpdated(handler: () => any): void {
-	}
-}

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

@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  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 types='@types/node'/>

extensions/merge-conflict/README.md

@@ -2,4 +2,4 @@
 
 See [documentation](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts).
 
-**Notice** This is a an extension that is bundled with SQL Operations Studio.
+**Notice** This is a an extension that is bundled with Visual Studio Code.

extensions/mssql/package.json

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

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,33 +42,38 @@
 	"Create a new Table": {
 		"prefix": "sqlCreateTable",
 		"body": [
-			"-- Create a new table called '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"-- Create a new table called '${1:TableName}' in schema '${2:SchemaName}'",
 			"-- Drop the table if it already exists",
-			"IF OBJECT_ID('[${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]', 'U') IS NOT NULL",
-			"DROP TABLE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
+			"IF OBJECT_ID('${2:SchemaName}.${1:TableName}', 'U') IS NOT NULL",
+			"DROP TABLE ${2:SchemaName}.${1:TableName}",
 			"GO",
-			"-- Create the table in the specified database and schema",
-			"CREATE TABLE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
+			"-- Create the table in the specified schema",
+			"CREATE TABLE ${2:SchemaName}.${1:TableName}",
 			"(",
-			"\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",
+			"\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",
 			");",
 			"GO"
 		],
 		"description": "Create a new Table"
 	},
 
-
 	"Drop a Table": {
 		"prefix": "sqlDropTable",
 		"body": [
-				"-- 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"
+			"-- 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"
 		],
 		"description": "Drop a Table"
 	},
@@ -76,9 +81,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}]' 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*/",
+			"-- 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*/",
 			"GO"
 		],
 		"description": "Add a new column to a Table"
@@ -87,9 +92,9 @@
 	"Drop a column from a Table": {
 		"prefix": "sqlDropColumn",
 		"body": [
-			"-- 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}]",
+			"-- Drop '${1:ColumnName}' from table '${2:TableName}' in schema '${3:SchemaName}'",
+			"ALTER TABLE ${3:SchemaName}.${2:TableName}",
+			"\tDROP COLUMN ${1:ColumnName}",
 			"GO"
 		],
 		"description": "Add a new column to a Table"
@@ -98,9 +103,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}]' in database '[${3:DatabaseName}]'",
-			"SELECT * FROM [${3:DatabaseName}].[${2:SchemaName}].[${1:TableOrViewName}]",
-			"WHERE ${4:/* add search conditions here */}",
+			"-- 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 */",
 			"GO"
 		],
 		"description": "Select rows from a Table or a View"
@@ -109,19 +114,19 @@
 	"Insert rows into a Table": {
 		"prefix": "sqlInsertRows",
 		"body": [
-			"-- 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]}",
+			"-- Insert rows into table '${1:TableName}'",
+			"INSERT INTO ${1:TableName}",
+			"( -- columns to insert data into",
+			" $2[Column1], [Column2], [Column3]",
 			")",
 			"VALUES",
-			"( -- First row: values for the columns in the list above",
-			" ${5:ColumnValue1, ColumnValue2, ColumnValue3}",
+			"( -- first row: values for the columns in the list above",
+			" $3Column1_Value, Column2_Value, Column3_Value",
 			"),",
-			"( -- Second row: values for the columns in the list above",
-			" ${6:ColumnValue1, ColumnValue2, ColumnValue3}",
+			"( -- second row: values for the columns in the list above",
+			" $4Column1_Value, Column2_Value, Column3_Value",
 			")",
-			"-- Add more rows here",
+			"-- add more rows here",
 			"GO"
 		],
 		"description": "Insert rows into a Table"
@@ -130,9 +135,9 @@
 	"Delete rows from a Table": {
 		"prefix": "sqlDeleteRows",
 		"body": [
-			"-- 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 */}",
+			"-- Delete rows from table '${1:TableName}'",
+			"DELETE FROM ${1:TableName}",
+			"WHERE $2\t/* add search conditions here */",
 			"GO"
 		],
 		"description": "Delete rows from a Table"
@@ -141,13 +146,13 @@
 	"Update rows in a Table": {
 		"prefix": "sqlUpdateRows",
 		"body": [
-			"-- Update rows in table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
-			"UPDATE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
+			"-- Update rows in table '${1:TableName}'",
+			"UPDATE ${1:TableName}",
 			"SET",
-			"\t[${4:ColumnName1}] = ${5:ColumnValue1},",
-			"\t[${6:ColumnName2}] = ${7:ColumnValue2}",
-			"\t-- Add more columns and values here",
-			"WHERE ${8:/* add search conditions here */}",
+			"\t$2[Colum1] = Colum1_Value,",
+			"\t$3[Colum2] = Colum2_Value",
+			"\t-- add more columns and values here",
+			"WHERE $4\t/* add search conditions here */",
 			"GO"
 		],
 		"description": "Update rows in a Table"
@@ -202,8 +207,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"
@@ -213,7 +218,7 @@
 		"prefix": "sqlListDatabases",
 		"body": [
 			"-- Get a list of databases",
-			"SELECT [name] FROM sys.databases",
+			"SELECT name FROM sys.databases",
 			"GO"
 		],
 		"description": "List databases"
@@ -227,8 +232,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",
 			"",
@@ -242,20 +247,20 @@
 		"prefix": "sqlCursor",
 		"body": [
 			"-- Declare a cursor for a Table or a View '${1:TableOrViewName}' in schema '${2:SchemaName}'",
-			"DECLARE @ColumnName1 NVARCHAR(50), @ColumnName2 NVARCHAR(50)",
+			"DECLARE @Column1 NVARCHAR(50), @Column2 NVARCHAR(50)",
 			"",
 			"DECLARE db_cursor CURSOR FOR",
-			"SELECT ColumnName1, Column2",
+			"SELECT Column1, Column2",
 			"FROM $2.$1",
 			"",
 			"OPEN db_cursor",
-			"FETCH NEXT FROM db_cursor INTO @ColumnName1, @ColumnName2",
+			"FETCH NEXT FROM db_cursor INTO @Column1, @Column2",
 			"",
 			"WHILE @@FETCH_STATUS = 0",
 			"BEGIN",
 			"\t-- add instructions to be executed for every row",
 			"\t$3",
-			"\tFETCH NEXT FROM db_cursor INTO @ColumnName1, @ColumnName2",
+			"\tFETCH NEXT FROM db_cursor INTO @Column1, @Column2",
 			"END",
 			"",
 			"CLOSE db_cursor",
@@ -298,34 +303,5 @@
 			"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.12",
+	"version": "1.4.0-alpha.45",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.1.zip",
 		"Windows_64": "win-x64-netcoreapp2.1.zip",
@@ -16,4 +16,4 @@
 	},
 	"installDirectory": "../sqltoolsservice/{#platform#}/{#version#}",
 	"executableFiles": ["MicrosoftSqlToolsServiceLayer.exe", "MicrosoftSqlToolsServiceLayer"]
-}
+}

extensions/mssql/src/contextProvider.ts

@@ -37,7 +37,7 @@ export default class ContextProvider {
 	public onDashboardOpen(e: sqlops.DashboardDocument): void {
 		let iscloud: boolean;
 		let edition: number;
-		if (e.profile.providerName.toLowerCase() === 'mssql' && !types.isUndefinedOrNull(e.serverInfo) && !types.isUndefinedOrNull(e.serverInfo.engineEditionId)) {
+		if (e.profile.providerName.toLowerCase() === 'mssql' && !types.isUndefinedOrNull(e.serverInfo.engineEditionId)) {
 			if (isCloudEditions.some(i => i === e.serverInfo.engineEditionId)) {
 				iscloud = true;
 			} else {

extensions/mssql/src/contracts.ts

@@ -64,10 +64,6 @@ export interface DeleteAgentJobParams {
 	job: sqlops.AgentJobInfo;
 }
 
-export interface AgentJobDefaultsParams {
-	ownerUri: string;
-}
-
 // Job Step management parameters
 export interface CreateAgentJobStepParams {
 	ownerUri: string;
@@ -148,32 +144,6 @@ export interface DeleteAgentProxyParams {
 	proxy: sqlops.AgentProxyInfo;
 }
 
-// Agent Credentials parameters
-export interface GetCredentialsParams {
-	ownerUri: string;
-}
-
-// Job Schedule management parameters
-export interface AgentJobScheduleParams {
-	ownerUri: string;
-}
-
-export interface CreateAgentJobScheduleParams {
-	ownerUri: string;
-	schedule: sqlops.AgentJobScheduleInfo;
-}
-
-export interface UpdateAgentJobScheduleParams {
-	ownerUri: string;
-	originalScheduleName: string;
-	schedule: sqlops.AgentJobScheduleInfo;
-}
-
-export interface DeleteAgentJobScheduleParams {
-	ownerUri: string;
-	schedule: sqlops.AgentJobScheduleInfo;
-}
-
 // Agent Job management requests
 export namespace AgentJobsRequest {
 	export const type = new RequestType<AgentJobsParams, sqlops.AgentJobsResult, void, void>('agent/jobs');
@@ -199,10 +169,6 @@ export namespace DeleteAgentJobRequest {
 	export const type = new RequestType<DeleteAgentJobParams, sqlops.ResultStatus, void, void>('agent/deletejob');
 }
 
-export namespace AgentJobDefaultsRequest {
-	export const type = new RequestType<AgentJobDefaultsParams, sqlops.AgentJobDefaultsResult, void, void>('agent/jobdefaults');
-}
-
 // Job Step requests
 export namespace CreateAgentJobStepRequest {
 	export const type = new RequestType<CreateAgentJobStepParams, sqlops.CreateAgentJobStepResult, void, void>('agent/createjobstep');
@@ -267,26 +233,4 @@ export namespace DeleteAgentProxyRequest {
 	export const type = new RequestType<DeleteAgentProxyParams, sqlops.ResultStatus, void, void>('agent/deleteproxy');
 }
 
-// Agent Credentials request
-export namespace AgentCredentialsRequest {
-	export const type = new RequestType<GetCredentialsParams, sqlops.GetCredentialsResult, void, void>('security/credentials');
-}
-
-// Job Schedules requests
-export namespace AgentJobSchedulesRequest {
-	export const type = new RequestType<AgentJobScheduleParams, sqlops.AgentJobSchedulesResult, void, void>('agent/schedules');
-}
-
-export namespace CreateAgentJobScheduleRequest {
-	export const type = new RequestType<CreateAgentJobScheduleParams, sqlops.CreateAgentJobScheduleResult, void, void>('agent/createschedule');
-}
-
-export namespace UpdateAgentJobScheduleRequest {
-	export const type = new RequestType<UpdateAgentJobScheduleParams, sqlops.UpdateAgentJobScheduleResult, void, void>('agent/updateschedule');
-}
-
-export namespace DeleteAgentJobScheduleRequest {
-	export const type = new RequestType<DeleteAgentJobScheduleParams, sqlops.ResultStatus, void, void>('agent/deleteschedule');
-}
-
 // ------------------------------- < Agent Management > ------------------------------------

extensions/mssql/src/features.ts

@@ -35,8 +35,6 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 		contracts.AgentJobActionRequest.type
 	];
 
-	private onUpdatedHandler: () => any;
-
 	constructor(client: SqlOpsDataClient) {
 		super(client, AgentServicesFeature.messagesTypes);
 	}
@@ -55,18 +53,6 @@ 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> => {
@@ -110,10 +96,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentJobRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -129,10 +112,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentJobRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -146,23 +126,6 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 				job: jobInfo
 			};
 			let requestType = contracts.DeleteAgentJobRequest.type;
-			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
-				e => {
-					client.logFailedRequest(requestType, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let getJobDefaults = (ownerUri: string): Thenable<sqlops.AgentJobDefaultsResult> => {
-			let params: contracts.AgentJobDefaultsParams = {
-				ownerUri: ownerUri
-			};
-			let requestType = contracts.AgentJobDefaultsRequest.type;
 			return client.sendRequest(requestType, params).then(
 				r => r,
 				e => {
@@ -180,10 +143,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentJobStepRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -199,10 +159,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentJobStepRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -217,10 +174,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentJobStepRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -250,10 +204,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentAlertRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -269,10 +220,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentAlertRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -287,10 +235,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentAlertRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -320,10 +265,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentOperatorRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -339,10 +281,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentOperatorRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -357,10 +296,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.DeleteAgentOperatorRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -390,10 +326,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.CreateAgentProxyRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -409,10 +342,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			};
 			let requestType = contracts.UpdateAgentProxyRequest.type;
 			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
+				r => r,
 				e => {
 					client.logFailedRequest(requestType, e);
 					return Promise.resolve(undefined);
@@ -426,24 +356,6 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 				proxy: proxyInfo
 			};
 			let requestType = contracts.DeleteAgentProxyRequest.type;
-			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
-				e => {
-					client.logFailedRequest(requestType, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		// Agent Credential Method
-		let  getCredentials = (ownerUri: string): Thenable<sqlops.GetCredentialsResult>  => {
-			let params: contracts.GetCredentialsParams = {
-				ownerUri: ownerUri
-			};
-			let requestType = contracts.AgentCredentialsRequest.type;
 			return client.sendRequest(requestType, params).then(
 				r => r,
 				e => {
@@ -453,77 +365,6 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			);
 		};
 
-
-		// Job Schedule management methods
-		let  getJobSchedules = (ownerUri: string): Thenable<sqlops.AgentJobSchedulesResult>  => {
-			let params: contracts.AgentJobScheduleParams = {
-				ownerUri: ownerUri
-			};
-			let requestType = contracts.AgentJobSchedulesRequest.type;
-			return client.sendRequest(requestType, params).then(
-				r => r,
-				e => {
-					client.logFailedRequest(requestType, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let createJobSchedule = (ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.CreateAgentJobScheduleResult> => {
-			let params: contracts.CreateAgentJobScheduleParams = {
-				ownerUri: ownerUri,
-				schedule: scheduleInfo
-			};
-			let requestType = contracts.CreateAgentJobScheduleRequest.type;
-			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
-				e => {
-					client.logFailedRequest(requestType, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let updateJobSchedule = (ownerUri: string, originalScheduleName: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.UpdateAgentJobScheduleResult> => {
-			let params: contracts.UpdateAgentJobScheduleParams = {
-				ownerUri: ownerUri,
-				originalScheduleName: originalScheduleName,
-				schedule: scheduleInfo
-			};
-			let requestType = contracts.UpdateAgentJobScheduleRequest.type;
-			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
-				e => {
-					client.logFailedRequest(requestType, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let deleteJobSchedule = (ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable<sqlops.ResultStatus> => {
-			let params: contracts.DeleteAgentJobScheduleParams = {
-				ownerUri: ownerUri,
-				schedule: scheduleInfo
-			};
-			let requestType = contracts.DeleteAgentJobScheduleRequest.type;
-			return client.sendRequest(requestType, params).then(
-				r => {
-					fireOnUpdated();
-					return r;
-				},
-				e => {
-					client.logFailedRequest(requestType, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
 		return sqlops.dataprotocol.registerAgentServicesProvider({
 			providerId: client.providerId,
 			getJobs,
@@ -532,7 +373,6 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			createJob,
 			updateJob,
 			deleteJob,
-			getJobDefaults,
 			createJobStep,
 			updateJobStep,
 			deleteJobStep,
@@ -547,13 +387,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 			getProxies,
 			createProxy,
 			updateProxy,
-			deleteProxy,
-			getCredentials,
-			getJobSchedules,
-			createJobSchedule,
-			updateJobSchedule,
-			deleteJobSchedule,
-			registerOnUpdated
+			deleteProxy
 		});
 	}
 }

extensions/mssql/src/telemetry.ts

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

extensions/mssql/yarn.lock

@@ -49,9 +49,9 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.0":
-  version "0.2.0"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/c7a691c7fc5ad54a147090784a7f11efda301f4b"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.1.7":
+  version "0.1.7"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/d50285b03d0d5073c086362c5c96afb279320607"
   dependencies:
     vscode-languageclient "3.5.0"
 

extensions/profiler/README.md

@@ -10,13 +10,6 @@ Common SQL Profiler use-cases taken from https://docs.microsoft.com/en-us/sql/to
 - Monitoring the performance of SQL Server to tune workloads.
 - Correlating performance counters to diagnose problems.
 
-## SQL Server Profiler 0.1.1 Release
-The SQL Server Profiler for SQL Operations Studio *Preview* extension is now available. This is the initial preview release for a new lightweight XEvent-based profiler. The SQL Server Profiler extension tries to make it simple to quickly trace server activity for troubleshooting and monitoring.
-
-We'll continue to enhance this extension over the next couple releases. Take a look at the below screenshot to see what's currently available.
-
-<img width="850" src="https://user-images.githubusercontent.com/599935/41578613-fa10e8bc-7347-11e8-8b97-9fb7d186c9f6.png">
-
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

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.2",
+  "version": "0.30.0",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt",
@@ -32,16 +32,6 @@
         "command": "profiler.newProfiler",
         "title": "New Profiler",
         "category": "Profiler"
-      },
-      {
-        "command": "profiler.start",
-        "title": "Start",
-        "category": "Profiler"
-      },
-      {
-        "command": "profiler.stop",
-        "title": "Stop",
-        "category": "Profiler"
       }
     ],
     "outputChannels": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlops",
-  "version": "0.32.1",
+  "version": "0.30.5",
   "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
   "author": {
     "name": "Microsoft Corporation"
@@ -60,7 +60,7 @@
     "reflect-metadata": "^0.1.8",
     "rxjs": "5.4.0",
     "semver": "4.3.6",
-    "slickgrid": "github:anthonydresser/SlickGrid#2.3.23",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.16",
     "spdlog": "0.6.0",
     "sudo-prompt": "^8.0.0",
     "svg.js": "^2.2.5",

product.json

@@ -27,16 +27,14 @@
 		"reportIssueUrl": "https://github.com/Microsoft/sqlopsstudio/issues/new?labels=customer%20reported%20issue",
 		"requestFeatureUrl": "https://github.com/Microsoft/sqlopsstudio/issues/new?labels=feature-request"
 	},
-	"gettingStartedUrl": "https://go.microsoft.com/fwlink/?linkid=862039",
-	"releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=875578",
+	"releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=862039",
 	"documentationUrl": "https://go.microsoft.com/fwlink/?linkid=862277",
 	"commit": "9ca6200018fc206d67a47229f991901a8a453781",
 	"date": "2017-12-15T12:00:00.000Z",
 	"recommendedExtensions": [
 		"Microsoft.agent",
-		"Microsoft.profiler",
-		"Microsoft.server-report",
 		"Microsoft.whoisactive",
+		"Microsoft.server-report",
 		"Redgate.sql-search"
 	],
 	"extensionsGallery": {

samples/serverReports/src/sql/all_db_space_used.sql

@@ -9,7 +9,7 @@ declare @dbsize table
     Free_Space_MB decimal(20,2) default (0))
 insert into @dbsize
     (Dbname,file_Size_MB,Space_Used_MB,Free_Space_MB)
-exec sp_MSforeachdb
+exec sp_msforeachdb
 'use [?];
   select DB_NAME() AS DbName,
 sum(size)/128.0 AS File_Size_MB,
@@ -24,7 +24,7 @@ declare @logsize table
     log_Free_Space_MB decimal(20,2)default (0))
 insert into @logsize
     (Dbname,Log_File_Size_MB,log_Space_Used_MB,log_Free_Space_MB)
-exec sp_MSforeachdb
+exec sp_msforeachdb
 'use [?];
   select DB_NAME() AS DbName,
 sum(size)/128.0 AS Log_File_Size_MB,
@@ -38,7 +38,7 @@ declare @dbfreesize table
     Freespace varchar(50)default (0.00))
 insert into @dbfreesize
     (name,database_size,Freespace)
-exec sp_MSforeachdb
+exec sp_msforeachdb
 'use [?];SELECT database_name = db_name()
     ,database_size = ltrim(str((convert(DECIMAL(15, 2), dbsize) + convert(DECIMAL(15, 2), logsize)) * 8192 / 1048576, 15, 2) + ''MB'')
     ,''unallocated space'' = ltrim(str((

samples/sqlservices/package.json

@@ -19,7 +19,7 @@
         "commands": [
             {
                 "command": "sqlservices.openDialog",
-                "title": "sqlservices.openDialog"
+                "title": "openDialog"
             },
             {
                 "command": "sqlservices.openEditor",
@@ -32,10 +32,6 @@
             {
                 "command": "sqlservices.openEditorWithWebView2",
                 "title": "sqlservices.openEditorWithWebView2"
-            },
-            {
-                "command": "sqlservices.openWizard",
-                "title": "sqlservices.openWizard"
             }
         ],
         "dashboard.tabs": [

samples/sqlservices/src/controllers/mainController.ts

@@ -60,212 +60,9 @@ export default class MainController implements vscode.Disposable {
 			this.openEditorWithWebview2();
 		});
 
-		vscode.commands.registerCommand('sqlservices.openWizard', () => {
-			this.openWizard();
-		});
-
 		return Promise.resolve(true);
 	}
 
-	private async getTabContent(view: sqlops.ModelView, customButton1: sqlops.window.modelviewdialog.Button, customButton2: sqlops.window.modelviewdialog.Button, componentWidth: number | string): Promise<void> {
-		let inputBox = view.modelBuilder.inputBox()
-			.withProperties({
-				multiline: true,
-				height: 100
-			}).component();
-		let inputBoxWrapper = view.modelBuilder.loadingComponent().withItem(inputBox).component();
-		inputBoxWrapper.loading = false;
-		customButton1.onClick(() => {
-			inputBoxWrapper.loading = true;
-			setTimeout(() => inputBoxWrapper.loading = false, 5000);
-		});
-		let inputBox2 = view.modelBuilder.inputBox().component();
-		let backupFilesInputBox = view.modelBuilder.inputBox().component();
-
-		let checkbox = view.modelBuilder.checkBox()
-			.withProperties({
-				label: 'Copy-only backup'
-			})
-			.component();
-		checkbox.onChanged(e => {
-			console.info("inputBox.enabled " + inputBox.enabled);
-			inputBox.enabled = !inputBox.enabled;
-		});
-		let button = view.modelBuilder.button()
-			.withProperties({
-				label: '+'
-			}).component();
-		let button3 = view.modelBuilder.button()
-			.withProperties({
-				label: '-'
-
-			}).component();
-		let button2 = view.modelBuilder.button()
-			.component();
-		button.onDidClick(e => {
-			backupFilesInputBox.value = 'Button clicked';
-		});
-		let dropdown = view.modelBuilder.dropDown()
-			.withProperties({
-				value: 'Full',
-				values: ['Full', 'Differential', 'Transaction Log']
-			})
-			.component();
-		let f = 0;
-		inputBox.onTextChanged((params) => {
-			vscode.window.showInformationMessage(inputBox.value);
-			f = f + 1;
-			inputBox2.value = f.toString();
-		});
-		dropdown.onValueChanged((params) => {
-			vscode.window.showInformationMessage(inputBox2.value);
-			inputBox.value = dropdown.value.toString();
-		});
-		let radioButton = view.modelBuilder.radioButton()
-			.withProperties({
-				value: 'option1',
-				name: 'radioButtonOptions',
-				label: 'Option 1',
-				checked: true
-				//width: 300
-			}).component();
-		let radioButton2 = view.modelBuilder.radioButton()
-			.withProperties({
-				value: 'option2',
-				name: 'radioButtonOptions',
-				label: 'Option 2'
-			}).component();
-		let inputBox3 = view.modelBuilder.inputBox().component();
-		let inputBox4 = view.modelBuilder.inputBox().component();
-		let form2Model = view.modelBuilder.formContainer()
-			.withFormItems([{
-				component: inputBox3,
-				title: 'inputBox3'
-			}, {
-				component: inputBox4,
-				title: 'inputBox4'
-			}], {
-					horizontal: true
-				}).component();
-		let groupModel1 = view.modelBuilder.groupContainer()
-			.withLayout({
-			}).withItems([
-				form2Model
-			]).component();
-		radioButton.onDidClick(() => {
-			inputBox.value = radioButton.value;
-			groupModel1.enabled = true;
-		});
-		radioButton2.onDidClick(() => {
-			inputBox.value = radioButton.value;
-			groupModel1.enabled = false;
-		});
-		let table = view.modelBuilder.table().withProperties({
-			data: [
-				['1', '2', '2'],
-				['4', '5', '6'],
-				['7', '8', '9']
-			], columns: ['c1', 'c2', 'c3'],
-			height: 250,
-			selectedRows: [0]
-		}).component();
-		table.onRowSelected(e => {
-			// TODO:
-		});
-		let listBox = view.modelBuilder.listBox().withProperties({
-			values: ['1', '2', '3'],
-			selectedRow: 2
-		}).component();
-
-		let declarativeTable = view.modelBuilder.declarativeTable()
-			.withProperties({
-				columns: [{
-					displayName: 'Column 1',
-					valueType: sqlops.DeclarativeDataType.string,
-					width: '20px',
-					isReadOnly: true
-				}, {
-					displayName: 'Column 2',
-					valueType: sqlops.DeclarativeDataType.string,
-					width: '100px',
-					isReadOnly: false
-				}, {
-					displayName: 'Column 3',
-					valueType: sqlops.DeclarativeDataType.boolean,
-					width: '20px',
-					isReadOnly: false
-				}, {
-					displayName: 'Column 4',
-					valueType: sqlops.DeclarativeDataType.category,
-					isReadOnly: false,
-					width: '120px',
-					categoryValues: [
-						{ name: 'options1', displayName: 'option 1' },
-						{ name: 'options2', displayName: 'option 2' }
-					]
-				}
-				],
-				data: [
-					['Data00', 'Data01', false, 'options2'],
-					['Data10', 'Data11', true, 'options1']
-				]
-			}).component();
-
-		declarativeTable.onDataChanged(e => {
-			inputBox2.value = e.row.toString() + ' ' + e.column.toString() + ' ' + e.value.toString();
-			inputBox3.value = declarativeTable.data[e.row][e.column];
-		});
-
-		let flexRadioButtonsModel = view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'column',
-				alignItems: 'left',
-				height: 150
-			}).withItems([
-				radioButton, groupModel1, radioButton2]
-				, { flex: '1 1 50%' }).component();
-		let formModel = view.modelBuilder.formContainer()
-			.withFormItems([{
-				component: inputBoxWrapper,
-				title: 'Backup name'
-			}, {
-				component: inputBox2,
-				title: 'Recovery model'
-			}, {
-				component: dropdown,
-				title: 'Backup type'
-			}, {
-				component: checkbox,
-				title: ''
-			}, {
-				component: backupFilesInputBox,
-				title: 'Backup files',
-				actions: [button, button3]
-			}, {
-				component: flexRadioButtonsModel,
-				title: 'Options'
-			}, {
-				component: declarativeTable,
-				title: 'Declarative Table'
-			}, {
-				component: table,
-				title: 'Table'
-			}, {
-				component: listBox,
-				title: 'List Box'
-			}], {
-					horizontal: false,
-					componentWidth: componentWidth
-				}).component();
-		let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
-		formWrapper.loading = false;
-		customButton2.onClick(() => {
-			formWrapper.loading = true;
-			setTimeout(() => formWrapper.loading = false, 5000);
-		});
-		await view.initializeModel(formWrapper);
-	}
-
 	private openDialog(): void {
 		let dialog = sqlops.window.modelviewdialog.createDialog('Test dialog');
 		let tab1 = sqlops.window.modelviewdialog.createTab('Test tab 1');
@@ -283,37 +80,205 @@ export default class MainController implements vscode.Disposable {
 		customButton2.onClick(() => console.log('button 2 clicked!'));
 		dialog.customButtons = [customButton1, customButton2];
 		tab1.registerContent(async (view) => {
-			await this.getTabContent(view, customButton1, customButton2, 400);
-		});
-		sqlops.window.modelviewdialog.openDialog(dialog);
-	}
+			let inputBox = view.modelBuilder.inputBox()
+				.withProperties({
+					multiline: true,
+					height: 100
+				}).component();
+			let inputBoxWrapper = view.modelBuilder.loadingComponent().withItem(inputBox).component();
+			inputBoxWrapper.loading = false;
+			customButton1.onClick(() => {
+				inputBoxWrapper.loading = true;
+				setTimeout(() => inputBoxWrapper.loading = false, 5000);
+			});
+			let inputBox2 = view.modelBuilder.inputBox().component();
+			let backupFilesInputBox = view.modelBuilder.inputBox().component();
 
-	private openWizard(): void {
-		let wizard = sqlops.window.modelviewdialog.createWizard('Test wizard');
-		let page1 = sqlops.window.modelviewdialog.createWizardPage('First wizard page');
-		let page2 = sqlops.window.modelviewdialog.createWizardPage('Second wizard page');
-		page2.content = 'sqlservices';
-		let customButton1 = sqlops.window.modelviewdialog.createButton('Load name');
-		customButton1.onClick(() => console.log('button 1 clicked!'));
-		let customButton2 = sqlops.window.modelviewdialog.createButton('Load all');
-		customButton2.onClick(() => console.log('button 2 clicked!'));
-		wizard.customButtons = [customButton1, customButton2];
-		page1.registerContent(async (view) => {
-			await this.getTabContent(view, customButton1, customButton2, 800);
+			let checkbox = view.modelBuilder.checkBox()
+				.withProperties({
+					label: 'Copy-only backup'
+				})
+				.component();
+			checkbox.onChanged(e => {
+				console.info("inputBox.enabled " + inputBox.enabled);
+				inputBox.enabled = !inputBox.enabled;
+			});
+			let button = view.modelBuilder.button()
+				.withProperties({
+					label: '+'
+				}).component();
+			let button3 = view.modelBuilder.button()
+				.withProperties({
+					label: '-'
+
+				}).component();
+			let button2 = view.modelBuilder.button()
+				.component();
+			button.onDidClick(e => {
+				backupFilesInputBox.value = 'Button clicked';
+			});
+			let dropdown = view.modelBuilder.dropDown()
+				.withProperties({
+					value: 'Full',
+					values: ['Full', 'Differential', 'Transaction Log']
+				})
+				.component();
+			let f = 0;
+			inputBox.onTextChanged((params) => {
+				vscode.window.showInformationMessage(inputBox.value);
+				f = f + 1;
+				inputBox2.value = f.toString();
+			});
+			dropdown.onValueChanged((params) => {
+				vscode.window.showInformationMessage(inputBox2.value);
+				inputBox.value = dropdown.value;
+			});
+			let radioButton = view.modelBuilder.radioButton()
+				.withProperties({
+					value: 'option1',
+					name: 'radioButtonOptions',
+					label: 'Option 1',
+					checked: true
+					//width: 300
+				}).component();
+			let radioButton2 = view.modelBuilder.radioButton()
+				.withProperties({
+					value: 'option2',
+					name: 'radioButtonOptions',
+					label: 'Option 2'
+				}).component();
+			let inputBox3 = view.modelBuilder.inputBox().component();
+			let inputBox4 = view.modelBuilder.inputBox().component();
+			let form2Model = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: inputBox3,
+					title: 'inputBox3'
+				}, {
+					component: inputBox4,
+					title: 'inputBox4'
+				}], {
+					horizontal: true
+				}).component();
+			let groupModel1 = view.modelBuilder.groupContainer()
+				.withLayout({
+				}).withItems([
+					form2Model
+				]).component();
+			radioButton.onDidClick(() => {
+				inputBox.value = radioButton.value;
+				groupModel1.enabled = true;
+			});
+			radioButton2.onDidClick(() => {
+				inputBox.value = radioButton.value;
+				groupModel1.enabled = false;
+			});
+			let table = view.modelBuilder.table().withProperties({
+				data: [
+					['1', '2', '2'],
+					['4', '5', '6'],
+					['7', '8', '9']
+				], columns: ['c1', 'c2', 'c3'],
+				height: 250,
+				selectedRows: [0]
+			}).component();
+			table.onRowSelected(e => {
+				// TODO:
+			});
+			let listBox = view.modelBuilder.listBox().withProperties({
+				values: ['1', '2', '3'],
+				selectedRow: 2
+			}).component();
+
+			let declarativeTable = view.modelBuilder.declarativeTable()
+			.withProperties({
+				columns: [{
+						displayName: 'Column 1',
+						valueType: sqlops.DeclarativeDataType.string,
+						width: '20px',
+						isReadOnly: true
+					}, {
+						displayName: 'Column 2',
+						valueType: sqlops.DeclarativeDataType.string,
+						width: '100px',
+						isReadOnly: false
+					}, {
+						displayName: 'Column 3',
+						valueType: sqlops.DeclarativeDataType.boolean,
+						width: '20px',
+						isReadOnly: false
+					}, {
+						displayName: 'Column 4',
+						valueType: sqlops.DeclarativeDataType.category,
+						isReadOnly: false,
+						width: '120px',
+						categoryValues: [
+							{ name: 'options1', displayName: 'option 1' },
+							{ name: 'options2', displayName: 'option 2' }
+						]
+					}
+				],
+				data: [
+					['Data00', 'Data01', false, 'options2'],
+					['Data10', 'Data11', true, 'options1']
+				]
+			}).component();
+
+			declarativeTable.onDataChanged(e => {
+				inputBox2.value = e.row.toString() + ' ' + e.column.toString() + ' ' + e.value.toString();
+				inputBox3.value = declarativeTable.data[e.row][e.column];
+			});
+
+			let flexRadioButtonsModel = view.modelBuilder.flexContainer()
+				.withLayout({
+					flexFlow: 'column',
+					alignItems: 'left',
+					height: 150
+				}).withItems([
+					radioButton, groupModel1, radioButton2]
+				, { flex: '1 1 50%' }).component();
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
+					component: inputBoxWrapper,
+					title: 'Backup name'
+				}, {
+					component: inputBox2,
+					title: 'Recovery model'
+				}, {
+					component: dropdown,
+					title: 'Backup type'
+				}, {
+					component: checkbox,
+					title: ''
+				}, {
+					component: backupFilesInputBox,
+					title: 'Backup files',
+					actions: [button, button3]
+				}, {
+					component: flexRadioButtonsModel,
+					title: 'Options'
+				}, {
+					component: declarativeTable,
+					title: 'Declarative Table'
+				}, {
+					component: table,
+					title: 'Table'
+				}, {
+					component: listBox,
+					title: 'List Box'
+				}], {
+					horizontal: false,
+					componentWidth: 400
+				}).component();
+			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
+			formWrapper.loading = false;
+			customButton2.onClick(() => {
+				formWrapper.loading = true;
+				setTimeout(() => formWrapper.loading = false, 5000);
+			});
+			await view.initializeModel(formWrapper);
 		});
-		wizard.registerOperation({
-			displayName: 'test task',
-			description: 'task description',
-			isCancelable: true
-		}, op => {
-			op.updateStatus(sqlops.TaskStatus.InProgress);
-			op.updateStatus(sqlops.TaskStatus.InProgress, 'Task is running');
-			setTimeout(() => {
-				op.updateStatus(sqlops.TaskStatus.Succeeded);
-			}, 5000);
-		});
-		wizard.pages = [page1, page2];
-		wizard.open();
+
+		sqlops.window.modelviewdialog.openDialog(dialog);
 	}
 
 	private openEditor(): void {
@@ -389,14 +354,13 @@ export default class MainController implements vscode.Disposable {
 			let monitorLightPath = vscode.Uri.file(path.join(__dirname, '..', 'media', 'monitor.svg'));
 			let monitorIcon = {
 				light: monitorLightPath,
-				dark: path.join(__dirname, '..', 'media', 'monitor_inverse.svg')
-			};
+				dark: path.join(__dirname, '..', 'media', 'monitor_inverse.svg') };
 
 			let monitorButton = view.modelBuilder.button()
-				.withProperties({
-					label: 'Monitor',
-					iconPath: monitorIcon
-				}).component();
+					.withProperties({
+						label: 'Monitor',
+						iconPath: monitorIcon
+					}).component();
 			let toolbarModel = view.modelBuilder.toolbarContainer()
 				.withToolbarItems([{
 					component: inputBox,

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

@@ -11,7 +11,7 @@ export class ToggleDropdownAction extends Action {
 	private static readonly ID = 'dropdownAction.toggle';
 	private static readonly ICON = 'dropdown-arrow';
 
-	constructor(private _fn: () => any, label: string) {
+	constructor(label, private _fn: () => any) {
 		super(ToggleDropdownAction.ID, label, ToggleDropdownAction.ICON);
 	}
 

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

@@ -53,10 +53,6 @@ export interface IDropdownOptions extends IDropdownStyles {
 	 * Value to use as aria-label for the input box
 	 */
 	ariaLabel?: string;
-	/**
-	 * Label for the dropdown action
-	 */
-	actionLabel: string;
 }
 
 export interface IDropdownStyles {
@@ -70,8 +66,7 @@ const defaults: IDropdownOptions = {
 	strictSelection: true,
 	maxHeight: 300,
 	errorMessage: errorMessage,
-	contextBorder: Color.fromHex('#696969'),
-	actionLabel: nls.localize('dropdownAction.toggle', "Toggle dropdown")
+	contextBorder: Color.fromHex('#696969')
 };
 
 interface ListResource {
@@ -120,11 +115,11 @@ export class Dropdown extends Disposable {
 		this.$input = $('.dropdown-input').style('width', '100%').appendTo(this.$el);
 		this.$treeContainer = $('.dropdown-tree');
 
-		this._toggleAction = new ToggleDropdownAction(() => {
+		this._toggleAction = new ToggleDropdownAction(nls.localize('dropdown.toggle', '{0} Toggle Dropdown', this._options.ariaLabel), () => {
 			this._showList();
 			this._tree.domFocus();
 			this._tree.focusFirst();
-		}, opt.actionLabel);
+		});
 
 		this._input = new InputBox(this.$input.getHTMLElement(), contextViewService, {
 			validationOptions: {

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 'use strict';
-import { InputBox as vsInputBox, IInputOptions, IInputBoxStyles as vsIInputBoxStyles, IMessage } from 'vs/base/browser/ui/inputbox/inputBox';
+import { InputBox as vsInputBox, IInputOptions, IInputBoxStyles as vsIInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
 import { Color } from 'vs/base/common/color';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -33,7 +33,6 @@ export class InputBox extends vsInputBox {
 	public onLoseFocus: Event<OnLoseFocusParams> = this._onLoseFocus.event;
 
 	private _isTextAreaInput: boolean;
-	private _hideErrors = false;
 
 	constructor(container: HTMLElement, contextViewProvider: IContextViewProvider, options?: IInputOptions) {
 		super(container, contextViewProvider, options);
@@ -63,13 +62,13 @@ export class InputBox extends vsInputBox {
 		this.enabledInputBorder = this.inputBorder;
 		this.disabledInputBackground = styles.disabledInputBackground;
 		this.disabledInputForeground = styles.disabledInputForeground;
-		this.updateInputEnabledDisabledColors();
-		this.applyStyles();
 	}
 
 	public enable(): void {
 		super.enable();
-		this.updateInputEnabledDisabledColors();
+		this.inputBackground = this.enabledInputBackground;
+		this.inputForeground = this.enabledInputForeground;
+		this.inputBorder = this.enabledInputBorder;
 		this.applyStyles();
 	}
 
@@ -89,7 +88,9 @@ export class InputBox extends vsInputBox {
 
 	public disable(): void {
 		super.disable();
-		this.updateInputEnabledDisabledColors();
+		this.inputBackground = this.disabledInputBackground;
+		this.inputForeground = this.disabledInputForeground;
+		this.inputBorder = this.disabledInputBorder;
 		this.applyStyles();
 	}
 
@@ -102,28 +103,4 @@ export class InputBox extends vsInputBox {
 	public isEnabled(): boolean {
 		return !this.inputElement.hasAttribute('disabled');
 	}
-
-	public get hideErrors(): boolean {
-		return this._hideErrors;
-	}
-
-	public set hideErrors(hideErrors: boolean) {
-		this._hideErrors = hideErrors;
-		if (hideErrors) {
-			this.hideMessage();
-		}
-	}
-
-	public showMessage(message: IMessage, force?: boolean): void {
-		if (!this.hideErrors) {
-			super.showMessage(message, force);
-		}
-	}
-
-	private updateInputEnabledDisabledColors(): void {
-		let enabled = this.isEnabled();
-		this.inputBackground = enabled ? this.enabledInputBackground : this.disabledInputBackground;
-		this.inputForeground = enabled ? this.enabledInputForeground : this.disabledInputForeground;
-		this.inputBorder = enabled ? this.enabledInputBorder : this.disabledInputBorder;
-	}
 }

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

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

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

@@ -172,22 +172,4 @@
 	margin-right: 10px;
 	width: 20px;
 	height: 20px;
-}
-
-.modal .modal-footer .dialogErrorMessage {
-	align-items: center;
-	max-height: 30px;
-	margin-right: 5px;
-}
-
-.modal .dialogErrorMessage .icon {
-	float: left;
-	margin-right: 10px;
-	width: auto;
-	height: 20px;
-}
-
-.modal .modal-footer .dialogErrorMessage .errorMessage {
-	max-height: 100%;
-	overflow-y: scroll;
 }

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

@@ -21,13 +21,9 @@ import { Button } from 'sql/base/browser/ui/button/button';
 import * as TelemetryUtils from 'sql/common/telemetryUtilities';
 import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { localize } from 'vs/nls';
-import { MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 export const MODAL_SHOWING_KEY = 'modalShowing';
 export const MODAL_SHOWING_CONTEXT = new RawContextKey<Array<string>>(MODAL_SHOWING_KEY, []);
-const INFO_ALT_TEXT = localize('infoAltText', 'Info');
-const WARNING_ALT_TEXT = localize('warningAltText', 'Warning');
-const ERROR_ALT_TEXT = localize('errorAltText', 'Error');
 
 export interface IModalDialogStyles {
 	dialogForeground?: Color;
@@ -149,7 +145,7 @@ export abstract class Modal extends Disposable implements IThemable {
 	/**
 	 * Build and render the modal, will call {@link Modal#renderBody}
 	 */
-	public render(errorMessagesInFooter: boolean = false) {
+	public render() {
 		let modalBodyClass = (this._modalOptions.isAngular === false ? 'modal-body' : 'modal-body-and-footer');
 		let parts: Array<HTMLElement> = [];
 		// This modal header section refers to the header of of the dialog
@@ -170,7 +166,7 @@ export abstract class Modal extends Disposable implements IThemable {
 				}
 				modalHeader.div({ class: 'modal-title' }, (modalTitle) => {
 					this._modalTitle = modalTitle;
-					modalTitle.text(this._title);
+					modalTitle.innerHtml(this._title);
 				});
 			});
 			parts.push(this._modalHeaderSection.getHTMLElement());
@@ -186,6 +182,17 @@ export abstract class Modal extends Disposable implements IThemable {
 
 		this.renderBody(body.getHTMLElement());
 
+		if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) {
+			body.div({ class: 'dialogErrorMessage', id: 'dialogErrorMessage' }, (errorMessageContainer) => {
+				errorMessageContainer.div({ class: 'icon error' }, (iconContainer) => {
+					this._errorIconElement = iconContainer.getHTMLElement();
+					this._errorIconElement.style.visibility = 'hidden';
+				});
+				errorMessageContainer.div({ class: 'errorMessage' }, (messageContainer) => {
+					this._errorMessage = messageContainer;
+				});
+			});
+		}
 		// This modal footer section refers to the footer of of the dialog
 		if (this._modalOptions.isAngular === false) {
 			this._modalFooterSection = $().div({ class: 'modal-footer' }, (modelFooter) => {
@@ -214,19 +221,6 @@ export abstract class Modal extends Disposable implements IThemable {
 			builderClass += ' wide';
 		}
 
-		if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) {
-			let builder = errorMessagesInFooter ? this._leftFooter : body;
-			builder.div({ class: 'dialogErrorMessage', id: 'dialogErrorMessage' }, (errorMessageContainer) => {
-				errorMessageContainer.div({ class: 'icon error' }, (iconContainer) => {
-					this._errorIconElement = iconContainer.getHTMLElement();
-					this._errorIconElement.style.visibility = 'hidden';
-				});
-				errorMessageContainer.div({ class: 'errorMessage' }, (messageContainer) => {
-					this._errorMessage = messageContainer;
-				});
-			});
-		}
-
 		// The builder builds the dialog. It append header, body and footer sections.
 		this._builder = $().div({ class: builderClass, 'role': 'dialog' }, (dialogContainer) => {
 			this._modalDialog = dialogContainer.div({ class: 'modal-dialog ', role: 'document' }, (modalDialog) => {
@@ -361,33 +355,14 @@ export abstract class Modal extends Disposable implements IThemable {
 	 * Show an error in the error message element
 	 * @param err Text to show in the error message
 	 */
-	protected setError(err: string, level: MessageLevel = MessageLevel.Error) {
+	protected setError(err: string) {
 		if (this._modalOptions.hasErrors) {
 			if (err === '') {
 				this._errorIconElement.style.visibility = 'hidden';
 			} else {
-				const levelClasses = ['info', 'warning', 'error'];
-				let selectedLevel = levelClasses[2];
-				let altText = ERROR_ALT_TEXT;
-				if (level === MessageLevel.Information) {
-					selectedLevel = levelClasses[0];
-					altText = INFO_ALT_TEXT;
-				} else if (level === MessageLevel.Warning) {
-					selectedLevel = levelClasses[1];
-					altText = WARNING_ALT_TEXT;
-				}
-				levelClasses.forEach(level => {
-					if (selectedLevel === level) {
-						this._errorIconElement.classList.add(level);
-					} else {
-						this._errorIconElement.classList.remove(level);
-					}
-				});
-
-				this._errorIconElement.title = altText;
 				this._errorIconElement.style.visibility = 'visible';
 			}
-			this._errorMessage.text(err);
+			this._errorMessage.innerHtml(err);
 		}
 	}
 
@@ -433,7 +408,7 @@ export abstract class Modal extends Disposable implements IThemable {
 	 */
 	protected set title(title: string) {
 		if (this._title !== undefined) {
-			this._modalTitle.text(title);
+			this._modalTitle.innerHtml(title);
 		}
 	}
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/sql/base/common/strings.ts

@@ -1,22 +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';
-
-/**
- * Converts HTML characters inside the string to use entities instead. Makes the string safe from
- * being used e.g. in HTMLElement.innerHTML.
- */
-export function escape(html: string): string {
-	return html.replace(/[<|>|&|"]/g, function (match) {
-		switch (match) {
-			case '<': return '&lt;';
-			case '>': return '&gt;';
-			case '&': return '&amp;';
-			case '"': return '&quot;';
-			case '\'': return '&#39';
-			default: return match;
-		}
-	});
-}

src/sql/common/constants.ts

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

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

@@ -81,15 +81,6 @@
 	content: url("status_info.svg");
 }
 
-.vs .icon.help {
-	content: url("help.svg");
-}
-
-.vs-dark .icon.help,
-.hc-black .icon.help {
-	content: url("help_inverse.svg");
-}
-
 .vs .icon.success,
 .vs-dark .icon.success,
 .hc-black .icon.success {
@@ -225,19 +216,4 @@
 
 .vs .icon.unpin {
 	background: url('unpin.svg') center center no-repeat;
-}
-
-.small {
-	width: 16px;
-	height: 16px;
-}
-
-.medium {
-	width: 24px;
-	height: 24px;
-}
-
-.large {
-	width: 32px;
-	height: 32px;
 }

src/sql/media/icons/help.svg

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

src/sql/media/icons/help_inverse.svg

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

src/sql/media/icons/status_info.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-blue{fill:#1BA1E2;} .icon-white{fill:#FFFFFF;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M0 8c0-4.418 3.582-8 8-8s8 3.582 8 8-3.582 8-8 8-8-3.582-8-8z" id="outline"/><path class="icon-vs-blue" d="M8 1c-3.865 0-7 3.135-7 7s3.135 7 7 7 7-3.135 7-7-3.135-7-7-7zm1 12h-2v-7h2v7zm0-8h-2v-2h2v2z" id="iconBg"/><path class="icon-white" d="M7 6h2v7h-2v-7zm0-1h2v-2h-2v2z" id="iconFg"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-blue{fill:#1BA1E2;} .icon-white{fill:#FFFFFF;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M0 8c0-4.418 3.582-8 8-8s8 3.582 8 8-3.582 8-8 8-8-3.582-8-8z" id="outline"/><path class="icon-vs-blue" d="M8 1c-3.865 0-7 3.135-7 7s3.135 7 7 7 7-3.135 7-7-3.135-7-7-7zm1 12h-2v-7h2v7zm0-8h-2v-2h2v2z" id="iconBg"/><path class="icon-white" d="M7 6h2v7h-2v-7zm0-1h2v-2h-2v2z" id="iconFg"/></svg>

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

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

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

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

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

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

src/sql/parts/admin/security/createLogin.module.ts

@@ -6,14 +6,12 @@
 import { NgModule, Inject, forwardRef, ApplicationRef, ComponentFactoryResolver, Type } from '@angular/core';
 import { APP_BASE_HREF, CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
+import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
 
-import { IBootstrapParams, providerIterator } from 'sql/services/bootstrap/bootstrapService';
-import { CreateLoginComponent } from 'sql/parts/admin/security/createLogin.component';
-
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { CreateLoginComponent, CREATELOGIN_SELECTOR } from 'sql/parts/admin/security/createLogin.component';
 
 // Connection Dashboard main angular module
-export const CreateLoginModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type<any> => {
+export const CreateLoginModule = (params: IBootstrapParams, selector: string): Type<any> => {
 
 	@NgModule({
 		declarations: [
@@ -26,8 +24,7 @@ export const CreateLoginModule = (params: IBootstrapParams, selector: string, in
 		],
 		providers: [
 			{ provide: APP_BASE_HREF, useValue: '/' },
-			{ provide: IBootstrapParams, useValue: params },
-			...providerIterator(instantiationService)
+			{ provide: IBootstrapParams, useValue: params }
 		]
 	})
 	class ModuleClass {

src/sql/parts/common/customInputConverter.ts

@@ -38,13 +38,13 @@ export function convertEditorInput(input: EditorInput, options: IQueryEditorOpti
 		let uri: URI = getQueryEditorFileUri(input);
 		if (uri) {
 			const queryResultsInput: QueryResultsInput = instantiationService.createInstance(QueryResultsInput, uri.toString());
-			let queryInput: QueryInput = instantiationService.createInstance(QueryInput, '', input, queryResultsInput, undefined);
+			let queryInput: QueryInput = instantiationService.createInstance(QueryInput, input.getName(), '', input, queryResultsInput, undefined);
 			return queryInput;
 		}
 
 		//QueryPlanInput
 		uri = getQueryPlanEditorUri(input);
-		if (uri) {
+		if(uri) {
 			let queryPlanXml: string = fs.readFileSync(uri.fsPath);
 			let queryPlanInput: QueryPlanInput = instantiationService.createInstance(QueryPlanInput, queryPlanXml, 'aaa', undefined);
 			return queryPlanInput;
@@ -60,14 +60,14 @@ export function convertEditorInput(input: EditorInput, options: IQueryEditorOpti
  */
 export function getSupportedInputResource(input: IEditorInput): URI {
 	if (input instanceof UntitledEditorInput) {
-		let untitledCast: UntitledEditorInput = <UntitledEditorInput>input;
+		let untitledCast: UntitledEditorInput = <UntitledEditorInput> input;
 		if (untitledCast) {
 			return untitledCast.getResource();
 		}
 	}
 
 	if (input instanceof FileEditorInput) {
-		let fileCast: FileEditorInput = <FileEditorInput>input;
+		let fileCast: FileEditorInput  = <FileEditorInput> input;
 		if (fileCast) {
 			return fileCast.getResource();
 		}
@@ -99,7 +99,7 @@ function getQueryEditorFileUri(input: EditorInput): URI {
 		if (uri) {
 			let isValidUri: boolean = !!uri && !!uri.toString;
 
-			if (isValidUri && (hasFileExtension(sqlFileTypes, input, true) || hasSqlFileMode(input))) {
+			if (isValidUri && (hasFileExtension(sqlFileTypes, input, true) || hasSqlFileMode(input)) ) {
 				return uri;
 			}
 		}
@@ -120,7 +120,7 @@ function getQueryPlanEditorUri(input: EditorInput): URI {
 	// If this editor is not already of type queryinput
 	if (!(input instanceof QueryPlanInput)) {
 		let uri: URI = getSupportedInputResource(input);
-		if (uri) {
+		if(uri) {
 			if (hasFileExtension(sqlPlanFileTypes, input, false)) {
 				return uri;
 			}
@@ -136,7 +136,7 @@ function getQueryPlanEditorUri(input: EditorInput): URI {
  */
 function hasSqlFileMode(input: EditorInput): boolean {
 	if (input instanceof UntitledEditorInput) {
-		let untitledCast: UntitledEditorInput = <UntitledEditorInput>input;
+		let untitledCast: UntitledEditorInput = <UntitledEditorInput> input;
 		return untitledCast && (untitledCast.getModeId() === undefined || untitledCast.getModeId() === sqlModeId);
 	}
 

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

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

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

@@ -174,7 +174,7 @@ export interface IConnectionManagementService {
 
 	disconnectEditor(owner: IConnectableInput, force?: boolean): Promise<boolean>;
 
-	disconnect(connection: IConnectionProfile): Promise<void>;
+	disconnect(connection: ConnectionProfile): Promise<void>;
 
 	disconnect(ownerUri: string): Promise<void>;
 
@@ -208,7 +208,7 @@ export interface IConnectionManagementService {
 	 */
 	cancelEditorConnection(owner: IConnectableInput): Thenable<boolean>;
 
-	showDashboard(connection: IConnectionProfile): Thenable<boolean>;
+	showDashboard(connection: ConnectionProfile): Thenable<boolean>;
 
 	closeDashboard(uri: string): void;
 
@@ -216,7 +216,7 @@ export interface IConnectionManagementService {
 
 	hasRegisteredServers(): boolean;
 
-	canChangeConnectionConfig(profile: IConnectionProfile, newGroupID: string): boolean;
+	canChangeConnectionConfig(profile: ConnectionProfile, newGroupID: string): boolean;
 
 	getTabColorForUri(uri: string): string;
 
@@ -320,13 +320,12 @@ export enum MetadataType {
 }
 
 export enum TaskStatus {
-	NotStarted = 0,
-	InProgress = 1,
-	Succeeded = 2,
-	SucceededWithWarning = 3,
-	Failed = 4,
-	Canceled = 5,
-	Canceling = 6
+	notStarted = 0,
+	inProgress = 1,
+	succeeded = 2,
+	succeededWithWarning = 3,
+	failed = 4,
+	canceled = 5
 }
 
 export interface IConnectionParams {

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

@@ -553,7 +553,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		});
 	}
 
-	public showDashboard(connection: IConnectionProfile): Thenable<boolean> {
+	public showDashboard(connection: ConnectionProfile): Thenable<boolean> {
 		return this.showDashboardForConnectionManagementInfo(connection);
 	}
 

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

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

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

@@ -21,8 +21,6 @@ export const capabilitiesOptions = 'OPTIONS_METADATA';
 export const configMaxRecentConnections = 'maxRecentConnections';
 
 export const mssqlProviderName = 'MSSQL';
-export const anyProviderName = '*';
-export const connectionProviderContextKey = 'connectionProvider';
 
 export const applicationName = 'sqlops';
 

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

@@ -280,23 +280,26 @@ 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;
 				});
 			}
-			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);
+			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;
 				}
-			}));
+
+				resolve(this.showDialogWithModel().then(() => {
+					if (connectionResult && connectionResult.errorMessage) {
+						this.showErrorDialog(Severity.Error, this._connectionErrorTitle, connectionResult.errorMessage, connectionResult.callStack);
+					}
+				}));
+			}, e => reject(e));
 		});
 	}
 
@@ -339,9 +342,9 @@ export class ConnectionDialogService implements IConnectionDialogService {
 		if (!platform.isWindows && types.isString(message) && message.toLowerCase().includes('kerberos') && message.toLowerCase().includes('kinit')) {
 			message = [
 				localize('kerberosErrorStart', "Connection failed due to Kerberos error."),
-				localize('kerberosHelpLink', "Help configuring Kerberos is available at {0}", helpLink),
-				localize('kerberosKinit', "If you have previously connected you may need to re-run kinit.")
-			].join('\r\n');
+				localize('kerberosHelpLink', "&nbsp;Help configuring Kerberos is available at ") + helpLink,
+				localize('kerberosKinit', "&nbsp;If you have previously connected you may need to re-run kinit.")
+			].join('<br/>');
 			actions.push(new Action('Kinit', 'Run kinit', null, true, () => {
 				this._connectionDialog.close();
 				this._clipboardService.writeText('kinit\r');

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

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

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

@@ -172,8 +172,7 @@ export class ConnectionWidget {
 			strictSelection: false,
 			placeholder: this._defaultDatabaseName,
 			maxHeight: 125,
-			ariaLabel: databaseOption.displayName,
-			actionLabel: localize('toggleDatabaseNameDropdown', 'Select Database Toggle Dropdown')
+			ariaLabel: databaseOption.displayName
 		});
 
 		let serverGroupLabel = localize('serverGroup', 'Server group');

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

@@ -19,9 +19,9 @@ import { WEBVIEW_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWebvi
 import { MODELVIEW_CONTAINER } from 'sql/parts/dashboard/containers/dashboardModelViewContainer.contribution';
 import { CONTROLHOST_CONTAINER } from 'sql/parts/dashboard/containers/dashboardControlHostContainer.contribution';
 import { NAV_SECTION } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution';
-import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
+import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions, IDashboardContainer, registerContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
+import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
 import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service';
-import * as Constants from 'sql/parts/connection/common/constants';
 
 const dashboardcontainerRegistry = Registry.as<IDashboardContainerRegistry>(DashboardContainerExtensions.dashboardContainerContributions);
 const containerTypes = [
@@ -136,17 +136,13 @@ export function addProvider<T extends { connectionManagementService: SingleConne
  */
 export function addEdition<T extends { connectionManagementService: SingleConnectionManagementService }>(config: WidgetConfig[], collection: DashboardServiceInterface): Array<WidgetConfig> {
 	let connectionInfo: ConnectionManagementInfo = collection.connectionManagementService.connectionInfo;
-	if (connectionInfo.serverInfo) {
-		let edition = connectionInfo.serverInfo.engineEditionId;
-		return config.map((item) => {
-			if (item.edition === undefined) {
-				item.edition = edition;
-			}
-			return item;
-		});
-	} else {
-		return config;
-	}
+	let edition = connectionInfo.serverInfo.engineEditionId;
+	return config.map((item) => {
+		if (item.edition === undefined) {
+			item.edition = edition;
+		}
+		return item;
+	});
 }
 
 /**
@@ -166,11 +162,9 @@ export function addContext(config: WidgetConfig[], collection: any, context: str
  * Returns a filtered version of the widgets passed based on edition and provider
  * @param config widgets to filter
  */
-export function filterConfigs<T extends { provider?: string | string[], when?: string }, K extends { contextKeyService: IContextKeyService }>(config: T[], collection: K): Array<T> {
+export function filterConfigs<T extends { when?: string }, K extends { contextKeyService: IContextKeyService }>(config: T[], collection: K): Array<T> {
 	return config.filter((item) => {
-		if (!hasCompatibleProvider(item.provider, collection.contextKeyService)) {
-			return false;
-		} else if (!item.when) {
+		if (!item.when) {
 			return true;
 		} else {
 			return collection.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(item.when));
@@ -178,21 +172,6 @@ export function filterConfigs<T extends { provider?: string | string[], when?: s
 	});
 }
 
-/**
- * Check whether the listed providers contain '*' indicating any provider will do, or that they are a match
- * for the currently scoped 'connectionProvider' context key.
- */
-function hasCompatibleProvider(provider: string | string[], contextKeyService: IContextKeyService): boolean {
-	let isCompatible = true;
-	let connectionProvider = contextKeyService.getContextKeyValue<string>(Constants.connectionProviderContextKey);
-	if (connectionProvider) {
-		let providers = (provider instanceof Array) ? provider : [provider];
-		let matchingProvider = providers.find((p) => p === connectionProvider || p === Constants.anyProviderName);
-		isCompatible = (matchingProvider !== undefined);
-	}	// Else there's no connection context so skip the check
-	return isCompatible;
-}
-
 /**
  * Get registered container if it is specified as the key
  * @param container dashboard container

src/sql/parts/dashboard/common/dashboardPage.component.ts

@@ -17,12 +17,11 @@ import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab }
 import { PinUnpinTabAction, AddFeatureTabAction } from './actions';
 import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { AngularEventType, IAngularEventingService } from 'sql/services/angularEventing/angularEventingService';
-import { DashboardTab, IConfigModifierCollection } from 'sql/parts/dashboard/common/interfaces';
+import { DashboardTab } from 'sql/parts/dashboard/common/interfaces';
 import * as dashboardHelper from 'sql/parts/dashboard/common/dashboardHelper';
 import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution';
 import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution';
 import { AngularDisposable } from 'sql/base/common/lifecycle';
-import * as Constants from 'sql/parts/connection/common/constants';
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as types from 'vs/base/common/types';
@@ -39,11 +38,16 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 const dashboardRegistry = Registry.as<IDashboardRegistry>(DashboardExtensions.DashboardContributions);
 
+interface IConfigModifierCollection {
+	connectionManagementService: SingleConnectionManagementService;
+	contextKeyService: IContextKeyService;
+}
+
 @Component({
 	selector: 'dashboard-page',
 	templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/common/dashboardPage.component.html'))
 })
-export abstract class DashboardPage extends AngularDisposable implements IConfigModifierCollection {
+export abstract class DashboardPage extends AngularDisposable {
 
 	protected tabs: Array<TabConfig> = [];
 
@@ -133,10 +137,21 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
 		this._tabsDispose.forEach(i => i.dispose());
 		this._tabsDispose = [];
 
-		let allTabs = dashboardHelper.filterConfigs(dashboardRegistry.tabs, this);
+		// Create home tab
+		let homeTab: TabConfig = {
+			id: 'homeTab',
+			publisher: undefined,
+			title: this.homeTabTitle,
+			container: { 'widgets-container': homeWidgets },
+			context: this.context,
+			originalConfig: this._originalConfig,
+			editable: true,
+			canClose: false,
+			actions: []
+		};
+		this.addNewTab(homeTab);
 
-		// Before separating tabs into pinned / shown, ensure that the home tab is always set up as expected
-		allTabs = this.setAndRemoveHomeTab(allTabs, homeWidgets);
+		let allTabs = dashboardHelper.filterConfigs(dashboardRegistry.tabs, this);
 
 		// Load tab setting configs
 		this._tabSettingConfigs = this.dashboardService.getSettings<Array<TabSettingConfig>>([this.context, 'tabs'].join('.'));
@@ -184,32 +199,6 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
 		}));
 	}
 
-	private setAndRemoveHomeTab(allTabs: IDashboardTab[], homeWidgets: WidgetConfig[]): IDashboardTab[] {
-		let homeTabConfig: TabConfig = {
-			id: 'homeTab',
-			provider: Constants.anyProviderName,
-			publisher: undefined,
-			title: this.homeTabTitle,
-			container: { 'widgets-container': homeWidgets },
-			context: this.context,
-			originalConfig: this._originalConfig,
-			editable: true,
-			canClose: false,
-			actions: []
-		};
-
-		let homeTabIndex = allTabs.findIndex((tab) => tab.isHomeTab === true);
-		if (homeTabIndex !== undefined && homeTabIndex > -1) {
-			// Have a tab: get its information and copy over to the home tab definition
-			let homeTab = allTabs.splice(homeTabIndex, 1)[0];
-			let tabConfig = this.initTabComponents(homeTab);
-			homeTabConfig.id = tabConfig.id;
-			homeTabConfig.container = tabConfig.container;
-		}
-		this.addNewTab(homeTabConfig);
-		return allTabs;
-	}
-
 	private rewriteConfig(): void {
 		let writeableConfig = objects.deepClone(this._tabSettingConfigs);
 
@@ -219,12 +208,35 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
 
 	private loadNewTabs(dashboardTabs: IDashboardTab[], openLastTab: boolean = false) {
 		if (dashboardTabs && dashboardTabs.length > 0) {
-			let selectedTabs = dashboardTabs.map(v => this.initTabComponents(v)).map(v => {
+			let selectedTabs = dashboardTabs.map(v => {
+				let containerResult = dashboardHelper.getDashboardContainer(v.container);
+				if (!containerResult.result) {
+					return { id: v.id, title: v.title, container: { 'error-container': undefined }, alwaysShow: v.alwaysShow };
+				}
+
+				let key = Object.keys(containerResult.container)[0];
+				if (key === WIDGETS_CONTAINER || key === GRID_CONTAINER) {
+					let configs = <WidgetConfig[]>Object.values(containerResult.container)[0];
+					this._configModifiers.forEach(cb => {
+						configs = cb.apply(this, [configs, this.dashboardService, this.context]);
+					});
+					this._gridModifiers.forEach(cb => {
+						configs = cb.apply(this, [configs]);
+					});
+					if (key === WIDGETS_CONTAINER) {
+						return { id: v.id, title: v.title, container: { 'widgets-container': configs }, alwaysShow: v.alwaysShow };
+
+					} else {
+						return { id: v.id, title: v.title, container: { 'grid-container': configs }, alwaysShow: v.alwaysShow };
+					}
+				}
+				return { id: v.id, title: v.title, container: containerResult.container, alwaysShow: v.alwaysShow };
+			}).map(v => {
 				let actions = [];
-				let tabSettingConfig = this._tabSettingConfigs.find(i => i.tabId === v.id);
+				let tabConfig = this._tabSettingConfigs.find(i => i.tabId === v.id);
 				let isPinned = false;
-				if (tabSettingConfig) {
-					isPinned = tabSettingConfig.isPinned;
+				if (tabConfig) {
+					isPinned = tabConfig.isPinned;
 				} else if (v.alwaysShow) {
 					isPinned = true;
 				}
@@ -249,30 +261,6 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
 		}
 	}
 
-	private initTabComponents(value: IDashboardTab): { id: string; title: string; container: object; alwaysShow: boolean; } {
-		let containerResult = dashboardHelper.getDashboardContainer(value.container);
-		if (!containerResult.result) {
-			return { id: value.id, title: value.title, container: { 'error-container': undefined }, alwaysShow: value.alwaysShow };
-		}
-		let key = Object.keys(containerResult.container)[0];
-		if (key === WIDGETS_CONTAINER || key === GRID_CONTAINER) {
-			let configs = <WidgetConfig[]>Object.values(containerResult.container)[0];
-			this._configModifiers.forEach(cb => {
-				configs = cb.apply(this, [configs, this, this.context]);
-			});
-			this._gridModifiers.forEach(cb => {
-				configs = cb.apply(this, [configs]);
-			});
-			if (key === WIDGETS_CONTAINER) {
-				return { id: value.id, title: value.title, container: { 'widgets-container': configs }, alwaysShow: value.alwaysShow };
-			}
-			else {
-				return { id: value.id, title: value.title, container: { 'grid-container': configs }, alwaysShow: value.alwaysShow };
-			}
-		}
-		return { id: value.id, title: value.title, container: containerResult.container, alwaysShow: value.alwaysShow };
-	}
-
 	private getContentType(tab: TabConfig): string {
 		return tab.container ? Object.keys(tab.container)[0] : '';
 	}

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

@@ -5,11 +5,8 @@
 import 'vs/css!./dashboardPanel';
 
 import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
-import {
-	TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_ACTIVE_BORDER, TAB_INACTIVE_BACKGROUND,
-	TAB_INACTIVE_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BACKGROUND, TAB_BORDER, EDITOR_GROUP_BORDER
-} from 'vs/workbench/common/theme';
-import { activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_ACTIVE_BORDER, TAB_INACTIVE_BACKGROUND, TAB_INACTIVE_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BACKGROUND, TAB_BORDER } from 'vs/workbench/common/theme';
+import { activeContrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
@@ -101,14 +98,4 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			}
 		`);
 	}
-
-	const divider = theme.getColor(EDITOR_GROUP_BORDER);
-	if (divider) {
-		collector.addRule(`
-			panel.dashboard-panel > .tabbedPanel > .title .tabList .tab-header {
-				border-right-width: 1px;
-				border-right-style: solid;
-			}
-		`);
-	}
 });

src/sql/parts/dashboard/common/dashboardTab.contribution.ts

@@ -7,7 +7,6 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { localize } from 'vs/nls';
 import * as types from 'vs/base/common/types';
 
-import * as Constants from 'sql/parts/connection/common/constants';
 import { registerTab } from 'sql/platform/dashboard/common/dashboardRegistry';
 import { generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
 import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution';
@@ -18,11 +17,9 @@ export interface IDashboardTabContrib {
 	id: string;
 	title: string;
 	container: object;
-	provider: string | string[];
 	when?: string;
 	description?: string;
 	alwaysShow?: boolean;
-	isHomeTab?: boolean;
 }
 
 const tabSchema: IJSONSchema = {
@@ -44,11 +41,6 @@ const tabSchema: IJSONSchema = {
 			description: localize('sqlops.extension.contributes.tab.when', 'Condition which must be true to show this item'),
 			type: 'string'
 		},
-		provider: {
-			description: localize('sqlops.extension.contributes.tab.provider', 'Defines the connection types this tab is compatible with. Defaults to "MSSQL" if not set'),
-			type: ['string', 'array']
-
-		},
 		container: {
 			description: localize('sqlops.extension.contributes.dashboard.tab.container', "The container that will be displayed in this tab."),
 			type: 'object',
@@ -57,10 +49,6 @@ const tabSchema: IJSONSchema = {
 		alwaysShow: {
 			description: localize('sqlops.extension.contributes.dashboard.tab.alwaysShow', "Whether or not this tab should always be shown or only when the user adds it."),
 			type: 'boolean'
-		},
-		isHomeTab: {
-			description: localize('sqlops.extension.contributes.dashboard.tab.isHomeTab', "Whether or not this tab should be used as the Home tab for a connection type."),
-			type: 'boolean'
 		}
 	}
 };
@@ -79,7 +67,7 @@ const tabContributionSchema: IJSONSchema = {
 ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabContrib[]>('dashboard.tabs', [], tabContributionSchema).setHandler(extensions => {
 
 	function handleCommand(tab: IDashboardTabContrib, extension: IExtensionPointUser<any>) {
-		let { description, container, provider, title, when, id, alwaysShow, isHomeTab } = tab;
+		let { description, container, title, when, id, alwaysShow } = tab;
 
 		// If always show is not specified, set it to true by default.
 		if (!types.isBoolean(alwaysShow)) {
@@ -100,13 +88,6 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabCo
 			return;
 		}
 
-		if (!provider) {
-			// Use a default. Consider warning extension developers about this in the future if in development mode
-			provider = Constants.mssqlProviderName;
-			// Cannot be a home tab if it did not specify a provider
-			isHomeTab = false;
-		}
-
 		if (Object.keys(container).length !== 1) {
 			extension.collector.error(localize('dashboardTab.contribution.moreThanOneDashboardContainersError', 'Exactly 1 dashboard container must be defined per space'));
 			return;
@@ -129,7 +110,7 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabCo
 		}
 
 		if (result) {
-			registerTab({ description, title, container, provider, when, id, alwaysShow, publisher, isHomeTab });
+			registerTab({ description, title, container, when, id, alwaysShow, publisher });
 		}
 	}
 

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

@@ -7,11 +7,9 @@ import { OnDestroy } from '@angular/core';
 
 import { Event } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 import { AngularDisposable } from 'sql/base/common/lifecycle';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
-import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service';
 
 export enum Conditional {
 	'equals',
@@ -32,16 +30,23 @@ export abstract class DashboardTab extends TabChild implements OnDestroy {
 	public enableEdit(): void {
 		// no op
 	}
+
+	private _toDispose: IDisposable[] = [];
+
 	constructor() {
 		super();
 	}
 
+	public dispose(): void {
+		this._toDispose = dispose(this._toDispose);
+	}
+
+	protected _register<T extends IDisposable>(t: T): T {
+		this._toDispose.push(t);
+		return t;
+	}
+
 	ngOnDestroy() {
 		this.dispose();
 	}
 }
-
-export interface IConfigModifierCollection {
-	connectionManagementService: SingleConnectionManagementService;
-	contextKeyService: IContextKeyService;
-}

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

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

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

@@ -5,27 +5,28 @@
 
 import 'vs/css!./dashboardNavSection';
 
-import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core';
+import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, EventEmitter, OnChanges, AfterContentInit } from '@angular/core';
 
-import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service';
+import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service';
+import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
 import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/parts/dashboard/common/dashboardWidget';
 import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component';
-import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
-import { DashboardTab, IConfigModifierCollection } from 'sql/parts/dashboard/common/interfaces';
+import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component';
+import { DashboardTab } from 'sql/parts/dashboard/common/interfaces';
 import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution';
 import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution';
 import * as dashboardHelper from 'sql/parts/dashboard/common/dashboardHelper';
 
+import { Registry } from 'vs/platform/registry/common/platform';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as nls from 'vs/nls';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 @Component({
 	selector: 'dashboard-nav-section',
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => DashboardNavSection) }],
 	templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/containers/dashboardNavSection.component.html'))
 })
-export class DashboardNavSection extends DashboardTab implements OnDestroy, OnChanges, AfterContentInit, IConfigModifierCollection {
+export class DashboardNavSection extends DashboardTab implements OnDestroy, OnChanges, AfterContentInit {
 	@Input() private tab: TabConfig;
 	protected tabs: Array<TabConfig> = [];
 	private _onResize = new Emitter<void>();
@@ -37,7 +38,7 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh
 	};
 
 	// a set of config modifiers
-	private readonly _configModifiers: Array<(item: Array<WidgetConfig>, collection: IConfigModifierCollection, context: string) => Array<WidgetConfig>> = [
+	private readonly _configModifiers: Array<(item: Array<WidgetConfig>, dashboardServer: DashboardServiceInterface, context: string) => Array<WidgetConfig>> = [
 		dashboardHelper.removeEmpty,
 		dashboardHelper.initExtensionConfigs,
 		dashboardHelper.addProvider,
@@ -102,7 +103,7 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh
 				if (key === WIDGETS_CONTAINER || key === GRID_CONTAINER) {
 					let configs = <WidgetConfig[]>Object.values(containerResult.container)[0];
 					this._configModifiers.forEach(cb => {
-						configs = cb.apply(this, [configs, this, this.tab.context]);
+						configs = cb.apply(this, [configs, this.dashboardService, this.tab.context]);
 					});
 					this._gridModifiers.forEach(cb => {
 						configs = cb.apply(this, [configs]);
@@ -168,12 +169,4 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh
 			});
 		}
 	}
-
-	public get connectionManagementService(): SingleConnectionManagementService {
-		return this.dashboardService.connectionManagementService;
-	}
-
-	public get contextKeyService(): IContextKeyService {
-		return this.dashboardService.scopedContextKeyService;
-	}
 }

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

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Inject, NgModule, forwardRef, ApplicationRef, ComponentFactoryResolver } from '@angular/core';
+import { Inject, NgModule, forwardRef, ApplicationRef, ComponentFactoryResolver, NgModuleRef, NgModuleFactory } from '@angular/core';
 import { CommonModule, APP_BASE_HREF } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule, Routes, UrlSerializer, Router, NavigationEnd } from '@angular/router';
@@ -14,7 +14,7 @@ import { ChartsModule } from 'ng2-charts/ng2-charts';
 import CustomUrlSerializer from 'sql/common/urlSerializer';
 import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
 import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
-import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService';
+import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
 
 import { Registry } from 'vs/platform/registry/common/platform';
 
@@ -32,7 +32,7 @@ import { CommonServiceInterface } from 'sql/services/common/commonServiceInterfa
 import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive';
 
 /* Base Components */
-import { DashboardComponent } from 'sql/parts/dashboard/dashboard.component';
+import { DashboardComponent, DASHBOARD_SELECTOR } from 'sql/parts/dashboard/dashboard.component';
 import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component';
 import { DashboardWidgetContainer } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.component';
 import { DashboardGridContainer } from 'sql/parts/dashboard/containers/dashboardGridContainer.component';
@@ -51,10 +51,7 @@ import { ControlHostContent } from 'sql/parts/dashboard/contents/controlHostCont
 import { DashboardControlHostContainer } from 'sql/parts/dashboard/containers/dashboardControlHostContainer.component';
 import { JobsViewComponent } from 'sql/parts/jobManagement/views/jobsView.component';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
-import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component';
 import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component';
-import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component';
-import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component';
 import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component';
@@ -62,8 +59,9 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component';
 let baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer,
 	DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent,
 	ComponentHostDirective, BreadcrumbComponent, ControlHostContent, DashboardControlHostContainer,
-	JobsViewComponent, AgentViewComponent, JobHistoryComponent, JobStepsViewComponent, AlertsViewComponent, ProxiesViewComponent, OperatorsViewComponent,
-	DashboardModelViewContainer, ModelComponentWrapper, Checkbox, SelectBox, InputBox,];
+	JobsViewComponent, AgentViewComponent, JobHistoryComponent, JobStepsViewComponent, DashboardModelViewContainer, ModelComponentWrapper, Checkbox,
+	SelectBox,
+	InputBox,];
 
 /* Panel */
 import { PanelModule } from 'sql/base/browser/ui/panel/panel.module';
@@ -82,8 +80,7 @@ import { ExplorerWidget } from 'sql/parts/dashboard/widgets/explorer/explorerWid
 import { TasksWidget } from 'sql/parts/dashboard/widgets/tasks/tasksWidget.component';
 import { InsightsWidget } from 'sql/parts/dashboard/widgets/insights/insightsWidget.component';
 import { WebviewWidget } from 'sql/parts/dashboard/widgets/webview/webviewWidget.component';
-import { JobStepsViewComponent } from 'sql/parts/jobManagement/views/jobStepsView.component';
-import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation';
+import { JobStepsViewComponent } from '../jobManagement/views/jobStepsView.component';
 
 let widgetComponents = [
 	PropertiesWidgetComponent,
@@ -112,7 +109,7 @@ const appRoutes: Routes = [
 ];
 
 // Connection Dashboard main angular module
-export const DashboardModule = (params, selector: string, instantiationService: IInstantiationService): any => {
+export const DashboardModule = (params, selector: string): any => {
 	@NgModule({
 		declarations: [
 			...baseComponents,
@@ -143,31 +140,31 @@ export const DashboardModule = (params, selector: string, instantiationService:
 			{ provide: IBreadcrumbService, useClass: BreadcrumbService },
 			{ provide: CommonServiceInterface, useClass: DashboardServiceInterface },
 			{ provide: UrlSerializer, useClass: CustomUrlSerializer },
-			{ provide: IBootstrapParams, useValue: params },
-			{ provide: ISelector, useValue: selector },
-			...providerIterator(instantiationService)
+			{ provide: IBootstrapParams, useValue: params }
 		]
 	})
 	class ModuleClass {
-		private navigations = 0;
+		private _bootstrap: DashboardServiceInterface;
 		constructor(
 			@Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver,
+			@Inject(forwardRef(() => CommonServiceInterface)) bootstrap: CommonServiceInterface,
 			@Inject(forwardRef(() => Router)) private _router: Router,
-			@Inject(ITelemetryService) private telemetryService: ITelemetryService,
-			@Inject(ISelector) private selector: string
+			@Inject(ITelemetryService) private telemetryService: ITelemetryService
 		) {
+			this._bootstrap = bootstrap as DashboardServiceInterface;
 		}
 
 		ngDoBootstrap(appRef: ApplicationRef) {
 			const factory = this._resolver.resolveComponentFactory(DashboardComponent);
-			(<any>factory).factory.selector = this.selector;
+			this._bootstrap.selector = selector;
+			(<any>factory).factory.selector = selector;
 			appRef.bootstrap(factory);
 
 			this._router.events.subscribe(e => {
 				if (e instanceof NavigationEnd) {
-					this.navigations++;
+					this._bootstrap.handlePageNavigation();
 					TelemetryUtils.addTelemetry(this.telemetryService, TelemetryKeys.DashboardNavigated, {
-						numberOfNavigations: this.navigations,
+						numberOfNavigations: this._bootstrap.getNumberOfPageNavigations(),
 						routeUrl: e.url
 					});
 				}

src/sql/parts/dashboard/dashboardEditor.ts

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

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

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

src/sql/parts/dashboard/pages/serverDashboardPage.contribution.ts

@@ -96,12 +96,16 @@ let defaultVal = [
 	},
 	{
 		widget: {
-			'backup-history-server-insight': null
+			'backup-history-server-insight': {
+				cacheId: '0c7cba8b-c87a-4bcc-ae54-2f40a5503a90'
+			}
 		}
 	},
 	{
 		widget: {
-			'all-database-size-server-insight': null
+			'all-database-size-server-insight': {
+				cacheId: '1d7cba8b-c87a-4bcc-ae54-2f40a5503a90'
+			}
 		}
 	}
 ];
@@ -117,7 +121,8 @@ export const serverDashboardTabsSchema: IJSONSchema = {
 	type: ['array'],
 	description: nls.localize('dashboardServerTabs', 'Customizes the Server dashboard tabs'),
 	items: generateDashboardTabSchema('server'),
-	default: []
+	default: [
+	]
 };
 
 export const SERVER_DASHBOARD_SETTING = 'dashboard.server.widgets';

src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts

@@ -4,29 +4,50 @@
  *--------------------------------------------------------------------------------------------*/
 
 /* Node Modules */
-import { Injectable, Inject, forwardRef } from '@angular/core';
+import { Injectable, Inject, forwardRef, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
 
 /* SQL imports */
 import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams';
 import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
 import { IMetadataService } from 'sql/services/metadata/metadataService';
 import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
+import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo';
 import { IAdminService } from 'sql/parts/admin/common/adminService';
 import { IQueryManagementService } from 'sql/parts/query/common/queryManagement';
 import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils';
+import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces';
+import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
+import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
 import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/services/angularEventing/angularEventingService';
 import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
 import { TabSettingConfig } from 'sql/parts/dashboard/common/dashboardWidget';
-import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
+import { IDashboardViewService } from 'sql/services/dashboard/common/dashboardViewService';
+import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { ConnectionContextkey } from 'sql/parts/connection/common/connectionContextKey';
+import { SingleConnectionMetadataService, SingleConnectionManagementService, SingleAdminService, SingleQueryManagementService, CommonServiceInterface }
+from 'sql/services/common/commonServiceInterface.service';
+
+import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'sqlops';
 
 /* VS imports */
+import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { ConfigurationEditingService, IConfigurationValue } from 'vs/workbench/services/configuration/node/configurationEditingService';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IStorageService } from 'vs/platform/storage/common/storage';
 import { Event, Emitter } from 'vs/base/common/event';
 import Severity from 'vs/base/common/severity';
 import * as nls from 'vs/nls';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { deepClone } from 'vs/base/common/objects';
-import { RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 const DASHBOARD_SETTINGS = 'dashboard';
@@ -64,22 +85,45 @@ export class DashboardServiceInterface extends CommonServiceInterface {
 	private _numberOfPageNavigations = 0;
 
 	constructor(
+		@Inject(forwardRef(() => Router)) private _router: Router,
+		@Inject(INotificationService) private _notificationService: INotificationService,
 		@Inject(IMetadataService) metadataService: IMetadataService,
 		@Inject(IConnectionManagementService) connectionManagementService: IConnectionManagementService,
 		@Inject(IAdminService) adminService: IAdminService,
 		@Inject(IQueryManagementService) queryManagementService: IQueryManagementService,
-		@Inject(IBootstrapParams) params: IDashboardComponentParams,
-		@Inject(forwardRef(() => Router)) private _router: Router,
-		@Inject(INotificationService) private _notificationService: INotificationService,
 		@Inject(IAngularEventingService) private angularEventingService: IAngularEventingService,
-		@Inject(IConfigurationService) private _configService: IConfigurationService
+		@Inject(IConfigurationService) private _configService: IConfigurationService,
+		@Inject(IBootstrapParams) _params: IDashboardComponentParams
 	) {
-		super(params, metadataService, connectionManagementService, adminService, queryManagementService);
-		// during testing there may not be params
-		if (this._params) {
-			this.dashboardContextKey = this._dashboardContextKey.bindTo(this.scopedContextKeyService);
-			this._register(toDisposableSubscription(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
-		}
+		super(_params, metadataService, connectionManagementService, adminService, queryManagementService);
+	}
+
+	private get params(): IDashboardComponentParams {
+		return this._params;
+	}
+
+	/**
+	 * Set the selector for this dashboard instance, should only be set once
+	 */
+	public set selector(selector: string) {
+		this._uniqueSelector = selector;
+		this._getbootstrapParams();
+	}
+
+	protected _getbootstrapParams(): void {
+		this.scopedContextKeyService = this.params.scopedContextService;
+		this._connectionContextKey = this.params.connectionContextKey;
+		this.dashboardContextKey = this._dashboardContextKey.bindTo(this.scopedContextKeyService);
+		this.uri = this.params.ownerUri;
+	}
+
+	/**
+	 * Set the uri for this dashboard instance, should only be set once
+	 * Inits all the services that depend on knowing a uri
+	 */
+	protected set uri(uri: string) {
+		super.setUri(uri);
+		this._register(toDisposableSubscription(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event))));
 	}
 
 	/**

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

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

src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts

@@ -28,7 +28,6 @@ import { IContextViewService, IContextMenuService } from 'vs/platform/contextvie
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProgressService } from 'vs/platform/progress/common/progress';
-import * as types from 'vs/base/common/types';
 
 @Component({
 	selector: 'explorer-widget',
@@ -121,8 +120,6 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
 			let currentProfile = this._bootstrap.connectionManagementService.connectionInfo.connectionProfile;
 			this._register(toDisposableSubscription(this._bootstrap.metadataService.databaseNames.subscribe(
 				data => {
-					// Handle the case where there is no metadata service
-					data = data || [];
 					let profileData = data.map(d => {
 						let profile = new ConnectionProfile(this.capabilitiesService, currentProfile);
 						profile.databaseName = d;

src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts

@@ -166,6 +166,7 @@ export class TasksWidget extends DashboardWidget implements IDashboardWidget, On
 	}
 
 	public runTask(task: ICommandAction) {
+		let serverInfo = this._bootstrap.connectionManagementService.connectionInfo.serverInfo;
 		this.commandService.executeCommand(task.id, this._profile);
 	}
 

src/sql/parts/disasterRecovery/backup/backup.module.ts

@@ -4,23 +4,20 @@
 *--------------------------------------------------------------------------------------------*/
 
 import {
-	ApplicationRef, ComponentFactoryResolver, NgModule,
+	ApplicationRef, ComponentFactoryResolver, ModuleWithProviders, NgModule,
 	Inject, forwardRef, Type
 } from '@angular/core';
 import { APP_BASE_HREF, CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-
-import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService';
-import { BackupComponent } from 'sql/parts/disasterRecovery/backup/backup.component';
-
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
+import { BackupComponent, BACKUP_SELECTOR } from 'sql/parts/disasterRecovery/backup/backup.component';
 
 // work around
 const BrowserAnimationsModule = (<any>require.__$__nodeRequire('@angular/platform-browser/animations')).BrowserAnimationsModule;
 
 // Backup wizard main angular module
-export const BackupModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type<any> => {
+export const BackupModule = (params: IBootstrapParams, selector: string): Type<any> => {
 	@NgModule({
 		declarations: [
 			BackupComponent
@@ -34,22 +31,19 @@ export const BackupModule = (params: IBootstrapParams, selector: string, instant
 		],
 		providers: [
 			{ provide: APP_BASE_HREF, useValue: '/' },
-			{ provide: IBootstrapParams, useValue: params },
-			{ provide: ISelector, useValue: selector },
-			...providerIterator(instantiationService)
+			{ provide: IBootstrapParams, useValue: params }
 		]
 	})
 	class ModuleClass {
 
 		constructor(
-			@Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver,
-			@Inject(ISelector) private selector: string
+			@Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver
 		) {
 		}
 
 		ngDoBootstrap(appRef: ApplicationRef) {
 			const factory = this._resolver.resolveComponentFactory(BackupComponent);
-			(<any>factory).factory.selector = this.selector;
+			(<any>factory).factory.selector = selector;
 			appRef.bootstrap(factory);
 		}
 	}

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

@@ -179,8 +179,8 @@ export class RestoreDialogController implements IRestoreDialogController {
 	private isSuccessfulRestore(response: TaskNode): boolean {
 		return (response.taskName === this._restoreTaskName &&
 			response.message === this._restoreCompleted &&
-			(response.status === TaskStatus.Succeeded ||
-				response.status === TaskStatus.SucceededWithWarning) &&
+			(response.status === TaskStatus.succeeded ||
+				response.status === TaskStatus.succeededWithWarning) &&
 			(response.taskExecutionMode === TaskExecutionMode.execute ||
 				response.taskExecutionMode === TaskExecutionMode.executeAndScript));
 	}

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

@@ -226,7 +226,7 @@ export class RestoreDialog extends Modal {
 
 			destinationContainer.div({ class: 'dialog-input-section' }, (inputContainer) => {
 				inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
-					labelContainer.text(LocalizedStrings.TARGETDATABASE);
+					labelContainer.innerHtml(LocalizedStrings.TARGETDATABASE);
 				});
 
 				inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {
@@ -235,8 +235,7 @@ export class RestoreDialog extends Modal {
 					this._databaseDropdown = new Dropdown(inputCellContainer.getHTMLElement(), this._contextViewService, this._themeService,
 						{
 							strictSelection: false,
-							ariaLabel: LocalizedStrings.TARGETDATABASE,
-							actionLabel: localize('toggleDatabaseNameDropdown', 'Select Database Toggle Dropdown')
+							ariaLabel: LocalizedStrings.TARGETDATABASE
 						}
 					);
 					this._databaseDropdown.onValueChange(s => {
@@ -471,7 +470,7 @@ export class RestoreDialog extends Modal {
 			className += ' header';
 		}
 		container.div({ class: className }, (labelContainer) => {
-			labelContainer.text(content);
+			labelContainer.innerHtml(content);
 		});
 	}
 
@@ -535,7 +534,7 @@ export class RestoreDialog extends Modal {
 		let selectBox: SelectBox;
 		container.div({ class: 'dialog-input-section' }, (inputContainer) => {
 			inputContainer.div({ class: 'dialog-label' }, (labelContainer) => {
-				labelContainer.text(label);
+				labelContainer.innerHtml(label);
 			});
 
 			inputContainer.div({ class: 'dialog-input' }, (inputCellContainer) => {

src/sql/parts/fileBrowser/fileBrowserTreeView.ts

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