From 8ced4343f30ef20a39862d13140df1815c78806a Mon Sep 17 00:00:00 2001 From: Ihor Yeromin Date: Fri, 14 Jul 2023 21:09:36 +0200 Subject: [PATCH] =?UTF-8?q?Field=20Config:=20Add=20new=20units=20(m=CE=A9,?= =?UTF-8?q?=20kHz,=20MHz,=20GHz,=20ac,=20ha)=20(#71357)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: nmarrs --- packages/grafana-data/src/valueFormats/categories.ts | 6 ++++++ packages/grafana-data/src/valueFormats/valueFormats.test.ts | 1 + 2 files changed, 7 insertions(+) diff --git a/packages/grafana-data/src/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts index 4ad4863e6f6..e8c6f5a6eb9 100644 --- a/packages/grafana-data/src/valueFormats/categories.ts +++ b/packages/grafana-data/src/valueFormats/categories.ts @@ -80,6 +80,8 @@ export const getCategories = (): ValueFormatCategory[] => [ { name: 'Square Meters (m²)', id: 'areaM2', fn: toFixedUnit('m²') }, { name: 'Square Feet (ft²)', id: 'areaF2', fn: toFixedUnit('ft²') }, { name: 'Square Miles (mi²)', id: 'areaMI2', fn: toFixedUnit('mi²') }, + { name: 'Acres (ac)', id: 'acres', fn: toFixedUnit('ac') }, + { name: 'Hectares (ha)', id: 'hectares', fn: toFixedUnit('ha') }, ], }, { @@ -236,6 +238,7 @@ export const getCategories = (): ValueFormatCategory[] => [ { name: 'Kilovolt (kV)', id: 'kvolt', fn: SIPrefix('V', 1) }, { name: 'Millivolt (mV)', id: 'mvolt', fn: SIPrefix('V', -1) }, { name: 'Decibel-milliwatt (dBm)', id: 'dBm', fn: SIPrefix('dBm') }, + { name: 'Milliohm (mΩ)', id: 'mohm', fn: SIPrefix('Ω', -1) }, { name: 'Ohm (Ω)', id: 'ohm', fn: SIPrefix('Ω') }, { name: 'Kiloohm (kΩ)', id: 'kohm', fn: SIPrefix('Ω', 1) }, { name: 'Megaohm (MΩ)', id: 'Mohm', fn: SIPrefix('Ω', 2) }, @@ -341,6 +344,9 @@ export const getCategories = (): ValueFormatCategory[] => [ formats: [ { name: 'Revolutions per minute (rpm)', id: 'rotrpm', fn: toFixedUnit('rpm') }, { name: 'Hertz (Hz)', id: 'rothz', fn: SIPrefix('Hz') }, + { name: 'Kilohertz (kHz)', id: 'rotkhz', fn: SIPrefix('kHz', 3) }, + { name: 'Megahertz (MHz)', id: 'rotmhz', fn: SIPrefix('MHz', 4) }, + { name: 'Gigahertz (GHz)', id: 'rotghz', fn: SIPrefix('GHz', 5) }, { name: 'Radians per second (rad/s)', id: 'rotrads', fn: toFixedUnit('rad/s') }, { name: 'Degrees per second (°/s)', id: 'rotdegs', fn: toFixedUnit('°/s') }, ], diff --git a/packages/grafana-data/src/valueFormats/valueFormats.test.ts b/packages/grafana-data/src/valueFormats/valueFormats.test.ts index ff46f153771..2b2e8d0ed63 100644 --- a/packages/grafana-data/src/valueFormats/valueFormats.test.ts +++ b/packages/grafana-data/src/valueFormats/valueFormats.test.ts @@ -40,6 +40,7 @@ describe('valueFormats', () => { ${'kbytes'} | ${undefined} | ${10000000} | ${'9.54 GiB'} ${'deckbytes'} | ${undefined} | ${10000000} | ${'10 GB'} ${'megwatt'} | ${3} | ${1000} | ${'1.000 GW'} + ${'mohm'} | ${3} | ${1000} | ${'1.000 Ω'} ${'kohm'} | ${3} | ${1000} | ${'1.000 MΩ'} ${'Mohm'} | ${3} | ${1000} | ${'1.000 GΩ'} ${'farad'} | ${3} | ${1000} | ${'1.000 kF'}