Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Enable real API service, handle null results (#14435)

Browse source 
- 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>
This commit is contained in:
Jacob Shandling 2023-10-10 15:40:36 -07:00 committed by GitHub
parent 1cb4121842
commit 9768186048
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
View file

@ -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) {

8
frontend/services/entities/query_report.ts
View file

@ -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);
},