Skip to content
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.

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

[Fleet] Update agent details page #84434

Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix after review
nchaulet committed Nov 30, 2020
commit 0271964ec11b4a1f9e7968cbfe5398e46be0cc59
Original file line number Diff line number Diff line change
@@ -59,9 +59,7 @@ export const AgentDetailsOverviewSection: React.FunctionComponent<{
defaultMessage: 'Agent version',
}),
description:
typeof agent.local_metadata.elastic === 'object' &&
typeof agent.local_metadata.elastic.agent === 'object' &&
typeof agent.local_metadata.elastic.agent.version === 'string' ? (
typeof agent.local_metadata?.elastic?.agent?.version === 'string' ? (
<EuiFlexGroup gutterSize="s" alignItems="center" style={{ minWidth: 0 }}>
<EuiFlexItem grow={false} className="eui-textNoWrap">
{agent.local_metadata.elastic.agent.version}
@@ -102,8 +100,7 @@ export const AgentDetailsOverviewSection: React.FunctionComponent<{
defaultMessage: 'Host name',
}),
description:
typeof agent.local_metadata.host === 'object' &&
typeof agent.local_metadata.host.hostname === 'string'
typeof agent.local_metadata?.host?.hostname === 'string'
? agent.local_metadata.host.hostname
: '-',
},
@@ -112,9 +109,7 @@ export const AgentDetailsOverviewSection: React.FunctionComponent<{
defaultMessage: 'Logging level',
}),
description:
typeof agent.local_metadata.elastic === 'object' &&
typeof agent.local_metadata.elastic.agent === 'object' &&
typeof agent.local_metadata.elastic.agent.log_level === 'string'
typeof agent.local_metadata?.elastic?.agent?.log_level === 'string'
? agent.local_metadata.elastic.agent.log_level
: '-',
},
@@ -123,9 +118,7 @@ export const AgentDetailsOverviewSection: React.FunctionComponent<{
defaultMessage: 'Agent release',
}),
description:
typeof agent.local_metadata.elastic === 'object' &&
typeof agent.local_metadata.elastic.agent === 'object' &&
typeof agent.local_metadata.elastic.agent.snapshot === 'boolean'
typeof agent.local_metadata?.elastic?.agent?.snapshot === 'boolean'
? agent.local_metadata.elastic.agent.snapshot === true
? 'snapshot'
: 'stable'
@@ -136,8 +129,7 @@ export const AgentDetailsOverviewSection: React.FunctionComponent<{
defaultMessage: 'Platform',
}),
description:
typeof agent.local_metadata.os === 'object' &&
typeof agent.local_metadata.os.platform === 'string'
typeof agent.local_metadata?.os?.platform === 'string'
? agent.local_metadata.os.platform
: '-',
},
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@
*/
export { AgentLogs } from './agent_logs';
export { AgentDetailsActionMenu } from './actions_menu';
export { AgentDetailsContent } from './agent_details/';
export { AgentDetailsContent } from './agent_details';
Original file line number Diff line number Diff line change
@@ -38,12 +38,6 @@ import { AgentLogs, AgentDetailsActionMenu, AgentDetailsContent } from './compon
import { useIntraAppState } from '../../../hooks/use_intra_app_state';
import { isAgentUpgradeable } from '../../../services';

const Divider = styled.div`
width: 0;
height: 100%;
border-left: ${(props) => props.theme.eui.euiBorderThin};
`;

export const AgentDetailsPage: React.FunctionComponent = () => {
const {
params: { agentId, tabId = '' },
@@ -141,7 +135,6 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
'-'
),
},
{ isDivider: true },
{
label: i18n.translate('xpack.fleet.agentDetails.policyLabel', {
defaultMessage: 'Policy',
@@ -159,7 +152,6 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
agentData.item.policy_id || '-'
),
},
{ isDivider: true },
{
label: i18n.translate('xpack.fleet.agentDetails.agentVersionLabel', {
defaultMessage: 'Agent version',
@@ -198,7 +190,6 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
'-'
),
},
{ isDivider: true },
{
content: (
<AgentDetailsActionMenu
@@ -212,22 +203,18 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
/>
),
},
]
.filter((item) => item.isDivider !== true)
.map((item, index) => (
<EuiFlexItem grow={false} key={index}>
{item.isDivider ?? false ? (
<Divider />
) : item.label ? (
<EuiDescriptionList compressed>
<EuiDescriptionListTitle>{item.label}</EuiDescriptionListTitle>
<EuiDescriptionListDescription>{item.content}</EuiDescriptionListDescription>
</EuiDescriptionList>
) : (
item.content
)}
</EuiFlexItem>
))}
].map((item, index) => (
<EuiFlexItem grow={false} key={index}>
{item.label ? (
<EuiDescriptionList compressed>
<EuiDescriptionListTitle>{item.label}</EuiDescriptionListTitle>
<EuiDescriptionListDescription>{item.content}</EuiDescriptionListDescription>
</EuiDescriptionList>
) : (
item.content
)}
</EuiFlexItem>
))}
</EuiFlexGroup>
) : undefined,
/* eslint-disable-next-line react-hooks/exhaustive-deps */