From cce6875787953187dbf76a94b614b37a6e094c99 Mon Sep 17 00:00:00 2001
From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com>
Date: Thu, 21 Dec 2023 09:23:34 -0800
Subject: [PATCH] =?UTF-8?q?UI=20=E2=80=93=C2=A0Render=20Query=20Report=20'?=
 =?UTF-8?q?No=20Results'=20state=20when=20`discard=5Fdata`=20is=20enabled,?=
 =?UTF-8?q?=20regardless=20of=20contents/presence=20of=20`results`;=20clea?=
 =?UTF-8?q?nup=20tooltip=20content=20(#15777)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Addresses #15778 and part of #15608

## Checklist for submitter
- [x] Manual QA for all new/changed functionality

---------

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
---
 .../queries/details/QueryDetailsPage/QueryDetailsPage.tsx      | 2 +-
 .../pages/queries/details/components/NoResults/NoResults.tsx   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
index 5cfe2eecf9..c2cd4a0a4f 100644
--- a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
+++ b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
@@ -342,7 +342,7 @@ const QueryDetailsPage = ({
     }
 
     // Empty state with varying messages explaining why there's no results
-    if (emptyCache) {
+    if (emptyCache || lastEditedQueryDiscardData) {
       return (
         <NoResults
           queryInterval={storedQuery?.interval}
diff --git a/frontend/pages/queries/details/components/NoResults/NoResults.tsx b/frontend/pages/queries/details/components/NoResults/NoResults.tsx
index 4841acb24d..0370891fd9 100644
--- a/frontend/pages/queries/details/components/NoResults/NoResults.tsx
+++ b/frontend/pages/queries/details/components/NoResults/NoResults.tsx
@@ -75,7 +75,6 @@ const NoResults = ({
                 The following setting prevents saving this query&apos;s results
                 in Fleet:
               </div>
-              \
               <div>
                 &nbsp; • Query reports are globally disabled in organization
                 settings.
@@ -90,7 +89,6 @@ const NoResults = ({
                 The following setting prevents saving this query&apos;s results
                 in Fleet:
               </div>
-              \
               <div>
                 &nbsp; • This query has <b>Discard data</b> enabled.
               </div>
@@ -104,7 +102,6 @@ const NoResults = ({
                 The following setting prevents saving this query&apos;s results
                 in Fleet:
               </div>
-              \
               <div>
                 &nbsp; • The logging setting for this query is not{" "}
                 <b>Snapshot</b>.