From 841ddd42de66e1098c9baeb055e435e64d61a6a1 Mon Sep 17 00:00:00 2001
From: Sushant Bhadauria <sushant14bhadauria@gmail.com>
Date: Mon, 1 Jun 2026 22:39:54 +0530
Subject: [PATCH 1/2] dashboard: add adlist filter dropdown to Top Blocked
 Domains

Allow users to filter the Top Blocked Domains table by subscription
list (adlist) directly from the dashboard.

- index.lp: add a <select id="ad-frequency-list-filter"> in the
  Top Blocked Domains box header
- scripts/js/index.js:
  - populateBlockedListFilter(): fetch /api/lists, populate dropdown
    with enabled blocklists
  - updateTopDomainsTable(): when a specific list is selected, fetch a
    larger pool of top domains and filter client-side via
    /api/search/<domain> to identify which adlist each domain belongs
    to, then render the top 10 matches; falls back to the unfiltered
    endpoint when "All lists" is selected
  - wire dropdown change event to refresh the table

Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Sushant Bhadauria <sushant14bhadauria@gmail.com>
---
 index.lp            |   5 ++
 scripts/js/index.js | 133 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/index.lp b/index.lp
index a4c8a5775b..c6cc62cda4 100644
--- a/index.lp
+++ b/index.lp
@@ -191,6 +191,11 @@ mg.include('scripts/lua/header_authenticated.lp','r')
         <div class="box" id="ad-frequency">
             <div class="box-header with-border">
                 <h3 class="box-title">Top Blocked Domains</h3>
+                <div class="pull-right" style="width:45%;max-width:280px;">
+                    <select id="ad-frequency-list-filter" class="form-control input-sm" title="Filter by subscription list">
+                        <option value="">All lists</option>
+                    </select>
+                </div>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
diff --git a/scripts/js/index.js b/scripts/js/index.js
index 84b61b34b4..a3bbc07b90 100644
--- a/scripts/js/index.js
+++ b/scripts/js/index.js
@@ -358,6 +358,68 @@ function updateTopClientsTable(blocked) {
   });
 }
 
+// Populate the subscription-list dropdown on the "Top Blocked Domains" card.
+// Only enabled blocklists are shown; allowlists are excluded.
+function populateBlockedListFilter() {
+  const select = $("#ad-frequency-list-filter");
+  // Preserve any previously selected value
+  const previousVal = select.val();
+
+  $.getJSON(document.body.dataset.apiurl + "/lists", data => {
+    // Remove all options except the first "All lists" placeholder
+    select.find("option:not(:first)").remove();
+
+    if (!data.lists) return;
+
+    data.lists.forEach(list => {
+      if (list.type === "block" && list.enabled) {
+        const label =
+          list.address.length > 50 ? list.address.substring(0, 47) + "..." : list.address;
+        select.append($("<option>", { value: list.id, text: label, title: list.address }));
+      }
+    });
+
+    // Restore selection if the same list is still present
+    if (previousVal) select.val(previousVal);
+  });
+}
+
+// Fetch the set of adlist IDs a domain belongs to via the search API.
+// Returns a Promise resolving to a Set of numeric IDs.
+// Response shape: { search: { gravity: [ { id: N, address: "...", ... }, ... ] } }
+function fetchDomainAdlistIds(domain) {
+  return new Promise(resolve => {
+    $.getJSON(document.body.dataset.apiurl + "/search/" + encodeURIComponent(domain))
+      .then(data => {
+        const ids = new Set();
+        if (data.search && Array.isArray(data.search.gravity)) {
+          data.search.gravity.forEach(entry => {
+            if (typeof entry.id === "number") ids.add(entry.id);
+          });
+        }
+        resolve(ids);
+      })
+      .fail(() => resolve(new Set()));
+  });
+}
+
+// Render a list of domain items into the blocked-domains table.
+function renderBlockedDomainRows(items, sum, domaintable) {
+  items.forEach(item => {
+    const domain = encodeURIComponent(item.domain);
+    const urlText = domain === "" ? "." : item.domain;
+    const url = '<a href="queries?domain=' + domain + '&upstream=blocklist">' + urlText + "</a>";
+    const percentage = (item.count / sum) * 100;
+    domaintable.append(
+      "<tr> " +
+        utils.addTD(url) +
+        utils.addTD(item.count) +
+        utils.addTD(utils.colorBar(percentage, sum, "queries-blocked")) +
+        "</tr> "
+    );
+  });
+}
+
 function updateTopDomainsTable(blocked) {
   let api;
   let style;
@@ -366,12 +428,73 @@ function updateTopDomainsTable(blocked) {
   let overlay;
   let domaintable;
   if (blocked) {
-    api = document.body.dataset.apiurl + "/stats/top_domains?blocked=true";
     style = "queries-blocked";
     table = $("#ad-frequency");
     tablecontent = $("#ad-frequency td").parent();
     overlay = $("#ad-frequency .overlay");
     domaintable = $("#ad-frequency").find("tbody:last");
+
+    const selectedList = $("#ad-frequency-list-filter").val();
+    const adlistId = selectedList ? parseInt(selectedList, 10) : -1;
+
+    if (adlistId >= 0) {
+      // ── Filtered mode ────────────────────────────────────────────────────
+      // Client-side filtering: fetch a larger pool of blocked domains, then
+      // use /api/search/<domain> for each to check which adlist it belongs
+      // to. This works with the stock FTL binary (no rebuild required).
+      // When FTL is eventually rebuilt with the ?list= server-side param,
+      // this code can be replaced by a single API call.
+      const POOL_SIZE = 25;
+      tablecontent.remove();
+      overlay.show();
+
+      $.getJSON(
+        document.body.dataset.apiurl + "/stats/top_domains?blocked=true&count=" + POOL_SIZE,
+        data => {
+          const domains = data.domains || [];
+          const sum = data.blocked_queries;
+
+          if (domains.length === 0) {
+            domaintable.append('<tr><td colspan="3" class="text-center">- No data -</td></tr>');
+            overlay.hide();
+            return;
+          }
+
+          // Check every domain in parallel; then filter and render.
+          Promise.all(
+            domains.map(item =>
+              fetchDomainAdlistIds(item.domain).then(ids => ({
+                item,
+                inList: ids.has(adlistId),
+              }))
+            )
+          ).then(results => {
+            const matched = results
+              .filter(r => r.inList)
+              .slice(0, 10)
+              .map(r => r.item);
+
+            tablecontent.remove();
+            if (matched.length === 0) {
+              domaintable.append(
+                '<tr><td colspan="3" class="text-center">- No blocked domains from this list -</td></tr>'
+              );
+            } else {
+              renderBlockedDomainRows(matched, sum, domaintable);
+            }
+            overlay.hide();
+          });
+        }
+      ).fail(data => {
+        apiFailure(data);
+      });
+
+      // Early return — rendering happens inside the async callbacks above.
+      return;
+    }
+
+    // ── Unfiltered mode (All lists) ───────────────────────────────────────
+    api = document.body.dataset.apiurl + "/stats/top_domains?blocked=true";
   } else {
     api = document.body.dataset.apiurl + "/stats/top_domains";
     style = "queries-permitted";
@@ -828,6 +951,14 @@ $(() => {
 
   // Initialize privacy level before loading any data that depends on it
   initPrivacyLevel().then(() => {
+    // Populate the subscription-list dropdown, then load the top lists
+    populateBlockedListFilter();
+
+    // Re-fetch the blocked table whenever the user changes the list filter
+    $("#ad-frequency-list-filter").on("change", () => {
+      updateTopDomainsTable(true);
+    });
+
     // After privacy level is initialized, load the top lists
     updateTopLists();
   });

From 5f013fdaa53e5d3e80f50c9f68ec1d195c988863 Mon Sep 17 00:00:00 2001
From: Sushant Bhadauria <sushant14bhadauria@gmail.com>
Date: Mon, 1 Jun 2026 23:51:06 +0530
Subject: [PATCH 2/2] fix: resolve XO linter errors in index.js

- Replace .forEach() with for...of loops (unicorn/no-array-for-each)
- Use Number.parseInt instead of parseInt (unicorn/prefer-number-properties)
- Add required blank lines before statements (@stylistic/padding-line-between-statements)

Co-authored-by: Cursor <cursoragent@cursor.com>
Signed-off-by: Sushant Bhadauria <sushant14bhadauria@gmail.com>
---
 scripts/js/index.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/js/index.js b/scripts/js/index.js
index a3bbc07b90..2e6b8b27e9 100644
--- a/scripts/js/index.js
+++ b/scripts/js/index.js
@@ -371,13 +371,13 @@ function populateBlockedListFilter() {
 
     if (!data.lists) return;
 
-    data.lists.forEach(list => {
+    for (const list of data.lists) {
       if (list.type === "block" && list.enabled) {
         const label =
           list.address.length > 50 ? list.address.substring(0, 47) + "..." : list.address;
         select.append($("<option>", { value: list.id, text: label, title: list.address }));
       }
-    });
+    }
 
     // Restore selection if the same list is still present
     if (previousVal) select.val(previousVal);
@@ -393,10 +393,11 @@ function fetchDomainAdlistIds(domain) {
       .then(data => {
         const ids = new Set();
         if (data.search && Array.isArray(data.search.gravity)) {
-          data.search.gravity.forEach(entry => {
+          for (const entry of data.search.gravity) {
             if (typeof entry.id === "number") ids.add(entry.id);
-          });
+          }
         }
+
         resolve(ids);
       })
       .fail(() => resolve(new Set()));
@@ -405,7 +406,7 @@ function fetchDomainAdlistIds(domain) {
 
 // Render a list of domain items into the blocked-domains table.
 function renderBlockedDomainRows(items, sum, domaintable) {
-  items.forEach(item => {
+  for (const item of items) {
     const domain = encodeURIComponent(item.domain);
     const urlText = domain === "" ? "." : item.domain;
     const url = '<a href="queries?domain=' + domain + '&upstream=blocklist">' + urlText + "</a>";
@@ -417,7 +418,7 @@ function renderBlockedDomainRows(items, sum, domaintable) {
         utils.addTD(utils.colorBar(percentage, sum, "queries-blocked")) +
         "</tr> "
     );
-  });
+  }
 }
 
 function updateTopDomainsTable(blocked) {
@@ -435,7 +436,7 @@ function updateTopDomainsTable(blocked) {
     domaintable = $("#ad-frequency").find("tbody:last");
 
     const selectedList = $("#ad-frequency-list-filter").val();
-    const adlistId = selectedList ? parseInt(selectedList, 10) : -1;
+    const adlistId = selectedList ? Number.parseInt(selectedList, 10) : -1;
 
     if (adlistId >= 0) {
       // ── Filtered mode ────────────────────────────────────────────────────
@@ -482,6 +483,7 @@ function updateTopDomainsTable(blocked) {
             } else {
               renderBlockedDomainRows(matched, sum, domaintable);
             }
+
             overlay.hide();
           });
         }