@@ -401,8 +401,8 @@ const UsageModal = ({ open, onClose, username }: UsageModalProps) => {
401401 node_id : selectedNodeId ,
402402 }
403403
404- // Add group_by_node when all nodes are selected (selectedNodeId is undefined)
405- if ( selectedNodeId === undefined ) {
404+ // Add group_by_node when all nodes are selected for sudo admins (selectedNodeId is undefined)
405+ if ( selectedNodeId === undefined && is_sudo ) {
406406 baseParams . group_by_node = true
407407 }
408408
@@ -428,8 +428,8 @@ const UsageModal = ({ open, onClose, username }: UsageModalProps) => {
428428 const processedChartData = useMemo ( ( ) => {
429429 if ( ! data ?. stats ) return [ ]
430430
431- // If all nodes selected (selectedNodeId is undefined), handle like AllNodesStackedBarChart
432- if ( selectedNodeId === undefined ) {
431+ // If all nodes selected for sudo admins (selectedNodeId is undefined and is_sudo ), handle like AllNodesStackedBarChart
432+ if ( selectedNodeId === undefined && is_sudo ) {
433433 let statsByNode : Record < string , any [ ] > = { }
434434 if ( data . stats ) {
435435 if ( typeof data . stats === 'object' && ! Array . isArray ( data . stats ) ) {
@@ -756,8 +756,8 @@ const UsageModal = ({ open, onClose, username }: UsageModalProps) => {
756756 tickMargin = { 2 }
757757 />
758758 < ChartTooltip cursor = { false } content = { < CustomBarTooltip chartConfig = { chartConfig } dir = { dir } period = { currentPeriod } /> } />
759- { selectedNodeId === undefined ? (
760- // All nodes selected - render stacked bars
759+ { selectedNodeId === undefined && is_sudo ? (
760+ // All nodes selected for sudo admins - render stacked bars
761761 nodeList . map ( ( node , idx ) => (
762762 < Bar
763763 key = { node . id }
@@ -769,7 +769,7 @@ const UsageModal = ({ open, onClose, username }: UsageModalProps) => {
769769 />
770770 ) )
771771 ) : (
772- // Single node selected - render single bar
772+ // Single node selected OR non-sudo admin aggregated data - render single bar
773773 < Bar dataKey = "usage" radius = { 6 } cursor = "pointer" >
774774 { processedChartData . map ( ( _ : any , index : number ) => (
775775 < Cell key = { `cell-${ index } ` } fill = { 'hsl(var(--primary))' } />
0 commit comments