diff --git a/public/app/plugins/panel/table/specs/transformers.test.ts b/public/app/plugins/panel/table/specs/transformers.test.ts index 49926aa00a8..c82c9dd6cd0 100644 --- a/public/app/plugins/panel/table/specs/transformers.test.ts +++ b/public/app/plugins/panel/table/specs/transformers.test.ts @@ -108,7 +108,6 @@ describe('when transforming time series table', () => { { type: 'foo', columns: [{ text: 'Time' }, { text: 'Label Key 1' }, { text: 'Value' }], - rows: [[time, 'Label Value 1', 42]], }, ]; diff --git a/public/app/plugins/panel/table/transformers.ts b/public/app/plugins/panel/table/transformers.ts index dac63a935a0..ab3daf6c7be 100644 --- a/public/app/plugins/panel/table/transformers.ts +++ b/public/app/plugins/panel/table/transformers.ts @@ -158,9 +158,8 @@ transformers['table'] = { if (!data || data.length === 0) { return; } - - const noTableIndex = _.findIndex(data, d => d.type !== 'table'); - if (noTableIndex > -1) { + const noTableIndex = _.findIndex(data, d => 'columns' in d && 'rows' in d); + if (noTableIndex < 0) { throw { message: `Result of query #${String.fromCharCode( 65 + noTableIndex