darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-20 13:12:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3540 from alphagov/search-whole-postal-address

Browse Source 
Tell users that they can search whole postal address
This commit is contained in:
Chris Hill-Scott
2020-08-03 14:47:58 +01:00
committed by GitHub
parent 4bf4680031 3fbf966719
commit 47a5c2abba
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/jobs.py
View File

@@ -171,9 +171,7 @@ def view_notifications(service_id, message_type=None):
things_you_can_search_by={
'email': ['email address'],
'sms': ['phone number'],
# This should become ‘postal address’ not ‘first line…’ once
# we’ve finished populating normalised addresses
'letter': ['first line of address', 'file name'],
'letter': ['postal address', 'file name'],
# We say recipient here because combining all 3 types, plus
# reference gets too long for the hint text
None: ['recipient'],

2
app/templates/views/activity/notifications.html
View File

@@ -19,7 +19,7 @@
{% if item.status in ('pending-virus-check', 'virus-scan-failed') %}
<span class="file-list-filename loading-indicator">Checking</span>
{% else %}
<a class="govuk-link govuk-link--no-visited-state file-list-filename" href="{{ single_notification_url(notification_id=item.id) }}">{{ item.to.splitlines()[0].lstrip().rstrip(' ,') if item.to else '' }}</a>
<a class="govuk-link govuk-link--no-visited-state file-list-filename" href="{{ single_notification_url(notification_id=item.id) }}">{{ item.to.splitlines()|join(', ') if item.to else '' }}</a>
{% endif %}
<p class="file-list-hint">
{{ item.preview_of_content }}

12
tests/app/main/views/test_activity.py
View File

@@ -402,7 +402,7 @@ def test_shows_message_when_no_notifications(
{
'to': 'Firstname Lastname',
},
'Search by first line of address or file name',
'Search by postal address or file name',
'Firstname Lastname',
),
])
@@ -448,7 +448,7 @@ def test_search_recipient_form(
(None, 'Search by recipient or reference'),
('sms', 'Search by phone number or reference'),
('email', 'Search by email address or reference'),
('letter', 'Search by first line of address, file name or reference'),
('letter', 'Search by postal address, file name or reference'),
])
def test_api_users_are_told_they_can_search_by_reference_when_service_has_api_keys(
client_request,
@@ -473,7 +473,7 @@ def test_api_users_are_told_they_can_search_by_reference_when_service_has_api_ke
(None, 'Search by recipient'),
('sms', 'Search by phone number'),
('email', 'Search by email address'),
('letter', 'Search by first line of address or file name'),
('letter', 'Search by postal address or file name'),
])
def test_api_users_are_not_told_they_can_search_by_reference_when_service_has_no_api_keys(
client_request,
@@ -757,8 +757,8 @@ def test_sending_status_hint_displays_correctly_on_notifications_page(
@pytest.mark.parametrize("is_precompiled_letter,expected_address,expected_hint", [
(True, "Full Name,\nFirst address line\npostcode", "ref"),
(False, "Full Name,\nFirst address line\npostcode", "template subject")
(True, "Full Name\nFirst address line\npostcode", "ref"),
(False, "Full Name\nFirst address line\npostcode", "template subject")
])
def test_should_show_address_and_hint_for_letters(
client_request,
@@ -786,5 +786,5 @@ def test_should_show_address_and_hint_for_letters(
message_type='letter',
)
assert page.select_one('a.file-list-filename').text == 'Full Name'
assert page.select_one('a.file-list-filename').text == 'Full Name, First address line, postcode'
assert page.find('p', {'class': 'file-list-hint'}).text.strip() == expected_hint