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

Collapse alert chart previews by default #77479

Merged
merged 1 commit into from
Sep 16, 2020
Merged

Collapse alert chart previews by default #77479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 18 additions & 12 deletions x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criteria.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import React from 'react';
import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
import { EuiFlexItem, EuiFlexGroup, EuiAccordion } from '@elastic/eui';
import { IFieldType } from 'src/plugins/data/public';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { IErrorObject } from '../../../../../../triggers_actions_ui/public/types';
Expand Down Expand Up @@ -44,23 +44,29 @@ export const Criteria: React.FC<Props> = ({
<EuiFlexItem grow>
{criteria.map((criterion, idx) => {
return (
<React.Fragment key={idx}>
<Criterion
idx={idx}
fields={fields}
criterion={criterion}
updateCriterion={updateCriterion}
removeCriterion={removeCriterion}
canDelete={criteria.length > 1}
errors={errors[idx.toString()] as IErrorObject}
/>
<EuiAccordion
id={`criterion-${idx}`}
buttonContent={
<Criterion
idx={idx}
fields={fields}
criterion={criterion}
updateCriterion={updateCriterion}
removeCriterion={removeCriterion}
canDelete={criteria.length > 1}
errors={errors[idx.toString()] as IErrorObject}
/>
}
key={idx}
arrowDisplay="right"
>
<CriterionPreview
alertParams={alertParams}
context={context}
chartCriterion={criterion}
sourceId={sourceId}
/>
</React.Fragment>
</EuiAccordion>
);
})}
</EuiFlexItem>
Expand Down
15 changes: 12 additions & 3 deletions x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criterion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,10 @@ export const Criterion: React.FC<Props> = ({
value={criterion.field}
isActive={isFieldPopoverOpen}
color={errors.field.length === 0 ? 'secondary' : 'danger'}
onClick={() => setIsFieldPopoverOpen(true)}
onClick={(e) => {
e.stopPropagation();
setIsFieldPopoverOpen(true);
}}
/>
}
isOpen={isFieldPopoverOpen}
Expand Down Expand Up @@ -202,7 +205,10 @@ export const Criterion: React.FC<Props> = ({
? 'secondary'
: 'danger'
}
onClick={() => setIsComparatorPopoverOpen(true)}
onClick={(e) => {
e.stopPropagation();
setIsComparatorPopoverOpen(true);
}}
/>
}
isOpen={isComparatorPopoverOpen}
Expand Down Expand Up @@ -260,7 +266,10 @@ export const Criterion: React.FC<Props> = ({
})}
color={'danger'}
iconType={'trash'}
onClick={() => removeCriterion(idx)}
onClick={(e: React.MouseEvent) => {
e.stopPropagation();
removeCriterion(idx);
}}
/>
</EuiFlexItem>
)}
Expand Down