Skip to content

[Fleet] fix UI bug displaying default agent binary source #214360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliaElastic merged 3 commits into from
Mar 13, 2025
Merged

[Fleet] fix UI bug displaying default agent binary source #214360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9bf8a5
fix UI bug displaying default agent binary source
juliaElastic Mar 13, 2025
5bc7f40
address review comments
juliaElastic Mar 13, 2025
3011c04
fix test
juliaElastic Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ations/fleet/sections/agent_policy/components/agent_policy_advanced_fields/hooks.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,11 @@ describe('useFleetServerHostsOptions', () => {
"inputDisplay": "Default (currently Default)",
"value": "@@##DEFAULT_SELECT##@@",
},
Object {
"disabled": false,
"inputDisplay": "Default",
"value": "default-host",
},
Object {
"disabled": true,
"inputDisplay": "Internal",
Expand Down
34 changes: 15 additions & 19 deletions ...pplications/fleet/sections/agent_policy/components/agent_policy_advanced_fields/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export function useOutputOptions(agentPolicy: Partial<NewAgentPolicy | AgentPoli
);
}

export function useDownloadSourcesOptions(agentPolicy: Partial<NewAgentPolicy | AgentPolicy>) {
export function useDownloadSourcesOptions() {
const downloadSourcesRequest = useGetDownloadSources();

const dataDownloadSourceOptions = useMemo(() => {
Expand All @@ -169,14 +169,12 @@ export function useDownloadSourcesOptions(agentPolicy: Partial<NewAgentPolicy |

return [
getDefaultDownloadSource(defaultDownloadSourceName),
...downloadSourcesRequest.data.items
.filter((item) => !item.is_default)
.map((item) => {
return {
value: item.id,
inputDisplay: item.name,
};
}),
...downloadSourcesRequest.data.items.map((item) => {
return {
value: item.id,
inputDisplay: item.name,
};
}),
];
}, [downloadSourcesRequest]);

Expand Down Expand Up @@ -222,17 +220,15 @@ export function useFleetServerHostsOptions(agentPolicy: Partial<NewAgentPolicy |

return [
getDefaultFleetServerHosts(defaultFleetServerHostsName),
...fleetServerHostsRequest.data.items
.filter((item) => !item.is_default)
.map((item) => {
const isInternalFleetServerHost = !!item.is_internal;
...fleetServerHostsRequest.data.items.map((item) => {
const isInternalFleetServerHost = !!item.is_internal;

return {
value: item.id,
inputDisplay: item.name,
disabled: isInternalFleetServerHost,
};
}),
return {
value: item.id,
inputDisplay: item.name,
disabled: isInternalFleetServerHost,
};
}),
];
}, [fleetServerHostsRequest]);

Expand Down
2 changes: 1 addition & 1 deletion ...pplications/fleet/sections/agent_policy/components/agent_policy_advanced_fields/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const AgentPolicyAdvancedOptionsContent: React.FunctionComponent<Props> =
maxAgentPoliciesWithInactivityTimeout !== undefined &&
totalAgentPoliciesWithInactivityTimeout > (maxAgentPoliciesWithInactivityTimeout ?? 0);
const { dataDownloadSourceOptions, isLoading: isLoadingDownloadSources } =
useDownloadSourcesOptions(agentPolicy);
useDownloadSourcesOptions();

const { fleetServerHostsOptions, isLoading: isLoadingFleetServerHostsOption } =
useFleetServerHostsOptions(agentPolicy);
Expand Down
Loading