From fb64345e92cb2dfadca2984b80cd5fe2192dfeda Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 24 Mar 2021 11:50:15 +0200 Subject: [PATCH] Format numbers larger than 100m --- assets/js/dashboard/number-formatter.js | 5 +++-- lib/plausible_web/views/stats_view.ex | 2 +- test/plausible_web/views/stats_view_test.exs | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/js/dashboard/number-formatter.js b/assets/js/dashboard/number-formatter.js index 8496ab632..0ecc4373f 100644 --- a/assets/js/dashboard/number-formatter.js +++ b/assets/js/dashboard/number-formatter.js @@ -2,6 +2,7 @@ const THOUSAND = 1000 const HUNDRED_THOUSAND = 100000 const MILLION = 1000000 const HUNDRED_MILLION = 100000000 +const BILLION = 1000000000 export default function numberFormatter(num) { if (num >= THOUSAND && num < MILLION) { @@ -11,9 +12,9 @@ export default function numberFormatter(num) { } else { return (Math.floor(thousands * 10) / 10) + 'k' } - } else if (num >= MILLION && num < HUNDRED_MILLION) { + } else if (num >= MILLION && num < BILLION) { const millions = num / MILLION - if (millions === Math.floor(millions)) { + if (millions === Math.floor(millions) || num >= HUNDRED_MILLION) { return Math.floor(millions) + 'M' } else { return (Math.floor(millions * 10) / 10) + 'M' diff --git a/lib/plausible_web/views/stats_view.ex b/lib/plausible_web/views/stats_view.ex index 8c4511d1d..7ef8780f7 100644 --- a/lib/plausible_web/views/stats_view.ex +++ b/lib/plausible_web/views/stats_view.ex @@ -27,7 +27,7 @@ defmodule PlausibleWeb.StatsView do n >= 1_000_000 && n < 1_000_000_000 -> millions = trunc(n / 100_000) / 10 - if millions == trunc(millions) do + if millions == trunc(millions) || n > 100_000_000 do "#{trunc(millions)}m" else "#{millions}m" diff --git a/test/plausible_web/views/stats_view_test.exs b/test/plausible_web/views/stats_view_test.exs index 07922bb6c..908f22b6a 100644 --- a/test/plausible_web/views/stats_view_test.exs +++ b/test/plausible_web/views/stats_view_test.exs @@ -42,5 +42,9 @@ defmodule PlausibleWeb.StatsView.Test do test "99_999_999 becomes 99.9m" do assert StatsView.large_number_format(99_999_999) == "99.9m" end + + test "101_000_000 becomes 101m" do + assert StatsView.large_number_format(101_000_000) == "101m" + end end end