ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 01:32:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3897: Unified connection integration - sql connection improvements (#3910)

Browse Source 
* #3897: Unified connection integration - sql connection improvements

* variable name change

* Misc changes

* Misc change
This commit is contained in:
Raj
2019-02-06 10:33:21 -08:00
committed by GitHub
parent d74e5e6457
commit 42135d3e53
4 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sql/parts/notebook/models/notebookModel.ts
View File

@@ -66,6 +66,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _defaultKernel: nb.IKernelSpec;
private _kernelDisplayNameToConnectionProviderIds: Map<string, string[]> = new Map<string, string[]>();
private _kernelDisplayNameToNotebookProviderIds: Map<string, string> = new Map<string, string>();
private _onValidConnectionSelected = new Emitter<boolean>();
constructor(private notebookOptions: INotebookModelOptions, startSessionImmediately?: boolean, private connectionProfile?: IConnectionProfile) {
super();
@@ -229,6 +230,10 @@ export class NotebookModel extends Disposable implements INotebookModel {
return this._onProviderIdChanged.event;
}
public get onValidConnectionSelected(): Event<boolean>{
return this._onValidConnectionSelected.event;
}
public getApplicableConnectionProviderIds(kernelDisplayName: string): string[] {
let ids = [];
if (kernelDisplayName) {
@@ -451,11 +456,18 @@ export class NotebookModel extends Disposable implements INotebookModel {
let newConnectionProfile = new ConnectionProfile(this.notebookOptions.capabilitiesService, newConnection);
this._activeConnection = newConnectionProfile;
this.refreshConnections(newConnectionProfile);
this._activeClientSession.updateConnection(this._activeConnection.toIConnectionProfile()).catch((error) => {
if (error) {
this.notifyError(error.message);
}
});
this._activeClientSession.updateConnection(this._activeConnection.toIConnectionProfile()).then(
result => {
//Remove 'Select connection' from 'Attach to' drop-down since its a valid connection
this._onValidConnectionSelected.fire(true);
},
error => {
if (error) {
this.notifyError(notebookUtils.getErrorMessage(error));
//Selected a wrong connection, Attach to should be defaulted with 'Select connection'
this._onValidConnectionSelected.fire(false);
}
});
} catch (err) {
let msg = notebookUtils.getErrorMessage(err);
this.notifyError(localize('changeContextFailed', 'Changing context failed: {0}', msg));