From 1a196b78e61aa451176119bb0f620aeb2ef05c85 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Thu, 18 Apr 2024 14:32:48 +0100 Subject: [PATCH] Refactor --- .../client/src/components/app/charts/AreaChart.svelte | 8 +------- packages/client/src/components/app/charts/BarChart.svelte | 8 +------- .../client/src/components/app/charts/LineChart.svelte | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/packages/client/src/components/app/charts/AreaChart.svelte b/packages/client/src/components/app/charts/AreaChart.svelte index 2d7886abfd..08f64c7bd6 100644 --- a/packages/client/src/components/app/charts/AreaChart.svelte +++ b/packages/client/src/components/app/charts/AreaChart.svelte @@ -2,6 +2,7 @@ import { ApexOptionsBuilder } from "./ApexOptionsBuilder" import ApexChart from "./ApexChart.svelte" import { get } from "lodash"; + import formatters from "./formatters" export let title export let dataProvider @@ -24,13 +25,6 @@ export let stacked export let gradient - const formatters = { - ["Default"]: val => val, - ["Thousands"]: val => `${Math.round(val / 1000)}K`, - ["Millions"]: val => `${Math.round(val / 1000000)}M`, - ["Datetime"]: val => (new Date(val)).toLocaleString() - } - $: series = getSeries(dataProvider, valueColumns) $: categories = getCategories(dataProvider, labelColumn); diff --git a/packages/client/src/components/app/charts/BarChart.svelte b/packages/client/src/components/app/charts/BarChart.svelte index 3996f31710..fdf582a0c3 100644 --- a/packages/client/src/components/app/charts/BarChart.svelte +++ b/packages/client/src/components/app/charts/BarChart.svelte @@ -2,6 +2,7 @@ import { ApexOptionsBuilder } from "./ApexOptionsBuilder" import ApexChart from "./ApexChart.svelte" import { get } from "lodash"; + import formatters from "./formatters" export let dataProvider export let labelColumn @@ -21,13 +22,6 @@ export let c1, c2, c3, c4, c5 export let horizontal - const formatters = { - ["Default"]: val => val, - ["Thousands"]: val => `${Math.round(val / 1000)}K`, - ["Millions"]: val => `${Math.round(val / 1000000)}M`, - ["Datetime"]: val => (new Date(val)).toLocaleString() - } - $: series = getSeries(dataProvider, valueColumns) $: categories = getCategories(dataProvider, labelColumn); diff --git a/packages/client/src/components/app/charts/LineChart.svelte b/packages/client/src/components/app/charts/LineChart.svelte index 858b7eb64b..c80597f110 100644 --- a/packages/client/src/components/app/charts/LineChart.svelte +++ b/packages/client/src/components/app/charts/LineChart.svelte @@ -2,6 +2,7 @@ import { ApexOptionsBuilder } from "./ApexOptionsBuilder" import ApexChart from "./ApexChart.svelte" import { get } from "lodash"; + import formatters from "./formatters" export let title export let dataProvider @@ -19,13 +20,6 @@ export let palette export let c1, c2, c3, c4, c5 - const formatters = { - ["Default"]: val => val, - ["Thousands"]: val => `${Math.round(val / 1000)}K`, - ["Millions"]: val => `${Math.round(val / 1000000)}M`, - ["Datetime"]: val => (new Date(val)).toLocaleString() - } - $: series = getSeries(dataProvider, valueColumns) $: categories = getCategories(dataProvider, labelColumn);