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 action execution in insight dialog (#942)

Browse Source
This commit is contained in:
Anthony Dresser
2018-03-20 17:35:06 -07:00
committed by Karl Burtram
parent c116f933e2
commit 089577c5a8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/parts/insights/browser/insightsDialogView.ts
View File

@@ -198,7 +198,7 @@ export class InsightsDialogView extends Modal {
this._contextMenuService.showContextMenu({ this._contextMenuService.showContextMenu({
getAnchor: () => e.target as HTMLElement, getAnchor: () => e.target as HTMLElement,
getActions: () => this.insightActions, getActions: () => this.insightActions,
getActionsContext: () => this.topInsightContext(this._topTableData.getItem(this._topTable.getCellFromEvent(e).row), this._topTable.getCellFromEvent(e)) getActionsContext: () => this.topInsightContext(this._topTableData.getItem(this._topTable.getCellFromEvent(e).row))
}); });
} }
})); }));
@@ -301,7 +301,8 @@ export class InsightsDialogView extends Modal {
} else { } else {
return; return;
} }
this._commandService.executeCommand(action, this._connectionProfile); let context = this.topInsightContext(resource);
this._commandService.executeCommand(action, context);
}, 'left'); }, 'left');
button.enabled = false; button.enabled = false;
this._taskButtonDisposables.push(button); this._taskButtonDisposables.push(button);
@@ -344,7 +345,7 @@ export class InsightsDialogView extends Modal {
let task = tasks.includes(action); let task = tasks.includes(action);
let commandAction = MenuRegistry.getCommand(action); let commandAction = MenuRegistry.getCommand(action);
if (task) { if (task) {
returnActions.push(this._instantiationService.createInstance(ExecuteCommandAction, commandAction.title, commandAction.iconClass)); returnActions.push(this._instantiationService.createInstance(ExecuteCommandAction, commandAction.id, commandAction.title));
} }
} }
return TPromise.as(returnActions); return TPromise.as(returnActions);
@@ -354,7 +355,7 @@ export class InsightsDialogView extends Modal {
* Creates the context that should be passed to the action passed on the selected element for the top table * Creates the context that should be passed to the action passed on the selected element for the top table
* @param element * @param element
*/ */
private topInsightContext(element: ListResource, cell?: Slick.Cell): IInsightDialogActionContext { private topInsightContext(element: ListResource): IConnectionProfile {
let database = this._insight.actions.database || this._connectionProfile.databaseName; let database = this._insight.actions.database || this._connectionProfile.databaseName;
let server = this._insight.actions.server || this._connectionProfile.serverName; let server = this._insight.actions.server || this._connectionProfile.serverName;
let user = this._insight.actions.user || this._connectionProfile.userName; let user = this._insight.actions.user || this._connectionProfile.userName;
@@ -395,7 +396,7 @@ export class InsightsDialogView extends Modal {
profile.serverName = server; profile.serverName = server;
profile.userName = user; profile.userName = user;
return { profile, cellData: undefined }; return profile;
} }
/** /**