From 4d8b19f4c92a1d9fca64c8aefca46647df0f4693 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Thu, 8 Sep 2022 21:55:56 -0300
Subject: [PATCH] Address team decisions

- change checkboxes order;
- remove all lines if all checkboxes are unselected.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 groups-domains.php                   | 4 ++--
 scripts/pi-hole/js/groups-domains.js | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/groups-domains.php b/groups-domains.php
index 545b00e0..2ac14dd6 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -116,10 +116,10 @@ require 'scripts/pi-hole/php/header_authenticated.php';
                 <div class="filter_types">
                     <div class="line">
                         <span><input type="checkbox" name="typ" value="0" id="typ0" checked><label for="typ0">Exact whitelist</label></span>
-                        <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
+                        <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
                     </div>
                     <div class="line">
-                        <span><input type="checkbox" name="typ" value="2" id="typ2" checked><label for="typ2">Regex whitelist</label></span>
+                        <span><input type="checkbox" name="typ" value="1" id="typ1" checked><label for="typ1">Exact blacklist</label></span>
                         <span><input type="checkbox" name="typ" value="3" id="typ3" checked><label for="typ3">Regex blacklist</label></span>
                     </div>
                 </div>
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 7864f0b7..1dd2c026 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -410,10 +410,6 @@ $.fn.dataTable.ext.search.push(function (settings, searchData, index, rowData) {
     })
     .get();
 
-  if (types.length === 0) {
-    return true;
-  }
-
   if (types.indexOf(rowData.type.toString()) !== -1) {
     return true;
   }