Merge ~ovidiu-florin/ka:master into ka:master

[Ovidiu-Florin BOGDAN]

Added filter based on build status

Added filter based on build status

[Jose Manuel Santamaria Lema (panfaust)]

Hi,

I have tested the patch against applications in staging, and checked the resulting htm using various web browsers from *yakkety*. Just FYI
* It works:
  - with firefox
  - with chromium
* It doesn't work:
  - with konqueror using the KHTML engine
  - with konqueror using the QtWebkit engine
  - with rekonq (uses QtWebkit)

Nitpicking: wrt to user friendliness, I was expecting that checking the "Error" checkbox would display only the packages in "Error" status, however it works the other way around: clicking the checkboxes hides packages from the list. I guess what is tricking me is the meaning of the word "filter". So as a humble suggestion ¿what about changing the thing to...
"Show only packages in these states: <checkboxes>"
so clicking on the textboxes would show only the packages in the selected states?
Keep in mind that we could also add a filter for package name:
"Package name contains: <textbox> <button to click and show only the package in question>"
so the select_what_you_want_to_see logic makes more sense to me than the select_what_you_want_to_hide logic. Note that this logic (and meaning of the word 'filter') is the current logic used for the LP's web interface, see:
https://launchpad.net/~kubuntu-ppa/+archive/ubuntu/staging-frameworks/+packages

The idea of showing only the interesting packages looks very good to me, so thank you for working on this :)

Cheers.

[Ovidiu-Florin BOGDAN (ovidiu-florin)]

FYI, this patch uses HTML5.

[Ovidiu-Florin BOGDAN (ovidiu-florin)]

FYI, this patch uses HTML5.

[Jose Manuel Santamaria Lema (panfaust)]

Hi,

I have retried with your latest changes and seems to work fine after a quick test with chromium and firefox. Still doesn't work with my yakkety's konqueror, however, what you are proposing looks already better than what we have right now (even if it doesn't work on all possible browsers), so I would mark this as "Approved".

Also note that I have reviewed this from a user point of view. Unfortunately, I don't know enough about JavaScript/HTML to have a great opinion about the code itself, but I hope it's ok.

review: Approve

[Jose Manuel Santamaria Lema (panfaust)]

P.S. I have here a "demo" of a webpage generated by the code proposed in this merge request:

http://gpul.grupos.udc.es/things/ovi_filter_demo/staging_apps_16.12.2.html

[Rik Mills (rikmills)]

From checking the 'demo', that seems to be working nicely in Firefox

[Clive Johnston (clivejo)]

Looks good on mobile browser, I'd like to see this MR accepted and working
on weegie.

On 2 Mar 2017 17:33, "Rik Mills" <email address hidden> wrote:

> >From checking the 'demo', that seems to be working nicely in Firefox
> --
> https://code.launchpad.net/~ovidiu-florin/ka/+git/ka/+merge/318326
> Your team Kubuntu Packagers is subscribed to branch ka:master.
>

diff --git a/ppa-build-status b/ppa-build-status
index 7827877..e177458 100755
--- a/ppa-build-status
+++ b/ppa-build-status
@@ -323,6 +323,45 @@ print("""
 
        return false;
     }
+
+    function filterList() {
+        filterStatus("status0");
+        filterStatus("status1");
+        filterStatus("status2");
+        filterStatus("status-2");
+
+        var filterText = document.getElementById("filterText").value;
+
+        var allElements = document.querySelectorAll(".pkname");
+        var elements = []
+
+        allElements.forEach(function(item, index) {
+            if (item.parentNode.parentNode.style.display == "")
+                elements.push(item)
+        });
+
+        elements.forEach(function(item, index) {
+            var packageName = item.textContent.split(" - ")[0];
+
+            var display = "none";
+            if (packageName.includes(filterText) || filterText.length == 0)
+                display = "";
+
+            item.parentNode.parentNode.style.display = display;
+        });
+    }
+
+    function filterStatus(status) {
+        var elements = document.querySelectorAll("." + status);
+
+        var display = "none";
+        if (document.getElementById("ck-" + status).checked)
+            display = "";
+
+        elements.forEach(function(item, index) {
+            item.parentNode.style.display = display;
+        });
+    }
 //-->
 </script>
 
@@ -332,6 +371,19 @@ print("""
 
 <h1 id="top">Kubuntu %s %s -> %s status [<a href="https://launchpad.net/~%s/+archive/%s/+packages?field.series_filter=%s">%s</a>]</h1>
 """ % (releaseString, releaseString, version, release, ppaParts[0], ppaParts[1], release, args.ppa))
+
+print("""
+    <table>
+        <tr>
+            <td><input type="text" id="filterText" placeholder="Package Name" oninput="filterList()"/></td>
+            <td><input type="checkbox" id="ck-status0" onchange="filterList()" checked /> OK</td>
+            <td><input type="checkbox" id="ck-status1" onchange="filterList()" checked /> Warning</td>
+            <td><input type="checkbox" id="ck-status2" onchange="filterList()" checked /> Error</td>
+            <td><input type="checkbox" id="ck-status-2" onchange="filterList()" checked /> Dependency wait</td>
+        </tr>
+    </table>
+""")
+
 print("<br/><div>Last updated on %s (UTC)</div>\n" % datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M"))
 print("""
 <table class="grid">
@@ -495,7 +547,7 @@ for package in sorted(builds.keys()):
         if len(message) > 150 and build["status"] != STATUS_WAITING:
             message = '<a href="#" onclick="return toggleVisibility(\'msg-%d\')">show/hide</a><div id="msg-%d" style="display:none;">%s</div>' % (i, i, message)
 
-        print('<tr class="%s"><td class="status%d"><span title="%s">%s - %s</span></td><td><a href="%s">%s</a></td>' % (trclass, build["status"], cgi.escape(build["version"]), package, cgi.escape(build["version"]), build["weblink"], arch))
+        print('<tr class="%s"><td class="status%d"><span class="pkname" title="%s">%s - %s</span></td><td><a href="%s">%s</a></td>' % (trclass, build["status"], cgi.escape(build["version"]), package, cgi.escape(build["version"]), build["weblink"], arch))
         if build["logfile"]:
             print('<td><a href="%s">logfile</a></td>' % (build["logfile"],))
         else: