From 3371c8bd5c1304cfaea2478c184539bbb60ddc90 Mon Sep 17 00:00:00 2001
From: Gabe Lyons <gabe.lyons@airbnb.com>
Date: Wed, 14 Mar 2018 00:05:06 -0700
Subject: [PATCH] overriding annotation and layers' control tab (#4609)

---
 .../explore/components/ControlPanelsContainer.jsx        | 9 +++++++--
 superset/assets/javascripts/explore/stores/controls.jsx  | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
index 71e2bc1032..8fe18db77f 100644
--- a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
+++ b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
@@ -92,8 +92,13 @@ class ControlPanelsContainer extends React.Component {
     const displaySectionsToRender = [];
     allSectionsToRender.forEach((section) => {
       if (section.controlSetRows.some(rows => rows.some(
-        control => controls[control] && !controls[control].renderTrigger,
-      ))) {
+        control => (
+          controls[control] &&
+          (
+            !controls[control].renderTrigger ||
+            controls[control].tabOverride === 'data'
+          )
+        )))) {
         querySectionsToRender.push(section);
       } else {
         displaySectionsToRender.push(section);
diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
index ec4522be88..641aaaed9a 100644
--- a/superset/assets/javascripts/explore/stores/controls.jsx
+++ b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -1702,6 +1702,7 @@ export const controls = {
     default: [],
     description: 'Annotation Layers',
     renderTrigger: true,
+    tabOverride: 'data',
   },
 
   having_filters: {