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

move eula prompt post azdata discovery (#12532)

Browse Source 
* new download location of azdata.msi

* move eula prompt post azdata discovery

* unacceptEula - test change

* Revert "unacceptEula - test change"

This reverts commit f84a3f5e41797de25b38f87143d66f7041b5c4ec.
This commit is contained in:
Arvind Ranasaria
2020-09-21 12:56:03 -07:00
committed by GitHub
parent db902beb24
commit 21d9485ca7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/azdata/src/extension.ts
View File

@@ -31,21 +31,21 @@ export async function activate(context: vscode.ExtensionContext): Promise<azdata
eulaAccepted = !!context.globalState.get<boolean>(constants.eulaAccepted); // fetch eula acceptance state from memento eulaAccepted = !!context.globalState.get<boolean>(constants.eulaAccepted); // fetch eula acceptance state from memento
await vscode.commands.executeCommand('setContext', constants.eulaAccepted, eulaAccepted); // set a context key for current value of eulaAccepted state retrieved from memento so that command for accepting eula is available/unavailable in commandPalette appropriately. await vscode.commands.executeCommand('setContext', constants.eulaAccepted, eulaAccepted); // set a context key for current value of eulaAccepted state retrieved from memento so that command for accepting eula is available/unavailable in commandPalette appropriately.
Logger.log(loc.eulaAcceptedStateOnStartup(eulaAccepted)); Logger.log(loc.eulaAcceptedStateOnStartup(eulaAccepted));
if (!eulaAccepted) {
// Don't block on this since we want extension to finish activating without requiring user actions.
// If EULA has not been accepted then we will check again while executing azdata commands.
promptForEula(context.globalState)
.then(async (userResponse: boolean) => {
eulaAccepted = userResponse;
})
.catch((err) => console.log(err));
}
// Don't block on this since we want the extension to finish activating without needing user input // Don't block on this since we want the extension to finish activating without needing user input
checkAndInstallAzdata() // install if not installed and user wants it. checkAndInstallAzdata() // install if not installed and user wants it.
.then(async azdataTool => { .then(async azdataTool => {
localAzdata = azdataTool; localAzdata = azdataTool;
if (localAzdata !== undefined) { if (localAzdata !== undefined) {
if (!eulaAccepted) {
// Don't block on this since we want extension to finish activating without requiring user actions.
// If EULA has not been accepted then we will check again while executing azdata commands.
promptForEula(context.globalState)
.then(async (userResponse: boolean) => {
eulaAccepted = userResponse;
})
.catch((err) => console.log(err));
}
try { try {
//update if available and user wants it. //update if available and user wants it.
if (await checkAndUpdateAzdata(localAzdata)) { // if an update was performed if (await checkAndUpdateAzdata(localAzdata)) { // if an update was performed