ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6397 right-click New Notebook connects to wrong server (#6399)

Browse Source 
- The OEAction calls through a command service implementation that loses the context object.
Directly instantiating the NewNotebookAction solves this.
Also tested NewQuery and that didn't have an issue so left as-is
This commit is contained in:
Kevin Cunnane
2019-07-17 14:27:08 -07:00
committed by GitHub
parent 3c499d31e8
commit 9807e28a24
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts
View File

@@ -91,7 +91,7 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
}, (context) => this.getBuiltinConnectionActions(context)); }, (context) => this.getBuiltinConnectionActions(context));
} }
private getAllActions(context: ObjectExplorerContext, getDefaultActions: (ObjectExplorerContext) => IAction[]) { private getAllActions(context: ObjectExplorerContext, getDefaultActions: (context: ObjectExplorerContext) => IAction[]) {
// Create metadata needed to get a useful set of actions // Create metadata needed to get a useful set of actions
let scopedContextService = this.getContextKeyService(context); let scopedContextService = this.getContextKeyService(context);
let menu = this.menuService.createMenu(MenuId.ObjectExplorerItemContext, scopedContextService); let menu = this.menuService.createMenu(MenuId.ObjectExplorerItemContext, scopedContextService);
@@ -190,7 +190,9 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
private addNewQueryNotebookActions(context: ObjectExplorerContext, actions: IAction[]): void { private addNewQueryNotebookActions(context: ObjectExplorerContext, actions: IAction[]): void {
if (this._queryManagementService.isProviderRegistered(context.profile.providerName)) { if (this._queryManagementService.isProviderRegistered(context.profile.providerName)) {
actions.push(this._instantiationService.createInstance(OEAction, NewQueryAction.ID, NewQueryAction.LABEL)); actions.push(this._instantiationService.createInstance(OEAction, NewQueryAction.ID, NewQueryAction.LABEL));
actions.push(this._instantiationService.createInstance(OEAction, NewNotebookAction.ID, NewNotebookAction.LABEL)); // Workaround for #6397 right-click and run New Notebook connects to wrong server. Use notebook action instead of generic command action
let notebookAction = this._instantiationService.createInstance(NewNotebookAction, NewNotebookAction.ID, NewNotebookAction.LABEL);
actions.push(notebookAction);
} }
} }