Skip to content

[7.x] [Security Solution] [Endpoint] Fleet summary card adjustments (#114291) #114826

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
kibanamachine merged 1 commit into from
Oct 13, 2021
Merged

[7.x] [Security Solution] [Endpoint] Fleet summary card adjustments (#114291) #114826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 22 additions & 15 deletions ...ager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,23 @@ interface ExceptionItemsSummaryProps {
export const ExceptionItemsSummary = memo<ExceptionItemsSummaryProps>(
({ stats, isSmall = false }) => {
const getItem = useCallback(
(stat: keyof GetExceptionSummaryResponse) => (
<EuiFlexItem key={stat}>
<SummaryStat
value={stats?.[stat] ?? 0}
color={stat === 'total' ? 'primary' : 'default'}
key={stat}
isSmall={isSmall}
>
{SUMMARY_LABELS[stat]}
</SummaryStat>
</EuiFlexItem>
),
(stat: keyof GetExceptionSummaryResponse) => {
if (stat !== 'total' && isSmall) {
return null;
}
return (
<EuiFlexItem key={stat}>
<SummaryStat
value={stats?.[stat] ?? 0}
color={stat === 'total' && !isSmall ? 'primary' : 'default'}
key={stat}
isSmall={isSmall}
>
{SUMMARY_LABELS[stat]}
</SummaryStat>
</EuiFlexItem>
);
},
[stats, isSmall]
);

Expand Down Expand Up @@ -100,9 +105,11 @@ const SummaryStat: FC<{ value: number; color?: EuiBadgeProps['color']; isSmall?:
gutterSize={isSmall ? 'xs' : 'l'}
isSmall={isSmall}
>
<EuiFlexItem grow={false} style={color === 'primary' ? CSS_BOLD : undefined}>
{children}
</EuiFlexItem>
{!isSmall ? (
<EuiFlexItem grow={false} style={color === 'primary' ? CSS_BOLD : undefined}>
{children}
</EuiFlexItem>
) : null}
<EuiFlexItem grow={false}>
<EuiBadge color={color}>{value}</EuiBadge>
</EuiFlexItem>
Expand Down
64 changes: 48 additions & 16 deletions ...ager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@
*/

import React, { memo, useMemo, useState, useEffect, useRef } from 'react';
import { EuiPanel, EuiText } from '@elastic/eui';
import { EuiPanel, EuiText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';

import { useKibana, useToasts } from '../../../../../../../common/lib/kibana';
import { ExceptionItemsSummary } from './exception_items_summary';
import { TrustedAppsHttpService } from '../../../../../trusted_apps/service';
import { StyledEuiFlexGridGroup, StyledEuiFlexGridItem } from './styled_components';
import {
StyledEuiFlexGridGroup,
StyledEuiFlexGridItem,
StyledEuiFlexItem,
} from './styled_components';

interface FleetTrustedAppsCardProps {
customLink: React.ReactNode;
Expand All @@ -38,7 +42,7 @@ export const FleetTrustedAppsCard = memo<FleetTrustedAppsCardProps>(
try {
const response = await trustedAppsApi.getTrustedAppsSummary({
kuery: policyId
? `exception-list-agnostic.attributes.tags:"policy:${policyId}" OR exception-list-agnostic.attributes.tags:"policy:all"`
? `(exception-list-agnostic.attributes.tags:"policy:${policyId}" OR exception-list-agnostic.attributes.tags:"policy:all")`
: undefined,
});
if (isMounted) {
Expand Down Expand Up @@ -72,21 +76,49 @@ export const FleetTrustedAppsCard = memo<FleetTrustedAppsCardProps>(
/>
);

const cardGrid = useMemo(() => {
if (cardSize === 'm') {
return (
<EuiFlexGroup
alignItems="baseline"
justifyContent="flexStart"
gutterSize="s"
direction="row"
responsive={false}
>
<EuiFlexItem grow={false}>
<EuiText>
<h5>{getTitleMessage()}</h5>
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<ExceptionItemsSummary stats={stats} isSmall={true} />
</EuiFlexItem>
<StyledEuiFlexItem grow={1}>{customLink}</StyledEuiFlexItem>
</EuiFlexGroup>
);
} else {
return (
<StyledEuiFlexGridGroup alignItems="baseline" justifyContent="center">
<StyledEuiFlexGridItem gridarea="title" alignitems="flex-start">
<EuiText>
<h4>{getTitleMessage()}</h4>
</EuiText>
</StyledEuiFlexGridItem>
<StyledEuiFlexGridItem gridarea="summary" alignitems={'center'}>
<ExceptionItemsSummary stats={stats} isSmall={false} />
</StyledEuiFlexGridItem>
<StyledEuiFlexGridItem gridarea="link" alignitems="flex-end">
{customLink}
</StyledEuiFlexGridItem>
</StyledEuiFlexGridGroup>
);
}
}, [cardSize, customLink, stats]);

return (
<EuiPanel hasShadow={false} paddingSize="l" hasBorder data-test-subj="fleetTrustedAppsCard">
<StyledEuiFlexGridGroup alignItems="baseline" justifyContent="center" cardSize={cardSize}>
<StyledEuiFlexGridItem gridarea="title" alignitems="flex-start">
<EuiText>
{cardSize === 'l' ? <h4>{getTitleMessage()}</h4> : <h5>{getTitleMessage()}</h5>}
</EuiText>
</StyledEuiFlexGridItem>
<StyledEuiFlexGridItem gridarea="summary">
<ExceptionItemsSummary stats={stats} isSmall={cardSize === 'm'} />
</StyledEuiFlexGridItem>
<StyledEuiFlexGridItem gridarea="link" alignitems="flex-end">
{customLink}
</StyledEuiFlexGridItem>
</StyledEuiFlexGridGroup>
{cardGrid}
</EuiPanel>
);
}
Expand Down
11 changes: 6 additions & 5 deletions ...st_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
import styled from 'styled-components';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';

export const StyledEuiFlexGridGroup = styled(EuiFlexGroup)<{
cardSize?: 'm' | 'l';
}>`
export const StyledEuiFlexGridGroup = styled(EuiFlexGroup)`
display: grid;
grid-template-columns: ${({ cardSize = 'l' }) =>
cardSize === 'l' ? '25% 45% 30%' : '30% 35% 35%'};
grid-template-columns: 25% 45% 30%;
grid-template-areas: 'title summary link';
`;

Expand All @@ -25,3 +22,7 @@ export const StyledEuiFlexGridItem = styled(EuiFlexItem)<{
margin: 0px;
padding: 12px;
`;

export const StyledEuiFlexItem = styled(EuiFlexItem)`
flex-direction: row-reverse;
`;