From 976818604850968e49013b3be6efd1b907596be5 Mon Sep 17 00:00:00 2001
From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com>
Date: Tue, 10 Oct 2023 15:40:36 -0700
Subject: [PATCH] Enable real API service, handle null results (#14435)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove mock api service and uncomment real api service
- Handle if query_report.results is `null` – should be updated on
backend to return empty array, but doing this as well to facilitate
team-wide manual testing/QA

---------

Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
---
 .../queries/details/QueryDetailsPage/QueryDetailsPage.tsx | 4 ++--
 frontend/services/entities/query_report.ts                | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
index f375a88b00..f739127386 100644
--- a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
+++ b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
@@ -142,7 +142,7 @@ const QueryDetailsPage = ({
   const isLoading = isStoredQueryLoading || isQueryReportLoading;
   const isApiError = storedQueryError || queryReportError;
   const isClipped =
-    queryReport && queryReport.results.length >= QUERY_REPORT_RESULTS_LIMIT;
+    (queryReport?.results?.length ?? 0) >= QUERY_REPORT_RESULTS_LIMIT;
 
   const renderHeader = () => {
     const canEditQuery =
@@ -253,7 +253,7 @@ const QueryDetailsPage = ({
     const loggingSnapshot = storedQuery?.logging === "snapshot";
     const disabledCaching =
       disabledCachingGlobally || discardDataEnabled || !loggingSnapshot;
-    const emptyCache = queryReport?.results.length === 0; // TODO: Update with API response
+    const emptyCache = (queryReport?.results?.length ?? 0) === 0; // TODO: Update with API response
 
     // Loading state
     if (isLoading) {
diff --git a/frontend/services/entities/query_report.ts b/frontend/services/entities/query_report.ts
index 9dbf13834e..02855a2644 100644
--- a/frontend/services/entities/query_report.ts
+++ b/frontend/services/entities/query_report.ts
@@ -1,12 +1,9 @@
 /* eslint-disable  @typescript-eslint/explicit-module-boundary-types */
-// import sendRequest from "services";
+import sendRequest from "services";
 import endpoints from "utilities/endpoints";
 
 import { buildQueryStringFromParams } from "utilities/url";
 
-// Mock API requests to be used in developing FE for #7766 in parallel with BE development
-import { sendRequest } from "services/mock_service/service/service";
-
 export interface ISortOption {
   key: string;
   direction: string;
@@ -42,8 +39,7 @@ export default {
 
     const queryString = buildQueryStringFromParams(queryParams);
 
-    // const endpoint = `${QUERIES}/${id}/report`;
-    const endpoint = `${QUERIES}/113/report`;
+    const endpoint = `${QUERIES}/${id}/report`;
     const path = `${endpoint}?${queryString}`;
     return sendRequest("GET", path);
   },