ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-29 17:23:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a not implemented issue when we were not sanitizing kernel display name (#3869)

Browse Source 
Fixing an issue where we got a 501 Not Implemented because kernel display name sanitization was not occurring with the _defaultKernel case.

In addition, changed a method name to make it more clear, and removed an erroneous error that would occur every time you opened a notebook without any existing connections. I'm just removing this, as it adds no value.
This commit is contained in:
Chris LaFreniere
2019-01-31 09:50:27 -08:00
committed by Kevin Cunnane
parent c43085beab
commit 90d8c37f91
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
}
public changeKernel(displayName: string): void {
let spec = this.getSpecNameFromDisplayName(displayName);
let spec = this.getKernelSpecFromDisplayName(displayName);
this.doChangeKernel(spec);
}
@@ -416,7 +416,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
// TODO should revert kernels dropdown
});
}
this.notifyError(localize('noActiveClientSessionFound', 'No active client session was found.'));
return Promise.resolve();
}
@@ -472,6 +471,10 @@ export class NotebookModel extends Disposable implements INotebookModel {
this._kernelsChangedEmitter.fire(session.kernel);
});
});
let spec = this.getKernelSpecFromDisplayName(this._defaultKernel.display_name);
if (spec) {
this._defaultKernel = spec;
}
this.doChangeKernel(this._defaultKernel);
}
} catch (err) {
@@ -495,7 +498,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
return notebook!.metadata!.kernelspec;
}
private getSpecNameFromDisplayName(displayName: string): nb.IKernelSpec {
private getKernelSpecFromDisplayName(displayName: string): nb.IKernelSpec {
displayName = this.sanitizeDisplayName(displayName);
let kernel: nb.IKernelSpec = this.specs.kernels.find(k => k.display_name.toLowerCase() === displayName.toLowerCase());
if (!kernel) {