From ad8924ed13e5872fa8254a1dd1b0b56c340010c5 Mon Sep 17 00:00:00 2001 From: Rajat Dabade Date: Tue, 13 Feb 2024 15:19:15 +0530 Subject: [PATCH] [Refactor]: added extra param to check isdepend on query build (#4523) * refactor: added extra param to check isdepend on query build * refactor: added extra param to check isdepend on query build * refactor: updated enabled query condition * refactor: added extra param to check isdepend on query build * refactor: updated enabled query condition * chore: clean code --- .../Steps/LogsConnectionStatus/LogsConnectionStatus.tsx | 2 ++ frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx b/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx index 994234eca8..b7ebbcfde8 100644 --- a/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx +++ b/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx @@ -89,6 +89,8 @@ export default function LogsConnectionStatus(): JSX.Element { refetchInterval: pollingInterval, enabled: true, }, + {}, + false, ); const verifyLogsData = ( diff --git a/frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts b/frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts index c874f5e6db..bd85d8f799 100644 --- a/frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts +++ b/frontend/src/hooks/queryBuilder/useGetExplorerQueryRange.ts @@ -17,6 +17,7 @@ export const useGetExplorerQueryRange = ( panelType: PANEL_TYPES | null, options?: UseQueryOptions, Error>, params?: Record, + isDependentOnQB = true, ): UseQueryResult, Error> => { const { isEnabledQuery } = useQueryBuilder(); const { selectedTime: globalSelectedInterval, minTime, maxTime } = useSelector< @@ -32,11 +33,11 @@ export const useGetExplorerQueryRange = ( const isEnabled = useMemo(() => { if (!options) return isEnabledQuery; if (typeof options.enabled === 'boolean') { - return isEnabledQuery && options.enabled; + return options.enabled && (!isDependentOnQB || isEnabledQuery); } return isEnabledQuery; - }, [options, isEnabledQuery]); + }, [options, isEnabledQuery, isDependentOnQB]); return useGetQueryRange( {