This is an automated email from the ASF dual-hosted git repository.
graceguo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git.
from c87a140 add Switzerland to country selection (#8592)
add ff6ab10 [Feature] Dashboard scoped filter (#8590)
No new revisions were added by this update.
Summary of changes:
superset/assets/package-lock.json | 11 +
superset/assets/package.json | 1 +
.../dashboard/actions/dashboardLayout_spec.js | 70 ++-
.../dashboard/components/Dashboard_spec.jsx | 121 +----
.../components/FilterIndicatorsContainer_spec.jsx | 43 +-
.../dashboard/fixtures/mockDashboardFilters.js | 6 +-
.../dashboard/fixtures/mockDashboardLayout.js | 53 ++-
.../dashboard/reducers/dashboardFilters_spec.js | 51 +-
.../dashboard/util/getDashboardUrl_spec.js | 8 +-
.../util/getFilterScopeFromNodesTree_spec.js | 216 +++++++++
.../util/getFormDataWithExtraFilters_spec.js | 32 +-
.../{SqlLab/index.jsx => components/ChartIcon.jsx} | 14 +-
superset/assets/src/components/CheckboxIcons.jsx | 40 ++
superset/assets/src/components/ModalTrigger.jsx | 2 +
.../src/dashboard/actions/dashboardFilters.js | 16 +
.../src/dashboard/actions/dashboardLayout.js | 40 +-
.../assets/src/dashboard/actions/dashboardState.js | 17 +-
.../assets/src/dashboard/components/Dashboard.jsx | 82 ++--
.../dashboard/components/DeleteComponentModal.jsx | 4 +-
.../components/FilterIndicatorsContainer.jsx | 94 ++--
.../assets/src/dashboard/components/Header.jsx | 14 +-
.../dashboard/components/HeaderActionsDropdown.jsx | 6 +-
.../assets/src/dashboard/components/SaveModal.jsx | 4 -
.../src/dashboard/components/SliceHeader.jsx | 2 -
.../dashboard/components/SliceHeaderControls.jsx | 5 +-
.../components/filterscope/FilterFieldItem.jsx} | 22 +-
.../components/filterscope/FilterFieldTree.jsx | 71 +++
.../FilterScopeModal.jsx} | 39 +-
.../components/filterscope/FilterScopeSelector.jsx | 528 +++++++++++++++++++++
.../components/filterscope/FilterScopeTree.jsx | 71 +++
.../filterscope/renderFilterFieldTreeNodes.jsx} | 56 ++-
.../filterscope/renderFilterScopeTreeNodes.jsx | 74 +++
.../components/filterscope/treeIcons.jsx} | 52 +-
.../dashboard/components/gridComponents/Chart.jsx | 16 +-
superset/assets/src/dashboard/containers/Chart.jsx | 11 +-
.../assets/src/dashboard/containers/Dashboard.jsx | 10 +-
.../src/dashboard/containers/DashboardHeader.jsx | 2 -
.../src/dashboard/containers/FilterIndicators.jsx | 6 +-
.../{DashboardGrid.jsx => FilterScope.jsx} | 23 +-
.../src/dashboard/reducers/dashboardFilters.js | 73 ++-
.../src/dashboard/reducers/dashboardLayout.js | 1 +
.../src/dashboard/reducers/getInitialState.js | 50 +-
.../src/dashboard/stylesheets/dashboard.less | 17 +-
.../stylesheets/filter-scope-selector.less | 268 +++++++++++
.../assets/src/dashboard/stylesheets/index.less | 1 +
.../src/dashboard/util/activeDashboardFilters.js | 132 +++++-
.../dashboard/util/buildFilterScopeTreeEntry.js | 65 +++
.../util/charts/getEffectiveExtraFilters.js | 47 +-
.../util/charts/getFormDataWithExtraFilters.js | 13 +-
superset/assets/src/dashboard/util/constants.js | 3 +
.../src/dashboard/util/dashboardFiltersColorMap.js | 8 +-
.../util/getDashboardFilterKey.js} | 12 +-
.../assets/src/dashboard/util/getDashboardUrl.js | 9 +-
.../util/getFilterFieldNodesTree.js} | 48 +-
.../dashboard/util/getFilterScopeFromNodesTree.js | 126 +++++
.../src/dashboard/util/getFilterScopeNodesTree.js | 128 +++++
.../util/getFilterScopeParentNodes.js} | 29 +-
.../getFilterValuesByFilterId.js} | 50 +-
.../util/getKeyForFilterScopeTree.js} | 13 +-
.../src/dashboard/util/getRevertedFilterScope.js | 49 ++
.../util/getSelectedChartIdForFilterScopeTree.js | 53 +++
.../util/isInDifferentFilterScopes.js} | 21 +-
.../src/dashboard/util/newEntitiesFromDrop.js | 4 +
superset/assets/src/dashboard/util/propShapes.jsx | 52 +-
.../serializeActiveFilterValues.js} | 30 +-
.../dashboard/util/serializeFilterScopes.js} | 25 +-
.../src/visualizations/FilterBox/FilterBox.css | 2 +-
.../src/visualizations/FilterBox/FilterBox.jsx | 5 +-
superset/views/core.py | 14 +-
69 files changed, 2619 insertions(+), 662 deletions(-)
create mode 100644
superset/assets/spec/javascripts/dashboard/util/getFilterScopeFromNodesTree_spec.js
copy superset/assets/src/{SqlLab/index.jsx => components/ChartIcon.jsx} (64%)
create mode 100644 superset/assets/src/components/CheckboxIcons.jsx
copy superset/assets/src/{components/FilterBadgeIcon.jsx =>
dashboard/components/filterscope/FilterFieldItem.jsx} (62%)
create mode 100644
superset/assets/src/dashboard/components/filterscope/FilterFieldTree.jsx
copy superset/assets/src/dashboard/components/{CodeModal.jsx =>
filterscope/FilterScopeModal.jsx} (59%)
create mode 100644
superset/assets/src/dashboard/components/filterscope/FilterScopeSelector.jsx
create mode 100644
superset/assets/src/dashboard/components/filterscope/FilterScopeTree.jsx
copy superset/assets/src/{explore/controlPanels/FilterBox.jsx =>
dashboard/components/filterscope/renderFilterFieldTreeNodes.jsx} (50%)
create mode 100644
superset/assets/src/dashboard/components/filterscope/renderFilterScopeTreeNodes.jsx
copy superset/assets/src/{SqlLab/components/QueryHistory.jsx =>
dashboard/components/filterscope/treeIcons.jsx} (51%)
copy superset/assets/src/dashboard/containers/{DashboardGrid.jsx =>
FilterScope.jsx} (71%)
create mode 100644
superset/assets/src/dashboard/stylesheets/filter-scope-selector.less
create mode 100644
superset/assets/src/dashboard/util/buildFilterScopeTreeEntry.js
copy superset/assets/src/{components/RefreshLabel.less =>
dashboard/util/getDashboardFilterKey.js} (73%)
copy superset/assets/src/{explore/controlPanels/FilterBox.jsx =>
dashboard/util/getFilterFieldNodesTree.js} (51%)
create mode 100644
superset/assets/src/dashboard/util/getFilterScopeFromNodesTree.js
create mode 100644
superset/assets/src/dashboard/util/getFilterScopeNodesTree.js
copy superset/assets/src/{messageToasts/reducers/index.js =>
dashboard/util/getFilterScopeParentNodes.js} (62%)
copy superset/assets/src/dashboard/{stylesheets/components/markdown.less =>
util/getFilterValuesByFilterId.js} (58%)
copy superset/assets/src/{explore/components/controls/FilterPanel.tsx =>
dashboard/util/getKeyForFilterScopeTree.js} (76%)
create mode 100644 superset/assets/src/dashboard/util/getRevertedFilterScope.js
create mode 100644
superset/assets/src/dashboard/util/getSelectedChartIdForFilterScopeTree.js
copy superset/assets/src/{components/BootstrapSliderWrapper.jsx =>
dashboard/util/isInDifferentFilterScopes.js} (64%)
copy superset/assets/src/dashboard/{reducers/datasources.js =>
util/serializeActiveFilterValues.js} (58%)
copy superset/assets/{spec/javascripts/dashboard/util/getDashboardUrl_spec.js
=> src/dashboard/util/serializeFilterScopes.js} (67%)
