From 8aa99be75fa7f4546565886bcc438c801d298b74 Mon Sep 17 00:00:00 2001 From: Joey Orlando Date: Thu, 2 Nov 2023 07:25:07 -0400 Subject: [PATCH 1/4] sign .drone.yml after changes --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 53a56540..dd1eaf7b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -379,4 +379,4 @@ kind: secret name: github_api_token --- kind: signature -hmac: 9cc2cc2db01455d34768577047f8069d19c0573b6a05dd26c88b9deb3af3a0c9 +hmac: b9e499a424faecd9a8f41552cc307bd3431cb0e3fac77f3ee99ce19258fc0fec From 2edae70b0408cf8be9b292b920ed5387dd6349eb Mon Sep 17 00:00:00 2001 From: Yulya Artyukhina Date: Thu, 2 Nov 2023 12:37:28 +0100 Subject: [PATCH 2/4] Update wording for mobile push notifications timing choices (#3253) # What this PR does Update wording for mobile push notifications timing choices ## Which issue(s) this PR fixes ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) --- CHANGELOG.md | 4 ++++ engine/apps/mobile_app/models.py | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8435945c..0aeebae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed + +- Change wording for push notifications timing choices @Ferril ([#3253](https://github.com/grafana/oncall/pull/3253)) + ## v1.3.51 (2023-11-02) ### Fixed diff --git a/engine/apps/mobile_app/models.py b/engine/apps/mobile_app/models.py index cb24a396..63aa2ab7 100644 --- a/engine/apps/mobile_app/models.py +++ b/engine/apps/mobile_app/models.py @@ -171,11 +171,11 @@ class MobileAppUserSettings(models.Model): ONE_DAY_IN_SECONDS = TWELVE_HOURS_IN_SECONDS * 2 NOTIFICATION_TIMING_CHOICES = ( - (FIFTEEN_MINUTES_IN_SECONDS, "fifteen minutes before"), - (ONE_HOUR_IN_SECONDS, "one hour before"), - (SIX_HOURS_IN_SECONDS, "six hours before"), - (TWELVE_HOURS_IN_SECONDS, "twelve hours before"), - (ONE_DAY_IN_SECONDS, "one day before"), + (FIFTEEN_MINUTES_IN_SECONDS, "15 minutes before"), + (ONE_HOUR_IN_SECONDS, "1 hour before"), + (SIX_HOURS_IN_SECONDS, "6 hours before"), + (TWELVE_HOURS_IN_SECONDS, "12 hours before"), + (ONE_DAY_IN_SECONDS, "1 day before"), ) going_oncall_notification_timing = JSONField(default=default_notification_timing_options) From bf1cb831975dae07d004f2916724db0c7fd1023f Mon Sep 17 00:00:00 2001 From: Joey Orlando Date: Thu, 2 Nov 2023 07:59:10 -0400 Subject: [PATCH 3/4] hotfix for TypeError --- grafana-plugin/src/pages/incident/Incident.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-plugin/src/pages/incident/Incident.tsx b/grafana-plugin/src/pages/incident/Incident.tsx index 4fe3f230..2de64a38 100644 --- a/grafana-plugin/src/pages/incident/Incident.tsx +++ b/grafana-plugin/src/pages/incident/Incident.tsx @@ -177,7 +177,7 @@ class IncidentPage extends React.Component
- {(!incident.resolved || incident?.paged_users.length > 0) && ( + {(!incident.resolved || incident?.paged_users?.length > 0) && ( Date: Thu, 2 Nov 2023 08:02:31 -0400 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aeebae8..0edbcb4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## v1.3.52 (2023-11-02) + +### Fixed + +- Address `TypeError` that occurs under some scenarios on the Alert Group detail page + ### Changed - Change wording for push notifications timing choices @Ferril ([#3253](https://github.com/grafana/oncall/pull/3253)) @@ -16,7 +22,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Postpone Legacy AlertManager and Grafana Alerting integration auto-migration date ([3250])() -- Address `TypeError` that occurs under some scenarios on the Alert Group detail page ([3252](https://github.com/grafana/oncall/pull/3252)) ## v1.3.50 (2023-11-02)