Skip to content

Refactor the HTTPS-adoption-by-country plot to make it easy to add more countries #1675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Refactor the HTTPS-adoption-by-country plot to make it easy to add more countries #1675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions i18n/en.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ other = "USA users"
[graph_japan_users]
other = "Japan users"

[graph_india_users]
other = "Indian users"

[graph_germany_users]
other = "German users"

[graph_percent_https]
other = "Percent of Pageloads over HTTPS (14 day moving average)"

Expand Down
2 changes: 2 additions & 0 deletions layouts/shortcodes/plotly.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
data-all_users="{{ i18n "graph_all_users" }}"
data-usa_users="{{ i18n "graph_usa_users" }}"
data-japan_users="{{ i18n "graph_japan_users" }}"
data-india_users="{{ i18n "graph_india_users" }}"
data-germany_users="{{ i18n "graph_germany_users" }}"
data-percent_https="{{ i18n "graph_percent_https" }}"
></span>

Expand Down
21 changes: 10 additions & 11 deletions static/js/stats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,14 @@ function doPlot() {
// Firefox telemetry (HTTP_PAGELOAD_IS_SSL) over time
function httpsPlot(dom) {

let traces = [];
let countries = [
{ "code": "US", "name": loc.usa_users, "line": { color: leOrange, dash: "dot" } },
{ "code": "JP", "name": loc.japan_users, "line": { color: someGreen, dash: "dash" } },
{ "code": "DE", "name": loc.germany_users, "line": { color: "#FF0000", dash: "dash" } },
{ "code": "IN", "name": loc.india_users, "line": { color: "#00F0F0", dash: "dot" } },
];

let traces = [];
{
let traceObj = { type: "scatter", x:[], y:[], name: loc.all_users, line: { color: leBlue } };
let stackMovingAvg = [];
Expand All @@ -286,17 +292,10 @@ function doPlot() {
}, stackMovingAvg);
traces.push(traceObj);
}
{
let traceObj = { type: "scatter", x:[], y:[], name: loc.usa_users, line: { color: leOrange, dash: "dot" } };
httpsDerivePageloadsFromNormalizedData(traceObj, (os, country) => {
return (country == "US");
});
traces.push(traceObj);
}
{
let traceObj = { type: "scatter", x:[], y:[], name: loc.japan_users, line: { color: someGreen, dash: "dash" } };
for (let country_idx in countries) {
let traceObj = { type: "scatter", x:[], y:[], name: countries[country_idx]["name"], line: countries[country_idx]["line"] };
httpsDerivePageloadsFromNormalizedData(traceObj, (os, country) => {
return (country == "JP");
return (country == countries[country_idx]["code"]);
});
traces.push(traceObj);
}
Expand Down