diff --git a/assets/bug_queries.json b/assets/bug_queries.json
index 37919d2..57ecd57 100644
--- a/assets/bug_queries.json
+++ b/assets/bug_queries.json
@@ -3,7 +3,7 @@
"BUGZILLA_REST_URL": "https://bugzilla.mozilla.org/rest/bug",
"channels": {
"esr115": {
- "pd_key": "LATEST_THUNDERBIRD_VERSION",
+ "pd_key": "THUNDERBIRD_ESR",
"title": "Thunderbird",
"short_label": "115.x ESR",
"next_version_url": "https://hg.mozilla.org/releases/comm-esr115/raw-file/tip/mail/config/version_display.txt",
@@ -178,6 +178,182 @@
}
}
},
+ "esr128": {
+ "pd_key": "THUNDERBIRD_ESR_NEXT",
+ "title": "Thunderbird",
+ "short_label": "128.x ESR",
+ "next_version_url": "https://hg.mozilla.org/releases/comm-esr128/raw-file/tip/mail/config/version_display.txt",
+ "queries": {
+ "uplifts-requested": {
+ "description": "Thunderbird 128esr - Uplifts Requested",
+ "fetch_cols": [
+ "id",
+ "summary",
+ "status",
+ "product",
+ "component",
+ "target_milestone",
+ "priority",
+ "bug_severity",
+ "cf_last_resolved",
+ "cf_status_thunderbird_%CHANNEL%",
+ "cf_tracking_thunderbird_%CHANNEL%"
+ ],
+ "queryparams": {
+ "include_fields": "",
+ "classification": [
+ "Client Software",
+ "Developer Infrastructure",
+ "Components",
+ "Server Software",
+ "Other"
+ ],
+ "f1": "flagtypes.name",
+ "o1": "substring",
+ "product": [
+ "Calendar",
+ "Chat Core",
+ "MailNews Core",
+ "Thunderbird"
+ ],
+ "v1": "approval-comm-esr128?"
+ }
+ },
+ "uplifts-approved": {
+ "description": "Thunderbird 128esr - Uplifts Approved",
+ "fetch_cols": [
+ "id",
+ "summary",
+ "status",
+ "product",
+ "component",
+ "target_milestone",
+ "priority",
+ "bug_severity",
+ "cf_last_resolved",
+ "cf_status_thunderbird_%CHANNEL%",
+ "cf_tracking_thunderbird_%CHANNEL%"
+ ],
+ "queryparams": {
+ "include_fields": "",
+ "classification": [
+ "Client Software",
+ "Developer Infrastructure",
+ "Components",
+ "Server Software",
+ "Other"
+ ],
+ "f1": "flagtypes.name",
+ "f2": "cf_status_thunderbird_esr128",
+ "o1": "substring",
+ "o2": "nowords",
+ "product": [
+ "Calendar",
+ "Chat Core",
+ "Instantbird",
+ "MailNews Core",
+ "Thunderbird"
+ ],
+ "v1": "approval-comm-esr128+",
+ "v2": "fixed verified"
+ }
+ },
+ "affected": {
+ "description": "Thunderbird 128 - Fixed in Daily",
+ "fetch_cols": [
+ "id",
+ "summary",
+ "status",
+ "product",
+ "component",
+ "keywords",
+ "regressed_by",
+ "target_milestone",
+ "priority",
+ "bug_severity",
+ "cf_last_resolved",
+ "cf_status_thunderbird_%CHANNEL%"
+ ],
+ "queryparams": {
+ "include_fields": "",
+ "bug_status": [
+ "RESOLVED",
+ "VERIFIED"
+ ],
+ "classification": [
+ "Client Software",
+ "Developer Infrastructure",
+ "Components",
+ "Server Software",
+ "Other"
+ ],
+ "f1": "cf_status_thunderbird_esr128",
+ "f2": "product",
+ "f3": "flagtypes.name",
+ "f4": "target_milestone",
+ "o1": "equals",
+ "o2": "anywordssubstr",
+ "o3": "notsubstring",
+ "o4": "notequals",
+ "resolution": "FIXED",
+ "v1": "affected",
+ "v2": "MailNews Chat Calendar Thunderbird",
+ "v3": "approval-comm-%CHANNEL%",
+ "v4": "128 Branch"
+ }
+ },
+ "missed": {
+ "description": "Thunderbird 128 - Missed uplifts",
+ "fetch_cols": [
+ "id",
+ "summary",
+ "status",
+ "product",
+ "component",
+ "target_milestone",
+ "priority",
+ "bug_severity",
+ "cf_last_resolved",
+ "cf_status_thunderbird_%CHANNEL%"
+ ],
+ "queryparams": {
+ "include_fields": "",
+ "bug_status": [
+ "ASSIGNED",
+ "REOPENED",
+ "RESOLVED",
+ "VERIFIED"
+ ],
+ "classification": [
+ "Client Software",
+ "Developer Infrastructure",
+ "Components",
+ "Server Software",
+ "Other"
+ ],
+ "f1": "flagtypes.name",
+ "f2": "longdesc",
+ "f3": "product",
+ "f4": "OP",
+ "f5": "target_milestone",
+ "f6": "target_milestone",
+ "f7": "CP",
+ "j4": "AND_G",
+ "n2": "1",
+ "o1": "substring",
+ "o2": "substring",
+ "o3": "anywords",
+ "o5": "greaterthaneq",
+ "o6": "lessthaneq",
+ "v1": "approval-comm-esr128+",
+ "v2": "releases/comm-esr128/rev",
+ "v3": "MailNews Chat Calendar Thunderbird",
+ "v5": "116",
+ "v6": "127"
+ }
+ }
+ }
+ },
"beta": {
"pd_key": "LATEST_THUNDERBIRD_DEVEL_VERSION",
"title": "Thunderbird",
@@ -512,6 +688,93 @@
}
}
},
+ "release": {
+ "pd_key": "LATEST_THUNDERBIRD_DEVEL_VERSION",
+ "title": "Thunderbird",
+ "short_label": "Release",
+ "next_version_url": "https://hg.mozilla.org/releases/comm-release/raw-file/tip/mail/config/version_display.txt",
+ "queries": {
+ "uplifts-requested": {
+ "description": "Thunderbird Release - Uplifts Requested",
+ "fetch_cols": [
+ "id",
+ "summary",
+ "status",
+ "product",
+ "component",
+ "target_milestone",
+ "priority",
+ "bug_severity",
+ "cf_last_resolved",
+ "cf_status_thunderbird_%CHANNEL%",
+ "cf_tracking_thunderbird_%CHANNEL%"
+ ],
+ "queryparams": {
+ "include_fields": "",
+ "classification": [
+ "Client Software",
+ "Developer Infrastructure",
+ "Components",
+ "Server Software",
+ "Other"
+ ],
+ "f1": "flagtypes.name",
+ "f2": "target_milestone",
+ "o1": "substring",
+ "o2": "anywords",
+ "product": [
+ "Calendar",
+ "Chat Core",
+ "MailNews Core",
+ "Thunderbird"
+ ],
+ "v1": "approval-comm-release?",
+ "v2": "%NEXT_MILESTONE%"
+ }
+ },
+ "uplifts-approved": {
+ "description": "Thunderbird Release - Uplifts Approved",
+ "fetch_cols": [
+ "id",
+ "summary",
+ "status",
+ "product",
+ "component",
+ "target_milestone",
+ "priority",
+ "bug_severity",
+ "cf_last_resolved",
+ "cf_status_thunderbird_%CHANNEL%",
+ "cf_tracking_thunderbird_%CHANNEL%"
+ ],
+ "queryparams": {
+ "include_fields": "",
+ "classification": [
+ "Client Software",
+ "Developer Infrastructure",
+ "Components",
+ "Server Software",
+ "Other"
+ ],
+ "f1": "target_milestone",
+ "f2": "flagtypes.name",
+ "f3": "cf_status_thunderbird_%CHANNEL%",
+ "o1": "anywords",
+ "o2": "substring",
+ "o3": "nowords",
+ "product": [
+ "Calendar",
+ "Chat Core",
+ "MailNews Core",
+ "Thunderbird"
+ ],
+ "v1": "%NEXT_MILESTONE%",
+ "v2": "approval-comm-release+",
+ "v3": "fixed verified"
+ }
+ }
+ }
+ },
"nightly": {
"pd_key": "LATEST_THUNDERBIRD_NIGHTLY_VERSION",
"title": "Thunderbird Nightly",
diff --git a/assets/css/code.css b/assets/css/code.css
index 145b35f..fc470e4 100644
--- a/assets/css/code.css
+++ b/assets/css/code.css
@@ -18,6 +18,7 @@ pre.code .c1, .code .codetable .c1, .highlight pre .c1 { color: #3D7B7B; font-st
pre.code .cs, .code .codetable .cs, .highlight pre .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
pre.code .gd, .code .codetable .gd, .highlight pre .gd { color: #A00000 } /* Generic.Deleted */
pre.code .ge, .code .codetable .ge, .highlight pre .ge { font-style: italic } /* Generic.Emph */
+pre.code .ges, .code .codetable .ges, .highlight pre .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
pre.code .gr, .code .codetable .gr, .highlight pre .gr { color: #E40000 } /* Generic.Error */
pre.code .gh, .code .codetable .gh, .highlight pre .gh { color: #000080; font-weight: bold } /* Generic.Heading */
pre.code .gi, .code .codetable .gi, .highlight pre .gi { color: #008400 } /* Generic.Inserted */
diff --git a/assets/css/rst_base.css b/assets/css/rst_base.css
index b145903..d5aa552 100644
--- a/assets/css/rst_base.css
+++ b/assets/css/rst_base.css
@@ -72,10 +72,11 @@ span.problematic {
margin-top: 0;
margin-bottom: 0;
}
-/* Nested Paragraphs */
+/* Nested Paragraphs
p:first-child { margin-top: 0; }
p:last-child { margin-bottom: 0; }
details > p:last-child { margin-bottom: 1em; }
+ */
/* Table of Contents */
.contents ul.auto-toc { /* section numbers present */
diff --git a/assets/css/tbrelease.css b/assets/css/tbrelease.css
index b9a135c..f6864a4 100644
--- a/assets/css/tbrelease.css
+++ b/assets/css/tbrelease.css
@@ -47,6 +47,10 @@ iframe.release-dashboard {
border: none;
}
+main {
+ margin: 1em;
+}
+
main.no-padding {
padding-left: 0;
padding-right: 0;
diff --git a/assets/js/bugzilla.js b/assets/js/bugzilla.js
index fc094c2..767fda2 100644
--- a/assets/js/bugzilla.js
+++ b/assets/js/bugzilla.js
@@ -37,7 +37,7 @@ const ColumnMap = {
export default class BZQueryRunner {
constructor(tableId) {
this._validInputs = {
- channel_name: ["esr115", "beta", "nightly"],
+ channel_name: ["esr128", "esr115", "release", "beta", "nightly"],
query_name: [
"uplifts-requested",
"uplifts-approved",
@@ -226,6 +226,7 @@ export default class BZQueryRunner {
*/
fixQueryVersions(bugzilla_version, nightly_version) {
const old_beta = (Number(bugzilla_version) - 1).toString(10)
+ const next_milestone = (Number(bugzilla_version) +1).toString(10)
let fc = this.fetchColumns
let qp = this.queryParams
const ignore_params = ["include_fields", "classification", "product"]
@@ -244,6 +245,9 @@ export default class BZQueryRunner {
if (value.includes("%NIGHTLY%")) {
this.setQueryParam(param, value.replace("%NIGHTLY%", nightly_version))
}
+ if (value.includes("%NEXT_MILESTONE%")) {
+ this.setQueryParam(param, value.replace("%NEXT_MILESTONE%", next_milestone))
+ }
if (value.includes("%OLDBETA%")) {
this.setQueryParam(param, value.replace("%OLDBETA%", old_beta))
}
@@ -351,7 +355,7 @@ export default class BZQueryRunner {
if (current_version !== undefined && nightly_major !== undefined) {
if (this.channel_name.startsWith("esr")) {
bugzilla_version = this.channel_name
- } else if (this.channel_name === "beta") {
+ } else if (this.channel_name === "beta" || this.channel_name === "release") {
bugzilla_version = current_version.major_version.toString()
}
if (bugzilla_version !== null) {
@@ -409,7 +413,7 @@ export default class BZQueryRunner {
* @param {URL} query_url URL to fetch.
*/
renderTable(query_url) {
- const bugzilla_link = this.getBugzillaURL().href
+ const _me = this
this.$table = $(this._tableId).bootstrapTable({
columns: this.queryColumns,
url: query_url.href,
@@ -422,6 +426,7 @@ export default class BZQueryRunner {
return res["bugs"]
},
onLoadSuccess: function (data, status, xhr) {
+ const bugzilla_link = _me.getBugzillaURL().href
$("#open_bugzilla").data("href", bugzilla_link)
$("#get_data").data("href", query_url.href)
$("#bug_count").text(`Bug count: ${data.length}`)
diff --git a/css/landing.css b/css/landing.css
index c2f8764..ca40d71 100644
--- a/css/landing.css
+++ b/css/landing.css
@@ -99,10 +99,14 @@ header h2 {
.channel {
display: flex;
- padding: 1.5vmax;
+ padding: 1em;
flex-direction: row;
}
+.channel.hide {
+ padding: 0;
+}
+
.channel .release {
margin: 0 auto;
font-size: 2vmax;
diff --git a/dashboard/index.html b/dashboard/index.html
index a0864c8..b0eb143 100644
--- a/dashboard/index.html
+++ b/dashboard/index.html
@@ -60,20 +60,18 @@
-
-
+ captions: function(element){var i=element.getElementsByTagName('img')[0];return i===undefined?'':i.alt;}});
+
+
+