ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues due to missing notebook values (specs and cells) (#4008)

Browse Source 
- Fix #3844
    - Fix #3955
    - Specs can be null on early load of Jupyter kernels
    - Cells were missing in some reference test .ipynb files. We should be resilient to malformed files if possible.
This commit is contained in:
Kevin Cunnane
2019-02-11 17:17:56 -08:00
committed by GitHub
parent 62404721ed
commit 67f9a7f5e4
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,8 +546,12 @@ export class NotebookModel extends Disposable implements INotebookModel {
return kernel; return kernel;
} }
private getDisplayNameFromSpecName(kernelid: string): string { private getDisplayNameFromSpecName(kernel: nb.IKernel): string {
let newKernel = this.notebookManager.sessionManager.specs.kernels.find(kernel => kernel.name === kernelid); let specs = this.notebookManager.sessionManager.specs;
if (!specs || !specs.kernels) {
return kernel.name;
}
let newKernel = this.notebookManager.sessionManager.specs.kernels.find(kernel => kernel.name === kernel.name);
let newKernelDisplayName; let newKernelDisplayName;
if (newKernel) { if (newKernel) {
newKernelDisplayName = newKernel.display_name; newKernelDisplayName = newKernel.display_name;
@@ -586,7 +590,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private async loadActiveContexts(kernelChangedArgs: nb.IKernelChangedArgs): Promise<void> { private async loadActiveContexts(kernelChangedArgs: nb.IKernelChangedArgs): Promise<void> {
if (kernelChangedArgs && kernelChangedArgs.newValue && kernelChangedArgs.newValue.name) { if (kernelChangedArgs && kernelChangedArgs.newValue && kernelChangedArgs.newValue.name) {
let kernelDisplayName = this.getDisplayNameFromSpecName(kernelChangedArgs.newValue.name); let kernelDisplayName = this.getDisplayNameFromSpecName(kernelChangedArgs.newValue);
this._activeContexts = await NotebookContexts.getContextsForKernel(this.notebookOptions.connectionService, this.getApplicableConnectionProviderIds(kernelDisplayName), kernelChangedArgs, this.connectionProfile); this._activeContexts = await NotebookContexts.getContextsForKernel(this.notebookOptions.connectionService, this.getApplicableConnectionProviderIds(kernelDisplayName), kernelChangedArgs, this.connectionProfile);
this._contextsChangedEmitter.fire(); this._contextsChangedEmitter.fire();
if (this.contexts.defaultConnection !== undefined && this.contexts.defaultConnection.serverName !== undefined) { if (this.contexts.defaultConnection !== undefined && this.contexts.defaultConnection.serverName !== undefined) {

6
src/sql/workbench/services/notebook/node/localContentManager.ts
View File

@@ -71,8 +71,10 @@ namespace v4 {
nbformat_minor: contents.nbformat_minor nbformat_minor: contents.nbformat_minor
}; };
for (let cell of contents.cells) { if (contents.cells) {
notebook.cells.push(readCell(cell)); for (let cell of contents.cells) {
notebook.cells.push(readCell(cell));
}
} }
return notebook; return notebook;