From 05e1ad20b1d659004aa269721aa9b89608db7a01 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Tue, 10 Jan 2017 12:00:24 +0100
Subject: [PATCH] Move log levels to Parity tab

---
 js/src/routes.js                           |   3 -
 js/src/views/Settings/Advanced/advanced.js | 105 ---------------------
 js/src/views/Settings/Advanced/index.js    |  17 ----
 js/src/views/Settings/Parity/parity.js     | 105 ++++++++++++++++++++-
 js/src/views/Settings/index.js             |   2 -
 5 files changed, 101 insertions(+), 131 deletions(-)
 delete mode 100644 js/src/views/Settings/Advanced/advanced.js
 delete mode 100644 js/src/views/Settings/Advanced/index.js

diff --git a/js/src/routes.js b/js/src/routes.js
index f1bf74c09b6..20fb3dba61b 100644
--- a/js/src/routes.js
+++ b/js/src/routes.js
@@ -22,8 +22,6 @@ import {
   Wallet, Web, WriteContract
 } from '~/views';
 
-import { SettingsAdvanced } from '~/views/Settings';
-
 function handleDeprecatedRoute (nextState, replace) {
   const { address } = nextState.params;
   const redirectMap = {
@@ -62,7 +60,6 @@ const contractsRoutes = [
 ];
 
 const settingsRoutes = [
-  { path: 'advanced', component: SettingsAdvanced },
   { path: 'background', component: SettingsBackground },
   { path: 'proxy', component: SettingsProxy },
   { path: 'views', component: SettingsViews },
diff --git a/js/src/views/Settings/Advanced/advanced.js b/js/src/views/Settings/Advanced/advanced.js
deleted file mode 100644
index 685d63d7dfd..00000000000
--- a/js/src/views/Settings/Advanced/advanced.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component } from 'react';
-import LogLevel from 'loglevel';
-
-import { Container, Select } from '~/ui';
-import { LOG_KEYS } from '~/config';
-
-import layout from '../layout.css';
-
-export default class AdvancedSettings extends Component {
-
-  state = {
-    loglevels: {},
-    selectValues: []
-  };
-
-  componentWillMount () {
-    this.loadLogLevels();
-
-    const selectValues = Object.keys(LogLevel.levels).map((levelName) => {
-      const value = LogLevel.levels[levelName];
-
-      return {
-        name: levelName,
-        value
-      };
-    });
-
-    this.setState({ selectValues });
-  }
-
-  loadLogLevels () {
-    const nextState = { ...this.state.logLevels };
-
-    Object.keys(LOG_KEYS).map((logKey) => {
-      const log = LOG_KEYS[logKey];
-
-      const logger = LogLevel.getLogger(log.path);
-      const level = logger.getLevel();
-
-      nextState[logKey] = { level, log };
-    });
-
-    this.setState({ logLevels: nextState });
-  }
-
-  render () {
-    return (
-      <Container title='Advanced Settings'>
-        <div className={ layout.layout }>
-          <div className={ layout.overview }>
-            <div>
-              Choose the different logs level.
-            </div>
-          </div>
-          <div className={ layout.details }>
-            { this.renderLogsLevels() }
-          </div>
-        </div>
-      </Container>
-    );
-  }
-
-  renderLogsLevels () {
-    const { logLevels, selectValues } = this.state;
-
-    return Object.keys(logLevels).map((logKey) => {
-      const { level, log } = logLevels[logKey];
-      const { path, desc } = log;
-
-      const onChange = (_, index) => {
-        const nextLevel = Object.values(selectValues)[index].value;
-        LogLevel.getLogger(path).setLevel(nextLevel);
-        this.loadLogLevels();
-      };
-
-      return (
-        <div key={ logKey }>
-          <div>{ path }</div>
-          <p>{ desc }</p>
-          <Select
-            onChange={ onChange }
-            value={ level }
-            values={ selectValues }
-          />
-        </div>
-      );
-    });
-  }
-}
diff --git a/js/src/views/Settings/Advanced/index.js b/js/src/views/Settings/Advanced/index.js
deleted file mode 100644
index 5232c625de8..00000000000
--- a/js/src/views/Settings/Advanced/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './advanced';
diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
index 978ef296f33..c52d713cdc1 100644
--- a/js/src/views/Settings/Parity/parity.js
+++ b/js/src/views/Settings/Parity/parity.js
@@ -17,7 +17,9 @@
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { MenuItem } from 'material-ui';
+import LogLevel from 'loglevel';
 
+import { LOG_KEYS } from '~/config';
 import { Select, Container, LanguageSelector } from '~/ui';
 
 import layout from '../layout.css';
@@ -25,14 +27,54 @@ import layout from '../layout.css';
 export default class Parity extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
-  }
+  };
 
   state = {
-    mode: 'active'
-  }
+    loglevels: {},
+    mode: 'active',
+    selectValues: []
+  };
 
   componentWillMount () {
     this.loadMode();
+    this.loadLogLevels();
+    this.setSelectValues();
+  }
+
+  loadLogLevels () {
+    if (process.env.NODE_ENV === 'production') {
+      return null;
+    }
+
+    const nextState = { ...this.state.logLevels };
+
+    Object.keys(LOG_KEYS).map((logKey) => {
+      const log = LOG_KEYS[logKey];
+
+      const logger = LogLevel.getLogger(log.path);
+      const level = logger.getLevel();
+
+      nextState[logKey] = { level, log };
+    });
+
+    this.setState({ logLevels: nextState });
+  }
+
+  setSelectValues () {
+    if (process.env.NODE_ENV === 'production') {
+      return null;
+    }
+
+    const selectValues = Object.keys(LogLevel.levels).map((levelName) => {
+      const value = LogLevel.levels[levelName];
+
+      return {
+        name: levelName,
+        value
+      };
+    });
+
+    this.setState({ selectValues });
   }
 
   render () {
@@ -45,7 +87,8 @@ export default class Parity extends Component {
             <div>
               <FormattedMessage
                 id='settings.parity.overview_0'
-                defaultMessage='Control the Parity node settings and mode of operation via this interface.' />
+                defaultMessage='Control the Parity node settings and mode of operation via this interface.'
+              />
             </div>
           </div>
           <div className={ layout.details }>
@@ -53,10 +96,64 @@ export default class Parity extends Component {
             { this.renderModes() }
           </div>
         </div>
+
+        { this.renderLogsConfig() }
       </Container>
     );
   }
 
+  renderLogsConfig () {
+    if (process.env.NODE_ENV === 'production') {
+      return null;
+    }
+
+    return (
+      <div className={ layout.layout }>
+        <div className={ layout.overview }>
+          <div>
+            <FormattedMessage
+              id='settings.parity.loglevels'
+              defaultMessage='Choose the different logs level.'
+            />
+          </div>
+        </div>
+        <div className={ layout.details }>
+          { this.renderLogsLevels() }
+        </div>
+      </div>
+    );
+  }
+
+  renderLogsLevels () {
+    if (process.env.NODE_ENV === 'production') {
+      return null;
+    }
+
+    const { logLevels, selectValues } = this.state;
+
+    return Object.keys(logLevels).map((logKey) => {
+      const { level, log } = logLevels[logKey];
+      const { path, desc } = log;
+
+      const onChange = (_, index) => {
+        const nextLevel = Object.values(selectValues)[index].value;
+        LogLevel.getLogger(path).setLevel(nextLevel);
+        this.loadLogLevels();
+      };
+
+      return (
+        <div key={ logKey }>
+          <p>{ desc }</p>
+          <Select
+            onChange={ onChange }
+            value={ level }
+            values={ selectValues }
+          />
+        </div>
+      );
+    });
+  }
+
   renderModes () {
     const { mode } = this.state;
 
diff --git a/js/src/views/Settings/index.js b/js/src/views/Settings/index.js
index 4f75ac90622..878a874526b 100644
--- a/js/src/views/Settings/index.js
+++ b/js/src/views/Settings/index.js
@@ -16,7 +16,6 @@
 
 import settingsReducer from './reducers';
 import { toggleView, updateBackground } from './actions';
-import SettingsAdvanced from './Advanced';
 import SettingsBackground from './Background';
 import SettingsParity from './Parity';
 import SettingsProxy from './Proxy';
@@ -25,7 +24,6 @@ import SettingsViews, { defaultViews } from './Views';
 export default from './settings';
 
 export {
-  SettingsAdvanced,
   SettingsBackground,
   SettingsParity,
   SettingsProxy,