This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 03e4a5b fix(native-filters): Update filter saving (#14370)
03e4a5b is described below
commit 03e4a5b6b7e070fbc09c1653157a056e009477d5
Author: simcha90 <[email protected]>
AuthorDate: Tue Apr 27 11:20:04 2021 +0300
fix(native-filters): Update filter saving (#14370)
* fix:fix get permission function
* fix: not reload charts after save filters
* fix: not reload charts after save filters
* fix: temp commit type
* lint: add typing
---
.../nativeFilters/FiltersConfigModal/utils.ts | 4 +++-
.../containers/{Dashboard.jsx => Dashboard.ts} | 19 ++++++++++---------
superset-frontend/src/dashboard/types.ts | 8 +++++++-
.../src/dashboard/util/activeAllDashboardFilters.ts | 17 +++++++++++++++--
superset-frontend/src/dataMask/reducer.ts | 14 ++++++++++++--
superset-frontend/src/dataMask/types.ts | 2 +-
6 files changed, 48 insertions(+), 16 deletions(-)
diff --git
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
index 9c71a8c..659baa8 100644
---
a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
+++
b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/utils.ts
@@ -197,7 +197,9 @@ export const createHandleTabEdit = (
}
};
-export const generateFilterId = () => `NATIVE_FILTER-${shortid.generate()}`;
+export const NATIVE_FILTER_PREFIX = 'NATIVE_FILTER-';
+export const generateFilterId = () =>
+ `${NATIVE_FILTER_PREFIX}${shortid.generate()}`;
export const getFilterIds = (config: FilterConfiguration) =>
config.map(filter => filter.id);
diff --git a/superset-frontend/src/dashboard/containers/Dashboard.jsx
b/superset-frontend/src/dashboard/containers/Dashboard.ts
similarity index 86%
rename from superset-frontend/src/dashboard/containers/Dashboard.jsx
rename to superset-frontend/src/dashboard/containers/Dashboard.ts
index 98c58d2..526223d 100644
--- a/superset-frontend/src/dashboard/containers/Dashboard.jsx
+++ b/superset-frontend/src/dashboard/containers/Dashboard.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { bindActionCreators } from 'redux';
+import { bindActionCreators, Dispatch } from 'redux';
import { connect } from 'react-redux';
import Dashboard from '../components/Dashboard';
@@ -28,9 +28,13 @@ import {
import { triggerQuery } from '../../chart/chartAction';
import { logEvent } from '../../logger/actions';
import { getActiveFilters } from '../util/activeDashboardFilters';
-import { getAllActiveFilters } from '../util/activeAllDashboardFilters';
+import {
+ getAllActiveFilters,
+ getRelevantDataMask,
+} from '../util/activeAllDashboardFilters';
+import { RootState } from '../types';
-function mapStateToProps(state) {
+function mapStateToProps(state: RootState) {
const {
datasources,
sliceEntities,
@@ -62,21 +66,18 @@ function mapStateToProps(state) {
// eslint-disable-next-line camelcase
chartConfiguration: dashboardInfo.metadata?.chart_configuration,
nativeFilters: nativeFilters.filters,
- dataMask,
+ dataMask: getRelevantDataMask(dataMask, 'isApplied'),
layout: dashboardLayout.present,
}),
},
- ownDataCharts: Object.values(dataMask).reduce(
- (prev, next) => ({ ...prev, [next.id]: next.ownState }),
- {},
- ),
+ ownDataCharts: getRelevantDataMask(dataMask, 'ownState', 'ownState'),
slices: sliceEntities.slices,
layout: dashboardLayout.present,
impressionId,
};
}
-function mapDispatchToProps(dispatch) {
+function mapDispatchToProps(dispatch: Dispatch) {
return {
actions: bindActionCreators(
{
diff --git a/superset-frontend/src/dashboard/types.ts
b/superset-frontend/src/dashboard/types.ts
index e74fb43..7731a7a 100644
--- a/superset-frontend/src/dashboard/types.ts
+++ b/superset-frontend/src/dashboard/types.ts
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { ChartProps } from '@superset-ui/core';
+import { ChartProps, JsonObject } from '@superset-ui/core';
import { chart } from 'src/chart/chartReducer';
import componentTypes from 'src/dashboard/util/componentTypes';
import { DataMaskStateWithId } from '../dataMask/types';
+import { NativeFiltersState } from './reducers/types';
export type ChartReducerInitialState = typeof chart;
@@ -46,11 +47,16 @@ export type DashboardState = { editMode: boolean;
directPathToChild: string[] };
/** Root state of redux */
export type RootState = {
+ datasources: JsonObject;
+ sliceEntities: JsonObject;
charts: { [key: string]: Chart };
dashboardLayout: DashboardLayoutState;
dashboardFilters: {};
dashboardState: DashboardState;
dataMask: DataMaskStateWithId;
+ dashboardInfo: JsonObject;
+ impressionId: string;
+ nativeFilters: NativeFiltersState;
};
/** State of dashboardLayout in redux */
diff --git a/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
b/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
index 54fce7f..c3210aa 100644
--- a/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
+++ b/superset-frontend/src/dashboard/util/activeAllDashboardFilters.ts
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+import { DataMaskStateWithId } from 'src/dataMask/types';
+import { JsonObject } from '@superset-ui/core';
import { CHART_TYPE } from './componentTypes';
import { Scope } from '../components/nativeFilters/types';
import { ActiveFilters, LayoutItem } from '../types';
import { ChartConfiguration, Filters } from '../reducers/types';
import { DASHBOARD_ROOT_ID } from './constants';
-import { DataMaskStateWithId } from '../../dataMask/types';
// Looking for affected chart scopes and values
export const findAffectedCharts = ({
@@ -71,6 +72,18 @@ export const findAffectedCharts = ({
);
};
+export const getRelevantDataMask = (
+ dataMask: DataMaskStateWithId,
+ filterBy: string,
+ prop?: string,
+): JsonObject | DataMaskStateWithId =>
+ Object.values(dataMask)
+ .filter(item => item[filterBy])
+ .reduce(
+ (prev, next) => ({ ...prev, [next.id]: prop ? next[prop] : next }),
+ {},
+ );
+
export const getAllActiveFilters = ({
chartConfiguration,
nativeFilters,
@@ -92,7 +105,7 @@ export const getAllActiveFilters = ({
excluded: [filterId],
};
// Iterate over all roots to find all affected charts
- scope.rootPath.forEach(layoutItemId => {
+ scope.rootPath.forEach((layoutItemId: string | number) => {
layout[layoutItemId].children.forEach((child: string) => {
// Need exclude from affected charts, charts that located in scope
`excluded`
findAffectedCharts({
diff --git a/superset-frontend/src/dataMask/reducer.ts
b/superset-frontend/src/dataMask/reducer.ts
index 6177cbd..22c3e66 100644
--- a/superset-frontend/src/dataMask/reducer.ts
+++ b/superset-frontend/src/dataMask/reducer.ts
@@ -26,6 +26,8 @@ import {
SET_DATA_MASK_FOR_FILTER_CONFIG_COMPLETE,
UPDATE_DATA_MASK,
} from './actions';
+import { NATIVE_FILTER_PREFIX } from
'../dashboard/components/nativeFilters/FiltersConfigModal/utils';
+import { Filter } from '../dashboard/components/nativeFilters/types';
export function getInitialDataMask(id: string): DataMaskWithId {
return {
@@ -33,6 +35,7 @@ export function getInitialDataMask(id: string):
DataMaskWithId {
extraFormData: {},
filterState: {},
ownState: {},
+ isApplied: false,
};
}
@@ -42,17 +45,24 @@ const dataMaskReducer = produce(
switch (action.type) {
case UPDATE_DATA_MASK:
draft[action.filterId] = {
+ ...getInitialDataMask(action.filterId),
...draft[action.filterId],
...action.dataMask,
- id: action.filterId,
+ isApplied: true,
};
return draft;
case SET_DATA_MASK_FOR_FILTER_CONFIG_COMPLETE:
- (action.filterConfig ?? []).forEach(filter => {
+ (action.filterConfig ?? []).forEach((filter: Filter) => {
cleanState[filter.id] =
draft[filter.id] ?? getInitialDataMask(filter.id);
});
+ // Get back all other non-native filters
+ Object.values(draft).forEach(filter => {
+ if (!String(filter?.id).startsWith(NATIVE_FILTER_PREFIX)) {
+ cleanState[filter?.id] = filter;
+ }
+ });
return cleanState;
default:
diff --git a/superset-frontend/src/dataMask/types.ts
b/superset-frontend/src/dataMask/types.ts
index f9e4cef..2e335b2 100644
--- a/superset-frontend/src/dataMask/types.ts
+++ b/superset-frontend/src/dataMask/types.ts
@@ -25,5 +25,5 @@ export enum DataMaskType {
export type DataMaskState = { [id: string]: DataMask };
-export type DataMaskWithId = DataMask & { id: string };
+export type DataMaskWithId = { id: string; isApplied?: boolean } & DataMask;
export type DataMaskStateWithId = { [filterId: string]: DataMaskWithId };
