From f56d45ac56ed568e6f3f8edee4468a18e68668a0 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 7 Sep 2016 15:13:24 +0200
Subject: [PATCH] feat(alerting): include default notifications in alert tab

---
 public/app/features/alerting/alert_tab_ctrl.ts       | 8 ++++++++
 public/app/features/alerting/partials/alert_tab.html | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts
index f3cc998deaa..b372520507d 100644
--- a/public/app/features/alerting/alert_tab_ctrl.ts
+++ b/public/app/features/alerting/alert_tab_ctrl.ts
@@ -76,6 +76,14 @@ export class AlertTabCtrl {
           this.alertNotifications.push(model);
         }
       });
+
+      _.each(this.notifications, item => {
+        if (item.isDefault) {
+          item.iconClass = this.getNotificationIcon(item.type);
+          item.bgColor = "#00678b";
+          this.alertNotifications.push(item);
+        }
+      });
     });
   }
 
diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html
index 770e3a2cb05..fbbcf810ee6 100644
--- a/public/app/features/alerting/partials/alert_tab.html
+++ b/public/app/features/alerting/partials/alert_tab.html
@@ -6,7 +6,7 @@
 			</li>
 			<li ng-class="{active: ctrl.subTabIndex === 1}">
 				<a ng-click="ctrl.changeTabIndex(1)">
-					Notifications <span class="muted">({{ctrl.alert.notifications.length}})</span>
+					Notifications <span class="muted">({{ctrl.alertNotifications.length}})</span>
 				</a>
 			</li>
 			<li ng-class="{active: ctrl.subTabIndex === 2}">
@@ -122,9 +122,9 @@
 			<div class="gf-form-inline">
 				<div class="gf-form max-width-30">
 					<span class="gf-form-label width-8">Send to</span>
-					<span class="gf-form-label query-part" ng-repeat="nc in ctrl.alertNotifications">
+					<span class="gf-form-label" ng-repeat="nc in ctrl.alertNotifications" ng-style="{'background-color': nc.bgColor }">
 						<i class="{{nc.iconClass}}"></i>&nbsp;{{nc.name}}&nbsp;
-						<i class="fa fa-remove pointer muted" ng-click="ctrl.removeNotification($index)"></i>
+						<i class="fa fa-remove pointer muted" ng-click="ctrl.removeNotification($index)" ng-if="nc.isDefault === false"></i>
 					</span>
 					<metric-segment segment="ctrl.addNotificationSegment" get-options="ctrl.getNotifications()" on-change="ctrl.notificationAdded()"></metric-segment>
 				</div>