ui: flakes: support filtering by branch prefix

Signed-off-by: Jakub Kicinski <[email protected]>

Author: kuba-moo

contest/backend/query.py

@@ -35,17 +35,17 @@ def branches():
     return rows
 
 
-#SELECT branch,branch_date,count(*),remote FROM results GROUP BY branch,branch_date,remote ORDER BY branch_date DESC LIMIT 510;
-
-def branches_to_rows(br_cnt, remote):
+def branches_to_rows(br_cnt, remote, br_pfx=None):
     global psql
 
     cnt = 0
     with psql.cursor() as cur:
-        if remote:
-            q = f"SELECT branch,count(*),branch_date,remote FROM results GROUP BY branch,branch_date,remote ORDER BY branch_date DESC LIMIT {br_cnt}"
-        else:
-            q = f"SELECT branch,count(*),branch_date        FROM results GROUP BY branch,branch_date        ORDER BY branch_date DESC LIMIT {br_cnt}"
+        remote_k = ",remote" if remote else ""
+        # Slap the -2 in here as the first letter of the date, to avoid prefix of prefix matches
+        pfx_flt = f"WHERE branch LIKE '{br_pfx}-2%' " if br_pfx else ""
+
+        q = f"SELECT branch,count(*),branch_date{remote_k} FROM results {pfx_flt} GROUP BY branch,branch_date{remote_k} ORDER BY branch_date DESC LIMIT {br_cnt}"
+
         cur.execute(q)
         for r in cur.fetchall():
             cnt += r[1]
@@ -108,7 +108,12 @@ def results():
         if not br_cnt:
             br_cnt = 10
 
-        limit = branches_to_rows(br_cnt, remote)
+        br_pfx = request.args.get('br-pfx')
+        if br_pfx:
+            # Slap the -2 in here as the first letter of the date, to avoid prefix of prefix matches
+            where.append(f"branch LIKE '{br_pfx}-2%'")
+
+        limit = branches_to_rows(br_cnt, remote, br_pfx)
 
         t2 = datetime.datetime.now()
 

ui/contest.js

@@ -168,7 +168,7 @@ function reload_select_filters(first_load)
 	old_values[elem_id] = elem.value;
     }
 
-    // Keep the "all" option, remove the rest
+    // Wipe the options and re-add
     $("select option").remove();
 
     // We have all JSONs now, do processing.

ui/flakes.html

@@ -29,6 +29,9 @@
         <br />
         <input type="number" id="br-cnt" name="ld-pw" min="1" value="100" disabled>
         <div style="height=1em">&nbsp;</div>
+        <label for="br-pfx">Branch prefix</label>
+        <select id="br-pfx" name="ld-pw" disabled></select>
+        <div style="height=1em">&nbsp;</div>
         <label for="ld-remote">Remote</label>
         <select id="ld-remote" name="ld-pw" disabled></select>
         <div style="height=1em">&nbsp;</div>

ui/flakes.js

@@ -12,6 +12,8 @@ function get_sort_key()
     return "cnt";
 }
 
+var branch_pfx_set = new Set();
+
 function load_result_table(data_raw)
 {
     // Get all branch names
@@ -22,6 +24,19 @@ function load_result_table(data_raw)
     let br_cnt = document.getElementById("br-cnt").value;
     const branches = Array.from(branch_set).slice(0, br_cnt);
 
+    // Populate the load filters with prefixes
+    let select_br_pfx = document.getElementById("br-pfx");
+    for (const br of branches) {
+	const br_pfx = nipa_br_pfx_get(br);
+
+	if (select_br_pfx.length == 0)
+	    nipa_select_add_option(select_br_pfx, "-- all --", "");
+	if (branch_pfx_set.has(br_pfx))
+	    continue;
+	nipa_select_add_option(select_br_pfx, br_pfx, br_pfx);
+	branch_pfx_set.add(br_pfx);
+    }
+
     // Build the result map
     var pw_n = document.getElementById("pw-n").checked;
     var pw_y = document.getElementById("pw-y").checked;
@@ -175,6 +190,7 @@ function reload_data()
 {
     const format_l2 = document.getElementById("ld-cases");
     const br_cnt = document.getElementById("br-cnt");
+    const br_pfx = document.getElementById("br-pfx");
     const remote = document.getElementById("ld-remote");
 
     let req_url = "query/results";
@@ -184,6 +200,8 @@ function reload_data()
 	req_url += "&format=l2";
     if (remote.value)
 	req_url += "&remote=" + remote.value;
+    if (br_pfx.value)
+	req_url += "&br-pfx=" + br_pfx.value;
 
     nipa_filters_disable(["ld-pw", "fl-pw"]);
     $(document).ready(function() {