feat(bi): Added support for decimal numbers in BI (#24103)

PostHog · Jul 31, 2024 · 9001b68 · 9001b68
1 parent 89789af
commit 9001b68
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/frontend/src/queries/nodes/DataVisualization/Components/SeriesTab.tsx b/frontend/src/queries/nodes/DataVisualization/Components/SeriesTab.tsx
@@ -95,6 +95,9 @@ const YSeries = ({ series, index }: { series: AxisSeries<number>; index: number
                         <LemonField name="suffix" label="Suffix">
                             <LemonInput placeholder="USD" />
                         </LemonField>
+                        <LemonField name="decimalPlaces" label="Decimal places">
+                            <LemonInput type="number" min={0} />
+                        </LemonField>
                     </Form>
                 }
                 visible={isSettingsOpen}

diff --git a/frontend/src/queries/nodes/DataVisualization/Components/ySeriesLogic.ts b/frontend/src/queries/nodes/DataVisualization/Components/ySeriesLogic.ts
@@ -47,13 +47,16 @@ export const ySeriesLogic = kea<ySeriesLogicType>([
                 prefix: props.series?.settings?.formatting?.prefix ?? '',
                 suffix: props.series?.settings?.formatting?.suffix ?? '',
                 style: props.series?.settings?.formatting?.style ?? 'none',
+                decimalPlaces: props.series?.settings?.formatting?.decimalPlaces ?? '',
             },
             submit: async (format) => {
                 actions.updateYSeries(props.seriesIndex, props.series.column.name, {
                     formatting: {
                         prefix: format.prefix,
                         suffix: format.suffix,
                         style: format.style,
+                        decimalPlaces:
+                            format.decimalPlaces === '' ? undefined : parseInt(format.decimalPlaces.toString(), 10),
                     },
                 })
                 actions.setSettingsOpen(false)

diff --git a/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts b/frontend/src/queries/nodes/DataVisualization/dataVisualizationLogic.ts
@@ -67,14 +67,16 @@ const DefaultAxisSettings: AxisSeriesSettings = {
 }
 
 export const formatDataWithSettings = (data: number, settings?: AxisSeriesSettings): string => {
-    let dataAsString = `${data}`
+    const decimalPlaces = settings?.formatting?.decimalPlaces
+
+    let dataAsString = `${decimalPlaces ? data.toFixed(decimalPlaces) : data}`
 
     if (settings?.formatting?.style === 'number') {
-        dataAsString = data.toLocaleString()
+        dataAsString = data.toLocaleString(undefined, { maximumFractionDigits: decimalPlaces })
     }
 
     if (settings?.formatting?.style === 'percent') {
-        dataAsString = `${(data * 100).toLocaleString()}%`
+        dataAsString = `${data.toLocaleString(undefined, { maximumFractionDigits: decimalPlaces })}%`
     }
 
     if (settings?.formatting?.prefix) {
@@ -273,7 +275,20 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
                             column,
                             data: data.map((n) => {
                                 try {
-                                    return parseInt(n[column.dataIndex], 10)
+                                    const multiplier = series.settings.formatting?.style === 'percent' ? 100 : 1
+
+                                    if (series.settings.formatting?.decimalPlaces) {
+                                        return parseFloat(
+                                            (parseFloat(n[column.dataIndex]) * multiplier).toFixed(
+                                                series.settings.formatting.decimalPlaces
+                                            )
+                                        )
+                                    }
+
+                                    const isInt = Number.isInteger(n[column.dataIndex])
+                                    return isInt
+                                        ? parseInt(n[column.dataIndex], 10) * multiplier
+                                        : parseFloat(n[column.dataIndex]) * multiplier
                                 } catch {
                                     return 0
                                 }

diff --git a/frontend/src/queries/schema.json b/frontend/src/queries/schema.json
@@ -2046,6 +2046,9 @@
         "ChartSettingsFormatting": {
             "additionalProperties": false,
             "properties": {
+                "decimalPlaces": {
+                    "type": "number"
+                },
                 "prefix": {
                     "type": "string"
                 },

diff --git a/frontend/src/queries/schema.ts b/frontend/src/queries/schema.ts
@@ -560,6 +560,7 @@ export interface ChartSettingsFormatting {
     prefix?: string
     suffix?: string
     style?: 'none' | 'number' | 'percent'
+    decimalPlaces?: number
 }
 
 export interface ChartSettings {

diff --git a/posthog/schema.py b/posthog/schema.py
@@ -169,6 +169,7 @@ class ChartSettingsFormatting(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+    decimalPlaces: Optional[float] = None
     prefix: Optional[str] = None
     style: Optional[Style] = None
     suffix: Optional[str] = None