IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 12:44:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Old Table: Table is not rendering when col property is undefined (#44129)

Browse Source
This commit is contained in:
Maria Alexandra 2022-01-25 14:22:57 +01:00 committed by GitHub
parent 24efb42f19
commit 58b8d84085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
public/app/core/specs/table_model.test.ts
View File

@ -55,6 +55,34 @@ describe('when sorting table asc', () => {
});
});
describe('when sorting table with cols being undefined', () => {
let table: TableModel;
const panel = {
sort: { cols: undefined, desc: false },
};
beforeEach(() => {
table = new TableModel();
// @ts-ignore
table.columns = [{}, {}];
table.rows = [
[100, 11],
[105, 15],
[103, 10],
];
// This is needed because after 8.3 cols can be undefined
// https://github.com/grafana/grafana/issues/44127
//@ts-ignore
table.sort(panel.sort);
});
it('should return the original table without sorting', () => {
expect(table.rows[0][1]).toBe(11);
expect(table.rows[1][1]).toBe(15);
expect(table.rows[2][1]).toBe(10);
});
});
describe('when sorting with nulls', () => {
let table: TableModel;
let values;

3
public/app/core/table_model.ts
View File

@ -41,7 +41,8 @@ export default class TableModel implements TableData {
}
sort(options: { col: number; desc: boolean }) {
if (options.col === null || this.columns.length <= options.col) {
// Since 8.3.0 col property can be also undefined, https://github.com/grafana/grafana/issues/44127
if (options.col === null || options.col === undefined || this.columns.length <= options.col) {
return;
}