mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-20 17:22:51 -05:00
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:
@@ -240,7 +240,7 @@ export class DeployAzureSQLVMWizardModel extends ResourceTypeModel {
|
||||
}
|
||||
|
||||
|
||||
public getCodeCellContentForNotebook(): string[] {
|
||||
public override getCodeCellContentForNotebook(): string[] {
|
||||
|
||||
const statements: string[] = [];
|
||||
statements.push('import os');
|
||||
|
||||
@@ -46,7 +46,7 @@ export class AzureSettingsPage extends BasePage {
|
||||
this._subscriptionsMap = new Map();
|
||||
}
|
||||
|
||||
public async initialize() {
|
||||
public override async initialize() {
|
||||
this.pageObject.registerContent(async (view: azdata.ModelView) => {
|
||||
|
||||
await Promise.all([
|
||||
@@ -86,13 +86,13 @@ export class AzureSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this._model.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this._model.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -45,7 +45,7 @@ export class NetworkSettingsPage extends BasePage {
|
||||
);
|
||||
}
|
||||
|
||||
public async initialize() {
|
||||
public override async initialize() {
|
||||
this.pageObject.registerContent(async (view: azdata.ModelView) => {
|
||||
|
||||
await Promise.all([
|
||||
@@ -84,7 +84,7 @@ export class NetworkSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.populateVirtualNetworkDropdown();
|
||||
this.populatePublicIpkDropdown();
|
||||
this.liveValidation = false;
|
||||
@@ -102,7 +102,7 @@ export class NetworkSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this._model.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
@@ -448,7 +448,7 @@ export class NetworkSettingsPage extends BasePage {
|
||||
return dropdownValues;
|
||||
}
|
||||
|
||||
protected async validatePage(): Promise<string> {
|
||||
protected override async validatePage(): Promise<string> {
|
||||
const errorMessages = [];
|
||||
if (this._model.newVirtualNetwork === 'True') {
|
||||
if (this._model.virtualNetworkName.length < 2 || this._model.virtualNetworkName.length > 64) {
|
||||
|
||||
@@ -38,7 +38,7 @@ export class SqlServerSettingsPage extends BasePage {
|
||||
|
||||
}
|
||||
|
||||
public async initialize() {
|
||||
public override async initialize() {
|
||||
this.pageObject.registerContent(async (view: azdata.ModelView) => {
|
||||
|
||||
await Promise.all([
|
||||
@@ -80,7 +80,7 @@ export class SqlServerSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
|
||||
this.liveValidation = false;
|
||||
|
||||
@@ -100,7 +100,7 @@ export class SqlServerSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this._model.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
@@ -220,7 +220,7 @@ export class SqlServerSettingsPage extends BasePage {
|
||||
}
|
||||
|
||||
|
||||
protected async validatePage(): Promise<string> {
|
||||
protected override async validatePage(): Promise<string> {
|
||||
|
||||
const errorMessages = [];
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ export class AzureSQLVMSummaryPage extends BasePage {
|
||||
|
||||
}
|
||||
|
||||
public async initialize() {
|
||||
public override async initialize() {
|
||||
this.pageObject.registerContent(async (view: azdata.ModelView) => {
|
||||
this._view = view;
|
||||
this._form = view.modelBuilder.formContainer();
|
||||
@@ -33,7 +33,7 @@ export class AzureSQLVMSummaryPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
|
||||
this.formItems.forEach(item => {
|
||||
this._form.removeFormItem(item);
|
||||
@@ -297,7 +297,7 @@ export class AzureSQLVMSummaryPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -50,7 +50,7 @@ export class VmSettingsPage extends BasePage {
|
||||
);
|
||||
}
|
||||
|
||||
public async initialize() {
|
||||
public override async initialize() {
|
||||
this.pageObject.registerContent(async (view: azdata.ModelView) => {
|
||||
|
||||
await Promise.all([
|
||||
@@ -110,7 +110,7 @@ export class VmSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.populateVmImageDropdown();
|
||||
this.populateVmSizeDropdown();
|
||||
|
||||
@@ -132,7 +132,7 @@ export class VmSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
@@ -388,7 +388,7 @@ export class VmSettingsPage extends BasePage {
|
||||
this._vmSizeDropdown.loading = false;
|
||||
}
|
||||
|
||||
protected async validatePage(): Promise<string> {
|
||||
protected override async validatePage(): Promise<string> {
|
||||
|
||||
const errorMessages = [];
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user