From 258788fd88937bc4320b85ece4365166b50f42f0 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Tue, 21 Nov 2017 11:05:53 +0100 Subject: [PATCH] Add updatePending and errors to admin settings slots --- .../src/routes/Configure/components/ModerationSettings.js | 5 ++++- .../src/routes/Configure/components/StreamSettings.js | 4 +++- .../src/routes/Configure/components/TechSettings.js | 5 ++++- .../src/routes/Configure/containers/ModerationSettings.js | 6 +++++- .../src/routes/Configure/containers/TechSettings.js | 6 +++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/client/coral-admin/src/routes/Configure/components/ModerationSettings.js b/client/coral-admin/src/routes/Configure/components/ModerationSettings.js index f5db719bb..94aa7d923 100644 --- a/client/coral-admin/src/routes/Configure/components/ModerationSettings.js +++ b/client/coral-admin/src/routes/Configure/components/ModerationSettings.js @@ -39,7 +39,7 @@ class ModerationSettings extends React.Component { }; render() { - const {settings, data, root} = this.props; + const {settings, data, root, updatePending, errors} = this.props; return ( ); @@ -82,6 +84,7 @@ class ModerationSettings extends React.Component { ModerationSettings.propTypes = { updatePending: PropTypes.func.isRequired, + errors: PropTypes.object.isRequired, data: PropTypes.object.isRequired, root: PropTypes.object.isRequired, settings: PropTypes.object.isRequired, diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js index 9c05711cb..ea2c570bb 100644 --- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js +++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js @@ -100,7 +100,7 @@ class StreamSettings extends React.Component { }; render() { - const {settings, data, root, errors} = this.props; + const {settings, data, root, errors, updatePending} = this.props; return ( ); diff --git a/client/coral-admin/src/routes/Configure/components/TechSettings.js b/client/coral-admin/src/routes/Configure/components/TechSettings.js index 7f16b6064..1b783c9ec 100644 --- a/client/coral-admin/src/routes/Configure/components/TechSettings.js +++ b/client/coral-admin/src/routes/Configure/components/TechSettings.js @@ -31,7 +31,7 @@ class TechSettings extends React.Component { }; render() { - const {settings, data, root} = this.props; + const {settings, data, root, errors, updatePending} = this.props; return ( ); @@ -59,6 +61,7 @@ class TechSettings extends React.Component { TechSettings.propTypes = { updatePending: PropTypes.func.isRequired, + errors: PropTypes.object.isRequired, data: PropTypes.object.isRequired, root: PropTypes.object.isRequired, settings: PropTypes.object.isRequired, diff --git a/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js b/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js index 0583378a9..61538f4c0 100644 --- a/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js +++ b/client/coral-admin/src/routes/Configure/containers/ModerationSettings.js @@ -10,6 +10,10 @@ const slots = [ 'adminModerationSettings', ]; +const mapStateToProps = (state) => ({ + errors: state.configure.errors, +}); + const mapDispatchToProps = (dispatch) => bindActionCreators({ updatePending, @@ -36,5 +40,5 @@ export default compose( } ` }), - connect(null, mapDispatchToProps), + connect(mapStateToProps, mapDispatchToProps), )(ModerationSettings); diff --git a/client/coral-admin/src/routes/Configure/containers/TechSettings.js b/client/coral-admin/src/routes/Configure/containers/TechSettings.js index df33a3f9a..1f5ac20b8 100644 --- a/client/coral-admin/src/routes/Configure/containers/TechSettings.js +++ b/client/coral-admin/src/routes/Configure/containers/TechSettings.js @@ -10,6 +10,10 @@ const slots = [ 'adminTechSettings', ]; +const mapStateToProps = (state) => ({ + errors: state.configure.errors, +}); + const mapDispatchToProps = (dispatch) => bindActionCreators({ updatePending, @@ -33,5 +37,5 @@ export default compose( } ` }), - connect(null, mapDispatchToProps), + connect(mapStateToProps, mapDispatchToProps), )(TechSettings);