From 6a4ba13b442fd6bd4dee99a3657342c3613c7f01 Mon Sep 17 00:00:00 2001
From: Gilles De Mey <gilles.de.mey@gmail.com>
Date: Mon, 11 Sep 2023 18:06:08 +0200
Subject: [PATCH] Alerting: Fix default policy timing summary (#74549)

---
 .../unified/components/notification-policies/Policy.test.tsx  | 2 ++
 .../unified/components/notification-policies/Policy.tsx       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx b/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
index 187640ab617..7d6d7979e7b 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
@@ -257,4 +257,6 @@ const mockRoutes: RouteWithID = {
     },
   ],
   group_wait: '30s',
+  group_interval: undefined,
+  repeat_interval: undefined,
 };
diff --git a/public/app/features/alerting/unified/components/notification-policies/Policy.tsx b/public/app/features/alerting/unified/components/notification-policies/Policy.tsx
index c1c6a40ef20..50f1054e173 100644
--- a/public/app/features/alerting/unified/components/notification-policies/Policy.tsx
+++ b/public/app/features/alerting/unified/components/notification-policies/Policy.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import { uniqueId, groupBy, upperFirst, sumBy, isArray } from 'lodash';
+import { uniqueId, groupBy, upperFirst, sumBy, isArray, defaults } from 'lodash';
 import pluralize from 'pluralize';
 import React, { FC, Fragment, ReactNode } from 'react';
 import { Link } from 'react-router-dom';
@@ -281,7 +281,7 @@ const Policy: FC<PolicyComponentProps> = ({
                 {timingOptions && (
                   // for the default policy we will also merge the default timings, that way a user can observe what the timing options would be
                   <TimingOptionsMeta
-                    timingOptions={isDefaultPolicy ? { ...timingOptions, ...TIMING_OPTIONS_DEFAULTS } : timingOptions}
+                    timingOptions={isDefaultPolicy ? defaults(timingOptions, TIMING_OPTIONS_DEFAULTS) : timingOptions}
                   />
                 )}
                 {hasInheritedProperties && (