Skip to content

Commit ac874fa

Browse files
committed
fix(chart): use proper node usages for chart dashboard only on all admins
1 parent 324a409 commit ac874fa

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

dashboard/src/components/dashboard/data-usage-chart.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,10 @@ const DataUsageChart = ({ admin_username }: { admin_username?: string }) => {
221221
return { startDate: start.toISOString(), endDate: now.toISOString() }
222222
}, [periodOption])
223223

224-
// For sudo admins: fetch from nodes, for non-sudo: fetch from users
224+
// For sudo admins: fetch from nodes only when viewing all admins (no admin_username)
225+
// For specific admin views or non-sudo admins: fetch from users
226+
const shouldUseNodeUsage = is_sudo && !admin_username
227+
225228
const nodeUsageParams = useMemo(
226229
() => ({
227230
period: periodOption.period,
@@ -243,20 +246,20 @@ const DataUsageChart = ({ admin_username }: { admin_username?: string }) => {
243246

244247
const { data: nodeData, isLoading: isLoadingNodes } = useGetUsage(nodeUsageParams, {
245248
query: {
246-
enabled: is_sudo,
249+
enabled: shouldUseNodeUsage,
247250
refetchInterval: 1000 * 60 * 5,
248251
},
249252
})
250253

251254
const { data: userData, isLoading: isLoadingUsers } = useGetUsersUsage(userUsageParams, {
252255
query: {
253-
enabled: !is_sudo,
256+
enabled: !shouldUseNodeUsage,
254257
refetchInterval: 1000 * 60 * 5,
255258
},
256259
})
257260

258-
const data = is_sudo ? nodeData : userData
259-
const isLoading = is_sudo ? isLoadingNodes : isLoadingUsers
261+
const data = shouldUseNodeUsage ? nodeData : userData
262+
const isLoading = shouldUseNodeUsage ? isLoadingNodes : isLoadingUsers
260263

261264
// Extract correct stats array from grouped or flat API response (like CostumeBarChart)
262265
let statsArr: any[] = []
@@ -269,7 +272,7 @@ const DataUsageChart = ({ admin_username }: { admin_username?: string }) => {
269272
}
270273
}
271274

272-
const chartData = useMemo(() => transformUsageData({ stats: statsArr }, periodOption, is_sudo), [statsArr, periodOption, is_sudo])
275+
const chartData = useMemo(() => transformUsageData({ stats: statsArr }, periodOption, shouldUseNodeUsage), [statsArr, periodOption, shouldUseNodeUsage])
273276

274277
// Calculate trend
275278
const trend = useMemo(() => {

0 commit comments

Comments
 (0)