Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Removes Redux state mutations - iteration 1 #23522

Merged
merged 3 commits into from
Mar 31, 2023
+14 −10
Merged

fix: Removes Redux state mutations - iteration 1 #23522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e20f424
fix: Removes Redux state mutations - iteration 1
michael-s-molina Mar 29, 2023
271dbbe
Deep clones layout object
michael-s-molina Mar 29, 2023
df9d21e
Uses spread operator
michael-s-molina Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions superset-frontend/src/components/Chart/chartReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
/* eslint camelcase: 0 */
import { t } from '@superset-ui/core';
import { omit } from 'lodash';
import { HYDRATE_DASHBOARD } from 'src/dashboard/actions/hydrate';
import { DatasourcesAction } from 'src/dashboard/actions/datasources';
import { ChartState } from 'src/explore/types';
Expand Down Expand Up @@ -180,8 +181,7 @@ export default function chartReducer(

/* eslint-disable no-param-reassign */
if (action.type === actions.REMOVE_CHART) {
delete charts[action.key];
return charts;
return omit(charts, [action.key]);
}
if (action.type === actions.UPDATE_CHART_ID) {
const { newId, key } = action;
Expand Down
5 changes: 3 additions & 2 deletions superset-frontend/src/dashboard/util/crossFilters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/

import { cloneDeep } from 'lodash';
import {
Behavior,
FeatureFlag,
Expand Down Expand Up @@ -60,7 +60,8 @@ export const getCrossFiltersConfiguration = (

if (behaviors.includes(Behavior.INTERACTIVE_CHART)) {
if (initialConfig[chartId]) {
chartConfiguration[chartId] = initialConfig[chartId];
// We need to clone to avoid mutating Redux state
chartConfiguration[chartId] = cloneDeep(initialConfig[chartId]);
}
if (!chartConfiguration[chartId]) {
chartConfiguration[chartId] = {
Expand Down
15 changes: 9 additions & 6 deletions superset-frontend/src/dashboard/util/updateComponentParentsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { logging } from '@superset-ui/core';

/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand All @@ -18,6 +16,8 @@ import { logging } from '@superset-ui/core';
* specific language governing permissions and limitations
* under the License.
*/
import { logging } from '@superset-ui/core';

export default function updateComponentParentsList({
currentComponent,
layout = {},
Expand All @@ -32,11 +32,14 @@ export default function updateComponentParentsList({

if (Array.isArray(currentComponent.children)) {
currentComponent.children.forEach(childId => {
const child = layout[childId];
if (child) {
child.parents = parentsList; // eslint-disable-line no-param-reassign
if (layout[childId]) {
// eslint-disable-next-line no-param-reassign
layout[childId] = {
...layout[childId],
parents: parentsList,
};
updateComponentParentsList({
currentComponent: child,
currentComponent: layout[childId],
layout,
});
} else {
Expand Down