From 30635d051b546278e79f16a76393cabe0d3d15f6 Mon Sep 17 00:00:00 2001 From: Johnson Cherian Date: Tue, 7 May 2024 07:06:32 +0530 Subject: [PATCH 1/2] fix: set preview loader only when running quer is executed --- frontend/src/_helpers/appUtils.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js index 17d4b01d46..5531da8bd6 100644 --- a/frontend/src/_helpers/appUtils.js +++ b/frontend/src/_helpers/appUtils.js @@ -337,7 +337,16 @@ export function onQueryConfirmOrCancel(_ref, queryConfirmationData, isConfirm = ); _ref.updateQueryConfirmationList(filtertedQueryConfirmation, 'check'); - isConfirm && runQuery(_ref, queryConfirmationData.queryId, queryConfirmationData.queryName, true, mode); + isConfirm && + runQuery( + _ref, + queryConfirmationData.queryId, + queryConfirmationData.queryName, + true, + mode, + undefined, + queryConfirmationData.shouldSetPreviewData + ); } export async function copyToClipboard(text) { @@ -1004,10 +1013,6 @@ export function runQuery( const queryPanelState = useQueryPanelStore.getState(); const { queryPreviewData } = queryPanelState; const { setPreviewLoading, setPreviewData } = queryPanelState.actions; - if (shouldSetPreviewData) { - setPreviewLoading(true); - queryPreviewData && setPreviewData(''); - } if (query) { dataQuery = JSON.parse(JSON.stringify(query)); @@ -1037,6 +1042,7 @@ export function runQuery( const queryConfirmation = { queryId, queryName, + shouldSetPreviewData, }; if (!queryConfirmationList.some((query) => queryId === query.queryId)) { queryConfirmationList.push(queryConfirmation); @@ -1054,6 +1060,10 @@ export function runQuery( // eslint-disable-next-line no-unused-vars return new Promise(function (resolve, reject) { setTimeout(() => { + if (shouldSetPreviewData) { + setPreviewLoading(true); + queryPreviewData && setPreviewData(''); + } if (!isOnLoad) { useCurrentStateStore.getState().actions.setCurrentState({ queries: { From 852206a5157bab2444b2ef0a46e97c7872a7d22d Mon Sep 17 00:00:00 2001 From: Johnson Cherian Date: Tue, 7 May 2024 07:06:32 +0530 Subject: [PATCH 2/2] fix: set preview loader only when running query is executed --- frontend/src/_helpers/appUtils.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/src/_helpers/appUtils.js b/frontend/src/_helpers/appUtils.js index 17d4b01d46..5531da8bd6 100644 --- a/frontend/src/_helpers/appUtils.js +++ b/frontend/src/_helpers/appUtils.js @@ -337,7 +337,16 @@ export function onQueryConfirmOrCancel(_ref, queryConfirmationData, isConfirm = ); _ref.updateQueryConfirmationList(filtertedQueryConfirmation, 'check'); - isConfirm && runQuery(_ref, queryConfirmationData.queryId, queryConfirmationData.queryName, true, mode); + isConfirm && + runQuery( + _ref, + queryConfirmationData.queryId, + queryConfirmationData.queryName, + true, + mode, + undefined, + queryConfirmationData.shouldSetPreviewData + ); } export async function copyToClipboard(text) { @@ -1004,10 +1013,6 @@ export function runQuery( const queryPanelState = useQueryPanelStore.getState(); const { queryPreviewData } = queryPanelState; const { setPreviewLoading, setPreviewData } = queryPanelState.actions; - if (shouldSetPreviewData) { - setPreviewLoading(true); - queryPreviewData && setPreviewData(''); - } if (query) { dataQuery = JSON.parse(JSON.stringify(query)); @@ -1037,6 +1042,7 @@ export function runQuery( const queryConfirmation = { queryId, queryName, + shouldSetPreviewData, }; if (!queryConfirmationList.some((query) => queryId === query.queryId)) { queryConfirmationList.push(queryConfirmation); @@ -1054,6 +1060,10 @@ export function runQuery( // eslint-disable-next-line no-unused-vars return new Promise(function (resolve, reject) { setTimeout(() => { + if (shouldSetPreviewData) { + setPreviewLoading(true); + queryPreviewData && setPreviewData(''); + } if (!isOnLoad) { useCurrentStateStore.getState().actions.setCurrentState({ queries: {