From 8380a7a532f7f01ef037bf0afb5e9315264421b4 Mon Sep 17 00:00:00 2001 From: Christopher Kolstad Date: Tue, 15 Apr 2025 10:38:56 +0200 Subject: [PATCH] fix(frontend): Now only shows average daily requests when viewing daily (#9758) As reported by Ivar, there's no point in displaying the average daily traffic when grouping monthly. --- .../admin/network/NetworkTrafficUsage/bar-chart-options.ts | 3 ++- .../network/NetworkTrafficUsage/hooks/useChartDataSelection.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/component/admin/network/NetworkTrafficUsage/bar-chart-options.ts b/frontend/src/component/admin/network/NetworkTrafficUsage/bar-chart-options.ts index 2f09ab5d23..50b6b04676 100644 --- a/frontend/src/component/admin/network/NetworkTrafficUsage/bar-chart-options.ts +++ b/frontend/src/component/admin/network/NetworkTrafficUsage/bar-chart-options.ts @@ -6,6 +6,7 @@ export const createBarChartOptions = ( theme: Theme, tooltipTitleCallback: (tooltipItems: any) => string, includedTraffic?: number, + showAverageDaily?: boolean, ): ChartOptions<'bar'> => ({ plugins: { annotation: { @@ -18,7 +19,7 @@ export const createBarChartOptions = ( yMax: includedTraffic ? includedTraffic / 30 : 0, borderColor: 'gray', borderWidth: 1, - display: !!includedTraffic, + display: !!includedTraffic && !!showAverageDaily, label: { backgroundColor: 'rgba(192, 192, 192, 0.8)', diff --git a/frontend/src/component/admin/network/NetworkTrafficUsage/hooks/useChartDataSelection.ts b/frontend/src/component/admin/network/NetworkTrafficUsage/hooks/useChartDataSelection.ts index 2cb12bb0b9..afe6e5e2c0 100644 --- a/frontend/src/component/admin/network/NetworkTrafficUsage/hooks/useChartDataSelection.ts +++ b/frontend/src/component/admin/network/NetworkTrafficUsage/hooks/useChartDataSelection.ts @@ -50,6 +50,7 @@ export const useChartDataSelection = (includedTraffic?: number) => { } }, includedTraffic, + chartDataSelection.grouping === 'daily', ); }, [theme, chartDataSelection, includedTraffic]);