ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-10 10:12:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/resource-deployment/src/ui/toolsAndEulaSettingsPage.ts
View File

@@ -45,7 +45,7 @@ export class ToolsAndEulaPage extends ResourceTypePage {
this._resourceType = wizard.resourceType;
}
public async onEnter(): Promise<void> {
public override async onEnter(): Promise<void> {
this.wizard.wizardObject.generateScriptButton.hidden = true;
this.wizard.wizardObject.registerNavigationValidator(async (pcInfo) => {
for (let i = 0; i < this._tools.length; i++) {
@@ -294,7 +294,7 @@ export class ToolsAndEulaPage extends ResourceTypePage {
this.wizard.wizardObject.message = { text: '' };
let eulaAccepted = true;
for (const tool of this._tools) {
eulaAccepted = tool.isEulaAccepted() || await tool.promptForEula();
eulaAccepted = await tool.isEulaAccepted() || await tool.promptForEula();
if (!eulaAccepted) {
this.wizard.wizardObject.message = {
level: azdata.window.MessageLevel.Error,
@@ -415,14 +415,14 @@ export class ToolsAndEulaPage extends ResourceTypePage {
this.wizard.wizardObject.cancelButton.enabled = enable;
}
public async onLeave(): Promise<void> {
public override async onLeave(): Promise<void> {
this.toolsService.toolsForCurrentProvider = this._tools;
}
private areToolsEulaAccepted(): boolean {
private async areToolsEulaAccepted(): Promise<boolean> {
// we run 'map' on each tool before doing 'every' so that we collect eula messages for all tools (instead of bailing out after 1st failure)
this._eulaValidationSucceeded = this._tools.map(tool => {
const eulaAccepted = tool.isEulaAccepted();
this._eulaValidationSucceeded = (await Promise.all(this._tools.map(async tool => {
const eulaAccepted = await tool.isEulaAccepted();
if (!eulaAccepted) {
this.wizard.wizardObject.message = {
level: azdata.window.MessageLevel.Error,
@@ -430,7 +430,7 @@ export class ToolsAndEulaPage extends ResourceTypePage {
};
}
return eulaAccepted;
}).every(isEulaAccepted => isEulaAccepted);
}))).every(isEulaAccepted => isEulaAccepted);
return this._eulaValidationSucceeded;
}
@@ -507,8 +507,13 @@ export class ToolsAndEulaPage extends ResourceTypePage {
text: infoText.join(EOL)
};
} else if (!this.areToolsEulaAccepted()) {
this.wizard.wizardObject.doneButton.label = loc.acceptEulaAndSelect;
this.wizard.wizardObject.nextButton.label = loc.acceptEulaAndSelect;
this.areToolsEulaAccepted().then(toolsEulaAccepted => {
if (!toolsEulaAccepted) {
this.wizard.wizardObject.doneButton.label = loc.acceptEulaAndSelect;
this.wizard.wizardObject.nextButton.label = loc.acceptEulaAndSelect;
}
});
}
this._toolsLoadingComponent.loading = false;
}