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

ADS Welcome Page (#5043)

Browse Source 
* ADS Welcome Page

* sample notebook section

* Opens in browser :(

* Remove sample notebooks section

* fix open file in windows

* Change az_data_welcome_page to be under sql/

* fix tslint issue

* Scope table css down
This commit is contained in:
Chris LaFreniere
2019-04-17 10:50:43 -07:00
committed by GitHub
parent 8956b591f7
commit ac3b6aef27
4 changed files with 99 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,23 +36,19 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
}
});
// {{SQL CARBON EDIT}} - Disable welcome page
// Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
// .registerWorkbenchContribution(WelcomePageContribution, LifecyclePhase.Restored);
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
.registerWorkbenchContribution(WelcomePageContribution, LifecyclePhase.Restored);
// Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions)
// .registerWorkbenchAction(new SyncActionDescriptor(WelcomePageAction, WelcomePageAction.ID, WelcomePageAction.LABEL), 'Help: Welcome', localize('help', "Help"));
Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions)
.registerWorkbenchAction(new SyncActionDescriptor(WelcomePageAction, WelcomePageAction.ID, WelcomePageAction.LABEL), 'Help: Welcome', localize('help', "Help"));
// Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).registerEditorInputFactory(WelcomeInputFactory.ID, WelcomeInputFactory);
// {{SQL CARBON EDIT}} - End
Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).registerEditorInputFactory(WelcomeInputFactory.ID, WelcomeInputFactory);
// {{SQL CARBON EDIT}} - Disable unused menu item
// MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
// group: '1_welcome',
// command: {
// id: 'workbench.action.showWelcomePage',
// title: localize({ key: 'miWelcome', comment: ['&& denotes a mnemonic'] }, "&&Welcome")
// },
// order: 1
// });
// {{SQL CARBON EDIT}} - End
MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
group: '1_welcome',
command: {
id: 'workbench.action.showWelcomePage',
title: localize({ key: 'miWelcome', comment: ['&& denotes a mnemonic'] }, "&&Welcome")
},
order: 1
});

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

@@ -23,7 +23,8 @@ import { Schemas } from 'vs/base/common/network';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { getInstalledExtensions, IExtensionStatus, onExtensionChanged, isKeymapExtension } from 'vs/workbench/contrib/extensions/common/extensionsUtils';
import { IExtensionEnablementService, IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, EnablementState, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { used } from 'vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page';
// {{SQL CARBON EDIT}} - Redirect to ADS welcome page
import { used } from 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page';
import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { splitName } from 'vs/base/common/labels';
@@ -106,16 +107,14 @@ export class WelcomePageContribution implements IWorkbenchContribution {
}
function isWelcomePageEnabled(configurationService: IConfigurationService, contextService: IWorkspaceContextService) {
// {{SQL CARBON EDIT}} - Disable the welcome page
return false;
// const startupEditor = configurationService.inspect(configurationKey);
// if (!startupEditor.user && !startupEditor.workspace) {
// const welcomeEnabled = configurationService.inspect(oldConfigurationKey);
// if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) {
// return welcomeEnabled.value;
// }
// }
// return startupEditor.value === 'welcomePage' || startupEditor.value === 'readme' || startupEditor.value === 'welcomePageInEmptyWorkbench' && contextService.getWorkbenchState() === WorkbenchState.EMPTY;
const startupEditor = configurationService.inspect(configurationKey);
if (!startupEditor.user && !startupEditor.workspace) {
const welcomeEnabled = configurationService.inspect(oldConfigurationKey);
if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) {
return welcomeEnabled.value;
}
}
return startupEditor.value === 'welcomePage' || startupEditor.value === 'readme' || startupEditor.value === 'welcomePageInEmptyWorkbench' && contextService.getWorkbenchState() === WorkbenchState.EMPTY;
}
export class WelcomePageAction extends Action {
@@ -273,10 +272,11 @@ class WelcomePage {
const recentlyOpened = this.windowService.getRecentlyOpened();
const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions);
const resource = URI.parse(require.toUrl('./vs_code_welcome_page'))
// {{SQL CARBON EDIT}} - Redirect to ADS welcome page
const resource = URI.parse(require.toUrl('./az_data_welcome_page'))
.with({
scheme: Schemas.walkThrough,
query: JSON.stringify({ moduleId: 'vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page' })
query: JSON.stringify({ moduleId: 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page' })
});
this.editorInput = this.instantiationService.createInstance(WalkThroughInput, {
typeId: welcomeInputTypeId,