noSettings parameter to remove Settings button and dialog

zalmoxisus · Aug 1, 2016 · 64b6689 · 64b6689
1 parent fd3ad00
commit 64b6689
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/src/app/components/Button.js b/src/app/components/Button.js
@@ -19,7 +19,7 @@ export default class Button extends React.Component {
     theme: PropTypes.oneOfType([
       PropTypes.object,
       PropTypes.string
-    ]).isRequired
+    ])
   };
 
   static defaultProps = {

diff --git a/src/app/components/ButtonBar.js b/src/app/components/ButtonBar.js
@@ -20,7 +20,8 @@ export default class ButtonBar extends Component {
     saveSettings: PropTypes.func.isRequired,
     importState: PropTypes.func.isRequired,
     exportState: PropTypes.func.isRequired,
-    socketOptions: PropTypes.object
+    socketOptions: PropTypes.object,
+    noSettings: PropTypes.bool
   };
 
   constructor() {
@@ -58,14 +59,18 @@ export default class ButtonBar extends Component {
         <SliderButton isOpen={this.props.sliderIsOpen} onClick={this.props.toggleSlider} />
         <ImportButton importState={this.props.importState} />
         <ExportButton exportState={this.props.exportState} />
-        <Button Icon={SettingsIcon} onClick={this.openSettings}>Settings</Button>
+        {!this.props.noSettings &&
+          <Button Icon={SettingsIcon} onClick={this.openSettings}>Settings</Button>
+        }
         <Button Icon={HelpIcon} onClick={this.openHelp}>How to use</Button>
-        <Settings
-          isOpen={this.state.settingsOpened}
-          close={this.closeSettings}
-          saveSettings={this.props.saveSettings}
-          socketOptions={this.props.socketOptions}
-        />
+        {!this.props.noSettings &&
+          <Settings
+            isOpen={this.state.settingsOpened}
+            close={this.closeSettings}
+            saveSettings={this.props.saveSettings}
+            socketOptions={this.props.socketOptions}
+          />
+        }
       </div>
     );
   }

diff --git a/src/app/containers/App.js b/src/app/containers/App.js
@@ -27,7 +27,7 @@ export default class App extends Component {
       autoReconnect: PropTypes.bool,
       secure: PropTypes.bool
     }),
-    noButtonBar: PropTypes.bool
+    noSettings: PropTypes.bool
   };
 
   constructor() {
@@ -172,18 +172,17 @@ export default class App extends Component {
             key={`Dispatcher-${key}`}
           />
         }
-        {!this.props.noButtonBar &&
-          <ButtonBar
-            openModal={this.openModal} closeModal={this.closeModal}
-            toggleDispatcher={this.toggleDispatcher}
-            dispatcherIsOpen={this.state.dispatcherIsOpen}
-            toggleSlider={this.toggleSlider}
-            sliderIsOpen={this.state.sliderIsOpen}
-            saveSettings={this.saveSettings}
-            importState={importState} exportState={exportState}
-            socketOptions={this.socketOptions}
-          />
-        }
+        <ButtonBar
+          openModal={this.openModal} closeModal={this.closeModal}
+          toggleDispatcher={this.toggleDispatcher}
+          dispatcherIsOpen={this.state.dispatcherIsOpen}
+          toggleSlider={this.toggleSlider}
+          sliderIsOpen={this.state.sliderIsOpen}
+          saveSettings={this.saveSettings}
+          importState={importState} exportState={exportState}
+          socketOptions={this.socketOptions}
+          noSettings={this.props.noSettings}
+        />
       </div>
     );
   }