diff --git a/extensions/agent/src/agentUtils.ts b/extensions/agent/src/agentUtils.ts index ce9b639e64..16b75c8308 100644 --- a/extensions/agent/src/agentUtils.ts +++ b/extensions/agent/src/agentUtils.ts @@ -1,26 +1,25 @@ 'use strict'; -import * as sqlops from 'sqlops'; import * as azdata from 'azdata'; export class AgentUtils { - private static _agentService: sqlops.AgentServicesProvider; - private static _connectionService: sqlops.ConnectionProvider; - private static _queryProvider: sqlops.QueryProvider; + private static _agentService: azdata.AgentServicesProvider; + private static _connectionService: azdata.ConnectionProvider; + private static _queryProvider: azdata.QueryProvider; - public static async getAgentService(): Promise { + public static async getAgentService(): Promise { if (!AgentUtils._agentService) { let currentConnection = await azdata.connection.getCurrentConnection(); - this._agentService = sqlops.dataprotocol.getProvider(currentConnection.providerId, sqlops.DataProviderType.AgentServicesProvider); + this._agentService = azdata.dataprotocol.getProvider(currentConnection.providerId, azdata.DataProviderType.AgentServicesProvider); } return AgentUtils._agentService; } public static async getDatabases(ownerUri: string): Promise { if (!AgentUtils._connectionService) { - let currentConnection = await sqlops.connection.getCurrentConnection(); - this._connectionService = sqlops.dataprotocol.getProvider(currentConnection.providerName, sqlops.DataProviderType.ConnectionProvider); + let currentConnection = await azdata.connection.getCurrentConnection(); + this._connectionService = azdata.dataprotocol.getProvider(currentConnection.providerId, azdata.DataProviderType.ConnectionProvider); } return AgentUtils._connectionService.listDatabases(ownerUri).then(result => { if (result && result.databaseNames && result.databaseNames.length > 0) { @@ -29,10 +28,10 @@ export class AgentUtils { }); } - public static async getQueryProvider(): Promise { + public static async getQueryProvider(): Promise { if (!AgentUtils._queryProvider) { - let currentConnection = await sqlops.connection.getCurrentConnection(); - this._queryProvider = sqlops.dataprotocol.getProvider(currentConnection.providerName, sqlops.DataProviderType.QueryProvider); + let currentConnection = await azdata.connection.getCurrentConnection(); + this._queryProvider = azdata.dataprotocol.getProvider(currentConnection.providerId, azdata.DataProviderType.QueryProvider); } return this._queryProvider; } diff --git a/extensions/agent/src/apiWrapper.ts b/extensions/agent/src/apiWrapper.ts index 038d5e6f0f..926912ce30 100644 --- a/extensions/agent/src/apiWrapper.ts +++ b/extensions/agent/src/apiWrapper.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as data from 'sqlops'; +import * as data from 'azdata'; /** * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into diff --git a/extensions/agent/src/data/alertData.ts b/extensions/agent/src/data/alertData.ts index bdaa6e3ed5..9dbf3faeaa 100644 --- a/extensions/agent/src/data/alertData.ts +++ b/extensions/agent/src/data/alertData.ts @@ -6,7 +6,7 @@ import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { AgentUtils } from '../agentUtils'; import { IAgentDialogData, AgentDialogMode } from '../interfaces'; import { JobData } from './jobData'; @@ -51,7 +51,7 @@ export class AlertData implements IAgentDialogData { constructor( ownerUri:string, - alertInfo: sqlops.AgentAlertInfo, + alertInfo: azdata.AgentAlertInfo, jobModel?: JobData, viaJobDialog: boolean = false ) { @@ -111,7 +111,7 @@ export class AlertData implements IAgentDialogData { } } - public toAgentAlertInfo(): sqlops.AgentAlertInfo { + public toAgentAlertInfo(): azdata.AgentAlertInfo { return { id: this.id, name: this.name, @@ -119,7 +119,7 @@ export class AlertData implements IAgentDialogData { eventDescriptionKeyword: this.eventDescriptionKeyword, eventSource: this.eventSource, hasNotification: this.hasNotification, - includeEventDescription: sqlops.NotifyMethods.none, // this.includeEventDescription, + includeEventDescription: azdata.NotifyMethods.none, // this.includeEventDescription, isEnabled: this.isEnabled, jobId: this.jobId, jobName: this.jobName, @@ -139,13 +139,13 @@ export class AlertData implements IAgentDialogData { }; } - private static getAlertTypeFromString(alertTypeString: string): sqlops.AlertType { + private static getAlertTypeFromString(alertTypeString: string): azdata.AlertType { if (alertTypeString === AlertData.AlertTypePerformanceConditionString) { - return sqlops.AlertType.sqlServerPerformanceCondition; + return azdata.AlertType.sqlServerPerformanceCondition; } else if (alertTypeString === AlertData.AlertTypeWmiEventString) { - return sqlops.AlertType.wmiEvent; + return azdata.AlertType.wmiEvent; } else { - return sqlops.AlertType.sqlServerEvent; + return azdata.AlertType.sqlServerEvent; } } } \ No newline at end of file diff --git a/extensions/agent/src/data/jobData.ts b/extensions/agent/src/data/jobData.ts index 68b31cd23b..edfc218831 100644 --- a/extensions/agent/src/data/jobData.ts +++ b/extensions/agent/src/data/jobData.ts @@ -5,7 +5,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { AgentUtils } from '../agentUtils'; import { IAgentDialogData, AgentDialogMode } from '../interfaces'; @@ -25,8 +25,8 @@ export class JobData implements IAgentDialogData { private _jobCategories: string[]; private _operators: string[]; private _defaultOwner: string; - private _jobCompletionActionConditions: sqlops.CategoryValue[]; - private _jobCategoryIdsMap: sqlops.AgentJobCategory[]; + private _jobCompletionActionConditions: azdata.CategoryValue[]; + private _jobCategoryIdsMap: azdata.AgentJobCategory[]; public dialogMode: AgentDialogMode = AgentDialogMode.CREATE; public name: string; @@ -36,23 +36,23 @@ export class JobData implements IAgentDialogData { 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 emailLevel: azdata.JobCompletionActionCondition = azdata.JobCompletionActionCondition.OnFailure; + public pageLevel: azdata.JobCompletionActionCondition = azdata.JobCompletionActionCondition.OnFailure; + public eventLogLevel: azdata.JobCompletionActionCondition = azdata.JobCompletionActionCondition.OnFailure; + public deleteLevel: azdata.JobCompletionActionCondition = azdata.JobCompletionActionCondition.OnSuccess; public operatorToEmail: string; public operatorToPage: string; - public jobSteps: sqlops.AgentJobStepInfo[]; - public jobSchedules: sqlops.AgentJobScheduleInfo[]; - public alerts: sqlops.AgentAlertInfo[]; + public jobSteps: azdata.AgentJobStepInfo[]; + public jobSchedules: azdata.AgentJobScheduleInfo[]; + public alerts: azdata.AgentAlertInfo[]; public jobId: string; public startStepId: number; public categoryType: number; constructor( ownerUri: string, - jobInfo: sqlops.AgentJobInfo = undefined, - private _agentService: sqlops.AgentServicesProvider = undefined) { + jobInfo: azdata.AgentJobInfo = undefined, + private _agentService: azdata.AgentServicesProvider = undefined) { this._ownerUri = ownerUri; if (jobInfo) { @@ -77,7 +77,7 @@ export class JobData implements IAgentDialogData { return this._jobCategories; } - public get jobCategoryIdsMap(): sqlops.AgentJobCategory[] { + public get jobCategoryIdsMap(): azdata.AgentJobCategory[] { return this._jobCategoryIdsMap; } @@ -93,7 +93,7 @@ export class JobData implements IAgentDialogData { return this._defaultOwner; } - public get JobCompletionActionConditions(): sqlops.CategoryValue[] { + public get JobCompletionActionConditions(): azdata.CategoryValue[] { return this._jobCompletionActionConditions; } @@ -112,18 +112,18 @@ export class JobData implements IAgentDialogData { this._jobCompletionActionConditions = [{ displayName: this.JobCompletionActionCondition_OnSuccess, - name: sqlops.JobCompletionActionCondition.OnSuccess.toString() + name: azdata.JobCompletionActionCondition.OnSuccess.toString() }, { displayName: this.JobCompletionActionCondition_OnFailure, - name: sqlops.JobCompletionActionCondition.OnFailure.toString() + name: azdata.JobCompletionActionCondition.OnFailure.toString() }, { displayName: this.JobCompletionActionCondition_Always, - name: sqlops.JobCompletionActionCondition.Always.toString() + name: azdata.JobCompletionActionCondition.Always.toString() }]; } public async save() { - let jobInfo: sqlops.AgentJobInfo = this.toAgentJobInfo(); + let jobInfo: azdata.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); @@ -146,7 +146,7 @@ export class JobData implements IAgentDialogData { }; } - public toAgentJobInfo(): sqlops.AgentJobInfo { + public toAgentJobInfo(): azdata.AgentJobInfo { return { name: this.name, owner: this.owner, diff --git a/extensions/agent/src/data/jobStepData.ts b/extensions/agent/src/data/jobStepData.ts index c399d73f1a..226a702e6a 100644 --- a/extensions/agent/src/data/jobStepData.ts +++ b/extensions/agent/src/data/jobStepData.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; import { AgentUtils } from '../agentUtils'; @@ -95,7 +95,7 @@ export class JobStepData implements IAgentDialogData { }; } - public static convertToJobStepData(jobStepInfo: sqlops.AgentJobStepInfo, jobData: JobData) { + public static convertToJobStepData(jobStepInfo: azdata.AgentJobStepInfo, jobData: JobData) { let stepData = new JobStepData(jobData.ownerUri, jobData); stepData.ownerUri = jobData.ownerUri; stepData.jobId = jobStepInfo.jobId; @@ -127,8 +127,8 @@ export class JobStepData implements IAgentDialogData { return stepData; } - public static convertToAgentJobStepInfo(jobStepData: JobStepData): sqlops.AgentJobStepInfo { - let result: sqlops.AgentJobStepInfo = { + public static convertToAgentJobStepInfo(jobStepData: JobStepData): azdata.AgentJobStepInfo { + let result: azdata.AgentJobStepInfo = { jobId: jobStepData.jobId, jobName: jobStepData.jobName, script: jobStepData.script, diff --git a/extensions/agent/src/data/operatorData.ts b/extensions/agent/src/data/operatorData.ts index d091ecbbf8..588093b985 100644 --- a/extensions/agent/src/data/operatorData.ts +++ b/extensions/agent/src/data/operatorData.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { AgentUtils } from '../agentUtils'; import { IAgentDialogData, AgentDialogMode } from '../interfaces'; @@ -29,7 +29,7 @@ export class OperatorData implements IAgentDialogData { weekdayPagerStartTime: string; weekdayPagerEndTime: string; - constructor(ownerUri:string, operatorInfo: sqlops.AgentOperatorInfo) { + constructor(ownerUri:string, operatorInfo: azdata.AgentOperatorInfo) { this.ownerUri = ownerUri; if (operatorInfo) { @@ -50,7 +50,7 @@ export class OperatorData implements IAgentDialogData { } } - public toAgentOperatorInfo(): sqlops.AgentOperatorInfo { + public toAgentOperatorInfo(): azdata.AgentOperatorInfo { return { name: this.name, id: this.id, @@ -61,7 +61,7 @@ export class OperatorData implements IAgentDialogData { lastPagerDate: this.lastPagerDate, pagerAddress: this.pagerAddress, categoryName: this.categoryName, - pagerDays: sqlops.WeekDays.weekDays, //this.pagerDays, + pagerDays: azdata.WeekDays.weekDays, //this.pagerDays, saturdayPagerEndTime: this.saturdayPagerEndTime, saturdayPagerStartTime: this.saturdayPagerStartTime, sundayPagerEndTime: this.sundayPagerEndTime, diff --git a/extensions/agent/src/data/pickScheduleData.ts b/extensions/agent/src/data/pickScheduleData.ts index d2a46bf729..5be15d679a 100644 --- a/extensions/agent/src/data/pickScheduleData.ts +++ b/extensions/agent/src/data/pickScheduleData.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; 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; + public schedules: azdata.AgentJobScheduleInfo[]; + public selectedSchedule: azdata.AgentJobScheduleInfo; private jobName: string; constructor(ownerUri:string, jobName: string) { diff --git a/extensions/agent/src/data/proxyData.ts b/extensions/agent/src/data/proxyData.ts index d05683db73..3a3d7dfb48 100644 --- a/extensions/agent/src/data/proxyData.ts +++ b/extensions/agent/src/data/proxyData.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { AgentUtils } from '../agentUtils'; import { IAgentDialogData, AgentDialogMode } from '../interfaces'; @@ -19,7 +19,7 @@ export class ProxyData implements IAgentDialogData { credentialId: number; isEnabled: boolean; - constructor(ownerUri:string, proxyInfo: sqlops.AgentProxyInfo) { + constructor(ownerUri:string, proxyInfo: azdata.AgentProxyInfo) { this.ownerUri = ownerUri; if (proxyInfo) { @@ -40,7 +40,7 @@ export class ProxyData implements IAgentDialogData { } } - public toAgentProxyInfo(): sqlops.AgentProxyInfo { + public toAgentProxyInfo(): azdata.AgentProxyInfo { return { id: this.id, accountName: this.accountName, diff --git a/extensions/agent/src/data/scheduleData.ts b/extensions/agent/src/data/scheduleData.ts index bd9a4c6e85..aaa55b8f75 100644 --- a/extensions/agent/src/data/scheduleData.ts +++ b/extensions/agent/src/data/scheduleData.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; 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; + public schedules: azdata.AgentJobScheduleInfo[]; + public selectedSchedule: azdata.AgentJobScheduleInfo; constructor(ownerUri:string) { this.ownerUri = ownerUri; diff --git a/extensions/agent/src/dialogs/agentDialog.ts b/extensions/agent/src/dialogs/agentDialog.ts index 29ea619866..7368904402 100644 --- a/extensions/agent/src/dialogs/agentDialog.ts +++ b/extensions/agent/src/dialogs/agentDialog.ts @@ -5,7 +5,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { IAgentDialogData, AgentDialogMode } from '../interfaces'; @@ -18,7 +18,7 @@ export abstract class AgentDialog { protected _onSuccess: vscode.EventEmitter = new vscode.EventEmitter(); public readonly onSuccess: vscode.Event = this._onSuccess.event; - public dialog: sqlops.window.Dialog; + public dialog: azdata.window.Dialog; // Dialog Name for Telemetry public dialogName: string; @@ -32,11 +32,11 @@ export abstract class AgentDialog { protected abstract async updateModel(); - protected abstract async initializeDialog(dialog: sqlops.window.Dialog); + protected abstract async initializeDialog(dialog: azdata.window.Dialog); public async openDialog(dialogName?: string) { let event = dialogName ? dialogName : null; - this.dialog = sqlops.window.createModelViewDialog(this.title, event); + this.dialog = azdata.window.createModelViewDialog(this.title, event); await this.model.initialize(); @@ -48,7 +48,7 @@ export abstract class AgentDialog { this.dialog.cancelButton.label = AgentDialog.CancelButtonText; this.dialog.cancelButton.onClick(async () => await this.cancel()); - sqlops.window.openDialog(this.dialog); + azdata.window.openDialog(this.dialog); } protected async execute() { @@ -60,18 +60,18 @@ export abstract class AgentDialog { protected async cancel() { } - protected getActualConditionValue(checkbox: sqlops.CheckBoxComponent, dropdown: sqlops.DropDownComponent): sqlops.JobCompletionActionCondition { - return checkbox.checked ? Number(this.getDropdownValue(dropdown)) : sqlops.JobCompletionActionCondition.Never; + protected getActualConditionValue(checkbox: azdata.CheckBoxComponent, dropdown: azdata.DropDownComponent): azdata.JobCompletionActionCondition { + return checkbox.checked ? Number(this.getDropdownValue(dropdown)) : azdata.JobCompletionActionCondition.Never; } - protected getDropdownValue(dropdown: sqlops.DropDownComponent): string { + protected getDropdownValue(dropdown: azdata.DropDownComponent): string { return (typeof dropdown.value === 'string') ? dropdown.value : dropdown.value.name; } - protected setConditionDropdownSelectedValue(dropdown: sqlops.DropDownComponent, selectedValue: number) { + protected setConditionDropdownSelectedValue(dropdown: azdata.DropDownComponent, selectedValue: number) { let idx: number = 0; for (idx = 0; idx < dropdown.values.length; idx++) { - if (Number((dropdown.values[idx]).name) === selectedValue) { + if (Number((dropdown.values[idx]).name) === selectedValue) { dropdown.value = dropdown.values[idx]; break; } diff --git a/extensions/agent/src/dialogs/alertDialog.ts b/extensions/agent/src/dialogs/alertDialog.ts index c6105ab8ab..2c4a505f5a 100644 --- a/extensions/agent/src/dialogs/alertDialog.ts +++ b/extensions/agent/src/dialogs/alertDialog.ts @@ -6,7 +6,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { AgentDialog } from './agentDialog'; import { AgentUtils } from '../agentUtils'; import { AlertData } from '../data/alertData'; @@ -121,37 +121,37 @@ export class AlertDialog extends AgentDialog { private readonly EditAlertDialog = 'EditAlertDialogOpened'; // UI Components - private generalTab: sqlops.window.DialogTab; - private responseTab: sqlops.window.DialogTab; - private optionsTab: sqlops.window.DialogTab; + private generalTab: azdata.window.DialogTab; + private responseTab: azdata.window.DialogTab; + private optionsTab: azdata.window.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 nameTextBox: azdata.InputBoxComponent; + private typeDropDown: azdata.DropDownComponent; + private severityDropDown: azdata.DropDownComponent; + private databaseDropDown: azdata.DropDownComponent; + private enabledCheckBox: azdata.CheckBoxComponent; + private errorNumberRadioButton: azdata.RadioButtonComponent; + private severityRadioButton: azdata.RadioButtonComponent; + private errorNumberTextBox: azdata.InputBoxComponent; - private raiseAlertMessageCheckBox: sqlops.CheckBoxComponent; - private raiseAlertMessageTextBox: sqlops.InputBoxComponent; + private raiseAlertMessageCheckBox: azdata.CheckBoxComponent; + private raiseAlertMessageTextBox: azdata.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; + private executeJobTextBox: azdata.InputBoxComponent; + private executeJobCheckBox: azdata.CheckBoxComponent; + private newJobButton: azdata.ButtonComponent; + private notifyOperatorsCheckBox: azdata.CheckBoxComponent; + private operatorsTable: azdata.TableComponent; + private newOperatorButton: azdata.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 additionalMessageTextBox: azdata.InputBoxComponent; + private includeErrorInEmailTextBox: azdata.CheckBoxComponent; + private includeErrorInPagerTextBox: azdata.CheckBoxComponent; + private delayMinutesTextBox: azdata.InputBoxComponent; + private delaySecondsTextBox: azdata.InputBoxComponent; private isEdit: boolean = false; private databases: string[]; @@ -162,7 +162,7 @@ export class AlertDialog extends AgentDialog { constructor( ownerUri: string, jobModel: JobData, - alertInfo: sqlops.AgentAlertInfo = undefined, + alertInfo: azdata.AgentAlertInfo = undefined, viaJobDialog: boolean = false ) { super(ownerUri, @@ -175,13 +175,13 @@ export class AlertDialog extends AgentDialog { this.dialogName = this.isEdit ? this.EditAlertDialog : this.NewAlertDialog; } - protected async initializeDialog(dialog: sqlops.window.Dialog) { + protected async initializeDialog(dialog: azdata.window.Dialog) { this.databases = await AgentUtils.getDatabases(this.ownerUri); this.databases.unshift(AlertDialog.AllDatabases); - this.generalTab = sqlops.window.createTab(AlertDialog.GeneralTabText); - this.responseTab = sqlops.window.createTab(AlertDialog.ResponseTabText); - this.optionsTab = sqlops.window.createTab(AlertDialog.OptionsTabText); + this.generalTab = azdata.window.createTab(AlertDialog.GeneralTabText); + this.responseTab = azdata.window.createTab(AlertDialog.ResponseTabText); + this.optionsTab = azdata.window.createTab(AlertDialog.OptionsTabText); this.initializeGeneralTab(this.databases, dialog); this.initializeResponseTab(); @@ -190,7 +190,7 @@ export class AlertDialog extends AgentDialog { dialog.content = [this.generalTab, this.responseTab, this.optionsTab]; } - private initializeGeneralTab(databases: string[], dialog: sqlops.window.Dialog) { + private initializeGeneralTab(databases: string[], dialog: azdata.window.Dialog) { this.generalTab.registerContent(async view => { // create controls this.nameTextBox = view.modelBuilder.inputBox().component(); diff --git a/extensions/agent/src/dialogs/jobDialog.ts b/extensions/agent/src/dialogs/jobDialog.ts index 6c41301e42..b63703a129 100644 --- a/extensions/agent/src/dialogs/jobDialog.ts +++ b/extensions/agent/src/dialogs/jobDialog.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { JobData } from '../data/jobData'; import { JobStepDialog } from './jobStepDialog'; import { PickScheduleDialog } from './pickScheduleDialog'; @@ -73,60 +73,60 @@ export class JobDialog extends AgentDialog { private readonly EditJobDialogEvent: string = 'EditJobDialogOpened'; // UI Components - private generalTab: sqlops.window.DialogTab; - private stepsTab: sqlops.window.DialogTab; - private alertsTab: sqlops.window.DialogTab; - private schedulesTab: sqlops.window.DialogTab; - private notificationsTab: sqlops.window.DialogTab; + private generalTab: azdata.window.DialogTab; + private stepsTab: azdata.window.DialogTab; + private alertsTab: azdata.window.DialogTab; + private schedulesTab: azdata.window.DialogTab; + private notificationsTab: azdata.window.DialogTab; // General tab controls - private nameTextBox: sqlops.InputBoxComponent; - private ownerTextBox: sqlops.InputBoxComponent; - private categoryDropdown: sqlops.DropDownComponent; - private descriptionTextBox: sqlops.InputBoxComponent; - private enabledCheckBox: sqlops.CheckBoxComponent; + private nameTextBox: azdata.InputBoxComponent; + private ownerTextBox: azdata.InputBoxComponent; + private categoryDropdown: azdata.DropDownComponent; + private descriptionTextBox: azdata.InputBoxComponent; + private enabledCheckBox: azdata.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; + private stepsTable: azdata.TableComponent; + private newStepButton: azdata.ButtonComponent; + private moveStepUpButton: azdata.ButtonComponent; + private moveStepDownButton: azdata.ButtonComponent; + private editStepButton: azdata.ButtonComponent; + private deleteStepButton: azdata.ButtonComponent; // Schedule tab controls - private removeScheduleButton: sqlops.ButtonComponent; + private removeScheduleButton: azdata.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; - private startStepDropdown: sqlops.DropDownComponent; + private notificationsTabTopLabel: azdata.TextComponent; + private emailCheckBox: azdata.CheckBoxComponent; + private emailOperatorDropdown: azdata.DropDownComponent; + private emailConditionDropdown: azdata.DropDownComponent; + private pagerCheckBox: azdata.CheckBoxComponent; + private pagerOperatorDropdown: azdata.DropDownComponent; + private pagerConditionDropdown: azdata.DropDownComponent; + private eventLogCheckBox: azdata.CheckBoxComponent; + private eventLogConditionDropdown: azdata.DropDownComponent; + private deleteJobCheckBox: azdata.CheckBoxComponent; + private deleteJobConditionDropdown: azdata.DropDownComponent; + private startStepDropdown: azdata.DropDownComponent; // Schedule tab controls - private schedulesTable: sqlops.TableComponent; - private pickScheduleButton: sqlops.ButtonComponent; + private schedulesTable: azdata.TableComponent; + private pickScheduleButton: azdata.ButtonComponent; // Alert tab controls - private alertsTable: sqlops.TableComponent; - private newAlertButton: sqlops.ButtonComponent; + private alertsTable: azdata.TableComponent; + private newAlertButton: azdata.ButtonComponent; private isEdit: boolean = false; // Job objects - private steps: sqlops.AgentJobStepInfo[]; - private schedules: sqlops.AgentJobScheduleInfo[]; - private alerts: sqlops.AgentAlertInfo[] = []; - private startStepDropdownValues: sqlops.CategoryValue[] = []; + private steps: azdata.AgentJobStepInfo[]; + private schedules: azdata.AgentJobScheduleInfo[]; + private alerts: azdata.AgentAlertInfo[] = []; + private startStepDropdownValues: azdata.CategoryValue[] = []; - constructor(ownerUri: string, jobInfo: sqlops.AgentJobInfo = undefined) { + constructor(ownerUri: string, jobInfo: azdata.AgentJobInfo = undefined) { super( ownerUri, new JobData(ownerUri, jobInfo), @@ -139,11 +139,11 @@ export class JobDialog extends AgentDialog { } protected async initializeDialog() { - this.generalTab = sqlops.window.createTab(this.GeneralTabText); - this.stepsTab = sqlops.window.createTab(this.StepsTabText); - this.alertsTab = sqlops.window.createTab(this.AlertsTabText); - this.schedulesTab = sqlops.window.createTab(this.SchedulesTabText); - this.notificationsTab = sqlops.window.createTab(this.NotificationsTabText); + this.generalTab = azdata.window.createTab(this.GeneralTabText); + this.stepsTab = azdata.window.createTab(this.StepsTabText); + this.alertsTab = azdata.window.createTab(this.AlertsTabText); + this.schedulesTab = azdata.window.createTab(this.SchedulesTabText); + this.notificationsTab = azdata.window.createTab(this.NotificationsTabText); this.initializeGeneralTab(); this.initializeStepsTab(); this.initializeAlertsTab(); @@ -636,7 +636,7 @@ export class JobDialog extends AgentDialog { }); } - private createRowContainer(view: sqlops.ModelView): sqlops.FlexBuilder { + private createRowContainer(view: azdata.ModelView): azdata.FlexBuilder { return view.modelBuilder.flexContainer().withLayout({ flexFlow: 'row', alignItems: 'left', @@ -644,7 +644,7 @@ export class JobDialog extends AgentDialog { }); } - private convertStepsToData(jobSteps: sqlops.AgentJobStepInfo[]): any[][] { + private convertStepsToData(jobSteps: azdata.AgentJobStepInfo[]): any[][] { let result = []; jobSteps.forEach(jobStep => { let cols = []; @@ -658,7 +658,7 @@ export class JobDialog extends AgentDialog { return result; } - private convertSchedulesToData(jobSchedules: sqlops.AgentJobScheduleInfo[]): any[][] { + private convertSchedulesToData(jobSchedules: azdata.AgentJobScheduleInfo[]): any[][] { let result = []; jobSchedules.forEach(schedule => { let cols = []; @@ -670,7 +670,7 @@ export class JobDialog extends AgentDialog { return result; } - private convertAlertsToData(alerts: sqlops.AgentAlertInfo[]): any[][] { + private convertAlertsToData(alerts: azdata.AgentAlertInfo[]): any[][] { let result = []; alerts.forEach(alert => { let cols = []; diff --git a/extensions/agent/src/dialogs/jobStepDialog.ts b/extensions/agent/src/dialogs/jobStepDialog.ts index ea105c6f2d..daafa3a149 100644 --- a/extensions/agent/src/dialogs/jobStepDialog.ts +++ b/extensions/agent/src/dialogs/jobStepDialog.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { JobStepData } from '../data/jobStepData'; import { AgentUtils } from '../agentUtils'; @@ -74,42 +74,42 @@ export class JobStepDialog extends AgentDialog { // UI Components // Dialogs - private fileBrowserDialog: sqlops.window.Dialog; + private fileBrowserDialog: azdata.window.Dialog; // Dialog tabs - private generalTab: sqlops.window.DialogTab; - private advancedTab: sqlops.window.DialogTab; + private generalTab: azdata.window.DialogTab; + private advancedTab: azdata.window.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; - private processExitCodeBox: sqlops.InputBoxComponent; + private nameTextBox: azdata.InputBoxComponent; + private commandTextBox: azdata.InputBoxComponent; + private selectedPathTextBox: azdata.InputBoxComponent; + private retryAttemptsBox: azdata.InputBoxComponent; + private retryIntervalBox: azdata.InputBoxComponent; + private outputFileNameBox: azdata.InputBoxComponent; + private fileBrowserNameBox: azdata.InputBoxComponent; + private userInputBox: azdata.InputBoxComponent; + private processExitCodeBox: azdata.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; + private typeDropdown: azdata.DropDownComponent; + private runAsDropdown: azdata.DropDownComponent; + private databaseDropdown: azdata.DropDownComponent; + private successActionDropdown: azdata.DropDownComponent; + private failureActionDropdown: azdata.DropDownComponent; + private fileTypeDropdown: azdata.DropDownComponent; // Buttons - private openButton: sqlops.ButtonComponent; - private parseButton: sqlops.ButtonComponent; - private outputFileBrowserButton: sqlops.ButtonComponent; + private openButton: azdata.ButtonComponent; + private parseButton: azdata.ButtonComponent; + private outputFileBrowserButton: azdata.ButtonComponent; // Checkbox - private appendToExistingFileCheckbox: sqlops.CheckBoxComponent; - private logToTableCheckbox: sqlops.CheckBoxComponent; - private logStepOutputHistoryCheckbox: sqlops.CheckBoxComponent; + private appendToExistingFileCheckbox: azdata.CheckBoxComponent; + private logToTableCheckbox: azdata.CheckBoxComponent; + private logStepOutputHistoryCheckbox: azdata.CheckBoxComponent; - private fileBrowserTree: sqlops.FileBrowserTreeComponent; + private fileBrowserTree: azdata.FileBrowserTreeComponent; private jobModel: JobData; public jobName: string; private server: string; @@ -120,7 +120,7 @@ export class JobStepDialog extends AgentDialog { ownerUri: string, server: string, jobModel: JobData, - jobStepInfo?: sqlops.AgentJobStepInfo, + jobStepInfo?: azdata.AgentJobStepInfo, viaJobDialog: boolean = false ) { super(ownerUri, @@ -138,12 +138,12 @@ export class JobStepDialog extends AgentDialog { } private initializeUIComponents() { - this.generalTab = sqlops.window.createTab(this.GeneralTabText); - this.advancedTab = sqlops.window.createTab(this.AdvancedTabText); + this.generalTab = azdata.window.createTab(this.GeneralTabText); + this.advancedTab = azdata.window.createTab(this.AdvancedTabText); this.dialog.content = [this.generalTab, this.advancedTab]; } - private createCommands(view, queryProvider: sqlops.QueryProvider) { + private createCommands(view, queryProvider: azdata.QueryProvider) { this.openButton = view.modelBuilder.button() .withProperties({ label: this.OpenCommandText, @@ -181,7 +181,7 @@ export class JobStepDialog extends AgentDialog { .component(); } - private createGeneralTab(databases: string[], queryProvider: sqlops.QueryProvider) { + private createGeneralTab(databases: string[], queryProvider: azdata.QueryProvider) { this.generalTab.registerContent(async (view) => { this.nameTextBox = view.modelBuilder.inputBox() .withProperties({ @@ -425,8 +425,8 @@ export class JobStepDialog extends AgentDialog { private openFileBrowserDialog() { let fileBrowserTitle = this.FileBrowserDialogTitle + `${this.server}`; - this.fileBrowserDialog = sqlops.window.createModelViewDialog(fileBrowserTitle); - let fileBrowserTab = sqlops.window.createTab('File Browser'); + this.fileBrowserDialog = azdata.window.createModelViewDialog(fileBrowserTitle); + let fileBrowserTab = azdata.window.createTab('File Browser'); this.fileBrowserDialog.content = [fileBrowserTab]; fileBrowserTab.registerContent(async (view) => { this.fileBrowserTree = view.modelBuilder.fileBrowserTree() @@ -470,7 +470,7 @@ export class JobStepDialog extends AgentDialog { }); this.fileBrowserDialog.okButton.label = this.OkButtonText; this.fileBrowserDialog.cancelButton.label = this.CancelButtonText; - sqlops.window.openDialog(this.fileBrowserDialog); + azdata.window.openDialog(this.fileBrowserDialog); } private createTSQLOptions(view) { diff --git a/extensions/agent/src/dialogs/operatorDialog.ts b/extensions/agent/src/dialogs/operatorDialog.ts index 27d7ec52b2..ba8ac64d34 100644 --- a/extensions/agent/src/dialogs/operatorDialog.ts +++ b/extensions/agent/src/dialogs/operatorDialog.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { OperatorData } from '../data/operatorData'; import * as nls from 'vscode-nls'; @@ -48,33 +48,33 @@ export class OperatorDialog extends AgentDialog { private readonly EditOperatorDialog = 'EditOperatorDialogOpened'; // UI Components - private generalTab: sqlops.window.DialogTab; - private notificationsTab: sqlops.window.DialogTab; + private generalTab: azdata.window.DialogTab; + private notificationsTab: azdata.window.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; + private nameTextBox: azdata.InputBoxComponent; + private enabledCheckBox: azdata.CheckBoxComponent; + private emailNameTextBox: azdata.InputBoxComponent; + private pagerEmailNameTextBox: azdata.InputBoxComponent; + private pagerMondayCheckBox: azdata.CheckBoxComponent; + private pagerTuesdayCheckBox: azdata.CheckBoxComponent; + private pagerWednesdayCheckBox: azdata.CheckBoxComponent; + private pagerThursdayCheckBox: azdata.CheckBoxComponent; + private pagerFridayCheckBox: azdata.CheckBoxComponent; + private pagerSaturdayCheckBox: azdata.CheckBoxComponent; + private pagerSundayCheckBox: azdata.CheckBoxComponent; + private weekdayPagerStartTimeInput: azdata.InputBoxComponent; + private weekdayPagerEndTimeInput: azdata.InputBoxComponent; + private saturdayPagerStartTimeInput: azdata.InputBoxComponent; + private saturdayPagerEndTimeInput: azdata.InputBoxComponent; + private sundayPagerStartTimeInput: azdata.InputBoxComponent; + private sundayPagerEndTimeInput: azdata.InputBoxComponent; // Notification tab controls - private alertsTable: sqlops.TableComponent; + private alertsTable: azdata.TableComponent; private isEdit: boolean = false; - constructor(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo = undefined) { + constructor(ownerUri: string, operatorInfo: azdata.AgentOperatorInfo = undefined) { super( ownerUri, new OperatorData(ownerUri, operatorInfo), @@ -83,9 +83,9 @@ export class OperatorDialog extends AgentDialog { this.dialogName = this.isEdit ? this.EditOperatorDialog : this.NewOperatorDialog; } - protected async initializeDialog(dialog: sqlops.window.Dialog) { - this.generalTab = sqlops.window.createTab(OperatorDialog.GeneralTabText); - this.notificationsTab = sqlops.window.createTab(OperatorDialog.NotificationsTabText); + protected async initializeDialog(dialog: azdata.window.Dialog) { + this.generalTab = azdata.window.createTab(OperatorDialog.GeneralTabText); + this.notificationsTab = azdata.window.createTab(OperatorDialog.NotificationsTabText); this.initializeGeneralTab(); this.initializeNotificationTab(); diff --git a/extensions/agent/src/dialogs/pickScheduleDialog.ts b/extensions/agent/src/dialogs/pickScheduleDialog.ts index 4f31caaead..2083bbb581 100644 --- a/extensions/agent/src/dialogs/pickScheduleDialog.ts +++ b/extensions/agent/src/dialogs/pickScheduleDialog.ts @@ -5,7 +5,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { PickScheduleData } from '../data/pickScheduleData'; @@ -25,8 +25,8 @@ export class PickScheduleDialog { // UI Components - private dialog: sqlops.window.Dialog; - private schedulesTable: sqlops.TableComponent; + private dialog: azdata.window.Dialog; + private schedulesTable: azdata.TableComponent; private model: PickScheduleData; @@ -39,13 +39,13 @@ export class PickScheduleDialog { public async showDialog() { await this.model.initialize(); - this.dialog = sqlops.window.createModelViewDialog(this.DialogTitle); + this.dialog = azdata.window.createModelViewDialog(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.openDialog(this.dialog); + azdata.window.openDialog(this.dialog); } private initializeContent() { diff --git a/extensions/agent/src/dialogs/proxyDialog.ts b/extensions/agent/src/dialogs/proxyDialog.ts index a828b9ba04..7e07e3dbd3 100644 --- a/extensions/agent/src/dialogs/proxyDialog.ts +++ b/extensions/agent/src/dialogs/proxyDialog.ts @@ -6,7 +6,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { AgentDialog } from './agentDialog'; import { ProxyData } from '../data/proxyData'; @@ -40,28 +40,28 @@ export class ProxyDialog extends AgentDialog { private readonly EditProxyDialog = 'EditProxyDialogOpened'; // UI Components - private generalTab: sqlops.window.DialogTab; + private generalTab: azdata.window.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 proxyNameTextBox: azdata.InputBoxComponent; + private credentialNameDropDown: azdata.DropDownComponent; + private descriptionTextBox: azdata.InputBoxComponent; + private subsystemCheckBox: azdata.CheckBoxComponent; + private operatingSystemCheckBox: azdata.CheckBoxComponent; + private replicationSnapshotCheckBox: azdata.CheckBoxComponent; + private replicationTransactionLogCheckBox: azdata.CheckBoxComponent; + private replicationDistributorCheckBox: azdata.CheckBoxComponent; + private replicationMergeCheckbox: azdata.CheckBoxComponent; + private replicationQueueReaderCheckbox: azdata.CheckBoxComponent; + private sqlQueryCheckBox: azdata.CheckBoxComponent; + private sqlCommandCheckBox: azdata.CheckBoxComponent; + private sqlIntegrationServicesPackageCheckbox: azdata.CheckBoxComponent; + private powershellCheckBox: azdata.CheckBoxComponent; - private credentials: sqlops.CredentialInfo[]; + private credentials: azdata.CredentialInfo[]; private isEdit: boolean = false; - constructor(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo = undefined, credentials: sqlops.CredentialInfo[]) { + constructor(ownerUri: string, proxyInfo: azdata.AgentProxyInfo = undefined, credentials: azdata.CredentialInfo[]) { super( ownerUri, new ProxyData(ownerUri, proxyInfo), @@ -71,8 +71,8 @@ export class ProxyDialog extends AgentDialog { this.dialogName = this.isEdit ? this.EditProxyDialog : this.NewProxyDialog; } - protected async initializeDialog(dialog: sqlops.window.Dialog) { - this.generalTab = sqlops.window.createTab(ProxyDialog.GeneralTabText); + protected async initializeDialog(dialog: azdata.window.Dialog) { + this.generalTab = azdata.window.createTab(ProxyDialog.GeneralTabText); this.initializeGeneralTab(); diff --git a/extensions/agent/src/dialogs/scheduleDialog.ts b/extensions/agent/src/dialogs/scheduleDialog.ts index 3f8f532389..4c06658d4f 100644 --- a/extensions/agent/src/dialogs/scheduleDialog.ts +++ b/extensions/agent/src/dialogs/scheduleDialog.ts @@ -5,7 +5,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { ScheduleData } from '../data/scheduleData'; @@ -21,8 +21,8 @@ export class ScheduleDialog { private readonly SchedulesLabelText: string = localize('scheduleDialog.schedules', 'Schedules'); // UI Components - private dialog: sqlops.window.Dialog; - private schedulesTable: sqlops.TableComponent; + private dialog: azdata.window.Dialog; + private schedulesTable: azdata.TableComponent; private model: ScheduleData; @@ -35,14 +35,14 @@ export class ScheduleDialog { public async showDialog() { await this.model.initialize(); - this.dialog = sqlops.window.createModelViewDialog(this.DialogTitle); + this.dialog = azdata.window.createModelViewDialog(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.openDialog(this.dialog); + azdata.window.openDialog(this.dialog); } private initializeContent() { diff --git a/extensions/agent/src/mainController.ts b/extensions/agent/src/mainController.ts index d8a35b7ca9..1704b817c6 100644 --- a/extensions/agent/src/mainController.ts +++ b/extensions/agent/src/mainController.ts @@ -5,7 +5,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { AlertDialog } from './dialogs/alertDialog'; import { JobDialog } from './dialogs/jobDialog'; @@ -38,11 +38,11 @@ export class MainController { * Activates the extension */ public activate(): void { - vscode.commands.registerCommand('agent.openJobDialog', (ownerUri: string, jobInfo: sqlops.AgentJobInfo) => { + vscode.commands.registerCommand('agent.openJobDialog', (ownerUri: string, jobInfo: azdata.AgentJobInfo) => { let dialog = new JobDialog(ownerUri, jobInfo); dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog(); }); - vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, server: string, jobInfo: sqlops.AgentJobInfo, jobStepInfo: sqlops.AgentJobStepInfo) => { + vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, server: string, jobInfo: azdata.AgentJobInfo, jobStepInfo: azdata.AgentJobStepInfo) => { AgentUtils.getAgentService().then((agentService) => { let jobData: JobData = new JobData(ownerUri, jobInfo, agentService); let dialog = new JobStepDialog(ownerUri, server, jobData, jobStepInfo, false); @@ -53,18 +53,18 @@ export class MainController { let dialog = new PickScheduleDialog(ownerUri, jobName); dialog.showDialog(); }); - vscode.commands.registerCommand('agent.openAlertDialog', (ownerUri: string, jobInfo: sqlops.AgentJobInfo, alertInfo: sqlops.AgentAlertInfo) => { + vscode.commands.registerCommand('agent.openAlertDialog', (ownerUri: string, jobInfo: azdata.AgentJobInfo, alertInfo: azdata.AgentAlertInfo) => { AgentUtils.getAgentService().then((agentService) => { let jobData: JobData = new JobData(ownerUri, jobInfo, agentService); let dialog = new AlertDialog(ownerUri, jobData, alertInfo, false); dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog(); }); }); - vscode.commands.registerCommand('agent.openOperatorDialog', (ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo) => { + vscode.commands.registerCommand('agent.openOperatorDialog', (ownerUri: string, operatorInfo: azdata.AgentOperatorInfo) => { let dialog = new OperatorDialog(ownerUri, operatorInfo); dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog(); }); - vscode.commands.registerCommand('agent.openProxyDialog', (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo, credentials: sqlops.CredentialInfo[]) => { + vscode.commands.registerCommand('agent.openProxyDialog', (ownerUri: string, proxyInfo: azdata.AgentProxyInfo, credentials: azdata.CredentialInfo[]) => { let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials); dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog(); }); diff --git a/extensions/agent/src/test/agent.test.ts b/extensions/agent/src/test/agent.test.ts index 04a9202083..93924bd278 100644 --- a/extensions/agent/src/test/agent.test.ts +++ b/extensions/agent/src/test/agent.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import 'mocha'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { JobData } from '../data/jobData'; import { TestAgentService } from './testAgentService'; diff --git a/extensions/agent/src/test/testAgentService.ts b/extensions/agent/src/test/testAgentService.ts index ae68cf12bf..db7a150cc8 100644 --- a/extensions/agent/src/test/testAgentService.ts +++ b/extensions/agent/src/test/testAgentService.ts @@ -4,104 +4,104 @@ *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; -export class TestAgentService implements sqlops.AgentServicesProvider { +export class TestAgentService implements azdata.AgentServicesProvider { handle?: number; readonly providerId: string = 'Test Provider'; // Job management methods - getJobs(ownerUri: string): Thenable { + getJobs(ownerUri: string): Thenable { return undefined; } - getJobHistory(ownerUri: string, jobId: string, jobName: string): Thenable { + getJobHistory(ownerUri: string, jobId: string, jobName: string): Thenable { return undefined; } - jobAction(ownerUri: string, jobName: string, action: string): Thenable { + jobAction(ownerUri: string, jobName: string, action: string): Thenable { return undefined; } - createJob(ownerUri: string, jobInfo: sqlops.AgentJobInfo): Thenable { + createJob(ownerUri: string, jobInfo: azdata.AgentJobInfo): Thenable { return undefined; } - updateJob(ownerUri: string, originalJobName: string, jobInfo: sqlops.AgentJobInfo): Thenable { + updateJob(ownerUri: string, originalJobName: string, jobInfo: azdata.AgentJobInfo): Thenable { return undefined; } - deleteJob(ownerUri: string, jobInfo: sqlops.AgentJobInfo): Thenable { + deleteJob(ownerUri: string, jobInfo: azdata.AgentJobInfo): Thenable { return undefined; } - getJobDefaults(ownerUri: string): Thenable { + getJobDefaults(ownerUri: string): Thenable { return undefined; } // Job Step management methods - createJobStep(ownerUri: string, jobInfo: sqlops.AgentJobStepInfo): Thenable { + createJobStep(ownerUri: string, jobInfo: azdata.AgentJobStepInfo): Thenable { return undefined; } - updateJobStep(ownerUri: string, originalJobStepName: string, jobInfo: sqlops.AgentJobStepInfo): Thenable { + updateJobStep(ownerUri: string, originalJobStepName: string, jobInfo: azdata.AgentJobStepInfo): Thenable { return undefined; } - deleteJobStep(ownerUri: string, jobInfo: sqlops.AgentJobStepInfo): Thenable { + deleteJobStep(ownerUri: string, jobInfo: azdata.AgentJobStepInfo): Thenable { return undefined; } // Alert management methods - getAlerts(ownerUri: string): Thenable { + getAlerts(ownerUri: string): Thenable { return undefined; } - createAlert(ownerUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable { + createAlert(ownerUri: string, alertInfo: azdata.AgentAlertInfo): Thenable { return undefined; } - updateAlert(ownerUri: string, originalAlertName: string, alertInfo: sqlops.AgentAlertInfo): Thenable { + updateAlert(ownerUri: string, originalAlertName: string, alertInfo: azdata.AgentAlertInfo): Thenable { return undefined; } - deleteAlert(ownerUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable { + deleteAlert(ownerUri: string, alertInfo: azdata.AgentAlertInfo): Thenable { return undefined; } // Operator management methods - getOperators(ownerUri: string): Thenable { + getOperators(ownerUri: string): Thenable { return undefined; } - createOperator(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable { + createOperator(ownerUri: string, operatorInfo: azdata.AgentOperatorInfo): Thenable { return undefined; } - updateOperator(ownerUri: string, originalOperatorName: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable { + updateOperator(ownerUri: string, originalOperatorName: string, operatorInfo: azdata.AgentOperatorInfo): Thenable { return undefined; } - deleteOperator(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable { + deleteOperator(ownerUri: string, operatorInfo: azdata.AgentOperatorInfo): Thenable { return undefined; } // Proxy management methods - getProxies(ownerUri: string): Thenable { + getProxies(ownerUri: string): Thenable { return undefined; } - createProxy(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable { + createProxy(ownerUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable { return undefined; } - updateProxy(ownerUri: string, originalProxyName: string, proxyInfo: sqlops.AgentProxyInfo): Thenable { + updateProxy(ownerUri: string, originalProxyName: string, proxyInfo: azdata.AgentProxyInfo): Thenable { return undefined; } - deleteProxy(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable { + deleteProxy(ownerUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable { return undefined; } // Agent Credential method - getCredentials(ownerUri: string): Thenable { + getCredentials(ownerUri: string): Thenable { return undefined; } // Job Schedule management methods - getJobSchedules(ownerUri: string): Thenable { + getJobSchedules(ownerUri: string): Thenable { return undefined; } - createJobSchedule(ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable { + createJobSchedule(ownerUri: string, scheduleInfo: azdata.AgentJobScheduleInfo): Thenable { return undefined; } - updateJobSchedule(ownerUri: string, originalScheduleName: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable { + updateJobSchedule(ownerUri: string, originalScheduleName: string, scheduleInfo: azdata.AgentJobScheduleInfo): Thenable { return undefined; } - deleteJobSchedule(ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable { + deleteJobSchedule(ownerUri: string, scheduleInfo: azdata.AgentJobScheduleInfo): Thenable { return undefined; } diff --git a/extensions/agent/src/typings/ref.d.ts b/extensions/agent/src/typings/ref.d.ts index acd28db2d3..4d46be908b 100644 --- a/extensions/agent/src/typings/ref.d.ts +++ b/extensions/agent/src/typings/ref.d.ts @@ -6,6 +6,4 @@ /// /// /// -/// -/// /// \ No newline at end of file diff --git a/extensions/azurecore/src/account-provider/azureAccountProvider.ts b/extensions/azurecore/src/account-provider/azureAccountProvider.ts index 78c49ea2ed..47eb193b2d 100644 --- a/extensions/azurecore/src/account-provider/azureAccountProvider.ts +++ b/extensions/azurecore/src/account-provider/azureAccountProvider.ts @@ -6,7 +6,7 @@ 'use strict'; import * as adal from 'adal-node'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as request from 'request'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; @@ -22,7 +22,7 @@ import TokenCache from './tokenCache'; const localize = nls.loadMessageBundle(); -export class AzureAccountProvider implements sqlops.AccountProvider { +export class AzureAccountProvider implements azdata.AccountProvider { // CONSTANTS /////////////////////////////////////////////////////////// private static WorkSchoolAccountType: string = 'work_school'; private static MicrosoftAccountType: string = 'microsoft'; @@ -57,7 +57,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider { * @param {"data".AccountKey} accountKey Key identifying the account to delete tokens for * @returns {Thenable} Promise to clear requested tokens from the token cache */ - public clear(accountKey: sqlops.AccountKey): Thenable { + public clear(accountKey: azdata.AccountKey): Thenable { return this.doIfInitialized(() => this.clearAccountTokens(accountKey)); } @@ -69,14 +69,14 @@ export class AzureAccountProvider implements sqlops.AccountProvider { return this._tokenCache.clear(); } - public getSecurityToken(account: AzureAccount, resource: sqlops.AzureResource): Thenable { + public getSecurityToken(account: AzureAccount, resource: azdata.AzureResource): Thenable { return this.doIfInitialized(() => this.getAccessTokens(account, resource)); } - public initialize(restoredAccounts: sqlops.Account[]): Thenable { + public initialize(restoredAccounts: azdata.Account[]): Thenable { let self = this; - let rehydrationTasks: Thenable[] = []; + let rehydrationTasks: Thenable[] = []; for (let account of restoredAccounts) { // Purge any invalid accounts if (!account) { @@ -90,7 +90,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider { // Attempt to get fresh tokens. If this fails then the account is stale. // NOTE: Based on ADAL implementation, getting tokens should use the refresh token if necessary - let task = this.getAccessTokens(account, sqlops.AzureResource.ResourceManagement) + let task = this.getAccessTokens(account, azdata.AzureResource.ResourceManagement) .then( () => { return account; @@ -145,7 +145,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider { return Promise.resolve(); } - private clearAccountTokens(accountKey: sqlops.AccountKey): Thenable { + private clearAccountTokens(accountKey: azdata.AccountKey): Thenable { // Put together a query to look up any tokens associated with the account key let query = { userId: accountKey.accountId }; @@ -161,12 +161,12 @@ export class AzureAccountProvider implements sqlops.AccountProvider { : Promise.reject(localize('accountProviderNotInitialized', 'Account provider not initialized, cannot perform action')); } - private getAccessTokens(account: AzureAccount, resource: sqlops.AzureResource): Thenable { + private getAccessTokens(account: AzureAccount, resource: azdata.AzureResource): Thenable { let self = this; - const resourceIdMap = new Map([ - [sqlops.AzureResource.ResourceManagement, self._metadata.settings.armResource.id], - [sqlops.AzureResource.Sql, self._metadata.settings.sqlResource.id] + const resourceIdMap = new Map([ + [azdata.AzureResource.ResourceManagement, self._metadata.settings.armResource.id], + [azdata.AzureResource.Sql, self._metadata.settings.sqlResource.id] ]); let accessTokenPromises: Thenable[] = []; @@ -185,7 +185,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider { if (error) { // TODO: We'll assume for now that the account is stale, though that might not be accurate account.isStale = true; - sqlops.accounts.accountUpdated(account); + azdata.accounts.accountUpdated(account); reject(error); return; @@ -245,7 +245,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider { let title = isAddAccount ? localize('addAccount', 'Add {0} account', self._metadata.displayName) : localize('refreshAccount', 'Refresh {0} account', self._metadata.displayName); - return sqlops.accounts.beginAutoOAuthDeviceCode(self._metadata.id, title, oAuth.userCodeInfo.message, oAuth.userCodeInfo.userCode, oAuth.userCodeInfo.verificationUrl) + return azdata.accounts.beginAutoOAuthDeviceCode(self._metadata.id, title, oAuth.userCodeInfo.message, oAuth.userCodeInfo.userCode, oAuth.userCodeInfo.verificationUrl) .then(() => { return new Promise((resolve, reject) => { let context = oAuth.context; @@ -254,14 +254,14 @@ export class AzureAccountProvider implements sqlops.AccountProvider { if (err) { if (self._autoOAuthCancelled) { // Auto OAuth was cancelled by the user, indicate this with the error we return - reject({ userCancelledSignIn: true }); + reject({ userCancelledSignIn: true }); } else { // Auto OAuth failed for some other reason - sqlops.accounts.endAutoOAuthDeviceCode(); + azdata.accounts.endAutoOAuthDeviceCode(); reject(err); } } else { - sqlops.accounts.endAutoOAuthDeviceCode(); + azdata.accounts.endAutoOAuthDeviceCode(); resolve(response); } diff --git a/extensions/azurecore/src/account-provider/azureAccountProviderService.ts b/extensions/azurecore/src/account-provider/azureAccountProviderService.ts index fe9ad75937..6202c39fc0 100644 --- a/extensions/azurecore/src/account-provider/azureAccountProviderService.ts +++ b/extensions/azurecore/src/account-provider/azureAccountProviderService.ts @@ -6,7 +6,7 @@ 'use strict'; import * as constants from '../constants'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as events from 'events'; import * as nls from 'vscode-nls'; import * as path from 'path'; @@ -27,7 +27,7 @@ export class AzureAccountProviderService implements vscode.Disposable { // MEMBER VARIABLES //////////////////////////////////////////////////////// private _accountDisposals: { [accountProviderId: string]: vscode.Disposable }; private _accountProviders: { [accountProviderId: string]: AzureAccountProvider }; - private _credentialProvider: sqlops.CredentialProvider; + private _credentialProvider: azdata.CredentialProvider; private _configChangePromiseChain: Thenable; private _currentConfig: vscode.WorkspaceConfiguration; private _event: events.EventEmitter; @@ -55,7 +55,7 @@ export class AzureAccountProviderService implements vscode.Disposable { // 2a) Store the credential provider for use later // 2b) Register the configuration change handler // 2c) Perform an initial config change handling - return sqlops.credentials.getProvider(AzureAccountProviderService.CredentialNamespace) + return azdata.credentials.getProvider(AzureAccountProviderService.CredentialNamespace) .then(credProvider => { self._credentialProvider = credProvider; @@ -138,7 +138,7 @@ export class AzureAccountProviderService implements vscode.Disposable { let tokenCache = new CredentialServiceTokenCache(self._credentialProvider, tokenCacheKey, tokenCachePath); let accountProvider = new AzureAccountProvider(provider.metadata, tokenCache); self._accountProviders[provider.metadata.id] = accountProvider; - self._accountDisposals[provider.metadata.id] = sqlops.accounts.registerAccountProvider(provider.metadata, accountProvider); + self._accountDisposals[provider.metadata.id] = azdata.accounts.registerAccountProvider(provider.metadata, accountProvider); resolve(); } catch (e) { console.error(`Failed to register account provider: ${e}`); diff --git a/extensions/azurecore/src/account-provider/interfaces.ts b/extensions/azurecore/src/account-provider/interfaces.ts index 78c959403b..bb1c5ad3ec 100644 --- a/extensions/azurecore/src/account-provider/interfaces.ts +++ b/extensions/azurecore/src/account-provider/interfaces.ts @@ -1,6 +1,6 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * Represents a tenant (an Azure Active Directory instance) to which a user has access @@ -123,7 +123,7 @@ export interface ProviderSettings { /** * Extension of account provider metadata to override settings type for Azure account providers */ -export interface AzureAccountProviderMetadata extends sqlops.AccountProviderMetadata { +export interface AzureAccountProviderMetadata extends azdata.AccountProviderMetadata { /** * Azure specific account provider settings. */ @@ -148,7 +148,7 @@ export interface AzureAccountProperties { /** * Override of the Account type to enforce properties that are AzureAccountProperties */ -export interface AzureAccount extends sqlops.Account { +export interface AzureAccount extends azdata.Account { /** * AzureAccountProperties specifically used for Azure accounts */ diff --git a/extensions/azurecore/src/account-provider/tokenCache.ts b/extensions/azurecore/src/account-provider/tokenCache.ts index 96e3bf4d4e..81f91295ce 100644 --- a/extensions/azurecore/src/account-provider/tokenCache.ts +++ b/extensions/azurecore/src/account-provider/tokenCache.ts @@ -6,7 +6,7 @@ 'use strict'; import * as adal from 'adal-node'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as crypto from 'crypto'; import * as fs from 'fs'; @@ -19,7 +19,7 @@ export default class TokenCache implements adal.TokenCache { private _activeOperation: Thenable; constructor( - private _credentialProvider: sqlops.CredentialProvider, + private _credentialProvider: azdata.CredentialProvider, private _credentialServiceKey: string, private _cacheSerializationPath: string ) { diff --git a/extensions/azurecore/src/apiWrapper.ts b/extensions/azurecore/src/apiWrapper.ts index 5766945bae..41e9315edf 100644 --- a/extensions/azurecore/src/apiWrapper.ts +++ b/extensions/azurecore/src/apiWrapper.ts @@ -6,7 +6,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as constants from './constants'; @@ -19,64 +19,64 @@ import * as constants from './constants'; */ export class ApiWrapper { // Data APIs - public registerConnectionProvider(provider: sqlops.ConnectionProvider): vscode.Disposable { - return sqlops.dataprotocol.registerConnectionProvider(provider); + public registerConnectionProvider(provider: azdata.ConnectionProvider): vscode.Disposable { + return azdata.dataprotocol.registerConnectionProvider(provider); } - public registerObjectExplorerProvider(provider: sqlops.ObjectExplorerProvider): vscode.Disposable { - return sqlops.dataprotocol.registerObjectExplorerProvider(provider); + public registerObjectExplorerProvider(provider: azdata.ObjectExplorerProvider): vscode.Disposable { + return azdata.dataprotocol.registerObjectExplorerProvider(provider); } - public registerTaskServicesProvider(provider: sqlops.TaskServicesProvider): vscode.Disposable { - return sqlops.dataprotocol.registerTaskServicesProvider(provider); + public registerTaskServicesProvider(provider: azdata.TaskServicesProvider): vscode.Disposable { + return azdata.dataprotocol.registerTaskServicesProvider(provider); } - public registerFileBrowserProvider(provider: sqlops.FileBrowserProvider): vscode.Disposable { - return sqlops.dataprotocol.registerFileBrowserProvider(provider); + public registerFileBrowserProvider(provider: azdata.FileBrowserProvider): vscode.Disposable { + return azdata.dataprotocol.registerFileBrowserProvider(provider); } - public registerCapabilitiesServiceProvider(provider: sqlops.CapabilitiesProvider): vscode.Disposable { - return sqlops.dataprotocol.registerCapabilitiesServiceProvider(provider); + public registerCapabilitiesServiceProvider(provider: azdata.CapabilitiesProvider): vscode.Disposable { + return azdata.dataprotocol.registerCapabilitiesServiceProvider(provider); } - public registerModelViewProvider(widgetId: string, handler: (modelView: sqlops.ModelView) => void): void { - return sqlops.ui.registerModelViewProvider(widgetId, handler); + public registerModelViewProvider(widgetId: string, handler: (modelView: azdata.ModelView) => void): void { + return azdata.ui.registerModelViewProvider(widgetId, handler); } - public registerWebviewProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void): void { - return sqlops.dashboard.registerWebviewProvider(widgetId, handler); + public registerWebviewProvider(widgetId: string, handler: (webview: azdata.DashboardWebview) => void): void { + return azdata.dashboard.registerWebviewProvider(widgetId, handler); } - public createDialog(title: string): sqlops.window.Dialog { - return sqlops.window.createModelViewDialog(title); + public createDialog(title: string): azdata.window.Dialog { + return azdata.window.createModelViewDialog(title); } - public openDialog(dialog: sqlops.window.Dialog): void { - return sqlops.window.openDialog(dialog); + public openDialog(dialog: azdata.window.Dialog): void { + return azdata.window.openDialog(dialog); } - public closeDialog(dialog: sqlops.window.Dialog): void { - return sqlops.window.closeDialog(dialog); + public closeDialog(dialog: azdata.window.Dialog): void { + return azdata.window.closeDialog(dialog); } - public registerTaskHandler(taskId: string, handler: (profile: sqlops.IConnectionProfile) => void): void { - sqlops.tasks.registerTask(taskId, handler); + public registerTaskHandler(taskId: string, handler: (profile: azdata.IConnectionProfile) => void): void { + azdata.tasks.registerTask(taskId, handler); } - public startBackgroundOperation(operationInfo: sqlops.BackgroundOperationInfo): void { - sqlops.tasks.startBackgroundOperation(operationInfo); + public startBackgroundOperation(operationInfo: azdata.BackgroundOperationInfo): void { + azdata.tasks.startBackgroundOperation(operationInfo); } - public getActiveConnections(): Thenable { - return sqlops.connection.getActiveConnections(); + public getActiveConnections(): Thenable { + return azdata.connection.getActiveConnections(); } - public getCurrentConnection(): Thenable { - return sqlops.connection.getCurrentConnection(); + public getCurrentConnection(): Thenable { + return azdata.connection.getCurrentConnection(); } - public createModelViewEditor(title: string, options?: sqlops.ModelViewEditorOptions): sqlops.workspace.ModelViewEditor { - return sqlops.workspace.createModelViewEditor(title, options); + public createModelViewEditor(title: string, options?: azdata.ModelViewEditorOptions): azdata.workspace.ModelViewEditor { + return azdata.workspace.createModelViewEditor(title, options); } // VSCode APIs @@ -195,31 +195,31 @@ export class ApiWrapper { return vscode.window.createOutputChannel(name); } - public createWizardPage(title: string): sqlops.window.WizardPage { - return sqlops.window.createWizardPage(title); + public createWizardPage(title: string): azdata.window.WizardPage { + return azdata.window.createWizardPage(title); } public registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable { return vscode.languages.registerCompletionItemProvider(selector, provider, ...triggerCharacters); } - public createTab(title: string): sqlops.window.DialogTab { - return sqlops.window.createTab(title); + public createTab(title: string): azdata.window.DialogTab { + return azdata.window.createTab(title); } // Account APIs - public getAllAccounts(): Thenable { - return sqlops.accounts.getAllAccounts(); + public getAllAccounts(): Thenable { + return azdata.accounts.getAllAccounts(); } - public getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> { - return sqlops.accounts.getSecurityToken(account, resource); + public getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> { + return azdata.accounts.getSecurityToken(account, resource); } - public readonly onDidChangeAccounts = sqlops.accounts.onDidChangeAccounts; + public readonly onDidChangeAccounts = azdata.accounts.onDidChangeAccounts; // Connection APIs - public openConnectionDialog(providers: string[], initialConnectionProfile?: sqlops.IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Thenable { - return sqlops.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions); + public openConnectionDialog(providers: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable { + return azdata.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions); } } diff --git a/extensions/azurecore/src/azureResource/azure-resource.d.ts b/extensions/azurecore/src/azureResource/azure-resource.d.ts index ec9d9a5be8..2c551a786d 100644 --- a/extensions/azurecore/src/azureResource/azure-resource.d.ts +++ b/extensions/azurecore/src/azureResource/azure-resource.d.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { TreeDataProvider } from 'vscode'; -import { DataProvider, Account } from 'sqlops'; -import { TreeItem } from 'sqlops'; +import { DataProvider, Account } from 'azdata'; +import { TreeItem } from 'azdata'; export namespace azureResource { export interface IAzureResourceProvider extends DataProvider { diff --git a/extensions/azurecore/src/azureResource/commands.ts b/extensions/azurecore/src/azureResource/commands.ts index cf9cfc590c..28ebee7473 100644 --- a/extensions/azurecore/src/azureResource/commands.ts +++ b/extensions/azurecore/src/azureResource/commands.ts @@ -6,7 +6,7 @@ 'use strict'; import { window, QuickPickItem } from 'vscode'; -import { AzureResource } from 'sqlops'; +import { AzureResource } from 'azdata'; import { TokenCredentials } from 'ms-rest'; import { AppContext } from '../appContext'; import * as nls from 'vscode-nls'; diff --git a/extensions/azurecore/src/azureResource/interfaces.ts b/extensions/azurecore/src/azureResource/interfaces.ts index d56283f338..30e3d8101b 100644 --- a/extensions/azurecore/src/azureResource/interfaces.ts +++ b/extensions/azurecore/src/azureResource/interfaces.ts @@ -6,7 +6,7 @@ 'use strict'; import { ServiceClientCredentials } from 'ms-rest'; -import { Account, DidChangeAccountsParams } from 'sqlops'; +import { Account, DidChangeAccountsParams } from 'azdata'; import { Event } from 'vscode'; import { azureResource } from './azure-resource'; diff --git a/extensions/azurecore/src/azureResource/messageTreeNode.ts b/extensions/azurecore/src/azureResource/messageTreeNode.ts index 54a8ba805f..d598262c53 100644 --- a/extensions/azurecore/src/azureResource/messageTreeNode.ts +++ b/extensions/azurecore/src/azureResource/messageTreeNode.ts @@ -6,7 +6,7 @@ 'use strict'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; -import { NodeInfo } from 'sqlops'; +import { NodeInfo } from 'azdata'; import { TreeNode } from './treeNode'; import { AzureResourceItemType } from './constants'; diff --git a/extensions/azurecore/src/azureResource/providers/database/commands.ts b/extensions/azurecore/src/azureResource/providers/database/commands.ts index 2ebd8e0ccb..8369834a41 100644 --- a/extensions/azurecore/src/azureResource/providers/database/commands.ts +++ b/extensions/azurecore/src/azureResource/providers/database/commands.ts @@ -5,7 +5,7 @@ 'use strict'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; import { AppContext } from '../../../appContext'; import { TreeNode } from '../../treeNode'; diff --git a/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts index 4493861882..a44f5b5090 100644 --- a/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { AzureResource } from 'sqlops'; +import { AzureResource } from 'azdata'; import { TreeItem, TreeItemCollapsibleState, ExtensionContext } from 'vscode'; import { TokenCredentials } from 'ms-rest'; import * as nls from 'vscode-nls'; diff --git a/extensions/azurecore/src/azureResource/providers/databaseServer/commands.ts b/extensions/azurecore/src/azureResource/providers/databaseServer/commands.ts index d6ec02b558..cbe768e374 100644 --- a/extensions/azurecore/src/azureResource/providers/databaseServer/commands.ts +++ b/extensions/azurecore/src/azureResource/providers/databaseServer/commands.ts @@ -5,7 +5,7 @@ 'use strict'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; import { AppContext } from '../../../appContext'; import { TreeNode } from '../../treeNode'; diff --git a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts index f58ca68788..779b4d3694 100644 --- a/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts +++ b/extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { AzureResource } from 'sqlops'; +import { AzureResource } from 'azdata'; import { TreeItem, TreeItemCollapsibleState, ExtensionContext } from 'vscode'; import { TokenCredentials } from 'ms-rest'; import * as nls from 'vscode-nls'; diff --git a/extensions/azurecore/src/azureResource/resourceService.ts b/extensions/azurecore/src/azureResource/resourceService.ts index 3e8c4e83da..aaf93039fa 100644 --- a/extensions/azurecore/src/azureResource/resourceService.ts +++ b/extensions/azurecore/src/azureResource/resourceService.ts @@ -6,7 +6,7 @@ 'use strict'; import { extensions, TreeItem } from 'vscode'; -import { Account } from 'sqlops'; +import { Account } from 'azdata'; import { azureResource } from './azure-resource'; import { IAzureResourceNodeWithProviderId } from './interfaces'; diff --git a/extensions/azurecore/src/azureResource/resourceTreeNode.ts b/extensions/azurecore/src/azureResource/resourceTreeNode.ts index 707652b215..3159c90047 100644 --- a/extensions/azurecore/src/azureResource/resourceTreeNode.ts +++ b/extensions/azurecore/src/azureResource/resourceTreeNode.ts @@ -5,7 +5,7 @@ 'use strict'; -import { NodeInfo } from 'sqlops'; +import { NodeInfo } from 'azdata'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); diff --git a/extensions/azurecore/src/azureResource/services/accountService.ts b/extensions/azurecore/src/azureResource/services/accountService.ts index bc38f823a5..f1de0a3edb 100644 --- a/extensions/azurecore/src/azureResource/services/accountService.ts +++ b/extensions/azurecore/src/azureResource/services/accountService.ts @@ -6,7 +6,7 @@ 'use strict'; import { Event } from 'vscode'; -import { Account, DidChangeAccountsParams } from 'sqlops'; +import { Account, DidChangeAccountsParams } from 'azdata'; import { ApiWrapper } from '../../apiWrapper'; import { IAzureResourceAccountService } from '../interfaces'; diff --git a/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts b/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts index 1429890096..0d963e81d2 100644 --- a/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts +++ b/extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts @@ -6,7 +6,7 @@ 'use strict'; import { WorkspaceConfiguration, ConfigurationTarget } from 'vscode'; -import { Account } from 'sqlops'; +import { Account } from 'azdata'; import { azureResource } from '../azure-resource'; import { IAzureResourceSubscriptionFilterService, IAzureResourceCacheService } from '../interfaces'; diff --git a/extensions/azurecore/src/azureResource/services/subscriptionService.ts b/extensions/azurecore/src/azureResource/services/subscriptionService.ts index 1fd6168289..9cbb86414d 100644 --- a/extensions/azurecore/src/azureResource/services/subscriptionService.ts +++ b/extensions/azurecore/src/azureResource/services/subscriptionService.ts @@ -5,7 +5,7 @@ 'use strict'; -import { Account } from 'sqlops'; +import { Account } from 'azdata'; import { ServiceClientCredentials } from 'ms-rest'; import { SubscriptionClient } from 'azure-arm-resource'; diff --git a/extensions/azurecore/src/azureResource/tree/accountNotSignedInTreeNode.ts b/extensions/azurecore/src/azureResource/tree/accountNotSignedInTreeNode.ts index 24e760166d..b7e9c91d30 100644 --- a/extensions/azurecore/src/azureResource/tree/accountNotSignedInTreeNode.ts +++ b/extensions/azurecore/src/azureResource/tree/accountNotSignedInTreeNode.ts @@ -6,7 +6,7 @@ 'use strict'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; -import { NodeInfo } from 'sqlops'; +import { NodeInfo } from 'azdata'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); diff --git a/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts b/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts index 9534e4aa23..3dd54e1a80 100644 --- a/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts +++ b/extensions/azurecore/src/azureResource/tree/accountTreeNode.ts @@ -6,7 +6,7 @@ 'use strict'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; -import { Account, NodeInfo, AzureResource } from 'sqlops'; +import { Account, NodeInfo, AzureResource } from 'azdata'; import { TokenCredentials } from 'ms-rest'; import { AppContext } from '../../appContext'; import * as nls from 'vscode-nls'; diff --git a/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts b/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts index 8765dafb58..476cfe7055 100644 --- a/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts +++ b/extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts @@ -6,7 +6,7 @@ 'use strict'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; -import { Account, NodeInfo } from 'sqlops'; +import { Account, NodeInfo } from 'azdata'; import { AppContext } from '../../appContext'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); diff --git a/extensions/azurecore/src/azureResource/tree/treeProvider.ts b/extensions/azurecore/src/azureResource/tree/treeProvider.ts index a36365c41c..c0f99460c2 100644 --- a/extensions/azurecore/src/azureResource/tree/treeProvider.ts +++ b/extensions/azurecore/src/azureResource/tree/treeProvider.ts @@ -35,7 +35,7 @@ export class AzureResourceTreeProvider implements TreeDataProvider, IA if (!this.isSystemInitialized && !this._loadingTimer) { this._loadingTimer = setInterval(async () => { try { - // Call sqlops.accounts.getAllAccounts() to determine whether the system has been initialized. + // Call azdata.accounts.getAllAccounts() to determine whether the system has been initialized. await this.appContext.getService(AzureResourceServiceNames.accountService).getAccounts(); // System has been initialized diff --git a/extensions/azurecore/src/azureResource/treeNode.ts b/extensions/azurecore/src/azureResource/treeNode.ts index 72a0ea772c..2e7ea861c2 100644 --- a/extensions/azurecore/src/azureResource/treeNode.ts +++ b/extensions/azurecore/src/azureResource/treeNode.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; type TreeNodePredicate = (node: TreeNode) => boolean; @@ -66,7 +66,7 @@ export abstract class TreeNode { public abstract getChildren(refreshChildren: boolean): TreeNode[] | Promise; public abstract getTreeItem(): vscode.TreeItem | Promise; - public abstract getNodeInfo(): sqlops.NodeInfo; + public abstract getNodeInfo(): azdata.NodeInfo; /** * The value to use for this node in the node path diff --git a/extensions/azurecore/src/controllers/azureResourceController.ts b/extensions/azurecore/src/controllers/azureResourceController.ts index fb01d0f4db..6daed0888d 100644 --- a/extensions/azurecore/src/controllers/azureResourceController.ts +++ b/extensions/azurecore/src/controllers/azureResourceController.ts @@ -6,7 +6,7 @@ 'use strict'; import ControllerBase from './controllerBase'; -import { DidChangeAccountsParams } from 'sqlops'; +import { DidChangeAccountsParams } from 'azdata'; import { IAzureResourceCacheService, diff --git a/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts b/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts index 463227da8c..eeaade48bf 100644 --- a/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts +++ b/extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import 'mocha'; @@ -24,7 +24,7 @@ let mockApiWrapper: TypeMoq.IMock; let mockExtensionContext: TypeMoq.IMock; // Mock test data -const mockAccount: sqlops.Account = { +const mockAccount: azdata.Account = { key: { accountId: 'mock_account', providerId: 'mock_provider' @@ -103,7 +103,7 @@ describe('AzureResourceDatabaseTreeDataProvider.getChildren', function(): void { mockApiWrapper = TypeMoq.Mock.ofType(); mockExtensionContext = TypeMoq.Mock.ofType(); - mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); + mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, TypeMoq.It.isAny())).returns(() => Promise.resolve(mockDatabases)); mockExtensionContext.setup((o) => o.asAbsolutePath(TypeMoq.It.isAnyString())).returns(() => TypeMoq.It.isAnyString()); }); diff --git a/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts b/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts index 4ded7d18f5..be601e3a86 100644 --- a/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts +++ b/extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import 'mocha'; @@ -24,7 +24,7 @@ let mockApiWrapper: TypeMoq.IMock; let mockExtensionContext: TypeMoq.IMock; // Mock test data -const mockAccount: sqlops.Account = { +const mockAccount: azdata.Account = { key: { accountId: 'mock_account', providerId: 'mock_provider' @@ -103,7 +103,7 @@ describe('AzureResourceDatabaseServerTreeDataProvider.getChildren', function(): mockApiWrapper = TypeMoq.Mock.ofType(); mockExtensionContext = TypeMoq.Mock.ofType(); - mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); + mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, TypeMoq.It.isAny())).returns(() => Promise.resolve(mockDatabaseServers)); mockExtensionContext.setup((o) => o.asAbsolutePath(TypeMoq.It.isAnyString())).returns(() => TypeMoq.It.isAnyString()); }); diff --git a/extensions/azurecore/src/test/azureResource/resourceService.test.ts b/extensions/azurecore/src/test/azureResource/resourceService.test.ts index f6607383cc..a7ac1ee90c 100644 --- a/extensions/azurecore/src/test/azureResource/resourceService.test.ts +++ b/extensions/azurecore/src/test/azureResource/resourceService.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import 'mocha'; import { fail } from 'assert'; @@ -15,7 +15,7 @@ import { azureResource } from '../../azureResource/azure-resource'; import { AzureResourceService } from '../../azureResource/resourceService'; // Mock test data -const mockAccount: sqlops.Account = { +const mockAccount: azdata.Account = { key: { accountId: 'mock_account', providerId: 'mock_provider' diff --git a/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts b/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts index 511cd8284b..15a98d3cab 100644 --- a/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts +++ b/extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import 'mocha'; @@ -18,7 +18,7 @@ import { AzureResourceResourceTreeNode } from '../../azureResource/resourceTreeN const resourceService = AzureResourceService.getInstance(); // Mock test data -const mockAccount: sqlops.Account = { +const mockAccount: azdata.Account = { key: { accountId: 'mock_account', providerId: 'mock_provider' diff --git a/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts b/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts index 28665dc5b5..46a8d87aab 100644 --- a/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts +++ b/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import 'mocha'; import { TokenCredentials } from 'ms-rest'; @@ -42,7 +42,7 @@ let mockTreeChangeHandler: TypeMoq.IMock; // Mock test data const mockTenantId = 'mock_tenant_id'; -const mockAccount: sqlops.Account = { +const mockAccount: azdata.Account = { key: { accountId: 'mock_account', providerId: 'mock_provider' @@ -105,7 +105,7 @@ describe('AzureResourceAccountTreeNode.info', function(): void { mockAppContext.registerService(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object); mockAppContext.registerService(AzureResourceServiceNames.tenantService, mockTenantService.object); - mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); + mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid()); mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache); mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions); @@ -193,7 +193,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void { mockAppContext.registerService(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object); mockAppContext.registerService(AzureResourceServiceNames.tenantService, mockTenantService.object); - mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); + mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid()); mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache); mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions); @@ -208,7 +208,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void { const children = await accountTreeNode.getChildren(); - mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once()); + mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement), TypeMoq.Times.once()); mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredential), TypeMoq.Times.once()); mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(0)); mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once()); @@ -243,7 +243,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void { await accountTreeNode.getChildren(); const children = await accountTreeNode.getChildren(); - mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once()); + mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement), TypeMoq.Times.once()); mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredential), TypeMoq.Times.once()); mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once()); mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once()); @@ -299,7 +299,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void { const children = await accountTreeNode.getChildren(); - mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once()); + mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement), TypeMoq.Times.once()); mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredential), TypeMoq.Times.once()); mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.once()); mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never()); @@ -332,7 +332,7 @@ describe('AzureResourceAccountTreeNode.clearCache', function() : void { mockAppContext.registerService(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object); mockAppContext.registerService(AzureResourceServiceNames.tenantService, mockTenantService.object); - mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); + mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens)); mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid()); mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache); mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions); diff --git a/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts b/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts index 66ddf5b486..87d92e703f 100644 --- a/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts +++ b/extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import 'mocha'; import { AppContext } from '../../../appContext'; @@ -32,7 +32,7 @@ let mockCacheService: TypeMoq.IMock; let mockTreeChangeHandler: TypeMoq.IMock; // Mock test data -const mockAccount: sqlops.Account = { +const mockAccount: azdata.Account = { key: { accountId: 'mock_account', providerId: 'mock_provider' diff --git a/extensions/azurecore/src/test/azureResource/tree/treeProvider.test.ts b/extensions/azurecore/src/test/azureResource/tree/treeProvider.test.ts index 520a1ab518..1d89c2daea 100644 --- a/extensions/azurecore/src/test/azureResource/tree/treeProvider.test.ts +++ b/extensions/azurecore/src/test/azureResource/tree/treeProvider.test.ts @@ -8,7 +8,7 @@ import * as vscode from 'vscode'; import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import 'mocha'; import { AppContext } from '../../../appContext'; import { ApiWrapper } from '../../../apiWrapper'; @@ -30,7 +30,7 @@ let mockCacheService: TypeMoq.IMock; let mockAccountService: TypeMoq.IMock; // Mock test data -const mockAccount1: sqlops.Account = { +const mockAccount1: azdata.Account = { key: { accountId: 'mock_account_1', providerId: 'mock_provider' @@ -43,7 +43,7 @@ const mockAccount1: sqlops.Account = { properties: undefined, isStale: false }; -const mockAccount2: sqlops.Account = { +const mockAccount2: azdata.Account = { key: { accountId: 'mock_account_2', providerId: 'mock_provider' diff --git a/extensions/azurecore/src/typings/ref.d.ts b/extensions/azurecore/src/typings/ref.d.ts index 41e273db7f..4d46be908b 100644 --- a/extensions/azurecore/src/typings/ref.d.ts +++ b/extensions/azurecore/src/typings/ref.d.ts @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ /// -/// -/// +/// +/// /// \ No newline at end of file diff --git a/extensions/big-data-cluster/src/typings/ref.d.ts b/extensions/big-data-cluster/src/typings/ref.d.ts index 41e273db7f..4d46be908b 100644 --- a/extensions/big-data-cluster/src/typings/ref.d.ts +++ b/extensions/big-data-cluster/src/typings/ref.d.ts @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ /// -/// -/// +/// +/// /// \ No newline at end of file diff --git a/extensions/big-data-cluster/src/wizards/create-cluster/pages/clusterProfilePage.ts b/extensions/big-data-cluster/src/wizards/create-cluster/pages/clusterProfilePage.ts index 1f2aa49806..e155fb1b3e 100644 --- a/extensions/big-data-cluster/src/wizards/create-cluster/pages/clusterProfilePage.ts +++ b/extensions/big-data-cluster/src/wizards/create-cluster/pages/clusterProfilePage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { WizardPageBase } from '../../wizardPageBase'; import { CreateClusterWizard } from '../createClusterWizard'; import * as nls from 'vscode-nls'; @@ -25,7 +25,7 @@ export class ClusterProfilePage extends WizardPageBase { }); } - protected initialize(view: sqlops.ModelView): Thenable { + protected initialize(view: azdata.ModelView): Thenable { let formBuilder = view.modelBuilder.formContainer(); let form = formBuilder.component(); return view.initializeModel(form); diff --git a/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectExistingClusterPage.ts b/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectExistingClusterPage.ts index f86537d652..655a316ad8 100644 --- a/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectExistingClusterPage.ts +++ b/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectExistingClusterPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as os from 'os'; import { WizardPageBase } from '../../wizardPageBase'; @@ -17,10 +17,10 @@ const localize = nls.loadMessageBundle(); const ClusterRadioButtonGroupName = 'cluster'; export class SelectExistingClusterPage extends WizardPageBase { - private existingClusterControl: sqlops.FlexContainer; - private clusterContextsLabel: sqlops.TextComponent; - private errorLoadingClustersLabel: sqlops.TextComponent; - private clusterContextContainer: sqlops.DivContainer; + private existingClusterControl: azdata.FlexContainer; + private clusterContextsLabel: azdata.TextComponent; + private errorLoadingClustersLabel: azdata.TextComponent; + private clusterContextContainer: azdata.DivContainer; constructor(wizard: CreateClusterWizard) { super(localize('bdc-create.selectTargetClusterPageTitle', 'Where do you want to deploy this SQL Server big data cluster?'), @@ -28,7 +28,7 @@ export class SelectExistingClusterPage extends WizardPageBase { + protected initialize(view: azdata.ModelView): Thenable { this.initExistingClusterControl(view); let formBuilder = view.modelBuilder.formContainer().withFormItems( [ @@ -56,14 +56,14 @@ export class SelectExistingClusterPage extends WizardPageBase { - let option = view.modelBuilder.radioButton().withProperties({ + let option = view.modelBuilder.radioButton().withProperties({ label: cluster.contextName, checked: cluster.active, name: ClusterRadioButtonGroupName diff --git a/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectTargetClusterTypePage.ts b/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectTargetClusterTypePage.ts index f96309ebb4..7c6d4f8778 100644 --- a/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectTargetClusterTypePage.ts +++ b/extensions/big-data-cluster/src/wizards/create-cluster/pages/selectTargetClusterTypePage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { WizardPageBase } from '../../wizardPageBase'; import { TargetClusterTypeInfo, ToolInstallationStatus, ToolInfo } from '../../../interfaces'; import * as nls from 'vscode-nls'; @@ -16,13 +16,13 @@ const InstallToolsButtonText = localize('bdc-create.InstallToolsText', 'Install const InstallingButtonText = localize('bdc-create.InstallingButtonText', 'Installing...'); export class SelectTargetClusterTypePage extends WizardPageBase { - private cards: sqlops.CardComponent[]; - private toolsTable: sqlops.TableComponent; - private formBuilder: sqlops.FormBuilder; - private form: sqlops.FormContainer; - private installToolsButton: sqlops.window.Button; - private toolsLoadingWrapper: sqlops.LoadingComponent; - private refreshToolsButton: sqlops.window.Button; + private cards: azdata.CardComponent[]; + private toolsTable: azdata.TableComponent; + private formBuilder: azdata.FormBuilder; + private form: azdata.FormContainer; + private installToolsButton: azdata.window.Button; + private toolsLoadingWrapper: azdata.LoadingComponent; + private refreshToolsButton: azdata.window.Button; private isValid: boolean = false; private isLoading: boolean = false; private requiredTools: ToolInfo[]; @@ -31,7 +31,7 @@ export class SelectTargetClusterTypePage extends WizardPageBase { this.wizard.wizardObject.message = null; @@ -54,7 +54,7 @@ export class SelectTargetClusterTypePage extends WizardPageBase { this.updateRequiredToolStatus(); @@ -62,7 +62,7 @@ export class SelectTargetClusterTypePage extends WizardPageBase { + protected initialize(view: azdata.ModelView): Thenable { let self = this; self.registerNavigationValidator(); return self.wizard.model.getAllTargetClusterTypeInfo().then((clusterTypes) => { @@ -74,20 +74,20 @@ export class SelectTargetClusterTypePage extends WizardPageBase({ + self.toolsTable = view.modelBuilder.table().withProperties({ height: 150, data: [], columns: [toolColumn, descriptionColumn, statusColumn], @@ -125,7 +125,7 @@ export class SelectTargetClusterTypePage extends WizardPageBase { if (this.isLoading) { let messageText = localize('bdc-create.ToolsRefreshingText', 'Please wait while the required tools status is being refreshed.'); - let messageLevel = sqlops.window.MessageLevel.Information; + let messageLevel = azdata.window.MessageLevel.Information; this.wizard.wizardObject.message = { level: messageLevel, text: messageText @@ -137,7 +137,7 @@ export class SelectTargetClusterTypePage extends WizardPageBase({ - cardType: sqlops.CardType.VerticalButton, + let card = view.modelBuilder.card().withProperties({ + cardType: azdata.CardType.VerticalButton, iconPath: { dark: self.wizard.context.asAbsolutePath(targetClusterTypeInfo.iconPath.dark), light: self.wizard.context.asAbsolutePath(targetClusterTypeInfo.iconPath.light) diff --git a/extensions/big-data-cluster/src/wizards/create-cluster/pages/settingsPage.ts b/extensions/big-data-cluster/src/wizards/create-cluster/pages/settingsPage.ts index 0bba2bc654..b3c566ab27 100644 --- a/extensions/big-data-cluster/src/wizards/create-cluster/pages/settingsPage.ts +++ b/extensions/big-data-cluster/src/wizards/create-cluster/pages/settingsPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { WizardPageBase } from '../../wizardPageBase'; import * as nls from 'vscode-nls'; import { ClusterPorts, ContainerRegistryInfo } from '../../../interfaces'; @@ -22,7 +22,7 @@ export class SettingsPage extends WizardPageBase { wizard); } - protected initialize(view: sqlops.ModelView): Thenable { + protected initialize(view: azdata.ModelView): Thenable { let clusterPorts: ClusterPorts; let containerRegistryInfo: ContainerRegistryInfo; @@ -41,7 +41,7 @@ export class SettingsPage extends WizardPageBase { label: localize('bdc-create.AdminUsernameText', 'Admin username'), isRequiredField: true, inputWidth: UserNameInputWidth - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.adminUserName = inputBox.value; }); let adminPasswordInput = this.createInputWithLabel(view, { @@ -49,7 +49,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputType: 'password', inputWidth: UserNameInputWidth - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.adminPassword = inputBox.value; }); @@ -59,7 +59,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: PortInputWidth, initialValue: clusterPorts.sql - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.sqlPort = inputBox.value; }); let knoxPortInput = this.createInputWithLabel(view, { @@ -67,7 +67,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: PortInputWidth, initialValue: clusterPorts.knox - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.knoxPort = inputBox.value; }); let controllerPortInput = this.createInputWithLabel(view, { @@ -75,7 +75,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: PortInputWidth, initialValue: clusterPorts.controller - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.controllerPort = inputBox.value; }); let proxyPortInput = this.createInputWithLabel(view, { @@ -83,7 +83,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: PortInputWidth, initialValue: clusterPorts.proxy - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.proxyPort = inputBox.value; }); let grafanaPortInput = this.createInputWithLabel(view, { @@ -91,7 +91,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: PortInputWidth, initialValue: clusterPorts.grafana - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.grafanaPort = inputBox.value; }); let kibanaPortInput = this.createInputWithLabel(view, { @@ -99,10 +99,10 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: PortInputWidth, initialValue: clusterPorts.kibana - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.kibanaPort = inputBox.value; }); - let restorePortSettingsButton = view.modelBuilder.button().withProperties({ + let restorePortSettingsButton = view.modelBuilder.button().withProperties({ label: RestoreDefaultValuesText, width: 200 }).component(); @@ -122,7 +122,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: UserNameInputWidth, initialValue: containerRegistryInfo.registry - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.containerRegistry = inputBox.value; }); @@ -131,7 +131,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: UserNameInputWidth, initialValue: containerRegistryInfo.repository - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.containerRepository = inputBox.value; }); @@ -140,7 +140,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: true, inputWidth: UserNameInputWidth, initialValue: containerRegistryInfo.imageTag - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.containerRegistry = inputBox.value; }); @@ -149,7 +149,7 @@ export class SettingsPage extends WizardPageBase { isRequiredField: false, inputWidth: UserNameInputWidth, placeHolder: registryUserNamePasswordHintText - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.containerRegistryUserName = inputBox.value; }); @@ -159,10 +159,10 @@ export class SettingsPage extends WizardPageBase { inputWidth: UserNameInputWidth, placeHolder: registryUserNamePasswordHintText, inputType: 'password' - }, (inputBox: sqlops.InputBoxComponent) => { + }, (inputBox: azdata.InputBoxComponent) => { this.wizard.model.containerRegistryPassword = inputBox.value; }); - let restoreContainerSettingsButton = view.modelBuilder.button().withProperties({ + let restoreContainerSettingsButton = view.modelBuilder.button().withProperties({ label: RestoreDefaultValuesText, width: 200 }).component(); @@ -179,16 +179,16 @@ export class SettingsPage extends WizardPageBase { let acceptEulaCheckbox = view.modelBuilder.checkBox().component(); acceptEulaCheckbox.checked = false; - let eulaLink: sqlops.LinkArea = { + let eulaLink: azdata.LinkArea = { text: localize('bdc-create.LicenseAgreementText', 'License Agreement'), url: 'https://docs.microsoft.com/en-us/sql/getting-started/about-the-sql-server-license-terms?view=sql-server-2014' }; - let privacyPolicyLink: sqlops.LinkArea = { + let privacyPolicyLink: azdata.LinkArea = { text: localize('bdc-create.PrivacyPolicyText', 'Privacy Policy'), url: 'https://privacy.microsoft.com/en-us/privacystatement' }; - let checkboxText = view.modelBuilder.text().withProperties({ + let checkboxText = view.modelBuilder.text().withProperties({ value: localize({ key: 'bdc-create.AcceptTermsText', comment: ['{0} is the place holder for License Agreement, {1} is the place holder for Privacy Policy'] @@ -217,14 +217,14 @@ export class SettingsPage extends WizardPageBase { }); } - private createInputWithLabel(view: sqlops.ModelView, options: { + private createInputWithLabel(view: azdata.ModelView, options: { label: string, isRequiredField: boolean, inputWidth: string, inputType?: string, initialValue?: string, placeHolder?: string - }, textChangedHandler: (inputBox: sqlops.InputBoxComponent) => void): { row: sqlops.FlexContainer, input: sqlops.InputBoxComponent } { + }, textChangedHandler: (inputBox: azdata.InputBoxComponent) => void): { row: azdata.FlexContainer, input: azdata.InputBoxComponent } { let inputType = !!options.inputType ? options.inputType : 'text'; let input = view.modelBuilder.inputBox().withProperties({ required: options.isRequiredField, @@ -245,7 +245,7 @@ export class SettingsPage extends WizardPageBase { }; } - private createRow(view: sqlops.ModelView, items: sqlops.Component[]): sqlops.FlexContainer { + private createRow(view: azdata.ModelView, items: azdata.Component[]): azdata.FlexContainer { return view.modelBuilder.flexContainer().withItems(items, { CSSStyles: { 'margin-right': '5px' } }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component(); } } diff --git a/extensions/big-data-cluster/src/wizards/create-cluster/pages/summaryPage.ts b/extensions/big-data-cluster/src/wizards/create-cluster/pages/summaryPage.ts index 02043d3bfd..fbe30de742 100644 --- a/extensions/big-data-cluster/src/wizards/create-cluster/pages/summaryPage.ts +++ b/extensions/big-data-cluster/src/wizards/create-cluster/pages/summaryPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { WizardPageBase } from '../../wizardPageBase'; import { CreateClusterWizard } from '../createClusterWizard'; import * as nls from 'vscode-nls'; @@ -16,7 +16,7 @@ export class SummaryPage extends WizardPageBase { super(localize('bdc-create.summaryPageTitle', 'Summary'), '', wizard); } - protected initialize(view: sqlops.ModelView): Thenable { + protected initialize(view: azdata.ModelView): Thenable { let formBuilder = view.modelBuilder.formContainer(); let form = formBuilder.component(); return view.initializeModel(form); diff --git a/extensions/big-data-cluster/src/wizards/wizardBase.ts b/extensions/big-data-cluster/src/wizards/wizardBase.ts index 164c4fbbc8..1183d58c13 100644 --- a/extensions/big-data-cluster/src/wizards/wizardBase.ts +++ b/extensions/big-data-cluster/src/wizards/wizardBase.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ExtensionContext } from 'vscode'; import { WizardPageBase } from './wizardPageBase'; export abstract class WizardBase { - public wizardObject: sqlops.window.Wizard; - private customButtons: sqlops.window.Button[]; + public wizardObject: azdata.window.Wizard; + private customButtons: azdata.window.Button[]; private pages: WizardPageBase[]; constructor(public model: T, public context: ExtensionContext, private title: string) { @@ -19,7 +19,7 @@ export abstract class WizardBase { } public open(): Thenable { - this.wizardObject = sqlops.window.createWizard(this.title); + this.wizardObject = azdata.window.createWizard(this.title); this.initialize(); this.wizardObject.customButtons = this.customButtons; this.wizardObject.onPageChanged((e) => { @@ -34,7 +34,7 @@ export abstract class WizardBase { protected abstract initialize(): void; - public addButton(button: sqlops.window.Button) { + public addButton(button: azdata.window.Button) { this.customButtons.push(button); } diff --git a/extensions/big-data-cluster/src/wizards/wizardPageBase.ts b/extensions/big-data-cluster/src/wizards/wizardPageBase.ts index 3225036959..586d8b62ec 100644 --- a/extensions/big-data-cluster/src/wizards/wizardPageBase.ts +++ b/extensions/big-data-cluster/src/wizards/wizardPageBase.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export abstract class WizardPageBase { - private _page: sqlops.window.WizardPage; + private _page: azdata.window.WizardPage; - public get pageObject(): sqlops.window.WizardPage { + public get pageObject(): azdata.window.WizardPage { return this._page; } @@ -18,14 +18,14 @@ export abstract class WizardPageBase { } constructor(title: string, description: string, private _wizard: T) { - this._page = sqlops.window.createWizardPage(title); + this._page = azdata.window.createWizardPage(title); this._page.description = description; - this._page.registerContent((view: sqlops.ModelView) => { + this._page.registerContent((view: azdata.ModelView) => { return this.initialize(view); }); } - protected abstract initialize(view: sqlops.ModelView): Thenable; + protected abstract initialize(view: azdata.ModelView): Thenable; public onEnter(): void { } diff --git a/extensions/import/src/controllers/mainController.ts b/extensions/import/src/controllers/mainController.ts index 313a2b2263..5769fb6f3e 100644 --- a/extensions/import/src/controllers/mainController.ts +++ b/extensions/import/src/controllers/mainController.ts @@ -6,7 +6,7 @@ 'use strict'; import * as constants from '../constants'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import ControllerBase from './controllerBase'; import * as vscode from 'vscode'; import { FlatFileWizard } from '../wizard/flatFileWizard'; @@ -41,10 +41,10 @@ export default class MainController extends ControllerBase { } private initializeFlatFileProvider(provider: FlatFileProvider) { - sqlops.tasks.registerTask('flatFileImport.start', (profile: sqlops.IConnectionProfile, ...args: any[]) => new FlatFileWizard(provider).start(profile, args)); + azdata.tasks.registerTask('flatFileImport.start', (profile: azdata.IConnectionProfile, ...args: any[]) => new FlatFileWizard(provider).start(profile, args)); } private initializeDacFxWizard() { - sqlops.tasks.registerTask('dacFx.start', (profile: sqlops.IConnectionProfile, ...args: any[]) => new DataTierApplicationWizard().start(profile, args)); + azdata.tasks.registerTask('dacFx.start', (profile: azdata.IConnectionProfile, ...args: any[]) => new DataTierApplicationWizard().start(profile, args)); } } diff --git a/extensions/import/src/services/serviceApiManager.ts b/extensions/import/src/services/serviceApiManager.ts index a0e9b3e915..d7b8cd6c9b 100644 --- a/extensions/import/src/services/serviceApiManager.ts +++ b/extensions/import/src/services/serviceApiManager.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as contracts from './contracts'; import { SqlOpsDataClient } from 'dataprotocol-client/lib/main'; @@ -21,7 +21,7 @@ export interface IServiceApi { export interface IModelViewDefinition { id: string; - modelView: sqlops.ModelView; + modelView: azdata.ModelView; } export class ServiceApiManager implements IServiceApi { @@ -53,7 +53,7 @@ export class ServiceApiManager implements IServiceApi { return this._onRegisteredModelView.event; } - public registerModelView(id: string, modelView: sqlops.ModelView): void { + public registerModelView(id: string, modelView: azdata.ModelView): void { this._onRegisteredModelView.fire({ id: id, modelView: modelView diff --git a/extensions/import/src/typings/ref.d.ts b/extensions/import/src/typings/ref.d.ts index 41e273db7f..1c00f76a98 100644 --- a/extensions/import/src/typings/ref.d.ts +++ b/extensions/import/src/typings/ref.d.ts @@ -6,4 +6,6 @@ /// /// /// +/// +/// /// \ No newline at end of file diff --git a/extensions/import/src/wizard/api/basePage.ts b/extensions/import/src/wizard/api/basePage.ts index e92f8ddaf9..5c1f857366 100644 --- a/extensions/import/src/wizard/api/basePage.ts +++ b/extensions/import/src/wizard/api/basePage.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { BaseDataModel } from './models'; export abstract class BasePage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly model: BaseDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; /** * This method constructs all the elements of the page. @@ -48,7 +48,7 @@ export abstract class BasePage { public abstract setupNavigationValidator(); protected async getServerValues(): Promise<{ connection, displayName, name }[]> { - let cons = await sqlops.connection.getActiveConnections(); + let cons = await azdata.connection.getActiveConnections(); // This user has no active connections ABORT MISSION if (!cons || cons.length === 0) { return undefined; @@ -103,7 +103,7 @@ export abstract class BasePage { protected async getDatabaseValues(): Promise<{ displayName, name }[]> { let idx = -1; let count = -1; - let values = (await sqlops.connection.listDatabases(this.model.server.connectionId)).map(db => { + let values = (await azdata.connection.listDatabases(this.model.server.connectionId)).map(db => { count++; if (this.model.database && db === this.model.database) { idx = count; diff --git a/extensions/import/src/wizard/api/dacFxConfigPage.ts b/extensions/import/src/wizard/api/dacFxConfigPage.ts index b7a7f41262..c6e0e9f7ca 100644 --- a/extensions/import/src/wizard/api/dacFxConfigPage.ts +++ b/extensions/import/src/wizard/api/dacFxConfigPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as os from 'os'; import * as path from 'path'; @@ -16,19 +16,19 @@ const localize = nls.loadMessageBundle(); export abstract class DacFxConfigPage extends BasePage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; - protected serverDropdown: sqlops.DropDownComponent; - protected databaseTextBox: sqlops.InputBoxComponent; - protected databaseDropdown: sqlops.DropDownComponent; - protected databaseLoader: sqlops.LoadingComponent; - protected fileTextBox: sqlops.InputBoxComponent; - protected fileButton: sqlops.ButtonComponent; + protected readonly view: azdata.ModelView; + protected serverDropdown: azdata.DropDownComponent; + protected databaseTextBox: azdata.InputBoxComponent; + protected databaseDropdown: azdata.DropDownComponent; + protected databaseLoader: azdata.LoadingComponent; + protected fileTextBox: azdata.InputBoxComponent; + protected fileButton: azdata.ButtonComponent; protected fileExtension: string; - protected constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + protected constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(); this.instance = instance; this.wizardPage = wizardPage; @@ -42,7 +42,7 @@ export abstract class DacFxConfigPage extends BasePage { }); } - protected async createServerDropdown(isTargetServer: boolean): Promise { + protected async createServerDropdown(isTargetServer: boolean): Promise { this.serverDropdown = this.view.modelBuilder.dropDown().withProperties({ required: true }).component(); @@ -78,7 +78,7 @@ export abstract class DacFxConfigPage extends BasePage { return true; } - protected async createDatabaseTextBox(): Promise { + protected async createDatabaseTextBox(): Promise { this.databaseTextBox = this.view.modelBuilder.inputBox().withProperties({ required: true }).component(); @@ -93,14 +93,14 @@ export abstract class DacFxConfigPage extends BasePage { }; } - protected async createDatabaseDropdown(): Promise { + protected async createDatabaseDropdown(): Promise { this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ required: true }).component(); // Handle database changes this.databaseDropdown.onValueChanged(async () => { - this.model.database = (this.databaseDropdown.value).name; + this.model.database = (this.databaseDropdown.value).name; this.fileTextBox.value = this.generateFilePath(); this.model.filePath = this.fileTextBox.value; }); @@ -152,7 +152,7 @@ export abstract class DacFxConfigPage extends BasePage { } } -interface ConnectionDropdownValue extends sqlops.CategoryValue { - connection: sqlops.connection.Connection; +interface ConnectionDropdownValue extends azdata.CategoryValue { + connection: azdata.connection.Connection; } diff --git a/extensions/import/src/wizard/api/importPage.ts b/extensions/import/src/wizard/api/importPage.ts index 749f4d7f54..b4ce56ac90 100644 --- a/extensions/import/src/wizard/api/importPage.ts +++ b/extensions/import/src/wizard/api/importPage.ts @@ -5,20 +5,20 @@ 'use strict'; import { ImportDataModel } from './models'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { FlatFileProvider } from '../../services/contracts'; import { FlatFileWizard } from '../flatFileWizard'; import { BasePage } from './basePage'; export abstract class ImportPage extends BasePage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: FlatFileWizard; protected readonly model: ImportDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; protected readonly provider: FlatFileProvider; - protected constructor(instance: FlatFileWizard, wizardPage: sqlops.window.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) { + protected constructor(instance: FlatFileWizard, wizardPage: azdata.window.WizardPage, model: ImportDataModel, view: azdata.ModelView, provider: FlatFileProvider) { super(); this.instance = instance; this.wizardPage = wizardPage; diff --git a/extensions/import/src/wizard/api/models.ts b/extensions/import/src/wizard/api/models.ts index 3961f1e0ec..5051df192e 100644 --- a/extensions/import/src/wizard/api/models.ts +++ b/extensions/import/src/wizard/api/models.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export interface BaseDataModel { - server: sqlops.connection.Connection; + server: azdata.connection.Connection; serverId: string; database: string; } diff --git a/extensions/import/src/wizard/dataTierApplicationWizard.ts b/extensions/import/src/wizard/dataTierApplicationWizard.ts index 7e81fdd71d..09bb12448f 100644 --- a/extensions/import/src/wizard/dataTierApplicationWizard.ts +++ b/extensions/import/src/wizard/dataTierApplicationWizard.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { SelectOperationPage } from './pages/selectOperationpage'; import { DeployConfigPage } from './pages/deployConfigPage'; import { DeployPlanPage } from './pages/deployPlanPage'; @@ -20,10 +20,10 @@ import { BasePage } from './api/basePage'; const localize = nls.loadMessageBundle(); class Page { - wizardPage: sqlops.window.WizardPage; + wizardPage: azdata.window.WizardPage; dacFxPage: BasePage; - constructor(wizardPage: sqlops.window.WizardPage) { + constructor(wizardPage: azdata.window.WizardPage) { this.wizardPage = wizardPage; } } @@ -69,8 +69,8 @@ export enum ExportOperationPath { } export class DataTierApplicationWizard { - public wizard: sqlops.window.Wizard; - private connection: sqlops.connection.Connection; + public wizard: azdata.window.Wizard; + private connection: azdata.connection.ConnectionProfile; private model: DacFxDataModel; public pages: Map = new Map(); public selectedOperation: Operation; @@ -81,26 +81,27 @@ export class DataTierApplicationWizard { public async start(p: any, ...args: any[]) { this.model = {}; - let profile = p ? p.connectionProfile : undefined; + let profile = p ? p.connectionProfile : undefined; if (profile) { this.model.serverId = profile.id; this.model.database = profile.databaseName; } - this.connection = await sqlops.connection.getCurrentConnection(); + this.connection = await azdata.connection.getCurrentConnection(); if (!this.connection) { - this.connection = await sqlops.connection.openConnectionDialog(); + // @TODO: remove cast once azdata update complete - karlb 3/1/2019 + this.connection = await azdata.connection.openConnectionDialog(); } - this.wizard = sqlops.window.createWizard('Data-tier Application Wizard'); - let selectOperationWizardPage = sqlops.window.createWizardPage(localize('dacFx.selectOperationPageName', 'Select an Operation')); - let deployConfigWizardPage = sqlops.window.createWizardPage(localize('dacFx.deployConfigPageName', 'Select Deploy Dacpac Settings')); - let deployPlanWizardPage = sqlops.window.createWizardPage(localize('dacFx.deployPlanPage', 'Review the deploy plan')); - let deployActionWizardPage = sqlops.window.createWizardPage(localize('dacFx.deployActionPageName', 'Select Action')); - let summaryWizardPage = sqlops.window.createWizardPage(localize('dacFx.summaryPageName', 'Summary')); - let extractConfigWizardPage = sqlops.window.createWizardPage(localize('dacFx.extractConfigPageName', 'Select Extract Dacpac Settings')); - let importConfigWizardPage = sqlops.window.createWizardPage(localize('dacFx.importConfigPageName', 'Select Import Bacpac Settings')); - let exportConfigWizardPage = sqlops.window.createWizardPage(localize('dacFx.exportConfigPageName', 'Select Export Bacpac Settings')); + this.wizard = azdata.window.createWizard('Data-tier Application Wizard'); + let selectOperationWizardPage = azdata.window.createWizardPage(localize('dacFx.selectOperationPageName', 'Select an Operation')); + let deployConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.deployConfigPageName', 'Select Deploy Dacpac Settings')); + let deployPlanWizardPage = azdata.window.createWizardPage(localize('dacFx.deployPlanPage', 'Review the deploy plan')); + let deployActionWizardPage = azdata.window.createWizardPage(localize('dacFx.deployActionPageName', 'Select Action')); + let summaryWizardPage = azdata.window.createWizardPage(localize('dacFx.summaryPageName', 'Summary')); + let extractConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.extractConfigPageName', 'Select Extract Dacpac Settings')); + let importConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.importConfigPageName', 'Select Import Bacpac Settings')); + let exportConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.exportConfigPageName', 'Select Export Bacpac Settings')); this.pages.set('selectOperation', new Page(selectOperationWizardPage)); this.pages.set('deployConfig', new Page(deployConfigWizardPage)); @@ -190,7 +191,7 @@ export class DataTierApplicationWizard { this.wizard.open(); } - public registerNavigationValidator(validator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean) { + public registerNavigationValidator(validator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean) { this.wizard.registerNavigationValidator(validator); } @@ -255,9 +256,9 @@ export class DataTierApplicationWizard { private async deploy() { let service = await DataTierApplicationWizard.getService(this.model.server.providerName); - let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); + let ownerUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); - let result = await service.deployDacpac(this.model.filePath, this.model.database, this.model.upgradeExisting, ownerUri, sqlops.TaskExecutionMode.execute); + let result = await service.deployDacpac(this.model.filePath, this.model.database, this.model.upgradeExisting, ownerUri, azdata.TaskExecutionMode.execute); if (!result || !result.success) { vscode.window.showErrorMessage( localize('alertData.deployErrorMessage', "Deploy failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); @@ -266,9 +267,9 @@ export class DataTierApplicationWizard { private async extract() { let service = await DataTierApplicationWizard.getService(this.model.server.providerName); - let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); + let ownerUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); - let result = await service.extractDacpac(this.model.database, this.model.filePath, this.model.database, this.model.version, ownerUri, sqlops.TaskExecutionMode.execute); + let result = await service.extractDacpac(this.model.database, this.model.filePath, this.model.database, this.model.version, ownerUri, azdata.TaskExecutionMode.execute); if (!result || !result.success) { vscode.window.showErrorMessage( localize('alertData.extractErrorMessage', "Extract failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); @@ -277,9 +278,9 @@ export class DataTierApplicationWizard { private async export() { let service = await DataTierApplicationWizard.getService(this.model.server.providerName); - let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); + let ownerUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); - let result = await service.exportBacpac(this.model.database, this.model.filePath, ownerUri, sqlops.TaskExecutionMode.execute); + let result = await service.exportBacpac(this.model.database, this.model.filePath, ownerUri, azdata.TaskExecutionMode.execute); if (!result || !result.success) { vscode.window.showErrorMessage( localize('alertData.exportErrorMessage', "Export failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); @@ -288,9 +289,9 @@ export class DataTierApplicationWizard { private async import() { let service = await DataTierApplicationWizard.getService(this.model.server.providerName); - let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); + let ownerUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); - let result = await service.importBacpac(this.model.filePath, this.model.database, ownerUri, sqlops.TaskExecutionMode.execute); + let result = await service.importBacpac(this.model.filePath, this.model.database, ownerUri, azdata.TaskExecutionMode.execute); if (!result || !result.success) { vscode.window.showErrorMessage( localize('alertData.importErrorMessage', "Import failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); @@ -303,14 +304,14 @@ export class DataTierApplicationWizard { } let service = await DataTierApplicationWizard.getService(this.model.server.providerName); - let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); + let ownerUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); this.wizard.message = { text: localize('dacfx.scriptGeneratingMessage', 'You can view the status of script generation in the Task History once the wizard is closed'), - level: sqlops.window.MessageLevel.Information, + level: azdata.window.MessageLevel.Information, description: '' }; - let result = await service.generateDeployScript(this.model.filePath, this.model.database, this.model.scriptFilePath, ownerUri, sqlops.TaskExecutionMode.execute); + let result = await service.generateDeployScript(this.model.filePath, this.model.database, this.model.scriptFilePath, ownerUri, azdata.TaskExecutionMode.execute); if (!result || !result.success) { vscode.window.showErrorMessage( localize('alertData.deployErrorMessage', "Deploy failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown')); @@ -360,9 +361,9 @@ export class DataTierApplicationWizard { public async generateDeployPlan(): Promise { let service = await DataTierApplicationWizard.getService(this.model.server.providerName); - let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); + let ownerUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); - let result = await service.generateDeployPlan(this.model.filePath, this.model.database, ownerUri, sqlops.TaskExecutionMode.execute); + let result = await service.generateDeployPlan(this.model.filePath, this.model.database, ownerUri, azdata.TaskExecutionMode.execute); if (!result || !result.success) { vscode.window.showErrorMessage( @@ -372,8 +373,8 @@ export class DataTierApplicationWizard { return result.report; } - private static async getService(providerName: string): Promise { - let service = sqlops.dataprotocol.getProvider(providerName, sqlops.DataProviderType.DacFxServicesProvider); + private static async getService(providerName: string): Promise { + let service = azdata.dataprotocol.getProvider(providerName, azdata.DataProviderType.DacFxServicesProvider); return service; } } diff --git a/extensions/import/src/wizard/flatFileWizard.ts b/extensions/import/src/wizard/flatFileWizard.ts index bbe7f24ed6..50cbbe5f7e 100644 --- a/extensions/import/src/wizard/flatFileWizard.ts +++ b/extensions/import/src/wizard/flatFileWizard.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { FlatFileProvider } from '../services/contracts'; import { ImportDataModel } from './api/models'; import { ImportPage } from './api/importPage'; @@ -20,9 +20,9 @@ const localize = nls.loadMessageBundle(); export class FlatFileWizard { private readonly provider: FlatFileProvider; - private wizard: sqlops.window.Wizard; + private wizard: azdata.window.Wizard; - private importAnotherFileButton: sqlops.window.Button; + private importAnotherFileButton: azdata.window.Button; constructor(provider: FlatFileProvider) { this.provider = provider; @@ -31,7 +31,7 @@ export class FlatFileWizard { public async start(p: any, ...args: any[]) { let model = {}; - let profile = p ? p.connectionProfile : null; + let profile = p ? p.connectionProfile : null; if (profile) { model.serverId = profile.id; model.database = profile.databaseName; @@ -40,17 +40,17 @@ export class FlatFileWizard { let pages: Map = new Map(); - let connections = await sqlops.connection.getActiveConnections(); + let connections = await azdata.connection.getActiveConnections(); if (!connections || connections.length === 0) { vscode.window.showErrorMessage(localize('import.needConnection', 'Please connect to a server before using this wizard.')); return; } - this.wizard = sqlops.window.createWizard(localize('flatFileImport.wizardName', 'Import flat file wizard')); - let page1 = sqlops.window.createWizardPage(localize('flatFileImport.page1Name', 'Specify Input File')); - let page2 = sqlops.window.createWizardPage(localize('flatFileImport.page2Name', 'Preview Data')); - let page3 = sqlops.window.createWizardPage(localize('flatFileImport.page3Name', 'Modify Columns')); - let page4 = sqlops.window.createWizardPage(localize('flatFileImport.page4Name', 'Summary')); + this.wizard = azdata.window.createWizard(localize('flatFileImport.wizardName', 'Import flat file wizard')); + let page1 = azdata.window.createWizardPage(localize('flatFileImport.page1Name', 'Specify Input File')); + let page2 = azdata.window.createWizardPage(localize('flatFileImport.page2Name', 'Preview Data')); + let page3 = azdata.window.createWizardPage(localize('flatFileImport.page3Name', 'Modify Columns')); + let page4 = azdata.window.createWizardPage(localize('flatFileImport.page4Name', 'Summary')); let fileConfigPage: FileConfigPage; @@ -86,7 +86,7 @@ export class FlatFileWizard { }); - this.importAnotherFileButton = sqlops.window.createButton(localize('flatFileImport.importNewFile', 'Import new file')); + this.importAnotherFileButton = azdata.window.createButton(localize('flatFileImport.importNewFile', 'Import new file')); this.importAnotherFileButton.onClick(() => { //TODO replace this with proper cleanup for all the pages this.wizard.close(); @@ -129,7 +129,7 @@ export class FlatFileWizard { this.importAnotherFileButton.hidden = !visibility; } - public registerNavigationValidator(validator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean) { + public registerNavigationValidator(validator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean) { this.wizard.registerNavigationValidator(validator); } diff --git a/extensions/import/src/wizard/pages/dacFxSummaryPage.ts b/extensions/import/src/wizard/pages/dacFxSummaryPage.ts index 5ad6573faa..4aa686c457 100644 --- a/extensions/import/src/wizard/pages/dacFxSummaryPage.ts +++ b/extensions/import/src/wizard/pages/dacFxSummaryPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import { DacFxDataModel } from '../api/models'; import { DataTierApplicationWizard, Operation } from '../dataTierApplicationWizard'; @@ -14,16 +14,16 @@ const localize = nls.loadMessageBundle(); export class DacFxSummaryPage extends BasePage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; - private form: sqlops.FormContainer; - private table: sqlops.TableComponent; - private loader: sqlops.LoadingComponent; + private form: azdata.FormContainer; + private table: azdata.TableComponent; + private loader: azdata.LoadingComponent; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(); this.instance = instance; this.wizardPage = wizardPage; diff --git a/extensions/import/src/wizard/pages/deployActionPage.ts b/extensions/import/src/wizard/pages/deployActionPage.ts index db1a7d1cff..661f7d3881 100644 --- a/extensions/import/src/wizard/pages/deployActionPage.ts +++ b/extensions/import/src/wizard/pages/deployActionPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; import * as path from 'path'; @@ -17,16 +17,16 @@ const localize = nls.loadMessageBundle(); export class DeployActionPage extends DacFxConfigPage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; - private deployRadioButton: sqlops.RadioButtonComponent; - private deployScriptRadioButton: sqlops.RadioButtonComponent; - private scriptRadioButton: sqlops.RadioButtonComponent; - private form: sqlops.FormContainer; + protected readonly view: azdata.ModelView; + private deployRadioButton: azdata.RadioButtonComponent; + private deployScriptRadioButton: azdata.RadioButtonComponent; + private scriptRadioButton: azdata.RadioButtonComponent; + private form: azdata.FormContainer; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(instance, wizardPage, model, view); } @@ -59,7 +59,7 @@ export class DeployActionPage extends DacFxConfigPage { return true; } - private async createDeployRadioButton(): Promise { + private async createDeployRadioButton(): Promise { this.deployRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedDeployAction', @@ -78,7 +78,7 @@ export class DeployActionPage extends DacFxConfigPage { }; } - private async createDeployScriptRadioButton(): Promise { + private async createDeployScriptRadioButton(): Promise { this.deployScriptRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedDeployAction', @@ -97,7 +97,7 @@ export class DeployActionPage extends DacFxConfigPage { }; } - private async createScriptRadioButton(): Promise { + private async createScriptRadioButton(): Promise { this.scriptRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedDeployAction', @@ -118,7 +118,7 @@ export class DeployActionPage extends DacFxConfigPage { }; } - private async createFileBrowser(): Promise { + private async createFileBrowser(): Promise { this.createFileBrowserParts(); //default filepath diff --git a/extensions/import/src/wizard/pages/deployConfigPage.ts b/extensions/import/src/wizard/pages/deployConfigPage.ts index cb5fc6c53b..ce43f314d0 100644 --- a/extensions/import/src/wizard/pages/deployConfigPage.ts +++ b/extensions/import/src/wizard/pages/deployConfigPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; import * as path from 'path'; @@ -17,16 +17,16 @@ const localize = nls.loadMessageBundle(); export class DeployConfigPage extends DacFxConfigPage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; - private databaseDropdownComponent: sqlops.FormComponent; - private databaseComponent: sqlops.FormComponent; - private formBuilder: sqlops.FormBuilder; - private form: sqlops.FormContainer; + protected readonly view: azdata.ModelView; + private databaseDropdownComponent: azdata.FormComponent; + private databaseComponent: azdata.FormComponent; + private formBuilder: azdata.FormBuilder; + private form: azdata.FormContainer; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(instance, wizardPage, model, view); this.fileExtension = '.bacpac'; } @@ -63,7 +63,7 @@ export class DeployConfigPage extends DacFxConfigPage { return r1 && r2; } - private async createFileBrowser(): Promise { + private async createFileBrowser(): Promise { this.createFileBrowserParts(); this.fileButton.onDidClick(async (click) => { @@ -104,7 +104,7 @@ export class DeployConfigPage extends DacFxConfigPage { }; } - private async createRadiobuttons(): Promise { + private async createRadiobuttons(): Promise { let upgradeRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'updateExisting', @@ -121,7 +121,7 @@ export class DeployConfigPage extends DacFxConfigPage { this.model.upgradeExisting = true; this.formBuilder.removeFormItem(this.databaseComponent); this.formBuilder.addFormItem(this.databaseDropdownComponent, { horizontal: true, componentWidth: 400 }); - this.model.database = (this.databaseDropdown.value).name; + this.model.database = (this.databaseDropdown.value).name; // add deploy plan and generate script pages let deployPlanPage = this.instance.pages.get('deployPlan'); @@ -159,13 +159,13 @@ export class DeployConfigPage extends DacFxConfigPage { }; } - protected async createDeployDatabaseDropdown(): Promise { + protected async createDeployDatabaseDropdown(): Promise { this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ required: true }).component(); //Handle database changes this.databaseDropdown.onValueChanged(async () => { - this.model.database = (this.databaseDropdown.value).name; + this.model.database = (this.databaseDropdown.value).name; }); this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component(); return { diff --git a/extensions/import/src/wizard/pages/deployPlanPage.ts b/extensions/import/src/wizard/pages/deployPlanPage.ts index 018497e815..90f1081042 100644 --- a/extensions/import/src/wizard/pages/deployPlanPage.ts +++ b/extensions/import/src/wizard/pages/deployPlanPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as parser from 'htmlparser2'; import { DacFxDataModel } from '../api/models'; @@ -37,20 +37,20 @@ export class DeployPlanResult { } export class DeployPlanPage extends DacFxConfigPage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; - private formBuilder: sqlops.FormBuilder; - private form: sqlops.FormContainer; - private table: sqlops.TableComponent; - private loader: sqlops.LoadingComponent; - private dataLossCheckbox: sqlops.CheckBoxComponent; - private dataLossText: sqlops.TextComponent; - private dataLossComponentGroup: sqlops.FormComponentGroup; - private noDataLossTextComponent: sqlops.FormComponent; + protected readonly view: azdata.ModelView; + private formBuilder: azdata.FormBuilder; + private form: azdata.FormContainer; + private table: azdata.TableComponent; + private loader: azdata.LoadingComponent; + private dataLossCheckbox: azdata.CheckBoxComponent; + private dataLossText: azdata.TextComponent; + private dataLossComponentGroup: azdata.FormComponentGroup; + private noDataLossTextComponent: azdata.FormComponent; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(instance, wizardPage, model, view); } @@ -116,7 +116,7 @@ export class DeployPlanPage extends DacFxConfigPage { } } - private async createDataLossCheckbox(): Promise { + private async createDataLossCheckbox(): Promise { this.dataLossCheckbox = this.view.modelBuilder.checkBox() .withValidation(component => component.checked === true) .withProperties({ @@ -130,7 +130,7 @@ export class DeployPlanPage extends DacFxConfigPage { }; } - private async createNoDataLossText(): Promise { + private async createNoDataLossText(): Promise { let noDataLossText = this.view.modelBuilder.text() .withProperties({ value: localize('dacfx.noDataLossText', 'No data loss will occur from the listed deploy actions.') @@ -142,7 +142,7 @@ export class DeployPlanPage extends DacFxConfigPage { }; } - private async createDataLossComponents(): Promise { + private async createDataLossComponents(): Promise { let dataLossComponent = await this.createDataLossCheckbox(); this.dataLossText = this.view.modelBuilder.text() .withProperties({ @@ -176,8 +176,8 @@ export class DeployPlanPage extends DacFxConfigPage { return columnData; } - private getTableColumns(dataloss: boolean): sqlops.TableColumn[] { - let columns: sqlops.TableColumn[] = [ + private getTableColumns(dataloss: boolean): azdata.TableColumn[] { + let columns: azdata.TableColumn[] = [ { value: localize('dacfx.operationColumn', 'Operation'), width: 75, diff --git a/extensions/import/src/wizard/pages/exportConfigPage.ts b/extensions/import/src/wizard/pages/exportConfigPage.ts index e76f96f53e..2962cd9772 100644 --- a/extensions/import/src/wizard/pages/exportConfigPage.ts +++ b/extensions/import/src/wizard/pages/exportConfigPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; import { DacFxDataModel } from '../api/models'; @@ -15,14 +15,14 @@ const localize = nls.loadMessageBundle(); export class ExportConfigPage extends DacFxConfigPage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; - private form: sqlops.FormContainer; + private form: azdata.FormContainer; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(instance, wizardPage, model, view); this.fileExtension = '.bacpac'; } @@ -61,7 +61,7 @@ export class ExportConfigPage extends DacFxConfigPage { }); } - private async createFileBrowser(): Promise { + private async createFileBrowser(): Promise { this.createFileBrowserParts(); // default filepath diff --git a/extensions/import/src/wizard/pages/extractConfigPage.ts b/extensions/import/src/wizard/pages/extractConfigPage.ts index 9da02f441e..cce5356580 100644 --- a/extensions/import/src/wizard/pages/extractConfigPage.ts +++ b/extensions/import/src/wizard/pages/extractConfigPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; import { DacFxDataModel } from '../api/models'; @@ -15,15 +15,15 @@ const localize = nls.loadMessageBundle(); export class ExtractConfigPage extends DacFxConfigPage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; - private form: sqlops.FormContainer; - private versionTextBox: sqlops.InputBoxComponent; + private form: azdata.FormContainer; + private versionTextBox: azdata.InputBoxComponent; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(instance, wizardPage, model, view); this.fileExtension = '.dacpac'; } @@ -64,7 +64,7 @@ export class ExtractConfigPage extends DacFxConfigPage { }); } - private async createFileBrowser(): Promise { + private async createFileBrowser(): Promise { this.createFileBrowserParts(); // default filepath @@ -101,7 +101,7 @@ export class ExtractConfigPage extends DacFxConfigPage { }; } - private async createVersionTextBox(): Promise { + private async createVersionTextBox(): Promise { this.versionTextBox = this.view.modelBuilder.inputBox().withProperties({ required: true }).component(); diff --git a/extensions/import/src/wizard/pages/fileConfigPage.ts b/extensions/import/src/wizard/pages/fileConfigPage.ts index 9d7ee76754..1942ddaf5e 100644 --- a/extensions/import/src/wizard/pages/fileConfigPage.ts +++ b/extensions/import/src/wizard/pages/fileConfigPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { ImportDataModel } from '../api/models'; @@ -16,20 +16,20 @@ const localize = nls.loadMessageBundle(); export class FileConfigPage extends ImportPage { - private serverDropdown: sqlops.DropDownComponent; - private databaseDropdown: sqlops.DropDownComponent; - private fileTextBox: sqlops.InputBoxComponent; - private fileButton: sqlops.ButtonComponent; - private tableNameTextBox: sqlops.InputBoxComponent; - private schemaDropdown: sqlops.DropDownComponent; - private form: sqlops.FormContainer; + private serverDropdown: azdata.DropDownComponent; + private databaseDropdown: azdata.DropDownComponent; + private fileTextBox: azdata.InputBoxComponent; + private fileButton: azdata.ButtonComponent; + private tableNameTextBox: azdata.InputBoxComponent; + private schemaDropdown: azdata.DropDownComponent; + private form: azdata.FormContainer; - private databaseLoader: sqlops.LoadingComponent; - private schemaLoader: sqlops.LoadingComponent; + private databaseLoader: azdata.LoadingComponent; + private schemaLoader: azdata.LoadingComponent; private tableNames: string[] = []; - public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) { + public constructor(instance: FlatFileWizard, wizardPage: azdata.window.WizardPage, model: ImportDataModel, view: azdata.ModelView, provider: FlatFileProvider) { super(instance, wizardPage, model, view, provider); } @@ -82,7 +82,7 @@ export class FileConfigPage extends ImportPage { }); } - private async createServerDropdown(): Promise { + private async createServerDropdown(): Promise { this.serverDropdown = this.view.modelBuilder.dropDown().withProperties({ required: true }).component(); @@ -116,14 +116,14 @@ export class FileConfigPage extends ImportPage { return true; } - private async createDatabaseDropdown(): Promise { + private async createDatabaseDropdown(): Promise { this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({ required: true }).component(); // Handle database changes this.databaseDropdown.onValueChanged(async (db) => { - this.model.database = (this.databaseDropdown.value).name; + this.model.database = (this.databaseDropdown.value).name; //this.populateTableNames(); this.populateSchemaDropdown(); }); @@ -159,7 +159,7 @@ export class FileConfigPage extends ImportPage { return true; } - private async createFileBrowser(): Promise { + private async createFileBrowser(): Promise { this.fileTextBox = this.view.modelBuilder.inputBox().withProperties({ required: true }).component(); @@ -218,7 +218,7 @@ export class FileConfigPage extends ImportPage { }; } - private async createTableNameBox(): Promise { + private async createTableNameBox(): Promise { this.tableNameTextBox = this.view.modelBuilder.inputBox().withValidation((name) => { let tableName = name.value; @@ -247,14 +247,14 @@ export class FileConfigPage extends ImportPage { } - private async createSchemaDropdown(): Promise { + private async createSchemaDropdown(): Promise { this.schemaDropdown = this.view.modelBuilder.dropDown().withProperties({ required: true }).component(); this.schemaLoader = this.view.modelBuilder.loadingComponent().withItem(this.schemaDropdown).component(); this.schemaDropdown.onValueChanged(() => { - this.model.schema = (this.schemaDropdown.value).name; + this.model.schema = (this.schemaDropdown.value).name; }); @@ -267,8 +267,8 @@ export class FileConfigPage extends ImportPage { private async populateSchemaDropdown(): Promise { this.schemaLoader.loading = true; - let connectionUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); - let queryProvider = sqlops.dataprotocol.getProvider(this.model.server.providerName, sqlops.DataProviderType.QueryProvider); + let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); + let queryProvider = azdata.dataprotocol.getProvider(this.model.server.providerName, azdata.DataProviderType.QueryProvider); let query = `SELECT name FROM sys.schemas`; @@ -321,16 +321,16 @@ export class FileConfigPage extends ImportPage { // private async populateTableNames(): Promise { // this.tableNames = []; - // let databaseName = (this.databaseDropdown.value).name; + // let databaseName = (this.databaseDropdown.value).name; // // if (!databaseName || databaseName.length === 0) { // this.tableNames = []; // return false; // } // - // let connectionUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); - // let queryProvider = sqlops.dataprotocol.getProvider(this.model.server.providerName, sqlops.DataProviderType.QueryProvider); - // let results: sqlops.SimpleExecuteResult; + // let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); + // let queryProvider = azdata.dataprotocol.getProvider(this.model.server.providerName, azdata.DataProviderType.QueryProvider); + // let results: azdata.SimpleExecuteResult; // // try { // //let query = sqlstring.format('USE ?; SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = \'BASE TABLE\'', [databaseName]); @@ -348,6 +348,6 @@ export class FileConfigPage extends ImportPage { } -interface ConnectionDropdownValue extends sqlops.CategoryValue { - connection: sqlops.connection.Connection; +interface ConnectionDropdownValue extends azdata.CategoryValue { + connection: azdata.connection.Connection; } diff --git a/extensions/import/src/wizard/pages/importConfigPage.ts b/extensions/import/src/wizard/pages/importConfigPage.ts index c0d5cd650d..1e8699d1c1 100644 --- a/extensions/import/src/wizard/pages/importConfigPage.ts +++ b/extensions/import/src/wizard/pages/importConfigPage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; import * as path from 'path'; @@ -17,14 +17,14 @@ const localize = nls.loadMessageBundle(); export class ImportConfigPage extends DacFxConfigPage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; - private form: sqlops.FormContainer; + private form: azdata.FormContainer; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(instance, wizardPage, model, view); this.fileExtension = '.bacpac'; } @@ -53,7 +53,7 @@ export class ImportConfigPage extends DacFxConfigPage { return r1; } - private async createFileBrowser(): Promise { + private async createFileBrowser(): Promise { this.createFileBrowserParts(); this.fileButton.onDidClick(async (click) => { diff --git a/extensions/import/src/wizard/pages/modifyColumnsPage.ts b/extensions/import/src/wizard/pages/modifyColumnsPage.ts index 76e91554cf..02fc85bedb 100644 --- a/extensions/import/src/wizard/pages/modifyColumnsPage.ts +++ b/extensions/import/src/wizard/pages/modifyColumnsPage.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import { ColumnMetadata, ImportDataModel } from '../api/models'; import { ImportPage } from '../api/importPage'; @@ -51,12 +51,12 @@ export class ModifyColumnsPage extends ImportPage { { name: 'varchar(50)', displayName: 'varchar(50)' }, { name: 'varchar(MAX)', displayName: 'varchar(MAX)' } ]; - private table: sqlops.DeclarativeTableComponent; - private loading: sqlops.LoadingComponent; - private text: sqlops.TextComponent; - private form: sqlops.FormContainer; + private table: azdata.DeclarativeTableComponent; + private loading: azdata.LoadingComponent; + private text: azdata.TextComponent; + private form: azdata.FormContainer; - public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) { + public constructor(instance: FlatFileWizard, wizardPage: azdata.window.WizardPage, model: ImportDataModel, view: azdata.ModelView, provider: FlatFileProvider) { super(instance, wizardPage, model, view, provider); } @@ -142,23 +142,23 @@ export class ModifyColumnsPage extends ImportPage { height: 400, columns: [{ displayName: localize('flatFileImport.columnName', 'Column Name'), - valueType: sqlops.DeclarativeDataType.string, + valueType: azdata.DeclarativeDataType.string, width: '150px', isReadOnly: false }, { displayName: localize('flatFileImport.dataType', 'Data Type'), - valueType: sqlops.DeclarativeDataType.editableCategory, + valueType: azdata.DeclarativeDataType.editableCategory, width: '150px', isReadOnly: false, categoryValues: this.categoryValues }, { displayName: localize('flatFileImport.primaryKey', 'Primary Key'), - valueType: sqlops.DeclarativeDataType.boolean, + valueType: azdata.DeclarativeDataType.boolean, width: '100px', isReadOnly: false }, { displayName: localize('flatFileImport.allowNulls', 'Allow Nulls'), - valueType: sqlops.DeclarativeDataType.boolean, + valueType: azdata.DeclarativeDataType.boolean, isReadOnly: false, width: '100px' }], diff --git a/extensions/import/src/wizard/pages/prosePreviewPage.ts b/extensions/import/src/wizard/pages/prosePreviewPage.ts index 99fe995df0..f82e508255 100644 --- a/extensions/import/src/wizard/pages/prosePreviewPage.ts +++ b/extensions/import/src/wizard/pages/prosePreviewPage.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import { ImportDataModel } from '../api/models'; import { ImportPage } from '../api/importPage'; @@ -15,12 +15,12 @@ import { FlatFileWizard } from '../flatFileWizard'; const localize = nls.loadMessageBundle(); export class ProsePreviewPage extends ImportPage { - private table: sqlops.TableComponent; - private loading: sqlops.LoadingComponent; - private form: sqlops.FormContainer; - private refresh: sqlops.ButtonComponent; + private table: azdata.TableComponent; + private loading: azdata.LoadingComponent; + private form: azdata.FormContainer; + private refresh: azdata.ButtonComponent; - public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) { + public constructor(instance: FlatFileWizard, wizardPage: azdata.window.WizardPage, model: ImportDataModel, view: azdata.ModelView, provider: FlatFileProvider) { super(instance, wizardPage, model, view, provider); } diff --git a/extensions/import/src/wizard/pages/selectOperationpage.ts b/extensions/import/src/wizard/pages/selectOperationpage.ts index 30d0213525..28090b0507 100644 --- a/extensions/import/src/wizard/pages/selectOperationpage.ts +++ b/extensions/import/src/wizard/pages/selectOperationpage.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import { DacFxDataModel } from '../api/models'; import { DataTierApplicationWizard, Operation, DeployOperationPath, ExtractOperationPath, ImportOperationPath, ExportOperationPath } from '../dataTierApplicationWizard'; @@ -14,18 +14,18 @@ const localize = nls.loadMessageBundle(); export class SelectOperationPage extends BasePage { - protected readonly wizardPage: sqlops.window.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly instance: DataTierApplicationWizard; protected readonly model: DacFxDataModel; - protected readonly view: sqlops.ModelView; + protected readonly view: azdata.ModelView; - private deployRadioButton: sqlops.RadioButtonComponent; - private extractRadioButton: sqlops.RadioButtonComponent; - private importRadioButton: sqlops.RadioButtonComponent; - private exportRadioButton: sqlops.RadioButtonComponent; - private form: sqlops.FormContainer; + private deployRadioButton: azdata.RadioButtonComponent; + private extractRadioButton: azdata.RadioButtonComponent; + private importRadioButton: azdata.RadioButtonComponent; + private exportRadioButton: azdata.RadioButtonComponent; + private form: azdata.FormContainer; - public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) { + public constructor(instance: DataTierApplicationWizard, wizardPage: azdata.window.WizardPage, model: DacFxDataModel, view: azdata.ModelView) { super(); this.instance = instance; this.wizardPage = wizardPage; @@ -61,7 +61,7 @@ export class SelectOperationPage extends BasePage { return true; } - private async createDeployRadioButton(): Promise { + private async createDeployRadioButton(): Promise { this.deployRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedOperation', @@ -90,7 +90,7 @@ export class SelectOperationPage extends BasePage { }; } - private async createExtractRadioButton(): Promise { + private async createExtractRadioButton(): Promise { this.extractRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedOperation', @@ -115,7 +115,7 @@ export class SelectOperationPage extends BasePage { }; } - private async createImportRadioButton(): Promise { + private async createImportRadioButton(): Promise { this.importRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedOperation', @@ -140,7 +140,7 @@ export class SelectOperationPage extends BasePage { }; } - private async createExportRadioButton(): Promise { + private async createExportRadioButton(): Promise { this.exportRadioButton = this.view.modelBuilder.radioButton() .withProperties({ name: 'selectedOperation', diff --git a/extensions/import/src/wizard/pages/summaryPage.ts b/extensions/import/src/wizard/pages/summaryPage.ts index 2b7c4938bb..f5af66552d 100644 --- a/extensions/import/src/wizard/pages/summaryPage.ts +++ b/extensions/import/src/wizard/pages/summaryPage.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import { ImportDataModel } from '../api/models'; @@ -17,12 +17,12 @@ const localize = nls.loadMessageBundle(); export class SummaryPage extends ImportPage { - private table: sqlops.TableComponent; - private statusText: sqlops.TextComponent; - private loading: sqlops.LoadingComponent; - private form: sqlops.FormContainer; + private table: azdata.TableComponent; + private statusText: azdata.TextComponent; + private loading: azdata.LoadingComponent; + private form: azdata.FormContainer; - public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) { + public constructor(instance: FlatFileWizard, wizardPage: azdata.window.WizardPage, model: ImportDataModel, view: azdata.ModelView, provider: FlatFileProvider) { super(instance, wizardPage, model, view, provider); } @@ -142,18 +142,18 @@ export class SummaryPage extends ImportPage { if (options.authenticationType === 'Integrated') { connectionString = `Data Source=${options.server + (options.port ? `,${options.port}` : '')};Initial Catalog=${this.model.database};Integrated Security=True`; } else { - let credentials = await sqlops.connection.getCredentials(this.model.server.connectionId); + let credentials = await azdata.connection.getCredentials(this.model.server.connectionId); connectionString = `Data Source=${options.server + (options.port ? `,${options.port}` : '')};Initial Catalog=${this.model.database};Integrated Security=False;User Id=${options.user};Password=${credentials.password}`; } // TODO: Fix this, it's returning undefined string. - //await sqlops.connection.getConnectionString(this.model.server.connectionId, true); + //await azdata.connection.getConnectionString(this.model.server.connectionId, true); return connectionString; } // private async getCountRowsInserted(): Promise { - // let connectionUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId); - // let queryProvider = sqlops.dataprotocol.getProvider(this.model.server.providerName, sqlops.DataProviderType.QueryProvider); + // let connectionUri = await azdata.connection.getUriForConnection(this.model.server.connectionId); + // let queryProvider = azdata.dataprotocol.getProvider(this.model.server.providerName, azdata.DataProviderType.QueryProvider); // try { // let query = sqlstring.format('USE ?; SELECT COUNT(*) FROM ?', [this.model.database, this.model.table]); // let results = await queryProvider.runQueryAndReturn(connectionUri, query); diff --git a/extensions/integration-tests/src/main.ts b/extensions/integration-tests/src/main.ts index b175aacaf1..3d268c6089 100644 --- a/extensions/integration-tests/src/main.ts +++ b/extensions/integration-tests/src/main.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { normalize, join } from 'path'; import * as fs from 'fs'; @@ -22,7 +22,7 @@ export function activate(context: vscode.ExtensionContext) { for (let i = 0; i < installers.length; i++) { if (installers[i].endsWith('.vsix')) { let installerFullPath = join(extensionInstallersFolder, installers[i]); - await sqlops.extensions.install(installerFullPath); + await azdata.extensions.install(installerFullPath); } } await setConfiguration('workbench.enablePreviewFeatures', true); diff --git a/extensions/integration-tests/src/objectExplorer.test.ts b/extensions/integration-tests/src/objectExplorer.test.ts index 2f3f4d2a59..40754627fd 100644 --- a/extensions/integration-tests/src/objectExplorer.test.ts +++ b/extensions/integration-tests/src/objectExplorer.test.ts @@ -6,7 +6,7 @@ 'use strict'; import 'mocha'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { context } from './testContext'; import { getDefaultTestingServer } from './testConfig'; import { connectToServer } from './utils'; @@ -16,9 +16,9 @@ if (context.RunTest) { suite('Object Explorer integration test suite', () => { test('context menu test', async function () { await connectToServer(await getDefaultTestingServer()); - let nodes = await sqlops.objectexplorer.getActiveConnectionNodes(); + let nodes = await azdata.objectexplorer.getActiveConnectionNodes(); assert(nodes.length === 1, `expecting 1 active connection, actual: ${nodes.length}`); - let actions = await sqlops.objectexplorer.getNodeActions(nodes[0].connectionId, nodes[0].nodePath); + let actions = await azdata.objectexplorer.getNodeActions(nodes[0].connectionId, nodes[0].nodePath); const expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'New Notebook', 'Launch Profiler']; const expectedString = expectedActions.join(','); diff --git a/extensions/integration-tests/src/typings/ref.d.ts b/extensions/integration-tests/src/typings/ref.d.ts index 8748ce5242..73e5b609af 100644 --- a/extensions/integration-tests/src/typings/ref.d.ts +++ b/extensions/integration-tests/src/typings/ref.d.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// -/// +/// +/// +/// /// \ No newline at end of file diff --git a/extensions/integration-tests/src/utils.ts b/extensions/integration-tests/src/utils.ts index 083f47e7f1..fb135e0066 100644 --- a/extensions/integration-tests/src/utils.ts +++ b/extensions/integration-tests/src/utils.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import assert = require('assert'); -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { TestServerProfile } from './testConfig'; export async function connectToServer(server: TestServerProfile) { - let connectionProfile: sqlops.IConnectionProfile = { + let connectionProfile: azdata.IConnectionProfile = { serverName: server.serverName, databaseName: server.database, authenticationType: server.authenticationTypeName, @@ -25,7 +25,7 @@ export async function connectToServer(server: TestServerProfile) { options: {} }; await ensureConnectionViewOpened(); - let result = await sqlops.connection.connect(connectionProfile); + let result = await azdata.connection.connect(connectionProfile); assert(result.connected, `Failed to connect to "${connectionProfile.serverName}", error code: ${result.errorCode}, error message: ${result.errorMessage}`); //workaround diff --git a/extensions/mssql/src/api/mssqlapis.d.ts b/extensions/mssql/src/api/mssqlapis.d.ts index a7309454b3..f5d0f0a354 100644 --- a/extensions/mssql/src/api/mssqlapis.d.ts +++ b/extensions/mssql/src/api/mssqlapis.d.ts @@ -5,7 +5,7 @@ // This is the place for extensions to expose APIs. -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; /** @@ -35,10 +35,10 @@ export interface MssqlObjectExplorerBrowser { /** * Gets the matching node given a context object, e.g. one from a right-click on a node in Object Explorer * - * @param {sqlops.ObjectExplorerContext} objectExplorerContext + * @param {azdata.ObjectExplorerContext} objectExplorerContext * @returns {Promise} */ - getNode(objectExplorerContext: sqlops.ObjectExplorerContext): Promise; + getNode(objectExplorerContext: azdata.ObjectExplorerContext): Promise; } /** @@ -48,7 +48,7 @@ export interface MssqlObjectExplorerBrowser { * @interface ITreeNode */ export interface ITreeNode { - getNodeInfo(): sqlops.NodeInfo; + getNodeInfo(): azdata.NodeInfo; getChildren(refreshChildren: boolean): ITreeNode[] | Promise; } diff --git a/extensions/mssql/src/apiWrapper.ts b/extensions/mssql/src/apiWrapper.ts index af6232b304..537d99d05c 100644 --- a/extensions/mssql/src/apiWrapper.ts +++ b/extensions/mssql/src/apiWrapper.ts @@ -6,7 +6,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into @@ -17,44 +17,44 @@ import * as sqlops from 'sqlops'; */ export class ApiWrapper { // Data APIs - public registerConnectionProvider(provider: sqlops.ConnectionProvider): vscode.Disposable { - return sqlops.dataprotocol.registerConnectionProvider(provider); + public registerConnectionProvider(provider: azdata.ConnectionProvider): vscode.Disposable { + return azdata.dataprotocol.registerConnectionProvider(provider); } - public registerObjectExplorerNodeProvider(provider: sqlops.ObjectExplorerNodeProvider): vscode.Disposable { - return sqlops.dataprotocol.registerObjectExplorerNodeProvider(provider); + public registerObjectExplorerNodeProvider(provider: azdata.ObjectExplorerNodeProvider): vscode.Disposable { + return azdata.dataprotocol.registerObjectExplorerNodeProvider(provider); } - public registerTaskServicesProvider(provider: sqlops.TaskServicesProvider): vscode.Disposable { - return sqlops.dataprotocol.registerTaskServicesProvider(provider); + public registerTaskServicesProvider(provider: azdata.TaskServicesProvider): vscode.Disposable { + return azdata.dataprotocol.registerTaskServicesProvider(provider); } - public registerFileBrowserProvider(provider: sqlops.FileBrowserProvider): vscode.Disposable { - return sqlops.dataprotocol.registerFileBrowserProvider(provider); + public registerFileBrowserProvider(provider: azdata.FileBrowserProvider): vscode.Disposable { + return azdata.dataprotocol.registerFileBrowserProvider(provider); } - public createDialog(title: string): sqlops.window.Dialog { - return sqlops.window.createModelViewDialog(title); + public createDialog(title: string): azdata.window.Dialog { + return azdata.window.createModelViewDialog(title); } - public openDialog(dialog: sqlops.window.Dialog): void { - return sqlops.window.openDialog(dialog); + public openDialog(dialog: azdata.window.Dialog): void { + return azdata.window.openDialog(dialog); } - public closeDialog(dialog: sqlops.window.Dialog): void { - return sqlops.window.closeDialog(dialog); + public closeDialog(dialog: azdata.window.Dialog): void { + return azdata.window.closeDialog(dialog); } - public registerTaskHandler(taskId: string, handler: (profile: sqlops.IConnectionProfile) => void): void { - sqlops.tasks.registerTask(taskId, handler); + public registerTaskHandler(taskId: string, handler: (profile: azdata.IConnectionProfile) => void): void { + azdata.tasks.registerTask(taskId, handler); } - public startBackgroundOperation(operationInfo: sqlops.BackgroundOperationInfo): void { - sqlops.tasks.startBackgroundOperation(operationInfo); + public startBackgroundOperation(operationInfo: azdata.BackgroundOperationInfo): void { + azdata.tasks.startBackgroundOperation(operationInfo); } - public getActiveConnections(): Thenable { - return sqlops.connection.getActiveConnections(); + public getActiveConnections(): Thenable { + return azdata.connection.getActiveConnections(); } // VSCode APIs @@ -113,7 +113,7 @@ export class ApiWrapper { return vscode.window.createOutputChannel(name); } - public createTab(title: string): sqlops.window.DialogTab { - return sqlops.window.createTab(title); + public createTab(title: string): azdata.window.DialogTab { + return azdata.window.createTab(title); } } diff --git a/extensions/mssql/src/contextProvider.ts b/extensions/mssql/src/contextProvider.ts index dec7eb9c40..4055509038 100644 --- a/extensions/mssql/src/contextProvider.ts +++ b/extensions/mssql/src/contextProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as types from './types'; import * as Constants from './constants'; @@ -33,11 +33,11 @@ export default class ContextProvider { private _disposables = new Array(); constructor() { - this._disposables.push(sqlops.workspace.onDidOpenDashboard(this.onDashboardOpen, this)); - this._disposables.push(sqlops.workspace.onDidChangeToDashboard(this.onDashboardOpen, this)); + this._disposables.push(azdata.workspace.onDidOpenDashboard(this.onDashboardOpen, this)); + this._disposables.push(azdata.workspace.onDidChangeToDashboard(this.onDashboardOpen, this)); } - public onDashboardOpen(e: sqlops.DashboardDocument): void { + public onDashboardOpen(e: azdata.DashboardDocument): void { let iscloud: boolean; let edition: number; let isCluster: boolean = false; diff --git a/extensions/mssql/src/contracts.ts b/extensions/mssql/src/contracts.ts index 8665d1a434..0cd7862814 100644 --- a/extensions/mssql/src/contracts.ts +++ b/extensions/mssql/src/contracts.ts @@ -6,7 +6,7 @@ import { NotificationType, RequestType } from 'vscode-languageclient'; import { ITelemetryEventProperties, ITelemetryEventMeasures } from './telemetry'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; // ------------------------------- < Telemetry Sent Event > ------------------------------------ @@ -51,18 +51,18 @@ export interface AgentJobActionParams { export interface CreateAgentJobParams { ownerUri: string; - job: sqlops.AgentJobInfo; + job: azdata.AgentJobInfo; } export interface UpdateAgentJobParams { ownerUri: string; originalJobName: string; - job: sqlops.AgentJobInfo; + job: azdata.AgentJobInfo; } export interface DeleteAgentJobParams { ownerUri: string; - job: sqlops.AgentJobInfo; + job: azdata.AgentJobInfo; } export interface AgentJobDefaultsParams { @@ -72,18 +72,18 @@ export interface AgentJobDefaultsParams { // Job Step management parameters export interface CreateAgentJobStepParams { ownerUri: string; - step: sqlops.AgentJobStepInfo; + step: azdata.AgentJobStepInfo; } export interface UpdateAgentJobStepParams { ownerUri: string; originalJobStepName: string; - step: sqlops.AgentJobStepInfo; + step: azdata.AgentJobStepInfo; } export interface DeleteAgentJobStepParams { ownerUri: string; - step: sqlops.AgentJobStepInfo; + step: azdata.AgentJobStepInfo; } // Alert management parameters @@ -93,18 +93,18 @@ export interface AgentAlertsParams { export interface CreateAgentAlertParams { ownerUri: string; - alert: sqlops.AgentAlertInfo; + alert: azdata.AgentAlertInfo; } export interface UpdateAgentAlertParams { ownerUri: string; originalAlertName: string; - alert: sqlops.AgentAlertInfo; + alert: azdata.AgentAlertInfo; } export interface DeleteAgentAlertParams { ownerUri: string; - alert: sqlops.AgentAlertInfo; + alert: azdata.AgentAlertInfo; } // Operator management parameters @@ -114,18 +114,18 @@ export interface AgentOperatorsParams { export interface CreateAgentOperatorParams { ownerUri: string; - operator: sqlops.AgentOperatorInfo; + operator: azdata.AgentOperatorInfo; } export interface UpdateAgentOperatorParams { ownerUri: string; originalOperatorName: string; - operator: sqlops.AgentOperatorInfo; + operator: azdata.AgentOperatorInfo; } export interface DeleteAgentOperatorParams { ownerUri: string; - operator: sqlops.AgentOperatorInfo; + operator: azdata.AgentOperatorInfo; } // Proxy management parameters @@ -135,18 +135,18 @@ export interface AgentProxiesParams { export interface CreateAgentProxyParams { ownerUri: string; - proxy: sqlops.AgentProxyInfo; + proxy: azdata.AgentProxyInfo; } export interface UpdateAgentProxyParams { ownerUri: string; originalProxyName: string; - proxy: sqlops.AgentProxyInfo; + proxy: azdata.AgentProxyInfo; } export interface DeleteAgentProxyParams { ownerUri: string; - proxy: sqlops.AgentProxyInfo; + proxy: azdata.AgentProxyInfo; } // Agent Credentials parameters @@ -161,133 +161,133 @@ export interface AgentJobScheduleParams { export interface CreateAgentJobScheduleParams { ownerUri: string; - schedule: sqlops.AgentJobScheduleInfo; + schedule: azdata.AgentJobScheduleInfo; } export interface UpdateAgentJobScheduleParams { ownerUri: string; originalScheduleName: string; - schedule: sqlops.AgentJobScheduleInfo; + schedule: azdata.AgentJobScheduleInfo; } export interface DeleteAgentJobScheduleParams { ownerUri: string; - schedule: sqlops.AgentJobScheduleInfo; + schedule: azdata.AgentJobScheduleInfo; } // Agent Job management requests export namespace AgentJobsRequest { - export const type = new RequestType('agent/jobs'); + export const type = new RequestType('agent/jobs'); } export namespace AgentJobHistoryRequest { - export const type = new RequestType('agent/jobhistory'); + export const type = new RequestType('agent/jobhistory'); } export namespace AgentJobActionRequest { - export const type = new RequestType('agent/jobaction'); + export const type = new RequestType('agent/jobaction'); } export namespace CreateAgentJobRequest { - export const type = new RequestType('agent/createjob'); + export const type = new RequestType('agent/createjob'); } export namespace UpdateAgentJobRequest { - export const type = new RequestType('agent/updatejob'); + export const type = new RequestType('agent/updatejob'); } export namespace DeleteAgentJobRequest { - export const type = new RequestType('agent/deletejob'); + export const type = new RequestType('agent/deletejob'); } export namespace AgentJobDefaultsRequest { - export const type = new RequestType('agent/jobdefaults'); + export const type = new RequestType('agent/jobdefaults'); } // Job Step requests export namespace CreateAgentJobStepRequest { - export const type = new RequestType('agent/createjobstep'); + export const type = new RequestType('agent/createjobstep'); } export namespace UpdateAgentJobStepRequest { - export const type = new RequestType('agent/updatejobstep'); + export const type = new RequestType('agent/updatejobstep'); } export namespace DeleteAgentJobStepRequest { - export const type = new RequestType('agent/deletejobstep'); + export const type = new RequestType('agent/deletejobstep'); } // Alerts requests export namespace AgentAlertsRequest { - export const type = new RequestType('agent/alerts'); + export const type = new RequestType('agent/alerts'); } export namespace CreateAgentAlertRequest { - export const type = new RequestType('agent/createalert'); + export const type = new RequestType('agent/createalert'); } export namespace UpdateAgentAlertRequest { - export const type = new RequestType('agent/updatealert'); + export const type = new RequestType('agent/updatealert'); } export namespace DeleteAgentAlertRequest { - export const type = new RequestType('agent/deletealert'); + export const type = new RequestType('agent/deletealert'); } // Operators requests export namespace AgentOperatorsRequest { - export const type = new RequestType('agent/operators'); + export const type = new RequestType('agent/operators'); } export namespace CreateAgentOperatorRequest { - export const type = new RequestType('agent/createoperator'); + export const type = new RequestType('agent/createoperator'); } export namespace UpdateAgentOperatorRequest { - export const type = new RequestType('agent/updateoperator'); + export const type = new RequestType('agent/updateoperator'); } export namespace DeleteAgentOperatorRequest { - export const type = new RequestType('agent/deleteoperator'); + export const type = new RequestType('agent/deleteoperator'); } // Proxies requests export namespace AgentProxiesRequest { - export const type = new RequestType('agent/proxies'); + export const type = new RequestType('agent/proxies'); } export namespace CreateAgentProxyRequest { - export const type = new RequestType('agent/createproxy'); + export const type = new RequestType('agent/createproxy'); } export namespace UpdateAgentProxyRequest { - export const type = new RequestType('agent/updateproxy'); + export const type = new RequestType('agent/updateproxy'); } export namespace DeleteAgentProxyRequest { - export const type = new RequestType('agent/deleteproxy'); + export const type = new RequestType('agent/deleteproxy'); } // Agent Credentials request export namespace AgentCredentialsRequest { - export const type = new RequestType('security/credentials'); + export const type = new RequestType('security/credentials'); } // Job Schedules requests export namespace AgentJobSchedulesRequest { - export const type = new RequestType('agent/schedules'); + export const type = new RequestType('agent/schedules'); } export namespace CreateAgentJobScheduleRequest { - export const type = new RequestType('agent/createschedule'); + export const type = new RequestType('agent/createschedule'); } export namespace UpdateAgentJobScheduleRequest { - export const type = new RequestType('agent/updateschedule'); + export const type = new RequestType('agent/updateschedule'); } export namespace DeleteAgentJobScheduleRequest { - export const type = new RequestType('agent/deleteschedule'); + export const type = new RequestType('agent/deleteschedule'); } // ------------------------------- < Agent Management > ------------------------------------ @@ -347,26 +347,26 @@ export interface GenerateDeployPlanParams { } export namespace ExportRequest { - export const type = new RequestType('dacfx/export'); + export const type = new RequestType('dacfx/export'); } export namespace ImportRequest { - export const type = new RequestType('dacfx/import'); + export const type = new RequestType('dacfx/import'); } export namespace ExtractRequest { - export const type = new RequestType('dacfx/extract'); + export const type = new RequestType('dacfx/extract'); } export namespace DeployRequest { - export const type = new RequestType('dacfx/deploy'); + export const type = new RequestType('dacfx/deploy'); } export namespace GenerateDeployScriptRequest { - export const type = new RequestType('dacfx/generateDeploymentScript'); + export const type = new RequestType('dacfx/generateDeploymentScript'); } export namespace GenerateDeployPlanRequest { - export const type = new RequestType('dacfx/generateDeployPlan'); + export const type = new RequestType('dacfx/generateDeployPlan'); } // ------------------------------- < DacFx > ------------------------------------ \ No newline at end of file diff --git a/extensions/mssql/src/credentialstore/contracts.ts b/extensions/mssql/src/credentialstore/contracts.ts index 49a1436ecb..0dcd28c4f2 100644 --- a/extensions/mssql/src/credentialstore/contracts.ts +++ b/extensions/mssql/src/credentialstore/contracts.ts @@ -5,7 +5,7 @@ 'use strict'; import { RequestType } from 'vscode-languageclient'; -import { Credential } from 'sqlops'; +import { Credential } from 'azdata'; // --------------------------------- < Read Credential Request > ------------------------------------------------- diff --git a/extensions/mssql/src/credentialstore/credentialstore.ts b/extensions/mssql/src/credentialstore/credentialstore.ts index b304551ae7..ea12c8cdb1 100644 --- a/extensions/mssql/src/credentialstore/credentialstore.ts +++ b/extensions/mssql/src/credentialstore/credentialstore.ts @@ -10,7 +10,7 @@ import { IConfig, ServerProvider } from 'service-downloader'; import { ServerOptions, RPCMessageType, ClientCapabilities, ServerCapabilities, TransportKind } from 'vscode-languageclient'; import { Disposable } from 'vscode'; import * as UUID from 'vscode-languageclient/lib/utils/uuid'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as Contracts from './contracts'; import * as Constants from './constants'; @@ -42,7 +42,7 @@ class CredentialsFeature extends SqlOpsFeature { protected registerProvider(options: any): Disposable { const client = this._client; - let readCredential = (credentialId: string): Thenable => { + let readCredential = (credentialId: string): Thenable => { return client.sendRequest(Contracts.ReadCredentialRequest.type, { credentialId }); }; @@ -54,7 +54,7 @@ class CredentialsFeature extends SqlOpsFeature { return client.sendRequest(Contracts.DeleteCredentialRequest.type, { credentialId }); }; - return sqlops.credentials.registerProvider({ + return azdata.credentials.registerProvider({ deleteCredential, readCredential, saveCredential, diff --git a/extensions/mssql/src/features.ts b/extensions/mssql/src/features.ts index 553887f6f9..71d017cf84 100644 --- a/extensions/mssql/src/features.ts +++ b/extensions/mssql/src/features.ts @@ -9,7 +9,7 @@ import { ClientCapabilities, StaticFeature, RPCMessageType, ServerCapabilities } import { Disposable } from 'vscode'; import { Telemetry } from './telemetry'; import * as contracts from './contracts'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as Utils from './utils'; import * as UUID from 'vscode-languageclient/lib/utils/uuid'; @@ -54,7 +54,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { const client = this._client; let self = this; - let exportBacpac = (databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable => { + let exportBacpac = (databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable => { let params: contracts.ExportParams = { databaseName: databaseName, packageFilePath: packageFilePath, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return client.sendRequest(contracts.ExportRequest.type, params).then( r => { @@ -67,7 +67,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { ); }; - let importBacpac = (packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable => { + let importBacpac = (packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable => { let params: contracts.ImportParams = { packageFilePath: packageFilePath, databaseName: databaseName, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return client.sendRequest(contracts.ImportRequest.type, params).then( r => { @@ -80,7 +80,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { ); }; - let extractDacpac = (databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable => { + let extractDacpac = (databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable => { let params: contracts.ExtractParams = { databaseName: databaseName, packageFilePath: packageFilePath, applicationName: applicationName, applicationVersion: applicationVersion, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return client.sendRequest(contracts.ExtractRequest.type, params).then( r => { @@ -93,7 +93,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { ); }; - let deployDacpac = (packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable => { + let deployDacpac = (packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable => { let params: contracts.DeployParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, upgradeExisting: upgradeExisting, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return client.sendRequest(contracts.DeployRequest.type, params).then( r => { @@ -106,7 +106,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { ); }; - let generateDeployScript = (packageFilePath: string, targetDatabaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable => { + let generateDeployScript = (packageFilePath: string, targetDatabaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable => { let params: contracts.GenerateDeployScriptParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, scriptFilePath: scriptFilePath, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return client.sendRequest(contracts.GenerateDeployScriptRequest.type, params).then( r => { @@ -119,7 +119,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { ); }; - let generateDeployPlan = (packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable => { + let generateDeployPlan = (packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable => { let params: contracts.GenerateDeployPlanParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return client.sendRequest(contracts.GenerateDeployPlanRequest.type, params).then( r => { @@ -132,7 +132,7 @@ export class DacFxServicesFeature extends SqlOpsFeature { ); }; - return sqlops.dataprotocol.registerDacFxServicesProvider({ + return azdata.dataprotocol.registerDacFxServicesProvider({ providerId: client.providerId, exportBacpac, importBacpac, @@ -185,7 +185,7 @@ export class AgentServicesFeature extends SqlOpsFeature { }; // Job management methods - let getJobs = (ownerUri: string): Thenable => { + let getJobs = (ownerUri: string): Thenable => { let params: contracts.AgentJobsParams = { ownerUri: ownerUri, jobId: null }; return client.sendRequest(contracts.AgentJobsRequest.type, params).then( r => r, @@ -196,7 +196,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let getJobHistory = (ownerUri: string, jobID: string, jobName: string): Thenable => { + let getJobHistory = (ownerUri: string, jobID: string, jobName: string): Thenable => { let params: contracts.AgentJobHistoryParams = { ownerUri: ownerUri, jobId: jobID, jobName: jobName }; return client.sendRequest(contracts.AgentJobHistoryRequest.type, params).then( @@ -208,7 +208,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let jobAction = (ownerUri: string, jobName: string, action: string): Thenable => { + let jobAction = (ownerUri: string, jobName: string, action: string): Thenable => { let params: contracts.AgentJobActionParams = { ownerUri: ownerUri, jobName: jobName, action: action }; return client.sendRequest(contracts.AgentJobActionRequest.type, params).then( r => r, @@ -219,7 +219,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let createJob = (ownerUri: string, jobInfo: sqlops.AgentJobInfo): Thenable => { + let createJob = (ownerUri: string, jobInfo: azdata.AgentJobInfo): Thenable => { let params: contracts.CreateAgentJobParams = { ownerUri: ownerUri, job: jobInfo @@ -237,7 +237,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let updateJob = (ownerUri: string, originalJobName: string, jobInfo: sqlops.AgentJobInfo): Thenable => { + let updateJob = (ownerUri: string, originalJobName: string, jobInfo: azdata.AgentJobInfo): Thenable => { let params: contracts.UpdateAgentJobParams = { ownerUri: ownerUri, originalJobName: originalJobName, @@ -256,7 +256,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let deleteJob = (ownerUri: string, jobInfo: sqlops.AgentJobInfo): Thenable => { + let deleteJob = (ownerUri: string, jobInfo: azdata.AgentJobInfo): Thenable => { let params: contracts.DeleteAgentJobParams = { ownerUri: ownerUri, job: jobInfo @@ -274,7 +274,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let getJobDefaults = (ownerUri: string): Thenable => { + let getJobDefaults = (ownerUri: string): Thenable => { let params: contracts.AgentJobDefaultsParams = { ownerUri: ownerUri }; @@ -289,7 +289,7 @@ export class AgentServicesFeature extends SqlOpsFeature { }; // Job Step management methods - let createJobStep = (ownerUri: string, stepInfo: sqlops.AgentJobStepInfo): Thenable => { + let createJobStep = (ownerUri: string, stepInfo: azdata.AgentJobStepInfo): Thenable => { let params: contracts.CreateAgentJobStepParams = { ownerUri: ownerUri, step: stepInfo @@ -307,7 +307,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let updateJobStep = (ownerUri: string, originalJobStepName: string, stepInfo: sqlops.AgentJobStepInfo): Thenable => { + let updateJobStep = (ownerUri: string, originalJobStepName: string, stepInfo: azdata.AgentJobStepInfo): Thenable => { let params: contracts.UpdateAgentJobStepParams = { ownerUri: ownerUri, originalJobStepName: originalJobStepName, @@ -326,7 +326,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let deleteJobStep = (ownerUri: string, stepInfo: sqlops.AgentJobStepInfo): Thenable => { + let deleteJobStep = (ownerUri: string, stepInfo: azdata.AgentJobStepInfo): Thenable => { let params: contracts.DeleteAgentJobStepParams = { ownerUri: ownerUri, step: stepInfo @@ -345,7 +345,7 @@ export class AgentServicesFeature extends SqlOpsFeature { }; // Alert management methods - let getAlerts = (ownerUri: string): Thenable => { + let getAlerts = (ownerUri: string): Thenable => { let params: contracts.AgentAlertsParams = { ownerUri: ownerUri }; @@ -359,7 +359,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let createAlert = (ownerUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable => { + let createAlert = (ownerUri: string, alertInfo: azdata.AgentAlertInfo): Thenable => { let params: contracts.CreateAgentAlertParams = { ownerUri: ownerUri, alert: alertInfo @@ -377,7 +377,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let updateAlert = (ownerUri: string, originalAlertName: string, alertInfo: sqlops.AgentAlertInfo): Thenable => { + let updateAlert = (ownerUri: string, originalAlertName: string, alertInfo: azdata.AgentAlertInfo): Thenable => { let params: contracts.UpdateAgentAlertParams = { ownerUri: ownerUri, originalAlertName: originalAlertName, @@ -396,7 +396,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let deleteAlert = (ownerUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable => { + let deleteAlert = (ownerUri: string, alertInfo: azdata.AgentAlertInfo): Thenable => { let params: contracts.DeleteAgentAlertParams = { ownerUri: ownerUri, alert: alertInfo @@ -415,7 +415,7 @@ export class AgentServicesFeature extends SqlOpsFeature { }; // Operator management methods - let getOperators = (ownerUri: string): Thenable => { + let getOperators = (ownerUri: string): Thenable => { let params: contracts.AgentOperatorsParams = { ownerUri: ownerUri }; @@ -429,7 +429,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let createOperator = (ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable => { + let createOperator = (ownerUri: string, operatorInfo: azdata.AgentOperatorInfo): Thenable => { let params: contracts.CreateAgentOperatorParams = { ownerUri: ownerUri, operator: operatorInfo @@ -447,7 +447,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let updateOperator = (ownerUri: string, originalOperatorName: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable => { + let updateOperator = (ownerUri: string, originalOperatorName: string, operatorInfo: azdata.AgentOperatorInfo): Thenable => { let params: contracts.UpdateAgentOperatorParams = { ownerUri: ownerUri, originalOperatorName: originalOperatorName, @@ -466,7 +466,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let deleteOperator = (ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable => { + let deleteOperator = (ownerUri: string, operatorInfo: azdata.AgentOperatorInfo): Thenable => { let params: contracts.DeleteAgentOperatorParams = { ownerUri: ownerUri, operator: operatorInfo @@ -485,7 +485,7 @@ export class AgentServicesFeature extends SqlOpsFeature { }; // Proxy management methods - let getProxies = (ownerUri: string): Thenable => { + let getProxies = (ownerUri: string): Thenable => { let params: contracts.AgentProxiesParams = { ownerUri: ownerUri }; @@ -499,7 +499,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let createProxy = (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable => { + let createProxy = (ownerUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable => { let params: contracts.CreateAgentProxyParams = { ownerUri: ownerUri, proxy: proxyInfo @@ -517,7 +517,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let updateProxy = (ownerUri: string, originalProxyName: string, proxyInfo: sqlops.AgentProxyInfo): Thenable => { + let updateProxy = (ownerUri: string, originalProxyName: string, proxyInfo: azdata.AgentProxyInfo): Thenable => { let params: contracts.UpdateAgentProxyParams = { ownerUri: ownerUri, originalProxyName: originalProxyName, @@ -536,7 +536,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let deleteProxy = (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable => { + let deleteProxy = (ownerUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable => { let params: contracts.DeleteAgentProxyParams = { ownerUri: ownerUri, proxy: proxyInfo @@ -555,7 +555,7 @@ export class AgentServicesFeature extends SqlOpsFeature { }; // Agent Credential Method - let getCredentials = (ownerUri: string): Thenable => { + let getCredentials = (ownerUri: string): Thenable => { let params: contracts.GetCredentialsParams = { ownerUri: ownerUri }; @@ -571,7 +571,7 @@ export class AgentServicesFeature extends SqlOpsFeature { // Job Schedule management methods - let getJobSchedules = (ownerUri: string): Thenable => { + let getJobSchedules = (ownerUri: string): Thenable => { let params: contracts.AgentJobScheduleParams = { ownerUri: ownerUri }; @@ -585,7 +585,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let createJobSchedule = (ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable => { + let createJobSchedule = (ownerUri: string, scheduleInfo: azdata.AgentJobScheduleInfo): Thenable => { let params: contracts.CreateAgentJobScheduleParams = { ownerUri: ownerUri, schedule: scheduleInfo @@ -603,7 +603,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let updateJobSchedule = (ownerUri: string, originalScheduleName: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable => { + let updateJobSchedule = (ownerUri: string, originalScheduleName: string, scheduleInfo: azdata.AgentJobScheduleInfo): Thenable => { let params: contracts.UpdateAgentJobScheduleParams = { ownerUri: ownerUri, originalScheduleName: originalScheduleName, @@ -622,7 +622,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - let deleteJobSchedule = (ownerUri: string, scheduleInfo: sqlops.AgentJobScheduleInfo): Thenable => { + let deleteJobSchedule = (ownerUri: string, scheduleInfo: azdata.AgentJobScheduleInfo): Thenable => { let params: contracts.DeleteAgentJobScheduleParams = { ownerUri: ownerUri, schedule: scheduleInfo @@ -640,7 +640,7 @@ export class AgentServicesFeature extends SqlOpsFeature { ); }; - return sqlops.dataprotocol.registerAgentServicesProvider({ + return azdata.dataprotocol.registerAgentServicesProvider({ providerId: client.providerId, getJobs, getJobHistory, diff --git a/extensions/mssql/src/main.ts b/extensions/mssql/src/main.ts index 5f5e558837..e17adbbaee 100644 --- a/extensions/mssql/src/main.ts +++ b/extensions/mssql/src/main.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as path from 'path'; import * as os from 'os'; import * as nls from 'vscode-nls'; @@ -108,7 +108,7 @@ export async function activate(context: vscode.ExtensionContext): Promise { @@ -131,7 +131,7 @@ export async function activate(context: vscode.ExtensionContext): Promise { + getNode: (context: azdata.ObjectExplorerContext) => { let oeProvider = appContext.getService(Constants.ObjectExplorerService); return oeProvider.findSqlClusterNodeByContext(context); } @@ -147,36 +147,36 @@ function activateSparkFeatures(appContext: AppContext): void { let outputChannel: vscode.OutputChannel = mssqlOutputChannel; extensionContext.subscriptions.push(new OpenSparkJobSubmissionDialogCommand(appContext, outputChannel)); extensionContext.subscriptions.push(new OpenSparkJobSubmissionDialogFromFileCommand(appContext, outputChannel)); - apiWrapper.registerTaskHandler(Constants.mssqlClusterLivySubmitSparkJobTask, (profile: sqlops.IConnectionProfile) => { + apiWrapper.registerTaskHandler(Constants.mssqlClusterLivySubmitSparkJobTask, (profile: azdata.IConnectionProfile) => { new OpenSparkJobSubmissionDialogTask(appContext, outputChannel).execute(profile); }); - apiWrapper.registerTaskHandler(Constants.mssqlClusterLivyOpenSparkHistory, (profile: sqlops.IConnectionProfile) => { + apiWrapper.registerTaskHandler(Constants.mssqlClusterLivyOpenSparkHistory, (profile: azdata.IConnectionProfile) => { new OpenSparkYarnHistoryTask(appContext).execute(profile, true); }); - apiWrapper.registerTaskHandler(Constants.mssqlClusterLivyOpenYarnHistory, (profile: sqlops.IConnectionProfile) => { + apiWrapper.registerTaskHandler(Constants.mssqlClusterLivyOpenYarnHistory, (profile: azdata.IConnectionProfile) => { new OpenSparkYarnHistoryTask(appContext).execute(profile, false); }); } function activateNotebookTask(appContext: AppContext): void { let apiWrapper = appContext.apiWrapper; - apiWrapper.registerTaskHandler(Constants.mssqlClusterNewNotebookTask, (profile: sqlops.IConnectionProfile) => { + apiWrapper.registerTaskHandler(Constants.mssqlClusterNewNotebookTask, (profile: azdata.IConnectionProfile) => { return saveProfileAndCreateNotebook(profile); }); - apiWrapper.registerTaskHandler(Constants.mssqlClusterOpenNotebookTask, (profile: sqlops.IConnectionProfile) => { + apiWrapper.registerTaskHandler(Constants.mssqlClusterOpenNotebookTask, (profile: azdata.IConnectionProfile) => { return handleOpenNotebookTask(profile); }); } -function saveProfileAndCreateNotebook(profile: sqlops.IConnectionProfile): Promise { +function saveProfileAndCreateNotebook(profile: azdata.IConnectionProfile): Promise { return handleNewNotebookTask(undefined, profile); } -async function handleNewNotebookTask(oeContext?: sqlops.ObjectExplorerContext, profile?: sqlops.IConnectionProfile): Promise { +async function handleNewNotebookTask(oeContext?: azdata.ObjectExplorerContext, profile?: azdata.IConnectionProfile): Promise { // Ensure we get a unique ID for the notebook. For now we're using a different prefix to the built-in untitled files // to handle this. We should look into improving this in the future let untitledUri = vscode.Uri.parse(`untitled:Notebook-${untitledCounter++}`); - let editor = await sqlops.nb.showNotebookDocument(untitledUri, { + let editor = await azdata.nb.showNotebookDocument(untitledUri, { connectionId: profile.id, providerId: jupyterNotebookProviderId, preview: false, @@ -203,7 +203,7 @@ async function handleNewNotebookTask(oeContext?: sqlops.ObjectExplorerContext, p } } -async function handleOpenNotebookTask(profile: sqlops.IConnectionProfile): Promise { +async function handleOpenNotebookTask(profile: azdata.IConnectionProfile): Promise { let notebookFileTypeName = localize('notebookFileType', 'Notebooks'); let filter = {}; filter[notebookFileTypeName] = 'ipynb'; @@ -219,7 +219,7 @@ async function handleOpenNotebookTask(profile: sqlops.IConnectionProfile): Promi // in the future might want additional supported types vscode.window.showErrorMessage(localize('unsupportedFileType', 'Only .ipynb Notebooks are supported')); } else { - await sqlops.nb.showNotebookDocument(fileUri, { + await azdata.nb.showNotebookDocument(fileUri, { connectionId: profile.id, providerId: jupyterNotebookProviderId, preview: false diff --git a/extensions/mssql/src/objectExplorerNodeProvider/command.ts b/extensions/mssql/src/objectExplorerNodeProvider/command.ts index 1e131df137..f0afb038d9 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/command.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/command.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -42,7 +42,7 @@ export interface ICommandViewContext extends ICommandBaseContext { export interface ICommandObjectExplorerContext extends ICommandBaseContext { type: 'objectexplorer'; - explorerContext: sqlops.ObjectExplorerContext; + explorerContext: azdata.ObjectExplorerContext; } export type CommandContext = ICommandObjectExplorerContext | ICommandViewContext | ICommandUriContext | ICommandUnknownContext; @@ -115,7 +115,7 @@ export abstract class Command extends vscode.Disposable { } if (firstArg && utils.isObjectExplorerContext(firstArg)) { - const [explorerContext, ...rest] = args as [sqlops.ObjectExplorerContext, any]; + const [explorerContext, ...rest] = args as [azdata.ObjectExplorerContext, any]; return [{ command: command, type: constants.ObjectExplorerService, explorerContext: explorerContext }, rest]; } diff --git a/extensions/mssql/src/objectExplorerNodeProvider/connection.ts b/extensions/mssql/src/objectExplorerNodeProvider/connection.ts index e43775e3a4..a19616486b 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/connection.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/connection.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -13,14 +13,14 @@ import * as constants from '../constants'; import { IFileSource, IHdfsOptions, IRequestParams, FileSourceFactory } from './fileSources'; export class SqlClusterConnection { - private _connection: sqlops.connection.Connection; - private _profile: sqlops.IConnectionProfile; + private _connection: azdata.connection.Connection; + private _profile: azdata.IConnectionProfile; private _host: string; private _port: string; private _user: string; private _password: string; - constructor(connectionInfo: sqlops.connection.Connection | sqlops.IConnectionProfile) { + constructor(connectionInfo: azdata.connection.Connection | azdata.IConnectionProfile) { this.validate(connectionInfo); if ('id' in connectionInfo) { @@ -36,14 +36,14 @@ export class SqlClusterConnection { this._password = this._connection.options[constants.passwordPropName]; } - public get connection(): sqlops.connection.Connection { return this._connection; } - public get profile(): sqlops.IConnectionProfile { return this._profile; } + public get connection(): azdata.connection.Connection { return this._connection; } + public get profile(): azdata.IConnectionProfile { return this._profile; } public get host(): string { return this._host; } public get port(): number { return this._port ? Number.parseInt(this._port) : constants.defaultKnoxPort; } public get user(): string { return this._user; } public get password(): string { return this._password; } - public isMatch(connection: SqlClusterConnection | sqlops.ConnectionInfo): boolean { + public isMatch(connection: SqlClusterConnection | azdata.ConnectionInfo): boolean { if (!connection) { return false; } let options1 = connection instanceof SqlClusterConnection ? connection._connection.options : connection.options; @@ -69,7 +69,7 @@ export class SqlClusterConnection { return FileSourceFactory.instance.createHdfsFileSource(options); } - private validate(connectionInfo: sqlops.ConnectionInfo): void { + private validate(connectionInfo: azdata.ConnectionInfo): void { if (!connectionInfo) { throw new Error(localize('connectionInfoUndefined', 'ConnectionInfo is undefined.')); } @@ -84,7 +84,7 @@ export class SqlClusterConnection { } } - private getMissingProperties(connectionInfo: sqlops.ConnectionInfo): string[] { + private getMissingProperties(connectionInfo: azdata.ConnectionInfo): string[] { if (!connectionInfo || !connectionInfo.options) { return undefined; } return [ constants.hostPropName, constants.knoxPortPropName, @@ -92,15 +92,15 @@ export class SqlClusterConnection { ].filter(e => connectionInfo.options[e] === undefined); } - private toConnection(connProfile: sqlops.IConnectionProfile): sqlops.connection.Connection { - let connection: sqlops.connection.Connection = Object.assign(connProfile, + private toConnection(connProfile: azdata.IConnectionProfile): azdata.connection.Connection { + let connection: azdata.connection.Connection = Object.assign(connProfile, { connectionId: this._profile.id }); return connection; } - private toConnectionProfile(connectionInfo: sqlops.connection.Connection): sqlops.IConnectionProfile { + private toConnectionProfile(connectionInfo: azdata.connection.Connection): azdata.IConnectionProfile { let options = connectionInfo.options; - let connProfile: sqlops.IConnectionProfile = Object.assign({}, + let connProfile: azdata.IConnectionProfile = Object.assign({}, connectionInfo, { serverName: `${options[constants.hostPropName]},${options[constants.knoxPortPropName]}`, diff --git a/extensions/mssql/src/objectExplorerNodeProvider/hdfsCommands.ts b/extensions/mssql/src/objectExplorerNodeProvider/hdfsCommands.ts index ffd2d244cc..cba85cd86f 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/hdfsCommands.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/hdfsCommands.ts @@ -6,7 +6,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as fs from 'fs'; import * as fspath from 'path'; import * as clipboardy from 'clipboardy'; @@ -92,7 +92,7 @@ export class UploadFilesCommand extends ProgressCommand { localize('uploading', 'Uploading files to HDFS'), true, () => this.apiWrapper.showInformationMessage(localize('uploadCanceled', 'Upload operation was canceled'))); if (context.type === constants.ObjectExplorerService) { - let objectExplorerNode = await sqlops.objectexplorer.getNode(context.explorerContext.connectionProfile.id, folderNode.getNodeInfo().nodePath); + let objectExplorerNode = await azdata.objectexplorer.getNode(context.explorerContext.connectionProfile.id, folderNode.getNodeInfo().nodePath); await objectExplorerNode.refresh(); } } @@ -150,7 +150,7 @@ export class MkDirCommand extends ProgressCommand { localize('makingDir', 'Creating directory'), true, () => this.apiWrapper.showInformationMessage(localize('mkdirCanceled', 'Operation was canceled'))); if (context.type === constants.ObjectExplorerService) { - let objectExplorerNode = await sqlops.objectexplorer.getNode(context.explorerContext.connectionProfile.id, folderNode.getNodeInfo().nodePath); + let objectExplorerNode = await azdata.objectexplorer.getNode(context.explorerContext.connectionProfile.id, folderNode.getNodeInfo().nodePath); await objectExplorerNode.refresh(); } } @@ -191,9 +191,9 @@ export class DeleteFilesCommand extends Command { // TODO ideally would let node define if it's deletable // TODO also, would like to change this to getNodeInfo as OE is the primary use case now let treeItem = await node.getTreeItem(); - let oeNodeToRefresh: sqlops.objectexplorer.ObjectExplorerNode = undefined; + let oeNodeToRefresh: azdata.objectexplorer.ObjectExplorerNode = undefined; if (context.type === constants.ObjectExplorerService) { - let oeNodeToDelete = await sqlops.objectexplorer.getNode(context.explorerContext.connectionProfile.id, node.getNodeInfo().nodePath); + let oeNodeToDelete = await azdata.objectexplorer.getNode(context.explorerContext.connectionProfile.id, node.getNodeInfo().nodePath); oeNodeToRefresh = await oeNodeToDelete.getParent(); } switch (treeItem.contextValue) { diff --git a/extensions/mssql/src/objectExplorerNodeProvider/hdfsProvider.ts b/extensions/mssql/src/objectExplorerNodeProvider/hdfsProvider.ts index 5aceb69673..2cb29e36a0 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/hdfsProvider.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/hdfsProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as fspath from 'path'; import * as fs from 'fs'; @@ -153,10 +153,10 @@ export class FolderNode extends HdfsFileSourceNode { return item; } - getNodeInfo(): sqlops.NodeInfo { + getNodeInfo(): azdata.NodeInfo { // TODO handle error message case by returning it in the OE API // TODO support better mapping of node type - let nodeInfo: sqlops.NodeInfo = { + let nodeInfo: azdata.NodeInfo = { label: this.getDisplayName(), isLeaf: false, errorMessage: undefined, @@ -252,9 +252,9 @@ export class FileNode extends HdfsFileSourceNode implements IFileNode { } - getNodeInfo(): sqlops.NodeInfo { + getNodeInfo(): azdata.NodeInfo { // TODO improve node type handling so it's not tied to SQL Server types - let nodeInfo: sqlops.NodeInfo = { + let nodeInfo: azdata.NodeInfo = { label: this.getDisplayName(), isLeaf: true, errorMessage: undefined, @@ -349,8 +349,8 @@ export class ErrorNode extends TreeNode { } - getNodeInfo(): sqlops.NodeInfo { - let nodeInfo: sqlops.NodeInfo = { + getNodeInfo(): azdata.NodeInfo { + let nodeInfo: azdata.NodeInfo = { label: this.message, isLeaf: false, errorMessage: undefined, diff --git a/extensions/mssql/src/objectExplorerNodeProvider/objectExplorerNodeProvider.ts b/extensions/mssql/src/objectExplorerNodeProvider/objectExplorerNodeProvider.ts index ac8f4ad73c..b1307f3ed6 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/objectExplorerNodeProvider.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/objectExplorerNodeProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -23,10 +23,10 @@ import { ICommandObjectExplorerContext } from './command'; export const mssqlOutputChannel = vscode.window.createOutputChannel(constants.providerId); -export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sqlops.ObjectExplorerNodeProvider, ITreeChangeHandler { +export class MssqlObjectExplorerNodeProvider extends ProviderBase implements azdata.ObjectExplorerNodeProvider, ITreeChangeHandler { public readonly supportedProviderId: string = constants.providerId; private sessionMap: Map; - private expandCompleteEmitter = new vscode.EventEmitter(); + private expandCompleteEmitter = new vscode.EventEmitter(); constructor(private appContext: AppContext) { super(); @@ -34,7 +34,7 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql this.appContext.registerService(constants.ObjectExplorerService, this); } - handleSessionOpen(session: sqlops.ObjectExplorerSession): Thenable { + handleSessionOpen(session: azdata.ObjectExplorerSession): Thenable { return new Promise((resolve, reject) => { if (!session) { reject('handleSessionOpen requires a session object to be passed'); @@ -44,10 +44,10 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql }); } - private async doSessionOpen(session: sqlops.ObjectExplorerSession): Promise { + private async doSessionOpen(session: azdata.ObjectExplorerSession): Promise { if (!session || !session.sessionId) { return false; } - let sqlConnProfile = await sqlops.objectexplorer.getSessionConnectionProfile(session.sessionId); + let sqlConnProfile = await azdata.objectexplorer.getSessionConnectionProfile(session.sessionId); if (!sqlConnProfile) { return false; } let clusterConnInfo = await SqlClusterLookUp.getSqlClusterConnection(sqlConnProfile); @@ -59,7 +59,7 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql return true; } - expandNode(nodeInfo: sqlops.ExpandNodeInfo, isRefresh: boolean = false): Thenable { + expandNode(nodeInfo: azdata.ExpandNodeInfo, isRefresh: boolean = false): Thenable { return new Promise((resolve, reject) => { if (!nodeInfo) { reject('expandNode requires a nodeInfo object to be passed'); @@ -69,7 +69,7 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql }); } - private async doExpandNode(nodeInfo: sqlops.ExpandNodeInfo, isRefresh: boolean = false): Promise { + private async doExpandNode(nodeInfo: azdata.ExpandNodeInfo, isRefresh: boolean = false): Promise { let session = this.sessionMap.get(nodeInfo.sessionId); let response = { sessionId: nodeInfo.sessionId, @@ -95,8 +95,8 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql return true; } - private async startExpansion(session: SqlClusterSession, nodeInfo: sqlops.ExpandNodeInfo, isRefresh: boolean = false): Promise { - let expandResult: sqlops.ObjectExplorerExpandInfo = { + private async startExpansion(session: SqlClusterSession, nodeInfo: azdata.ExpandNodeInfo, isRefresh: boolean = false): Promise { + let expandResult: azdata.ObjectExplorerExpandInfo = { sessionId: session.sessionId, nodePath: nodeInfo.nodePath, errorMessage: undefined, @@ -125,24 +125,24 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql this.expandCompleteEmitter.fire(expandResult); } - refreshNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + refreshNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { // TODO #3815 implement properly return this.expandNode(nodeInfo, true); } - handleSessionClose(closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): void { + handleSessionClose(closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): void { this.sessionMap.delete(closeSessionInfo.sessionId); } - findNodes(findNodesInfo: sqlops.FindNodesInfo): Thenable { + findNodes(findNodesInfo: azdata.FindNodesInfo): Thenable { // TODO #3814 implement - let response: sqlops.ObjectExplorerFindNodesResponse = { + let response: azdata.ObjectExplorerFindNodesResponse = { nodes: [] }; return Promise.resolve(response); } - registerOnExpandCompleted(handler: (response: sqlops.ObjectExplorerExpandInfo) => any): void { + registerOnExpandCompleted(handler: (response: azdata.ObjectExplorerExpandInfo) => any): void { this.expandCompleteEmitter.event(handler); } @@ -157,7 +157,7 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql this.appContext.apiWrapper.showErrorMessage(localize('sessionNotFound', 'Session for node {0} does not exist', node.nodePathValue)); } else { let nodeInfo = node.getNodeInfo(); - let expandInfo: sqlops.ExpandNodeInfo = { + let expandInfo: azdata.ExpandNodeInfo = { nodePath: nodeInfo.nodePath, sessionId: session.sessionId }; @@ -181,7 +181,7 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql return sqlClusterSession; } - async findSqlClusterNodeByContext(context: ICommandObjectExplorerContext | sqlops.ObjectExplorerContext): Promise { + async findSqlClusterNodeByContext(context: ICommandObjectExplorerContext | azdata.ObjectExplorerContext): Promise { let node: T = undefined; let explorerContext = 'explorerContext' in context ? context.explorerContext : context; let sqlConnProfile = explorerContext.connectionProfile; @@ -198,7 +198,7 @@ export class MssqlObjectExplorerNodeProvider extends ProviderBase implements sql return node; } - public findSqlClusterSessionBySqlConnProfile(connectionProfile: sqlops.IConnectionProfile): SqlClusterSession { + public findSqlClusterSessionBySqlConnProfile(connectionProfile: azdata.IConnectionProfile): SqlClusterSession { for (let session of this.sessionMap.values()) { if (session.isMatchedSqlConnection(connectionProfile)) { return session; @@ -213,8 +213,8 @@ export class SqlClusterSession { constructor( private _sqlClusterConnection: SqlClusterConnection, - private _sqlSession: sqlops.ObjectExplorerSession, - private _sqlConnectionProfile: sqlops.IConnectionProfile, + private _sqlSession: azdata.ObjectExplorerSession, + private _sqlConnectionProfile: azdata.IConnectionProfile, private _appContext: AppContext, private _changeHandler: ITreeChangeHandler ) { @@ -224,12 +224,12 @@ export class SqlClusterSession { } public get sqlClusterConnection(): SqlClusterConnection { return this._sqlClusterConnection; } - public get sqlSession(): sqlops.ObjectExplorerSession { return this._sqlSession; } - public get sqlConnectionProfile(): sqlops.IConnectionProfile { return this._sqlConnectionProfile; } + public get sqlSession(): azdata.ObjectExplorerSession { return this._sqlSession; } + public get sqlConnectionProfile(): azdata.IConnectionProfile { return this._sqlConnectionProfile; } public get sessionId(): string { return this._sqlSession.sessionId; } public get rootNode(): SqlClusterRootNode { return this._rootNode; } - public isMatchedSqlConnection(sqlConnProfile: sqlops.IConnectionProfile): boolean { + public isMatchedSqlConnection(sqlConnProfile: azdata.IConnectionProfile): boolean { return this._sqlConnectionProfile.id === sqlConnProfile.id; } } @@ -266,8 +266,8 @@ class SqlClusterRootNode extends TreeNode { throw new Error('Not intended for use in a file explorer view.'); } - getNodeInfo(): sqlops.NodeInfo { - let nodeInfo: sqlops.NodeInfo = { + getNodeInfo(): azdata.NodeInfo { + let nodeInfo: azdata.NodeInfo = { label: localize('rootLabel', 'Root'), isLeaf: false, errorMessage: undefined, @@ -311,8 +311,8 @@ class DataServicesNode extends TreeNode { throw new Error('Not intended for use in a file explorer view.'); } - getNodeInfo(): sqlops.NodeInfo { - let nodeInfo: sqlops.NodeInfo = { + getNodeInfo(): azdata.NodeInfo { + let nodeInfo: azdata.NodeInfo = { label: localize('dataServicesLabel', 'Data Services'), isLeaf: false, errorMessage: undefined, diff --git a/extensions/mssql/src/objectExplorerNodeProvider/treeNodes.ts b/extensions/mssql/src/objectExplorerNodeProvider/treeNodes.ts index 9f0776d7b5..eecf411e2c 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/treeNodes.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/treeNodes.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { ITreeNode } from './types'; @@ -74,5 +74,5 @@ export abstract class TreeNode implements ITreeNode { abstract getChildren(refreshChildren: boolean): TreeNode[] | Promise; abstract getTreeItem(): vscode.TreeItem | Promise; - abstract getNodeInfo(): sqlops.NodeInfo; + abstract getNodeInfo(): azdata.NodeInfo; } diff --git a/extensions/mssql/src/objectExplorerNodeProvider/types.d.ts b/extensions/mssql/src/objectExplorerNodeProvider/types.d.ts index 9d6863b005..47caa95397 100644 --- a/extensions/mssql/src/objectExplorerNodeProvider/types.d.ts +++ b/extensions/mssql/src/objectExplorerNodeProvider/types.d.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * A tree node in the object explorer tree @@ -13,7 +13,7 @@ import * as sqlops from 'sqlops'; * @interface ITreeNode */ export interface ITreeNode { - getNodeInfo(): sqlops.NodeInfo; + getNodeInfo(): azdata.NodeInfo; getChildren(refreshChildren: boolean): ITreeNode[] | Promise; } diff --git a/extensions/mssql/src/resourceProvider/contracts.ts b/extensions/mssql/src/resourceProvider/contracts.ts index 6969ddd183..b48c1420c4 100644 --- a/extensions/mssql/src/resourceProvider/contracts.ts +++ b/extensions/mssql/src/resourceProvider/contracts.ts @@ -5,7 +5,7 @@ 'use strict'; import { RequestType } from 'vscode-languageclient'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; // ------------------------------- < Resource Events > ------------------------------------ export namespace CreateFirewallRuleRequest { @@ -18,7 +18,7 @@ export namespace HandleFirewallRuleRequest { // Firewall rule interfaces export interface CreateFirewallRuleParams { - account: sqlops.Account; + account: azdata.Account; serverName: string; startIpAddress: string; endIpAddress: string; diff --git a/extensions/mssql/src/resourceProvider/resourceProvider.ts b/extensions/mssql/src/resourceProvider/resourceProvider.ts index 99d723589f..09e439aac1 100644 --- a/extensions/mssql/src/resourceProvider/resourceProvider.ts +++ b/extensions/mssql/src/resourceProvider/resourceProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IConfig, ServerProvider } from 'service-downloader'; import { SqlOpsDataClient, SqlOpsFeature, ClientOptions } from 'dataprotocol-client'; import { ServerCapabilities, ClientCapabilities, RPCMessageType, ServerOptions, TransportKind } from 'vscode-languageclient'; @@ -39,16 +39,16 @@ class FireWallFeature extends SqlOpsFeature { protected registerProvider(options: any): Disposable { const client = this._client; - let createFirewallRule = (account: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo): Thenable => { + let createFirewallRule = (account: azdata.Account, firewallruleInfo: azdata.FirewallRuleInfo): Thenable => { return client.sendRequest(CreateFirewallRuleRequest.type, asCreateFirewallRuleParams(account, firewallruleInfo)); }; - let handleFirewallRule = (errorCode: number, errorMessage: string, connectionTypeId: string): Thenable => { + let handleFirewallRule = (errorCode: number, errorMessage: string, connectionTypeId: string): Thenable => { let params: HandleFirewallRuleParams = { errorCode: errorCode, errorMessage: errorMessage, connectionTypeId: connectionTypeId }; return client.sendRequest(HandleFirewallRuleRequest.type, params); }; - return sqlops.resources.registerResourceProvider({ + return azdata.resources.registerResourceProvider({ displayName: 'Azure SQL Resource Provider', // TODO Localize id: 'Microsoft.Azure.SQL.ResourceProvider', settings: { @@ -61,7 +61,7 @@ class FireWallFeature extends SqlOpsFeature { } } -function asCreateFirewallRuleParams(account: sqlops.Account, params: sqlops.FirewallRuleInfo): CreateFirewallRuleParams { +function asCreateFirewallRuleParams(account: azdata.Account, params: azdata.FirewallRuleInfo): CreateFirewallRuleParams { return { account: account, serverName: params.serverName, diff --git a/extensions/mssql/src/sparkFeature/dialog/dialogCommands.ts b/extensions/mssql/src/sparkFeature/dialog/dialogCommands.ts index e48f9b5ee8..58d104be2b 100644 --- a/extensions/mssql/src/sparkFeature/dialog/dialogCommands.ts +++ b/extensions/mssql/src/sparkFeature/dialog/dialogCommands.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as vscode from 'vscode'; const localize = nls.loadMessageBundle(); @@ -48,9 +48,9 @@ export class OpenSparkJobSubmissionDialogCommand extends Command { } private async selectConnection(): Promise { - let connectionList: sqlops.connection.Connection[] = await this.apiWrapper.getActiveConnections(); + let connectionList: azdata.connection.Connection[] = await this.apiWrapper.getActiveConnections(); let displayList: string[] = new Array(); - let connectionMap: Map = new Map(); + let connectionMap: Map = new Map(); if (connectionList && connectionList.length > 0) { connectionList.forEach(conn => { if (conn.providerName === constants.sqlProviderName) { @@ -125,7 +125,7 @@ export class OpenSparkJobSubmissionDialogTask { constructor(private appContext: AppContext, private outputChannel: vscode.OutputChannel) { } - async execute(profile: sqlops.IConnectionProfile, ...args: any[]): Promise { + async execute(profile: azdata.IConnectionProfile, ...args: any[]): Promise { try { let sqlClusterConnection = SqlClusterLookUp.findSqlClusterConnection(profile, this.appContext); if (!sqlClusterConnection) { diff --git a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkAdvancedTab.ts b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkAdvancedTab.ts index 1014327c1b..9dc897e4bb 100644 --- a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkAdvancedTab.ts +++ b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkAdvancedTab.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); @@ -14,12 +14,12 @@ import { AppContext } from '../../../appContext'; import { ApiWrapper } from '../../../apiWrapper'; export class SparkAdvancedTab { - private _tab: sqlops.window.DialogTab; - public get tab(): sqlops.window.DialogTab { return this._tab; } + private _tab: azdata.window.DialogTab; + public get tab(): azdata.window.DialogTab { return this._tab; } - private _referenceFilesInputBox: sqlops.InputBoxComponent; - private _referenceJARFilesInputBox: sqlops.InputBoxComponent; - private _referencePyFilesInputBox: sqlops.InputBoxComponent; + private _referenceFilesInputBox: azdata.InputBoxComponent; + private _referenceJARFilesInputBox: azdata.InputBoxComponent; + private _referencePyFilesInputBox: azdata.InputBoxComponent; private get apiWrapper(): ApiWrapper { return this.appContext.apiWrapper; @@ -30,7 +30,7 @@ export class SparkAdvancedTab { this._tab.registerContent(async (modelView) => { let builder = modelView.modelBuilder; - let parentLayout: sqlops.FormItemLayout = { + let parentLayout: azdata.FormItemLayout = { horizontal: false, componentWidth: '400px' }; diff --git a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkConfigurationTab.ts b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkConfigurationTab.ts index f29a9bf03d..4d90c2a9d2 100644 --- a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkConfigurationTab.ts +++ b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkConfigurationTab.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; import * as fspath from 'path'; import * as fs from 'fs'; @@ -22,19 +22,19 @@ import { SparkFileSource } from './sparkJobSubmissionService'; const localize = nls.loadMessageBundle(); export class SparkConfigurationTab { - private _tab: sqlops.window.DialogTab; - public get tab(): sqlops.window.DialogTab { return this._tab; } + private _tab: azdata.window.DialogTab; + public get tab(): azdata.window.DialogTab { return this._tab; } - private _jobNameInputBox: sqlops.InputBoxComponent; - private _sparkContextLabel: sqlops.TextComponent; - private _fileSourceDropDown: sqlops.DropDownComponent; - private _sparkSourceFileInputBox: sqlops.InputBoxComponent; - private _filePickerButton: sqlops.ButtonComponent; - private _sourceFlexContainer: sqlops.FlexContainer; - private _sourceFlexContainerWithHint: sqlops.FlexContainer; - private _localUploadDestinationLabel: sqlops.TextComponent; - private _mainClassInputBox: sqlops.InputBoxComponent; - private _argumentsInputBox: sqlops.InputBoxComponent; + private _jobNameInputBox: azdata.InputBoxComponent; + private _sparkContextLabel: azdata.TextComponent; + private _fileSourceDropDown: azdata.DropDownComponent; + private _sparkSourceFileInputBox: azdata.InputBoxComponent; + private _filePickerButton: azdata.ButtonComponent; + private _sourceFlexContainer: azdata.FlexContainer; + private _sourceFlexContainerWithHint: azdata.FlexContainer; + private _localUploadDestinationLabel: azdata.TextComponent; + private _mainClassInputBox: azdata.InputBoxComponent; + private _argumentsInputBox: azdata.InputBoxComponent; private get apiWrapper(): ApiWrapper { return this.appContext.apiWrapper; @@ -46,7 +46,7 @@ export class SparkConfigurationTab { this._tab.registerContent(async (modelView) => { let builder = modelView.modelBuilder; - let parentLayout: sqlops.FormItemLayout = { + let parentLayout: azdata.FormItemLayout = { horizontal: false, componentWidth: '400px' }; @@ -72,7 +72,7 @@ export class SparkConfigurationTab { title: localize('sparkJobSubmission_SparkCluster', 'Spark Cluster') }, parentLayout); - this._fileSourceDropDown = builder.dropDown().withProperties({ + this._fileSourceDropDown = builder.dropDown().withProperties({ values: [SparkFileSource.Local.toString(), SparkFileSource.HDFS.toString()], value: (this._path) ? SparkFileSource.HDFS.toString() : SparkFileSource.Local.toString() }).component(); diff --git a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionDialog.ts b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionDialog.ts index cd2db9763a..be4785ff63 100644 --- a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionDialog.ts +++ b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionDialog.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import * as utils from '../../../utils'; @@ -22,7 +22,7 @@ import { SqlClusterConnection } from '../../../objectExplorerNodeProvider/connec const localize = nls.loadMessageBundle(); export class SparkJobSubmissionDialog { - private _dialog: sqlops.window.Dialog; + private _dialog: azdata.window.Dialog; private _dataModel: SparkJobSubmissionModel; private _sparkConfigTab: SparkConfigurationTab; private _sparkAdvancedTab: SparkAdvancedTab; @@ -76,7 +76,7 @@ export class SparkJobSubmissionDialog { ); } - private async onSubmit(op: sqlops.BackgroundOperation): Promise { + private async onSubmit(op: azdata.BackgroundOperation): Promise { try { this.outputChannel.show(); let msg = localize('sparkJobSubmission_SubmissionStartMessage', @@ -86,15 +86,15 @@ export class SparkJobSubmissionDialog { if (this._dataModel.isMainSourceFromLocal) { try { this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionPrepareUploadingFile(this._dataModel.localFileSourcePath, this._dataModel.hdfsFolderDestinationPath))); - op.updateStatus(sqlops.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionPrepareUploadingFile(this._dataModel.localFileSourcePath, this._dataModel.hdfsFolderDestinationPath)); + op.updateStatus(azdata.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionPrepareUploadingFile(this._dataModel.localFileSourcePath, this._dataModel.hdfsFolderDestinationPath)); await this._dataModel.uploadFile(this._dataModel.localFileSourcePath, this._dataModel.hdfsFolderDestinationPath); vscode.window.showInformationMessage(LocalizedConstants.sparkJobSubmissionUploadingFileSucceeded); this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionUploadingFileSucceeded)); - op.updateStatus(sqlops.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionUploadingFileSucceeded); + op.updateStatus(azdata.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionUploadingFileSucceeded); } catch (error) { vscode.window.showErrorMessage(LocalizedConstants.sparkJobSubmissionUploadingFileFailed(utils.getErrorMessage(error))); this.outputChannel.appendLine(this.addErrorTag(LocalizedConstants.sparkJobSubmissionUploadingFileFailed(utils.getErrorMessage(error)))); - op.updateStatus(sqlops.TaskStatus.Failed, LocalizedConstants.sparkJobSubmissionUploadingFileFailed(utils.getErrorMessage(error))); + op.updateStatus(azdata.TaskStatus.Failed, LocalizedConstants.sparkJobSubmissionUploadingFileFailed(utils.getErrorMessage(error))); this.outputChannel.appendLine(LocalizedConstants.sparkJobSubmissionEndMessage); return; } @@ -103,11 +103,11 @@ export class SparkJobSubmissionDialog { // 2. Submit job to cluster. let submissionSettings: SparkJobSubmissionInput = this.getSubmissionInput(); this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionPrepareSubmitJob(submissionSettings.jobName))); - op.updateStatus(sqlops.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionPrepareSubmitJob(submissionSettings.jobName)); + op.updateStatus(azdata.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionPrepareSubmitJob(submissionSettings.jobName)); let livyBatchId = await this._dataModel.submitBatchJobByLivy(submissionSettings); vscode.window.showInformationMessage(LocalizedConstants.sparkJobSubmissionSparkJobHasBeenSubmitted); this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionSparkJobHasBeenSubmitted)); - op.updateStatus(sqlops.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionSparkJobHasBeenSubmitted); + op.updateStatus(azdata.TaskStatus.InProgress, LocalizedConstants.sparkJobSubmissionSparkJobHasBeenSubmitted); // 3. Get SparkHistory/YarnUI Url. try { @@ -116,24 +116,24 @@ export class SparkJobSubmissionDialog { let sparkHistoryUrl = this._dataModel.generateSparkHistoryUIUrl(submissionSettings, appId); vscode.window.showInformationMessage(LocalizedConstants.sparkJobSubmissionSparkHistoryLinkMessage(sparkHistoryUrl)); this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionSparkHistoryLinkMessage(sparkHistoryUrl))); - op.updateStatus(sqlops.TaskStatus.Succeeded, LocalizedConstants.sparkJobSubmissionSparkHistoryLinkMessage(sparkHistoryUrl)); + op.updateStatus(azdata.TaskStatus.Succeeded, LocalizedConstants.sparkJobSubmissionSparkHistoryLinkMessage(sparkHistoryUrl)); /* // Spark Tracking URl is not working now. let sparkTrackingUrl = this._dataModel.generateSparkTrackingUIUrl(submissionSettings, appId); vscode.window.showInformationMessage(LocalizedConstants.sparkJobSubmissionTrackingLinkMessage(sparkTrackingUrl)); this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionTrackingLinkMessage(sparkTrackingUrl))); - op.updateStatus(sqlops.TaskStatus.Succeeded, LocalizedConstants.sparkJobSubmissionTrackingLinkMessage(sparkTrackingUrl)); + op.updateStatus(azdata.TaskStatus.Succeeded, LocalizedConstants.sparkJobSubmissionTrackingLinkMessage(sparkTrackingUrl)); */ let yarnUIUrl = this._dataModel.generateYarnUIUrl(submissionSettings, appId); vscode.window.showInformationMessage(LocalizedConstants.sparkJobSubmissionYarnUIMessage(yarnUIUrl)); this.outputChannel.appendLine(this.addInfoTag(LocalizedConstants.sparkJobSubmissionYarnUIMessage(yarnUIUrl))); - op.updateStatus(sqlops.TaskStatus.Succeeded, LocalizedConstants.sparkJobSubmissionYarnUIMessage(yarnUIUrl)); + op.updateStatus(azdata.TaskStatus.Succeeded, LocalizedConstants.sparkJobSubmissionYarnUIMessage(yarnUIUrl)); } catch (error) { vscode.window.showErrorMessage(LocalizedConstants.sparkJobSubmissionGetApplicationIdFailed(utils.getErrorMessage(error))); this.outputChannel.appendLine(this.addErrorTag(LocalizedConstants.sparkJobSubmissionGetApplicationIdFailed(utils.getErrorMessage(error)))); - op.updateStatus(sqlops.TaskStatus.Failed, LocalizedConstants.sparkJobSubmissionGetApplicationIdFailed(utils.getErrorMessage(error))); + op.updateStatus(azdata.TaskStatus.Failed, LocalizedConstants.sparkJobSubmissionGetApplicationIdFailed(utils.getErrorMessage(error))); this.outputChannel.appendLine(LocalizedConstants.sparkJobSubmissionEndMessage); return; } @@ -142,7 +142,7 @@ export class SparkJobSubmissionDialog { } catch (error) { vscode.window.showErrorMessage(LocalizedConstants.sparkJobSubmissionSubmitJobFailed(utils.getErrorMessage(error))); this.outputChannel.appendLine(this.addErrorTag(LocalizedConstants.sparkJobSubmissionSubmitJobFailed(utils.getErrorMessage(error)))); - op.updateStatus(sqlops.TaskStatus.Failed, LocalizedConstants.sparkJobSubmissionSubmitJobFailed(utils.getErrorMessage(error))); + op.updateStatus(azdata.TaskStatus.Failed, LocalizedConstants.sparkJobSubmissionSubmitJobFailed(utils.getErrorMessage(error))); this.outputChannel.appendLine(LocalizedConstants.sparkJobSubmissionEndMessage); } } diff --git a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionModel.ts b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionModel.ts index 5d73b6da4c..366927d403 100644 --- a/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionModel.ts +++ b/extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionModel.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); import * as fs from 'fs'; @@ -39,7 +39,7 @@ export class SparkJobSubmissionModel { constructor( private readonly _sqlClusterConnection: SqlClusterConnection, - private readonly _dialog: sqlops.window.Dialog, + private readonly _dialog: azdata.window.Dialog, private readonly _appContext: AppContext, requestService?: (args: any) => any) { @@ -54,7 +54,7 @@ export class SparkJobSubmissionModel { public get connection(): SqlClusterConnection { return this._sqlClusterConnection; } public get dialogService(): SparkJobSubmissionService { return this._dialogService; } - public get dialog(): sqlops.window.Dialog { return this._dialog; } + public get dialog(): azdata.window.Dialog { return this._dialog; } public isJarFile(): boolean { if (this.hdfsSubmitFilePath) { @@ -65,15 +65,15 @@ export class SparkJobSubmissionModel { } public showDialogError(message: string): void { - let errorLevel = sqlops.window.MessageLevel ? sqlops.window.MessageLevel : 0; + let errorLevel = azdata.window.MessageLevel ? azdata.window.MessageLevel : 0; this._dialog.message = { text: message, - level: errorLevel + level: errorLevel }; } public showDialogInfo(message: string): void { - let infoLevel = sqlops.window.MessageLevel ? sqlops.window.MessageLevel.Information : 2; + let infoLevel = azdata.window.MessageLevel ? azdata.window.MessageLevel.Information : 2; this._dialog.message = { text: message, level: infoLevel diff --git a/extensions/mssql/src/sparkFeature/historyTask.ts b/extensions/mssql/src/sparkFeature/historyTask.ts index c150678a8f..1b094f7191 100644 --- a/extensions/mssql/src/sparkFeature/historyTask.ts +++ b/extensions/mssql/src/sparkFeature/historyTask.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { AppContext } from '../appContext'; import { getErrorMessage } from '../utils'; @@ -15,7 +15,7 @@ export class OpenSparkYarnHistoryTask { constructor(private appContext: AppContext) { } - async execute(sqlConnProfile: sqlops.IConnectionProfile, isSpark: boolean): Promise { + async execute(sqlConnProfile: azdata.IConnectionProfile, isSpark: boolean): Promise { try { let sqlClusterConnection = SqlClusterLookUp.findSqlClusterConnection(sqlConnProfile, this.appContext); if (!sqlClusterConnection) diff --git a/extensions/mssql/src/sparkFeature/sparkUtils.ts b/extensions/mssql/src/sparkFeature/sparkUtils.ts index f7c2519633..02db13c641 100644 --- a/extensions/mssql/src/sparkFeature/sparkUtils.ts +++ b/extensions/mssql/src/sparkFeature/sparkUtils.ts @@ -9,27 +9,27 @@ import * as childProcess from 'child_process'; import * as fs from 'fs-extra'; import * as nls from 'vscode-nls'; import * as path from 'path'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as which from 'which'; import * as Constants from '../constants'; const localize = nls.loadMessageBundle(); -export function getDropdownValue(dropdownValue: string | sqlops.CategoryValue): string { +export function getDropdownValue(dropdownValue: string | azdata.CategoryValue): string { if (typeof(dropdownValue) === 'string') { return dropdownValue; } else { - return dropdownValue ? (dropdownValue).name : undefined; + return dropdownValue ? (dropdownValue).name : undefined; } } -export function getServerAddressFromName(connection: sqlops.ConnectionInfo | string): string { +export function getServerAddressFromName(connection: azdata.ConnectionInfo | string): string { // Strip TDS port number from the server URI - if ((connection).options && (connection).options['host']) { - return (connection).options['host'].split(',')[0].split(':')[0]; - } else if ((connection).options && (connection).options['server']) { - return (connection).options['server'].split(',')[0].split(':')[0]; + if ((connection).options && (connection).options['host']) { + return (connection).options['host'].split(',')[0].split(':')[0]; + } else if ((connection).options && (connection).options['server']) { + return (connection).options['server'].split(',')[0].split(':')[0]; } else { return (connection).split(',')[0].split(':')[0]; } @@ -141,7 +141,7 @@ export function executeStreamedCommand(cmd: string, outputChannel?: vscode.Outpu }); } -export function isObjectExplorerContext(object: any): object is sqlops.ObjectExplorerContext { +export function isObjectExplorerContext(object: any): object is azdata.ObjectExplorerContext { return 'connectionProfile' in object && 'isConnectionNode' in object; } diff --git a/extensions/mssql/src/sqlClusterLookUp.ts b/extensions/mssql/src/sqlClusterLookUp.ts index 57736c0398..354d227150 100644 --- a/extensions/mssql/src/sqlClusterLookUp.ts +++ b/extensions/mssql/src/sqlClusterLookUp.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as constants from './constants'; import * as UUID from 'vscode-languageclient/lib/utils/uuid'; import { AppContext } from './appContext'; @@ -15,12 +15,12 @@ import { MssqlObjectExplorerNodeProvider } from './objectExplorerNodeProvider/ob export function findSqlClusterConnection( - obj: ICommandObjectExplorerContext | sqlops.IConnectionProfile, + obj: ICommandObjectExplorerContext | azdata.IConnectionProfile, appContext: AppContext) : SqlClusterConnection { if (!obj || !appContext) { return undefined; } - let sqlConnProfile: sqlops.IConnectionProfile; + let sqlConnProfile: azdata.IConnectionProfile; if ('type' in obj && obj.type === constants.ObjectExplorerService && 'explorerContext' in obj && obj.explorerContext && obj.explorerContext.connectionProfile) { sqlConnProfile = obj.explorerContext.connectionProfile; @@ -35,7 +35,7 @@ export function findSqlClusterConnection( return sqlClusterConnection; } -function findSqlClusterConnectionBySqlConnProfile(sqlConnProfile: sqlops.IConnectionProfile, appContext: AppContext): SqlClusterConnection { +function findSqlClusterConnectionBySqlConnProfile(sqlConnProfile: azdata.IConnectionProfile, appContext: AppContext): SqlClusterConnection { if (!sqlConnProfile || !appContext) { return undefined; } let sqlOeNodeProvider = appContext.getService(constants.ObjectExplorerService); @@ -48,7 +48,7 @@ function findSqlClusterConnectionBySqlConnProfile(sqlConnProfile: sqlops.IConnec } export async function getSqlClusterConnection( - obj: sqlops.IConnectionProfile | sqlops.connection.Connection | ICommandObjectExplorerContext): Promise { + obj: azdata.IConnectionProfile | azdata.connection.Connection | ICommandObjectExplorerContext): Promise { if (!obj) { return undefined; } @@ -66,13 +66,13 @@ export async function getSqlClusterConnection( return sqlClusterConnInfo; } -async function createSqlClusterConnInfo(sqlConnInfo: sqlops.IConnectionProfile | sqlops.connection.Connection): Promise { +async function createSqlClusterConnInfo(sqlConnInfo: azdata.IConnectionProfile | azdata.connection.Connection): Promise { if (!sqlConnInfo) { return undefined; } let connectionId: string = 'id' in sqlConnInfo ? sqlConnInfo.id : sqlConnInfo.connectionId; if (!connectionId) { return undefined; } - let serverInfo = await sqlops.connection.getServerInfo(connectionId); + let serverInfo = await azdata.connection.getServerInfo(connectionId); if (!serverInfo || !serverInfo.options) { return undefined; } let endpoints: IEndpoint[] = serverInfo.options[constants.clusterEndpointsProperty]; @@ -81,7 +81,7 @@ async function createSqlClusterConnInfo(sqlConnInfo: sqlops.IConnectionProfile | let index = endpoints.findIndex(ep => ep.serviceName === constants.hadoopKnoxEndpointName); if (index < 0) { return undefined; } - let credentials = await sqlops.connection.getCredentials(connectionId); + let credentials = await azdata.connection.getCredentials(connectionId); if (!credentials) { return undefined; } let clusterConnInfo = { @@ -99,12 +99,12 @@ async function createSqlClusterConnInfo(sqlConnInfo: sqlops.IConnectionProfile | return clusterConnInfo; } -function connProfileToConnectionParam(connectionProfile: sqlops.IConnectionProfile): ConnectionParam { +function connProfileToConnectionParam(connectionProfile: azdata.IConnectionProfile): ConnectionParam { let result = Object.assign(connectionProfile, { connectionId: connectionProfile.id }); return result; } -function connToConnectionParam(connection: sqlops.connection.Connection): ConnectionParam { +function connToConnectionParam(connection: azdata.connection.Connection): ConnectionParam { let connectionId = connection.connectionId; let options = connection.options; let result = Object.assign(connection, @@ -124,7 +124,7 @@ interface IEndpoint { port: number; } -class ConnectionParam implements sqlops.connection.Connection, sqlops.IConnectionProfile, sqlops.ConnectionInfo +class ConnectionParam implements azdata.connection.Connection, azdata.IConnectionProfile, azdata.ConnectionInfo { public connectionName: string; public serverName: string; diff --git a/extensions/mssql/src/typings/refs.d.ts b/extensions/mssql/src/typings/refs.d.ts index 3a7c7e8150..a57da7a011 100644 --- a/extensions/mssql/src/typings/refs.d.ts +++ b/extensions/mssql/src/typings/refs.d.ts @@ -5,4 +5,6 @@ /// /// +/// +/// /// diff --git a/extensions/mssql/src/utils.ts b/extensions/mssql/src/utils.ts index e47b11eca1..2e09975bb5 100644 --- a/extensions/mssql/src/utils.ts +++ b/extensions/mssql/src/utils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as path from 'path'; import * as crypto from 'crypto'; @@ -174,7 +174,7 @@ export function getErrorMessage(error: Error | string): string { return (error instanceof Error) ? error.message : error; } -export function isObjectExplorerContext(object: any): object is sqlops.ObjectExplorerContext { +export function isObjectExplorerContext(object: any): object is azdata.ObjectExplorerContext { return 'connectionProfile' in object && 'isConnectionNode' in object; } @@ -184,7 +184,7 @@ export function getUserHome(): string { export async function getClusterEndpoint(profileId: string, serviceName: string): Promise { - let serverInfo: sqlops.ServerInfo = await sqlops.connection.getServerInfo(profileId); + let serverInfo: azdata.ServerInfo = await azdata.connection.getServerInfo(profileId); if (!serverInfo || !serverInfo.options) { return undefined; } diff --git a/extensions/notebook/src/common/apiWrapper.ts b/extensions/notebook/src/common/apiWrapper.ts index 004e4e3b88..e4ab5e4140 100644 --- a/extensions/notebook/src/common/apiWrapper.ts +++ b/extensions/notebook/src/common/apiWrapper.ts @@ -6,7 +6,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into @@ -24,8 +24,8 @@ export class ApiWrapper { return vscode.window.createTerminal(options); } - public getCurrentConnection(): Thenable { - return sqlops.connection.getCurrentConnection(); + public getCurrentConnection(): Thenable { + return azdata.connection.getCurrentConnection(); } public getWorkspacePathFromUri(uri: vscode.Uri): string | undefined { @@ -41,8 +41,8 @@ export class ApiWrapper { return vscode.languages.registerCompletionItemProvider(selector, provider, ...triggerCharacters); } - public registerTaskHandler(taskId: string, handler: (profile: sqlops.IConnectionProfile) => void): void { - sqlops.tasks.registerTask(taskId, handler); + public registerTaskHandler(taskId: string, handler: (profile: azdata.IConnectionProfile) => void): void { + azdata.tasks.registerTask(taskId, handler); } public showErrorMessage(message: string, ...items: string[]): Thenable { @@ -53,8 +53,8 @@ export class ApiWrapper { return vscode.window.showOpenDialog(options); } - public startBackgroundOperation(operationInfo: sqlops.BackgroundOperationInfo): void { - sqlops.tasks.startBackgroundOperation(operationInfo); + public startBackgroundOperation(operationInfo: azdata.BackgroundOperationInfo): void { + azdata.tasks.startBackgroundOperation(operationInfo); } /** diff --git a/extensions/notebook/src/dialog/configurePythonDialog.ts b/extensions/notebook/src/dialog/configurePythonDialog.ts index a015fe3bc7..45ea414fff 100644 --- a/extensions/notebook/src/dialog/configurePythonDialog.ts +++ b/extensions/notebook/src/dialog/configurePythonDialog.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as fs from 'fs'; import * as utils from '../common/utils'; @@ -17,7 +17,7 @@ import JupyterServerInstallation from '../jupyter/jupyterServerInstallation'; const localize = nls.loadMessageBundle(); export class ConfigurePythonDialog { - private dialog: sqlops.window.modelviewdialog.Dialog; + private dialog: azdata.window.modelviewdialog.Dialog; private readonly DialogTitle = localize('configurePython.dialogName', 'Configure Python for Notebooks'); private readonly OkButtonText = localize('configurePython.okButtonText', 'Install'); @@ -28,14 +28,14 @@ export class ConfigurePythonDialog { private readonly InstallationNote = localize('configurePython.installNote', 'This installation will take some time. It is recommended to not close the application until the installation is complete.'); private readonly InvalidLocationMsg = localize('configurePython.invalidLocationMsg', 'The specified install location is invalid.'); - private pythonLocationTextBox: sqlops.InputBoxComponent; - private browseButton: sqlops.ButtonComponent; + private pythonLocationTextBox: azdata.InputBoxComponent; + private browseButton: azdata.ButtonComponent; constructor(private appContext: AppContext, private outputChannel: vscode.OutputChannel, private jupyterInstallation: JupyterServerInstallation) { } public async showDialog() { - this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle); + this.dialog = azdata.window.modelviewdialog.createDialog(this.DialogTitle); this.initializeContent(); @@ -44,19 +44,19 @@ export class ConfigurePythonDialog { this.dialog.registerCloseValidator(() => this.handleInstall()); - sqlops.window.modelviewdialog.openDialog(this.dialog); + azdata.window.modelviewdialog.openDialog(this.dialog); } private initializeContent() { this.dialog.registerContent(async view => { this.pythonLocationTextBox = view.modelBuilder.inputBox() - .withProperties({ + .withProperties({ value: JupyterServerInstallation.getPythonInstallPath(this.appContext.apiWrapper), width: '100%' }).component(); this.browseButton = view.modelBuilder.button() - .withProperties({ + .withProperties({ label: this.BrowseButtonText, width: '100px' }).component(); @@ -158,14 +158,14 @@ export class ConfigurePythonDialog { private showInfoMessage(message: string) { this.dialog.message = { text: message, - level: sqlops.window.modelviewdialog.MessageLevel.Information + level: azdata.window.modelviewdialog.MessageLevel.Information }; } private showErrorMessage(message: string) { this.dialog.message = { text: message, - level: sqlops.window.modelviewdialog.MessageLevel.Error + level: azdata.window.modelviewdialog.MessageLevel.Error }; } } \ No newline at end of file diff --git a/extensions/notebook/src/extension.ts b/extensions/notebook/src/extension.ts index 37ffaa5e76..f51842269b 100644 --- a/extensions/notebook/src/extension.ts +++ b/extensions/notebook/src/extension.ts @@ -6,7 +6,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as os from 'os'; import * as nls from 'vscode-nls'; @@ -40,7 +40,7 @@ export function activate(extensionContext: vscode.ExtensionContext) { extensionContext.subscriptions.push(vscode.commands.registerCommand('notebook.command.addtext', () => { addCell('markdown'); })); - extensionContext.subscriptions.push(vscode.commands.registerCommand('notebook.command.analyzeNotebook', (explorerContext: sqlops.ObjectExplorerContext) => { + extensionContext.subscriptions.push(vscode.commands.registerCommand('notebook.command.analyzeNotebook', (explorerContext: azdata.ObjectExplorerContext) => { analyzeNotebook(explorerContext); })); @@ -52,7 +52,7 @@ export function activate(extensionContext: vscode.ExtensionContext) { function newNotebook(connectionId: string) { let title = `Untitled-${counter++}`; let untitledUri = vscode.Uri.parse(`untitled:${title}`); - let options: sqlops.nb.NotebookShowOptions = connectionId ? { + let options: azdata.nb.NotebookShowOptions = connectionId ? { viewColumn: null, preserveFocus: true, preview: null, @@ -60,7 +60,7 @@ function newNotebook(connectionId: string) { connectionId: connectionId, defaultKernel: null } : null; - sqlops.nb.showNotebookDocument(untitledUri, options).then(success => { + azdata.nb.showNotebookDocument(untitledUri, options).then(success => { }, (err: Error) => { vscode.window.showErrorMessage(err.message); @@ -86,7 +86,7 @@ async function openNotebook(): Promise { async function runActiveCell(): Promise { try { - let notebook = sqlops.nb.activeNotebookEditor; + let notebook = azdata.nb.activeNotebookEditor; if (notebook) { await notebook.runCell(); } else { @@ -97,11 +97,11 @@ async function runActiveCell(): Promise { } } -async function addCell(cellType: sqlops.nb.CellType): Promise { +async function addCell(cellType: azdata.nb.CellType): Promise { try { - let notebook = sqlops.nb.activeNotebookEditor; + let notebook = azdata.nb.activeNotebookEditor; if (notebook) { - await notebook.edit((editBuilder: sqlops.nb.NotebookEditorEdit) => { + await notebook.edit((editBuilder: azdata.nb.NotebookEditorEdit) => { // TODO should prompt and handle cell placement editBuilder.insertCell({ cell_type: cellType, @@ -116,12 +116,12 @@ async function addCell(cellType: sqlops.nb.CellType): Promise { } } -async function analyzeNotebook(oeContext?: sqlops.ObjectExplorerContext): Promise { +async function analyzeNotebook(oeContext?: azdata.ObjectExplorerContext): Promise { // Ensure we get a unique ID for the notebook. For now we're using a different prefix to the built-in untitled files // to handle this. We should look into improving this in the future let untitledUri = vscode.Uri.parse(`untitled:Notebook-${counter++}`); - let editor = await sqlops.nb.showNotebookDocument(untitledUri, { + let editor = await azdata.nb.showNotebookDocument(untitledUri, { connectionId: oeContext ? oeContext.connectionProfile.id : '', providerId: JUPYTER_NOTEBOOK_PROVIDER, preview: false, diff --git a/extensions/notebook/src/integrationTest/notebookIntegration.test.ts b/extensions/notebook/src/integrationTest/notebookIntegration.test.ts index c3b9ca0656..673f5aedea 100644 --- a/extensions/notebook/src/integrationTest/notebookIntegration.test.ts +++ b/extensions/notebook/src/integrationTest/notebookIntegration.test.ts @@ -8,7 +8,7 @@ import * as should from 'should'; import * as assert from 'assert'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as tempWrite from 'temp-write'; import 'mocha'; @@ -42,13 +42,13 @@ describe('Notebook Integration Test', function (): void { let uri = writeNotebookToFile(pythonNotebook); await ensureJupyterInstalled(); - let notebook = await sqlops.nb.showNotebookDocument(uri); + let notebook = await azdata.nb.showNotebookDocument(uri); should(notebook.document.cells).have.length(1); let ran = await notebook.runCell(notebook.document.cells[0]); should(ran).be.true('Notebook runCell failed'); let cellOutputs = notebook.document.cells[0].contents.outputs; should(cellOutputs).have.length(1); - let result = (cellOutputs[0]).data['text/plain']; + let result = (cellOutputs[0]).data['text/plain']; should(result).equal('2'); try { @@ -68,7 +68,7 @@ describe('Notebook Integration Test', function (): void { let connectionId = await connectToSparkIntegrationServer(); // When I open a Spark notebook and run the cell - let notebook = await sqlops.nb.showNotebookDocument(uri, { + let notebook = await azdata.nb.showNotebookDocument(uri, { connectionId: connectionId }); should(notebook.document.cells).have.length(1); @@ -78,7 +78,7 @@ describe('Notebook Integration Test', function (): void { // Then I expect to get the output result of 1+1, executed remotely against the Spark endpoint let cellOutputs = notebook.document.cells[0].contents.outputs; should(cellOutputs).have.length(4); - let sparkResult = (cellOutputs[3]).text; + let sparkResult = (cellOutputs[3]).text; should(sparkResult).equal('2'); try { @@ -92,7 +92,7 @@ describe('Notebook Integration Test', function (): void { async function connectToSparkIntegrationServer(): Promise { assert.ok(process.env.BACKEND_HOSTNAME, 'BACKEND_HOSTNAME, BACKEND_USERNAME, BACKEND_PWD must be set using ./tasks/setbackenvariables.sh or .\\tasks\\setbackendvaraibles.bat'); - let connInfo: sqlops.connection.Connection = { + let connInfo: azdata.connection.Connection = { options: { 'host': process.env.BACKEND_HOSTNAME, 'groupId': 'C777F06B-202E-4480-B475-FA416154D458', @@ -104,14 +104,14 @@ async function connectToSparkIntegrationServer(): Promise { connectionId: 'abcd1234', }; connInfo['savePassword'] = true; - let result = await sqlops.connection.connect(connInfo as sqlops.IConnectionProfile); + let result = await azdata.connection.connect(connInfo as azdata.IConnectionProfile); should(result.connected).be.true(); should(result.connectionId).not.be.undefined(); should(result.connectionId).not.be.empty(); should(result.errorMessage).be.undefined(); - let activeConnections = await sqlops.connection.getActiveConnections(); + let activeConnections = await azdata.connection.getActiveConnections(); should(activeConnections).have.length(1); return result.connectionId; diff --git a/extensions/notebook/src/intellisense/completionItemProvider.ts b/extensions/notebook/src/intellisense/completionItemProvider.ts index 5031ae5d33..78e2dd5655 100644 --- a/extensions/notebook/src/intellisense/completionItemProvider.ts +++ b/extensions/notebook/src/intellisense/completionItemProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as vscode from 'vscode'; import { charCountToJsCountDiff, jsIndexToCharIndex } from './text'; diff --git a/extensions/notebook/src/jupyter/jupyterController.ts b/extensions/notebook/src/jupyter/jupyterController.ts index 1cb46fef38..858b789e5a 100644 --- a/extensions/notebook/src/jupyter/jupyterController.ts +++ b/extensions/notebook/src/jupyter/jupyterController.ts @@ -6,7 +6,7 @@ 'use strict'; import * as path from 'path'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as os from 'os'; import * as nls from 'vscode-nls'; @@ -75,22 +75,22 @@ export class JupyterController implements vscode.Disposable { let notebookProvider = undefined; notebookProvider = this.registerNotebookProvider(); - sqlops.nb.onDidOpenNotebookDocument(notebook => { + azdata.nb.onDidOpenNotebookDocument(notebook => { if (!JupyterServerInstallation.isPythonInstalled(this.apiWrapper)) { this.doConfigurePython(jupyterInstaller); } }); // Add command/task handlers - this.apiWrapper.registerTaskHandler(constants.jupyterOpenNotebookTask, (profile: sqlops.IConnectionProfile) => { + this.apiWrapper.registerTaskHandler(constants.jupyterOpenNotebookTask, (profile: azdata.IConnectionProfile) => { return this.handleOpenNotebookTask(profile); }); - this.apiWrapper.registerTaskHandler(constants.jupyterNewNotebookTask, (profile: sqlops.IConnectionProfile) => { + this.apiWrapper.registerTaskHandler(constants.jupyterNewNotebookTask, (profile: azdata.IConnectionProfile) => { return this.saveProfileAndCreateNotebook(profile); }); - this.apiWrapper.registerCommand(constants.jupyterNewNotebookCommand, (explorerContext: sqlops.ObjectExplorerContext) => { + this.apiWrapper.registerCommand(constants.jupyterNewNotebookCommand, (explorerContext: azdata.ObjectExplorerContext) => { return this.saveProfileAndCreateNotebook(explorerContext ? explorerContext.connectionProfile : undefined); }); - this.apiWrapper.registerCommand(constants.jupyterAnalyzeCommand, (explorerContext: sqlops.ObjectExplorerContext) => { + this.apiWrapper.registerCommand(constants.jupyterAnalyzeCommand, (explorerContext: azdata.ObjectExplorerContext) => { return this.saveProfileAndAnalyzeNotebook(explorerContext); }); @@ -113,15 +113,15 @@ export class JupyterController implements vscode.Disposable { extensionContext: this.extensionContext, apiWrapper: this.apiWrapper })); - sqlops.nb.registerNotebookProvider(notebookProvider); + azdata.nb.registerNotebookProvider(notebookProvider); return notebookProvider; } - private saveProfileAndCreateNotebook(profile: sqlops.IConnectionProfile): Promise { + private saveProfileAndCreateNotebook(profile: azdata.IConnectionProfile): Promise { return this.handleNewNotebookTask(undefined, profile); } - private saveProfileAndAnalyzeNotebook(oeContext: sqlops.ObjectExplorerContext): Promise { + private saveProfileAndAnalyzeNotebook(oeContext: azdata.ObjectExplorerContext): Promise { return this.handleNewNotebookTask(oeContext, oeContext.connectionProfile); } @@ -131,11 +131,11 @@ export class JupyterController implements vscode.Disposable { } // EVENT HANDLERS ////////////////////////////////////////////////////// - public async getDefaultConnection(): Promise { + public async getDefaultConnection(): Promise { return await this.apiWrapper.getCurrentConnection(); } - private async handleOpenNotebookTask(profile: sqlops.IConnectionProfile): Promise { + private async handleOpenNotebookTask(profile: azdata.IConnectionProfile): Promise { let notebookFileTypeName = localize('notebookFileType', 'Notebooks'); let filter = {}; filter[notebookFileTypeName] = 'ipynb'; @@ -151,7 +151,7 @@ export class JupyterController implements vscode.Disposable { // in the future might want additional supported types this.apiWrapper.showErrorMessage(localize('unsupportedFileType', 'Only .ipynb Notebooks are supported')); } else { - await sqlops.nb.showNotebookDocument(fileUri, { + await azdata.nb.showNotebookDocument(fileUri, { connectionId: profile.id, providerId: constants.jupyterNotebookProviderId, preview: false @@ -160,11 +160,11 @@ export class JupyterController implements vscode.Disposable { } } - private async handleNewNotebookTask(oeContext?: sqlops.ObjectExplorerContext, profile?: sqlops.IConnectionProfile): Promise { + private async handleNewNotebookTask(oeContext?: azdata.ObjectExplorerContext, profile?: azdata.IConnectionProfile): Promise { // Ensure we get a unique ID for the notebook. For now we're using a different prefix to the built-in untitled files // to handle this. We should look into improving this in the future let untitledUri = vscode.Uri.parse(`untitled:Notebook-${untitledCounter++}`); - let editor = await sqlops.nb.showNotebookDocument(untitledUri, { + let editor = await azdata.nb.showNotebookDocument(untitledUri, { connectionId: profile.id, providerId: constants.jupyterNotebookProviderId, preview: false, diff --git a/extensions/notebook/src/jupyter/jupyterKernel.ts b/extensions/notebook/src/jupyter/jupyterKernel.ts index 820d1e46aa..eac72dfbcb 100644 --- a/extensions/notebook/src/jupyter/jupyterKernel.ts +++ b/extensions/notebook/src/jupyter/jupyterKernel.ts @@ -6,7 +6,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { Kernel, KernelMessage } from '@jupyterlab/services'; function toShellMessage(msgImpl: KernelMessage.IShellMessage): nb.IShellMessage { diff --git a/extensions/notebook/src/jupyter/jupyterNotebookManager.ts b/extensions/notebook/src/jupyter/jupyterNotebookManager.ts index 62dac72796..273008bbb7 100644 --- a/extensions/notebook/src/jupyter/jupyterNotebookManager.ts +++ b/extensions/notebook/src/jupyter/jupyterNotebookManager.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as vscode from 'vscode'; import { ServerConnection, SessionManager } from '@jupyterlab/services'; diff --git a/extensions/notebook/src/jupyter/jupyterNotebookProvider.ts b/extensions/notebook/src/jupyter/jupyterNotebookProvider.ts index 3d750bbe22..f9a7cbea2b 100644 --- a/extensions/notebook/src/jupyter/jupyterNotebookProvider.ts +++ b/extensions/notebook/src/jupyter/jupyterNotebookProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; const localize = nls.loadMessageBundle(); diff --git a/extensions/notebook/src/jupyter/jupyterServerInstallation.ts b/extensions/notebook/src/jupyter/jupyterServerInstallation.ts index 938ca14ea4..cc3a1a5d08 100644 --- a/extensions/notebook/src/jupyter/jupyterServerInstallation.ts +++ b/extensions/notebook/src/jupyter/jupyterServerInstallation.ts @@ -8,7 +8,7 @@ import * as fs from 'fs-extra'; import * as path from 'path'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ExecOptions } from 'child_process'; import * as decompress from 'decompress'; import * as request from 'request'; @@ -82,25 +82,25 @@ export default class JupyterServerInstallation { return installation; } - private async installDependencies(backgroundOperation: sqlops.BackgroundOperation): Promise { + private async installDependencies(backgroundOperation: azdata.BackgroundOperation): Promise { if (!fs.existsSync(this._pythonExecutable) || this._forceInstall) { window.showInformationMessage(msgInstallPkgStart); this.outputChannel.show(true); this.outputChannel.appendLine(msgPythonInstallationProgress); - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonInstallationProgress); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonInstallationProgress); await this.installPythonPackage(backgroundOperation); - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonInstallationComplete); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonInstallationComplete); this.outputChannel.appendLine(msgPythonInstallationComplete); // Install jupyter on Windows because local python is not bundled with jupyter unlike linux and MacOS. await this.installJupyterProsePackage(); await this.installSparkMagic(); - backgroundOperation.updateStatus(sqlops.TaskStatus.Succeeded, msgInstallPkgFinish); + backgroundOperation.updateStatus(azdata.TaskStatus.Succeeded, msgInstallPkgFinish); window.showInformationMessage(msgInstallPkgFinish); } } - private installPythonPackage(backgroundOperation: sqlops.BackgroundOperation): Promise { + private installPythonPackage(backgroundOperation: azdata.BackgroundOperation): Promise { let bundleVersion = constants.pythonBundleVersion; let pythonVersion = constants.pythonVersion; let packageName = 'python-#pythonversion-#platform-#bundleversion.#extension'; @@ -129,10 +129,10 @@ export default class JupyterServerInstallation { let self = undefined; return new Promise((resolve, reject) => { self = this; - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgDownloadPython(platformId, pythonDownloadUrl)); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgDownloadPython(platformId, pythonDownloadUrl)); fs.mkdirs(this._pythonInstallationPath, (err) => { if (err) { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonDirectoryError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonDirectoryError); reject(err); } @@ -141,12 +141,12 @@ export default class JupyterServerInstallation { let printThreshold = 0.1; request.get(pythonDownloadUrl, { timeout: 20000 }) .on('error', (downloadError) => { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonDownloadError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonDownloadError); reject(downloadError); }) .on('response', (response) => { if (response.statusCode !== 200) { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonDownloadError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonDownloadError); reject(response.statusMessage); } @@ -174,7 +174,7 @@ export default class JupyterServerInstallation { try { fs.removeSync(pythonSourcePath); } catch (err) { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonUnpackError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonUnpackError); reject(err); } } @@ -182,19 +182,19 @@ export default class JupyterServerInstallation { //Delete zip/tar file fs.unlink(pythonPackagePathLocal, (err) => { if (err) { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonUnpackError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonUnpackError); reject(err); } }); resolve(); }).catch(err => { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonUnpackError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonUnpackError); reject(err); }); }) .on('error', (downloadError) => { - backgroundOperation.updateStatus(sqlops.TaskStatus.InProgress, msgPythonDownloadError); + backgroundOperation.updateStatus(azdata.TaskStatus.InProgress, msgPythonDownloadError); reject(downloadError); }); }); @@ -254,7 +254,7 @@ export default class JupyterServerInstallation { }) .catch(err => { let errorMsg = msgDependenciesInstallationFailed(err); - op.updateStatus(sqlops.TaskStatus.Failed, errorMsg); + op.updateStatus(azdata.TaskStatus.Failed, errorMsg); this.apiWrapper.showErrorMessage(errorMsg); this._installCompleteEmitter.fire(errorMsg); }); diff --git a/extensions/notebook/src/jupyter/jupyterServerManager.ts b/extensions/notebook/src/jupyter/jupyterServerManager.ts index d85145069d..6cbfd41824 100644 --- a/extensions/notebook/src/jupyter/jupyterServerManager.ts +++ b/extensions/notebook/src/jupyter/jupyterServerManager.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as vscode from 'vscode'; import * as path from 'path'; import { ServerConnection } from '@jupyterlab/services'; diff --git a/extensions/notebook/src/jupyter/jupyterSessionManager.ts b/extensions/notebook/src/jupyter/jupyterSessionManager.ts index 5f5ea416c4..7551728451 100644 --- a/extensions/notebook/src/jupyter/jupyterSessionManager.ts +++ b/extensions/notebook/src/jupyter/jupyterSessionManager.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb, ServerInfo, connection, IConnectionProfile } from 'sqlops'; +import { nb, ServerInfo, connection, IConnectionProfile } from 'azdata'; import { Session, Kernel } from '@jupyterlab/services'; import * as fs from 'fs-extra'; import * as nls from 'vscode-nls'; diff --git a/extensions/notebook/src/jupyter/remoteContentManager.ts b/extensions/notebook/src/jupyter/remoteContentManager.ts index 090cbe3186..bcde0d7cb9 100644 --- a/extensions/notebook/src/jupyter/remoteContentManager.ts +++ b/extensions/notebook/src/jupyter/remoteContentManager.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as vscode from 'vscode'; import { Contents } from '@jupyterlab/services'; diff --git a/extensions/notebook/src/test/model/contentManagers.test.ts b/extensions/notebook/src/test/model/contentManagers.test.ts index d26d11017f..11ba89d3cb 100644 --- a/extensions/notebook/src/test/model/contentManagers.test.ts +++ b/extensions/notebook/src/test/model/contentManagers.test.ts @@ -10,7 +10,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; import * as path from 'path'; import { ContentsManager, Contents } from '@jupyterlab/services'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import 'mocha'; import { INotebook, CellTypes } from '../../contracts/content'; diff --git a/extensions/notebook/src/test/model/kernel.test.ts b/extensions/notebook/src/test/model/kernel.test.ts index 9569460753..53dffc0853 100644 --- a/extensions/notebook/src/test/model/kernel.test.ts +++ b/extensions/notebook/src/test/model/kernel.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { Kernel, KernelMessage } from '@jupyterlab/services'; import 'mocha'; diff --git a/extensions/notebook/src/test/model/sessionManager.test.ts b/extensions/notebook/src/test/model/sessionManager.test.ts index 67582586ab..81a4f01b6c 100644 --- a/extensions/notebook/src/test/model/sessionManager.test.ts +++ b/extensions/notebook/src/test/model/sessionManager.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { SessionManager, Session, Kernel } from '@jupyterlab/services'; import 'mocha'; diff --git a/extensions/notebook/src/typings/refs.d.ts b/extensions/notebook/src/typings/refs.d.ts index ee283e0c24..5e3fc28b95 100644 --- a/extensions/notebook/src/typings/refs.d.ts +++ b/extensions/notebook/src/typings/refs.d.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -/// -/// +/// +/// /// /// diff --git a/extensions/profiler/client/src/apiWrapper.ts b/extensions/profiler/client/src/apiWrapper.ts index 038d5e6f0f..926912ce30 100644 --- a/extensions/profiler/client/src/apiWrapper.ts +++ b/extensions/profiler/client/src/apiWrapper.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as data from 'sqlops'; +import * as data from 'azdata'; /** * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into diff --git a/extensions/profiler/client/src/data/createSessionData.ts b/extensions/profiler/client/src/data/createSessionData.ts index 2a5b78b43f..85e25f33c8 100644 --- a/extensions/profiler/client/src/data/createSessionData.ts +++ b/extensions/profiler/client/src/data/createSessionData.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export class CreateSessionData { public ownerUri: string; public sessionName: string; - public templates: Array = new Array(); + public templates: Array = new Array(); - constructor(ownerUri: string, templates: Array) { + constructor(ownerUri: string, templates: Array) { this.ownerUri = ownerUri; this.templates = templates; } @@ -20,7 +20,7 @@ export class CreateSessionData { return this.templates.map(e => e.name); } - public selectTemplate(name: string): sqlops.ProfilerSessionTemplate { + public selectTemplate(name: string): azdata.ProfilerSessionTemplate { return this.templates.find((t) => { return t.name === name; }); } } \ No newline at end of file diff --git a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts b/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts index 1c8c132e13..295211a0b7 100644 --- a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts +++ b/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts @@ -5,7 +5,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { CreateSessionData } from '../data/createSessionData'; @@ -18,9 +18,9 @@ export class CreateSessionDialog { private readonly DialogTitleText: string = localize('createSessionDialog.title', 'Start New Profiler Session'); // UI Components - private dialog: sqlops.window.Dialog; - private templatesBox: sqlops.DropDownComponent; - private sessionNameBox: sqlops.InputBoxComponent; + private dialog: azdata.window.Dialog; + private templatesBox: azdata.DropDownComponent; + private sessionNameBox: azdata.InputBoxComponent; private model: CreateSessionData; private readonly _providerType: string; @@ -29,7 +29,7 @@ export class CreateSessionDialog { public readonly onSuccess: vscode.Event = this._onSuccess.event; - constructor(ownerUri: string, providerType: string, templates: Array) { + constructor(ownerUri: string, providerType: string, templates: Array) { if (typeof (templates) === 'undefined' || templates === null) { throw new Error(localize('createSessionDialog.templatesInvalid', "Invalid templates list, cannot open dialog")); } @@ -44,14 +44,14 @@ export class CreateSessionDialog { } public async showDialog(): Promise { - this.dialog = sqlops.window.createModelViewDialog(this.DialogTitleText); + this.dialog = azdata.window.createModelViewDialog(this.DialogTitleText); this.initializeContent(); this.dialog.okButton.onClick(() => this.execute()); this.dialog.cancelButton.onClick(() => { }); this.dialog.okButton.label = this.CreateButtonText; this.dialog.cancelButton.label = this.CancelButtonText; - sqlops.window.openDialog(this.dialog); + azdata.window.openDialog(this.dialog); } private initializeContent(): void { @@ -111,7 +111,7 @@ export class CreateSessionDialog { } private async execute(): Promise { - let profilerService = sqlops.dataprotocol.getProvider(this._providerType, sqlops.DataProviderType.ProfilerProvider); + let profilerService = azdata.dataprotocol.getProvider(this._providerType, azdata.DataProviderType.ProfilerProvider); let name = this.sessionNameBox.value; let selected = this.templatesBox.value.toString(); diff --git a/extensions/profiler/client/src/mainController.ts b/extensions/profiler/client/src/mainController.ts index b4e57b8376..c583029e1a 100644 --- a/extensions/profiler/client/src/mainController.ts +++ b/extensions/profiler/client/src/mainController.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ApiWrapper } from './apiWrapper'; import { CreateSessionDialog } from './dialogs/profilerCreateSessionDialog'; @@ -29,7 +29,7 @@ export class MainController { } public activate(): void { - vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, providerType: string, templates: Array) => { + vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, providerType: string, templates: Array) => { let dialog = new CreateSessionDialog(ownerUri, providerType, templates); dialog.showDialog(); }); diff --git a/extensions/profiler/client/src/typings/ref.d.ts b/extensions/profiler/client/src/typings/ref.d.ts index 83bbdd3e21..12430dd85a 100644 --- a/extensions/profiler/client/src/typings/ref.d.ts +++ b/extensions/profiler/client/src/typings/ref.d.ts @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ /// -/// -/// +/// +/// /// \ No newline at end of file diff --git a/src/sql/azdata.proposed.d.ts b/src/sql/azdata.proposed.d.ts index 48115a0a2d..22d8737c7d 100644 --- a/src/sql/azdata.proposed.d.ts +++ b/src/sql/azdata.proposed.d.ts @@ -2349,7 +2349,7 @@ declare module 'azdata' { export namespace window { /** - * @deprecated this method has been deprecated and will be removed in a future release, please use sqlops.window.createWebViewDialog instead. + * @deprecated this method has been deprecated and will be removed in a future release, please use azdata.window.createWebViewDialog instead. * @param title */ export function createDialog( @@ -3249,7 +3249,7 @@ declare module 'azdata' { export namespace window { /** - * @deprecated this namespace has been deprecated and will be removed in a future release, please use the methods under sqlops.window namespace. + * @deprecated this namespace has been deprecated and will be removed in a future release, please use the methods under azdata.window namespace. */ export namespace modelviewdialog { /** diff --git a/src/sql/azdata.test.d.ts b/src/sql/azdata.test.d.ts new file mode 100644 index 0000000000..f34748b9b1 --- /dev/null +++ b/src/sql/azdata.test.d.ts @@ -0,0 +1,23 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +// This is the place for APIs used for testing + +import * as core from 'azdata'; +import * as vscode from 'vscode'; + +declare module 'azdata' { + + export namespace extensions { + export function install(vsixPath: string): Thenable; + } + + export namespace objectexplorer { + /** + * get object explorer node context menu actions + */ + export function getNodeActions(connectionId: string, nodePath: string): Thenable; + } +} diff --git a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts index 57c41ed72f..c5c8952e5a 100644 --- a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts +++ b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts @@ -25,7 +25,7 @@ import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/v import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { values } from 'vs/base/common/map'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; @@ -39,7 +39,7 @@ import * as TelemetryKeys from 'sql/common/telemetryKeys'; class AccountPanel extends ViewletPanel { public index: number; - private accountList: List; + private accountList: List; constructor( private options: IViewletPanelOptions, @@ -53,7 +53,7 @@ class AccountPanel extends ViewletPanel { } protected renderBody(container: HTMLElement): void { - this.accountList = new List(container, new AccountListDelegate(AccountDialog.ACCOUNTLIST_HEIGHT), [this.instantiationService.createInstance(AccountListRenderer)]); + this.accountList = new List(container, new AccountListDelegate(AccountDialog.ACCOUNTLIST_HEIGHT), [this.instantiationService.createInstance(AccountListRenderer)]); this.disposables.push(attachListStyler(this.accountList, this.themeService)); } @@ -71,7 +71,7 @@ class AccountPanel extends ViewletPanel { this.accountList.domFocus(); } - public updateAccounts(accounts: sqlops.Account[]) { + public updateAccounts(accounts: azdata.Account[]) { this.accountList.splice(0, this.accountList.length, accounts); } @@ -315,7 +315,7 @@ export class AccountDialog extends Modal { this._providerViewsMap.set(newProvider.addedProvider.id, { view: providerView, addAccountAction: addAccountAction }); } - private removeProvider(removedProvider: sqlops.AccountProviderMetadata) { + private removeProvider(removedProvider: azdata.AccountProviderMetadata) { // Skip removing the provider if it doesn't exist let providerView = this._providerViewsMap.get(removedProvider.id); if (!providerView || !providerView.view) { diff --git a/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts b/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts index c5c7b25df7..e7be093161 100644 --- a/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts +++ b/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; @@ -18,8 +18,8 @@ export class AccountViewModel { private _addProviderEmitter: Emitter; public get addProviderEvent(): Event { return this._addProviderEmitter.event; } - private _removeProviderEmitter: Emitter; - public get removeProviderEvent(): Event { return this._removeProviderEmitter.event; } + private _removeProviderEmitter: Emitter; + public get removeProviderEvent(): Event { return this._removeProviderEmitter.event; } private _updateAccountListEmitter: Emitter; public get updateAccountListEvent(): Event { return this._updateAccountListEmitter.event; } @@ -29,7 +29,7 @@ export class AccountViewModel { // Create our event emitters this._addProviderEmitter = new Emitter(); - this._removeProviderEmitter = new Emitter(); + this._removeProviderEmitter = new Emitter(); this._updateAccountListEmitter = new Emitter(); // Register handlers for any changes to the providers or accounts @@ -53,7 +53,7 @@ export class AccountViewModel { // 3) Build parameters to add a provider and return it return this._accountManagementService.getAccountProviderMetadata() .then( - (providers: sqlops.AccountProviderMetadata[]) => { + (providers: azdata.AccountProviderMetadata[]) => { let promises = providers.map(provider => { return self._accountManagementService.getAccountsForProvider(provider.id) .then( diff --git a/src/sql/parts/accountManagement/common/accountActions.ts b/src/sql/parts/accountManagement/common/accountActions.ts index 1fb6a9d987..f1cbc43167 100644 --- a/src/sql/parts/accountManagement/common/accountActions.ts +++ b/src/sql/parts/accountManagement/common/accountActions.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -79,7 +79,7 @@ export class RemoveAccountAction extends Action { public static LABEL = localize('removeAccount', 'Remove account'); constructor( - private _account: sqlops.Account, + private _account: azdata.Account, @IDialogService private _dialogService: IDialogService, @INotificationService private _notificationService: INotificationService, @IAccountManagementService private _accountManagementService: IAccountManagementService @@ -147,7 +147,7 @@ export class ApplyFilterAction extends Action { export class RefreshAccountAction extends Action { public static ID = 'account.refresh'; public static LABEL = localize('refreshAccount', 'Reenter your credentials'); - public account: sqlops.Account; + public account: azdata.Account; constructor( @IAccountManagementService private _accountManagementService: IAccountManagementService diff --git a/src/sql/parts/accountManagement/common/accountListRenderer.ts b/src/sql/parts/accountManagement/common/accountListRenderer.ts index e9a230e176..d1ebf7c292 100644 --- a/src/sql/parts/accountManagement/common/accountListRenderer.ts +++ b/src/sql/parts/accountManagement/common/accountListRenderer.ts @@ -15,20 +15,20 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { RemoveAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; -export class AccountListDelegate implements IListVirtualDelegate { +export class AccountListDelegate implements IListVirtualDelegate { constructor( private _height: number ) { } - public getHeight(element: sqlops.Account): number { + public getHeight(element: azdata.Account): number { return this._height; } - public getTemplateId(element: sqlops.Account): string { + public getTemplateId(element: azdata.Account): string { return 'accountListRenderer'; } } @@ -44,7 +44,7 @@ export interface AccountListTemplate { actions?: ActionBar; } -export class AccountPickerListRenderer implements IListRenderer { +export class AccountPickerListRenderer implements IListRenderer { public static TEMPLATE_ID = 'accountListRenderer'; public get templateId(): string { @@ -64,7 +64,7 @@ export class AccountPickerListRenderer implements IListRenderer { - let firewallRuleInfo: sqlops.FirewallRuleInfo = { + let firewallRuleInfo: azdata.FirewallRuleInfo = { startIpAddress: this._firewallRuleDialog.viewModel.isIPAddressSelected ? this._firewallRuleDialog.viewModel.defaultIPAddress : this._firewallRuleDialog.viewModel.fromSubnetIPRange, endIpAddress: this._firewallRuleDialog.viewModel.isIPAddressSelected ? this._firewallRuleDialog.viewModel.defaultIPAddress : this._firewallRuleDialog.viewModel.toSubnetIPRange, serverName: this._connection.serverName, diff --git a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel.ts b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel.ts index 0ac82aecad..b588f07a3a 100644 --- a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel.ts +++ b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * View model for firewall rule dialog */ export class FirewallRuleViewModel { public isIPAddressSelected: boolean; - public selectedAccount: sqlops.Account; + public selectedAccount: azdata.Account; private _defaultIPAddress: string; private _defaultFromSubnetIPRange: string; diff --git a/src/sql/parts/admin/database/create/createDatabase.component.ts b/src/sql/parts/admin/database/create/createDatabase.component.ts index 728c15ac37..d87463b5dc 100644 --- a/src/sql/parts/admin/database/create/createDatabase.component.ts +++ b/src/sql/parts/admin/database/create/createDatabase.component.ts @@ -11,7 +11,7 @@ import { ConnectionManagementInfo } from 'sql/platform/connection/common/connect import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { ITaskDialogComponent } from 'sql/parts/tasks/common/tasks'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; export const CREATEDATABASE_SELECTOR: string = 'createdatabase-component'; @@ -51,8 +51,8 @@ export class CreateDatabaseComponent implements ITaskDialogComponent { ) { } - private getDatabaseInfo(form: NgForm): sqlops.DatabaseInfo { - return { + private getDatabaseInfo(form: NgForm): azdata.DatabaseInfo { + return { options: { name: form.value.databaseName, owner: form.value.databaseOwner diff --git a/src/sql/parts/connection/common/connectionContextKey.ts b/src/sql/parts/connection/common/connectionContextKey.ts index 2b4737af1f..cf658038a0 100644 --- a/src/sql/parts/connection/common/connectionContextKey.ts +++ b/src/sql/parts/connection/common/connectionContextKey.ts @@ -6,7 +6,7 @@ 'use strict'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; export class ConnectionContextKey implements IContextKey { diff --git a/src/sql/parts/connection/common/connectionGlobalStatus.ts b/src/sql/parts/connection/common/connectionGlobalStatus.ts index 7cdedebc17..b82f7cbdaf 100644 --- a/src/sql/parts/connection/common/connectionGlobalStatus.ts +++ b/src/sql/parts/connection/common/connectionGlobalStatus.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionSummary } from 'sqlops'; +import { ConnectionSummary } from 'azdata'; import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants'; diff --git a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts b/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts index f414fad1d3..c0ea96a7b6 100644 --- a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts +++ b/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts @@ -8,7 +8,7 @@ // // import { AdvancedPropertiesDialog } from 'sql/parts/connection/connectionDialog/advancedPropertiesDialog'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { localize } from 'vs/nls'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; @@ -26,7 +26,7 @@ export class AdvancedPropertiesController { this._options = this._advancedDialog.optionValues; } - public showDialog(providerOptions: sqlops.ConnectionOption[], container: HTMLElement, options: { [name: string]: any }): void { + public showDialog(providerOptions: azdata.ConnectionOption[], container: HTMLElement, options: { [name: string]: any }): void { this._options = options; var serviceOptions = providerOptions.map(option => AdvancedPropertiesController.connectionOptionToServiceOption(option)); this.advancedDialog.open(serviceOptions, this._options); @@ -47,7 +47,7 @@ export class AdvancedPropertiesController { this._advancedDialog = dialog; } - public static connectionOptionToServiceOption(connectionOption: sqlops.ConnectionOption): sqlops.ServiceOption { + public static connectionOptionToServiceOption(connectionOption: azdata.ConnectionOption): azdata.ServiceOption { return { name: connectionOption.name, displayName: connectionOption.displayName, diff --git a/src/sql/parts/dashboard/common/dashboardTab.contribution.ts b/src/sql/parts/dashboard/common/dashboardTab.contribution.ts index 695846cdff..148886ed32 100644 --- a/src/sql/parts/dashboard/common/dashboardTab.contribution.ts +++ b/src/sql/parts/dashboard/common/dashboardTab.contribution.ts @@ -30,43 +30,43 @@ const tabSchema: IJSONSchema = { properties: { id: { type: 'string', - description: localize('sqlops.extension.contributes.dashboard.tab.id', "Unique identifier for this tab. Will be passed to the extension for any requests.") + description: localize('azdata.extension.contributes.dashboard.tab.id', "Unique identifier for this tab. Will be passed to the extension for any requests.") }, title: { type: 'string', - description: localize('sqlops.extension.contributes.dashboard.tab.title', "Title of the tab to show the user.") + description: localize('azdata.extension.contributes.dashboard.tab.title', "Title of the tab to show the user.") }, description: { - description: localize('sqlops.extension.contributes.dashboard.tab.description', "Description of this tab that will be shown to the user."), + description: localize('azdata.extension.contributes.dashboard.tab.description', "Description of this tab that will be shown to the user."), type: 'string' }, when: { - description: localize('sqlops.extension.contributes.tab.when', 'Condition which must be true to show this item'), + description: localize('azdata.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'), + description: localize('azdata.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."), + description: localize('azdata.extension.contributes.dashboard.tab.container', "The container that will be displayed in this tab."), type: 'object', properties: generateContainerTypeSchemaProperties() }, 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."), + description: localize('azdata.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."), + description: localize('azdata.extension.contributes.dashboard.tab.isHomeTab', "Whether or not this tab should be used as the Home tab for a connection type."), type: 'boolean' } } }; const tabContributionSchema: IJSONSchema = { - description: localize('sqlops.extension.contributes.tabs', "Contributes a single or multiple tabs for users to add to their dashboard."), + description: localize('azdata.extension.contributes.tabs', "Contributes a single or multiple tabs for users to add to their dashboard."), oneOf: [ tabSchema, { diff --git a/src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts b/src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts index acb545b580..6bed9817a8 100644 --- a/src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts +++ b/src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts @@ -34,10 +34,10 @@ const containerSchema: IJSONSchema = { properties: { id: { type: 'string', - description: localize('sqlops.extension.contributes.dashboard.container.id', "Unique identifier for this container.") + description: localize('azdata.extension.contributes.dashboard.container.id', "Unique identifier for this container.") }, container: { - description: localize('sqlops.extension.contributes.dashboard.container.container', "The container that will be displayed in the tab."), + description: localize('azdata.extension.contributes.dashboard.container.container', "The container that will be displayed in the tab."), type: 'object', properties: generateContainerTypeSchemaProperties() } @@ -45,7 +45,7 @@ const containerSchema: IJSONSchema = { }; const containerContributionSchema: IJSONSchema = { - description: localize('sqlops.extension.contributes.containers', "Contributes a single or multiple dashboard containers for users to add to their dashboard."), + description: localize('azdata.extension.contributes.containers', "Contributes a single or multiple dashboard containers for users to add to their dashboard."), oneOf: [ containerSchema, { diff --git a/src/sql/parts/dashboard/contents/controlHostContent.component.ts b/src/sql/parts/dashboard/contents/controlHostContent.component.ts index 3f1b31f41e..3f12cbd4fb 100644 --- a/src/sql/parts/dashboard/contents/controlHostContent.component.ts +++ b/src/sql/parts/dashboard/contents/controlHostContent.component.ts @@ -10,7 +10,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { memoize } from 'vs/base/common/decorators'; import { AgentViewComponent } from '../../jobManagement/agent/agentView.component'; @@ -48,9 +48,9 @@ export class ControlHostContent { } @memoize - public get connection(): sqlops.connection.Connection { + public get connection(): azdata.connection.Connection { let currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; - let connection: sqlops.connection.Connection = { + let connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options @@ -59,7 +59,7 @@ export class ControlHostContent { } @memoize - public get serverInfo(): sqlops.ServerInfo { + public get serverInfo(): azdata.ServerInfo { return this._dashboardService.connectionManagementService.connectionInfo.serverInfo; } diff --git a/src/sql/parts/dashboard/contents/webviewContent.component.ts b/src/sql/parts/dashboard/contents/webviewContent.component.ts index ffe780861a..aa44fca2a0 100644 --- a/src/sql/parts/dashboard/contents/webviewContent.component.ts +++ b/src/sql/parts/dashboard/contents/webviewContent.component.ts @@ -21,7 +21,7 @@ import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IContextKey } from 'vs/platform/contextkey/common/contextkey'; @Component({ @@ -68,9 +68,9 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo } @memoize - public get connection(): sqlops.connection.Connection { + public get connection(): azdata.connection.Connection { let currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; - let connection: sqlops.connection.Connection = { + let connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options @@ -79,7 +79,7 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo } @memoize - public get serverInfo(): sqlops.ServerInfo { + public get serverInfo(): azdata.ServerInfo { return this._dashboardService.connectionManagementService.connectionInfo.serverInfo; } diff --git a/src/sql/parts/dashboard/pages/dashboardPageContribution.ts b/src/sql/parts/dashboard/pages/dashboardPageContribution.ts index 50c9112384..0e446c9c01 100644 --- a/src/sql/parts/dashboard/pages/dashboardPageContribution.ts +++ b/src/sql/parts/dashboard/pages/dashboardPageContribution.ts @@ -31,7 +31,7 @@ export function generateDashboardWidgetSchema(type?: 'database' | 'server', exte type: 'string' }, when: { - description: localize('sqlops.extension.contributes.widget.when', 'Condition which must be true to show this item'), + description: localize('azdata.extension.contributes.widget.when', 'Condition which must be true to show this item'), type: 'string' }, gridItemConfig: { @@ -117,7 +117,7 @@ export function generateDashboardGridLayoutSchema(type?: 'database' | 'server', ] }, when: { - description: localize('sqlops.extension.contributes.widget.when', 'Condition which must be true to show this item'), + description: localize('azdata.extension.contributes.widget.when', 'Condition which must be true to show this item'), type: 'string' } } @@ -130,7 +130,7 @@ export function generateDashboardTabSchema(type?: 'database' | 'server'): IJSONS properties: { tabId: { type: 'string', - description: localize('sqlops.extension.contributes.dashboardPage.tab.id', "Unique identifier for this tab. Will be passed to the extension for any requests."), + description: localize('azdata.extension.contributes.dashboardPage.tab.id', "Unique identifier for this tab. Will be passed to the extension for any requests."), enum: [], enumDescriptions: [], errorMessage: localize('dashboardTabError', "Extension tab is unknown or not installed.") diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts index d9353c121f..1790696a25 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts @@ -20,7 +20,7 @@ import { IScriptingService } from 'sql/platform/scripting/common/scriptingServic import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { ObjectMetadata } from 'sqlops'; +import { ObjectMetadata } from 'azdata'; import * as tree from 'vs/base/parts/tree/browser/tree'; import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; diff --git a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts b/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts index cc2a4a29ee..b03850e348 100644 --- a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts @@ -18,7 +18,7 @@ import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insi import { insertValueRegex } from 'sql/workbench/services/insights/common/insightsDialogService'; import { RunInsightQueryAction } from './actions'; -import { SimpleExecuteResult } from 'sqlops'; +import { SimpleExecuteResult } from 'azdata'; import { Action } from 'vs/base/common/actions'; import * as types from 'vs/base/common/types'; diff --git a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts b/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts index 11eeed6936..db36f0b2eb 100644 --- a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts @@ -12,7 +12,7 @@ import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { error } from 'sql/base/common/log'; import { IDashboardRegistry, Extensions as DashboardExtensions } from 'sql/platform/dashboard/common/dashboardRegistry'; -import { DatabaseInfo, ServerInfo } from 'sqlops'; +import { DatabaseInfo, ServerInfo } from 'azdata'; import { EventType, addDisposableListener } from 'vs/base/browser/dom'; import * as types from 'vs/base/common/types'; diff --git a/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts b/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts index cf31b61744..b7c5d57f44 100644 --- a/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts @@ -15,7 +15,7 @@ import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboar import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; @@ -74,9 +74,9 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget, } @memoize - public get connection(): sqlops.connection.Connection { + public get connection(): azdata.connection.Connection { let currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; - let connection: sqlops.connection.Connection = { + let connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options @@ -85,7 +85,7 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget, } @memoize - public get serverInfo(): sqlops.ServerInfo { + public get serverInfo(): azdata.ServerInfo { return this._dashboardService.connectionManagementService.connectionInfo.serverInfo; } diff --git a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts index f7dfe1e80b..4e98f4f76d 100644 --- a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts +++ b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts @@ -20,7 +20,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { mixin } from 'vs/base/common/objects'; import * as strings from 'vs/base/common/strings'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Button } from 'sql/base/browser/ui/button/button'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; @@ -127,7 +127,7 @@ export class RestoreDialog extends Modal { public onDatabaseListFocused: Event = this._onDatabaseListFocused.event; constructor( - optionsMetadata: sqlops.ServiceOption[], + optionsMetadata: azdata.ServiceOption[], @IPartService partService: IPartService, @IThemeService themeService: IThemeService, @IContextViewService private _contextViewService: IContextViewService, @@ -843,7 +843,7 @@ export class RestoreDialog extends Modal { } } - private updateRestoreDatabaseFiles(dbFiles: sqlops.RestoreDatabaseFileInfo[]) { + private updateRestoreDatabaseFiles(dbFiles: azdata.RestoreDatabaseFileInfo[]) { this.clearFileListTable(); if (dbFiles && dbFiles.length > 0) { let data = []; @@ -864,7 +864,7 @@ export class RestoreDialog extends Modal { } } - private updateBackupSetsToRestore(backupSetsToRestore: sqlops.DatabaseFileInfo[]) { + private updateBackupSetsToRestore(backupSetsToRestore: azdata.DatabaseFileInfo[]) { if (this._isBackupFileCheckboxChanged) { let selectedRow = []; for (let i = 0; i < backupSetsToRestore.length; i++) { diff --git a/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts b/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts index 3c20cf24a5..d364e718b8 100644 --- a/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts +++ b/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import * as types from 'vs/base/common/types'; @@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; export interface RestoreOptionsElement { - optionMetadata: sqlops.ServiceOption; + optionMetadata: azdata.ServiceOption; defaultValue: any; currentValue: any; } @@ -62,15 +62,15 @@ export class RestoreViewModel { private _onSetRestoreOption = new Emitter(); public onSetRestoreOption: Event = this._onSetRestoreOption.event; - private _onUpdateBackupSetsToRestore = new Emitter(); - public onUpdateBackupSetsToRestore: Event = this._onUpdateBackupSetsToRestore.event; + private _onUpdateBackupSetsToRestore = new Emitter(); + public onUpdateBackupSetsToRestore: Event = this._onUpdateBackupSetsToRestore.event; - private _onUpdateRestoreDatabaseFiles = new Emitter(); - public onUpdateRestoreDatabaseFiles: Event = this._onUpdateRestoreDatabaseFiles.event; + private _onUpdateRestoreDatabaseFiles = new Emitter(); + public onUpdateRestoreDatabaseFiles: Event = this._onUpdateRestoreDatabaseFiles.event; private _optionsMap: { [name: string]: RestoreOptionsElement } = {}; - constructor(optionsMetadata: sqlops.ServiceOption[]) { + constructor(optionsMetadata: azdata.ServiceOption[]) { optionsMetadata.forEach(optionMetadata => { let defaultValue = this.getDisplayValue(optionMetadata, optionMetadata.defaultValue); this._optionsMap[optionMetadata.name] = { @@ -84,7 +84,7 @@ export class RestoreViewModel { /** * Get option display value */ - public getDisplayValue(optionMetadata: sqlops.ServiceOption, optionValue: any): any { + public getDisplayValue(optionMetadata: azdata.ServiceOption, optionValue: any): any { let displayValue: any; switch (optionMetadata.valueType) { case ServiceOptionType.boolean: @@ -119,7 +119,7 @@ export class RestoreViewModel { /** * Get option metadata from the option map */ - public getOptionMetadata(optionName: string): sqlops.ServiceOption { + public getOptionMetadata(optionName: string): azdata.ServiceOption { return this._optionsMap[optionName] ? this._optionsMap[optionName].optionMetadata : undefined; } @@ -170,7 +170,7 @@ export class RestoreViewModel { /** * On restore plan response will update all the information from restore plan response */ - public onRestorePlanResponse(restorePlanResponse: sqlops.RestorePlanResponse): void { + public onRestorePlanResponse(restorePlanResponse: azdata.RestorePlanResponse): void { if (restorePlanResponse.planDetails && restorePlanResponse.planDetails['lastBackupTaken']) { this.updateLastBackupTaken(restorePlanResponse.planDetails['lastBackupTaken'].currentValue); } @@ -187,7 +187,7 @@ export class RestoreViewModel { /** * Update options with plan details */ - public updateOptionWithPlanDetail(planDetails: { [key: string]: sqlops.RestorePlanDetailInfo }): void { + public updateOptionWithPlanDetail(planDetails: { [key: string]: azdata.RestorePlanDetailInfo }): void { if (planDetails) { for (var key in planDetails) { let optionElement = this._optionsMap[key]; @@ -234,7 +234,7 @@ export class RestoreViewModel { /** * Update backup sets to restore */ - public updateBackupSetsToRestore(backupSetsToRestore: sqlops.DatabaseFileInfo[]): void { + public updateBackupSetsToRestore(backupSetsToRestore: azdata.DatabaseFileInfo[]): void { this.selectedBackupSets = null; if (backupSetsToRestore) { this.selectedBackupSets = []; diff --git a/src/sql/parts/editData/common/editDataInput.ts b/src/sql/parts/editData/common/editDataInput.ts index 1823e2cfa1..80b4a5f06c 100644 --- a/src/sql/parts/editData/common/editDataInput.ts +++ b/src/sql/parts/editData/common/editDataInput.ts @@ -9,7 +9,7 @@ import { IConnectionManagementService, IConnectableInput, INewConnectionParams } import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; -import { EditSessionReadyParams, ISelectionData } from 'sqlops'; +import { EditSessionReadyParams, ISelectionData } from 'azdata'; import { URI } from 'vs/base/common/uri'; import nls = require('vs/nls'); import { INotificationService } from 'vs/platform/notification/common/notification'; diff --git a/src/sql/parts/grid/services/dataService.ts b/src/sql/parts/grid/services/dataService.ts index f45c684c7d..cd679a544e 100644 --- a/src/sql/parts/grid/services/dataService.ts +++ b/src/sql/parts/grid/services/dataService.ts @@ -9,7 +9,7 @@ import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { Observer } from 'rxjs/Observer'; -import { ResultSetSubset, EditUpdateCellResult, EditSubsetResult, EditCreateRowResult } from 'sqlops'; +import { ResultSetSubset, EditUpdateCellResult, EditSubsetResult, EditCreateRowResult } from 'azdata'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { ResultSerializer } from 'sql/platform/node/resultSerializer'; import { ISaveRequest } from 'sql/parts/grid/common/interfaces'; diff --git a/src/sql/parts/grid/views/editData/editData.component.ts b/src/sql/parts/grid/views/editData/editData.component.ts index c4315a2f8d..cab03f6c2e 100644 --- a/src/sql/parts/grid/views/editData/editData.component.ts +++ b/src/sql/parts/grid/views/editData/editData.component.ts @@ -39,7 +39,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { KeyCode } from 'vs/base/common/keyCodes'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { EditUpdateCellResult } from 'sqlops'; +import { EditUpdateCellResult } from 'azdata'; export const EDITDATA_SELECTOR: string = 'editdata-component'; @Component({ diff --git a/src/sql/parts/jobManagement/agent/agentView.component.ts b/src/sql/parts/jobManagement/agent/agentView.component.ts index aacb9195fd..65a904f5b5 100644 --- a/src/sql/parts/jobManagement/agent/agentView.component.ts +++ b/src/sql/parts/jobManagement/agent/agentView.component.ts @@ -8,7 +8,7 @@ import 'sql/parts/dashboard/common/dashboardPanelStyles'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core'; -import { AgentJobInfo } from 'sqlops'; +import { AgentJobInfo } from 'azdata'; import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; diff --git a/src/sql/parts/jobManagement/views/alertsView.component.ts b/src/sql/parts/jobManagement/views/alertsView.component.ts index 691f3fa29a..c195b9fac7 100644 --- a/src/sql/parts/jobManagement/views/alertsView.component.ts +++ b/src/sql/parts/jobManagement/views/alertsView.component.ts @@ -14,7 +14,7 @@ import 'vs/css!sql/base/browser/ui/table/media/table'; import * as dom from 'vs/base/browser/dom'; import * as nls from 'vs/nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; @@ -72,7 +72,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On private _didTabChange: boolean; @ViewChild('jobalertsgrid') _gridEl: ElementRef; - public alerts: sqlops.AgentAlertInfo[]; + public alerts: azdata.AgentAlertInfo[]; public contextAction = NewAlertAction; constructor( @@ -181,7 +181,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On } } - private onAlertsAvailable(alerts: sqlops.AgentAlertInfo[]) { + private onAlertsAvailable(alerts: azdata.AgentAlertInfo[]) { let items: any = alerts.map((item) => { return { id: item.id, diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.ts b/src/sql/parts/jobManagement/views/jobHistory.component.ts index 1e7decdc76..6876af838c 100644 --- a/src/sql/parts/jobManagement/views/jobHistory.component.ts +++ b/src/sql/parts/jobManagement/views/jobHistory.component.ts @@ -6,7 +6,7 @@ import 'vs/css!./jobHistory'; import 'vs/css!sql/media/icons/common-icons'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; @@ -53,9 +53,9 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { @ViewChild('table') private _tableContainer: ElementRef; @ViewChild('jobsteps') private _jobStepsView: ElementRef; - @Input() public agentJobInfo: sqlops.AgentJobInfo = undefined; - @Input() public agentJobHistories: sqlops.AgentJobHistoryInfo[] = undefined; - public agentJobHistoryInfo: sqlops.AgentJobHistoryInfo = undefined; + @Input() public agentJobInfo: azdata.AgentJobInfo = undefined; + @Input() public agentJobHistories: azdata.AgentJobHistoryInfo[] = undefined; + public agentJobHistoryInfo: azdata.AgentJobHistoryInfo = undefined; private _isVisible: boolean = false; private _stepRows: JobStepsViewRow[] = []; @@ -63,7 +63,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { private _showPreviousRuns: boolean = undefined; private _runStatus: string = undefined; private _jobCacheObject: JobCacheObject; - private _agentJobInfo: sqlops.AgentJobInfo; + private _agentJobInfo: azdata.AgentJobInfo; private _noJobsAvailable: boolean = false; private static readonly HEADING_HEIGHT: number = 24; @@ -217,7 +217,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { } } - private didJobFail(job: sqlops.AgentJobHistoryInfo): boolean { + private didJobFail(job: azdata.AgentJobHistoryInfo): boolean { for (let i = 0; i < job.steps.length; i++) { if (job.steps[i].runStatus === 0) { return true; @@ -226,7 +226,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { return false; } - private buildHistoryTree(self: any, jobHistories: sqlops.AgentJobHistoryInfo[]) { + private buildHistoryTree(self: any, jobHistories: azdata.AgentJobHistoryInfo[]) { self._treeController.jobHistories = jobHistories; let jobHistoryRows = this._treeController.jobHistories.map(job => self.convertToJobHistoryRow(job)); self._treeDataSource.data = jobHistoryRows; @@ -259,7 +259,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { this._agentViewComponent.showHistory = false; } - private convertToJobHistoryRow(historyInfo: sqlops.AgentJobHistoryInfo): JobHistoryRow { + private convertToJobHistoryRow(historyInfo: azdata.AgentJobHistoryInfo): JobHistoryRow { let jobHistoryRow = new JobHistoryRow(); jobHistoryRow.runDate = this.formatTime(historyInfo.runDate); jobHistoryRow.runStatus = JobManagementUtilities.convertToStatusString(historyInfo.runStatus); diff --git a/src/sql/parts/jobManagement/views/jobHistoryTree.ts b/src/sql/parts/jobManagement/views/jobHistoryTree.ts index 6785bd2f99..67765acf55 100644 --- a/src/sql/parts/jobManagement/views/jobHistoryTree.ts +++ b/src/sql/parts/jobManagement/views/jobHistoryTree.ts @@ -13,7 +13,7 @@ import { Promise, TPromise } from 'vs/base/common/winjs.base'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { generateUuid } from 'vs/base/common/uuid'; import * as DOM from 'vs/base/browser/dom'; -import { AgentJobHistoryInfo } from 'sqlops'; +import { AgentJobHistoryInfo } from 'azdata'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; export class JobHistoryRow { diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/parts/jobManagement/views/jobsView.component.ts index 729fbee889..4713974985 100644 --- a/src/sql/parts/jobManagement/views/jobsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobsView.component.ts @@ -12,7 +12,7 @@ import 'vs/css!../common/media/jobs'; import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!sql/base/browser/ui/table/media/table'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; @@ -87,11 +87,11 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe private filterValueMap: { [columnName: string]: string[]; } = {}; private sortingStylingMap: { [columnName: string]: any; } = {}; - public jobs: sqlops.AgentJobInfo[]; - private jobHistories: { [jobId: string]: sqlops.AgentJobHistoryInfo[]; } = Object.create(null); - private jobSteps: { [jobId: string]: sqlops.AgentJobStepInfo[]; } = Object.create(null); - private jobAlerts: { [jobId: string]: sqlops.AgentAlertInfo[]; } = Object.create(null); - private jobSchedules: { [jobId: string]: sqlops.AgentJobScheduleInfo[]; } = Object.create(null); + public jobs: azdata.AgentJobInfo[]; + private jobHistories: { [jobId: string]: azdata.AgentJobHistoryInfo[]; } = Object.create(null); + private jobSteps: { [jobId: string]: azdata.AgentJobStepInfo[]; } = Object.create(null); + private jobAlerts: { [jobId: string]: azdata.AgentAlertInfo[]; } = Object.create(null); + private jobSchedules: { [jobId: string]: azdata.AgentJobScheduleInfo[]; } = Object.create(null); public contextAction = NewJobAction; @ViewChild('jobsgrid') _gridEl: ElementRef; @@ -223,7 +223,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe } } - private onJobsAvailable(jobs: sqlops.AgentJobInfo[]) { + private onJobsAvailable(jobs: azdata.AgentJobInfo[]) { let jobViews: any; let start: boolean = true; if (!jobs) { @@ -545,7 +545,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe } } - private separateFailingJobs(): sqlops.AgentJobInfo[][] { + private separateFailingJobs(): azdata.AgentJobInfo[][] { let failing = []; let nonFailing = []; for (let i = 0; i < this.jobs.length; i++) { @@ -573,7 +573,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe return cell.classList.contains('error-row'); } - private getJob(args: Slick.OnClickEventArgs): sqlops.AgentJobInfo { + private getJob(args: Slick.OnClickEventArgs): azdata.AgentJobInfo { let row = args.row; let jobName: string; let cell = args.grid.getCellNode(row, 1); @@ -586,7 +586,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe return job; } - private async curateJobHistory(jobs: sqlops.AgentJobInfo[], ownerUri: string) { + private async curateJobHistory(jobs: azdata.AgentJobInfo[], ownerUri: string) { const self = this; for (let job of jobs) { let result = await this._jobManagementService.getJobHistory(ownerUri, job.jobId, job.name); @@ -600,7 +600,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe self._jobCacheObject.setJobAlerts(job.jobId, self.jobAlerts[job.jobId]); self._jobCacheObject.setJobSchedules(job.jobId, self.jobSchedules[job.jobId]); let jobHistories = self._jobCacheObject.getJobHistory(job.jobId); - let previousRuns: sqlops.AgentJobHistoryInfo[]; + let previousRuns: azdata.AgentJobHistoryInfo[]; if (jobHistories.length >= 5) { previousRuns = jobHistories.slice(jobHistories.length - 5, jobHistories.length); } else { @@ -620,7 +620,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe } } - private createJobChart(jobId: string, jobHistories: sqlops.AgentJobHistoryInfo[]): void { + private createJobChart(jobId: string, jobHistories: azdata.AgentJobHistoryInfo[]): void { let chartHeights = this.getChartHeights(jobHistories); let runCharts = []; for (let i = 0; i < chartHeights.length; i++) { @@ -642,7 +642,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe } // chart height normalization logic - private getChartHeights(jobHistories: sqlops.AgentJobHistoryInfo[]): string[] { + private getChartHeights(jobHistories: azdata.AgentJobHistoryInfo[]): string[] { if (!jobHistories || jobHistories.length === 0) { return []; } @@ -866,10 +866,10 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe return actions; } - protected convertStepsToStepInfos(steps: sqlops.AgentJobStep[], job: sqlops.AgentJobInfo): sqlops.AgentJobStepInfo[] { + protected convertStepsToStepInfos(steps: azdata.AgentJobStep[], job: azdata.AgentJobInfo): azdata.AgentJobStepInfo[] { let result = []; steps.forEach(step => { - let stepInfo: sqlops.AgentJobStepInfo = { + let stepInfo: azdata.AgentJobStepInfo = { jobId: job.jobId, jobName: job.name, script: null, @@ -916,7 +916,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe } } - let job: sqlops.AgentJobInfo[] = this.jobs.filter(job => { + let job: azdata.AgentJobInfo[] = this.jobs.filter(job => { return job.jobId === jobId; }); diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.ts b/src/sql/parts/jobManagement/views/operatorsView.component.ts index 81a53e989b..fd3569618e 100644 --- a/src/sql/parts/jobManagement/views/operatorsView.component.ts +++ b/src/sql/parts/jobManagement/views/operatorsView.component.ts @@ -14,7 +14,7 @@ import 'vs/css!sql/base/browser/ui/table/media/table'; import * as dom from 'vs/base/browser/dom'; import * as nls from 'vs/nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; @@ -71,7 +71,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit, private _didTabChange: boolean; @ViewChild('operatorsgrid') _gridEl: ElementRef; - public operators: sqlops.AgentOperatorInfo[]; + public operators: azdata.AgentOperatorInfo[]; public contextAction = NewOperatorAction; constructor( @@ -183,7 +183,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit, } } - private onOperatorsAvailable(operators: sqlops.AgentOperatorInfo[]) { + private onOperatorsAvailable(operators: azdata.AgentOperatorInfo[]) { let items: any = operators.map((item) => { return { id: item.id, diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.ts b/src/sql/parts/jobManagement/views/proxiesView.component.ts index 16e0c2de21..063484616d 100644 --- a/src/sql/parts/jobManagement/views/proxiesView.component.ts +++ b/src/sql/parts/jobManagement/views/proxiesView.component.ts @@ -13,7 +13,7 @@ import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!sql/base/browser/ui/table/media/table'; import * as dom from 'vs/base/browser/dom'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; @@ -72,7 +72,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O private _isCloud: boolean; private _proxiesCacheObject: ProxiesCacheObject; - public proxies: sqlops.AgentProxyInfo[]; + public proxies: azdata.AgentProxyInfo[]; public readonly contextAction = NewProxyAction; private _didTabChange: boolean; @@ -186,7 +186,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O } } - private onProxiesAvailable(proxies: sqlops.AgentProxyInfo[]) { + private onProxiesAvailable(proxies: azdata.AgentProxyInfo[]) { let items: any = proxies.map((item) => { return { id: item.accountName, diff --git a/src/sql/parts/modelComponents/button.component.ts b/src/sql/parts/modelComponents/button.component.ts index 2752735a60..32391e9ef5 100644 --- a/src/sql/parts/modelComponents/button.component.ts +++ b/src/sql/parts/modelComponents/button.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentWithIconBase } from 'sql/parts/modelComponents/componentWithIconBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -132,47 +132,47 @@ export default class ButtonComponent extends ComponentWithIconBase implements IC // CSS-bound properties private get label(): string { - return this.getPropertyOrDefault((props) => props.label, ''); + return this.getPropertyOrDefault((props) => props.label, ''); } private set label(newValue: string) { - this.setPropertyFromUI(this.setValueProperties, newValue); + this.setPropertyFromUI(this.setValueProperties, newValue); } private get isFile(): boolean { - return this.getPropertyOrDefault((props) => props.isFile, false); + return this.getPropertyOrDefault((props) => props.isFile, false); } private set isFile(newValue: boolean) { - this.setPropertyFromUI(this.setFileProperties, newValue); + this.setPropertyFromUI(this.setFileProperties, newValue); } private get fileContent(): string { - return this.getPropertyOrDefault((props) => props.fileContent, ''); + return this.getPropertyOrDefault((props) => props.fileContent, ''); } private set fileContent(newValue: string) { - this.setPropertyFromUI(this.setFileContentProperties, newValue); + this.setPropertyFromUI(this.setFileContentProperties, newValue); } - private setFileContentProperties(properties: sqlops.ButtonProperties, fileContent: string): void { + private setFileContentProperties(properties: azdata.ButtonProperties, fileContent: string): void { properties.fileContent = fileContent; } - private setValueProperties(properties: sqlops.ButtonProperties, label: string): void { + private setValueProperties(properties: azdata.ButtonProperties, label: string): void { properties.label = label; } - private setFileProperties(properties: sqlops.ButtonProperties, isFile: boolean): void { + private setFileProperties(properties: azdata.ButtonProperties, isFile: boolean): void { properties.isFile = isFile; } private get title(): string { - return this.getPropertyOrDefault((props) => props.title, ''); + return this.getPropertyOrDefault((props) => props.title, ''); } private set title(newValue: string) { - this.setPropertyFromUI((properties, title) => { properties.title = title; }, newValue); + this.setPropertyFromUI((properties, title) => { properties.title = title; }, newValue); } } diff --git a/src/sql/parts/modelComponents/card.component.ts b/src/sql/parts/modelComponents/card.component.ts index d27b9d30f3..8fc299469e 100644 --- a/src/sql/parts/modelComponents/card.component.ts +++ b/src/sql/parts/modelComponents/card.component.ts @@ -9,7 +9,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; @@ -121,11 +121,11 @@ export default class CardComponent extends ComponentWithIconBase implements ICom } public get selected(): boolean { - return this.getPropertyOrDefault((props) => props.selected, false); + return this.getPropertyOrDefault((props) => props.selected, false); } public set selected(newValue: boolean) { - this.setPropertyFromUI((props, value) => props.selected = value, newValue); + this.setPropertyFromUI((props, value) => props.selected = value, newValue); } public get isDetailsCard(): boolean { diff --git a/src/sql/parts/modelComponents/checkbox.component.ts b/src/sql/parts/modelComponents/checkbox.component.ts index e3349ea69c..1b51a53ebf 100644 --- a/src/sql/parts/modelComponents/checkbox.component.ts +++ b/src/sql/parts/modelComponents/checkbox.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -87,18 +87,18 @@ export default class CheckBoxComponent extends ComponentBase implements ICompone // CSS-bound properties public get checked(): boolean { - return this.getPropertyOrDefault((props) => props.checked, false); + return this.getPropertyOrDefault((props) => props.checked, false); } public set checked(newValue: boolean) { - this.setPropertyFromUI((properties, value) => { properties.checked = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.checked = value; }, newValue); } private get label(): string { - return this.getPropertyOrDefault((props) => props.label, ''); + return this.getPropertyOrDefault((props) => props.label, ''); } private set label(newValue: string) { - this.setPropertyFromUI((properties, label) => { properties.label = label; }, newValue); + this.setPropertyFromUI((properties, label) => { properties.label = label; }, newValue); } } diff --git a/src/sql/parts/modelComponents/componentBase.ts b/src/sql/parts/modelComponents/componentBase.ts index ce434f30de..e64842e3b9 100644 --- a/src/sql/parts/modelComponents/componentBase.ts +++ b/src/sql/parts/modelComponents/componentBase.ts @@ -12,7 +12,7 @@ import { import * as types from 'vs/base/common/types'; import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { Event, Emitter } from 'vs/base/common/event'; @@ -137,35 +137,35 @@ export abstract class ComponentBase extends Disposable implements IComponent, On } public get height(): number | string { - return this.getPropertyOrDefault((props) => props.height, undefined); + return this.getPropertyOrDefault((props) => props.height, undefined); } public set height(newValue: number | string) { - this.setPropertyFromUI((props, value) => props.height = value, newValue); + this.setPropertyFromUI((props, value) => props.height = value, newValue); } public get width(): number | string { - return this.getPropertyOrDefault((props) => props.width, undefined); + return this.getPropertyOrDefault((props) => props.width, undefined); } public set width(newValue: number | string) { - this.setPropertyFromUI((props, value) => props.width = value, newValue); + this.setPropertyFromUI((props, value) => props.width = value, newValue); } public get position(): string { - return this.getPropertyOrDefault((props) => props.position, ''); + return this.getPropertyOrDefault((props) => props.position, ''); } public set position(newValue: string) { - this.setPropertyFromUI((properties, position) => { properties.position = position; }, newValue); + this.setPropertyFromUI((properties, position) => { properties.position = position; }, newValue); } public get CSSStyles(): { [key: string]: string } { - return this.getPropertyOrDefault((props) => props.CSSStyles, {}); + return this.getPropertyOrDefault((props) => props.CSSStyles, {}); } public set CSSStyles(newValue: { [key: string]: string }) { - this.setPropertyFromUI((properties, CSSStyles) => { properties.CSSStyles = CSSStyles; }, newValue); + this.setPropertyFromUI((properties, CSSStyles) => { properties.CSSStyles = CSSStyles; }, newValue); } public convertSizeToNumber(size: number | string): number { diff --git a/src/sql/parts/modelComponents/componentWithIconBase.ts b/src/sql/parts/modelComponents/componentWithIconBase.ts index dcf57453f2..12d7b057b3 100644 --- a/src/sql/parts/modelComponents/componentWithIconBase.ts +++ b/src/sql/parts/modelComponents/componentWithIconBase.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { URI } from 'vs/base/common/uri'; import { IdGenerator } from 'vs/base/common/idGenerator'; import { createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom'; @@ -89,15 +89,15 @@ export abstract class ComponentWithIconBase extends ComponentBase { } public get iconPath(): string | URI | { light: string | URI; dark: string | URI } { - return this.getPropertyOrDefault((props) => props.iconPath, undefined); + return this.getPropertyOrDefault((props) => props.iconPath, undefined); } public get iconHeight(): number | string { - return this.getPropertyOrDefault((props) => props.iconHeight, '50px'); + return this.getPropertyOrDefault((props) => props.iconHeight, '50px'); } public get iconWidth(): number | string { - return this.getPropertyOrDefault((props) => props.iconWidth, '50px'); + return this.getPropertyOrDefault((props) => props.iconWidth, '50px'); } ngOnDestroy(): void { diff --git a/src/sql/parts/modelComponents/declarativeTable.component.ts b/src/sql/parts/modelComponents/declarativeTable.component.ts index 7ad918c86a..c992e32da0 100644 --- a/src/sql/parts/modelComponents/declarativeTable.component.ts +++ b/src/sql/parts/modelComponents/declarativeTable.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -88,17 +88,17 @@ export default class DeclarativeTableComponent extends ComponentBase implements } private isCheckBox(cell: number): boolean { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return column.valueType === DeclarativeDataType.boolean; } private isControlEnabled(cell: number): boolean { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return !column.isReadOnly; } private isLabel(cell: number): boolean { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return column.isReadOnly && column.valueType === DeclarativeDataType.string; } @@ -117,7 +117,7 @@ export default class DeclarativeTableComponent extends ComponentBase implements private onSelectBoxChanged(e: ISelectData | string, row: number, cell: number): void { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; if (column.categoryValues) { if (typeof e === 'string') { let category = column.categoryValues.find(c => c.displayName === e); @@ -135,7 +135,7 @@ export default class DeclarativeTableComponent extends ComponentBase implements private onCellDataChanged(newValue: any, row: number, cell: number): void { this.data[row][cell] = newValue; this.data = this.data; - let newCellData: sqlops.TableCell = { + let newCellData: azdata.TableCell = { row: row, column: cell, value: newValue @@ -147,32 +147,32 @@ export default class DeclarativeTableComponent extends ComponentBase implements } private isSelectBox(cell: number): boolean { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return column.valueType === DeclarativeDataType.category; } private isEditableSelectBox(cell: number): boolean { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return column.valueType === DeclarativeDataType.editableCategory; } private isInputBox(cell: number): boolean { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return column.valueType === DeclarativeDataType.string && !column.isReadOnly; } private getColumnWidth(cell: number): string { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return this.convertSize(column.width, '30px'); } private GetOptions(cell: number): string[] { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; return column.categoryValues ? column.categoryValues.map(x => x.displayName) : []; } private GetSelectedOptionDisplayName(row: number, cell: number): string { - let column: sqlops.DeclarativeTableColumn = this.columns[cell]; + let column: azdata.DeclarativeTableColumn = this.columns[cell]; let cellData = this.data[row][cell]; if (cellData && column.categoryValues) { let category = column.categoryValues.find(v => v.name === cellData); @@ -200,18 +200,18 @@ export default class DeclarativeTableComponent extends ComponentBase implements } public get data(): any[][] { - return this.getPropertyOrDefault((props) => props.data, []); + return this.getPropertyOrDefault((props) => props.data, []); } public set data(newValue: any[][]) { - this.setPropertyFromUI((props, value) => props.data = value, newValue); + this.setPropertyFromUI((props, value) => props.data = value, newValue); } - public get columns(): sqlops.DeclarativeTableColumn[] { - return this.getPropertyOrDefault((props) => props.columns, []); + public get columns(): azdata.DeclarativeTableColumn[] { + return this.getPropertyOrDefault((props) => props.columns, []); } - public set columns(newValue: sqlops.DeclarativeTableColumn[]) { - this.setPropertyFromUI((props, value) => props.columns = value, newValue); + public set columns(newValue: azdata.DeclarativeTableColumn[]) { + this.setPropertyFromUI((props, value) => props.columns = value, newValue); } } diff --git a/src/sql/parts/modelComponents/divContainer.component.ts b/src/sql/parts/modelComponents/divContainer.component.ts index ca0d46fb8e..daace63a9b 100644 --- a/src/sql/parts/modelComponents/divContainer.component.ts +++ b/src/sql/parts/modelComponents/divContainer.component.ts @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; @@ -19,7 +19,7 @@ import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentW import types = require('vs/base/common/types'); class DivItem { - constructor(public descriptor: IComponentDescriptor, public config: sqlops.DivItemLayout) { } + constructor(public descriptor: IComponentDescriptor, public config: azdata.DivItemLayout) { } } @Component({ @@ -32,7 +32,7 @@ class DivItem { ` }) -export default class DivContainer extends ContainerBase implements IComponent, OnDestroy { +export default class DivContainer extends ContainerBase implements IComponent, OnDestroy { @Input() descriptor: IComponentDescriptor; @Input() modelStore: IModelStore; @ViewChild('divContainer', { read: ElementRef }) divContainer; @@ -59,7 +59,7 @@ export default class DivContainer extends ContainerBase im /// IComponent implementation - public setLayout(layout: sqlops.DivLayout): void { + public setLayout(layout: azdata.DivLayout): void { this._height = this.convertSize(layout.height); this._width = this.convertSize(layout.width); this.layout(); @@ -98,17 +98,17 @@ export default class DivContainer extends ContainerBase im // CSS-bound properties public get overflowY(): string { - return this.getPropertyOrDefault((props) => props.overflowY, ''); + return this.getPropertyOrDefault((props) => props.overflowY, ''); } public set overflowY(newValue: string) { - this.setPropertyFromUI((properties, newValue) => { properties.overflowY = newValue; }, newValue); + this.setPropertyFromUI((properties, newValue) => { properties.overflowY = newValue; }, newValue); } public get yOffsetChange(): number { - return this.getPropertyOrDefault((props) => props.yOffsetChange, 0); + return this.getPropertyOrDefault((props) => props.yOffsetChange, 0); } public set yOffsetChange(newValue: number) { - this.setPropertyFromUI((properties, newValue) => { properties.yOffsetChange = newValue; }, newValue); + this.setPropertyFromUI((properties, newValue) => { properties.yOffsetChange = newValue; }, newValue); } private getItemOrder(item: DivItem): number { diff --git a/src/sql/parts/modelComponents/dom.component.ts b/src/sql/parts/modelComponents/dom.component.ts index 4154eed3f3..6f58a32255 100644 --- a/src/sql/parts/modelComponents/dom.component.ts +++ b/src/sql/parts/modelComponents/dom.component.ts @@ -10,7 +10,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as DOM from 'vs/base/browser/dom'; import { $, Builder } from 'sql/base/browser/builder'; @@ -83,10 +83,10 @@ export default class DomComponent extends ComponentBase implements IComponent, O // CSS-bound properties public get html(): string { - return this.getPropertyOrDefault((props) => props.html, ''); + return this.getPropertyOrDefault((props) => props.html, ''); } public set html(newValue: string) { - this.setPropertyFromUI((properties, html) => { properties.html = html; }, newValue); + this.setPropertyFromUI((properties, html) => { properties.html = html; }, newValue); } } diff --git a/src/sql/parts/modelComponents/dropdown.component.ts b/src/sql/parts/modelComponents/dropdown.component.ts index 6503bcd9c0..40f0cd36a0 100644 --- a/src/sql/parts/modelComponents/dropdown.component.ts +++ b/src/sql/parts/modelComponents/dropdown.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -128,7 +128,7 @@ export default class DropDownComponent extends ComponentBase implements ICompone if (!this.valuesHaveDisplayName()) { return this.values as string[]; } else { - return (this.values).map(v => v.displayName); + return (this.values).map(v => v.displayName); } } return []; @@ -140,8 +140,8 @@ export default class DropDownComponent extends ComponentBase implements ICompone private getSelectedValue(): string { if (this.values && this.values.length > 0 && this.valuesHaveDisplayName()) { - let selectedValue = this.value || this.values[0]; - let valueCategory = (this.values).find(v => v.name === selectedValue.name); + let selectedValue = this.value || this.values[0]; + let valueCategory = (this.values).find(v => v.name === selectedValue.name); return valueCategory && valueCategory.displayName; } else { if (!this.value && this.values && this.values.length > 0) { @@ -153,7 +153,7 @@ export default class DropDownComponent extends ComponentBase implements ICompone private setSelectedValue(newValue: string): void { if (this.values && this.valuesHaveDisplayName()) { - let valueCategory = (this.values).find(v => v.displayName === newValue); + let valueCategory = (this.values).find(v => v.displayName === newValue); this.value = valueCategory; } else { this.value = newValue; @@ -162,12 +162,12 @@ export default class DropDownComponent extends ComponentBase implements ICompone // CSS-bound properties - private get value(): string | sqlops.CategoryValue { - return this.getPropertyOrDefault((props) => props.value, ''); + private get value(): string | azdata.CategoryValue { + return this.getPropertyOrDefault((props) => props.value, ''); } private get editable(): boolean { - return this.getPropertyOrDefault((props) => props.editable, false); + return this.getPropertyOrDefault((props) => props.editable, false); } public getEditableDisplay(): string { @@ -178,23 +178,23 @@ export default class DropDownComponent extends ComponentBase implements ICompone return !this.editable ? '' : 'none'; } - private set value(newValue: string | sqlops.CategoryValue) { - this.setPropertyFromUI(this.setValueProperties, newValue); + private set value(newValue: string | azdata.CategoryValue) { + this.setPropertyFromUI(this.setValueProperties, newValue); } - private get values(): string[] | sqlops.CategoryValue[] { - return this.getPropertyOrDefault((props) => props.values, []); + private get values(): string[] | azdata.CategoryValue[] { + return this.getPropertyOrDefault((props) => props.values, []); } - private set values(newValue: string[] | sqlops.CategoryValue[]) { - this.setPropertyFromUI(this.setValuesProperties, newValue); + private set values(newValue: string[] | azdata.CategoryValue[]) { + this.setPropertyFromUI(this.setValuesProperties, newValue); } - private setValueProperties(properties: sqlops.DropDownProperties, value: string | sqlops.CategoryValue): void { + private setValueProperties(properties: azdata.DropDownProperties, value: string | azdata.CategoryValue): void { properties.value = value; } - private setValuesProperties(properties: sqlops.DropDownProperties, values: string[] | sqlops.CategoryValue[]): void { + private setValuesProperties(properties: azdata.DropDownProperties, values: string[] | azdata.CategoryValue[]): void { properties.values = values; } } diff --git a/src/sql/parts/modelComponents/editor.component.ts b/src/sql/parts/modelComponents/editor.component.ts index ff935ceb33..d13de3ef5d 100644 --- a/src/sql/parts/modelComponents/editor.component.ts +++ b/src/sql/parts/modelComponents/editor.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as DOM from 'vs/base/browser/dom'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITextModel } from 'vs/editor/common/model'; @@ -161,42 +161,42 @@ export default class EditorComponent extends ComponentBase implements IComponent // CSS-bound properties public get content(): string { - return this.getPropertyOrDefault((props) => props.content, undefined); + return this.getPropertyOrDefault((props) => props.content, undefined); } public set content(newValue: string) { - this.setPropertyFromUI((properties, content) => { properties.content = content; }, newValue); + this.setPropertyFromUI((properties, content) => { properties.content = content; }, newValue); } public get languageMode(): string { - return this.getPropertyOrDefault((props) => props.languageMode, undefined); + return this.getPropertyOrDefault((props) => props.languageMode, undefined); } public set languageMode(newValue: string) { - this.setPropertyFromUI((properties, languageMode) => { properties.languageMode = languageMode; }, newValue); + this.setPropertyFromUI((properties, languageMode) => { properties.languageMode = languageMode; }, newValue); } public get isAutoResizable(): boolean { - return this.getPropertyOrDefault((props) => props.isAutoResizable, false); + return this.getPropertyOrDefault((props) => props.isAutoResizable, false); } public set isAutoResizable(newValue: boolean) { - this.setPropertyFromUI((properties, isAutoResizable) => { properties.isAutoResizable = isAutoResizable; }, newValue); + this.setPropertyFromUI((properties, isAutoResizable) => { properties.isAutoResizable = isAutoResizable; }, newValue); } public get minimumHeight(): number { - return this.getPropertyOrDefault((props) => props.minimumHeight, this._editor.minimumHeight); + return this.getPropertyOrDefault((props) => props.minimumHeight, this._editor.minimumHeight); } public set minimumHeight(newValue: number) { - this.setPropertyFromUI((properties, minimumHeight) => { properties.minimumHeight = minimumHeight; }, newValue); + this.setPropertyFromUI((properties, minimumHeight) => { properties.minimumHeight = minimumHeight; }, newValue); } public get editorUri(): string { - return this.getPropertyOrDefault((props) => props.editorUri, ''); + return this.getPropertyOrDefault((props) => props.editorUri, ''); } public set editorUri(newValue: string) { - this.setPropertyFromUI((properties, editorUri) => { properties.editorUri = editorUri; }, newValue); + this.setPropertyFromUI((properties, editorUri) => { properties.editorUri = editorUri; }, newValue); } } diff --git a/src/sql/parts/modelComponents/fileBrowserTree.component.ts b/src/sql/parts/modelComponents/fileBrowserTree.component.ts index 049a732c08..b9a641e57c 100644 --- a/src/sql/parts/modelComponents/fileBrowserTree.component.ts +++ b/src/sql/parts/modelComponents/fileBrowserTree.component.ts @@ -7,7 +7,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -124,10 +124,10 @@ export default class FileBrowserTreeComponent extends ComponentBase implements I // CSS-bound properties public get ownerUri(): string { - return this.getPropertyOrDefault((props) => props.ownerUri, ''); + return this.getPropertyOrDefault((props) => props.ownerUri, ''); } public set ownerUri(newValue: string) { - this.setPropertyFromUI((props, value) => props.ownerUri = value, newValue); + this.setPropertyFromUI((props, value) => props.ownerUri = value, newValue); } } diff --git a/src/sql/parts/modelComponents/flexContainer.component.ts b/src/sql/parts/modelComponents/flexContainer.component.ts index f45bc58364..7af9106f62 100644 --- a/src/sql/parts/modelComponents/flexContainer.component.ts +++ b/src/sql/parts/modelComponents/flexContainer.component.ts @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; -import { FlexLayout, FlexItemLayout } from 'sqlops'; +import { FlexLayout, FlexItemLayout } from 'azdata'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; diff --git a/src/sql/parts/modelComponents/formContainer.component.ts b/src/sql/parts/modelComponents/formContainer.component.ts index b10ab6c3cc..6f5fd6a7df 100644 --- a/src/sql/parts/modelComponents/formContainer.component.ts +++ b/src/sql/parts/modelComponents/formContainer.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import { FormLayout, FormItemLayout } from 'sqlops'; +import { FormLayout, FormItemLayout } from 'azdata'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; diff --git a/src/sql/parts/modelComponents/groupContainer.component.ts b/src/sql/parts/modelComponents/groupContainer.component.ts index 8bdaf2d3e3..52d46c6e1a 100644 --- a/src/sql/parts/modelComponents/groupContainer.component.ts +++ b/src/sql/parts/modelComponents/groupContainer.component.ts @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import { GroupLayout, GroupItemLayout } from 'sqlops'; +import { GroupLayout, GroupItemLayout } from 'azdata'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; diff --git a/src/sql/parts/modelComponents/hyperlink.component.ts b/src/sql/parts/modelComponents/hyperlink.component.ts index 1a58a06118..f705c26236 100644 --- a/src/sql/parts/modelComponents/hyperlink.component.ts +++ b/src/sql/parts/modelComponents/hyperlink.component.ts @@ -8,7 +8,7 @@ import { OnDestroy, AfterViewInit, ElementRef } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; @@ -45,11 +45,11 @@ export default class HyperlinkComponent extends ComponentBase implements ICompon } public set label(newValue: string) { - this.setPropertyFromUI((properties, value) => { properties.label = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.label = value; }, newValue); } public get label(): string { - return this.getPropertyOrDefault((props) => props.label, ''); + return this.getPropertyOrDefault((props) => props.label, ''); } public getLabel(): string { @@ -57,11 +57,11 @@ export default class HyperlinkComponent extends ComponentBase implements ICompon } public set url(newValue: string) { - this.setPropertyFromUI((properties, value) => { properties.url = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.url = value; }, newValue); } public get url(): string { - return this.getPropertyOrDefault((props) => props.url, ''); + return this.getPropertyOrDefault((props) => props.url, ''); } public getUrl(): string { diff --git a/src/sql/parts/modelComponents/inputbox.component.ts b/src/sql/parts/modelComponents/inputbox.component.ts index 5a7669d75f..96cff0c8f3 100644 --- a/src/sql/parts/modelComponents/inputbox.component.ts +++ b/src/sql/parts/modelComponents/inputbox.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -211,82 +211,82 @@ export default class InputBoxComponent extends ComponentBase implements ICompone // CSS-bound properties public get value(): string { - return this.getPropertyOrDefault((props) => props.value, ''); + return this.getPropertyOrDefault((props) => props.value, ''); } public set value(newValue: string) { - this.setPropertyFromUI((props, value) => props.value = value, newValue); + this.setPropertyFromUI((props, value) => props.value = value, newValue); } public get ariaLabel(): string { - return this.getPropertyOrDefault((props) => props.ariaLabel, ''); + return this.getPropertyOrDefault((props) => props.ariaLabel, ''); } public set ariaLabel(newValue: string) { - this.setPropertyFromUI((props, value) => props.ariaLabel = value, newValue); + this.setPropertyFromUI((props, value) => props.ariaLabel = value, newValue); } public get placeHolder(): string { - return this.getPropertyOrDefault((props) => props.placeHolder, ''); + return this.getPropertyOrDefault((props) => props.placeHolder, ''); } public set placeHolder(newValue: string) { - this.setPropertyFromUI((props, value) => props.placeHolder = value, newValue); + this.setPropertyFromUI((props, value) => props.placeHolder = value, newValue); } public set columns(newValue: number) { - this.setPropertyFromUI((props, value) => props.columns = value, newValue); + this.setPropertyFromUI((props, value) => props.columns = value, newValue); } public get rows(): number { - return this.getPropertyOrDefault((props) => props.rows, undefined); + return this.getPropertyOrDefault((props) => props.rows, undefined); } public get columns(): number { - return this.getPropertyOrDefault((props) => props.columns, undefined); + return this.getPropertyOrDefault((props) => props.columns, undefined); } public set rows(newValue: number) { - this.setPropertyFromUI((props, value) => props.rows = value, newValue); + this.setPropertyFromUI((props, value) => props.rows = value, newValue); } public get min(): number { - return this.getPropertyOrDefault((props) => props.min, undefined); + return this.getPropertyOrDefault((props) => props.min, undefined); } public set min(newValue: number) { - this.setPropertyFromUI((props, value) => props.min = value, newValue); + this.setPropertyFromUI((props, value) => props.min = value, newValue); } public get max(): number { - return this.getPropertyOrDefault((props) => props.max, undefined); + return this.getPropertyOrDefault((props) => props.max, undefined); } public set max(newValue: number) { - this.setPropertyFromUI((props, value) => props.max = value, newValue); + this.setPropertyFromUI((props, value) => props.max = value, newValue); } public get inputType(): string { - return this.getPropertyOrDefault((props) => props.inputType, 'text'); + return this.getPropertyOrDefault((props) => props.inputType, 'text'); } public set inputType(newValue: string) { - this.setPropertyFromUI((props, value) => props.inputType = value, newValue); + this.setPropertyFromUI((props, value) => props.inputType = value, newValue); } public get multiline(): boolean { - return this.getPropertyOrDefault((props) => props.multiline, false); + return this.getPropertyOrDefault((props) => props.multiline, false); } public set multiline(newValue: boolean) { - this.setPropertyFromUI((props, value) => props.multiline = value, newValue); + this.setPropertyFromUI((props, value) => props.multiline = value, newValue); } public get required(): boolean { - return this.getPropertyOrDefault((props) => props.required, false); + return this.getPropertyOrDefault((props) => props.required, false); } public set required(newValue: boolean) { - this.setPropertyFromUI((props, value) => props.required = value, newValue); + this.setPropertyFromUI((props, value) => props.required = value, newValue); } } diff --git a/src/sql/parts/modelComponents/interfaces.ts b/src/sql/parts/modelComponents/interfaces.ts index 67fe11f11c..6808f6703d 100644 --- a/src/sql/parts/modelComponents/interfaces.ts +++ b/src/sql/parts/modelComponents/interfaces.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { InjectionToken } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/parts/modelComponents/listbox.component.ts b/src/sql/parts/modelComponents/listbox.component.ts index e16719b08f..cc6dee9b1c 100644 --- a/src/sql/parts/modelComponents/listbox.component.ts +++ b/src/sql/parts/modelComponents/listbox.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -91,18 +91,18 @@ export default class ListBoxComponent extends ComponentBase implements IComponen // CSS-bound properties private get values(): string[] { - return this.getPropertyOrDefault((props) => props.values, undefined); + return this.getPropertyOrDefault((props) => props.values, undefined); } private set values(newValue: string[]) { - this.setPropertyFromUI((props, value) => props.values = value, newValue); + this.setPropertyFromUI((props, value) => props.values = value, newValue); } private get selectedRow(): number { - return this.getPropertyOrDefault((props) => props.selectedRow, undefined); + return this.getPropertyOrDefault((props) => props.selectedRow, undefined); } private set selectedRow(newValue: number) { - this.setPropertyFromUI((props, value) => props.selectedRow = value, newValue); + this.setPropertyFromUI((props, value) => props.selectedRow = value, newValue); } } diff --git a/src/sql/parts/modelComponents/loadingComponent.component.ts b/src/sql/parts/modelComponents/loadingComponent.component.ts index 660cf0f7ba..4d82639fd9 100644 --- a/src/sql/parts/modelComponents/loadingComponent.component.ts +++ b/src/sql/parts/modelComponents/loadingComponent.component.ts @@ -8,7 +8,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef, OnDestroy, AfterViewInit, ElementRef } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; @@ -67,11 +67,11 @@ export default class LoadingComponent extends ComponentBase implements IComponen } public get loading(): boolean { - return this.getPropertyOrDefault((props) => props.loading, false); + return this.getPropertyOrDefault((props) => props.loading, false); } public set loading(newValue: boolean) { - this.setPropertyFromUI((properties, value) => { properties.loading = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.loading = value; }, newValue); this.layout(); } diff --git a/src/sql/parts/modelComponents/modelEditor/modelViewInput.ts b/src/sql/parts/modelComponents/modelEditor/modelViewInput.ts index fc56251d4b..59e3f0fbb8 100644 --- a/src/sql/parts/modelComponents/modelEditor/modelViewInput.ts +++ b/src/sql/parts/modelComponents/modelEditor/modelViewInput.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { IEditorModel } from 'vs/platform/editor/common/editor'; @@ -55,7 +55,7 @@ export class ModelViewInput extends EditorInput { private _dialogPane: DialogPane; constructor(private _title: string, private _model: ModelViewInputModel, - private _options: sqlops.ModelViewEditorOptions, + private _options: azdata.ModelViewEditorOptions, @IInstantiationService private _instantiationService: IInstantiationService, @IPartService private readonly _partService: IPartService ) { @@ -116,7 +116,7 @@ export class ModelViewInput extends EditorInput { return this._dialogPane; } - public get options(): sqlops.ModelViewEditorOptions { + public get options(): azdata.ModelViewEditorOptions { return this._options; } diff --git a/src/sql/parts/modelComponents/modelStore.ts b/src/sql/parts/modelComponents/modelStore.ts index c64f155a9b..7430bc4b32 100644 --- a/src/sql/parts/modelComponents/modelStore.ts +++ b/src/sql/parts/modelComponents/modelStore.ts @@ -7,7 +7,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; import { Deferred } from 'sql/base/common/promise'; diff --git a/src/sql/parts/modelComponents/modelViewContent.component.ts b/src/sql/parts/modelComponents/modelViewContent.component.ts index 87e593401c..2155c21160 100644 --- a/src/sql/parts/modelComponents/modelViewContent.component.ts +++ b/src/sql/parts/modelComponents/modelViewContent.component.ts @@ -16,7 +16,7 @@ import { IModelView } from 'sql/platform/model/common/modelViewService'; import { ViewBase } from 'sql/parts/modelComponents/viewBase'; import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; @Component({ selector: 'modelview-content', @@ -66,13 +66,13 @@ export class ModelViewContent extends ViewBase implements OnInit, IModelView { } @memoize - public get connection(): sqlops.connection.Connection { + public get connection(): azdata.connection.Connection { if (!this._commonService.connectionManagementService || !this._commonService.connectionManagementService.connectionInfo) { return undefined; } let currentConnection = this._commonService.connectionManagementService.connectionInfo.connectionProfile; - let connection: sqlops.connection.Connection = { + let connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options @@ -81,7 +81,7 @@ export class ModelViewContent extends ViewBase implements OnInit, IModelView { } @memoize - public get serverInfo(): sqlops.ServerInfo { + public get serverInfo(): azdata.ServerInfo { if (!this._commonService.connectionManagementService || !this._commonService.connectionManagementService.connectionInfo) { return undefined; } diff --git a/src/sql/parts/modelComponents/radioButton.component.ts b/src/sql/parts/modelComponents/radioButton.component.ts index f019beb421..3e7c6d4ea8 100644 --- a/src/sql/parts/modelComponents/radioButton.component.ts +++ b/src/sql/parts/modelComponents/radioButton.component.ts @@ -9,7 +9,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; @@ -84,19 +84,19 @@ export default class RadioButtonComponent extends ComponentBase implements IComp // CSS-bound properties public get checked(): boolean { - return this.getPropertyOrDefault((props) => props.checked, false); + return this.getPropertyOrDefault((props) => props.checked, false); } public set checked(newValue: boolean) { - this.setPropertyFromUI((properties, value) => { properties.checked = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.checked = value; }, newValue); } public set value(newValue: string) { - this.setPropertyFromUI((properties, value) => { properties.value = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.value = value; }, newValue); } public get value(): string { - return this.getPropertyOrDefault((props) => props.value, ''); + return this.getPropertyOrDefault((props) => props.value, ''); } public getLabel(): string { @@ -104,18 +104,18 @@ export default class RadioButtonComponent extends ComponentBase implements IComp } public get label(): string { - return this.getPropertyOrDefault((props) => props.label, ''); + return this.getPropertyOrDefault((props) => props.label, ''); } public set label(newValue: string) { - this.setPropertyFromUI((properties, label) => { properties.label = label; }, newValue); + this.setPropertyFromUI((properties, label) => { properties.label = label; }, newValue); } public get name(): string { - return this.getPropertyOrDefault((props) => props.name, ''); + return this.getPropertyOrDefault((props) => props.name, ''); } public set name(newValue: string) { - this.setPropertyFromUI((properties, label) => { properties.name = label; }, newValue); + this.setPropertyFromUI((properties, label) => { properties.name = label; }, newValue); } } diff --git a/src/sql/parts/modelComponents/table.component.ts b/src/sql/parts/modelComponents/table.component.ts index c5766b7d87..8c5f6f2146 100644 --- a/src/sql/parts/modelComponents/table.component.ts +++ b/src/sql/parts/modelComponents/table.component.ts @@ -9,7 +9,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -47,7 +47,7 @@ export default class TableComponent extends ComponentBase implements IComponent, } - transformColumns(columns: string[] | sqlops.TableColumn[]): Slick.Column[] { + transformColumns(columns: string[] | azdata.TableColumn[]): Slick.Column[] { let tableColumns: any[] = columns; if (tableColumns) { return (columns).map(col => { @@ -172,30 +172,30 @@ export default class TableComponent extends ComponentBase implements IComponent, // CSS-bound properties public get data(): any[][] { - return this.getPropertyOrDefault((props) => props.data, []); + return this.getPropertyOrDefault((props) => props.data, []); } public set data(newValue: any[][]) { - this.setPropertyFromUI((props, value) => props.data = value, newValue); + this.setPropertyFromUI((props, value) => props.data = value, newValue); } public get columns(): string[] { - return this.getPropertyOrDefault((props) => props.columns, []); + return this.getPropertyOrDefault((props) => props.columns, []); } public get fontSize(): number | string { - return this.getPropertyOrDefault((props) => props.fontSize, ''); + return this.getPropertyOrDefault((props) => props.fontSize, ''); } public set columns(newValue: string[]) { - this.setPropertyFromUI((props, value) => props.columns = value, newValue); + this.setPropertyFromUI((props, value) => props.columns = value, newValue); } public get selectedRows(): number[] { - return this.getPropertyOrDefault((props) => props.selectedRows, []); + return this.getPropertyOrDefault((props) => props.selectedRows, []); } public set selectedRows(newValue: number[]) { - this.setPropertyFromUI((props, value) => props.selectedRows = value, newValue); + this.setPropertyFromUI((props, value) => props.selectedRows = value, newValue); } } diff --git a/src/sql/parts/modelComponents/text.component.ts b/src/sql/parts/modelComponents/text.component.ts index f171142322..724d774a71 100644 --- a/src/sql/parts/modelComponents/text.component.ts +++ b/src/sql/parts/modelComponents/text.component.ts @@ -9,7 +9,7 @@ import { OnDestroy, AfterViewInit, ElementRef, SecurityContext } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; @@ -52,15 +52,15 @@ export default class TextComponent extends ComponentBase implements IComponent, } public set value(newValue: string) { - this.setPropertyFromUI((properties, value) => { properties.value = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.value = value; }, newValue); } public get value(): string { - return this.getPropertyOrDefault((props) => props.value, ''); + return this.getPropertyOrDefault((props) => props.value, ''); } public getValue(): SafeHtml { - let links = this.getPropertyOrDefault((props) => props.links, []); + let links = this.getPropertyOrDefault((props) => props.links, []); let text = this._domSanitizer.sanitize(SecurityContext.HTML, this.value); if (links.length !== 0) { for (let i: number = 0; i < links.length; i++) { diff --git a/src/sql/parts/modelComponents/tree/tree.component.ts b/src/sql/parts/modelComponents/tree/tree.component.ts index 6ca21bcb87..bc468657b4 100644 --- a/src/sql/parts/modelComponents/tree/tree.component.ts +++ b/src/sql/parts/modelComponents/tree/tree.component.ts @@ -10,7 +10,7 @@ import { ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; @@ -155,10 +155,10 @@ export default class TreeComponent extends ComponentBase implements IComponent, } public get withCheckbox(): boolean { - return this.getPropertyOrDefault((props) => props.withCheckbox, false); + return this.getPropertyOrDefault((props) => props.withCheckbox, false); } public set withCheckbox(newValue: boolean) { - this.setPropertyFromUI((properties, value) => { properties.withCheckbox = value; }, newValue); + this.setPropertyFromUI((properties, value) => { properties.withCheckbox = value; }, newValue); } } diff --git a/src/sql/parts/modelComponents/viewBase.ts b/src/sql/parts/modelComponents/viewBase.ts index b1ccf62bae..b59faad4e2 100644 --- a/src/sql/parts/modelComponents/viewBase.ts +++ b/src/sql/parts/modelComponents/viewBase.ts @@ -9,7 +9,7 @@ import { ChangeDetectorRef } from '@angular/core'; import { Registry } from 'vs/platform/registry/common/platform'; import nls = require('vs/nls'); -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IModelView, IModelViewEventArgs } from 'sql/platform/model/common/modelViewService'; @@ -36,8 +36,8 @@ export abstract class ViewBase extends AngularDisposable implements IModelView { // Properties needed by the model view code abstract id: string; - abstract connection: sqlops.connection.Connection; - abstract serverInfo: sqlops.ServerInfo; + abstract connection: azdata.connection.Connection; + abstract serverInfo: azdata.ServerInfo; private _onEventEmitter = new Emitter(); initializeModel(rootComponent: IComponentShape, validationCallback: (componentId: string) => Thenable): void { diff --git a/src/sql/parts/modelComponents/webview.component.ts b/src/sql/parts/modelComponents/webview.component.ts index b10b0801a3..1c675b4142 100644 --- a/src/sql/parts/modelComponents/webview.component.ts +++ b/src/sql/parts/modelComponents/webview.component.ts @@ -8,7 +8,7 @@ import { ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList } from '@angular/core'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { Parts, IPartService } from 'vs/workbench/services/part/common/partService'; @@ -165,27 +165,27 @@ export default class WebViewComponent extends ComponentBase implements IComponen // CSS-bound properties public get message(): any { - return this.getPropertyOrDefault((props) => props.message, undefined); + return this.getPropertyOrDefault((props) => props.message, undefined); } public set message(newValue: any) { - this.setPropertyFromUI((properties, message) => { properties.message = message; }, newValue); + this.setPropertyFromUI((properties, message) => { properties.message = message; }, newValue); } public get html(): string { - return this.getPropertyOrDefault((props) => props.html, undefined); + return this.getPropertyOrDefault((props) => props.html, undefined); } public set html(newValue: string) { - this.setPropertyFromUI((properties, html) => { properties.html = html; }, newValue); + this.setPropertyFromUI((properties, html) => { properties.html = html; }, newValue); } public get options(): vscode.WebviewOptions { - return this.getPropertyOrDefault((props) => props.options, undefined); + return this.getPropertyOrDefault((props) => props.options, undefined); } public get extensionLocation(): UriComponents { - return this.getPropertyOrDefault((props) => props.extensionLocation, undefined); + return this.getPropertyOrDefault((props) => props.extensionLocation, undefined); } private get extensionLocationUri(): URI { diff --git a/src/sql/parts/notebook/cellViews/codeActions.ts b/src/sql/parts/notebook/cellViews/codeActions.ts index f07522ebdc..b5ad68b4f7 100644 --- a/src/sql/parts/notebook/cellViews/codeActions.ts +++ b/src/sql/parts/notebook/cellViews/codeActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { Action } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/sql/parts/notebook/cellViews/output.component.ts b/src/sql/parts/notebook/cellViews/output.component.ts index 09f581609d..5e534b7d0d 100644 --- a/src/sql/parts/notebook/cellViews/output.component.ts +++ b/src/sql/parts/notebook/cellViews/output.component.ts @@ -6,7 +6,7 @@ import 'vs/css!./code'; import { OnInit, Component, Input, Inject, ElementRef, ViewChild } from '@angular/core'; import { AngularDisposable } from 'sql/base/node/lifecycle'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; import { MimeModel } from 'sql/parts/notebook/outputs/common/mimemodel'; import * as outputProcessor from 'sql/parts/notebook/outputs/common/outputProcessor'; diff --git a/src/sql/parts/notebook/models/cell.ts b/src/sql/parts/notebook/models/cell.ts index 9415f562d0..17182eceff 100644 --- a/src/sql/parts/notebook/models/cell.ts +++ b/src/sql/parts/notebook/models/cell.ts @@ -6,7 +6,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/parts/notebook/models/clientSession.ts b/src/sql/parts/notebook/models/clientSession.ts index 6e2eafd969..ec9ff8c2b1 100644 --- a/src/sql/parts/notebook/models/clientSession.ts +++ b/src/sql/parts/notebook/models/clientSession.ts @@ -8,7 +8,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as nls from 'vs/nls'; import { URI } from 'vs/base/common/uri'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/notebook/models/modelFactory.ts b/src/sql/parts/notebook/models/modelFactory.ts index d224b6fa7e..f1f31a968a 100644 --- a/src/sql/parts/notebook/models/modelFactory.ts +++ b/src/sql/parts/notebook/models/modelFactory.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { CellModel } from './cell'; import { IClientSession, IClientSessionOptions, ICellModelOptions, ICellModel, IModelFactory } from './modelInterfaces'; diff --git a/src/sql/parts/notebook/models/modelInterfaces.ts b/src/sql/parts/notebook/models/modelInterfaces.ts index 4a2b39d1f2..bec0f3d9b9 100644 --- a/src/sql/parts/notebook/models/modelInterfaces.ts +++ b/src/sql/parts/notebook/models/modelInterfaces.ts @@ -8,7 +8,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { Event } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/parts/notebook/models/nbformat.ts b/src/sql/parts/notebook/models/nbformat.ts index 7ef637978a..4573bde37b 100644 --- a/src/sql/parts/notebook/models/nbformat.ts +++ b/src/sql/parts/notebook/models/nbformat.ts @@ -7,7 +7,7 @@ import { JSONObject } from './jsonext'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; /** * A namespace for nbformat interfaces. diff --git a/src/sql/parts/notebook/models/notebookContexts.ts b/src/sql/parts/notebook/models/notebookContexts.ts index 2c8b87e459..618149cb1d 100644 --- a/src/sql/parts/notebook/models/notebookContexts.ts +++ b/src/sql/parts/notebook/models/notebookContexts.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { localize } from 'vs/nls'; import { IDefaultConnection, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces'; diff --git a/src/sql/parts/notebook/models/notebookModel.ts b/src/sql/parts/notebook/models/notebookModel.ts index 8d527a4511..44b50b8d3d 100644 --- a/src/sql/parts/notebook/models/notebookModel.ts +++ b/src/sql/parts/notebook/models/notebookModel.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb, connection } from 'sqlops'; +import { nb, connection } from 'azdata'; import { localize } from 'vs/nls'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/notebook/notebookActions.ts b/src/sql/parts/notebook/notebookActions.ts index f1dcadb555..9dde306240 100644 --- a/src/sql/parts/notebook/notebookActions.ts +++ b/src/sql/parts/notebook/notebookActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Action } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -258,7 +258,7 @@ export class KernelsDropdown extends SelectBox { this.updateKernel(defaultKernel); }); if (model.clientSession) { - model.clientSession.kernelChanged((changedArgs: sqlops.nb.IKernelChangedArgs) => { + model.clientSession.kernelChanged((changedArgs: azdata.nb.IKernelChangedArgs) => { if (changedArgs.newValue) { this.updateKernel(changedArgs.newValue); } @@ -267,7 +267,7 @@ export class KernelsDropdown extends SelectBox { } // Update SelectBox values - private updateKernel(defaultKernel: sqlops.nb.IKernelSpec) { + private updateKernel(defaultKernel: azdata.nb.IKernelSpec) { let specs = this.model.specs; if (specs && specs.kernels) { let index = specs.kernels.findIndex((kernel => kernel.name === defaultKernel.name)); diff --git a/src/sql/parts/notebook/notebookInput.ts b/src/sql/parts/notebook/notebookInput.ts index c9dda4f84d..6a856d825f 100644 --- a/src/sql/parts/notebook/notebookInput.ts +++ b/src/sql/parts/notebook/notebookInput.ts @@ -12,7 +12,7 @@ import { EditorInput, EditorModel, ConfirmResult } from 'vs/workbench/common/edi import { Emitter, Event } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IStandardKernelWithProvider } from 'sql/parts/notebook/notebookUtils'; import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/common/notebookService'; @@ -27,7 +27,7 @@ export class NotebookInputModel extends EditorModel { private readonly _onDidChangeDirty: Emitter = this._register(new Emitter()); private _providerId: string; private _standardKernels: IStandardKernelWithProvider[]; - private _defaultKernel: sqlops.nb.IKernelSpec; + private _defaultKernel: azdata.nb.IKernelSpec; constructor(public readonly notebookUri: URI, private readonly handle: number, private _isTrusted: boolean = false, @@ -76,11 +76,11 @@ export class NotebookInputModel extends EditorModel { }); } - public get defaultKernel(): sqlops.nb.IKernelSpec { + public get defaultKernel(): azdata.nb.IKernelSpec { return this._defaultKernel; } - public set defaultKernel(kernel: sqlops.nb.IKernelSpec) { + public set defaultKernel(kernel: azdata.nb.IKernelSpec) { this._defaultKernel = kernel; } @@ -150,7 +150,7 @@ export class NotebookInput extends EditorInput { return this._model.standardKernels; } - public get defaultKernel(): sqlops.nb.IKernelSpec { + public get defaultKernel(): azdata.nb.IKernelSpec { return this._model.defaultKernel; } diff --git a/src/sql/parts/notebook/notebookUtils.ts b/src/sql/parts/notebook/notebookUtils.ts index 1109ee51b9..297a61c63e 100644 --- a/src/sql/parts/notebook/notebookUtils.ts +++ b/src/sql/parts/notebook/notebookUtils.ts @@ -6,7 +6,7 @@ 'use strict'; import * as path from 'path'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as os from 'os'; import * as pfs from 'vs/base/node/pfs'; import { localize } from 'vs/nls'; diff --git a/src/sql/parts/notebook/outputs/common/outputProcessor.ts b/src/sql/parts/notebook/outputs/common/outputProcessor.ts index b684918646..a687f9c8f6 100644 --- a/src/sql/parts/notebook/outputs/common/outputProcessor.ts +++ b/src/sql/parts/notebook/outputs/common/outputProcessor.ts @@ -7,7 +7,7 @@ import { JSONObject, isPrimitive } from '../../models/jsonext'; import { MimeModel } from './mimemodel'; import { nbformat } from '../../models/nbformat'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; /** * A multiline string. diff --git a/src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts b/src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts index bc1fc69cfe..016196275b 100644 --- a/src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts +++ b/src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts @@ -13,7 +13,7 @@ import { Deferred } from 'sql/base/common/promise'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; import { TreeItemCollapsibleState } from 'vs/workbench/common/views'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/objectExplorer/common/treeNode.ts b/src/sql/parts/objectExplorer/common/treeNode.ts index 66a2538e76..9da3bc6c3f 100644 --- a/src/sql/parts/objectExplorer/common/treeNode.ts +++ b/src/sql/parts/objectExplorer/common/treeNode.ts @@ -7,7 +7,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { NodeType, SqlThemeIcon } from 'sql/parts/objectExplorer/common/nodeType'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as UUID from 'vs/base/common/uuid'; @@ -87,14 +87,14 @@ export class TreeNode { public connection: ConnectionProfile; - public session: sqlops.ObjectExplorerSession; + public session: azdata.ObjectExplorerSession; - public metadata: sqlops.ObjectMetadata; + public metadata: azdata.ObjectMetadata; public iconType: string | SqlThemeIcon; constructor(nodeTypeId: string, label: string, isAlwaysLeaf: boolean, nodePath: string, - nodeSubType: string, nodeStatus: string, parent: TreeNode, metadata: sqlops.ObjectMetadata, + nodeSubType: string, nodeStatus: string, parent: TreeNode, metadata: azdata.ObjectMetadata, iconType: string | SqlThemeIcon, private _objectExplorerCallbacks: ObjectExplorerCallbacks) { this.nodeTypeId = nodeTypeId; @@ -131,7 +131,7 @@ export class TreeNode { return undefined; } - public getSession(): sqlops.ObjectExplorerSession { + public getSession(): azdata.ObjectExplorerSession { var currentNode: TreeNode = this; while (!currentNode.session && currentNode.parent) { currentNode = currentNode.parent; @@ -146,8 +146,8 @@ export class TreeNode { return false; } - public toNodeInfo(): sqlops.NodeInfo { - return { + public toNodeInfo(): azdata.NodeInfo { + return { nodePath: this.nodePath, nodeType: this.nodeTypeId, nodeSubType: this.nodeSubType, diff --git a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts index 77d9b75f5f..6f6bbf16e7 100644 --- a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts +++ b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts @@ -11,7 +11,7 @@ import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { @@ -32,9 +32,9 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -export class ObjectExplorerActionsContext implements sqlops.ObjectExplorerContext { - public connectionProfile: sqlops.IConnectionProfile; - public nodeInfo: sqlops.NodeInfo; +export class ObjectExplorerActionsContext implements azdata.ObjectExplorerContext { + public connectionProfile: azdata.IConnectionProfile; + public nodeInfo: azdata.NodeInfo; public isConnectionNode: boolean = false; } diff --git a/src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts b/src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts index 78a620028c..0063f58e15 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts @@ -6,7 +6,7 @@ 'use strict'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; export class TreeNodeContextKey implements IContextKey { diff --git a/src/sql/parts/profiler/editor/profilerInput.ts b/src/sql/parts/profiler/editor/profilerInput.ts index d58562402d..ec7a3abffd 100644 --- a/src/sql/parts/profiler/editor/profilerInput.ts +++ b/src/sql/parts/profiler/editor/profilerInput.ts @@ -8,7 +8,7 @@ import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTem import { ProfilerState } from './profilerState'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -199,7 +199,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession { return this._filter; } - public onSessionStopped(notification: sqlops.ProfilerSessionStoppedParams) { + public onSessionStopped(notification: azdata.ProfilerSessionStoppedParams) { this._notificationService.error(nls.localize("profiler.sessionStopped", "XEvent Profiler Session stopped unexpectedly on the server {0}.", this.connection.serverName)); this.state.change({ @@ -209,7 +209,7 @@ export class ProfilerInput extends EditorInput implements IProfilerSession { }); } - public onProfilerSessionCreated(params: sqlops.ProfilerSessionCreatedParams) { + public onProfilerSessionCreated(params: azdata.ProfilerSessionCreatedParams) { if (types.isUndefinedOrNull(params.sessionName) || types.isUndefinedOrNull(params.templateName)) { this._notificationService.error(nls.localize("profiler.sessionCreationError", "Error while starting new session")); } else { @@ -239,14 +239,14 @@ export class ProfilerInput extends EditorInput implements IProfilerSession { this.state.change(state); } - public onMoreRows(eventMessage: sqlops.ProfilerSessionEvents) { + public onMoreRows(eventMessage: azdata.ProfilerSessionEvents) { if (eventMessage.eventsLost) { this._notificationService.warn(nls.localize("profiler.eventsLost", "The XEvent Profiler session for {0} has lost events.", this.connection.serverName)); } let newEvents = []; for (let i: number = 0; i < eventMessage.events.length && i < 500; ++i) { - let e: sqlops.ProfilerEvent = eventMessage.events[i]; + let e: azdata.ProfilerEvent = eventMessage.events[i]; let data = {}; data['EventClass'] = e.name; data['StartTime'] = e.timestamp; diff --git a/src/sql/parts/query/common/flavorStatus.ts b/src/sql/parts/query/common/flavorStatus.ts index a8acffebcd..a3599e8a14 100644 --- a/src/sql/parts/query/common/flavorStatus.ts +++ b/src/sql/parts/query/common/flavorStatus.ts @@ -20,7 +20,7 @@ import nls = require('vs/nls'); import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import { DidChangeLanguageFlavorParams } from 'sqlops'; +import { DidChangeLanguageFlavorParams } from 'azdata'; import Severity from 'vs/base/common/severity'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor'; diff --git a/src/sql/parts/query/common/queryInput.ts b/src/sql/parts/query/common/queryInput.ts index 477880b0b4..3614839e6c 100644 --- a/src/sql/parts/query/common/queryInput.ts +++ b/src/sql/parts/query/common/queryInput.ts @@ -18,7 +18,7 @@ import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { ISelectionData, ExecutionPlanOptions } from 'sqlops'; +import { ISelectionData, ExecutionPlanOptions } from 'azdata'; const MAX_SIZE = 13; diff --git a/src/sql/parts/query/editor/gridPanel.ts b/src/sql/parts/query/editor/gridPanel.ts index 5cc4f193af..1660b9355d 100644 --- a/src/sql/parts/query/editor/gridPanel.ts +++ b/src/sql/parts/query/editor/gridPanel.ts @@ -25,7 +25,7 @@ import { ITableStyles, ITableMouseEvent } from 'sql/base/browser/ui/table/interf import { warn } from 'sql/base/common/log'; import { $ } from 'sql/base/browser/builder'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; @@ -187,7 +187,7 @@ export class GridPanel extends ViewletPanel { } this.reset(); })); - this.addResultSet(this.runner.batchSets.reduce((p, e) => { + this.addResultSet(this.runner.batchSets.reduce((p, e) => { if (this.configurationService.getValue('sql.results.streaming')) { p = p.concat(e.resultSetSummaries); } else { @@ -204,8 +204,8 @@ export class GridPanel extends ViewletPanel { } } - private onResultSet(resultSet: sqlops.ResultSetSummary | sqlops.ResultSetSummary[]) { - let resultsToAdd: sqlops.ResultSetSummary[]; + private onResultSet(resultSet: azdata.ResultSetSummary | azdata.ResultSetSummary[]) { + let resultsToAdd: azdata.ResultSetSummary[]; if (!Array.isArray(resultSet)) { resultsToAdd = [resultSet]; } else { @@ -237,8 +237,8 @@ export class GridPanel extends ViewletPanel { } } - private updateResultSet(resultSet: sqlops.ResultSetSummary | sqlops.ResultSetSummary[]) { - let resultsToUpdate: sqlops.ResultSetSummary[]; + private updateResultSet(resultSet: azdata.ResultSetSummary | azdata.ResultSetSummary[]) { + let resultsToUpdate: azdata.ResultSetSummary[]; if (!Array.isArray(resultSet)) { resultsToUpdate = [resultSet]; } else { @@ -274,7 +274,7 @@ export class GridPanel extends ViewletPanel { } } - private addResultSet(resultSet: sqlops.ResultSetSummary[]) { + private addResultSet(resultSet: azdata.ResultSetSummary[]) { let tables: GridTable[] = []; for (let set of resultSet) { @@ -406,7 +406,7 @@ class GridTable extends Disposable implements IView { private scrolled = false; private visible = false; - public get resultSet(): sqlops.ResultSetSummary { + public get resultSet(): azdata.ResultSetSummary { return this._resultSet; } @@ -417,7 +417,7 @@ class GridTable extends Disposable implements IView { constructor( private runner: QueryRunner, - private _resultSet: sqlops.ResultSetSummary, + private _resultSet: azdata.ResultSetSummary, state: GridTableState, @IContextMenuService private contextMenuService: IContextMenuService, @IInstantiationService private instantiationService: IInstantiationService, @@ -647,7 +647,7 @@ class GridTable extends Disposable implements IView { } } - public updateResult(resultSet: sqlops.ResultSetSummary) { + public updateResult(resultSet: azdata.ResultSetSummary) { this._resultSet = resultSet; if (this.table && this.visible) { this.dataProvider.length = resultSet.rowCount; diff --git a/src/sql/parts/query/editor/messagePanel.ts b/src/sql/parts/query/editor/messagePanel.ts index e8cc151d55..4f001caa86 100644 --- a/src/sql/parts/query/editor/messagePanel.ts +++ b/src/sql/parts/query/editor/messagePanel.ts @@ -10,7 +10,7 @@ import QueryRunner from 'sql/platform/query/common/queryRunner'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { $ } from 'sql/base/browser/builder'; -import { IResultMessage, ISelectionData } from 'sqlops'; +import { IResultMessage, ISelectionData } from 'azdata'; import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet'; import { IDataSource, ITree, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/parts/query/editor/queryEditor.ts b/src/sql/parts/query/editor/queryEditor.ts index 6b3dcf016d..d1406e2f61 100644 --- a/src/sql/parts/query/editor/queryEditor.ts +++ b/src/sql/parts/query/editor/queryEditor.ts @@ -27,7 +27,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; -import { ISelectionData } from 'sqlops'; +import { ISelectionData } from 'azdata'; import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { IDisposable } from 'vs/base/common/lifecycle'; import { IRange } from 'vs/editor/common/core/range'; diff --git a/src/sql/parts/query/execution/keyboardQueryActions.ts b/src/sql/parts/query/execution/keyboardQueryActions.ts index a4218083b3..228f443d1a 100644 --- a/src/sql/parts/query/execution/keyboardQueryActions.ts +++ b/src/sql/parts/query/execution/keyboardQueryActions.ts @@ -10,7 +10,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { TPromise } from 'vs/base/common/winjs.base'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; @@ -341,7 +341,7 @@ export class RunQueryShortcutAction extends Action { return TPromise.as(''); } - private isProcWithSingleArgument(result: sqlops.SimpleExecuteResult): number { + private isProcWithSingleArgument(result: azdata.SimpleExecuteResult): number { let columnTypeOrdinal = this.getColumnIndex(result.columnInfo, 'COLUMN_TYPE'); let dataTypeOrdinal = this.getColumnIndex(result.columnInfo, 'DATA_TYPE'); if (columnTypeOrdinal && dataTypeOrdinal) { @@ -375,7 +375,7 @@ export class RunQueryShortcutAction extends Action { return -1; // Couldn't process so return default value } - private getColumnIndex(columnInfo: sqlops.IDbColumn[], columnName: string): number { + private getColumnIndex(columnInfo: azdata.IDbColumn[], columnName: string): number { return columnInfo ? columnInfo.findIndex(c => c.columnName === columnName) : undefined; } diff --git a/src/sql/parts/query/execution/queryActions.ts b/src/sql/parts/query/execution/queryActions.ts index db7176aeb4..ea053a9dc2 100644 --- a/src/sql/parts/query/execution/queryActions.ts +++ b/src/sql/parts/query/execution/queryActions.ts @@ -15,7 +15,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler'; -import { ISelectionData } from 'sqlops'; +import { ISelectionData } from 'azdata'; import { IConnectionManagementService, IConnectionParams, diff --git a/src/sql/platform/accountManagement/browser/accountPicker.ts b/src/sql/platform/accountManagement/browser/accountPicker.ts index daa17e4e12..ab0c81b8d5 100644 --- a/src/sql/platform/accountManagement/browser/accountPicker.ts +++ b/src/sql/platform/accountManagement/browser/accountPicker.ts @@ -19,7 +19,7 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList'; import { attachDropdownStyler } from 'sql/platform/theme/common/styler'; import { AddAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions'; @@ -29,7 +29,7 @@ import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/ac export class AccountPicker extends Disposable { public static ACCOUNTPICKERLIST_HEIGHT = 47; public viewModel: AccountPickerViewModel; - private _accountList: List; + private _accountList: List; private _rootElement: HTMLElement; private _refreshContainer: HTMLElement; private _listContainer: HTMLElement; @@ -46,8 +46,8 @@ export class AccountPicker extends Disposable { private _addAccountStartEmitter: Emitter; public get addAccountStartEvent(): Event { return this._addAccountStartEmitter.event; } - private _onAccountSelectionChangeEvent: Emitter; - public get onAccountSelectionChangeEvent(): Event { return this._onAccountSelectionChangeEvent.event; } + private _onAccountSelectionChangeEvent: Emitter; + public get onAccountSelectionChangeEvent(): Event { return this._onAccountSelectionChangeEvent.event; } constructor( private _providerId: string, @@ -61,7 +61,7 @@ export class AccountPicker extends Disposable { this._addAccountCompleteEmitter = new Emitter(); this._addAccountErrorEmitter = new Emitter(); this._addAccountStartEmitter = new Emitter(); - this._onAccountSelectionChangeEvent = new Emitter(); + this._onAccountSelectionChangeEvent = new Emitter(); // Create the view model, wire up the events, and initialize with baseline data this.viewModel = this._instantiationService.createInstance(AccountPickerViewModel, this._providerId); @@ -89,7 +89,7 @@ export class AccountPicker extends Disposable { let delegate = new AccountListDelegate(AccountPicker.ACCOUNTPICKERLIST_HEIGHT); let accountRenderer = new AccountPickerListRenderer(); this._listContainer = DOM.$('div.account-list-container'); - this._accountList = new List(this._listContainer, delegate, [accountRenderer]); + this._accountList = new List(this._listContainer, delegate, [accountRenderer]); this._register(attachListStyler(this._accountList, this._themeService)); this._rootElement = DOM.$('div.account-picker-container'); @@ -108,7 +108,7 @@ export class AccountPicker extends Disposable { this._dropdown = this._register(new DropdownList(this._rootElement, option, this._listContainer, this._accountList, this._themeService, addAccountAction)); this._register(attachDropdownStyler(this._dropdown, this._themeService)); - this._register(this._accountList.onSelectionChange((e: IListEvent) => { + this._register(this._accountList.onSelectionChange((e: IListEvent) => { if (e.elements.length === 1) { this._dropdown.renderLabel(); this.onAccountSelectionChange(e.elements[0]); @@ -134,7 +134,7 @@ export class AccountPicker extends Disposable { // Load the initial contents of the view model this.viewModel.initialize() - .then((accounts: sqlops.Account[]) => { + .then((accounts: azdata.Account[]) => { this.updateAccountList(accounts); }); } @@ -147,7 +147,7 @@ export class AccountPicker extends Disposable { } // PRIVATE HELPERS ///////////////////////////////////////////////////// - private onAccountSelectionChange(account: sqlops.Account) { + private onAccountSelectionChange(account: azdata.Account) { this.viewModel.selectedAccount = account; if (account && account.isStale) { this._refreshAccountAction.account = account; @@ -194,7 +194,7 @@ export class AccountPicker extends Disposable { return null; } - private updateAccountList(accounts: sqlops.Account[]): void { + private updateAccountList(accounts: azdata.Account[]): void { // keep the selection to the current one let selectedElements = this._accountList.getSelectedElements(); diff --git a/src/sql/platform/accountManagement/browser/accountPickerService.ts b/src/sql/platform/accountManagement/browser/accountPickerService.ts index efcb3f8d5f..c7dbb7f1e9 100644 --- a/src/sql/platform/accountManagement/browser/accountPickerService.ts +++ b/src/sql/platform/accountManagement/browser/accountPickerService.ts @@ -6,7 +6,7 @@ 'use strict'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Event, Emitter } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; import { AccountPicker } from 'sql/platform/accountManagement/browser/accountPicker'; @@ -26,8 +26,8 @@ export class AccountPickerService implements IAccountPickerService { private _addAccountStartEmitter: Emitter; public get addAccountStartEvent(): Event { return this._addAccountStartEmitter.event; } - private _onAccountSelectionChangeEvent: Emitter; - public get onAccountSelectionChangeEvent(): Event { return this._onAccountSelectionChangeEvent.event; } + private _onAccountSelectionChangeEvent: Emitter; + public get onAccountSelectionChangeEvent(): Event { return this._onAccountSelectionChangeEvent.event; } constructor( @IInstantiationService private _instantiationService: IInstantiationService @@ -36,13 +36,13 @@ export class AccountPickerService implements IAccountPickerService { this._addAccountCompleteEmitter = new Emitter(); this._addAccountErrorEmitter = new Emitter(); this._addAccountStartEmitter = new Emitter(); - this._onAccountSelectionChangeEvent = new Emitter(); + this._onAccountSelectionChangeEvent = new Emitter(); } /** * Get selected account */ - public get selectedAccount(): sqlops.Account { + public get selectedAccount(): azdata.Account { return this._accountPicker.viewModel.selectedAccount; } diff --git a/src/sql/platform/accountManagement/common/accountPicker.ts b/src/sql/platform/accountManagement/common/accountPicker.ts index 35f7403fc0..99bd9a43d4 100644 --- a/src/sql/platform/accountManagement/common/accountPicker.ts +++ b/src/sql/platform/accountManagement/common/accountPicker.ts @@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export const IAccountPickerService = createDecorator('AccountPickerService'); export interface IAccountPickerService { @@ -17,6 +17,6 @@ export interface IAccountPickerService { addAccountCompleteEvent: Event; addAccountErrorEvent: Event; addAccountStartEvent: Event; - onAccountSelectionChangeEvent: Event; - selectedAccount: sqlops.Account; + onAccountSelectionChangeEvent: Event; + selectedAccount: azdata.Account; } diff --git a/src/sql/platform/accountManagement/common/accountPickerViewModel.ts b/src/sql/platform/accountManagement/common/accountPickerViewModel.ts index f08a888251..3cf37ec88f 100644 --- a/src/sql/platform/accountManagement/common/accountPickerViewModel.ts +++ b/src/sql/platform/accountManagement/common/accountPickerViewModel.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; @@ -18,7 +18,7 @@ export class AccountPickerViewModel { private _updateAccountListEmitter: Emitter; public get updateAccountListEvent(): Event { return this._updateAccountListEmitter.event; } - public selectedAccount: sqlops.Account; + public selectedAccount: azdata.Account; constructor( private _providerId: string, @@ -38,7 +38,7 @@ export class AccountPickerViewModel { * Loads an initial list of accounts from the account management service * @return {Thenable} Promise to return the list of accounts */ - public initialize(): Thenable { + public initialize(): Thenable { // Load a baseline of the accounts for the provider return this._accountManagementService.getAccountsForProvider(this._providerId) .then(null, () => { diff --git a/src/sql/platform/accountManagement/common/accountStore.ts b/src/sql/platform/accountManagement/common/accountStore.ts index d5c08d035b..8f1a03f73f 100644 --- a/src/sql/platform/accountManagement/common/accountStore.ts +++ b/src/sql/platform/accountManagement/common/accountStore.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { AccountAdditionResult } from 'sql/platform/accountManagement/common/eventTypes'; import { IAccountStore } from 'sql/platform/accountManagement/common/interfaces'; @@ -19,7 +19,7 @@ export default class AccountStore implements IAccountStore { constructor(private _memento: object) { } // PUBLIC METHODS ////////////////////////////////////////////////////// - public addOrUpdate(newAccount: sqlops.Account): Thenable { + public addOrUpdate(newAccount: azdata.Account): Thenable { let self = this; return this.doOperation(() => { @@ -36,7 +36,7 @@ export default class AccountStore implements IAccountStore { }); } - public getAccountsByProvider(providerId: string): Thenable { + public getAccountsByProvider(providerId: string): Thenable { let self = this; return this.doOperation(() => { @@ -45,7 +45,7 @@ export default class AccountStore implements IAccountStore { }); } - public getAllAccounts(): Thenable { + public getAllAccounts(): Thenable { let self = this; return this.doOperation(() => { @@ -53,7 +53,7 @@ export default class AccountStore implements IAccountStore { }); } - public remove(key: sqlops.AccountKey): Thenable { + public remove(key: azdata.AccountKey): Thenable { let self = this; return this.doOperation(() => { @@ -64,7 +64,7 @@ export default class AccountStore implements IAccountStore { }); } - public update(key: sqlops.AccountKey, updateOperation: (account: sqlops.Account) => void): Thenable { + public update(key: azdata.AccountKey, updateOperation: (account: azdata.Account) => void): Thenable { let self = this; return this.doOperation(() => { @@ -76,12 +76,12 @@ export default class AccountStore implements IAccountStore { } // PRIVATE METHODS ///////////////////////////////////////////////////// - private static findAccountByKey(key1: sqlops.AccountKey, key2: sqlops.AccountKey): boolean { + private static findAccountByKey(key1: azdata.AccountKey, key2: azdata.AccountKey): boolean { // Provider ID and Account ID must match return key1.providerId === key2.providerId && key1.accountId === key2.accountId; } - private static mergeAccounts(source: sqlops.Account, target: sqlops.Account): void { + private static mergeAccounts(source: azdata.Account, target: azdata.Account): void { // Take any display info changes target.displayInfo = source.displayInfo; @@ -109,7 +109,7 @@ export default class AccountStore implements IAccountStore { return >this._activeOperation; } - private addToAccountList(accounts: sqlops.Account[], accountToAdd: sqlops.Account): AccountListOperationResult { + private addToAccountList(accounts: azdata.Account[], accountToAdd: azdata.Account): AccountListOperationResult { // Check if the entry already exists let match = accounts.findIndex(account => AccountStore.findAccountByKey(account.key, accountToAdd.key)); if (match >= 0) { @@ -134,7 +134,7 @@ export default class AccountStore implements IAccountStore { }; } - private removeFromAccountList(accounts: sqlops.Account[], accountToRemove: sqlops.AccountKey): AccountListOperationResult { + private removeFromAccountList(accounts: azdata.Account[], accountToRemove: azdata.AccountKey): AccountListOperationResult { // Check if the entry exists let match = accounts.findIndex(account => AccountStore.findAccountByKey(account.key, accountToRemove)); if (match >= 0) { @@ -151,7 +151,7 @@ export default class AccountStore implements IAccountStore { }; } - private updateAccountList(accounts: sqlops.Account[], accountToUpdate: sqlops.AccountKey, updateOperation: (account: sqlops.Account) => void): AccountListOperationResult { + private updateAccountList(accounts: azdata.Account[], accountToUpdate: azdata.AccountKey, updateOperation: (account: azdata.Account) => void): AccountListOperationResult { // Check if the entry exists let match = accounts.findIndex(account => AccountStore.findAccountByKey(account.key, accountToUpdate)); if (match < 0) { @@ -178,7 +178,7 @@ export default class AccountStore implements IAccountStore { } // MEMENTO IO METHODS ////////////////////////////////////////////////// - private readFromMemento(): Thenable { + private readFromMemento(): Thenable { // Initialize the account list if it isn't already let accounts = this._memento[AccountStore.MEMENTO_KEY]; if (!accounts) { @@ -191,7 +191,7 @@ export default class AccountStore implements IAccountStore { return Promise.resolve(accounts); } - private writeToMemento(accounts: sqlops.Account[]): Thenable { + private writeToMemento(accounts: azdata.Account[]): Thenable { // Store a shallow copy of the account list to disconnect the memento list from the active list this._memento[AccountStore.MEMENTO_KEY] = JSON.parse(JSON.stringify(accounts)); return Promise.resolve(); @@ -200,5 +200,5 @@ export default class AccountStore implements IAccountStore { interface AccountListOperationResult extends AccountAdditionResult { accountRemoved: boolean; - updatedAccounts: sqlops.Account[]; + updatedAccounts: azdata.Account[]; } diff --git a/src/sql/platform/accountManagement/common/eventTypes.ts b/src/sql/platform/accountManagement/common/eventTypes.ts index 7dbd22d4cf..a9d42a221f 100644 --- a/src/sql/platform/accountManagement/common/eventTypes.ts +++ b/src/sql/platform/accountManagement/common/eventTypes.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * Result from calling add/update on the account store @@ -24,7 +24,7 @@ export interface AccountAdditionResult { /** * The account that was added/updated (with any updates applied) */ - changedAccount: sqlops.Account; + changedAccount: azdata.Account; } /** @@ -34,12 +34,12 @@ export interface AccountProviderAddedEventParams { /** * The provider that was registered */ - addedProvider: sqlops.AccountProviderMetadata; + addedProvider: azdata.AccountProviderMetadata; /** * The accounts that were rehydrated with the provider */ - initialAccounts: sqlops.Account[]; + initialAccounts: azdata.Account[]; } /** @@ -54,5 +54,5 @@ export interface UpdateAccountListEventParams { /** * Updated list of accounts, sorted appropriately */ - accountList: sqlops.Account[]; + accountList: azdata.Account[]; } diff --git a/src/sql/platform/accountManagement/common/interfaces.ts b/src/sql/platform/accountManagement/common/interfaces.ts index 411a6e1e0d..766770dd27 100644 --- a/src/sql/platform/accountManagement/common/interfaces.ts +++ b/src/sql/platform/accountManagement/common/interfaces.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event } from 'vs/base/common/event'; import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -18,13 +18,13 @@ export interface IAccountManagementService { _serviceBrand: any; // ACCOUNT MANAGEMENT METHODS ////////////////////////////////////////// - accountUpdated(account: sqlops.Account): Thenable; + accountUpdated(account: azdata.Account): Thenable; addAccount(providerId: string): Thenable; - getAccountProviderMetadata(): Thenable; - getAccountsForProvider(providerId: string): Thenable; - getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}>; - removeAccount(accountKey: sqlops.AccountKey): Thenable; - refreshAccount(account: sqlops.Account): Thenable; + getAccountProviderMetadata(): Thenable; + getAccountsForProvider(providerId: string): Thenable; + getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}>; + removeAccount(accountKey: azdata.AccountKey): Thenable; + refreshAccount(account: azdata.Account): Thenable; // UI METHODS ////////////////////////////////////////////////////////// openAccountListDialog(): Thenable; @@ -34,17 +34,17 @@ export interface IAccountManagementService { copyUserCodeAndOpenBrowser(userCode: string, uri: string): void; // SERVICE MANAGEMENT METHODS ///////////////////////////////////////// - registerProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): void; + registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): void; shutdown(): void; - unregisterProvider(providerMetadata: sqlops.AccountProviderMetadata): void; + unregisterProvider(providerMetadata: azdata.AccountProviderMetadata): void; // EVENTING //////////////////////////////////////////////////////////// readonly addAccountProviderEvent: Event; - readonly removeAccountProviderEvent: Event; + readonly removeAccountProviderEvent: Event; readonly updateAccountListEvent: Event; } -// Enum matching the AzureResource enum from sqlops.d.ts +// Enum matching the AzureResource enum from azdata.d.ts export enum AzureResource { ResourceManagement = 0, Sql = 1 @@ -56,20 +56,20 @@ export interface IAccountStore { * @param {Account} account Account to add/update * @return {Thenable} Results of the add/update operation */ - addOrUpdate(account: sqlops.Account): Thenable; + addOrUpdate(account: azdata.Account): Thenable; /** * Retrieves all accounts, filtered by provider ID * @param {string} providerId ID of the provider to filter by * @return {Thenable} Promise to return all accounts that belong to the provided provider */ - getAccountsByProvider(providerId: string): Thenable; + getAccountsByProvider(providerId: string): Thenable; /** * Retrieves all accounts in the store. Returns empty array if store is not initialized * @return {Thenable} Promise to return all accounts */ - getAllAccounts(): Thenable; + getAllAccounts(): Thenable; /** * Removes an account. @@ -78,7 +78,7 @@ export interface IAccountStore { * @param key - The key of an account. * @returns True if the account was removed, false if the account doesn't exist */ - remove(key: sqlops.AccountKey): Thenable; + remove(key: azdata.AccountKey): Thenable; /** * Updates the custom properties stored with an account. @@ -88,5 +88,5 @@ export interface IAccountStore { * @param updateOperation - Operation to perform on the matching account * @returns True if the account was modified, false if the account doesn't exist */ - update(key: sqlops.AccountKey, updateOperation: (account: sqlops.Account) => void): Thenable; + update(key: azdata.AccountKey, updateOperation: (account: azdata.Account) => void): Thenable; } diff --git a/src/sql/platform/backup/common/backupService.ts b/src/sql/platform/backup/common/backupService.ts index 69d58b3496..afe42f34fb 100644 --- a/src/sql/platform/backup/common/backupService.ts +++ b/src/sql/platform/backup/common/backupService.ts @@ -6,7 +6,7 @@ 'use strict'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export enum TaskExecutionMode { execute = 0, @@ -21,15 +21,15 @@ export const IBackupService = createDecorator(SERVICE_ID); export interface IBackupService { _serviceBrand: any; - getBackupConfigInfo(connectionUri: string): Thenable; + getBackupConfigInfo(connectionUri: string): Thenable; /** * Backup a data source using the provided connection */ - backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: sqlops.TaskExecutionMode): Thenable; + backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: azdata.TaskExecutionMode): Thenable; /** * Register a disaster recovery provider */ - registerProvider(providerId: string, provider: sqlops.BackupProvider): void; + registerProvider(providerId: string, provider: azdata.BackupProvider): void; } diff --git a/src/sql/platform/backup/common/backupServiceImp.ts b/src/sql/platform/backup/common/backupServiceImp.ts index aa28ff673a..9528a44580 100644 --- a/src/sql/platform/backup/common/backupServiceImp.ts +++ b/src/sql/platform/backup/common/backupServiceImp.ts @@ -5,7 +5,7 @@ 'use strict'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as Constants from 'sql/common/constants'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; @@ -15,7 +15,7 @@ import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/ba export class BackupService implements IBackupService { public _serviceBrand: any; - private _providers: { [handle: string]: sqlops.BackupProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.BackupProvider; } = Object.create(null); constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService, @@ -26,7 +26,7 @@ export class BackupService implements IBackupService { /** * Get database metadata needed to populate backup UI */ - public getBackupConfigInfo(connectionUri: string): Thenable { + public getBackupConfigInfo(connectionUri: string): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -40,8 +40,8 @@ export class BackupService implements IBackupService { /** * Backup a data source using the provided connection */ - public backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: TaskExecutionMode): Thenable { - return new Promise((resolve, reject) => { + public backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: TaskExecutionMode): Thenable { + return new Promise((resolve, reject) => { let providerResult = this.getProvider(connectionUri); if (providerResult) { TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.BackupCreated, { provider: providerResult.providerName }); @@ -56,7 +56,7 @@ export class BackupService implements IBackupService { }); } - private getProvider(connectionUri: string): { provider: sqlops.BackupProvider, providerName: string } { + private getProvider(connectionUri: string): { provider: azdata.BackupProvider, providerName: string } { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { return { provider: this._providers[providerId], providerName: providerId }; @@ -68,7 +68,7 @@ export class BackupService implements IBackupService { /** * Register a disaster recovery provider */ - public registerProvider(providerId: string, provider: sqlops.BackupProvider): void { + public registerProvider(providerId: string, provider: azdata.BackupProvider): void { this._providers[providerId] = provider; } } diff --git a/src/sql/platform/capabilities/common/capabilitiesService.ts b/src/sql/platform/capabilities/common/capabilitiesService.ts index ab5df93a74..057f1b0692 100644 --- a/src/sql/platform/capabilities/common/capabilitiesService.ts +++ b/src/sql/platform/capabilities/common/capabilitiesService.ts @@ -10,7 +10,7 @@ import * as Constants from 'sql/common/constants'; import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { toObject } from 'sql/base/common/map'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { IAction } from 'vs/base/common/actions'; @@ -24,7 +24,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; export const SERVICE_ID = 'capabilitiesService'; -export const HOST_NAME = 'sqlops'; +export const HOST_NAME = 'azdata'; export const HOST_VERSION = '1.0'; const connectionRegistry = Registry.as(ConnectionExtensions.ConnectionProviderContributions); @@ -63,12 +63,12 @@ export interface ICapabilitiesService { /** * get the old version of provider information */ - getLegacyCapabilities(provider: string): sqlops.DataProtocolServerCapabilities; + getLegacyCapabilities(provider: string): azdata.DataProtocolServerCapabilities; /** * Register a capabilities provider */ - registerProvider(provider: sqlops.CapabilitiesProvider): void; + registerProvider(provider: azdata.CapabilitiesProvider): void; /** * Returns true if the feature is available for given connection @@ -97,7 +97,7 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ private _momento: Memento; private _providers = new Map(); private _featureUpdateEvents = new Map>(); - private _legacyProviders = new Map(); + private _legacyProviders = new Map(); private _onCapabilitiesRegistered = this._register(new Emitter()); public readonly onCapabilitiesRegistered = this._onCapabilitiesRegistered.event; @@ -184,7 +184,7 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ return this._providers.get(provider); } - public getLegacyCapabilities(provider: string): sqlops.DataProtocolServerCapabilities { + public getLegacyCapabilities(provider: string): azdata.DataProtocolServerCapabilities { return this._legacyProviders.get(provider); } @@ -200,7 +200,7 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ * Register the capabilities provider and query the provider for its capabilities * @param provider */ - public registerProvider(provider: sqlops.CapabilitiesProvider): void { + public registerProvider(provider: azdata.CapabilitiesProvider): void { // request the capabilities from server provider.getServerCapabilities(clientCapabilities).then(serverCapabilities => { this._legacyProviders.set(serverCapabilities.providerName, serverCapabilities); diff --git a/src/sql/platform/connection/common/connectionConfig.ts b/src/sql/platform/connection/common/connectionConfig.ts index 149e337316..76d8159692 100644 --- a/src/sql/platform/connection/common/connectionConfig.ts +++ b/src/sql/platform/connection/common/connectionConfig.ts @@ -14,7 +14,7 @@ import { IWorkspaceConfigurationService } from 'vs/workbench/services/configurat import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { ConnectionProfile } from './connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import { generateUuid } from 'vs/base/common/uuid'; @@ -451,7 +451,7 @@ export class ConnectionConfig implements IConnectionConfig { */ private getConfiguration(key: string): any { let configs: any; - configs = this._workspaceConfigurationService.inspect(key); + configs = this._workspaceConfigurationService.inspect(key); return configs; } @@ -462,7 +462,7 @@ export class ConnectionConfig implements IConnectionConfig { */ private writeConfiguration( key: string, - profiles: IConnectionProfileStore[] | IConnectionProfileGroup[] | sqlops.DataProtocolServerCapabilities[], + profiles: IConnectionProfileStore[] | IConnectionProfileGroup[] | azdata.DataProtocolServerCapabilities[], target: ConfigurationTarget = ConfigurationTarget.USER): Promise { return new Promise((resolve, reject) => { let configValue: IConfigurationValue = { diff --git a/src/sql/platform/connection/common/connectionManagement.ts b/src/sql/platform/connection/common/connectionManagement.ts index c0dafc35b5..38e43617fa 100644 --- a/src/sql/platform/connection/common/connectionManagement.ts +++ b/src/sql/platform/connection/common/connectionManagement.ts @@ -7,7 +7,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -76,7 +76,7 @@ export interface IConnectionManagementService { onConnect: Event; onDisconnect: Event; onConnectionChanged: Event; - onLanguageFlavorChanged: Event; + onLanguageFlavorChanged: Event; /** * Opens the connection dialog to create new connection @@ -119,11 +119,11 @@ export interface IConnectionManagementService { /** * Adds the successful connection to MRU and send the connection error back to the connection handler for failed connections */ - onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void; + onConnectionComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void; onIntelliSenseCacheComplete(handle: number, connectionUri: string): void; - onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo); + onConnectionChangedNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo); getConnectionGroups(providers?: string[]): ConnectionProfileGroup[]; @@ -145,7 +145,7 @@ export interface IConnectionManagementService { deleteConnectionGroup(group: ConnectionProfileGroup): Promise; - getAdvancedProperties(): sqlops.ConnectionOption[]; + getAdvancedProperties(): azdata.ConnectionOption[]; getConnectionUri(connectionProfile: IConnectionProfile): string; @@ -177,12 +177,12 @@ export interface IConnectionManagementService { addSavedPassword(connectionProfile: IConnectionProfile): Promise; - listDatabases(connectionUri: string): Thenable; + listDatabases(connectionUri: string): Thenable; /** * Register a connection provider */ - registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void; + registerProvider(providerId: string, provider: azdata.ConnectionProvider): void; editGroup(group: ConnectionProfileGroup): Promise; @@ -261,7 +261,7 @@ export interface IConnectionManagementService { * @param {string} profileId The id of the connection profile to get the password for * @returns ServerInfo */ - getServerInfo(profileId: string): sqlops.ServerInfo; + getServerInfo(profileId: string): azdata.ServerInfo; /** * Get the connection string for the provided connection ID @@ -271,7 +271,7 @@ export interface IConnectionManagementService { /** * Serialize connection string with optional provider */ - buildConnectionInfo(connectionString: string, provider?: string): Thenable; + buildConnectionInfo(connectionString: string, provider?: string): Thenable; providerRegistered(providerId: string): boolean; /** @@ -292,7 +292,7 @@ export interface INewConnectionParams { connectionType: ConnectionType; input?: IConnectableInput; runQueryOnCompletion?: RunQueryOnConnectionMode; - querySelection?: sqlops.ISelectionData; + querySelection?: azdata.ISelectionData; showDashboard?: boolean; providers?: string[]; } diff --git a/src/sql/platform/connection/common/connectionManagementInfo.ts b/src/sql/platform/connection/common/connectionManagementInfo.ts index a18c3dab42..911c76ce34 100644 --- a/src/sql/platform/connection/common/connectionManagementInfo.ts +++ b/src/sql/platform/connection/common/connectionManagementInfo.ts @@ -6,7 +6,7 @@ 'use strict'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { StopWatch } from 'vs/base/common/stopwatch'; /** @@ -64,7 +64,7 @@ export class ConnectionManagementInfo { /** * Information about the connected server. */ - serverInfo: sqlops.ServerInfo; + serverInfo: azdata.ServerInfo; /** * Owner uri assigned to the connection diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts index efb54d6b2a..7492fab72e 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/common/connectionManagementService.ts @@ -36,7 +36,7 @@ import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions a import { IAccountManagementService, AzureResource } from 'sql/platform/accountManagement/common/interfaces'; import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as errors from 'vs/base/common/errors'; @@ -62,7 +62,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti _serviceBrand: any; - private _providers = new Map, properties: ConnectionProviderProperties }>(); + private _providers = new Map, properties: ConnectionProviderProperties }>(); private _uriToProvider: { [uri: string]: string; } = Object.create(null); @@ -74,7 +74,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti private _onDisconnect = new Emitter(); private _onConnectRequestSent = new Emitter(); private _onConnectionChanged = new Emitter(); - private _onLanguageFlavorChanged = new Emitter(); + private _onLanguageFlavorChanged = new Emitter(); private _connectionGlobalStatus = new ConnectionGlobalStatus(this._statusBarService); private _configurationEditService: ConfigurationEditingService; @@ -123,7 +123,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti let providerRegistration = (p: { id: string, properties: ConnectionProviderProperties }) => { let provider = { - onReady: new Deferred(), + onReady: new Deferred(), properties: p.properties }; this._providers.set(p.id, provider); @@ -172,25 +172,25 @@ export class ConnectionManagementService extends Disposable implements IConnecti return this._onConnectRequestSent.event; } - public get onLanguageFlavorChanged(): Event { + public get onLanguageFlavorChanged(): Event { return this._onLanguageFlavorChanged.event; } private _providerCount: number = 0; // Connection Provider Registration - public registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void { + public registerProvider(providerId: string, provider: azdata.ConnectionProvider): void { if (!this._providers.has(providerId)) { console.error('Provider', providerId, 'attempted to register but has no metadata'); let providerType = { - onReady: new Deferred(), + onReady: new Deferred(), properties: undefined }; this._providers.set(providerId, providerType); } // we know this is a deferred promise because we made it - (this._providers.get(providerId).onReady as Deferred).resolve(provider); + (this._providers.get(providerId).onReady as Deferred).resolve(provider); } /** @@ -652,7 +652,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - public getAdvancedProperties(): sqlops.ConnectionOption[] { + public getAdvancedProperties(): azdata.ConnectionOption[] { let providers = this._capabilitiesService.providers; if (providers) { @@ -831,7 +831,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - private sendListDatabasesRequest(uri: string): Thenable { + private sendListDatabasesRequest(uri: string): Thenable { let providerId: string = this.getProviderIdFromUri(uri); if (!providerId) { return Promise.resolve(undefined); @@ -891,7 +891,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - public onConnectionComplete(handle: number, info: sqlops.ConnectionInfoSummary): void { + public onConnectionComplete(handle: number, info: azdata.ConnectionInfoSummary): void { const self = this; let connection = this._connectionStatusManager.onConnectionComplete(info); @@ -919,7 +919,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti } } - public onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void { + public onConnectionChangedNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void { let profile: IConnectionProfile = this._connectionStatusManager.onConnectionChanged(changedConnInfo); this._notifyConnectionChanged(profile, changedConnInfo.connectionUri); } @@ -1188,7 +1188,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return this._connectionStatusManager.isConnected(fileUri) ? this._connectionStatusManager.findConnection(fileUri) : undefined; } - public listDatabases(connectionUri: string): Thenable { + public listDatabases(connectionUri: string): Thenable { const self = this; if (self.isConnected(connectionUri)) { return self.sendListDatabasesRequest(connectionUri); @@ -1366,7 +1366,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return credentials; } - public getServerInfo(profileId: string): sqlops.ServerInfo { + public getServerInfo(profileId: string): azdata.ServerInfo { let profile = this._connectionStatusManager.findConnectionByProfileId(profileId); if (!profile) { return undefined; @@ -1411,7 +1411,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * Serialize connection with options provider * TODO this could be a map reduce operation */ - public buildConnectionInfo(connectionString: string, provider: string): Thenable { + public buildConnectionInfo(connectionString: string, provider: string): Thenable { let connectionProvider = this._providers.get(provider); if (connectionProvider) { return connectionProvider.onReady.then(e => { diff --git a/src/sql/platform/connection/common/connectionProfile.ts b/src/sql/platform/connection/common/connectionProfile.ts index 7f2f7a860e..b4b305e9df 100644 --- a/src/sql/platform/connection/common/connectionProfile.ts +++ b/src/sql/platform/connection/common/connectionProfile.ts @@ -6,7 +6,7 @@ 'use strict'; import { ConnectionProfileGroup } from './connectionProfileGroup'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import * as interfaces from 'sql/platform/connection/common/interfaces'; import { equalsIgnoreCase } from 'vs/base/common/strings'; @@ -33,7 +33,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa public constructor( capabilitiesService: ICapabilitiesService, - model: string | sqlops.IConnectionProfile + model: string | azdata.IConnectionProfile ) { super(capabilitiesService, model); if (model && !isString(model)) { @@ -175,13 +175,13 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa return result; } - public toConnectionInfo(): sqlops.ConnectionInfo { + public toConnectionInfo(): azdata.ConnectionInfo { return { options: this.options }; } - public static fromIConnectionProfile(capabilitiesService: ICapabilitiesService, profile: sqlops.IConnectionProfile) { + public static fromIConnectionProfile(capabilitiesService: ICapabilitiesService, profile: azdata.IConnectionProfile) { if (profile) { if (profile instanceof ConnectionProfile) { return profile; diff --git a/src/sql/platform/connection/common/connectionStatusManager.ts b/src/sql/platform/connection/common/connectionStatusManager.ts index bd5d99b579..7adafdef91 100644 --- a/src/sql/platform/connection/common/connectionStatusManager.ts +++ b/src/sql/platform/connection/common/connectionStatusManager.ts @@ -9,13 +9,13 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from './interfaces'; import * as Utils from './utils'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { StopWatch } from 'vs/base/common/stopwatch'; export class ConnectionStatusManager { private _connections: { [id: string]: ConnectionManagementInfo }; - private _providerCapabilitiesMap: { [providerName: string]: sqlops.DataProtocolServerCapabilities }; + private _providerCapabilitiesMap: { [providerName: string]: azdata.DataProtocolServerCapabilities }; constructor( @ICapabilitiesService private _capabilitiesService: ICapabilitiesService) { this._connections = {}; @@ -110,7 +110,7 @@ export class ConnectionStatusManager { return newId; } - public onConnectionComplete(summary: sqlops.ConnectionInfoSummary): ConnectionManagementInfo { + public onConnectionComplete(summary: azdata.ConnectionInfoSummary): ConnectionManagementInfo { let connection = this._connections[summary.ownerUri]; connection.serviceTimer.stop(); connection.connecting = false; @@ -123,7 +123,7 @@ export class ConnectionStatusManager { * Updates database name after connection is complete * @param summary connection summary */ - public updateDatabaseName(summary: sqlops.ConnectionInfoSummary): void { + public updateDatabaseName(summary: azdata.ConnectionInfoSummary): void { let connection = this._connections[summary.ownerUri]; //Check if the existing connection database name is different the one in the summary @@ -158,7 +158,7 @@ export class ConnectionStatusManager { return ownerUriToReturn; } - public onConnectionChanged(changedConnInfo: sqlops.ChangedConnectionInfo): IConnectionProfile { + public onConnectionChanged(changedConnInfo: azdata.ChangedConnectionInfo): IConnectionProfile { let connection = this._connections[changedConnInfo.connectionUri]; if (connection && connection.connectionProfile) { connection.connectionProfile.serverName = changedConnInfo.connection.serverName; diff --git a/src/sql/platform/connection/common/connectionStore.ts b/src/sql/platform/connection/common/connectionStore.ts index 9c8d6f38e0..3b34ea19b7 100644 --- a/src/sql/platform/connection/common/connectionStore.ts +++ b/src/sql/platform/connection/common/connectionStore.ts @@ -209,7 +209,7 @@ export class ConnectionStore { * Gets the list of recently used connections. These will not include the password - a separate call to * {addSavedPassword} is needed to fill that before connecting * - * @returns {sqlops.ConnectionInfo} the array of connections, empty if none are found + * @returns {azdata.ConnectionInfo} the array of connections, empty if none are found */ public getRecentlyUsedConnections(providers?: string[]): ConnectionProfile[] { let configValues: IConnectionProfile[] = this._memento[Constants.recentConnections]; @@ -249,7 +249,7 @@ export class ConnectionStore { * Gets the list of active connections. These will not include the password - a separate call to * {addSavedPassword} is needed to fill that before connecting * - * @returns {sqlops.ConnectionInfo} the array of connections, empty if none are found + * @returns {azdata.ConnectionInfo} the array of connections, empty if none are found */ public getActiveConnections(): ConnectionProfile[] { let configValues: IConnectionProfile[] = this._memento[Constants.activeConnections]; diff --git a/src/sql/platform/connection/common/constants.ts b/src/sql/platform/connection/common/constants.ts index af3ba5b820..c30519237e 100644 --- a/src/sql/platform/connection/common/constants.ts +++ b/src/sql/platform/connection/common/constants.ts @@ -24,7 +24,7 @@ export const mssqlProviderName = 'MSSQL'; export const anyProviderName = '*'; export const connectionProviderContextKey = 'connectionProvider'; -export const applicationName = 'sqlops'; +export const applicationName = 'azdata'; export const defaultEngine = 'defaultEngine'; diff --git a/src/sql/platform/connection/common/iconnectionConfig.ts b/src/sql/platform/connection/common/iconnectionConfig.ts index b5f07861d0..bcf0f12a60 100644 --- a/src/sql/platform/connection/common/iconnectionConfig.ts +++ b/src/sql/platform/connection/common/iconnectionConfig.ts @@ -8,7 +8,7 @@ import { IConnectionProfile } from './interfaces'; import { IConnectionProfileGroup, ConnectionProfileGroup } from './connectionProfileGroup'; import { ConnectionProfile } from './connectionProfile'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /** * Interface for a configuration file that stores connection profiles. diff --git a/src/sql/platform/connection/common/interfaces.ts b/src/sql/platform/connection/common/interfaces.ts index 3361fe5282..361ea2f7c9 100644 --- a/src/sql/platform/connection/common/interfaces.ts +++ b/src/sql/platform/connection/common/interfaces.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; -export interface IConnectionProfile extends sqlops.IConnectionProfile { +export interface IConnectionProfile extends azdata.IConnectionProfile { getOptionsKey(): string; - matches(profile: sqlops.IConnectionProfile): boolean; + matches(profile: azdata.IConnectionProfile): boolean; } export interface IConnectionProfileStore { diff --git a/src/sql/platform/connection/common/providerConnectionInfo.ts b/src/sql/platform/connection/common/providerConnectionInfo.ts index 4ded24f95a..92e4ddd3cf 100644 --- a/src/sql/platform/connection/common/providerConnectionInfo.ts +++ b/src/sql/platform/connection/common/providerConnectionInfo.ts @@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { isString } from 'vs/base/common/types'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as Constants from 'sql/platform/connection/common/constants'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; @@ -16,7 +16,7 @@ import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/com type SettableProperty = 'serverName' | 'authenticationType' | 'databaseName' | 'password' | 'connectionName' | 'userName'; -export class ProviderConnectionInfo extends Disposable implements sqlops.ConnectionInfo { +export class ProviderConnectionInfo extends Disposable implements azdata.ConnectionInfo { options: { [name: string]: any } = {}; @@ -27,7 +27,7 @@ export class ProviderConnectionInfo extends Disposable implements sqlops.Connect public constructor( protected capabilitiesService: ICapabilitiesService, - model: string | sqlops.IConnectionProfile + model: string | azdata.IConnectionProfile ) { super(); // we can't really do a whole lot if we don't have a provider @@ -59,7 +59,7 @@ export class ProviderConnectionInfo extends Disposable implements sqlops.Connect * * This handles the case where someone hasn't passed in a valid property bag, but doesn't cause errors when */ - private updateSpecialValueType(typeName: SettableProperty, model: sqlops.IConnectionProfile): void { + private updateSpecialValueType(typeName: SettableProperty, model: azdata.IConnectionProfile): void { if (!this[typeName]) { this[typeName] = model[typeName]; } @@ -283,7 +283,7 @@ export class ProviderConnectionInfo extends Disposable implements sqlops.Connect return displayName; } - public getProviderOptions(): sqlops.ConnectionOption[] { + public getProviderOptions(): azdata.ConnectionOption[] { return this._serverCapabilities.connectionOptions; } diff --git a/src/sql/platform/credentials/common/credentialsService.ts b/src/sql/platform/credentials/common/credentialsService.ts index 46b9dfdd7e..c7879a2ea3 100644 --- a/src/sql/platform/credentials/common/credentialsService.ts +++ b/src/sql/platform/credentials/common/credentialsService.ts @@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Deferred } from 'sql/base/common/promise'; export const SERVICE_ID = 'credentialsService'; @@ -15,7 +15,7 @@ export const SERVICE_ID = 'credentialsService'; export interface CredentialManagementEvents { onSaveCredential(credentialId: string, password: string): Thenable; - onReadCredential(credentialId: string): Thenable; + onReadCredential(credentialId: string): Thenable; onDeleteCredential(credentialId: string): Thenable; } @@ -27,7 +27,7 @@ export interface ICredentialsService { saveCredential(credentialId: string, password: string): Thenable; - readCredential(credentialId: string): Thenable; + readCredential(credentialId: string): Thenable; deleteCredential(credentialId: string): Thenable; @@ -66,7 +66,7 @@ export class CredentialsService implements ICredentialsService { return this._onServerEventsReady.promise.then(() => this._serverEvents[this._lastHandle].onSaveCredential(credentialId, password)); } - public readCredential(credentialId: string): Thenable { + public readCredential(credentialId: string): Thenable { return this._onServerEventsReady.promise.then(() => this._serverEvents[this._lastHandle].onReadCredential(credentialId)); } diff --git a/src/sql/platform/dacfx/common/dacFxService.ts b/src/sql/platform/dacfx/common/dacFxService.ts index 688fbe37af..e84d402fb1 100644 --- a/src/sql/platform/dacfx/common/dacFxService.ts +++ b/src/sql/platform/dacfx/common/dacFxService.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -17,65 +17,65 @@ export const IDacFxService = createDecorator(SERVICE_ID); export interface IDacFxService { _serviceBrand: any; - registerProvider(providerId: string, provider: sqlops.DacFxServicesProvider): void; - exportBacpac(sourceDatabaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void; - importBacpac(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void; - extractDacpac(sourceDatabaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void; - deployDacpac(packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void; - generateDeployScript(packageFilePath: string, targetDatabaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void; - generateDeployPlan(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void; + registerProvider(providerId: string, provider: azdata.DacFxServicesProvider): void; + exportBacpac(sourceDatabaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void; + importBacpac(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void; + extractDacpac(sourceDatabaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void; + deployDacpac(packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void; + generateDeployScript(packageFilePath: string, targetDatabaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void; + generateDeployPlan(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void; } export class DacFxService implements IDacFxService { _serviceBrand: any; - private _providers: { [handle: string]: sqlops.DacFxServicesProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.DacFxServicesProvider; } = Object.create(null); constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService ) { } - registerProvider(providerId: string, provider: sqlops.DacFxServicesProvider): void { + registerProvider(providerId: string, provider: azdata.DacFxServicesProvider): void { this._providers[providerId] = provider; } - exportBacpac(databasesName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + exportBacpac(databasesName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return this._runAction(ownerUri, (runner) => { return runner.exportBacpac(databasesName, packageFilePath, ownerUri, taskExecutionMode); }); } - importBacpac(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + importBacpac(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return this._runAction(ownerUri, (runner) => { return runner.importBacpac(packageFilePath, databaseName, ownerUri, taskExecutionMode); }); } - extractDacpac(databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + extractDacpac(databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return this._runAction(ownerUri, (runner) => { return runner.extractDacpac(databaseName, packageFilePath, applicationName, applicationVersion, ownerUri, taskExecutionMode); }); } - deployDacpac(packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + deployDacpac(packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return this._runAction(ownerUri, (runner) => { return runner.deployDacpac(packageFilePath, databaseName, upgradeExisting, ownerUri, taskExecutionMode); }); } - generateDeployScript(packageFilePath: string, databaseName: string, generateDeployScript: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + generateDeployScript(packageFilePath: string, databaseName: string, generateDeployScript: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return this._runAction(ownerUri, (runner) => { return runner.generateDeployScript(packageFilePath, databaseName, generateDeployScript, ownerUri, taskExecutionMode); }); } - generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return this._runAction(ownerUri, (runner) => { return runner.generateDeployPlan(packageFilePath, databaseName, ownerUri, taskExecutionMode); }); } - private _runAction(uri: string, action: (handler: sqlops.DacFxServicesProvider) => Thenable): Thenable { + private _runAction(uri: string, action: (handler: azdata.DacFxServicesProvider) => Thenable): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(uri); if (!providerId) { diff --git a/src/sql/platform/dashboard/browser/dashboardService.ts b/src/sql/platform/dashboard/browser/dashboardService.ts index 7f29050ee9..59105ac2d3 100644 --- a/src/sql/platform/dashboard/browser/dashboardService.ts +++ b/src/sql/platform/dashboard/browser/dashboardService.ts @@ -7,20 +7,20 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; import * as DOM from 'vs/base/browser/dom'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export const IDashboardService = createDecorator('dashboardService'); export interface IDashboardService { _serviceBrand: any; - readonly onDidOpenDashboard: Event; - readonly onDidChangeToDashboard: Event; + readonly onDidOpenDashboard: Event; + readonly onDidChangeToDashboard: Event; readonly onLayout: Event; - openDashboard(document: sqlops.DashboardDocument): void; + openDashboard(document: azdata.DashboardDocument): void; - changeToDashboard(document: sqlops.DashboardDocument): void; + changeToDashboard(document: azdata.DashboardDocument): void; layout(dimension: DOM.Dimension): void; } diff --git a/src/sql/platform/dashboard/browser/dashboardServiceImpl.ts b/src/sql/platform/dashboard/browser/dashboardServiceImpl.ts index afe9902e65..f594f3479f 100644 --- a/src/sql/platform/dashboard/browser/dashboardServiceImpl.ts +++ b/src/sql/platform/dashboard/browser/dashboardServiceImpl.ts @@ -7,24 +7,24 @@ import { IDashboardService } from './dashboardService'; import { Event, Emitter } from 'vs/base/common/event'; import * as DOM from 'vs/base/browser/dom'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export class DashboardService implements IDashboardService { public _serviceBrand: any; - private _onDidOpenDashboard = new Emitter(); - public readonly onDidOpenDashboard: Event = this._onDidOpenDashboard.event; + private _onDidOpenDashboard = new Emitter(); + public readonly onDidOpenDashboard: Event = this._onDidOpenDashboard.event; - private _onDidChangeToDashboard = new Emitter(); - public readonly onDidChangeToDashboard: Event = this._onDidChangeToDashboard.event; + private _onDidChangeToDashboard = new Emitter(); + public readonly onDidChangeToDashboard: Event = this._onDidChangeToDashboard.event; private _onLayout = new Emitter(); public readonly onLayout: Event = this._onLayout.event; - public openDashboard(document: sqlops.DashboardDocument): void { + public openDashboard(document: azdata.DashboardDocument): void { this._onDidOpenDashboard.fire(document); } - public changeToDashboard(document: sqlops.DashboardDocument): void { + public changeToDashboard(document: azdata.DashboardDocument): void { this._onDidChangeToDashboard.fire(document); } diff --git a/src/sql/platform/dialog/customDialogService.ts b/src/sql/platform/dialog/customDialogService.ts index 773b04b2a0..6b441e53c5 100644 --- a/src/sql/platform/dialog/customDialogService.ts +++ b/src/sql/platform/dialog/customDialogService.ts @@ -5,7 +5,6 @@ 'use strict'; -import * as sqlops from 'sqlops'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { DialogModal } from 'sql/platform/dialog/dialogModal'; import { WizardModal } from 'sql/platform/dialog/wizardModal'; diff --git a/src/sql/platform/dialog/dialogTypes.ts b/src/sql/platform/dialog/dialogTypes.ts index e23878e88c..5b1ede09d7 100644 --- a/src/sql/platform/dialog/dialogTypes.ts +++ b/src/sql/platform/dialog/dialogTypes.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { localize } from 'vs/nls'; import { Event, Emitter } from 'vs/base/common/event'; import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes'; @@ -80,7 +80,7 @@ export class Dialog extends ModelViewPane { } } -export class DialogButton implements sqlops.window.Button { +export class DialogButton implements azdata.window.Button { private _label: string; private _enabled: boolean; private _hidden: boolean; @@ -169,13 +169,13 @@ export class Wizard { public cancelButton: DialogButton; public customButtons: DialogButton[]; private _currentPage: number; - private _pageChangedEmitter = new Emitter(); + private _pageChangedEmitter = new Emitter(); public readonly onPageChanged = this._pageChangedEmitter.event; private _pageAddedEmitter = new Emitter(); public readonly onPageAdded = this._pageAddedEmitter.event; private _pageRemovedEmitter = new Emitter(); public readonly onPageRemoved = this._pageRemovedEmitter.event; - private _navigationValidator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean | Thenable; + private _navigationValidator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean | Thenable; private _onMessageChange = new Emitter(); public readonly onMessageChange = this._onMessageChange.event; private _message: DialogMessage; @@ -233,7 +233,7 @@ export class Wizard { this._pageRemovedEmitter.fire(removedPage); } - public registerNavigationValidator(validator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean | Thenable): void { + public registerNavigationValidator(validator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean | Thenable): void { this._navigationValidator = validator; } diff --git a/src/sql/platform/fileBrowser/common/fileBrowserService.ts b/src/sql/platform/fileBrowser/common/fileBrowserService.ts index fce703ccca..915a706d90 100644 --- a/src/sql/platform/fileBrowser/common/fileBrowserService.ts +++ b/src/sql/platform/fileBrowser/common/fileBrowserService.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; @@ -20,10 +20,10 @@ import * as strings from 'vs/base/common/strings'; export class FileBrowserService implements IFileBrowserService { public _serviceBrand: any; - private _providers: { [handle: string]: sqlops.FileBrowserProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.FileBrowserProvider; } = Object.create(null); private _onAddFileTree = new Emitter(); private _onExpandFolder = new Emitter(); - private _onPathValidate = new Emitter(); + private _onPathValidate = new Emitter(); private _pathToFileNodeMap: { [path: string]: FileNode } = {}; private _expandResolveMap: { [key: string]: any } = {}; static fileNodeId: number = 0; @@ -32,7 +32,7 @@ export class FileBrowserService implements IFileBrowserService { @IErrorMessageService private _errorMessageService: IErrorMessageService) { } - public registerProvider(providerId: string, provider: sqlops.FileBrowserProvider): void { + public registerProvider(providerId: string, provider: azdata.FileBrowserProvider): void { this._providers[providerId] = provider; } @@ -44,7 +44,7 @@ export class FileBrowserService implements IFileBrowserService { return this._onExpandFolder.event; } - public get onPathValidate(): Event { + public get onPathValidate(): Event { return this._onPathValidate.event; } @@ -63,7 +63,7 @@ export class FileBrowserService implements IFileBrowserService { }); } - public onFileBrowserOpened(handle: number, fileBrowserOpenedParams: sqlops.FileBrowserOpenedParams) { + public onFileBrowserOpened(handle: number, fileBrowserOpenedParams: azdata.FileBrowserOpenedParams) { if (fileBrowserOpenedParams.succeeded === true && fileBrowserOpenedParams.fileTree && fileBrowserOpenedParams.fileTree.rootNode @@ -97,7 +97,7 @@ export class FileBrowserService implements IFileBrowserService { }); } - public onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: sqlops.FileBrowserExpandedParams) { + public onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: azdata.FileBrowserExpandedParams) { var mapKey = this.generateResolveMapKey(fileBrowserExpandedParams.ownerUri, fileBrowserExpandedParams.expandPath); var expandResolve = this._expandResolveMap[mapKey]; if (expandResolve) { @@ -134,11 +134,11 @@ export class FileBrowserService implements IFileBrowserService { }); } - public onFilePathsValidated(handle: number, fileBrowserValidatedParams: sqlops.FileBrowserValidatedParams) { + public onFilePathsValidated(handle: number, fileBrowserValidatedParams: azdata.FileBrowserValidatedParams) { this._onPathValidate.fire(fileBrowserValidatedParams); } - public closeFileBrowser(ownerUri: string): Thenable { + public closeFileBrowser(ownerUri: string): Thenable { let provider = this.getProvider(ownerUri); if (provider) { return provider.closeFileBrowser(ownerUri); @@ -149,7 +149,7 @@ export class FileBrowserService implements IFileBrowserService { private generateResolveMapKey(ownerUri: string, expandPath: string): string { return ownerUri + ':' + expandPath; } - private getProvider(connectionUri: string): sqlops.FileBrowserProvider { + private getProvider(connectionUri: string): azdata.FileBrowserProvider { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { return this._providers[providerId]; @@ -158,7 +158,7 @@ export class FileBrowserService implements IFileBrowserService { } } - private convertFileTree(parentNode: FileNode, fileTreeNode: sqlops.FileTreeNode, expandPath: string, ownerUri: string): FileBrowserTree { + private convertFileTree(parentNode: FileNode, fileTreeNode: azdata.FileTreeNode, expandPath: string, ownerUri: string): FileBrowserTree { FileBrowserService.fileNodeId += 1; var expandedNodes: FileNode[] = []; var selectedNode: FileNode; @@ -207,7 +207,7 @@ export class FileBrowserService implements IFileBrowserService { return { rootNode: fileNode, selectedNode: selectedNode, expandedNodes: expandedNodes }; } - private convertChildren(expandedNode: FileNode, childrenToConvert: sqlops.FileTreeNode[], ownerUri: string): FileNode[] { + private convertChildren(expandedNode: FileNode, childrenToConvert: azdata.FileTreeNode[], ownerUri: string): FileNode[] { var childrenNodes = []; for (var i = 0; i < childrenToConvert.length; i++) { diff --git a/src/sql/platform/fileBrowser/common/interfaces.ts b/src/sql/platform/fileBrowser/common/interfaces.ts index b373ecf9dd..8a1098e809 100644 --- a/src/sql/platform/fileBrowser/common/interfaces.ts +++ b/src/sql/platform/fileBrowser/common/interfaces.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { Event } from 'vs/base/common/event'; @@ -16,12 +16,12 @@ export interface IFileBrowserService { _serviceBrand: any; onAddFileTree: Event; onExpandFolder: Event; - onPathValidate: Event; + onPathValidate: Event; /** * Register file browser provider */ - registerProvider(providerId: string, provider: sqlops.FileBrowserProvider): void; + registerProvider(providerId: string, provider: azdata.FileBrowserProvider): void; /** * Open file browser @@ -31,7 +31,7 @@ export interface IFileBrowserService { /** * Event called when file browser is opened */ - onFileBrowserOpened(handle: number, fileBrowserOpenedParams: sqlops.FileBrowserOpenedParams); + onFileBrowserOpened(handle: number, fileBrowserOpenedParams: azdata.FileBrowserOpenedParams); /** * Expand folder node @@ -41,7 +41,7 @@ export interface IFileBrowserService { /** * Event called when children nodes are retrieved */ - onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: sqlops.FileBrowserExpandedParams); + onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: azdata.FileBrowserExpandedParams); /** * Validate selected file paths @@ -51,10 +51,10 @@ export interface IFileBrowserService { /** * Event called when the validation is complete */ - onFilePathsValidated(handle: number, fileBrowserValidatedParams: sqlops.FileBrowserValidatedParams); + onFilePathsValidated(handle: number, fileBrowserValidatedParams: azdata.FileBrowserValidatedParams); /** * Close file browser */ - closeFileBrowser(ownerUri: string): Thenable; + closeFileBrowser(ownerUri: string): Thenable; } \ No newline at end of file diff --git a/src/sql/platform/jobManagement/common/interfaces.ts b/src/sql/platform/jobManagement/common/interfaces.ts index a51b24b274..d5aff9d179 100644 --- a/src/sql/platform/jobManagement/common/interfaces.ts +++ b/src/sql/platform/jobManagement/common/interfaces.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { JobCacheObject, AlertsCacheObject, ProxiesCacheObject, OperatorsCacheObject } from './jobManagementService'; import { Event } from 'vs/base/common/event'; @@ -18,27 +18,27 @@ export interface IJobManagementService { _serviceBrand: any; onDidChange: Event; - registerProvider(providerId: string, provider: sqlops.AgentServicesProvider): void; + registerProvider(providerId: string, provider: azdata.AgentServicesProvider): void; fireOnDidChange(): void; - getJobs(connectionUri: string): Thenable; - getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable; - deleteJob(connectionUri: string, job: sqlops.AgentJobInfo): Thenable; + getJobs(connectionUri: string): Thenable; + getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable; + deleteJob(connectionUri: string, job: azdata.AgentJobInfo): Thenable; - deleteJobStep(connectionUri: string, step: sqlops.AgentJobStepInfo): Thenable; + deleteJobStep(connectionUri: string, step: azdata.AgentJobStepInfo): Thenable; - getAlerts(connectionUri: string): Thenable; - deleteAlert(connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable; + getAlerts(connectionUri: string): Thenable; + deleteAlert(connectionUri: string, alert: azdata.AgentAlertInfo): Thenable; - getOperators(connectionUri: string): Thenable; - deleteOperator(connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable; + getOperators(connectionUri: string): Thenable; + deleteOperator(connectionUri: string, operator: azdata.AgentOperatorInfo): Thenable; - getProxies(connectionUri: string): Thenable; - deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable; + getProxies(connectionUri: string): Thenable; + deleteProxy(connectionUri: string, proxy: azdata.AgentProxyInfo): Thenable; - getCredentials(connectionUri: string): Thenable; + getCredentials(connectionUri: string): Thenable; - jobAction(connectionUri: string, jobName: string, action: string): Thenable; + jobAction(connectionUri: string, jobName: string, action: string): Thenable; addToCache(server: string, cache: JobCacheObject | OperatorsCacheObject); jobCacheObjectMap: { [server: string]: JobCacheObject; }; operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; }; diff --git a/src/sql/platform/jobManagement/common/jobActions.ts b/src/sql/platform/jobManagement/common/jobActions.ts index 32744284d4..b336a7ad81 100644 --- a/src/sql/platform/jobManagement/common/jobActions.ts +++ b/src/sql/platform/jobManagement/common/jobActions.ts @@ -6,7 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component'; @@ -184,7 +184,7 @@ export class DeleteJobAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { let self = this; - let job = actionInfo.targetObject as sqlops.AgentJobInfo; + let job = actionInfo.targetObject as azdata.AgentJobInfo; self._notificationService.prompt( Severity.Info, nls.localize('jobaction.deleteJobConfirm', "Are you sure you'd like to delete the job '{0}'?", job.name), @@ -250,7 +250,7 @@ export class DeleteStepAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { let self = this; - let step = actionInfo.targetObject as sqlops.AgentJobStepInfo; + let step = actionInfo.targetObject as azdata.AgentJobStepInfo; let refreshAction = this.instantationService.createInstance(JobsRefreshAction); self._notificationService.prompt( Severity.Info, @@ -339,7 +339,7 @@ export class DeleteAlertAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { let self = this; - let alert = actionInfo.targetObject as sqlops.AgentAlertInfo; + let alert = actionInfo.targetObject as azdata.AgentAlertInfo; self._notificationService.prompt( Severity.Info, nls.localize('jobaction.deleteAlertConfirm', "Are you sure you'd like to delete the alert '{0}'?", alert.name), @@ -424,7 +424,7 @@ export class DeleteOperatorAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { const self = this; - let operator = actionInfo.targetObject as sqlops.AgentOperatorInfo; + let operator = actionInfo.targetObject as azdata.AgentOperatorInfo; self._notificationService.prompt( Severity.Info, nls.localize('jobaction.deleteOperatorConfirm', "Are you sure you'd like to delete the operator '{0}'?", operator.name), @@ -510,7 +510,7 @@ export class DeleteProxyAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { let self = this; - let proxy = actionInfo.targetObject as sqlops.AgentProxyInfo; + let proxy = actionInfo.targetObject as azdata.AgentProxyInfo; self._notificationService.prompt( Severity.Info, nls.localize('jobaction.deleteProxyConfirm', "Are you sure you'd like to delete the proxy '{0}'?", proxy.accountName), diff --git a/src/sql/platform/jobManagement/common/jobManagementService.ts b/src/sql/platform/jobManagement/common/jobManagementService.ts index 05b074b797..3bb7f42fe3 100644 --- a/src/sql/platform/jobManagement/common/jobManagementService.ts +++ b/src/sql/platform/jobManagement/common/jobManagementService.ts @@ -6,7 +6,7 @@ 'use strict'; import { localize } from 'vs/nls'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; @@ -18,7 +18,7 @@ export class JobManagementService implements IJobManagementService { private _onDidChange = new Emitter(); public readonly onDidChange: Event = this._onDidChange.event; - private _providers: { [handle: string]: sqlops.AgentServicesProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.AgentServicesProvider; } = Object.create(null); private _jobCacheObjectMap: { [server: string]: JobCacheObject; } = {}; private _operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; } = {}; private _alertsCacheObject: { [server: string]: AlertsCacheObject; } = {}; @@ -34,32 +34,32 @@ export class JobManagementService implements IJobManagementService { } // Jobs - public getJobs(connectionUri: string): Thenable { + public getJobs(connectionUri: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getJobs(connectionUri); }); } - public deleteJob(connectionUri: string, job: sqlops.AgentJobInfo): Thenable { + public deleteJob(connectionUri: string, job: azdata.AgentJobInfo): Thenable { return this._runAction(connectionUri, (runner) => { return runner.deleteJob(connectionUri, job); }); } - public getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable { + public getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getJobHistory(connectionUri, jobID, jobName); }); } - public jobAction(connectionUri: string, jobName: string, action: string): Thenable { + public jobAction(connectionUri: string, jobName: string, action: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.jobAction(connectionUri, jobName, action); }); } // Steps - public deleteJobStep(connectionUri: string, stepInfo: sqlops.AgentJobStepInfo): Thenable { + public deleteJobStep(connectionUri: string, stepInfo: azdata.AgentJobStepInfo): Thenable { return this._runAction(connectionUri, (runner) => { return runner.deleteJobStep(connectionUri, stepInfo); }); @@ -67,51 +67,51 @@ export class JobManagementService implements IJobManagementService { // Alerts - public getAlerts(connectionUri: string): Thenable { + public getAlerts(connectionUri: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getAlerts(connectionUri); }); } - public deleteAlert(connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable { + public deleteAlert(connectionUri: string, alert: azdata.AgentAlertInfo): Thenable { return this._runAction(connectionUri, (runner) => { return runner.deleteAlert(connectionUri, alert); }); } // Operators - public getOperators(connectionUri: string): Thenable { + public getOperators(connectionUri: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getOperators(connectionUri); }); } - public deleteOperator(connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable { + public deleteOperator(connectionUri: string, operator: azdata.AgentOperatorInfo): Thenable { return this._runAction(connectionUri, (runner) => { return runner.deleteOperator(connectionUri, operator); }); } // Proxies - public getProxies(connectionUri: string): Thenable { + public getProxies(connectionUri: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getProxies(connectionUri); }); } - public deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable { + public deleteProxy(connectionUri: string, proxy: azdata.AgentProxyInfo): Thenable { return this._runAction(connectionUri, (runner) => { return runner.deleteProxy(connectionUri, proxy); }); } - public getCredentials(connectionUri: string): Thenable { + public getCredentials(connectionUri: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getCredentials(connectionUri); }); } - private _runAction(uri: string, action: (handler: sqlops.AgentServicesProvider) => Thenable): Thenable { + private _runAction(uri: string, action: (handler: azdata.AgentServicesProvider) => Thenable): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(uri); if (!providerId) { @@ -125,7 +125,7 @@ export class JobManagementService implements IJobManagementService { } } - public registerProvider(providerId: string, provider: sqlops.AgentServicesProvider): void { + public registerProvider(providerId: string, provider: azdata.AgentServicesProvider): void { this._providers[providerId] = provider; } @@ -163,22 +163,22 @@ export class JobManagementService implements IJobManagementService { */ export class JobCacheObject { _serviceBrand: any; - private _jobs: sqlops.AgentJobInfo[] = []; - private _jobHistories: { [jobID: string]: sqlops.AgentJobHistoryInfo[]; } = {}; - private _jobSteps: { [jobID: string]: sqlops.AgentJobStepInfo[]; } = {}; - private _jobAlerts: { [jobID: string]: sqlops.AgentAlertInfo[]; } = {}; - private _jobSchedules: { [jobID: string]: sqlops.AgentJobScheduleInfo[]; } = {}; + private _jobs: azdata.AgentJobInfo[] = []; + private _jobHistories: { [jobID: string]: azdata.AgentJobHistoryInfo[]; } = {}; + private _jobSteps: { [jobID: string]: azdata.AgentJobStepInfo[]; } = {}; + private _jobAlerts: { [jobID: string]: azdata.AgentAlertInfo[]; } = {}; + private _jobSchedules: { [jobID: string]: azdata.AgentJobScheduleInfo[]; } = {}; private _runCharts: { [jobID: string]: string[]; } = {}; private _prevJobID: string; private _serverName: string; private _dataView: Slick.Data.DataView; /* Getters */ - public get jobs(): sqlops.AgentJobInfo[] { + public get jobs(): azdata.AgentJobInfo[] { return this._jobs; } - public get jobHistories(): { [jobID: string]: sqlops.AgentJobHistoryInfo[] } { + public get jobHistories(): { [jobID: string]: azdata.AgentJobHistoryInfo[] } { return this._jobHistories; } @@ -186,7 +186,7 @@ export class JobCacheObject { return this._prevJobID; } - public getJobHistory(jobID: string): sqlops.AgentJobHistoryInfo[] { + public getJobHistory(jobID: string): azdata.AgentJobHistoryInfo[] { return this._jobHistories[jobID]; } @@ -202,24 +202,24 @@ export class JobCacheObject { return this._runCharts[jobID]; } - public getJobSteps(jobID: string): sqlops.AgentJobStepInfo[] { + public getJobSteps(jobID: string): azdata.AgentJobStepInfo[] { return this._jobSteps[jobID]; } - public getJobAlerts(jobID: string): sqlops.AgentAlertInfo[] { + public getJobAlerts(jobID: string): azdata.AgentAlertInfo[] { return this._jobAlerts[jobID]; } - public getJobSchedules(jobID: string): sqlops.AgentJobScheduleInfo[] { + public getJobSchedules(jobID: string): azdata.AgentJobScheduleInfo[] { return this._jobSchedules[jobID]; } /* Setters */ - public set jobs(value: sqlops.AgentJobInfo[]) { + public set jobs(value: azdata.AgentJobInfo[]) { this._jobs = value; } - public set jobHistories(value: { [jobID: string]: sqlops.AgentJobHistoryInfo[]; }) { + public set jobHistories(value: { [jobID: string]: azdata.AgentJobHistoryInfo[]; }) { this._jobHistories = value; } @@ -227,7 +227,7 @@ export class JobCacheObject { this._prevJobID = value; } - public setJobHistory(jobID: string, value: sqlops.AgentJobHistoryInfo[]) { + public setJobHistory(jobID: string, value: azdata.AgentJobHistoryInfo[]) { this._jobHistories[jobID] = value; } @@ -243,15 +243,15 @@ export class JobCacheObject { this._dataView = value; } - public setJobSteps(jobID: string, value: sqlops.AgentJobStepInfo[]) { + public setJobSteps(jobID: string, value: azdata.AgentJobStepInfo[]) { this._jobSteps[jobID] = value; } - public setJobAlerts(jobID: string, value: sqlops.AgentAlertInfo[]) { + public setJobAlerts(jobID: string, value: azdata.AgentAlertInfo[]) { this._jobAlerts[jobID] = value; } - public setJobSchedules(jobID: string, value: sqlops.AgentJobScheduleInfo[]) { + public setJobSchedules(jobID: string, value: azdata.AgentJobScheduleInfo[]) { this._jobSchedules[jobID] = value; } } @@ -261,12 +261,12 @@ export class JobCacheObject { */ export class OperatorsCacheObject { _serviceBrand: any; - private _operators: sqlops.AgentOperatorInfo[]; + private _operators: azdata.AgentOperatorInfo[]; private _dataView: Slick.Data.DataView; private _serverName: string; /** Getters */ - public get operators(): sqlops.AgentOperatorInfo[] { + public get operators(): azdata.AgentOperatorInfo[] { return this._operators; } @@ -279,7 +279,7 @@ export class OperatorsCacheObject { } /** Setters */ - public set operators(value: sqlops.AgentOperatorInfo[]) { + public set operators(value: azdata.AgentOperatorInfo[]) { this._operators = value; } @@ -298,12 +298,12 @@ export class OperatorsCacheObject { */ export class AlertsCacheObject { _serviceBrand: any; - private _alerts: sqlops.AgentAlertInfo[]; + private _alerts: azdata.AgentAlertInfo[]; private _dataView: Slick.Data.DataView; private _serverName: string; /** Getters */ - public get alerts(): sqlops.AgentAlertInfo[] { + public get alerts(): azdata.AgentAlertInfo[] { return this._alerts; } @@ -316,7 +316,7 @@ export class AlertsCacheObject { } /** Setters */ - public set alerts(value: sqlops.AgentAlertInfo[]) { + public set alerts(value: azdata.AgentAlertInfo[]) { this._alerts = value; } @@ -335,14 +335,14 @@ export class AlertsCacheObject { */ export class ProxiesCacheObject { _serviceBrand: any; - private _proxies: sqlops.AgentProxyInfo[]; + private _proxies: azdata.AgentProxyInfo[]; private _dataView: Slick.Data.DataView; private _serverName: string; /** * Getters */ - public get proxies(): sqlops.AgentProxyInfo[] { + public get proxies(): azdata.AgentProxyInfo[] { return this._proxies; } @@ -356,7 +356,7 @@ export class ProxiesCacheObject { /** Setters */ - public set proxies(value: sqlops.AgentProxyInfo[]) { + public set proxies(value: azdata.AgentProxyInfo[]) { this._proxies = value; } diff --git a/src/sql/platform/metadata/common/metadataService.ts b/src/sql/platform/metadata/common/metadataService.ts index 2fd64e148d..35b1ad82d1 100644 --- a/src/sql/platform/metadata/common/metadataService.ts +++ b/src/sql/platform/metadata/common/metadataService.ts @@ -8,7 +8,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export const SERVICE_ID = 'metadataService'; @@ -17,18 +17,18 @@ export const IMetadataService = createDecorator(SERVICE_ID); export interface IMetadataService { _serviceBrand: any; - getMetadata(connectionUri: string): Thenable; + getMetadata(connectionUri: string): Thenable; getDatabaseNames(connectionUri: string): Thenable; - getTableInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable; + getTableInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable; - getViewInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable; + getViewInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable; /** * Register a metadata provider */ - registerProvider(providerId: string, provider: sqlops.MetadataProvider): void; + registerProvider(providerId: string, provider: azdata.MetadataProvider): void; } export class MetadataService implements IMetadataService { @@ -37,12 +37,12 @@ export class MetadataService implements IMetadataService { private _disposables: IDisposable[] = []; - private _providers: { [handle: string]: sqlops.MetadataProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.MetadataProvider; } = Object.create(null); constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService) { } - public getMetadata(connectionUri: string): Thenable { + public getMetadata(connectionUri: string): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -66,7 +66,7 @@ export class MetadataService implements IMetadataService { return Promise.resolve([]); } - public getTableInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { + public getTableInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -78,7 +78,7 @@ export class MetadataService implements IMetadataService { return Promise.resolve(undefined); } - public getViewInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { + public getViewInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -93,7 +93,7 @@ export class MetadataService implements IMetadataService { /** * Register a metadata provider */ - public registerProvider(providerId: string, provider: sqlops.MetadataProvider): void { + public registerProvider(providerId: string, provider: azdata.MetadataProvider): void { this._providers[providerId] = provider; } diff --git a/src/sql/platform/model/common/modelViewService.ts b/src/sql/platform/model/common/modelViewService.ts index 2c71dd7eb6..72f9ba3076 100644 --- a/src/sql/platform/model/common/modelViewService.ts +++ b/src/sql/platform/model/common/modelViewService.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IComponentEventArgs } from 'sql/parts/modelComponents/interfaces'; import { Event } from 'vs/base/common/event'; export interface IView { readonly id: string; - readonly connection: sqlops.connection.Connection; - readonly serverInfo: sqlops.ServerInfo; + readonly connection: azdata.connection.Connection; + readonly serverInfo: azdata.ServerInfo; } export interface IModelViewEventArgs extends IComponentEventArgs { diff --git a/src/sql/platform/node/resultSerializer.ts b/src/sql/platform/node/resultSerializer.ts index f3f2720288..812205a767 100644 --- a/src/sql/platform/node/resultSerializer.ts +++ b/src/sql/platform/node/resultSerializer.ts @@ -7,7 +7,7 @@ import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import * as Constants from 'sql/parts/query/common/constants'; import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import { SaveResultsRequestParams } from 'sqlops'; +import { SaveResultsRequestParams } from 'azdata'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { ISaveRequest, SaveFormat } from 'sql/parts/grid/common/interfaces'; diff --git a/src/sql/platform/query/common/queryManagement.ts b/src/sql/platform/query/common/queryManagement.ts index 31ee02f900..13ce869f60 100644 --- a/src/sql/platform/query/common/queryManagement.ts +++ b/src/sql/platform/query/common/queryManagement.ts @@ -7,7 +7,7 @@ import QueryRunner from 'sql/platform/query/common/queryRunner'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IDisposable } from 'vs/base/common/lifecycle'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; @@ -26,23 +26,23 @@ export interface IQueryManagementService { getRegisteredProviders(): string[]; registerRunner(runner: QueryRunner, uri: string): void; - cancelQuery(ownerUri: string): Thenable; - runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable; + cancelQuery(ownerUri: string): Thenable; + runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable; runQueryStatement(ownerUri: string, line: number, column: number): Thenable; runQueryString(ownerUri: string, queryString: string): Thenable; - runQueryAndReturn(ownerUri: string, queryString: string): Thenable; - parseSyntax(ownerUri: string, query: string): Thenable; - getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable; + runQueryAndReturn(ownerUri: string, queryString: string): Thenable; + parseSyntax(ownerUri: string, query: string): Thenable; + getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable; disposeQuery(ownerUri: string): Thenable; - saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable; + saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable; // Callbacks - onQueryComplete(result: sqlops.QueryExecuteCompleteNotificationResult): void; - onBatchStart(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void; - onBatchComplete(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void; - onResultSetAvailable(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void; - onResultSetUpdated(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void; - onMessage(message: sqlops.QueryExecuteMessageParams): void; + onQueryComplete(result: azdata.QueryExecuteCompleteNotificationResult): void; + onBatchStart(batchInfo: azdata.QueryExecuteBatchNotificationParams): void; + onBatchComplete(batchInfo: azdata.QueryExecuteBatchNotificationParams): void; + onResultSetAvailable(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void; + onResultSetUpdated(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void; + onMessage(message: azdata.QueryExecuteMessageParams): void; // Edit Data Callbacks onEditSessionReady(ownerUri: string, success: boolean, message: string): void; @@ -50,39 +50,39 @@ export interface IQueryManagementService { // Edit Data Functions initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable; disposeEdit(ownerUri: string): Thenable; - updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable; + updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable; commitEdit(ownerUri): Thenable; - createRow(ownerUri: string): Thenable; + createRow(ownerUri: string): Thenable; deleteRow(ownerUri: string, rowId: number): Thenable; - revertCell(ownerUri: string, rowId: number, columnId: number): Thenable; + revertCell(ownerUri: string, rowId: number, columnId: number): Thenable; revertRow(ownerUri: string, rowId: number): Thenable; - getEditRows(rowData: sqlops.EditSubsetParams): Thenable; + getEditRows(rowData: azdata.EditSubsetParams): Thenable; } /* * An object that can handle basic request-response actions related to queries */ export interface IQueryRequestHandler { - cancelQuery(ownerUri: string): Thenable; - runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable; + cancelQuery(ownerUri: string): Thenable; + runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable; runQueryStatement(ownerUri: string, line: number, column: number): Thenable; runQueryString(ownerUri: string, queryString: string): Thenable; - runQueryAndReturn(ownerUri: string, queryString: string): Thenable; - parseSyntax(ownerUri: string, query: string): Thenable; - getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable; + runQueryAndReturn(ownerUri: string, queryString: string): Thenable; + parseSyntax(ownerUri: string, query: string): Thenable; + getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable; disposeQuery(ownerUri: string): Thenable; - saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable; + saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable; // Edit Data actions initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable; disposeEdit(ownerUri: string): Thenable; - updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable; + updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable; commitEdit(ownerUri): Thenable; - createRow(ownerUri: string): Thenable; + createRow(ownerUri: string): Thenable; deleteRow(ownerUri: string, rowId: number): Thenable; - revertCell(ownerUri: string, rowId: number, columnId: number): Thenable; + revertCell(ownerUri: string, rowId: number, columnId: number): Thenable; revertRow(ownerUri: string, rowId: number): Thenable; - getEditRows(rowData: sqlops.EditSubsetParams): Thenable; + getEditRows(rowData: azdata.EditSubsetParams): Thenable; } export class QueryManagementService implements IQueryManagementService { @@ -161,7 +161,7 @@ export class QueryManagementService implements IQueryManagementService { return Array.from(this._requestHandlers.keys()); } - private addTelemetry(eventName: string, ownerUri: string, runOptions?: sqlops.ExecutionPlanOptions): void { + private addTelemetry(eventName: string, ownerUri: string, runOptions?: azdata.ExecutionPlanOptions): void { let providerId: string = this._connectionService.getProviderIdFromUri(ownerUri); let data: TelemetryUtils.IConnectionTelemetryData = { provider: providerId, @@ -189,13 +189,13 @@ export class QueryManagementService implements IQueryManagementService { } } - public cancelQuery(ownerUri: string): Thenable { + public cancelQuery(ownerUri: string): Thenable { this.addTelemetry(TelemetryKeys.CancelQuery, ownerUri); return this._runAction(ownerUri, (runner) => { return runner.cancelQuery(ownerUri); }); } - public runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable { + public runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable { this.addTelemetry(TelemetryKeys.RunQuery, ownerUri, runOptions); return this._runAction(ownerUri, (runner) => { return runner.runQuery(ownerUri, selection, runOptions); @@ -212,17 +212,17 @@ export class QueryManagementService implements IQueryManagementService { return runner.runQueryString(ownerUri, queryString); }); } - public runQueryAndReturn(ownerUri: string, queryString: string): Thenable { + public runQueryAndReturn(ownerUri: string, queryString: string): Thenable { return this._runAction(ownerUri, (runner) => { return runner.runQueryAndReturn(ownerUri, queryString); }); } - public parseSyntax(ownerUri: string, query: string): Thenable { + public parseSyntax(ownerUri: string, query: string): Thenable { return this._runAction(ownerUri, (runner) => { return runner.parseSyntax(ownerUri, query); }); } - public getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable { + public getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable { return this._runAction(rowData.ownerUri, (runner) => { return runner.getQueryRows(rowData); }); @@ -234,42 +234,42 @@ export class QueryManagementService implements IQueryManagementService { }); } - public saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable { + public saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable { return this._runAction(requestParams.ownerUri, (runner) => { return runner.saveResults(requestParams); }); } - public onQueryComplete(result: sqlops.QueryExecuteCompleteNotificationResult): void { + public onQueryComplete(result: azdata.QueryExecuteCompleteNotificationResult): void { this._notify(result.ownerUri, (runner: QueryRunner) => { runner.handleQueryComplete(result); }); } - public onBatchStart(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { + public onBatchStart(batchInfo: azdata.QueryExecuteBatchNotificationParams): void { this._notify(batchInfo.ownerUri, (runner: QueryRunner) => { runner.handleBatchStart(batchInfo); }); } - public onBatchComplete(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { + public onBatchComplete(batchInfo: azdata.QueryExecuteBatchNotificationParams): void { this._notify(batchInfo.ownerUri, (runner: QueryRunner) => { runner.handleBatchComplete(batchInfo); }); } - public onResultSetAvailable(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { + public onResultSetAvailable(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { this._notify(resultSetInfo.ownerUri, (runner: QueryRunner) => { runner.handleResultSetAvailable(resultSetInfo); }); } - public onResultSetUpdated(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { + public onResultSetUpdated(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { this._notify(resultSetInfo.ownerUri, (runner: QueryRunner) => { runner.handleResultSetUpdated(resultSetInfo); }); } - public onMessage(message: sqlops.QueryExecuteMessageParams): void { + public onMessage(message: azdata.QueryExecuteMessageParams): void { this._notify(message.ownerUri, (runner: QueryRunner) => { runner.handleMessage(message); }); @@ -288,7 +288,7 @@ export class QueryManagementService implements IQueryManagementService { }); } - public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { + public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { return this._runAction(ownerUri, (runner) => { return runner.updateCell(ownerUri, rowId, columnId, newValue); }); @@ -300,7 +300,7 @@ export class QueryManagementService implements IQueryManagementService { }); } - public createRow(ownerUri: string): Thenable { + public createRow(ownerUri: string): Thenable { return this._runAction(ownerUri, (runner) => { return runner.createRow(ownerUri); }); @@ -318,7 +318,7 @@ export class QueryManagementService implements IQueryManagementService { }); } - public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { + public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { return this._runAction(ownerUri, (runner) => { return runner.revertCell(ownerUri, rowId, columnId); }); @@ -330,7 +330,7 @@ export class QueryManagementService implements IQueryManagementService { }); } - public getEditRows(rowData: sqlops.EditSubsetParams): Thenable { + public getEditRows(rowData: azdata.EditSubsetParams): Thenable { return this._runAction(rowData.ownerUri, (runner) => { return runner.getEditRows(rowData); }); diff --git a/src/sql/platform/query/common/queryModel.ts b/src/sql/platform/query/common/queryModel.ts index 0a5a5baf65..28de7886e7 100644 --- a/src/sql/platform/query/common/queryModel.ts +++ b/src/sql/platform/query/common/queryModel.ts @@ -17,7 +17,7 @@ import { EditCreateRowResult, EditRevertCellResult, ExecutionPlanOptions -} from 'sqlops'; +} from 'azdata'; import { QueryInfo } from 'sql/platform/query/common/queryModelService'; export const SERVICE_ID = 'queryModelService'; diff --git a/src/sql/platform/query/common/queryModelService.ts b/src/sql/platform/query/common/queryModelService.ts index 94a93e3088..f5650e0085 100644 --- a/src/sql/platform/query/common/queryModelService.ts +++ b/src/sql/platform/query/common/queryModelService.ts @@ -16,7 +16,7 @@ import { SqlFlavorStatusbarItem } from 'sql/parts/query/common/flavorStatus'; import { RowCountStatusBarItem } from 'sql/parts/query/common/rowCountStatus'; import { TimeElapsedStatusBarItem } from 'sql/parts/query/common/timeElapsedStatus'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar'; @@ -44,7 +44,7 @@ export class QueryInfo { public queryRunner: QueryRunner; public dataService: DataService; public queryEventQueue: QueryEvent[]; - public selection: Array; + public selection: Array; public queryInput: QueryInput; public selectionSnippet: string; @@ -69,12 +69,12 @@ export class QueryModelService implements IQueryModelService { private _queryInfoMap: Map; private _onRunQueryStart: Emitter; private _onRunQueryComplete: Emitter; - private _onEditSessionReady: Emitter; + private _onEditSessionReady: Emitter; // EVENTS ///////////////////////////////////////////////////////////// public get onRunQueryStart(): Event { return this._onRunQueryStart.event; } public get onRunQueryComplete(): Event { return this._onRunQueryComplete.event; } - public get onEditSessionReady(): Event { return this._onEditSessionReady.event; } + public get onEditSessionReady(): Event { return this._onEditSessionReady.event; } // CONSTRUCTOR ///////////////////////////////////////////////////////// constructor( @@ -84,7 +84,7 @@ export class QueryModelService implements IQueryModelService { this._queryInfoMap = new Map(); this._onRunQueryStart = new Emitter(); this._onRunQueryComplete = new Emitter(); - this._onEditSessionReady = new Emitter(); + this._onEditSessionReady = new Emitter(); // Register Statusbar items @@ -157,13 +157,13 @@ export class QueryModelService implements IQueryModelService { /** * Get more data rows from the current resultSets from the service layer */ - public getQueryRows(uri: string, rowStart: number, numberOfRows: number, batchId: number, resultId: number): Thenable { + public getQueryRows(uri: string, rowStart: number, numberOfRows: number, batchId: number, resultId: number): Thenable { return this._getQueryInfo(uri).queryRunner.getQueryRows(rowStart, numberOfRows, batchId, resultId).then(results => { return results.resultSubset; }); } - public getEditRows(uri: string, rowStart: number, numberOfRows: number): Thenable { + public getEditRows(uri: string, rowStart: number, numberOfRows: number): Thenable { return this._queryInfoMap.get(uri).queryRunner.getEditRows(rowStart, numberOfRows).then(results => { return results; }); @@ -210,14 +210,14 @@ export class QueryModelService implements IQueryModelService { /** * Run a query for the given URI with the given text selection */ - public runQuery(uri: string, selection: sqlops.ISelectionData, queryInput: QueryInput, runOptions?: sqlops.ExecutionPlanOptions): void { + public runQuery(uri: string, selection: azdata.ISelectionData, queryInput: QueryInput, runOptions?: azdata.ExecutionPlanOptions): void { this.doRunQuery(uri, selection, queryInput, false, runOptions); } /** * Run the current SQL statement for the given URI */ - public runQueryStatement(uri: string, selection: sqlops.ISelectionData, queryInput: QueryInput): void { + public runQueryStatement(uri: string, selection: azdata.ISelectionData, queryInput: QueryInput): void { this.doRunQuery(uri, selection, queryInput, true); } @@ -231,8 +231,8 @@ export class QueryModelService implements IQueryModelService { /** * Run Query implementation */ - private doRunQuery(uri: string, selection: sqlops.ISelectionData | string, queryInput: QueryInput, - runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): void { + private doRunQuery(uri: string, selection: azdata.ISelectionData | string, queryInput: QueryInput, + runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): void { // Reuse existing query runner if it exists let queryRunner: QueryRunner; let info: QueryInfo; @@ -463,7 +463,7 @@ export class QueryModelService implements IQueryModelService { return TPromise.as(null); } - public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { + public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { // Get existing query runner let queryRunner = this.internalGetQueryRunner(ownerUri); if (queryRunner) { @@ -493,7 +493,7 @@ export class QueryModelService implements IQueryModelService { return TPromise.as(null); } - public createRow(ownerUri: string): Thenable { + public createRow(ownerUri: string): Thenable { // Get existing query runner let queryRunner = this.internalGetQueryRunner(ownerUri); if (queryRunner) { @@ -511,7 +511,7 @@ export class QueryModelService implements IQueryModelService { return TPromise.as(null); } - public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { + public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { // Get existing query runner let queryRunner = this.internalGetQueryRunner(ownerUri); if (queryRunner) { @@ -595,9 +595,9 @@ export class QueryModelService implements IQueryModelService { // TODO remove this funciton and its usages when #821 in vscode-mssql is fixed and // the SqlToolsService version is updated in this repo - coquagli 4/19/2017 - private _validateSelection(selection: sqlops.ISelectionData): sqlops.ISelectionData { + private _validateSelection(selection: azdata.ISelectionData): azdata.ISelectionData { if (!selection) { - selection = {}; + selection = {}; } selection.endColumn = selection ? Math.max(0, selection.endColumn) : 0; selection.endLine = selection ? Math.max(0, selection.endLine) : 0; diff --git a/src/sql/platform/query/common/queryRunner.ts b/src/sql/platform/query/common/queryRunner.ts index 59aab04e81..f03c02388d 100644 --- a/src/sql/platform/query/common/queryRunner.ts +++ b/src/sql/platform/query/common/queryRunner.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as Constants from 'sql/parts/query/common/constants'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; @@ -48,15 +48,15 @@ export const enum EventType { export interface IEventType { start: void; complete: string; - message: sqlops.IResultMessage; - batchStart: sqlops.BatchSummary; - batchComplete: sqlops.BatchSummary; - resultSet: sqlops.ResultSetSummary; + message: azdata.IResultMessage; + batchStart: azdata.BatchSummary; + batchComplete: azdata.BatchSummary; + resultSet: azdata.ResultSetSummary; editSessionReady: IEditSessionReadyEvent; } -export interface IGridMessage extends sqlops.IResultMessage { - selection: sqlops.ISelectionData; +export interface IGridMessage extends azdata.IResultMessage { + selection: azdata.ISelectionData; } /* @@ -69,8 +69,8 @@ export default class QueryRunner extends Disposable { private _totalElapsedMilliseconds: number = 0; private _isExecuting: boolean = false; private _hasCompleted: boolean = false; - private _batchSets: sqlops.BatchSummary[] = []; - private _messages: sqlops.IResultMessage[] = []; + private _batchSets: azdata.BatchSummary[] = []; + private _messages: azdata.IResultMessage[] = []; private _eventEmitter = new EventEmitter(); private _isQueryPlan: boolean; @@ -78,13 +78,13 @@ export default class QueryRunner extends Disposable { private _planXml = new Deferred(); public get planXml(): Thenable { return this._planXml.promise; } - private _onMessage = this._register(new Emitter()); + private _onMessage = this._register(new Emitter()); public readonly onMessage = this._onMessage.event; - private _onResultSet = this._register(new Emitter()); + private _onResultSet = this._register(new Emitter()); public readonly onResultSet = this._onResultSet.event; - private _onResultSetUpdate = this._register(new Emitter()); + private _onResultSetUpdate = this._register(new Emitter()); public readonly onResultSetUpdate = this._onResultSetUpdate.event; private _onQueryStart = this._register(new Emitter()); @@ -93,11 +93,11 @@ export default class QueryRunner extends Disposable { private _onQueryEnd = this._register(new Emitter()); public readonly onQueryEnd: Event = this._onQueryEnd.event; - private _onBatchStart = this._register(new Emitter()); - public readonly onBatchStart: Event = this._onBatchStart.event; + private _onBatchStart = this._register(new Emitter()); + public readonly onBatchStart: Event = this._onBatchStart.event; - private _onBatchEnd = this._register(new Emitter()); - public readonly onBatchEnd: Event = this._onBatchEnd.event; + private _onBatchEnd = this._register(new Emitter()); + public readonly onBatchEnd: Event = this._onBatchEnd.event; private _queryStartTime: Date; public get queryStartTime(): Date { @@ -132,14 +132,14 @@ export default class QueryRunner extends Disposable { /** * For public use only, for private use, directly access the member */ - public get batchSets(): sqlops.BatchSummary[] { + public get batchSets(): azdata.BatchSummary[] { return this._batchSets.slice(0); } /** * For public use only, for private use, directly access the member */ - public get messages(): sqlops.IResultMessage[] { + public get messages(): azdata.IResultMessage[] { return this._messages.slice(0); } @@ -152,7 +152,7 @@ export default class QueryRunner extends Disposable { /** * Cancels the running query, if there is one */ - public cancelQuery(): Thenable { + public cancelQuery(): Thenable { return this._queryManagementService.cancelQuery(this.uri); } @@ -160,13 +160,13 @@ export default class QueryRunner extends Disposable { * Runs the query with the provided query * @param input Query string to execute */ - public runQuery(input: string, runOptions?: sqlops.ExecutionPlanOptions): Thenable; + public runQuery(input: string, runOptions?: azdata.ExecutionPlanOptions): Thenable; /** * Runs the query by pulling the query from the document using the provided selection data * @param input selection data */ - public runQuery(input: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable; - public runQuery(input, runOptions?: sqlops.ExecutionPlanOptions): Thenable { + public runQuery(input: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable; + public runQuery(input, runOptions?: azdata.ExecutionPlanOptions): Thenable { return this.doRunQuery(input, false, runOptions); } @@ -174,7 +174,7 @@ export default class QueryRunner extends Disposable { * Runs the current SQL statement by pulling the query from the document using the provided selection data * @param input selection data */ - public runQueryStatement(input: sqlops.ISelectionData): Thenable { + public runQueryStatement(input: azdata.ISelectionData): Thenable { return this.doRunQuery(input, true); } @@ -182,9 +182,9 @@ export default class QueryRunner extends Disposable { * Implementation that runs the query with the provided query * @param input Query string to execute */ - private doRunQuery(input: string, runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): Thenable; - private doRunQuery(input: sqlops.ISelectionData, runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): Thenable; - private doRunQuery(input, runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): Thenable { + private doRunQuery(input: string, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable; + private doRunQuery(input: azdata.ISelectionData, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable; + private doRunQuery(input, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable { if (this.isExecuting) { return TPromise.as(undefined); } @@ -235,20 +235,20 @@ export default class QueryRunner extends Disposable { // Attempting to launch the query failed, show the error message const eol = this.getEolString(); let message = nls.localize('query.ExecutionFailedError', 'Execution failed due to an unexpected error: {0}\t{1}', eol, error); - this.handleMessage({ + this.handleMessage({ ownerUri: this.uri, message: { isError: true, message: message } }); - this.handleQueryComplete({ ownerUri: this.uri }); + this.handleQueryComplete({ ownerUri: this.uri }); } /** * Handle a QueryComplete from the service layer */ - public handleQueryComplete(result: sqlops.QueryExecuteCompleteNotificationResult): void { + public handleQueryComplete(result: azdata.QueryExecuteCompleteNotificationResult): void { // this also isn't exact but its the best we can do this._queryEndTime = new Date(); @@ -283,7 +283,7 @@ export default class QueryRunner extends Disposable { /** * Handle a BatchStart from the service layer */ - public handleBatchStart(result: sqlops.QueryExecuteBatchNotificationParams): void { + public handleBatchStart(result: azdata.QueryExecuteBatchNotificationParams): void { let batch = result.batchSummary; // Recalculate the start and end lines, relative to the result line offset @@ -314,8 +314,8 @@ export default class QueryRunner extends Disposable { /** * Handle a BatchComplete from the service layer */ - public handleBatchComplete(result: sqlops.QueryExecuteBatchNotificationParams): void { - let batch: sqlops.BatchSummary = result.batchSummary; + public handleBatchComplete(result: azdata.QueryExecuteBatchNotificationParams): void { + let batch: azdata.BatchSummary = result.batchSummary; // Store the batch again to get the rest of the data this._batchSets[batch.id] = batch; @@ -333,17 +333,17 @@ export default class QueryRunner extends Disposable { /** * Handle a ResultSetComplete from the service layer */ - public handleResultSetAvailable(result: sqlops.QueryExecuteResultSetNotificationParams): void { + public handleResultSetAvailable(result: azdata.QueryExecuteResultSetNotificationParams): void { if (result && result.resultSetSummary) { let resultSet = result.resultSetSummary; - let batchSet: sqlops.BatchSummary; + let batchSet: azdata.BatchSummary; if (!resultSet.batchId) { // Missing the batchId. In this case, default to always using the first batch in the list // or create one in the case the DMP extension didn't obey the contract perfectly if (this._batchSets.length > 0) { batchSet = this._batchSets[0]; } else { - batchSet = { + batchSet = { id: 0, selection: undefined, hasError: false, @@ -373,10 +373,10 @@ export default class QueryRunner extends Disposable { } } - public handleResultSetUpdated(result: sqlops.QueryExecuteResultSetNotificationParams): void { + public handleResultSetUpdated(result: azdata.QueryExecuteResultSetNotificationParams): void { if (result && result.resultSetSummary) { let resultSet = result.resultSetSummary; - let batchSet: sqlops.BatchSummary; + let batchSet: azdata.BatchSummary; batchSet = this._batchSets[resultSet.batchId]; // handle getting queryPlanxml if we need too if (this.isQueryPlan) { @@ -397,7 +397,7 @@ export default class QueryRunner extends Disposable { /** * Handle a Mssage from the service layer */ - public handleMessage(obj: sqlops.QueryExecuteMessageParams): void { + public handleMessage(obj: azdata.QueryExecuteMessageParams): void { let message = obj.message; message.time = new Date(message.time).toLocaleTimeString(); this._messages.push(message); @@ -410,8 +410,8 @@ export default class QueryRunner extends Disposable { /** * Get more data rows from the current resultSets from the service layer */ - public getQueryRows(rowStart: number, numberOfRows: number, batchIndex: number, resultSetIndex: number): Thenable { - let rowData: sqlops.QueryExecuteSubsetParams = { + public getQueryRows(rowStart: number, numberOfRows: number, batchIndex: number, resultSetIndex: number): Thenable { + let rowData: azdata.QueryExecuteSubsetParams = { ownerUri: this.uri, resultSetIndex: resultSetIndex, rowsCount: numberOfRows, @@ -458,15 +458,15 @@ export default class QueryRunner extends Disposable { * @param rowStart The index of the row to start returning (inclusive) * @param numberOfRows The number of rows to return */ - public getEditRows(rowStart: number, numberOfRows: number): Thenable { + public getEditRows(rowStart: number, numberOfRows: number): Thenable { const self = this; - let rowData: sqlops.EditSubsetParams = { + let rowData: azdata.EditSubsetParams = { ownerUri: this.uri, rowCount: numberOfRows, rowStartIndex: rowStart }; - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { self._queryManagementService.getEditRows(rowData).then(result => { if (!result.hasOwnProperty('rowCount')) { let error = `Nothing returned from subset query`; @@ -492,7 +492,7 @@ export default class QueryRunner extends Disposable { this._eventEmitter.emit(EventType.EDIT_SESSION_READY, { ownerUri, success, message }); } - public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { + public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { return this._queryManagementService.updateCell(ownerUri, rowId, columnId, newValue); } @@ -500,7 +500,7 @@ export default class QueryRunner extends Disposable { return this._queryManagementService.commitEdit(ownerUri); } - public createRow(ownerUri: string): Thenable { + public createRow(ownerUri: string): Thenable { return this._queryManagementService.createRow(ownerUri).then(result => { return result; }); @@ -510,7 +510,7 @@ export default class QueryRunner extends Disposable { return this._queryManagementService.deleteRow(ownerUri, rowId); } - public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { + public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { return this._queryManagementService.revertCell(ownerUri, rowId, columnId).then(result => { return result; }); @@ -621,7 +621,7 @@ export default class QueryRunner extends Disposable { private getColumnHeaders(batchId: number, resultId: number, range: Slick.Range): string[] { let headers: string[] = undefined; - let batchSummary: sqlops.BatchSummary = this._batchSets[batchId]; + let batchSummary: azdata.BatchSummary = this._batchSets[batchId]; if (batchSummary !== undefined) { let resultSetSummary = batchSummary.resultSetSummaries[resultId]; headers = resultSetSummary.columnInfo.slice(range.fromCell, range.toCell + 1).map((info, i) => { @@ -648,7 +648,7 @@ export default class QueryRunner extends Disposable { // get config copyRemoveNewLine option from vscode config let showBatchTime: boolean = WorkbenchUtils.getSqlConfigValue(this._configurationService, Constants.configShowBatchTime); if (showBatchTime) { - let message: sqlops.IResultMessage = { + let message: azdata.IResultMessage = { batchId: batchId, message: nls.localize('elapsedBatchTime', 'Batch execution time: {0}', executionTime), time: undefined, diff --git a/src/sql/platform/restore/common/mssqlRestoreInfo.ts b/src/sql/platform/restore/common/mssqlRestoreInfo.ts index 43dfe1163d..b5492f1dfd 100644 --- a/src/sql/platform/restore/common/mssqlRestoreInfo.ts +++ b/src/sql/platform/restore/common/mssqlRestoreInfo.ts @@ -5,12 +5,12 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; -export class MssqlRestoreInfo implements sqlops.RestoreInfo { +export class MssqlRestoreInfo implements azdata.RestoreInfo { options: { [name: string]: any }; - taskExecutionMode: sqlops.TaskExecutionMode; + taskExecutionMode: azdata.TaskExecutionMode; public constructor() { this.options = {}; diff --git a/src/sql/platform/restore/common/restoreService.ts b/src/sql/platform/restore/common/restoreService.ts index edf6429cb4..76f394eed3 100644 --- a/src/sql/platform/restore/common/restoreService.ts +++ b/src/sql/platform/restore/common/restoreService.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export { TaskExecutionMode } from 'sql/platform/backup/common/backupService'; @@ -21,27 +21,27 @@ export interface IRestoreService { /** * Register a disaster recovery provider */ - registerProvider(providerId: string, provider: sqlops.RestoreProvider): void; + registerProvider(providerId: string, provider: azdata.RestoreProvider): void; /** * Restore a data source using a backup file or database */ - restore(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable; + restore(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable; /** * Gets restore plan to do the restore operation on a database */ - getRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable; + getRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable; /** * Gets restore config Info */ - getRestoreConfigInfo(connectionUri: string): Thenable; + getRestoreConfigInfo(connectionUri: string): Thenable; /** * Cancel restore plan */ - cancelRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable; + cancelRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable; } export const IRestoreDialogController = createDecorator('restoreDialogService'); diff --git a/src/sql/platform/restore/common/restoreServiceImpl.ts b/src/sql/platform/restore/common/restoreServiceImpl.ts index 2e7da9f9c7..8e11ca4a49 100644 --- a/src/sql/platform/restore/common/restoreServiceImpl.ts +++ b/src/sql/platform/restore/common/restoreServiceImpl.ts @@ -9,7 +9,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as types from 'vs/base/common/types'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService'; @@ -31,7 +31,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con export class RestoreService implements IRestoreService { public _serviceBrand: any; - private _providers: { [handle: string]: sqlops.RestoreProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.RestoreProvider; } = Object.create(null); constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService, @@ -42,8 +42,8 @@ export class RestoreService implements IRestoreService { /** * Gets restore config Info */ - getRestoreConfigInfo(connectionUri: string): Thenable { - return new Promise((resolve, reject) => { + getRestoreConfigInfo(connectionUri: string): Thenable { + return new Promise((resolve, reject) => { let providerResult = this.getProvider(connectionUri); if (providerResult) { providerResult.provider.getRestoreConfigInfo(connectionUri).then(result => { @@ -60,8 +60,8 @@ export class RestoreService implements IRestoreService { /** * Restore a data source using a backup file or database */ - restore(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { - return new Promise((resolve, reject) => { + restore(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { + return new Promise((resolve, reject) => { let providerResult = this.getProvider(connectionUri); if (providerResult) { TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.RestoreRequested, { provider: providerResult.providerName }); @@ -76,7 +76,7 @@ export class RestoreService implements IRestoreService { }); } - private getProvider(connectionUri: string): { provider: sqlops.RestoreProvider, providerName: string } { + private getProvider(connectionUri: string): { provider: azdata.RestoreProvider, providerName: string } { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { return { provider: this._providers[providerId], providerName: providerId }; @@ -88,8 +88,8 @@ export class RestoreService implements IRestoreService { /** * Gets restore plan to do the restore operation on a database */ - getRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { - return new Promise((resolve, reject) => { + getRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { + return new Promise((resolve, reject) => { let providerResult = this.getProvider(connectionUri); if (providerResult) { providerResult.provider.getRestorePlan(connectionUri, restoreInfo).then(result => { @@ -107,7 +107,7 @@ export class RestoreService implements IRestoreService { /** * Cancels a restore plan */ - cancelRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { + cancelRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { return new Promise((resolve, reject) => { let providerResult = this.getProvider(connectionUri); if (providerResult) { @@ -126,7 +126,7 @@ export class RestoreService implements IRestoreService { /** * Register a disaster recovery provider */ - public registerProvider(providerId: string, provider: sqlops.RestoreProvider): void { + public registerProvider(providerId: string, provider: azdata.RestoreProvider): void { this._providers[providerId] = provider; } } @@ -233,7 +233,7 @@ export class RestoreDialogController implements IRestoreDialogController { }); } - private setRestoreOption(overwriteTargetDatabase: boolean = false): sqlops.RestoreInfo { + private setRestoreOption(overwriteTargetDatabase: boolean = false): azdata.RestoreInfo { let restoreInfo = undefined; let providerId: string = this.getCurrentProviderId(); @@ -264,8 +264,8 @@ export class RestoreDialogController implements IRestoreDialogController { return restoreInfo; } - private getRestoreOption(): sqlops.ServiceOption[] { - let options: sqlops.ServiceOption[] = []; + private getRestoreOption(): azdata.ServiceOption[] { + let options: azdata.ServiceOption[] = []; let providerId: string = this.getCurrentProviderId(); let providerCapabilities = this._capabilitiesService.getLegacyCapabilities(providerId); diff --git a/src/sql/platform/scripting/common/scriptingService.ts b/src/sql/platform/scripting/common/scriptingService.ts index d7f9efdc5f..f5a568e91f 100644 --- a/src/sql/platform/scripting/common/scriptingService.ts +++ b/src/sql/platform/scripting/common/scriptingService.ts @@ -9,7 +9,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ScriptOperation } from 'sql/workbench/common/taskUtilities'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { error } from 'sql/base/common/log'; export const SERVICE_ID = 'scriptingService'; @@ -18,12 +18,12 @@ export const IScriptingService = createDecorator(SERVICE_ID); export interface IScriptingService { _serviceBrand: any; - script(connectionUri: string, metadata: sqlops.ObjectMetadata, operation: ScriptOperation, paramDetails: sqlops.ScriptingParamDetails): Thenable; + script(connectionUri: string, metadata: azdata.ObjectMetadata, operation: ScriptOperation, paramDetails: azdata.ScriptingParamDetails): Thenable; /** * Register a scripting provider */ - registerProvider(providerId: string, provider: sqlops.ScriptingProvider): void; + registerProvider(providerId: string, provider: azdata.ScriptingProvider): void; /** * Specifies whether a provider with a given ID has been registered or not @@ -33,12 +33,12 @@ export interface IScriptingService { /** * Callback method for when scripting is complete */ - onScriptingComplete(handle: number, scriptingCompleteResult: sqlops.ScriptingCompleteResult): void; + onScriptingComplete(handle: number, scriptingCompleteResult: azdata.ScriptingCompleteResult): void; /** * Returns the result for an operation if the operation failed */ - getOperationFailedResult(operationId: string): sqlops.ScriptingCompleteResult; + getOperationFailedResult(operationId: string): azdata.ScriptingCompleteResult; } export class ScriptingService implements IScriptingService { @@ -47,9 +47,9 @@ export class ScriptingService implements IScriptingService { private disposables: IDisposable[] = []; - private _providers: { [handle: string]: sqlops.ScriptingProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.ScriptingProvider; } = Object.create(null); - private failedScriptingOperations: { [operationId: string]: sqlops.ScriptingCompleteResult } = {}; + private failedScriptingOperations: { [operationId: string]: azdata.ScriptingCompleteResult } = {}; constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService) { } /** @@ -59,7 +59,7 @@ export class ScriptingService implements IScriptingService { * @param operation * @param paramDetails */ - public script(connectionUri: string, metadata: sqlops.ObjectMetadata, operation: ScriptOperation, paramDetails: sqlops.ScriptingParamDetails): Thenable { + public script(connectionUri: string, metadata: azdata.ObjectMetadata, operation: ScriptOperation, paramDetails: azdata.ScriptingParamDetails): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { @@ -76,7 +76,7 @@ export class ScriptingService implements IScriptingService { * @param handle * @param scriptingCompleteResult */ - public onScriptingComplete(handle: number, scriptingCompleteResult: sqlops.ScriptingCompleteResult): void { + public onScriptingComplete(handle: number, scriptingCompleteResult: azdata.ScriptingCompleteResult): void { if (scriptingCompleteResult && scriptingCompleteResult.hasError && scriptingCompleteResult.errorMessage) { error(`Scripting failed. error: ${scriptingCompleteResult.errorMessage}`); if (scriptingCompleteResult.operationId) { @@ -89,7 +89,7 @@ export class ScriptingService implements IScriptingService { * Returns the result for an operation if the operation failed * @param operationId Operation Id */ - public getOperationFailedResult(operationId: string): sqlops.ScriptingCompleteResult { + public getOperationFailedResult(operationId: string): azdata.ScriptingCompleteResult { if (operationId && operationId in this.failedScriptingOperations) { return this.failedScriptingOperations[operationId]; } else { @@ -100,7 +100,7 @@ export class ScriptingService implements IScriptingService { /** * Register a scripting provider */ - public registerProvider(providerId: string, provider: sqlops.ScriptingProvider): void { + public registerProvider(providerId: string, provider: azdata.ScriptingProvider): void { this._providers[providerId] = provider; } diff --git a/src/sql/platform/serialization/common/serializationService.ts b/src/sql/platform/serialization/common/serializationService.ts index b46575c444..12f3c2efc4 100644 --- a/src/sql/platform/serialization/common/serializationService.ts +++ b/src/sql/platform/serialization/common/serializationService.ts @@ -9,12 +9,12 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export const SERVICE_ID = 'serializationService'; export interface SerializationProviderEvents { - onSaveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable; + onSaveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable; } export const ISerializationService = createDecorator(SERVICE_ID); @@ -22,13 +22,13 @@ export const ISerializationService = createDecorator(SERV export interface ISerializationService { _serviceBrand: any; - saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable; + saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable; - disabledSaveAs(): Thenable; + disabledSaveAs(): Thenable; addEventListener(handle: number, events: SerializationProviderEvents): IDisposable; - getSerializationFeatureMetadataProvider(ownerUri: string): sqlops.FeatureMetadataProvider; + getSerializationFeatureMetadataProvider(ownerUri: string): azdata.FeatureMetadataProvider; } export class SerializationService implements ISerializationService { @@ -58,7 +58,7 @@ export class SerializationService implements ISerializationService { }; } - public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { + public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { if (this._serverEvents === undefined || this._serverEvents[this._lastHandle] === undefined) { return this.disabledSaveAs(); } @@ -66,12 +66,12 @@ export class SerializationService implements ISerializationService { return this._serverEvents[this._lastHandle].onSaveAs(saveFormat, savePath, results, appendToFile); } - public disabledSaveAs(): Thenable { + public disabledSaveAs(): Thenable { return Promise.resolve({ messages: 'Saving results into different format disabled for this data provider.' }); } - public getSerializationFeatureMetadataProvider(ownerUri: string): sqlops.FeatureMetadataProvider { + public getSerializationFeatureMetadataProvider(ownerUri: string): azdata.FeatureMetadataProvider { let providerId: string = this._connectionService.getProviderIdFromUri(ownerUri); let providerCapabilities = this._capabilitiesService.getLegacyCapabilities(providerId); diff --git a/src/sql/platform/taskHistory/common/taskService.ts b/src/sql/platform/taskHistory/common/taskService.ts index 88a255a59c..f668cf6006 100644 --- a/src/sql/platform/taskHistory/common/taskService.ts +++ b/src/sql/platform/taskHistory/common/taskService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -27,20 +27,20 @@ export interface ITaskService { handleTaskComplete(eventArgs: TaskStatusChangeArgs): void; getAllTasks(): TaskNode; getNumberOfInProgressTasks(): number; - onNewTaskCreated(handle: number, taskInfo: sqlops.TaskInfo); - createNewTask(taskInfo: sqlops.TaskInfo); - updateTask(taskProgressInfo: sqlops.TaskProgressInfo); - onTaskStatusChanged(handle: number, taskProgressInfo: sqlops.TaskProgressInfo); + onNewTaskCreated(handle: number, taskInfo: azdata.TaskInfo); + createNewTask(taskInfo: azdata.TaskInfo); + updateTask(taskProgressInfo: azdata.TaskProgressInfo); + onTaskStatusChanged(handle: number, taskProgressInfo: azdata.TaskProgressInfo); cancelTask(providerId: string, taskId: string): Thenable; /** * Register a ObjectExplorer provider */ - registerProvider(providerId: string, provider: sqlops.TaskServicesProvider): void; + registerProvider(providerId: string, provider: azdata.TaskServicesProvider): void; } export interface TaskStatusChangeArgs { taskId: string; - status: sqlops.TaskStatus; + status: azdata.TaskStatus; message?: string; script?: string; } @@ -50,7 +50,7 @@ export class TaskService implements ITaskService { private _taskQueue: TaskNode; private _onTaskComplete = new Emitter(); private _onAddNewTask = new Emitter(); - private _providers: { [handle: string]: sqlops.TaskServicesProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.TaskServicesProvider; } = Object.create(null); constructor( @ILifecycleService lifecycleService: ILifecycleService, @@ -69,15 +69,15 @@ export class TaskService implements ITaskService { /** * Register a ObjectExplorer provider */ - public registerProvider(providerId: string, provider: sqlops.TaskServicesProvider): void { + public registerProvider(providerId: string, provider: azdata.TaskServicesProvider): void { this._providers[providerId] = provider; } - public onNewTaskCreated(handle: number, taskInfo: sqlops.TaskInfo) { + public onNewTaskCreated(handle: number, taskInfo: azdata.TaskInfo) { this.createNewTask(taskInfo); } - public createNewTask(taskInfo: sqlops.TaskInfo) { + public createNewTask(taskInfo: azdata.TaskInfo) { let databaseName: string = taskInfo.databaseName; let serverName: string = taskInfo.serverName; if (taskInfo && taskInfo.connection) { @@ -94,7 +94,7 @@ export class TaskService implements ITaskService { this.handleNewTask(node); } - public updateTask(taskProgressInfo: sqlops.TaskProgressInfo) { + public updateTask(taskProgressInfo: azdata.TaskProgressInfo) { this.handleTaskComplete({ taskId: taskProgressInfo.taskId, status: taskProgressInfo.status, @@ -103,7 +103,7 @@ export class TaskService implements ITaskService { }); } - public onTaskStatusChanged(handle: number, taskProgressInfo: sqlops.TaskProgressInfo) { + public onTaskStatusChanged(handle: number, taskProgressInfo: azdata.TaskProgressInfo) { this.updateTask(taskProgressInfo); } diff --git a/src/sql/services/common/commonServiceInterface.service.ts b/src/sql/services/common/commonServiceInterface.service.ts index 83d627ba46..75c6f29e44 100644 --- a/src/sql/services/common/commonServiceInterface.service.ts +++ b/src/sql/services/common/commonServiceInterface.service.ts @@ -19,7 +19,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; -import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'sqlops'; +import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'azdata'; /* VS imports */ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/workbench/api/common/sqlExtHostTypes.ts b/src/sql/workbench/api/common/sqlExtHostTypes.ts index f0e92e3189..cdd85e230e 100644 --- a/src/sql/workbench/api/common/sqlExtHostTypes.ts +++ b/src/sql/workbench/api/common/sqlExtHostTypes.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { nb, IConnectionProfile } from 'sqlops'; +import { nb, IConnectionProfile } from 'azdata'; import * as vsExtTypes from 'vs/workbench/api/node/extHostTypes'; // SQL added extension host types diff --git a/src/sql/workbench/api/electron-browser/mainThreadTasks.ts b/src/sql/workbench/api/electron-browser/mainThreadTasks.ts index 13374f22cb..91f662b668 100644 --- a/src/sql/workbench/api/electron-browser/mainThreadTasks.ts +++ b/src/sql/workbench/api/electron-browser/mainThreadTasks.ts @@ -18,7 +18,7 @@ import { MainThreadTasksShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/api/node/extHostAccountManagement.ts b/src/sql/workbench/api/node/extHostAccountManagement.ts index c1e8f8a2ca..08065fcbc8 100644 --- a/src/sql/workbench/api/node/extHostAccountManagement.ts +++ b/src/sql/workbench/api/node/extHostAccountManagement.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { Disposable } from 'vs/workbench/api/node/extHostTypes'; import { @@ -21,8 +21,8 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { private _handlePool: number = 0; private _proxy: MainThreadAccountManagementShape; private _providers: { [handle: number]: AccountProviderWithMetadata } = {}; - private _accounts: { [handle: number]: sqlops.Account[] } = {}; - private readonly _onDidChangeAccounts = new Emitter(); + private _accounts: { [handle: number]: azdata.Account[] } = {}; + private readonly _onDidChangeAccounts = new Emitter(); constructor(mainContext: IMainContext) { super(); @@ -31,24 +31,24 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { // PUBLIC METHODS ////////////////////////////////////////////////////// // - MAIN THREAD AVAILABLE METHODS ///////////////////////////////////// - public $clear(handle: number, accountKey: sqlops.AccountKey): Thenable { - return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.clear(accountKey)); + public $clear(handle: number, accountKey: azdata.AccountKey): Thenable { + return this._withProvider(handle, (provider: azdata.AccountProvider) => provider.clear(accountKey)); } - public $initialize(handle: number, restoredAccounts: sqlops.Account[]): Thenable { - return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.initialize(restoredAccounts)); + public $initialize(handle: number, restoredAccounts: azdata.Account[]): Thenable { + return this._withProvider(handle, (provider: azdata.AccountProvider) => provider.initialize(restoredAccounts)); } - public $prompt(handle: number): Thenable { - return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.prompt()); + public $prompt(handle: number): Thenable { + return this._withProvider(handle, (provider: azdata.AccountProvider) => provider.prompt()); } - public $refresh(handle: number, account: sqlops.Account): Thenable { - return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.refresh(account)); + public $refresh(handle: number, account: azdata.Account): Thenable { + return this._withProvider(handle, (provider: azdata.AccountProvider) => provider.refresh(account)); } public $autoOAuthCancelled(handle: number): Thenable { - return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.autoOAuthCancelled()); + return this._withProvider(handle, (provider: azdata.AccountProvider) => provider.autoOAuthCancelled()); } // - EXTENSION HOST AVAILABLE METHODS ////////////////////////////////// @@ -60,18 +60,18 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { this._proxy.$endAutoOAuthDeviceCode(); } - public $accountUpdated(updatedAccount: sqlops.Account): void { + public $accountUpdated(updatedAccount: azdata.Account): void { this._proxy.$accountUpdated(updatedAccount); } - public $getAllAccounts(): Thenable { + public $getAllAccounts(): Thenable { if (Object.keys(this._providers).length === 0) { throw new Error('No account providers registered.'); } this._accounts = {}; - const resultAccounts: sqlops.Account[] = []; + const resultAccounts: azdata.Account[] = []; const promises: Thenable[] = []; @@ -90,7 +90,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { return Promise.all(promises).then(() => resultAccounts); } - public $getSecurityToken(account: sqlops.Account, resource?: sqlops.AzureResource): Thenable<{}> { + public $getSecurityToken(account: azdata.Account, resource?: azdata.AzureResource): Thenable<{}> { if (resource === undefined) { resource = AzureResource.ResourceManagement; } @@ -98,7 +98,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { for (const handle in this._accounts) { const providerHandle = parseInt(handle); if (this._accounts[handle].findIndex((acct) => acct.key.accountId === account.key.accountId) !== -1) { - return this._withProvider(providerHandle, (provider: sqlops.AccountProvider) => provider.getSecurityToken(account, resource)); + return this._withProvider(providerHandle, (provider: azdata.AccountProvider) => provider.getSecurityToken(account, resource)); } } @@ -106,15 +106,15 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { }); } - public get onDidChangeAccounts(): Event { + public get onDidChangeAccounts(): Event { return this._onDidChangeAccounts.event; } - public $accountsChanged(handle: number, accounts: sqlops.Account[]): Thenable { + public $accountsChanged(handle: number, accounts: azdata.Account[]): Thenable { return this._onDidChangeAccounts.fire({ accounts: accounts }); } - public $registerAccountProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): Disposable { + public $registerAccountProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): Disposable { let self = this; // Look for any account providers that have the same provider ID @@ -155,7 +155,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { return this._handlePool++; } - private _withProvider(handle: number, callback: (provider: sqlops.AccountProvider) => Thenable): Thenable { + private _withProvider(handle: number, callback: (provider: azdata.AccountProvider) => Thenable): Thenable { let provider = this._providers[handle]; if (provider === undefined) { return TPromise.wrapError(new Error(`Provider ${handle} not found.`)); @@ -165,8 +165,8 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape { } interface AccountProviderWithMetadata { - metadata: sqlops.AccountProviderMetadata; - provider: sqlops.AccountProvider; + metadata: azdata.AccountProviderMetadata; + provider: azdata.AccountProvider; } diff --git a/src/sql/workbench/api/node/extHostBackgroundTaskManagement.ts b/src/sql/workbench/api/node/extHostBackgroundTaskManagement.ts index 66256a748e..25b84a7ac9 100644 --- a/src/sql/workbench/api/node/extHostBackgroundTaskManagement.ts +++ b/src/sql/workbench/api/node/extHostBackgroundTaskManagement.ts @@ -6,7 +6,7 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostBackgroundTaskManagementShape, SqlMainContext, MainThreadBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { Emitter } from 'vs/base/common/event'; import { generateUuid } from 'vs/base/common/uuid'; @@ -21,7 +21,7 @@ export enum TaskStatus { Canceling = 6 } -export class ExtBackgroundOperation implements sqlops.BackgroundOperation { +export class ExtBackgroundOperation implements azdata.BackgroundOperation { private readonly _proxy: MainThreadBackgroundTaskManagementShape; private _onCanceled = new Emitter(); @@ -55,7 +55,7 @@ export class ExtBackgroundOperation implements sqlops.BackgroundOperation { export class ExtHostBackgroundTaskManagement implements ExtHostBackgroundTaskManagementShape { private readonly _proxy: MainThreadBackgroundTaskManagementShape; - private readonly _handlers = new Map(); + private readonly _handlers = new Map(); private readonly _operations = new Map(); private readonly _mainContext: IMainContext; @@ -82,14 +82,14 @@ export class ExtHostBackgroundTaskManagement implements ExtHostBackgroundTaskMan } } - $registerTask(operationInfo: sqlops.BackgroundOperationInfo): void { + $registerTask(operationInfo: azdata.BackgroundOperationInfo): void { let operationId = operationInfo.operationId || `OperationId${generateUuid()}`; if (this._handlers.has(operationId)) { throw new Error(`operation '${operationId}' already exists`); } this._handlers.set(operationId, operationInfo); - let taskInfo: sqlops.TaskInfo = { + let taskInfo: azdata.TaskInfo = { databaseName: undefined, serverName: undefined, description: operationInfo.description, diff --git a/src/sql/workbench/api/node/extHostConnectionManagement.ts b/src/sql/workbench/api/node/extHostConnectionManagement.ts index 8f76e01103..355f260ce3 100644 --- a/src/sql/workbench/api/node/extHostConnectionManagement.ts +++ b/src/sql/workbench/api/node/extHostConnectionManagement.ts @@ -7,7 +7,6 @@ import { ExtHostConnectionManagementShape, SqlMainContext, MainThreadConnectionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { generateUuid } from 'vs/base/common/uuid'; -import * as sqlops from 'sqlops'; import * as azdata from 'azdata'; export class ExtHostConnectionManagement extends ExtHostConnectionManagementShape { @@ -30,11 +29,11 @@ export class ExtHostConnectionManagement extends ExtHostConnectionManagementShap } // "sqlops" back-compat connection APIs - public $getActiveConnections(): Thenable { + public $getActiveConnections(): Thenable { return this._proxy.$getActiveConnections(); } - public $getSqlOpsCurrentConnection(): Thenable { + public $getSqlOpsCurrentConnection(): Thenable { return this._proxy.$getCurrentConnection(); } @@ -42,11 +41,11 @@ export class ExtHostConnectionManagement extends ExtHostConnectionManagementShap return this._proxy.$getCredentials(connectionId); } - public $getServerInfo(connectionId: string): Thenable { + public $getServerInfo(connectionId: string): Thenable { return this._proxy.$getServerInfo(connectionId); } - public $openConnectionDialog(providers?: string[], initialConnectionProfile?: sqlops.IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Thenable { + public $openConnectionDialog(providers?: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable { return this._proxy.$openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions); } @@ -62,7 +61,7 @@ export class ExtHostConnectionManagement extends ExtHostConnectionManagementShap return this._proxy.$getUriForConnection(connectionId); } - public $connect(connectionProfile: sqlops.IConnectionProfile): Thenable { + public $connect(connectionProfile: azdata.IConnectionProfile): Thenable { return this._proxy.$connect(connectionProfile); } } diff --git a/src/sql/workbench/api/node/extHostCredentialManagement.ts b/src/sql/workbench/api/node/extHostCredentialManagement.ts index 291dfc66f8..659ff95716 100644 --- a/src/sql/workbench/api/node/extHostCredentialManagement.ts +++ b/src/sql/workbench/api/node/extHostCredentialManagement.ts @@ -8,13 +8,13 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { SqlMainContext, MainThreadCredentialManagementShape, ExtHostCredentialManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Disposable } from 'vs/workbench/api/node/extHostTypes'; class CredentialAdapter { - public provider: sqlops.CredentialProvider; + public provider: azdata.CredentialProvider; - constructor(provider: sqlops.CredentialProvider) { + constructor(provider: azdata.CredentialProvider) { this.provider = provider; } @@ -22,7 +22,7 @@ class CredentialAdapter { return this.provider.saveCredential(credentialId, password); } - public readCredential(credentialId: string): Thenable { + public readCredential(credentialId: string): Thenable { return this.provider.readCredential(credentialId); } @@ -54,7 +54,7 @@ export class ExtHostCredentialManagement extends ExtHostCredentialManagementShap } // PUBLIC METHODS ////////////////////////////////////////////////////// - public $registerCredentialProvider(provider: sqlops.CredentialProvider): vscode.Disposable { + public $registerCredentialProvider(provider: azdata.CredentialProvider): vscode.Disposable { // Store the credential provider provider.handle = this._nextHandle(); this._adapter[provider.handle] = new CredentialAdapter(provider); @@ -67,7 +67,7 @@ export class ExtHostCredentialManagement extends ExtHostCredentialManagementShap return this._createDisposable(provider.handle); } - public $getCredentialProvider(namespaceId: string): Thenable { + public $getCredentialProvider(namespaceId: string): Thenable { let self = this; if (!namespaceId) { @@ -84,7 +84,7 @@ export class ExtHostCredentialManagement extends ExtHostCredentialManagementShap return this._withAdapter(0, CredentialAdapter, adapter => adapter.saveCredential(credentialId, password)); } - public $readCredential(credentialId: string): Thenable { + public $readCredential(credentialId: string): Thenable { return this._withAdapter(0, CredentialAdapter, adapter => adapter.readCredential(credentialId)); } @@ -105,9 +105,9 @@ export class ExtHostCredentialManagement extends ExtHostCredentialManagementShap return `${namespaceId}|${credentialId}`; } - private _createNamespacedCredentialProvider(namespaceId: string, adapter: CredentialAdapter): Thenable { + private _createNamespacedCredentialProvider(namespaceId: string, adapter: CredentialAdapter): Thenable { // Create a provider that wraps the methods in a namespace - let provider: sqlops.CredentialProvider = { + let provider: azdata.CredentialProvider = { handle: adapter.provider.handle, deleteCredential: (credentialId: string) => { let namespacedId = ExtHostCredentialManagement._getNamespacedCredentialId(namespaceId, credentialId); diff --git a/src/sql/workbench/api/node/extHostDashboard.ts b/src/sql/workbench/api/node/extHostDashboard.ts index b1ebd740a0..c4396b7345 100644 --- a/src/sql/workbench/api/node/extHostDashboard.ts +++ b/src/sql/workbench/api/node/extHostDashboard.ts @@ -7,16 +7,16 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { Event, Emitter } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ExtHostDashboardShape, MainThreadDashboardShape, SqlMainContext } from './sqlExtHost.protocol'; export class ExtHostDashboard implements ExtHostDashboardShape { - private _onDidOpenDashboard = new Emitter(); - public readonly onDidOpenDashboard: Event = this._onDidOpenDashboard.event; + private _onDidOpenDashboard = new Emitter(); + public readonly onDidOpenDashboard: Event = this._onDidOpenDashboard.event; - private _onDidChangeToDashboard = new Emitter(); - public readonly onDidChangeToDashboard: Event = this._onDidChangeToDashboard.event; + private _onDidChangeToDashboard = new Emitter(); + public readonly onDidChangeToDashboard: Event = this._onDidChangeToDashboard.event; private _proxy: MainThreadDashboardShape; @@ -24,11 +24,11 @@ export class ExtHostDashboard implements ExtHostDashboardShape { this._proxy = mainContext.getProxy(SqlMainContext.MainThreadDashboard); } - $onDidOpenDashboard(dashboard: sqlops.DashboardDocument) { + $onDidOpenDashboard(dashboard: azdata.DashboardDocument) { this._onDidOpenDashboard.fire(dashboard); } - $onDidChangeToDashboard(dashboard: sqlops.DashboardDocument) { + $onDidChangeToDashboard(dashboard: azdata.DashboardDocument) { this._onDidChangeToDashboard.fire(dashboard); } } diff --git a/src/sql/workbench/api/node/extHostDashboardWebview.ts b/src/sql/workbench/api/node/extHostDashboardWebview.ts index aa72cf8186..0005c06fb2 100644 --- a/src/sql/workbench/api/node/extHostDashboardWebview.ts +++ b/src/sql/workbench/api/node/extHostDashboardWebview.ts @@ -11,9 +11,9 @@ import { Emitter } from 'vs/base/common/event'; import { deepClone } from 'vs/base/common/objects'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; -class ExtHostDashboardWebview implements sqlops.DashboardWebview { +class ExtHostDashboardWebview implements azdata.DashboardWebview { private _html: string; public onMessageEmitter = new Emitter(); @@ -22,8 +22,8 @@ class ExtHostDashboardWebview implements sqlops.DashboardWebview { constructor( private readonly _proxy: MainThreadDashboardWebviewShape, private readonly _handle: number, - private readonly _connection: sqlops.connection.Connection, - private readonly _serverInfo: sqlops.ServerInfo + private readonly _connection: azdata.connection.Connection, + private readonly _serverInfo: azdata.ServerInfo ) { } public postMessage(message: any): Thenable { @@ -38,11 +38,11 @@ class ExtHostDashboardWebview implements sqlops.DashboardWebview { return this.onClosedEmitter.event; } - public get connection(): sqlops.connection.Connection { + public get connection(): azdata.connection.Connection { return deepClone(this._connection); } - public get serverInfo(): sqlops.ServerInfo { + public get serverInfo(): azdata.ServerInfo { return deepClone(this._serverInfo); } @@ -62,7 +62,7 @@ export class ExtHostDashboardWebviews implements ExtHostDashboardWebviewsShape { private readonly _proxy: MainThreadDashboardWebviewShape; private readonly _webviews = new Map(); - private readonly _handlers = new Map void>(); + private readonly _handlers = new Map void>(); constructor( mainContext: IMainContext @@ -81,12 +81,12 @@ export class ExtHostDashboardWebviews implements ExtHostDashboardWebviewsShape { this._webviews.delete(handle); } - $registerProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void): void { + $registerProvider(widgetId: string, handler: (webview: azdata.DashboardWebview) => void): void { this._handlers.set(widgetId, handler); this._proxy.$registerProvider(widgetId); } - $registerWidget(handle: number, id: string, connection: sqlops.connection.Connection, serverInfo: sqlops.ServerInfo): void { + $registerWidget(handle: number, id: string, connection: azdata.connection.Connection, serverInfo: azdata.ServerInfo): void { let webview = new ExtHostDashboardWebview(this._proxy, handle, connection, serverInfo); this._webviews.set(handle, webview); this._handlers.get(id)(webview); diff --git a/src/sql/workbench/api/node/extHostDataProtocol.ts b/src/sql/workbench/api/node/extHostDataProtocol.ts index 386f5d78cf..5c116d7f48 100644 --- a/src/sql/workbench/api/node/extHostDataProtocol.ts +++ b/src/sql/workbench/api/node/extHostDataProtocol.ts @@ -5,7 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { Disposable } from 'vs/workbench/api/node/extHostTypes'; @@ -15,15 +15,15 @@ import { TPromise } from 'vs/base/common/winjs.base'; export class ExtHostDataProtocol extends ExtHostDataProtocolShape { - private readonly _onDidChangeLanguageFlavor = new Emitter(); + private readonly _onDidChangeLanguageFlavor = new Emitter(); - readonly onDidChangeLanguageFlavor: Event = this._onDidChangeLanguageFlavor.event; + readonly onDidChangeLanguageFlavor: Event = this._onDidChangeLanguageFlavor.event; private _proxy: MainThreadDataProtocolShape; private static _handlePool: number = 0; - private _adapter = new Map(); - private _providersByType = new Map(); + private _adapter = new Map(); + private _providersByType = new Map(); constructor( mainContext: IMainContext @@ -43,7 +43,7 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { return ExtHostDataProtocol._handlePool++; } - private _resolveProvider

(handle: number): P { + private _resolveProvider

(handle: number): P { let provider = this._adapter.get(handle) as P; if (provider) { return provider; @@ -52,7 +52,7 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { } } - private registerProvider(provider: sqlops.DataProvider, providerType: DataProviderType): vscode.Disposable { + private registerProvider(provider: azdata.DataProvider, providerType: DataProviderType): vscode.Disposable { provider.handle = this._nextHandle(); this._adapter.set(provider.handle, provider); let providersForType = this._providersByType.get(providerType); @@ -65,7 +65,7 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { return this._createDisposable(provider.handle); } - public getProvider(providerId: string, providerType: sqlops.DataProviderType): T { + public getProvider(providerId: string, providerType: azdata.DataProviderType): T { let providersForType = this._providersByType.get(providerType); if (!providersForType) { return undefined; @@ -73,133 +73,133 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { return providersForType.find(provider => provider.providerId === providerId) as T; } - public getProvidersByType(providerType: sqlops.DataProviderType): T[] { + public getProvidersByType(providerType: azdata.DataProviderType): T[] { let providersForType = this._providersByType.get(providerType); return (providersForType || []) as T[]; } - $registerConnectionProvider(provider: sqlops.ConnectionProvider): vscode.Disposable { + $registerConnectionProvider(provider: azdata.ConnectionProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.ConnectionProvider); this._proxy.$registerConnectionProvider(provider.providerId, provider.handle); return rt; } - $registerBackupProvider(provider: sqlops.BackupProvider): vscode.Disposable { + $registerBackupProvider(provider: azdata.BackupProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.BackupProvider); this._proxy.$registerBackupProvider(provider.providerId, provider.handle); return rt; } - $registerRestoreProvider(provider: sqlops.RestoreProvider): vscode.Disposable { + $registerRestoreProvider(provider: azdata.RestoreProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.RestoreProvider); this._proxy.$registerRestoreProvider(provider.providerId, provider.handle); return rt; } - $registerScriptingProvider(provider: sqlops.ScriptingProvider): vscode.Disposable { + $registerScriptingProvider(provider: azdata.ScriptingProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.ScriptingProvider); this._proxy.$registerScriptingProvider(provider.providerId, provider.handle); return rt; } - $registerQueryProvider(provider: sqlops.QueryProvider): vscode.Disposable { + $registerQueryProvider(provider: azdata.QueryProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.QueryProvider); this._proxy.$registerQueryProvider(provider.providerId, provider.handle); return rt; } - $registerMetadataProvider(provider: sqlops.MetadataProvider): vscode.Disposable { + $registerMetadataProvider(provider: azdata.MetadataProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.MetadataProvider); this._proxy.$registerMetadataProvider(provider.providerId, provider.handle); return rt; } - $registerTaskServicesProvider(provider: sqlops.TaskServicesProvider): vscode.Disposable { + $registerTaskServicesProvider(provider: azdata.TaskServicesProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.TaskServicesProvider); this._proxy.$registerTaskServicesProvider(provider.providerId, provider.handle); return rt; } - $registerFileBrowserProvider(provider: sqlops.FileBrowserProvider): vscode.Disposable { + $registerFileBrowserProvider(provider: azdata.FileBrowserProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.FileBrowserProvider); this._proxy.$registerFileBrowserProvider(provider.providerId, provider.handle); return rt; } - $registerObjectExplorerProvider(provider: sqlops.ObjectExplorerProvider): vscode.Disposable { + $registerObjectExplorerProvider(provider: azdata.ObjectExplorerProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.ObjectExplorerProvider); this._proxy.$registerObjectExplorerProvider(provider.providerId, provider.handle); return rt; } - $registerObjectExplorerNodeProvider(provider: sqlops.ObjectExplorerNodeProvider): vscode.Disposable { + $registerObjectExplorerNodeProvider(provider: azdata.ObjectExplorerNodeProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.ObjectExplorerNodeProvider); this._proxy.$registerObjectExplorerNodeProvider(provider.providerId, provider.supportedProviderId, provider.group, provider.handle); return rt; } - $registerProfilerProvider(provider: sqlops.ProfilerProvider): vscode.Disposable { + $registerProfilerProvider(provider: azdata.ProfilerProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.ProfilerProvider); this._proxy.$registerProfilerProvider(provider.providerId, provider.handle); return rt; } - $registerAdminServicesProvider(provider: sqlops.AdminServicesProvider): vscode.Disposable { + $registerAdminServicesProvider(provider: azdata.AdminServicesProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.AdminServicesProvider); this._proxy.$registerAdminServicesProvider(provider.providerId, provider.handle); return rt; } - $registerAgentServiceProvider(provider: sqlops.AgentServicesProvider): vscode.Disposable { + $registerAgentServiceProvider(provider: azdata.AgentServicesProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.AgentServicesProvider); this._proxy.$registerAgentServicesProvider(provider.providerId, provider.handle); return rt; } - $registerCapabilitiesServiceProvider(provider: sqlops.CapabilitiesProvider): vscode.Disposable { + $registerCapabilitiesServiceProvider(provider: azdata.CapabilitiesProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.CapabilitiesProvider); this._proxy.$registerCapabilitiesServiceProvider(provider.providerId, provider.handle); return rt; } - $registerDacFxServiceProvider(provider: sqlops.DacFxServicesProvider): vscode.Disposable { + $registerDacFxServiceProvider(provider: azdata.DacFxServicesProvider): vscode.Disposable { let rt = this.registerProvider(provider, DataProviderType.DacFxServicesProvider); this._proxy.$registerDacFxServicesProvider(provider.providerId, provider.handle); return rt; } // Capabilities Discovery handlers - $getServerCapabilities(handle: number, client: sqlops.DataProtocolClientCapabilities): Thenable { - return this._resolveProvider(handle).getServerCapabilities(client); + $getServerCapabilities(handle: number, client: azdata.DataProtocolClientCapabilities): Thenable { + return this._resolveProvider(handle).getServerCapabilities(client); } // Connection Management handlers - $connect(handle: number, connectionUri: string, connection: sqlops.ConnectionInfo): Thenable { - return this._resolveProvider(handle).connect(connectionUri, connection); + $connect(handle: number, connectionUri: string, connection: azdata.ConnectionInfo): Thenable { + return this._resolveProvider(handle).connect(connectionUri, connection); } $disconnect(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).disconnect(connectionUri); + return this._resolveProvider(handle).disconnect(connectionUri); } $cancelConnect(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).cancelConnect(connectionUri); + return this._resolveProvider(handle).cancelConnect(connectionUri); } $changeDatabase(handle: number, connectionUri: string, newDatabase: string): Thenable { - return this._resolveProvider(handle).changeDatabase(connectionUri, newDatabase); + return this._resolveProvider(handle).changeDatabase(connectionUri, newDatabase); } - $listDatabases(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).listDatabases(connectionUri); + $listDatabases(handle: number, connectionUri: string): Thenable { + return this._resolveProvider(handle).listDatabases(connectionUri); } $getConnectionString(handle: number, connectionUri: string, includePassword: boolean): Thenable { - return this._resolveProvider(handle).getConnectionString(connectionUri, includePassword); + return this._resolveProvider(handle).getConnectionString(connectionUri, includePassword); } - $buildConnectionInfo(handle: number, connectionString: string): Thenable { - let provider = this._resolveProvider(handle); + $buildConnectionInfo(handle: number, connectionString: string): Thenable { + let provider = this._resolveProvider(handle); if (provider.buildConnectionInfo) { return provider.buildConnectionInfo(connectionString); } else { @@ -208,10 +208,10 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { } $rebuildIntelliSenseCache(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).rebuildIntelliSenseCache(connectionUri); + return this._resolveProvider(handle).rebuildIntelliSenseCache(connectionUri); } - $onConnectComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void { + $onConnectComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void { this._proxy.$onConnectionComplete(handle, connectionInfoSummary); } @@ -219,107 +219,107 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { this._proxy.$onIntelliSenseCacheComplete(handle, connectionUri); } - public $onConnectionChanged(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void { + public $onConnectionChanged(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void { this._proxy.$onConnectionChangeNotification(handle, changedConnInfo); } // Protocol-wide Event Handlers - public $languageFlavorChanged(params: sqlops.DidChangeLanguageFlavorParams): void { + public $languageFlavorChanged(params: azdata.DidChangeLanguageFlavorParams): void { this._onDidChangeLanguageFlavor.fire(params); } // Query Management handlers - $cancelQuery(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).cancelQuery(ownerUri); + $cancelQuery(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).cancelQuery(ownerUri); } - $runQuery(handle: number, ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable { - return this._resolveProvider(handle).runQuery(ownerUri, selection, runOptions); + $runQuery(handle: number, ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable { + return this._resolveProvider(handle).runQuery(ownerUri, selection, runOptions); } $runQueryStatement(handle: number, ownerUri: string, line: number, column: number): Thenable { - return this._resolveProvider(handle).runQueryStatement(ownerUri, line, column); + return this._resolveProvider(handle).runQueryStatement(ownerUri, line, column); } $runQueryString(handle: number, ownerUri: string, queryString: string): Thenable { - return this._resolveProvider(handle).runQueryString(ownerUri, queryString); + return this._resolveProvider(handle).runQueryString(ownerUri, queryString); } - $runQueryAndReturn(handle: number, ownerUri: string, queryString: string): Thenable { - return this._resolveProvider(handle).runQueryAndReturn(ownerUri, queryString); + $runQueryAndReturn(handle: number, ownerUri: string, queryString: string): Thenable { + return this._resolveProvider(handle).runQueryAndReturn(ownerUri, queryString); } - $parseSyntax(handle: number, ownerUri: string, query: string): Thenable { - return this._resolveProvider(handle).parseSyntax(ownerUri, query); + $parseSyntax(handle: number, ownerUri: string, query: string): Thenable { + return this._resolveProvider(handle).parseSyntax(ownerUri, query); } - $getQueryRows(handle: number, rowData: sqlops.QueryExecuteSubsetParams): Thenable { - return this._resolveProvider(handle).getQueryRows(rowData); + $getQueryRows(handle: number, rowData: azdata.QueryExecuteSubsetParams): Thenable { + return this._resolveProvider(handle).getQueryRows(rowData); } $disposeQuery(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).disposeQuery(ownerUri); + return this._resolveProvider(handle).disposeQuery(ownerUri); } - $onQueryComplete(handle: number, result: sqlops.QueryExecuteCompleteNotificationResult): void { + $onQueryComplete(handle: number, result: azdata.QueryExecuteCompleteNotificationResult): void { this._proxy.$onQueryComplete(handle, result); } - $onBatchStart(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { + $onBatchStart(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void { this._proxy.$onBatchStart(handle, batchInfo); } - $onBatchComplete(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { + $onBatchComplete(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void { this._proxy.$onBatchComplete(handle, batchInfo); } - $onResultSetAvailable(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { + $onResultSetAvailable(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { this._proxy.$onResultSetAvailable(handle, resultSetInfo); } - $onResultSetUpdated(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { + $onResultSetUpdated(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { this._proxy.$onResultSetUpdated(handle, resultSetInfo); } - $onQueryMessage(handle: number, message: sqlops.QueryExecuteMessageParams): void { + $onQueryMessage(handle: number, message: azdata.QueryExecuteMessageParams): void { this._proxy.$onQueryMessage(handle, message); } - $saveResults(handle: number, requestParams: sqlops.SaveResultsRequestParams): Thenable { - return this._resolveProvider(handle).saveResults(requestParams); + $saveResults(handle: number, requestParams: azdata.SaveResultsRequestParams): Thenable { + return this._resolveProvider(handle).saveResults(requestParams); } // Edit Data handlers $commitEdit(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).commitEdit(ownerUri); + return this._resolveProvider(handle).commitEdit(ownerUri); } - $createRow(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).createRow(ownerUri); + $createRow(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).createRow(ownerUri); } $deleteRow(handle: number, ownerUri: string, rowId: number): Thenable { - return this._resolveProvider(handle).deleteRow(ownerUri, rowId); + return this._resolveProvider(handle).deleteRow(ownerUri, rowId); } $disposeEdit(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).disposeEdit(ownerUri); + return this._resolveProvider(handle).disposeEdit(ownerUri); } $initializeEdit(handle: number, ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable { - return this._resolveProvider(handle).initializeEdit(ownerUri, schemaName, objectName, objectType, rowLimit, queryString); + return this._resolveProvider(handle).initializeEdit(ownerUri, schemaName, objectName, objectType, rowLimit, queryString); } - $revertCell(handle: number, ownerUri: string, rowId: number, columnId: number): Thenable { - return this._resolveProvider(handle).revertCell(ownerUri, rowId, columnId); + $revertCell(handle: number, ownerUri: string, rowId: number, columnId: number): Thenable { + return this._resolveProvider(handle).revertCell(ownerUri, rowId, columnId); } $revertRow(handle: number, ownerUri: string, rowId: number): Thenable { - return this._resolveProvider(handle).revertRow(ownerUri, rowId); + return this._resolveProvider(handle).revertRow(ownerUri, rowId); } - $updateCell(handle: number, ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { - return this._resolveProvider(handle).updateCell(ownerUri, rowId, columnId, newValue); + $updateCell(handle: number, ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { + return this._resolveProvider(handle).updateCell(ownerUri, rowId, columnId, newValue); } - $getEditRows(handle: number, rowData: sqlops.EditSubsetParams): Thenable { - return this._resolveProvider(handle).getEditRows(rowData); + $getEditRows(handle: number, rowData: azdata.EditSubsetParams): Thenable { + return this._resolveProvider(handle).getEditRows(rowData); } $onEditSessionReady(handle: number, ownerUri: string, success: boolean, message: string): void { @@ -327,171 +327,171 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { } // Metadata handlers - public $getMetadata(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).getMetadata(connectionUri); + public $getMetadata(handle: number, connectionUri: string): Thenable { + return this._resolveProvider(handle).getMetadata(connectionUri); } public $getDatabases(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).getDatabases(connectionUri); + return this._resolveProvider(handle).getDatabases(connectionUri); } - public $getTableInfo(handle: number, connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { - return this._resolveProvider(handle).getTableInfo(connectionUri, metadata); + public $getTableInfo(handle: number, connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { + return this._resolveProvider(handle).getTableInfo(connectionUri, metadata); } - public $getViewInfo(handle: number, connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { - return this._resolveProvider(handle).getViewInfo(connectionUri, metadata); + public $getViewInfo(handle: number, connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { + return this._resolveProvider(handle).getViewInfo(connectionUri, metadata); } // Object Explorer Service - public $createObjectExplorerSession(handle: number, connInfo: sqlops.ConnectionInfo): Thenable { - return this._resolveProvider(handle).createNewSession(connInfo); + public $createObjectExplorerSession(handle: number, connInfo: azdata.ConnectionInfo): Thenable { + return this._resolveProvider(handle).createNewSession(connInfo); } - public $createObjectExplorerNodeProviderSession(handle: number, session: sqlops.ObjectExplorerSession): Thenable { - return this._resolveProvider(handle).handleSessionOpen(session); + public $createObjectExplorerNodeProviderSession(handle: number, session: azdata.ObjectExplorerSession): Thenable { + return this._resolveProvider(handle).handleSessionOpen(session); } - public $expandObjectExplorerNode(handle: number, nodeInfo: sqlops.ExpandNodeInfo): Thenable { - return this._resolveProvider (handle).expandNode(nodeInfo); + public $expandObjectExplorerNode(handle: number, nodeInfo: azdata.ExpandNodeInfo): Thenable { + return this._resolveProvider (handle).expandNode(nodeInfo); } - public $refreshObjectExplorerNode(handle: number, nodeInfo: sqlops.ExpandNodeInfo): Thenable { - return this._resolveProvider (handle).refreshNode(nodeInfo); + public $refreshObjectExplorerNode(handle: number, nodeInfo: azdata.ExpandNodeInfo): Thenable { + return this._resolveProvider (handle).refreshNode(nodeInfo); } - public $closeObjectExplorerSession(handle: number, closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): Thenable { - return this._resolveProvider(handle).closeSession(closeSessionInfo); + public $closeObjectExplorerSession(handle: number, closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): Thenable { + return this._resolveProvider(handle).closeSession(closeSessionInfo); } - public $handleSessionClose(handle: number, closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): void { - return this._resolveProvider(handle).handleSessionClose(closeSessionInfo); + public $handleSessionClose(handle: number, closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): void { + return this._resolveProvider(handle).handleSessionClose(closeSessionInfo); } - public $findNodes(handle: number, findNodesInfo: sqlops.FindNodesInfo): Thenable { - return this._resolveProvider(handle).findNodes(findNodesInfo); + public $findNodes(handle: number, findNodesInfo: azdata.FindNodesInfo): Thenable { + return this._resolveProvider(handle).findNodes(findNodesInfo); } - public $onObjectExplorerSessionCreated(handle: number, response: sqlops.ObjectExplorerSession): void { + public $onObjectExplorerSessionCreated(handle: number, response: azdata.ObjectExplorerSession): void { this._proxy.$onObjectExplorerSessionCreated(handle, response); } - public $onObjectExplorerSessionDisconnected(handle: number, response: sqlops.ObjectExplorerSession): void { + public $onObjectExplorerSessionDisconnected(handle: number, response: azdata.ObjectExplorerSession): void { this._proxy.$onObjectExplorerSessionDisconnected(handle, response); } - public $onObjectExplorerNodeExpanded(providerId: string, response: sqlops.ObjectExplorerExpandInfo): void { + public $onObjectExplorerNodeExpanded(providerId: string, response: azdata.ObjectExplorerExpandInfo): void { this._proxy.$onObjectExplorerNodeExpanded(providerId, response); } // Task Service - public $getAllTasks(handle: number, listTasksParams: sqlops.ListTasksParams): Thenable { - return this._resolveProvider(handle).getAllTasks(listTasksParams); + public $getAllTasks(handle: number, listTasksParams: azdata.ListTasksParams): Thenable { + return this._resolveProvider(handle).getAllTasks(listTasksParams); } - public $cancelTask(handle: number, cancelTaskParams: sqlops.CancelTaskParams): Thenable { - return this._resolveProvider(handle).cancelTask(cancelTaskParams); + public $cancelTask(handle: number, cancelTaskParams: azdata.CancelTaskParams): Thenable { + return this._resolveProvider(handle).cancelTask(cancelTaskParams); } - public $onTaskStatusChanged(handle: number, response: sqlops.TaskProgressInfo): void { + public $onTaskStatusChanged(handle: number, response: azdata.TaskProgressInfo): void { this._proxy.$onTaskStatusChanged(handle, response); } - public $onTaskCreated(handle: number, response: sqlops.TaskInfo): void { + public $onTaskCreated(handle: number, response: azdata.TaskInfo): void { this._proxy.$onTaskCreated(handle, response); } // Scripting handlers - public $scriptAsOperation(handle: number, connectionUri: string, operation: sqlops.ScriptOperation, metadata: sqlops.ObjectMetadata, paramDetails: sqlops.ScriptingParamDetails): Thenable { - return this._resolveProvider(handle).scriptAsOperation(connectionUri, operation, metadata, paramDetails); + public $scriptAsOperation(handle: number, connectionUri: string, operation: azdata.ScriptOperation, metadata: azdata.ObjectMetadata, paramDetails: azdata.ScriptingParamDetails): Thenable { + return this._resolveProvider(handle).scriptAsOperation(connectionUri, operation, metadata, paramDetails); } - public $onScriptingComplete(handle: number, scriptingCompleteResult: sqlops.ScriptingCompleteResult): void { + public $onScriptingComplete(handle: number, scriptingCompleteResult: azdata.ScriptingCompleteResult): void { this._proxy.$onScriptingComplete(handle, scriptingCompleteResult); } /** * Create a new database on the provided connection */ - public $createDatabase(handle: number, connectionUri: string, database: sqlops.DatabaseInfo): Thenable { - return this._resolveProvider(handle).createDatabase(connectionUri, database); + public $createDatabase(handle: number, connectionUri: string, database: azdata.DatabaseInfo): Thenable { + return this._resolveProvider(handle).createDatabase(connectionUri, database); } /** * Create a new database on the provided connection */ - public $getDefaultDatabaseInfo(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).getDefaultDatabaseInfo(connectionUri); + public $getDefaultDatabaseInfo(handle: number, connectionUri: string): Thenable { + return this._resolveProvider(handle).getDefaultDatabaseInfo(connectionUri); } /** * Get the info on a database */ - public $getDatabaseInfo(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).getDatabaseInfo(connectionUri); + public $getDatabaseInfo(handle: number, connectionUri: string): Thenable { + return this._resolveProvider(handle).getDatabaseInfo(connectionUri); } /** * Create a new login on the provided connection */ - public $createLogin(handle: number, connectionUri: string, login: sqlops.LoginInfo): Thenable { - return this._resolveProvider(handle).createLogin(connectionUri, login); + public $createLogin(handle: number, connectionUri: string, login: azdata.LoginInfo): Thenable { + return this._resolveProvider(handle).createLogin(connectionUri, login); } /** * Backup a database */ - public $backup(handle: number, connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { - return this._resolveProvider(handle).backup(connectionUri, backupInfo, taskExecutionMode); + public $backup(handle: number, connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: azdata.TaskExecutionMode): Thenable { + return this._resolveProvider(handle).backup(connectionUri, backupInfo, taskExecutionMode); } /** * Create a new database on the provided connection */ - public $getBackupConfigInfo(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).getBackupConfigInfo(connectionUri); + public $getBackupConfigInfo(handle: number, connectionUri: string): Thenable { + return this._resolveProvider(handle).getBackupConfigInfo(connectionUri); } /** * Restores a database */ - public $restore(handle: number, connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { - return this._resolveProvider(handle).restore(connectionUri, restoreInfo); + public $restore(handle: number, connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { + return this._resolveProvider(handle).restore(connectionUri, restoreInfo); } /** * Gets a plan for restoring a database */ - public $getRestorePlan(handle: number, connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { - return this._resolveProvider(handle).getRestorePlan(connectionUri, restoreInfo); + public $getRestorePlan(handle: number, connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { + return this._resolveProvider(handle).getRestorePlan(connectionUri, restoreInfo); } /** * cancels a restore plan */ - public $cancelRestorePlan(handle: number, connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { - return this._resolveProvider(handle).cancelRestorePlan(connectionUri, restoreInfo); + public $cancelRestorePlan(handle: number, connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { + return this._resolveProvider(handle).cancelRestorePlan(connectionUri, restoreInfo); } /** * Gets restore config Info */ - public $getRestoreConfigInfo(handle: number, connectionUri: string): Thenable { - return this._resolveProvider(handle).getRestoreConfigInfo(connectionUri); + public $getRestoreConfigInfo(handle: number, connectionUri: string): Thenable { + return this._resolveProvider(handle).getRestoreConfigInfo(connectionUri); } /** * Open a file browser */ public $openFileBrowser(handle: number, ownerUri: string, expandPath: string, fileFilters: string[], changeFilter: boolean): Thenable { - return this._resolveProvider(handle).openFileBrowser(ownerUri, expandPath, fileFilters, changeFilter); + return this._resolveProvider(handle).openFileBrowser(ownerUri, expandPath, fileFilters, changeFilter); } /** * Send event when opening browser is complete */ - public $onFileBrowserOpened(handle: number, response: sqlops.FileBrowserOpenedParams): void { + public $onFileBrowserOpened(handle: number, response: azdata.FileBrowserOpenedParams): void { this._proxy.$onFileBrowserOpened(handle, response); } @@ -499,13 +499,13 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { * Expand a folder node */ public $expandFolderNode(handle: number, ownerUri: string, expandPath: string): Thenable { - return this._resolveProvider(handle).expandFolderNode(ownerUri, expandPath); + return this._resolveProvider(handle).expandFolderNode(ownerUri, expandPath); } /** * Send event when expansion is complete */ - public $onFolderNodeExpanded(handle: number, response: sqlops.FileBrowserExpandedParams): void { + public $onFolderNodeExpanded(handle: number, response: azdata.FileBrowserExpandedParams): void { this._proxy.$onFolderNodeExpanded(handle, response); } @@ -513,21 +513,21 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { * Validate selected file path */ public $validateFilePaths(handle: number, ownerUri: string, serviceType: string, selectedFiles: string[]): Thenable { - return this._resolveProvider(handle).validateFilePaths(ownerUri, serviceType, selectedFiles); + return this._resolveProvider(handle).validateFilePaths(ownerUri, serviceType, selectedFiles); } /** * Send event when validation is complete */ - public $onFilePathsValidated(handle: number, response: sqlops.FileBrowserValidatedParams) { + public $onFilePathsValidated(handle: number, response: azdata.FileBrowserValidatedParams) { this._proxy.$onFilePathsValidated(handle, response); } /** * Close file browser */ - public $closeFileBrowser(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).closeFileBrowser(ownerUri); + public $closeFileBrowser(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).closeFileBrowser(ownerUri); } /** @@ -537,63 +537,63 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { /** * Create a new profiler session */ - public $createSession(handle: number, sessionId: string, createStatement: string, template: sqlops.ProfilerSessionTemplate): Thenable { - return this._resolveProvider(handle).createSession(sessionId, createStatement, template); + public $createSession(handle: number, sessionId: string, createStatement: string, template: azdata.ProfilerSessionTemplate): Thenable { + return this._resolveProvider(handle).createSession(sessionId, createStatement, template); } /** * Start a profiler session */ public $startSession(handle: number, sessionId: string, sessionName: string): Thenable { - return this._resolveProvider(handle).startSession(sessionId, sessionName); + return this._resolveProvider(handle).startSession(sessionId, sessionName); } /** * Stop a profiler session */ public $stopSession(handle: number, sessionId: string): Thenable { - return this._resolveProvider(handle).stopSession(sessionId); + return this._resolveProvider(handle).stopSession(sessionId); } /** * Pause a profiler session */ public $pauseSession(handle: number, sessionId: string): Thenable { - return this._resolveProvider(handle).pauseSession(sessionId); + return this._resolveProvider(handle).pauseSession(sessionId); } /** * Disconnect a profiler session */ public $disconnectSession(handle: number, sessionId: string): Thenable { - return this._resolveProvider(handle).disconnectSession(sessionId); + return this._resolveProvider(handle).disconnectSession(sessionId); } /** * Get list of running XEvent sessions on the session's target server */ public $getXEventSessions(handle: number, sessionId: string): Thenable { - return this._resolveProvider(handle).getXEventSessions(sessionId); + return this._resolveProvider(handle).getXEventSessions(sessionId); } /** * Profiler session events available notification */ - public $onSessionEventsAvailable(handle: number, response: sqlops.ProfilerSessionEvents): void { + public $onSessionEventsAvailable(handle: number, response: azdata.ProfilerSessionEvents): void { this._proxy.$onSessionEventsAvailable(handle, response); } /** * Profiler session stopped unexpectedly notification */ - public $onSessionStopped(handle: number, response: sqlops.ProfilerSessionStoppedParams): void { + public $onSessionStopped(handle: number, response: azdata.ProfilerSessionStoppedParams): void { this._proxy.$onSessionStopped(handle, response); } /** * Profiler session created notification */ - public $onProfilerSessionCreated(handle: number, response: sqlops.ProfilerSessionCreatedParams): void { + public $onProfilerSessionCreated(handle: number, response: azdata.ProfilerSessionCreatedParams): void { this._proxy.$onProfilerSessionCreated(handle, response); } @@ -605,85 +605,85 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape { /** * Get Agent Job list */ - public $getJobs(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).getJobs(ownerUri); + public $getJobs(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).getJobs(ownerUri); } /** * Get a Agent Job's history */ - public $getJobHistory(handle: number, ownerUri: string, jobID: string, jobName: string): Thenable { - return this._resolveProvider(handle).getJobHistory(ownerUri, jobID, jobName); + public $getJobHistory(handle: number, ownerUri: string, jobID: string, jobName: string): Thenable { + return this._resolveProvider(handle).getJobHistory(ownerUri, jobID, jobName); } /** * Run an action on a job */ - public $jobAction(handle: number, ownerUri: string, jobName: string, action: string): Thenable { - return this._resolveProvider(handle).jobAction(ownerUri, jobName, action); + public $jobAction(handle: number, ownerUri: string, jobName: string, action: string): Thenable { + return this._resolveProvider(handle).jobAction(ownerUri, jobName, action); } /** * Deletes a job */ - $deleteJob(handle: number, ownerUri: string, job: sqlops.AgentJobInfo): Thenable { - throw this._resolveProvider(handle).deleteJob(ownerUri, job); + $deleteJob(handle: number, ownerUri: string, job: azdata.AgentJobInfo): Thenable { + throw this._resolveProvider(handle).deleteJob(ownerUri, job); } /** * Deletes a job step */ - $deleteJobStep(handle: number, ownerUri: string, step: sqlops.AgentJobStepInfo): Thenable { - throw this._resolveProvider(handle).deleteJobStep(ownerUri, step); + $deleteJobStep(handle: number, ownerUri: string, step: azdata.AgentJobStepInfo): Thenable { + throw this._resolveProvider(handle).deleteJobStep(ownerUri, step); } /** * Get Agent Alerts list */ - $getAlerts(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).getAlerts(ownerUri); + $getAlerts(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).getAlerts(ownerUri); } /** * Deletes an alert */ - $deleteAlert(handle: number, ownerUri: string, alert: sqlops.AgentAlertInfo): Thenable { - return this._resolveProvider(handle).deleteAlert(ownerUri, alert); + $deleteAlert(handle: number, ownerUri: string, alert: azdata.AgentAlertInfo): Thenable { + return this._resolveProvider(handle).deleteAlert(ownerUri, alert); } /** * Get Agent Oeprators list */ - $getOperators(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).getOperators(ownerUri); + $getOperators(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).getOperators(ownerUri); } /** * Deletes an operator */ - $deleteOperator(handle: number, ownerUri: string, operator: sqlops.AgentOperatorInfo): Thenable { - return this._resolveProvider(handle).deleteOperator(ownerUri, operator); + $deleteOperator(handle: number, ownerUri: string, operator: azdata.AgentOperatorInfo): Thenable { + return this._resolveProvider(handle).deleteOperator(ownerUri, operator); } /** * Get Agent Proxies list */ - $getProxies(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).getProxies(ownerUri); + $getProxies(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).getProxies(ownerUri); } /** * Deletes a proxy */ - $deleteProxy(handle: number, ownerUri: string, proxy: sqlops.AgentProxyInfo): Thenable { - return this._resolveProvider(handle).deleteProxy(ownerUri, proxy); + $deleteProxy(handle: number, ownerUri: string, proxy: azdata.AgentProxyInfo): Thenable { + return this._resolveProvider(handle).deleteProxy(ownerUri, proxy); } /** * Gets Agent Credentials from server */ - $getCredentials(handle: number, ownerUri: string): Thenable { - return this._resolveProvider(handle).getCredentials(ownerUri); + $getCredentials(handle: number, ownerUri: string): Thenable { + return this._resolveProvider(handle).getCredentials(ownerUri); } /** diff --git a/src/sql/workbench/api/node/extHostModalDialog.ts b/src/sql/workbench/api/node/extHostModalDialog.ts index 9151040298..625b45a0fa 100644 --- a/src/sql/workbench/api/node/extHostModalDialog.ts +++ b/src/sql/workbench/api/node/extHostModalDialog.ts @@ -7,10 +7,10 @@ import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Emitter } from 'vs/base/common/event'; -class ExtHostDialog implements sqlops.ModalDialog { +class ExtHostDialog implements azdata.ModalDialog { private _title: string; private _html: string; private _okTitle: string; @@ -97,7 +97,7 @@ export class ExtHostModalDialogs implements ExtHostModalDialogsShape { createDialog( title: string - ): sqlops.ModalDialog { + ): azdata.ModalDialog { console.log(title); const handle = ExtHostModalDialogs._handlePool++; this._proxy.$createDialog(handle); diff --git a/src/sql/workbench/api/node/extHostModelView.ts b/src/sql/workbench/api/node/extHostModelView.ts index 89f7b69438..03e699a9f0 100644 --- a/src/sql/workbench/api/node/extHostModelView.ts +++ b/src/sql/workbench/api/node/extHostModelView.ts @@ -11,13 +11,13 @@ import { URI } from 'vs/base/common/uri'; import * as nls from 'vs/nls'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { SqlMainContext, ExtHostModelViewShape, MainThreadModelViewShape, ExtHostModelViewTreeViewsShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IItemConfig, ModelComponentTypes, IComponentShape, IComponentEventArgs, ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; -class ModelBuilderImpl implements sqlops.ModelBuilder { +class ModelBuilderImpl implements azdata.ModelBuilder { private nextComponentId: number; private readonly _componentBuilders = new Map>(); @@ -31,182 +31,182 @@ class ModelBuilderImpl implements sqlops.ModelBuilder { this.nextComponentId = 0; } - navContainer(): sqlops.ContainerBuilder { + navContainer(): azdata.ContainerBuilder { let id = this.getNextComponentId(); - let container: GenericContainerBuilder = new GenericContainerBuilder(this._proxy, this._handle, ModelComponentTypes.NavContainer, id); + let container: GenericContainerBuilder = new GenericContainerBuilder(this._proxy, this._handle, ModelComponentTypes.NavContainer, id); this._componentBuilders.set(id, container); return container; } - divContainer(): sqlops.DivBuilder { + divContainer(): azdata.DivBuilder { let id = this.getNextComponentId(); let container = new DivContainerBuilder(this._proxy, this._handle, ModelComponentTypes.DivContainer, id); this._componentBuilders.set(id, container); return container; } - flexContainer(): sqlops.FlexBuilder { + flexContainer(): azdata.FlexBuilder { let id = this.getNextComponentId(); - let container: GenericContainerBuilder = new GenericContainerBuilder(this._proxy, this._handle, ModelComponentTypes.FlexContainer, id); + let container: GenericContainerBuilder = new GenericContainerBuilder(this._proxy, this._handle, ModelComponentTypes.FlexContainer, id); this._componentBuilders.set(id, container); return container; } - formContainer(): sqlops.FormBuilder { + formContainer(): azdata.FormBuilder { let id = this.getNextComponentId(); let container = new FormContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Form, id, this); this._componentBuilders.set(id, container); return container; } - toolbarContainer(): sqlops.ToolbarBuilder { + toolbarContainer(): azdata.ToolbarBuilder { let id = this.getNextComponentId(); let container = new ToolbarContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Toolbar, id); this._componentBuilders.set(id, container); return container; } - groupContainer(): sqlops.GroupBuilder { + groupContainer(): azdata.GroupBuilder { let id = this.getNextComponentId(); - let container: GenericContainerBuilder = new GenericContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Group, id); + let container: GenericContainerBuilder = new GenericContainerBuilder(this._proxy, this._handle, ModelComponentTypes.Group, id); this._componentBuilders.set(id, container); return container; } - card(): sqlops.ComponentBuilder { + card(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new CardWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new CardWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - tree(): sqlops.ComponentBuilder> { + tree(): azdata.ComponentBuilder> { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl> = this.getComponentBuilder(new TreeComponentWrapper(this._extHostModelViewTree, this._proxy, this._handle, id, this._extension), id); + let builder: ComponentBuilderImpl> = this.getComponentBuilder(new TreeComponentWrapper(this._extHostModelViewTree, this._proxy, this._handle, id, this._extension), id); this._componentBuilders.set(id, builder); return builder; } - inputBox(): sqlops.ComponentBuilder { + inputBox(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new InputBoxWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new InputBoxWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - text(): sqlops.ComponentBuilder { + text(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new TextComponentWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new TextComponentWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - radioButton(): sqlops.ComponentBuilder { + radioButton(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new RadioButtonWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new RadioButtonWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - checkBox(): sqlops.ComponentBuilder { + checkBox(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new CheckBoxWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new CheckBoxWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - webView(): sqlops.ComponentBuilder { + webView(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new WebViewWrapper(this._proxy, this._handle, id, this._extension.extensionLocation), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new WebViewWrapper(this._proxy, this._handle, id, this._extension.extensionLocation), id); this._componentBuilders.set(id, builder); return builder; } - editor(): sqlops.ComponentBuilder { + editor(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new EditorWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new EditorWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - button(): sqlops.ComponentBuilder { + button(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new ButtonWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new ButtonWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - dropDown(): sqlops.ComponentBuilder { + dropDown(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new DropDownWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new DropDownWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - listBox(): sqlops.ComponentBuilder { + listBox(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new ListBoxWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new ListBoxWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - table(): sqlops.ComponentBuilder { + table(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new TableComponentWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new TableComponentWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - declarativeTable(): sqlops.ComponentBuilder { + declarativeTable(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new DeclarativeTableWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new DeclarativeTableWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - dashboardWidget(widgetId: string): sqlops.ComponentBuilder { + dashboardWidget(widgetId: string): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder = this.getComponentBuilder(new ComponentWrapper(this._proxy, this._handle, ModelComponentTypes.DashboardWidget, id), id); + let builder = this.getComponentBuilder(new ComponentWrapper(this._proxy, this._handle, ModelComponentTypes.DashboardWidget, id), id); this._componentBuilders.set(id, builder); return builder; } - dashboardWebview(webviewId: string): sqlops.ComponentBuilder { + dashboardWebview(webviewId: string): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new ComponentWrapper(this._proxy, this._handle, ModelComponentTypes.DashboardWebview, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new ComponentWrapper(this._proxy, this._handle, ModelComponentTypes.DashboardWebview, id), id); this._componentBuilders.set(id, builder); return builder; } - loadingComponent(): sqlops.LoadingComponentBuilder { + loadingComponent(): azdata.LoadingComponentBuilder { let id = this.getNextComponentId(); let builder = new LoadingComponentBuilder(new LoadingComponentWrapper(this._proxy, this._handle, id)); this._componentBuilders.set(id, builder); return builder; } - fileBrowserTree(): sqlops.ComponentBuilder { + fileBrowserTree(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new FileBrowserTreeComponentWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new FileBrowserTreeComponentWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - dom(): sqlops.ComponentBuilder { + dom(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new DomComponentWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new DomComponentWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - hyperlink(): sqlops.ComponentBuilder { + hyperlink(): azdata.ComponentBuilder { let id = this.getNextComponentId(); - let builder: ComponentBuilderImpl = this.getComponentBuilder(new HyperlinkComponentWrapper(this._proxy, this._handle, id), id); + let builder: ComponentBuilderImpl = this.getComponentBuilder(new HyperlinkComponentWrapper(this._proxy, this._handle, id), id); this._componentBuilders.set(id, builder); return builder; } - getComponentBuilder(component: ComponentWrapper, id: string): ComponentBuilderImpl { + getComponentBuilder(component: ComponentWrapper, id: string): ComponentBuilderImpl { let componentBuilder: ComponentBuilderImpl = new ComponentBuilderImpl(component); this._componentBuilders.set(id, componentBuilder); return componentBuilder; @@ -233,7 +233,7 @@ interface IWithEventHandler { handleEvent(eventArgs: IComponentEventArgs): void; } -class ComponentBuilderImpl implements sqlops.ComponentBuilder, IWithEventHandler { +class ComponentBuilderImpl implements azdata.ComponentBuilder, IWithEventHandler { constructor(protected _component: ComponentWrapper) { _component.registerEvent(); @@ -247,13 +247,13 @@ class ComponentBuilderImpl implements sqlops.Compone return this._component; } - withProperties(properties: U): sqlops.ComponentBuilder { + withProperties(properties: U): azdata.ComponentBuilder { // Keep any properties that may have been set during initial object construction this._component.properties = Object.assign({}, this._component.properties, properties); return this; } - withValidation(validation: (component: T) => boolean): sqlops.ComponentBuilder { + withValidation(validation: (component: T) => boolean): azdata.ComponentBuilder { this._component.customValidations.push(validation); return this; } @@ -263,17 +263,17 @@ class ComponentBuilderImpl implements sqlops.Compone } } -class ContainerBuilderImpl extends ComponentBuilderImpl implements sqlops.ContainerBuilder { +class ContainerBuilderImpl extends ComponentBuilderImpl implements azdata.ContainerBuilder { constructor(componentWrapper: ComponentWrapper) { super(componentWrapper); } - withLayout(layout: TLayout): sqlops.ContainerBuilder { + withLayout(layout: TLayout): azdata.ContainerBuilder { this._component.layout = layout; return this; } - withItems(components: sqlops.Component[], itemLayout?: TItemLayout): sqlops.ContainerBuilder { + withItems(components: azdata.Component[], itemLayout?: TItemLayout): azdata.ContainerBuilder { this._component.itemConfigs = components.map(item => { let componentWrapper = item as ComponentWrapper; return new InternalItemConfig(componentWrapper, itemLayout); @@ -282,29 +282,29 @@ class ContainerBuilderImpl ext } } -class GenericContainerBuilder extends ContainerBuilderImpl { +class GenericContainerBuilder extends ContainerBuilderImpl { constructor(proxy: MainThreadModelViewShape, handle: number, type: ModelComponentTypes, id: string) { super(new ComponentWrapper(proxy, handle, type, id)); } } -class DivContainerBuilder extends ContainerBuilderImpl { +class DivContainerBuilder extends ContainerBuilderImpl { constructor(proxy: MainThreadModelViewShape, handle: number, type: ModelComponentTypes, id: string) { super(new DivContainerWrapper(proxy, handle, type, id)); } } -class FormContainerBuilder extends GenericContainerBuilder implements sqlops.FormBuilder { +class FormContainerBuilder extends GenericContainerBuilder implements azdata.FormBuilder { constructor(proxy: MainThreadModelViewShape, handle: number, type: ModelComponentTypes, id: string, private _builder: ModelBuilderImpl) { super(proxy, handle, type, id); } - withFormItems(components: (sqlops.FormComponent | sqlops.FormComponentGroup)[], itemLayout?: sqlops.FormItemLayout): sqlops.FormBuilder { + withFormItems(components: (azdata.FormComponent | azdata.FormComponentGroup)[], itemLayout?: azdata.FormItemLayout): azdata.FormBuilder { this.addFormItems(components, itemLayout); return this; } - private convertToItemConfig(formComponent: sqlops.FormComponent, itemLayout?: sqlops.FormItemLayout): InternalItemConfig { + private convertToItemConfig(formComponent: azdata.FormComponent, itemLayout?: azdata.FormItemLayout): InternalItemConfig { let componentWrapper = formComponent.component as ComponentWrapper; if (formComponent.required && componentWrapper) { componentWrapper.required = true; @@ -325,7 +325,7 @@ class FormContainerBuilder extends GenericContainerBuilder { let componentWrapper = component as ComponentWrapper; @@ -334,7 +334,7 @@ class FormContainerBuilder extends GenericContainerBuilder { let componentWrapper = component as ComponentWrapper; @@ -343,18 +343,18 @@ class FormContainerBuilder extends GenericContainerBuilder, itemLayout?: sqlops.FormItemLayout): void { + addFormItems(formComponents: Array, itemLayout?: azdata.FormItemLayout): void { formComponents.forEach(formComponent => { this.addFormItem(formComponent, itemLayout); }); } - addFormItem(formComponent: sqlops.FormComponent | sqlops.FormComponentGroup, itemLayout?: sqlops.FormItemLayout): void { + addFormItem(formComponent: azdata.FormComponent | azdata.FormComponentGroup, itemLayout?: azdata.FormItemLayout): void { this.insertFormItem(formComponent, undefined, itemLayout); } - insertFormItem(formComponent: sqlops.FormComponent | sqlops.FormComponentGroup, index?: number, itemLayout?: sqlops.FormItemLayout): void { - let componentGroup = formComponent as sqlops.FormComponentGroup; + insertFormItem(formComponent: azdata.FormComponent | azdata.FormComponentGroup, index?: number, itemLayout?: azdata.FormItemLayout): void { + let componentGroup = formComponent as azdata.FormComponentGroup; if (componentGroup && componentGroup.components !== undefined) { let labelComponent = this._builder.text().component(); labelComponent.value = componentGroup.title; @@ -371,15 +371,15 @@ class FormContainerBuilder extends GenericContainerBuilder implements sqlops.ToolbarBuilder { - withToolbarItems(components: sqlops.ToolbarComponent[]): sqlops.ContainerBuilder { +class ToolbarContainerBuilder extends GenericContainerBuilder implements azdata.ToolbarBuilder { + withToolbarItems(components: azdata.ToolbarComponent[]): azdata.ContainerBuilder { this._component.itemConfigs = components.map(item => { return this.convertToItemConfig(item); }); return this; } - private convertToItemConfig(toolbarComponent: sqlops.ToolbarComponent): InternalItemConfig { + private convertToItemConfig(toolbarComponent: azdata.ToolbarComponent): InternalItemConfig { let componentWrapper = toolbarComponent.component as ComponentWrapper; return new InternalItemConfig(componentWrapper, { @@ -418,20 +418,20 @@ class ToolbarContainerBuilder extends GenericContainerBuilder): void { + addToolbarItems(toolbarComponent: Array): void { toolbarComponent.forEach(toolbarComponent => { this.addToolbarItem(toolbarComponent); }); } - addToolbarItem(toolbarComponent: sqlops.ToolbarComponent): void { + addToolbarItem(toolbarComponent: azdata.ToolbarComponent): void { let itemImpl = this.convertToItemConfig(toolbarComponent); this._component.addItem(toolbarComponent.component as ComponentWrapper, itemImpl.config); } } -class LoadingComponentBuilder extends ComponentBuilderImpl implements sqlops.LoadingComponentBuilder { - withItem(component: sqlops.Component) { +class LoadingComponentBuilder extends ComponentBuilderImpl implements azdata.LoadingComponentBuilder { + withItem(component: azdata.Component) { this.component().component = component; return this; } @@ -447,12 +447,12 @@ class InternalItemConfig { }; } - public get component(): sqlops.Component { + public get component(): azdata.Component { return this._component; } } -class ComponentWrapper implements sqlops.Component { +class ComponentWrapper implements azdata.Component { public properties: { [key: string]: any } = {}; public layout: any; public itemConfigs: InternalItemConfig[]; @@ -482,7 +482,7 @@ class ComponentWrapper implements sqlops.Component { return this._type; } - public get items(): sqlops.Component[] { + public get items(): azdata.Component[] { return this.itemConfigs.map(itemConfig => itemConfig.component); } @@ -533,7 +533,7 @@ class ComponentWrapper implements sqlops.Component { return this._proxy.$clearContainer(this._handle, this.id); } - public addItems(items: Array, itemLayout?: any): void { + public addItems(items: Array, itemLayout?: any): void { for (let item of items) { this.addItem(item, itemLayout); } @@ -549,7 +549,7 @@ class ComponentWrapper implements sqlops.Component { return false; } - public removeItem(item: sqlops.Component): boolean { + public removeItem(item: azdata.Component): boolean { let index = this.itemConfigs.findIndex(c => c.component.id === item.id); if (index >= 0 && index < this.itemConfigs.length) { return this.removeItemAt(index); @@ -557,11 +557,11 @@ class ComponentWrapper implements sqlops.Component { return false; } - public insertItem(item: sqlops.Component, index: number, itemLayout?: any) { + public insertItem(item: azdata.Component, index: number, itemLayout?: any) { this.addItem(item, itemLayout, index); } - public addItem(item: sqlops.Component, itemLayout?: any, index?: number): void { + public addItem(item: azdata.Component, itemLayout?: any, index?: number): void { let itemImpl = item as ComponentWrapper; if (!itemImpl) { throw new Error(nls.localize('unknownComponentType', 'Unkown component type. Must use ModelBuilder to create objects')); @@ -653,7 +653,7 @@ class ComponentWrapper implements sqlops.Component { } } -class ContainerWrapper extends ComponentWrapper implements sqlops.Container { +class ContainerWrapper extends ComponentWrapper implements azdata.Container { constructor(proxy: MainThreadModelViewShape, handle: number, type: ModelComponentTypes, id: string) { super(proxy, handle, type, id); @@ -661,7 +661,7 @@ class ContainerWrapper extends ComponentWrapper implements sqlops.Containe } -class CardWrapper extends ComponentWrapper implements sqlops.CardComponent { +class CardWrapper extends ComponentWrapper implements azdata.CardComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Card, id); @@ -688,16 +688,16 @@ class CardWrapper extends ComponentWrapper implements sqlops.CardComponent { public set selected(v: boolean) { this.setProperty('selected', v); } - public get cardType(): sqlops.CardType { + public get cardType(): azdata.CardType { return this.properties['cardType']; } - public set cardType(v: sqlops.CardType) { + public set cardType(v: azdata.CardType) { this.setProperty('cardType', v); } - public get actions(): sqlops.ActionDescriptor[] { + public get actions(): azdata.ActionDescriptor[] { return this.properties['actions']; } - public set actions(a: sqlops.ActionDescriptor[]) { + public set actions(a: azdata.ActionDescriptor[]) { this.setProperty('actions', a); } public get iconPath(): string | URI | { light: string | URI; dark: string | URI } { @@ -720,7 +720,7 @@ class CardWrapper extends ComponentWrapper implements sqlops.CardComponent { this.setProperty('iconWidth', v); } - public get onDidActionClick(): vscode.Event { + public get onDidActionClick(): vscode.Event { let emitter = this._emitterMap.get(ComponentEventType.onDidClick); return emitter && emitter.event; } @@ -731,7 +731,7 @@ class CardWrapper extends ComponentWrapper implements sqlops.CardComponent { } } -class InputBoxWrapper extends ComponentWrapper implements sqlops.InputBoxComponent { +class InputBoxWrapper extends ComponentWrapper implements azdata.InputBoxComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.InputBox, id); @@ -795,10 +795,10 @@ class InputBoxWrapper extends ComponentWrapper implements sqlops.InputBoxCompone this.setProperty('multiline', v); } - public get inputType(): sqlops.InputBoxInputType { + public get inputType(): azdata.InputBoxInputType { return this.properties['inputType']; } - public set inputType(v: sqlops.InputBoxInputType) { + public set inputType(v: azdata.InputBoxInputType) { this.setProperty('inputType', v); } @@ -808,7 +808,7 @@ class InputBoxWrapper extends ComponentWrapper implements sqlops.InputBoxCompone } } -class CheckBoxWrapper extends ComponentWrapper implements sqlops.CheckBoxComponent { +class CheckBoxWrapper extends ComponentWrapper implements azdata.CheckBoxComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.CheckBox, id); @@ -836,7 +836,7 @@ class CheckBoxWrapper extends ComponentWrapper implements sqlops.CheckBoxCompone } } -class WebViewWrapper extends ComponentWrapper implements sqlops.WebViewComponent { +class WebViewWrapper extends ComponentWrapper implements azdata.WebViewComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string, private _extensionLocation: URI) { super(proxy, handle, ModelComponentTypes.WebView, id); this.properties = { @@ -872,7 +872,7 @@ class WebViewWrapper extends ComponentWrapper implements sqlops.WebViewComponent } } -class DomComponentWrapper extends ComponentWrapper implements sqlops.DomComponent { +class DomComponentWrapper extends ComponentWrapper implements azdata.DomComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Dom, id); @@ -887,7 +887,7 @@ class DomComponentWrapper extends ComponentWrapper implements sqlops.DomComponen } } -class EditorWrapper extends ComponentWrapper implements sqlops.EditorComponent { +class EditorWrapper extends ComponentWrapper implements azdata.EditorComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Editor, id); this.properties = {}; @@ -940,7 +940,7 @@ class EditorWrapper extends ComponentWrapper implements sqlops.EditorComponent { } } -class RadioButtonWrapper extends ComponentWrapper implements sqlops.RadioButtonComponent { +class RadioButtonWrapper extends ComponentWrapper implements azdata.RadioButtonComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.RadioButton, id); @@ -981,7 +981,7 @@ class RadioButtonWrapper extends ComponentWrapper implements sqlops.RadioButtonC } } -class TextComponentWrapper extends ComponentWrapper implements sqlops.TextComponentProperties { +class TextComponentWrapper extends ComponentWrapper implements azdata.TextComponentProperties { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Text, id); @@ -996,7 +996,7 @@ class TextComponentWrapper extends ComponentWrapper implements sqlops.TextCompon } } -class TableComponentWrapper extends ComponentWrapper implements sqlops.TableComponent { +class TableComponentWrapper extends ComponentWrapper implements azdata.TableComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Table, id); @@ -1011,10 +1011,10 @@ class TableComponentWrapper extends ComponentWrapper implements sqlops.TableComp this.setProperty('data', v); } - public get columns(): string[] | sqlops.TableColumn[] { + public get columns(): string[] | azdata.TableColumn[] { return this.properties['columns']; } - public set columns(v: string[] | sqlops.TableColumn[]) { + public set columns(v: string[] | azdata.TableColumn[]) { this.setProperty('columns', v); } @@ -1039,7 +1039,7 @@ class TableComponentWrapper extends ComponentWrapper implements sqlops.TableComp } } -class DropDownWrapper extends ComponentWrapper implements sqlops.DropDownComponent { +class DropDownWrapper extends ComponentWrapper implements azdata.DropDownComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.DropDown, id); @@ -1047,21 +1047,21 @@ class DropDownWrapper extends ComponentWrapper implements sqlops.DropDownCompone this._emitterMap.set(ComponentEventType.onDidChange, new Emitter()); } - public get value(): string | sqlops.CategoryValue { + public get value(): string | azdata.CategoryValue { let val = this.properties['value']; if (!val && this.values && this.values.length > 0) { val = this.values[0]; } return val; } - public set value(v: string | sqlops.CategoryValue) { + public set value(v: string | azdata.CategoryValue) { this.setProperty('value', v); } - public get values(): string[] | sqlops.CategoryValue[] { + public get values(): string[] | azdata.CategoryValue[] { return this.properties['values']; } - public set values(v: string[] | sqlops.CategoryValue[]) { + public set values(v: string[] | azdata.CategoryValue[]) { this.setProperty('values', v); } @@ -1078,7 +1078,7 @@ class DropDownWrapper extends ComponentWrapper implements sqlops.DropDownCompone } } -class DeclarativeTableWrapper extends ComponentWrapper implements sqlops.DeclarativeTableComponent { +class DeclarativeTableWrapper extends ComponentWrapper implements azdata.DeclarativeTableComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.DeclarativeTable, id); @@ -1093,11 +1093,11 @@ class DeclarativeTableWrapper extends ComponentWrapper implements sqlops.Declara this.setProperty('data', v); } - public get columns(): sqlops.DeclarativeTableColumn[] { + public get columns(): azdata.DeclarativeTableColumn[] { return this.properties['columns']; } - public set columns(v: sqlops.DeclarativeTableColumn[]) { + public set columns(v: azdata.DeclarativeTableColumn[]) { this.setProperty('columns', v); } @@ -1107,7 +1107,7 @@ class DeclarativeTableWrapper extends ComponentWrapper implements sqlops.Declara } } -class ListBoxWrapper extends ComponentWrapper implements sqlops.ListBoxComponent { +class ListBoxWrapper extends ComponentWrapper implements azdata.ListBoxComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.ListBox, id); @@ -1135,7 +1135,7 @@ class ListBoxWrapper extends ComponentWrapper implements sqlops.ListBoxComponent } } -class ButtonWrapper extends ComponentWrapper implements sqlops.ButtonComponent { +class ButtonWrapper extends ComponentWrapper implements azdata.ButtonComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Button, id); @@ -1170,7 +1170,7 @@ class ButtonWrapper extends ComponentWrapper implements sqlops.ButtonComponent { } } -class LoadingComponentWrapper extends ComponentWrapper implements sqlops.LoadingComponent { +class LoadingComponentWrapper extends ComponentWrapper implements azdata.LoadingComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.LoadingComponent, id); this.properties = {}; @@ -1185,16 +1185,16 @@ class LoadingComponentWrapper extends ComponentWrapper implements sqlops.Loading this.setProperty('loading', value); } - public get component(): sqlops.Component { + public get component(): azdata.Component { return this.items[0]; } - public set component(value: sqlops.Component) { + public set component(value: azdata.Component) { this.addItem(value); } } -class FileBrowserTreeComponentWrapper extends ComponentWrapper implements sqlops.FileBrowserTreeComponent { +class FileBrowserTreeComponentWrapper extends ComponentWrapper implements azdata.FileBrowserTreeComponent { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.FileBrowserTree, id); @@ -1216,7 +1216,7 @@ class FileBrowserTreeComponentWrapper extends ComponentWrapper implements sqlops } } -class DivContainerWrapper extends ComponentWrapper implements sqlops.DivContainer { +class DivContainerWrapper extends ComponentWrapper implements azdata.DivContainer { public get overflowY(): string { return this.properties['overflowY']; } @@ -1234,7 +1234,7 @@ class DivContainerWrapper extends ComponentWrapper implements sqlops.DivContaine } } -class TreeComponentWrapper extends ComponentWrapper implements sqlops.TreeComponent { +class TreeComponentWrapper extends ComponentWrapper implements azdata.TreeComponent { constructor( private _extHostModelViewTree: ExtHostModelViewTreeViewsShape, @@ -1243,7 +1243,7 @@ class TreeComponentWrapper extends ComponentWrapper implements sqlops.TreeCom this.properties = {}; } - public registerDataProvider(dataProvider: sqlops.TreeComponentDataProvider): sqlops.TreeComponentView { + public registerDataProvider(dataProvider: azdata.TreeComponentDataProvider): azdata.TreeComponentView { this.setDataProvider(); return this._extHostModelViewTree.$createTreeView(this._handle, this.id, { treeDataProvider: dataProvider }, this._extension); } @@ -1256,7 +1256,7 @@ class TreeComponentWrapper extends ComponentWrapper implements sqlops.TreeCom } } -class HyperlinkComponentWrapper extends ComponentWrapper implements sqlops.HyperlinkComponentProperties { +class HyperlinkComponentWrapper extends ComponentWrapper implements azdata.HyperlinkComponentProperties { constructor(proxy: MainThreadModelViewShape, handle: number, id: string) { super(proxy, handle, ModelComponentTypes.Hyperlink, id); @@ -1278,20 +1278,20 @@ class HyperlinkComponentWrapper extends ComponentWrapper implements sqlops.Hyper } } -class ModelViewImpl implements sqlops.ModelView { +class ModelViewImpl implements azdata.ModelView { public onClosedEmitter = new Emitter(); private _onValidityChangedEmitter = new Emitter(); public readonly onValidityChanged = this._onValidityChangedEmitter.event; private _modelBuilder: ModelBuilderImpl; - private _component: sqlops.Component; + private _component: azdata.Component; constructor( private readonly _proxy: MainThreadModelViewShape, private readonly _handle: number, - private readonly _connection: sqlops.connection.Connection, - private readonly _serverInfo: sqlops.ServerInfo, + private readonly _connection: azdata.connection.Connection, + private readonly _serverInfo: azdata.ServerInfo, private readonly mainContext: IMainContext, private readonly _extHostModelViewTree: ExtHostModelViewTreeViewsShape, _extension: IExtensionDescription @@ -1303,15 +1303,15 @@ class ModelViewImpl implements sqlops.ModelView { return this.onClosedEmitter.event; } - public get connection(): sqlops.connection.Connection { + public get connection(): azdata.connection.Connection { return deepClone(this._connection); } - public get serverInfo(): sqlops.ServerInfo { + public get serverInfo(): azdata.ServerInfo { return deepClone(this._serverInfo); } - public get modelBuilder(): sqlops.ModelBuilder { + public get modelBuilder(): azdata.ModelBuilder { return this._modelBuilder; } @@ -1323,7 +1323,7 @@ class ModelViewImpl implements sqlops.ModelView { this._modelBuilder.handleEvent(componentId, eventArgs); } - public initializeModel(component: T): Thenable { + public initializeModel(component: T): Thenable { component.onValidityChanged(valid => this._onValidityChangedEmitter.fire(valid)); this._component = component; let componentImpl = component as ComponentWrapper; @@ -1346,7 +1346,7 @@ export class ExtHostModelView implements ExtHostModelViewShape { private readonly _proxy: MainThreadModelViewShape; private readonly _modelViews = new Map(); - private readonly _handlers = new Map void>(); + private readonly _handlers = new Map void>(); private readonly _handlerToExtension = new Map(); constructor( private _mainContext: IMainContext, @@ -1361,13 +1361,13 @@ export class ExtHostModelView implements ExtHostModelViewShape { this._modelViews.delete(handle); } - $registerProvider(widgetId: string, handler: (webview: sqlops.ModelView) => void, extension: IExtensionDescription): void { + $registerProvider(widgetId: string, handler: (webview: azdata.ModelView) => void, extension: IExtensionDescription): void { this._handlers.set(widgetId, handler); this._handlerToExtension.set(widgetId, extension); this._proxy.$registerProvider(widgetId); } - $registerWidget(handle: number, id: string, connection: sqlops.connection.Connection, serverInfo: sqlops.ServerInfo): void { + $registerWidget(handle: number, id: string, connection: azdata.connection.Connection, serverInfo: azdata.ServerInfo): void { let extension = this._handlerToExtension.get(id); let view = new ModelViewImpl(this._proxy, handle, connection, serverInfo, this._mainContext, this._extHostModelViewTree, extension); this._modelViews.set(handle, view); diff --git a/src/sql/workbench/api/node/extHostModelViewDialog.ts b/src/sql/workbench/api/node/extHostModelViewDialog.ts index f1349a2789..eb4d8a80d3 100644 --- a/src/sql/workbench/api/node/extHostModelViewDialog.ts +++ b/src/sql/workbench/api/node/extHostModelViewDialog.ts @@ -12,7 +12,7 @@ import { generateUuid } from 'vs/base/common/uuid'; import { URI } from 'vs/base/common/uri'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { SqlMainContext, ExtHostModelViewDialogShape, MainThreadModelViewDialogShape, ExtHostModelViewShape, ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; @@ -26,8 +26,8 @@ const GENERATE_SCRIPT_LABEL = nls.localize('generateScriptLabel', 'Generate scri const NEXT_LABEL = nls.localize('dialogNextLabel', 'Next'); const PREVIOUS_LABEL = nls.localize('dialogPreviousLabel', 'Previous'); -class ModelViewPanelImpl implements sqlops.window.ModelViewPanel { - private _modelView: sqlops.ModelView; +class ModelViewPanelImpl implements azdata.window.ModelViewPanel { + private _modelView: azdata.ModelView; private _handle: number; protected _modelViewId: string; protected _valid: boolean = true; @@ -41,7 +41,7 @@ class ModelViewPanelImpl implements sqlops.window.ModelViewPanel { this._onValidityChanged(valid => this._valid = valid); } - public registerContent(handler: (view: sqlops.ModelView) => Thenable): void { + public registerContent(handler: (view: azdata.ModelView) => Thenable): void { if (!this._modelViewId) { let viewId = this._viewType + this._handle; this.setModelViewId(viewId); @@ -60,11 +60,11 @@ class ModelViewPanelImpl implements sqlops.window.ModelViewPanel { this._modelViewId = value; } - public get modelView(): sqlops.ModelView { + public get modelView(): azdata.ModelView { return this._modelView; } - public set modelView(value: sqlops.ModelView) { + public set modelView(value: azdata.ModelView) { this._modelView = value; } @@ -77,7 +77,7 @@ class ModelViewPanelImpl implements sqlops.window.ModelViewPanel { } } -class ModelViewEditorImpl extends ModelViewPanelImpl implements sqlops.workspace.ModelViewEditor { +class ModelViewEditorImpl extends ModelViewPanelImpl implements azdata.workspace.ModelViewEditor { private _isDirty: boolean; private _saveHandler: () => Thenable; @@ -87,7 +87,7 @@ class ModelViewEditorImpl extends ModelViewPanelImpl implements sqlops.workspace extension: IExtensionDescription, private _proxy: MainThreadModelViewDialogShape, private _title: string, - private _options: sqlops.ModelViewEditorOptions + private _options: azdata.ModelViewEditorOptions ) { super('modelViewEditor', extHostModelViewDialog, extHostModelView, extension); this._isDirty = false; @@ -119,13 +119,13 @@ class ModelViewEditorImpl extends ModelViewPanelImpl implements sqlops.workspace } } -class DialogImpl extends ModelViewPanelImpl implements sqlops.window.Dialog { +class DialogImpl extends ModelViewPanelImpl implements azdata.window.Dialog { public title: string; - public content: string | sqlops.window.DialogTab[]; - public okButton: sqlops.window.Button; - public cancelButton: sqlops.window.Button; - public customButtons: sqlops.window.Button[]; - private _message: sqlops.window.DialogMessage; + public content: string | azdata.window.DialogTab[]; + public okButton: azdata.window.Button; + public cancelButton: azdata.window.Button; + public customButtons: azdata.window.Button[]; + private _message: azdata.window.DialogMessage; private _closeValidator: () => boolean | Thenable; private _operationHandler: BackgroundOperationHandler; private _dialogName: string; @@ -143,7 +143,7 @@ class DialogImpl extends ModelViewPanelImpl implements sqlops.window.Dialog { }); } - public registerOperation(operationInfo: sqlops.BackgroundOperationInfo): void { + public registerOperation(operationInfo: azdata.BackgroundOperationInfo): void { this._operationHandler.registerOperation(operationInfo); } @@ -152,11 +152,11 @@ class DialogImpl extends ModelViewPanelImpl implements sqlops.window.Dialog { this.content = value; } - public get message(): sqlops.window.DialogMessage { + public get message(): azdata.window.DialogMessage { return this._message; } - public set message(value: sqlops.window.DialogMessage) { + public set message(value: azdata.window.DialogMessage) { this._message = value; this._extHostModelViewDialog.updateDialogContent(this); } @@ -182,7 +182,7 @@ class DialogImpl extends ModelViewPanelImpl implements sqlops.window.Dialog { } } -class TabImpl extends ModelViewPanelImpl implements sqlops.window.DialogTab { +class TabImpl extends ModelViewPanelImpl implements azdata.window.DialogTab { constructor( extHostModelViewDialog: ExtHostModelViewDialog, extHostModelView: ExtHostModelViewShape, @@ -200,7 +200,7 @@ class TabImpl extends ModelViewPanelImpl implements sqlops.window.DialogTab { } } -class ButtonImpl implements sqlops.window.Button { +class ButtonImpl implements azdata.window.Button { private _label: string; private _enabled: boolean; private _hidden: boolean; @@ -247,7 +247,7 @@ class ButtonImpl implements sqlops.window.Button { class BackgroundOperationHandler { - private _operationInfo: sqlops.BackgroundOperationInfo; + private _operationInfo: azdata.BackgroundOperationInfo; constructor( private _name: string, @@ -269,13 +269,13 @@ class BackgroundOperationHandler { } } - public registerOperation(operationInfo: sqlops.BackgroundOperationInfo): void { + public registerOperation(operationInfo: azdata.BackgroundOperationInfo): void { this._operationInfo = operationInfo; } } -class WizardPageImpl extends ModelViewPanelImpl implements sqlops.window.WizardPage { - public customButtons: sqlops.window.Button[]; +class WizardPageImpl extends ModelViewPanelImpl implements azdata.window.WizardPage { + public customButtons: azdata.window.Button[]; private _enabled: boolean = true; private _description: string; @@ -320,23 +320,23 @@ export enum WizardPageInfoEventType { export interface WizardPageEventInfo { eventType: WizardPageInfoEventType; - pageChangeInfo: sqlops.window.WizardPageChangeInfo; - pages?: sqlops.window.WizardPage[]; + pageChangeInfo: azdata.window.WizardPageChangeInfo; + pages?: azdata.window.WizardPage[]; } -class WizardImpl implements sqlops.window.Wizard { +class WizardImpl implements azdata.window.Wizard { private _currentPage: number = undefined; - public pages: sqlops.window.WizardPage[] = []; - public doneButton: sqlops.window.Button; - public cancelButton: sqlops.window.Button; - public generateScriptButton: sqlops.window.Button; - public nextButton: sqlops.window.Button; - public backButton: sqlops.window.Button; - public customButtons: sqlops.window.Button[]; - private _pageChangedEmitter = new Emitter(); + public pages: azdata.window.WizardPage[] = []; + public doneButton: azdata.window.Button; + public cancelButton: azdata.window.Button; + public generateScriptButton: azdata.window.Button; + public nextButton: azdata.window.Button; + public backButton: azdata.window.Button; + public customButtons: azdata.window.Button[]; + private _pageChangedEmitter = new Emitter(); public readonly onPageChanged = this._pageChangedEmitter.event; - private _navigationValidator: (info: sqlops.window.WizardPageChangeInfo) => boolean | Thenable; - private _message: sqlops.window.DialogMessage; + private _navigationValidator: (info: azdata.window.WizardPageChangeInfo) => boolean | Thenable; + private _message: azdata.window.DialogMessage; private _displayPageTitles: boolean = true; private _operationHandler: BackgroundOperationHandler; @@ -355,7 +355,7 @@ class WizardImpl implements sqlops.window.Wizard { }); } - public registerOperation(operationInfo: sqlops.BackgroundOperationInfo): void { + public registerOperation(operationInfo: azdata.BackgroundOperationInfo): void { this._operationHandler.registerOperation(operationInfo); } @@ -363,11 +363,11 @@ class WizardImpl implements sqlops.window.Wizard { return this._currentPage; } - public get message(): sqlops.window.DialogMessage { + public get message(): azdata.window.DialogMessage { return this._message; } - public set message(value: sqlops.window.DialogMessage) { + public set message(value: azdata.window.DialogMessage) { this._message = value; this._extHostModelViewDialog.updateWizard(this); } @@ -381,7 +381,7 @@ class WizardImpl implements sqlops.window.Wizard { this._extHostModelViewDialog.updateWizard(this); } - public addPage(page: sqlops.window.WizardPage, index?: number): Thenable { + public addPage(page: azdata.window.WizardPage, index?: number): Thenable { return this._extHostModelViewDialog.updateWizardPage(page).then(() => { this._extHostModelViewDialog.addPage(this, page, index); }); @@ -403,11 +403,11 @@ class WizardImpl implements sqlops.window.Wizard { return this._extHostModelViewDialog.closeWizard(this); } - public registerNavigationValidator(validator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean | Thenable): void { + public registerNavigationValidator(validator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean | Thenable): void { this._navigationValidator = validator; } - public validateNavigation(info: sqlops.window.WizardPageChangeInfo): Thenable { + public validateNavigation(info: azdata.window.WizardPageChangeInfo): Thenable { if (this._navigationValidator) { return Promise.resolve(this._navigationValidator(info)); } else { @@ -450,8 +450,8 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { return handle; } - private getHandle(item: sqlops.window.Button | sqlops.window.Dialog | sqlops.window.DialogTab - | sqlops.window.ModelViewPanel | sqlops.window.Wizard | sqlops.window.WizardPage | sqlops.workspace.ModelViewEditor) { + private getHandle(item: azdata.window.Button | azdata.window.Dialog | azdata.window.DialogTab + | azdata.window.ModelViewPanel | azdata.window.Wizard | azdata.window.WizardPage | azdata.workspace.ModelViewEditor) { let handle = this._objectHandles.get(item); if (handle === undefined) { handle = ExtHostModelViewDialog.getNewHandle(); @@ -472,7 +472,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { } } - public $onWizardPageChanged(handle: number, info: sqlops.window.WizardPageChangeInfo): void { + public $onWizardPageChanged(handle: number, info: azdata.window.WizardPageChangeInfo): void { let callback = this._pageInfoChangedCallbacks.get(handle); if (callback) { callback({ @@ -485,7 +485,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { public $updateWizardPageInfo(handle: number, pageHandles: number[], currentPageIndex: number): void { let callback = this._pageInfoChangedCallbacks.get(handle); if (callback) { - let pages = pageHandles.map(pageHandle => this._objectsByHandle.get(handle) as sqlops.window.WizardPage); + let pages = pageHandles.map(pageHandle => this._objectsByHandle.get(handle) as azdata.window.WizardPage); callback({ eventType: WizardPageInfoEventType.PageAddedOrRemoved, pageChangeInfo: { @@ -497,7 +497,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { } } - public $validateNavigation(handle: number, info: sqlops.window.WizardPageChangeInfo): Thenable { + public $validateNavigation(handle: number, info: azdata.window.WizardPageChangeInfo): Thenable { let wizard = this._objectsByHandle.get(handle) as WizardImpl; return wizard.validateNavigation(info); } @@ -512,25 +512,25 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { return editor.handleSave(); } - public openDialog(dialog: sqlops.window.Dialog): void { + public openDialog(dialog: azdata.window.Dialog): void { let handle = this.getHandle(dialog); this.updateDialogContent(dialog); dialog.dialogName ? this._proxy.$openDialog(handle, dialog.dialogName) : this._proxy.$openDialog(handle); } - public closeDialog(dialog: sqlops.window.Dialog): void { + public closeDialog(dialog: azdata.window.Dialog): void { let handle = this.getHandle(dialog); this._proxy.$closeDialog(handle); } - public createModelViewEditor(title: string, extension: IExtensionDescription, options?: sqlops.ModelViewEditorOptions): sqlops.workspace.ModelViewEditor { + public createModelViewEditor(title: string, extension: IExtensionDescription, options?: azdata.ModelViewEditorOptions): azdata.workspace.ModelViewEditor { let editor = new ModelViewEditorImpl(this, this._extHostModelView, extension, this._proxy, title, options); editor.handle = this.getHandle(editor); return editor; } - public updateDialogContent(dialog: sqlops.window.Dialog): void { + public updateDialogContent(dialog: azdata.window.Dialog): void { let handle = this.getHandle(dialog); let tabs = dialog.content; if (tabs && typeof tabs !== 'string') { @@ -551,7 +551,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { }); } - public updateTabContent(tab: sqlops.window.DialogTab): void { + public updateTabContent(tab: azdata.window.DialogTab): void { let handle = this.getHandle(tab); this._proxy.$setTabDetails(handle, { title: tab.title, @@ -559,7 +559,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { }); } - public updateButton(button: sqlops.window.Button): void { + public updateButton(button: azdata.window.Button): void { let handle = this.getHandle(button); this._proxy.$setButtonDetails(handle, { label: button.label, @@ -568,12 +568,12 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { }); } - public registerOnClickCallback(button: sqlops.window.Button, callback: () => void) { + public registerOnClickCallback(button: azdata.window.Button, callback: () => void) { let handle = this.getHandle(button); this._onClickCallbacks.set(handle, callback); } - public createDialog(title: string, dialogName?: string, extension?: IExtensionDescription): sqlops.window.Dialog { + public createDialog(title: string, dialogName?: string, extension?: IExtensionDescription): azdata.window.Dialog { let dialog = new DialogImpl(this, this._extHostModelView, this._extHostTaskManagement, extension); if (dialogName) { dialog.dialogName = dialogName; @@ -583,14 +583,14 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { return dialog; } - public createTab(title: string, extension?: IExtensionDescription): sqlops.window.DialogTab { + public createTab(title: string, extension?: IExtensionDescription): azdata.window.DialogTab { let tab = new TabImpl(this, this._extHostModelView, extension); tab.title = title; tab.handle = this.getHandle(tab); return tab; } - public createButton(label: string): sqlops.window.Button { + public createButton(label: string): azdata.window.Button { let button = new ButtonImpl(this); this.getHandle(button); this.registerOnClickCallback(button, button.getOnClickCallback()); @@ -598,7 +598,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { return button; } - public getValidityChangedEvent(panel: sqlops.window.ModelViewPanel) { + public getValidityChangedEvent(panel: azdata.window.ModelViewPanel) { let handle = this.getHandle(panel); let emitter = this._validityEmitters.get(handle); if (!emitter) { @@ -608,24 +608,24 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { return emitter.event; } - public registerWizardPageInfoChangedCallback(wizard: sqlops.window.Wizard, callback: (info: WizardPageEventInfo) => void): void { + public registerWizardPageInfoChangedCallback(wizard: azdata.window.Wizard, callback: (info: WizardPageEventInfo) => void): void { let handle = this.getHandle(wizard); this._pageInfoChangedCallbacks.set(handle, callback); } - public createWizardPage(title: string, extension?: IExtensionDescription): sqlops.window.WizardPage { + public createWizardPage(title: string, extension?: IExtensionDescription): azdata.window.WizardPage { let page = new WizardPageImpl(title, this, this._extHostModelView, extension); page.handle = this.getHandle(page); return page; } - public createWizard(title: string): sqlops.window.Wizard { + public createWizard(title: string): azdata.window.Wizard { let wizard = new WizardImpl(title, this, this._extHostTaskManagement); this.getHandle(wizard); return wizard; } - public updateWizardPage(page: sqlops.window.WizardPage): Thenable { + public updateWizardPage(page: azdata.window.WizardPage): Thenable { let handle = this.getHandle(page); if (page.customButtons) { page.customButtons.forEach(button => this.updateButton(button)); @@ -639,7 +639,7 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { }); } - public updateWizard(wizard: sqlops.window.Wizard): Thenable { + public updateWizard(wizard: azdata.window.Wizard): Thenable { let handle = this.getHandle(wizard); wizard.pages.forEach(page => this.updateWizardPage(page)); this.updateButton(wizard.backButton); @@ -665,25 +665,25 @@ export class ExtHostModelViewDialog implements ExtHostModelViewDialogShape { }); } - public addPage(wizard: sqlops.window.Wizard, page: sqlops.window.WizardPage, pageIndex?: number): Thenable { + public addPage(wizard: azdata.window.Wizard, page: azdata.window.WizardPage, pageIndex?: number): Thenable { return this._proxy.$addWizardPage(this.getHandle(wizard), this.getHandle(page), pageIndex); } - public removePage(wizard: sqlops.window.Wizard, pageIndex: number): Thenable { + public removePage(wizard: azdata.window.Wizard, pageIndex: number): Thenable { return this._proxy.$removeWizardPage(this.getHandle(wizard), pageIndex); } - public setWizardPage(wizard: sqlops.window.Wizard, pageIndex: number): Thenable { + public setWizardPage(wizard: azdata.window.Wizard, pageIndex: number): Thenable { return this._proxy.$setWizardPage(this.getHandle(wizard), pageIndex); } - public openWizard(wizard: sqlops.window.Wizard): Thenable { + public openWizard(wizard: azdata.window.Wizard): Thenable { let handle = this.getHandle(wizard); this.updateWizard(wizard); return this._proxy.$openWizard(handle); } - public closeWizard(wizard: sqlops.window.Wizard): Thenable { + public closeWizard(wizard: azdata.window.Wizard): Thenable { let handle = this.getHandle(wizard); return this._proxy.$closeWizard(handle); } diff --git a/src/sql/workbench/api/node/extHostModelViewTree.ts b/src/sql/workbench/api/node/extHostModelViewTree.ts index ff05492e3f..2fc9598146 100644 --- a/src/sql/workbench/api/node/extHostModelViewTree.ts +++ b/src/sql/workbench/api/node/extHostModelViewTree.ts @@ -11,7 +11,7 @@ import { SqlMainContext, ExtHostModelViewTreeViewsShape, MainThreadModelViewShap import { ITreeComponentItem } from 'sql/workbench/common/views'; import { CommandsConverter } from 'vs/workbench/api/node/extHostCommands'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vsTreeExt from 'vs/workbench/api/node/extHostTreeViews'; import { Emitter } from 'vs/base/common/event'; import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; @@ -27,7 +27,7 @@ export class ExtHostModelViewTreeViews implements ExtHostModelViewTreeViewsShape this._proxy = this._mainContext.getProxy(SqlMainContext.MainThreadModelView); } - $createTreeView(handle: number, componentId: string, options: { treeDataProvider: sqlops.TreeComponentDataProvider }, extension: IExtensionDescription): sqlops.TreeComponentView { + $createTreeView(handle: number, componentId: string, options: { treeDataProvider: azdata.TreeComponentDataProvider }, extension: IExtensionDescription): azdata.TreeComponentView { if (!options || !options.treeDataProvider) { throw new Error('Options with treeDataProvider is mandatory'); } @@ -75,7 +75,7 @@ export class ExtHostModelViewTreeViews implements ExtHostModelViewTreeViewsShape $setVisible(treeViewId: string, visible: boolean): void { } - private createExtHostTreeViewer(handle: number, id: string, dataProvider: sqlops.TreeComponentDataProvider, extension: IExtensionDescription): ExtHostTreeView { + private createExtHostTreeViewer(handle: number, id: string, dataProvider: azdata.TreeComponentDataProvider, extension: IExtensionDescription): ExtHostTreeView { const treeView = new ExtHostTreeView(handle, id, dataProvider, this._proxy, undefined, extension); this.treeViews.set(`${handle}-${id}`, treeView); return treeView; @@ -84,12 +84,12 @@ export class ExtHostModelViewTreeViews implements ExtHostModelViewTreeViewsShape export class ExtHostTreeView extends vsTreeExt.ExtHostTreeView { - private _onNodeCheckedChanged = new Emitter>(); + private _onNodeCheckedChanged = new Emitter>(); private _onChangeSelection = new Emitter>(); - public readonly NodeCheckedChanged: vscode.Event> = this._onNodeCheckedChanged.event; + public readonly NodeCheckedChanged: vscode.Event> = this._onNodeCheckedChanged.event; public readonly ChangeSelection: vscode.Event> = this._onChangeSelection.event; constructor( - private handle: number, private componentId: string, private componentDataProvider: sqlops.TreeComponentDataProvider, + private handle: number, private componentId: string, private componentDataProvider: azdata.TreeComponentDataProvider, private modelViewProxy: MainThreadModelViewShape, commands: CommandsConverter, extension: IExtensionDescription) { super(componentId, { treeDataProvider: componentDataProvider }, undefined, commands, undefined, extension); } @@ -162,7 +162,7 @@ export class ExtHostTreeView extends vsTreeExt.ExtHostTreeView { }); } - protected createTreeItem(element: T, extensionTreeItem: sqlops.TreeComponentItem, parent?: vsTreeExt.TreeNode): ITreeComponentItem { + protected createTreeItem(element: T, extensionTreeItem: azdata.TreeComponentItem, parent?: vsTreeExt.TreeNode): ITreeComponentItem { let item = super.createTreeItem(element, extensionTreeItem, parent); item = Object.assign({}, item, { checked: extensionTreeItem.checked, enabled: extensionTreeItem.enabled }); return item; diff --git a/src/sql/workbench/api/node/extHostNotebook.ts b/src/sql/workbench/api/node/extHostNotebook.ts index daf79de9e3..1e72fa3f57 100644 --- a/src/sql/workbench/api/node/extHostNotebook.ts +++ b/src/sql/workbench/api/node/extHostNotebook.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -16,7 +16,7 @@ import { URI, UriComponents } from 'vs/base/common/uri'; import { ExtHostNotebookShape, MainThreadNotebookShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, INotebookFutureDetails, FutureMessageType } from 'sql/workbench/api/common/sqlExtHostTypes'; -type Adapter = sqlops.nb.NotebookProvider | sqlops.nb.NotebookManager | sqlops.nb.ISession | sqlops.nb.IKernel | sqlops.nb.IFuture; +type Adapter = azdata.nb.NotebookProvider | azdata.nb.NotebookManager | azdata.nb.ISession | azdata.nb.IKernel | azdata.nb.IFuture; export class ExtHostNotebook implements ExtHostNotebookShape { private static _handlePool: number = 0; @@ -64,22 +64,22 @@ export class ExtHostNotebook implements ExtHostNotebookShape { return this._withServerManager(managerHandle, (serverManager) => serverManager.stopServer()); } - $getNotebookContents(managerHandle: number, notebookUri: UriComponents): Thenable { + $getNotebookContents(managerHandle: number, notebookUri: UriComponents): Thenable { return this._withContentManager(managerHandle, (contentManager) => contentManager.getNotebookContents(URI.revive(notebookUri))); } - $save(managerHandle: number, notebookUri: UriComponents, notebook: sqlops.nb.INotebookContents): Thenable { + $save(managerHandle: number, notebookUri: UriComponents, notebook: azdata.nb.INotebookContents): Thenable { return this._withContentManager(managerHandle, (contentManager) => contentManager.save(URI.revive(notebookUri), notebook)); } - $refreshSpecs(managerHandle: number): Thenable { + $refreshSpecs(managerHandle: number): Thenable { return this._withSessionManager(managerHandle, async (sessionManager) => { await sessionManager.ready; return sessionManager.specs; }); } - $startNewSession(managerHandle: number, options: sqlops.nb.ISessionOptions): Thenable { + $startNewSession(managerHandle: number, options: azdata.nb.ISessionOptions): Thenable { return this._withSessionManager(managerHandle, async (sessionManager) => { let session = await sessionManager.startNew(options); let sessionId = this._addNewAdapter(session); @@ -101,7 +101,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape { }); } - private saveKernel(kernel: sqlops.nb.IKernel): INotebookKernelDetails { + private saveKernel(kernel: azdata.nb.IKernel): INotebookKernelDetails { let kernelId = this._addNewAdapter(kernel); let kernelDetails: INotebookKernelDetails = { kernelId: kernelId, @@ -119,38 +119,38 @@ export class ExtHostNotebook implements ExtHostNotebookShape { }); } - $changeKernel(sessionId: number, kernelInfo: sqlops.nb.IKernelSpec): Thenable { - let session = this._getAdapter(sessionId); + $changeKernel(sessionId: number, kernelInfo: azdata.nb.IKernelSpec): Thenable { + let session = this._getAdapter(sessionId); return session.changeKernel(kernelInfo).then(kernel => this.saveKernel(kernel)); } - $configureKernel(sessionId: number, kernelInfo: sqlops.nb.IKernelSpec): Thenable { - let session = this._getAdapter(sessionId); + $configureKernel(sessionId: number, kernelInfo: azdata.nb.IKernelSpec): Thenable { + let session = this._getAdapter(sessionId); return session.configureKernel(kernelInfo).then(() => null); } - $configureConnection(sessionId: number, connection: sqlops.IConnectionProfile): Thenable { - let session = this._getAdapter(sessionId); + $configureConnection(sessionId: number, connection: azdata.IConnectionProfile): Thenable { + let session = this._getAdapter(sessionId); return session.configureConnection(connection).then(() => null); } - $getKernelReadyStatus(kernelId: number): Thenable { - let kernel = this._getAdapter(kernelId); + $getKernelReadyStatus(kernelId: number): Thenable { + let kernel = this._getAdapter(kernelId); return kernel.ready.then(success => kernel.info); } - $getKernelSpec(kernelId: number): Thenable { - let kernel = this._getAdapter(kernelId); + $getKernelSpec(kernelId: number): Thenable { + let kernel = this._getAdapter(kernelId); return kernel.getSpec(); } - $requestComplete(kernelId: number, content: sqlops.nb.ICompleteRequest): Thenable { - let kernel = this._getAdapter(kernelId); + $requestComplete(kernelId: number, content: azdata.nb.ICompleteRequest): Thenable { + let kernel = this._getAdapter(kernelId); return kernel.requestComplete(content); } - $requestExecute(kernelId: number, content: sqlops.nb.IExecuteRequest, disposeOnDone?: boolean): Thenable { - let kernel = this._getAdapter(kernelId); + $requestExecute(kernelId: number, content: azdata.nb.IExecuteRequest, disposeOnDone?: boolean): Thenable { + let kernel = this._getAdapter(kernelId); let future = kernel.requestExecute(content, disposeOnDone); let futureId = this._addNewAdapter(future); this.hookFutureDone(futureId, future); @@ -161,7 +161,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape { }); } - private hookFutureDone(futureId: number, future: sqlops.nb.IFuture): void { + private hookFutureDone(futureId: number, future: azdata.nb.IFuture): void { future.done.then(success => { return this._proxy.$onFutureDone(futureId, { succeeded: true, message: success, rejectReason: undefined }); }, err => { @@ -179,31 +179,31 @@ export class ExtHostNotebook implements ExtHostNotebookShape { }); } - private hookFutureMessages(futureId: number, future: sqlops.nb.IFuture): void { + private hookFutureMessages(futureId: number, future: azdata.nb.IFuture): void { future.setReplyHandler({ handle: (msg) => this._proxy.$onFutureMessage(futureId, FutureMessageType.Reply, msg) }); future.setStdInHandler({ handle: (msg) => this._proxy.$onFutureMessage(futureId, FutureMessageType.StdIn, msg) }); future.setIOPubHandler({ handle: (msg) => this._proxy.$onFutureMessage(futureId, FutureMessageType.IOPub, msg) }); } $interruptKernel(kernelId: number): Thenable { - let kernel = this._getAdapter(kernelId); + let kernel = this._getAdapter(kernelId); return kernel.interrupt(); } - $sendInputReply(futureId: number, content: sqlops.nb.IInputReply): void { - let future = this._getAdapter(futureId); + $sendInputReply(futureId: number, content: azdata.nb.IInputReply): void { + let future = this._getAdapter(futureId); return future.sendInputReply(content); } $disposeFuture(futureId: number): void { - let future = this._getAdapter(futureId); + let future = this._getAdapter(futureId); future.dispose(); } //#endregion //#region APIs called by extensions - registerNotebookProvider(provider: sqlops.nb.NotebookProvider): vscode.Disposable { + registerNotebookProvider(provider: azdata.nb.NotebookProvider): vscode.Disposable { if (!provider || !provider.providerId) { throw new Error(localize('providerRequired', 'A NotebookProvider with valid providerId must be passed to this method')); } @@ -235,7 +235,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape { return undefined; } - private async createManager(provider: sqlops.nb.NotebookProvider, notebookUri: URI): Promise { + private async createManager(provider: azdata.nb.NotebookProvider, notebookUri: URI): Promise { let manager = await provider.getNotebookManager(notebookUri); let uriString = notebookUri.toString(); let adapter = new NotebookManagerAdapter(provider, manager, uriString); @@ -254,8 +254,8 @@ export class ExtHostNotebook implements ExtHostNotebookShape { return ExtHostNotebook._handlePool++; } - private _withProvider(handle: number, callback: (provider: sqlops.nb.NotebookProvider) => R | PromiseLike): TPromise { - let provider = this._adapters.get(handle) as sqlops.nb.NotebookProvider; + private _withProvider(handle: number, callback: (provider: azdata.nb.NotebookProvider) => R | PromiseLike): TPromise { + let provider = this._adapters.get(handle) as azdata.nb.NotebookProvider; if (provider === undefined) { return TPromise.wrapError(new Error(localize('errNoProvider', 'no notebook provider found'))); } @@ -270,7 +270,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape { return TPromise.wrap(callback(manager)); } - private _withServerManager(handle: number, callback: (manager: sqlops.nb.ServerManager) => R | PromiseLike): TPromise { + private _withServerManager(handle: number, callback: (manager: azdata.nb.ServerManager) => R | PromiseLike): TPromise { return this._withNotebookManager(handle, (notebookManager) => { let serverManager = notebookManager.serverManager; if (!serverManager) { @@ -280,7 +280,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape { }); } - private _withContentManager(handle: number, callback: (manager: sqlops.nb.ContentManager) => R | PromiseLike): TPromise { + private _withContentManager(handle: number, callback: (manager: azdata.nb.ContentManager) => R | PromiseLike): TPromise { return this._withNotebookManager(handle, (notebookManager) => { let contentManager = notebookManager.contentManager; if (!contentManager) { @@ -290,7 +290,7 @@ export class ExtHostNotebook implements ExtHostNotebookShape { }); } - private _withSessionManager(handle: number, callback: (manager: sqlops.nb.SessionManager) => R | PromiseLike): TPromise { + private _withSessionManager(handle: number, callback: (manager: azdata.nb.SessionManager) => R | PromiseLike): TPromise { return this._withNotebookManager(handle, (notebookManager) => { let sessionManager = notebookManager.sessionManager; if (!sessionManager) { @@ -318,24 +318,24 @@ export class ExtHostNotebook implements ExtHostNotebookShape { } -class NotebookManagerAdapter implements sqlops.nb.NotebookManager { +class NotebookManagerAdapter implements azdata.nb.NotebookManager { public handle: number; constructor( - public readonly provider: sqlops.nb.NotebookProvider, - private manager: sqlops.nb.NotebookManager, + public readonly provider: azdata.nb.NotebookProvider, + private manager: azdata.nb.NotebookManager, public readonly uriString: string ) { } - public get contentManager(): sqlops.nb.ContentManager { + public get contentManager(): azdata.nb.ContentManager { return this.manager.contentManager; } - public get sessionManager(): sqlops.nb.SessionManager { + public get sessionManager(): azdata.nb.SessionManager { return this.manager.sessionManager; } - public get serverManager(): sqlops.nb.ServerManager { + public get serverManager(): azdata.nb.ServerManager { return this.manager.serverManager; } } diff --git a/src/sql/workbench/api/node/extHostNotebookDocumentData.ts b/src/sql/workbench/api/node/extHostNotebookDocumentData.ts index 5df63d0b5e..60ecf47532 100644 --- a/src/sql/workbench/api/node/extHostNotebookDocumentData.ts +++ b/src/sql/workbench/api/node/extHostNotebookDocumentData.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IDisposable } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; @@ -17,15 +17,15 @@ import { CellRange } from 'sql/workbench/api/common/sqlExtHostTypes'; export class ExtHostNotebookDocumentData implements IDisposable { - private _document: sqlops.nb.NotebookDocument; + private _document: azdata.nb.NotebookDocument; private _isDisposed: boolean = false; - private _kernelSpec: sqlops.nb.IKernelSpec; + private _kernelSpec: azdata.nb.IKernelSpec; constructor(private readonly _proxy: MainThreadNotebookDocumentsAndEditorsShape, private readonly _uri: URI, private _providerId: string, private _isDirty: boolean, - private _cells: sqlops.nb.NotebookCell[] + private _cells: azdata.nb.NotebookCell[] ) { } @@ -39,7 +39,7 @@ export class ExtHostNotebookDocumentData implements IDisposable { } - get document(): sqlops.nb.NotebookDocument { + get document(): azdata.nb.NotebookDocument { if (!this._document) { const data = this; this._document = { @@ -77,7 +77,7 @@ export class ExtHostNotebookDocumentData implements IDisposable { // ---- range math - private _validateRange(range: sqlops.nb.CellRange): sqlops.nb.CellRange { + private _validateRange(range: azdata.nb.CellRange): azdata.nb.CellRange { if (!(range instanceof CellRange)) { throw new Error('Invalid argument'); } diff --git a/src/sql/workbench/api/node/extHostNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/extHostNotebookDocumentsAndEditors.ts index 16cf0ce98c..9c1285bfd3 100644 --- a/src/sql/workbench/api/node/extHostNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/extHostNotebookDocumentsAndEditors.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { Event, Emitter } from 'vs/base/common/event'; @@ -35,13 +35,13 @@ export class ExtHostNotebookDocumentsAndEditors implements ExtHostNotebookDocume private readonly _onDidChangeVisibleNotebookEditors = new Emitter(); private readonly _onDidChangeActiveNotebookEditor = new Emitter(); - private _onDidOpenNotebook = new Emitter(); - private _onDidChangeNotebookCell = new Emitter(); + private _onDidOpenNotebook = new Emitter(); + private _onDidChangeNotebookCell = new Emitter(); readonly onDidChangeVisibleNotebookEditors: Event = this._onDidChangeVisibleNotebookEditors.event; readonly onDidChangeActiveNotebookEditor: Event = this._onDidChangeActiveNotebookEditor.event; - readonly onDidOpenNotebookDocument: Event = this._onDidOpenNotebook.event; - readonly onDidChangeNotebookCell: Event = this._onDidChangeNotebookCell.event; + readonly onDidOpenNotebookDocument: Event = this._onDidOpenNotebook.event; + readonly onDidChangeNotebookCell: Event = this._onDidChangeNotebookCell.event; constructor( @@ -156,11 +156,11 @@ export class ExtHostNotebookDocumentsAndEditors implements ExtHostNotebookDocume //#endregion //#region Extension accessible methods - showNotebookDocument(uri: vscode.Uri, showOptions: sqlops.nb.NotebookShowOptions): Thenable { + showNotebookDocument(uri: vscode.Uri, showOptions: azdata.nb.NotebookShowOptions): Thenable { return this.doShowNotebookDocument(uri, showOptions); } - private async doShowNotebookDocument(uri: vscode.Uri, showOptions: sqlops.nb.NotebookShowOptions): Promise { + private async doShowNotebookDocument(uri: vscode.Uri, showOptions: azdata.nb.NotebookShowOptions): Promise { let options: INotebookShowOptions = {}; if (showOptions) { options.preserveFocus = showOptions.preserveFocus; diff --git a/src/sql/workbench/api/node/extHostNotebookEditor.ts b/src/sql/workbench/api/node/extHostNotebookEditor.ts index ff2136395a..4413ceec4f 100644 --- a/src/sql/workbench/api/node/extHostNotebookEditor.ts +++ b/src/sql/workbench/api/node/extHostNotebookEditor.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { ok } from 'vs/base/common/assert'; @@ -17,8 +17,8 @@ import { ExtHostNotebookDocumentData } from 'sql/workbench/api/node/extHostNoteb import { CellRange, ISingleNotebookEditOperation, ICellRange } from 'sql/workbench/api/common/sqlExtHostTypes'; export interface INotebookEditOperation { - range: sqlops.nb.CellRange; - cell: Partial; + range: azdata.nb.CellRange; + cell: Partial; forceMoveMarkers: boolean; } @@ -29,7 +29,7 @@ export interface INotebookEditData { undoStopAfter: boolean; } -function toICellRange(range: sqlops.nb.CellRange): ICellRange { +function toICellRange(range: azdata.nb.CellRange): ICellRange { return { start: range.start, end: range.end @@ -38,13 +38,13 @@ function toICellRange(range: sqlops.nb.CellRange): ICellRange { export class NotebookEditorEdit { - private readonly _document: sqlops.nb.NotebookDocument; + private readonly _document: azdata.nb.NotebookDocument; private readonly _documentVersionId: number; private _collectedEdits: INotebookEditOperation[]; private readonly _undoStopBefore: boolean; private readonly _undoStopAfter: boolean; - constructor(document: sqlops.nb.NotebookDocument, options: { undoStopBefore: boolean; undoStopAfter: boolean; }) { + constructor(document: azdata.nb.NotebookDocument, options: { undoStopBefore: boolean; undoStopAfter: boolean; }) { this._document = document; // TODO add version handling this._documentVersionId = 0; @@ -63,7 +63,7 @@ export class NotebookEditorEdit { }; } - replace(location: number | CellRange, value: Partial): void { + replace(location: number | CellRange, value: Partial): void { let range: CellRange = this.getAsRange(location); this._pushEdit(range, value, false); } @@ -82,7 +82,7 @@ export class NotebookEditorEdit { return range; } - insertCell(value: Partial, location?: number): void { + insertCell(value: Partial, location?: number): void { if (location === null || location === undefined) { // If not specified, assume adding to end of list location = this._document.cells.length; @@ -105,7 +105,7 @@ export class NotebookEditorEdit { this._pushEdit(range, null, true); } - private _pushEdit(range: sqlops.nb.CellRange, cell: Partial, forceMoveMarkers: boolean): void { + private _pushEdit(range: azdata.nb.CellRange, cell: Partial, forceMoveMarkers: boolean): void { let validRange = this._document.validateCellRange(range); this._collectedEdits.push({ range: validRange, @@ -115,7 +115,7 @@ export class NotebookEditorEdit { } } -export class ExtHostNotebookEditor implements sqlops.nb.NotebookEditor, IDisposable { +export class ExtHostNotebookEditor implements azdata.nb.NotebookEditor, IDisposable { private _disposed: boolean = false; constructor( @@ -132,7 +132,7 @@ export class ExtHostNotebookEditor implements sqlops.nb.NotebookEditor, IDisposa this._disposed = true; } - get document(): sqlops.nb.NotebookDocument { + get document(): azdata.nb.NotebookDocument { return this._documentData.document; } @@ -152,12 +152,12 @@ export class ExtHostNotebookEditor implements sqlops.nb.NotebookEditor, IDisposa return this._id; } - public runCell(cell: sqlops.nb.NotebookCell): Thenable { + public runCell(cell: azdata.nb.NotebookCell): Thenable { let uri = cell ? cell.uri : undefined; return this._proxy.$runCell(this._id, uri); } - public edit(callback: (editBuilder: sqlops.nb.NotebookEditorEdit) => void, options?: { undoStopBefore: boolean; undoStopAfter: boolean; }): Thenable { + public edit(callback: (editBuilder: azdata.nb.NotebookEditorEdit) => void, options?: { undoStopBefore: boolean; undoStopAfter: boolean; }): Thenable { if (this._disposed) { return TPromise.wrapError(new Error('NotebookEditor#edit not possible on closed editors')); } diff --git a/src/sql/workbench/api/node/extHostObjectExplorer.ts b/src/sql/workbench/api/node/extHostObjectExplorer.ts index 3012829041..ec714f8a62 100644 --- a/src/sql/workbench/api/node/extHostObjectExplorer.ts +++ b/src/sql/workbench/api/node/extHostObjectExplorer.ts @@ -6,7 +6,7 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostObjectExplorerShape, SqlMainContext, MainThreadObjectExplorerShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; export class ExtHostObjectExplorer implements ExtHostObjectExplorerShape { @@ -19,15 +19,15 @@ export class ExtHostObjectExplorer implements ExtHostObjectExplorerShape { this._proxy = mainContext.getProxy(SqlMainContext.MainThreadObjectExplorer); } - public $getNode(connectionId: string, nodePath?: string): Thenable { + public $getNode(connectionId: string, nodePath?: string): Thenable { return this._proxy.$getNode(connectionId, nodePath).then(nodeInfo => nodeInfo === undefined ? undefined : new ExtHostObjectExplorerNode(nodeInfo, connectionId, this._proxy)); } - public $getActiveConnectionNodes(): Thenable { + public $getActiveConnectionNodes(): Thenable { return this._proxy.$getActiveConnectionNodes().then(results => results.map(result => new ExtHostObjectExplorerNode(result.nodeInfo, result.connectionId, this._proxy))); } - public $findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable { + public $findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable { return this._proxy.$findNodes(connectionId, type, schema, name, database, parentObjectNames).then(results => results.map(result => new ExtHostObjectExplorerNode(result, connectionId, this._proxy))); } @@ -35,12 +35,12 @@ export class ExtHostObjectExplorer implements ExtHostObjectExplorerShape { return this._proxy.$getNodeActions(connectionId, nodePath); } - public $getSessionConnectionProfile(sessionId: string): Thenable { + public $getSessionConnectionProfile(sessionId: string): Thenable { return this._proxy.$getSessionConnectionProfile(sessionId); } } -class ExtHostObjectExplorerNode implements sqlops.objectexplorer.ObjectExplorerNode { +class ExtHostObjectExplorerNode implements azdata.objectexplorer.ObjectExplorerNode { public connectionId: string; public nodePath: string; public nodeType: string; @@ -48,10 +48,10 @@ class ExtHostObjectExplorerNode implements sqlops.objectexplorer.ObjectExplorerN public nodeStatus: string; public label: string; public isLeaf: boolean; - public metadata: sqlops.ObjectMetadata; + public metadata: azdata.ObjectMetadata; public errorMessage: string; - constructor(nodeInfo: sqlops.NodeInfo, connectionId: string, private _proxy: MainThreadObjectExplorerShape) { + constructor(nodeInfo: azdata.NodeInfo, connectionId: string, private _proxy: MainThreadObjectExplorerShape) { this.getDetailsFromInfo(nodeInfo); this.connectionId = connectionId; } @@ -68,11 +68,11 @@ class ExtHostObjectExplorerNode implements sqlops.objectexplorer.ObjectExplorerN return this._proxy.$setSelected(this.connectionId, this.nodePath, selected, clearOtherSelections); } - getChildren(): Thenable { + getChildren(): Thenable { return this._proxy.$getChildren(this.connectionId, this.nodePath).then(children => children.map(nodeInfo => new ExtHostObjectExplorerNode(nodeInfo, this.connectionId, this._proxy))); } - getParent(): Thenable { + getParent(): Thenable { let parentPathEndIndex = this.nodePath.lastIndexOf('/'); if (parentPathEndIndex === -1) { return Promise.resolve(undefined); @@ -84,7 +84,7 @@ class ExtHostObjectExplorerNode implements sqlops.objectexplorer.ObjectExplorerN return this._proxy.$refresh(this.connectionId, this.nodePath).then(nodeInfo => this.getDetailsFromInfo(nodeInfo)); } - private getDetailsFromInfo(nodeInfo: sqlops.NodeInfo): void { + private getDetailsFromInfo(nodeInfo: azdata.NodeInfo): void { Object.entries(nodeInfo).forEach(([key, value]) => this[key] = value); } } diff --git a/src/sql/workbench/api/node/extHostQueryEditor.ts b/src/sql/workbench/api/node/extHostQueryEditor.ts index bf9b0580a0..aa61068a5c 100644 --- a/src/sql/workbench/api/node/extHostQueryEditor.ts +++ b/src/sql/workbench/api/node/extHostQueryEditor.ts @@ -6,7 +6,7 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostQueryEditorShape, SqlMainContext, MainThreadQueryEditorShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; export class ExtHostQueryEditor implements ExtHostQueryEditorShape { diff --git a/src/sql/workbench/api/node/extHostResourceProvider.ts b/src/sql/workbench/api/node/extHostResourceProvider.ts index 2d9ec384aa..4251b246b0 100644 --- a/src/sql/workbench/api/node/extHostResourceProvider.ts +++ b/src/sql/workbench/api/node/extHostResourceProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { Disposable } from 'vs/workbench/api/node/extHostTypes'; @@ -27,15 +27,15 @@ export class ExtHostResourceProvider extends ExtHostResourceProviderShape { // PUBLIC METHODS ////////////////////////////////////////////////////// // - MAIN THREAD AVAILABLE METHODS ///////////////////////////////////// - public $createFirewallRule(handle: number, account: sqlops.Account, firewallRuleInfo: sqlops.FirewallRuleInfo): Thenable { - return this._withProvider(handle, (provider: sqlops.ResourceProvider) => provider.createFirewallRule(account, firewallRuleInfo)); + public $createFirewallRule(handle: number, account: azdata.Account, firewallRuleInfo: azdata.FirewallRuleInfo): Thenable { + return this._withProvider(handle, (provider: azdata.ResourceProvider) => provider.createFirewallRule(account, firewallRuleInfo)); } - public $handleFirewallRule(handle: number, errorCode: number, errorMessage: string, connectionTypeId: string): Thenable { - return this._withProvider(handle, (provider: sqlops.ResourceProvider) => provider.handleFirewallRule(errorCode, errorMessage, connectionTypeId)); + public $handleFirewallRule(handle: number, errorCode: number, errorMessage: string, connectionTypeId: string): Thenable { + return this._withProvider(handle, (provider: azdata.ResourceProvider) => provider.handleFirewallRule(errorCode, errorMessage, connectionTypeId)); } // - EXTENSION HOST AVAILABLE METHODS ////////////////////////////////// - public $registerResourceProvider(providerMetadata: sqlops.ResourceProviderMetadata, provider: sqlops.ResourceProvider): Disposable { + public $registerResourceProvider(providerMetadata: azdata.ResourceProviderMetadata, provider: azdata.ResourceProvider): Disposable { let self = this; // Look for any account providers that have the same provider ID @@ -76,7 +76,7 @@ export class ExtHostResourceProvider extends ExtHostResourceProviderShape { return this._handlePool++; } - private _withProvider(handle: number, callback: (provider: sqlops.ResourceProvider) => Thenable): Thenable { + private _withProvider(handle: number, callback: (provider: azdata.ResourceProvider) => Thenable): Thenable { let provider = this._providers[handle]; if (provider === undefined) { return TPromise.wrapError(new Error(`Provider ${handle} not found.`)); @@ -86,8 +86,8 @@ export class ExtHostResourceProvider extends ExtHostResourceProviderShape { } interface ResourceProviderWithMetadata { - metadata: sqlops.ResourceProviderMetadata; - provider: sqlops.ResourceProvider; + metadata: azdata.ResourceProviderMetadata; + provider: azdata.ResourceProvider; } diff --git a/src/sql/workbench/api/node/extHostSerializationProvider.ts b/src/sql/workbench/api/node/extHostSerializationProvider.ts index 8a20c36cf7..b71af6a985 100644 --- a/src/sql/workbench/api/node/extHostSerializationProvider.ts +++ b/src/sql/workbench/api/node/extHostSerializationProvider.ts @@ -8,17 +8,17 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { SqlMainContext, MainThreadSerializationProviderShape, ExtHostSerializationProviderShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Disposable } from 'vs/workbench/api/node/extHostTypes'; class SerializationAdapter { - private _provider: sqlops.SerializationProvider; + private _provider: azdata.SerializationProvider; - constructor(provider: sqlops.SerializationProvider) { + constructor(provider: azdata.SerializationProvider) { this._provider = provider; } - public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { + public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { return this._provider.saveAs(saveFormat, savePath, results, appendToFile); } @@ -59,14 +59,14 @@ export class ExtHostSerializationProvider extends ExtHostSerializationProviderSh this._proxy = mainContext.getProxy(SqlMainContext.MainThreadSerializationProvider); } - public $registerSerializationProvider(provider: sqlops.SerializationProvider): vscode.Disposable { + public $registerSerializationProvider(provider: azdata.SerializationProvider): vscode.Disposable { provider.handle = this._nextHandle(); this._adapter[provider.handle] = new SerializationAdapter(provider); this._proxy.$registerSerializationProvider(provider.handle); return this._createDisposable(provider.handle); } - public $saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { + public $saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { return this._withAdapter(0, SerializationAdapter, adapter => adapter.saveAs(saveFormat, savePath, results, appendToFile)); } diff --git a/src/sql/workbench/api/node/extHostTasks.ts b/src/sql/workbench/api/node/extHostTasks.ts index f16889ae81..65b63909cf 100644 --- a/src/sql/workbench/api/node/extHostTasks.ts +++ b/src/sql/workbench/api/node/extHostTasks.ts @@ -10,7 +10,7 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import * as extHostTypes from 'vs/workbench/api/node/extHostTypes'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks'; import { SqlMainContext, MainThreadTasksShape, ExtHostTasksShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; @@ -32,7 +32,7 @@ export class ExtHostTasks implements ExtHostTasksShape { this._proxy = mainContext.getProxy(SqlMainContext.MainThreadTasks); } - registerTask(id: string, callback: sqlops.tasks.ITaskHandler, thisArg?: any, description?: ITaskHandlerDescription): extHostTypes.Disposable { + registerTask(id: string, callback: azdata.tasks.ITaskHandler, thisArg?: any, description?: ITaskHandlerDescription): extHostTypes.Disposable { this.logService.trace('ExtHostTasks#registerTask', id); if (!id.trim().length) { diff --git a/src/sql/workbench/api/node/mainThreadAccountManagement.ts b/src/sql/workbench/api/node/mainThreadAccountManagement.ts index 71ab4d7a67..d00ae7b9d0 100644 --- a/src/sql/workbench/api/node/mainThreadAccountManagement.ts +++ b/src/sql/workbench/api/node/mainThreadAccountManagement.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; @@ -20,7 +20,7 @@ import { UpdateAccountListEventParams } from 'sql/platform/accountManagement/com @extHostNamedCustomer(SqlMainContext.MainThreadAccountManagement) export class MainThreadAccountManagement implements MainThreadAccountManagementShape { - private _providerMetadata: { [handle: number]: sqlops.AccountProviderMetadata }; + private _providerMetadata: { [handle: number]: azdata.AccountProviderMetadata }; private _proxy: ExtHostAccountManagementShape; private _toDispose: IDisposable[]; @@ -39,7 +39,7 @@ export class MainThreadAccountManagement implements MainThreadAccountManagementS return; } - const providerMetadataIndex = Object.values(this._providerMetadata).findIndex((providerMetadata: sqlops.AccountProviderMetadata) => providerMetadata.id === e.providerId); + const providerMetadataIndex = Object.values(this._providerMetadata).findIndex((providerMetadata: azdata.AccountProviderMetadata) => providerMetadata.id === e.providerId); if (providerMetadataIndex === -1) { return; } @@ -57,35 +57,35 @@ export class MainThreadAccountManagement implements MainThreadAccountManagementS return this._accountManagementService.endAutoOAuthDeviceCode(); } - $accountUpdated(updatedAccount: sqlops.Account): void { + $accountUpdated(updatedAccount: azdata.Account): void { this._accountManagementService.accountUpdated(updatedAccount); } - public $getAccountsForProvider(providerId: string): Thenable { + public $getAccountsForProvider(providerId: string): Thenable { return this._accountManagementService.getAccountsForProvider(providerId); } - public $registerAccountProvider(providerMetadata: sqlops.AccountProviderMetadata, handle: number): Thenable { + public $registerAccountProvider(providerMetadata: azdata.AccountProviderMetadata, handle: number): Thenable { let self = this; // Create the account provider that interfaces with the extension via the proxy and register it - let accountProvider: sqlops.AccountProvider = { + let accountProvider: azdata.AccountProvider = { autoOAuthCancelled(): Thenable { return self._proxy.$autoOAuthCancelled(handle); }, - clear(accountKey: sqlops.AccountKey): Thenable { + clear(accountKey: azdata.AccountKey): Thenable { return self._proxy.$clear(handle, accountKey); }, - getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> { + getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> { return self._proxy.$getSecurityToken(account, resource); }, - initialize(restoredAccounts: sqlops.Account[]): Thenable { + initialize(restoredAccounts: azdata.Account[]): Thenable { return self._proxy.$initialize(handle, restoredAccounts); }, - prompt(): Thenable { + prompt(): Thenable { return self._proxy.$prompt(handle); }, - refresh(account: sqlops.Account): Thenable { + refresh(account: azdata.Account): Thenable { return self._proxy.$refresh(handle, account); } }; diff --git a/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts b/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts index 95f631d9a6..18670e64ea 100644 --- a/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts +++ b/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts @@ -12,7 +12,7 @@ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { Disposable } from 'vs/base/common/lifecycle'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export enum TaskStatus { NotStarted = 0, @@ -41,12 +41,12 @@ export class MainThreadBackgroundTaskManagement extends Disposable implements Ma })); } - $registerTask(taskInfo: sqlops.TaskInfo): void { + $registerTask(taskInfo: azdata.TaskInfo): void { this._taskService.createNewTask(taskInfo); this._proxy.$onTaskRegistered(taskInfo.taskId); } - $updateTask(taskProgressInfo: sqlops.TaskProgressInfo): void { + $updateTask(taskProgressInfo: azdata.TaskProgressInfo): void { this._taskService.updateTask(taskProgressInfo); } } diff --git a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts index 5c67612de5..c38f050743 100644 --- a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts +++ b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts @@ -5,7 +5,7 @@ 'use strict'; import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, MainThreadConnectionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; @@ -44,11 +44,11 @@ export class MainThreadConnectionManagement implements MainThreadConnectionManag this._toDispose = dispose(this._toDispose); } - public $getActiveConnections(): Thenable { + public $getActiveConnections(): Thenable { return Promise.resolve(this._connectionManagementService.getActiveConnections().map(profile => this.convertConnection(profile))); } - public $getCurrentConnection(): Thenable { + public $getCurrentConnection(): Thenable { return Promise.resolve(this.convertConnection(TaskUtilities.getCurrentGlobalConnection(this._objectExplorerService, this._connectionManagementService, this._workbenchEditorService, true))); } @@ -56,11 +56,11 @@ export class MainThreadConnectionManagement implements MainThreadConnectionManag return Promise.resolve(this._connectionManagementService.getActiveConnectionCredentials(connectionId)); } - public $getServerInfo(connectionId: string): Thenable { + public $getServerInfo(connectionId: string): Thenable { return Promise.resolve(this._connectionManagementService.getServerInfo(connectionId)); } - public async $openConnectionDialog(providers: string[], initialConnectionProfile?: IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Promise { + public async $openConnectionDialog(providers: string[], initialConnectionProfile?: IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Promise { let connectionProfile = await this._connectionDialogService.openDialogAndWait(this._connectionManagementService, { connectionType: 1, providers: providers }, initialConnectionProfile); const connection = connectionProfile ? { connectionId: connectionProfile.id, @@ -97,12 +97,12 @@ export class MainThreadConnectionManagement implements MainThreadConnectionManag return Promise.resolve(this._connectionManagementService.getConnectionUriFromId(connectionId)); } - private convertConnection(profile: IConnectionProfile): sqlops.connection.Connection { + private convertConnection(profile: IConnectionProfile): azdata.connection.Connection { if (!profile) { return undefined; } profile = this._connectionManagementService.removeConnectionProfileCredentials(profile); - let connection: sqlops.connection.Connection = { + let connection: azdata.connection.Connection = { providerName: profile.providerName, connectionId: profile.id, options: profile.options @@ -110,7 +110,7 @@ export class MainThreadConnectionManagement implements MainThreadConnectionManag return connection; } - public $connect(connectionProfile: IConnectionProfile): Thenable { + public $connect(connectionProfile: IConnectionProfile): Thenable { let profile = new ConnectionProfile(this._capabilitiesService, connectionProfile); profile.id = generateUuid(); return this._connectionManagementService.connectAndSaveProfile(profile, undefined, { @@ -120,7 +120,7 @@ export class MainThreadConnectionManagement implements MainThreadConnectionManag showConnectionDialogOnError: true, showFirewallRuleOnError: true }).then((result) => { - return { + return { connected: result.connected, connectionId: result.connected ? profile.id : undefined, errorCode: result.errorCode, diff --git a/src/sql/workbench/api/node/mainThreadCredentialManagement.ts b/src/sql/workbench/api/node/mainThreadCredentialManagement.ts index 897bad59d1..32eb236f25 100644 --- a/src/sql/workbench/api/node/mainThreadCredentialManagement.ts +++ b/src/sql/workbench/api/node/mainThreadCredentialManagement.ts @@ -11,7 +11,7 @@ import { MainThreadCredentialManagementShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; @@ -44,7 +44,7 @@ export class MainThreadCredentialManagement implements MainThreadCredentialManag onSaveCredential(credentialId: string, password: string): Thenable { return self._proxy.$saveCredential(credentialId, password); }, - onReadCredential(credentialId: string): Thenable { + onReadCredential(credentialId: string): Thenable { return self._proxy.$readCredential(credentialId); }, onDeleteCredential(credentialId: string): Thenable { diff --git a/src/sql/workbench/api/node/mainThreadDataProtocol.ts b/src/sql/workbench/api/node/mainThreadDataProtocol.ts index fa5fbe11e9..2785dd33d2 100644 --- a/src/sql/workbench/api/node/mainThreadDataProtocol.ts +++ b/src/sql/workbench/api/node/mainThreadDataProtocol.ts @@ -13,7 +13,7 @@ import { import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; @@ -73,8 +73,8 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerConnectionProvider(providerId: string, handle: number): TPromise { const self = this; - this._connectionManagementService.registerProvider(providerId, { - connect(connectionUri: string, connectionInfo: sqlops.ConnectionInfo): Thenable { + this._connectionManagementService.registerProvider(providerId, { + connect(connectionUri: string, connectionInfo: azdata.ConnectionInfo): Thenable { return self._proxy.$connect(handle, connectionUri, connectionInfo); }, disconnect(connectionUri: string): Thenable { @@ -86,13 +86,13 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { cancelConnect(connectionUri: string): Thenable { return self._proxy.$cancelConnect(handle, connectionUri); }, - listDatabases(connectionUri: string): Thenable { + listDatabases(connectionUri: string): Thenable { return self._proxy.$listDatabases(handle, connectionUri); }, getConnectionString(connectionUri: string, includePassword: boolean): Thenable { return self._proxy.$getConnectionString(handle, connectionUri, includePassword); }, - buildConnectionInfo(connectionString: string): Thenable { + buildConnectionInfo(connectionString: string): Thenable { return self._proxy.$buildConnectionInfo(handle, connectionString); }, rebuildIntelliSenseCache(connectionUri: string): Thenable { @@ -106,10 +106,10 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerQueryProvider(providerId: string, handle: number): TPromise { const self = this; this._queryManagementService.addQueryRequestHandler(providerId, { - cancelQuery(ownerUri: string): Thenable { + cancelQuery(ownerUri: string): Thenable { return self._proxy.$cancelQuery(handle, ownerUri); }, - runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable { + runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable { return self._proxy.$runQuery(handle, ownerUri, selection, runOptions); }, runQueryStatement(ownerUri: string, line: number, column: number): Thenable { @@ -118,19 +118,19 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { runQueryString(ownerUri: string, queryString: string): Thenable { return self._proxy.$runQueryString(handle, ownerUri, queryString); }, - runQueryAndReturn(ownerUri: string, queryString: string): Thenable { + runQueryAndReturn(ownerUri: string, queryString: string): Thenable { return self._proxy.$runQueryAndReturn(handle, ownerUri, queryString); }, - parseSyntax(ownerUri: string, query: string): Thenable { + parseSyntax(ownerUri: string, query: string): Thenable { return self._proxy.$parseSyntax(handle, ownerUri, query); }, - getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable { + getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable { return self._proxy.$getQueryRows(handle, rowData); }, disposeQuery(ownerUri: string): Thenable { return self._proxy.$disposeQuery(handle, ownerUri); }, - saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable { + saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable { let serializationProvider = self._serializationService.getSerializationFeatureMetadataProvider(requestParams.ownerUri); if (serializationProvider && serializationProvider.enabled) { return self._proxy.$saveResults(handle, requestParams); @@ -145,13 +145,13 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable { return self._proxy.$initializeEdit(handle, ownerUri, schemaName, objectName, objectType, rowLimit, queryString); }, - updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { + updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable { return self._proxy.$updateCell(handle, ownerUri, rowId, columnId, newValue); }, commitEdit(ownerUri): Thenable { return self._proxy.$commitEdit(handle, ownerUri); }, - createRow(ownerUri: string): Thenable { + createRow(ownerUri: string): Thenable { return self._proxy.$createRow(handle, ownerUri); }, deleteRow(ownerUri: string, rowId: number): Thenable { @@ -160,13 +160,13 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { disposeEdit(ownerUri: string): Thenable { return self._proxy.$disposeEdit(handle, ownerUri); }, - revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { + revertCell(ownerUri: string, rowId: number, columnId: number): Thenable { return self._proxy.$revertCell(handle, ownerUri, rowId, columnId); }, revertRow(ownerUri: string, rowId: number): Thenable { return self._proxy.$revertRow(handle, ownerUri, rowId); }, - getEditRows(rowData: sqlops.EditSubsetParams): Thenable { + getEditRows(rowData: azdata.EditSubsetParams): Thenable { return self._proxy.$getEditRows(handle, rowData); } }); @@ -176,11 +176,11 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerBackupProvider(providerId: string, handle: number): TPromise { const self = this; - this._backupService.registerProvider(providerId, { - backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + this._backupService.registerProvider(providerId, { + backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$backup(handle, connectionUri, backupInfo, taskExecutionMode); }, - getBackupConfigInfo(connectionUri: string): Thenable { + getBackupConfigInfo(connectionUri: string): Thenable { return self._proxy.$getBackupConfigInfo(handle, connectionUri); } }); @@ -190,17 +190,17 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerRestoreProvider(providerId: string, handle: number): TPromise { const self = this; - this._restoreService.registerProvider(providerId, { - getRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { + this._restoreService.registerProvider(providerId, { + getRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { return self._proxy.$getRestorePlan(handle, connectionUri, restoreInfo); }, - cancelRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { + cancelRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { return self._proxy.$cancelRestorePlan(handle, connectionUri, restoreInfo); }, - restore(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { + restore(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { return self._proxy.$restore(handle, connectionUri, restoreInfo); }, - getRestoreConfigInfo(connectionUri: string): Thenable { + getRestoreConfigInfo(connectionUri: string): Thenable { return self._proxy.$getRestoreConfigInfo(handle, connectionUri); } }); @@ -210,17 +210,17 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerMetadataProvider(providerId: string, handle: number): TPromise { const self = this; - this._metadataService.registerProvider(providerId, { - getMetadata(connectionUri: string): Thenable { + this._metadataService.registerProvider(providerId, { + getMetadata(connectionUri: string): Thenable { return self._proxy.$getMetadata(handle, connectionUri); }, getDatabases(connectionUri: string): Thenable { return self._proxy.$getDatabases(handle, connectionUri); }, - getTableInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { + getTableInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { return self._proxy.$getTableInfo(handle, connectionUri, metadata); }, - getViewInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { + getViewInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { return self._proxy.$getViewInfo(handle, connectionUri, metadata); } }); @@ -230,21 +230,21 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerObjectExplorerProvider(providerId: string, handle: number): TPromise { const self = this; - this._objectExplorerService.registerProvider(providerId, { + this._objectExplorerService.registerProvider(providerId, { providerId: providerId, - createNewSession(connection: sqlops.ConnectionInfo): Thenable { + createNewSession(connection: azdata.ConnectionInfo): Thenable { return self._proxy.$createObjectExplorerSession(handle, connection); }, - expandNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + expandNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { return self._proxy.$expandObjectExplorerNode(handle, nodeInfo); }, - refreshNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + refreshNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { return self._proxy.$refreshObjectExplorerNode(handle, nodeInfo); }, - closeSession(closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): Thenable { + closeSession(closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): Thenable { return self._proxy.$closeObjectExplorerSession(handle, closeSessionInfo); }, - findNodes(findNodesInfo: sqlops.FindNodesInfo): Thenable { + findNodes(findNodesInfo: azdata.FindNodesInfo): Thenable { return self._proxy.$findNodes(handle, findNodesInfo); } }); @@ -254,23 +254,23 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerObjectExplorerNodeProvider(providerId: string, supportedProviderId: string, group: string, handle: number): TPromise { const self = this; - this._objectExplorerService.registerNodeProvider( { + this._objectExplorerService.registerNodeProvider( { supportedProviderId: supportedProviderId, providerId: providerId, group: group, - expandNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + expandNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { return self._proxy.$expandObjectExplorerNode(handle, nodeInfo); }, - refreshNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + refreshNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { return self._proxy.$refreshObjectExplorerNode(handle, nodeInfo); }, - findNodes(findNodesInfo: sqlops.FindNodesInfo): Thenable { + findNodes(findNodesInfo: azdata.FindNodesInfo): Thenable { return self._proxy.$findNodes(handle, findNodesInfo); }, - handleSessionOpen(session: sqlops.ObjectExplorerSession): Thenable { + handleSessionOpen(session: azdata.ObjectExplorerSession): Thenable { return self._proxy.$createObjectExplorerNodeProviderSession(handle, session); }, - handleSessionClose(closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): void { + handleSessionClose(closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): void { return self._proxy.$handleSessionClose(handle, closeSessionInfo); } }); @@ -280,11 +280,11 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerTaskServicesProvider(providerId: string, handle: number): TPromise { const self = this; - this._taskService.registerProvider(providerId, { - getAllTasks(listTasksParams: sqlops.ListTasksParams): Thenable { + this._taskService.registerProvider(providerId, { + getAllTasks(listTasksParams: azdata.ListTasksParams): Thenable { return self._proxy.$getAllTasks(handle, listTasksParams); }, - cancelTask(cancelTaskParams: sqlops.CancelTaskParams): Thenable { + cancelTask(cancelTaskParams: azdata.CancelTaskParams): Thenable { return self._proxy.$cancelTask(handle, cancelTaskParams); } }); @@ -294,8 +294,8 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerScriptingProvider(providerId: string, handle: number): TPromise { const self = this; - this._scriptingService.registerProvider(providerId, { - scriptAsOperation(connectionUri: string, operation: sqlops.ScriptOperation, metadata: sqlops.ObjectMetadata, paramDetails: sqlops.ScriptingParamDetails): Thenable { + this._scriptingService.registerProvider(providerId, { + scriptAsOperation(connectionUri: string, operation: azdata.ScriptOperation, metadata: azdata.ObjectMetadata, paramDetails: azdata.ScriptingParamDetails): Thenable { return self._proxy.$scriptAsOperation(handle, connectionUri, operation, metadata, paramDetails); } }); @@ -305,7 +305,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerFileBrowserProvider(providerId: string, handle: number): TPromise { const self = this; - this._fileBrowserService.registerProvider(providerId, { + this._fileBrowserService.registerProvider(providerId, { openFileBrowser(ownerUri: string, expandPath: string, fileFilters: string[], changeFilter: boolean): Thenable { return self._proxy.$openFileBrowser(handle, ownerUri, expandPath, fileFilters, changeFilter); }, @@ -315,7 +315,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { validateFilePaths(ownerUri: string, serviceType: string, selectedFiles: string[]): Thenable { return self._proxy.$validateFilePaths(handle, ownerUri, serviceType, selectedFiles); }, - closeFileBrowser(ownerUri: string): Thenable { + closeFileBrowser(ownerUri: string): Thenable { return self._proxy.$closeFileBrowser(handle, ownerUri); } }); @@ -325,8 +325,8 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerProfilerProvider(providerId: string, handle: number): TPromise { const self = this; - this._profilerService.registerProvider(providerId, { - createSession(sessionId: string, createStatement: string, template: sqlops.ProfilerSessionTemplate): Thenable { + this._profilerService.registerProvider(providerId, { + createSession(sessionId: string, createStatement: string, template: azdata.ProfilerSessionTemplate): Thenable { return self._proxy.$createSession(handle, sessionId, createStatement, template); }, startSession(sessionId: string, sessionName: string): Thenable { @@ -354,17 +354,17 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerAdminServicesProvider(providerId: string, handle: number): TPromise { const self = this; - this._adminService.registerProvider(providerId, { - createDatabase(connectionUri: string, database: sqlops.DatabaseInfo): Thenable { + this._adminService.registerProvider(providerId, { + createDatabase(connectionUri: string, database: azdata.DatabaseInfo): Thenable { return self._proxy.$createDatabase(handle, connectionUri, database); }, - getDefaultDatabaseInfo(connectionUri: string): Thenable { + getDefaultDatabaseInfo(connectionUri: string): Thenable { return self._proxy.$getDefaultDatabaseInfo(handle, connectionUri); }, - getDatabaseInfo(connectionUri: string): Thenable { + getDatabaseInfo(connectionUri: string): Thenable { return self._proxy.$getDatabaseInfo(handle, connectionUri); }, - createLogin(connectionUri: string, login: sqlops.LoginInfo): Thenable { + createLogin(connectionUri: string, login: azdata.LoginInfo): Thenable { return self._proxy.$createLogin(handle, connectionUri, login); } }); @@ -374,42 +374,42 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerAgentServicesProvider(providerId: string, handle: number): TPromise { const self = this; - this._jobManagementService.registerProvider(providerId, { + this._jobManagementService.registerProvider(providerId, { providerId: providerId, - getJobs(connectionUri: string): Thenable { + getJobs(connectionUri: string): Thenable { return self._proxy.$getJobs(handle, connectionUri); }, - getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable { + getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable { return self._proxy.$getJobHistory(handle, connectionUri, jobID, jobName); }, - jobAction(connectionUri: string, jobName: string, action: string): Thenable { + jobAction(connectionUri: string, jobName: string, action: string): Thenable { return self._proxy.$jobAction(handle, connectionUri, jobName, action); }, - deleteJob(connectionUri: string, jobInfo: sqlops.AgentJobInfo): Thenable { + deleteJob(connectionUri: string, jobInfo: azdata.AgentJobInfo): Thenable { return self._proxy.$deleteJob(handle, connectionUri, jobInfo); }, - deleteJobStep(connectionUri: string, stepInfo: sqlops.AgentJobStepInfo): Thenable { + deleteJobStep(connectionUri: string, stepInfo: azdata.AgentJobStepInfo): Thenable { return self._proxy.$deleteJobStep(handle, connectionUri, stepInfo); }, - getAlerts(connectionUri: string): Thenable { + getAlerts(connectionUri: string): Thenable { return self._proxy.$getAlerts(handle, connectionUri); }, - deleteAlert(connectionUri: string, alertInfo: sqlops.AgentAlertInfo): Thenable { + deleteAlert(connectionUri: string, alertInfo: azdata.AgentAlertInfo): Thenable { return self._proxy.$deleteAlert(handle, connectionUri, alertInfo); }, - getOperators(connectionUri: string): Thenable { + getOperators(connectionUri: string): Thenable { return self._proxy.$getOperators(handle, connectionUri); }, - deleteOperator(connectionUri: string, operatorInfo: sqlops.AgentOperatorInfo): Thenable { + deleteOperator(connectionUri: string, operatorInfo: azdata.AgentOperatorInfo): Thenable { return self._proxy.$deleteOperator(handle, connectionUri, operatorInfo); }, - getProxies(connectionUri: string): Thenable { + getProxies(connectionUri: string): Thenable { return self._proxy.$getProxies(handle, connectionUri); }, - deleteProxy(connectionUri: string, proxyInfo: sqlops.AgentProxyInfo): Thenable { + deleteProxy(connectionUri: string, proxyInfo: azdata.AgentProxyInfo): Thenable { return self._proxy.$deleteProxy(handle, connectionUri, proxyInfo); }, - getCredentials(connectionUri: string): Thenable { + getCredentials(connectionUri: string): Thenable { return self._proxy.$getCredentials(handle, connectionUri); } }); @@ -419,8 +419,8 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerCapabilitiesServiceProvider(providerId: string, handle: number): TPromise { const self = this; - this._capabilitiesService.registerProvider({ - getServerCapabilities(client: sqlops.DataProtocolClientCapabilities): Thenable { + this._capabilitiesService.registerProvider({ + getServerCapabilities(client: azdata.DataProtocolClientCapabilities): Thenable { return self._proxy.$getServerCapabilities(handle, client); } }); @@ -430,23 +430,23 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { public $registerDacFxServicesProvider(providerId: string, handle: number): TPromise { const self = this; - this._dacFxService.registerProvider(providerId, { - exportBacpac(databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + this._dacFxService.registerProvider(providerId, { + exportBacpac(databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$exportBacpac(handle, databaseName, packageFilePath, ownerUri, taskExecutionMode); }, - importBacpac(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + importBacpac(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$importBacpac(handle, packageFilePath, databaseName, ownerUri, taskExecutionMode); }, - extractDacpac(databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + extractDacpac(databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$extractDacpac(handle, databaseName, packageFilePath, applicationName, applicationVersion, ownerUri, taskExecutionMode); }, - deployDacpac(packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + deployDacpac(packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$deployDacpac(handle, packageFilePath, databaseName, upgradeExisting, ownerUri, taskExecutionMode); }, - generateDeployScript(packageFilePath: string, databaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + generateDeployScript(packageFilePath: string, databaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$generateDeployScript(handle, packageFilePath, databaseName, scriptFilePath, ownerUri, taskExecutionMode); }, - generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { + generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { return self._proxy.$generateDeployPlan(handle, packageFilePath, databaseName, ownerUri, taskExecutionMode); } }); @@ -455,7 +455,7 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { } // Connection Management handlers - public $onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void { + public $onConnectionComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void { this._connectionManagementService.onConnectionComplete(handle, connectionInfoSummary); } @@ -463,27 +463,27 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { this._connectionManagementService.onIntelliSenseCacheComplete(handle, connectionUri); } - public $onConnectionChangeNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void { + public $onConnectionChangeNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void { this._connectionManagementService.onConnectionChangedNotification(handle, changedConnInfo); } // Query Management handlers - public $onQueryComplete(handle: number, result: sqlops.QueryExecuteCompleteNotificationResult): void { + public $onQueryComplete(handle: number, result: azdata.QueryExecuteCompleteNotificationResult): void { this._queryManagementService.onQueryComplete(result); } - public $onBatchStart(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { + public $onBatchStart(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void { this._queryManagementService.onBatchStart(batchInfo); } - public $onBatchComplete(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { + public $onBatchComplete(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void { this._queryManagementService.onBatchComplete(batchInfo); } - public $onResultSetAvailable(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { + public $onResultSetAvailable(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { this._queryManagementService.onResultSetAvailable(resultSetInfo); } - public $onResultSetUpdated(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { + public $onResultSetUpdated(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { this._queryManagementService.onResultSetUpdated(resultSetInfo); } - public $onQueryMessage(handle: number, message: sqlops.QueryExecuteMessageParams): void { + public $onQueryMessage(handle: number, message: azdata.QueryExecuteMessageParams): void { this._queryManagementService.onMessage(message); } public $onEditSessionReady(handle: number, ownerUri: string, success: boolean, message: string): void { @@ -491,56 +491,56 @@ export class MainThreadDataProtocol implements MainThreadDataProtocolShape { } // Script Handlers - public $onScriptingComplete(handle: number, scriptingCompleteResult: sqlops.ScriptingCompleteResult): void { + public $onScriptingComplete(handle: number, scriptingCompleteResult: azdata.ScriptingCompleteResult): void { this._scriptingService.onScriptingComplete(handle, scriptingCompleteResult); } //OE handlers - public $onObjectExplorerSessionCreated(handle: number, sessionResponse: sqlops.ObjectExplorerSession): void { + public $onObjectExplorerSessionCreated(handle: number, sessionResponse: azdata.ObjectExplorerSession): void { this._objectExplorerService.onSessionCreated(handle, sessionResponse); } - public $onObjectExplorerSessionDisconnected(handle: number, sessionResponse: sqlops.ObjectExplorerSession): void { + public $onObjectExplorerSessionDisconnected(handle: number, sessionResponse: azdata.ObjectExplorerSession): void { this._objectExplorerService.onSessionDisconnected(handle, sessionResponse); } - public $onObjectExplorerNodeExpanded(providerId: string, expandResponse: sqlops.ObjectExplorerExpandInfo): void { + public $onObjectExplorerNodeExpanded(providerId: string, expandResponse: azdata.ObjectExplorerExpandInfo): void { let expandInfo: NodeExpandInfoWithProviderId = Object.assign({ providerId: providerId }, expandResponse); this._objectExplorerService.onNodeExpanded(expandInfo); } //Tasks handlers - public $onTaskCreated(handle: number, taskInfo: sqlops.TaskInfo): void { + public $onTaskCreated(handle: number, taskInfo: azdata.TaskInfo): void { this._taskService.onNewTaskCreated(handle, taskInfo); } - public $onTaskStatusChanged(handle: number, taskProgressInfo: sqlops.TaskProgressInfo): void { + public $onTaskStatusChanged(handle: number, taskProgressInfo: azdata.TaskProgressInfo): void { this._taskService.onTaskStatusChanged(handle, taskProgressInfo); } //File browser handlers - public $onFileBrowserOpened(handle: number, response: sqlops.FileBrowserOpenedParams): void { + public $onFileBrowserOpened(handle: number, response: azdata.FileBrowserOpenedParams): void { this._fileBrowserService.onFileBrowserOpened(handle, response); } - public $onFolderNodeExpanded(handle: number, response: sqlops.FileBrowserExpandedParams): void { + public $onFolderNodeExpanded(handle: number, response: azdata.FileBrowserExpandedParams): void { this._fileBrowserService.onFolderNodeExpanded(handle, response); } - public $onFilePathsValidated(handle: number, response: sqlops.FileBrowserValidatedParams): void { + public $onFilePathsValidated(handle: number, response: azdata.FileBrowserValidatedParams): void { this._fileBrowserService.onFilePathsValidated(handle, response); } // Profiler handlers - public $onSessionEventsAvailable(handle: number, response: sqlops.ProfilerSessionEvents): void { + public $onSessionEventsAvailable(handle: number, response: azdata.ProfilerSessionEvents): void { this._profilerService.onMoreRows(response); } - public $onSessionStopped(handle: number, response: sqlops.ProfilerSessionStoppedParams): void { + public $onSessionStopped(handle: number, response: azdata.ProfilerSessionStoppedParams): void { this._profilerService.onSessionStopped(response); } - public $onProfilerSessionCreated(handle: number, response: sqlops.ProfilerSessionCreatedParams): void { + public $onProfilerSessionCreated(handle: number, response: azdata.ProfilerSessionCreatedParams): void { this._profilerService.onProfilerSessionCreated(response); } diff --git a/src/sql/workbench/api/node/mainThreadModelViewDialog.ts b/src/sql/workbench/api/node/mainThreadModelViewDialog.ts index 7f0b23aa9b..43485ee6c6 100644 --- a/src/sql/workbench/api/node/mainThreadModelViewDialog.ts +++ b/src/sql/workbench/api/node/mainThreadModelViewDialog.ts @@ -16,7 +16,7 @@ import { IModelViewDialogDetails, IModelViewTabDetails, IModelViewButtonDetails, import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/parts/modelComponents/modelEditor/modelViewInput'; import * as vscode from 'vscode'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @extHostNamedCustomer(SqlMainContext.MainThreadModelViewDialog) @@ -45,7 +45,7 @@ export class MainThreadModelViewDialog implements MainThreadModelViewDialogShape throw new Error('Method not implemented.'); } - public $openEditor(handle: number, modelViewId: string, title: string, options?: sqlops.ModelViewEditorOptions, position?: vscode.ViewColumn): Thenable { + public $openEditor(handle: number, modelViewId: string, title: string, options?: azdata.ModelViewEditorOptions, position?: vscode.ViewColumn): Thenable { return new Promise((resolve, reject) => { let saveHandler: ModeViewSaveHandler = options && options.supportsSave ? (h) => this.handleSave(h) : undefined; let model = new ModelViewInputModel(modelViewId, handle, saveHandler); @@ -286,7 +286,7 @@ export class MainThreadModelViewDialog implements MainThreadModelViewDialogShape this._proxy.$updateWizardPageInfo(handle, wizard.pages.map(page => this._wizardPageHandles.get(page)), wizard.currentPage); } - private validateNavigation(handle: number, info: sqlops.window.WizardPageChangeInfo): Thenable { + private validateNavigation(handle: number, info: azdata.window.WizardPageChangeInfo): Thenable { return this._proxy.$validateNavigation(handle, info); } diff --git a/src/sql/workbench/api/node/mainThreadNotebook.ts b/src/sql/workbench/api/node/mainThreadNotebook.ts index 25bef87247..21c7a71d70 100644 --- a/src/sql/workbench/api/node/mainThreadNotebook.ts +++ b/src/sql/workbench/api/node/mainThreadNotebook.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { SqlExtHostContext, SqlMainContext, ExtHostNotebookShape, MainThreadNotebookShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { Disposable } from 'vs/base/common/lifecycle'; @@ -63,7 +63,7 @@ export class MainThreadNotebook extends Disposable implements MainThreadNotebook } } - public $onFutureMessage(futureId: number, type: FutureMessageType, payload: sqlops.nb.IMessage): void { + public $onFutureMessage(futureId: number, type: FutureMessageType, payload: azdata.nb.IMessage): void { let future = this._futures.get(futureId); if (future) { future.onMessage(type, payload); @@ -115,9 +115,9 @@ class NotebookProviderWrapper extends Disposable implements INotebookProvider { } class NotebookManagerWrapper implements INotebookManager { - private _sessionManager: sqlops.nb.SessionManager; - private _contentManager: sqlops.nb.ContentManager; - private _serverManager: sqlops.nb.ServerManager; + private _sessionManager: azdata.nb.SessionManager; + private _contentManager: azdata.nb.ContentManager; + private _serverManager: azdata.nb.ServerManager; private managerDetails: INotebookManagerDetails; constructor(private _proxy: Proxies, @@ -134,13 +134,13 @@ class NotebookManagerWrapper implements INotebookManager { return this; } - public get sessionManager(): sqlops.nb.SessionManager { + public get sessionManager(): azdata.nb.SessionManager { return this._sessionManager; } - public get contentManager(): sqlops.nb.ContentManager { + public get contentManager(): azdata.nb.ContentManager { return this._contentManager; } - public get serverManager(): sqlops.nb.ServerManager { + public get serverManager(): azdata.nb.ServerManager { return this._serverManager; } @@ -149,20 +149,20 @@ class NotebookManagerWrapper implements INotebookManager { } } -class ContentManagerWrapper implements sqlops.nb.ContentManager { +class ContentManagerWrapper implements azdata.nb.ContentManager { constructor(private handle: number, private _proxy: Proxies) { } - getNotebookContents(notebookUri: URI): Thenable { + getNotebookContents(notebookUri: URI): Thenable { return this._proxy.ext.$getNotebookContents(this.handle, notebookUri); } - save(path: URI, notebook: sqlops.nb.INotebookContents): Thenable { + save(path: URI, notebook: azdata.nb.INotebookContents): Thenable { return this._proxy.ext.$save(this.handle, path, notebook); } } -class ServerManagerWrapper implements sqlops.nb.ServerManager { +class ServerManagerWrapper implements azdata.nb.ServerManager { private onServerStartedEmitter = new Emitter(); private _isStarted: boolean; constructor(private handle: number, private _proxy: Proxies) { @@ -201,10 +201,10 @@ class ServerManagerWrapper implements sqlops.nb.ServerManager { } } -class SessionManagerWrapper implements sqlops.nb.SessionManager { +class SessionManagerWrapper implements azdata.nb.SessionManager { private readyPromise: Promise; private _isReady: boolean; - private _specs: sqlops.nb.IAllKernels; + private _specs: azdata.nb.IAllKernels; constructor(private managerHandle: number, private _proxy: Proxies) { this._isReady = false; this.readyPromise = this.initializeSessionManager(); @@ -218,15 +218,15 @@ class SessionManagerWrapper implements sqlops.nb.SessionManager { return this.readyPromise; } - get specs(): sqlops.nb.IAllKernels { + get specs(): azdata.nb.IAllKernels { return this._specs; } - startNew(options: sqlops.nb.ISessionOptions): Thenable { + startNew(options: azdata.nb.ISessionOptions): Thenable { return this.doStartNew(options); } - private async doStartNew(options: sqlops.nb.ISessionOptions): Promise { + private async doStartNew(options: azdata.nb.ISessionOptions): Promise { let sessionDetails = await this._proxy.ext.$startNewSession(this.managerHandle, options); return new SessionWrapper(this._proxy, sessionDetails); } @@ -248,7 +248,7 @@ class SessionManagerWrapper implements sqlops.nb.SessionManager { } } -class SessionWrapper implements sqlops.nb.ISession { +class SessionWrapper implements azdata.nb.ISession { private _kernel: KernelWrapper; constructor(private _proxy: Proxies, private sessionDetails: INotebookSessionDetails) { if (sessionDetails && sessionDetails.kernelDetails) { @@ -276,48 +276,48 @@ class SessionWrapper implements sqlops.nb.ISession { return this.sessionDetails.type; } - get status(): sqlops.nb.KernelStatus { - return this.sessionDetails.status as sqlops.nb.KernelStatus; + get status(): azdata.nb.KernelStatus { + return this.sessionDetails.status as azdata.nb.KernelStatus; } - get kernel(): sqlops.nb.IKernel { + get kernel(): azdata.nb.IKernel { return this._kernel; } - changeKernel(kernelInfo: sqlops.nb.IKernelSpec): Thenable { + changeKernel(kernelInfo: azdata.nb.IKernelSpec): Thenable { return this.doChangeKernel(kernelInfo); } - configureKernel(kernelInfo: sqlops.nb.IKernelSpec): Thenable { + configureKernel(kernelInfo: azdata.nb.IKernelSpec): Thenable { return this.doConfigureKernel(kernelInfo); } - configureConnection(connection: sqlops.IConnectionProfile): Thenable { + configureConnection(connection: azdata.IConnectionProfile): Thenable { if (connection['capabilitiesService'] !== undefined) { connection['capabilitiesService'] = undefined; } return this.doConfigureConnection(connection); } - private async doChangeKernel(kernelInfo: sqlops.nb.IKernelSpec): Promise { + private async doChangeKernel(kernelInfo: azdata.nb.IKernelSpec): Promise { let kernelDetails = await this._proxy.ext.$changeKernel(this.sessionDetails.sessionId, kernelInfo); this._kernel = new KernelWrapper(this._proxy, kernelDetails); return this._kernel; } - private async doConfigureKernel(kernelInfo: sqlops.nb.IKernelSpec): Promise { + private async doConfigureKernel(kernelInfo: azdata.nb.IKernelSpec): Promise { await this._proxy.ext.$configureKernel(this.sessionDetails.sessionId, kernelInfo); } - private async doConfigureConnection(connection: sqlops.IConnectionProfile): Promise { + private async doConfigureConnection(connection: azdata.IConnectionProfile): Promise { await this._proxy.ext.$configureConnection(this.sessionDetails.sessionId, connection); } } -class KernelWrapper implements sqlops.nb.IKernel { +class KernelWrapper implements azdata.nb.IKernel { private _isReady: boolean = false; private _ready = new Deferred(); - private _info: sqlops.nb.IInfoReply; + private _info: azdata.nb.IInfoReply; constructor(private _proxy: Proxies, private kernelDetails: INotebookKernelDetails) { this.initialize(kernelDetails); } @@ -352,19 +352,19 @@ class KernelWrapper implements sqlops.nb.IKernel { return this.kernelDetails.supportsIntellisense; } - get info(): sqlops.nb.IInfoReply { + get info(): azdata.nb.IInfoReply { return this._info; } - getSpec(): Thenable { + getSpec(): Thenable { return this._proxy.ext.$getKernelSpec(this.kernelDetails.kernelId); } - requestComplete(content: sqlops.nb.ICompleteRequest): Thenable { + requestComplete(content: azdata.nb.ICompleteRequest): Thenable { return this._proxy.ext.$requestComplete(this.kernelDetails.kernelId, content); } - requestExecute(content: sqlops.nb.IExecuteRequest, disposeOnDone?: boolean): sqlops.nb.IFuture { + requestExecute(content: azdata.nb.IExecuteRequest, disposeOnDone?: boolean): azdata.nb.IFuture { let future = new FutureWrapper(this._proxy); this._proxy.ext.$requestExecute(this.kernelDetails.kernelId, content, disposeOnDone) .then(details => { @@ -383,9 +383,9 @@ class KernelWrapper implements sqlops.nb.IKernel { class FutureWrapper implements FutureInternal { private _futureId: number; - private _done = new Deferred(); - private _messageHandlers = new Map>(); - private _msg: sqlops.nb.IMessage; + private _done = new Deferred(); + private _messageHandlers = new Map>(); + private _msg: azdata.nb.IMessage; private _inProgress: boolean; constructor(private _proxy: Proxies) { @@ -401,7 +401,7 @@ class FutureWrapper implements FutureInternal { this._done.reject(error); } - public onMessage(type: FutureMessageType, payload: sqlops.nb.IMessage): void { + public onMessage(type: FutureMessageType, payload: azdata.nb.IMessage): void { let handler = this._messageHandlers.get(type); if (handler) { try { @@ -421,7 +421,7 @@ class FutureWrapper implements FutureInternal { } } - private addMessageHandler(type: FutureMessageType, handler: sqlops.nb.MessageHandler): void { + private addMessageHandler(type: FutureMessageType, handler: azdata.nb.MessageHandler): void { // Note: there can only be 1 message handler according to the Jupyter Notebook spec. // You can use a message hook to override this / add additional side-processors this._messageHandlers.set(type, handler); @@ -436,27 +436,27 @@ class FutureWrapper implements FutureInternal { this._inProgress = value; } - get msg(): sqlops.nb.IMessage { + get msg(): azdata.nb.IMessage { return this._msg; } - get done(): Thenable { + get done(): Thenable { return this._done.promise; } - setReplyHandler(handler: sqlops.nb.MessageHandler): void { + setReplyHandler(handler: azdata.nb.MessageHandler): void { this.addMessageHandler(FutureMessageType.Reply, handler); } - setStdInHandler(handler: sqlops.nb.MessageHandler): void { + setStdInHandler(handler: azdata.nb.MessageHandler): void { this.addMessageHandler(FutureMessageType.StdIn, handler); } - setIOPubHandler(handler: sqlops.nb.MessageHandler): void { + setIOPubHandler(handler: azdata.nb.MessageHandler): void { this.addMessageHandler(FutureMessageType.IOPub, handler); } - sendInputReply(content: sqlops.nb.IInputReply): void { + sendInputReply(content: azdata.nb.IInputReply): void { this._proxy.ext.$sendInputReply(this._futureId, content); } @@ -465,10 +465,10 @@ class FutureWrapper implements FutureInternal { this._proxy.ext.$disposeFuture(this._futureId); } - registerMessageHook(hook: (msg: sqlops.nb.IIOPubMessage) => boolean | Thenable): void { + registerMessageHook(hook: (msg: azdata.nb.IIOPubMessage) => boolean | Thenable): void { throw new Error('Method not implemented.'); } - removeMessageHook(hook: (msg: sqlops.nb.IIOPubMessage) => boolean | Thenable): void { + removeMessageHook(hook: (msg: azdata.nb.IIOPubMessage) => boolean | Thenable): void { throw new Error('Method not implemented.'); } //#endregion diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index 8c7fb80c21..8d2fc99b08 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { URI, UriComponents } from 'vs/base/common/uri'; @@ -529,13 +529,13 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements return changeData; } - private getKernelSpec(editor: MainThreadNotebookEditor): sqlops.nb.IKernelSpec { + private getKernelSpec(editor: MainThreadNotebookEditor): azdata.nb.IKernelSpec { let spec = editor && editor.model && editor.model.clientSession ? editor.model.clientSession.cachedKernelSpec : undefined; return spec; } - private convertCellModelToNotebookCell(cells: ICellModel | ICellModel[]): sqlops.nb.NotebookCell[] { - let notebookCells: sqlops.nb.NotebookCell[] = []; + private convertCellModelToNotebookCell(cells: ICellModel | ICellModel[]): azdata.nb.NotebookCell[] { + let notebookCells: azdata.nb.NotebookCell[] = []; if (Array.isArray(cells)) { for (let cell of cells) { notebookCells.push({ diff --git a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts index 519ec8fb4b..98a62eff5f 100644 --- a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts +++ b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts @@ -5,7 +5,7 @@ 'use strict'; import { SqlExtHostContext, SqlMainContext, ExtHostObjectExplorerShape, MainThreadObjectExplorerShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; @@ -39,7 +39,7 @@ export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape { this._toDispose = dispose(this._toDispose); } - public $getNode(connectionId: string, nodePath?: string): Thenable { + public $getNode(connectionId: string, nodePath?: string): Thenable { return this._objectExplorerService.getTreeNode(connectionId, nodePath).then(treeNode => { if (!treeNode) { return undefined; @@ -63,7 +63,7 @@ export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape { return this._objectExplorerService.getTreeNode(connectionId, nodePath).then(treeNode => treeNode.setSelected(selected, clearOtherSelections)); } - public $getChildren(connectionId: string, nodePath: string): Thenable { + public $getChildren(connectionId: string, nodePath: string): Thenable { return this._objectExplorerService.getTreeNode(connectionId, nodePath).then(treeNode => treeNode.getChildren().then(children => children.map(node => node.toNodeInfo()))); } @@ -71,19 +71,19 @@ export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape { return this._objectExplorerService.getTreeNode(connectionId, nodePath).then(treeNode => treeNode.isExpanded()); } - public $findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable { + public $findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable { return this._objectExplorerService.findNodes(connectionId, type, schema, name, database, parentObjectNames); } - public $refresh(connectionId: string, nodePath: string): Thenable { + public $refresh(connectionId: string, nodePath: string): Thenable { return this._objectExplorerService.refreshNodeInView(connectionId, nodePath).then(node => node.toNodeInfo()); } public $getNodeActions(connectionId: string, nodePath: string): Thenable { return this._objectExplorerService.getNodeActions(connectionId, nodePath); } - - public $getSessionConnectionProfile(sessionId: string): Thenable { + + public $getSessionConnectionProfile(sessionId: string): Thenable { return Promise.resolve(this._objectExplorerService.getSessionConnectionProfile(sessionId)); } } diff --git a/src/sql/workbench/api/node/mainThreadResourceProvider.ts b/src/sql/workbench/api/node/mainThreadResourceProvider.ts index 6e955010dd..7d8d85b545 100644 --- a/src/sql/workbench/api/node/mainThreadResourceProvider.ts +++ b/src/sql/workbench/api/node/mainThreadResourceProvider.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; @@ -20,7 +20,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC @extHostNamedCustomer(SqlMainContext.MainThreadResourceProvider) export class MainThreadResourceProvider implements MainThreadResourceProviderShape { - private _providerMetadata: { [handle: number]: sqlops.AccountProviderMetadata }; + private _providerMetadata: { [handle: number]: azdata.AccountProviderMetadata }; private _proxy: ExtHostResourceProviderShape; private _toDispose: IDisposable[]; @@ -35,15 +35,15 @@ export class MainThreadResourceProvider implements MainThreadResourceProviderSha this._toDispose = []; } - public $registerResourceProvider(providerMetadata: sqlops.ResourceProviderMetadata, handle: number): Thenable { + public $registerResourceProvider(providerMetadata: azdata.ResourceProviderMetadata, handle: number): Thenable { let self = this; // Create the account provider that interfaces with the extension via the proxy and register it - let resourceProvider: sqlops.ResourceProvider = { - createFirewallRule(account: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo): Thenable { + let resourceProvider: azdata.ResourceProvider = { + createFirewallRule(account: azdata.Account, firewallruleInfo: azdata.FirewallRuleInfo): Thenable { return self._proxy.$createFirewallRule(handle, account, firewallruleInfo); }, - handleFirewallRule(errorCode: number, errorMessage: string, connectionTypeId: string): Thenable { + handleFirewallRule(errorCode: number, errorMessage: string, connectionTypeId: string): Thenable { return self._proxy.$handleFirewallRule(handle, errorCode, errorMessage, connectionTypeId); } }; diff --git a/src/sql/workbench/api/node/mainThreadSerializationProvider.ts b/src/sql/workbench/api/node/mainThreadSerializationProvider.ts index 8c6f0aa9e4..1117fb43b6 100644 --- a/src/sql/workbench/api/node/mainThreadSerializationProvider.ts +++ b/src/sql/workbench/api/node/mainThreadSerializationProvider.ts @@ -11,7 +11,7 @@ import { MainThreadSerializationProviderShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { ISerializationService } from 'sql/platform/serialization/common/serializationService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; @@ -42,7 +42,7 @@ export class MainThreadSerializationProvider implements MainThreadSerializationP let self = this; this._registrations[handle] = this.serializationService.addEventListener(handle, { - onSaveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { + onSaveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { return self._proxy.$saveAs(saveFormat, savePath, results, appendToFile); } }); diff --git a/src/sql/workbench/api/node/sqlExtHost.api.impl.ts b/src/sql/workbench/api/node/sqlExtHost.api.impl.ts index 11fd1273fa..b8b3b4f6b1 100644 --- a/src/sql/workbench/api/node/sqlExtHost.api.impl.ts +++ b/src/sql/workbench/api/node/sqlExtHost.api.impl.ts @@ -99,16 +99,16 @@ export function createApiFactory( }, // "sqlops" back-compat APIs - getActiveConnections(): Thenable { + getActiveConnections(): Thenable { return extHostConnectionManagement.$getActiveConnections(); }, getCredentials(connectionId: string): Thenable<{ [name: string]: string }> { return extHostConnectionManagement.$getCredentials(connectionId); }, - getServerInfo(connectionId: string): Thenable { + getServerInfo(connectionId: string): Thenable { return extHostConnectionManagement.$getServerInfo(connectionId); }, - openConnectionDialog(providers?: string[], initialConnectionProfile?: sqlops.IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Thenable { + openConnectionDialog(providers?: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable { return extHostConnectionManagement.$openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions); }, listDatabases(connectionId: string): Thenable { @@ -120,15 +120,15 @@ export function createApiFactory( getUriForConnection(connectionId: string): Thenable { return extHostConnectionManagement.$getUriForConnection(connectionId); }, - connect(connectionProfile: sqlops.IConnectionProfile): Thenable { + connect(connectionProfile: azdata.IConnectionProfile): Thenable { return extHostConnectionManagement.$connect(connectionProfile); } }; // Backcompat "sqlops" APIs // namespace: accounts - const accounts: typeof sqlops.accounts = { - registerAccountProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): vscode.Disposable { + const accounts: typeof azdata.accounts = { + registerAccountProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): vscode.Disposable { return extHostAccountManagement.$registerAccountProvider(providerMetadata, provider); }, beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable { @@ -137,66 +137,66 @@ export function createApiFactory( endAutoOAuthDeviceCode(): void { return extHostAccountManagement.$endAutoOAuthDeviceCode(); }, - accountUpdated(updatedAccount: sqlops.Account): void { + accountUpdated(updatedAccount: azdata.Account): void { return extHostAccountManagement.$accountUpdated(updatedAccount); }, - getAllAccounts(): Thenable { + getAllAccounts(): Thenable { return extHostAccountManagement.$getAllAccounts(); }, - getSecurityToken(account: sqlops.Account, resource?: sqlops.AzureResource): Thenable<{}> { + getSecurityToken(account: azdata.Account, resource?: azdata.AzureResource): Thenable<{}> { return extHostAccountManagement.$getSecurityToken(account, resource); }, - onDidChangeAccounts(listener: (e: sqlops.DidChangeAccountsParams) => void, thisArgs?: any, disposables?: extHostTypes.Disposable[]) { + onDidChangeAccounts(listener: (e: azdata.DidChangeAccountsParams) => void, thisArgs?: any, disposables?: extHostTypes.Disposable[]) { return extHostAccountManagement.onDidChangeAccounts(listener, thisArgs, disposables); } }; // namespace: credentials - const credentials: typeof sqlops.credentials = { - registerProvider(provider: sqlops.CredentialProvider): vscode.Disposable { + const credentials: typeof azdata.credentials = { + registerProvider(provider: azdata.CredentialProvider): vscode.Disposable { return extHostCredentialManagement.$registerCredentialProvider(provider); }, - getProvider(namespaceId: string): Thenable { + getProvider(namespaceId: string): Thenable { return extHostCredentialManagement.$getCredentialProvider(namespaceId); } }; // namespace: objectexplorer - const objectExplorer: typeof sqlops.objectexplorer = { - getNode(connectionId: string, nodePath?: string): Thenable { + const objectExplorer: typeof azdata.objectexplorer = { + getNode(connectionId: string, nodePath?: string): Thenable { return extHostObjectExplorer.$getNode(connectionId, nodePath); }, - getActiveConnectionNodes(): Thenable { + getActiveConnectionNodes(): Thenable { return extHostObjectExplorer.$getActiveConnectionNodes(); }, - findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable { + findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable { return extHostObjectExplorer.$findNodes(connectionId, type, schema, name, database, parentObjectNames); }, getNodeActions(connectionId: string, nodePath: string): Thenable { return extHostObjectExplorer.$getNodeActions(connectionId, nodePath); }, - getSessionConnectionProfile(sessionId: string): Thenable { + getSessionConnectionProfile(sessionId: string): Thenable { return extHostObjectExplorer.$getSessionConnectionProfile(sessionId); } }; // namespace: serialization - const serialization: typeof sqlops.serialization = { - registerProvider(provider: sqlops.SerializationProvider): vscode.Disposable { + const serialization: typeof azdata.serialization = { + registerProvider(provider: azdata.SerializationProvider): vscode.Disposable { return extHostSerializationProvider.$registerSerializationProvider(provider); }, }; // namespace: serialization - const resources: typeof sqlops.resources = { - registerResourceProvider(providerMetadata: sqlops.ResourceProviderMetadata, provider: sqlops.ResourceProvider): vscode.Disposable { + const resources: typeof azdata.resources = { + registerResourceProvider(providerMetadata: azdata.ResourceProviderMetadata, provider: azdata.ResourceProvider): vscode.Disposable { return extHostResourceProvider.$registerResourceProvider(providerMetadata, provider); } }; - let registerConnectionProvider = (provider: sqlops.ConnectionProvider): vscode.Disposable => { + let registerConnectionProvider = (provider: azdata.ConnectionProvider): vscode.Disposable => { // Connection callbacks - provider.registerOnConnectionComplete((connSummary: sqlops.ConnectionInfoSummary) => { + provider.registerOnConnectionComplete((connSummary: azdata.ConnectionInfoSummary) => { extHostDataProvider.$onConnectComplete(provider.handle, connSummary); }); @@ -204,35 +204,35 @@ export function createApiFactory( extHostDataProvider.$onIntelliSenseCacheComplete(provider.handle, connectionUri); }); - provider.registerOnConnectionChanged((changedConnInfo: sqlops.ChangedConnectionInfo) => { + provider.registerOnConnectionChanged((changedConnInfo: azdata.ChangedConnectionInfo) => { extHostDataProvider.$onConnectionChanged(provider.handle, changedConnInfo); }); return extHostDataProvider.$registerConnectionProvider(provider); }; - let registerQueryProvider = (provider: sqlops.QueryProvider): vscode.Disposable => { - provider.registerOnQueryComplete((result: sqlops.QueryExecuteCompleteNotificationResult) => { + let registerQueryProvider = (provider: azdata.QueryProvider): vscode.Disposable => { + provider.registerOnQueryComplete((result: azdata.QueryExecuteCompleteNotificationResult) => { extHostDataProvider.$onQueryComplete(provider.handle, result); }); - provider.registerOnBatchStart((batchInfo: sqlops.QueryExecuteBatchNotificationParams) => { + provider.registerOnBatchStart((batchInfo: azdata.QueryExecuteBatchNotificationParams) => { extHostDataProvider.$onBatchStart(provider.handle, batchInfo); }); - provider.registerOnBatchComplete((batchInfo: sqlops.QueryExecuteBatchNotificationParams) => { + provider.registerOnBatchComplete((batchInfo: azdata.QueryExecuteBatchNotificationParams) => { extHostDataProvider.$onBatchComplete(provider.handle, batchInfo); }); - provider.registerOnResultSetAvailable((resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams) => { + provider.registerOnResultSetAvailable((resultSetInfo: azdata.QueryExecuteResultSetNotificationParams) => { extHostDataProvider.$onResultSetAvailable(provider.handle, resultSetInfo); }); - provider.registerOnResultSetUpdated((resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams) => { + provider.registerOnResultSetUpdated((resultSetInfo: azdata.QueryExecuteResultSetNotificationParams) => { extHostDataProvider.$onResultSetUpdated(provider.handle, resultSetInfo); }); - provider.registerOnMessage((message: sqlops.QueryExecuteMessageParams) => { + provider.registerOnMessage((message: azdata.QueryExecuteMessageParams) => { extHostDataProvider.$onQueryMessage(provider.handle, message); }); @@ -243,105 +243,105 @@ export function createApiFactory( return extHostDataProvider.$registerQueryProvider(provider); }; - let registerObjectExplorerProvider = (provider: sqlops.ObjectExplorerProvider): vscode.Disposable => { - provider.registerOnSessionCreated((response: sqlops.ObjectExplorerSession) => { + let registerObjectExplorerProvider = (provider: azdata.ObjectExplorerProvider): vscode.Disposable => { + provider.registerOnSessionCreated((response: azdata.ObjectExplorerSession) => { extHostDataProvider.$onObjectExplorerSessionCreated(provider.handle, response); }); if (provider.registerOnSessionDisconnected) { - provider.registerOnSessionDisconnected((response: sqlops.ObjectExplorerSession) => { + provider.registerOnSessionDisconnected((response: azdata.ObjectExplorerSession) => { extHostDataProvider.$onObjectExplorerSessionDisconnected(provider.handle, response); }); } - provider.registerOnExpandCompleted((response: sqlops.ObjectExplorerExpandInfo) => { + provider.registerOnExpandCompleted((response: azdata.ObjectExplorerExpandInfo) => { extHostDataProvider.$onObjectExplorerNodeExpanded(provider.providerId, response); }); return extHostDataProvider.$registerObjectExplorerProvider(provider); }; - let registerObjectExplorerNodeProvider = (provider: sqlops.ObjectExplorerNodeProvider): vscode.Disposable => { - provider.registerOnExpandCompleted((response: sqlops.ObjectExplorerExpandInfo) => { + let registerObjectExplorerNodeProvider = (provider: azdata.ObjectExplorerNodeProvider): vscode.Disposable => { + provider.registerOnExpandCompleted((response: azdata.ObjectExplorerExpandInfo) => { extHostDataProvider.$onObjectExplorerNodeExpanded(provider.providerId, response); }); return extHostDataProvider.$registerObjectExplorerNodeProvider(provider); }; - let registerTaskServicesProvider = (provider: sqlops.TaskServicesProvider): vscode.Disposable => { - provider.registerOnTaskCreated((response: sqlops.TaskInfo) => { + let registerTaskServicesProvider = (provider: azdata.TaskServicesProvider): vscode.Disposable => { + provider.registerOnTaskCreated((response: azdata.TaskInfo) => { extHostDataProvider.$onTaskCreated(provider.handle, response); }); - provider.registerOnTaskStatusChanged((response: sqlops.TaskProgressInfo) => { + provider.registerOnTaskStatusChanged((response: azdata.TaskProgressInfo) => { extHostDataProvider.$onTaskStatusChanged(provider.handle, response); }); return extHostDataProvider.$registerTaskServicesProvider(provider); }; - let registerFileBrowserProvider = (provider: sqlops.FileBrowserProvider): vscode.Disposable => { - provider.registerOnFileBrowserOpened((response: sqlops.FileBrowserOpenedParams) => { + let registerFileBrowserProvider = (provider: azdata.FileBrowserProvider): vscode.Disposable => { + provider.registerOnFileBrowserOpened((response: azdata.FileBrowserOpenedParams) => { extHostDataProvider.$onFileBrowserOpened(provider.handle, response); }); - provider.registerOnFolderNodeExpanded((response: sqlops.FileBrowserExpandedParams) => { + provider.registerOnFolderNodeExpanded((response: azdata.FileBrowserExpandedParams) => { extHostDataProvider.$onFolderNodeExpanded(provider.handle, response); }); - provider.registerOnFilePathsValidated((response: sqlops.FileBrowserValidatedParams) => { + provider.registerOnFilePathsValidated((response: azdata.FileBrowserValidatedParams) => { extHostDataProvider.$onFilePathsValidated(provider.handle, response); }); return extHostDataProvider.$registerFileBrowserProvider(provider); }; - let registerScriptingProvider = (provider: sqlops.ScriptingProvider): vscode.Disposable => { - provider.registerOnScriptingComplete((response: sqlops.ScriptingCompleteResult) => { + let registerScriptingProvider = (provider: azdata.ScriptingProvider): vscode.Disposable => { + provider.registerOnScriptingComplete((response: azdata.ScriptingCompleteResult) => { extHostDataProvider.$onScriptingComplete(provider.handle, response); }); return extHostDataProvider.$registerScriptingProvider(provider); }; - let registerProfilerProvider = (provider: sqlops.ProfilerProvider): vscode.Disposable => { - provider.registerOnSessionEventsAvailable((response: sqlops.ProfilerSessionEvents) => { + let registerProfilerProvider = (provider: azdata.ProfilerProvider): vscode.Disposable => { + provider.registerOnSessionEventsAvailable((response: azdata.ProfilerSessionEvents) => { extHostDataProvider.$onSessionEventsAvailable(provider.handle, response); }); - provider.registerOnSessionStopped((response: sqlops.ProfilerSessionStoppedParams) => { + provider.registerOnSessionStopped((response: azdata.ProfilerSessionStoppedParams) => { extHostDataProvider.$onSessionStopped(provider.handle, response); }); - provider.registerOnProfilerSessionCreated((response: sqlops.ProfilerSessionCreatedParams) => { + provider.registerOnProfilerSessionCreated((response: azdata.ProfilerSessionCreatedParams) => { extHostDataProvider.$onProfilerSessionCreated(provider.handle, response); }); return extHostDataProvider.$registerProfilerProvider(provider); }; - let registerBackupProvider = (provider: sqlops.BackupProvider): vscode.Disposable => { + let registerBackupProvider = (provider: azdata.BackupProvider): vscode.Disposable => { return extHostDataProvider.$registerBackupProvider(provider); }; - let registerRestoreProvider = (provider: sqlops.RestoreProvider): vscode.Disposable => { + let registerRestoreProvider = (provider: azdata.RestoreProvider): vscode.Disposable => { return extHostDataProvider.$registerRestoreProvider(provider); }; - let registerMetadataProvider = (provider: sqlops.MetadataProvider): vscode.Disposable => { + let registerMetadataProvider = (provider: azdata.MetadataProvider): vscode.Disposable => { return extHostDataProvider.$registerMetadataProvider(provider); }; - let registerCapabilitiesServiceProvider = (provider: sqlops.CapabilitiesProvider): vscode.Disposable => { + let registerCapabilitiesServiceProvider = (provider: azdata.CapabilitiesProvider): vscode.Disposable => { return extHostDataProvider.$registerCapabilitiesServiceProvider(provider); }; - let registerAdminServicesProvider = (provider: sqlops.AdminServicesProvider): vscode.Disposable => { + let registerAdminServicesProvider = (provider: azdata.AdminServicesProvider): vscode.Disposable => { return extHostDataProvider.$registerAdminServicesProvider(provider); }; - let registerAgentServicesProvider = (provider: sqlops.AgentServicesProvider): vscode.Disposable => { + let registerAgentServicesProvider = (provider: azdata.AgentServicesProvider): vscode.Disposable => { provider.registerOnUpdated(() => { extHostDataProvider.$onJobDataUpdated(provider.handle); }); @@ -349,12 +349,12 @@ export function createApiFactory( return extHostDataProvider.$registerAgentServiceProvider(provider); }; - let registerDacFxServicesProvider = (provider: sqlops.DacFxServicesProvider): vscode.Disposable => { + let registerDacFxServicesProvider = (provider: azdata.DacFxServicesProvider): vscode.Disposable => { return extHostDataProvider.$registerDacFxServiceProvider(provider); }; // namespace: dataprotocol - const dataprotocol: typeof sqlops.dataprotocol = { + const dataprotocol: typeof azdata.dataprotocol = { registerBackupProvider, registerConnectionProvider, registerFileBrowserProvider, @@ -370,113 +370,113 @@ export function createApiFactory( registerAgentServicesProvider, registerCapabilitiesServiceProvider, registerDacFxServicesProvider, - onDidChangeLanguageFlavor(listener: (e: sqlops.DidChangeLanguageFlavorParams) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) { + onDidChangeLanguageFlavor(listener: (e: azdata.DidChangeLanguageFlavorParams) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) { return extHostDataProvider.onDidChangeLanguageFlavor(listener, thisArgs, disposables); }, - getProvider(providerId: string, providerType: sqlops.DataProviderType) { + getProvider(providerId: string, providerType: azdata.DataProviderType) { return extHostDataProvider.getProvider(providerId, providerType); }, - getProvidersByType(providerType: sqlops.DataProviderType) { + getProvidersByType(providerType: azdata.DataProviderType) { return extHostDataProvider.getProvidersByType(providerType); } }; - const modelViewDialog: typeof sqlops.window.modelviewdialog = { - createDialog(title: string, dialogName?: string): sqlops.window.modelviewdialog.Dialog { - console.warn('the method sqlops.window.modelviewdialog.createDialog has been deprecated, replace it with sqlops.window.createModelViewDialog'); + const modelViewDialog: typeof azdata.window.modelviewdialog = { + createDialog(title: string, dialogName?: string): azdata.window.modelviewdialog.Dialog { + console.warn('the method azdata.window.modelviewdialog.createDialog has been deprecated, replace it with azdata.window.createModelViewDialog'); return extHostModelViewDialog.createDialog(title, dialogName, extension); }, - createTab(title: string): sqlops.window.modelviewdialog.DialogTab { - console.warn('the method sqlops.window.modelviewdialog.createTab has been deprecated, replace it with sqlops.window.createTab'); + createTab(title: string): azdata.window.modelviewdialog.DialogTab { + console.warn('the method azdata.window.modelviewdialog.createTab has been deprecated, replace it with azdata.window.createTab'); return extHostModelViewDialog.createTab(title, extension); }, - createButton(label: string): sqlops.window.modelviewdialog.Button { - console.warn('the method sqlops.window.modelviewdialog.createButton has been deprecated, replace it with sqlops.window.createButton'); + createButton(label: string): azdata.window.modelviewdialog.Button { + console.warn('the method azdata.window.modelviewdialog.createButton has been deprecated, replace it with azdata.window.createButton'); return extHostModelViewDialog.createButton(label); }, - openDialog(dialog: sqlops.window.modelviewdialog.Dialog) { - console.warn('the method sqlops.window.modelviewdialog.openDialog has been deprecated, replace it with sqlops.window.openDialog'); + openDialog(dialog: azdata.window.modelviewdialog.Dialog) { + console.warn('the method azdata.window.modelviewdialog.openDialog has been deprecated, replace it with azdata.window.openDialog'); return extHostModelViewDialog.openDialog(dialog); }, - closeDialog(dialog: sqlops.window.modelviewdialog.Dialog) { - console.warn('the method sqlops.window.modelviewdialog.closeDialog has been deprecated, replace it with sqlops.window.closeDialog'); + closeDialog(dialog: azdata.window.modelviewdialog.Dialog) { + console.warn('the method azdata.window.modelviewdialog.closeDialog has been deprecated, replace it with azdata.window.closeDialog'); return extHostModelViewDialog.closeDialog(dialog); }, - createWizardPage(title: string): sqlops.window.modelviewdialog.WizardPage { - console.warn('the method sqlops.window.modelviewdialog.createWizardPage has been deprecated, replace it with sqlops.window.createWizardPage'); + createWizardPage(title: string): azdata.window.modelviewdialog.WizardPage { + console.warn('the method azdata.window.modelviewdialog.createWizardPage has been deprecated, replace it with azdata.window.createWizardPage'); return extHostModelViewDialog.createWizardPage(title); }, - createWizard(title: string): sqlops.window.modelviewdialog.Wizard { - console.warn('the method sqlops.window.modelviewdialog.createWizard has been deprecated, replace it with sqlops.window.createWizard'); + createWizard(title: string): azdata.window.modelviewdialog.Wizard { + console.warn('the method azdata.window.modelviewdialog.createWizard has been deprecated, replace it with azdata.window.createWizard'); return extHostModelViewDialog.createWizard(title); }, MessageLevel: sqlExtHostTypes.MessageLevel }; - const window: typeof sqlops.window = { + const window: typeof azdata.window = { createDialog(name: string) { - console.warn('the method sqlops.window.createDialog has been deprecated, replace it with sqlops.window.createWebViewDialog'); + console.warn('the method azdata.window.createDialog has been deprecated, replace it with azdata.window.createWebViewDialog'); return extHostModalDialogs.createDialog(name); }, modelviewdialog: modelViewDialog, createWebViewDialog(name: string) { return extHostModalDialogs.createDialog(name); }, - createModelViewDialog(title: string, dialogName?: string): sqlops.window.Dialog { + createModelViewDialog(title: string, dialogName?: string): azdata.window.Dialog { return extHostModelViewDialog.createDialog(title, dialogName, extension); }, - createTab(title: string): sqlops.window.DialogTab { + createTab(title: string): azdata.window.DialogTab { return extHostModelViewDialog.createTab(title, extension); }, - createButton(label: string): sqlops.window.Button { + createButton(label: string): azdata.window.Button { return extHostModelViewDialog.createButton(label); }, - openDialog(dialog: sqlops.window.Dialog) { + openDialog(dialog: azdata.window.Dialog) { return extHostModelViewDialog.openDialog(dialog); }, - closeDialog(dialog: sqlops.window.Dialog) { + closeDialog(dialog: azdata.window.Dialog) { return extHostModelViewDialog.closeDialog(dialog); }, - createWizardPage(title: string): sqlops.window.WizardPage { + createWizardPage(title: string): azdata.window.WizardPage { return extHostModelViewDialog.createWizardPage(title); }, - createWizard(title: string): sqlops.window.Wizard { + createWizard(title: string): azdata.window.Wizard { return extHostModelViewDialog.createWizard(title); }, MessageLevel: sqlExtHostTypes.MessageLevel }; - const tasks: typeof sqlops.tasks = { + const tasks: typeof azdata.tasks = { registerTask(id: string, task: (...args: any[]) => any, thisArgs?: any): vscode.Disposable { return extHostTasks.registerTask(id, task, thisArgs); }, - startBackgroundOperation(operationInfo: sqlops.BackgroundOperationInfo): void { + startBackgroundOperation(operationInfo: azdata.BackgroundOperationInfo): void { extHostBackgroundTaskManagement.$registerTask(operationInfo); } }; - const workspace: typeof sqlops.workspace = { + const workspace: typeof azdata.workspace = { onDidOpenDashboard: extHostDashboard.onDidOpenDashboard, onDidChangeToDashboard: extHostDashboard.onDidChangeToDashboard, - createModelViewEditor(title: string, options?: sqlops.ModelViewEditorOptions): sqlops.workspace.ModelViewEditor { + createModelViewEditor(title: string, options?: azdata.ModelViewEditorOptions): azdata.workspace.ModelViewEditor { return extHostModelViewDialog.createModelViewEditor(title, extension, options); } }; const dashboard = { - registerWebviewProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void) { + registerWebviewProvider(widgetId: string, handler: (webview: azdata.DashboardWebview) => void) { extHostWebviewWidgets.$registerProvider(widgetId, handler); } }; const ui = { - registerModelViewProvider(modelViewId: string, handler: (view: sqlops.ModelView) => void): void { + registerModelViewProvider(modelViewId: string, handler: (view: azdata.ModelView) => void): void { extHostModelView.$registerProvider(modelViewId, handler, extension); } }; // namespace: queryeditor - const queryEditor: typeof sqlops.queryeditor = { + const queryEditor: typeof azdata.queryeditor = { connect(fileUri: string, connectionId: string): Thenable { return extHostQueryEditor.$connect(fileUri, connectionId); @@ -487,7 +487,7 @@ export function createApiFactory( } }; - const extensions: typeof sqlops.extensions = { + const extensions: typeof azdata.extensions = { install(vsixPath: string): Thenable { return extHostExtensionManagement.$install(vsixPath); } @@ -509,10 +509,10 @@ export function createApiFactory( get onDidChangeNotebookCell() { return extHostNotebookDocumentsAndEditors.onDidChangeNotebookCell; }, - showNotebookDocument(uri: vscode.Uri, showOptions: sqlops.nb.NotebookShowOptions) { + showNotebookDocument(uri: vscode.Uri, showOptions: azdata.nb.NotebookShowOptions) { return extHostNotebookDocumentsAndEditors.showNotebookDocument(uri, showOptions); }, - registerNotebookProvider(provider: sqlops.nb.NotebookProvider): vscode.Disposable { + registerNotebookProvider(provider: azdata.nb.NotebookProvider): vscode.Disposable { return extHostNotebook.registerNotebookProvider(provider); }, CellRange: sqlExtHostTypes.CellRange @@ -557,6 +557,7 @@ export function createApiFactory( nb: nb, AzureResource: sqlExtHostTypes.AzureResource, TreeItem: sqlExtHostTypes.TreeItem, + extensions: extensions }; }, diff --git a/src/sql/workbench/api/node/sqlExtHost.protocol.ts b/src/sql/workbench/api/node/sqlExtHost.protocol.ts index 64d77efc5b..37d2f77e2e 100644 --- a/src/sql/workbench/api/node/sqlExtHost.protocol.ts +++ b/src/sql/workbench/api/node/sqlExtHost.protocol.ts @@ -14,7 +14,7 @@ import { UriComponents } from 'vs/base/common/uri'; import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable } from 'vs/base/common/lifecycle'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { ITreeComponentItem } from 'sql/workbench/common/views'; @@ -29,16 +29,16 @@ import { IExtensionDescription } from 'vs/workbench/services/extensions/common/e export abstract class ExtHostAccountManagementShape { $autoOAuthCancelled(handle: number): Thenable { throw ni(); } - $clear(handle: number, accountKey: sqlops.AccountKey): Thenable { throw ni(); } - $getSecurityToken(account: sqlops.Account, resource?: sqlops.AzureResource): Thenable<{}> { throw ni(); } - $initialize(handle: number, restoredAccounts: sqlops.Account[]): Thenable { throw ni(); } - $prompt(handle: number): Thenable { throw ni(); } - $refresh(handle: number, account: sqlops.Account): Thenable { throw ni(); } - $accountsChanged(handle: number, accounts: sqlops.Account[]): Thenable { throw ni(); } + $clear(handle: number, accountKey: azdata.AccountKey): Thenable { throw ni(); } + $getSecurityToken(account: azdata.Account, resource?: azdata.AzureResource): Thenable<{}> { throw ni(); } + $initialize(handle: number, restoredAccounts: azdata.Account[]): Thenable { throw ni(); } + $prompt(handle: number): Thenable { throw ni(); } + $refresh(handle: number, account: azdata.Account): Thenable { throw ni(); } + $accountsChanged(handle: number, accounts: azdata.Account[]): Thenable { throw ni(); } } export abstract class ExtHostConnectionManagementShape { - $onConnectionOpened(handleId: string, connection: sqlops.connection.Connection): void { throw ni; } + $onConnectionOpened(handleId: string, connection: azdata.connection.Connection): void { throw ni; } } export abstract class ExtHostDataProtocolShape { @@ -46,7 +46,7 @@ export abstract class ExtHostDataProtocolShape { /** * Establish a connection to a data source using the provided ConnectionInfo instance. */ - $connect(handle: number, connectionUri: string, connection: sqlops.ConnectionInfo): Thenable { throw ni(); } + $connect(handle: number, connectionUri: string, connection: azdata.ConnectionInfo): Thenable { throw ni(); } /** * Disconnect from a data source using the provided connectionUri string. @@ -68,7 +68,7 @@ export abstract class ExtHostDataProtocolShape { * @param handle the handle to use when looking up a provider * @param connectionUri URI identifying a connected resource */ - $listDatabases(handle: number, connectionUri: string): Thenable { throw ni(); } + $listDatabases(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Get the connection string for the connection specified by connectionUri @@ -82,7 +82,7 @@ export abstract class ExtHostDataProtocolShape { * @param handle the handle to use when looking up a provider * @param connectionString the connection string to serialize */ - $buildConnectionInfo(handle: number, connectionString: string): Thenable { throw ni(); } + $buildConnectionInfo(handle: number, connectionString: string): Thenable { throw ni(); } /** * Notifies all listeners on the Extension Host side that a language change occurred @@ -90,69 +90,69 @@ export abstract class ExtHostDataProtocolShape { * and other events * @param params information on what URI was changed and the new language */ - $languageFlavorChanged(params: sqlops.DidChangeLanguageFlavorParams): void { throw ni(); } + $languageFlavorChanged(params: azdata.DidChangeLanguageFlavorParams): void { throw ni(); } /** * Callback when a connection request has completed */ - $onConnectComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void { throw ni(); } + $onConnectComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void { throw ni(); } /** * Callback when a IntelliSense cache has been built */ $onIntelliSenseCacheComplete(handle: number, connectionUri: string): void { throw ni(); } - $getServerCapabilities(handle: number, client: sqlops.DataProtocolClientCapabilities): Thenable { throw ni(); } + $getServerCapabilities(handle: number, client: azdata.DataProtocolClientCapabilities): Thenable { throw ni(); } /** * Metadata service methods * */ - $getMetadata(handle: number, connectionUri: string): Thenable { throw ni(); } + $getMetadata(handle: number, connectionUri: string): Thenable { throw ni(); } $getDatabases(handle: number, connectionUri: string): Thenable { throw ni(); } - $getTableInfo(handle: number, connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { throw ni(); } + $getTableInfo(handle: number, connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { throw ni(); } - $getViewInfo(handle: number, connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable { throw ni(); } + $getViewInfo(handle: number, connectionUri: string, metadata: azdata.ObjectMetadata): Thenable { throw ni(); } /** * Object Explorer */ - $createObjectExplorerSession(handle: number, connInfo: sqlops.ConnectionInfo): Thenable { throw ni(); } + $createObjectExplorerSession(handle: number, connInfo: azdata.ConnectionInfo): Thenable { throw ni(); } - $expandObjectExplorerNode(handle: number, nodeInfo: sqlops.ExpandNodeInfo): Thenable { throw ni(); } + $expandObjectExplorerNode(handle: number, nodeInfo: azdata.ExpandNodeInfo): Thenable { throw ni(); } - $refreshObjectExplorerNode(handle: number, nodeInfo: sqlops.ExpandNodeInfo): Thenable { throw ni(); } + $refreshObjectExplorerNode(handle: number, nodeInfo: azdata.ExpandNodeInfo): Thenable { throw ni(); } - $closeObjectExplorerSession(handle: number, closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): Thenable { throw ni(); } + $closeObjectExplorerSession(handle: number, closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): Thenable { throw ni(); } - $findNodes(handle: number, findNodesInfo: sqlops.FindNodesInfo): Thenable { throw ni(); } + $findNodes(handle: number, findNodesInfo: azdata.FindNodesInfo): Thenable { throw ni(); } - $createObjectExplorerNodeProviderSession(handle: number, sessionInfo: sqlops.ObjectExplorerSession): Thenable { throw ni(); } + $createObjectExplorerNodeProviderSession(handle: number, sessionInfo: azdata.ObjectExplorerSession): Thenable { throw ni(); } - $handleSessionClose(handle: number, closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): void { throw ni(); } + $handleSessionClose(handle: number, closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): void { throw ni(); } /** * Tasks */ - $getAllTasks(handle: number, listTasksParams: sqlops.ListTasksParams): Thenable { throw ni(); } - $cancelTask(handle: number, cancelTaskParams: sqlops.CancelTaskParams): Thenable { throw ni(); } + $getAllTasks(handle: number, listTasksParams: azdata.ListTasksParams): Thenable { throw ni(); } + $cancelTask(handle: number, cancelTaskParams: azdata.CancelTaskParams): Thenable { throw ni(); } /** * Scripting methods */ - $scriptAsOperation(handle: number, connectionUri: string, operation: sqlops.ScriptOperation, metadata: sqlops.ObjectMetadata, paramDetails: sqlops.ScriptingParamDetails): Thenable { throw ni(); } + $scriptAsOperation(handle: number, connectionUri: string, operation: azdata.ScriptOperation, metadata: azdata.ObjectMetadata, paramDetails: azdata.ScriptingParamDetails): Thenable { throw ni(); } /** * Cancels the currently running query for a URI */ - $cancelQuery(handle: number, ownerUri: string): Thenable { throw ni(); } + $cancelQuery(handle: number, ownerUri: string): Thenable { throw ni(); } /** * Runs a query for a text selection inside a document */ - $runQuery(handle: number, ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable { throw ni(); } + $runQuery(handle: number, ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable { throw ni(); } /** * Runs the current SQL statement query for a text document */ @@ -164,15 +164,15 @@ export abstract class ExtHostDataProtocolShape { /** * Runs a query for a provided query and returns result */ - $runQueryAndReturn(handle: number, ownerUri: string, queryString: string): Thenable { throw ni(); } + $runQueryAndReturn(handle: number, ownerUri: string, queryString: string): Thenable { throw ni(); } /** * Parses a T-SQL string without actually executing it */ - $parseSyntax(handle: number, ownerUri: string, query: string): Thenable { throw ni(); } + $parseSyntax(handle: number, ownerUri: string, query: string): Thenable { throw ni(); } /** * Gets a subset of rows in a result set in order to display in the UI */ - $getQueryRows(handle: number, rowData: sqlops.QueryExecuteSubsetParams): Thenable { throw ni(); } + $getQueryRows(handle: number, rowData: azdata.QueryExecuteSubsetParams): Thenable { throw ni(); } /** * Disposes the cached information regarding a query @@ -187,33 +187,33 @@ export abstract class ExtHostDataProtocolShape { /** * Callback when a query has completed */ - $onQueryComplete(handle: number, result: sqlops.QueryExecuteCompleteNotificationResult): void { throw ni(); } + $onQueryComplete(handle: number, result: azdata.QueryExecuteCompleteNotificationResult): void { throw ni(); } /** * Callback when a batch has started. This enables the UI to display when batch execution has started */ - $onBatchStart(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { throw ni(); } + $onBatchStart(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void { throw ni(); } /** * Callback when a batch is complete. This includes updated information on result sets, time to execute, and * other relevant batch information */ - $onBatchComplete(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void { throw ni(); } + $onBatchComplete(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void { throw ni(); } /** * Callback when a result set has been returned from query execution and can be displayed */ - $onResultSetAvailable(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { throw ni(); } + $onResultSetAvailable(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { throw ni(); } /** * Callback when a result set has been returned from query execution and can be displayed */ - $onResultSetUpdate(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void { throw ni(); } + $onResultSetUpdate(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void { throw ni(); } /** * Callback when a message generated during query execution is issued */ - $onQueryMessage(handle: number, message: sqlops.QueryExecuteMessageParams): void { throw ni(); } + $onQueryMessage(handle: number, message: azdata.QueryExecuteMessageParams): void { throw ni(); } /** * Requests saving of the results from a result set into a specific format (CSV, JSON, Excel) */ - $saveResults(handle: number, requestParams: sqlops.SaveResultsRequestParams): Thenable { throw ni(); } + $saveResults(handle: number, requestParams: azdata.SaveResultsRequestParams): Thenable { throw ni(); } /** * Commits all pending edits in an edit session @@ -223,7 +223,7 @@ export abstract class ExtHostDataProtocolShape { /** * Creates a new row in the edit session */ - $createRow(handle: number, ownerUri: string): Thenable { throw ni(); } + $createRow(handle: number, ownerUri: string): Thenable { throw ni(); } /** * Marks the selected row for deletion in the edit session @@ -238,7 +238,7 @@ export abstract class ExtHostDataProtocolShape { /** * Reverts any pending changes for the requested cell and returns the original value */ - $revertCell(handle: number, ownerUri: string, rowId: number, columnId: number): Thenable { throw ni(); } + $revertCell(handle: number, ownerUri: string, rowId: number, columnId: number): Thenable { throw ni(); } /** * Reverts any pending changes for the requested row @@ -248,12 +248,12 @@ export abstract class ExtHostDataProtocolShape { /** * Updates a cell value in the requested row. Returns if there are any corrections to the value */ - $updateCell(handle: number, ownerUri: string, rowId: number, columId: number, newValue: string): Thenable { throw ni(); } + $updateCell(handle: number, ownerUri: string, rowId: number, columId: number, newValue: string): Thenable { throw ni(); } /** * Gets a subset of rows in a result set, merging pending edit changes in order to display in the UI */ - $getEditRows(handle: number, rowData: sqlops.EditSubsetParams): Thenable { throw ni(); } + $getEditRows(handle: number, rowData: azdata.EditSubsetParams): Thenable { throw ni(); } /** * Diposes an initialized edit session and cleans up pending edits @@ -263,52 +263,52 @@ export abstract class ExtHostDataProtocolShape { /** * Create a new database on the provided connection */ - $createDatabase(handle: number, connectionUri: string, database: sqlops.DatabaseInfo): Thenable { throw ni(); } + $createDatabase(handle: number, connectionUri: string, database: azdata.DatabaseInfo): Thenable { throw ni(); } /** * Get the default database prototype */ - $getDefaultDatabaseInfo(handle: number, connectionUri: string): Thenable { throw ni(); } + $getDefaultDatabaseInfo(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Get the database info */ - $getDatabaseInfo(handle: number, connectionUri: string): Thenable { throw ni(); } + $getDatabaseInfo(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Create a new login on the provided connection */ - $createLogin(handle: number, connectionUri: string, login: sqlops.LoginInfo): Thenable { throw ni(); } + $createLogin(handle: number, connectionUri: string, login: azdata.LoginInfo): Thenable { throw ni(); } /** * Backup a database */ - $backup(handle: number, connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $backup(handle: number, connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } /** * Get the extended database prototype */ - $getBackupConfigInfo(handle: number, connectionUri: string): Thenable { throw ni(); } + $getBackupConfigInfo(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Restores a database */ - $restore(handle: number, connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { throw ni(); } + $restore(handle: number, connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { throw ni(); } /** * Gets a plan for restoring a database */ - $getRestorePlan(handle: number, connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { throw ni(); } + $getRestorePlan(handle: number, connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { throw ni(); } /** * Cancels a plan */ - $cancelRestorePlan(handle: number, connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable { throw ni(); } + $cancelRestorePlan(handle: number, connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable { throw ni(); } /** * Gets restore config Info */ - $getRestoreConfigInfo(handle: number, connectionUri: string): Thenable { throw ni(); } + $getRestoreConfigInfo(handle: number, connectionUri: string): Thenable { throw ni(); } /** @@ -330,7 +330,7 @@ export abstract class ExtHostDataProtocolShape { /** * Close file browser */ - $closeFileBrowser(handle: number, ownerUri: string): Thenable { throw ni(); } + $closeFileBrowser(handle: number, ownerUri: string): Thenable { throw ni(); } /** * Profiler Provider methods @@ -339,7 +339,7 @@ export abstract class ExtHostDataProtocolShape { /** * Create a profiler session */ - $createSession(handle: number, sessionId: string, createStatement: string, template: sqlops.ProfilerSessionTemplate): Thenable { throw ni(); } + $createSession(handle: number, sessionId: string, createStatement: string, template: azdata.ProfilerSessionTemplate): Thenable { throw ni(); } /** * Start a profiler session @@ -369,92 +369,92 @@ export abstract class ExtHostDataProtocolShape { /** * Get Agent Job list */ - $getJobs(handle: number, ownerUri: string): Thenable { throw ni(); } + $getJobs(handle: number, ownerUri: string): Thenable { throw ni(); } /** * Get a Agent Job's history */ - $getJobHistory(handle: number, ownerUri: string, jobID: string, jobName: string): Thenable { throw ni(); } + $getJobHistory(handle: number, ownerUri: string, jobID: string, jobName: string): Thenable { throw ni(); } /** * Run an action on a Job */ - $jobAction(handle: number, ownerUri: string, jobName: string, action: string): Thenable { throw ni(); } + $jobAction(handle: number, ownerUri: string, jobName: string, action: string): Thenable { throw ni(); } /** * Deletes a job */ - $deleteJob(handle: number, ownerUri: string, job: sqlops.AgentJobInfo): Thenable { throw ni(); } + $deleteJob(handle: number, ownerUri: string, job: azdata.AgentJobInfo): Thenable { throw ni(); } /** * Deletes a job step */ - $deleteJobStep(handle: number, ownerUri: string, step: sqlops.AgentJobStepInfo): Thenable { throw ni(); } + $deleteJobStep(handle: number, ownerUri: string, step: azdata.AgentJobStepInfo): Thenable { throw ni(); } /** * Get Agent Alerts list */ - $getAlerts(handle: number, connectionUri: string): Thenable { throw ni(); } + $getAlerts(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Deletes an alert */ - $deleteAlert(handle: number, connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable { throw ni(); } + $deleteAlert(handle: number, connectionUri: string, alert: azdata.AgentAlertInfo): Thenable { throw ni(); } /** * Get Agent Oeprators list */ - $getOperators(handle: number, connectionUri: string): Thenable { throw ni(); } + $getOperators(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Deletes an operator */ - $deleteOperator(handle: number, connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable { throw ni(); } + $deleteOperator(handle: number, connectionUri: string, operator: azdata.AgentOperatorInfo): Thenable { throw ni(); } /** * Get Agent Proxies list */ - $getProxies(handle: number, connectionUri: string): Thenable { throw ni(); } + $getProxies(handle: number, connectionUri: string): Thenable { throw ni(); } /** * Deletes a proxy */ - $deleteProxy(handle: number, connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable { throw ni(); } + $deleteProxy(handle: number, connectionUri: string, proxy: azdata.AgentProxyInfo): Thenable { throw ni(); } /** * Get Agent Credentials list */ - $getCredentials(handle: number, connectionUri: string): Thenable { throw ni(); } + $getCredentials(handle: number, connectionUri: string): Thenable { throw ni(); } /** * DacFx export bacpac */ - $exportBacpac(handle: number, databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $exportBacpac(handle: number, databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } /** * DacFx import bacpac */ - $importBacpac(handle: number, packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $importBacpac(handle: number, packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } /** * DacFx extract dacpac */ - $extractDacpac(handle: number, databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $extractDacpac(handle: number, databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } /** * DacFx deploy dacpac */ - $deployDacpac(handle: number, packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $deployDacpac(handle: number, packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } /** * DacFx generate deploy script */ - $generateDeployScript(handle: number, packageFilePath: string, databaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $generateDeployScript(handle: number, packageFilePath: string, databaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } /** * DacFx generate deploy plan */ - $generateDeployPlan(handle: number, packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable { throw ni(); } + $generateDeployPlan(handle: number, packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable { throw ni(); } } @@ -465,12 +465,12 @@ export abstract class ExtHostResourceProviderShape { /** * Create a firewall rule */ - $createFirewallRule(handle: number, account: sqlops.Account, firewallRuleInfo: sqlops.FirewallRuleInfo): Thenable { throw ni(); } + $createFirewallRule(handle: number, account: azdata.Account, firewallRuleInfo: azdata.FirewallRuleInfo): Thenable { throw ni(); } /** * Handle firewall rule */ - $handleFirewallRule(handle: number, errorCode: number, errorMessage: string, connectionTypeId: string): Thenable { throw ni(); } + $handleFirewallRule(handle: number, errorCode: number, errorMessage: string, connectionTypeId: string): Thenable { throw ni(); } } @@ -480,7 +480,7 @@ export abstract class ExtHostResourceProviderShape { export abstract class ExtHostCredentialManagementShape { $saveCredential(credentialId: string, password: string): Thenable { throw ni(); } - $readCredential(credentialId: string): Thenable { throw ni(); } + $readCredential(credentialId: string): Thenable { throw ni(); } $deleteCredential(credentialId: string): Thenable { throw ni(); } } @@ -489,23 +489,23 @@ export abstract class ExtHostCredentialManagementShape { * Serialization provider extension host class. */ export abstract class ExtHostSerializationProviderShape { - $saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { throw ni(); } + $saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable { throw ni(); } } export interface MainThreadAccountManagementShape extends IDisposable { - $registerAccountProvider(providerMetadata: sqlops.AccountProviderMetadata, handle: number): Thenable; + $registerAccountProvider(providerMetadata: azdata.AccountProviderMetadata, handle: number): Thenable; $unregisterAccountProvider(handle: number): Thenable; $beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable; $endAutoOAuthDeviceCode(): void; - $accountUpdated(updatedAccount: sqlops.Account): void; + $accountUpdated(updatedAccount: azdata.Account): void; - $getAccountsForProvider(providerId: string): Thenable; + $getAccountsForProvider(providerId: string): Thenable; } export interface MainThreadResourceProviderShape extends IDisposable { - $registerResourceProvider(providerMetadata: sqlops.ResourceProviderMetadata, handle: number): Thenable; + $registerResourceProvider(providerMetadata: azdata.ResourceProviderMetadata, handle: number): Thenable; $unregisterResourceProvider(handle: number): Thenable; } @@ -526,27 +526,27 @@ export interface MainThreadDataProtocolShape extends IDisposable { $registerAgentServicesProvider(providerId: string, handle: number): TPromise; $registerDacFxServicesProvider(providerId: string, handle: number): TPromise; $unregisterProvider(handle: number): TPromise; - $onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void; + $onConnectionComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void; $onIntelliSenseCacheComplete(handle: number, connectionUri: string): void; - $onConnectionChangeNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void; - $onQueryComplete(handle: number, result: sqlops.QueryExecuteCompleteNotificationResult): void; - $onBatchStart(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void; - $onBatchComplete(handle: number, batchInfo: sqlops.QueryExecuteBatchNotificationParams): void; - $onResultSetAvailable(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void; - $onResultSetUpdated(handle: number, resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void; - $onQueryMessage(handle: number, message: sqlops.QueryExecuteMessageParams): void; - $onObjectExplorerSessionCreated(handle: number, message: sqlops.ObjectExplorerSession): void; - $onObjectExplorerSessionDisconnected(handle: number, message: sqlops.ObjectExplorerSession): void; - $onObjectExplorerNodeExpanded(providerId: string, message: sqlops.ObjectExplorerExpandInfo): void; - $onTaskCreated(handle: number, sessionResponse: sqlops.TaskInfo): void; - $onTaskStatusChanged(handle: number, sessionResponse: sqlops.TaskProgressInfo): void; - $onFileBrowserOpened(handle: number, response: sqlops.FileBrowserOpenedParams): void; - $onFolderNodeExpanded(handle: number, response: sqlops.FileBrowserExpandedParams): void; - $onFilePathsValidated(handle: number, response: sqlops.FileBrowserValidatedParams): void; - $onScriptingComplete(handle: number, message: sqlops.ScriptingCompleteResult): void; - $onSessionEventsAvailable(handle: number, response: sqlops.ProfilerSessionEvents): void; - $onSessionStopped(handle: number, response: sqlops.ProfilerSessionStoppedParams): void; - $onProfilerSessionCreated(handle: number, response: sqlops.ProfilerSessionCreatedParams): void; + $onConnectionChangeNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void; + $onQueryComplete(handle: number, result: azdata.QueryExecuteCompleteNotificationResult): void; + $onBatchStart(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void; + $onBatchComplete(handle: number, batchInfo: azdata.QueryExecuteBatchNotificationParams): void; + $onResultSetAvailable(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void; + $onResultSetUpdated(handle: number, resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void; + $onQueryMessage(handle: number, message: azdata.QueryExecuteMessageParams): void; + $onObjectExplorerSessionCreated(handle: number, message: azdata.ObjectExplorerSession): void; + $onObjectExplorerSessionDisconnected(handle: number, message: azdata.ObjectExplorerSession): void; + $onObjectExplorerNodeExpanded(providerId: string, message: azdata.ObjectExplorerExpandInfo): void; + $onTaskCreated(handle: number, sessionResponse: azdata.TaskInfo): void; + $onTaskStatusChanged(handle: number, sessionResponse: azdata.TaskProgressInfo): void; + $onFileBrowserOpened(handle: number, response: azdata.FileBrowserOpenedParams): void; + $onFolderNodeExpanded(handle: number, response: azdata.FileBrowserExpandedParams): void; + $onFilePathsValidated(handle: number, response: azdata.FileBrowserValidatedParams): void; + $onScriptingComplete(handle: number, message: azdata.ScriptingCompleteResult): void; + $onSessionEventsAvailable(handle: number, response: azdata.ProfilerSessionEvents): void; + $onSessionStopped(handle: number, response: azdata.ProfilerSessionStoppedParams): void; + $onProfilerSessionCreated(handle: number, response: azdata.ProfilerSessionCreatedParams): void; $onJobDataUpdated(handle: Number): void; /** @@ -556,15 +556,15 @@ export interface MainThreadDataProtocolShape extends IDisposable { } export interface MainThreadConnectionManagementShape extends IDisposable { - $getActiveConnections(): Thenable; - $getCurrentConnection(): Thenable; + $getActiveConnections(): Thenable; + $getCurrentConnection(): Thenable; $getCredentials(connectionId: string): Thenable<{ [name: string]: string }>; - $getServerInfo(connectedId: string): Thenable; - $openConnectionDialog(providers: string[], initialConnectionProfile?: sqlops.IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Thenable; + $getServerInfo(connectedId: string): Thenable; + $openConnectionDialog(providers: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable; $listDatabases(connectionId: string): Thenable; $getConnectionString(connectionId: string, includePassword: boolean): Thenable; $getUriForConnection(connectionId: string): Thenable; - $connect(connectionProfile: sqlops.IConnectionProfile): Thenable; + $connect(connectionProfile: azdata.IConnectionProfile): Thenable; } export interface MainThreadCredentialManagementShape extends IDisposable { @@ -630,8 +630,8 @@ export interface MainThreadDashboardShape extends IDisposable { } export interface ExtHostDashboardShape { - $onDidOpenDashboard(dashboard: sqlops.DashboardDocument): void; - $onDidChangeToDashboard(dashboard: sqlops.DashboardDocument): void; + $onDidOpenDashboard(dashboard: azdata.DashboardDocument): void; + $onDidChangeToDashboard(dashboard: azdata.DashboardDocument): void; } export interface MainThreadModalDialogShape extends IDisposable { @@ -659,10 +659,10 @@ export interface MainThreadTasksShape extends IDisposable { } export interface ExtHostDashboardWebviewsShape { - $registerProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void): void; + $registerProvider(widgetId: string, handler: (webview: azdata.DashboardWebview) => void): void; $onMessage(handle: number, message: any): void; $onClosed(handle: number): void; - $registerWidget(handle: number, id: string, connection: sqlops.connection.Connection, serverInfo: sqlops.ServerInfo): void; + $registerWidget(handle: number, id: string, connection: azdata.connection.Connection, serverInfo: azdata.ServerInfo): void; } export interface MainThreadDashboardWebviewShape extends IDisposable { @@ -672,16 +672,16 @@ export interface MainThreadDashboardWebviewShape extends IDisposable { } export interface ExtHostModelViewShape { - $registerProvider(widgetId: string, handler: (webview: sqlops.ModelView) => void, extension: IExtensionDescription): void; + $registerProvider(widgetId: string, handler: (webview: azdata.ModelView) => void, extension: IExtensionDescription): void; $onClosed(handle: number): void; - $registerWidget(handle: number, id: string, connection: sqlops.connection.Connection, serverInfo: sqlops.ServerInfo): void; + $registerWidget(handle: number, id: string, connection: azdata.connection.Connection, serverInfo: azdata.ServerInfo): void; $handleEvent(handle: number, id: string, eventArgs: any); $runCustomValidations(handle: number, id: string): Thenable; } export interface ExtHostModelViewTreeViewsShape { $getChildren(treeViewId: string, treeItemHandle?: string): TPromise; - $createTreeView(handle: number, componentId: string, options: { treeDataProvider: vscode.TreeDataProvider }, extension: IExtensionDescription): sqlops.TreeComponentView; + $createTreeView(handle: number, componentId: string, options: { treeDataProvider: vscode.TreeDataProvider }, extension: IExtensionDescription): azdata.TreeComponentView; $onNodeCheckedChanged(treeViewId: string, treeItemHandle?: string, checked?: boolean): void; $onNodeSelected(treeViewId: string, nodes: string[]): void; @@ -693,13 +693,13 @@ export interface ExtHostModelViewTreeViewsShape { export interface ExtHostBackgroundTaskManagementShape { $onTaskRegistered(operationId: string): void; $onTaskCanceled(operationId: string): void; - $registerTask(operationInfo: sqlops.BackgroundOperationInfo): void; + $registerTask(operationInfo: azdata.BackgroundOperationInfo): void; $removeTask(operationId: string): void; } export interface MainThreadBackgroundTaskManagementShape extends IDisposable { - $registerTask(taskInfo: sqlops.TaskInfo): void; - $updateTask(taskProgressInfo: sqlops.TaskProgressInfo): void; + $registerTask(taskInfo: azdata.TaskInfo): void; + $updateTask(taskProgressInfo: azdata.TaskProgressInfo): void; } export interface MainThreadModelViewShape extends IDisposable { @@ -720,30 +720,30 @@ export interface ExtHostObjectExplorerShape { } export interface MainThreadObjectExplorerShape extends IDisposable { - $getNode(connectionId: string, nodePath?: string): Thenable; - $getActiveConnectionNodes(): Thenable<{ nodeInfo: sqlops.NodeInfo, connectionId: string }[]>; + $getNode(connectionId: string, nodePath?: string): Thenable; + $getActiveConnectionNodes(): Thenable<{ nodeInfo: azdata.NodeInfo, connectionId: string }[]>; $setExpandedState(connectionId: string, nodePath: string, expandedState: vscode.TreeItemCollapsibleState): Thenable; $setSelected(connectionId: string, nodePath: string, selected: boolean, clearOtherSelections?: boolean): Thenable; - $getChildren(connectionId: string, nodePath: string): Thenable; + $getChildren(connectionId: string, nodePath: string): Thenable; $isExpanded(connectionId: string, nodePath: string): Thenable; - $findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable; - $refresh(connectionId: string, nodePath: string): Thenable; + $findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames: string[]): Thenable; + $refresh(connectionId: string, nodePath: string): Thenable; $getNodeActions(connectionId: string, nodePath: string): Thenable; - $getSessionConnectionProfile(sessionId: string): Thenable; + $getSessionConnectionProfile(sessionId: string): Thenable; } export interface ExtHostModelViewDialogShape { $onButtonClick(handle: number): void; $onPanelValidityChanged(handle: number, valid: boolean): void; - $onWizardPageChanged(handle: number, info: sqlops.window.WizardPageChangeInfo): void; + $onWizardPageChanged(handle: number, info: azdata.window.WizardPageChangeInfo): void; $updateWizardPageInfo(handle: number, pageHandles: number[], currentPageIndex: number): void; - $validateNavigation(handle: number, info: sqlops.window.WizardPageChangeInfo): Thenable; + $validateNavigation(handle: number, info: azdata.window.WizardPageChangeInfo): Thenable; $validateDialogClose(handle: number): Thenable; $handleSave(handle: number): Thenable; } export interface MainThreadModelViewDialogShape extends IDisposable { - $openEditor(handle: number, modelViewId: string, title: string, options?: sqlops.ModelViewEditorOptions, position?: vscode.ViewColumn): Thenable; + $openEditor(handle: number, modelViewId: string, title: string, options?: azdata.ModelViewEditorOptions, position?: vscode.ViewColumn): Thenable; $openDialog(handle: number, dialogName?: string): Thenable; $closeDialog(handle: number): Thenable; $setDialogDetails(handle: number, details: IModelViewDialogDetails): Thenable; @@ -782,35 +782,35 @@ export interface ExtHostNotebookShape { $doStopServer(managerHandle: number): Thenable; // Content Manager APIs - $getNotebookContents(managerHandle: number, notebookUri: UriComponents): Thenable; - $save(managerHandle: number, notebookUri: UriComponents, notebook: sqlops.nb.INotebookContents): Thenable; + $getNotebookContents(managerHandle: number, notebookUri: UriComponents): Thenable; + $save(managerHandle: number, notebookUri: UriComponents, notebook: azdata.nb.INotebookContents): Thenable; // Session Manager APIs - $refreshSpecs(managerHandle: number): Thenable; - $startNewSession(managerHandle: number, options: sqlops.nb.ISessionOptions): Thenable; + $refreshSpecs(managerHandle: number): Thenable; + $startNewSession(managerHandle: number, options: azdata.nb.ISessionOptions): Thenable; $shutdownSession(managerHandle: number, sessionId: string): Thenable; // Session APIs - $changeKernel(sessionId: number, kernelInfo: sqlops.nb.IKernelSpec): Thenable; - $configureKernel(sessionId: number, kernelInfo: sqlops.nb.IKernelSpec): Thenable; - $configureConnection(sessionId: number, connection: sqlops.IConnectionProfile): Thenable; + $changeKernel(sessionId: number, kernelInfo: azdata.nb.IKernelSpec): Thenable; + $configureKernel(sessionId: number, kernelInfo: azdata.nb.IKernelSpec): Thenable; + $configureConnection(sessionId: number, connection: azdata.IConnectionProfile): Thenable; // Kernel APIs - $getKernelReadyStatus(kernelId: number): Thenable; - $getKernelSpec(kernelId: number): Thenable; - $requestComplete(kernelId: number, content: sqlops.nb.ICompleteRequest): Thenable; - $requestExecute(kernelId: number, content: sqlops.nb.IExecuteRequest, disposeOnDone?: boolean): Thenable; + $getKernelReadyStatus(kernelId: number): Thenable; + $getKernelSpec(kernelId: number): Thenable; + $requestComplete(kernelId: number, content: azdata.nb.ICompleteRequest): Thenable; + $requestExecute(kernelId: number, content: azdata.nb.IExecuteRequest, disposeOnDone?: boolean): Thenable; $interruptKernel(kernelId: number): Thenable; // Future APIs - $sendInputReply(futureId: number, content: sqlops.nb.IInputReply): void; + $sendInputReply(futureId: number, content: azdata.nb.IInputReply): void; $disposeFuture(futureId: number): void; } export interface MainThreadNotebookShape extends IDisposable { $registerNotebookProvider(providerId: string, handle: number): void; $unregisterNotebookProvider(handle: number): void; - $onFutureMessage(futureId: number, type: FutureMessageType, payload: sqlops.nb.IMessage): void; + $onFutureMessage(futureId: number, type: FutureMessageType, payload: azdata.nb.IMessage): void; $onFutureDone(futureId: number, done: INotebookFutureDone): void; } @@ -827,7 +827,7 @@ export interface INotebookModelAddedData { providerId: string; providers: string[]; isDirty: boolean; - cells: sqlops.nb.NotebookCell[]; + cells: azdata.nb.NotebookCell[]; } export interface INotebookModelChangedData { @@ -835,8 +835,8 @@ export interface INotebookModelChangedData { providerId: string; providers: string[]; isDirty: boolean; - cells: sqlops.nb.NotebookCell[]; - kernelSpec: sqlops.nb.IKernelSpec; + cells: azdata.nb.NotebookCell[]; + kernelSpec: azdata.nb.IKernelSpec; } export interface INotebookEditorAddData { @@ -851,7 +851,7 @@ export interface INotebookShowOptions { preview?: boolean; providerId?: string; connectionId?: string; - defaultKernel?: sqlops.nb.IKernelSpec; + defaultKernel?: azdata.nb.IKernelSpec; } export interface ExtHostNotebookDocumentsAndEditorsShape { diff --git a/src/sql/workbench/browser/modal/dialogHelper.ts b/src/sql/workbench/browser/modal/dialogHelper.ts index 174e39f45f..630cd1cc6b 100644 --- a/src/sql/workbench/browser/modal/dialogHelper.ts +++ b/src/sql/workbench/browser/modal/dialogHelper.ts @@ -10,7 +10,7 @@ import { Button } from 'sql/base/browser/ui/button/button'; import { Builder } from 'sql/base/browser/builder'; import * as types from 'vs/base/common/types'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export function appendRow(container: Builder, label: string, labelClass: string, cellContainerClass: string, rowContainerClass?: string): Builder { let cellContainer: Builder; @@ -62,7 +62,7 @@ export function getBooleanValueFromStringOrBoolean(value: any): boolean { return false; } -export function getCategoryDisplayName(categories: sqlops.CategoryValue[], categoryName: string) { +export function getCategoryDisplayName(categories: azdata.CategoryValue[], categoryName: string) { var displayName: string; categories.forEach(c => { if (c.name === categoryName) { @@ -72,7 +72,7 @@ export function getCategoryDisplayName(categories: sqlops.CategoryValue[], categ return displayName; } -export function getCategoryName(categories: sqlops.CategoryValue[], categoryDisplayName: string) { +export function getCategoryName(categories: azdata.CategoryValue[], categoryDisplayName: string) { var categoryName: string; categories.forEach(c => { if (c.displayName === categoryDisplayName) { diff --git a/src/sql/workbench/browser/modal/optionsDialog.ts b/src/sql/workbench/browser/modal/optionsDialog.ts index 676956f5e4..396f18b3da 100644 --- a/src/sql/workbench/browser/modal/optionsDialog.ts +++ b/src/sql/workbench/browser/modal/optionsDialog.ts @@ -14,7 +14,7 @@ import { attachButtonStyler, attachModalDialogStyler, attachPanelStyler } from ' import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { Event, Emitter } from 'vs/base/common/event'; @@ -152,9 +152,9 @@ export class OptionsDialog extends Modal { this._optionDescription.text(option.description); } - private fillInOptions(container: Builder, options: sqlops.ServiceOption[]): void { + private fillInOptions(container: Builder, options: azdata.ServiceOption[]): void { for (let i = 0; i < options.length; i++) { - let option: sqlops.ServiceOption = options[i]; + let option: azdata.ServiceOption = options[i]; let rowContainer = DialogHelper.appendRow(container, option.displayName, 'optionsDialog-label', 'optionsDialog-input'); OptionsDialogHelper.createOptionElement(option, rowContainer, this._optionValues, this._optionElements, this._contextViewService, (name) => this.onOptionLinkClicked(name)); } @@ -219,7 +219,7 @@ export class OptionsDialog extends Modal { this._onCloseEvent.fire(); } - public open(options: sqlops.ServiceOption[], optionValues: { [name: string]: any }) { + public open(options: azdata.ServiceOption[], optionValues: { [name: string]: any }) { this._optionValues = optionValues; let firstOption: string; let containerGroup: Builder; @@ -230,7 +230,7 @@ export class OptionsDialog extends Modal { this.splitview = new ScrollableSplitView(containerGroup.getHTMLElement(), { enableResizing: false, scrollDebounce: 0 }); let categoryMap = OptionsDialogHelper.groupOptionsByCategory(options); for (let category in categoryMap) { - let serviceOptions: sqlops.ServiceOption[] = categoryMap[category]; + let serviceOptions: azdata.ServiceOption[] = categoryMap[category]; let bodyContainer = $().element('table', { class: 'optionsDialog-table' }, (tableContainer: Builder) => { this.fillInOptions(tableContainer, serviceOptions); }); diff --git a/src/sql/workbench/browser/modal/optionsDialogHelper.ts b/src/sql/workbench/browser/modal/optionsDialogHelper.ts index ffd437e1e0..6d9d44207a 100644 --- a/src/sql/workbench/browser/modal/optionsDialogHelper.ts +++ b/src/sql/workbench/browser/modal/optionsDialogHelper.ts @@ -12,17 +12,17 @@ import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import * as types from 'vs/base/common/types'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { localize } from 'vs/nls'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; export interface IOptionElement { optionWidget: any; - option: sqlops.ServiceOption; + option: azdata.ServiceOption; optionValue: any; } -export function createOptionElement(option: sqlops.ServiceOption, rowContainer: Builder, options: { [name: string]: any }, +export function createOptionElement(option: azdata.ServiceOption, rowContainer: Builder, options: { [name: string]: any }, optionsMap: { [optionName: string]: IOptionElement }, contextViewService: IContextViewService, onFocus: (name) => void): void { let possibleInputs: string[] = []; let optionValue = getOptionValueAndCategoryValues(option, options, possibleInputs); @@ -69,7 +69,7 @@ export function createOptionElement(option: sqlops.ServiceOption, rowContainer: inputElement.onfocus = () => onFocus(option.name); } -export function getOptionValueAndCategoryValues(option: sqlops.ServiceOption, options: { [optionName: string]: any }, possibleInputs: string[]): any { +export function getOptionValueAndCategoryValues(option: azdata.ServiceOption, options: { [optionName: string]: any }, possibleInputs: string[]): any { var optionValue = option.defaultValue; if (options[option.name]) { // if the value type is boolean, the option value can be either boolean or string @@ -161,8 +161,8 @@ export function findElement(container: Builder, className: string): HTMLElement return elementBuilder.getHTMLElement(); } -export function groupOptionsByCategory(options: sqlops.ServiceOption[]): { [category: string]: sqlops.ServiceOption[] } { - var connectionOptionsMap: { [category: string]: sqlops.ServiceOption[] } = {}; +export function groupOptionsByCategory(options: azdata.ServiceOption[]): { [category: string]: azdata.ServiceOption[] } { + var connectionOptionsMap: { [category: string]: azdata.ServiceOption[] } = {}; options.forEach(option => { var groupName = option.groupName; if (groupName === null || groupName === undefined) { diff --git a/src/sql/workbench/common/actions.ts b/src/sql/workbench/common/actions.ts index 684ed542c8..4be05406dc 100644 --- a/src/sql/workbench/common/actions.ts +++ b/src/sql/workbench/common/actions.ts @@ -19,7 +19,7 @@ import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/co import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; -import { ObjectMetadata } from 'sqlops'; +import { ObjectMetadata } from 'azdata'; import { Action } from 'vs/base/common/actions'; import { IWindowsService } from 'vs/platform/windows/common/windows'; diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index 751f8f8f29..05de9747df 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/src/sql/workbench/common/taskUtilities.ts @@ -27,7 +27,7 @@ import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import Severity from 'vs/base/common/severity'; import * as nls from 'vs/nls'; @@ -139,10 +139,10 @@ export function connectIfNotAlreadyConnected(connectionProfile: IConnectionProfi /** * Select the top rows from an object */ -export function scriptSelect(connectionProfile: IConnectionProfile, metadata: sqlops.ObjectMetadata, connectionService: IConnectionManagementService, queryEditorService: IQueryEditorService, scriptingService: IScriptingService): Promise { +export function scriptSelect(connectionProfile: IConnectionProfile, metadata: azdata.ObjectMetadata, connectionService: IConnectionManagementService, queryEditorService: IQueryEditorService, scriptingService: IScriptingService): Promise { return new Promise((resolve, reject) => { connectionService.connectIfNotConnected(connectionProfile).then(connectionResult => { - let paramDetails: sqlops.ScriptingParamDetails = getScriptingParamDetails(connectionService, connectionResult, metadata); + let paramDetails: azdata.ScriptingParamDetails = getScriptingParamDetails(connectionService, connectionResult, metadata); scriptingService.script(connectionResult, metadata, ScriptOperation.Select, paramDetails).then(result => { if (result.script) { queryEditorService.newSqlEditor(result.script).then((owner: IConnectableInput) => { @@ -174,10 +174,10 @@ export function scriptSelect(connectionProfile: IConnectionProfile, metadata: sq /** * Opens a new Edit Data session */ -export function scriptEditSelect(connectionProfile: IConnectionProfile, metadata: sqlops.ObjectMetadata, connectionService: IConnectionManagementService, queryEditorService: IQueryEditorService, scriptingService: IScriptingService): Promise { +export function scriptEditSelect(connectionProfile: IConnectionProfile, metadata: azdata.ObjectMetadata, connectionService: IConnectionManagementService, queryEditorService: IQueryEditorService, scriptingService: IScriptingService): Promise { return new Promise((resolve, reject) => { connectionService.connectIfNotConnected(connectionProfile).then(connectionResult => { - let paramDetails: sqlops.ScriptingParamDetails = getScriptingParamDetails(connectionService, connectionResult, metadata); + let paramDetails: azdata.ScriptingParamDetails = getScriptingParamDetails(connectionService, connectionResult, metadata); scriptingService.script(connectionResult, metadata, ScriptOperation.Select, paramDetails).then(result => { if (result.script) { queryEditorService.newEditDataEditor(metadata.schema, metadata.name, result.script).then((owner: EditDataInput) => { @@ -209,7 +209,7 @@ export function scriptEditSelect(connectionProfile: IConnectionProfile, metadata /** * Script the object as a statement based on the provided action (except Select) */ -export function script(connectionProfile: IConnectionProfile, metadata: sqlops.ObjectMetadata, +export function script(connectionProfile: IConnectionProfile, metadata: azdata.ObjectMetadata, connectionService: IConnectionManagementService, queryEditorService: IQueryEditorService, scriptingService: IScriptingService, @@ -437,9 +437,9 @@ function getStartPos(script: string, operation: ScriptOperation, typeName: strin } -function getScriptingParamDetails(connectionService: IConnectionManagementService, ownerUri: string, metadata: sqlops.ObjectMetadata): sqlops.ScriptingParamDetails { - let serverInfo: sqlops.ServerInfo = getServerInfo(connectionService, ownerUri); - let paramDetails: sqlops.ScriptingParamDetails = { +function getScriptingParamDetails(connectionService: IConnectionManagementService, ownerUri: string, metadata: azdata.ObjectMetadata): azdata.ScriptingParamDetails { + let serverInfo: azdata.ServerInfo = getServerInfo(connectionService, ownerUri); + let paramDetails: azdata.ScriptingParamDetails = { filePath: getFilePath(metadata), scriptCompatibilityOption: scriptCompatibilityOptionMap[serverInfo.serverMajorVersion], targetDatabaseEngineEdition: targetDatabaseEngineEditionMap[serverInfo.engineEditionId], @@ -448,7 +448,7 @@ function getScriptingParamDetails(connectionService: IConnectionManagementServic return paramDetails; } -function getFilePath(metadata: sqlops.ObjectMetadata): string { +function getFilePath(metadata: azdata.ObjectMetadata): string { let schemaName: string = metadata.schema; let objectName: string = metadata.name; let timestamp = Date.now().toString(); @@ -459,7 +459,7 @@ function getFilePath(metadata: sqlops.ObjectMetadata): string { } } -function getServerInfo(connectionService: IConnectionManagementService, ownerUri: string): sqlops.ServerInfo { +function getServerInfo(connectionService: IConnectionManagementService, ownerUri: string): azdata.ServerInfo { let connection: ConnectionManagementInfo = connectionService.getConnectionInfo(ownerUri); return connection.serverInfo; } \ No newline at end of file diff --git a/src/sql/workbench/common/views.ts b/src/sql/workbench/common/views.ts index 5e8f0adc67..07186ec3ef 100644 --- a/src/sql/workbench/common/views.ts +++ b/src/sql/workbench/common/views.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ITreeViewDataProvider, ITreeItem as vsITreeItem } from 'vs/workbench/common/views'; -import { IConnectionProfile } from 'sqlops'; +import { IConnectionProfile } from 'azdata'; export interface ITreeComponentItem extends vsITreeItem { checked?: boolean; diff --git a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts b/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts index 7fa67880b9..2f5cee6027 100644 --- a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts +++ b/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts @@ -10,12 +10,12 @@ import { localize } from 'vs/nls'; import { Event, Emitter } from 'vs/base/common/event'; import { deepClone } from 'vs/base/common/objects'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export interface ConnectionProviderProperties { providerId: string; displayName: string; - connectionOptions: sqlops.ConnectionOption[]; + connectionOptions: azdata.ConnectionOption[]; } export const Extensions = { diff --git a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts index 6b21f39117..636ecf3b66 100644 --- a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts +++ b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as platform from 'vs/platform/registry/common/platform'; import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar'; import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar'; @@ -40,8 +40,8 @@ export class AccountManagementService implements IAccountManagementService { private _addAccountProviderEmitter: Emitter; public get addAccountProviderEvent(): Event { return this._addAccountProviderEmitter.event; } - private _removeAccountProviderEmitter: Emitter; - public get removeAccountProviderEvent(): Event { return this._removeAccountProviderEmitter.event; } + private _removeAccountProviderEmitter: Emitter; + public get removeAccountProviderEvent(): Event { return this._removeAccountProviderEmitter.event; } private _updateAccountListEmitter: Emitter; public get updateAccountListEvent(): Event { return this._updateAccountListEmitter.event; } @@ -62,7 +62,7 @@ export class AccountManagementService implements IAccountManagementService { // Setup the event emitters this._addAccountProviderEmitter = new Emitter(); - this._removeAccountProviderEmitter = new Emitter(); + this._removeAccountProviderEmitter = new Emitter(); this._updateAccountListEmitter = new Emitter(); // Register status bar item @@ -88,7 +88,7 @@ export class AccountManagementService implements IAccountManagementService { * account's properties have been updated (usually when the account goes stale). * @param {Account} updatedAccount Account with the updated properties */ - public accountUpdated(updatedAccount: sqlops.Account): Thenable { + public accountUpdated(updatedAccount: azdata.Account): Thenable { let self = this; // 1) Update the account in the store @@ -156,7 +156,7 @@ export class AccountManagementService implements IAccountManagementService { * @param {Account} account account to refresh * @return {Thenable} Promise to return an account */ - public refreshAccount(account: sqlops.Account): Thenable { + public refreshAccount(account: azdata.Account): Thenable { let self = this; return this.doWithProvider(account.key.providerId, (provider) => { @@ -187,7 +187,7 @@ export class AccountManagementService implements IAccountManagementService { * Retrieves metadata of all providers that have been registered * @returns {Thenable} Registered account providers */ - public getAccountProviderMetadata(): Thenable { + public getAccountProviderMetadata(): Thenable { return Promise.resolve(Object.values(this._providers).map(provider => provider.metadata)); } @@ -196,7 +196,7 @@ export class AccountManagementService implements IAccountManagementService { * @param {string} providerId ID of the provider the returned accounts belong to * @returns {Thenable} Promise to return a list of accounts */ - public getAccountsForProvider(providerId: string): Thenable { + public getAccountsForProvider(providerId: string): Thenable { let self = this; // 1) Get the accounts from the store @@ -213,10 +213,10 @@ export class AccountManagementService implements IAccountManagementService { /** * Generates a security token by asking the account's provider * @param {Account} account Account to generate security token for - * @param {sqlops.AzureResource} resource The resource to get the security token for + * @param {azdata.AzureResource} resource The resource to get the security token for * @return {Thenable<{}>} Promise to return the security token */ - public getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> { + public getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> { return this.doWithProvider(account.key.providerId, provider => { return provider.provider.getSecurityToken(account, resource); }); @@ -228,7 +228,7 @@ export class AccountManagementService implements IAccountManagementService { * @returns {Thenable} Promise with result of account removal, true if account was * removed, false otherwise. */ - public removeAccount(accountKey: sqlops.AccountKey): Thenable { + public removeAccount(accountKey: azdata.AccountKey): Thenable { let self = this; // Step 1) Remove the account @@ -323,10 +323,10 @@ export class AccountManagementService implements IAccountManagementService { // SERVICE MANAGEMENT METHODS ////////////////////////////////////////// /** * Called by main thread to register an account provider from extension - * @param {sqlops.AccountProviderMetadata} providerMetadata Metadata of the provider that is being registered - * @param {sqlops.AccountProvider} provider References to the methods of the provider + * @param {azdata.AccountProviderMetadata} providerMetadata Metadata of the provider that is being registered + * @param {azdata.AccountProvider} provider References to the methods of the provider */ - public registerProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): Thenable { + public registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): Thenable { let self = this; // Store the account provider @@ -343,10 +343,10 @@ export class AccountManagementService implements IAccountManagementService { // 4) Write the accounts back to the store // 5) Fire the event to let folks know we have another account provider now return this._accountStore.getAccountsByProvider(providerMetadata.id) - .then((accounts: sqlops.Account[]) => { + .then((accounts: azdata.Account[]) => { return provider.initialize(accounts); }) - .then((accounts: sqlops.Account[]) => { + .then((accounts: azdata.Account[]) => { self._providers[providerMetadata.id].accounts = accounts; let writePromises = accounts.map(account => { return self._accountStore.addOrUpdate(account); @@ -373,7 +373,7 @@ export class AccountManagementService implements IAccountManagementService { } } - public unregisterProvider(providerMetadata: sqlops.AccountProviderMetadata): void { + public unregisterProvider(providerMetadata: azdata.AccountProviderMetadata): void { // Delete this account provider delete this._providers[providerMetadata.id]; @@ -404,7 +404,7 @@ export class AccountManagementService implements IAccountManagementService { private fireAccountListUpdate(provider: AccountProviderWithMetadata, sort: boolean) { // Step 1) Get and sort the list if (sort) { - provider.accounts.sort((a: sqlops.Account, b: sqlops.Account) => { + provider.accounts.sort((a: azdata.Account, b: azdata.Account) => { if (a.displayInfo.displayName < b.displayInfo.displayName) { return -1; } @@ -423,7 +423,7 @@ export class AccountManagementService implements IAccountManagementService { this._updateAccountListEmitter.fire(eventArg); } - private spliceModifiedAccount(provider: AccountProviderWithMetadata, modifiedAccount: sqlops.Account) { + private spliceModifiedAccount(provider: AccountProviderWithMetadata, modifiedAccount: azdata.Account) { // Find the updated account and splice the updated one in let indexToRemove: number = provider.accounts.findIndex(account => { return account.key.accountId === modifiedAccount.key.accountId; @@ -438,7 +438,7 @@ export class AccountManagementService implements IAccountManagementService { * Joins together an account provider, its metadata, and its accounts, used in the provider list */ export interface AccountProviderWithMetadata { - metadata: sqlops.AccountProviderMetadata; - provider: sqlops.AccountProvider; - accounts: sqlops.Account[]; + metadata: azdata.AccountProviderMetadata; + provider: azdata.AccountProvider; + accounts: azdata.Account[]; } diff --git a/src/sql/workbench/services/admin/common/adminService.ts b/src/sql/workbench/services/admin/common/adminService.ts index b58fc5f45d..ce7e3023e3 100644 --- a/src/sql/workbench/services/admin/common/adminService.ts +++ b/src/sql/workbench/services/admin/common/adminService.ts @@ -17,30 +17,30 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export const IAdminService = createDecorator(SERVICE_ID); export interface IAdminService { _serviceBrand: any; - registerProvider(providerId: string, provider: sqlops.AdminServicesProvider): void; + registerProvider(providerId: string, provider: azdata.AdminServicesProvider): void; showCreateDatabaseWizard(uri: string, connection: IConnectionProfile): Promise; showCreateLoginWizard(uri: string, connection: IConnectionProfile): Promise; - createDatabase(connectionUri: string, database: sqlops.DatabaseInfo): Thenable; + createDatabase(connectionUri: string, database: azdata.DatabaseInfo): Thenable; - getDefaultDatabaseInfo(connectionUri: string): Thenable; + getDefaultDatabaseInfo(connectionUri: string): Thenable; - getDatabaseInfo(connectionUri: string): Thenable; + getDatabaseInfo(connectionUri: string): Thenable; } export class AdminService implements IAdminService { _serviceBrand: any; - private _providers: { [handle: string]: sqlops.AdminServicesProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.AdminServicesProvider; } = Object.create(null); constructor( @IInstantiationService private _instantiationService: IInstantiationService, @@ -49,7 +49,7 @@ export class AdminService implements IAdminService { ) { } - private _runAction(uri: string, action: (handler: sqlops.AdminServicesProvider) => Thenable): Thenable { + private _runAction(uri: string, action: (handler: azdata.AdminServicesProvider) => Thenable): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(uri); if (!providerId) { @@ -72,7 +72,7 @@ export class AdminService implements IAdminService { }); } - public createDatabase(connectionUri: string, database: sqlops.DatabaseInfo): Thenable { + public createDatabase(connectionUri: string, database: azdata.DatabaseInfo): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -95,7 +95,7 @@ export class AdminService implements IAdminService { }); } - public createLogin(connectionUri: string, login: sqlops.LoginInfo): Thenable { + public createLogin(connectionUri: string, login: azdata.LoginInfo): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -106,7 +106,7 @@ export class AdminService implements IAdminService { return Promise.resolve(undefined); } - public getDefaultDatabaseInfo(connectionUri: string): Thenable { + public getDefaultDatabaseInfo(connectionUri: string): Thenable { let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); if (providerId) { let provider = this._providers[providerId]; @@ -117,13 +117,13 @@ export class AdminService implements IAdminService { return Promise.resolve(undefined); } - public getDatabaseInfo(connectionUri: string): Thenable { + public getDatabaseInfo(connectionUri: string): Thenable { return this._runAction(connectionUri, (runner) => { return runner.getDatabaseInfo(connectionUri); }); } - public registerProvider(providerId: string, provider: sqlops.AdminServicesProvider): void { + public registerProvider(providerId: string, provider: azdata.AdminServicesProvider): void { this._providers[providerId] = provider; } } diff --git a/src/sql/workbench/services/backup/browser/backupUiService.ts b/src/sql/workbench/services/backup/browser/backupUiService.ts index 1482b32b9c..3d7861011f 100644 --- a/src/sql/workbench/services/backup/browser/backupUiService.ts +++ b/src/sql/workbench/services/backup/browser/backupUiService.ts @@ -9,7 +9,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -52,7 +52,7 @@ export class BackupUiService implements IBackupUiService { }); } - private getOptions(provider: string): sqlops.ServiceOption[] { + private getOptions(provider: string): azdata.ServiceOption[] { let feature = this._capabilitiesService.getLegacyCapabilities(this._currentProvider).features.find(f => f.featureName === 'backup'); if (feature) { return feature.optionsMetadata; diff --git a/src/sql/workbench/services/connection/browser/connectionController.ts b/src/sql/workbench/services/connection/browser/connectionController.ts index 3470c521df..f672c2ae1b 100644 --- a/src/sql/workbench/services/connection/browser/connectionController.ts +++ b/src/sql/workbench/services/connection/browser/connectionController.ts @@ -11,7 +11,7 @@ import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDia import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as Constants from 'sql/platform/connection/common/constants'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as Utils from 'sql/platform/connection/common/utils'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; @@ -25,7 +25,7 @@ export class ConnectionController implements IConnectionComponentController { private _connectionWidget: ConnectionWidget; private _advancedController: AdvancedPropertiesController; private _model: IConnectionProfile; - private _providerOptions: sqlops.ConnectionOption[]; + private _providerOptions: azdata.ConnectionOption[]; private _providerName: string; /* key: uri, value : list of databases */ private _databaseCache = new Map(); diff --git a/src/sql/workbench/services/connection/browser/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts index eeccab7488..dbed6d66aa 100644 --- a/src/sql/workbench/services/connection/browser/connectionWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts @@ -24,7 +24,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import * as styler from 'sql/platform/theme/common/styler'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as lifecycle from 'vs/base/common/lifecycle'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; @@ -56,12 +56,12 @@ export class ConnectionWidget { private _addAzureAccountMessage: string = localize('connectionWidget.AddAzureAccount', 'Add an account...'); private readonly _azureProviderId = 'azurePublicCloud'; private _azureTenantId: string; - private _azureAccountList: sqlops.Account[]; + private _azureAccountList: azdata.Account[]; private _advancedButton: Button; private _callbacks: IConnectionComponentCallbacks; private _authTypeSelectBox: SelectBox; private _toDispose: lifecycle.IDisposable[]; - private _optionsMaps: { [optionType: number]: sqlops.ConnectionOption }; + private _optionsMaps: { [optionType: number]: azdata.ConnectionOption }; private _tableContainer: Builder; private _focusedBeforeHandleOnConnection: HTMLElement; private _providerName: string; @@ -95,7 +95,7 @@ export class ConnectionWidget { color: undefined, description: undefined, }; - constructor(options: sqlops.ConnectionOption[], + constructor(options: azdata.ConnectionOption[], callbacks: IConnectionComponentCallbacks, providerName: string, @IThemeService private _themeService: IThemeService, diff --git a/src/sql/workbench/services/insights/node/insightsDialogController.ts b/src/sql/workbench/services/insights/node/insightsDialogController.ts index f44f85a219..8604cd453f 100644 --- a/src/sql/workbench/services/insights/node/insightsDialogController.ts +++ b/src/sql/workbench/services/insights/node/insightsDialogController.ts @@ -12,7 +12,7 @@ import { IInsightsDialogModel, insertValueRegex } from 'sql/workbench/services/i import { error } from 'sql/base/common/log'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { DbCellValue, IDbColumn, QueryExecuteSubsetResult } from 'sqlops'; +import { DbCellValue, IDbColumn, QueryExecuteSubsetResult } from 'azdata'; import Severity from 'vs/base/common/severity'; import * as types from 'vs/base/common/types'; diff --git a/src/sql/workbench/services/notebook/common/notebookRegistry.ts b/src/sql/workbench/services/notebook/common/notebookRegistry.ts index 61934dee50..b1d0ac05b4 100644 --- a/src/sql/workbench/services/notebook/common/notebookRegistry.ts +++ b/src/sql/workbench/services/notebook/common/notebookRegistry.ts @@ -9,7 +9,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { localize } from 'vs/nls'; import * as platform from 'vs/platform/registry/common/platform'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; export const Extensions = { @@ -20,7 +20,7 @@ export const Extensions = { export interface NotebookProviderRegistration { provider: string; fileExtensions: string | string[]; - standardKernels: sqlops.nb.IStandardKernel | sqlops.nb.IStandardKernel[]; + standardKernels: azdata.nb.IStandardKernel | azdata.nb.IStandardKernel[]; } let notebookProviderType: IJSONSchema = { diff --git a/src/sql/workbench/services/notebook/common/notebookService.ts b/src/sql/workbench/services/notebook/common/notebookService.ts index cd0aa5ad49..53c68a182d 100644 --- a/src/sql/workbench/services/notebook/common/notebookService.ts +++ b/src/sql/workbench/services/notebook/common/notebookService.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -50,7 +50,7 @@ export interface INotebookService { getProvidersForFileType(fileType: string): string[]; - getStandardKernelsForProvider(provider: string): sqlops.nb.IStandardKernel[]; + getStandardKernelsForProvider(provider: string): azdata.nb.IStandardKernel[]; /** * Initializes and returns a Notebook manager that can handle all important calls to open, display, and @@ -82,9 +82,9 @@ export interface INotebookProvider { export interface INotebookManager { providerId: string; - readonly contentManager: sqlops.nb.ContentManager; - readonly sessionManager: sqlops.nb.SessionManager; - readonly serverManager: sqlops.nb.ServerManager; + readonly contentManager: azdata.nb.ContentManager; + readonly sessionManager: azdata.nb.SessionManager; + readonly serverManager: azdata.nb.ServerManager; } export interface INotebookParams extends IBootstrapParams { diff --git a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts index ac3803c190..f28ef97c85 100644 --- a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { localize } from 'vs/nls'; import { URI } from 'vs/base/common/uri'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/workbench/services/notebook/common/sessionManager.ts b/src/sql/workbench/services/notebook/common/sessionManager.ts index d81ff3a017..817bf982df 100644 --- a/src/sql/workbench/services/notebook/common/sessionManager.ts +++ b/src/sql/workbench/services/notebook/common/sessionManager.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { localize } from 'vs/nls'; import { FutureInternal } from 'sql/parts/notebook/models/modelInterfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/services/notebook/common/sqlSessionManager.ts b/src/sql/workbench/services/notebook/common/sqlSessionManager.ts index acf1821379..2b92760eb7 100644 --- a/src/sql/workbench/services/notebook/common/sqlSessionManager.ts +++ b/src/sql/workbench/services/notebook/common/sqlSessionManager.ts @@ -5,7 +5,7 @@ 'use strict'; import * as os from 'os'; -import { nb, QueryExecuteSubsetResult, IDbColumn, BatchSummary, IResultMessage, ResultSetSummary } from 'sqlops'; +import { nb, QueryExecuteSubsetResult, IDbColumn, BatchSummary, IResultMessage, ResultSetSummary } from 'azdata'; import { localize } from 'vs/nls'; import * as strings from 'vs/base/common/strings'; import { FutureInternal, ILanguageMagic } from 'sql/parts/notebook/models/modelInterfaces'; diff --git a/src/sql/workbench/services/notebook/node/localContentManager.ts b/src/sql/workbench/services/notebook/node/localContentManager.ts index e703087f82..efdaaf3a33 100644 --- a/src/sql/workbench/services/notebook/node/localContentManager.ts +++ b/src/sql/workbench/services/notebook/node/localContentManager.ts @@ -7,7 +7,7 @@ 'use strict'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as json from 'vs/base/common/json'; import * as pfs from 'vs/base/node/pfs'; diff --git a/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts b/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts index 9351f7fa57..2a7aa91c47 100644 --- a/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts +++ b/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts @@ -12,7 +12,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; @@ -26,37 +26,37 @@ export const SERVICE_ID = 'ObjectExplorerService'; export const IObjectExplorerService = createDecorator(SERVICE_ID); -export interface NodeExpandInfoWithProviderId extends sqlops.ObjectExplorerExpandInfo { +export interface NodeExpandInfoWithProviderId extends azdata.ObjectExplorerExpandInfo { providerId: string; } export interface IObjectExplorerService { _serviceBrand: any; - createNewSession(providerId: string, connection: ConnectionProfile): Thenable; + createNewSession(providerId: string, connection: ConnectionProfile): Thenable; - closeSession(providerId: string, session: sqlops.ObjectExplorerSession): Thenable; + closeSession(providerId: string, session: azdata.ObjectExplorerSession): Thenable; - expandNode(providerId: string, session: sqlops.ObjectExplorerSession, nodePath: string): Thenable; + expandNode(providerId: string, session: azdata.ObjectExplorerSession, nodePath: string): Thenable; - refreshNode(providerId: string, session: sqlops.ObjectExplorerSession, nodePath: string): Thenable; + refreshNode(providerId: string, session: azdata.ObjectExplorerSession, nodePath: string): Thenable; - resolveTreeNodeChildren(session: sqlops.ObjectExplorerSession, parentTree: TreeNode): Thenable; + resolveTreeNodeChildren(session: azdata.ObjectExplorerSession, parentTree: TreeNode): Thenable; - refreshTreeNode(session: sqlops.ObjectExplorerSession, parentTree: TreeNode): Thenable; + refreshTreeNode(session: azdata.ObjectExplorerSession, parentTree: TreeNode): Thenable; - onSessionCreated(handle: number, sessionResponse: sqlops.ObjectExplorerSession); + onSessionCreated(handle: number, sessionResponse: azdata.ObjectExplorerSession); - onSessionDisconnected(handle: number, sessionResponse: sqlops.ObjectExplorerSession); + onSessionDisconnected(handle: number, sessionResponse: azdata.ObjectExplorerSession); onNodeExpanded(sessionResponse: NodeExpandInfoWithProviderId); /** * Register a ObjectExplorer provider */ - registerProvider(providerId: string, provider: sqlops.ObjectExplorerProvider): void; + registerProvider(providerId: string, provider: azdata.ObjectExplorerProvider): void; - registerNodeProvider(expander: sqlops.ObjectExplorerNodeProvider): void; + registerNodeProvider(expander: azdata.ObjectExplorerNodeProvider): void; getObjectExplorerNode(connection: IConnectionProfile): TreeNode; @@ -76,7 +76,7 @@ export interface IObjectExplorerService { getServerTreeView(): ServerTreeView; - findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames?: string[]): Thenable; + findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames?: string[]): Thenable; getActiveConnectionNodes(): TreeNode[]; @@ -89,9 +89,9 @@ export interface IObjectExplorerService { */ getNodeActions(connectionId: string, nodePath: string): Thenable; - getSessionConnectionProfile(sessionId: string): sqlops.IConnectionProfile; + getSessionConnectionProfile(sessionId: string): azdata.IConnectionProfile; - getSession(sessionId: string): sqlops.ObjectExplorerSession; + getSession(sessionId: string): azdata.ObjectExplorerSession; providerRegistered(providerId: string): boolean; } @@ -113,7 +113,7 @@ export interface ObjectExplorerNodeEventArgs { export interface NodeInfoWithConnection { connectionId: string; - nodeInfo: sqlops.NodeInfo; + nodeInfo: azdata.NodeInfo; } export interface TopLevelChildrenPath { @@ -121,7 +121,7 @@ export interface TopLevelChildrenPath { supportedProviderId: string; groupingId: number; path: string[]; - providerObject: sqlops.ObjectExplorerNodeProvider | sqlops.ObjectExplorerProvider; + providerObject: azdata.ObjectExplorerNodeProvider | azdata.ObjectExplorerProvider; } export class ObjectExplorerService implements IObjectExplorerService { @@ -130,9 +130,9 @@ export class ObjectExplorerService implements IObjectExplorerService { private _disposables: IDisposable[] = []; - private _providers: { [handle: string]: sqlops.ObjectExplorerProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.ObjectExplorerProvider; } = Object.create(null); - private _nodeProviders: { [handle: string]: sqlops.ObjectExplorerNodeProvider[]; } = Object.create(null); + private _nodeProviders: { [handle: string]: azdata.ObjectExplorerNodeProvider[]; } = Object.create(null); private _activeObjectExplorerNodes: { [id: string]: TreeNode }; private _sessions: { [sessionId: string]: SessionStatus }; @@ -156,7 +156,7 @@ export class ObjectExplorerService implements IObjectExplorerService { this._onSelectionOrFocusChange = new Emitter(); } - public getSession(sessionId: string): sqlops.ObjectExplorerSession { + public getSession(sessionId: string): azdata.ObjectExplorerSession { let session = this._sessions[sessionId]; if (!session) { return undefined; @@ -226,11 +226,11 @@ export class ObjectExplorerService implements IObjectExplorerService { /** * Gets called when session is created */ - public onSessionCreated(handle: number, session: sqlops.ObjectExplorerSession): void { + public onSessionCreated(handle: number, session: azdata.ObjectExplorerSession): void { this.handleSessionCreated(session); } - private async handleSessionCreated(session: sqlops.ObjectExplorerSession): Promise { + private async handleSessionCreated(session: azdata.ObjectExplorerSession): Promise { try { let connection: ConnectionProfile = undefined; let errorMessage: string = undefined; @@ -268,7 +268,7 @@ export class ObjectExplorerService implements IObjectExplorerService { /** * Gets called when session is disconnected */ - public onSessionDisconnected(handle: number, session: sqlops.ObjectExplorerSession) { + public onSessionDisconnected(handle: number, session: azdata.ObjectExplorerSession) { if (this._sessions[session.sessionId]) { let connection: ConnectionProfile = this._sessions[session.sessionId].connection; if (connection && this._connectionManagementService.isProfileConnected(connection)) { @@ -318,9 +318,9 @@ export class ObjectExplorerService implements IObjectExplorerService { return this._activeObjectExplorerNodes[connection.id]; } - public async createNewSession(providerId: string, connection: ConnectionProfile): Promise { + public async createNewSession(providerId: string, connection: ConnectionProfile): Promise { let self = this; - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { let provider = this._providers[providerId]; if (provider) { provider.createNewSession(connection.toConnectionInfo()).then(result => { @@ -338,8 +338,8 @@ export class ObjectExplorerService implements IObjectExplorerService { }); } - public expandNode(providerId: string, session: sqlops.ObjectExplorerSession, nodePath: string): Thenable { - return new Promise((resolve, reject) => { + public expandNode(providerId: string, session: azdata.ObjectExplorerSession, nodePath: string): Thenable { + return new Promise((resolve, reject) => { let provider = this._providers[providerId]; if (provider) { TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.ObjectExplorerExpand, { refresh: 0, provider: providerId }); @@ -354,7 +354,7 @@ export class ObjectExplorerService implements IObjectExplorerService { }); } - private callExpandOrRefreshFromProvider(provider: sqlops.ObjectExplorerProviderBase, nodeInfo: sqlops.ExpandNodeInfo, refresh: boolean = false) { + private callExpandOrRefreshFromProvider(provider: azdata.ObjectExplorerProviderBase, nodeInfo: azdata.ExpandNodeInfo, refresh: boolean = false) { if (refresh) { return provider.refreshNode(nodeInfo); } else { @@ -364,11 +364,11 @@ export class ObjectExplorerService implements IObjectExplorerService { private expandOrRefreshNode( providerId: string, - session: sqlops.ObjectExplorerSession, + session: azdata.ObjectExplorerSession, nodePath: string, - refresh: boolean = false): Thenable { + refresh: boolean = false): Thenable { let self = this; - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { if (session.sessionId in self._sessions && self._sessions[session.sessionId]) { let newRequest = false; if (!self._sessions[session.sessionId].nodes[nodePath]) { @@ -379,8 +379,8 @@ export class ObjectExplorerService implements IObjectExplorerService { } let provider = this._providers[providerId]; if (provider) { - let resultMap: Map = new Map(); - let allProviders: sqlops.ObjectExplorerProviderBase[] = [provider]; + let resultMap: Map = new Map(); + let allProviders: azdata.ObjectExplorerProviderBase[] = [provider]; let nodeProviders = this._nodeProviders[providerId]; if (nodeProviders) { @@ -413,7 +413,7 @@ export class ObjectExplorerService implements IObjectExplorerService { }, refresh).then(isExpanding => { if (!isExpanding) { // The provider stated it's not going to expand the node, therefore do not need to track when merging results - let emptyResult: sqlops.ObjectExplorerExpandInfo = { + let emptyResult: azdata.ObjectExplorerExpandInfo = { errorMessage: undefined, nodePath: nodePath, nodes: [], @@ -433,10 +433,10 @@ export class ObjectExplorerService implements IObjectExplorerService { }); } - private mergeResults(allProviders: sqlops.ObjectExplorerProviderBase[], resultMap: Map, nodePath: string): sqlops.ObjectExplorerExpandInfo { - let finalResult: sqlops.ObjectExplorerExpandInfo; - let allNodes: sqlops.NodeInfo[] = []; - let errorNode: sqlops.NodeInfo = { + private mergeResults(allProviders: azdata.ObjectExplorerProviderBase[], resultMap: Map, nodePath: string): azdata.ObjectExplorerExpandInfo { + let finalResult: azdata.ObjectExplorerExpandInfo; + let allNodes: azdata.NodeInfo[] = []; + let errorNode: azdata.NodeInfo = { nodePath: nodePath, label: 'Error', errorMessage: '', @@ -477,7 +477,7 @@ export class ObjectExplorerService implements IObjectExplorerService { return finalResult; } - public refreshNode(providerId: string, session: sqlops.ObjectExplorerSession, nodePath: string): Thenable { + public refreshNode(providerId: string, session: azdata.ObjectExplorerSession, nodePath: string): Thenable { let provider = this._providers[providerId]; if (provider) { TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.ObjectExplorerExpand, { refresh: 1, provider: providerId }); @@ -486,7 +486,7 @@ export class ObjectExplorerService implements IObjectExplorerService { return Promise.resolve(undefined); } - public closeSession(providerId: string, session: sqlops.ObjectExplorerSession): Thenable { + public closeSession(providerId: string, session: azdata.ObjectExplorerSession): Thenable { // Complete any requests that are still open for the session let sessionStatus = this._sessions[session.sessionId]; if (sessionStatus && sessionStatus.nodes) { @@ -524,11 +524,11 @@ export class ObjectExplorerService implements IObjectExplorerService { /** * Register a ObjectExplorer provider */ - public registerProvider(providerId: string, provider: sqlops.ObjectExplorerProvider): void { + public registerProvider(providerId: string, provider: azdata.ObjectExplorerProvider): void { this._providers[providerId] = provider; } - public registerNodeProvider(nodeProvider: sqlops.ObjectExplorerNodeProvider): void { + public registerNodeProvider(nodeProvider: azdata.ObjectExplorerNodeProvider): void { let nodeProviders = this._nodeProviders[nodeProvider.supportedProviderId] || []; nodeProviders.push(nodeProvider); this._nodeProviders[nodeProvider.supportedProviderId] = nodeProviders; @@ -538,17 +538,17 @@ export class ObjectExplorerService implements IObjectExplorerService { this._disposables = dispose(this._disposables); } - public resolveTreeNodeChildren(session: sqlops.ObjectExplorerSession, parentTree: TreeNode): Thenable { + public resolveTreeNodeChildren(session: azdata.ObjectExplorerSession, parentTree: TreeNode): Thenable { // Always refresh the node if it has an error, otherwise expand it normally let needsRefresh = !!parentTree.errorStateMessage; return this.expandOrRefreshTreeNode(session, parentTree, needsRefresh); } - public refreshTreeNode(session: sqlops.ObjectExplorerSession, parentTree: TreeNode): Thenable { + public refreshTreeNode(session: azdata.ObjectExplorerSession, parentTree: TreeNode): Thenable { return this.expandOrRefreshTreeNode(session, parentTree, true); } - private callExpandOrRefreshFromService(providerId: string, session: sqlops.ObjectExplorerSession, nodePath: string, refresh: boolean = false): Thenable { + private callExpandOrRefreshFromService(providerId: string, session: azdata.ObjectExplorerSession, nodePath: string, refresh: boolean = false): Thenable { if (refresh) { return this.refreshNode(providerId, session, nodePath); } else { @@ -557,7 +557,7 @@ export class ObjectExplorerService implements IObjectExplorerService { } private expandOrRefreshTreeNode( - session: sqlops.ObjectExplorerSession, + session: azdata.ObjectExplorerSession, parentTree: TreeNode, refresh: boolean = false): Thenable { return new Promise((resolve, reject) => { @@ -578,7 +578,7 @@ export class ObjectExplorerService implements IObjectExplorerService { }); } - private toTreeNode(nodeInfo: sqlops.NodeInfo, parent: TreeNode): TreeNode { + private toTreeNode(nodeInfo: azdata.NodeInfo, parent: TreeNode): TreeNode { // Show the status for database nodes with a status field let isLeaf: boolean = nodeInfo.isLeaf; if (nodeInfo.nodeType === NodeType.Database) { @@ -650,7 +650,7 @@ export class ObjectExplorerService implements IObjectExplorerService { return this._serverTreeView; } - public findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames?: string[]): Thenable { + public findNodes(connectionId: string, type: string, schema: string, name: string, database: string, parentObjectNames?: string[]): Thenable { let rootNode = this._activeObjectExplorerNodes[connectionId]; if (!rootNode) { return Promise.resolve([]); @@ -696,7 +696,7 @@ export class ObjectExplorerService implements IObjectExplorerService { return treeNode; } - public getSessionConnectionProfile(sessionId: string): sqlops.IConnectionProfile { + public getSessionConnectionProfile(sessionId: string): azdata.IConnectionProfile { return this._sessions[sessionId].connection.toIConnectionProfile(); } diff --git a/src/sql/workbench/services/profiler/common/interfaces.ts b/src/sql/workbench/services/profiler/common/interfaces.ts index f94b639a80..094d7b48ed 100644 --- a/src/sql/workbench/services/profiler/common/interfaces.ts +++ b/src/sql/workbench/services/profiler/common/interfaces.ts @@ -7,7 +7,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { INewProfilerState } from 'sql/parts/profiler/editor/profilerState'; const PROFILER_SERVICE_ID = 'profilerService'; @@ -26,15 +26,15 @@ export interface IProfilerSession { /** * Called by the service when more rows are available to render */ - onMoreRows(events: sqlops.ProfilerSessionEvents); + onMoreRows(events: azdata.ProfilerSessionEvents); /** * Called by the service when the session is closed unexpectedly */ - onSessionStopped(events: sqlops.ProfilerSessionStoppedParams); + onSessionStopped(events: azdata.ProfilerSessionStoppedParams); /** * Called by the service when a new profiler session is created by the dialog */ - onProfilerSessionCreated(events: sqlops.ProfilerSessionCreatedParams); + onProfilerSessionCreated(events: azdata.ProfilerSessionCreatedParams); /** * Called by the service when the session state is changed */ @@ -49,7 +49,7 @@ export interface IProfilerService { /** * Registers a backend provider for profiler session. ex: mssql */ - registerProvider(providerId: string, provider: sqlops.ProfilerProvider): void; + registerProvider(providerId: string, provider: azdata.ProfilerProvider): void; /** * Registers a session with the service that acts as the UI for a profiler session * @returns An unique id that should be used to make subsequent calls to this service @@ -66,7 +66,7 @@ export interface IProfilerService { /** * Creates a new session using the given create statement and session name */ - createSession(id: string, createStatement: string, template: sqlops.ProfilerSessionTemplate): Thenable; + createSession(id: string, createStatement: string, template: azdata.ProfilerSessionTemplate): Thenable; /** * Starts the session specified by the id */ @@ -86,15 +86,15 @@ export interface IProfilerService { /** * The method called by the service provider for when more rows are available to render */ - onMoreRows(params: sqlops.ProfilerSessionEvents): void; + onMoreRows(params: azdata.ProfilerSessionEvents): void; /** * The method called by the service provider for when more rows are available to render */ - onSessionStopped(params: sqlops.ProfilerSessionStoppedParams): void; + onSessionStopped(params: azdata.ProfilerSessionStoppedParams): void; /** * Called by the service when a new profiler session is created by the dialog */ - onProfilerSessionCreated(events: sqlops.ProfilerSessionCreatedParams); + onProfilerSessionCreated(events: azdata.ProfilerSessionCreatedParams); /** * Gets a list of the view templates that are specified in the settings * @param provider An optional string to limit the view templates to a specific provider diff --git a/src/sql/workbench/services/profiler/common/profilerService.ts b/src/sql/workbench/services/profiler/common/profilerService.ts index e26b6442d0..593507ea2d 100644 --- a/src/sql/workbench/services/profiler/common/profilerService.ts +++ b/src/sql/workbench/services/profiler/common/profilerService.ts @@ -12,7 +12,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { ProfilerColumnEditorDialog } from 'sql/parts/profiler/dialog/profilerColumnEditorDialog'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -50,7 +50,7 @@ class TwoWayMap { export class ProfilerService implements IProfilerService { private static readonly PROFILER_SERVICE_UI_STATE_STORAGE_KEY = 'profileservice.uiState'; public _serviceBrand: any; - private _providers = new Map(); + private _providers = new Map(); private _idMap = new TwoWayMap(); private _sessionMap = new Map(); private _connectionMap = new Map(); @@ -70,7 +70,7 @@ export class ProfilerService implements IProfilerService { this._memento = this._context.getMemento(StorageScope.GLOBAL); } - public registerProvider(providerId: string, provider: sqlops.ProfilerProvider): void { + public registerProvider(providerId: string, provider: azdata.ProfilerProvider): void { this._providers.set(providerId, provider); } @@ -93,15 +93,15 @@ export class ProfilerService implements IProfilerService { return TPromise.wrap(uri); } - public onMoreRows(params: sqlops.ProfilerSessionEvents): void { + public onMoreRows(params: azdata.ProfilerSessionEvents): void { this._sessionMap.get(this._idMap.reverseGet(params.sessionId)).onMoreRows(params); } - public onSessionStopped(params: sqlops.ProfilerSessionStoppedParams): void { + public onSessionStopped(params: azdata.ProfilerSessionStoppedParams): void { this._sessionMap.get(this._idMap.reverseGet(params.ownerUri)).onSessionStopped(params); } - public onProfilerSessionCreated(params: sqlops.ProfilerSessionCreatedParams): void { + public onProfilerSessionCreated(params: azdata.ProfilerSessionCreatedParams): void { this._sessionMap.get(this._idMap.reverseGet(params.ownerUri)).onProfilerSessionCreated(params); this.updateMemento(params.ownerUri, { previousSessionName: params.sessionName }); } @@ -114,7 +114,7 @@ export class ProfilerService implements IProfilerService { return this._runAction(id, provider => provider.disconnectSession(this._idMap.get(id))); } - public createSession(id: string, createStatement: string, template: sqlops.ProfilerSessionTemplate): Thenable { + public createSession(id: string, createStatement: string, template: azdata.ProfilerSessionTemplate): Thenable { return this._runAction(id, provider => provider.createSession(this._idMap.get(id), createStatement, template)).then(() => { this._sessionMap.get(this._idMap.reverseGet(id)).onSessionStateChanged({ isRunning: true, isStopped: false, isPaused: false }); return true; @@ -157,7 +157,7 @@ export class ProfilerService implements IProfilerService { }); } - private _runAction(id: ProfilerSessionID, action: (handler: sqlops.ProfilerProvider) => Thenable): Thenable { + private _runAction(id: ProfilerSessionID, action: (handler: azdata.ProfilerProvider) => Thenable): Thenable { // let providerId = this._connectionService.getProviderIdFromUri(this._idMap.get(id)); let providerId = 'MSSQL'; diff --git a/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts index e6ec8c8d7b..a126e6bdb5 100644 --- a/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts +++ b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts @@ -14,12 +14,12 @@ import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; import { FirewallRuleDialogController } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; export class ResourceProviderService implements IResourceProviderService { public _serviceBrand: any; - private _providers: { [handle: string]: sqlops.ResourceProvider; } = Object.create(null); + private _providers: { [handle: string]: azdata.ResourceProvider; } = Object.create(null); private _firewallRuleDialogController: FirewallRuleDialogController; constructor( @@ -44,8 +44,8 @@ export class ResourceProviderService implements IResourceProviderService { /** * Create a firewall rule */ - public createFirewallRule(selectedAccount: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo, resourceProviderId: string): Promise { - return new Promise((resolve, reject) => { + public createFirewallRule(selectedAccount: azdata.Account, firewallruleInfo: azdata.FirewallRuleInfo, resourceProviderId: string): Promise { + return new Promise((resolve, reject) => { let provider = this._providers[resourceProviderId]; if (provider) { TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.FirewallRuleRequested, { provider: resourceProviderId }); @@ -96,7 +96,7 @@ export class ResourceProviderService implements IResourceProviderService { /** * Register a resource provider */ - public registerProvider(providerId: string, provider: sqlops.ResourceProvider): void { + public registerProvider(providerId: string, provider: azdata.ResourceProvider): void { this._providers[providerId] = provider; } diff --git a/src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts b/src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts index e4673d38ea..c42650b7da 100644 --- a/src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts +++ b/src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts @@ -7,7 +7,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -26,7 +26,7 @@ export interface IResourceProviderService { /** * Register a resource provider */ - registerProvider(providerId: string, provider: sqlops.ResourceProvider): void; + registerProvider(providerId: string, provider: azdata.ResourceProvider): void; /** * Unregister a resource provider @@ -36,7 +36,7 @@ export interface IResourceProviderService { /** * Create a firewall rule */ - createFirewallRule(selectedAccount: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo, resourceProviderId: string): Promise; + createFirewallRule(selectedAccount: azdata.Account, firewallruleInfo: azdata.FirewallRuleInfo, resourceProviderId: string): Promise; /** * handle a firewall rule diff --git a/src/sqltest/parts/accountManagement/accountActions.test.ts b/src/sqltest/parts/accountManagement/accountActions.test.ts index f70267a923..cb29ff384d 100644 --- a/src/sqltest/parts/accountManagement/accountActions.test.ts +++ b/src/sqltest/parts/accountManagement/accountActions.test.ts @@ -6,14 +6,14 @@ 'use strict'; import * as assert from 'assert'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import { AddAccountAction, RemoveAccountAction } from 'sql/parts/accountManagement/common/accountActions'; import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs'; // import { MessageServiceStub } from 'sqltest/stubs/messageServiceStub'; import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub'; -let testAccount = { +let testAccount = { key: { providerId: 'azure', accountId: 'testAccount' diff --git a/src/sqltest/parts/accountManagement/accountPickerService.test.ts b/src/sqltest/parts/accountManagement/accountPickerService.test.ts index ba318a238a..addfc1917a 100644 --- a/src/sqltest/parts/accountManagement/accountPickerService.test.ts +++ b/src/sqltest/parts/accountManagement/accountPickerService.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; @@ -19,7 +19,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia let mockAddAccountCompleteEmitter: Emitter; let mockAddAccountErrorEmitter: Emitter; let mockAddAccountStartEmitter: Emitter; -let mockOnAccountSelectionChangeEvent: Emitter; +let mockOnAccountSelectionChangeEvent: Emitter; // TESTS /////////////////////////////////////////////////////////////////// suite('Account picker service tests', () => { @@ -28,7 +28,7 @@ suite('Account picker service tests', () => { mockAddAccountCompleteEmitter = new Emitter(); mockAddAccountErrorEmitter = new Emitter(); mockAddAccountStartEmitter = new Emitter(); - mockOnAccountSelectionChangeEvent = new Emitter(); + mockOnAccountSelectionChangeEvent = new Emitter(); }); test('Construction - Events are properly defined', () => { @@ -76,7 +76,7 @@ suite('Account picker service tests', () => { properties: [], isStale: false }; - let evOnAccountSelectionChangeEvent = new EventVerifierSingle(); + let evOnAccountSelectionChangeEvent = new EventVerifierSingle(); service.onAccountSelectionChangeEvent(evOnAccountSelectionChangeEvent.eventHandler); mockOnAccountSelectionChangeEvent.fire(account); evOnAccountSelectionChangeEvent.assertFired(account); diff --git a/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts b/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts index 1e01b3759a..ed66d2f6c8 100644 --- a/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts +++ b/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; @@ -16,8 +16,8 @@ import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStu // SUITE STATE ///////////////////////////////////////////////////////////// let mockUpdateAccountEmitter: Emitter; -let providers: sqlops.AccountProviderMetadata[]; -let accounts: sqlops.Account[]; +let providers: azdata.AccountProviderMetadata[]; +let accounts: azdata.Account[]; suite('Account picker view model tests', () => { setup(() => { providers = [{ diff --git a/src/sqltest/parts/accountManagement/accountViewModel.test.ts b/src/sqltest/parts/accountManagement/accountViewModel.test.ts index ed1b279b26..5b3d936573 100644 --- a/src/sqltest/parts/accountManagement/accountViewModel.test.ts +++ b/src/sqltest/parts/accountManagement/accountViewModel.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { Emitter } from 'vs/base/common/event'; @@ -16,11 +16,11 @@ import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStu // SUITE STATE ///////////////////////////////////////////////////////////// let mockAddProviderEmitter: Emitter; -let mockRemoveProviderEmitter: Emitter; +let mockRemoveProviderEmitter: Emitter; let mockUpdateAccountEmitter: Emitter; -let providers: sqlops.AccountProviderMetadata[]; -let accounts: sqlops.Account[]; +let providers: azdata.AccountProviderMetadata[]; +let accounts: azdata.Account[]; suite('Account Management Dialog ViewModel Tests', () => { @@ -56,7 +56,7 @@ suite('Account Management Dialog ViewModel Tests', () => { // Setup event mocks for the account management service mockAddProviderEmitter = new Emitter(); - mockRemoveProviderEmitter = new Emitter(); + mockRemoveProviderEmitter = new Emitter(); mockUpdateAccountEmitter = new Emitter(); }); @@ -79,7 +79,7 @@ suite('Account Management Dialog ViewModel Tests', () => { evAddProvider.assertFired(argAddProvider); let argRemoveProvider = providers[0]; - let evRemoveProvider = new EventVerifierSingle(); + let evRemoveProvider = new EventVerifierSingle(); vm.removeProviderEvent(evRemoveProvider.eventHandler); mockRemoveProviderEmitter.fire(argRemoveProvider); evRemoveProvider.assertFired(argRemoveProvider); @@ -95,7 +95,7 @@ suite('Account Management Dialog ViewModel Tests', () => { // Setup: Create a viewmodel with event handlers let mockAccountManagementService = getMockAccountManagementService(true, true); let evAddProvider = new EventVerifierSingle(); - let evRemoveProvider = new EventVerifierSingle(); + let evRemoveProvider = new EventVerifierSingle(); let evUpdateAccounts = new EventVerifierSingle(); let vm = getViewModel(mockAccountManagementService.object, evAddProvider, evRemoveProvider, evUpdateAccounts); @@ -125,7 +125,7 @@ suite('Account Management Dialog ViewModel Tests', () => { // Setup: Create a mock account management service that rejects looking up providers let mockAccountManagementService = getMockAccountManagementService(false, true); let evAddProvider = new EventVerifierSingle(); - let evRemoveProvider = new EventVerifierSingle(); + let evRemoveProvider = new EventVerifierSingle(); let evUpdateAccounts = new EventVerifierSingle(); let vm = getViewModel(mockAccountManagementService.object, evAddProvider, evRemoveProvider, evUpdateAccounts); @@ -154,7 +154,7 @@ suite('Account Management Dialog ViewModel Tests', () => { // Setup: Create a mock account management service that rejects the promise let mockAccountManagementService = getMockAccountManagementService(true, false); let evAddProvider = new EventVerifierSingle(); - let evRemoveProvider = new EventVerifierSingle(); + let evRemoveProvider = new EventVerifierSingle(); let evUpdateAccounts = new EventVerifierSingle(); let vm = getViewModel(mockAccountManagementService.object, evAddProvider, evRemoveProvider, evUpdateAccounts); @@ -202,7 +202,7 @@ function getMockAccountManagementService(resolveProviders: boolean, resolveAccou function getViewModel( ams: AccountManagementTestService, evAdd: EventVerifierSingle, - evRemove: EventVerifierSingle, + evRemove: EventVerifierSingle, evUpdate: EventVerifierSingle ): AccountViewModel { let vm = new AccountViewModel(ams); @@ -215,7 +215,7 @@ function getViewModel( function assertNoEventsFired( evAdd: EventVerifierSingle, - evRemove: EventVerifierSingle, + evRemove: EventVerifierSingle, evUpdate: EventVerifierSingle ): void { evAdd.assertNotFired(); diff --git a/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts b/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts index 10fed90f17..62a648cc56 100644 --- a/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts +++ b/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import { Emitter } from 'vs/base/common/event'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -21,7 +21,7 @@ import { Deferred } from 'sql/base/common/promise'; // TESTS /////////////////////////////////////////////////////////////////// suite('Firewall rule dialog controller tests', () => { let connectionProfile: IConnectionProfile; - let account: sqlops.Account; + let account: azdata.Account; let IPAddress = '250.222.155.198'; let mockOnAddAccountErrorEvent: Emitter; let mockOnCreateFirewallRule: Emitter; @@ -237,7 +237,7 @@ function getMockAccountManagementService(resolveSecurityToken: boolean): TypeMoq return mockAccountManagementService; } -function getMockResourceProvider(resolveCreateFirewallRule: boolean, response?: sqlops.CreateFirewallRuleResponse): TypeMoq.Mock { +function getMockResourceProvider(resolveCreateFirewallRule: boolean, response?: azdata.CreateFirewallRuleResponse): TypeMoq.Mock { let resourceProviderStub = new ResourceProviderStub(); let mockResourceProvider = TypeMoq.Mock.ofInstance(resourceProviderStub); mockResourceProvider.setup(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())) diff --git a/src/sqltest/parts/commandLine/commandLineService.test.ts b/src/sqltest/parts/commandLine/commandLineService.test.ts index 1b12c5560b..a7ce7290e8 100644 --- a/src/sqltest/parts/commandLine/commandLineService.test.ts +++ b/src/sqltest/parts/commandLine/commandLineService.test.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; /* Disabled pending next vscode merge which allows electron module to be imported during test runs NOTE: Import added above to prevent tests from failing due to the file being empty. Remove when reenabling the tests diff --git a/src/sqltest/parts/common/optionsDialogHelper.test.ts b/src/sqltest/parts/common/optionsDialogHelper.test.ts index b14796b0c5..71812d55fe 100644 --- a/src/sqltest/parts/common/optionsDialogHelper.test.ts +++ b/src/sqltest/parts/common/optionsDialogHelper.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as OptionsDialogHelper from 'sql/workbench/browser/modal/optionsDialogHelper'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Builder, $ } from 'sql/base/browser/builder'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; @@ -15,11 +15,11 @@ import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; suite('Advanced options helper tests', () => { var possibleInputs: string[]; let options: { [name: string]: any }; - var categoryOption: sqlops.ServiceOption; - var booleanOption: sqlops.ServiceOption; - var numberOption: sqlops.ServiceOption; - var stringOption: sqlops.ServiceOption; - var defaultGroupOption: sqlops.ServiceOption; + var categoryOption: azdata.ServiceOption; + var booleanOption: azdata.ServiceOption; + var numberOption: azdata.ServiceOption; + var stringOption: azdata.ServiceOption; + var defaultGroupOption: azdata.ServiceOption; var isValid: boolean; var inputValue: string; var inputBox: TypeMoq.Mock; diff --git a/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts b/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts index 8e85c99504..7ab81ae053 100644 --- a/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts +++ b/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts @@ -8,14 +8,14 @@ import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDialog/advancedPropertiesController'; import { Builder, $ } from 'sql/base/browser/builder'; import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; suite('Advanced properties dialog tests', () => { var advancedController: AdvancedPropertiesController; - var providerOptions: sqlops.ConnectionOption[]; + var providerOptions: azdata.ConnectionOption[]; setup(() => { advancedController = new AdvancedPropertiesController(() => { }, null); diff --git a/src/sqltest/parts/connection/connectionConfig.test.ts b/src/sqltest/parts/connection/connectionConfig.test.ts index 4ba4a09b1b..b1b1c5590d 100644 --- a/src/sqltest/parts/connection/connectionConfig.test.ts +++ b/src/sqltest/parts/connection/connectionConfig.test.ts @@ -18,7 +18,7 @@ import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/co import { TPromise } from 'vs/base/common/winjs.base'; import * as assert from 'assert'; import { ProviderFeatures, ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Emitter } from 'vs/base/common/event'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; @@ -188,7 +188,7 @@ suite('SQL ConnectionConfig tests', () => { setup(() => { capabilitiesService = TypeMoq.Mock.ofType(CapabilitiesTestService); capabilities = []; - let connectionProvider: sqlops.ConnectionProviderOptions = { + let connectionProvider: azdata.ConnectionProviderOptions = { options: [ { name: 'serverName', @@ -304,7 +304,7 @@ suite('SQL ConnectionConfig tests', () => { } test('allGroups should return groups from user and workspace settings', () => { - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -354,7 +354,7 @@ suite('SQL ConnectionConfig tests', () => { description: 'g1-2' }]; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToMerge); @@ -387,10 +387,10 @@ suite('SQL ConnectionConfig tests', () => { let expectedNumberOfConnections = connections.user.length + 1; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -429,10 +429,10 @@ suite('SQL ConnectionConfig tests', () => { let expectedNumberOfConnections = connections.user.length; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -472,11 +472,11 @@ suite('SQL ConnectionConfig tests', () => { let expectedNumberOfConnections = connections.user.length + 1; let expectedNumberOfGroups = configValueToConcat.user.length + 1; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -496,7 +496,7 @@ suite('SQL ConnectionConfig tests', () => { test('getConnections should return connections from user and workspace settings given getWorkspaceConnections set to true', () => { let getWorkspaceConnections: boolean = true; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); @@ -508,7 +508,7 @@ suite('SQL ConnectionConfig tests', () => { test('getConnections should return connections from user settings given getWorkspaceConnections set to false', () => { let getWorkspaceConnections: boolean = false; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); @@ -532,7 +532,7 @@ suite('SQL ConnectionConfig tests', () => { value: connections.value, workspaceFolder: [] }; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connectionsWithNoId); @@ -584,7 +584,7 @@ suite('SQL ConnectionConfig tests', () => { let capabilitiesService2: TypeMoq.Mock = TypeMoq.Mock.ofType(CapabilitiesTestService); capabilitiesService2.setup(x => x.getCapabilities('MSSQL')).returns(() => msSQLCapabilities2); (capabilitiesService2.object as any).onCapabilitiesRegistered = onCapabilitiesRegistered.event; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => configValue); @@ -664,7 +664,7 @@ suite('SQL ConnectionConfig tests', () => { }; let expectedNumberOfConnections = connections.user.length - 1; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); @@ -709,11 +709,11 @@ suite('SQL ConnectionConfig tests', () => { let expectedNumberOfConnections = connections.user.length - 1; let expectedNumberOfGroups = configValueToConcat.user.length - 2; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -750,7 +750,7 @@ suite('SQL ConnectionConfig tests', () => { }; let expectedNumberOfConnections = connections.user.length; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); @@ -775,7 +775,7 @@ suite('SQL ConnectionConfig tests', () => { configEditingServiceMock.setup(x => x.writeConfiguration(ConfigurationTarget.USER, TypeMoq.It.isAny())).callback((x: any, val: any) => { calledValue = val.value as IConnectionProfileStore[]; }).returns(() => Promise.resolve(undefined)); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -803,7 +803,7 @@ suite('SQL ConnectionConfig tests', () => { configEditingServiceMock.setup(x => x.writeConfiguration(ConfigurationTarget.USER, TypeMoq.It.isAny())).callback((x: any, val: any) => { calledValue = val.value as IConnectionProfileStore[]; }).returns(() => Promise.resolve(undefined)); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); @@ -842,7 +842,7 @@ suite('SQL ConnectionConfig tests', () => { }; let expectedNumberOfConnections = connections.user.length; - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); @@ -926,10 +926,10 @@ suite('SQL ConnectionConfig tests', () => { test('addConnection should not move the connection when editing', async () => { // Set up the connection config - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionsArrayName)) .returns(() => connections); - workspaceConfigurationServiceMock.setup(x => x.inspect( + workspaceConfigurationServiceMock.setup(x => x.inspect( Constants.connectionGroupsArrayName)) .returns(() => configValueToConcat); let config = new ConnectionConfig(configEditingServiceMock.object, workspaceConfigurationServiceMock.object, capabilitiesService.object); diff --git a/src/sqltest/parts/connection/connectionManagementService.test.ts b/src/sqltest/parts/connection/connectionManagementService.test.ts index e6bc949156..d6582f68a8 100644 --- a/src/sqltest/parts/connection/connectionManagementService.test.ts +++ b/src/sqltest/parts/connection/connectionManagementService.test.ts @@ -25,7 +25,7 @@ import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; import { ConnectionProviderStub } from 'sqltest/stubs/connectionProviderStub'; import { ResourceProviderStub } from 'sqltest/stubs/resourceProviderServiceStub'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { WorkspaceConfigurationTestService } from 'sqltest/stubs/workspaceConfigurationTestService'; @@ -219,7 +219,7 @@ suite('SQL ConnectionManagementService tests', () => { let id = connectionToUse.getOptionsKey(); let defaultUri = 'connection://' + (id ? id : connectionToUse.serverName + ':' + connectionToUse.databaseName); connectionManagementService.onConnectionRequestSent(() => { - let info: sqlops.ConnectionInfoSummary = { + let info: azdata.ConnectionInfoSummary = { connectionId: error ? undefined : 'id', connectionSummary: { databaseName: connectionToUse.databaseName, @@ -712,7 +712,7 @@ suite('SQL ConnectionManagementService tests', () => { // when I call doChangeLanguageFlavor try { let called = false; - connectionManagementService.onLanguageFlavorChanged((changeParams: sqlops.DidChangeLanguageFlavorParams) => { + connectionManagementService.onLanguageFlavorChanged((changeParams: azdata.DidChangeLanguageFlavorParams) => { called = true; assert.equal(changeParams.uri, uri); assert.equal(changeParams.language, language); @@ -737,7 +737,7 @@ suite('SQL ConnectionManagementService tests', () => { }; let connectionManagementService = createConnectionManagementService(); let called = false; - connectionManagementService.onLanguageFlavorChanged((changeParams: sqlops.DidChangeLanguageFlavorParams) => { + connectionManagementService.onLanguageFlavorChanged((changeParams: azdata.DidChangeLanguageFlavorParams) => { called = true; }); connect(uri, options).then(() => { @@ -850,7 +850,7 @@ suite('SQL ConnectionManagementService tests', () => { azureConnectionProfile.serverName = servername; // Set up the account management service to return a token for the given user - accountManagementService.setup(x => x.getAccountsForProvider(TypeMoq.It.isAny())).returns(providerId => Promise.resolve([ + accountManagementService.setup(x => x.getAccountsForProvider(TypeMoq.It.isAny())).returns(providerId => Promise.resolve([ { key: { accountId: username, @@ -892,7 +892,7 @@ suite('SQL ConnectionManagementService tests', () => { azureConnectionProfile.azureTenantId = azureTenantId; // Set up the account management service to return a token for the given user - accountManagementService.setup(x => x.getAccountsForProvider(TypeMoq.It.isAny())).returns(providerId => Promise.resolve([ + accountManagementService.setup(x => x.getAccountsForProvider(TypeMoq.It.isAny())).returns(providerId => Promise.resolve([ { key: { accountId: username, diff --git a/src/sqltest/parts/connection/connectionProfile.test.ts b/src/sqltest/parts/connection/connectionProfile.test.ts index 9f4b8c4d72..d53e65da3c 100644 --- a/src/sqltest/parts/connection/connectionProfile.test.ts +++ b/src/sqltest/parts/connection/connectionProfile.test.ts @@ -8,7 +8,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connection/common/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; @@ -52,7 +52,7 @@ suite('SQL ConnectionProfileInfo tests', () => { }; setup(() => { - let connectionProvider: sqlops.ConnectionOption[] = [ + let connectionProvider: azdata.ConnectionOption[] = [ { name: 'connectionName', displayName: undefined, diff --git a/src/sqltest/parts/connection/connectionStatusManager.test.ts b/src/sqltest/parts/connection/connectionStatusManager.test.ts index 87ca3f110d..224d36f94b 100644 --- a/src/sqltest/parts/connection/connectionStatusManager.test.ts +++ b/src/sqltest/parts/connection/connectionStatusManager.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; import * as Utils from 'sql/platform/connection/common/utils'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -129,7 +129,7 @@ suite('SQL ConnectionStatusManager tests', () => { test('addConnection should set connecting to true', () => { let expected = true; - let summary: sqlops.ConnectionInfoSummary = { + let summary: azdata.ConnectionInfoSummary = { ownerUri: connection1Id, connectionId: connection1Id, messages: undefined, @@ -145,7 +145,7 @@ suite('SQL ConnectionStatusManager tests', () => { test('onConnectionComplete should set connecting to false', () => { let expected = false; - let summary: sqlops.ConnectionInfoSummary = { + let summary: azdata.ConnectionInfoSummary = { ownerUri: connection1Id, connectionId: connection1Id, messages: undefined, @@ -179,7 +179,7 @@ suite('SQL ConnectionStatusManager tests', () => { test('updateDatabaseName should update the database name in connection', () => { let dbName: string = 'db name'; - let summary: sqlops.ConnectionInfoSummary = { + let summary: azdata.ConnectionInfoSummary = { connectionSummary: { databaseName: dbName, serverName: undefined, @@ -205,7 +205,7 @@ suite('SQL ConnectionStatusManager tests', () => { test('getOriginalOwnerUri should return the original uri given uri with db name', () => { let dbName: string = 'db name'; - let summary: sqlops.ConnectionInfoSummary = { + let summary: azdata.ConnectionInfoSummary = { connectionSummary: { databaseName: dbName, serverName: undefined, diff --git a/src/sqltest/parts/connection/connectionStore.test.ts b/src/sqltest/parts/connection/connectionStore.test.ts index b6ab2fdd4b..4f1b590886 100644 --- a/src/sqltest/parts/connection/connectionStore.test.ts +++ b/src/sqltest/parts/connection/connectionStore.test.ts @@ -15,7 +15,7 @@ import { CredentialsService } from 'sql/platform/credentials/common/credentialsS import * as assert from 'assert'; import { Memento } from 'vs/workbench/common/memento'; import { CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { Emitter } from 'vs/base/common/event'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; @@ -119,7 +119,7 @@ suite('SQL ConnectionStore tests', () => { }; capabilitiesService = new CapabilitiesTestService(); - let connectionProvider: sqlops.ConnectionOption[] = [ + let connectionProvider: azdata.ConnectionOption[] = [ { name: 'connectionName', displayName: undefined, diff --git a/src/sqltest/parts/connection/objectExplorerService.test.ts b/src/sqltest/parts/connection/objectExplorerService.test.ts index 2c4c829a35..acb34b1a91 100644 --- a/src/sqltest/parts/connection/objectExplorerService.test.ts +++ b/src/sqltest/parts/connection/objectExplorerService.test.ts @@ -13,7 +13,7 @@ import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; @@ -28,9 +28,9 @@ suite('SQL Object Explorer Service tests', () => { let connectionToFail: ConnectionProfile; let conProfGroup: ConnectionProfileGroup; let objectExplorerService: ObjectExplorerService; - let objectExplorerSession: sqlops.ObjectExplorerSession; - let objectExplorerFailedSession: sqlops.ObjectExplorerSession; - let objectExplorerCloseSessionResponse: sqlops.ObjectExplorerCloseSessionResponse; + let objectExplorerSession: azdata.ObjectExplorerSession; + let objectExplorerFailedSession: azdata.ObjectExplorerSession; + let objectExplorerCloseSessionResponse: azdata.ObjectExplorerCloseSessionResponse; let objectExplorerExpandInfo: NodeExpandInfoWithProviderId; let objectExplorerExpandInfoRefresh: NodeExpandInfoWithProviderId; let sessionId = '1234'; @@ -116,11 +116,11 @@ suite('SQL Object Explorer Service tests', () => { nodePath: objectExplorerSession.rootNode.nodePath, providerId: providerId }; - let response: sqlops.ObjectExplorerSessionResponse = { + let response: azdata.ObjectExplorerSessionResponse = { sessionId: objectExplorerSession.sessionId }; - let failedResponse: sqlops.ObjectExplorerSessionResponse = { + let failedResponse: azdata.ObjectExplorerSessionResponse = { sessionId: failedSessionId }; @@ -273,10 +273,10 @@ suite('SQL Object Explorer Service tests', () => { objectExplorerService = new ObjectExplorerService(connectionManagementService.object, undefined, capabilitiesService); objectExplorerService.registerProvider('MSSQL', sqlOEProvider.object); - sqlOEProvider.setup(x => x.createNewSession(TypeMoq.It.is(x => x.options['serverName'] === connection.serverName))).returns(() => new Promise((resolve) => { + sqlOEProvider.setup(x => x.createNewSession(TypeMoq.It.is(x => x.options['serverName'] === connection.serverName))).returns(() => new Promise((resolve) => { resolve(response); })); - sqlOEProvider.setup(x => x.createNewSession(TypeMoq.It.is(x => x.options['serverName'] === connectionToFail.serverName))).returns(() => new Promise((resolve) => { + sqlOEProvider.setup(x => x.createNewSession(TypeMoq.It.is(x => x.options['serverName'] === connectionToFail.serverName))).returns(() => new Promise((resolve) => { resolve(failedResponse); })); sqlOEProvider.setup(x => x.expandNode(TypeMoq.It.isAny())).callback(() => { diff --git a/src/sqltest/parts/connection/providerConnectionInfo.test.ts b/src/sqltest/parts/connection/providerConnectionInfo.test.ts index 04afe0437c..4514196a6a 100644 --- a/src/sqltest/parts/connection/providerConnectionInfo.test.ts +++ b/src/sqltest/parts/connection/providerConnectionInfo.test.ts @@ -8,7 +8,7 @@ import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; @@ -37,8 +37,8 @@ suite('SQL ProviderConnectionInfo tests', () => { }; setup(() => { - let capabilities: sqlops.DataProtocolServerCapabilities[] = []; - let connectionProvider: sqlops.ConnectionOption[] = [ + let capabilities: azdata.DataProtocolServerCapabilities[] = []; + let connectionProvider: azdata.ConnectionOption[] = [ { name: 'connectionName', displayName: undefined, diff --git a/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts b/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts index 210d243fa6..86b3a8a491 100644 --- a/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts +++ b/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import { RestoreViewModel } from 'sql/parts/disasterRecovery/restore/restoreViewModel'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; @@ -14,14 +14,14 @@ suite('Restore Dialog view model tests', () => { let option2Category = 'option2'; let option3Boolean = 'option3'; let options: { [name: string]: any }; - let stringServiceOption: sqlops.ServiceOption; - let categoryServiceOption: sqlops.ServiceOption; - let booleanServiceOption: sqlops.ServiceOption; + let stringServiceOption: azdata.ServiceOption; + let categoryServiceOption: azdata.ServiceOption; + let booleanServiceOption: azdata.ServiceOption; let viewModel: RestoreViewModel; - let planDetails: { [key: string]: sqlops.RestorePlanDetailInfo }; - let backupSets: sqlops.DatabaseFileInfo[]; + let planDetails: { [key: string]: azdata.RestorePlanDetailInfo }; + let backupSets: azdata.DatabaseFileInfo[]; setup(() => { options = {}; @@ -168,7 +168,7 @@ suite('Restore Dialog view model tests', () => { }); test('on restore plan response should update all options from restore plan response correctly', () => { - let restorePlanResponse: sqlops.RestorePlanResponse = { + let restorePlanResponse: azdata.RestorePlanResponse = { sessionId: '123', backupSetsToRestore: backupSets, canRestore: true, @@ -198,7 +198,7 @@ suite('Restore Dialog view model tests', () => { test('on reset restore options should reset all options', () => { - let restorePlanResponse: sqlops.RestorePlanResponse = { + let restorePlanResponse: azdata.RestorePlanResponse = { sessionId: '123', backupSetsToRestore: backupSets, canRestore: true, diff --git a/src/sqltest/parts/grid/services/sharedServices.test.ts b/src/sqltest/parts/grid/services/sharedServices.test.ts index 4e68af5c5b..675c0357fa 100644 --- a/src/sqltest/parts/grid/services/sharedServices.test.ts +++ b/src/sqltest/parts/grid/services/sharedServices.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import * as SharedServices from 'sql/parts/grid/services/sharedServices'; diff --git a/src/sqltest/parts/insights/insightsDialogController.test.ts b/src/sqltest/parts/insights/insightsDialogController.test.ts index 38bf5229a9..1d1c2d2a92 100644 --- a/src/sqltest/parts/insights/insightsDialogController.test.ts +++ b/src/sqltest/parts/insights/insightsDialogController.test.ts @@ -12,7 +12,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; -import { IDbColumn, BatchSummary, QueryExecuteSubsetResult, ResultSetSubset } from 'sqlops'; +import { IDbColumn, BatchSummary, QueryExecuteSubsetResult, ResultSetSubset } from 'azdata'; import { EventEmitter } from 'sql/base/common/eventEmitter'; import { equal } from 'assert'; import { Mock, MockBehavior, It } from 'typemoq'; diff --git a/src/sqltest/parts/notebook/common.ts b/src/sqltest/parts/notebook/common.ts index 0f29c1a1ad..b417e88714 100644 --- a/src/sqltest/parts/notebook/common.ts +++ b/src/sqltest/parts/notebook/common.ts @@ -5,7 +5,7 @@ 'use strict'; -import { nb, IConnectionProfile } from 'sqlops'; +import { nb, IConnectionProfile } from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces'; diff --git a/src/sqltest/parts/notebook/model/cell.test.ts b/src/sqltest/parts/notebook/model/cell.test.ts index 27b4f6b398..c581a59ef5 100644 --- a/src/sqltest/parts/notebook/model/cell.test.ts +++ b/src/sqltest/parts/notebook/model/cell.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import * as objects from 'vs/base/common/objects'; diff --git a/src/sqltest/parts/notebook/model/clientSession.test.ts b/src/sqltest/parts/notebook/model/clientSession.test.ts index e0dcdfe2cf..4520fd791d 100644 --- a/src/sqltest/parts/notebook/model/clientSession.test.ts +++ b/src/sqltest/parts/notebook/model/clientSession.test.ts @@ -8,7 +8,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; diff --git a/src/sqltest/parts/notebook/model/contentManagers.test.ts b/src/sqltest/parts/notebook/model/contentManagers.test.ts index aafb8a66c8..930fa75421 100644 --- a/src/sqltest/parts/notebook/model/contentManagers.test.ts +++ b/src/sqltest/parts/notebook/model/contentManagers.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as should from 'should'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { URI } from 'vs/base/common/uri'; import * as tempWrite from 'temp-write'; diff --git a/src/sqltest/parts/notebook/model/notebookModel.test.ts b/src/sqltest/parts/notebook/model/notebookModel.test.ts index a3fee3d048..ed31fa2da6 100644 --- a/src/sqltest/parts/notebook/model/notebookModel.test.ts +++ b/src/sqltest/parts/notebook/model/notebookModel.test.ts @@ -7,7 +7,7 @@ import * as should from 'should'; import * as TypeMoq from 'typemoq'; -import { nb } from 'sqlops'; +import { nb } from 'azdata'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; diff --git a/src/sqltest/parts/notebook/model/notebookUtils.test.ts b/src/sqltest/parts/notebook/model/notebookUtils.test.ts index 801e1b083d..1a451fa0ab 100644 --- a/src/sqltest/parts/notebook/model/notebookUtils.test.ts +++ b/src/sqltest/parts/notebook/model/notebookUtils.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as should from 'should'; -import { nb, IConnectionProfile } from 'sqlops'; +import { nb, IConnectionProfile } from 'azdata'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sqltest/parts/query/editor/queryActions.test.ts b/src/sqltest/parts/query/editor/queryActions.test.ts index 8ad719c3e1..be9709b638 100644 --- a/src/sqltest/parts/query/editor/queryActions.test.ts +++ b/src/sqltest/parts/query/editor/queryActions.test.ts @@ -7,7 +7,7 @@ import { Emitter } from 'vs/base/common/event'; import { TPromise } from 'vs/base/common/winjs.base'; -import { ISelectionData } from 'sqlops'; +import { ISelectionData } from 'azdata'; import { IConnectionManagementService, diff --git a/src/sqltest/services/accountManagement/accountManagementService.test.ts b/src/sqltest/services/accountManagement/accountManagementService.test.ts index e6dc7e444d..1a8d0bb4f7 100644 --- a/src/sqltest/services/accountManagement/accountManagementService.test.ts +++ b/src/sqltest/services/accountManagement/accountManagementService.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import AccountStore from 'sql/platform/accountManagement/common/accountStore'; import { AccountDialogController } from 'sql/parts/accountManagement/accountDialog/accountDialogController'; @@ -18,16 +18,16 @@ import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; // SUITE CONSTANTS ///////////////////////////////////////////////////////// -const hasAccountProvider: sqlops.AccountProviderMetadata = { +const hasAccountProvider: azdata.AccountProviderMetadata = { id: 'hasAccounts', displayName: 'Provider with Accounts' }; -const noAccountProvider: sqlops.AccountProviderMetadata = { +const noAccountProvider: azdata.AccountProviderMetadata = { id: 'noAccounts', displayName: 'Provider without Accounts' }; -const account: sqlops.Account = { +const account: azdata.Account = { key: { providerId: hasAccountProvider.id, accountId: 'testAccount1' @@ -40,7 +40,7 @@ const account: sqlops.Account = { isStale: false, properties: {} }; -const accountList: sqlops.Account[] = [account]; +const accountList: azdata.Account[] = [account]; suite('Account Management Service Tests:', () => { test('Constructor', () => { @@ -69,7 +69,7 @@ suite('Account Management Service Tests:', () => { .returns(() => Promise.resolve(true)); // ... Register a account provider with the management service - let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); + let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); mockProvider.setup(x => x.clear(TypeMoq.It.isAny())).returns(() => Promise.resolve()); state.accountManagementService._providers[hasAccountProvider.id] = { accounts: [account], @@ -102,7 +102,7 @@ suite('Account Management Service Tests:', () => { })); // ... Register a account provider with the management service - let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); + let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); mockProvider.setup(x => x.clear(TypeMoq.It.isAny())).returns(() => Promise.resolve()); state.accountManagementService._providers[hasAccountProvider.id] = { accounts: [account], @@ -364,7 +364,7 @@ suite('Account Management Service Tests:', () => { .returns(() => Promise.resolve(true)); // ... Register a account provider with the management service - let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); + let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); mockProvider.setup(x => x.clear(TypeMoq.It.isAny())).returns(() => Promise.resolve()); state.accountManagementService._providers[hasAccountProvider.id] = { accounts: [account], @@ -571,7 +571,7 @@ function getTestState(): AccountManagementState { // Wire up event handlers let evUpdate = new EventVerifierSingle(); let evAddProvider = new EventVerifierSingle(); - let evRemoveProvider = new EventVerifierSingle(); + let evRemoveProvider = new EventVerifierSingle(); ams.updateAccountListEvent(evUpdate.eventHandler); ams.addAccountProviderEvent(evAddProvider.eventHandler); ams.removeAccountProviderEvent(evRemoveProvider.eventHandler); @@ -587,8 +587,8 @@ function getTestState(): AccountManagementState { }; } -function getMockAccountProvider(): TypeMoq.Mock { - let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); +function getMockAccountProvider(): TypeMoq.Mock { + let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); mockProvider.setup(x => x.clear(TypeMoq.It.isAny())).returns(() => Promise.resolve()); mockProvider.setup(x => x.initialize(TypeMoq.It.isAny())).returns(param => Promise.resolve(param)); mockProvider.setup(x => x.prompt()).returns(() => Promise.resolve(account)); @@ -596,8 +596,8 @@ function getMockAccountProvider(): TypeMoq.Mock { return mockProvider; } -function getFailingMockAccountProvider(cancel: boolean): TypeMoq.Mock { - let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); +function getFailingMockAccountProvider(cancel: boolean): TypeMoq.Mock { + let mockProvider = TypeMoq.Mock.ofType(AccountProviderStub); mockProvider.setup(x => x.clear(TypeMoq.It.isAny())) .returns(() => Promise.resolve()); mockProvider.setup(x => x.initialize(TypeMoq.It.isAny())) @@ -605,13 +605,13 @@ function getFailingMockAccountProvider(cancel: boolean): TypeMoq.Mock x.prompt()) .returns(() => { return cancel - ? Promise.reject({ userCancelledSignIn: true }).then() + ? Promise.reject({ userCancelledSignIn: true }).then() : Promise.reject(new Error()).then(); }); mockProvider.setup(x => x.refresh(TypeMoq.It.isAny())) .returns(() => { return cancel - ? Promise.reject({ userCancelledSignIn: true }).then() + ? Promise.reject({ userCancelledSignIn: true }).then() : Promise.reject(new Error()).then(); }); return mockProvider; @@ -623,5 +623,5 @@ interface AccountManagementState { mockAccountStore: TypeMoq.Mock; eventVerifierUpdate: EventVerifierSingle; eventVerifierProviderAdded: EventVerifierSingle; - eventVerifierProviderRemoved: EventVerifierSingle; + eventVerifierProviderRemoved: EventVerifierSingle; } diff --git a/src/sqltest/services/accountManagement/accountStore.test.ts b/src/sqltest/services/accountManagement/accountStore.test.ts index 9650b8f6b6..8b9136a4f0 100644 --- a/src/sqltest/services/accountManagement/accountStore.test.ts +++ b/src/sqltest/services/accountManagement/accountStore.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import AccountStore from 'sql/platform/accountManagement/common/accountStore'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; @@ -68,7 +68,7 @@ suite('Account Store Tests', () => { let as = new AccountStore(memento); // If: I add an account to the store that already exists - let param = { + let param = { key: account2.key, displayInfo: account1.displayInfo, isStale: account1.isStale @@ -308,7 +308,7 @@ suite('Account Store Tests', () => { let as = new AccountStore(memento); // ... Create a callback that we can verify was called - let updateCallback = new EventVerifierSingle(); + let updateCallback = new EventVerifierSingle(); // If: I update an account as.update(account1.key, updateCallback.eventHandler) @@ -337,7 +337,7 @@ suite('Account Store Tests', () => { let as = new AccountStore(memento); // ... Create a callback that we can verify was called - let updateCallback = new EventVerifierSingle(); + let updateCallback = new EventVerifierSingle(); // If: I update an account that doesn't exist as.update({ accountId: 'testyTest', providerId: 'cloudyCloud' }, updateCallback.eventHandler) @@ -366,7 +366,7 @@ suite('Account Store Tests', () => { // ... Create a callback to update the account let newDisplayName = 'Display Name Changed!'; - let updateCallback = (arg: sqlops.Account) => { + let updateCallback = (arg: azdata.Account) => { arg.displayInfo.displayName = newDisplayName; }; @@ -397,7 +397,7 @@ suite('Account Store Tests', () => { }); // TODO: Reinstate contextual logo once UI changes are checked in -const account1 = { +const account1 = { key: { providerId: 'azure', accountId: 'testAccount1' @@ -410,7 +410,7 @@ const account1 = { isStale: false }; -const account2 = { +const account2 = { key: { providerId: 'azure', accountId: 'testAccount2' @@ -430,7 +430,7 @@ function getTestMemento() { return memento; } -function assertAccountEqual(a: sqlops.Account, b: sqlops.Account) { +function assertAccountEqual(a: azdata.Account, b: azdata.Account) { assert.equal(a.key.providerId, b.key.providerId); assert.equal(a.key.accountId, b.key.accountId); diff --git a/src/sqltest/stubs/accountManagementStubs.ts b/src/sqltest/stubs/accountManagementStubs.ts index e60f31f82b..8f069408b8 100644 --- a/src/sqltest/stubs/accountManagementStubs.ts +++ b/src/sqltest/stubs/accountManagementStubs.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event } from 'vs/base/common/event'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; @@ -15,10 +15,10 @@ export class AccountManagementTestService implements IAccountManagementService { _serviceBrand: any; public get addAccountProviderEvent(): Event { return () => { return undefined; }; } - public get removeAccountProviderEvent(): Event { return () => { return undefined; }; } + public get removeAccountProviderEvent(): Event { return () => { return undefined; }; } public get updateAccountListEvent(): Event { return () => { return undefined; }; } - accountUpdated(account: sqlops.Account): Thenable { + accountUpdated(account: azdata.Account): Thenable { return undefined; } @@ -42,23 +42,23 @@ export class AccountManagementTestService implements IAccountManagementService { return undefined; } - getAccountProviderMetadata(): Thenable { + getAccountProviderMetadata(): Thenable { return undefined; } - getAccountsForProvider(providerId: string): Thenable { + getAccountsForProvider(providerId: string): Thenable { return undefined; } - getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> { + getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> { return undefined; } - removeAccount(accountKey: sqlops.AccountKey): Thenable { + removeAccount(accountKey: azdata.AccountKey): Thenable { return undefined; } - refreshAccount(account: sqlops.Account): Thenable { + refreshAccount(account: azdata.Account): Thenable { return undefined; } @@ -66,7 +66,7 @@ export class AccountManagementTestService implements IAccountManagementService { return undefined; } - registerProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): void { + registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): void { return undefined; } @@ -74,33 +74,33 @@ export class AccountManagementTestService implements IAccountManagementService { return undefined; } - unregisterProvider(providerMetadata: sqlops.AccountProviderMetadata): void { + unregisterProvider(providerMetadata: azdata.AccountProviderMetadata): void { return undefined; } } -export class AccountProviderStub implements sqlops.AccountProvider { +export class AccountProviderStub implements azdata.AccountProvider { autoOAuthCancelled(): Thenable { return Promise.resolve(); } - clear(account: sqlops.AccountKey): Thenable { + clear(account: azdata.AccountKey): Thenable { return Promise.resolve(); } - getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> { + getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> { return Promise.resolve({}); } - initialize(storedAccounts: sqlops.Account[]): Thenable { + initialize(storedAccounts: azdata.Account[]): Thenable { return Promise.resolve(storedAccounts); } - prompt(): Thenable { + prompt(): Thenable { return Promise.resolve(undefined); } - refresh(account: sqlops.Account): Thenable { + refresh(account: azdata.Account): Thenable { return Promise.resolve(account); } } diff --git a/src/sqltest/stubs/capabilitiesTestService.ts b/src/sqltest/stubs/capabilitiesTestService.ts index 618241ba93..d0ca7ae377 100644 --- a/src/sqltest/stubs/capabilitiesTestService.ts +++ b/src/sqltest/stubs/capabilitiesTestService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { ICapabilitiesService, ProviderFeatures } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; @@ -20,7 +20,7 @@ export class CapabilitiesTestService implements ICapabilitiesService { constructor() { - let connectionProvider: sqlops.ConnectionOption[] = [ + let connectionProvider: azdata.ConnectionOption[] = [ { name: 'connectionName', displayName: undefined, @@ -110,7 +110,7 @@ export class CapabilitiesTestService implements ICapabilitiesService { return this.capabilities[provider]; } - public getLegacyCapabilities(provider: string): sqlops.DataProtocolServerCapabilities { + public getLegacyCapabilities(provider: string): azdata.DataProtocolServerCapabilities { throw new Error('Method not implemented.'); } @@ -122,11 +122,11 @@ export class CapabilitiesTestService implements ICapabilitiesService { * Register the capabilities provider and query the provider for its capabilities * @param provider */ - public registerProvider(provider: sqlops.CapabilitiesProvider): void { + public registerProvider(provider: azdata.CapabilitiesProvider): void { } // Event Emitters - public get onProviderRegisteredEvent(): Event { + public get onProviderRegisteredEvent(): Event { return undefined; } diff --git a/src/sqltest/stubs/connectionManagementService.test.ts b/src/sqltest/stubs/connectionManagementService.test.ts index 7682fc9372..fdaf10752d 100644 --- a/src/sqltest/stubs/connectionManagementService.test.ts +++ b/src/sqltest/stubs/connectionManagementService.test.ts @@ -9,7 +9,7 @@ import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/co import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; // Test stubs for commonly used objects @@ -31,7 +31,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer return conEvent.event; } - registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void { + registerProvider(providerId: string, provider: azdata.ConnectionProvider): void { } @@ -47,7 +47,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer return undefined; } - onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void { + onConnectionComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void { } @@ -55,11 +55,11 @@ export class TestConnectionManagementService implements IConnectionManagementSer } - public onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void { + public onConnectionChangedNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void { } - getCurrentConnectionSummary(): sqlops.ConnectionSummary { + getCurrentConnectionSummary(): azdata.ConnectionSummary { return undefined; } @@ -111,7 +111,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer }); } - getAdvancedProperties(): sqlops.ConnectionOption[] { + getAdvancedProperties(): azdata.ConnectionOption[] { return []; } @@ -181,7 +181,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer return new Promise(() => connectionProfile); } - public listDatabases(connectionUri: string): Thenable { + public listDatabases(connectionUri: string): Thenable { return Promise.resolve(undefined); } @@ -215,7 +215,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer return true; } - getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities { + getCapabilities(providerName: string): azdata.DataProtocolServerCapabilities { return undefined; } @@ -254,7 +254,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer return undefined; } - getServerInfo(profileId: string): sqlops.ServerInfo { + getServerInfo(profileId: string): azdata.ServerInfo { return undefined; } @@ -262,7 +262,7 @@ export class TestConnectionManagementService implements IConnectionManagementSer return undefined; } - buildConnectionInfo(connectionString: string, provider?: string): Thenable { + buildConnectionInfo(connectionString: string, provider?: string): Thenable { return undefined; } diff --git a/src/sqltest/stubs/connectionProviderStub.ts b/src/sqltest/stubs/connectionProviderStub.ts index 19ad97033a..57f57abc92 100644 --- a/src/sqltest/stubs/connectionProviderStub.ts +++ b/src/sqltest/stubs/connectionProviderStub.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; -export class ConnectionProviderStub implements sqlops.ConnectionProvider { +export class ConnectionProviderStub implements azdata.ConnectionProvider { public readonly providerId = 'MSSQL'; - connect(connectionUri: string, connectionInfo: sqlops.ConnectionInfo): Thenable { + connect(connectionUri: string, connectionInfo: azdata.ConnectionInfo): Thenable { return undefined; } @@ -20,7 +20,7 @@ export class ConnectionProviderStub implements sqlops.ConnectionProvider { return undefined; } - listDatabases(connectionUri: string): Thenable { + listDatabases(connectionUri: string): Thenable { return undefined; } @@ -36,7 +36,7 @@ export class ConnectionProviderStub implements sqlops.ConnectionProvider { return undefined; } - registerOnConnectionComplete(handler: (connSummary: sqlops.ConnectionInfoSummary) => any) { + registerOnConnectionComplete(handler: (connSummary: azdata.ConnectionInfoSummary) => any) { return undefined; } @@ -44,7 +44,7 @@ export class ConnectionProviderStub implements sqlops.ConnectionProvider { return undefined; } - registerOnConnectionChanged(handler: (changedConnInfo: sqlops.ChangedConnectionInfo) => any) { + registerOnConnectionChanged(handler: (changedConnInfo: azdata.ChangedConnectionInfo) => any) { return undefined; } } \ No newline at end of file diff --git a/src/sqltest/stubs/credentialsTestStubs.ts b/src/sqltest/stubs/credentialsTestStubs.ts index 6e6f45cbc6..b20e1196c2 100644 --- a/src/sqltest/stubs/credentialsTestStubs.ts +++ b/src/sqltest/stubs/credentialsTestStubs.ts @@ -5,15 +5,15 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { TPromise } from 'vs/base/common/winjs.base'; import { CredentialManagementEvents, ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { IDisposable } from 'vs/base/common/lifecycle'; -export class CredentialsTestProvider implements sqlops.CredentialProvider { +export class CredentialsTestProvider implements azdata.CredentialProvider { handle: number; - public storedCredentials: { [K: string]: sqlops.Credential } = {}; + public storedCredentials: { [K: string]: azdata.Credential } = {}; saveCredential(credentialId: string, password: string): Thenable { this.storedCredentials[credentialId] = { @@ -23,7 +23,7 @@ export class CredentialsTestProvider implements sqlops.CredentialProvider { return TPromise.as(true); } - readCredential(credentialId: string): Thenable { + readCredential(credentialId: string): Thenable { return TPromise.as(this.storedCredentials[credentialId]); } @@ -41,7 +41,7 @@ export class CredentialsTestService implements ICredentialsService { return undefined; } - readCredential(credentialId: string): Thenable { + readCredential(credentialId: string): Thenable { return undefined; } diff --git a/src/sqltest/stubs/objectExplorerProviderTestService.ts b/src/sqltest/stubs/objectExplorerProviderTestService.ts index 93219d3d7a..2c8f3f7dba 100644 --- a/src/sqltest/stubs/objectExplorerProviderTestService.ts +++ b/src/sqltest/stubs/objectExplorerProviderTestService.ts @@ -2,43 +2,43 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; // Test stubs for commonly used objects -export class ObjectExplorerProviderTestService implements sqlops.ObjectExplorerProvider { +export class ObjectExplorerProviderTestService implements azdata.ObjectExplorerProvider { public readonly providerId = 'MSSQL'; - public createNewSession(connInfo: sqlops.ConnectionInfo): Thenable { + public createNewSession(connInfo: azdata.ConnectionInfo): Thenable { return Promise.resolve(undefined); } - public expandNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + public expandNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { return Promise.resolve(undefined); } - public refreshNode(nodeInfo: sqlops.ExpandNodeInfo): Thenable { + public refreshNode(nodeInfo: azdata.ExpandNodeInfo): Thenable { return Promise.resolve(undefined); } - public closeSession(closeSessionInfo: sqlops.ObjectExplorerCloseSessionInfo): Thenable { + public closeSession(closeSessionInfo: azdata.ObjectExplorerCloseSessionInfo): Thenable { return Promise.resolve(undefined); } - public registerOnSessionCreated(handler: (response: sqlops.ObjectExplorerSession) => any): void { + public registerOnSessionCreated(handler: (response: azdata.ObjectExplorerSession) => any): void { } - public registerOnSessionDisconnected(handler: (response: sqlops.ObjectExplorerSession) => any): void { + public registerOnSessionDisconnected(handler: (response: azdata.ObjectExplorerSession) => any): void { } - public registerOnExpandCompleted(handler: (response: sqlops.ObjectExplorerExpandInfo) => any): void { + public registerOnExpandCompleted(handler: (response: azdata.ObjectExplorerExpandInfo) => any): void { } - public findNodes(findNodesInfo: sqlops.FindNodesInfo): Thenable { + public findNodes(findNodesInfo: azdata.FindNodesInfo): Thenable { return undefined; } } \ No newline at end of file diff --git a/src/sqltest/stubs/resourceProviderServiceStub.ts b/src/sqltest/stubs/resourceProviderServiceStub.ts index 0e2662034c..54340dc527 100644 --- a/src/sqltest/stubs/resourceProviderServiceStub.ts +++ b/src/sqltest/stubs/resourceProviderServiceStub.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { IHandleFirewallRuleResult, IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class ResourceProviderStub implements IResourceProviderService { _serviceBrand: any; - registerProvider(providerId: string, provider: sqlops.ResourceProvider) { + registerProvider(providerId: string, provider: azdata.ResourceProvider) { } @@ -18,7 +18,7 @@ export class ResourceProviderStub implements IResourceProviderService { } - createFirewallRule(selectedAccount: sqlops.Account, firewallruleInfo: sqlops.FirewallRuleInfo, resourceProviderId: string): Promise { + createFirewallRule(selectedAccount: azdata.Account, firewallruleInfo: azdata.FirewallRuleInfo, resourceProviderId: string): Promise { return undefined; } diff --git a/src/sqltest/workbench/api/extHostAccountManagement.test.ts b/src/sqltest/workbench/api/extHostAccountManagement.test.ts index 11cf230bd9..bcc840d00e 100644 --- a/src/sqltest/workbench/api/extHostAccountManagement.test.ts +++ b/src/sqltest/workbench/api/extHostAccountManagement.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import { AccountProviderStub, AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs'; import { ExtHostAccountManagement } from 'sql/workbench/api/node/extHostAccountManagement'; @@ -22,8 +22,8 @@ const IRPCProtocol = createDecorator('rpcProtocol'); // SUITE STATE ///////////////////////////////////////////////////////////// let instantiationService: TestInstantiationService; -let mockAccountMetadata: sqlops.AccountProviderMetadata; -let mockAccount: sqlops.Account; +let mockAccountMetadata: azdata.AccountProviderMetadata; +let mockAccount: azdata.Account; let threadService: TestRPCProtocol; // TESTS /////////////////////////////////////////////////////////////////// @@ -428,8 +428,8 @@ suite('ExtHostAccountManagement', () => { }); }); -function getMockAccountProvider(): TypeMoq.Mock { - let mock = TypeMoq.Mock.ofType(AccountProviderStub); +function getMockAccountProvider(): TypeMoq.Mock { + let mock = TypeMoq.Mock.ofType(AccountProviderStub); mock.setup((obj) => obj.clear(TypeMoq.It.isValue(mockAccount.key))) .returns(() => Promise.resolve(undefined)); mock.setup((obj) => obj.refresh(TypeMoq.It.isValue(mockAccount))) @@ -442,7 +442,7 @@ function getMockAccountProvider(): TypeMoq.Mock { return mock; } -function getMockAccountManagementService(accounts: sqlops.Account[]): TypeMoq.Mock { +function getMockAccountManagementService(accounts: azdata.Account[]): TypeMoq.Mock { let mockAccountManagementService = TypeMoq.Mock.ofType(AccountManagementTestService); mockAccountManagementService.setup(x => x.getAccountsForProvider(TypeMoq.It.isAny())) diff --git a/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts b/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts index f90b631712..280b3908ae 100644 --- a/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts +++ b/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import { Mock, It, Times } from 'typemoq'; import { ExtHostBackgroundTaskManagement, TaskStatus } from 'sql/workbench/api/node/extHostBackgroundTaskManagement'; @@ -21,8 +21,8 @@ suite('ExtHostBackgroundTaskManagement Tests', () => { setup(() => { mockProxy = Mock.ofInstance({ - $registerTask: (taskInfo: sqlops.TaskInfo) => nothing, - $updateTask: (taskProgressInfo: sqlops.TaskProgressInfo) => nothing + $registerTask: (taskInfo: azdata.TaskInfo) => nothing, + $updateTask: (taskProgressInfo: azdata.TaskProgressInfo) => nothing }); let mainContext = { getProxy: proxyType => mockProxy.object @@ -35,12 +35,12 @@ suite('ExtHostBackgroundTaskManagement Tests', () => { }); test('RegisterTask should successfully create background task and update status', () => { - let operationInfo: sqlops.BackgroundOperationInfo = { + let operationInfo: azdata.BackgroundOperationInfo = { connection: undefined, description: 'description', displayName: 'displayName', isCancelable: true, - operation: (op: sqlops.BackgroundOperation) => { op.updateStatus(TaskStatus.Succeeded); }, + operation: (op: azdata.BackgroundOperation) => { op.updateStatus(TaskStatus.Succeeded); }, operationId: operationId }; extHostBackgroundTaskManagement.$registerTask(operationInfo); @@ -56,12 +56,12 @@ suite('ExtHostBackgroundTaskManagement Tests', () => { }); test('Canceling the task should notify the extension', () => { - let operationInfo: sqlops.BackgroundOperationInfo = { + let operationInfo: azdata.BackgroundOperationInfo = { connection: undefined, description: 'description', displayName: 'displayName', isCancelable: true, - operation: (op: sqlops.BackgroundOperation) => { + operation: (op: azdata.BackgroundOperation) => { op.onCanceled(() => { op.updateStatus(TaskStatus.Canceled); }); @@ -76,12 +76,12 @@ suite('ExtHostBackgroundTaskManagement Tests', () => { }); test('RegisterTask should assign unique id to the operation is not assigned', () => { - let operationInfo: sqlops.BackgroundOperationInfo = { + let operationInfo: azdata.BackgroundOperationInfo = { connection: undefined, description: 'description', displayName: 'displayName', isCancelable: true, - operation: (op: sqlops.BackgroundOperation) => { op.updateStatus(TaskStatus.Succeeded); }, + operation: (op: azdata.BackgroundOperation) => { op.updateStatus(TaskStatus.Succeeded); }, operationId: undefined }; extHostBackgroundTaskManagement.$registerTask(operationInfo); @@ -91,12 +91,12 @@ suite('ExtHostBackgroundTaskManagement Tests', () => { }); test('RegisterTask should fail given id of an existing operation', () => { - let operationInfo: sqlops.BackgroundOperationInfo = { + let operationInfo: azdata.BackgroundOperationInfo = { connection: undefined, description: 'description', displayName: 'displayName', isCancelable: true, - operation: (op: sqlops.BackgroundOperation) => { op.updateStatus(TaskStatus.Succeeded); }, + operation: (op: azdata.BackgroundOperation) => { op.updateStatus(TaskStatus.Succeeded); }, operationId: operationId }; extHostBackgroundTaskManagement.$registerTask(operationInfo); diff --git a/src/sqltest/workbench/api/extHostCredentialManagement.test.ts b/src/sqltest/workbench/api/extHostCredentialManagement.test.ts index e440ac3d5f..b9504773db 100644 --- a/src/sqltest/workbench/api/extHostCredentialManagement.test.ts +++ b/src/sqltest/workbench/api/extHostCredentialManagement.test.ts @@ -14,7 +14,7 @@ import { IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentif import { MainThreadCredentialManagement } from 'sql/workbench/api/node/mainThreadCredentialManagement'; import { CredentialsTestProvider, CredentialsTestService } from 'sqltest/stubs/credentialsTestStubs'; import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; -import { Credential, CredentialProvider } from 'sqlops'; +import { Credential, CredentialProvider } from 'azdata'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; const IRPCProtocol = createDecorator('rpcProtocol'); diff --git a/src/sqltest/workbench/api/extHostDataProtocol.test.ts b/src/sqltest/workbench/api/extHostDataProtocol.test.ts index 9962cb1cd5..662492ae78 100644 --- a/src/sqltest/workbench/api/extHostDataProtocol.test.ts +++ b/src/sqltest/workbench/api/extHostDataProtocol.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { Mock } from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ExtHostDataProtocol } from 'sql/workbench/api/node/extHostDataProtocol'; import { DataProviderType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ProxyAuthHandler } from 'vs/code/electron-main/auth'; @@ -36,7 +36,7 @@ suite('ExtHostDataProtocol', () => { getTableInfo: () => undefined, getViewInfo: () => undefined, providerId: extension1Id - } as sqlops.MetadataProvider); + } as azdata.MetadataProvider); let extension2Id = 'provider2'; let extension2MetadataMock = Mock.ofInstance({ @@ -45,15 +45,15 @@ suite('ExtHostDataProtocol', () => { getTableInfo: () => undefined, getViewInfo: () => undefined, providerId: extension2Id - } as sqlops.MetadataProvider); + } as azdata.MetadataProvider); // If I register both providers and then get them using the getProvider API extHostDataProtocol.$registerMetadataProvider(extension1MetadataMock.object); extHostDataProtocol.$registerMetadataProvider(extension2MetadataMock.object); - extHostDataProtocol.$registerConnectionProvider({} as sqlops.ConnectionProvider); - let retrievedProvider1 = extHostDataProtocol.getProvider(extension1Id, DataProviderType.MetadataProvider); - let retrievedProvider2 = extHostDataProtocol.getProvider(extension2Id, DataProviderType.MetadataProvider); - let allProviders = extHostDataProtocol.getProvidersByType(DataProviderType.MetadataProvider); + extHostDataProtocol.$registerConnectionProvider({} as azdata.ConnectionProvider); + let retrievedProvider1 = extHostDataProtocol.getProvider(extension1Id, DataProviderType.MetadataProvider); + let retrievedProvider2 = extHostDataProtocol.getProvider(extension2Id, DataProviderType.MetadataProvider); + let allProviders = extHostDataProtocol.getProvidersByType(DataProviderType.MetadataProvider); // Then each provider was retrieved successfully assert.equal(retrievedProvider1, extension1MetadataMock.object, 'Expected metadata provider was not retrieved for extension 1'); diff --git a/src/sqltest/workbench/api/extHostModelView.test.ts b/src/sqltest/workbench/api/extHostModelView.test.ts index fca1173a69..1960b00362 100644 --- a/src/sqltest/workbench/api/extHostModelView.test.ts +++ b/src/sqltest/workbench/api/extHostModelView.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { Mock, It, Times, MockBehavior } from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ExtHostModelView } from 'sql/workbench/api/node/extHostModelView'; import { MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; @@ -24,8 +24,8 @@ interface IWithItemConfig { suite('ExtHostModelView Validation Tests', () => { let extHostModelView: ExtHostModelView; let mockProxy: Mock; - let modelView: sqlops.ModelView; - let inputBox: sqlops.InputBoxComponent; + let modelView: azdata.ModelView; + let inputBox: azdata.InputBoxComponent; let validText = 'valid'; let widgetId = 'widget_id'; let handle = 1; @@ -146,7 +146,7 @@ suite('ExtHostModelView Validation Tests', () => { inputComponent.required = false; // If I build a form that sets the input component as required - let inputFormComponent: sqlops.FormComponent = { + let inputFormComponent: azdata.FormComponent = { component: inputComponent, title: 'test_input', required: true @@ -171,17 +171,17 @@ suite('ExtHostModelView Validation Tests', () => { let groupInput = modelView.modelBuilder.inputBox().component(); let groupDropdown = modelView.modelBuilder.dropDown().component(); - let topLevelInputFormComponent: sqlops.FormComponent = { component: topLevelList, title: 'top_level_input' }; - let groupInputFormComponent: sqlops.FormComponent = { component: groupInput, title: 'group_input' }; - let groupDropdownFormComponent: sqlops.FormComponent = { component: groupDropdown, title: 'group_dropdown' }; + let topLevelInputFormComponent: azdata.FormComponent = { component: topLevelList, title: 'top_level_input' }; + let groupInputFormComponent: azdata.FormComponent = { component: groupInput, title: 'group_input' }; + let groupDropdownFormComponent: azdata.FormComponent = { component: groupDropdown, title: 'group_dropdown' }; let groupTitle = 'group_title'; // Give the group a default layout and add one just for the input component too - let defaultLayout: sqlops.FormItemLayout = { + let defaultLayout: azdata.FormItemLayout = { horizontal: true }; - let groupInputLayout: sqlops.FormItemLayout = { + let groupInputLayout: azdata.FormItemLayout = { horizontal: false }; @@ -216,9 +216,9 @@ suite('ExtHostModelView Validation Tests', () => { assert.equal((groupLabelConfig.config as TitledFormItemLayout).isGroupLabel, true); // Verify that the components' layouts are correct - assert.equal((listBoxConfig.config as sqlops.FormItemLayout).horizontal, defaultLayout.horizontal); - assert.equal((inputBoxConfig.config as sqlops.FormItemLayout).horizontal, groupInputLayout.horizontal); - assert.equal((dropdownConfig.config as sqlops.FormItemLayout).horizontal, defaultLayout.horizontal); + assert.equal((listBoxConfig.config as azdata.FormItemLayout).horizontal, defaultLayout.horizontal); + assert.equal((inputBoxConfig.config as azdata.FormItemLayout).horizontal, groupInputLayout.horizontal); + assert.equal((dropdownConfig.config as azdata.FormItemLayout).horizontal, defaultLayout.horizontal); }); test('Inserting and removing components from a container should work correctly', () => { @@ -342,7 +342,7 @@ suite('ExtHostModelView Validation Tests', () => { let dropDown = modelView.modelBuilder.dropDown().component(); let checkBox = modelView.modelBuilder.checkBox().component(); - let groupItems: sqlops.FormComponentGroup = { + let groupItems: azdata.FormComponentGroup = { title: 'Group', components: [{ title: 'Drop Down', @@ -352,11 +352,11 @@ suite('ExtHostModelView Validation Tests', () => { component: checkBox }] }; - let listBoxFormItem: sqlops.FormComponent = { + let listBoxFormItem: azdata.FormComponent = { title: 'List Box', component: listBox }; - let inputBoxFormItem: sqlops.FormComponent = { + let inputBoxFormItem: azdata.FormComponent = { title: 'Input Box', component: inputBox }; diff --git a/src/sqltest/workbench/api/extHostModelViewDialog.test.ts b/src/sqltest/workbench/api/extHostModelViewDialog.test.ts index 3ce8ba69dc..8906752757 100644 --- a/src/sqltest/workbench/api/extHostModelViewDialog.test.ts +++ b/src/sqltest/workbench/api/extHostModelViewDialog.test.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as assert from 'assert'; import { Mock, It, Times } from 'typemoq'; import { ExtHostModelViewDialog } from 'sql/workbench/api/node/extHostModelViewDialog'; @@ -276,7 +276,7 @@ suite('ExtHostModelViewDialog Tests', () => { // Create the wizard and add a validation that records that it has been called let wizard = extHostModelViewDialog.createWizard('wizard_1'); extHostModelViewDialog.updateWizard(wizard); - let validationInfo: sqlops.window.WizardPageChangeInfo; + let validationInfo: azdata.window.WizardPageChangeInfo; wizard.registerNavigationValidator(info => { validationInfo = info; return true; diff --git a/src/sqltest/workbench/api/exthostNotebook.test.ts b/src/sqltest/workbench/api/exthostNotebook.test.ts index b02b0defaa..e6b438ec9b 100644 --- a/src/sqltest/workbench/api/exthostNotebook.test.ts +++ b/src/sqltest/workbench/api/exthostNotebook.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; @@ -120,11 +120,11 @@ suite('ExtHostNotebook Tests', () => { }); }); -class NotebookProviderStub implements sqlops.nb.NotebookProvider { +class NotebookProviderStub implements azdata.nb.NotebookProvider { providerId: string = 'TestProvider'; - standardKernels: sqlops.nb.IStandardKernel[] = [{name: 'fakeKernel', connectionProviderIds: ['MSSQL']}]; + standardKernels: azdata.nb.IStandardKernel[] = [{name: 'fakeKernel', connectionProviderIds: ['MSSQL']}]; - getNotebookManager(notebookUri: vscode.Uri): Thenable { + getNotebookManager(notebookUri: vscode.Uri): Thenable { throw new Error('Method not implemented.'); } handleNotebookClosed(notebookUri: vscode.Uri): void { @@ -132,16 +132,16 @@ class NotebookProviderStub implements sqlops.nb.NotebookProvider { } } -class NotebookManagerStub implements sqlops.nb.NotebookManager { - get contentManager(): sqlops.nb.ContentManager { +class NotebookManagerStub implements azdata.nb.NotebookManager { + get contentManager(): azdata.nb.ContentManager { return undefined; } - get sessionManager(): sqlops.nb.SessionManager { + get sessionManager(): azdata.nb.SessionManager { return undefined; } - get serverManager(): sqlops.nb.ServerManager { + get serverManager(): azdata.nb.ServerManager { return undefined; } } \ No newline at end of file diff --git a/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts b/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts index 68fc0238ca..7c01a7b095 100644 --- a/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts +++ b/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts @@ -5,7 +5,7 @@ 'use strict'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { Mock, It, Times } from 'typemoq'; import { MainThreadBackgroundTaskManagement, TaskStatus } from 'sql/workbench/api/node/mainThreadBackgroundTaskManagement'; import { ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; @@ -26,7 +26,7 @@ suite('MainThreadBackgroundTaskManagement Tests', () => { mockProxy = Mock.ofInstance({ $onTaskRegistered: (operationId: string) => nothing, $onTaskCanceled: (operationId: string) => nothing, - $registerTask: (operationInfo: sqlops.BackgroundOperationInfo) => nothing, + $registerTask: (operationInfo: azdata.BackgroundOperationInfo) => nothing, $removeTask: (operationId: string) => nothing, }); taskService = Mock.ofInstance({ @@ -38,8 +38,8 @@ suite('MainThreadBackgroundTaskManagement Tests', () => { getAllTasks: undefined, getNumberOfInProgressTasks: undefined, onNewTaskCreated: undefined, - createNewTask: (taskInfo: sqlops.TaskInfo) => nothing, - updateTask: (taskProgressInfo: sqlops.TaskProgressInfo) => nothing, + createNewTask: (taskInfo: azdata.TaskInfo) => nothing, + updateTask: (taskProgressInfo: azdata.TaskProgressInfo) => nothing, onTaskStatusChanged: undefined, cancelTask: undefined, registerProvider: undefined @@ -54,7 +54,7 @@ suite('MainThreadBackgroundTaskManagement Tests', () => { }); test('RegisterTask should successfully create background task', () => { - let taskInfo: sqlops.TaskInfo = { + let taskInfo: azdata.TaskInfo = { taskId: operationId, databaseName: undefined, description: undefined, @@ -71,7 +71,7 @@ suite('MainThreadBackgroundTaskManagement Tests', () => { }); test('UpdateTask should successfully update the background task status', () => { - let taskInfo: sqlops.TaskProgressInfo = { + let taskInfo: azdata.TaskProgressInfo = { taskId: operationId, status: TaskStatus.InProgress, message: undefined, @@ -81,7 +81,7 @@ suite('MainThreadBackgroundTaskManagement Tests', () => { }); test('Canceling the task should notify the proxy', () => { - let taskInfo: sqlops.TaskProgressInfo = { + let taskInfo: azdata.TaskProgressInfo = { taskId: operationId, status: TaskStatus.InProgress, message: undefined, diff --git a/src/sqltest/workbench/api/mainThreadNotebook.test.ts b/src/sqltest/workbench/api/mainThreadNotebook.test.ts index 153b8d6ada..3d1b861d32 100644 --- a/src/sqltest/workbench/api/mainThreadNotebook.test.ts +++ b/src/sqltest/workbench/api/mainThreadNotebook.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { URI, UriComponents } from 'vs/base/common/uri'; @@ -132,46 +132,46 @@ class ExtHostNotebookStub implements ExtHostNotebookShape { $doStopServer(managerHandle: number): Thenable { throw new Error('Method not implemented.'); } - $getNotebookContents(managerHandle: number, notebookUri: UriComponents): Thenable { + $getNotebookContents(managerHandle: number, notebookUri: UriComponents): Thenable { throw new Error('Method not implemented.'); } - $save(managerHandle: number, notebookUri: UriComponents, notebook: sqlops.nb.INotebookContents): Thenable { + $save(managerHandle: number, notebookUri: UriComponents, notebook: azdata.nb.INotebookContents): Thenable { throw new Error('Method not implemented.'); } - $refreshSpecs(managerHandle: number): Thenable { + $refreshSpecs(managerHandle: number): Thenable { throw new Error('Method not implemented.'); } - $startNewSession(managerHandle: number, options: sqlops.nb.ISessionOptions): Thenable { + $startNewSession(managerHandle: number, options: azdata.nb.ISessionOptions): Thenable { throw new Error('Method not implemented.'); } $shutdownSession(managerHandle: number, sessionId: string): Thenable { throw new Error('Method not implemented.'); } - $changeKernel(sessionId: number, kernelInfo: sqlops.nb.IKernelSpec): Thenable { + $changeKernel(sessionId: number, kernelInfo: azdata.nb.IKernelSpec): Thenable { throw new Error('Method not implemented.'); } - $configureKernel(sessionId: number, kernelInfo: sqlops.nb.IKernelSpec): Thenable { + $configureKernel(sessionId: number, kernelInfo: azdata.nb.IKernelSpec): Thenable { throw new Error('Method not implemented.'); } - $configureConnection(sessionId: number, conneection: sqlops.IConnectionProfile): Thenable { + $configureConnection(sessionId: number, conneection: azdata.IConnectionProfile): Thenable { throw new Error('Method not implemented.'); } - $getKernelReadyStatus(kernelId: number): Thenable { + $getKernelReadyStatus(kernelId: number): Thenable { throw new Error('Method not implemented.'); } - $getKernelSpec(kernelId: number): Thenable { + $getKernelSpec(kernelId: number): Thenable { throw new Error('Method not implemented.'); } - $requestComplete(kernelId: number, content: sqlops.nb.ICompleteRequest): Thenable { + $requestComplete(kernelId: number, content: azdata.nb.ICompleteRequest): Thenable { throw new Error('Method not implemented.'); } - $requestExecute(kernelId: number, content: sqlops.nb.IExecuteRequest, disposeOnDone?: boolean): Thenable { + $requestExecute(kernelId: number, content: azdata.nb.IExecuteRequest, disposeOnDone?: boolean): Thenable { throw new Error('Method not implemented.'); } $interruptKernel(kernelId: number): Thenable { throw new Error('Method not implemented.'); } - $sendInputReply(futureId: number, content: sqlops.nb.IInputReply): void { + $sendInputReply(futureId: number, content: azdata.nb.IInputReply): void { throw new Error('Method not implemented.'); } $disposeFuture(futureId: number): void { diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index ee4a2c7332..8ede1e9b2b 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -21,7 +21,7 @@ import { IExtensionDescription, checkProposedApiEnabled } from 'vs/workbench/ser import * as typeConvert from 'vs/workbench/api/node/extHostTypeConverters'; // {{SQL CARBON EDIT}} -import * as sqlops from 'sqlops'; +import * as azdata from 'azdata'; import { ITreeItem as sqlITreeItem } from 'sql/workbench/common/views'; export type TreeItemHandle = string; @@ -436,7 +436,7 @@ export class ExtHostTreeView extends Disposable { } // {{SQL CARBON EDIT}} - protected createTreeItem(element: T, extensionTreeItem: sqlops.TreeItem, parent?: TreeNode): sqlITreeItem { + protected createTreeItem(element: T, extensionTreeItem: azdata.TreeItem, parent?: TreeNode): sqlITreeItem { const handle = this.createHandle(element, extensionTreeItem, parent); const icon = this.getLightIconPath(extensionTreeItem);