overriding annotation and layers' control tab (apache#4609)

michellethomas · May 23, 2018 · 6af6105 · 6af6105
1 parent cdc5d60
commit 6af6105
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -1702,6 +1702,7 @@ export const controls = {
     default: [],
     description: 'Annotation Layers',
     renderTrigger: true,
+    tabOverride: 'data',
   },
 
   having_filters: {