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

remove insider build check (#7926)

Browse Source 
* remove insider build check

* fix welcome page not load issue
This commit is contained in:
Alan Ren
2019-10-23 21:53:42 -07:00
committed by GitHub
parent a16bfbfedd
commit 34fe2b44cc
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,19 +6,6 @@
import { escape } from 'vs/base/common/strings'; import { escape } from 'vs/base/common/strings';
import { localize } from 'vs/nls'; 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 () => ` export default () => `
<div class="welcomePageContainer"> <div class="welcomePageContainer">
<div class="welcomePage"> <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> <li class="windows-only linux-only"><a href="command:workbench.action.files.openFile">${escape(localize('welcomePage.openFileLinuxPC', "Open file"))}</a></li>
</ul> </ul>
</div> </div>
<div class="section deploy" style="display:${showDeploySection() ? 'block' : 'none'}"> <div class="section deploy">
<h2 class="caption">${escape(localize('welcomePage.deploy', "Deploy"))}</h2> <h2 class="caption">${escape(localize('welcomePage.deploy', "Deploy"))}</h2>
<ul> <ul>
<li><a href="command:azdata.resource.deploy">${escape(localize('welcomePage.DeploySQLServer', "Deploy SQL Server…"))}</a></li> <li><a href="command:azdata.resource.deploy">${escape(localize('welcomePage.DeploySQLServer', "Deploy SQL Server…"))}</a></li>

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

@@ -42,8 +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, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; import { IRecentlyOpened, isRecentWorkspace, IRecentWorkspace, IRecentFolder, isRecentFolder, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
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}} import 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; // {{SQL CARBON EDIT}}
import { setProductQuality } from 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page'; // {{SQL CARBON EDIT}}
import { IHostService } from 'vs/workbench/services/host/browser/host'; import { IHostService } from 'vs/workbench/services/host/browser/host';
const configurationKey = 'workbench.startupEditor'; const configurationKey = 'workbench.startupEditor';
@@ -265,7 +264,6 @@ class WelcomePage extends Disposable {
@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}}
@IHostService private readonly hostService: IHostService @IHostService private readonly hostService: IHostService
) { ) {
super(); super();
@@ -274,7 +272,6 @@ class WelcomePage extends Disposable {
const recentlyOpened = this.workspacesService.getRecentlyOpened(); const recentlyOpened = this.workspacesService.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,