diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts index 232c3a41eb3..8038fbe1bdb 100644 --- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts +++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts @@ -80,19 +80,6 @@ describe('toDataFrame', () => { ).toThrowError('Expected table rows to be array, got object.'); }); - it('migrate from 6.3 style rows', () => { - const oldDataFrame = { - fields: [{ name: 'A' }, { name: 'B' }, { name: 'C' }], - rows: [ - [100, 'A', 1], - [200, 'B', 2], - [300, 'C', 3], - ], - }; - const data = toDataFrame(oldDataFrame); - expect(data.length).toBe(oldDataFrame.rows.length); - }); - it('Guess Colum Types from value', () => { expect(guessFieldTypeFromValue(1)).toBe(FieldType.number); expect(guessFieldTypeFromValue(1.234)).toBe(FieldType.number); diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts index 87e746e770d..d7182ef2c2b 100644 --- a/packages/grafana-data/src/dataframe/processDataFrame.ts +++ b/packages/grafana-data/src/dataframe/processDataFrame.ts @@ -16,7 +16,6 @@ import { DataFrameDTO, } from '../types/index'; import { isDateTime } from '../datetime/moment_wrapper'; -import { deprecationWarning } from '../utils/deprecationWarning'; import { ArrayVector } from '../vector/ArrayVector'; import { MutableDataFrame } from './MutableDataFrame'; import { SortedVector } from '../vector/SortedVector'; @@ -224,7 +223,7 @@ export function guessFieldTypeForField(field: Field): FieldType | undefined { export const guessFieldTypes = (series: DataFrame): DataFrame => { for (let i = 0; i < series.fields.length; i++) { if (!series.fields[i].type) { - // Somethign is missing a type return a modified copy + // Something is missing a type, return a modified copy return { ...series, fields: series.fields.map(field => { @@ -250,17 +249,6 @@ export const isDataFrame = (data: any): data is DataFrame => data && data.hasOwn export const toDataFrame = (data: any): DataFrame => { if (data.hasOwnProperty('fields')) { - // @deprecated -- remove in 6.5 - if (data.hasOwnProperty('rows')) { - const v = new MutableDataFrame(data as DataFrameDTO); - const rows = data.rows as any[][]; - for (let i = 0; i < rows.length; i++) { - v.appendRow(rows[i]); - } - deprecationWarning('DataFrame', '.rows', 'columnar format'); - return v; - } - // DataFrameDTO does not have length if (data.hasOwnProperty('length')) { return data as DataFrame; diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts index 9a2d9596d81..563cad821a6 100644 --- a/public/app/plugins/panel/singlestat/module.ts +++ b/public/app/plugins/panel/singlestat/module.ts @@ -700,7 +700,7 @@ function getColorForValue(data: any, value: number) { //------------------------------------------------ // Private utility functions -// Somethign like this should be avaliable in a +// Something like this should be avaliable in a // DataFrame[] abstraction helper //------------------------------------------------