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

Fix teams dropdown default value for hosts page filtered by policy; fix policy button text (#2439)

Browse source
This commit is contained in:
gillespi314 2021-10-07 14:30:14 -05:00 committed by GitHub
parent 9b19e3ace6
commit 84a3c6e134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/interfaces/policy.ts
View file

@ -2,6 +2,7 @@ export interface IPolicy {
id: number;
query_id: number;
query_name: string;
team_id: number;
passing_host_count: number;
failing_host_count: number;
last_run_time?: string;

21
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
View file

@ -83,7 +83,7 @@ interface IManageHostsProps {
interface ILabelsResponse {
labels: ILabel[];
}
interface IPolicyResponse {
interface IPolicyAPIResponse {
policy: IPolicy;
}
@ -176,7 +176,7 @@ const ManageHostsPage = ({
const [isHostsLoading, setIsHostsLoading] = useState<boolean>(false);
const [hasHostErrors, setHasHostErrors] = useState<boolean>(false);
const [sortBy, setSortBy] = useState<ISortOption[]>(initialSortBy);
const [policyName, setPolicyName] = useState<string>();
const [policy, setPolicy] = useState<IPolicy>();
const [tableQueryData, setTableQueryData] = useState<ITableQueryProps>();
// ======== end states
@ -233,18 +233,19 @@ const ManageHostsPage = ({
}
);
useQuery<IPolicyResponse, Error>(
useQuery<IPolicyAPIResponse, Error>(
["policy"],
() => {
const request = currentTeam
? teamPoliciesAPI.load(currentTeam.id, policyId)
const teamId = parseInt(queryParams?.team_id, 10) || 0;
const request = teamId
? teamPoliciesAPI.load(teamId, policyId)
: globalPoliciesAPI.load(policyId);
return request;
},
{
enabled: !!policyId,
onSuccess: ({ policy }) => {
setPolicyName(policy.query_name);
onSuccess: ({ policy: policyAPIResponse }) => {
setPolicy(policyAPIResponse);
},
}
);
@ -771,7 +772,7 @@ const ManageHostsPage = ({
);
const selectedTeamId = getValidatedTeamId(
teams || [],
currentTeam?.id as number,
(policyId && policy?.team_id) || (currentTeam?.id as number),
currentUser,
isOnGlobalTeam as boolean
);
@ -796,7 +797,7 @@ const ManageHostsPage = ({
const buttonText = (
<>
<img src={PolicyIcon} alt="Policy" />
{policyName}
{policy?.query_name}
<img src={CloseIcon} alt="Remove policy filter" />
</>
);
@ -810,7 +811,7 @@ const ManageHostsPage = ({
className={`${baseClass}__clear-policies-filter`}
onClick={handleClearPoliciesFilter}
variant={"small-text-icon"}
title={policyName}
title={policy?.query_name}
>
{buttonText}
</Button>