From f2c9d968a46827e2808a9ebd1fb47e418c403dd0 Mon Sep 17 00:00:00 2001 From: Aditya Bist Date: Mon, 25 Feb 2019 09:51:43 -0800 Subject: [PATCH] fix Object explorer tests (#4135) --- .../src/objectExplorer.test.ts | 2 +- extensions/integration-tests/src/utils.ts | 2 +- .../common/dataExplorer.contribution.ts | 25 ++++++++++++++++--- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/extensions/integration-tests/src/objectExplorer.test.ts b/extensions/integration-tests/src/objectExplorer.test.ts index 7adddd89af..2f3f4d2a59 100644 --- a/extensions/integration-tests/src/objectExplorer.test.ts +++ b/extensions/integration-tests/src/objectExplorer.test.ts @@ -19,7 +19,7 @@ if (context.RunTest) { let nodes = await sqlops.objectexplorer.getActiveConnectionNodes(); assert(nodes.length === 1, `expecting 1 active connection, actual: ${nodes.length}`); let actions = await sqlops.objectexplorer.getNodeActions(nodes[0].connectionId, nodes[0].nodePath); - const expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'Launch Profiler']; + const expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'New Notebook', 'Launch Profiler']; const expectedString = expectedActions.join(','); const actualString = actions.join(','); diff --git a/extensions/integration-tests/src/utils.ts b/extensions/integration-tests/src/utils.ts index 8ce1c08553..083f47e7f1 100644 --- a/extensions/integration-tests/src/utils.ts +++ b/extensions/integration-tests/src/utils.ts @@ -34,5 +34,5 @@ export async function connectToServer(server: TestServerProfile) { } export async function ensureConnectionViewOpened() { - await vscode.commands.executeCommand('workbench.view.connections'); + await vscode.commands.executeCommand('workbench.view.dataExplorer'); } \ No newline at end of file diff --git a/src/sql/parts/dataExplorer/common/dataExplorer.contribution.ts b/src/sql/parts/dataExplorer/common/dataExplorer.contribution.ts index 5f3ab6c2b2..3344fbfb4e 100644 --- a/src/sql/parts/dataExplorer/common/dataExplorer.contribution.ts +++ b/src/sql/parts/dataExplorer/common/dataExplorer.contribution.ts @@ -14,8 +14,25 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } fr import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; -import { OpenConnectionsViewletAction } from 'sql/parts/objectExplorer/common/registeredServer.contribution'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; +import { ToggleViewletAction } from 'vs/workbench/browser/parts/activitybar/activitybarActions'; +import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; +import { IPartService } from 'vs/workbench/services/part/common/partService'; + +// Viewlet Action +export class OpenDataExplorerViewletAction extends ToggleViewletAction { + public static ID = VIEWLET_ID; + public static LABEL = 'Show Data Explorer'; + + constructor( + id: string, + label: string, + @IViewletService viewletService: IViewletService, + @IPartService partService: IPartService + ) { + super(viewletDescriptor, partService, viewletService); + } +} // Data Explorer Viewlet const viewletDescriptor = new ViewletDescriptor( @@ -34,9 +51,9 @@ if (process.env.NODE_ENV === 'development') { const registry = Registry.as(ActionExtensions.WorkbenchActions); registry.registerWorkbenchAction( new SyncActionDescriptor( - OpenConnectionsViewletAction, - OpenConnectionsViewletAction.ID, - OpenConnectionsViewletAction.LABEL, + OpenDataExplorerViewletAction, + OpenDataExplorerViewletAction.ID, + OpenDataExplorerViewletAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.Shift | KeyCode.KEY_C }), 'View: Show Servers', localize('registeredServers.view', "View")