QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-22 09:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix https://github.com/apache/incubator-superset/issues/3422 (#3440)

Browse Source
This commit is contained in:
Grace Guo
2017-09-12 12:06:22 -07:00
committed by Maxime Beauchemin
parent 3c0e85e2c0
commit 2d6b9422c6
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
superset/assets/javascripts/SqlLab/actions.js
View File

@@ -20,6 +20,8 @@ export const QUERY_EDITOR_SET_TITLE = 'QUERY_EDITOR_SET_TITLE';
export const QUERY_EDITOR_SET_AUTORUN = 'QUERY_EDITOR_SET_AUTORUN';
export const QUERY_EDITOR_SET_SQL = 'QUERY_EDITOR_SET_SQL';
export const QUERY_EDITOR_SET_SELECTED_TEXT = 'QUERY_EDITOR_SET_SELECTED_TEXT';
export const QUERY_EDITOR_PERSIST_HEIGHT = 'QUERY_EDITOR_PERSIST_HEIGHT';
export const SET_DATABASES = 'SET_DATABASES';
export const SET_ACTIVE_QUERY_EDITOR = 'SET_ACTIVE_QUERY_EDITOR';
export const SET_ACTIVE_SOUTHPANE_TAB = 'SET_ACTIVE_SOUTHPANE_TAB';
@@ -346,6 +348,10 @@ export function refreshQueries(alteredQueries) {
return { type: REFRESH_QUERIES, alteredQueries };
}
export function persistEditorHeight(queryEditor, currentHeight) {
return { type: QUERY_EDITOR_PERSIST_HEIGHT, queryEditor, currentHeight };
}
export function popStoredQuery(urlId) {
return function (dispatch) {
$.ajax({

6
superset/assets/javascripts/SqlLab/components/SqlEditor.jsx
View File

@@ -67,6 +67,10 @@ class SqlEditor extends React.PureComponent {
southPaneHeight: height - this.refs.ace.clientHeight,
height,
});
if (this.refs.ace.clientHeight) {
this.props.actions.persistEditorHeight(this.props.queryEditor, this.refs.ace.clientHeight);
}
}
setQueryEditorSql(sql) {
this.props.actions.queryEditorSetSql(this.props.queryEditor, sql);
@@ -191,7 +195,7 @@ class SqlEditor extends React.PureComponent {
}
render() {
const height = this.sqlEditorHeight();
const defaultNorthHeight = 200;
const defaultNorthHeight = this.props.queryEditor.height || 200;
return (
<div
className="SqlEditor"

3
superset/assets/javascripts/SqlLab/reducers.js
View File

@@ -216,6 +216,9 @@ export const sqlLabReducer = function (state, action) {
[actions.QUERY_EDITOR_SET_AUTORUN]() {
return alterInArr(state, 'queryEditors', action.queryEditor, { autorun: action.autorun });
},
[actions.QUERY_EDITOR_PERSIST_HEIGHT]() {
return alterInArr(state, 'queryEditors', action.queryEditor, { height: action.currentHeight });
},
[actions.ADD_ALERT]() {
return addToArr(state, 'alerts', action.alert);
},