From 5731366a1cf8dfa4ebb22adb4d7aa2e1995a12e3 Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Tue, 22 Feb 2022 14:15:12 -0800 Subject: [PATCH] Fixing query editor smoke test (#18515) * Fixing query editor smoke test * Fixing notification toast for telemetry opt out * Adding SQL Carbon edit --- .../welcome/telemetryOptOut/browser/telemetryOptOut.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.ts b/src/vs/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.ts index d5f52b3433..2a4221f8cd 100644 --- a/src/vs/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.ts +++ b/src/vs/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.ts @@ -41,7 +41,9 @@ export abstract class AbstractTelemetryOptOut implements IWorkbenchContribution } protected async handleTelemetryOptOut(): Promise { - if (this.productService.telemetryOptOutUrl && !this.storageService.get(AbstractTelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN, StorageScope.GLOBAL)) { + if (this.productService.telemetryOptOutUrl && + !this.storageService.get(AbstractTelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN, StorageScope.GLOBAL) && + !this.environmentService.disableTelemetry) { // {{SQL CARBON EDIT}} Adding check to disable opt out toast when this flag is set. const experimentId = 'telemetryOptOut'; const [count, experimentState] = await Promise.all([this.getWindowCount(), this.experimentService.getExperimentById(experimentId)]);