From 478ad2dda5660e1a47ab7fe6edee2b05c87ba8ba Mon Sep 17 00:00:00 2001
From: Vasilev Sergey <ed66679@gmail.com>
Date: Thu, 26 Sep 2024 14:45:21 +0400
Subject: [PATCH] Add check is last not empty contend isEmpty()

---
 src/QueryBuilder/ResultViewer/ResultViewer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QueryBuilder/ResultViewer/ResultViewer.js b/src/QueryBuilder/ResultViewer/ResultViewer.js
index 6e7bb318..3aec7615 100644
--- a/src/QueryBuilder/ResultViewer/ResultViewer.js
+++ b/src/QueryBuilder/ResultViewer/ResultViewer.js
@@ -124,7 +124,7 @@ export const ResultViewer = ({
   );
 
   const renderTable = () => {
-    const showSpinner = !lastNotEmptyContent && isListLoading && isEmpty(contentData);
+    const showSpinner = isEmpty(lastNotEmptyContent) && (isListLoading || isContentDataLoading) && isEmpty(contentData);
 
     return (
       <Row center="xs">