From b62263229131a7f8f635de97162b8d228102c37b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 2 Sep 2022 01:19:06 +0200 Subject: [PATCH] Alerting: Fix UI bug when setting custom notification policy group by (#54607) (#54610) Custom values were not being displayed in the multiselect for notification policy `Group by` even though they were correctly being saved. (cherry picked from commit d706320d0a88f142ae4f178080429be8436a2b3c) Co-authored-by: Matthew Jacobson --- .../alerting/unified/components/amroutes/AmRootRouteForm.tsx | 2 +- .../unified/components/amroutes/AmRoutesExpandedForm.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/app/features/alerting/unified/components/amroutes/AmRootRouteForm.tsx b/public/app/features/alerting/unified/components/amroutes/AmRootRouteForm.tsx index c0d5d24ce0d..52c700e7248 100644 --- a/public/app/features/alerting/unified/components/amroutes/AmRootRouteForm.tsx +++ b/public/app/features/alerting/unified/components/amroutes/AmRootRouteForm.tsx @@ -87,7 +87,7 @@ export const AmRootRouteForm: FC = ({ setValue('groupBy', [...field.value, opt]); }} onChange={(value) => onChange(mapMultiSelectValueToStrings(value))} - options={[...commonGroupByOptions, groupByOptions]} + options={[...commonGroupByOptions, ...groupByOptions]} /> )} control={control} diff --git a/public/app/features/alerting/unified/components/amroutes/AmRoutesExpandedForm.tsx b/public/app/features/alerting/unified/components/amroutes/AmRoutesExpandedForm.tsx index a58f085ed74..ca979ae5243 100644 --- a/public/app/features/alerting/unified/components/amroutes/AmRoutesExpandedForm.tsx +++ b/public/app/features/alerting/unified/components/amroutes/AmRoutesExpandedForm.tsx @@ -180,7 +180,7 @@ export const AmRoutesExpandedForm: FC = ({ onCancel, setValue('groupBy', [...field.value, opt]); }} onChange={(value) => onChange(mapMultiSelectValueToStrings(value))} - options={[...commonGroupByOptions, groupByOptions]} + options={[...commonGroupByOptions, ...groupByOptions]} /> )} control={control}