moves config field to experiments section

Author: alanshaw

add-on/_locales/en/messages.json

@@ -170,7 +170,7 @@
     "description": "An option title on the Preferences screen (option_ipfsNodeConfig_title)"
   },
   "option_ipfsNodeConfig_description": {
-    "message": "Configuration for your IPFS node. Must be valid JSON.",
+    "message": "Configuration for the embedded IPFS node. Must be valid JSON.",
     "description": "An option description on the Preferences screen (option_ipfsNodeConfig_description)"
   },
   "option_ipfsNodeType_external": {

add-on/src/options/forms/experiments-form.js

@@ -11,6 +11,8 @@ function experimentsForm ({
   linkify,
   dnslink,
   ipfsProxy,
+  ipfsNodeType,
+  ipfsNodeConfig,
   onOptionChange,
   onOptionsReset
 }) {
@@ -20,6 +22,7 @@ function experimentsForm ({
   const onLinkifyChange = onOptionChange('linkify')
   const onDnsLinkChange = onOptionChange('dnslink')
   const onIpfsProxyChange = onOptionChange('ipfsProxy')
+  const onIpfsNodeConfigChange = onOptionChange('ipfsNodeConfig')
 
   return html`
     <form>
@@ -87,6 +90,17 @@ function experimentsForm ({
           </label>
           <input type="checkbox" id="ipfs-proxy" onchange=${onIpfsProxyChange} checked=${ipfsProxy} />
         </div>
+        ${ipfsNodeType === 'embedded' ? html`
+          <div>
+            <label for="ipfsNodeConfig">
+              <dl>
+                <dt>${browser.i18n.getMessage('option_ipfsNodeConfig_title')}</dt>
+                <dd>${browser.i18n.getMessage('option_ipfsNodeConfig_description')}</dd>
+              </dl>
+            </label>
+            <textarea id="ipfsNodeConfig" rows="4" onchange=${onIpfsNodeConfigChange}>${ipfsNodeConfig}</textarea>
+          </div>
+        ` : null}
         <div>
           <label for="resetAllOptions">
             <dl>

add-on/src/options/forms/ipfs-node-form.js

@@ -4,9 +4,8 @@
 const browser = require('webextension-polyfill')
 const html = require('choo/html')
 
-function ipfsNodeForm ({ ipfsNodeType, ipfsNodeConfig, onOptionChange }) {
+function ipfsNodeForm ({ ipfsNodeType, onOptionChange }) {
   const onIpfsNodeTypeChange = onOptionChange('ipfsNodeType')
-  const onIpfsNodeConfigChange = onOptionChange('ipfsNodeConfig')
 
   return html`
     <form>
@@ -32,17 +31,6 @@ function ipfsNodeForm ({ ipfsNodeType, ipfsNodeConfig, onOptionChange }) {
             </option>
           </select>
         </div>
-        ${ipfsNodeType === 'embedded' ? html`
-          <div>
-            <label for="ipfsNodeConfig">
-              <dl>
-                <dt>${browser.i18n.getMessage('option_ipfsNodeConfig_title')}</dt>
-                <dd>${browser.i18n.getMessage('option_ipfsNodeConfig_description')}</dd>
-              </dl>
-            </label>
-            <textarea id="ipfsNodeConfig" rows="4" onchange=${onIpfsNodeConfigChange}>${ipfsNodeConfig}</textarea>
-          </div>
-        ` : null}
       </fieldset>
     </form>
   `

add-on/src/options/page.js

@@ -32,7 +32,6 @@ module.exports = function optionsPage (state, emit) {
     <div>
       ${ipfsNodeForm({
         ipfsNodeType: state.options.ipfsNodeType,
-        ipfsNodeConfig: state.options.ipfsNodeConfig,
         onOptionChange
       })}
       ${gatewaysForm({
@@ -54,6 +53,8 @@ module.exports = function optionsPage (state, emit) {
         linkify: state.options.linkify,
         dnslink: state.options.dnslink,
         ipfsProxy: state.options.ipfsProxy,
+        ipfsNodeType: state.options.ipfsNodeType,
+        ipfsNodeConfig: state.options.ipfsNodeConfig,
         onOptionChange,
         onOptionsReset
       })}

yarn.lock

@@ -1062,8 +1062,8 @@ bcrypt-pbkdf@^1.0.0:
     tweetnacl "^0.14.3"
 
 bel@^5.1.3:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/bel/-/bel-5.1.6.tgz#6e98ed2f0add3c48f0ac83f6e15dc9754ea16ac6"
+  version "5.1.7"
+  resolved "https://registry.yarnpkg.com/bel/-/bel-5.1.7.tgz#1aea92e028398a51a4467aba3e83295882601ca4"
   dependencies:
     hyperx "^2.3.0"
     is-electron "^2.0.0"