From df12038f33b7acf6a3e9329054f1b5ad4cb02cd8 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Mon, 17 Sep 2018 17:44:32 +0300
Subject: [PATCH] Add refresh button to querylog page

Closes #331
---
 client/src/components/Dashboard/index.js | 10 +++++---
 client/src/components/Logs/index.js      | 30 +++++++++++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/client/src/components/Dashboard/index.js b/client/src/components/Dashboard/index.js
index 5b02f199..28bee848 100644
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -13,10 +13,14 @@ import Loading from '../ui/Loading';
 
 class Dashboard extends Component {
     componentDidMount() {
+        this.getAllStats();
+    }
+
+    getAllStats = () => {
         this.props.getStats();
         this.props.getStatsHistory();
         this.props.getTopStats();
-    }
+    };
 
     render() {
         const { dashboard } = this.props;
@@ -26,8 +30,8 @@ class Dashboard extends Component {
             dashboard.processingStatsHistory ||
             dashboard.processingTopStats;
 
-        const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.componentDidMount()}>Refresh statistics</button>;
-        const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.componentDidMount()}></button>;
+        const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}>Refresh statistics</button>;
+        const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
 
         return (
             <Fragment>
diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js
index 70648940..b45d5e19 100644
--- a/client/src/components/Logs/index.js
+++ b/client/src/components/Logs/index.js
@@ -12,10 +12,7 @@ const DOWNLOAD_LOG_FILENAME = 'dns-logs.txt';
 
 class Logs extends Component {
     componentDidMount() {
-        // get logs on initialization if queryLogIsEnabled
-        if (this.props.dashboard.queryLogEnabled) {
-            this.props.getLogs();
-        }
+        this.getLogs();
     }
 
     componentDidUpdate(prevProps) {
@@ -25,6 +22,13 @@ class Logs extends Component {
         }
     }
 
+    getLogs = () => {
+        // get logs on initialization if queryLogIsEnabled
+        if (this.props.dashboard.queryLogEnabled) {
+            this.props.getLogs();
+        }
+    }
+
     renderTooltip(isFiltered, rule) {
         if (rule) {
             return (isFiltered && <Tooltip text={rule}/>);
@@ -144,11 +148,19 @@ class Logs extends Component {
                     onClick={() => this.props.toggleLogStatus(queryLogEnabled)}
                 >{queryLogEnabled ? 'Disable log' : 'Enable log'}</button>
                 {queryLogEnabled &&
-                <button
-                    className="btn btn-primary btn-standart"
-                    type="submit"
-                    onClick={this.handleDownloadButton}
-                >Download log file</button> }
+                    <button
+                        className="btn btn-primary btn-standart mr-2"
+                        type="submit"
+                        onClick={this.handleDownloadButton}
+                    >Download log file</button>
+                }
+                {queryLogEnabled &&
+                    <button
+                        className="btn btn-outline-primary btn-standart"
+                        type="submit"
+                        onClick={this.getLogs}
+                    >Refresh</button>
+                }
             </div>);
     }