From ad610a1916b855da50d5ab86ff85ed9ef835587c Mon Sep 17 00:00:00 2001
From: Nathan Rodman <nathanrodman@gmail.com>
Date: Tue, 31 Aug 2021 20:51:36 -0700
Subject: [PATCH] Alerting: Fix bug for default value in silence matcher
 (#38735)

---
 .../unified/components/silences/MatchersField.tsx      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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