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 Solutions] Add tooltips #73436

Merged
merged 7 commits into from
Jul 29, 2020
Merged

[Security Solutions] Add tooltips #73436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d644d0
Add tooltips
cnasikas Jul 28, 2020
62983f1
Hide tooltip when actions are active
cnasikas Jul 28, 2020
b03576e
Merge branch 'master' into add_tooltips
elasticmachine Jul 28, 2020
3b8d61a
Merge branch 'master' into add_tooltips
elasticmachine Jul 28, 2020
80e9514
Merge branch 'master' into add_tooltips
elasticmachine Jul 28, 2020
558b69c
Merge branch 'master' into add_tooltips
elasticmachine Jul 29, 2020
6fd6be3
Merge branch 'master' into add_tooltips
elasticmachine Jul 29, 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
20 changes: 11 additions & 9 deletions x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
import React, { useCallback, useRef, useState } from 'react';
import { useHistory } from 'react-router-dom';

Expand Down Expand Up @@ -204,14 +204,16 @@ const RulesPageComponent: React.FC = () => {
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>
<EuiButton
data-test-subj="open-value-lists-modal-button"
iconType="importAction"
isDisabled={userHasNoPermissions(canUserCRUD) || loading}
onClick={showValueListsModal}
>
{i18n.UPLOAD_VALUE_LISTS}
</EuiButton>
<EuiToolTip position="top" content={i18n.UPLOAD_VALUE_LISTS_TOOLTIP}>
<EuiButton
data-test-subj="open-value-lists-modal-button"
iconType="importAction"
isDisabled={userHasNoPermissions(canUserCRUD) || loading}
onClick={showValueListsModal}
>
{i18n.UPLOAD_VALUE_LISTS}
</EuiButton>
</EuiToolTip>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
Expand Down
8 changes: 8 additions & 0 deletions .../plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ export const UPLOAD_VALUE_LISTS = i18n.translate(
}
);

export const UPLOAD_VALUE_LISTS_TOOLTIP = i18n.translate(
'xpack.securitySolution.lists.detectionEngine.rules.uploadValueListsButtonTooltip',
{
defaultMessage:
'Use value lists to create an exception when a field value matches a value found in a list',
}
);

export const ADD_NEW_RULE = i18n.translate(
'xpack.securitySolution.detectionEngine.rules.addNewRuleTitle',
{
Expand Down
50 changes: 34 additions & 16 deletions x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
EuiOverlayMask,
EuiToolTip,
} from '@elastic/eui';
import React, { useCallback } from 'react';
import React, { useCallback, useMemo } from 'react';
import uuid from 'uuid';
import styled from 'styled-components';
import { useDispatch, useSelector } from 'react-redux';
Expand Down Expand Up @@ -192,18 +192,28 @@ export const NewCase = React.memo<NewCaseProps>(
timelineTitle,
]);

return (
<EuiButtonEmpty
data-test-subj="attach-timeline-case"
color={compact ? undefined : 'text'}
iconSide="left"
iconType="paperClip"
disabled={timelineStatus === TimelineStatus.draft}
onClick={handleClick}
size={compact ? 'xs' : undefined}
>
{buttonText}
</EuiButtonEmpty>
const button = useMemo(
() => (
<EuiButtonEmpty
data-test-subj="attach-timeline-case"
color={compact ? undefined : 'text'}
iconSide="left"
iconType="paperClip"
disabled={timelineStatus === TimelineStatus.draft}
onClick={handleClick}
size={compact ? 'xs' : undefined}
>
{buttonText}
</EuiButtonEmpty>
),
[compact, timelineStatus, handleClick, buttonText]
);
return timelineStatus === TimelineStatus.draft ? (
<EuiToolTip position="left" content={i18n.ATTACH_TIMELINE_TO_CASE_TOOLTIP}>
{button}
</EuiToolTip>
) : (
button
);
}
);
Expand All @@ -225,8 +235,8 @@ export const ExistingCase = React.memo<ExistingCaseProps>(
? i18n.ATTACH_TO_EXISTING_CASE
: i18n.ATTACH_TIMELINE_TO_EXISTING_CASE;

return (
<>
const button = useMemo(
() => (
<EuiButtonEmpty
data-test-subj="attach-timeline-existing-case"
color={compact ? undefined : 'text'}
Expand All @@ -238,7 +248,15 @@ export const ExistingCase = React.memo<ExistingCaseProps>(
>
{buttonText}
</EuiButtonEmpty>
</>
),
[buttonText, handleClick, timelineStatus, compact]
);
return timelineStatus === TimelineStatus.draft ? (
<EuiToolTip position="left" content={i18n.ATTACH_TIMELINE_TO_CASE_TOOLTIP}>
{button}
</EuiToolTip>
) : (
button
);
}
);
Expand Down
7 changes: 7 additions & 0 deletions ...plugins/security_solution/public/timelines/components/timeline/properties/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ export const ATTACH_TO_EXISTING_CASE = i18n.translate(
}
);

export const ATTACH_TIMELINE_TO_CASE_TOOLTIP = i18n.translate(
'xpack.securitySolution.timeline.properties.attachTimelineToCaseTooltip',
{
defaultMessage: 'Please provide a title for your timeline in order to attach it to a case',
}
);

export const STREAM_LIVE = i18n.translate(
'xpack.securitySolution.timeline.properties.streamLiveButtonLabel',
{
Expand Down