Skip to content

[7.7] [Metrics UI] Fix editing alert filter query #65171

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
Zacqary merged 1 commit into from
May 4, 2020
Merged

[7.7] [Metrics UI] Fix editing alert filter query #65171

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
9 changes: 5 additions & 4 deletions x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const Expressions: React.FC<Props> = props => {
[setAlertParams, alertParams.criteria]
);

const onFilterQuerySubmit = useCallback(
const onFilterChange = useCallback(
(filter: any) => {
setAlertParams('filterQuery', filter);
},
Expand Down Expand Up @@ -222,8 +222,8 @@ export const Expressions: React.FC<Props> = props => {
}, [alertsContext.metadata, defaultExpression, source]); // eslint-disable-line react-hooks/exhaustive-deps

const handleFieldSearchChange = useCallback(
(e: ChangeEvent<HTMLInputElement>) => onFilterQuerySubmit(e.target.value),
[onFilterQuerySubmit]
(e: ChangeEvent<HTMLInputElement>) => onFilterChange(e.target.value),
[onFilterChange]
);

return (
Expand Down Expand Up @@ -293,7 +293,8 @@ export const Expressions: React.FC<Props> = props => {
{(alertsContext.metadata && (
<MetricsExplorerKueryBar
derivedIndexPattern={derivedIndexPattern}
onSubmit={onFilterQuerySubmit}
onChange={onFilterChange}
onSubmit={onFilterChange}
value={alertParams.filterQuery}
/>
)) || (
Expand Down
5 changes: 5 additions & 0 deletions x-pack/plugins/infra/public/components/metrics_explorer/kuery_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { esKuery, IIndexPattern } from '../../../../../../src/plugins/data/publi
interface Props {
derivedIndexPattern: IIndexPattern;
onSubmit: (query: string) => void;
onChange?: (query: string) => void;
value?: string | null;
placeholder?: string;
}
Expand All @@ -30,6 +31,7 @@ function validateQuery(query: string) {
export const MetricsExplorerKueryBar = ({
derivedIndexPattern,
onSubmit,
onChange,
value,
placeholder,
}: Props) => {
Expand All @@ -46,6 +48,9 @@ export const MetricsExplorerKueryBar = ({
const handleChange = (query: string) => {
setValidation(validateQuery(query));
setDraftQuery(query);
if (onChange) {
onChange(query);
}
};

const filteredDerivedIndexPattern = {
Expand Down