Skip to content

Commit

Permalink
Merge pull request #4707 from moisseev/webui
Browse files Browse the repository at this point in the history 
[Minor] Get rid of 'var' declarations
  • Loading branch information
@vstakhov
vstakhov committed Nov 17, 2023
2 parents 66620b5 + 36d8c61 commit e737f18
Show file tree
Hide file tree
Showing 16 changed files with 203 additions and 204 deletions.
1 change: 0 additions & 1 deletion .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"no-negated-condition": "off",
"no-plusplus": "off",
"no-ternary": "off",
"no-var": "off",
"object-curly-newline": ["error", { "consistent": true }],
"object-property-newline": ["error", { "allowAllPropertiesOnSameLine": true }],
"object-shorthand": "off",
Expand Down
4 changes: 2 additions & 2 deletions interface/css/bootstrap.min.css
View file

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions interface/js/app/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
define(["jquery", "app/rspamd"],
function ($, rspamd) {
"use strict";
var ui = {};
const ui = {};

ui.getActions = function getActions(checked_server) {
rspamd.query("actions", {
success: function (data) {
$("#actionsFormField").empty();
var items = [];
const items = [];
$.each(data[0].data, function (i, item) {
var actionsOrder = ["greylist", "add header", "rewrite subject", "reject"];
var idx = actionsOrder.indexOf(item.action);
const actionsOrder = ["greylist", "add header", "rewrite subject", "reject"];
const idx = actionsOrder.indexOf(item.action);
if (idx >= 0) {
items.push({
idx: idx,
Expand Down Expand Up @@ -67,11 +67,11 @@ define(["jquery", "app/rspamd"],

ui.saveActions = function (server) {
function descending(arr) {
var desc = true;
var filtered = arr.filter(function (el) {
let desc = true;
const filtered = arr.filter(function (el) {
return el !== null;
});
for (var i = 0; i < filtered.length - 1; i++) {
for (let i = 0; i < filtered.length - 1; i++) {
if (filtered[i + 1] >= filtered[i]) {
desc = false;
break;
Expand All @@ -80,9 +80,9 @@ define(["jquery", "app/rspamd"],
return desc;
}

var elts = (function () {
var values = [];
var inputs = $("#actionsForm :input[data-id=\"action\"]");
const elts = (function () {
const values = [];
const inputs = $("#actionsForm :input[data-id=\"action\"]");
// Rspamd order: [spam, rewrite_subject, probable_spam, greylist]
values[0] = parseFloat(inputs[3].value);
values[1] = parseFloat(inputs[2].value);
Expand All @@ -92,7 +92,7 @@ define(["jquery", "app/rspamd"],
return JSON.stringify(values);
}());
// String to array for comparison
var eltsArray = JSON.parse(elts);
const eltsArray = JSON.parse(elts);
if (eltsArray[0] < 0) {
rspamd.alertMessage("alert-modal alert-error", "Spam can not be negative");
} else if (eltsArray[1] < 0) {
Expand All @@ -116,23 +116,23 @@ define(["jquery", "app/rspamd"],
};

ui.getMaps = function (checked_server) {
var $listmaps = $("#listMaps");
const $listmaps = $("#listMaps");
$listmaps.closest(".card").hide();
rspamd.query("maps", {
success: function (json) {
var data = json[0].data;
const data = json[0].data;
$listmaps.empty();
$("#modalBody").empty();
var $tbody = $("<tbody>");
const $tbody = $("<tbody>");

$.each(data, function (i, item) {
var $td = '<td><span class="badge text-bg-secondary">Read</span></td>';
let $td = '<td><span class="badge text-bg-secondary">Read</span></td>';
if (!(item.editable === false || rspamd.read_only)) {
$td = $($td).append('&nbsp;<span class="badge text-bg-success">Write</span>');
}
var $tr = $("<tr>").append($td);
const $tr = $("<tr>").append($td);

var $span = $('<span class="map-link" data-bs-toggle="modal" data-bs-target="#modalDialog">' + item.uri + "</span>").data("item", item);
const $span = $('<span class="map-link" data-bs-toggle="modal" data-bs-target="#modalDialog">' + item.uri + "</span>").data("item", item);
$span.wrap("<td>").parent().appendTo($tr);
$("<td>" + item.description + "</td>").appendTo($tr);
$tr.appendTo($tbody);
Expand All @@ -145,7 +145,7 @@ define(["jquery", "app/rspamd"],
};


var jar = {};
let jar = {};
const editor = {
advanced: {
codejar: true,
Expand All @@ -163,8 +163,8 @@ define(["jquery", "app/rspamd"],

// Modal form for maps
$(document).on("click", "[data-bs-toggle=\"modal\"]", function () {
var checked_server = rspamd.getSelector("selSrv");
var item = $(this).data("item");
const checked_server = rspamd.getSelector("selSrv");
const item = $(this).data("item");
rspamd.query("getmap", {
headers: {
Map: item.map
Expand All @@ -188,7 +188,7 @@ define(["jquery", "app/rspamd"],
document.querySelector("#editor").innerHTML = rspamd.escapeHTML(data[0].data);
}

var icon = "fa-edit";
let icon = "fa-edit";
if (item.editable === false || rspamd.read_only) {
$("#editor").attr(editor[mode].readonly_attr);
icon = "fa-eye";
Expand Down
38 changes: 19 additions & 19 deletions interface/js/app/graph.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ define(["jquery", "app/rspamd", "d3evolution", "d3pie", "d3", "footable"],
function ($, rspamd, D3Evolution, D3Pie, d3) {
"use strict";

var rrd_pie_config = {
const rrd_pie_config = {
cornerRadius: 2,
size: {
canvasWidth: 400,
Expand All @@ -56,11 +56,11 @@ define(["jquery", "app/rspamd", "d3evolution", "d3pie", "d3", "footable"],
},
};

var ui = {};
var prevUnit = "msg/s";
const ui = {};
let prevUnit = "msg/s";

ui.draw = function (graphs, neighbours, checked_server, type) {
var graph_options = {
const graph_options = {
title: "Rspamd throughput",
width: 1060,
height: 370,
Expand All @@ -73,7 +73,7 @@ define(["jquery", "app/rspamd", "d3evolution", "d3pie", "d3", "footable"],
};

function initGraph() {
var graph = new D3Evolution("graph", $.extend({}, graph_options, {
const graph = new D3Evolution("graph", $.extend({}, graph_options, {
yScale: rspamd.getSelector("selYScale"),
type: rspamd.getSelector("selType"),
interpolate: rspamd.getSelector("selInterpolate"),
Expand All @@ -96,16 +96,16 @@ define(["jquery", "app/rspamd", "d3evolution", "d3pie", "d3", "footable"],
}

function getRrdSummary(json, scaleFactor) {
var xExtents = d3.extent(d3.merge(json), function (d) { return d.x; });
var timeInterval = xExtents[1] - xExtents[0];
const xExtents = d3.extent(d3.merge(json), function (d) { return d.x; });
const timeInterval = xExtents[1] - xExtents[0];

var total = 0;
var rows = json.map(function (curr, i) {
let total = 0;
const rows = json.map(function (curr, i) {
// Time intervals that don't have data are excluded from average calculation as d3.mean()ignores nulls
var avg = d3.mean(curr, function (d) { return d.y; });
const avg = d3.mean(curr, function (d) { return d.y; });
// To find an integral on the whole time interval we need to convert nulls to zeroes
var value = d3.mean(curr, function (d) { return Number(d.y); }) * timeInterval / scaleFactor ^ 0; // eslint-disable-line no-bitwise
var yExtents = d3.extent(curr, function (d) { return d.y; });
const value = d3.mean(curr, function (d) { return Number(d.y); }) * timeInterval / scaleFactor ^ 0; // eslint-disable-line no-bitwise
const yExtents = d3.extent(curr, function (d) { return d.y; });

total += value;
return {
Expand Down Expand Up @@ -162,13 +162,13 @@ define(["jquery", "app/rspamd", "d3evolution", "d3pie", "d3", "footable"],
}

function updateWidgets(data) {
var rrd_summary = {rows:[]};
var unit = "msg/s";
let rrd_summary = {rows:[]};
let unit = "msg/s";

if (data) {
// Autoranging
var scaleFactor = 1;
var yMax = d3.max(d3.merge(data), function (d) { return d.y; });
let scaleFactor = 1;
const yMax = d3.max(d3.merge(data), function (d) { return d.y; });
if (yMax < 1) {
scaleFactor = 60;
unit = "msg/min";
Expand Down Expand Up @@ -202,15 +202,15 @@ define(["jquery", "app/rspamd", "d3evolution", "d3pie", "d3", "footable"],

rspamd.query("graph", {
success: function (req_data) {
var data = null;
var neighbours_data = req_data
let data = null;
const neighbours_data = req_data
.filter(function (d) { return d.status; }) // filter out unavailable neighbours
.map(function (d) { return d.data; });

if (neighbours_data.length === 1) {
data = neighbours_data[0];
} else {
var time_match = true;
let time_match = true;
neighbours_data.reduce(function (res, curr, _, arr) {
if ((curr[0][0].x !== res[0][0].x) ||
(curr[0][curr[0].length - 1].x !== res[0][res[0].length - 1].x)) {
Expand Down
36 changes: 18 additions & 18 deletions interface/js/app/history.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
define(["jquery", "app/rspamd", "d3", "footable"],
function ($, rspamd, d3) {
"use strict";
var ui = {};
var prevVersion = null;
const ui = {};
let prevVersion = null;

function process_history_legacy(data) {
var items = [];
const items = [];

var compare = function (e1, e2) {
const compare = function (e1, e2) {
return e1.name.localeCompare(e2.name);
};

Expand Down Expand Up @@ -287,20 +287,20 @@ define(["jquery", "app/rspamd", "d3", "footable"],
}];
}

var columns = {
const columns = {
2: columns_v2,
legacy: columns_legacy
};

function process_history_data(data) {
var process_functions = {
const process_functions = {
2: rspamd.process_history_v2,
legacy: process_history_legacy
};
var pf = process_functions.legacy;
let pf = process_functions.legacy;

if (data.version) {
var strkey = data.version.toString();
const strkey = data.version.toString();
if (process_functions[strkey]) {
pf = process_functions[strkey];
}
Expand All @@ -310,10 +310,10 @@ define(["jquery", "app/rspamd", "d3", "footable"],
}

function get_history_columns(data) {
var func = columns.legacy;
let func = columns.legacy;

if (data.version) {
var strkey = data.version.toString();
const strkey = data.version.toString();
if (columns[strkey]) {
func = columns[strkey];
}
Expand All @@ -326,7 +326,7 @@ define(["jquery", "app/rspamd", "d3", "footable"],
rspamd.query("history", {
success: function (req_data) {
function differentVersions(neighbours_data) {
var dv = neighbours_data.some(function (e) {
const dv = neighbours_data.some(function (e) {
return e.version !== neighbours_data[0].version;
});
if (dv) {
Expand All @@ -337,12 +337,12 @@ define(["jquery", "app/rspamd", "d3", "footable"],
return false;
}

var neighbours_data = req_data
const neighbours_data = req_data
.filter(function (d) { return d.status; }) // filter out unavailable neighbours
.map(function (d) { return d.data; });
if (neighbours_data.length && !differentVersions(neighbours_data)) {
var data = {};
var version = neighbours_data[0].version;
let data = {};
const version = neighbours_data[0].version;
if (version) {
data.rows = [].concat.apply([], neighbours_data
.map(function (e) {
Expand All @@ -355,8 +355,8 @@ define(["jquery", "app/rspamd", "d3", "footable"],
data = [].concat.apply([], neighbours_data);
$("#legacy-history-badge").show();
}
var o = process_history_data(data);
var items = o.items;
const o = process_history_data(data);
const items = o.items;
rspamd.symbols.history = o.symbols;

if (Object.prototype.hasOwnProperty.call(rspamd.tables, "history") &&
Expand Down Expand Up @@ -418,14 +418,14 @@ define(["jquery", "app/rspamd", "d3", "footable"],

rspamd.query("errors", {
success: function (data) {
var neighbours_data = data
const neighbours_data = data
.filter(function (d) {
return d.status;
}) // filter out unavailable neighbours
.map(function (d) {
return d.data;
});
var rows = [].concat.apply([], neighbours_data);
const rows = [].concat.apply([], neighbours_data);
$.each(rows, function (i, item) {
item.ts = {
value: rspamd.unix_time_format(item.ts),
Expand Down

0 comments on commit e737f18

Please sign in to comment.