Skip to content

Commit

Permalink
Revert "fix(native-filters): Fix update ownState (#17181)" (#17311)
Browse files Browse the repository at this point in the history
This reverts commit cf284ba.
  • Loading branch information
Erik Ritter authored Nov 2, 2021
1 parent b3f0abf commit 7c6d6f4
Showing 1 changed file with 24 additions and 57 deletions.
81 changes: 24 additions & 57 deletions superset-frontend/src/dashboard/components/Dashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -220,55 +220,6 @@ class Dashboard extends React.PureComponent {
return Object.values(this.props.charts);
}

isFilterKeyRemoved(filterKey) {
const { appliedFilters } = this;
const { activeFilters } = this.props;

// refresh charts if a filter was removed, added, or changed
const currFilterKeys = Object.keys(activeFilters);
const appliedFilterKeys = Object.keys(appliedFilters);

return (
!currFilterKeys.includes(filterKey) &&
appliedFilterKeys.includes(filterKey)
);
}

isFilterKeyNewlyAdded(filterKey) {
const { appliedFilters } = this;
const appliedFilterKeys = Object.keys(appliedFilters);

return !appliedFilterKeys.includes(filterKey);
}

isFilterKeyChangedValue(filterKey) {
const { appliedFilters } = this;
const { activeFilters } = this.props;

return !areObjectsEqual(
appliedFilters[filterKey].values,
activeFilters[filterKey].values,
{
ignoreUndefined: true,
},
);
}

isFilterKeyChangedScope(filterKey) {
const { appliedFilters } = this;
const { activeFilters } = this.props;

return !areObjectsEqual(
appliedFilters[filterKey].scope,
activeFilters[filterKey].scope,
);
}

hasFilterKeyValues(filterKey) {
const { appliedFilters } = this;
return Object.keys(appliedFilters[filterKey]?.values ?? []).length;
}

applyFilters() {
const { appliedFilters } = this;
const { activeFilters, ownDataCharts } = this.props;
Expand All @@ -284,21 +235,37 @@ class Dashboard extends React.PureComponent {
);
[...allKeys].forEach(filterKey => {
if (
this.isFilterKeyRemoved(filterKey) ||
this.isFilterKeyNewlyAdded(filterKey)
!currFilterKeys.includes(filterKey) &&
appliedFilterKeys.includes(filterKey)
) {
// check if there are values in filter, if no, there is was added only ownState, so no need reload other charts
if (this.hasFilterKeyValues(filterKey)) {
affectedChartIds.push(...appliedFilters[filterKey].scope);
}
// filterKey is removed?
affectedChartIds.push(...appliedFilters[filterKey].scope);
} else if (!appliedFilterKeys.includes(filterKey)) {
// filterKey is newly added?
affectedChartIds.push(...activeFilters[filterKey].scope);
} else {
// if filterKey changes value,
// update charts in its scope
if (this.isFilterKeyChangedValue(filterKey)) {
if (
!areObjectsEqual(
appliedFilters[filterKey].values,
activeFilters[filterKey].values,
{
ignoreUndefined: true,
},
)
) {
affectedChartIds.push(...activeFilters[filterKey].scope);
}

// if filterKey changes scope,
// update all charts in its scope
if (this.isFilterKeyChangedScope(filterKey)) {
if (
!areObjectsEqual(
appliedFilters[filterKey].scope,
activeFilters[filterKey].scope,
)
) {
const chartsInScope = (activeFilters[filterKey].scope || []).concat(
appliedFilters[filterKey].scope || [],
);
Expand Down

0 comments on commit 7c6d6f4

Please sign in to comment.