From 99b2b8633db4fa3fa21d43f3e6a27694b00908e4 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Jun 2016 12:20:32 +0800 Subject: [web] settings store --- web/src/js/components/ProxyApp.jsx | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'web/src/js/components') diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx index 81272268..d7f640a3 100644 --- a/web/src/js/components/ProxyApp.jsx +++ b/web/src/js/components/ProxyApp.jsx @@ -7,7 +7,6 @@ import { Splitter } from "./common.js" import Header from "./Header" import EventLog from "./EventLog" import Footer from "./Footer" -import { SettingsStore } from "../store/store.js" import { Key } from "../utils.js" class ProxyAppMain extends Component { @@ -24,17 +23,9 @@ class ProxyAppMain extends Component { constructor(props, context) { super(props, context) - this.settingsStore = new SettingsStore() - - // Default Settings before fetch - _.extend(this.settingsStore.dict, {}) - - this.state = { settings: this.settingsStore.dict } - this.focus = this.focus.bind(this) this.onKeyDown = this.onKeyDown.bind(this) this.updateLocation = this.updateLocation.bind(this) - this.onSettingsChange = this.onSettingsChange.bind(this) } /** @@ -61,29 +52,11 @@ class ProxyAppMain extends Component { } /** - * @todo remove settings store * @todo connect websocket here * @todo listen to window's key events */ componentDidMount() { this.focus() - this.settingsStore.addListener("recalculate", this.onSettingsChange) - } - - /** - * @todo remove settings store - * @todo disconnect websocket here - * @todo stop listening to window's key events - */ - componentWillUnmount() { - this.settingsStore.removeListener("recalculate", this.onSettingsChange) - } - - /** - * @todo move to actions - */ - onSettingsChange() { - this.setState({ settings: this.settingsStore.dict }) } /** @@ -143,8 +116,7 @@ class ProxyAppMain extends Component { } render() { - const { showEventLog, location, children } = this.props - const { settings } = this.state + const { showEventLog, location, children, settings } = this.props const query = this.getQuery() return (
@@ -165,6 +137,7 @@ class ProxyAppMain extends Component { export default connect( state => ({ - showEventLog: state.eventLog.visible + showEventLog: state.eventLog.visible, + settings: state.settings.settings, }) )(ProxyAppMain) -- cgit v1.2.3 From 6ad2f13341208b8460eae0dd0105c3109e773bae Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jun 2016 06:01:29 +0800 Subject: [web] fix settings ducks --- web/src/js/components/ProxyApp.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'web/src/js/components') diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx index d7f640a3..1d27614f 100644 --- a/web/src/js/components/ProxyApp.jsx +++ b/web/src/js/components/ProxyApp.jsx @@ -3,6 +3,7 @@ import ReactDOM from "react-dom" import _ from "lodash" import { connect } from 'react-redux' +import { fetch as fetchSettings } from '../ducks/settings' import { Splitter } from "./common.js" import Header from "./Header" import EventLog from "./EventLog" @@ -51,6 +52,10 @@ class ProxyAppMain extends Component { return _.clone(this.props.location.query) } + componentWillMount() { + this.props.fetchSettings(); + } + /** * @todo connect websocket here * @todo listen to window's key events @@ -139,5 +144,8 @@ export default connect( state => ({ showEventLog: state.eventLog.visible, settings: state.settings.settings, - }) + }), + { + fetchSettings, + } )(ProxyAppMain) -- cgit v1.2.3 From ce53799c623a8ac74631f6fc4ab8fb134bff1cc8 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 17 Jun 2016 21:03:19 -0700 Subject: simplify settings reducer --- web/src/js/components/ProxyApp.jsx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'web/src/js/components') diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx index 8129b0f0..39cadff5 100644 --- a/web/src/js/components/ProxyApp.jsx +++ b/web/src/js/components/ProxyApp.jsx @@ -3,7 +3,6 @@ import ReactDOM from 'react-dom' import _ from 'lodash' import { connect } from 'react-redux' -import { fetch as fetchSettings } from '../ducks/settings' import Header from './Header' import EventLog from './EventLog' import Footer from './Footer' @@ -50,12 +49,7 @@ class ProxyAppMain extends Component { return _.clone(this.props.location.query) } - componentWillMount() { - this.props.fetchSettings(); - } - /** - * @todo connect websocket here * @todo listen to window's key events */ componentDidMount() { @@ -139,8 +133,5 @@ export default connect( state => ({ showEventLog: state.eventLog.visible, settings: state.settings.settings, - }), - { - fetchSettings, - } + }) )(ProxyAppMain) -- cgit v1.2.3 From f203936fbf51b04f424666f9d2dd63bce8c84404 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 17 Jun 2016 21:06:17 -0700 Subject: add setInterceptPattern action creator --- web/src/js/components/Header/MainMenu.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'web/src/js/components') diff --git a/web/src/js/components/Header/MainMenu.jsx b/web/src/js/components/Header/MainMenu.jsx index 86bf961a..7b0b542c 100644 --- a/web/src/js/components/Header/MainMenu.jsx +++ b/web/src/js/components/Header/MainMenu.jsx @@ -1,9 +1,10 @@ import React, { Component, PropTypes } from 'react' -import { SettingsActions } from "../../actions.js" import FilterInput from './FilterInput' import { Query } from '../../actions.js' +import {setInterceptPattern} from "../../ducks/settings" +import { connect } from 'react-redux' -export default class MainMenu extends Component { +class MainMenu extends Component { static title = 'Start' static route = 'flows' @@ -28,7 +29,7 @@ export default class MainMenu extends Component { } onInterceptChange(val) { - SettingsActions.update({ intercept: val }) + this.props.setInterceptPattern(val); } render() { @@ -71,3 +72,7 @@ export default class MainMenu extends Component { ) } } + +export default connect(undefined, { + setInterceptPattern +})(MainMenu); -- cgit v1.2.3