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
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
)}
<ContextMenuActions
button={{
props: { iconType: 'arrowDown', iconSide: 'right' },
props: { iconType: 'arrowDown', iconSide: 'right', color: 'primary', fill: true },
children: (
<FormattedMessage
id="xpack.fleet.agentDetails.actionsButton"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import React, { memo, useMemo } from 'react';
import {
EuiFlexGroup,
EuiFlexItem,
EuiLink,
EuiAccordion,
EuiTitle,
EuiPanel,
EuiButtonIcon,
EuiBasicTable,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import styled from 'styled-components';
import { Agent, AgentPolicy, PackagePolicy, PackagePolicyInput } from '../../../../../types';
import { useLink } from '../../../../../hooks';
import { PackageIcon } from '../../../../../components';
import { displayInputType, getLogsQueryByInputType } from './input_type_utils';

const StyledCollapsablePanel = styled(EuiPanel).attrs((props) => ({
paddingSize: 'none',
}))`
.euiAccordion__triggerWrapper {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do this without targeting EUI internal classes? If the solution isn't obvious, mind opening a ticket/discussion with the EUI team for a suggestion or fix?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think it's possible to do it without custom css here, I know @hbharding implemented it the same way for the overview panel,

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elastic/eui-design Do you think there is anything built in that I can use to build this component? I currently use an EuiAccordion in a EuiPanel with some custom css

Screen Shot 2020-11-30 at 1 26 08 PM

Screen Shot 2020-11-30 at 1 26 03 PM

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @nchaulet , It looks like what you're actually building is a table within the contents of the accordion body. I would explicitly use the EuiBasicTable component so that all the right associations are made between cells. Then you'll just need to remove the padding from the accordion but pass a custom padding and class to the button portion of the accordion. Here's an example CodeSandox https://codesandbox.io/s/thirsty-river-hmfd2?file=/index.js

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot I just updated to use a buttonClass in EuiAccordion works perfectly :)

border-bottom: 1px solid ${(props) => props.theme.eui.euiColorLightShade};
padding: ${(props) => props.theme.eui.paddingSizes.m}
${(props) => props.theme.eui.paddingSizes.m};
}
.euiAccordion__childWrapper {
overflow: visible;
}
`;

const CollapsablePanel: React.FC<{ title: React.ReactNode }> = ({ title, children }) => {
return (
<StyledCollapsablePanel paddingSize="none">
<EuiAccordion id="accordion-1" arrowDisplay="right" buttonContent={title}>
{children}
</EuiAccordion>
</StyledCollapsablePanel>
);
};

export const AgentDetailsIntegration: React.FunctionComponent<{
agent: Agent;
agentPolicy: AgentPolicy;
packagePolicy: PackagePolicy;
}> = memo(({ agent, agentPolicy, packagePolicy }) => {
const { getHref } = useLink();

const inputs = useMemo(() => {
return packagePolicy.inputs.filter((input) => input.enabled);
}, [packagePolicy.inputs]);

const columns = [
{
field: 'type',
width: '100%',
name: i18n.translate('xpack.fleet.agentDetailsIntegrations.inputTypeLabel', {
defaultMessage: 'Input',
}),
render: (inputType: string) => {
return displayInputType(inputType);
},
},
{
name: i18n.translate('xpack.fleet.agentDetailsIntegrations.actionsLabel', {
defaultMessage: 'Actions',
}),
field: 'type',
width: 'auto',
render: (inputType: string) => {
return (
<EuiButtonIcon
href={`${getHref('fleet_agent_details', {
agentId: agent.id,
tabId: 'logs',
})}?${getLogsQueryByInputType(inputType)}`}
nchaulet marked this conversation as resolved.
Show resolved Hide resolved
iconType="editorAlignLeft"
title={i18n.translate('xpack.fleet.agentDetailsIntegrations.viewLogsButton', {
defaultMessage: 'View logs',
})}
/>
);
},
},
];

return (
<CollapsablePanel
title={
<EuiTitle size="xs">
<h3>
<EuiFlexGroup gutterSize="s">
<EuiFlexItem grow={false}>
{packagePolicy.package ? (
<PackageIcon
packageName={packagePolicy.package.name}
version={packagePolicy.package.version}
size="l"
tryApi={true}
/>
) : (
<PackageIcon size="l" packageName="default" version="0" />
)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiLink
href={getHref('edit_integration', {
policyId: agentPolicy.id,
packagePolicyId: packagePolicy.id,
})}
>
{packagePolicy.name}
</EuiLink>
</EuiFlexItem>
</EuiFlexGroup>
</h3>
</EuiTitle>
}
>
<EuiBasicTable<PackagePolicyInput> tableLayout="auto" items={inputs} columns={columns} />
</CollapsablePanel>
);
});

export const AgentDetailsIntegrationsSection: React.FunctionComponent<{
agent: Agent;
agentPolicy?: AgentPolicy;
}> = memo(({ agent, agentPolicy }) => {
if (!agentPolicy || !agentPolicy.package_policies) {
return null;
}

return (
<EuiFlexGroup direction="column">
{(agentPolicy.package_policies as PackagePolicy[]).map((packagePolicy) => {
nchaulet marked this conversation as resolved.
Show resolved Hide resolved
return (
<EuiFlexItem grow={false} key={packagePolicy.id}>
<AgentDetailsIntegration
agent={agent}
agentPolicy={agentPolicy}
packagePolicy={packagePolicy}
/>
</EuiFlexItem>
);
})}
</EuiFlexGroup>
);
});
Loading