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 clicking on a profile in azure connection dialog (#11900)

Browse Source
This commit is contained in:
Anthony Dresser
2020-08-20 20:41:54 -07:00
committed by GitHub
parent 84d21b1e76
commit 31323d6efb
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
View File

@@ -48,7 +48,7 @@ import { RecentConnectionActionsProvider, RecentConnectionTreeController } from
import { ClearRecentConnectionsAction } from 'sql/workbench/services/connection/browser/connectionActions'; import { ClearRecentConnectionsAction } from 'sql/workbench/services/connection/browser/connectionActions';
import { combinedDisposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; import { combinedDisposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ITree } from 'vs/base/parts/tree/browser/tree';
import { AsyncServerTree, ServerTreeElement } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree'; import { AsyncServerTree } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
export interface OnShowUIResponse { export interface OnShowUIResponse {
@@ -399,8 +399,16 @@ export class ConnectionDialogWidget extends Modal implements IViewPaneContainer
}); });
this._recentConnectionTree = TreeCreationUtils.createConnectionTree(treeContainer, this.instantiationService, this._configurationService, localize('connectionDialog.recentConnections', "Recent Connections"), controller); this._recentConnectionTree = TreeCreationUtils.createConnectionTree(treeContainer, this.instantiationService, this._configurationService, localize('connectionDialog.recentConnections', "Recent Connections"), controller);
if (this._recentConnectionTree instanceof AsyncServerTree) { if (this._recentConnectionTree instanceof AsyncServerTree) {
this._recentConnectionTree.onMouseClick(e => this.onConnectionClick(e.element, false)); this._recentConnectionTree.onMouseClick(e => {
this._recentConnectionTree.onMouseDblClick(e => this.onConnectionClick(e.element, true)); if (e.element instanceof ConnectionProfile) {
this.onConnectionClick(e.element, false);
}
});
this._recentConnectionTree.onMouseDblClick(e => {
if (e.element instanceof ConnectionProfile) {
this.onConnectionClick(e.element, true);
}
});
} }
// Theme styler // Theme styler
@@ -429,8 +437,16 @@ export class ConnectionDialogWidget extends Modal implements IViewPaneContainer
const controller = new SavedConnectionTreeController(leftClick); const controller = new SavedConnectionTreeController(leftClick);
this._savedConnectionTree = TreeCreationUtils.createConnectionTree(treeContainer, this.instantiationService, this._configurationService, localize('connectionDialog.savedConnections', "Saved Connections"), controller); this._savedConnectionTree = TreeCreationUtils.createConnectionTree(treeContainer, this.instantiationService, this._configurationService, localize('connectionDialog.savedConnections', "Saved Connections"), controller);
if (this._savedConnectionTree instanceof AsyncServerTree) { if (this._savedConnectionTree instanceof AsyncServerTree) {
this._savedConnectionTree.onMouseClick(e => this.onConnectionClick(e.element, false)); this._savedConnectionTree.onMouseClick(e => {
this._savedConnectionTree.onMouseDblClick(e => this.onConnectionClick(e.element, true)); if (e.element instanceof ConnectionProfile) {
this.onConnectionClick(e.element, false);
}
});
this._savedConnectionTree.onMouseDblClick(e => {
if (e.element instanceof ConnectionProfile) {
this.onConnectionClick(e.element, true);
}
});
} }
// Theme styler // Theme styler
@@ -444,10 +460,7 @@ export class ConnectionDialogWidget extends Modal implements IViewPaneContainer
DOM.append(noSavedConnectionContainer, DOM.$('.no-saved-connections')).innerText = noSavedConnectionLabel; DOM.append(noSavedConnectionContainer, DOM.$('.no-saved-connections')).innerText = noSavedConnectionLabel;
} }
private onConnectionClick(element: ServerTreeElement, connect: boolean = false): void { private onConnectionClick(element: IConnectionProfile, connect: boolean = false): void {
if (!(element instanceof ConnectionProfile)) {
return;
}
if (connect) { if (connect) {
this.connect(element); this.connect(element);
} else { } else {
@@ -647,7 +660,7 @@ export class ConnectionDialogWidget extends Modal implements IViewPaneContainer
const disposable = combinedDisposable(pane, paneStyler); const disposable = combinedDisposable(pane, paneStyler);
const paneItem = { pane, disposable }; const paneItem = { pane, disposable };
treeView.onDidChangeSelection(e => { treeView.onDidChangeSelection(e => {
if (e.length > 0 && e[0].payload instanceof ConnectionProfile) { if (e.length > 0 && e[0].payload) {
this.onConnectionClick(e[0].payload); this.onConnectionClick(e[0].payload);
} }
}); });