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

Notebooks: Fix Grids Not Rendering when Unsaved Notebook Reloaded (#12483) (#12498)

Browse Source 
* Clear Output and fix output change

* Fix tests after forced clear + append output
This commit is contained in:
Chris LaFreniere
2020-09-18 20:14:45 -07:00
committed by GitHub
parent 99e11d2e22
commit cc6d84e7f6
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/contrib/notebook/browser/models/notebookTextFileModel.ts
View File

@@ -129,9 +129,11 @@ export class NotebookTextFileModel {
} }
public transformAndApplyEditForOutputUpdate(contentChange: NotebookContentChange, textEditorModel: ITextEditorModel): boolean { public transformAndApplyEditForOutputUpdate(contentChange: NotebookContentChange, textEditorModel: ITextEditorModel): boolean {
this.transformAndApplyEditForClearOutput(contentChange, textEditorModel);
if (Array.isArray(contentChange.cells[0].outputs) && contentChange.cells[0].outputs.length > 0) { if (Array.isArray(contentChange.cells[0].outputs) && contentChange.cells[0].outputs.length > 0) {
let newOutput = JSON.stringify(contentChange.cells[0].outputs[contentChange.cells[0].outputs.length - 1], undefined, ' '); for (let i = 0; i < contentChange.cells[0].outputs.length; i++) {
if (contentChange.cells[0].outputs.length > 1) { let newOutput = JSON.stringify(contentChange.cells[0].outputs[i], undefined, ' ');
if (i > 0) {
newOutput = ', '.concat(newOutput); newOutput = ', '.concat(newOutput);
} else { } else {
newOutput = '\n'.concat(newOutput).concat('\n'); newOutput = '\n'.concat(newOutput).concat('\n');
@@ -149,9 +151,10 @@ export class NotebookTextFileModel {
range: new Range(endOutputsRange.startLineNumber, endOutputsRange.startColumn, endOutputsRange.startLineNumber, endOutputsRange.startColumn), range: new Range(endOutputsRange.startLineNumber, endOutputsRange.startColumn, endOutputsRange.startLineNumber, endOutputsRange.startColumn),
text: newOutput text: newOutput
}]); }]);
return true;
} }
} }
return true;
}
return false; return false;
} }

1
src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts
View File

@@ -392,6 +392,7 @@ export class DataResourceDataProvider implements IGridDataProvider {
let rows = await this._queryRunner.getQueryRows(i, numRows, this._batchId, this._id); let rows = await this._queryRunner.getQueryRows(i, numRows, this._batchId, this._id);
this.convertData(rows); this.convertData(rows);
} }
this.cellModel.sendChangeToNotebook(NotebookChangeType.CellOutputUpdated);
} }
private convertData(rows: ResultSetSubset): void { private convertData(rows: ResultSetSubset): void {