From 33cdb85bd4954ef6f94d05f79f086844779f0d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Mon, 8 Jul 2024 20:29:52 +0200
Subject: [PATCH] Don't try to fill client/domain tables if there is no data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/index.js | 80 ++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index c5505189d8..c3ea4e0ac1 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -295,31 +295,31 @@ function updateTopClientsTable(blocked) {
     // Add note if there are no results (e.g. privacy mode enabled)
     if (jQuery.isEmptyObject(data.clients)) {
       clienttable.append('<tr><td colspan="3"><center>- No data -</center></td></tr>');
+    } else {
+      // Populate table with content
+      data.clients.forEach(function (client) {
+        // Sanitize client
+        let clientname = client.name;
+        if (clientname.length === 0) clientname = client.ip;
+        url =
+          '<a href="queries.lp?client_ip=' +
+          encodeURIComponent(client.ip) +
+          '">' +
+          utils.escapeHtml(clientname) +
+          "</a>";
+        percentage = (client.count / sum) * 100;
+
+        // Add row to table
+        clienttable.append(
+          "<tr> " +
+            utils.addTD(url) +
+            utils.addTD(client.count) +
+            utils.addTD(utils.colorBar(percentage, sum, style)) +
+            "</tr> "
+        );
+      });
     }
 
-    // Populate table with content
-    data.clients.forEach(function (client) {
-      // Sanitize client
-      let clientname = client.name;
-      if (clientname.length === 0) clientname = client.ip;
-      url =
-        '<a href="queries.lp?client_ip=' +
-        encodeURIComponent(client.ip) +
-        '">' +
-        utils.escapeHtml(clientname) +
-        "</a>";
-      percentage = (client.count / sum) * 100;
-
-      // Add row to table
-      clienttable.append(
-        "<tr> " +
-          utils.addTD(url) +
-          utils.addTD(client.count) +
-          utils.addTD(utils.colorBar(percentage, sum, style)) +
-          "</tr> "
-      );
-    });
-
     // Hide overlay
     overlay.hide();
   }).fail(function (data) {
@@ -352,25 +352,25 @@ function updateTopDomainsTable(blocked) {
     // Add note if there are no results (e.g. privacy mode enabled)
     if (jQuery.isEmptyObject(data.domains)) {
       domaintable.append('<tr><td colspan="3"><center>- No data -</center></td></tr>');
+    } else {
+      // Populate table with content
+      data.domains.forEach(function (item) {
+        // Sanitize domain
+        domain = encodeURIComponent(item.domain);
+        // Substitute "." for empty domain lookups
+        urlText = domain === "" ? "." : domain;
+        url = '<a href="queries.lp?domain=' + domain + '">' + urlText + "</a>";
+        percentage = (item.count / sum) * 100;
+        domaintable.append(
+          "<tr> " +
+            utils.addTD(url) +
+            utils.addTD(item.count) +
+            utils.addTD(utils.colorBar(percentage, sum, style)) +
+            "</tr> "
+        );
+      });
     }
 
-    // Populate table with content
-    data.domains.forEach(function (item) {
-      // Sanitize domain
-      domain = encodeURIComponent(item.domain);
-      // Substitute "." for empty domain lookups
-      urlText = domain === "" ? "." : domain;
-      url = '<a href="queries.lp?domain=' + domain + '">' + urlText + "</a>";
-      percentage = (item.count / sum) * 100;
-      domaintable.append(
-        "<tr> " +
-          utils.addTD(url) +
-          utils.addTD(item.count) +
-          utils.addTD(utils.colorBar(percentage, sum, style)) +
-          "</tr> "
-      );
-    });
-
     overlay.hide();
   }).fail(function (data) {
     apiFailure(data);