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

Alanren/welcomepage (#6537)

Browse Source 
* remove dependency on product.quality

* remove extra line

* comments
This commit is contained in:
Alan Ren
2019-07-30 14:55:32 -07:00
committed by GitHub
parent c1acf6ae93
commit f68ed67e3a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/contrib/welcome/page/browser/az_data_welcome_page.ts
View File

@@ -5,15 +5,20 @@
import { escape } from 'vs/base/common/strings'; import { escape } from 'vs/base/common/strings';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import product from 'vs/platform/product/node/product';
export function used() { export function used() {
} }
let productQuality: string;
export function setProductQuality(quality: string): void {
productQuality = quality;
}
function showDeploySection(): boolean { function showDeploySection(): boolean {
// only show the deploy section for insider build and dev environment for now until the feature is stable // 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 // tracking issue: https://github.com/microsoft/azuredatastudio/issues/5987
return product.quality !== 'stable'; return productQuality !== 'stable';
} }

7
src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
View File

@@ -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 { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/contrib/extensions/common/extensionsUtils';
import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { IExtensionEnablementService, EnablementState, IExtensionTipsService } from 'vs/workbench/services/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 { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
import { Disposable } from 'vs/base/common/lifecycle'; import { Disposable } from 'vs/base/common/lifecycle';
import { splitName } from 'vs/base/common/labels'; 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 { joinPath } from 'vs/base/common/resources';
import { IRecentlyOpened, isRecentWorkspace, IRecentWorkspace, IRecentFolder, isRecentFolder } from 'vs/platform/history/common/history'; import { IRecentlyOpened, isRecentWorkspace, IRecentWorkspace, IRecentFolder, isRecentFolder } from 'vs/platform/history/common/history';
import { CancellationToken } from 'vs/base/common/cancellation'; import { CancellationToken } from 'vs/base/common/cancellation';
import { IEnvironmentService } from 'vs/platform/environment/common/environment'; // {{SQL CARBON EDIT}}
used(); used();
@@ -264,7 +265,8 @@ class WelcomePage extends Disposable {
@IExtensionTipsService private readonly tipsService: IExtensionTipsService, @IExtensionTipsService private readonly tipsService: IExtensionTipsService,
@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService, @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@ILifecycleService lifecycleService: ILifecycleService, @ILifecycleService lifecycleService: ILifecycleService,
@ITelemetryService private readonly telemetryService: ITelemetryService @ITelemetryService private readonly telemetryService: ITelemetryService,
@IEnvironmentService private readonly environmentService: IEnvironmentService // {{SQL CARBON EDIT}}
) { ) {
super(); super();
this._register(lifecycleService.onShutdown(() => this.dispose())); this._register(lifecycleService.onShutdown(() => this.dispose()));
@@ -272,6 +274,7 @@ class WelcomePage extends Disposable {
const recentlyOpened = this.windowService.getRecentlyOpened(); const recentlyOpened = this.windowService.getRecentlyOpened();
const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions); const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions);
// {{SQL CARBON EDIT}} - Redirect to ADS welcome page // {{SQL CARBON EDIT}} - Redirect to ADS welcome page
setProductQuality(this.environmentService.appQuality);
const resource = URI.parse(require.toUrl('./az_data_welcome_page')) const resource = URI.parse(require.toUrl('./az_data_welcome_page'))
.with({ .with({
scheme: Schemas.walkThrough, scheme: Schemas.walkThrough,