Fleet UI: Remove default states causing race conditions with empty st…

…ate rendering (#14499)
fleetdm · Oct 12, 2023 · 3af5b80 · 3af5b80
1 parent 35cfde8
commit 3af5b80
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from "react";
+import React, { useContext, useState, useEffect } from "react";
 import { useQuery } from "react-query";
 import { InjectedRouter, Params } from "react-router/lib/Router";
 import { useErrorHandler } from "react-error-boundary";
@@ -79,6 +79,8 @@ const QueryDetailsPage = ({
     lastEditedQueryName,
     lastEditedQueryDescription,
     lastEditedQueryObserverCanRun,
+    lastEditedQueryDiscardData,
+    lastEditedQueryLoggingType,
     setLastEditedQueryId,
     setLastEditedQueryName,
     setLastEditedQueryDescription,
@@ -94,6 +96,14 @@ const QueryDetailsPage = ({
   // Title that shows up on browser tabs (e.g., Query details | Discover TLS certificates | Fleet for osquery)
   document.title = `Query details | ${lastEditedQueryName} | Fleet for osquery`;
 
+  const [disabledCachingGlobally, setDisabledCachingGlobally] = useState(true);
+
+  useEffect(() => {
+    if (config) {
+      setDisabledCachingGlobally(config.server_settings.query_reports_disabled);
+    }
+  }, [config]);
+
   // disabled on page load so we can control the number of renders
   // else it will re-populate the context on occasion
   const {
@@ -250,12 +260,9 @@ const QueryDetailsPage = ({
   );
 
   const renderReport = () => {
-    const disabledCachingGlobally =
-      config?.server_settings.query_reports_disabled || true;
-    const discardDataEnabled = storedQuery?.discard_data || true;
-    const loggingSnapshot = storedQuery?.logging === "snapshot";
+    const loggingSnapshot = lastEditedQueryLoggingType === "snapshot";
     const disabledCaching =
-      disabledCachingGlobally || discardDataEnabled || !loggingSnapshot;
+      disabledCachingGlobally || lastEditedQueryDiscardData || !loggingSnapshot;
     const emptyCache = (queryReport?.results?.length ?? 0) === 0;
 
     // Loading state
@@ -276,7 +283,7 @@ const QueryDetailsPage = ({
           queryUpdatedAt={storedQuery?.updated_at}
           disabledCaching={disabledCaching}
           disabledCachingGlobally={disabledCachingGlobally}
-          discardDataEnabled={discardDataEnabled}
+          discardDataEnabled={lastEditedQueryDiscardData}
           loggingSnapshot={loggingSnapshot}
         />
       );

diff --git a/frontend/pages/queries/details/components/NoResults/NoResults.tsx b/frontend/pages/queries/details/components/NoResults/NoResults.tsx
@@ -44,8 +44,8 @@ const NoResults = ({
     new Date()
   );
 
-  // Collecting results state
-  if (collectingResults) {
+  // Collecting results state only shows if caching is enabled
+  if (collectingResults && !disabledCaching) {
     const collectingResultsInfo = () =>
       `Fleet is collecting query results. Check back in about ${readableCheckbackTime}.`;
 
@@ -59,14 +59,7 @@ const NoResults = ({
   }
 
   const noResultsInfo = () => {
-    if (!queryInterval) {
-      return (
-        <>
-          This query does not collect data on a schedule. Add a{" "}
-          <strong>frequency</strong> or run this as a live query to see results.
-        </>
-      );
-    }
+    // In order of empty page priority
     if (disabledCaching) {
       const tipContent = () => {
         if (disabledCachingGlobally) {
@@ -90,6 +83,14 @@ const NoResults = ({
         </>
       );
     }
+    if (!queryInterval) {
+      return (
+        <>
+          This query does not collect data on a schedule. Add <br />a{" "}
+          <strong>frequency</strong> or run this as a live query to see results.
+        </>
+      );
+    }
     // No errors will be reported in V1
     // if (errorsOnly) {
     //   return (