From 4f1af03dc3c233be07caf289130690f5a9f9f3c0 Mon Sep 17 00:00:00 2001 From: moisseev Date: Thu, 19 Nov 2020 11:06:54 +0300 Subject: [PATCH] [WebUI] Add History tab autorefreshing Issue: #820 --- interface/index.html | 11 +++++++++++ interface/js/app/rspamd.js | 20 +++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/interface/index.html b/interface/index.html index a3810804b..ea118dcfc 100644 --- a/interface/index.html +++ b/interface/index.html @@ -63,6 +63,17 @@ 1 hour + Disable + + 10 seconds + 30 seconds + + 1 minute + 10 minutes + 30 minutes + + 1 hour + Disable 1 hour diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js index 360ba603e..5312efa51 100644 --- a/interface/js/app/rspamd.js +++ b/interface/js/app/rspamd.js @@ -145,6 +145,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_ if (id !== "#autoRefresh") tab_stat.statWidgets(ui, graphs, checked_server); $(".preset").show(); + $(".history").hide(); $(".dynamic").hide(); }()); break; @@ -165,6 +166,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_ if (id !== "#autoRefresh") tab_graph.draw(ui, graphs, tables, neighbours, checked_server, selData); $(".preset").hide(); + $(".history").hide(); $(".dynamic").show(); }()); break; @@ -176,8 +178,20 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_ tab_symbols.getSymbols(ui, tables, checked_server); break; case "#history_nav": - tab_history.getHistory(ui, tables); - tab_history.getErrors(ui, tables); + (function () { + function getHistoryAndErrors() { + tab_history.getHistory(ui, tables); + tab_history.getErrors(ui, tables); + } + var refreshInterval = $(".dropdown-menu a.active.history").data("value"); + setAutoRefresh(refreshInterval, "history", + function () { return getHistoryAndErrors(); }); + if (id !== "#autoRefresh") getHistoryAndErrors(); + + $(".preset").hide(); + $(".history").show(); + $(".dynamic").hide(); + }()); break; case "#disconnect": disconnect(); @@ -414,7 +428,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_ $(".dropdown-menu a").click(function (e) { e.preventDefault(); var classList = $(this).attr("class"); - var menuClass = (/\b(?:dynamic|preset)\b/).exec(classList)[0]; + var menuClass = (/\b(?:dynamic|history|preset)\b/).exec(classList)[0]; $(".dropdown-menu a.active." + menuClass).removeClass("active"); $(this).addClass("active"); tabClick("#autoRefresh"); -- 2.39.5