From fd6e97d52dbe450ed2e6d136de291fc5483f38da Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Mon, 20 Mar 2023 07:58:23 +0100
Subject: [PATCH] Alerting: Inherit new policy grouping from parent (#64956)

---
 .../EditNotificationPolicyForm.tsx                 | 14 ++++++++++++--
 .../components/notification-policies/Modals.tsx    |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx b/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
index 6c4e91931ab..cbc50fff893 100644
--- a/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
@@ -43,9 +43,16 @@ export interface AmRoutesExpandedFormProps {
   route?: RouteWithID;
   onSubmit: (route: Partial<FormAmRoute>) => void;
   actionButtons: ReactNode;
+  defaults?: Partial<FormAmRoute>;
 }
 
-export const AmRoutesExpandedForm = ({ actionButtons, receivers, route, onSubmit }: AmRoutesExpandedFormProps) => {
+export const AmRoutesExpandedForm = ({
+  actionButtons,
+  receivers,
+  route,
+  onSubmit,
+  defaults,
+}: AmRoutesExpandedFormProps) => {
   const styles = useStyles2(getStyles);
   const formStyles = useStyles2(getFormStyles);
   const [groupByOptions, setGroupByOptions] = useState(stringsToSelectableValues(route?.group_by));
@@ -53,7 +60,10 @@ export const AmRoutesExpandedForm = ({ actionButtons, receivers, route, onSubmit
 
   const receiversWithOnCallOnTop = receivers.sort(onCallFirst);
 
-  const formAmRoute = amRouteToFormAmRoute(route);
+  const formAmRoute = {
+    ...amRouteToFormAmRoute(route),
+    ...defaults,
+  };
 
   const emptyMatcher = [{ name: '', operator: MatcherOperator.equal, value: '' }];
 
diff --git a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
index 4cafb32637a..29bebec48c7 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Modals.tsx
@@ -55,6 +55,9 @@ const useAddPolicyModal = (
         >
           <AmRoutesExpandedForm
             receivers={AmRouteReceivers}
+            defaults={{
+              groupBy: parentRoute?.group_by,
+            }}
             onSubmit={(newRoute) => parentRoute && handleAdd(newRoute, parentRoute)}
             actionButtons={
               <Modal.ButtonRow>