Merge pull request #420 from UmakanthKaspa/fix/tooltip-filter-sort

fix: filter and sort tooltip values
frappe · Jan 10, 2025 · e5c7545 · e5c7545
2 parents ca8f920 + 622db31
commit e5c7545
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/frontend/src/widgets/AxisChart/getAxisChartOptions.js b/frontend/src/widgets/AxisChart/getAxisChartOptions.js
@@ -219,8 +219,18 @@ function makeOptions(chartType, labels, datasets, options) {
 			trigger: 'axis',
 			confine: true,
 			appendToBody: false,
-			valueFormatter: (value) => (isNaN(value) ? value : formatNumber(value)),
+			formatter: (params) => {
+				const filteredParams = params
+					.filter((p) => p.value !== 0 && p.value !== null) 
+					.sort((a, b) => b.value - a.value);
+
+				if (!filteredParams.length) return ''; 
+				return filteredParams
+					.map((p) => `${p.marker} ${p.seriesName}: ${formatNumber(p.value)}`)
+					.join('<br/>');
+			},
 		},
+
 	}
 }
 

diff --git a/frontend/src2/charts/helpers.ts b/frontend/src2/charts/helpers.ts
@@ -559,6 +559,12 @@ function getTooltip(options: any = {}) {
 		confine: true,
 		appendToBody: false,
 		formatter: (params: Object | Array<Object>) => {
+			if (Array.isArray(params)) {
+                params = params
+                    .filter((p) => p.value?.[1] !== 0) 
+                    .sort((a, b) => b.value?.[1] - a.value?.[1]); 
+            }
+
 			if (!Array.isArray(params)) {
 				const p = params as any
 				const value = options.xySwapped ? p.value[0] : p.value[1]