From 7c0812b52b97f65872beb1fe601f9138ebc30dbd Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 17 Nov 2023 10:36:38 +0100 Subject: [PATCH] Apply necessary code styling changes Signed-off-by: DL6ER --- scripts/pi-hole/js/groups-clients.js | 411 ++++++++++---------- scripts/pi-hole/js/groups-domains.js | 549 +++++++++++++------------- scripts/pi-hole/js/groups-lists.js | 561 ++++++++++++++------------- 3 files changed, 762 insertions(+), 759 deletions(-) diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js index 8455e75b..8ec90033 100644 --- a/scripts/pi-hole/js/groups-clients.js +++ b/scripts/pi-hole/js/groups-clients.js @@ -6,6 +6,7 @@ * Please see LICENSE file for your rights under this license. */ /* global utils:false, groups:false,, apiFailure:false, updateFtlInfo:false, getGroups:false, processGroupResult:false */ +/* exported initTable */ var table; @@ -90,228 +91,228 @@ $(function () { }); }); +// eslint-disable-next-line no-unused-vars function initTable() { - table = $("#clientsTable") - .DataTable({ - processing: true, - ajax: { - url: "/api/clients", - dataSrc: "clients", - type: "GET", + table = $("#clientsTable").DataTable({ + processing: true, + ajax: { + url: "/api/clients", + dataSrc: "clients", + type: "GET", + }, + order: [[0, "asc"]], + columns: [ + { data: "id", visible: false }, + { data: null, visible: true, orderable: false, width: "15px" }, + { data: "client", type: "ip-address" }, + { data: "comment" }, + { data: "groups", searchable: false }, + { data: null, width: "22px", orderable: false }, + ], + columnDefs: [ + { + targets: 1, + className: "select-checkbox", + render: function () { + return ""; + }, }, - order: [[0, "asc"]], - columns: [ - { data: "id", visible: false }, - { data: null, visible: true, orderable: false, width: "15px" }, - { data: "client", type: "ip-address" }, - { data: "comment" }, - { data: "groups", searchable: false }, - { data: null, width: "22px", orderable: false }, - ], - columnDefs: [ - { - targets: 1, - className: "select-checkbox", - render: function () { - return ""; - }, - }, - { - targets: "_all", - render: $.fn.dataTable.render.text(), - }, - ], - drawCallback: function () { - // Hide buttons if all clients were deleted - var hasRows = this.api().rows({ filter: "applied" }).data().length > 0; - $(".datatable-bt").css("visibility", hasRows ? "visible" : "hidden"); + { + targets: "_all", + render: $.fn.dataTable.render.text(), + }, + ], + drawCallback: function () { + // Hide buttons if all clients were deleted + var hasRows = this.api().rows({ filter: "applied" }).data().length > 0; + $(".datatable-bt").css("visibility", hasRows ? "visible" : "hidden"); - $('button[id^="deleteClient_"]').on("click", deleteClient); - // Remove visible dropdown to prevent orphaning - $("body > .bootstrap-select.dropdown").remove(); - }, - rowCallback: function (row, data) { - var dataId = utils.hexEncode(data.client); - $(row).attr("data-id", dataId); - var tooltip = - "Added: " + - utils.datetime(data.date_added, false) + - "\nLast modified: " + - utils.datetime(data.date_modified, false) + - "\nDatabase ID: " + - data.id; - var ipName = - ' .bootstrap-select.dropdown").remove(); + }, + rowCallback: function (row, data) { + var dataId = utils.hexEncode(data.client); + $(row).attr("data-id", dataId); + var tooltip = + "Added: " + + utils.datetime(data.date_added, false) + + "\nLast modified: " + + utils.datetime(data.date_modified, false) + + "\nDatabase ID: " + + data.id; + var ipName = + '' + + data.client + + ""; + if (data.name !== null && data.name.length > 0) + ipName += + '
' + - data.client + + data.name + ""; - if (data.name !== null && data.name.length > 0) - ipName += - '
' + - data.name + - ""; - $("td:eq(1)", row).html(ipName); + $("td:eq(1)", row).html(ipName); - $("td:eq(2)", row).html(''); - var commentEl = $("#comment_" + dataId, row); - commentEl.val(utils.unescapeHtml(data.comment)); - commentEl.on("change", editClient); + $("td:eq(2)", row).html(''); + var commentEl = $("#comment_" + dataId, row); + commentEl.val(utils.unescapeHtml(data.comment)); + commentEl.on("change", editClient); - $("td:eq(3)", row).empty(); - $("td:eq(3)", row).append( - '' + $("td:eq(3)", row).empty(); + $("td:eq(3)", row).append( + '' + ); + var selectEl = $("#multiselect_" + dataId, row); + // Add all known groups + for (var i = 0; i < groups.length; i++) { + var dataSub = ""; + if (!groups[i].enabled) { + dataSub = 'data-subtext="(disabled)"'; + } + + selectEl.append( + $("