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

[Alerting] "Create alert" and alert list design improvements #63515

Merged
merged 19 commits into from
Apr 17, 2020
Merged

[Alerting] "Create alert" and alert list design improvements #63515

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
61cfdc6
added header to actions section
andreadelrio Apr 8, 2020
4f68ae8
Merge remote-tracking branch 'upstream/master' into alerting-design-cu
andreadelrio Apr 8, 2020
8dec0f5
adjusted some spacing in Create Alert
andreadelrio Apr 9, 2020
ff642eb
lighter text in Actions section headings
andreadelrio Apr 10, 2020
08393d3
fixed bulk actions dropdown
andreadelrio Apr 12, 2020
616b54f
improve alert collapsed item actions
andreadelrio Apr 12, 2020
3b07e75
improve dropdown and adjust some buttos
andreadelrio Apr 14, 2020
0b3b50e
fixed conflicts and some more changes
andreadelrio Apr 14, 2020
8fc87bc
adjust font size of steps to match hierarchy
andreadelrio Apr 14, 2020
c4bb2f7
need to check master
andreadelrio Apr 15, 2020
9b464e3
improve collapsed actions menu
andreadelrio Apr 16, 2020
c37799f
added periods to help texts
andreadelrio Apr 16, 2020
78e7f9d
going back to EuiButtonEmpty to be able to use isLoading
andreadelrio Apr 16, 2020
bd9976e
fix prop
andreadelrio Apr 16, 2020
9a9ad29
Merge remote-tracking branch 'upstream/master' into alerting-design-cu
andreadelrio Apr 16, 2020
435fd07
remove Fragment
andreadelrio Apr 16, 2020
fa62385
remove translations we're not using
andreadelrio Apr 17, 2020
4275ae9
Fix functional tests
mikecote Apr 17, 2020
b84819d
Merge pull request #1 from mikecote/pr/63515
andreadelrio Apr 17, 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
12 changes: 11 additions & 1 deletion ...rs_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
.actAlertVisualization__chart {
height: $euiSize * 15;
height: $euiSize * 14;
}

.actAddAlertSteps {
.euiStep__titleWrapper {
align-items: center;
}

.euiStep__title {
@include euiTitle('xs');
}
}
andreadelrio marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 3 additions & 5 deletions ...ers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
const firstSetOfSteps = [
{
title: i18n.translate('xpack.triggersActionsUI.sections.alertAdd.selectIndex', {
defaultMessage: 'Select an index.',
defaultMessage: 'Select an index',
andreadelrio marked this conversation as resolved.
Show resolved Hide resolved
}),
children: (
<>
Expand Down Expand Up @@ -395,7 +395,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
},
{
title: i18n.translate('xpack.triggersActionsUI.sections.alertAdd.conditionPrompt', {
defaultMessage: 'Define the condition.',
defaultMessage: 'Define the condition',
}),
children: (
<>
Expand Down Expand Up @@ -444,12 +444,10 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
</Fragment>
) : null}
<EuiSpacer size="l" />
<EuiSteps steps={firstSetOfSteps} />
<EuiSpacer size="l" />
<EuiSteps className="actAddAlertSteps" steps={firstSetOfSteps} />
<div className="actAlertVisualization__chart">
{canShowVizualization ? (
<Fragment>
<EuiSpacer size="xl" />
<EuiEmptyPrompt
iconType="visBarVertical"
body={
Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/triggers_actions_ui/public/application/components/prompts/empty_prompt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ export const EmptyPrompt = ({ onCTAClicked }: { onCTAClicked: () => void }) => (
data-test-subj="createFirstAlertButton"
key="create-action"
fill
iconType="plusInCircle"
iconSide="left"
onClick={onCTAClicked}
>
<FormattedMessage
Expand Down
Loading