You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by cc...@apache.org on 2018/03/14 07:05:10 UTC
[incubator-superset] branch master updated: overriding annotation
and layers' control tab (#4609)
This is an automated email from the ASF dual-hosted git repository.
ccwilliams pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 3371c8b overriding annotation and layers' control tab (#4609)
3371c8b is described below
commit 3371c8bd5c1304cfaea2478c184539bbb60ddc90
Author: Gabe Lyons <ga...@airbnb.com>
AuthorDate: Wed Mar 14 00:05:06 2018 -0700
overriding annotation and layers' control tab (#4609)
---
.../javascripts/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 71e2bc1..8fe18db 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 ec4522b..641aaae 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: {
--
To stop receiving notification emails like this one, please contact
ccwilliams@apache.org.