@@ -2,7 +2,6 @@ import React from 'react';
22
33import { selectGraphShardExists } from '../../store/reducers/capabilities/capabilities' ;
44import { topQueriesApi } from '../../store/reducers/executeTopQueries/executeTopQueries' ;
5- import type { KeyValueRow } from '../../types/api/query' ;
65import { useAutoRefreshInterval } from '../../utils/hooks' ;
76import { useTypedSelector } from '../../utils/hooks/useTypedSelector' ;
87import type { TimeFrame } from '../../utils/timeframes' ;
@@ -32,10 +31,9 @@ export function useQueriesActivityData(database: string): UseQueriesActivityData
3231 const graphShardExists = useTypedSelector ( ( state ) => selectGraphShardExists ( state , database ) ) ;
3332 const skipCharts = graphShardExists === false ;
3433
35- const { data : runningQueriesData } = topQueriesApi . useGetRunningQueriesQuery (
34+ const { data : runningQueriesCountData } = topQueriesApi . useGetRunningQueriesCountQuery (
3635 {
3736 database,
38- filters : { } ,
3937 } ,
4038 { pollingInterval : shouldRefresh } ,
4139 ) ;
@@ -64,7 +62,9 @@ export function useQueriesActivityData(database: string): UseQueriesActivityData
6462 { pollingInterval : shouldRefresh , skip : skipCharts } ,
6563 ) ;
6664
67- const runningQueriesCount = runningQueriesData ?. resultSets ?. [ 0 ] ?. result ?. length || 0 ;
65+ const runningQueriesCount = runningQueriesCountData ?. runningQueriesCount ?? 0 ;
66+ const uniqueApplications = runningQueriesCountData ?. uniqueApplications ?? 0 ;
67+ const uniqueUsers = runningQueriesCountData ?. uniqueUsers ?? 0 ;
6868
6969 // Determine chart availability from queries API success/error state
7070 const areChartsAvailable = React . useMemo ( ( ) => {
@@ -90,26 +90,6 @@ export function useQueriesActivityData(database: string): UseQueriesActivityData
9090 [ latencyData ?. metrics ?. [ 0 ] ?. data ] ,
9191 ) ;
9292
93- const uniqueApplications = React . useMemo ( ( ) => {
94- const apps = new Set < string > ( ) ;
95- runningQueriesData ?. resultSets ?. [ 0 ] ?. result ?. forEach ( ( row : KeyValueRow ) => {
96- if ( row . ApplicationName ) {
97- apps . add ( String ( row . ApplicationName ) ) ;
98- }
99- } ) ;
100- return apps . size ;
101- } , [ runningQueriesData ] ) ;
102-
103- const uniqueUsers = React . useMemo ( ( ) => {
104- const users = new Set < string > ( ) ;
105- runningQueriesData ?. resultSets ?. [ 0 ] ?. result ?. forEach ( ( row : KeyValueRow ) => {
106- if ( row . UserSID ) {
107- users . add ( String ( row . UserSID ) ) ;
108- }
109- } ) ;
110- return users . size ;
111- } , [ runningQueriesData ] ) ;
112-
11393 return {
11494 runningQueriesCount,
11595 uniqueApplications,
0 commit comments