From 3e5ab10bc9b8c4bff2a4abcbc16d3bf89e5d7c6c Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Fri, 23 Feb 2018 10:01:57 -0800
Subject: [PATCH] Remove ID column and improve column header names

---
 ui/src/kapacitor/components/KapacitorRulesTable.js | 12 ++++++------
 ui/src/kapacitor/components/TasksTable.js          |  2 +-
 ui/src/kapacitor/constants/tableSizing.js          | 10 ++--------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/ui/src/kapacitor/components/KapacitorRulesTable.js b/ui/src/kapacitor/components/KapacitorRulesTable.js
index 9e050c810b..840011d9bb 100644
--- a/ui/src/kapacitor/components/KapacitorRulesTable.js
+++ b/ui/src/kapacitor/components/KapacitorRulesTable.js
@@ -4,7 +4,7 @@ import _ from 'lodash'
 
 import ConfirmButton from 'src/shared/components/ConfirmButton'
 import {parseAlertNodeList} from 'src/shared/parsing/parseHandlersFromRule'
-import {KAPACITOR_RULES_TABLE} from 'src/kapacitor/constants/tableSizing'
+import {TASKS_TABLE} from 'src/kapacitor/constants/tableSizing'
 const {
   colName,
   colTrigger,
@@ -12,7 +12,7 @@ const {
   colAlerts,
   colEnabled,
   colActions,
-} = KAPACITOR_RULES_TABLE
+} = TASKS_TABLE
 
 const KapacitorRulesTable = ({rules, source, onDelete, onChangeRuleStatus}) =>
   <div className="panel-body">
@@ -20,11 +20,11 @@ const KapacitorRulesTable = ({rules, source, onDelete, onChangeRuleStatus}) =>
       <thead>
         <tr>
           <th style={{minWidth: colName}}>Name</th>
-          <th style={{width: colTrigger}}>Rule Trigger</th>
+          <th style={{width: colTrigger}}>Rule Type</th>
           <th style={{width: colMessage}}>Message</th>
-          <th style={{width: colAlerts}}>Alerts</th>
+          <th style={{width: colAlerts}}>Alert Handlers</th>
           <th style={{width: colEnabled}} className="text-center">
-            Enabled
+            Task Enabled
           </th>
           <th style={{width: colActions}} />
         </tr>
@@ -57,7 +57,7 @@ const RuleRow = ({rule, source, onDelete, onChangeRuleStatus}) =>
     <td style={{width: colTrigger, textTransform: 'capitalize'}}>
       {rule.trigger}
     </td>
-    <td style={{wdith: colMessage}}>
+    <td style={{width: colMessage}}>
       {rule.message}
     </td>
     <td style={{width: colAlerts}}>
diff --git a/ui/src/kapacitor/components/TasksTable.js b/ui/src/kapacitor/components/TasksTable.js
index b9072abe97..84c079a761 100644
--- a/ui/src/kapacitor/components/TasksTable.js
+++ b/ui/src/kapacitor/components/TasksTable.js
@@ -15,7 +15,7 @@ const TasksTable = ({tasks, source, onDelete, onChangeRuleStatus}) =>
           <th style={{minWidth: colName}}>Name</th>
           <th style={{width: colType}}>Type</th>
           <th style={{width: colEnabled}} className="text-center">
-            Enabled
+            Task Enabled
           </th>
           <th style={{width: colActions}} />
         </tr>
diff --git a/ui/src/kapacitor/constants/tableSizing.js b/ui/src/kapacitor/constants/tableSizing.js
index b7e9892181..91780e4b98 100644
--- a/ui/src/kapacitor/constants/tableSizing.js
+++ b/ui/src/kapacitor/constants/tableSizing.js
@@ -1,15 +1,9 @@
-export const KAPACITOR_RULES_TABLE = {
+export const TASKS_TABLE = {
   colName: '200px',
   colTrigger: '90px',
   colMessage: '200px',
   colAlerts: '120px',
-  colEnabled: '64px',
+  colEnabled: '95px',
   colActions: '68px',
-}
-
-export const TASKS_TABLE = {
-  colName: '200px',
   colType: '90px',
-  colEnabled: '64px',
-  colActions: '68px',
 }