From c7a0153dd545a516f137128335a3fc53268bbe28 Mon Sep 17 00:00:00 2001 From: Gurveer Arora Date: Wed, 5 Sep 2018 14:20:38 +0100 Subject: [PATCH 1/2] Call load user functions on sign in --- src/components/App/App.js | 7 +++++-- src/components/App/AppContainer.js | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/App/App.js b/src/components/App/App.js index b48df431..de9ef37f 100644 --- a/src/components/App/App.js +++ b/src/components/App/App.js @@ -55,8 +55,11 @@ class App extends Component { } ], callbacks: { - signInSuccessWithAuthResult: res => - this.setState({loggedIn: res.user !== null}) + signInSuccessWithAuthResult: res => { + this.setState({loggedIn: res.user !== null}); + this.props.loadUsers(); + this.props.loadSlackUserReference(); + } } }; diff --git a/src/components/App/AppContainer.js b/src/components/App/AppContainer.js index 7990d6eb..e595bce2 100644 --- a/src/components/App/AppContainer.js +++ b/src/components/App/AppContainer.js @@ -1,9 +1,12 @@ import App from './App'; import {connect} from 'react-redux'; import {setDataController} from './actions'; +import {loadUsers, loadSlackUserReference} from '../Home/actions'; const mapDispatchToProps = { - setDataController + setDataController, + loadSlackUserReference, + loadUsers }; export default connect( From cbf0cd795e47e13a92c97f1dbcdc8bb09dfff422 Mon Sep 17 00:00:00 2001 From: Gurveer Arora Date: Wed, 5 Sep 2018 14:21:43 +0100 Subject: [PATCH 2/2] Props validation --- src/components/App/App.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/App/App.js b/src/components/App/App.js index de9ef37f..177e28d4 100644 --- a/src/components/App/App.js +++ b/src/components/App/App.js @@ -156,7 +156,9 @@ class App extends Component { } App.propTypes = { - setDataController: PropTypes.func.isRequired + setDataController: PropTypes.func.isRequired, + loadUsers: PropTypes.func.isRequired, + loadSlackUserReference: PropTypes.func.isRequired }; export default App;