darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-03-07 19:02:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2967 from alphagov/fix-linking-notification-status

Browse Source 
Only link to message status if message has failed
This commit is contained in:
Chris Hill-Scott
2019-05-13 13:55:37 +01:00
committed by GitHub
parent 61d9371134 3c6598cbc2
commit 2b63b005ef
4 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/__init__.py
View File

@@ -442,9 +442,14 @@ def format_notification_status_as_field_status(status, notification_type):
).get(status, 'error')
def format_notification_status_as_url(notification_type):
def format_notification_status_as_url(status, notification_type):
url = partial(url_for, "main.message_status")
if status not in {
'technical-failure', 'temporary-failure', 'permanent-failure',
}:
return None
return {
'email': url(_anchor='email-statuses'),
'sms': url(_anchor='sms-statuses')

6
app/templates/components/table.html
View File

@@ -154,11 +154,11 @@
align='right'
) %}
{% if displayed_on_single_line %}<span class="align-with-message-body">{% endif %}
{% if notification.notification_type|format_notification_status_as_url %}
<a href="{{ notification.notification_type|format_notification_status_as_url }}">
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
<a href="{{ notification.status|format_notification_status_as_url(notification.notification_type) }}">
{% endif %}
{{ notification.status|format_notification_status(notification.template.template_type) }}
{% if notification.notification_type|format_notification_status_as_url %}
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
</a>
{% endif %}
<span class="status-hint">

6
app/templates/partials/notifications/status.html
View File

@@ -1,12 +1,12 @@
<div class="ajax-block-container">
<p class="notification-status {{ notification.status|format_notification_status_as_field_status(notification.notification_type) }}">
{% if notification.notification_type|format_notification_status_as_url %}
<a href="{{ notification.notification_type|format_notification_status_as_url }}">
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
<a href="{{ notification.status|format_notification_status_as_url(notification.notification_type) }}">
{% endif %}
{{ notification.status|format_notification_status(
notification.template.template_type
) }}
{% if notification.notification_type|format_notification_status_as_url %}
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
</a>
{% endif %}
{% if sent_with_test_key %}

35
tests/app/main/test_formatters.py Normal file
View File

@@ -0,0 +1,35 @@
from functools import partial
import pytest
from flask import url_for
from app import format_notification_status_as_url
@pytest.mark.parametrize('status, notification_type, expected', (
# Successful statuses aren’t linked
('created', 'email', lambda: None),
('sending', 'email', lambda: None),
('delivered', 'email', lambda: None),
# Failures are linked to the channel-specific page
('temporary-failure', 'email', partial(url_for, 'main.message_status', _anchor='email-statuses')),
('permanent-failure', 'email', partial(url_for, 'main.message_status', _anchor='email-statuses')),
('technical-failure', 'email', partial(url_for, 'main.message_status', _anchor='email-statuses')),
('temporary-failure', 'sms', partial(url_for, 'main.message_status', _anchor='sms-statuses')),
('permanent-failure', 'sms', partial(url_for, 'main.message_status', _anchor='sms-statuses')),
('technical-failure', 'sms', partial(url_for, 'main.message_status', _anchor='sms-statuses')),
# Letter statuses are never linked
('technical-failure', 'letter', lambda: None),
('cancelled', 'letter', lambda: None),
('accepted', 'letter', lambda: None),
('received', 'letter', lambda: None),
))
def test_format_notification_status_as_url(
client,
status,
notification_type,
expected,
):
assert format_notification_status_as_url(
status, notification_type
) == expected()