IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix default policy timing summary (#74549)

Browse Source
This commit is contained in:
Gilles De Mey 2023-09-11 18:06:08 +02:00 committed by GitHub
parent dce492642a
commit 6a4ba13b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/alerting/unified/components/notification-policies/Policy.test.tsx
View File

@ -257,4 +257,6 @@ const mockRoutes: RouteWithID = {
},
],
group_wait: '30s',
group_interval: undefined,
repeat_interval: undefined,
};

4
public/app/features/alerting/unified/components/notification-policies/Policy.tsx
View File

@ -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 && (