From 21d2feb442b55d7312ec9fc26b823cc65d5fb644 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Mon, 16 Oct 2017 10:31:37 -0700
Subject: [PATCH 1/2] Add Cancel button for tickscript editor

---
 ui/src/kapacitor/components/Tickscript.js       |  5 ++++-
 ui/src/kapacitor/components/TickscriptHeader.js | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ui/src/kapacitor/components/Tickscript.js b/ui/src/kapacitor/components/Tickscript.js
index 539d02fb04..03e17aa7a4 100644
--- a/ui/src/kapacitor/components/Tickscript.js
+++ b/ui/src/kapacitor/components/Tickscript.js
@@ -1,4 +1,5 @@
 import React, {PropTypes} from 'react'
+
 import TickscriptHeader from 'src/kapacitor/components/TickscriptHeader'
 import TickscriptEditor from 'src/kapacitor/components/TickscriptEditor'
 
@@ -48,7 +49,9 @@ const {arrayOf, bool, func, shape, string} = PropTypes
 
 Tickscript.propTypes = {
   onSave: func.isRequired,
-  source: shape(),
+  source: shape({
+    id: string,
+  }),
   task: shape({
     id: string,
     script: string,
diff --git a/ui/src/kapacitor/components/TickscriptHeader.js b/ui/src/kapacitor/components/TickscriptHeader.js
index d826fe43f3..207ff5ff3e 100644
--- a/ui/src/kapacitor/components/TickscriptHeader.js
+++ b/ui/src/kapacitor/components/TickscriptHeader.js
@@ -1,4 +1,6 @@
 import React, {PropTypes} from 'react'
+import {Link} from 'react-router'
+
 import SourceIndicator from 'shared/components/SourceIndicator'
 import TickscriptType from 'src/kapacitor/components/TickscriptType'
 import MultiSelectDBDropdown from 'shared/components/MultiSelectDBDropdown'
@@ -11,6 +13,7 @@ const addName = list => list.map(l => ({...l, name: `${l.db}.${l.rp}`}))
 const TickscriptHeader = ({
   task: {id, type, dbrps},
   task,
+  source,
   onSave,
   onChangeType,
   onChangeID,
@@ -31,6 +34,12 @@ const TickscriptHeader = ({
           selectedItems={addName(dbrps)}
           onApply={onSelectDbrps}
         />
+        <Link
+          className="btn btn-sm btn-default"
+          to={`/sources/${source.id}/alert-rules`}
+        >
+          Cancel
+        </Link>
         <button
           className="btn btn-success btn-sm"
           title={id ? '' : 'ID your TICKscript to save'}
@@ -47,6 +56,9 @@ const {arrayOf, bool, func, shape, string} = PropTypes
 
 TickscriptHeader.propTypes = {
   onSave: func,
+  source: shape({
+    id: string,
+  }),
   onSelectDbrps: func.isRequired,
   task: shape({
     dbrps: arrayOf(

From 47f598e4f0304c79e0d0cd5cf4e1c3c594f062fc Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Mon, 16 Oct 2017 10:35:08 -0700
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be8f75679b..7dc7555188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### UI Improvements
 1. [#2111](https://github.com/influxdata/chronograf/pull/2111): Increase size of Cell Editor query tabs to reveal more of their query strings
+1. [#2119](https://github.com/influxdata/chronograf/pull/2119): Add cancel button to Tickscript editor
 
 ## v1.3.9.0 [2017-10-06]
 ### Bug Fixes