From: Alexander Moisseev Date: Fri, 29 Mar 2019 09:41:49 +0000 (+0300) Subject: [WebUI] Show grayed out pie X-Git-Tag: 1.9.1~26^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea8b71e211d18070397e6cb9b6bbde20366fce56;p=rspamd.git [WebUI] Show grayed out pie when throughput percentage is undefined --- 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);