Skip to content

Commit 3e5960e

Browse files
MikaKermanMikaKerman
committed
Update alert message formatting to consistently use plural terms for owners and subscribers
* Modified alert message templates to replace singular terms with plural for owners and subscribers, ensuring clarity in communication. * Updated various test fixture files to reflect these changes, enhancing consistency across alert messages.
1 parent 43565e5 commit 3e5960e

41 files changed

Lines changed: 206 additions & 215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎elementary/monitor/alerts/alert_messages/builder.py‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
LineBlock,
2929
LinesBlock,
3030
LinkBlock,
31-
MentionBlock,
3231
TableBlock,
3332
TextBlock,
3433
TextStyle,
@@ -424,24 +423,16 @@ def _get_alert_list_line(
424423
]
425424
if owners := list(set(alert.owners)):
426425
inlines.append(TextBlock(text="-"))
427-
if len(owners) == 1:
428-
inlines.append(TextBlock(text="Owner:"))
429-
inlines.append(MentionBlock(user=owners.pop()))
430-
else:
431-
owners.sort()
432-
inlines.append(TextBlock(text="Owners:"))
433-
inlines.append(MentionLineBlock(*owners))
426+
owners.sort()
427+
inlines.append(TextBlock(text="Owners:"))
428+
inlines.append(MentionLineBlock(*owners))
434429

435430
if subscribers := list(set(alert.subscribers)):
436431
if self.config.alert_groups_subscribers:
437432
inlines.append(TextBlock(text="-"))
438-
if len(subscribers) == 1:
439-
inlines.append(TextBlock(text="Subscriber:"))
440-
inlines.append(MentionBlock(user=subscribers.pop()))
441-
else:
442-
subscribers.sort()
443-
inlines.append(TextBlock(text="Subscribers:"))
444-
inlines.append(MentionLineBlock(*subscribers))
433+
subscribers.sort()
434+
inlines.append(TextBlock(text="Subscribers:"))
435+
inlines.append(MentionLineBlock(*subscribers))
445436

446437
if report_link := alert.get_report_link():
447438
inlines.append(TextBlock(text="-"))

‎tests/unit/alerts/alert_messages/fixtures/adaptive_card/alerts_group_model-errors-False_test-failures-False_test-warnings-True_test-errors-True_link-False_env-False_subscribers-True.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"type": "TextBlock",
44-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - Subscriber: subscriber1",
44+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - Subscribers: subscriber1",
4545
"wrap": true
4646
},
4747
{
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"type": "TextBlock",
59-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - Subscriber: subscriber1",
59+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - Subscribers: subscriber1",
6060
"wrap": true
6161
},
6262
{
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "TextBlock",
74-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - Subscriber: subscriber1",
74+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - Subscribers: subscriber1",
7575
"wrap": true
7676
},
7777
{
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"type": "TextBlock",
105-
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - Subscriber: subscriber1",
105+
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - Subscribers: subscriber1",
106106
"wrap": true
107107
},
108108
{
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"type": "TextBlock",
120-
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - Subscriber: subscriber1",
120+
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - Subscribers: subscriber1",
121121
"wrap": true
122122
},
123123
{
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"type": "TextBlock",
135-
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - Subscriber: subscriber1",
135+
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - Subscribers: subscriber1",
136136
"wrap": true
137137
},
138138
{

‎tests/unit/alerts/alert_messages/fixtures/adaptive_card/alerts_group_model-errors-False_test-failures-True_test-warnings-False_test-errors-False_link-False_env-False_subscribers-True.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"type": "TextBlock",
44-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - Subscriber: subscriber1",
44+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - Subscribers: subscriber1",
4545
"wrap": true
4646
},
4747
{
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"type": "TextBlock",
59-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - Subscriber: subscriber1",
59+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - Subscribers: subscriber1",
6060
"wrap": true
6161
},
6262
{
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "TextBlock",
74-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - Subscriber: subscriber1",
74+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - Subscribers: subscriber1",
7575
"wrap": true
7676
},
7777
{

‎tests/unit/alerts/alert_messages/fixtures/adaptive_card/alerts_group_model-errors-False_test-failures-True_test-warnings-False_test-errors-True_link-False_env-False_subscribers-True.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"type": "TextBlock",
44-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - Subscriber: subscriber1",
44+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - Subscribers: subscriber1",
4545
"wrap": true
4646
},
4747
{
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"type": "TextBlock",
59-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - Subscriber: subscriber1",
59+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - Subscribers: subscriber1",
6060
"wrap": true
6161
},
6262
{
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "TextBlock",
74-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - Subscriber: subscriber1",
74+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - Subscribers: subscriber1",
7575
"wrap": true
7676
},
7777
{
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"type": "TextBlock",
105-
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - Subscriber: subscriber1",
105+
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - Subscribers: subscriber1",
106106
"wrap": true
107107
},
108108
{
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"type": "TextBlock",
120-
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - Subscriber: subscriber1",
120+
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - Subscribers: subscriber1",
121121
"wrap": true
122122
},
123123
{
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"type": "TextBlock",
135-
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - Subscriber: subscriber1",
135+
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - Subscribers: subscriber1",
136136
"wrap": true
137137
},
138138
{

‎tests/unit/alerts/alert_messages/fixtures/adaptive_card/alerts_group_model-errors-False_test-failures-True_test-warnings-True_test-errors-True_link-True_env-True_subscribers-False.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"type": "TextBlock",
44-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - [View Report](http://test.com)",
44+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - [View Report](http://test.com)",
4545
"wrap": true
4646
},
4747
{
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"type": "TextBlock",
59-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - [View Report](http://test.com)",
59+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - [View Report](http://test.com)",
6060
"wrap": true
6161
},
6262
{
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "TextBlock",
74-
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - [View Report](http://test.com)",
74+
"text": "\ud83d\udd3a **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - [View Report](http://test.com)",
7575
"wrap": true
7676
},
7777
{
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"type": "TextBlock",
105-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - [View Report](http://test.com)",
105+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - [View Report](http://test.com)",
106106
"wrap": true
107107
},
108108
{
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"type": "TextBlock",
120-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - [View Report](http://test.com)",
120+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - [View Report](http://test.com)",
121121
"wrap": true
122122
},
123123
{
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"type": "TextBlock",
135-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - [View Report](http://test.com)",
135+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - [View Report](http://test.com)",
136136
"wrap": true
137137
},
138138
{
@@ -163,7 +163,7 @@
163163
},
164164
{
165165
"type": "TextBlock",
166-
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - [View Report](http://test.com)",
166+
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - [View Report](http://test.com)",
167167
"wrap": true
168168
},
169169
{
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"type": "TextBlock",
181-
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - [View Report](http://test.com)",
181+
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - [View Report](http://test.com)",
182182
"wrap": true
183183
},
184184
{
@@ -193,7 +193,7 @@
193193
},
194194
{
195195
"type": "TextBlock",
196-
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - [View Report](http://test.com)",
196+
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - [View Report](http://test.com)",
197197
"wrap": true
198198
},
199199
{

‎tests/unit/alerts/alert_messages/fixtures/adaptive_card/alerts_group_model-errors-True_test-failures-False_test-warnings-False_test-errors-True_link-False_env-False_subscribers-True.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"type": "TextBlock",
44-
"text": "\u274c **dbt failed to build table \"test_model\"** - Owner: owner1 - Subscriber: subscriber1",
44+
"text": "\u274c **dbt failed to build table \"test_model\"** - Owners: owner1 - Subscribers: subscriber1",
4545
"wrap": true
4646
},
4747
{
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"type": "TextBlock",
59-
"text": "\u274c **dbt failed to build table \"test_model\"** - Owner: owner1 - Subscriber: subscriber1",
59+
"text": "\u274c **dbt failed to build table \"test_model\"** - Owners: owner1 - Subscribers: subscriber1",
6060
"wrap": true
6161
},
6262
{
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "TextBlock",
74-
"text": "\u274c **dbt failed to build table \"test_model\"** - Owner: owner1 - Subscriber: subscriber1",
74+
"text": "\u274c **dbt failed to build table \"test_model\"** - Owners: owner1 - Subscribers: subscriber1",
7575
"wrap": true
7676
},
7777
{
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"type": "TextBlock",
105-
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - Subscriber: subscriber1",
105+
"text": "\u2757 **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - Subscribers: subscriber1",
106106
"wrap": true
107107
},
108108
{
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"type": "TextBlock",
120-
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - Subscriber: subscriber1",
120+
"text": "\u2757 **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - Subscribers: subscriber1",
121121
"wrap": true
122122
},
123123
{
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"type": "TextBlock",
135-
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - Subscriber: subscriber1",
135+
"text": "\u2757 **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - Subscribers: subscriber1",
136136
"wrap": true
137137
},
138138
{

‎tests/unit/alerts/alert_messages/fixtures/adaptive_card/alerts_group_model-errors-True_test-failures-False_test-warnings-True_test-errors-False_link-True_env-False_subscribers-False.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"type": "TextBlock",
44-
"text": "\u274c **dbt failed to build table \"test_model\"** - Owner: owner1 - [View Report](http://test.com)",
44+
"text": "\u274c **dbt failed to build table \"test_model\"** - Owners: owner1 - [View Report](http://test.com)",
4545
"wrap": true
4646
},
4747
{
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"type": "TextBlock",
59-
"text": "\u274c **dbt failed to build table \"test_model\"** - Owner: owner1 - [View Report](http://test.com)",
59+
"text": "\u274c **dbt failed to build table \"test_model\"** - Owners: owner1 - [View Report](http://test.com)",
6060
"wrap": true
6161
},
6262
{
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"type": "TextBlock",
74-
"text": "\u274c **dbt failed to build table \"test_model\"** - Owner: owner1 - [View Report](http://test.com)",
74+
"text": "\u274c **dbt failed to build table \"test_model\"** - Owners: owner1 - [View Report](http://test.com)",
7575
"wrap": true
7676
},
7777
{
@@ -102,7 +102,7 @@
102102
},
103103
{
104104
"type": "TextBlock",
105-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_2** - Owner: owner1 - [View Report](http://test.com)",
105+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_2** - Owners: owner1 - [View Report](http://test.com)",
106106
"wrap": true
107107
},
108108
{
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"type": "TextBlock",
120-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_5** - Owner: owner1 - [View Report](http://test.com)",
120+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_5** - Owners: owner1 - [View Report](http://test.com)",
121121
"wrap": true
122122
},
123123
{
@@ -132,7 +132,7 @@
132132
},
133133
{
134134
"type": "TextBlock",
135-
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_8** - Owner: owner1 - [View Report](http://test.com)",
135+
"text": "\u26a0\ufe0f **\"test_short_name\" test failed on test_table_8** - Owners: owner1 - [View Report](http://test.com)",
136136
"wrap": true
137137
},
138138
{

0 commit comments

Comments
 (0)