From 5373e38ac88773f537d22290a93db6f487b04555 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Thu, 16 Apr 2020 09:13:01 +0200
Subject: [PATCH] cmd/ursrv: Filter out ancient versions from chart

---
 cmd/ursrv/main.go           | 21 +++++++++++++++++++--
 cmd/ursrv/static/index.html |  9 ++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go
index df1ecd121..6a6a99be8 100644
--- a/cmd/ursrv/main.go
+++ b/cmd/ursrv/main.go
@@ -23,6 +23,7 @@ import (
 	"os"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -900,7 +901,8 @@ func newDataHandler(db *sql.DB, w http.ResponseWriter, r *http.Request) {
 }
 
 func summaryHandler(db *sql.DB, w http.ResponseWriter, r *http.Request) {
-	s, err := getSummary(db)
+	min, _ := strconv.Atoi(r.URL.Query().Get("min"))
+	s, err := getSummary(db, min)
 	if err != nil {
 		log.Println("summaryHandler:", err)
 		http.Error(w, "Database Error", http.StatusInternalServerError)
@@ -1558,7 +1560,21 @@ func (s *summary) MarshalJSON() ([]byte, error) {
 	return json.Marshal(table)
 }
 
-func getSummary(db *sql.DB) (summary, error) {
+// filter removes versions that never reach the specified min count.
+func (s *summary) filter(min int) {
+	// We cheat and just remove the versions from the "index" and leave the
+	// data points alone. The version index is used to build the table when
+	// we do the serialization, so at that point the data points are
+	// filtered out as well.
+	for ver := range s.versions {
+		if s.max[ver] < min {
+			delete(s.versions, ver)
+			delete(s.max, ver)
+		}
+	}
+}
+
+func getSummary(db *sql.DB, min int) (summary, error) {
 	s := newSummary()
 
 	rows, err := db.Query(`SELECT Day, Version, Count FROM VersionSummary WHERE Day > now() - '2 year'::INTERVAL;`)
@@ -1589,6 +1605,7 @@ func getSummary(db *sql.DB) (summary, error) {
 		s.setCount(day.Format("2006-01-02"), ver, num)
 	}
 
+	s.filter(min)
 	return s, nil
 }
 
diff --git a/cmd/ursrv/static/index.html b/cmd/ursrv/static/index.html
index b161fa2e8..d6e338bab 100644
--- a/cmd/ursrv/static/index.html
+++ b/cmd/ursrv/static/index.html
@@ -21,7 +21,7 @@ found in the LICENSE file.
   <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/heatmapjs@2.0.2/heatmap.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/leaflet-heatmap@1.0.0/leaflet-heatmap.js"></script>
-    
+
   <style type="text/css">
     body {
       margin: 40px;
@@ -55,7 +55,10 @@ found in the LICENSE file.
     google.setOnLoadCallback(drawPerformanceCharts);
 
     function drawVersionChart() {
-      var jsonData = $.ajax({url: "summary.json", dataType:"json", async: false}).responseText;
+      // Summary version chart for versions that at some point in the chart
+      // reaches 250 devices. This filters out versions that are old and
+      // uninteresting yet linger forever with like four users.
+      var jsonData = $.ajax({url: "summary.json?min=250", dataType:"json", async: false}).responseText;
       var rows = JSON.parse(jsonData);
 
       var data = new google.visualization.DataTable();
@@ -224,7 +227,7 @@ found in the LICENSE file.
       var testData = {
         data: locations
       };
-      
+
       var baseLayer = L.tileLayer(
         'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',{
           attribution: '...',