mirror of
https://github.com/GSA/notifications-admin.git
synced 2025-12-17 02:23:57 -05:00
Rename ‘whitelist’ to ‘guest list’ in UI
This commit changes all the places where a user would see the term ‘whitelist’ in the content of page to say guestlist instead. We’re removing the term ‘whitelist’ for two reasons. The first reason is that we agree with the National Cyber Security Centre say: > It's fairly common to say whitelisting and blacklisting to describe > desirable and undesirable things in cyber security. For instance, when > talking about which applications you will allow or deny on your > corporate network; or deciding which bad passwords you want your users > not to be able to use. > However, there's an issue with the terminology. It only makes sense if > you equate white with 'good, permitted, safe' and black with 'bad, > dangerous, forbidden'. There are some obvious problems with this. So > in the name of helping to stamp out racism in cyber security, we will > avoid this casually pejorative wording on our website in the future. > No, it's not the biggest issue in the world - but to borrow a slogan > from elsewhere: every little helps. – https://www.ncsc.gov.uk/blog-post/terminology-its-not-black-and-white The second reason is that we’ve observed some users think that they have to put recipients in the whitelist even when they’re already with in the team. We think that the term ‘whitelist’ might be reinforcing this mental model because of how ‘whitelists’ might work in other applications. We considered the following alternatives or concepts: - Development - Recipients - Sandbox - Extended team - Smoke test recipients - Allowed - Nominated - Bonus - Additional - Safe - Team list - Trusted contacts - Designated people - Guest list - Team key list We also considered not giving it a name, and explaining it as a nuance of how the team key works. After mocking this up it felt more disjoined. We think it’s still useful for the thing to have a name so that it’s easy to refer to between the docs and the UI. We like the term ‘guest list’ because: - of how it sits with team members – members and guests in the abstract - a guest list is a concept that a lot of people will be familiar with – a list of people who can access a thing - ‘guest’ is very different to ‘recipient’ – we want to mitigate any confusion between this and the (emergency) contact lists
This commit is contained in:
@@ -61,7 +61,7 @@ def whitelist(service_id):
|
||||
'email_addresses': list(filter(None, form.email_addresses.data)),
|
||||
'phone_numbers': list(filter(None, form.phone_numbers.data))
|
||||
})
|
||||
flash('Whitelist updated', 'default_with_tick')
|
||||
flash('Guest list updated', 'default_with_tick')
|
||||
return redirect(url_for('.api_integration', service_id=service_id))
|
||||
if not form.errors:
|
||||
form.populate(**service_api_client.get_whitelist(service_id))
|
||||
@@ -85,7 +85,7 @@ def create_api_key(service_id):
|
||||
form = CreateKeyForm(current_service.api_keys)
|
||||
form.key_type.choices = [
|
||||
(KEY_TYPE_NORMAL, 'Live – sends to anyone'),
|
||||
(KEY_TYPE_TEAM, 'Team and whitelist – limits who you can send to'),
|
||||
(KEY_TYPE_TEAM, 'Team and guest list – limits who you can send to'),
|
||||
(KEY_TYPE_TEST, 'Test – pretends to send messages'),
|
||||
]
|
||||
disabled_options, option_hints = [], {}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
|
||||
</div>
|
||||
<div class="govuk-grid-column-one-third">
|
||||
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Whitelist</a>
|
||||
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Guest list</a>
|
||||
</div>
|
||||
<div class="govuk-grid-column-one-third">
|
||||
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
{% if item.key_type == 'normal' %}
|
||||
Live – sends to anyone
|
||||
{% elif item.key_type == 'team' %}
|
||||
Team and whitelist – limits who you can send to
|
||||
Team and guest list – limits who you can send to
|
||||
{% elif item.key_type == 'test' %}
|
||||
Test – pretends to send messages
|
||||
{% endif %}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
|
||||
{% block service_page_title %}
|
||||
Whitelist
|
||||
Guest list
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
@@ -16,7 +16,7 @@
|
||||
{% if form.email_addresses.errors or form.phone_numbers.errors %}
|
||||
{% call banner_wrapper(type='dangerous') %}
|
||||
<h1 class='banner-title'>
|
||||
There was a problem with your whitelist
|
||||
There was a problem with your guest list
|
||||
</h1>
|
||||
<p class="govuk-body">Fix these errors:</p>
|
||||
<ul>
|
||||
@@ -34,7 +34,7 @@
|
||||
{% endcall %}
|
||||
{% else %}
|
||||
{{ page_header(
|
||||
'Whitelist',
|
||||
'Guest list',
|
||||
back_link=url_for('main.api_integration', service_id=current_service.id)
|
||||
) }}
|
||||
{% endif %}
|
||||
@@ -42,7 +42,7 @@
|
||||
<p class="govuk-body">
|
||||
You and members of
|
||||
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.manage_users', service_id=current_service.id) }}">your team</a>
|
||||
are included in the whitelist automatically.
|
||||
are included in the guest list automatically.
|
||||
</p>
|
||||
|
||||
{% call form_wrapper() %}
|
||||
|
||||
@@ -208,18 +208,18 @@ def test_should_show_api_keys_page(
|
||||
'Live – sends to anyone '
|
||||
'Not available because your service is in trial mode'
|
||||
),
|
||||
'Team and whitelist – limits who you can send to',
|
||||
'Team and guest list – limits who you can send to',
|
||||
'Test – pretends to send messages',
|
||||
]),
|
||||
(False, False, [
|
||||
'Live – sends to anyone',
|
||||
'Team and whitelist – limits who you can send to',
|
||||
'Team and guest list – limits who you can send to',
|
||||
'Test – pretends to send messages',
|
||||
]),
|
||||
(False, True, [
|
||||
'Live – sends to anyone',
|
||||
(
|
||||
'Team and whitelist – limits who you can send to '
|
||||
'Team and guest list – limits who you can send to '
|
||||
'Cannot be used to send letters'
|
||||
),
|
||||
'Test – pretends to send messages',
|
||||
@@ -468,7 +468,7 @@ def test_should_validate_whitelist_items(
|
||||
_expected_status=200,
|
||||
)
|
||||
|
||||
assert page.h1.string.strip() == 'There was a problem with your whitelist'
|
||||
assert page.h1.string.strip() == 'There was a problem with your guest list'
|
||||
jump_links = page.select('.banner-dangerous a')
|
||||
|
||||
assert jump_links[0].string.strip() == 'Enter valid email addresses'
|
||||
|
||||
Reference in New Issue
Block a user