public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing duplicated things

Browse Source
This commit is contained in:
Peter Holmberg
2019-01-08 15:56:01 +01:00
parent de38769973
commit 38dcbeb2fd
4 changed files with 23 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-ui/src/utils/ValueFormats/categories.ts
+9 -9
View File
@@ -1,4 +1,4 @@
import { locale, scaledUnits, toFixed, toFixedUnit, ValueFormatCategory } from './valueFormats';
import { locale, scaledUnits, simpleCountUnit, toFixed, toFixedUnit, ValueFormatCategory } from './valueFormats';
import {
dateTimeAsIso,
dateTimeAsUS,
@@ -289,14 +289,14 @@ export const getCategories = (): ValueFormatCategory[] => [
{
name: 'throughput',
formats: [
{ name: 'ops/sec (ops)', id: 'ops', fn: decimalSIPrefix('ops') },
{ name: 'requests/sec (rps)', id: 'reqps', fn: decimalSIPrefix('reqps') },
{ name: 'reads/sec (rps)', id: 'rps', fn: decimalSIPrefix('rps') },
{ name: 'writes/sec (wps)', id: 'wps', fn: decimalSIPrefix('wps') },
{ name: 'I/O ops/sec (iops)', id: 'iops', fn: decimalSIPrefix('iops') },
{ name: 'ops/min (opm)', id: 'opm', fn: decimalSIPrefix('opm') },
{ name: 'reads/min (rpm)', id: 'rpm', fn: decimalSIPrefix('rpm') },
{ name: 'writes/min (wpm)', id: 'wpm', fn: decimalSIPrefix('wpm') },
{ name: 'ops/sec (ops)', id: 'ops', fn: simpleCountUnit('ops') },
{ name: 'requests/sec (rps)', id: 'reqps', fn: simpleCountUnit('reqps') },
{ name: 'reads/sec (rps)', id: 'rps', fn: simpleCountUnit('rps') },
{ name: 'writes/sec (wps)', id: 'wps', fn: simpleCountUnit('wps') },
{ name: 'I/O ops/sec (iops)', id: 'iops', fn: simpleCountUnit('iops') },
{ name: 'ops/min (opm)', id: 'opm', fn: simpleCountUnit('opm') },
{ name: 'reads/min (rpm)', id: 'rpm', fn: simpleCountUnit('rpm') },
{ name: 'writes/min (wpm)', id: 'wpm', fn: simpleCountUnit('wpm') },
],
},
{
packages/grafana-ui/src/utils/ValueFormats/symbolFormatters.test.ts
-4
View File
@@ -4,8 +4,4 @@ describe('Currency', () => {
it('should format as usd', () => {
expect(currency('$')(1532.82, 1, -1)).toEqual('$1.53K');
});
it('should format as usd', () => {
expect(currency('kr')(1532.82, 1, -1)).toEqual('1.53K kr');
});
});
packages/grafana-ui/src/utils/ValueFormats/valueFormats.ts
+12
View File
@@ -107,6 +107,18 @@ export function locale(value: number, decimals: number) {
return value.toLocaleString(undefined, { maximumFractionDigits: decimals });
}
export function simpleCountUnit(symbol: string) {
const units = ['', 'K', 'M', 'B', 'T'];
const scaler = scaledUnits(1000, units);
return (size: number, decimals: number, scaledDecimals: number) => {
if (size === null) {
return '';
}
const scaled = scaler(size, decimals, scaledDecimals);
return scaled + ' ' + symbol;
};
}
function buildFormats() {
categories = getCategories();