Skip to content

Commit

Permalink
[Security Solution][Endpoint] Task/policy save modal text change, rem…
Browse files Browse the repository at this point in the history
…ove duplicate policy details text (elastic#73130)

[Security Solution][Endpoint] updates policy details text
# Conflicts:
#	x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
#	x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
  • Loading branch information
parkiino authored and efreeti committed Nov 16, 2020
1 parent a39d0ea commit 6091cdc
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,10 @@ export const ConfigForm: React.FC<{
*/
supportedOss: React.ReactNode;
children: React.ReactNode;
/**
* A description for the component.
*/
description: string;
/**
* The `data-test-subj` attribute to append to a certain child element.
*/
dataTestSubj: string;
/** React Node to be put on the right corner of the card */
rightCorner: React.ReactNode;
}> = React.memo(({ type, supportedOss, children, dataTestSubj, rightCorner, description }) => {
}> = React.memo(({ type, supportedOss, children, dataTestSubj, rightCorner }) => {
const typeTitle = useMemo(() => {
return (
<EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
Expand Down Expand Up @@ -85,12 +78,7 @@ export const ConfigForm: React.FC<{

return (
<PolicyDetailCard>
<EuiCard
description={description}
data-test-subj={dataTestSubj}
textAlign="left"
title={typeTitle}
>
<EuiCard description data-test-subj={dataTestSubj} textAlign="left" title={typeTitle}>
<EuiHorizontalRule margin="m" />
{children}
</EuiCard>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ export const LinuxEvents = React.memo(() => {
type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
defaultMessage: 'Event Collection',
})}
description={i18n.translate(
'xpack.securitySolution.endpoint.policy.details.eventCollectionLabel',
{
defaultMessage: 'Event Collection',
}
)}
supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.linux', {
defaultMessage: 'Linux',
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ export const MacEvents = React.memo(() => {
type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
defaultMessage: 'Event Collection',
})}
description={i18n.translate(
'xpack.securitySolution.endpoint.policy.details.eventCollectionLabel',
{
defaultMessage: 'Event Collection',
}
)}
supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.mac', {
defaultMessage: 'Mac',
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,6 @@ export const WindowsEvents = React.memo(() => {
type={i18n.translate('xpack.securitySolution.endpoint.policy.details.eventCollection', {
defaultMessage: 'Event Collection',
})}
description={i18n.translate('xpack.securitySolution.endpoint.policy.details.windowsLabel', {
defaultMessage: 'Windows',
})}
supportedOss={i18n.translate('xpack.securitySolution.endpoint.policy.details.windows', {
defaultMessage: 'Windows',
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,6 @@ export const MalwareProtections = React.memo(() => {
defaultMessage: 'Windows, Mac',
})}
dataTestSubj="malwareProtectionsForm"
description={i18n.translate('xpack.securitySolution.endpoint.policy.details.malwareLabel', {
defaultMessage: 'Malware',
})}
rightCorner={protectionSwitch}
>
{radioButtons}
Expand Down

0 comments on commit 6091cdc

Please sign in to comment.