From 54044155a51001529be24d393e24868948fb4bbb Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Mon, 23 Dec 2019 22:05:26 -0800 Subject: [PATCH] Units: support farenheit (existing misspelling) (#21249) (cherry picked from commit af2cd77655a3db2538e9ecf3efea4f3067b83140) --- .../grafana-data/src/valueFormats/valueFormats.test.ts | 8 ++++++++ packages/grafana-data/src/valueFormats/valueFormats.ts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/grafana-data/src/valueFormats/valueFormats.test.ts b/packages/grafana-data/src/valueFormats/valueFormats.test.ts index 78a0c4a26c3..5a996b6a16d 100644 --- a/packages/grafana-data/src/valueFormats/valueFormats.test.ts +++ b/packages/grafana-data/src/valueFormats/valueFormats.test.ts @@ -53,4 +53,12 @@ describe('valueFormats', () => { expect(str).toBe('1.200 s'); }); }); + + describe('Resolve old units', () => { + it('resolve farenheit', () => { + const fmt0 = getValueFormat('farenheit'); + const fmt1 = getValueFormat('fahrenheit'); + expect(fmt0).toEqual(fmt1); + }); + }); }); diff --git a/packages/grafana-data/src/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts index 0e99b6021c1..68ccea14f61 100644 --- a/packages/grafana-data/src/valueFormats/valueFormats.ts +++ b/packages/grafana-data/src/valueFormats/valueFormats.ts @@ -142,6 +142,14 @@ function buildFormats() { } } + // Resolve units pointing to old IDs + [{ from: 'farenheit', to: 'fahrenheit' }].forEach(alias => { + const f = index[alias.to]; + if (f) { + index[alias.from] = f; + } + }); + hasBuiltIndex = true; }