diff --git a/tests/webapp/api/test_performance_alertsummary_api.py b/tests/webapp/api/test_performance_alertsummary_api.py index 50333f0b46f..fbf0c2ce0bc 100644 --- a/tests/webapp/api/test_performance_alertsummary_api.py +++ b/tests/webapp/api/test_performance_alertsummary_api.py @@ -79,6 +79,7 @@ def test_alert_summaries_get( "bug_number", "bug_updated", "bug_due_date", + "bug_status", "issue_tracker", "notes", "assignee_username", @@ -209,6 +210,7 @@ def test_alert_summaries_get_onhold( "bug_number", "bug_updated", "bug_due_date", + "bug_status", "issue_tracker", "notes", "assignee_username", diff --git a/treeherder/webapp/api/performance_serializers.py b/treeherder/webapp/api/performance_serializers.py index d2ef2145670..a1ce03d0205 100644 --- a/treeherder/webapp/api/performance_serializers.py +++ b/treeherder/webapp/api/performance_serializers.py @@ -366,6 +366,7 @@ class Meta: "related_alerts", "status", "bug_number", + "bug_status", "bug_due_date", "bug_updated", "issue_tracker", diff --git a/ui/perfherder/alerts/AlertHeader.jsx b/ui/perfherder/alerts/AlertHeader.jsx index 11bc4000324..7843f44a69b 100644 --- a/ui/perfherder/alerts/AlertHeader.jsx +++ b/ui/perfherder/alerts/AlertHeader.jsx @@ -19,6 +19,7 @@ import Assignee from './Assignee'; import TagsList from './TagsList'; import AlertHeaderTitle from './AlertHeaderTitle'; import { getStatus } from '../perf-helpers/helpers'; +import { bugStatusMap } from '../perf-helpers/constants'; const AlertHeader = ({ frameworks, @@ -95,6 +96,9 @@ const AlertHeader = ({ const bugNumber = alertSummary.bug_number ? `Bug ${alertSummary.bug_number}` : ''; + const bugStatus = (alertSummary.bug_status != null && alertSummary.issue_tracker === 1) + ? `(${getStatus(alertSummary.bug_status, bugStatusMap)})` + : ''; const performanceTags = alertSummary.performance_tags || []; const alertSummaryDatetime = new Date(alertSummary.push_timestamp * 1000); @@ -192,7 +196,8 @@ const AlertHeader = ({ target="_blank" rel="noopener noreferrer" > - {bugNumber} + {bugNumber}{' '} + {bugStatus} ) : ( { bugNumber } diff --git a/ui/perfherder/perf-helpers/constants.js b/ui/perfherder/perf-helpers/constants.js index f9a6196bbdc..583b0c1287d 100644 --- a/ui/perfherder/perf-helpers/constants.js +++ b/ui/perfherder/perf-helpers/constants.js @@ -94,6 +94,18 @@ export const alertStatusMap = { acknowledged: 4, }; +export const bugStatusMap = { + new: 0, + fixed: 1, + invalid: 2, + inactive: 3, + duplicate: 4, + wontfix: 5, + worksforme: 6, + incomplete: 7, + moved: 8, +}; + export const alertBackfillResultStatusMap = { preliminary: 0, readyForProcessing: 1,