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

[Security Solution][Endpoint][Admin][Policy] Register as AV os restrictions tooltip note #93306

Merged
merged 10 commits into from
Mar 4, 2021
Merged

[Security Solution][Endpoint][Admin][Policy] Register as AV os restrictions tooltip note #93306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aaf521d
add osRestriction prop
parkiino Feb 23, 2021
4afdc38
tooltip text updated
parkiino Feb 25, 2021
32ee767
Merge remote-tracking branch 'upstream/master' into task/av-note
parkiino Mar 1, 2021
b3692f5
Merge remote-tracking branch 'upstream/master' into task/av-note
parkiino Mar 2, 2021
a945805
prettify
parkiino Mar 2, 2021
b6b39cc
fix jest test, remove osrestriction to component
parkiino Mar 4, 2021
8ae45d0
more resuable
parkiino Mar 4, 2021
656d8a2
Merge branch 'master' into task/av-note
kibanamachine Mar 4, 2021
754fe30
subdued icon
parkiino Mar 4, 2021
36a5272
Merge branch 'task/av-note' of github.com:parkiino/kibana into task/a…
parkiino Mar 4, 2021
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
9 changes: 8 additions & 1 deletion ...tion/public/management/pages/policy/view/components/antivirus_registration_form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,14 @@ export const AntivirusRegistrationForm = memo(() => {
);

return (
<ConfigForm type={TRANSLATIONS.title} supportedOss={[OperatingSystem.WINDOWS]}>
<ConfigForm
type={TRANSLATIONS.title}
supportedOss={[OperatingSystem.WINDOWS]}
osRestriction={i18n.translate(
'xpack.securitySolution.endpoint.policy.details.av.windowsServerNotSupported',
{ defaultMessage: 'Windows Server operating systems unsupported' }
)}
>
<EuiText size="s">{TRANSLATIONS.description}</EuiText>
<EuiSpacer size="s" />
<EuiSwitch
Expand Down
33 changes: 29 additions & 4 deletions ...ns/security_solution/public/management/pages/policy/view/components/config_form/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import React, { FC, ReactNode, memo } from 'react';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
import {
EuiFlexGroup,
EuiFlexItem,
Expand All @@ -15,6 +16,8 @@ import {
EuiText,
EuiShowFor,
EuiPanel,
EuiTextColor,
EuiIconTip,
} from '@elastic/eui';

import { OperatingSystem } from '../../../../../../../common/endpoint/types';
Expand All @@ -38,6 +41,7 @@ interface ConfigFormProps {
* Types of supported operating systems.
*/
supportedOss: OperatingSystem[];
osRestriction?: ReactNode;
dataTestSubj?: string;
/** React Node to be put on the right corner of the card */
rightCorner?: ReactNode;
Expand All @@ -52,19 +56,40 @@ export const ConfigFormHeading: FC = memo(({ children }) => (
ConfigFormHeading.displayName = 'ConfigFormHeading';

export const ConfigForm: FC<ConfigFormProps> = memo(
({ type, supportedOss, dataTestSubj, rightCorner, children }) => (
({ type, supportedOss, osRestriction, dataTestSubj, rightCorner, children }) => (
<EuiPanel data-test-subj={dataTestSubj}>
<EuiFlexGroup direction="row" gutterSize="none" alignItems="center">
<EuiFlexItem>
<EuiFlexItem grow={2}>
<ConfigFormHeading>{TITLES.type}</ConfigFormHeading>
<EuiText size="m">{type}</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={2}>
<ConfigFormHeading>{TITLES.os}</ConfigFormHeading>
<EuiText>{supportedOss.map((os) => OS_TITLES[os]).join(', ')}</EuiText>
<EuiFlexGroup direction="row" gutterSize="s" alignItems="center">
<EuiFlexItem grow={false}>
<EuiText>{supportedOss.map((os) => OS_TITLES[os]).join(', ')} </EuiText>
</EuiFlexItem>
{osRestriction && (
<EuiFlexItem grow={false}>
<EuiFlexGroup direction="row" gutterSize="xs">
<EuiFlexItem grow={false}>
<EuiTextColor color="subdued">
<FormattedMessage
id="xpack.securitySolution.endpoint.policy.details.antivirusRegistration.osRestriction"
defaultMessage="Restrictions"
/>
</EuiTextColor>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiIconTip type="iInCircle" color="subdued" content={osRestriction} />
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
)}
</EuiFlexGroup>
</EuiFlexItem>
<EuiShowFor sizes={['m', 'l', 'xl']}>
<EuiFlexItem grow={2}>
<EuiFlexItem grow={3}>
<EuiFlexGroup direction="row" gutterSize="none" justifyContent="flexEnd">
<EuiFlexItem grow={false}>{rightCorner}</EuiFlexItem>
</EuiFlexGroup>
Expand Down
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 @@ -326,7 +326,7 @@ describe('Policy Details', () => {
const userNotificationCustomMessageTextArea = policyView.find(
'EuiTextArea[data-test-subj="malwareUserNotificationCustomMessage"]'
);
const tooltip = policyView.find('EuiIconTip');
const tooltip = policyView.find('EuiIconTip[data-test-subj="malwareTooltip"]');
expect(userNotificationCheckbox).toHaveLength(0);
expect(userNotificationCustomMessageTextArea).toHaveLength(0);
expect(tooltip).toHaveLength(0);
Expand Down
4 changes: 2 additions & 2 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 @@ -211,14 +211,14 @@ export const MalwareProtections = React.memo(() => {
</ConfigFormHeading>
<EuiSpacer size="xs" />
<RadioFlexGroup>
<EuiFlexItem className="no-right-margin-radio" grow={1}>
<EuiFlexItem className="no-right-margin-radio" grow={2}>
<ProtectionRadio
protectionMode={radios[0].id}
key={radios[0].protection + radios[0].id}
label={radios[0].label}
/>
</EuiFlexItem>
<EuiFlexItem className="no-horizontal-margin-radio" grow={4}>
<EuiFlexItem className="no-horizontal-margin-radio" grow={5}>
<ProtectionRadio
protectionMode={radios[1].id}
key={radios[1].protection + radios[1].id}
Expand Down
4 changes: 2 additions & 2 deletions ...rity_solution/public/management/pages/policy/view/policy_forms/protections/ransomware.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ export const Ransomware = React.memo(() => {
</ConfigFormHeading>
<EuiSpacer size="xs" />
<RadioFlexGroup>
<EuiFlexItem className="no-right-margin-radio" grow={1}>
<EuiFlexItem className="no-right-margin-radio" grow={2}>
<ProtectionRadio
protectionMode={radios[0].id}
key={radios[0].protection + radios[0].id}
label={radios[0].label}
/>
</EuiFlexItem>
<EuiFlexItem className="no-horizontal-margin-radio" grow={4}>
<EuiFlexItem className="no-horizontal-margin-radio" grow={5}>
<ProtectionRadio
protectionMode={radios[1].id}
key={radios[1].protection + radios[1].id}
Expand Down