Skip to content

[7.x] [Alerting] Create alert design cleanup (#56929) #60070

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

Merged
andreadelrio merged 2 commits into from
Mar 13, 2020
Merged

[7.x] [Alerting] Create alert design cleanup (#56929) #60070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb10add
fix conflict
andreadelrio Feb 12, 2020
05d5acf
Removed merge duplication file
YulNaumenko Mar 12, 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
27 changes: 25 additions & 2 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 @@ -10,6 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import {
EuiFlexItem,
EuiFlexGroup,
EuiFormLabel,
EuiExpression,
EuiPopover,
EuiPopoverTitle,
Expand Down Expand Up @@ -345,7 +346,15 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
<EuiSpacer />
</Fragment>
) : null}
<EuiFlexGroup gutterSize="s" wrap>
<EuiSpacer size="l" />
<EuiFormLabel>
<FormattedMessage
defaultMessage="Select Index to query:"
id="xpack.triggersActionsUI.sections.alertAdd.selectIndex"
/>
</EuiFormLabel>
<EuiSpacer size="m" />
<EuiFlexGroup wrap>
<EuiFlexItem grow={false}>
<EuiPopover
id="indexPopover"
Expand All @@ -358,7 +367,7 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
defaultMessage: 'index',
}
)}
value={index || firstFieldOption.text}
value={index ? index.join(' ') : firstFieldOption.text}
isActive={indexPopoverOpen}
onClick={() => {
setIndexPopoverOpen(true);
Expand Down Expand Up @@ -388,6 +397,8 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
</div>
</EuiPopover>
</EuiFlexItem>
</EuiFlexGroup>
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<WhenExpression
aggType={aggType ?? DEFAULT_VALUES.AGGREGATION_TYPE}
Expand All @@ -409,6 +420,8 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
/>
</EuiFlexItem>
) : null}
</EuiFlexGroup>
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<GroupByExpression
groupBy={groupBy || DEFAULT_VALUES.GROUP_BY}
Expand All @@ -425,6 +438,16 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
}
/>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="xl" />
<EuiFormLabel>
<FormattedMessage
defaultMessage="Define the alert condition:"
id="xpack.triggersActionsUI.sections.alertAdd.conditionPrompt"
/>
</EuiFormLabel>
<EuiSpacer size="m" />
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<ThresholdExpression
thresholdComparator={thresholdComparator ?? DEFAULT_VALUES.THRESHOLD_COMPARATOR}
Expand Down
3 changes: 1 addition & 2 deletions ..._actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
>
{error}
</EuiCallOut>
<EuiSpacer size="l" />
</Fragment>
);
}
Expand Down Expand Up @@ -228,7 +227,7 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
<div data-test-subj="alertVisualizationChart">
<EuiSpacer size="l" />
{alertVisualizationDataKeys.length ? (
<Chart size={['100%', 300]} renderer="canvas">
<Chart size={['100%', 200]} renderer="canvas">
<Settings
theme={[customTheme(), chartsTheme]}
xDomain={domain}
Expand Down
4 changes: 4 additions & 0 deletions ...plugins/triggers_actions_ui/public/application/sections/action_connector_form/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.actConnectorModal {
z-index: 9000;
}

.euiComboBoxOptionsList {
z-index: 10000;
}