IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix bug for default value in silence matcher (#38735)

Browse Source
This commit is contained in:
Nathan Rodman 2021-08-31 20:51:36 -07:00 committed by GitHub
parent 4f479de88e
commit ad610a1916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/alerting/unified/components/silences/MatchersField.tsx
View File

@ -5,7 +5,7 @@ import { css, cx } from '@emotion/css';
import { useFormContext, useFieldArray } from 'react-hook-form'; import { useFormContext, useFieldArray } from 'react-hook-form';
import { SilenceFormFields } from '../../types/silence-form'; import { SilenceFormFields } from '../../types/silence-form';
import { MatcherOperator } from 'app/plugins/datasource/alertmanager/types'; import { MatcherOperator } from 'app/plugins/datasource/alertmanager/types';
import { matcherToOperator, matcherFieldToMatcher, matcherFieldOptions } from '../../utils/alertmanager'; import { matcherFieldOptions } from '../../utils/alertmanager';
interface Props { interface Props {
className?: string; className?: string;
@ -49,16 +49,12 @@ const MatchersField: FC<Props> = ({ className }) => {
render={({ field: { onChange, ref, ...field } }) => ( render={({ field: { onChange, ref, ...field } }) => (
<Select <Select
{...field} {...field}
onChange={(value) => onChange(value.value)}
className={styles.matcherOptions} className={styles.matcherOptions}
onChange={(value) => onChange(value?.value)}
options={matcherFieldOptions} options={matcherFieldOptions}
/> />
)} )}
defaultValue={ defaultValue={matcher.operator || matcherFieldOptions[0].value}
matcherFieldOptions.find(
(field) => field.label === matcherToOperator(matcherFieldToMatcher(matcher))
) || matcherFieldOptions[0]
}
name={`matchers.${index}.operator` as const} name={`matchers.${index}.operator` as const}
rules={{ required: { value: true, message: 'Required.' } }} rules={{ required: { value: true, message: 'Required.' } }}
/> />