Просмотр исходного кода

TablePanel: Check for table using keys (#17185)

* Fix: the type is not set so can check for columns and rows to validate is table (#16996)

* Fix: the type is not set so can check for columns and rows to validate is table (#16996)

* Fix: fix no table check and tests (#16996)
Shavonn Brown 6 лет назад
Родитель
Сommit
b695dcd0eb

+ 0 - 1
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]],
         },
       ];
 

+ 2 - 3
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