Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 12:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils: remove duplicate function and convert changeTableButtonStates to vanilla JS (#3547)

Browse Source
This commit is contained in:
Adam Warner
2025-07-11 18:34:12 +01:00
committed by GitHub
parent 0091f74294 9c00467a6d
commit 7207a5c20e
6 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/js/groups-clients.js
View File

@@ -321,7 +321,7 @@ function initTable() {
}
table.on("init select deselect", () => {
utils.changeBulkDeleteStates(table);
utils.changeTableButtonStates(table);
});
table.on("order.dt", () => {

2
scripts/js/groups-common.js
View File

@@ -115,7 +115,7 @@ function delGroupItems(type, ids, table, listType = undefined) {
// Clear selection after deletion
table.rows().deselect();
utils.changeBulkDeleteStates(table);
utils.changeTableButtonStates(table);
// Update number of <type> items in the sidebar
updateFtlInfo();

2
scripts/js/groups-domains.js
View File

@@ -397,7 +397,7 @@ function initTable() {
}
table.on("init select deselect", () => {
utils.changeBulkDeleteStates(table);
utils.changeTableButtonStates(table);
});
table.on("order.dt", () => {

2
scripts/js/groups-lists.js
View File

@@ -439,7 +439,7 @@ function initTable() {
});
table.on("init select deselect", () => {
utils.changeBulkDeleteStates(table);
utils.changeTableButtonStates(table);
});
table.on("order.dt", () => {

2
scripts/js/groups.js
View File

@@ -207,7 +207,7 @@ $(() => {
table.rows(0).deselect();
}
utils.changeBulkDeleteStates(table);
utils.changeTableButtonStates(table);
});
table.on("order.dt", () => {

59
scripts/js/utils.js
View File

@@ -418,33 +418,6 @@ function checkMessages() {
});
}
// Show only the appropriate delete buttons in datatables
function changeBulkDeleteStates(table) {
const allRows = table.rows({ filter: "applied" }).data().length;
const pageLength = table.page.len();
const 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");
}
}
function doLogout(url) {
$.ajax({
url: document.body.dataset.apiurl + "/auth",
@@ -474,30 +447,35 @@ function renderTimespan(data, type) {
return data;
}
// Show only the appropriate buttons
// Show only the appropriate delete buttons in datatables
function changeTableButtonStates(table) {
const selectAllElements = document.querySelectorAll(".selectAll");
const selectMoreElements = document.querySelectorAll(".selectMore");
const removeAllElements = document.querySelectorAll(".removeAll");
const deleteSelectedElements = document.querySelectorAll(".deleteSelected");
const allRows = table.rows({ filter: "applied" }).data().length;
const pageLength = table.page.len();
const selectedRows = table.rows(".selected").data().length;
if (selectedRows === 0) {
// Nothing selected
$(".selectAll").removeClass("hidden");
$(".selectMore").addClass("hidden");
$(".removeAll").addClass("hidden");
$(".deleteSelected").addClass("hidden");
for (const el of selectAllElements) el.classList.remove("hidden");
for (const el of selectMoreElements) el.classList.add("hidden");
for (const el of removeAllElements) el.classList.add("hidden");
for (const el of deleteSelectedElements) el.classList.add("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");
for (const el of selectAllElements) el.classList.add("hidden");
for (const el of selectMoreElements) el.classList.add("hidden");
for (const el of removeAllElements) el.classList.remove("hidden");
for (const el of deleteSelectedElements) el.classList.remove("hidden");
} else {
// Some rows are selected, but not all
$(".selectAll").addClass("hidden");
$(".selectMore").removeClass("hidden");
$(".removeAll").addClass("hidden");
$(".deleteSelected").removeClass("hidden");
for (const el of selectAllElements) el.classList.add("hidden");
for (const el of selectMoreElements) el.classList.remove("hidden");
for (const el of removeAllElements) el.classList.add("hidden");
for (const el of deleteSelectedElements) el.classList.remove("hidden");
}
}
@@ -722,7 +700,6 @@ globalThis.utils = (function () {
toPercent,
colorBar,
checkMessages,
changeBulkDeleteStates,
doLogout,
renderTimestamp,
renderTimespan,