From 34fe2b44cc3960d9ac46cd3655d1516ff050a6d6 Mon Sep 17 00:00:00 2001
From: Alan Ren <alanren@microsoft.com>
Date: Wed, 23 Oct 2019 21:53:42 -0700
Subject: [PATCH] remove insider build check (#7926)

* remove insider build check

* fix welcome page not load issue
---
 .../welcome/page/browser/az_data_welcome_page.ts  | 15 +--------------
 .../contrib/welcome/page/browser/welcomePage.ts   |  5 +----
 2 files changed, 2 insertions(+), 18 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 64966d2f9f..986274b175 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
@@ -6,19 +6,6 @@
 import { escape } from 'vs/base/common/strings';
 import { localize } from 'vs/nls';
 
-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 productQuality !== 'stable';
-}
-
-
 export default () => `
 <div class="welcomePageContainer">
 	<div class="welcomePage">
@@ -38,7 +25,7 @@ export default () => `
 						<li class="windows-only linux-only"><a href="command:workbench.action.files.openFile">${escape(localize('welcomePage.openFileLinuxPC', "Open file"))}</a></li>
 					</ul>
 				</div>
-				<div class="section deploy" style="display:${showDeploySection() ? 'block' : 'none'}">
+				<div class="section deploy">
 					<h2 class="caption">${escape(localize('welcomePage.deploy', "Deploy"))}</h2>
 					<ul>
 						<li><a href="command:azdata.resource.deploy">${escape(localize('welcomePage.DeploySQLServer', "Deploy SQL Server…"))}</a></li>
diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
index 6464b69d23..3efd686778 100644
--- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
+++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
@@ -42,8 +42,7 @@ import { ExtensionType } from 'vs/platform/extensions/common/extensions';
 import { joinPath } from 'vs/base/common/resources';
 import { IRecentlyOpened, isRecentWorkspace, IRecentWorkspace, IRecentFolder, isRecentFolder, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment'; // {{SQL CARBON EDIT}}
-import { setProductQuality } from 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; // {{SQL CARBON EDIT}}
+import 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; // {{SQL CARBON EDIT}}
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 
 const configurationKey = 'workbench.startupEditor';
@@ -265,7 +264,6 @@ class WelcomePage extends Disposable {
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IEnvironmentService private readonly environmentService: IEnvironmentService, // {{SQL CARBON EDIT}}
 		@IHostService private readonly hostService: IHostService
 	) {
 		super();
@@ -274,7 +272,6 @@ class WelcomePage extends Disposable {
 		const recentlyOpened = this.workspacesService.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,