mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-21 17:22:55 -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:
@@ -129,7 +129,7 @@ export class DeployClusterWizardModel extends ResourceTypeModel {
|
||||
this.setStorageSettingValue(VariableNames.SQLServerLogsStorageSize_VariableName, VariableNames.ControllerLogsStorageSize_VariableName);
|
||||
}
|
||||
|
||||
public setEnvironmentVariables(): void {
|
||||
public override setEnvironmentVariables(): void {
|
||||
this.setStorageSettingValues();
|
||||
}
|
||||
|
||||
@@ -215,7 +215,7 @@ export class DeployClusterWizardModel extends ResourceTypeModel {
|
||||
return targetDeploymentProfile;
|
||||
}
|
||||
|
||||
public getCodeCellContentForNotebook(tools: ITool[]): string[] {
|
||||
public override getCodeCellContentForNotebook(tools: ITool[]): string[] {
|
||||
const profile = this.createTargetProfile();
|
||||
const statements: string[] = [];
|
||||
if (this.deploymentType === BdcDeploymentType.NewAKS) {
|
||||
|
||||
@@ -159,7 +159,7 @@ export class AzureSettingsPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
this.wizard.wizardObject.message = { text: '' };
|
||||
if (pcInfo.newPage > pcInfo.lastPage) {
|
||||
@@ -177,7 +177,7 @@ export class AzureSettingsPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -294,7 +294,7 @@ export class ClusterSettingsPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
await setModelValues(this.inputComponents, this.wizard.model);
|
||||
if (this._model.authenticationMode === AuthenticationMode.ActiveDirectory) {
|
||||
const variableDNSPrefixMapping: { [s: string]: string } = {};
|
||||
@@ -315,7 +315,7 @@ export class ClusterSettingsPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
getInputBoxComponent(VariableNames.DockerRegistry_VariableName, this.inputComponents).value = this.wizard.model.getStringValue(VariableNames.DockerRegistry_VariableName);
|
||||
getInputBoxComponent(VariableNames.DockerRepository_VariableName, this.inputComponents).value = this.wizard.model.getStringValue(VariableNames.DockerRepository_VariableName);
|
||||
getInputBoxComponent(VariableNames.DockerImageTag_VariableName, this.inputComponents).value = this.wizard.model.getStringValue(VariableNames.DockerImageTag_VariableName);
|
||||
|
||||
@@ -216,7 +216,7 @@ export class DeploymentProfilePage extends ResourceTypePage {
|
||||
.component();
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
this.wizard.wizardObject.message = { text: '' };
|
||||
if (pcInfo.newPage > pcInfo.lastPage) {
|
||||
@@ -233,7 +233,7 @@ export class DeploymentProfilePage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -344,7 +344,7 @@ export class ServiceSettingsPage extends ResourceTypePage {
|
||||
};
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this.setInputBoxValue(VariableNames.ComputePoolScale_VariableName);
|
||||
this.setInputBoxValue(VariableNames.DataPoolScale_VariableName);
|
||||
this.setInputBoxValue(VariableNames.HDFSPoolScale_VariableName);
|
||||
@@ -421,7 +421,7 @@ export class ServiceSettingsPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
await setModelValues(this.inputComponents, this.wizard.model);
|
||||
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
|
||||
return true;
|
||||
|
||||
@@ -29,7 +29,7 @@ export class SummaryPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
this._model.showCustomButtons();
|
||||
this.formItems.forEach(item => {
|
||||
this.form!.removeFormItem(item);
|
||||
@@ -325,7 +325,7 @@ export class SummaryPage extends ResourceTypePage {
|
||||
this.form.addFormItems(this.formItems);
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this._model.hideCustomButtons();
|
||||
this.wizard.wizardObject.message = { text: '' };
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ export class TargetClusterContextPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onEnter(): Promise<void> {
|
||||
public override async onEnter(): Promise<void> {
|
||||
if (this.loadDefaultKubeConfigFile) {
|
||||
let defaultKubeConfigPath = this._model.kubeService.getDefaultConfigPath();
|
||||
this.loadClusterContexts(defaultKubeConfigPath);
|
||||
@@ -74,7 +74,7 @@ export class TargetClusterContextPage extends ResourceTypePage {
|
||||
});
|
||||
}
|
||||
|
||||
public async onLeave(): Promise<void> {
|
||||
public override async onLeave(): Promise<void> {
|
||||
this.wizard.wizardObject.registerNavigationValidator((e) => {
|
||||
return true;
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user