From 37349786f14a9a3cfeb51d8c55de97b7151aa9e6 Mon Sep 17 00:00:00 2001 From: Yevhen Shevchenko <90138953+yeshev@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:32:55 +0300 Subject: [PATCH] fix: getting first staged query (#3282) * fix: getting first staged query * fix: getting first enabled query --------- Co-authored-by: Palash Gupta --- frontend/src/container/LogsExplorerViews/index.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/frontend/src/container/LogsExplorerViews/index.tsx b/frontend/src/container/LogsExplorerViews/index.tsx index 6eb50af93d..66915e811f 100644 --- a/frontend/src/container/LogsExplorerViews/index.tsx +++ b/frontend/src/container/LogsExplorerViews/index.tsx @@ -463,9 +463,17 @@ function LogsExplorerViews(): JSX.Element { (queryData) => queryData.groupBy.length > 0, ); - return isGroupByExist - ? data.payload.data.result - : [data.payload.data.result[0]]; + const firstEnabledQuery = stagedQuery.builder.queryData.find( + (item) => !item.disabled, + ); + + const firstPayloadQuery = data.payload.data.result.find( + (item) => item.queryName === firstEnabledQuery?.queryName, + ); + + const firstPayloadQueryArray = firstPayloadQuery ? [firstPayloadQuery] : []; + + return isGroupByExist ? data.payload.data.result : firstPayloadQueryArray; }, [stagedQuery, data, panelType, listChartData]); return (