bucket cost chart tweaks

nais · Feb 10, 2025 · 15dc293 · 15dc293
1 parent a97be78
commit 15dc293
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/lib/chart/EChart.svelte b/src/lib/chart/EChart.svelte
@@ -50,7 +50,7 @@
 		let ins: EChartsType | undefined;
 
 		options = { ...defaultOptions, ...options };
-		options.tooltip = { ...options.tooltip, ...defaultOptions.tooltip };
+		options.tooltip = { ...defaultOptions.tooltip, ...options.tooltip };
 
 		const resize = () => {
 			ins?.resize();

diff --git a/src/routes/team/[team]/(teamPages)/buckets/+page.svelte b/src/routes/team/[team]/(teamPages)/buckets/+page.svelte
@@ -28,6 +28,8 @@
 	import { format } from 'date-fns';
 	import type { EChartsOption } from 'echarts';
 	import type { PageData } from './$houdini';
+	import type { CallbackDataParams, TopLevelFormatterParams } from 'echarts/types/dist/shared';
+	import { parseImage } from '$lib/utils/image';
 
 	interface Props {
 		data: PageData;
@@ -93,16 +95,15 @@
 	): EChartsOption => {
 		return {
 			tooltip: {
-				trigger: data.length > 10 ? 'item' : 'axis',
-				axisPointer: {
-					type: 'shadow'
-				},
-				valueFormatter(value: number) {
-					return euroValueFormatter(value);
-				}
+				// axisPointer: {
+				// 	type: 'shadow'
+				// },
+				trigger: 'axis',
+				formatter: (params: CallbackDataParams[]) =>
+					`${params[0].name}: <b>${euroValueFormatter(params[0].value as number)}</b>`
 			},
 			grid: {
-				left: '1%',
+				left: '0',
 				containLabel: true
 			},
 			xAxis: {
@@ -117,6 +118,7 @@
 				name: 'Bucket cost',
 				type: 'line',
 				emphasis: { focus: 'series' },
+				symbol: 'none',
 				data: data.map(({ sum }) => sum)
 			}
 		} as EChartsOption;