From 2f52c93d78a52a64c7d30c153f24a5addb488933 Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Thu, 16 Oct 2025 16:12:31 +0100 Subject: [PATCH 1/2] Fix technology filters --- src/js/components/filters.js | 8 ++++++-- static/css/techreport/techreport.css | 4 ++++ templates/techreport/components/filter_meta.html | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/js/components/filters.js b/src/js/components/filters.js index d66879ec..be4fe952 100644 --- a/src/js/components/filters.js +++ b/src/js/components/filters.js @@ -58,7 +58,11 @@ class Filters { /* Modify the URL with the tech */ url.searchParams.delete('tech'); - url.searchParams.append('tech', technologies); + if (technologies.length > 0) { + url.searchParams.append('tech', technologies); + } else { + url.searchParams.append('tech', 'ALL'); + } url.searchParams.delete('geo'); url.searchParams.append('geo', geo); @@ -120,7 +124,7 @@ class Filters { const combo = document.querySelectorAll('[data-component="combobox"]'); const url = new URL(location.href); - const selected = url.searchParams.get('tech')?.split(',') || []; + const selected = url.searchParams.get('tech')?.split(',') || ["ALL"]; combo.forEach(box => new ComboBox(box, this.technologies, selected)); } diff --git a/static/css/techreport/techreport.css b/static/css/techreport/techreport.css index 3bbddd44..4c3a1e71 100644 --- a/static/css/techreport/techreport.css +++ b/static/css/techreport/techreport.css @@ -1752,6 +1752,10 @@ h2.summary-heading { bottom: 1rem; } +[data-component="timeseries"] .meta .client { + display: none; +} + /* Chart summary list */ .data-summary { margin-top: 2rem; diff --git a/templates/techreport/components/filter_meta.html b/templates/techreport/components/filter_meta.html index 46036184..26e09d3d 100644 --- a/templates/techreport/components/filter_meta.html +++ b/templates/techreport/components/filter_meta.html @@ -1,5 +1,5 @@ From 6967691781fc334f11a35b987346a2a147957082 Mon Sep 17 00:00:00 2001 From: Barry Pollard Date: Thu, 16 Oct 2025 16:22:37 +0100 Subject: [PATCH 2/2] Show for comparisons --- static/css/techreport/techreport.css | 3 ++- templates/techreport/components/filter_meta.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/static/css/techreport/techreport.css b/static/css/techreport/techreport.css index 4c3a1e71..e094a11a 100644 --- a/static/css/techreport/techreport.css +++ b/static/css/techreport/techreport.css @@ -1752,7 +1752,8 @@ h2.summary-heading { bottom: 1rem; } -[data-component="timeseries"] .meta .client { +/* Drilldown shows both clients in timeseries so hide client meta for these */ +[data-component="timeseries"] .meta .drilldown.client { display: none; } diff --git a/templates/techreport/components/filter_meta.html b/templates/techreport/components/filter_meta.html index 26e09d3d..cb4b4451 100644 --- a/templates/techreport/components/filter_meta.html +++ b/templates/techreport/components/filter_meta.html @@ -1,5 +1,5 @@