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

Notebooks: Remove result set summary from saved metadata (#13616)

Browse Source 
* remove result set summary from metadata

* remove batchId and id from celloutputmetadata

* remove extra line
This commit is contained in:
Lucy Zhang
2020-12-07 12:28:07 -08:00
committed by GitHub
parent 6c89c61b0d
commit f96fd911c1
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/workbench/contrib/notebook/browser/cellViews/output.component.ts
View File

@@ -40,8 +40,6 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
private _initialized: boolean = false;
private _activeCellId: string;
private _componentInstance: IMimeComponent;
private _batchId: number | undefined;
private _id: number | undefined;
public errorText: string;
constructor(
@@ -103,14 +101,6 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
return this._componentInstance;
}
@Input() set batchId(value: number | undefined) {
this._batchId = value;
}
@Input() set id(value: number | undefined) {
this._id = value;
}
get trustedMode(): boolean {
return this._trusted;
}
@@ -183,8 +173,6 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
this._componentInstance.cellModel = this.cellModel;
this._componentInstance.cellOutput = this.cellOutput;
this._componentInstance.bundleOptions = options;
this._componentInstance.batchId = this._batchId;
this._componentInstance.id = this._id;
this._changeref.detectChanges();
let el = <HTMLElement>componentRef.location.nativeElement;

2
src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.component.html
View File

@@ -6,7 +6,7 @@
-->
<div style="overflow: hidden; width: 100%; height: 100%; display: flex; flex-flow: column">
<div #outputarea link-handler [isTrusted]="isTrusted" [notebookUri]="notebookUri" class="notebook-output" style="flex: 0 0 auto;">
<output-component *ngFor="let output of cellModel.outputs" [cellOutput]="output" [trustedMode] = "cellModel.trustedMode" [cellModel]="cellModel" [activeCellId]="activeCellId" [batchId]="output.metadata?.resultSet?.batchId" [id]="output.metadata?.resultSet?.id">
<output-component *ngFor="let output of cellModel.outputs" [cellOutput]="output" [trustedMode] = "cellModel.trustedMode" [cellModel]="cellModel" [activeCellId]="activeCellId">
</output-component>
</div>
</div>

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

@@ -40,6 +40,7 @@ import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
import { values } from 'vs/base/common/collections';
import { URI } from 'vs/base/common/uri';
import { assign } from 'vs/base/common/objects';
import { QueryResultId } from 'sql/workbench/services/notebook/browser/models/cell';
import { equals } from 'vs/base/common/arrays';
@Component({
selector: GridOutputComponent.SELECTOR,
@@ -94,16 +95,13 @@ export class GridOutputComponent extends AngularDisposable implements IMimeCompo
this._cellOutput = value;
}
@Input() set batchId(value: number | undefined) {
this._batchId = value;
}
@Input() set id(value: number | undefined) {
this._id = value;
}
ngOnInit() {
if (this.cellModel) {
let outputId: QueryResultId = this.cellModel.getOutputId(this._cellOutput);
if (outputId) {
this._batchId = outputId.batchId;
this._id = outputId.id;
}
this._register(this.cellModel.onTableUpdated(e => {
if (e.resultSet.batchId === this._batchId && e.resultSet.id === this._id) {
this.updateResult(e.resultSet, e.rows);