From 112fd5616b9f7dfbe91e9c41739f844e14daf959 Mon Sep 17 00:00:00 2001 From: Sara Taha Date: Fri, 13 Mar 2020 04:51:44 +0200 Subject: [PATCH 1/3] remove trailing zeros in large numbers in UI Added ~ option to d3Format which trims trailing zeros across format types. Fixes #3741 --- client/app/scripts/utils/__tests__/string-utils-test.js | 6 ++++++ client/app/scripts/utils/string-utils.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/app/scripts/utils/__tests__/string-utils-test.js b/client/app/scripts/utils/__tests__/string-utils-test.js index 5b0799a2e6..3402d825c4 100644 --- a/client/app/scripts/utils/__tests__/string-utils-test.js +++ b/client/app/scripts/utils/__tests__/string-utils-test.js @@ -10,6 +10,12 @@ describe('StringUtils', () => { it('it should render 0', () => { expect(f(0)).toBe('0.00'); }); + + it('it should render get rid of trailing zeros', () => { + expect(f(2104)).toBe('2.104k'); + expect(f(21100)).toBe('21.1k'); + expect(f(2120001)).toBe('2.12M'); + }); }); describe('longestCommonPrefix', () => { diff --git a/client/app/scripts/utils/string-utils.js b/client/app/scripts/utils/string-utils.js index ae3c5974d0..b5b17033fb 100644 --- a/client/app/scripts/utils/string-utils.js +++ b/client/app/scripts/utils/string-utils.js @@ -5,7 +5,7 @@ import { isoFormat } from 'd3-time-format'; import LCP from 'lcp'; import moment from 'moment'; -const formatLargeValue = d3Format('s'); +const formatLargeValue = d3Format('~s'); function renderHtml(text, unit) { From 70a818bff821453c9db396724dc51577b9db0fd2 Mon Sep 17 00:00:00 2001 From: Sara Taha Date: Fri, 13 Mar 2020 05:15:08 +0200 Subject: [PATCH 2/3] remove trailing space --- client/app/scripts/utils/__tests__/string-utils-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/scripts/utils/__tests__/string-utils-test.js b/client/app/scripts/utils/__tests__/string-utils-test.js index 3402d825c4..9c66f0f077 100644 --- a/client/app/scripts/utils/__tests__/string-utils-test.js +++ b/client/app/scripts/utils/__tests__/string-utils-test.js @@ -10,7 +10,7 @@ describe('StringUtils', () => { it('it should render 0', () => { expect(f(0)).toBe('0.00'); }); - + it('it should render get rid of trailing zeros', () => { expect(f(2104)).toBe('2.104k'); expect(f(21100)).toBe('21.1k'); From 7ef0008b4fc748388ff4e537449699d2f7af0cd2 Mon Sep 17 00:00:00 2001 From: Sara Taha Date: Fri, 13 Mar 2020 05:19:20 +0200 Subject: [PATCH 3/3] fix linting issue for trailing spaces --- client/app/scripts/utils/__tests__/string-utils-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/app/scripts/utils/__tests__/string-utils-test.js b/client/app/scripts/utils/__tests__/string-utils-test.js index 9c66f0f077..5dee9736d6 100644 --- a/client/app/scripts/utils/__tests__/string-utils-test.js +++ b/client/app/scripts/utils/__tests__/string-utils-test.js @@ -10,7 +10,6 @@ describe('StringUtils', () => { it('it should render 0', () => { expect(f(0)).toBe('0.00'); }); - it('it should render get rid of trailing zeros', () => { expect(f(2104)).toBe('2.104k'); expect(f(21100)).toBe('21.1k');