From cf53653cfaf581bf6e66aa72cb340309c23195db Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 3 Jun 2019 15:41:45 +0300
Subject: [PATCH 1/4] + client: split settings page into several pages

---
 client/src/__locales/en.json                  |   4 +
 client/src/components/App/index.js            |  36 ++-
 client/src/components/Header/Header.css       |  12 +-
 client/src/components/Header/Menu.js          |  66 ++++-
 .../Settings/Clients/ClientsTable.js          | 260 +++++++++++++++++
 .../src/components/Settings/Clients/index.js  | 267 +++---------------
 client/src/components/Settings/Dhcp/index.js  | 205 +++++++-------
 .../Settings/{ => Dns}/Upstream/Examples.js   |  51 +++-
 .../Settings/{ => Dns}/Upstream/Form.js       |  25 +-
 .../Settings/{ => Dns}/Upstream/index.js      |   8 +-
 client/src/components/Settings/Dns/index.js   |  35 +++
 .../components/Settings/Encryption/Form.js    |  84 +++---
 .../components/Settings/Encryption/index.js   |  16 +-
 client/src/components/Settings/index.js       |  70 +----
 client/src/components/ui/Dropdown.css         |   8 +
 client/src/components/ui/Dropdown.js          |  89 ++++++
 client/src/components/ui/Icons.js             |  24 ++
 client/src/containers/Clients.js              |  26 ++
 client/src/containers/Dhcp.js                 |  38 +++
 client/src/containers/Dns.js                  |  24 ++
 client/src/containers/Encryption.js           |  24 ++
 client/src/helpers/constants.js               |   2 +
 22 files changed, 882 insertions(+), 492 deletions(-)
 create mode 100644 client/src/components/Settings/Clients/ClientsTable.js
 rename client/src/components/Settings/{ => Dns}/Upstream/Examples.js (55%)
 rename client/src/components/Settings/{ => Dns}/Upstream/Form.js (88%)
 rename client/src/components/Settings/{ => Dns}/Upstream/index.js (93%)
 create mode 100644 client/src/components/Settings/Dns/index.js
 create mode 100644 client/src/components/ui/Dropdown.css
 create mode 100644 client/src/components/ui/Dropdown.js
 create mode 100644 client/src/containers/Clients.js
 create mode 100644 client/src/containers/Dhcp.js
 create mode 100644 client/src/containers/Dns.js
 create mode 100644 client/src/containers/Encryption.js

diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index d53593c5..66f3efab 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -96,6 +96,10 @@
     "no_servers_specified": "No servers specified",
     "no_settings": "No settings",
     "general_settings": "General settings",
+    "dns_settings": "DNS settings",
+    "encryption_settings": "Encryption settings",
+    "dhcp_settings": "DHCP settings",
+    "clients_settings": "Clients settings",
     "upstream_dns": "Upstream DNS servers",
     "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream.",
     "test_upstream_btn": "Test upstreams",
diff --git a/client/src/components/App/index.js b/client/src/components/App/index.js
index 6e5ed768..f77097a0 100644
--- a/client/src/components/App/index.js
+++ b/client/src/components/App/index.js
@@ -13,6 +13,12 @@ import Header from '../../containers/Header';
 import Dashboard from '../../containers/Dashboard';
 import Settings from '../../containers/Settings';
 import Filters from '../../containers/Filters';
+
+import Dns from '../../containers/Dns';
+import Encryption from '../../containers/Encryption';
+import Dhcp from '../../containers/Dhcp';
+import Clients from '../../containers/Clients';
+
 import Logs from '../../containers/Logs';
 import SetupGuide from '../../containers/SetupGuide';
 import Toasts from '../Toasts';
@@ -41,7 +47,7 @@ class App extends Component {
 
     handleUpdate = () => {
         this.props.getUpdate();
-    }
+    };
 
     setLanguage = () => {
         const { processing, language } = this.props.dashboard;
@@ -55,19 +61,17 @@ class App extends Component {
         i18n.on('languageChanged', (lang) => {
             this.props.changeLanguage(lang);
         });
-    }
+    };
 
     render() {
         const { dashboard, encryption } = this.props;
         const updateAvailable =
-            !dashboard.processingVersions &&
-            dashboard.isCoreRunning &&
-            dashboard.isUpdateAvailable;
+            !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
 
         return (
-            <HashRouter hashType='noslash'>
+            <HashRouter hashType="noslash">
                 <Fragment>
-                    {updateAvailable &&
+                    {updateAvailable && (
                         <Fragment>
                             <UpdateTopline
                                 url={dashboard.announcementUrl}
@@ -78,29 +82,33 @@ class App extends Component {
                             />
                             <UpdateOverlay processingUpdate={dashboard.processingUpdate} />
                         </Fragment>
-                    }
-                    {!encryption.processing &&
+                    )}
+                    {!encryption.processing && (
                         <EncryptionTopline notAfter={encryption.not_after} />
-                    }
+                    )}
                     <LoadingBar className="loading-bar" updateTime={1000} />
                     <Route component={Header} />
                     <div className="container container--wrap">
-                        {!dashboard.processing && !dashboard.isCoreRunning &&
+                        {!dashboard.processing && !dashboard.isCoreRunning && (
                             <div className="row row-cards">
                                 <div className="col-lg-12">
                                     <Status handleStatusChange={this.handleStatusChange} />
                                 </div>
                             </div>
-                        }
-                        {!dashboard.processing && dashboard.isCoreRunning &&
+                        )}
+                        {!dashboard.processing && dashboard.isCoreRunning && (
                             <Fragment>
                                 <Route path="/" exact component={Dashboard} />
                                 <Route path="/settings" component={Settings} />
+                                <Route path="/dns" component={Dns} />
+                                <Route path="/encryption" component={Encryption} />
+                                <Route path="/dhcp" component={Dhcp} />
+                                <Route path="/clients" component={Clients} />
                                 <Route path="/filters" component={Filters} />
                                 <Route path="/logs" component={Logs} />
                                 <Route path="/guide" component={SetupGuide} />
                             </Fragment>
-                        }
+                        )}
                     </div>
                     <Footer />
                     <Toasts />
diff --git a/client/src/components/Header/Header.css b/client/src/components/Header/Header.css
index 29222c96..35e8a3cc 100644
--- a/client/src/components/Header/Header.css
+++ b/client/src/components/Header/Header.css
@@ -16,11 +16,13 @@
     stroke: #9aa0ac;
 }
 
-.nav-tabs .nav-link.active .nav-icon {
+.nav-tabs .nav-link.active .nav-icon,
+.nav-tabs .nav-item.show .nav-icon {
     stroke: #66b574;
 }
 
-.nav-tabs .nav-link.active:hover .nav-icon {
+.nav-tabs .nav-link.active:hover .nav-icon,
+.nav-tabs .nav-item.show:hover .nav-icon {
     stroke: #58a273;
 }
 
@@ -87,6 +89,12 @@
     height: 32px;
 }
 
+.nav-tabs .nav-item.show .nav-link {
+    color: #66b574;
+    background-color: #fff;
+    border-bottom-color: #66b574;
+}
+
 @media screen and (min-width: 992px) {
     .header {
         padding: 0;
diff --git a/client/src/components/Header/Menu.js b/client/src/components/Header/Menu.js
index 2800d768..7948abc7 100644
--- a/client/src/components/Header/Menu.js
+++ b/client/src/components/Header/Menu.js
@@ -5,6 +5,9 @@ import enhanceWithClickOutside from 'react-click-outside';
 import classnames from 'classnames';
 import { Trans, withNamespaces } from 'react-i18next';
 
+import { SETTINGS_URLS } from '../../helpers/constants';
+import Dropdown from '../ui/Dropdown';
+
 class Menu extends Component {
     handleClickOutside = () => {
         this.props.closeMenu();
@@ -14,49 +17,86 @@ class Menu extends Component {
         this.props.toggleMenuOpen();
     };
 
+    getActiveClassForSettings = () => {
+        const { pathname } = this.props.location;
+        const isSettingsPage = SETTINGS_URLS.some(item => item === pathname);
+
+        return isSettingsPage ? 'active' : '';
+    };
+
     render() {
         const menuClass = classnames({
             'col-lg-6 mobile-menu': true,
             'mobile-menu--active': this.props.isMenuOpen,
         });
 
+        const dropdownControlClass = `nav-link ${this.getActiveClassForSettings()}`;
+
         return (
             <Fragment>
                 <div className={menuClass}>
                     <ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap">
                         <li className="nav-item border-bottom d-lg-none" onClick={this.toggleMenu}>
                             <div className="nav-link nav-link--back">
-                                <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
+                                <svg className="nav-icon">
+                                    <use xlinkHref="#back" />
+                                </svg>
                                 <Trans>back</Trans>
                             </div>
                         </li>
                         <li className="nav-item">
                             <NavLink to="/" exact={true} className="nav-link">
-                                <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
+                                <svg className="nav-icon">
+                                    <use xlinkHref="#dashboard" />
+                                </svg>
                                 <Trans>dashboard</Trans>
                             </NavLink>
                         </li>
-                        <li className="nav-item">
-                            <NavLink to="/settings" className="nav-link">
-                                <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
-                                <Trans>settings</Trans>
-                            </NavLink>
-                        </li>
+                        <Dropdown
+                            label={this.props.t('settings')}
+                            baseClassName="dropdown nav-item"
+                            controlClassName={dropdownControlClass}
+                            icon="settings"
+                        >
+                            <Fragment>
+                                <NavLink to="/settings" className="dropdown-item">
+                                    <Trans>general_settings</Trans>
+                                </NavLink>
+                                <NavLink to="/dns" className="dropdown-item">
+                                    <Trans>dns_settings</Trans>
+                                </NavLink>
+                                <NavLink to="/encryption" className="dropdown-item">
+                                    <Trans>encryption_settings</Trans>
+                                </NavLink>
+                                <NavLink to="/clients" className="dropdown-item">
+                                    <Trans>clients_settings</Trans>
+                                </NavLink>
+                                <NavLink to="/dhcp" className="dropdown-item">
+                                    <Trans>dhcp_settings</Trans>
+                                </NavLink>
+                            </Fragment>
+                        </Dropdown>
                         <li className="nav-item">
                             <NavLink to="/filters" className="nav-link">
-                                <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
+                                <svg className="nav-icon">
+                                    <use xlinkHref="#filters" />
+                                </svg>
                                 <Trans>filters</Trans>
                             </NavLink>
                         </li>
                         <li className="nav-item">
                             <NavLink to="/logs" className="nav-link">
-                                <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
+                                <svg className="nav-icon">
+                                    <use xlinkHref="#log" />
+                                </svg>
                                 <Trans>query_log</Trans>
                             </NavLink>
                         </li>
                         <li className="nav-item">
-                            <NavLink to="/guide" href="/guide" className="nav-link">
-                                <svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
+                            <NavLink to="/guide" className="nav-link">
+                                <svg className="nav-icon">
+                                    <use xlinkHref="#setup" />
+                                </svg>
                                 <Trans>setup_guide</Trans>
                             </NavLink>
                         </li>
@@ -71,6 +111,8 @@ Menu.propTypes = {
     isMenuOpen: PropTypes.bool,
     closeMenu: PropTypes.func,
     toggleMenuOpen: PropTypes.func,
+    location: PropTypes.object,
+    t: PropTypes.func,
 };
 
 export default withNamespaces()(enhanceWithClickOutside(Menu));
diff --git a/client/src/components/Settings/Clients/ClientsTable.js b/client/src/components/Settings/Clients/ClientsTable.js
new file mode 100644
index 00000000..c12fa1e3
--- /dev/null
+++ b/client/src/components/Settings/Clients/ClientsTable.js
@@ -0,0 +1,260 @@
+import React, { Component, Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { Trans, withNamespaces } from 'react-i18next';
+import ReactTable from 'react-table';
+
+import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
+import Card from '../../ui/Card';
+import Modal from './Modal';
+
+class ClientsTable extends Component {
+    handleFormAdd = (values) => {
+        this.props.addClient(values);
+    };
+
+    handleFormUpdate = (values, name) => {
+        this.props.updateClient(values, name);
+    };
+
+    handleSubmit = (values) => {
+        if (this.props.modalType === MODAL_TYPE.EDIT) {
+            this.handleFormUpdate(values, this.props.modalClientName);
+        } else {
+            this.handleFormAdd(values);
+        }
+    };
+
+    cellWrap = ({ value }) => (
+        <div className="logs__row logs__row--overflow">
+            <span className="logs__text" title={value}>
+                {value}
+            </span>
+        </div>
+    );
+
+    getClient = (name, clients) => {
+        const client = clients.find(item => name === item.name);
+
+        if (client) {
+            const identifier = client.mac ? CLIENT_ID.MAC : CLIENT_ID.IP;
+
+            return {
+                identifier,
+                use_global_settings: true,
+                ...client,
+            };
+        }
+
+        return {
+            identifier: CLIENT_ID.IP,
+            use_global_settings: true,
+        };
+    };
+
+    getStats = (ip, stats) => {
+        if (stats && stats.top_clients) {
+            return stats.top_clients[ip];
+        }
+
+        return '';
+    };
+
+    handleDelete = (data) => {
+        // eslint-disable-next-line no-alert
+        if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
+            this.props.deleteClient(data);
+        }
+    };
+
+    columns = [
+        {
+            Header: this.props.t('table_client'),
+            accessor: 'ip',
+            Cell: (row) => {
+                if (row.original && row.original.mac) {
+                    return (
+                        <div className="logs__row logs__row--overflow">
+                            <span className="logs__text" title={row.original.mac}>
+                                {row.original.mac} <em>(MAC)</em>
+                            </span>
+                        </div>
+                    );
+                } else if (row.value) {
+                    return (
+                        <div className="logs__row logs__row--overflow">
+                            <span className="logs__text" title={row.value}>
+                                {row.value} <em>(IP)</em>
+                            </span>
+                        </div>
+                    );
+                }
+
+                return '';
+            },
+        },
+        {
+            Header: this.props.t('table_name'),
+            accessor: 'name',
+            Cell: this.cellWrap,
+        },
+        {
+            Header: this.props.t('settings'),
+            accessor: 'use_global_settings',
+            Cell: ({ value }) => {
+                const title = value ? (
+                    <Trans>settings_global</Trans>
+                ) : (
+                    <Trans>settings_custom</Trans>
+                );
+
+                return (
+                    <div className="logs__row logs__row--overflow">
+                        <div className="logs__text" title={title}>
+                            {title}
+                        </div>
+                    </div>
+                );
+            },
+        },
+        {
+            Header: this.props.t('table_statistics'),
+            accessor: 'statistics',
+            Cell: (row) => {
+                const clientIP = row.original.ip;
+                const clientStats = clientIP && this.getStats(clientIP, this.props.topStats);
+
+                if (clientStats) {
+                    return (
+                        <div className="logs__row">
+                            <div className="logs__text" title={clientStats}>
+                                {clientStats}
+                            </div>
+                        </div>
+                    );
+                }
+
+                return '–';
+            },
+        },
+        {
+            Header: this.props.t('actions_table_header'),
+            accessor: 'actions',
+            maxWidth: 150,
+            Cell: (row) => {
+                const clientName = row.original.name;
+                const {
+                    toggleClientModal, processingDeleting, processingUpdating, t,
+                } = this.props;
+
+                return (
+                    <div className="logs__row logs__row--center">
+                        <button
+                            type="button"
+                            className="btn btn-icon btn-outline-primary btn-sm mr-2"
+                            onClick={() =>
+                                toggleClientModal({
+                                    type: MODAL_TYPE.EDIT,
+                                    name: clientName,
+                                })
+                            }
+                            disabled={processingUpdating}
+                            title={t('edit_table_action')}
+                        >
+                            <svg className="icons">
+                                <use xlinkHref="#edit" />
+                            </svg>
+                        </button>
+                        <button
+                            type="button"
+                            className="btn btn-icon btn-outline-secondary btn-sm"
+                            onClick={() => this.handleDelete({ name: clientName })}
+                            disabled={processingDeleting}
+                            title={t('delete_table_action')}
+                        >
+                            <svg className="icons">
+                                <use xlinkHref="#delete" />
+                            </svg>
+                        </button>
+                    </div>
+                );
+            },
+        },
+    ];
+
+    render() {
+        const {
+            t,
+            clients,
+            isModalOpen,
+            modalType,
+            modalClientName,
+            toggleClientModal,
+            processingAdding,
+            processingUpdating,
+        } = this.props;
+
+        const currentClientData = this.getClient(modalClientName, clients);
+
+        return (
+            <Card
+                title={t('clients_title')}
+                subtitle={t('clients_desc')}
+                bodyType="card-body box-body--settings"
+            >
+                <Fragment>
+                    <ReactTable
+                        data={clients || []}
+                        columns={this.columns}
+                        className="-striped -highlight card-table-overflow"
+                        showPagination={true}
+                        defaultPageSize={10}
+                        minRows={5}
+                        previousText={t('previous_btn')}
+                        nextText={t('next_btn')}
+                        loadingText={t('loading_table_status')}
+                        pageText={t('page_table_footer_text')}
+                        ofText={t('of_table_footer_text')}
+                        rowsText={t('rows_table_footer_text')}
+                        noDataText={t('clients_not_found')}
+                    />
+                    <button
+                        type="button"
+                        className="btn btn-success btn-standard mt-3"
+                        onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
+                        disabled={processingAdding}
+                    >
+                        <Trans>client_add</Trans>
+                    </button>
+
+                    <Modal
+                        isModalOpen={isModalOpen}
+                        modalType={modalType}
+                        toggleClientModal={toggleClientModal}
+                        currentClientData={currentClientData}
+                        handleSubmit={this.handleSubmit}
+                        processingAdding={processingAdding}
+                        processingUpdating={processingUpdating}
+                    />
+                </Fragment>
+            </Card>
+        );
+    }
+}
+
+ClientsTable.propTypes = {
+    t: PropTypes.func.isRequired,
+    clients: PropTypes.array.isRequired,
+    topStats: PropTypes.object.isRequired,
+    toggleClientModal: PropTypes.func.isRequired,
+    deleteClient: PropTypes.func.isRequired,
+    addClient: PropTypes.func.isRequired,
+    updateClient: PropTypes.func.isRequired,
+    isModalOpen: PropTypes.bool.isRequired,
+    modalType: PropTypes.string.isRequired,
+    modalClientName: PropTypes.string.isRequired,
+    processingAdding: PropTypes.bool.isRequired,
+    processingDeleting: PropTypes.bool.isRequired,
+    processingUpdating: PropTypes.bool.isRequired,
+};
+
+export default withNamespaces()(ClientsTable);
diff --git a/client/src/components/Settings/Clients/index.js b/client/src/components/Settings/Clients/index.js
index 526d8d57..4f936e1e 100644
--- a/client/src/components/Settings/Clients/index.js
+++ b/client/src/components/Settings/Clients/index.js
@@ -1,251 +1,50 @@
 import React, { Component, Fragment } from 'react';
+import { withNamespaces } from 'react-i18next';
 import PropTypes from 'prop-types';
-import { Trans, withNamespaces } from 'react-i18next';
-import ReactTable from 'react-table';
 
-import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
-import Card from '../../ui/Card';
-import Modal from './Modal';
+import ClientsTable from './ClientsTable';
+import AutoClients from './AutoClients';
+import PageTitle from '../../ui/PageTitle';
+import Loading from '../../ui/Loading';
 
 class Clients extends Component {
-    handleFormAdd = (values) => {
-        this.props.addClient(values);
-    };
-
-    handleFormUpdate = (values, name) => {
-        this.props.updateClient(values, name);
-    };
-
-    handleSubmit = (values) => {
-        if (this.props.modalType === MODAL_TYPE.EDIT) {
-            this.handleFormUpdate(values, this.props.modalClientName);
-        } else {
-            this.handleFormAdd(values);
-        }
-    };
-
-    cellWrap = ({ value }) => (
-        <div className="logs__row logs__row--overflow">
-            <span className="logs__text" title={value}>
-                {value}
-            </span>
-        </div>
-    );
-
-    getClient = (name, clients) => {
-        const client = clients.find(item => name === item.name);
-
-        if (client) {
-            const identifier = client.mac ? CLIENT_ID.MAC : CLIENT_ID.IP;
-
-            return {
-                identifier,
-                use_global_settings: true,
-                ...client,
-            };
-        }
-
-        return {
-            identifier: CLIENT_ID.IP,
-            use_global_settings: true,
-        };
-    };
-
-    getStats = (ip, stats) => {
-        if (stats && stats.top_clients) {
-            return stats.top_clients[ip];
-        }
-
-        return '';
-    };
-
-    handleDelete = (data) => {
-        // eslint-disable-next-line no-alert
-        if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
-            this.props.deleteClient(data);
-        }
-    }
-
-    columns = [
-        {
-            Header: this.props.t('table_client'),
-            accessor: 'ip',
-            Cell: (row) => {
-                if (row.original && row.original.mac) {
-                    return (
-                        <div className="logs__row logs__row--overflow">
-                            <span className="logs__text" title={row.original.mac}>
-                                {row.original.mac} <em>(MAC)</em>
-                            </span>
-                        </div>
-                    );
-                } else if (row.value) {
-                    return (
-                        <div className="logs__row logs__row--overflow">
-                            <span className="logs__text" title={row.value}>
-                                {row.value} <em>(IP)</em>
-                            </span>
-                        </div>
-                    );
-                }
-
-                return '';
-            },
-        },
-        {
-            Header: this.props.t('table_name'),
-            accessor: 'name',
-            Cell: this.cellWrap,
-        },
-        {
-            Header: this.props.t('settings'),
-            accessor: 'use_global_settings',
-            Cell: ({ value }) => {
-                const title = value ? (
-                    <Trans>settings_global</Trans>
-                ) : (
-                    <Trans>settings_custom</Trans>
-                );
-
-                return (
-                    <div className="logs__row logs__row--overflow">
-                        <div className="logs__text" title={title}>
-                            {title}
-                        </div>
-                    </div>
-                );
-            },
-        },
-        {
-            Header: this.props.t('table_statistics'),
-            accessor: 'statistics',
-            Cell: (row) => {
-                const clientIP = row.original.ip;
-                const clientStats = clientIP && this.getStats(clientIP, this.props.topStats);
-
-                if (clientStats) {
-                    return (
-                        <div className="logs__row">
-                            <div className="logs__text" title={clientStats}>
-                                {clientStats}
-                            </div>
-                        </div>
-                    );
-                }
-
-                return '–';
-            },
-        },
-        {
-            Header: this.props.t('actions_table_header'),
-            accessor: 'actions',
-            maxWidth: 150,
-            Cell: (row) => {
-                const clientName = row.original.name;
-                const {
-                    toggleClientModal,
-                    processingDeleting,
-                    processingUpdating,
-                    t,
-                } = this.props;
-
-                return (
-                    <div className="logs__row logs__row--center">
-                        <button
-                            type="button"
-                            className="btn btn-icon btn-outline-primary btn-sm mr-2"
-                            onClick={() =>
-                                toggleClientModal({
-                                    type: MODAL_TYPE.EDIT,
-                                    name: clientName,
-                                })
-                            }
-                            disabled={processingUpdating}
-                            title={t('edit_table_action')}
-                        >
-                            <svg className="icons">
-                                <use xlinkHref="#edit" />
-                            </svg>
-                        </button>
-                        <button
-                            type="button"
-                            className="btn btn-icon btn-outline-secondary btn-sm"
-                            onClick={() => this.handleDelete({ name: clientName })}
-                            disabled={processingDeleting}
-                            title={t('delete_table_action')}
-                        >
-                            <svg className="icons">
-                                <use xlinkHref="#delete" />
-                            </svg>
-                        </button>
-                    </div>
-                );
-            },
-        },
-    ];
-
     render() {
-        const {
-            t,
-            clients,
-            isModalOpen,
-            modalType,
-            modalClientName,
-            toggleClientModal,
-            processingAdding,
-            processingUpdating,
-        } = this.props;
-
-        const currentClientData = this.getClient(modalClientName, clients);
+        const { dashboard, clients, t } = this.props;
 
         return (
-            <Card
-                title={t('clients_title')}
-                subtitle={t('clients_desc')}
-                bodyType="card-body box-body--settings"
-            >
-                <Fragment>
-                    <ReactTable
-                        data={clients || []}
-                        columns={this.columns}
-                        className="-striped -highlight card-table-overflow"
-                        showPagination={true}
-                        defaultPageSize={10}
-                        minRows={5}
-                        previousText={t('previous_btn')}
-                        nextText={t('next_btn')}
-                        loadingText={t('loading_table_status')}
-                        pageText={t('page_table_footer_text')}
-                        ofText={t('of_table_footer_text')}
-                        rowsText={t('rows_table_footer_text')}
-                        noDataText={t('clients_not_found')}
-                    />
-                    <button
-                        type="button"
-                        className="btn btn-success btn-standard mt-3"
-                        onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
-                        disabled={processingAdding}
-                    >
-                        <Trans>client_add</Trans>
-                    </button>
-
-                    <Modal
-                        isModalOpen={isModalOpen}
-                        modalType={modalType}
-                        toggleClientModal={toggleClientModal}
-                        currentClientData={currentClientData}
-                        handleSubmit={this.handleSubmit}
-                        processingAdding={processingAdding}
-                        processingUpdating={processingUpdating}
-                    />
-                </Fragment>
-            </Card>
+            <Fragment>
+                <PageTitle title={t('clients_settings')} />
+                {!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
+                {!dashboard.processingTopStats && !dashboard.processingClients && (
+                    <Fragment>
+                        <ClientsTable
+                            clients={dashboard.clients}
+                            topStats={dashboard.topStats}
+                            isModalOpen={clients.isModalOpen}
+                            modalClientName={clients.modalClientName}
+                            modalType={clients.modalType}
+                            addClient={this.props.addClient}
+                            updateClient={this.props.updateClient}
+                            deleteClient={this.props.deleteClient}
+                            toggleClientModal={this.props.toggleClientModal}
+                            processingAdding={clients.processingAdding}
+                            processingDeleting={clients.processingDeleting}
+                            processingUpdating={clients.processingUpdating}
+                        />
+                        <AutoClients
+                            autoClients={dashboard.autoClients}
+                            topStats={dashboard.topStats}
+                        />
+                    </Fragment>
+                )}
+            </Fragment>
         );
     }
 }
 
 Clients.propTypes = {
     t: PropTypes.func.isRequired,
+    dashboard: PropTypes.object.isRequired,
     clients: PropTypes.array.isRequired,
     topStats: PropTypes.object.isRequired,
     toggleClientModal: PropTypes.func.isRequired,
diff --git a/client/src/components/Settings/Dhcp/index.js b/client/src/components/Settings/Dhcp/index.js
index d33f1bcf..626c18d4 100644
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -9,8 +9,15 @@ import Leases from './Leases';
 import StaticLeases from './StaticLeases/index';
 import Card from '../../ui/Card';
 import Accordion from '../../ui/Accordion';
+import PageTitle from '../../ui/PageTitle';
+import Loading from '../../ui/Loading';
 
 class Dhcp extends Component {
+    componentDidMount() {
+        this.props.getDhcpStatus();
+        this.props.getDhcpInterfaces();
+    }
+
     handleFormSubmit = (values) => {
         if (values.interface_name) {
             this.props.setDhcpConfig(values);
@@ -19,7 +26,7 @@ class Dhcp extends Component {
 
     handleToggle = (config) => {
         this.props.toggleDhcp(config);
-    }
+    };
 
     getToggleDhcpButton = () => {
         const {
@@ -54,17 +61,13 @@ class Dhcp extends Component {
                 className="btn btn-standard mr-2 btn-success"
                 onClick={() => this.handleToggle(config)}
                 disabled={
-                    !filledConfig
-                    || !check
-                    || otherDhcpFound
-                    || processingDhcp
-                    || processingConfig
+                    !filledConfig || !check || otherDhcpFound || processingDhcp || processingConfig
                 }
             >
                 <Trans>dhcp_enable</Trans>
             </button>
         );
-    }
+    };
 
     getActiveDhcpMessage = (t, check) => {
         const { found } = check.otherServer;
@@ -95,7 +98,7 @@ class Dhcp extends Component {
                 )}
             </div>
         );
-    }
+    };
 
     getDhcpWarning = (check) => {
         if (check.otherServer.found === DHCP_STATUS_RESPONSE.NO) {
@@ -107,7 +110,7 @@ class Dhcp extends Component {
                 <Trans>dhcp_warning</Trans>
             </div>
         );
-    }
+    };
 
     getStaticIpWarning = (t, check, interfaceName) => {
         if (check.staticIP.static === DHCP_STATUS_RESPONSE.ERROR) {
@@ -121,21 +124,19 @@ class Dhcp extends Component {
                             </Accordion>
                         </div>
                     </div>
-                    <hr className="mt-4 mb-4"/>
+                    <hr className="mt-4 mb-4" />
                 </Fragment>
             );
         } else if (
-            check.staticIP.static === DHCP_STATUS_RESPONSE.NO
-            && check.staticIP.ip
-            && interfaceName
+            check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
+            check.staticIP.ip &&
+            interfaceName
         ) {
             return (
                 <Fragment>
                     <div className="text-secondary mb-2">
                         <Trans
-                            components={[
-                                <strong key="0">example</strong>,
-                            ]}
+                            components={[<strong key="0">example</strong>]}
                             values={{
                                 interfaceName,
                                 ipAddress: check.staticIP.ip,
@@ -144,13 +145,13 @@ class Dhcp extends Component {
                             dhcp_dynamic_ip_found
                         </Trans>
                     </div>
-                    <hr className="mt-4 mb-4"/>
+                    <hr className="mt-4 mb-4" />
                 </Fragment>
             );
         }
 
         return '';
-    }
+    };
 
     render() {
         const { t, dhcp } = this.props;
@@ -158,93 +159,101 @@ class Dhcp extends Component {
             'btn btn-primary btn-standard': true,
             'btn btn-primary btn-standard btn-loading': dhcp.processingStatus,
         });
-        const {
-            enabled,
-            interface_name,
-            ...values
-        } = dhcp.config;
+        const { enabled, interface_name, ...values } = dhcp.config;
 
         return (
             <Fragment>
-                <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
-                    <div className="dhcp">
-                        {!dhcp.processing &&
-                            <Fragment>
-                                <Form
-                                    onSubmit={this.handleFormSubmit}
-                                    initialValues={{
-                                        interface_name,
-                                        ...values,
-                                    }}
-                                    interfaces={dhcp.interfaces}
-                                    processingConfig={dhcp.processingConfig}
-                                    processingInterfaces={dhcp.processingInterfaces}
-                                    enabled={enabled}
-                                />
-                                <hr/>
-                                <div className="card-actions mb-3">
-                                    {this.getToggleDhcpButton()}
-                                    <button
-                                        type="button"
-                                        className={statusButtonClass}
-                                        onClick={() =>
-                                            this.props.findActiveDhcp(interface_name)
-                                        }
-                                        disabled={
-                                            enabled
-                                            || !interface_name
-                                            || dhcp.processingConfig
-                                        }
-                                    >
-                                        <Trans>check_dhcp_servers</Trans>
-                                    </button>
-                                </div>
-                                {!enabled && dhcp.check &&
-                                    <Fragment>
-                                        {this.getStaticIpWarning(t, dhcp.check, interface_name)}
-                                        {this.getActiveDhcpMessage(t, dhcp.check)}
-                                        {this.getDhcpWarning(dhcp.check)}
-                                    </Fragment>
-                                }
-                            </Fragment>
-                        }
-                    </div>
-                </Card>
-                {!dhcp.processing && dhcp.config.enabled &&
+                <PageTitle title={t('dhcp_settings')} />
+                {(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
+                {!dhcp.processing && !dhcp.processingInterfaces && (
                     <Fragment>
-                        <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
-                            <div className="row">
-                                <div className="col">
-                                    <Leases leases={dhcp.leases} />
-                                </div>
-                            </div>
-                        </Card>
-                        <Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
-                            <div className="row">
-                                <div className="col-12">
-                                    <StaticLeases
-                                        staticLeases={dhcp.staticLeases}
-                                        isModalOpen={dhcp.isModalOpen}
-                                        addStaticLease={this.props.addStaticLease}
-                                        removeStaticLease={this.props.removeStaticLease}
-                                        toggleLeaseModal={this.props.toggleLeaseModal}
-                                        processingAdding={dhcp.processingAdding}
-                                        processingDeleting={dhcp.processingDeleting}
+                        <Card
+                            title={t('dhcp_title')}
+                            subtitle={t('dhcp_description')}
+                            bodyType="card-body box-body--settings"
+                        >
+                            <div className="dhcp">
+                                <Fragment>
+                                    <Form
+                                        onSubmit={this.handleFormSubmit}
+                                        initialValues={{
+                                            interface_name,
+                                            ...values,
+                                        }}
+                                        interfaces={dhcp.interfaces}
+                                        processingConfig={dhcp.processingConfig}
+                                        processingInterfaces={dhcp.processingInterfaces}
+                                        enabled={enabled}
                                     />
-                                </div>
-                                <div className="col-12">
-                                    <button
-                                        type="button"
-                                        className="btn btn-success btn-standard mt-3"
-                                        onClick={() => this.props.toggleLeaseModal()}
-                                    >
-                                        <Trans>dhcp_add_static_lease</Trans>
-                                    </button>
-                                </div>
+                                    <hr />
+                                    <div className="card-actions mb-3">
+                                        {this.getToggleDhcpButton()}
+                                        <button
+                                            type="button"
+                                            className={statusButtonClass}
+                                            onClick={() =>
+                                                this.props.findActiveDhcp(interface_name)
+                                            }
+                                            disabled={
+                                                enabled || !interface_name || dhcp.processingConfig
+                                            }
+                                        >
+                                            <Trans>check_dhcp_servers</Trans>
+                                        </button>
+                                    </div>
+                                    {!enabled && dhcp.check && (
+                                        <Fragment>
+                                            {this.getStaticIpWarning(t, dhcp.check, interface_name)}
+                                            {this.getActiveDhcpMessage(t, dhcp.check)}
+                                            {this.getDhcpWarning(dhcp.check)}
+                                        </Fragment>
+                                    )}
+                                </Fragment>
                             </div>
                         </Card>
+                        {dhcp.config.enabled && (
+                            <Fragment>
+                                <Card
+                                    title={t('dhcp_leases')}
+                                    bodyType="card-body box-body--settings"
+                                >
+                                    <div className="row">
+                                        <div className="col">
+                                            <Leases leases={dhcp.leases} />
+                                        </div>
+                                    </div>
+                                </Card>
+                                <Card
+                                    title={t('dhcp_static_leases')}
+                                    bodyType="card-body box-body--settings"
+                                >
+                                    <div className="row">
+                                        <div className="col-12">
+                                            <StaticLeases
+                                                staticLeases={dhcp.staticLeases}
+                                                isModalOpen={dhcp.isModalOpen}
+                                                addStaticLease={this.props.addStaticLease}
+                                                removeStaticLease={this.props.removeStaticLease}
+                                                toggleLeaseModal={this.props.toggleLeaseModal}
+                                                processingAdding={dhcp.processingAdding}
+                                                processingDeleting={dhcp.processingDeleting}
+                                            />
+                                        </div>
+                                        <div className="col-12">
+                                            <button
+                                                type="button"
+                                                className="btn btn-success btn-standard mt-3"
+                                                onClick={() => this.props.toggleLeaseModal()}
+                                            >
+                                                <Trans>dhcp_add_static_lease</Trans>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </Card>
+                            </Fragment>
+                        )}
                     </Fragment>
-                }
+                )}
             </Fragment>
         );
     }
@@ -256,10 +265,10 @@ Dhcp.propTypes = {
     getDhcpStatus: PropTypes.func,
     setDhcpConfig: PropTypes.func,
     findActiveDhcp: PropTypes.func,
-    handleSubmit: PropTypes.func,
     addStaticLease: PropTypes.func,
     removeStaticLease: PropTypes.func,
     toggleLeaseModal: PropTypes.func,
+    getDhcpInterfaces: PropTypes.func,
     t: PropTypes.func,
 };
 
diff --git a/client/src/components/Settings/Upstream/Examples.js b/client/src/components/Settings/Dns/Upstream/Examples.js
similarity index 55%
rename from client/src/components/Settings/Upstream/Examples.js
rename to client/src/components/Settings/Dns/Upstream/Examples.js
index 0515d9dc..d18d85ba 100644
--- a/client/src/components/Settings/Upstream/Examples.js
+++ b/client/src/components/Settings/Dns/Upstream/Examples.js
@@ -7,7 +7,12 @@ const Examples = props => (
         <p>
             <Trans
                 components={[
-                    <a href="https://kb.adguard.com/general/dns-providers" target="_blank" rel="noopener noreferrer" key="0">
+                    <a
+                        href="https://kb.adguard.com/general/dns-providers"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        key="0"
+                    >
                         DNS providers
                     </a>,
                 ]}
@@ -18,14 +23,19 @@ const Examples = props => (
         <Trans>examples_title</Trans>:
         <ol className="leading-loose">
             <li>
-                <code>1.1.1.1</code> - { props.t('example_upstream_regular') }
+                <code>1.1.1.1</code> - {props.t('example_upstream_regular')}
             </li>
             <li>
                 <code>tls://1dot1dot1dot1.cloudflare-dns.com</code> –&nbsp;
                 <span>
                     <Trans
                         components={[
-                            <a href="https://en.wikipedia.org/wiki/DNS_over_TLS" target="_blank" rel="noopener noreferrer" key="0">
+                            <a
+                                href="https://en.wikipedia.org/wiki/DNS_over_TLS"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                key="0"
+                            >
                                 DNS-over-TLS
                             </a>,
                         ]}
@@ -39,7 +49,12 @@ const Examples = props => (
                 <span>
                     <Trans
                         components={[
-                            <a href="https://en.wikipedia.org/wiki/DNS_over_HTTPS" target="_blank" rel="noopener noreferrer" key="0">
+                            <a
+                                href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                key="0"
+                            >
                                 DNS-over-HTTPS
                             </a>,
                         ]}
@@ -56,13 +71,28 @@ const Examples = props => (
                 <span>
                     <Trans
                         components={[
-                            <a href="https://dnscrypt.info/stamps/" target="_blank" rel="noopener noreferrer" key="0">
+                            <a
+                                href="https://dnscrypt.info/stamps/"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                key="0"
+                            >
                                 DNS Stamps
                             </a>,
-                            <a href="https://dnscrypt.info/" target="_blank" rel="noopener noreferrer" key="1">
+                            <a
+                                href="https://dnscrypt.info/"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                key="1"
+                            >
                                 DNSCrypt
                             </a>,
-                            <a href="https://en.wikipedia.org/wiki/DNS_over_HTTPS" target="_blank" rel="noopener noreferrer" key="2">
+                            <a
+                                href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                key="2"
+                            >
                                 DNS-over-HTTPS
                             </a>,
                         ]}
@@ -76,7 +106,12 @@ const Examples = props => (
                 <span>
                     <Trans
                         components={[
-                            <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains" target="_blank" rel="noopener noreferrer" key="0">
+                            <a
+                                href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                key="0"
+                            >
                                 Link
                             </a>,
                         ]}
diff --git a/client/src/components/Settings/Upstream/Form.js b/client/src/components/Settings/Dns/Upstream/Form.js
similarity index 88%
rename from client/src/components/Settings/Upstream/Form.js
rename to client/src/components/Settings/Dns/Upstream/Form.js
index 37990e42..d055f274 100644
--- a/client/src/components/Settings/Upstream/Form.js
+++ b/client/src/components/Settings/Dns/Upstream/Form.js
@@ -6,7 +6,7 @@ import { Trans, withNamespaces } from 'react-i18next';
 import flow from 'lodash/flow';
 import classnames from 'classnames';
 
-import { renderSelectField } from '../../../helpers/form';
+import { renderSelectField } from '../../../../helpers/form';
 import Examples from './Examples';
 
 let Form = (props) => {
@@ -58,7 +58,7 @@ let Form = (props) => {
                 </div>
                 <div className="col-12">
                     <Examples />
-                    <hr/>
+                    <hr />
                 </div>
                 <div className="col-12">
                     <div className="form__group">
@@ -84,11 +84,13 @@ let Form = (props) => {
                     <button
                         type="button"
                         className={testButtonClass}
-                        onClick={() => testUpstream({
-                            upstream_dns: upstreamDns,
-                            bootstrap_dns: bootstrapDns,
-                            all_servers: allServers,
-                        })}
+                        onClick={() =>
+                            testUpstream({
+                                upstream_dns: upstreamDns,
+                                bootstrap_dns: bootstrapDns,
+                                all_servers: allServers,
+                            })
+                        }
                         disabled={!upstreamDns || processingTestUpstream}
                     >
                         <Trans>test_upstream_btn</Trans>
@@ -97,10 +99,7 @@ let Form = (props) => {
                         type="submit"
                         className="btn btn-success btn-standard"
                         disabled={
-                            submitting
-                            || invalid
-                            || processingSetUpstream
-                            || processingTestUpstream
+                            submitting || invalid || processingSetUpstream || processingTestUpstream
                         }
                     >
                         <Trans>apply_btn</Trans>
@@ -140,5 +139,7 @@ Form = connect((state) => {
 
 export default flow([
     withNamespaces(),
-    reduxForm({ form: 'upstreamForm' }),
+    reduxForm({
+        form: 'upstreamForm',
+    }),
 ])(Form);
diff --git a/client/src/components/Settings/Upstream/index.js b/client/src/components/Settings/Dns/Upstream/index.js
similarity index 93%
rename from client/src/components/Settings/Upstream/index.js
rename to client/src/components/Settings/Dns/Upstream/index.js
index 7ae4ea4d..292c2cfd 100644
--- a/client/src/components/Settings/Upstream/index.js
+++ b/client/src/components/Settings/Dns/Upstream/index.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { withNamespaces } from 'react-i18next';
 
 import Form from './Form';
-import Card from '../../ui/Card';
+import Card from '../../../ui/Card';
 
 class Upstream extends Component {
     handleSubmit = (values) => {
@@ -12,7 +12,7 @@ class Upstream extends Component {
 
     handleTest = (values) => {
         this.props.testUpstream(values);
-    }
+    };
 
     render() {
         const {
@@ -26,8 +26,8 @@ class Upstream extends Component {
 
         return (
             <Card
-                title={ t('upstream_dns') }
-                subtitle={ t('upstream_dns_hint') }
+                title={t('upstream_dns')}
+                subtitle={t('upstream_dns_hint')}
                 bodyType="card-body box-body--settings"
             >
                 <div className="row">
diff --git a/client/src/components/Settings/Dns/index.js b/client/src/components/Settings/Dns/index.js
new file mode 100644
index 00000000..d65a6c32
--- /dev/null
+++ b/client/src/components/Settings/Dns/index.js
@@ -0,0 +1,35 @@
+import React, { Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { withNamespaces } from 'react-i18next';
+
+import Upstream from './Upstream';
+import PageTitle from '../../ui/PageTitle';
+
+const Dns = (props) => {
+    const { dashboard, settings, t } = props;
+
+    return (
+        <Fragment>
+            <PageTitle title={t('dns_settings')} />
+            <Upstream
+                upstreamDns={dashboard.upstreamDns}
+                bootstrapDns={dashboard.bootstrapDns}
+                allServers={dashboard.allServers}
+                setUpstream={props.setUpstream}
+                testUpstream={props.testUpstream}
+                processingTestUpstream={settings.processingTestUpstream}
+                processingSetUpstream={settings.processingSetUpstream}
+            />
+        </Fragment>
+    );
+};
+
+Dns.propTypes = {
+    dashboard: PropTypes.object.isRequired,
+    settings: PropTypes.object.isRequired,
+    setUpstream: PropTypes.func.isRequired,
+    testUpstream: PropTypes.func.isRequired,
+    t: PropTypes.func.isRequired,
+};
+
+export default withNamespaces()(Dns);
diff --git a/client/src/components/Settings/Encryption/Form.js b/client/src/components/Settings/Encryption/Form.js
index cc11c779..0b60271a 100644
--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -66,14 +66,15 @@ let Form = (props) => {
         setTlsConfig,
     } = props;
 
-    const isSavingDisabled = invalid
-        || submitting
-        || processingConfig
-        || processingValidate
-        || (isEnabled && (!privateKey || !certificateChain))
-        || (privateKey && !valid_key)
-        || (certificateChain && !valid_cert)
-        || (privateKey && certificateChain && !valid_pair);
+    const isSavingDisabled =
+        invalid ||
+        submitting ||
+        processingConfig ||
+        processingValidate ||
+        (isEnabled && (!privateKey || !certificateChain)) ||
+        (privateKey && !valid_key) ||
+        (certificateChain && !valid_cert) ||
+        (privateKey && certificateChain && !valid_pair);
 
     return (
         <form onSubmit={handleSubmit}>
@@ -91,7 +92,7 @@ let Form = (props) => {
                     <div className="form__desc">
                         <Trans>encryption_enable_desc</Trans>
                     </div>
-                    <hr/>
+                    <hr />
                 </div>
                 <div className="col-12">
                     <label className="form__label" htmlFor="server_name">
@@ -180,13 +181,20 @@ let Form = (props) => {
             <div className="row">
                 <div className="col-12">
                     <div className="form__group form__group--settings">
-                        <label className="form__label form__label--bold" htmlFor="certificate_chain">
+                        <label
+                            className="form__label form__label--bold"
+                            htmlFor="certificate_chain"
+                        >
                             <Trans>encryption_certificates</Trans>
                         </label>
                         <div className="form__desc form__desc--top">
                             <Trans
                                 values={{ link: 'letsencrypt.org' }}
-                                components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
+                                components={[
+                                    <a href="https://letsencrypt.org/" key="0">
+                                        link
+                                    </a>,
+                                ]}
                             >
                                 encryption_certificates_desc
                             </Trans>
@@ -202,49 +210,52 @@ let Form = (props) => {
                             disabled={!isEnabled}
                         />
                         <div className="form__status">
-                            {certificateChain &&
+                            {certificateChain && (
                                 <Fragment>
                                     <div className="form__label form__label--bold">
                                         <Trans>encryption_status</Trans>:
                                     </div>
                                     <ul className="encryption__list">
-                                        <li className={valid_chain ? 'text-success' : 'text-danger'}>
-                                            {valid_chain ?
+                                        <li
+                                            className={valid_chain ? 'text-success' : 'text-danger'}
+                                        >
+                                            {valid_chain ? (
                                                 <Trans>encryption_chain_valid</Trans>
-                                                : <Trans>encryption_chain_invalid</Trans>
-                                            }
+                                            ) : (
+                                                <Trans>encryption_chain_invalid</Trans>
+                                            )}
                                         </li>
-                                        {valid_cert &&
+                                        {valid_cert && (
                                             <Fragment>
-                                                {subject &&
+                                                {subject && (
                                                     <li>
                                                         <Trans>encryption_subject</Trans>:&nbsp;
                                                         {subject}
                                                     </li>
-                                                }
-                                                {issuer &&
+                                                )}
+                                                {issuer && (
                                                     <li>
                                                         <Trans>encryption_issuer</Trans>:&nbsp;
                                                         {issuer}
                                                     </li>
-                                                }
-                                                {not_after && not_after !== EMPTY_DATE &&
+                                                )}
+                                                {not_after && not_after !== EMPTY_DATE && (
                                                     <li>
                                                         <Trans>encryption_expire</Trans>:&nbsp;
                                                         {format(not_after, 'YYYY-MM-DD HH:mm:ss')}
                                                     </li>
-                                                }
-                                                {dns_names &&
+                                                )}
+                                                {dns_names && (
                                                     <li>
                                                         <Trans>encryption_hostnames</Trans>:&nbsp;
                                                         {dns_names}
                                                     </li>
-                                                }
+                                                )}
                                             </Fragment>
-                                        }
+                                        )}
                                     </ul>
                                 </Fragment>
-                            }
+                            )}
                         </div>
                     </div>
                 </div>
@@ -266,35 +277,34 @@ let Form = (props) => {
                             disabled={!isEnabled}
                         />
                         <div className="form__status">
-                            {privateKey &&
+                            {privateKey && (
                                 <Fragment>
                                     <div className="form__label form__label--bold">
                                         <Trans>encryption_status</Trans>:
                                     </div>
                                     <ul className="encryption__list">
                                         <li className={valid_key ? 'text-success' : 'text-danger'}>
-                                            {valid_key ?
+                                            {valid_key ? (
                                                 <Trans values={{ type: key_type }}>
                                                     encryption_key_valid
                                                 </Trans>
-                                                : <Trans values={{ type: key_type }}>
+                                            ) : (
+                                                <Trans values={{ type: key_type }}>
                                                     encryption_key_invalid
                                                 </Trans>
-                                            }
+                                            )}
                                         </li>
                                     </ul>
                                 </Fragment>
-                            }
+                            )}
                         </div>
                     </div>
                 </div>
-                {warning_validation &&
+                {warning_validation && (
                     <div className="col-12">
-                        <p className="text-danger">
-                            {warning_validation}
-                        </p>
+                        <p className="text-danger">{warning_validation}</p>
                     </div>
-                }
+                )}
             </div>
 
             <div className="btn-list mt-2">
diff --git a/client/src/components/Settings/Encryption/index.js b/client/src/components/Settings/Encryption/index.js
index b84ee889..cd2c4f5b 100644
--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -6,11 +6,17 @@ import debounce from 'lodash/debounce';
 import { DEBOUNCE_TIMEOUT } from '../../../helpers/constants';
 import Form from './Form';
 import Card from '../../ui/Card';
+import PageTitle from '../../ui/PageTitle';
+import Loading from '../../ui/Loading';
 
 class Encryption extends Component {
     componentDidMount() {
-        if (this.props.encryption.enabled) {
-            this.props.validateTlsConfig(this.props.encryption);
+        const { getTlsStatus, validateTlsConfig, encryption } = this.props;
+
+        getTlsStatus();
+
+        if (encryption.enabled) {
+            validateTlsConfig(encryption);
         }
     }
 
@@ -36,7 +42,9 @@ class Encryption extends Component {
 
         return (
             <div className="encryption">
-                {encryption &&
+                <PageTitle title={t('encryption_settings')} />
+                {encryption.processing && <Loading />}
+                {!encryption.processing && (
                     <Card
                         title={t('encryption_title')}
                         subtitle={t('encryption_desc')}
@@ -58,7 +66,7 @@ class Encryption extends Component {
                             {...this.props.encryption}
                         />
                     </Card>
-                }
+                )}
             </div>
         );
     }
diff --git a/client/src/components/Settings/index.js b/client/src/components/Settings/index.js
index 2bafa425..1e072311 100644
--- a/client/src/components/Settings/index.js
+++ b/client/src/components/Settings/index.js
@@ -2,12 +2,6 @@ import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { withNamespaces, Trans } from 'react-i18next';
 
-import Upstream from './Upstream';
-import Dhcp from './Dhcp';
-import Encryption from './Encryption';
-import Clients from './Clients';
-import AutoClients from './Clients/AutoClients';
-import Access from './Access';
 import Checkbox from '../ui/Checkbox';
 import Loading from '../ui/Loading';
 import PageTitle from '../ui/PageTitle';
@@ -41,10 +35,6 @@ class Settings extends Component {
 
     componentDidMount() {
         this.props.initSettings(this.settings);
-        this.props.getDhcpStatus();
-        this.props.getDhcpInterfaces();
-        this.props.getTlsStatus();
-        this.props.getAccessList();
     }
 
     renderSettings = (settings) => {
@@ -69,72 +59,20 @@ class Settings extends Component {
     };
 
     render() {
-        const {
-            settings, dashboard, clients, access, t,
-        } = this.props;
+        const { settings, t } = this.props;
         return (
             <Fragment>
-                <PageTitle title={t('settings')} />
+                <PageTitle title={t('general_settings')} />
                 {settings.processing && <Loading />}
                 {!settings.processing && (
                     <div className="content">
                         <div className="row">
                             <div className="col-md-12">
-                                <Card
-                                    title={t('general_settings')}
-                                    bodyType="card-body box-body--settings"
-                                >
+                                <Card bodyType="card-body box-body--settings">
                                     <div className="form">
                                         {this.renderSettings(settings.settingsList)}
                                     </div>
                                 </Card>
-                                <Upstream
-                                    upstreamDns={dashboard.upstreamDns}
-                                    bootstrapDns={dashboard.bootstrapDns}
-                                    allServers={dashboard.allServers}
-                                    setUpstream={this.props.setUpstream}
-                                    testUpstream={this.props.testUpstream}
-                                    processingTestUpstream={settings.processingTestUpstream}
-                                    processingSetUpstream={settings.processingSetUpstream}
-                                />
-                                {!dashboard.processingTopStats && !dashboard.processingClients && (
-                                    <Fragment>
-                                        <Clients
-                                            clients={dashboard.clients}
-                                            topStats={dashboard.topStats}
-                                            isModalOpen={clients.isModalOpen}
-                                            modalClientName={clients.modalClientName}
-                                            modalType={clients.modalType}
-                                            addClient={this.props.addClient}
-                                            updateClient={this.props.updateClient}
-                                            deleteClient={this.props.deleteClient}
-                                            toggleClientModal={this.props.toggleClientModal}
-                                            processingAdding={clients.processingAdding}
-                                            processingDeleting={clients.processingDeleting}
-                                            processingUpdating={clients.processingUpdating}
-                                        />
-                                        <AutoClients
-                                            autoClients={dashboard.autoClients}
-                                            topStats={dashboard.topStats}
-                                        />
-                                    </Fragment>
-                                )}
-                                <Access access={access} setAccessList={this.props.setAccessList} />
-                                <Encryption
-                                    encryption={this.props.encryption}
-                                    setTlsConfig={this.props.setTlsConfig}
-                                    validateTlsConfig={this.props.validateTlsConfig}
-                                />
-                                <Dhcp
-                                    dhcp={this.props.dhcp}
-                                    toggleDhcp={this.props.toggleDhcp}
-                                    getDhcpStatus={this.props.getDhcpStatus}
-                                    findActiveDhcp={this.props.findActiveDhcp}
-                                    setDhcpConfig={this.props.setDhcpConfig}
-                                    addStaticLease={this.props.addStaticLease}
-                                    removeStaticLease={this.props.removeStaticLease}
-                                    toggleLeaseModal={this.props.toggleLeaseModal}
-                                />
                             </div>
                         </div>
                     </div>
@@ -149,8 +87,6 @@ Settings.propTypes = {
     settings: PropTypes.object,
     settingsList: PropTypes.object,
     toggleSetting: PropTypes.func,
-    handleUpstreamChange: PropTypes.func,
-    setUpstream: PropTypes.func,
     t: PropTypes.func,
 };
 
diff --git a/client/src/components/ui/Dropdown.css b/client/src/components/ui/Dropdown.css
new file mode 100644
index 00000000..6af28594
--- /dev/null
+++ b/client/src/components/ui/Dropdown.css
@@ -0,0 +1,8 @@
+.dropdown-item.active,
+.dropdown-item:active {
+    background-color: #66b574;
+}
+
+.dropdown-menu {
+    cursor: default;
+}
diff --git a/client/src/components/ui/Dropdown.js b/client/src/components/ui/Dropdown.js
new file mode 100644
index 00000000..4f5bf36c
--- /dev/null
+++ b/client/src/components/ui/Dropdown.js
@@ -0,0 +1,89 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { withNamespaces } from 'react-i18next';
+import enhanceWithClickOutside from 'react-click-outside';
+
+import './Dropdown.css';
+
+class Dropdown extends Component {
+    state = {
+        isOpen: false,
+    };
+
+    toggleDropdown = () => {
+        this.setState(prevState => ({ isOpen: !prevState.isOpen }));
+    };
+
+    hideDropdown = () => {
+        this.setState({ isOpen: false });
+    };
+
+    handleClickOutside = () => {
+        if (this.state.isOpen) {
+            this.hideDropdown();
+        }
+    };
+
+    render() {
+        const {
+            label,
+            controlClassName,
+            menuClassName,
+            baseClassName,
+            icon,
+            children,
+        } = this.props;
+
+        const { isOpen } = this.state;
+
+        const dropdownClass = classnames({
+            [baseClassName]: true,
+            show: isOpen,
+        });
+
+        const dropdownMenuClass = classnames({
+            [menuClassName]: true,
+            show: isOpen,
+        });
+
+        const ariaSettings = isOpen ? 'true' : 'false';
+
+        return (
+            <div className={dropdownClass}>
+                <a
+                    className={controlClassName}
+                    aria-expanded={ariaSettings}
+                    onClick={this.toggleDropdown}
+                >
+                    {icon && (
+                        <svg className="nav-icon">
+                            <use xlinkHref={`#${icon}`} />
+                        </svg>
+                    )}
+                    {label}
+                </a>
+                <div className={dropdownMenuClass} onClick={this.hideDropdown}>
+                    {children}
+                </div>
+            </div>
+        );
+    }
+}
+
+Dropdown.defaultProps = {
+    baseClassName: 'dropdown',
+    menuClassName: 'dropdown-menu dropdown-menu-arrow',
+    controlClassName: '',
+};
+
+Dropdown.propTypes = {
+    label: PropTypes.string.isRequired,
+    children: PropTypes.node.isRequired,
+    controlClassName: PropTypes.node.isRequired,
+    menuClassName: PropTypes.string.isRequired,
+    baseClassName: PropTypes.string.isRequired,
+    icon: PropTypes.string,
+};
+
+export default withNamespaces()(enhanceWithClickOutside(Dropdown));
diff --git a/client/src/components/ui/Icons.js b/client/src/components/ui/Icons.js
index ef802433..58a5af9f 100644
--- a/client/src/components/ui/Icons.js
+++ b/client/src/components/ui/Icons.js
@@ -31,6 +31,30 @@ const Icons = () => (
         <symbol id="delete" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
             <path d="m3 6h2 16"/><path d="m19 6v14a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2-2v-14m3 0v-2a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><path d="m10 11v6"/><path d="m14 11v6"/>
         </symbol>
+
+        <symbol id="back" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/>
+        </symbol>
+
+        <symbol id="dashboard" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/>
+        </symbol>
+
+        <symbol id="filters" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/>
+        </symbol>
+
+        <symbol id="log" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/>
+        </symbol>
+
+        <symbol id="setup" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line>
+        </symbol>
+
+        <symbol id="settings" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
+            <circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/>
+        </symbol>
     </svg>
 );
 
diff --git a/client/src/containers/Clients.js b/client/src/containers/Clients.js
new file mode 100644
index 00000000..88ed5597
--- /dev/null
+++ b/client/src/containers/Clients.js
@@ -0,0 +1,26 @@
+import { connect } from 'react-redux';
+import { addErrorToast } from '../actions';
+import { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
+import Clients from '../components/Settings/Clients';
+
+const mapStateToProps = (state) => {
+    const { dashboard, clients } = state;
+    const props = {
+        dashboard,
+        clients,
+    };
+    return props;
+};
+
+const mapDispatchToProps = {
+    addErrorToast,
+    addClient,
+    updateClient,
+    deleteClient,
+    toggleClientModal,
+};
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps,
+)(Clients);
diff --git a/client/src/containers/Dhcp.js b/client/src/containers/Dhcp.js
new file mode 100644
index 00000000..5f40f851
--- /dev/null
+++ b/client/src/containers/Dhcp.js
@@ -0,0 +1,38 @@
+import { connect } from 'react-redux';
+import {
+    addErrorToast,
+    toggleDhcp,
+    getDhcpStatus,
+    getDhcpInterfaces,
+    setDhcpConfig,
+    findActiveDhcp,
+    toggleLeaseModal,
+    addStaticLease,
+    removeStaticLease,
+} from '../actions';
+import Dhcp from '../components/Settings/Dhcp';
+
+const mapStateToProps = (state) => {
+    const { dhcp } = state;
+    const props = {
+        dhcp,
+    };
+    return props;
+};
+
+const mapDispatchToProps = {
+    addErrorToast,
+    toggleDhcp,
+    getDhcpStatus,
+    getDhcpInterfaces,
+    setDhcpConfig,
+    findActiveDhcp,
+    toggleLeaseModal,
+    addStaticLease,
+    removeStaticLease,
+};
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps,
+)(Dhcp);
diff --git a/client/src/containers/Dns.js b/client/src/containers/Dns.js
new file mode 100644
index 00000000..fab30326
--- /dev/null
+++ b/client/src/containers/Dns.js
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
+import Dns from '../components/Settings/Dns';
+
+const mapStateToProps = (state) => {
+    const { dashboard, settings } = state;
+    const props = {
+        dashboard,
+        settings,
+    };
+    return props;
+};
+
+const mapDispatchToProps = {
+    handleUpstreamChange,
+    setUpstream,
+    testUpstream,
+    addErrorToast,
+};
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps,
+)(Dns);
diff --git a/client/src/containers/Encryption.js b/client/src/containers/Encryption.js
new file mode 100644
index 00000000..723837a2
--- /dev/null
+++ b/client/src/containers/Encryption.js
@@ -0,0 +1,24 @@
+import { connect } from 'react-redux';
+import { addErrorToast } from '../actions';
+import { getTlsStatus, setTlsConfig, validateTlsConfig } from '../actions/encryption';
+import Encryption from '../components/Settings/Encryption';
+
+const mapStateToProps = (state) => {
+    const { encryption } = state;
+    const props = {
+        encryption,
+    };
+    return props;
+};
+
+const mapDispatchToProps = {
+    addErrorToast,
+    getTlsStatus,
+    setTlsConfig,
+    validateTlsConfig,
+};
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps,
+)(Encryption);
diff --git a/client/src/helpers/constants.js b/client/src/helpers/constants.js
index d5f94f8c..e3db0df3 100644
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -177,3 +177,5 @@ export const CLIENT_ID = {
     MAC: 'mac',
     IP: 'ip',
 };
+
+export const SETTINGS_URLS = ['/encryption', '/dhcp', '/dns', '/settings', '/clients'];

From 757bb7285a0afd804d5e26eee29aeecc09d8662e Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 3 Jun 2019 16:08:50 +0300
Subject: [PATCH 2/4] * client: move access settings to DNS settings page

---
 .../src/components/Settings/Clients/index.js  | 30 +++++----
 .../Settings/{ => Dns}/Access/Form.js         |  0
 .../Settings/{ => Dns}/Access/index.js        |  2 +-
 client/src/components/Settings/Dns/index.js   | 61 ++++++++++++-----
 client/src/containers/Dns.js                  |  6 +-
 client/src/containers/Settings.js             | 66 +------------------
 client/src/reducers/access.js                 |  1 +
 7 files changed, 68 insertions(+), 98 deletions(-)
 rename client/src/components/Settings/{ => Dns}/Access/Form.js (100%)
 rename client/src/components/Settings/{ => Dns}/Access/index.js (96%)

diff --git a/client/src/components/Settings/Clients/index.js b/client/src/components/Settings/Clients/index.js
index 4f936e1e..087662a2 100644
--- a/client/src/components/Settings/Clients/index.js
+++ b/client/src/components/Settings/Clients/index.js
@@ -9,12 +9,20 @@ import Loading from '../../ui/Loading';
 
 class Clients extends Component {
     render() {
-        const { dashboard, clients, t } = this.props;
+        const {
+            t,
+            dashboard,
+            clients,
+            addClient,
+            updateClient,
+            deleteClient,
+            toggleClientModal,
+        } = this.props;
 
         return (
             <Fragment>
                 <PageTitle title={t('clients_settings')} />
-                {!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
+                {(dashboard.processingTopStats || dashboard.processingClients) && <Loading />}
                 {!dashboard.processingTopStats && !dashboard.processingClients && (
                     <Fragment>
                         <ClientsTable
@@ -23,10 +31,10 @@ class Clients extends Component {
                             isModalOpen={clients.isModalOpen}
                             modalClientName={clients.modalClientName}
                             modalType={clients.modalType}
-                            addClient={this.props.addClient}
-                            updateClient={this.props.updateClient}
-                            deleteClient={this.props.deleteClient}
-                            toggleClientModal={this.props.toggleClientModal}
+                            addClient={addClient}
+                            updateClient={updateClient}
+                            deleteClient={deleteClient}
+                            toggleClientModal={toggleClientModal}
                             processingAdding={clients.processingAdding}
                             processingDeleting={clients.processingDeleting}
                             processingUpdating={clients.processingUpdating}
@@ -45,18 +53,12 @@ class Clients extends Component {
 Clients.propTypes = {
     t: PropTypes.func.isRequired,
     dashboard: PropTypes.object.isRequired,
-    clients: PropTypes.array.isRequired,
-    topStats: PropTypes.object.isRequired,
+    clients: PropTypes.object.isRequired,
     toggleClientModal: PropTypes.func.isRequired,
     deleteClient: PropTypes.func.isRequired,
     addClient: PropTypes.func.isRequired,
     updateClient: PropTypes.func.isRequired,
-    isModalOpen: PropTypes.bool.isRequired,
-    modalType: PropTypes.string.isRequired,
-    modalClientName: PropTypes.string.isRequired,
-    processingAdding: PropTypes.bool.isRequired,
-    processingDeleting: PropTypes.bool.isRequired,
-    processingUpdating: PropTypes.bool.isRequired,
+    topStats: PropTypes.object,
 };
 
 export default withNamespaces()(Clients);
diff --git a/client/src/components/Settings/Access/Form.js b/client/src/components/Settings/Dns/Access/Form.js
similarity index 100%
rename from client/src/components/Settings/Access/Form.js
rename to client/src/components/Settings/Dns/Access/Form.js
diff --git a/client/src/components/Settings/Access/index.js b/client/src/components/Settings/Dns/Access/index.js
similarity index 96%
rename from client/src/components/Settings/Access/index.js
rename to client/src/components/Settings/Dns/Access/index.js
index 77ccc265..93d28bf7 100644
--- a/client/src/components/Settings/Access/index.js
+++ b/client/src/components/Settings/Dns/Access/index.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { withNamespaces } from 'react-i18next';
 
 import Form from './Form';
-import Card from '../../ui/Card';
+import Card from '../../../ui/Card';
 
 class Access extends Component {
     handleFormSubmit = (values) => {
diff --git a/client/src/components/Settings/Dns/index.js b/client/src/components/Settings/Dns/index.js
index d65a6c32..2b038b1f 100644
--- a/client/src/components/Settings/Dns/index.js
+++ b/client/src/components/Settings/Dns/index.js
@@ -1,34 +1,59 @@
-import React, { Fragment } from 'react';
+import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { withNamespaces } from 'react-i18next';
 
 import Upstream from './Upstream';
+import Access from './Access';
 import PageTitle from '../../ui/PageTitle';
+import Loading from '../../ui/Loading';
 
-const Dns = (props) => {
-    const { dashboard, settings, t } = props;
+class Dns extends Component {
+    componentDidMount() {
+        this.props.getAccessList();
+    }
 
-    return (
-        <Fragment>
-            <PageTitle title={t('dns_settings')} />
-            <Upstream
-                upstreamDns={dashboard.upstreamDns}
-                bootstrapDns={dashboard.bootstrapDns}
-                allServers={dashboard.allServers}
-                setUpstream={props.setUpstream}
-                testUpstream={props.testUpstream}
-                processingTestUpstream={settings.processingTestUpstream}
-                processingSetUpstream={settings.processingSetUpstream}
-            />
-        </Fragment>
-    );
-};
+    render() {
+        const {
+            t,
+            dashboard,
+            settings,
+            access,
+            setAccessList,
+            testUpstream,
+            setUpstream,
+        } = this.props;
+
+        return (
+            <Fragment>
+                <PageTitle title={t('dns_settings')} />
+                {(dashboard.processing || access.processing) && <Loading />}
+                {!dashboard.processing && !access.processing && (
+                    <Fragment>
+                        <Upstream
+                            upstreamDns={dashboard.upstreamDns}
+                            bootstrapDns={dashboard.bootstrapDns}
+                            allServers={dashboard.allServers}
+                            processingTestUpstream={settings.processingTestUpstream}
+                            processingSetUpstream={settings.processingSetUpstream}
+                            setUpstream={setUpstream}
+                            testUpstream={testUpstream}
+                        />
+                        <Access access={access} setAccessList={setAccessList} />
+                    </Fragment>
+                )}
+            </Fragment>
+        );
+    }
+}
 
 Dns.propTypes = {
     dashboard: PropTypes.object.isRequired,
     settings: PropTypes.object.isRequired,
     setUpstream: PropTypes.func.isRequired,
     testUpstream: PropTypes.func.isRequired,
+    getAccessList: PropTypes.func.isRequired,
+    setAccessList: PropTypes.func.isRequired,
+    access: PropTypes.object.isRequired,
     t: PropTypes.func.isRequired,
 };
 
diff --git a/client/src/containers/Dns.js b/client/src/containers/Dns.js
index fab30326..491f21ee 100644
--- a/client/src/containers/Dns.js
+++ b/client/src/containers/Dns.js
@@ -1,12 +1,14 @@
 import { connect } from 'react-redux';
 import { handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
+import { getAccessList, setAccessList } from '../actions/access';
 import Dns from '../components/Settings/Dns';
 
 const mapStateToProps = (state) => {
-    const { dashboard, settings } = state;
+    const { dashboard, settings, access } = state;
     const props = {
         dashboard,
         settings,
+        access,
     };
     return props;
 };
@@ -16,6 +18,8 @@ const mapDispatchToProps = {
     setUpstream,
     testUpstream,
     addErrorToast,
+    getAccessList,
+    setAccessList,
 };
 
 export default connect(
diff --git a/client/src/containers/Settings.js b/client/src/containers/Settings.js
index 5959d5fb..827822cf 100644
--- a/client/src/containers/Settings.js
+++ b/client/src/containers/Settings.js
@@ -1,53 +1,11 @@
 import { connect } from 'react-redux';
-import {
-    initSettings,
-    toggleSetting,
-    handleUpstreamChange,
-    setUpstream,
-    testUpstream,
-    addErrorToast,
-    toggleDhcp,
-    getDhcpStatus,
-    getDhcpInterfaces,
-    setDhcpConfig,
-    findActiveDhcp,
-    addStaticLease,
-    removeStaticLease,
-    toggleLeaseModal,
-} from '../actions';
-import {
-    getTlsStatus,
-    setTlsConfig,
-    validateTlsConfig,
-} from '../actions/encryption';
-import {
-    addClient,
-    updateClient,
-    deleteClient,
-    toggleClientModal,
-} from '../actions/clients';
-import {
-    getAccessList,
-    setAccessList,
-} from '../actions/access';
+import { initSettings, toggleSetting, addErrorToast } from '../actions';
 import Settings from '../components/Settings';
 
 const mapStateToProps = (state) => {
-    const {
-        settings,
-        dashboard,
-        dhcp,
-        encryption,
-        clients,
-        access,
-    } = state;
+    const { settings } = state;
     const props = {
         settings,
-        dashboard,
-        dhcp,
-        encryption,
-        clients,
-        access,
     };
     return props;
 };
@@ -55,27 +13,7 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = {
     initSettings,
     toggleSetting,
-    handleUpstreamChange,
-    setUpstream,
-    testUpstream,
     addErrorToast,
-    toggleDhcp,
-    getDhcpStatus,
-    getDhcpInterfaces,
-    setDhcpConfig,
-    findActiveDhcp,
-    getTlsStatus,
-    setTlsConfig,
-    validateTlsConfig,
-    addClient,
-    updateClient,
-    deleteClient,
-    toggleClientModal,
-    addStaticLease,
-    removeStaticLease,
-    toggleLeaseModal,
-    getAccessList,
-    setAccessList,
 };
 
 export default connect(
diff --git a/client/src/reducers/access.js b/client/src/reducers/access.js
index 9ee258a0..be8931dc 100644
--- a/client/src/reducers/access.js
+++ b/client/src/reducers/access.js
@@ -17,6 +17,7 @@ const access = handleActions(
                 allowed_clients: allowed_clients.join('\n'),
                 disallowed_clients: disallowed_clients.join('\n'),
                 blocked_hosts: blocked_hosts.join('\n'),
+                processing: false,
             };
             return newState;
         },

From 54f6710b8f03b452aae98d45da9c01468b671aae Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 3 Jun 2019 16:18:49 +0300
Subject: [PATCH 3/4] * client: remove unused addErrorToast method

---
 client/src/containers/Dhcp.js       | 2 --
 client/src/containers/Dns.js        | 3 +--
 client/src/containers/Encryption.js | 2 --
 client/src/containers/Settings.js   | 3 +--
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/client/src/containers/Dhcp.js b/client/src/containers/Dhcp.js
index 5f40f851..6f2b8f47 100644
--- a/client/src/containers/Dhcp.js
+++ b/client/src/containers/Dhcp.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 import {
-    addErrorToast,
     toggleDhcp,
     getDhcpStatus,
     getDhcpInterfaces,
@@ -21,7 +20,6 @@ const mapStateToProps = (state) => {
 };
 
 const mapDispatchToProps = {
-    addErrorToast,
     toggleDhcp,
     getDhcpStatus,
     getDhcpInterfaces,
diff --git a/client/src/containers/Dns.js b/client/src/containers/Dns.js
index 491f21ee..aa3c78ad 100644
--- a/client/src/containers/Dns.js
+++ b/client/src/containers/Dns.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { handleUpstreamChange, setUpstream, testUpstream, addErrorToast } from '../actions';
+import { handleUpstreamChange, setUpstream, testUpstream } from '../actions';
 import { getAccessList, setAccessList } from '../actions/access';
 import Dns from '../components/Settings/Dns';
 
@@ -17,7 +17,6 @@ const mapDispatchToProps = {
     handleUpstreamChange,
     setUpstream,
     testUpstream,
-    addErrorToast,
     getAccessList,
     setAccessList,
 };
diff --git a/client/src/containers/Encryption.js b/client/src/containers/Encryption.js
index 723837a2..e27dc44c 100644
--- a/client/src/containers/Encryption.js
+++ b/client/src/containers/Encryption.js
@@ -1,5 +1,4 @@
 import { connect } from 'react-redux';
-import { addErrorToast } from '../actions';
 import { getTlsStatus, setTlsConfig, validateTlsConfig } from '../actions/encryption';
 import Encryption from '../components/Settings/Encryption';
 
@@ -12,7 +11,6 @@ const mapStateToProps = (state) => {
 };
 
 const mapDispatchToProps = {
-    addErrorToast,
     getTlsStatus,
     setTlsConfig,
     validateTlsConfig,
diff --git a/client/src/containers/Settings.js b/client/src/containers/Settings.js
index 827822cf..e50290f1 100644
--- a/client/src/containers/Settings.js
+++ b/client/src/containers/Settings.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { initSettings, toggleSetting, addErrorToast } from '../actions';
+import { initSettings, toggleSetting } from '../actions';
 import Settings from '../components/Settings';
 
 const mapStateToProps = (state) => {
@@ -13,7 +13,6 @@ const mapStateToProps = (state) => {
 const mapDispatchToProps = {
     initSettings,
     toggleSetting,
-    addErrorToast,
 };
 
 export default connect(

From f7d88f6976ae8328bc47c0df4686ae6a38ed7bb0 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 3 Jun 2019 16:39:02 +0300
Subject: [PATCH 4/4] * client: check initial access settings

---
 client/src/reducers/access.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/reducers/access.js b/client/src/reducers/access.js
index be8931dc..b8fc14ed 100644
--- a/client/src/reducers/access.js
+++ b/client/src/reducers/access.js
@@ -14,9 +14,9 @@ const access = handleActions(
             } = payload;
             const newState = {
                 ...state,
-                allowed_clients: allowed_clients.join('\n'),
-                disallowed_clients: disallowed_clients.join('\n'),
-                blocked_hosts: blocked_hosts.join('\n'),
+                allowed_clients: (allowed_clients && allowed_clients.join('\n')) || '',
+                disallowed_clients: (disallowed_clients && disallowed_clients.join('\n')) || '',
+                blocked_hosts: (blocked_hosts && blocked_hosts.join('\n')) || '',
                 processing: false,
             };
             return newState;
@@ -35,9 +35,9 @@ const access = handleActions(
     {
         processing: true,
         processingSet: false,
-        allowed_clients: null,
-        disallowed_clients: null,
-        blocked_hosts: null,
+        allowed_clients: '',
+        disallowed_clients: '',
+        blocked_hosts: '',
     },
 );