From d706320d0a88f142ae4f178080429be8436a2b3c Mon Sep 17 00:00:00 2001
From: Matthew Jacobson <matthew.jacobson@grafana.com>
Date: Thu, 1 Sep 2022 19:06:42 -0400
Subject: [PATCH] Alerting: Fix UI bug when setting custom notification policy
 group by (#54607)

Custom values were not being displayed in the multiselect for notification policy `Group by` even though
they were correctly being saved.
---
 .../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<AmRootRouteFormProps> = ({
                     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<AmRoutesExpandedFormProps> = ({ onCancel,
                       setValue('groupBy', [...field.value, opt]);
                     }}
                     onChange={(value) => onChange(mapMultiSelectValueToStrings(value))}
-                    options={[...commonGroupByOptions, groupByOptions]}
+                    options={[...commonGroupByOptions, ...groupByOptions]}
                   />
                 )}
                 control={control}