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.

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

Jump to bottom

[Security Solution][Endpoint] Task/policy save modal text change, remove duplicate policy details text #73130

Merged
merged 3 commits into from
Jul 24, 2020
Merged

[Security Solution][Endpoint] Task/policy save modal text change, remove duplicate policy details text #73130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c135fc
policy save text change
parkiino Jul 23, 2020
a215592
remove duplicated description in policy details card
parkiino Jul 23, 2020
1c64999
fix jest test
parkiino Jul 23, 2020
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
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ describe('Policy Details', () => {
);
expect(warningCallout).toHaveLength(1);
expect(warningCallout.text()).toEqual(
'This action will update 5 hostsSaving these changes will apply the updates to all active endpoints assigned to this policy'
'This action will update 5 hostsSaving these changes will apply updates to all endpoints assigned to this policy'
);
});
it('should close dialog if cancel button is clicked', () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ const ConfirmUpdate = React.memo<{
>
<FormattedMessage
id="xpack.securitySolution.endpoint.policy.details.updateConfirm.warningMessage"
defaultMessage="Saving these changes will apply the updates to all active endpoints assigned to this policy"
defaultMessage="Saving these changes will apply updates to all endpoints assigned to this policy"
/>
</EuiCallOut>
<EuiSpacer size="xl" />
Expand Down
16 changes: 2 additions & 14 deletions ...lugins/security_solution/public/management/pages/policy/view/policy_forms/config_form.tsx
View file
Open in desktop
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
6 changes: 0 additions & 6 deletions ...ugins/security_solution/public/management/pages/policy/view/policy_forms/events/linux.tsx
View file
Open in desktop
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
6 changes: 0 additions & 6 deletions ...plugins/security_solution/public/management/pages/policy/view/policy_forms/events/mac.tsx
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions ...ins/security_solution/public/management/pages/policy/view/policy_forms/events/windows.tsx
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions ...ecurity_solution/public/management/pages/policy/view/policy_forms/protections/malware.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,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