From 4963e04d8ce81ef713bf1f737deb1ade74195eb1 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Thu, 16 Nov 2017 16:19:51 -0800
Subject: [PATCH] Remove timeShift from query options in kapacitor

---
 ui/src/shared/components/FieldList.js    |  2 +-
 ui/src/shared/components/QueryOptions.js | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/src/shared/components/FieldList.js b/ui/src/shared/components/FieldList.js
index bfb06f2e3c..dd2db74860 100644
--- a/ui/src/shared/components/FieldList.js
+++ b/ui/src/shared/components/FieldList.js
@@ -221,7 +221,7 @@ FieldList.propTypes = {
       })
     ),
   }).isRequired,
-  onTimeShift: func.isRequired,
+  onTimeShift: func,
   onToggleField: func.isRequired,
   onGroupByTime: func.isRequired,
   onFill: func,
diff --git a/ui/src/shared/components/QueryOptions.js b/ui/src/shared/components/QueryOptions.js
index e0d23dba7e..d02ee02408 100644
--- a/ui/src/shared/components/QueryOptions.js
+++ b/ui/src/shared/components/QueryOptions.js
@@ -17,10 +17,12 @@ const QueryOptions = ({
       selected={groupBy.time}
       onChooseGroupByTime={onGroupByTime}
     />
-    <TimeShiftDropdown
-      selected={shift && shift.label}
-      onChooseTimeShift={onTimeShift}
-    />
+    {isKapacitorRule
+      ? null
+      : <TimeShiftDropdown
+          selected={shift && shift.label}
+          onChooseTimeShift={onTimeShift}
+        />}
     {isKapacitorRule ? null : <FillQuery value={fill} onChooseFill={onFill} />}
   </div>