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

Do not use persistState for explorev2 (#1894)

Browse Source 
* Do not use persistState for explorev2

* Change enhancerWithPersistState to enhancer and function name to initEnhancer
This commit is contained in:
vera-liu
2017-01-03 20:23:43 -08:00
committed by GitHub
parent a1e3fc1c23
commit 9bc7ad9cd5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset/assets/javascripts/SqlLab/index.jsx
View File

@@ -5,7 +5,7 @@ require('bootstrap');
import React from 'react';
import { render } from 'react-dom';
import { getInitialState, sqlLabReducer } from './reducers';
import { enhancer } from '../reduxUtils';
import { initEnhancer } from '../reduxUtils';
import { createStore, compose, applyMiddleware } from 'redux';
import { Provider } from 'react-redux';
import thunkMiddleware from 'redux-thunk';
@@ -20,7 +20,7 @@ const bootstrapData = JSON.parse(appContainer.getAttribute('data-bootstrap'));
const state = Object.assign({}, getInitialState(bootstrapData.defaultDbId), bootstrapData);
let store = createStore(
sqlLabReducer, state, compose(applyMiddleware(thunkMiddleware), enhancer()));
sqlLabReducer, state, compose(applyMiddleware(thunkMiddleware), initEnhancer()));
// jquery hack to highlight the navbar menu
$('a:contains("SQL Lab")').parent().addClass('active');

4
superset/assets/javascripts/explorev2/index.jsx
View File

@@ -6,7 +6,7 @@ import { createStore, applyMiddleware, compose } from 'redux';
import { Provider } from 'react-redux';
import thunk from 'redux-thunk';
import { now } from '../modules/dates';
import { enhancer } from '../reduxUtils';
import { initEnhancer } from '../reduxUtils';
// jquery and bootstrap required to make bootstrap dropdown menu's work
const $ = window.$ = require('jquery'); // eslint-disable-line
@@ -68,7 +68,7 @@ bootstrappedState.viz.form_data.filters =
getFilters(bootstrappedState.viz.form_data, bootstrapData.datasource_type);
const store = createStore(exploreReducer, bootstrappedState,
compose(applyMiddleware(thunk), enhancer())
compose(applyMiddleware(thunk), initEnhancer(false))
);
ReactDOM.render(

8
superset/assets/javascripts/reduxUtils.js
View File

@@ -64,15 +64,15 @@ export function addToArr(state, arrKey, obj) {
return Object.assign({}, state, newState);
}
export function enhancer() {
let enhancerWithPersistState = compose(persistState());
export function initEnhancer(persist = true) {
let enhancer = persist ? compose(persistState()) : compose();
if (process.env.NODE_ENV === 'dev') {
/* eslint-disable no-underscore-dangle */
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
/* eslint-enable */
enhancerWithPersistState = composeEnhancers(persistState());
enhancer = persist ? composeEnhancers(persistState()) : composeEnhancers();
}
return enhancerWithPersistState;
return enhancer;
}
export function areArraysShallowEqual(arr1, arr2) {