commit ea8b71e: [WebUI] Show grayed out pie

Alexander Moisseev moiseev at mezonplus.ru
Fri Mar 29 10:56:06 UTC 2019


Author: Alexander Moisseev
Date: 2019-03-29 12:41:49 +0300
URL: https://github.com/rspamd/rspamd/commit/ea8b71e211d18070397e6cb9b6bbde20366fce56 (refs/pull/2825/head)

[WebUI] Show grayed out pie
when throughput percentage is undefined

---
 interface/js/app/graph.js | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/interface/js/app/graph.js b/interface/js/app/graph.js
index e01d97aff..2fd66b555 100644
--- a/interface/js/app/graph.js
+++ b/interface/js/app/graph.js
@@ -204,12 +204,40 @@ define(["jquery", "d3evolution", "footable"],
                     }
 
                     rrd_summary = getRrdSummary(data, scaleFactor);
+                }
+
+                if (graphs.rrd_pie) {
+                    graphs.rrd_pie.destroy();
+                    delete graphs.rrd_pie;
+                }
+                if (rrd_summary.total) {
                     graphs.rrd_pie = rspamd.drawPie(graphs.rrd_pie,
                         "rrd-pie",
                         rrd_summary.rows,
                         rrd_pie_config);
-                } else if (graphs.rrd_pie) {
-                    graphs.rrd_pie.destroy();
+                } else {
+                    // Show grayed out pie as percentage is undefined
+                    graphs.rrd_pie = rspamd.drawPie(graphs.rrd_pie,
+                        "rrd-pie",
+                        [{
+                            value: 1,
+                            color: "#FFFFFF",
+                        }],
+                        $.extend({}, rrd_pie_config, {
+                            labels: {
+                                outer: {
+                                    format: "none"
+                                },
+                                inner: {
+                                    format: "none"
+                                },
+                            },
+                            tooltips: {
+                                enabled: true,
+                                string: "Undefined"
+                            },
+                        })
+                    );
                 }
 
                 graphs.graph.data(data);


More information about the Commits mailing list