Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 00:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 106

[unreleased bug 19090] Fleet UI: Fix where platform causes incorrect count (#19787)

Browse source
This commit is contained in:
RachelElysia 2024-06-17 11:36:56 -04:00 committed by GitHub
parent cc96b3372a
commit 11a1c58094
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
View file

@ -14,7 +14,7 @@ import { QueryContext } from "context/query";
import { TableContext } from "context/table";
import { NotificationContext } from "context/notification";
import { getPerformanceImpactDescription } from "utilities/helpers";
import { SupportedPlatform } from "interfaces/platform";
import { SupportedPlatform, SelectedPlatform } from "interfaces/platform";
import {
IEnhancedQuery,
IQueryKeyQueriesLoadAll,
@ -43,7 +43,7 @@ interface IManageQueriesPageProps {
location: {
pathname: string;
query: {
platform?: SupportedPlatform;
platform?: SelectedPlatform;
page?: string;
query?: string;
order_key?: string;

14
frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx
View file

@ -10,7 +10,7 @@ import { InjectedRouter } from "react-router";
import { AppContext } from "context/app";
import { IEmptyTableProps } from "interfaces/empty_table";
import { SupportedPlatform } from "interfaces/platform";
import { SelectedPlatform } from "interfaces/platform";
import { IEnhancedQuery } from "interfaces/schedulable_query";
import { ITableQueryData } from "components/TableContainer/TableContainer";
import { IActionButtonProps } from "components/TableContainer/DataTable/ActionButton/ActionButton";
@ -38,7 +38,7 @@ export interface IQueriesTableProps {
isAnyTeamObserverPlus: boolean;
router?: InjectedRouter;
queryParams?: {
platform?: SupportedPlatform;
platform?: SelectedPlatform;
page?: string;
query?: string;
order_key?: string;
@ -118,20 +118,20 @@ const QueriesTable = ({
.toLowerCase()
.includes(queryParams?.query.toLowerCase())
: true;
const compatiblePlatforms =
checkPlatformCompatibility(query.query).platforms || [];
const filterCompatiblePlatform = queryParams?.platform
? compatiblePlatforms.includes(queryParams?.platform)
: true;
const filterCompatiblePlatform =
queryParams?.platform && queryParams?.platform !== "all"
? compatiblePlatforms.includes(queryParams?.platform)
: true;
return filterSearchQuery && filterCompatiblePlatform;
}) || []
);
}
setIsQueriesStateLoading(false);
}, [queriesList, queryParams?.query]);
}, [queriesList, queryParams]);
// Functions to avoid race conditions
const initialSearchQuery = (() => queryParams?.query ?? "")();