From f68ed67e3a833986ceb603a981a99f03547c3aca Mon Sep 17 00:00:00 2001
From: Alan Ren <alanren@microsoft.com>
Date: Tue, 30 Jul 2019 14:55:32 -0700
Subject: [PATCH] Alanren/welcomepage (#6537)

* remove dependency on product.quality

* remove extra line

* comments
---
 .../contrib/welcome/page/browser/az_data_welcome_page.ts | 9 +++++++--
 .../contrib/welcome/page/browser/welcomePage.ts          | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts b/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts
index f79f4cc434..3b218b1bdf 100644
--- a/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts
+++ b/src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts
@@ -5,15 +5,20 @@
 
 import { escape } from 'vs/base/common/strings';
 import { localize } from 'vs/nls';
-import product from 'vs/platform/product/node/product';
 
 export function used() {
 }
 
+let productQuality: string;
+
+export function setProductQuality(quality: string): void {
+	productQuality = quality;
+}
+
 function showDeploySection(): boolean {
 	// only show the deploy section for insider build and dev environment for now until the feature is stable
 	// tracking issue: https://github.com/microsoft/azuredatastudio/issues/5987
-	return product.quality !== 'stable';
+	return productQuality !== 'stable';
 }
 
 
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
index 508cd78a17..090dcbf5ba 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
@@ -24,7 +24,7 @@ import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/contrib/extensions/common/extensionsUtils';
 import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionEnablementService, EnablementState, IExtensionTipsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
-import { used } from 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; // {{SQL CARBON EDIT}} - Redirect to ADS welcome page
+import { used, setProductQuality } from 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; // {{SQL CARBON EDIT}} - Redirect to ADS welcome page
 import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { splitName } from 'vs/base/common/labels';
@@ -42,6 +42,7 @@ import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { joinPath } from 'vs/base/common/resources';
 import { IRecentlyOpened, isRecentWorkspace, IRecentWorkspace, IRecentFolder, isRecentFolder } from 'vs/platform/history/common/history';
 import { CancellationToken } from 'vs/base/common/cancellation';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment'; // {{SQL CARBON EDIT}}
 
 used();
 
@@ -264,7 +265,8 @@ class WelcomePage extends Disposable {
 		@IExtensionTipsService private readonly tipsService: IExtensionTipsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@ILifecycleService lifecycleService: ILifecycleService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService // {{SQL CARBON EDIT}}
 	) {
 		super();
 		this._register(lifecycleService.onShutdown(() => this.dispose()));
@@ -272,6 +274,7 @@ class WelcomePage extends Disposable {
 		const recentlyOpened = this.windowService.getRecentlyOpened();
 		const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions);
 		// {{SQL CARBON EDIT}} - Redirect to ADS welcome page
+		setProductQuality(this.environmentService.appQuality);
 		const resource = URI.parse(require.toUrl('./az_data_welcome_page'))
 			.with({
 				scheme: Schemas.walkThrough,