You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by hu...@apache.org on 2020/12/18 19:37:03 UTC
[incubator-superset] branch hugh/ch229 updated (5f73d31 -> c4af4fe)
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a change to branch hugh/ch229
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git.
from 5f73d31 fix merge conflicts
add 49ec13c feat: Support multiple queries per request (#11880)
add d543ca8 fix: fix the flaky FilterBox test re-introduced by #12114 (#12124)
add 8e625e0 fix: properly render booleans in FilterBox and explore page data preview (#12116)
add 2a23744 feat: Add Saved Metrics tab to metrics popover (#12123)
add 78cff80 Merge branch 'master' of https://github.com/apache/incubator-superset into feat-sql-toolbar
new 0d58c39 Merge branch 'feat-sql-toolbar' of https://github.com/apache/incubator-superset into hugh/ch229
new c4af4fe everything together
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cypress/integration/dashboard/filter.test.ts | 12 +-
.../spec/javascripts/chart/chartActions_spec.js | 2 +-
.../dashboard/components/FiltersBadge_spec.tsx | 36 +++---
.../components/AdhocMetricEditPopover_spec.jsx | 4 +-
.../explore/components/AdhocMetricOption_spec.jsx | 13 +--
.../components/MetricDefinitionValue_spec.jsx | 2 +-
.../explore/components/MetricsControl_spec.jsx | 2 +-
.../src/SqlLab/components/SqlEditor.jsx | 6 +-
superset-frontend/src/chart/Chart.jsx | 16 +--
superset-frontend/src/chart/ChartRenderer.jsx | 13 ++-
superset-frontend/src/chart/chartAction.js | 57 +++++-----
superset-frontend/src/chart/chartReducer.js | 14 +--
.../src/common/components/Tabs/Tabs.tsx | 7 +-
superset-frontend/src/constants.ts | 3 +
.../dashboard/components/FiltersBadge/selectors.ts | 4 +-
.../src/dashboard/components/SliceHeader.jsx | 8 +-
.../dashboard/components/SliceHeaderControls.jsx | 38 +++++--
.../dashboard/components/gridComponents/Chart.jsx | 12 +-
.../src/dashboard/util/propShapes.jsx | 2 +-
superset-frontend/src/explore/AdhocMetric.js | 9 +-
.../explore/components/AdhocFilterEditPopover.jsx | 5 +-
.../explore/components/AdhocMetricEditPopover.jsx | 123 +++++++++++++++++----
.../src/explore/components/AdhocMetricOption.jsx | 101 ++++-------------
.../components/AdhocMetricPopoverTrigger.tsx | 8 +-
.../src/explore/components/DataTableControl.tsx | 28 ++++-
.../src/explore/components/DisplayQueryButton.jsx | 1 -
.../explore/components/ExploreActionButtons.jsx | 6 +-
.../src/explore/components/ExploreChartHeader.jsx | 4 +-
.../src/explore/components/ExploreChartPanel.jsx | 42 ++++---
.../explore/components/MetricDefinitionValue.jsx | 43 ++++---
.../src/explore/components/OptionControls.tsx | 17 ++-
.../explore/components/controls/MetricsControl.jsx | 33 ++++--
.../src/explore/propTypes/savedMetricType.js | 1 +
.../src/explore/reducers/getInitialState.js | 2 +-
.../{prettier.config.js => src/explore/types.ts} | 8 +-
superset-frontend/src/middleware/asyncEvent.ts | 15 ++-
.../src/visualizations/FilterBox/FilterBox.jsx | 10 +-
37 files changed, 416 insertions(+), 291 deletions(-)
copy superset-frontend/{prettier.config.js => src/explore/types.ts} (88%)
[incubator-superset] 01/02: Merge branch 'feat-sql-toolbar' of
https://github.com/apache/incubator-superset into hugh/ch229
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch hugh/ch229
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 0d58c395e21f5526afc12ba73f07070bc50317b9
Merge: 5f73d31 78cff80
Author: hughhhh <hu...@gmail.com>
AuthorDate: Fri Dec 18 14:34:26 2020 -0500
Merge branch 'feat-sql-toolbar' of https://github.com/apache/incubator-superset into hugh/ch229
.../cypress/integration/dashboard/filter.test.ts | 12 +-
.../spec/javascripts/chart/chartActions_spec.js | 2 +-
.../dashboard/components/FiltersBadge_spec.tsx | 36 +++---
.../components/AdhocMetricEditPopover_spec.jsx | 4 +-
.../explore/components/AdhocMetricOption_spec.jsx | 13 +--
.../components/MetricDefinitionValue_spec.jsx | 2 +-
.../explore/components/MetricsControl_spec.jsx | 2 +-
superset-frontend/src/chart/Chart.jsx | 16 +--
superset-frontend/src/chart/ChartRenderer.jsx | 13 ++-
superset-frontend/src/chart/chartAction.js | 57 +++++-----
superset-frontend/src/chart/chartReducer.js | 14 +--
.../src/common/components/Tabs/Tabs.tsx | 7 +-
superset-frontend/src/constants.ts | 3 +
.../dashboard/components/FiltersBadge/selectors.ts | 4 +-
.../src/dashboard/components/SliceHeader.jsx | 8 +-
.../dashboard/components/SliceHeaderControls.jsx | 38 +++++--
.../dashboard/components/gridComponents/Chart.jsx | 12 +-
.../src/dashboard/util/propShapes.jsx | 2 +-
superset-frontend/src/explore/AdhocMetric.js | 9 +-
.../explore/components/AdhocFilterEditPopover.jsx | 5 +-
.../explore/components/AdhocMetricEditPopover.jsx | 123 +++++++++++++++++----
.../src/explore/components/AdhocMetricOption.jsx | 101 ++++-------------
.../components/AdhocMetricPopoverTrigger.tsx | 8 +-
.../src/explore/components/DataTableControl.tsx | 28 ++++-
.../src/explore/components/DisplayQueryButton.jsx | 1 -
.../explore/components/ExploreActionButtons.jsx | 6 +-
.../src/explore/components/ExploreChartHeader.jsx | 4 +-
.../src/explore/components/ExploreChartPanel.jsx | 42 ++++---
.../explore/components/MetricDefinitionValue.jsx | 43 ++++---
.../src/explore/components/OptionControls.tsx | 17 ++-
.../explore/components/controls/MetricsControl.jsx | 33 ++++--
.../src/explore/propTypes/savedMetricType.js | 1 +
.../src/explore/reducers/getInitialState.js | 2 +-
.../src/{constants.ts => explore/types.ts} | 8 +-
superset-frontend/src/middleware/asyncEvent.ts | 15 ++-
.../src/visualizations/FilterBox/FilterBox.jsx | 10 +-
36 files changed, 414 insertions(+), 287 deletions(-)
[incubator-superset] 02/02: everything together
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch hugh/ch229
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit c4af4fe0b70e4f4a7dc5589a5265b5ba8bff0b12
Author: hughhhh <hu...@gmail.com>
AuthorDate: Fri Dec 18 14:35:51 2020 -0500
everything together
---
superset-frontend/src/SqlLab/components/SqlEditor.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor.jsx b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
index 6fa58a7..6dc1a6b 100644
--- a/superset-frontend/src/SqlLab/components/SqlEditor.jsx
+++ b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
@@ -651,7 +651,7 @@ class SqlEditor extends React.PureComponent {
/>
</span>
)}
- {isFeatureEnabled(FeatureFlag.SCHEDULED_QUERIES) && (
+ {/* {isFeatureEnabled(FeatureFlag.SCHEDULED_QUERIES) && (
<span>
<ScheduleQueryButton
defaultLabel={qe.title}
@@ -664,8 +664,8 @@ class SqlEditor extends React.PureComponent {
disabled={!successful}
/>
</span>
- )}
- {ctasControls && <span>{ctasControls}</span>}
+ )} */}
+ {/* {ctasControls && <span>{ctasControls}</span>} */}
<span>
<LimitSelectStyled>
<Dropdown overlay={this.renderQueryLimit()}>