From 7f8cb264f84183b178d8c45d35115baa82044cea Mon Sep 17 00:00:00 2001
From: Luke Heath <luke@fleetdm.com>
Date: Wed, 8 Dec 2021 16:07:43 -0600
Subject: [PATCH] Return spinner when loading live query results (#3261)

---
 changes/issue-3197-queries-loading                | 1 +
 frontend/components/QueryResults/QueryResults.tsx | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changes/issue-3197-queries-loading

diff --git a/changes/issue-3197-queries-loading b/changes/issue-3197-queries-loading
new file mode 100644
index 0000000000..02bf471ff4
--- /dev/null
+++ b/changes/issue-3197-queries-loading
@@ -0,0 +1 @@
+* Return Spinner while waiting for live queries results
\ No newline at end of file
diff --git a/frontend/components/QueryResults/QueryResults.tsx b/frontend/components/QueryResults/QueryResults.tsx
index 6a0d108e9a..c8d64ac82f 100644
--- a/frontend/components/QueryResults/QueryResults.tsx
+++ b/frontend/components/QueryResults/QueryResults.tsx
@@ -46,7 +46,7 @@ const QueryResults = ({
   onStopQuery,
   setSelectedTargets,
   goToQueryEditor,
-}: IQueryResultsProps) => {
+}: IQueryResultsProps): JSX.Element => {
   const { hosts_count: hostsCount, query_results: queryResults, errors } =
     campaign || {};
 
@@ -193,7 +193,7 @@ const QueryResults = ({
       isQueryFinished && (!hostsCount.successful || emptyResults);
 
     if (hasNoResultsYet) {
-      return null;
+      return <Spinner />;
     }
 
     if (finishedWithNoResults) {