Allow delete multiple items - Group pages

- add checkboxes, buttons and functions to groups page;
- add checkboxes, buttons and functions to clients page;
- add checkboxes, buttons and functions to domains page;
- add checkboxes, buttons and functions to adlists page;
- move function to `utils.js`;
- fix CSS after insert a new table column;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

scripts/pi-hole/js/groups-adlists.js

@@ -117,8 +117,9 @@ function initTable() {
     order: [[0, "asc"]],
     columns: [
       { data: "id", visible: false },
-      { data: "status", searchable: false, class: "details-control" },
-      { data: "address" },
+      { data: null, visible: true, orderable: false, width: "15px" },
+      { data: "status", searchable: false, orderable: false, class: "details-control" },
+      { data: "address", orderable: false },
       { data: "enabled", searchable: false },
       { data: "comment" },
       { data: "groups", searchable: false },
@@ -126,8 +127,11 @@ function initTable() {
     ],
     columnDefs: [
       {
-        targets: [0, 2],
-        orderable: false,
+        targets: 1,
+        className: "select-checkbox",
+        render: function () {
+          return "";
+        },
       },
       {
         targets: "_all",
@@ -135,6 +139,10 @@ function initTable() {
       },
     ],
     drawCallback: function () {
+      // Hide buttons if all messages were deleted
+      var hasRows = this.api().rows({ filter: "applied" }).data().length > 0;
+      $(".datatable-bt").css("visibility", hasRows ? "visible" : "hidden");
+
       $('button[id^="deleteAdlist_"]').on("click", deleteAdlist);
       // Remove visible dropdown to prevent orphaning
       $("body > .bootstrap-select.dropdown").remove();
@@ -176,19 +184,19 @@ function initTable() {
         extra = "<i class='fa fa-exclamation-triangle list-status-3'></i>";
       }
 
-      $("td:eq(0)", row).addClass("list-status-" + statusCode);
-      $("td:eq(0)", row).html(
+      $("td:eq(1)", row).addClass("list-status-" + statusCode);
+      $("td:eq(1)", row).html(
         "<i class='fa " + statusIcon + "' title='Click for details about this list'></i>" + extra
       );
 
       if (data.address.startsWith("file://")) {
         // Local files cannot be downloaded from a distant client so don't show
         // a link to such a list here
-        $("td:eq(1)", row).html(
+        $("td:eq(2)", row).html(
           '<code id="address_' + data.id + '" class="breakall">' + data.address + "</code>"
         );
       } else {
-        $("td:eq(1)", row).html(
+        $("td:eq(2)", row).html(
           '<a id="address_' +
             data.id +
             '" class="breakall" href="' +
@@ -199,7 +207,7 @@ function initTable() {
         );
       }
 
-      $("td:eq(2)", row).html(
+      $("td:eq(3)", row).html(
         '<input type="checkbox" id="status_' + data.id + '"' + (disabled ? "" : " checked") + ">"
       );
       var statusEl = $("#status_" + data.id, row);
@@ -212,13 +220,13 @@ function initTable() {
       });
       statusEl.on("change", editAdlist);
 
-      $("td:eq(3)", row).html('<input id="comment_' + data.id + '" class="form-control">');
+      $("td:eq(4)", row).html('<input id="comment_' + data.id + '" class="form-control">');
       var commentEl = $("#comment_" + data.id, row);
       commentEl.val(utils.unescapeHtml(data.comment));
       commentEl.on("change", editAdlist);
 
-      $("td:eq(4)", row).empty();
-      $("td:eq(4)", row).append(
+      $("td:eq(5)", row).empty();
+      $("td:eq(5)", row).append(
         '<select class="selectpicker" id="multiselect_' + data.id + '" multiple></select>'
       );
       var selectEl = $("#multiselect_" + data.id, row);
@@ -285,20 +293,67 @@ function initTable() {
       var button =
         '<button type="button" class="btn btn-danger btn-xs" id="deleteAdlist_' +
         data.id +
+        '" data-del-id="' +
+        data.id +
         '">' +
         '<span class="far fa-trash-alt"></span>' +
         "</button>";
-      $("td:eq(5)", row).html(button);
+      $("td:eq(6)", row).html(button);
     },
     dom:
-      "<'row'<'col-sm-12'f>>" +
-      "<'row'<'col-sm-4'l><'col-sm-8'p>>" +
+      "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
       "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
-      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
+      "<'row'<'col-sm-12'i>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"],
     ],
+    select: {
+      style: "multi",
+      selector: "td:not(:last-child)",
+      info: false,
+    },
+    buttons: [
+      {
+        text: '<span class="far fa-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectAll",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        text: '<span class="far fa-plus-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectMore",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        extend: "selectNone",
+        text: '<span class="far fa-check-square"></span>',
+        titleAttr: "Deselect All",
+        className: "btn-sm datatable-bt removeAll",
+      },
+      {
+        text: '<span class="far fa-trash-alt"></span>',
+        titleAttr: "Delete Selected",
+        className: "btn-sm datatable-bt deleteSelected",
+        action: function () {
+          // For each ".selected" row ...
+          var ids = [];
+          $("tr.selected").each(function () {
+            // ... add the row identified by "data-id".
+            ids.push(parseInt($(this).attr("data-id"), 10));
+          });
+          // Delete all selected rows at once
+          delItems(ids);
+        },
+      },
+    ],
     stateSave: true,
     stateDuration: 0,
     stateSaveCallback: function (settings, data) {
@@ -319,6 +374,10 @@ function initTable() {
     },
   });
 
+  table.on("init select deselect", function () {
+    utils.changeBulkDeleteStates(table);
+  });
+
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
@@ -327,6 +386,7 @@ function initTable() {
       $("#resetButton").addClass("hidden");
     }
   });
+
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
     $("#resetButton").addClass("hidden");
@@ -358,6 +418,66 @@ function initTable() {
   }
 }
 
+// Remove 'bnt-group' class from container, to avoid grouping
+$.fn.dataTable.Buttons.defaults.dom.container.className = "dt-buttons";
+
+function deleteAdlist() {
+  // Passes the button data-del-id attribute as ID
+  var ids = [parseInt($(this).attr("data-del-id"), 10)];
+  delItems(ids);
+}
+
+function delItems(ids) {
+  // Check input validity
+  if (!Array.isArray(ids)) return;
+
+  var address = "";
+
+  // Exploit prevention: Return early for non-numeric IDs
+  for (var id of ids) {
+    if (typeof id !== "number") return;
+    address += "<li>" + utils.escapeHtml($("#address_" + id).text()) + "</li>";
+  }
+
+  utils.disableAll();
+  var idstring = ids.join(", ");
+  utils.showAlert("info", "", "Deleting Adlists: " + idstring, "...");
+
+  $.ajax({
+    url: "scripts/pi-hole/php/groups.php",
+    method: "post",
+    dataType: "json",
+    data: { action: "delete_adlist", id: JSON.stringify(ids), token: token },
+  })
+    .done(function (response) {
+      utils.enableAll();
+      if (response.success) {
+        utils.showAlert(
+          "success",
+          "far fa-trash-alt",
+          "Successfully deleted adlists: " + idstring,
+          "<ul>" + address + "</ul>"
+        );
+        for (var id in ids) {
+          if (Object.hasOwnProperty.call(ids, id)) {
+            table.row(id).remove().draw(false).ajax.reload(null, false);
+          }
+        }
+      } else {
+        utils.showAlert("error", "", "Error while deleting adlists: " + idstring, response.message);
+      }
+
+      // Clear selection after deletion
+      table.rows().deselect();
+      utils.changeBulkDeleteStates(table);
+    })
+    .fail(function (jqXHR, exception) {
+      utils.enableAll();
+      utils.showAlert("error", "", "Error while deleting adlists: " + idstring, jqXHR.responseText);
+      console.log(exception); // eslint-disable-line no-console
+    });
+}
+
 function addAdlist() {
   var address = utils.escapeHtml($("#new_address").val());
   var comment = utils.escapeHtml($("#new_comment").val());
@@ -490,32 +610,3 @@ function editAdlist() {
     },
   });
 }
-
-function deleteAdlist() {
-  var tr = $(this).closest("tr");
-  var id = tr.attr("data-id");
-  var address = utils.escapeHtml(tr.find("#address_" + id).text());
-
-  utils.disableAll();
-  utils.showAlert("info", "", "Deleting adlist...", address);
-  $.ajax({
-    url: "scripts/pi-hole/php/groups.php",
-    method: "post",
-    dataType: "json",
-    data: { action: "delete_adlist", id: id, token: token },
-    success: function (response) {
-      utils.enableAll();
-      if (response.success) {
-        utils.showAlert("success", "far fa-trash-alt", "Successfully deleted adlist ", address);
-        table.row(tr).remove().draw(false).ajax.reload(null, false);
-      } else {
-        utils.showAlert("error", "", "Error while deleting adlist with ID " + id, response.message);
-      }
-    },
-    error: function (jqXHR, exception) {
-      utils.enableAll();
-      utils.showAlert("error", "", "Error while deleting adlist with ID " + id, jqXHR.responseText);
-      console.log(exception); // eslint-disable-line no-console
-    },
-  });
-}

scripts/pi-hole/js/groups-clients.js

@@ -92,18 +92,31 @@ function initTable() {
     order: [[0, "asc"]],
     columns: [
       { data: "id", visible: false },
+      { data: null, visible: true, width: "15px" },
       { data: "ip", type: "ip-address" },
       { data: "comment" },
       { data: "groups", searchable: false },
       { data: "name", width: "22px", orderable: false },
     ],
     columnDefs: [
+      {
+        targets: 1,
+        orderable: false,
+        className: "select-checkbox",
+        render: function () {
+          return "";
+        },
+      },
       {
         targets: "_all",
         render: $.fn.dataTable.render.text(),
       },
     ],
     drawCallback: function () {
+      // Hide buttons if all messages 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();
@@ -134,15 +147,15 @@ function initTable() {
           '" class="breakall">' +
           data.name +
           "</code>";
-      $("td:eq(0)", row).html(ipName);
+      $("td:eq(1)", row).html(ipName);
 
-      $("td:eq(1)", row).html('<input id="comment_' + data.id + '" class="form-control">');
+      $("td:eq(2)", row).html('<input id="comment_' + data.id + '" class="form-control">');
       var commentEl = $("#comment_" + data.id, row);
       commentEl.val(utils.unescapeHtml(data.comment));
       commentEl.on("change", editClient);
 
-      $("td:eq(2)", row).empty();
-      $("td:eq(2)", row).append(
+      $("td:eq(3)", row).empty();
+      $("td:eq(3)", row).append(
         '<select class="selectpicker" id="multiselect_' + data.id + '" multiple></select>'
       );
       var selectEl = $("#multiselect_" + data.id, row);
@@ -209,16 +222,63 @@ function initTable() {
       var button =
         '<button type="button" class="btn btn-danger btn-xs" id="deleteClient_' +
         data.id +
+        '" data-del-id="' +
+        data.id +
         '">' +
         '<span class="far fa-trash-alt"></span>' +
         "</button>";
-      $("td:eq(3)", row).html(button);
+      $("td:eq(4)", row).html(button);
     },
+    select: {
+      style: "multi",
+      selector: "td:not(:last-child)",
+      info: false,
+    },
+    buttons: [
+      {
+        text: '<span class="far fa-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectAll",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        text: '<span class="far fa-plus-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectMore",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        extend: "selectNone",
+        text: '<span class="far fa-check-square"></span>',
+        titleAttr: "Deselect All",
+        className: "btn-sm datatable-bt removeAll",
+      },
+      {
+        text: '<span class="far fa-trash-alt"></span>',
+        titleAttr: "Delete Selected",
+        className: "btn-sm datatable-bt deleteSelected",
+        action: function () {
+          // For each ".selected" row ...
+          var ids = [];
+          $("tr.selected").each(function () {
+            // ... add the row identified by "data-id".
+            ids.push(parseInt($(this).attr("data-id"), 10));
+          });
+          // Delete all selected rows at once
+          delItems(ids);
+        },
+      },
+    ],
     dom:
-      "<'row'<'col-sm-12'f>>" +
-      "<'row'<'col-sm-4'l><'col-sm-8'p>>" +
+      "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
       "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
-      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
+      "<'row'<'col-sm-12'i>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"],
@@ -252,6 +312,10 @@ function initTable() {
     input.setAttribute("spellcheck", false);
   }
 
+  table.on("init select deselect", function () {
+    utils.changeBulkDeleteStates(table);
+  });
+
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
@@ -267,6 +331,75 @@ function initTable() {
   });
 }
 
+// Remove 'bnt-group' class from container, to avoid grouping
+$.fn.dataTable.Buttons.defaults.dom.container.className = "dt-buttons";
+
+function deleteClient() {
+  // Passes the button data-del-id attribute as ID
+  var ids = [parseInt($(this).attr("data-del-id"), 10)];
+  delItems(ids);
+}
+
+function delItems(ids) {
+  // Check input validity
+  if (!Array.isArray(ids)) return;
+
+  var items = "";
+  var name = "";
+
+  for (var id of ids) {
+    // Exploit prevention: Return early for non-numeric IDs
+    if (typeof id !== "number") return;
+
+    // Retrieve details
+    name = utils.escapeHtml($("#name_" + id).text());
+    if (name.length > 0) {
+      name = " (<i>" + utils.escapeHtml($("#name_" + id).text()) + "</i>)";
+    }
+
+    // Add client
+    items += "<li>" + utils.escapeHtml($("#ip_" + id).text()) + name + "</li>";
+  }
+
+  utils.disableAll();
+  var idstring = ids.join(", ");
+  utils.showAlert("info", "", "Deleting clients: " + idstring, "...");
+
+  $.ajax({
+    url: "scripts/pi-hole/php/groups.php",
+    method: "post",
+    dataType: "json",
+    data: { action: "delete_client", id: JSON.stringify(ids), token: token },
+  })
+    .done(function (response) {
+      utils.enableAll();
+      if (response.success) {
+        utils.showAlert(
+          "success",
+          "far fa-trash-alt",
+          "Successfully deleted clients: " + idstring,
+          "<ul>" + items + "</ul>"
+        );
+        for (var id in ids) {
+          if (Object.hasOwnProperty.call(ids, id)) {
+            table.row(id).remove().draw(false).ajax.reload(null, false);
+          }
+        }
+      } else {
+        utils.showAlert("error", "", "Error while deleting clients: " + idstring, response.message);
+      }
+
+      // Clear selection after deletion
+      table.rows().deselect();
+      utils.changeBulkDeleteStates(table);
+    })
+    .fail(function (jqXHR, exception) {
+      utils.enableAll();
+      utils.showAlert("error", "", "Error while deleting clients: " + idstring, jqXHR.responseText);
+      console.log(exception); // eslint-disable-line no-console
+    });
+}
+
 function addClient() {
   var ip = utils.escapeHtml($("#select").val().trim());
   var comment = utils.escapeHtml($("#new_comment").val());
@@ -389,38 +522,3 @@ function editClient() {
     },
   });
 }
-
-function deleteClient() {
-  var tr = $(this).closest("tr");
-  var id = tr.attr("data-id");
-  var ip = utils.escapeHtml(tr.find("#ip_" + id).text());
-  var name = utils.escapeHtml(tr.find("#name_" + id).text());
-
-  if (name.length > 0) {
-    ip += " (" + name + ")";
-  }
-
-  utils.disableAll();
-  utils.showAlert("info", "", "Deleting client...", ip);
-  $.ajax({
-    url: "scripts/pi-hole/php/groups.php",
-    method: "post",
-    dataType: "json",
-    data: { action: "delete_client", id: id, token: token },
-    success: function (response) {
-      utils.enableAll();
-      if (response.success) {
-        utils.showAlert("success", "far fa-trash-alt", "Successfully deleted client ", ip);
-        table.row(tr).remove().draw(false).ajax.reload(null, false);
-        reloadClientSuggestions();
-      } else {
-        utils.showAlert("error", "", "Error while deleting client with ID " + id, response.message);
-      }
-    },
-    error: function (jqXHR, exception) {
-      utils.enableAll();
-      utils.showAlert("error", "", "Error while deleting client with ID " + id, jqXHR.responseText);
-      console.log(exception); // eslint-disable-line no-console
-    },
-  });
-}

scripts/pi-hole/js/groups-domains.js

@@ -69,6 +69,7 @@ function initTable() {
     order: [[0, "asc"]],
     columns: [
       { data: "id", visible: false },
+      { data: null, visible: true, orderable: false, width: "15px" },
       { data: "domain" },
       { data: "type", searchable: false },
       { data: "enabled", searchable: false },
@@ -77,12 +78,24 @@ function initTable() {
       { data: null, width: "22px", orderable: false },
     ],
     columnDefs: [
+      {
+        targets: 1,
+        orderable: false,
+        className: "select-checkbox",
+        render: function () {
+          return "";
+        },
+      },
       {
         targets: "_all",
         render: $.fn.dataTable.render.text(),
       },
     ],
     drawCallback: function () {
+      // Hide buttons if all messages were deleted
+      var hasRows = this.api().rows({ filter: "applied" }).data().length > 0;
+      $(".datatable-bt").css("visibility", hasRows ? "visible" : "hidden");
+
       $('button[id^="deleteDomain_"]').on("click", deleteDomain);
       // Remove visible dropdown to prevent orphaning
       $("body > .bootstrap-select.dropdown").remove();
@@ -96,7 +109,7 @@ function initTable() {
         utils.datetime(data.date_modified, false) +
         "\nDatabase ID: " +
         data.id;
-      $("td:eq(0)", row).html(
+      $("td:eq(1)", row).html(
         '<code id="domain_' +
           data.id +
           '" title="' +
@@ -128,7 +141,7 @@ function initTable() {
           ">Regex blacklist</option>";
       }
 
-      $("td:eq(1)", row).html(
+      $("td:eq(2)", row).html(
         '<select id="type_' +
           data.id +
           '" class="form-control">' +
@@ -140,7 +153,7 @@ function initTable() {
       typeEl.on("change", editDomain);
 
       var disabled = data.enabled === 0;
-      $("td:eq(2)", row).html(
+      $("td:eq(3)", row).html(
         '<input type="checkbox" id="status_' + data.id + '"' + (disabled ? "" : " checked") + ">"
       );
       var statusEl = $("#status_" + data.id, row);
@@ -153,15 +166,15 @@ function initTable() {
       });
       statusEl.on("change", editDomain);
 
-      $("td:eq(3)", row).html('<input id="comment_' + data.id + '" class="form-control">');
+      $("td:eq(4)", row).html('<input id="comment_' + data.id + '" class="form-control">');
       var commentEl = $("#comment_" + data.id, row);
       commentEl.val(utils.unescapeHtml(data.comment));
       commentEl.on("change", editDomain);
 
       // Show group assignment field only if in full domain management mode
-      if (table.column(5).visible()) {
-        $("td:eq(4)", row).empty();
-        $("td:eq(4)", row).append(
+      if (table.column(6).visible()) {
+        $("td:eq(5)", row).empty();
+        $("td:eq(5)", row).append(
           '<select class="selectpicker" id="multiselect_' + data.id + '" multiple></select>'
         );
         var selectEl = $("#multiselect_" + data.id, row);
@@ -234,20 +247,67 @@ function initTable() {
       var button =
         '<button type="button" class="btn btn-danger btn-xs" id="deleteDomain_' +
         data.id +
+        '" data-del-id="' +
+        data.id +
         '">' +
         '<span class="far fa-trash-alt"></span>' +
         "</button>";
-      if (table.column(5).visible()) {
-        $("td:eq(5)", row).html(button);
+      if (table.column(6).visible()) {
+        $("td:eq(6)", row).html(button);
       } else {
-        $("td:eq(4)", row).html(button);
+        $("td:eq(5)", row).html(button);
       }
     },
+    select: {
+      style: "multi",
+      selector: "td:not(:last-child)",
+      info: false,
+    },
+    buttons: [
+      {
+        text: '<span class="far fa-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectAll",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        text: '<span class="far fa-plus-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectMore",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        extend: "selectNone",
+        text: '<span class="far fa-check-square"></span>',
+        titleAttr: "Deselect All",
+        className: "btn-sm datatable-bt removeAll",
+      },
+      {
+        text: '<span class="far fa-trash-alt"></span>',
+        titleAttr: "Delete Selected",
+        className: "btn-sm datatable-bt deleteSelected",
+        action: function () {
+          // For each ".selected" row ...
+          var ids = [];
+          $("tr.selected").each(function () {
+            // ... add the row identified by "data-id".
+            ids.push(parseInt($(this).attr("data-id"), 10));
+          });
+          // Delete all selected rows at once
+          delItems(ids);
+        },
+      },
+    ],
     dom:
-      "<'row'<'col-sm-12'f>>" +
-      "<'row'<'col-sm-4'l><'col-sm-8'p>>" +
+      "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
       "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
-      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
+      "<'row'<'col-sm-12'i>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"],
@@ -268,7 +328,7 @@ function initTable() {
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Show group assignment column only on full page
-      data.columns[5].visible = showtype === "all";
+      data.columns[6].visible = showtype === "all";
       // Apply loaded state to table
       return data;
     },
@@ -294,6 +354,10 @@ function initTable() {
     input.setAttribute("spellcheck", false);
   }
 
+  table.on("init select deselect", function () {
+    utils.changeBulkDeleteStates(table);
+  });
+
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
@@ -302,12 +366,85 @@ function initTable() {
       $("#resetButton").addClass("hidden");
     }
   });
+
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
     $("#resetButton").addClass("hidden");
   });
 }
 
+// Remove 'bnt-group' class from container, to avoid grouping
+$.fn.dataTable.Buttons.defaults.dom.container.className = "dt-buttons";
+
+function deleteDomain() {
+  // Passes the button data-del-id attribute as ID
+  var ids = [parseInt($(this).attr("data-del-id"), 10)];
+  delItems(ids);
+}
+
+function delItems(ids) {
+  // Check input validity
+  if (!Array.isArray(ids)) return;
+
+  var items = "";
+  var type = "";
+  var typeID = "";
+
+  for (var id of ids) {
+    // Exploit prevention: Return early for non-numeric IDs
+    if (typeof id !== "number") return;
+
+    // Retrieve domain type
+    typeID = $("#type_" + id).val();
+    if (typeID === "0" || typeID === "1") {
+      type = " (<i>domain</i>)";
+    } else if (typeID === "2" || typeID === "3") {
+      type = " (<i>regex</i>)";
+    }
+
+    // Add item
+    items += "<li>" + utils.escapeHtml($("#domain_" + id).text()) + type + "</li>";
+  }
+
+  utils.disableAll();
+  var idstring = ids.join(", ");
+  utils.showAlert("info", "", "Deleting items: " + idstring, "...");
+
+  $.ajax({
+    url: "scripts/pi-hole/php/groups.php",
+    method: "post",
+    dataType: "json",
+    data: { action: "delete_domain", id: JSON.stringify(ids), token: token },
+  })
+    .done(function (response) {
+      utils.enableAll();
+      if (response.success) {
+        utils.showAlert(
+          "success",
+          "far fa-trash-alt",
+          "Successfully deleted items: " + idstring,
+          "<ul>" + items + "</ul>"
+        );
+        for (var id in ids) {
+          if (Object.hasOwnProperty.call(ids, id)) {
+            table.row(id).remove().draw(false).ajax.reload(null, false);
+          }
+        }
+      } else {
+        utils.showAlert("error", "", "Error while deleting items: " + idstring, response.message);
+      }
+
+      // Clear selection after deletion
+      table.rows().deselect();
+      utils.changeBulkDeleteStates(table);
+    })
+    .fail(function (jqXHR, exception) {
+      utils.enableAll();
+      utils.showAlert("error", "", "Error while deleting items: " + idstring, jqXHR.responseText);
+      console.log(exception); // eslint-disable-line no-console
+    });
+}
+
 function addDomain() {
   var action = this.id;
   var tabHref = $('a[data-toggle="tab"][aria-expanded="true"]').attr("href");
@@ -490,55 +627,3 @@ function editDomain() {
     },
   });
 }
-
-function deleteDomain() {
-  var tr = $(this).closest("tr");
-  var id = tr.attr("data-id");
-  var domain = utils.escapeHtml(tr.find("#domain_" + id).text());
-  var type = tr.find("#type_" + id).val();
-
-  var domainRegex;
-  if (type === "0" || type === "1") {
-    domainRegex = "domain";
-  } else if (type === "2" || type === "3") {
-    domainRegex = "regex";
-  }
-
-  utils.disableAll();
-  utils.showAlert("info", "", "Deleting " + domainRegex + "...", domain);
-  $.ajax({
-    url: "scripts/pi-hole/php/groups.php",
-    method: "post",
-    dataType: "json",
-    data: { action: "delete_domain", id: id, token: token },
-    success: function (response) {
-      utils.enableAll();
-      if (response.success) {
-        utils.showAlert(
-          "success",
-          "far fa-trash-alt",
-          "Successfully deleted " + domainRegex,
-          domain
-        );
-        table.row(tr).remove().draw(false).ajax.reload(null, false);
-      } else {
-        utils.showAlert(
-          "error",
-          "",
-          "Error while deleting " + domainRegex + " with ID " + id,
-          response.message
-        );
-      }
-    },
-    error: function (jqXHR, exception) {
-      utils.enableAll();
-      utils.showAlert(
-        "error",
-        "",
-        "Error while deleting " + domainRegex + " with ID " + id,
-        jqXHR.responseText
-      );
-      console.log(exception); // eslint-disable-line no-console
-    },
-  });
-}

scripts/pi-hole/js/groups.js

@@ -22,18 +22,31 @@ $(function () {
     order: [[0, "asc"]],
     columns: [
       { data: "id", visible: false },
+      { data: null, visible: true, width: "15px" },
       { data: "name" },
       { data: "enabled", searchable: false },
       { data: "description" },
       { data: null, width: "22px", orderable: false },
     ],
     columnDefs: [
+      {
+        targets: 1,
+        orderable: false,
+        className: "select-checkbox",
+        render: function () {
+          return "";
+        },
+      },
       {
         targets: "_all",
         render: $.fn.dataTable.render.text(),
       },
     ],
     drawCallback: function () {
+      // Hide buttons if all messages were deleted
+      var hasRows = this.api().rows({ filter: "applied" }).data().length > 0;
+      $(".datatable-bt").css("visibility", hasRows ? "visible" : "hidden");
+
       $('button[id^="deleteGroup_"]').on("click", deleteGroup);
     },
     rowCallback: function (row, data) {
@@ -45,7 +58,7 @@ $(function () {
         utils.datetime(data.date_modified, false) +
         "\nDatabase ID: " +
         data.id;
-      $("td:eq(0)", row).html(
+      $("td:eq(1)", row).html(
         '<input id="name_' + data.id + '" title="' + tooltip + '" class="form-control">'
       );
       var nameEl = $("#name_" + data.id, row);
@@ -53,7 +66,7 @@ $(function () {
       nameEl.on("change", editGroup);
 
       var disabled = data.enabled === 0;
-      $("td:eq(1)", row).html(
+      $("td:eq(2)", row).html(
         '<input type="checkbox" id="status_' + data.id + '"' + (disabled ? "" : " checked") + ">"
       );
       var statusEl = $("#status_" + data.id, row);
@@ -66,28 +79,75 @@ $(function () {
       });
       statusEl.on("change", editGroup);
 
-      $("td:eq(2)", row).html('<input id="desc_' + data.id + '" class="form-control">');
+      $("td:eq(3)", row).html('<input id="desc_' + data.id + '" class="form-control">');
       var desc = data.description !== null ? data.description : "";
       var descEl = $("#desc_" + data.id, row);
       descEl.val(utils.unescapeHtml(desc));
       descEl.on("change", editGroup);
 
-      $("td:eq(3)", row).empty();
+      $("td:eq(4)", row).empty();
       if (data.id !== 0) {
         var button =
           '<button type="button" class="btn btn-danger btn-xs" id="deleteGroup_' +
           data.id +
+          '" data-del-id="' +
+          data.id +
           '">' +
           '<span class="far fa-trash-alt"></span>' +
           "</button>";
-        $("td:eq(3)", row).html(button);
+        $("td:eq(4)", row).html(button);
       }
     },
+    select: {
+      style: "multi",
+      selector: "td:not(:last-child)",
+      info: false,
+    },
+    buttons: [
+      {
+        text: '<span class="far fa-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectAll",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        text: '<span class="far fa-plus-square"></span>',
+        titleAttr: "Select All",
+        className: "btn-sm datatable-bt selectMore",
+        action: function () {
+          table.rows({ page: "current" }).select();
+        },
+      },
+      {
+        extend: "selectNone",
+        text: '<span class="far fa-check-square"></span>',
+        titleAttr: "Deselect All",
+        className: "btn-sm datatable-bt removeAll",
+      },
+      {
+        text: '<span class="far fa-trash-alt"></span>',
+        titleAttr: "Delete Selected",
+        className: "btn-sm datatable-bt deleteSelected",
+        action: function () {
+          // For each ".selected" row ...
+          var ids = [];
+          $("tr.selected").each(function () {
+            // ... add the row identified by "data-id".
+            ids.push(parseInt($(this).attr("data-id"), 10));
+          });
+          // Delete all selected rows at once
+          delItems(ids);
+        },
+      },
+    ],
     dom:
-      "<'row'<'col-sm-12'f>>" +
-      "<'row'<'col-sm-4'l><'col-sm-8'p>>" +
+      "<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
       "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
-      "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+      "<'row'<'col-sm-3'B><'col-sm-9'p>>" +
+      "<'row'<'col-sm-12'i>>",
     lengthMenu: [
       [10, 25, 50, 100, -1],
       [10, 25, 50, 100, "All"],
@@ -106,7 +166,7 @@ $(function () {
       }
 
       // Reset visibility of ID column
-      data.columns[0].visible = false;
+      data.columns[1].visible = false;
       // Apply loaded state to table
       return data;
     },
@@ -121,6 +181,10 @@ $(function () {
     input.setAttribute("spellcheck", false);
   }
 
+  table.on("init select deselect", function () {
+    utils.changeBulkDeleteStates(table);
+  });
+
   table.on("order.dt", function () {
     var order = table.order();
     if (order[0][0] !== 0 || order[0][1] !== "asc") {
@@ -129,12 +193,82 @@ $(function () {
       $("#resetButton").addClass("hidden");
     }
   });
+
   $("#resetButton").on("click", function () {
     table.order([[0, "asc"]]).draw();
     $("#resetButton").addClass("hidden");
   });
 });
 
+// Remove 'bnt-group' class from container, to avoid grouping
+$.fn.dataTable.Buttons.defaults.dom.container.className = "dt-buttons";
+
+function deleteGroup() {
+  // Passes the button data-del-id attribute as ID
+  var ids = [parseInt($(this).attr("data-del-id"), 10)];
+  delItems(ids);
+}
+
+function delItems(ids) {
+  // Check input validity
+  if (!Array.isArray(ids)) return;
+
+  var items = "";
+  var name = "";
+
+  for (var id of ids) {
+    // Exploit prevention: Return early for non-numeric IDs
+    if (typeof id !== "number") return;
+
+    // Retrieve details
+    name = utils.escapeHtml($("#name_" + id).text());
+    if (name.length > 0) {
+      name = " (<i>" + utils.escapeHtml($("#name_" + id).text()) + "</i>)";
+    }
+
+    // Add item
+    items += "<li>" + utils.escapeHtml($("#ip_" + id).text()) + name + "</li>";
+  }
+
+  utils.disableAll();
+  var idstring = ids.join(", ");
+  utils.showAlert("info", "", "Deleting groups: " + idstring, "...");
+
+  $.ajax({
+    url: "scripts/pi-hole/php/groups.php",
+    method: "post",
+    dataType: "json",
+    data: { action: "delete_group", id: JSON.stringify(ids), token: token },
+  })
+    .done(function (response) {
+      utils.enableAll();
+      if (response.success) {
+        utils.showAlert(
+          "success",
+          "far fa-trash-alt",
+          "Successfully deleted groups: " + idstring,
+          "<ul>" + items + "</ul>"
+        );
+        for (var id in ids) {
+          if (Object.hasOwnProperty.call(ids, id)) {
+            table.row(id).remove().draw(false).ajax.reload(null, false);
+          }
+        }
+      } else {
+        utils.showAlert("error", "", "Error while deleting groups: " + idstring, response.message);
+      }
+
+      // Clear selection after deletion
+      table.rows().deselect();
+      utils.changeBulkDeleteStates(table);
+    })
+    .fail(function (jqXHR, exception) {
+      utils.enableAll();
+      utils.showAlert("error", "", "Error while deleting groups: " + idstring, jqXHR.responseText);
+      console.log(exception); // eslint-disable-line no-console
+    });
+}
+
 function addGroup() {
   var name = utils.escapeHtml($("#new_name").val());
   var desc = utils.escapeHtml($("#new_desc").val());
@@ -246,32 +380,3 @@ function editGroup() {
     },
   });
 }
-
-function deleteGroup() {
-  var tr = $(this).closest("tr");
-  var id = tr.attr("data-id");
-  var name = utils.escapeHtml(tr.find("#name_" + id).val());
-
-  utils.disableAll();
-  utils.showAlert("info", "", "Deleting group...", name);
-  $.ajax({
-    url: "scripts/pi-hole/php/groups.php",
-    method: "post",
-    dataType: "json",
-    data: { action: "delete_group", id: id, token: token },
-    success: function (response) {
-      utils.enableAll();
-      if (response.success) {
-        utils.showAlert("success", "far fa-trash-alt", "Successfully deleted group ", name);
-        table.row(tr).remove().draw(false);
-      } else {
-        utils.showAlert("error", "", "Error while deleting group with ID " + id, response.message);
-      }
-    },
-    error: function (jqXHR, exception) {
-      utils.enableAll();
-      utils.showAlert("error", "", "Error while deleting group with ID " + id, jqXHR.responseText);
-      console.log(exception); // eslint-disable-line no-console
-    },
-  });
-}

scripts/pi-hole/js/utils.js

@@ -381,6 +381,33 @@ function checkMessages() {
   });
 }
 
+// Show only the appropriate delete buttons in datatables
+function changeBulkDeleteStates(table) {
+  var allRows = table.rows({ filter: "applied" }).data().length;
+  var pageLength = table.page.len();
+  var selectedRows = table.rows(".selected").data().length;
+
+  if (selectedRows === 0) {
+    // Nothing selected
+    $(".selectAll").removeClass("hidden");
+    $(".selectMore").addClass("hidden");
+    $(".removeAll").addClass("hidden");
+    $(".deleteSelected").addClass("hidden");
+  } else if (selectedRows >= pageLength || selectedRows === allRows) {
+    // Whole page is selected (or all available messages were selected)
+    $(".selectAll").addClass("hidden");
+    $(".selectMore").addClass("hidden");
+    $(".removeAll").removeClass("hidden");
+    $(".deleteSelected").removeClass("hidden");
+  } else {
+    // Some rows are selected, but not all
+    $(".selectAll").addClass("hidden");
+    $(".selectMore").removeClass("hidden");
+    $(".removeAll").addClass("hidden");
+    $(".deleteSelected").removeClass("hidden");
+  }
+}
+
 window.utils = (function () {
   return {
     escapeHtml: escapeHtml,
@@ -404,5 +431,6 @@ window.utils = (function () {
     addTD: addTD,
     colorBar: colorBar,
     checkMessages: checkMessages,
+    changeBulkDeleteStates: changeBulkDeleteStates,
   };
 })();