Fix: format value of survey charts tooltips (#2295)

instedd · Jul 6, 2023 · c61bd2f · c61bd2f
1 parent cbe5ecb
commit c61bd2f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/assets/js/components/charts/Forecasts.jsx b/assets/js/components/charts/Forecasts.jsx
@@ -2,6 +2,7 @@ import React, { Component } from "react"
 import * as d3 from "d3"
 import References from "./References"
 import TimeAgo from "react-timeago"
+import { percentFormat } from "./utils"
 
 const margin = { left: 36, top: 18, right: 18, bottom: 36 }
 
@@ -110,7 +111,7 @@ export default class Forecasts extends Component<Props> {
             .style("stroke", data[i].color)
             .on("mouseover", (d) =>
               tooltip
-                .text(d.value)
+                .text(percentFormat(d.value / 100))
                 .style("top", d3.event.pageY - 10 + "px")
                 .style("left", d3.event.pageX + 10 + "px")
                 .style("visibility", "visible")

diff --git a/assets/js/components/charts/SuccessRate.jsx b/assets/js/components/charts/SuccessRate.jsx
@@ -1,8 +1,8 @@
 import React, { Component } from "react"
-import * as d3 from "d3"
 import Donut from "./Donut"
 import classNames from "classnames"
 import { translate } from "react-i18next"
+import { numberFormat, labelFormat } from "./utils"
 
 const margin = { left: 18, top: 18, right: 18, bottom: 18 }
 
@@ -45,14 +45,6 @@ class SuccessRate extends Component<Props> {
     window.removeEventListener("resize", this.recalculate)
   }
 
-  numberFormat(number) {
-    return number < 0.1 ? d3.format(".1%")(number) : d3.format(".0%")(number)
-  }
-
-  labelFormat(number) {
-    return number > 0 && number < 1 ? d3.format(".2f")(number) : d3.format(".0f")(number)
-  }
-
   render() {
     const { progress, weight, initial, actual, estimated, exhausted, t } = this.props
     const zeroExhausted = exhausted == 0
@@ -86,14 +78,14 @@ class SuccessRate extends Component<Props> {
                   className="initial label"
                   transform={`translate(${-arcRadius - offset}, 0) rotate(-90)`}
                 >
-                  {this.labelFormat(1 - progress)}
+                  {labelFormat(1 - progress)}
                 </text>
                 <text
                   ref="foregroundLabel"
                   className="actual label hanging"
                   transform={`translate(${weight - arcRadius + offset}, 0) rotate(-90)`}
                 >
-                  {this.labelFormat(progress)}
+                  {labelFormat(progress)}
                 </text>
               </g>
             </g>
@@ -128,7 +120,7 @@ class SuccessRate extends Component<Props> {
               {t("estimated success rate")}
             </text>
             <text x={arcRadius} y={arcRadius / 2} className="percent large">
-              {this.numberFormat(estimated)}
+              {numberFormat(estimated)}
             </text>
             <g
               ref="progress"
@@ -146,7 +138,7 @@ class SuccessRate extends Component<Props> {
                 {t("Progress")}
               </text>
               <text x={donutRadius} y={donutRadius - margin.bottom} className="progress percent">
-                {this.numberFormat(progress)}
+                {numberFormat(progress)}
               </text>
             </g>
             <g
@@ -166,7 +158,7 @@ class SuccessRate extends Component<Props> {
                 {t("initial success rate")}
               </text>
               <text x={donutRadius / 2} y={donutRadius / 2} className="initial percent middle">
-                {this.numberFormat(initial)}
+                {numberFormat(initial)}
               </text>
             </g>
             <g
@@ -198,7 +190,7 @@ class SuccessRate extends Component<Props> {
                   "zero-exhausted": zeroExhausted,
                 })}
               >
-                {this.numberFormat(actual)}
+                {numberFormat(actual)}
               </text>
             </g>
           </g>

diff --git a/assets/js/components/charts/SuccessRateLine.jsx b/assets/js/components/charts/SuccessRateLine.jsx
@@ -1,5 +1,6 @@
 import React, { Component } from "react"
 import * as d3 from "d3"
+import { percentFormat } from "./utils"
 
 const margin = { left: 36, top: 18, right: 18, bottom: 36 }
 
@@ -105,13 +106,13 @@ export default class SuccessRateLine extends Component<Props> {
             .style("fill", srData[i].color)
             .style("stroke", srData[i].color)
             .style("opacity", 0.1)
-            .on("mouseover", (d) =>
+            .on("mouseover", (d) => {
               tooltip
-                .text(d.value)
+                .text(percentFormat(d.value / 100))
                 .style("top", d3.event.pageY - 10 + "px")
                 .style("left", d3.event.pageX + 10 + "px")
                 .style("visibility", "visible")
-            )
+            })
             .on("mouseout", () => tooltip.style("visibility", "hidden"))
         }
       }

diff --git a/assets/js/components/charts/utils.js b/assets/js/components/charts/utils.js
@@ -0,0 +1,14 @@
+import * as d3 from "d3"
+
+export function percentFormat(number) {
+  return d3.format(".1%")(number)
+}
+
+export function numberFormat(number) {
+  return number < 0.1 ? d3.format(".1%")(number) : d3.format(".0%")(number)
+}
+
+export function labelFormat(number) {
+  return number > 0 && number < 1 ? d3.format(".2f")(number) : d3.format(".0f")(number)
+}
+