fix(native-filters): Fix "undefined" error after editing a filter (#14984)

* fix(native-filters): Fix "undefined" error after editing a filter

* Remove console log
This commit is contained in:
Kamil Gabryjelski 2021-06-04 15:15:37 +02:00 committed by GitHub
parent 6955ed287b
commit 8c01c13d90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -85,11 +85,19 @@ export const setFilterConfiguration = (
endpoint: `/api/v1/dashboard/${id}`, endpoint: `/api/v1/dashboard/${id}`,
}); });
const mergedFilterConfig = filterConfig.map(filter => {
const oldFilter = oldFilters[filter.id];
if (!oldFilter) {
return filter;
}
return { ...oldFilter, ...filter };
});
try { try {
const response = await updateDashboard({ const response = await updateDashboard({
json_metadata: JSON.stringify({ json_metadata: JSON.stringify({
...metadata, ...metadata,
native_filter_configuration: filterConfig, native_filter_configuration: mergedFilterConfig,
}), }),
}); });
dispatch( dispatch(
@ -99,12 +107,20 @@ export const setFilterConfiguration = (
); );
dispatch({ dispatch({
type: SET_FILTER_CONFIG_COMPLETE, type: SET_FILTER_CONFIG_COMPLETE,
filterConfig, filterConfig: mergedFilterConfig,
}); });
dispatch(setDataMaskForFilterConfigComplete(filterConfig, oldFilters)); dispatch(
setDataMaskForFilterConfigComplete(mergedFilterConfig, oldFilters),
);
} catch (err) { } catch (err) {
dispatch({ type: SET_FILTER_CONFIG_FAIL, filterConfig }); dispatch({
dispatch({ type: SET_DATA_MASK_FOR_FILTER_CONFIG_FAIL, filterConfig }); type: SET_FILTER_CONFIG_FAIL,
filterConfig: mergedFilterConfig,
});
dispatch({
type: SET_DATA_MASK_FOR_FILTER_CONFIG_FAIL,
filterConfig: mergedFilterConfig,
});
} }
}; };