From e9ba5e440a79768c86fa5958749d083e8b5f409c Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 21 Apr 2020 10:53:49 +0200
Subject: [PATCH] Add [Ctrl] key action to combine filters.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 82e08a72..ca0854e5 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -425,9 +425,13 @@ $(document).ready(function() {
     initComplete: function() {
       var api = this.api();
       // Query type IPv4 / IPv6
-      api.$("td:eq(1)").click(function() {
+      api.$("td:eq(1)").click(function(event) {
         if (autofilter()) {
-          api.search("\\s"+this.textContent+"\\s", true, true).draw();
+          if(!event.ctrlKey) {
+            resetColumnsFilters();
+          }
+          console.log(event.ctrlKey);
+          api.column(1).search("^"+this.textContent+"$", true, true).draw();
           $("#resetButton").show();
         }
       });
@@ -447,10 +451,13 @@ $(document).ready(function() {
       );
       api.$("td:eq(1)").css("cursor", "pointer");
       // Domain
-      api.$("td:eq(2)").click(function() {
+      api.$("td:eq(2)").click(function(event) {
         if (autofilter()) {
+          if(!event.ctrlKey) {
+            resetColumnsFilters();
+          }
           var domain = this.textContent.split("\n")[0];
-          api.search("\\s"+domain+"\\s", true, true).draw();
+          api.column(2).search("^"+domain+"$", true, true).draw();
           $("#resetButton").show();
         }
       });
@@ -471,10 +478,12 @@ $(document).ready(function() {
       );
       api.$("td:eq(2)").css("cursor", "pointer");
       // Client
-      api.$("td:eq(3)").click(function() {
+      api.$("td:eq(3)").click(function(event) {
         if (autofilter()) {
-          api.search("\\s"+this.textContent+"\\s", true, true).draw();
-
+          if(!event.ctrlKey) {
+            resetColumnsFilters();
+          }
+          api.column(3).search("^"+this.textContent+"$", true, true).draw();
           $("#resetButton").show();
         }
       });
@@ -497,6 +506,7 @@ $(document).ready(function() {
   });
 
   // Initialize regex filter mode and clear search field (if set previously)
+  resetColumnsFilters();
   tableApi.search("", true, true).draw();
 
   $("#all-queries tbody").on("click", "button", function() {
@@ -509,7 +519,8 @@ $(document).ready(function() {
   });
 
   $("#resetButton").click(function() {
-    tableApi.search("", true, true).draw();
+    resetColumnsFilters();
+    tableApi.draw();
     $("#resetButton").hide();
   });
 
@@ -527,3 +538,10 @@ $(document).ready(function() {
     localStorage.setItem("query_log_filter_chkbox", $("#autofilter").prop("checked"));
   });
 });
+
+function resetColumnsFilters(add_filters) {
+  tableApi.columns()[0].forEach(index => {
+      tableApi.column(index).search("", true, true);
+    });
+    tableApi.draw();
+}