From c0c7597ffa720d6bb7838ad6868851103a967f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atte=20Kein=C3=A4nen?= <atte.keinanen@gmail.com>
Date: Mon, 15 May 2017 17:02:00 -0700
Subject: [PATCH] Add `supportMultipleAggregations` flag for hiding add button
---
.../datamodel/components/PartialQueryBuilder.jsx | 1 +
.../query_builder/components/GuiQueryEditor.jsx | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx b/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
index ac46b9c868c..4a8610d171a 100644
--- a/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
@@ -73,6 +73,7 @@ export default class PartialQueryBuilder extends Component {
databases={tableMetadata && [tableMetadata.db]}
setDatasetQuery={this.setDatasetQuery}
isShowingDataReference={false}
+ supportMultipleAggregations={false}
setDatabaseFn={null}
setSourceTableFn={null}
addQueryFilter={(filter) => onChange(Query.addFilter(datasetQuery.query, filter))}
diff --git a/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx b/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
index 9dee1e629a5..647b4e7c53e 100644
--- a/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
+++ b/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
@@ -35,7 +35,8 @@ export default class GuiQueryEditor extends Component {
setDatasetQuery: PropTypes.func.isRequired,
setDatabaseFn: PropTypes.func,
setSourceTableFn: PropTypes.func,
- features: PropTypes.object
+ features: PropTypes.object,
+ supportMultipleAggregations: PropTypes.bool
};
static defaultProps = {
@@ -46,7 +47,8 @@ export default class GuiQueryEditor extends Component {
breakout: true,
sort: true,
limit: true
- }
+ },
+ supportMultipleAggregations: true
};
renderAdd(text, onClick, targetRefName) {
@@ -134,7 +136,7 @@ export default class GuiQueryEditor extends Component {
}
renderAggregation() {
- const { datasetQuery: { query }, tableMetadata } = this.props;
+ const { datasetQuery: { query }, tableMetadata, supportMultipleAggregations } = this.props;
if (!this.props.features.aggregation) {
return;
@@ -152,7 +154,8 @@ export default class GuiQueryEditor extends Component {
const canRemoveAggregation = aggregations.length > 1;
- if (!isBareRows) {
+ if (supportMultipleAggregations && !isBareRows) {
+ // Placeholder aggregation for showing the add button
aggregations.push([]);
}
--
GitLab