From 23cd81b2cb660ce6f284d2cbf4b0c9352fb4ed24 Mon Sep 17 00:00:00 2001
From: deniz kusefoglu <denizk@gmail.com>
Date: Thu, 30 Nov 2017 16:19:32 -0800
Subject: [PATCH] Cr names from rules.alertNodes

---
 .../kapacitor/components/KapacitorRulesTable.js  |  3 ++-
 ui/src/kapacitor/components/RuleHandlers.js      |  2 +-
 .../kapacitor/containers/KapacitorRulesPage.js   |  1 -
 ...dlersFromRule.js => parseHandlersFromRule.js} | 16 ++++++++++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)
 rename ui/src/shared/parsing/{getHandlersFromRule.js => parseHandlersFromRule.js} (58%)

diff --git a/ui/src/kapacitor/components/KapacitorRulesTable.js b/ui/src/kapacitor/components/KapacitorRulesTable.js
index 00f6ab2689..c9106ec781 100644
--- a/ui/src/kapacitor/components/KapacitorRulesTable.js
+++ b/ui/src/kapacitor/components/KapacitorRulesTable.js
@@ -2,6 +2,7 @@ import React, {PropTypes} from 'react'
 import {Link} from 'react-router'
 import _ from 'lodash'
 
+import {getAlertNodeList} from 'src/shared/parsing/parseHandlersFromRule'
 import {KAPACITOR_RULES_TABLE} from 'src/kapacitor/constants/tableSizing'
 const {
   colName,
@@ -62,7 +63,7 @@ const RuleRow = ({rule, source, onDelete, onChangeRuleStatus}) =>
       </span>
     </td>
     <td style={{width: colAlerts}} className="monotype">
-      {rule.alerts.join(', ')}
+      {getAlertNodeList(rule)}
     </td>
     <td style={{width: colEnabled}} className="monotype text-center">
       <div className="dark-checkbox">
diff --git a/ui/src/kapacitor/components/RuleHandlers.js b/ui/src/kapacitor/components/RuleHandlers.js
index 4241af09e5..495826261e 100644
--- a/ui/src/kapacitor/components/RuleHandlers.js
+++ b/ui/src/kapacitor/components/RuleHandlers.js
@@ -4,7 +4,7 @@ import _ from 'lodash'
 import HandlerOptions from 'src/kapacitor/components/HandlerOptions'
 import HandlerTabs from 'src/kapacitor/components/HandlerTabs'
 import Dropdown from 'shared/components/Dropdown'
-// import getHandlersFromRule from 'src/shared/parsing/getHandlersFromRule'
+// import {getHandlersFromRule} from 'src/shared/parsing/parseHandlersFromRule'
 
 import {DEFAULT_HANDLERS} from 'src/kapacitor/constants'
 
diff --git a/ui/src/kapacitor/containers/KapacitorRulesPage.js b/ui/src/kapacitor/containers/KapacitorRulesPage.js
index 8652e1fd11..68931be1bd 100644
--- a/ui/src/kapacitor/containers/KapacitorRulesPage.js
+++ b/ui/src/kapacitor/containers/KapacitorRulesPage.js
@@ -70,7 +70,6 @@ KapacitorRulesPage.propTypes = {
       name: string.isRequired,
       trigger: string.isRequired,
       message: string.isRequired,
-      alerts: arrayOf(string.isRequired).isRequired,
     })
   ).isRequired,
   actions: shape({
diff --git a/ui/src/shared/parsing/getHandlersFromRule.js b/ui/src/shared/parsing/parseHandlersFromRule.js
similarity index 58%
rename from ui/src/shared/parsing/getHandlersFromRule.js
rename to ui/src/shared/parsing/parseHandlersFromRule.js
index 0abb13dde4..a320a68ba2 100644
--- a/ui/src/shared/parsing/getHandlersFromRule.js
+++ b/ui/src/shared/parsing/parseHandlersFromRule.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
+import {ALERTS_TO_RULE} from 'src/kapacitor/constants'
 
-const getHandlersFromRule = rule => {
+export const getHandlersFromRule = rule => {
   const handlersOfKind = {}
   const handlersOnThisAlert = []
 
@@ -20,4 +21,15 @@ const getHandlersFromRule = rule => {
   return {handlersOnThisAlert, selectedHandler, handlersOfKind}
 }
 
-export default getHandlersFromRule
+export const getAlertNodeList = rule => {
+  const nodeList = _.transform(
+    rule.alertNodes,
+    (acc, v, k) => {
+      if (k in ALERTS_TO_RULE && v.length > 0) {
+        acc.push(k)
+      }
+    },
+    []
+  )
+  return _.join(nodeList, ', ')
+}