Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions

View File

@@ -65,7 +65,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On
@ViewChild('jobalertsgrid') _gridEl: ElementRef;
public alerts: azdata.AgentAlertInfo[];
public contextAction = NewAlertAction;
public override contextAction = NewAlertAction;
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
@@ -97,7 +97,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On
this._parentComponent = this._agentViewComponent;
}
ngOnDestroy() {
override ngOnDestroy() {
this._didTabChange = true;
}
@@ -196,14 +196,14 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On
this._table.resizeCanvas();
}
protected getTableActions(): IAction[] {
protected override getTableActions(): IAction[] {
return [
this._instantiationService.createInstance(EditAlertAction),
this._instantiationService.createInstance(DeleteAlertAction)
];
}
protected getCurrentTableObject(rowIndex: number): any {
protected override getCurrentTableObject(rowIndex: number): any {
let targetObject = {
alertInfo: this.alerts && this.alerts.length >= rowIndex ? this.alerts[rowIndex] : undefined
};

View File

@@ -47,7 +47,7 @@ export class JobsRefreshAction extends Action {
super(JobsRefreshAction.ID, JobsRefreshAction.LABEL, 'refreshIcon');
}
public async run(context?: IJobActionInfo): Promise<void> {
public override async run(context?: IJobActionInfo): Promise<void> {
context?.component?.refreshJobs();
}
}
@@ -61,7 +61,7 @@ export class NewJobAction extends Action {
super(NewJobAction.ID, NewJobAction.LABEL, 'newStepIcon');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
const component = context.component as JobsViewComponent;
await component.openCreateJobDialog();
}
@@ -81,7 +81,7 @@ export class RunJobAction extends Action {
super(RunJobAction.ID, RunJobAction.LABEL, 'start');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
let jobName = context.targetObject.job.name;
let ownerUri = context.ownerUri;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
@@ -111,7 +111,7 @@ export class StopJobAction extends Action {
super(StopJobAction.ID, StopJobAction.LABEL, 'stop');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
let jobName = context.targetObject.name;
let ownerUri = context.ownerUri;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
@@ -137,7 +137,7 @@ export class EditJobAction extends Action {
super(EditJobAction.ID, EditJobAction.LABEL, 'edit');
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
await this._commandService.executeCommand(
'agent.openJobDialog',
actionInfo.ownerUri,
@@ -153,7 +153,7 @@ export class OpenMaterializedNotebookAction extends Action {
super(OpenMaterializedNotebookAction.ID, OpenMaterializedNotebookAction.LABEL, 'openNotebook');
}
public async run(context: any): Promise<void> {
public override async run(context: any): Promise<void> {
context.component.openNotebook(context.history);
}
}
@@ -171,7 +171,7 @@ export class DeleteJobAction extends Action {
super(DeleteJobAction.ID, DeleteJobAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
let job = actionInfo.targetObject.job as azdata.AgentJobInfo;
this._notificationService.prompt(
Severity.Info,
@@ -211,7 +211,7 @@ export class NewStepAction extends Action {
super(NewStepAction.ID, NewStepAction.LABEL, 'newStepIcon');
}
public async run(context: JobHistoryComponent): Promise<void> {
public override async run(context: JobHistoryComponent): Promise<void> {
let ownerUri = context.ownerUri;
let server = context.serverName;
let jobInfo = context.agentJobInfo;
@@ -233,7 +233,7 @@ export class DeleteStepAction extends Action {
super(DeleteStepAction.ID, DeleteStepAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
let step = actionInfo.targetObject as azdata.AgentJobStepInfo;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
this._notificationService.prompt(
@@ -274,7 +274,7 @@ export class NewAlertAction extends Action {
super(NewAlertAction.ID, NewAlertAction.LABEL, 'newStepIcon');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
let component = context.component as AlertsViewComponent;
await component.openCreateAlertDialog();
}
@@ -290,7 +290,7 @@ export class EditAlertAction extends Action {
super(EditAlertAction.ID, EditAlertAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
await this._commandService.executeCommand(
'agent.openAlertDialog',
actionInfo.ownerUri,
@@ -313,7 +313,7 @@ export class DeleteAlertAction extends Action {
super(DeleteAlertAction.ID, DeleteAlertAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
let alert = actionInfo.targetObject.alertInfo as azdata.AgentAlertInfo;
this._notificationService.prompt(
Severity.Info,
@@ -351,7 +351,7 @@ export class NewOperatorAction extends Action {
super(NewOperatorAction.ID, NewOperatorAction.LABEL, 'newStepIcon');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
let component = context.component as OperatorsViewComponent;
await component.openCreateOperatorDialog();
}
@@ -367,7 +367,7 @@ export class EditOperatorAction extends Action {
super(EditOperatorAction.ID, EditOperatorAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
await this._commandService.executeCommand(
'agent.openOperatorDialog',
actionInfo.ownerUri,
@@ -388,7 +388,7 @@ export class DeleteOperatorAction extends Action {
super(DeleteOperatorAction.ID, DeleteOperatorAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
let operator = actionInfo.targetObject as azdata.AgentOperatorInfo;
this._notificationService.prompt(
Severity.Info,
@@ -427,7 +427,7 @@ export class NewProxyAction extends Action {
super(NewProxyAction.ID, NewProxyAction.LABEL, 'newStepIcon');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
const component = context.component as ProxiesViewComponent;
component.openCreateProxyDialog();
}
@@ -444,7 +444,7 @@ export class EditProxyAction extends Action {
super(EditProxyAction.ID, EditProxyAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
const result = await this._jobManagementService.getCredentials(actionInfo.ownerUri);
if (result && result.credentials) {
await this._commandService.executeCommand(
@@ -469,7 +469,7 @@ export class DeleteProxyAction extends Action {
super(DeleteProxyAction.ID, DeleteProxyAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
let proxy = actionInfo.targetObject as azdata.AgentProxyInfo;
this._notificationService.prompt(
Severity.Info,
@@ -507,7 +507,7 @@ export class NewNotebookJobAction extends Action {
super(NewNotebookJobAction.ID, NewNotebookJobAction.LABEL, 'newStepIcon');
}
public async run(context: IJobActionInfo): Promise<void> {
public override async run(context: IJobActionInfo): Promise<void> {
let component = context.component as NotebooksViewComponent;
await component.openCreateNotebookDialog();
}
@@ -523,7 +523,7 @@ export class EditNotebookJobAction extends Action {
super(EditNotebookJobAction.ID, EditNotebookJobAction.LABEL, 'edit');
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
await this._commandService.executeCommand(
'agent.openNotebookDialog',
actionInfo.ownerUri,
@@ -539,7 +539,7 @@ export class OpenTemplateNotebookAction extends Action {
super(OpenTemplateNotebookAction.ID, OpenTemplateNotebookAction.LABEL, 'opennotebook');
}
public async run(actionInfo: any): Promise<void> {
public override async run(actionInfo: any): Promise<void> {
actionInfo.component.openTemplateNotebook();
}
}
@@ -558,7 +558,7 @@ export class DeleteNotebookAction extends Action {
super(DeleteNotebookAction.ID, DeleteNotebookAction.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
let notebook = actionInfo.targetObject.job as azdata.AgentNotebookInfo;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
this._notificationService.prompt(
@@ -596,7 +596,7 @@ export class PinNotebookMaterializedAction extends Action {
super(PinNotebookMaterializedAction.ID, PinNotebookMaterializedAction.LABEL);
}
public async run(actionInfo: any): Promise<void> {
public override async run(actionInfo: any): Promise<void> {
actionInfo.component.toggleNotebookPin(actionInfo.history, true);
}
}
@@ -609,7 +609,7 @@ export class DeleteMaterializedNotebookAction extends Action {
super(DeleteMaterializedNotebookAction.ID, DeleteMaterializedNotebookAction.LABEL);
}
public async run(actionInfo: any): Promise<void> {
public override async run(actionInfo: any): Promise<void> {
actionInfo.component.deleteMaterializedNotebook(actionInfo.history);
}
}
@@ -622,7 +622,7 @@ export class UnpinNotebookMaterializedAction extends Action {
super(UnpinNotebookMaterializedAction.ID, UnpinNotebookMaterializedAction.LABEL);
}
public async run(actionInfo: any): Promise<void> {
public override async run(actionInfo: any): Promise<void> {
actionInfo.component.toggleNotebookPin(actionInfo.history, false);
}
}
@@ -635,7 +635,7 @@ export class RenameNotebookMaterializedAction extends Action {
super(RenameNotebookMaterializedAction.ID, RenameNotebookMaterializedAction.LABEL);
}
public async run(actionInfo: any): Promise<void> {
public override async run(actionInfo: any): Promise<void> {
actionInfo.component.renameNotebook(actionInfo.history);
}
}
@@ -648,7 +648,7 @@ export class OpenLatestRunMaterializedNotebook extends Action {
super(OpenLatestRunMaterializedNotebook.ID, OpenLatestRunMaterializedNotebook.LABEL);
}
public async run(actionInfo: IJobActionInfo): Promise<void> {
public override async run(actionInfo: IJobActionInfo): Promise<void> {
actionInfo.component.openLastNRun(actionInfo.targetObject.job, 0, 1);
}
}

View File

@@ -350,7 +350,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit {
}
}
protected initActionBar() {
protected override initActionBar() {
this._runJobAction = this.instantiationService.createInstance(RunJobAction);
this._stopJobAction = this.instantiationService.createInstance(StopJobAction);
this._editJobAction = this.instantiationService.createInstance(EditJobAction);

View File

@@ -27,7 +27,7 @@ export class JobHistoryModel {
export class JobHistoryController extends TreeDefaults.DefaultController {
private _jobHistories: AgentJobHistoryInfo[];
protected onLeftClick(tree: tree.ITree, element: JobHistoryRow, event: IMouseEvent, origin: string = 'mouse'): boolean {
protected override onLeftClick(tree: tree.ITree, element: JobHistoryRow, event: IMouseEvent, origin: string = 'mouse'): boolean {
return true;
}

View File

@@ -58,7 +58,7 @@ export class JobStepsViewComponent extends JobManagementView implements OnInit,
super(commonService, dashboardService, contextMenuService, keybindingService, instantiationService, undefined);
}
ngAfterContentChecked() {
override ngAfterContentChecked() {
jQuery('.steps-tree .step-column-heading').closest('.monaco-tree-row').addClass('step-column-row');
this.layout();
this._tree.onDidScroll(() => {

View File

@@ -27,11 +27,11 @@ export class JobStepsViewModel {
export class JobStepsViewController extends TreeDefaults.DefaultController {
protected onLeftClick(tree: tree.ITree, element: JobStepsViewRow, event: IMouseEvent, origin: string = 'mouse'): boolean {
protected override onLeftClick(tree: tree.ITree, element: JobStepsViewRow, event: IMouseEvent, origin: string = 'mouse'): boolean {
return true;
}
public onContextMenu(tree: tree.ITree, element: JobStepsViewRow, event: tree.ContextMenuEvent): boolean {
public override onContextMenu(tree: tree.ITree, element: JobStepsViewRow, event: tree.ContextMenuEvent): boolean {
return true;
}

View File

@@ -92,7 +92,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
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;
public override contextAction = NewJobAction;
@ViewChild('jobsgrid') _gridEl: ElementRef;
@@ -131,7 +131,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
this._telemetryService.sendViewEvent(TelemetryView.AgentJobs);
}
ngOnDestroy() {
override ngOnDestroy() {
}
public layout() {
@@ -859,7 +859,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
});
}
protected getTableActions(targetObject: JobActionContext): IAction[] {
protected override getTableActions(targetObject: JobActionContext): IAction[] {
const editAction = this._instantiationService.createInstance(EditJobAction);
const runJobAction = this._instantiationService.createInstance(RunJobAction);
if (!targetObject.canEdit) {
@@ -906,7 +906,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
return result;
}
protected getCurrentTableObject(rowIndex: number): JobActionContext {
protected override getCurrentTableObject(rowIndex: number): JobActionContext {
let data = this._table.grid.getData() as Slick.DataProvider<IItem>;
if (!data || rowIndex >= data.getLength()) {
return undefined;

View File

@@ -262,7 +262,7 @@ export class NotebookHistoryComponent extends JobManagementView implements OnIni
}
}
protected initActionBar() {
protected override initActionBar() {
this._runJobAction = this.instantiationService.createInstance(RunJobAction);
this._stopJobAction = this.instantiationService.createInstance(StopJobAction);
this._editNotebookJobAction = this.instantiationService.createInstance(EditNotebookJobAction);
@@ -402,7 +402,7 @@ export class NotebookHistoryComponent extends JobManagementView implements OnIni
if (history.materializedNotebookName && history.materializedNotebookName !== '') {
tooltipString = history.materializedNotebookName;
}
let dateOptions = {
let dateOptions: Intl.DateTimeFormatOptions = {
weekday: 'long',
year: 'numeric',
month: 'long',
@@ -494,7 +494,7 @@ export class NotebookHistoryComponent extends JobManagementView implements OnIni
}
}
public refreshJobs() {
public override refreshJobs() {
this._agentViewComponent.refresh = true;
this.loadHistory();
}

View File

@@ -91,7 +91,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
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 = NewNotebookJobAction;
public override contextAction = NewNotebookJobAction;
@ViewChild('notebooksgrid') _gridEl: ElementRef;
@@ -131,7 +131,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
this._telemetryService.sendViewEvent(TelemetryView.AgentNotebooks);
}
ngOnDestroy() {
override ngOnDestroy() {
}
public layout() {
@@ -222,7 +222,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
}
}
protected initActionBar() {
protected override initActionBar() {
let refreshAction = this._instantiationService.createInstance(JobsRefreshAction);
let newAction = this._instantiationService.createInstance(NewNotebookJobAction);
let taskbar = <HTMLElement>this.actionBarContainer.nativeElement;
@@ -895,7 +895,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
});
}
protected getTableActions(targetObject: JobActionContext): IAction[] {
protected override getTableActions(targetObject: JobActionContext): IAction[] {
const editNotebookAction = this._instantiationService.createInstance(EditNotebookJobAction);
const runJobAction = this._instantiationService.createInstance(RunJobAction);
const openLatestRunAction = this._instantiationService.createInstance(OpenLatestRunMaterializedNotebook);
@@ -941,7 +941,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
return result;
}
protected getCurrentTableObject(rowIndex: number): JobActionContext {
protected override getCurrentTableObject(rowIndex: number): JobActionContext {
let data = this._table.grid.getData() as Slick.DataProvider<IItem>;
if (!data || rowIndex >= data.getLength()) {
return undefined;
@@ -997,7 +997,7 @@ export class NotebooksViewComponent extends JobManagementView implements OnInit,
await this._commandService.executeCommand('agent.openNotebookDialog', ownerUri);
}
public async openLastNRun(notebook: azdata.AgentNotebookInfo, n: number, maxVisibleElements: number) {
public override async openLastNRun(notebook: azdata.AgentNotebookInfo, n: number, maxVisibleElements: number) {
let notebookHistories = this._notebookCacheObject.getNotebookHistory(notebook.jobId);
if (notebookHistories && n < notebookHistories.length) {
notebookHistories = notebookHistories.sort((h1, h2) => {

View File

@@ -64,7 +64,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit,
@ViewChild('operatorsgrid') _gridEl: ElementRef;
public operators: azdata.AgentOperatorInfo[];
public contextAction = NewOperatorAction;
public override contextAction = NewOperatorAction;
constructor(
@Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef,
@@ -96,7 +96,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit,
this._parentComponent = this._agentViewComponent;
}
ngOnDestroy() {
override ngOnDestroy() {
this._didTabChange = true;
}
@@ -195,14 +195,14 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit,
this._table.resizeCanvas();
}
protected getTableActions(): IAction[] {
protected override getTableActions(): IAction[] {
return [
this._instantiationService.createInstance(EditOperatorAction),
this._instantiationService.createInstance(DeleteOperatorAction)
];
}
protected getCurrentTableObject(rowIndex: number): any {
protected override getCurrentTableObject(rowIndex: number): any {
return (this.operators && this.operators.length >= rowIndex)
? this.operators[rowIndex]
: undefined;

View File

@@ -62,7 +62,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O
private _proxiesCacheObject: ProxiesCacheObject;
public proxies: azdata.AgentProxyInfo[];
public readonly contextAction = NewProxyAction;
public override readonly contextAction = NewProxyAction;
private _didTabChange: boolean;
@ViewChild('proxiesgrid') _gridEl: ElementRef;
@@ -97,7 +97,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O
this._parentComponent = this._agentViewComponent;
}
ngOnDestroy() {
override ngOnDestroy() {
this._didTabChange = true;
}
@@ -196,14 +196,14 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O
this._table.resizeCanvas();
}
protected getTableActions(): IAction[] {
protected override getTableActions(): IAction[] {
return [
this._instantiationService.createInstance(EditProxyAction),
this._instantiationService.createInstance(DeleteProxyAction)
];
}
protected getCurrentTableObject(rowIndex: number): any {
protected override getCurrentTableObject(rowIndex: number): any {
return (this.proxies && this.proxies.length >= rowIndex)
? this.proxies[rowIndex]
: undefined;