From f59e76d54b0f5ea11e23f2f59eb3281682c7d1d0 Mon Sep 17 00:00:00 2001
From: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Date: Wed, 7 Feb 2024 09:54:31 +0100
Subject: [PATCH] Alerting: Use mute_time_intervals as field name in dto ,for
 simplified routing (#82045)

Use mute_time_intervals as field name in dto ,for simplified routing
---
 .../alerting/unified/utils/rule-form.test.ts  |  4 ++--
 .../alerting/unified/utils/rule-form.ts       | 22 ++-----------------
 public/app/types/unified-alerting-dto.ts      |  2 +-
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/public/app/features/alerting/unified/utils/rule-form.test.ts b/public/app/features/alerting/unified/utils/rule-form.test.ts
index 4d1324e9c97..48911f86b6a 100644
--- a/public/app/features/alerting/unified/utils/rule-form.test.ts
+++ b/public/app/features/alerting/unified/utils/rule-form.test.ts
@@ -130,7 +130,7 @@ describe('getContactPointsFromDTO', () => {
       ],
       notification_settings: {
         receiver: 'receiver',
-        mute_timings: ['mute_timing'],
+        mute_time_intervals: ['mute_timing'],
         group_by: ['group_by'],
         group_wait: 'group_wait',
         group_interval: 'group_interval',
@@ -199,7 +199,7 @@ describe('getNotificationSettingsForDTO', () => {
     const result = getNotificationSettingsForDTO(manualRouting, contactPoints);
     expect(result).toEqual({
       receiver: 'receiver',
-      mute_timings: ['mute_timing'],
+      mute_time_intervals: ['mute_timing'],
       group_by: ['group_by'],
       group_wait: 'group_wait',
       group_interval: 'group_interval',
diff --git a/public/app/features/alerting/unified/utils/rule-form.ts b/public/app/features/alerting/unified/utils/rule-form.ts
index 71c4aff9861..26e286c0898 100644
--- a/public/app/features/alerting/unified/utils/rule-form.ts
+++ b/public/app/features/alerting/unified/utils/rule-form.ts
@@ -147,7 +147,7 @@ export function getNotificationSettingsForDTO(
   if (contactPoints?.grafana?.selectedContactPoint && manualRouting) {
     return {
       receiver: contactPoints?.grafana?.selectedContactPoint,
-      mute_timings: contactPoints?.grafana?.muteTimeIntervals,
+      mute_time_intervals: contactPoints?.grafana?.muteTimeIntervals,
       group_by: contactPoints?.grafana?.overrideGrouping ? contactPoints?.grafana?.groupBy : undefined,
       group_wait:
         contactPoints?.grafana?.overrideTimings && contactPoints?.grafana?.groupWaitValue
@@ -197,7 +197,7 @@ export function getContactPointsFromDTO(ga: GrafanaRuleDefinition): AlertManager
   const contactPoint: ContactPoint | undefined = ga.notification_settings
     ? {
         selectedContactPoint: ga.notification_settings.receiver,
-        muteTimeIntervals: ga.notification_settings.mute_timings ?? [],
+        muteTimeIntervals: ga.notification_settings.mute_time_intervals ?? [],
         overrideGrouping:
           Array.isArray(ga.notification_settings.group_by) && ga.notification_settings.group_by.length > 0,
         overrideTimings: [
@@ -247,24 +247,6 @@ export function rulerRuleToFormValues(ruleWithLocation: RuleWithLocation): RuleF
 
         contactPoints: routingSettings,
         manualRouting: Boolean(routingSettings),
-        // next line is for testing
-        // manualRouting: true,
-        // contactPoints: {
-        //   grafana: {
-        //       selectedContactPoint: "contact_point_5",
-        //       muteTimeIntervals: [
-        //           "mute timing 1"
-        //       ],
-        //       overrideGrouping: true,
-        //       overrideTimings: true,
-        //       "groupBy": [
-        //           "..."
-        //       ],
-        //       groupWaitValue: "35s",
-        //       groupIntervalValue: "6m",
-        //       repeatIntervalValue: "5h"
-        //   }
-        // }
       };
     } else {
       throw new Error('Unexpected type of rule for grafana rules source');
diff --git a/public/app/types/unified-alerting-dto.ts b/public/app/types/unified-alerting-dto.ts
index b35fe160252..923339e22f2 100644
--- a/public/app/types/unified-alerting-dto.ts
+++ b/public/app/types/unified-alerting-dto.ts
@@ -203,7 +203,7 @@ export interface GrafanaNotificationSettings {
   group_wait?: string;
   group_interval?: string;
   repeat_interval?: string;
-  mute_timings?: string[];
+  mute_time_intervals?: string[];
 }
 export interface PostableGrafanaRuleDefinition {
   uid?: string;