QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-11 19:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix switching viz type to and from Filter box (#13094)

Browse Source 
* Fix switching viz_type to and from filter_box

* Remove RESET_FIELDS action

* Restore removed log

* Refactor reducer logic
This commit is contained in:
Kamil Gabryjelski
2021-02-15 17:05:40 +01:00
committed by GitHub
parent 2dbe92ba2f
commit d0b00bc08f
4 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
superset-frontend/src/explore/components/ExploreViewContainer.jsx
View File

@@ -17,7 +17,7 @@
* under the License.
*/
/* eslint camelcase: 0 */
import React, { useEffect, useState } from 'react';
import React, { useEffect, useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
@@ -165,7 +165,6 @@ function ExploreViewContainer(props) {
const windowSize = useWindowSize();
const [showingModal, setShowingModal] = useState(false);
const [chartIsStale, setChartIsStale] = useState(false);
const [isCollapsed, setIsCollapsed] = useState(false);
const width = `${windowSize.width}px`;
@@ -226,7 +225,6 @@ function ExploreViewContainer(props) {
props.actions.removeControlPanelAlert();
props.actions.triggerQuery(true, props.chart.id);
setChartIsStale(false);
addHistory();
}
@@ -301,9 +299,6 @@ function ExploreViewContainer(props) {
// effect to run when controls change
useEffect(() => {
if (previousControls) {
if (props.controls.viz_type.value !== previousControls.viz_type.value) {
props.actions.resetControls();
}
if (
props.controls.datasource &&
(previousControls.datasource == null ||
@@ -334,19 +329,32 @@ function ExploreViewContainer(props) {
props.actions.renderTriggered(new Date().getTime(), props.chart.id);
addHistory();
}
}
}, [props.controls]);
// this should be handled inside actions too
const hasQueryControlChanged = changedControlKeys.some(
const chartIsStale = useMemo(() => {
if (previousControls) {
const changedControlKeys = Object.keys(props.controls).filter(
key =>
typeof previousControls[key] !== 'undefined' &&
!areObjectsEqual(
props.controls[key].value,
previousControls[key].value,
),
);
return changedControlKeys.some(
key =>
!props.controls[key].renderTrigger &&
!props.controls[key].dontRefreshOnChange,
);
if (hasQueryControlChanged) {
props.actions.logEvent(LOG_ACTIONS_CHANGE_EXPLORE_CONTROLS);
setChartIsStale(true);
}
}
}, [props.controls]);
return false;
}, [previousControls, props.controls]);
if (chartIsStale) {
props.actions.logEvent(LOG_ACTIONS_CHANGE_EXPLORE_CONTROLS);
}
function renderErrorMessage() {
// Returns an error message as a node if any errors are in the store