Add filtering by all sheriffed frameworks in Alerts View

Author: Alex Finder

tests/webapp/api/test_performance_alertsummary_api.py

@@ -6,7 +6,11 @@
 
 from tests.conftest import create_perf_alert
 from treeherder.model.models import Push
-from treeherder.perf.models import PerformanceAlert, PerformanceAlertSummary
+from treeherder.perf.models import (
+ PerformanceAlert,
+ PerformanceAlertSummary,
+ PerformanceFramework,
+)
 
 
 @pytest.fixture
@@ -130,6 +134,36 @@ def test_alert_summaries_get(
  }
 
 
+def test_alert_summaries_sheriffed_frameworks(
+ client, test_perf_alert_summary, test_perf_alert_summary_2, test_perf_framework
+):
+ browsertime = PerformanceFramework.objects.create(name="browsertime", enabled=True)
+ platform_microbench = PerformanceFramework.objects.create(
+ name="platform_microbench", enabled=True
+ )
+ test_perf_alert_summary.framework = browsertime
+ test_perf_alert_summary.save()
+ test_perf_alert_summary_2.framework = platform_microbench
+ test_perf_alert_summary_2.save()
+ resp = client.get(
+ reverse("performance-alert-summaries-list"), {"show_sheriffed_frameworks": True}
+ )
+ assert resp.status_code == 200
+
+ assert len(resp.json()["results"]) == 1
+ assert resp.json()["results"][0]["framework"] == browsertime.id
+
+ test_perf_alert_summary.framework = test_perf_framework
+ test_perf_alert_summary.save()
+
+ resp = client.get(
+ reverse("performance-alert-summaries-list"), {"show_sheriffed_frameworks": True}
+ )
+ assert resp.status_code == 200
+
+ assert len(resp.json()["results"]) == 0
+
+
 def test_alert_summaries_get_onhold(
  client,
  test_perf_alert_summary,

treeherder/webapp/api/performance_data.py

@@ -347,6 +347,7 @@ class PerformanceAlertSummaryFilter(django_filters.FilterSet):
  hide_related_and_invalid = django_filters.BooleanFilter(method="_hide_related_and_invalid")
  with_assignee = django_filters.CharFilter(method="_with_assignee")
  timerange = django_filters.NumberFilter(method="_timerange")
+ show_sheriffed_frameworks = django_filters.BooleanFilter(method="_show_sheriffed_frameworks")
 
  def _filter_text(self, queryset, name, value):
  sep = Value(" ")
@@ -418,6 +419,19 @@ def _timerange(self, queryset, name, value):
  push__time__gt=datetime.datetime.utcfromtimestamp(int(time.time() - int(value)))
  )
 
+ def _show_sheriffed_frameworks(self, queryset, name, value):
+ return queryset.filter(
+ framework__name__in=[
+ "browsertime",
+ "awsy",
+ "talos",
+ "build_metrics",
+ "js-bench",
+ "mozperftest",
+ "devtools",
+ ]
+ )
+
  class Meta:
  model = PerformanceAlertSummary
  fields = [

ui/perfherder/alerts/AlertsView.jsx

@@ -148,6 +148,11 @@ class AlertsView extends React.Component {
  const frameworkOptions = cloneDeep(frameworks);
  const ignoreFrameworks = { id: -1, name: 'all frameworks' };
  frameworkOptions.unshift(ignoreFrameworks);
+ const ignoreNonSheriffedFrameworks = {
+ id: -2,
+ name: 'all sheriffed frameworks',
+ };
+ frameworkOptions.unshift(ignoreNonSheriffedFrameworks);
  return frameworkOptions;
  };
 
@@ -207,6 +212,9 @@ class AlertsView extends React.Component {
  if (listMode && params.framework === doNotFilter) {
  delete params.framework;
  }
+ if (listMode && params.framework === -2) {
+ delete params.framework;
+ }
 
  return params;
  };
@@ -271,6 +279,9 @@ class AlertsView extends React.Component {
  if (hideAssignedToOthers) {
  params.with_assignee = user.username;
  }
+ if (framework.id === -2) {
+ params.show_sheriffed_frameworks = true;
+ }
  }
 
  const url = getApiUrl(

ui/perfherder/alerts/AlertsViewControls.jsx

@@ -138,14 +138,14 @@ export default class AlertsViewControls extends React.Component {
 
  let sortedFrameworks = sortData(frameworkOptions, 'name', false);
  const allFrameworks = 'all frameworks';
- const mozperftest = 'mozperftest';
+ const allSheriffedFrameworks = 'all sheriffed frameworks';
  const platformMicrobench = 'platform_microbench';
 
  sortedFrameworks = sortedFrameworks.filter(
  (framework) =>
- framework.name !== mozperftest &&
  framework.name !== platformMicrobench &&
- framework.name !== allFrameworks,
+ framework.name !== allFrameworks &&
+ framework.name !== allSheriffedFrameworks,
  );
 
  const frameworkNames =
@@ -165,8 +165,8 @@ export default class AlertsViewControls extends React.Component {
  selectedItem: framework.name,
  updateData: this.updateFramework,
  namespace: 'framework',
- pinned: [allFrameworks],
- otherPinned: [mozperftest, platformMicrobench],
+ pinned: [allFrameworks, allSheriffedFrameworks],
+ otherPinned: [platformMicrobench],
  },
  ];