pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(explore): CUSTOM SQL tab should automatically update (#14194) 

* fix(explore): CUSTOM SQL tab should automatically update

* fix(explore): CUSTOM SQL tab should automatically update

* fix: lint

* fix(explore): default value

Co-authored-by: Yongjie Zhao <yongjiezhao@apache.org>

Co-authored-by: liuyaozong <liuyaozong@baijiahulian.com>
Co-authored-by: stephenLYZ <vueact@gmail.com>
Co-authored-by: Yongjie Zhao <yongjiezhao@apache.org>
This commit is contained in:
Yaozong Liu 2021-04-21 14:30:18 +08:00 committed by GitHub
parent 0dfb32cf08
commit 852e840575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
View File

@ -64,11 +64,13 @@ export default class AdhocFilterEditPopover extends React.Component {
this.onMouseUp = this.onMouseUp.bind(this);
this.onAdhocFilterChange = this.onAdhocFilterChange.bind(this);
this.adjustHeight = this.adjustHeight.bind(this);
this.onTabChange = this.onTabChange.bind(this);
this.state = {
adhocFilter: this.props.adhocFilter,
width: startingWidth,
height: startingHeight,
activeKey: this.props?.adhocFilter?.expressionType || 'SIMPLE',
};
this.popoverContentRef = React.createRef();
@ -118,6 +120,12 @@ export default class AdhocFilterEditPopover extends React.Component {
document.removeEventListener('mousemove', this.onMouseMove);
}
onTabChange(activeKey) {
this.setState({
activeKey,
});
}
adjustHeight(heightDifference) {
this.setState(state => ({ height: state.height + heightDifference }));
}
@ -154,6 +162,7 @@ export default class AdhocFilterEditPopover extends React.Component {
data-test="adhoc-filter-edit-tabs"
style={{ minHeight: this.state.height, width: this.state.width }}
allowOverflow
onChange={this.onTabChange}
>
<Tabs.TabPane
className="adhoc-filter-edit-tab"
@ -185,6 +194,7 @@ export default class AdhocFilterEditPopover extends React.Component {
onChange={this.onAdhocFilterChange}
options={this.props.options}
height={this.state.height}
activeKey={this.state.activeKey}
/>
) : (
<div className="custom-sql-disabled-message">

1
superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSqlTabContent/index.jsx
View File

@ -42,6 +42,7 @@ const propTypes = {
]),
).isRequired,
height: PropTypes.number.isRequired,
activeKey: PropTypes.string.isRequired,
};
export default class AdhocFilterEditPopoverSqlTabContent extends React.Component {