Skip to content

Commit a675a8f

Browse files
Revert "Bug 1991117 - Add option to copy a message tailored for backouts (#9034)" (#9061)
This reverts commit 149e85a.
1 parent aa690aa commit a675a8f

File tree

10 files changed

+97
-225
lines changed

10 files changed

+97
-225
lines changed

tests/ui/perfherder/alerts-view/status_dropdown_test.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const testStatusDropdown = (summaryTags, alertSummary) => {
4040
repoModel={testRepoModel}
4141
updateViewState={() => {}}
4242
issueTrackers={testIssueTrackers}
43+
bugTemplate={null}
4344
filteredAlerts={testAlerts}
4445
performanceTags={testPerformanceTags}
4546
frameworks={[{ id: 1, name: dummyFrameworkName }]}

tests/webapp/api/test_performance_bug_template_api.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ def test_perf_bug_template_api(client, test_perf_framework):
1919
"cc_list": f"foo{i}@bar.com",
2020
"text": f"my great text {i}",
2121
"critical_text": f"my great critical text {i}",
22-
"no_action_required_text": f"my great text - no action is required from the author {i}",
2322
}
2423
PerformanceBugTemplate.objects.create(framework=framework, **dict)
2524
dict["framework"] = framework.id

treeherder/perf/fixtures/performance_bug_templates.yaml

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,6 @@
3737
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
3838
3939
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
40-
no_action_required_text: |
41-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
42-
43-
_**No action is required from the author; this comment is provided for informational purposes only.**_
44-
45-
{{ alertSummary }}
46-
47-
### Need Help or Information?
48-
49-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
50-
51-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
5240
- model: perf.PerformanceBugTemplate
5341
pk: 2
5442
fields:
@@ -86,18 +74,6 @@
8674
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
8775
8876
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
89-
no_action_required_text: |
90-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
91-
92-
_**No action is required from the author; this comment is provided for informational purposes only.**_
93-
94-
{{ alertSummary }}
95-
96-
### Need Help or Information?
97-
98-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
99-
100-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
10177
- model: perf.PerformanceBugTemplate
10278
pk: 4
10379
fields:
@@ -137,18 +113,6 @@
137113
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
138114
139115
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
140-
no_action_required_text: |
141-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
142-
143-
_**No action is required from the author; this comment is provided for informational purposes only.**_
144-
145-
{{ alertSummary }}
146-
147-
### Need Help or Information?
148-
149-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
150-
151-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
152116
- model: perf.PerformanceBugTemplate
153117
pk: 5
154118
fields:
@@ -188,18 +152,6 @@
188152
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
189153
190154
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
191-
no_action_required_text: |
192-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
193-
194-
_**No action is required from the author; this comment is provided for informational purposes only.**_
195-
196-
{{ alertSummary }}
197-
198-
### Need Help or Information?
199-
200-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
201-
202-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
203155
- model: perf.PerformanceBugTemplate
204156
pk: 6
205157
fields:
@@ -239,18 +191,6 @@
239191
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
240192
241193
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
242-
no_action_required_text: |
243-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
244-
245-
_**No action is required from the author; this comment is provided for informational purposes only.**_
246-
247-
{{ alertSummary }}
248-
249-
### Need Help or Information?
250-
251-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
252-
253-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
254194
- model: perf.PerformanceBugTemplate
255195
pk: 7
256196
fields:
@@ -290,18 +230,6 @@
290230
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
291231
292232
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
293-
no_action_required_text: |
294-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
295-
296-
_**No action is required from the author; this comment is provided for informational purposes only.**_
297-
298-
{{ alertSummary }}
299-
300-
### Need Help or Information?
301-
302-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
303-
304-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
305233
- model: perf.PerformanceBugTemplate
306234
pk: 8
307235
fields:
@@ -341,18 +269,6 @@
341269
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
342270
343271
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
344-
no_action_required_text: |
345-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
346-
347-
_**No action is required from the author; this comment is provided for informational purposes only.**_
348-
349-
{{ alertSummary }}
350-
351-
### Need Help or Information?
352-
353-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
354-
355-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
356272
- model: perf.PerformanceBugTemplate
357273
pk: 9
358274
fields:
@@ -392,18 +308,6 @@
392308
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
393309
394310
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
395-
no_action_required_text: |
396-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
397-
398-
_**No action is required from the author; this comment is provided for informational purposes only.**_
399-
400-
{{ alertSummary }}
401-
402-
### Need Help or Information?
403-
404-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
405-
406-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
407311
- model: perf.PerformanceBugTemplate
408312
pk: 10
409313
fields:
@@ -443,18 +347,6 @@
443347
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
444348
445349
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
446-
no_action_required_text: |
447-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
448-
449-
_**No action is required from the author; this comment is provided for informational purposes only.**_
450-
451-
{{ alertSummary }}
452-
453-
### Need Help or Information?
454-
455-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
456-
457-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.
458350
- model: perf.PerformanceBugTemplate
459351
pk: 11
460352
fields:
@@ -494,15 +386,3 @@
494386
You can run all of these tests on try with `./mach try perf --alert {{ alertSummaryId }}`
495387
496388
The following [documentation link](https://firefox-source-docs.mozilla.org/testing/perfdocs/mach-try-perf.html#running-alert-tests) provides more information about this command.
497-
no_action_required_text: |
498-
Perfherder has detected a {{ framework }} performance change from push [{{ revision }}]({{ revisionHref }}).
499-
500-
_**No action is required from the author; this comment is provided for informational purposes only.**_
501-
502-
{{ alertSummary }}
503-
504-
### Need Help or Information?
505-
506-
If you have any questions, please reach out to {{ user }}. Alternatively, you can find help on Slack by joining [#perf-help](https://mozilla.enterprise.slack.com/archives/C03U19JCSFQ), and on Matrix you can find help by joining [#perftest](https://matrix.to/#/#perftest:mozilla.org).
507-
508-
Details of the alert can be found in the [alert summary]({{ alertHref }}), including links to graphs and comparisons for each of the affected tests.

treeherder/perf/migrations/0062_performancebugtemplate_no_action_required_text.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

treeherder/perf/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,6 @@ class PerformanceBugTemplate(models.Model):
828828

829829
text = models.TextField(max_length=4096)
830830
critical_text = models.TextField(max_length=4096, default="")
831-
no_action_required_text = models.TextField(max_length=4096, default="")
832831

833832
class Meta:
834833
db_table = "performance_bug_template"

treeherder/webapp/api/performance_serializers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ class Meta:
374374
"cc_list",
375375
"text",
376376
"critical_text",
377-
"no_action_required_text",
378377
]
379378

380379

ui/perfherder/alerts/AlertTable.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ export default class AlertTable extends React.Component {
299299
issueTrackers,
300300
fetchAlertSummaries,
301301
updateViewState,
302+
bugTemplate,
302303
modifyAlert,
303304
performanceTags,
304305
} = this.props;
@@ -359,6 +360,7 @@ export default class AlertTable extends React.Component {
359360
repoModel={repoModel}
360361
updateViewState={updateViewState}
361362
issueTrackers={issueTrackers}
363+
bugTemplate={bugTemplate}
362364
user={user}
363365
filteredAlerts={filteredAlerts}
364366
frameworks={frameworks}
@@ -531,6 +533,7 @@ AlertTable.propTypes = {
531533
}).isRequired,
532534
fetchAlertSummaries: PropTypes.func.isRequired,
533535
updateViewState: PropTypes.func.isRequired,
536+
bugTemplate: PropTypes.shape({}),
534537
modifyAlert: PropTypes.func,
535538
updateAlertSummary: PropTypes.func,
536539
projects: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
@@ -540,6 +543,7 @@ AlertTable.propTypes = {
540543
AlertTable.defaultProps = {
541544
alertSummary: null,
542545
issueTrackers: [],
546+
bugTemplate: null,
543547
modifyAlert: undefined,
544548
// leverage dependency injection
545549
// to improve code testability

ui/perfherder/alerts/AlertsView.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class AlertsView extends React.Component {
4848
optionCollectionMap: null,
4949
count: 0,
5050
id: validated.id,
51+
bugTemplate: null,
5152
totalPages: 0,
5253
};
5354
}
@@ -346,6 +347,7 @@ class AlertsView extends React.Component {
346347
issueTrackers,
347348
notSupportedAlertFilters,
348349
optionCollectionMap,
350+
bugTemplate,
349351
page,
350352
count,
351353
} = this.state;
@@ -394,6 +396,7 @@ class AlertsView extends React.Component {
394396
}
395397
updateViewState={(state) => this.setState(state)}
396398
setFiltersState={this.setFiltersState}
399+
bugTemplate={bugTemplate}
397400
user={user}
398401
page={page}
399402
count={count}

ui/perfherder/alerts/AlertsViewControls.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default class AlertsViewControls extends React.Component {
8282
const framework = frameworkOptions.find(
8383
(item) => item.name === selectedFramework,
8484
);
85-
updateViewState({ page: 1 });
85+
updateViewState({ bugTemplate: null, page: 1 });
8686
setFiltersState({ framework }, this.fetchAlertSummaries);
8787
};
8888

0 commit comments

Comments
 (0)