Skip to content

Commit 17ecb04

Browse files
John Schulzkibanamachine
andauthored
[Fleet] Filter hosted policies from menu (#97380)
## Summary * 4C & 7C from #91906 about hiding hosted agent policy from select menus * Also changed reassign agent to new policy UI from flyout to modal as requested <details><summary>Screenshots</summary> <h3>Current</h3> <img width="1090" alt="Screen Shot 2021-04-16 at 1 37 02 PM" src="https://user-images.githubusercontent.com/57655/115075124-9d9ea600-9ec8-11eb-8e88-d8f14f62613f.png"> <h3>PR</h3> <img width="1092" alt="Screen Shot 2021-04-16 at 1 43 51 PM" src="https://user-images.githubusercontent.com/57655/115075127-9d9ea600-9ec8-11eb-8c47-c3b1fbeb96eb.png"> <h3>current</h3> <img width="1112" alt="Screen Shot 2021-04-16 at 1 44 41 PM" src="https://user-images.githubusercontent.com/57655/115075129-9e373c80-9ec8-11eb-9f93-cac511c9d53d.png"> <h3>PR</h3> <img width="1106" alt="Screen Shot 2021-04-16 at 1 50 28 PM" src="https://user-images.githubusercontent.com/57655/115075130-9e373c80-9ec8-11eb-93fb-0adfa5ae81ba.png"> <h3>current</h3> <img width="1106" alt="Screen Shot 2021-04-16 at 1 35 48 PM" src="https://user-images.githubusercontent.com/57655/115075121-9d9ea600-9ec8-11eb-8605-89336371938b.png"> <h3>PR</h3> <img width="1106" alt="Screen Shot 2021-04-16 at 2 35 15 PM" src="https://user-images.githubusercontent.com/57655/115075133-9ecfd300-9ec8-11eb-9458-0b7f9cf76c10.png"> <img width="2136" alt="Screen Shot 2021-04-16 at 3 24 16 PM" src="https://user-images.githubusercontent.com/57655/115075141-a0010000-9ec8-11eb-896c-efc4be4be5ac.png"> </details> ### Checklist - [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent 1b02152 commit 17ecb04

File tree

9 files changed

+189
-187
lines changed

9 files changed

+189
-187
lines changed

x-pack/plugins/fleet/public/applications/fleet/components/package_icon.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,18 @@ import { usePackageIconType } from '../hooks';
1414

1515
export const PackageIcon: React.FunctionComponent<
1616
UsePackageIconType & Omit<EuiIconProps, 'type'>
17-
> = ({ packageName, version, icons, tryApi, ...euiIconProps }) => {
17+
> = ({ size = 's', packageName, version, icons, tryApi, ...euiIconProps }) => {
1818
const iconType = usePackageIconType({ packageName, version, icons, tryApi });
19-
return <EuiIcon size="s" type={iconType} {...euiIconProps} />;
19+
return (
20+
<EuiIcon
21+
// when a custom SVG is used the logo is rendered with <img class="euiIcon euiIcon--small">
22+
// this collides with some EuiText (+img) CSS from the EuiIcon component
23+
// which makes the button large, wide, and poorly layed out
24+
// override those styles until the bug is fixed or we find a better approach
25+
style={{ margin: 'unset', width: 'unset' }}
26+
size={size}
27+
type={iconType}
28+
{...euiIconProps}
29+
/>
30+
);
2031
};

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_select_agent_policy.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
9494
sortOrder: 'asc',
9595
full: true,
9696
});
97-
const agentPolicies = useMemo(() => agentPoliciesData?.items || [], [agentPoliciesData?.items]);
97+
const agentPolicies = useMemo(
98+
() => agentPoliciesData?.items.filter((policy) => !policy.is_managed) || [],
99+
[agentPoliciesData?.items]
100+
);
101+
98102
const agentPoliciesById = useMemo(() => {
99103
return agentPolicies.reduce((acc: { [key: string]: GetAgentPoliciesResponseItem }, policy) => {
100104
acc[policy.id] = policy;

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { useCapabilities, useKibanaVersion } from '../../../../hooks';
1414
import { ContextMenuActions } from '../../../../components';
1515
import {
1616
AgentUnenrollAgentModal,
17-
AgentReassignAgentPolicyFlyout,
17+
AgentReassignAgentPolicyModal,
1818
AgentUpgradeAgentModal,
1919
} from '../../components';
2020
import { useAgentRefresh } from '../hooks';
@@ -45,7 +45,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
4545
<>
4646
{isReassignFlyoutOpen && (
4747
<EuiPortal>
48-
<AgentReassignAgentPolicyFlyout agents={[agent]} onClose={onClose} />
48+
<AgentReassignAgentPolicyModal agents={[agent]} onClose={onClose} />
4949
</EuiPortal>
5050
)}
5151
{isUnenrollModalOpen && (

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/bulk_actions.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { FormattedMessage, FormattedNumber } from '@kbn/i18n/react';
2222
import { SO_SEARCH_LIMIT } from '../../../../constants';
2323
import type { Agent } from '../../../../types';
2424
import {
25-
AgentReassignAgentPolicyFlyout,
25+
AgentReassignAgentPolicyModal,
2626
AgentUnenrollAgentModal,
2727
AgentUpgradeAgentModal,
2828
} from '../../components';
@@ -161,7 +161,7 @@ export const AgentBulkActions: React.FunctionComponent<{
161161
<>
162162
{isReassignFlyoutOpen && (
163163
<EuiPortal>
164-
<AgentReassignAgentPolicyFlyout
164+
<AgentReassignAgentPolicyModal
165165
agents={agents}
166166
onClose={() => {
167167
setIsReassignFlyoutOpen(false);

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import { AgentPolicySummaryLine, ContextMenuActions } from '../../../components'
4141
import { AgentStatusKueryHelper, isAgentUpgradeable } from '../../../services';
4242
import { AGENT_SAVED_OBJECT_TYPE } from '../../../constants';
4343
import {
44-
AgentReassignAgentPolicyFlyout,
44+
AgentReassignAgentPolicyModal,
4545
AgentHealth,
4646
AgentUnenrollAgentModal,
4747
AgentUpgradeAgentModal,
@@ -379,7 +379,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
379379

380380
return (
381381
<EuiFlexGroup gutterSize="s" alignItems="center" style={{ minWidth: 0 }}>
382-
<AgentPolicySummaryLine policy={agentPolicy} />
382+
{agentPolicy && <AgentPolicySummaryLine policy={agentPolicy} />}
383383
{showWarning && (
384384
<EuiFlexItem grow={false}>
385385
<EuiText color="subdued" size="xs" className="eui-textNoWrap">
@@ -488,7 +488,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
488488
) : null}
489489
{agentToReassign && (
490490
<EuiPortal>
491-
<AgentReassignAgentPolicyFlyout
491+
<AgentReassignAgentPolicyModal
492492
agents={[agentToReassign]}
493493
onClose={() => {
494494
setAgentToReassign(undefined);

x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,16 @@ export const AgentPolicySelectionStep = ({
5353
setSelectedAPIKeyId?: (key: string) => void;
5454
setSelectedPolicyId?: (policyId: string) => void;
5555
}) => {
56+
const regularAgentPolicies = Array.isArray(agentPolicies)
57+
? agentPolicies.filter((policy) => policy && !policy.is_managed)
58+
: [];
5659
return {
5760
title: i18n.translate('xpack.fleet.agentEnrollment.stepChooseAgentPolicyTitle', {
5861
defaultMessage: 'Choose an agent policy',
5962
}),
6063
children: (
6164
<EnrollmentStepAgentPolicy
62-
agentPolicies={agentPolicies}
65+
agentPolicies={regularAgentPolicies}
6366
withKeySelection={setSelectedAPIKeyId ? true : false}
6467
onKeyChange={setSelectedAPIKeyId}
6568
onAgentPolicyChange={setSelectedPolicyId}

x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_reassign_policy_flyout/index.tsx

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)