mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-03 09:35:40 -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:
@@ -177,7 +177,7 @@ export class DeployAzureSQLDBWizardModel extends ResourceTypeModel {
|
||||
}
|
||||
}
|
||||
|
||||
public getCodeCellContentForNotebook(): string[] {
|
||||
public override getCodeCellContentForNotebook(): string[] {
|
||||
const statements: string[] = [];
|
||||
|
||||
statements.push(`azure_sqldb_subscription = '${this.azureSubscription}'`);
|
||||
|
||||
@@ -137,7 +137,7 @@ export class AzureSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator(async (pcInfo) => {
|
||||
if (pcInfo.newPage < pcInfo.lastPage) {
|
||||
return true;
|
||||
@@ -151,7 +151,7 @@ export class AzureSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
import { ResourceTypePage } from '../../resourceTypePage';
|
||||
|
||||
export abstract class BasePage extends ResourceTypePage {
|
||||
public abstract initialize(): void;
|
||||
public abstract override initialize(): void;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ export class DatabaseSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator(async (pcInfo) => {
|
||||
if (pcInfo.newPage < pcInfo.lastPage) {
|
||||
return true;
|
||||
@@ -99,7 +99,7 @@ export class DatabaseSettingsPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -26,7 +26,7 @@ export class AzureSQLDBSummaryPage extends BasePage {
|
||||
|
||||
}
|
||||
|
||||
public async initialize() {
|
||||
public override async initialize() {
|
||||
this.pageObject.registerContent(async (view: azdata.ModelView) => {
|
||||
this._view = view;
|
||||
this._form = view.modelBuilder.formContainer();
|
||||
@@ -34,7 +34,7 @@ export class AzureSQLDBSummaryPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
|
||||
this.formItems.forEach(item => {
|
||||
this._form.removeFormItem(item);
|
||||
@@ -197,7 +197,7 @@ export class AzureSQLDBSummaryPage extends BasePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user