Connects the sync component directly to redux and removes the passing…

… of global state and dispatchers
C3-TKO · Jul 15, 2016 · 85ead15 · 85ead15
1 parent 945bc7a
commit 85ead15
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/src/components/Main.js b/src/components/Main.js
@@ -139,7 +139,6 @@ class AppComponent extends React.Component {
           goto={this.goto}
 
           settings={settings}
-          actionEditSettings={actions.editSettings}
           actionAddSlide={actions.addSlide}
           actionEditSlide={actions.editSlide}
           actionDeleteSlide={actions.deleteSlide}

diff --git a/src/components/MenuComponent.js b/src/components/MenuComponent.js
@@ -88,7 +88,6 @@ class MenuComponent extends React.Component {
           <SettingsComponent
             slides={this.props.slides}
             settings={this.props.settings}
-            actionEditSettings={this.props.actionEditSettings}
             actionAddSlide={this.props.actionAddSlide}
             actionEditSlide={this.props.actionEditSlide}
             actionDeleteSlide={this.props.actionDeleteSlide}

diff --git a/src/components/SettingsComponent.js b/src/components/SettingsComponent.js
@@ -128,10 +128,10 @@ class SettingsComponent extends React.Component {
           <SlideListEditor
             slides={this.props.slides}
             settings={this.props.settings}
-            actionEditSettings={this.props.actionEditSettings}
             onDelete={this.onDelete}
             onEdit={this.onEdit}
-            onAdd={this.onAdd}/>
+            onAdd={this.onAdd}
+          />
         </Dialog>
 
         <Snackbar
@@ -150,7 +150,6 @@ SettingsComponent.displayName = 'SettingsComponent';
 SettingsComponent.propTypes = {
   slides: React.PropTypes.array.isRequired,
   settings: React.PropTypes.object.isRequired,
-  actionEditSettings: React.PropTypes.func.isRequired,
   actionAddSlide: React.PropTypes.func.isRequired,
   actionDeleteSlide: React.PropTypes.func.isRequired,
   actionEditSlide: React.PropTypes.func.isRequired

diff --git a/src/components/SlideListEditorComponent.js b/src/components/SlideListEditorComponent.js
@@ -121,10 +121,7 @@ class SlideListEditorComponent extends React.Component {
     return (
       <div className='slidelisteditor-component'>
         <div id='slidelisteditor-fab-bar'>
-          <SyncComponent
-            settings={this.props.settings}
-            actionEditSettings={this.props.actionEditSettings}
-          />
+          <SyncComponent />
           <ExportSlidesComponent
             slides={this.props.slides}
           />
@@ -184,7 +181,6 @@ SlideListEditorComponent.displayName = 'SlideListEditorComponent';
 SlideListEditorComponent.propTypes = {
   slides: React.PropTypes.array.isRequired,
   settings: React.PropTypes.object.isRequired,
-  actionEditSettings: React.PropTypes.func.isRequired,
   onDelete: React.PropTypes.func.isRequired,
   onEdit: React.PropTypes.func.isRequired,
   onAdd: React.PropTypes.func.isRequired

diff --git a/src/components/SyncComponent.js b/src/components/SyncComponent.js
@@ -10,6 +10,8 @@ import { FormsyText, FormsySelect, FormsyToggle } from 'formsy-material-ui/lib';
 import MenuItem from 'material-ui/MenuItem';
 import Snackbar from 'material-ui/Snackbar';
 import { defineMessages, injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+import editSettings from '../actions/editSettings';
 
 require('styles//Sync.scss');
 
@@ -109,7 +111,7 @@ class SyncComponent extends React.Component {
       enabled: data.enabled
     };
 
-    this.props.actionEditSettings(nextSettings);
+    this.props.dispatch(editSettings(nextSettings));
   }
 
   reboot = () => {
@@ -222,14 +224,14 @@ class SyncComponent extends React.Component {
 }
 
 SyncComponent.displayName = 'SyncComponent';
-
-SyncComponent.propTypes = {
-  settings: React.PropTypes.object.isRequired,
-  actionEditSettings: React.PropTypes.func.isRequired
-};
-
 SyncComponent.defaultProps = {
   snackbarDuration: 5000
 };
 
-export default injectIntl(SyncComponent);
+function mapStateToProps(state) {
+  return {
+    settings: state.settings
+  };
+}
+
+export default injectIntl(connect(mapStateToProps)(SyncComponent));