Refactor settings props passing

app/ui/components/editors/body/body-editor.js

@@ -27,12 +27,7 @@ type Props = {
   request: Request,
   workspace: Workspace,
   settings: Settings,
-  environmentId: string,
-  nunjucksPowerUserMode: boolean,
-  fontSize: number,
-  indentSize: number,
-  keyMap: string,
-  lineWrapping: boolean
+  environmentId: string
 };
 
 @autobind
@@ -103,17 +98,12 @@ class BodyEditor extends React.PureComponent<Props> {
 
   render () {
     const {
-      keyMap,
-      fontSize,
-      indentSize,
-      lineWrapping,
       request,
       workspace,
       settings,
       environmentId,
       handleRender: render,
-      handleGetRenderContext: getRenderContext,
-      nunjucksPowerUserMode
+      handleGetRenderContext: getRenderContext
     } = this.props;
 
     const noRender = request.settingDisableRenderRequestBody;
@@ -133,7 +123,7 @@ class BodyEditor extends React.PureComponent<Props> {
           onChange={this._handleFormUrlEncodedChange}
           handleRender={handleRender}
           handleGetRenderContext={handleGetRenderContext}
-          nunjucksPowerUserMode={nunjucksPowerUserMode}
+          nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
           parameters={request.body.params || []}
         />
       );
@@ -144,7 +134,7 @@ class BodyEditor extends React.PureComponent<Props> {
           onChange={this._handleFormChange}
           handleRender={handleRender}
           handleGetRenderContext={handleGetRenderContext}
-          nunjucksPowerUserMode={nunjucksPowerUserMode}
+          nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
           parameters={request.body.params || []}
         />
       );
@@ -161,17 +151,12 @@ class BodyEditor extends React.PureComponent<Props> {
         <GraphQLEditor
           key={uniqueKey}
           request={request}
-          fontSize={fontSize}
-          indentSize={indentSize}
           content={request.body.text || ''}
-          keyMap={keyMap}
-          lineWrapping={lineWrapping}
           render={handleRender}
           workspace={workspace}
           settings={settings}
           environmentId={environmentId}
           getRenderContext={handleGetRenderContext}
-          nunjucksPowerUserMode={nunjucksPowerUserMode}
           onChange={this._handleGraphQLChange}
         />
       );
@@ -180,15 +165,15 @@ class BodyEditor extends React.PureComponent<Props> {
       return (
         <RawEditor
           key={uniqueKey}
-          fontSize={fontSize}
-          indentSize={indentSize}
-          keyMap={keyMap}
-          lineWrapping={lineWrapping}
+          fontSize={settings.editorFontSize}
+          indentSize={settings.editorIndentSize}
+          keyMap={settings.editorKeyMap}
+          lineWrapping={settings.editorLineWrapping}
           contentType={contentType || 'text/plain'}
           content={request.body.text || ''}
           render={handleRender}
           getRenderContext={handleGetRenderContext}
-          nunjucksPowerUserMode={nunjucksPowerUserMode}
+          nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
           onChange={this._handleRawChange}
         />
       );

app/ui/components/editors/body/graph-ql-editor.js

@@ -29,13 +29,8 @@ type GraphQLBody = {
 type Props = {
   onChange: Function,
   content: string,
-  fontSize: number,
-  indentSize: number,
-  keyMap: string,
-  lineWrapping: boolean,
   render: Function | null,
   getRenderContext: Function | null,
-  nunjucksPowerUserMode: boolean,
   request: Request,
   workspace: Workspace,
   settings: Settings,
@@ -269,13 +264,9 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
   render () {
     const {
       content,
-      fontSize,
-      indentSize,
-      keyMap,
       render,
       getRenderContext,
-      nunjucksPowerUserMode,
-      lineWrapping,
+      settings,
       className
     } = this.props;
 
@@ -306,14 +297,14 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
               completeSingle: false
             }}
             lintOptions={schema ? {schema} : null}
-            fontSize={fontSize}
-            indentSize={indentSize}
-            keyMap={keyMap}
+            fontSize={settings.editorFontSize}
+            indentSize={settings.editorIndentSize}
+            keyMap={settings.editorKeyMap}
             defaultValue={query}
             className={className}
             onChange={this._handleQueryChange}
             mode="graphql"
-            lineWrapping={lineWrapping}
+            lineWrapping={settings.editorLineWrapping}
             placeholder=""
           />
         </div>
@@ -348,17 +339,17 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
             dynamicHeight
             debounceMillis={DEBOUNCE_MILLIS * 4}
             manualPrettify={false}
-            fontSize={fontSize}
-            indentSize={indentSize}
-            keyMap={keyMap}
+            fontSize={settings.editorFontSize}
+            indentSize={settings.editorIndentSize}
+            keyMap={settings.editorKeyMap}
             defaultValue={variables}
             className={className}
             render={render}
             getRenderContext={getRenderContext}
-            nunjucksPowerUserMode={nunjucksPowerUserMode}
+            nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
             onChange={this._handleVariablesChange}
             mode="application/json"
-            lineWrapping={lineWrapping}
+            lineWrapping={settings.editorLineWrapping}
             placeholder=""
           />
         </div>

app/ui/components/request-pane.js

@@ -50,13 +50,6 @@ type Props = {
   handleImportFile: Function,
 
   // Other
-  useBulkHeaderEditor: boolean,
-  showPasswords: boolean,
-  editorFontSize: number,
-  editorIndentSize: number,
-  nunjucksPowerUserMode: boolean,
-  editorKeyMap: string,
-  editorLineWrapping: boolean,
   workspace: Workspace,
   settings: Settings,
   environmentId: string,
@@ -100,9 +93,9 @@ class RequestPane extends React.PureComponent<Props> {
   }
 
   _handleUpdateSettingsUseBulkHeaderEditor () {
-    const {useBulkHeaderEditor, updateSettingsUseBulkHeaderEditor} = this.props;
-    updateSettingsUseBulkHeaderEditor(!useBulkHeaderEditor);
-    trackEvent('Headers', 'Toggle Bulk', !useBulkHeaderEditor ? 'On' : 'Off');
+    const {settings, updateSettingsUseBulkHeaderEditor} = this.props;
+    updateSettingsUseBulkHeaderEditor(!settings.useBulkHeaderEditor);
+    trackEvent('Headers', 'Toggle Bulk', !settings.useBulkHeaderEditor ? 'On' : 'Off');
   }
 
   _handleImportFile () {
@@ -165,17 +158,12 @@ class RequestPane extends React.PureComponent<Props> {
 
   render () {
     const {
-      editorFontSize,
-      editorIndentSize,
-      editorKeyMap,
-      editorLineWrapping,
       forceRefreshCounter,
       forceUpdateRequestHeaders,
       handleGenerateCode,
       handleGetRenderContext,
       handleImport,
       handleRender,
-      nunjucksPowerUserMode,
       handleSend,
       handleSendAndDownload,
       oAuth2Token,
@@ -183,15 +171,13 @@ class RequestPane extends React.PureComponent<Props> {
       workspace,
       environmentId,
       settings,
-      showPasswords,
       updateRequestAuthentication,
       updateRequestBody,
       updateRequestHeaders,
       updateRequestMethod,
       updateRequestMimeType,
       updateRequestParameters,
-      updateSettingsShowPasswords,
-      useBulkHeaderEditor
+      updateSettingsShowPasswords
     } = this.props;
 
     if (!request) {
@@ -264,7 +250,7 @@ class RequestPane extends React.PureComponent<Props> {
               handleSend={handleSend}
               handleSendAndDownload={handleSendAndDownload}
               handleRender={handleRender}
-              nunjucksPowerUserMode={nunjucksPowerUserMode}
+              nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
               handleGetRenderContext={handleGetRenderContext}
               url={request.url}
               requestId={request._id}
@@ -322,17 +308,12 @@ class RequestPane extends React.PureComponent<Props> {
               handleUpdateRequestMimeType={updateRequestMimeType}
               handleRender={handleRender}
               handleGetRenderContext={handleGetRenderContext}
-              nunjucksPowerUserMode={nunjucksPowerUserMode}
               request={request}
               workspace={workspace}
               environmentId={environmentId}
               settings={settings}
               onChange={updateRequestBody}
               onChangeHeaders={forceUpdateRequestHeaders}
-              fontSize={editorFontSize}
-              indentSize={editorIndentSize}
-              keyMap={editorKeyMap}
-              lineWrapping={editorLineWrapping}
             />
           </TabPanel>
           <TabPanel className="react-tabs__tab-panel scrollable-container">
@@ -340,12 +321,12 @@ class RequestPane extends React.PureComponent<Props> {
               <ErrorBoundary key={uniqueKey} errorClassName="font-error pad text-center">
                 <AuthWrapper
                   oAuth2Token={oAuth2Token}
-                  showPasswords={showPasswords}
+                  showPasswords={settings.showPasswords}
                   request={request}
                   handleUpdateSettingsShowPasswords={updateSettingsShowPasswords}
                   handleRender={handleRender}
                   handleGetRenderContext={handleGetRenderContext}
-                  nunjucksPowerUserMode={nunjucksPowerUserMode}
+                  nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
                   onChange={updateRequestAuthentication}
                 />
               </ErrorBoundary>
@@ -378,7 +359,7 @@ class RequestPane extends React.PureComponent<Props> {
                     pairs={request.parameters}
                     handleRender={handleRender}
                     handleGetRenderContext={handleGetRenderContext}
-                    nunjucksPowerUserMode={nunjucksPowerUserMode}
+                    nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
                     onChange={updateRequestParameters}
                   />
                 </ErrorBoundary>
@@ -398,19 +379,19 @@ class RequestPane extends React.PureComponent<Props> {
                 headers={request.headers}
                 handleRender={handleRender}
                 handleGetRenderContext={handleGetRenderContext}
-                nunjucksPowerUserMode={nunjucksPowerUserMode}
-                editorFontSize={editorFontSize}
-                editorIndentSize={editorIndentSize}
-                editorLineWrapping={editorLineWrapping}
+                nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
+                editorFontSize={settings.editorFontSize}
+                editorIndentSize={settings.editorIndentSize}
+                editorLineWrapping={settings.editorLineWrapping}
                 onChange={updateRequestHeaders}
-                bulk={useBulkHeaderEditor}
+                bulk={settings.useBulkHeaderEditor}
               />
             </ErrorBoundary>
 
             <div className="pad-right text-right">
               <button className="margin-top-sm btn btn--clicky"
                       onClick={this._handleUpdateSettingsUseBulkHeaderEditor}>
-                {useBulkHeaderEditor ? 'Regular Edit' : 'Bulk Edit'}
+                {settings.useBulkHeaderEditor ? 'Regular Edit' : 'Bulk Edit'}
               </button>
             </div>
           </TabPanel>

app/ui/components/wrapper.js

@@ -582,12 +582,6 @@ class Wrapper extends React.PureComponent<Props, State> {
             ref={handleSetRequestPaneRef}
             handleImportFile={this._handleImportFile}
             request={activeRequest}
-            showPasswords={settings.showPasswords}
-            useBulkHeaderEditor={settings.useBulkHeaderEditor}
-            editorFontSize={settings.editorFontSize}
-            editorIndentSize={settings.editorIndentSize}
-            editorKeyMap={settings.editorKeyMap}
-            editorLineWrapping={settings.editorLineWrapping}
             workspace={activeWorkspace}
             settings={settings}
             environmentId={activeEnvironment ? activeEnvironment._id : ''}
@@ -598,7 +592,6 @@ class Wrapper extends React.PureComponent<Props, State> {
             handleImport={this._handleImport}
             handleRender={handleRender}
             handleGetRenderContext={handleGetRenderContext}
-            nunjucksPowerUserMode={settings.nunjucksPowerUserMode}
             updateRequestBody={this._handleUpdateRequestBody}
             forceUpdateRequestHeaders={this._handleForceUpdateRequestHeaders}
             updateRequestUrl={this._handleUpdateRequestUrl}