diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts index 62286e770af..7cf8cc99049 100644 --- a/packages/grafana-data/src/types/data.ts +++ b/packages/grafana-data/src/types/data.ts @@ -48,7 +48,6 @@ export interface Field { type?: FieldType; filterable?: boolean; unit?: string; - dateFormat?: string; // Source data format decimals?: number | null; // Significant digits (for display) min?: number | null; max?: number | null; diff --git a/packages/grafana-data/src/utils/csv.ts b/packages/grafana-data/src/utils/csv.ts index a5382a6a70a..c62d001b57d 100644 --- a/packages/grafana-data/src/utils/csv.ts +++ b/packages/grafana-data/src/utils/csv.ts @@ -98,7 +98,6 @@ export class CSVReader { name: '#', type: FieldType.number, unit: '#', - dateFormat: '#', }; // Check if it is a known/supported column diff --git a/packages/grafana-ui/src/utils/displayValue.ts b/packages/grafana-ui/src/utils/displayValue.ts index e0f12926be3..c17774838b2 100644 --- a/packages/grafana-ui/src/utils/displayValue.ts +++ b/packages/grafana-ui/src/utils/displayValue.ts @@ -1,15 +1,6 @@ // Libraries import _ from 'lodash'; -import { - DateTime, - dateTime, - Threshold, - getMappedValue, - Field, - DecimalInfo, - DisplayValue, - DecimalCount, -} from '@grafana/data'; +import { Threshold, getMappedValue, Field, DecimalInfo, DisplayValue, DecimalCount } from '@grafana/data'; // Utils import { getValueFormat } from './valueFormats/valueFormats'; @@ -60,14 +51,6 @@ export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProce } } - if (field.dateFormat) { - const date = toMoment(value, numeric, field.dateFormat); - if (date.isValid()) { - text = date.format(field.dateFormat); - shouldFormat = false; - } - } - if (!isNaN(numeric)) { if (shouldFormat && !_.isBoolean(value)) { const { decimals, scaledDecimals } = getDecimalsForValue(value, field.decimals); @@ -88,20 +71,6 @@ export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProce return toStringProcessor; } -function toMoment(value: any, numeric: number, format: string): DateTime { - if (!isNaN(numeric)) { - const v = dateTime(numeric); - if (v.isValid()) { - return v; - } - } - const v = dateTime(value, format); - if (v.isValid) { - return v; - } - return dateTime(value); // moment will try to parse the format -} - /** Will return any value as a number or NaN */ function toNumber(value: any): number { if (typeof value === 'number') { diff --git a/packages/grafana-ui/src/utils/fieldDisplay.test.ts b/packages/grafana-ui/src/utils/fieldDisplay.test.ts index 4e697603a92..9620805f798 100644 --- a/packages/grafana-ui/src/utils/fieldDisplay.test.ts +++ b/packages/grafana-ui/src/utils/fieldDisplay.test.ts @@ -8,7 +8,6 @@ describe('FieldDisplay', () => { const f0 = { min: 0, max: 100, - dateFormat: 'YYYY', }; const f1 = { unit: 'ms', @@ -20,7 +19,6 @@ describe('FieldDisplay', () => { expect(field.min).toEqual(0); expect(field.max).toEqual(100); expect(field.unit).toEqual('ms'); - expect(field.dateFormat).toEqual('YYYY'); // last one overrieds const f2 = {