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

Fix grid changes that broke profiler (#2365)

Browse Source
This commit is contained in:
Matt Irvine
2018-08-30 10:11:02 -07:00
committed by GitHub
parent 4ae0daa17f
commit d94f86b44a
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/base/browser/ui/table/table.ts
View File

@@ -67,13 +67,13 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
constructor(parent: HTMLElement, configuration?: ITableConfiguration<T>, options?: Slick.GridOptions<T>) { constructor(parent: HTMLElement, configuration?: ITableConfiguration<T>, options?: Slick.GridOptions<T>) {
super(); super();
if (!configuration || isArray(configuration.dataProvider)) { if (!configuration || !configuration.dataProvider || isArray(configuration.dataProvider)) {
this._data = new TableDataView<T>(configuration && configuration.dataProvider as Array<T>); this._data = new TableDataView<T>(configuration && configuration.dataProvider as Array<T>);
} else { } else {
this._data = configuration.dataProvider; this._data = configuration.dataProvider;
} }
if (configuration.columns) { if (configuration && configuration.columns) {
this._columns = configuration.columns; this._columns = configuration.columns;
} else { } else {
this._columns = new Array<Slick.Column<T>>(); this._columns = new Array<Slick.Column<T>>();
@@ -105,7 +105,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
this._grid = new Slick.Grid<T>(this._tableContainer, this._data, this._columns, newOptions); this._grid = new Slick.Grid<T>(this._tableContainer, this._data, this._columns, newOptions);
this.idPrefix = this._tableContainer.classList[0]; this.idPrefix = this._tableContainer.classList[0];
DOM.addClass(this._container, this.idPrefix); DOM.addClass(this._container, this.idPrefix);
if (configuration.sorter) { if (configuration && configuration.sorter) {
this._sorter = configuration.sorter; this._sorter = configuration.sorter;
this._grid.onSort.subscribe((e, args) => { this._grid.onSort.subscribe((e, args) => {
this._sorter.sort(args); this._sorter.sort(args);

11
src/sql/parts/profiler/editor/controller/profilerTableEditor.ts
View File

@@ -72,7 +72,16 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
this._overlay.style.zIndex = '4'; this._overlay.style.zIndex = '4';
parent.appendChild(this._overlay); parent.appendChild(this._overlay);
this._profilerTable = new Table(parent); this._profilerTable = new Table(parent, {
sorter: {
sort: (args) => {
let input = this.input as ProfilerInput;
if (input && input.data) {
input.data.sort(args);
}
}
}
});
this._profilerTable.setSelectionModel(new RowSelectionModel()); this._profilerTable.setSelectionModel(new RowSelectionModel());
attachTableStyler(this._profilerTable, this._themeService); attachTableStyler(this._profilerTable, this._themeService);