From 102f2af372c5c72dfc4ca589174beeeedfda6f18 Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:16:45 -0400 Subject: [PATCH] Fleet UI: [small fixes] Table horizontally scrolls, "Get help" is on one line (#14414) --- frontend/components/InfoBanner/_styles.scss | 2 ++ .../queries/details/QueryDetailsPage/QueryDetailsPage.tsx | 7 ++++--- .../queries/details/components/QueryReport/_styles.scss | 4 ++++ frontend/services/mock_service/mocks/responses.ts | 3 +++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/frontend/components/InfoBanner/_styles.scss b/frontend/components/InfoBanner/_styles.scss index 81635a1062..a085cdbfc3 100644 --- a/frontend/components/InfoBanner/_styles.scss +++ b/frontend/components/InfoBanner/_styles.scss @@ -54,6 +54,8 @@ color: $core-fleet-black; text-align: right; gap: $pad-small; + min-width: max-content; + margin-left: $pad-small; button { margin-left: $pad-small; diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx index f739127386..7006042add 100644 --- a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx +++ b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx @@ -248,12 +248,13 @@ const QueryDetailsPage = ({ ); const renderReport = () => { - const disabledCachingGlobally = true; // TODO: Update accordingly to config?.server_settings.query_reports_disabled - const discardDataEnabled = true; // TODO: Update accordingly to storedQuery?.discard_data + const disabledCachingGlobally = + config?.server_settings.query_reports_disabled || true; + const discardDataEnabled = storedQuery?.discard_data || true; const loggingSnapshot = storedQuery?.logging === "snapshot"; const disabledCaching = disabledCachingGlobally || discardDataEnabled || !loggingSnapshot; - const emptyCache = (queryReport?.results?.length ?? 0) === 0; // TODO: Update with API response + const emptyCache = (queryReport?.results?.length ?? 0) === 0; // Loading state if (isLoading) { diff --git a/frontend/pages/queries/details/components/QueryReport/_styles.scss b/frontend/pages/queries/details/components/QueryReport/_styles.scss index ecfcde77c8..1d60937eeb 100644 --- a/frontend/pages/queries/details/components/QueryReport/_styles.scss +++ b/frontend/pages/queries/details/components/QueryReport/_styles.scss @@ -9,6 +9,10 @@ margin-bottom: 44px; // Fills space where filter is removed } } + + .data-table__wrapper { + overflow-x: scroll; + } } &__results-cta { diff --git a/frontend/services/mock_service/mocks/responses.ts b/frontend/services/mock_service/mocks/responses.ts index 2a2bf579c3..6533487f5b 100644 --- a/frontend/services/mock_service/mocks/responses.ts +++ b/frontend/services/mock_service/mocks/responses.ts @@ -924,6 +924,9 @@ const queryReport = { columns: { model: "Display Audio", vendor: "Apple Inc.", + version: "5.11", + vender_id: "05ac", + usb_address: "6", }, }, {