darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 17:45:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Addressing most of the low-lift items from the Notify content audit (#491)

Browse Source
This commit is contained in:
Jonathan Bobel
2023-05-08 10:49:30 -04:00
committed by GitHub
parent 8f76a9bb17
commit 68e94dd650
32 changed files with 441 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/error_pages/5xx.html
View File

@@ -93,7 +93,7 @@
<h2 class="govuk-visually-hidden">Support links</h2> <h2 class="govuk-visually-hidden">Support links</h2>
<div class="govuk-footer__meta-custom"> <div class="govuk-footer__meta-custom">
Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
class="govuk-footer__link">Technology Transformation Service</a> class="govuk-footer__link">Technology Transformation Services</a>
</div> </div>
<svg role="presentation" focusable="false" class="govuk-footer__licence-logo" <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"

22
app/formatters.py
View File

@@ -226,7 +226,7 @@ def format_notification_status(status, template_type):
'sending': 'Sending', 'sending': 'Sending',
'created': 'Sending', 'created': 'Sending',
'pending': 'Sending', 'pending': 'Sending',
'sent': 'Sent to an international number' 'sent': 'Sent'
}, },
}[template_type].get(status, status) }[template_type].get(status, status)
@@ -239,16 +239,16 @@ def format_notification_status_as_time(status, created, updated):
def format_notification_status_as_field_status(status, notification_type): def format_notification_status_as_field_status(status, notification_type):
return { return {
'failed': 'error', 'failed': 'error',
'technical-failure': 'error', 'technical-failure': 'error',
'temporary-failure': 'error', 'temporary-failure': 'error',
'permanent-failure': 'error', 'permanent-failure': 'error',
'delivered': None, 'delivered': None,
'sent': 'sent-international' if notification_type == 'sms' else None, 'sent': 'sent-international' if notification_type == 'sms' else None,
'sending': 'default', 'sending': 'default',
'created': 'default', 'created': 'default',
'pending': 'default', 'pending': 'default',
}.get(status, 'error') }.get(status, 'error')
def format_notification_status_as_url(status, notification_type): def format_notification_status_as_url(status, notification_type):

2
app/main/views/add_service.py
View File

@@ -35,7 +35,7 @@ def _create_example_template(service_id):
example_sms_template = service_api_client.create_service_template( example_sms_template = service_api_client.create_service_template(
'Example text message template', 'Example text message template',
'sms', 'sms',
'Hi, I’m trying out U.S. Notify. Today is ((day of week)) and my favourite color is ((color)).', 'Hi, I’m trying out U.S. Notify. Today is ((day of week)) and my favorite color is ((color)).',
service_id, service_id,
) )
return example_sms_template return example_sms_template

2
app/main/views/sign_in.py
View File

@@ -66,7 +66,7 @@ def sign_in():
flash(Markup( flash(Markup(
( (
f"The email address or password you entered is incorrect." f"The email address or password you entered is incorrect."
f"&ensp;<a href={password_reset_url} class='govuk-link'>Forgotten your password?</a>" f"&ensp;<a href={password_reset_url} class='govuk-link'>Forgot your password?</a>"
) )
)) ))

44
app/main/views/sub_navigation_dictionaries.py
View File

@@ -4,10 +4,10 @@ def features_nav():
"name": "Features", "name": "Features",
"link": "main.features", "link": "main.features",
"sub_navigation_items": [ "sub_navigation_items": [
{ # {
"name": "Emails", # "name": "Emails",
"link": "main.features_email", # "link": "main.features_email",
}, # },
{ {
"name": "Text messages", "name": "Text messages",
"link": "main.features_sms", "link": "main.features_sms",
@@ -50,23 +50,23 @@ def using_notify_nav():
{ {
"name": "Guidance", "name": "Guidance",
"link": "main.guidance_index", "link": "main.guidance_index",
"sub_navigation_items": [ # "sub_navigation_items": [
{ # {
"name": "Formatting", # "name": "Formatting",
"link": "main.edit_and_format_messages", # "link": "main.edit_and_format_messages",
}, # },
# { # {
# "name": "Branding", # "name": "Branding",
# "link": "main.branding_and_customisation", # "link": "main.branding_and_customisation",
# }, # },
# { # {
# "name": "Send files by email", # "name": "Send files by email",
# "link": "main.send_files_by_email", # "link": "main.send_files_by_email",
# }, # },
] # ]
# {
# "name": "API documentation",
# "link": "main.documentation",
# },
}, },
# {
# "name": "API documentation",
# "link": "main.documentation",
# },
] ]

19
app/templates/admin_template.html
View File

@@ -51,11 +51,6 @@
"text": "Support", "text": "Support",
"active": header_navigation.is_selected('support') "active": header_navigation.is_selected('support')
}, },
{
"href": url_for('main.documentation'),
"text": "Documentation",
"active": header_navigation.is_selected('documentation')
},
{ {
"href": url_for('main.user_profile'), "href": url_for('main.user_profile'),
"text": current_user.name, "text": current_user.name,
@@ -78,11 +73,6 @@
"text": "Support", "text": "Support",
"active": header_navigation.is_selected('support') "active": header_navigation.is_selected('support')
}, },
{
"href": url_for('main.documentation'),
"text": "Documentation",
"active": header_navigation.is_selected('documentation')
},
{ {
"href": url_for('main.user_profile'), "href": url_for('main.user_profile'),
"text": current_user.name, "text": current_user.name,
@@ -111,11 +101,6 @@
"text": "Pricing", "text": "Pricing",
"active": header_navigation.is_selected('pricing') "active": header_navigation.is_selected('pricing')
}, },
{
"href": url_for('main.documentation'),
"text": "Documentation",
"active": header_navigation.is_selected('documentation')
},
{ {
"href": url_for('main.sign_in'), "href": url_for('main.sign_in'),
"text": "Sign in", "text": "Sign in",
@@ -137,9 +122,9 @@
{% if current_service and current_service.research_mode %} {% if current_service and current_service.research_mode %}
{% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Service</a><span id="research-mode" class="research-mode">research mode</span>' %} {% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Services</a><span id="research-mode" class="research-mode">research mode</span>' %}
{% else %} {% else %}
{% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Service</a>' %} {% set meta_suffix = 'Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" class="govuk-footer__link">Technology Transformation Services</a>' %}
{% endif %} {% endif %}
{{ govukFooter({ {{ govukFooter({

151
app/templates/views/cookies.html Normal file
View File

@@ -0,0 +1,151 @@
{% extends "withoutnav_template.html" %}
{% from "components/banner.html" import banner %}
{% block per_page_title %}
Cookies
{% endblock %}
{% block cookie_message %}{% endblock %}
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="cookie-settings__confirmation banner banner-with-tick" data-cookie-confirmation="true" role="group" tabindex="-1">
<h2 class="banner-title">Your cookie settings were saved</h2>
<a class="govuk_link cookie-settings__prev-page govuk-!-margin-top-1" href="#" data-module="track-click" data-track-category="cookieSettings" data-track-action="Back to previous page">
Go back to the page you were looking at
</a>
</div>
<h1 class="heading-large">Cookies</h1>
<p class="summary">
Cookies are small files saved on your phone, tablet, or computer when you visit a website.
</p>
<p class="govuk-body">We use cookies to make U.S. Notify work and collect information about how you use our service.</p>
<h2 class="heading-medium" id="essential-cookies">Essential cookies</h2>
<p class="govuk-body">
Essential cookies keep your information secure while you use Notify. We do not need to ask permission to use them.
</p>
<table>
<caption class="govuk-visually-hidden">Essential cookies</caption>
<thead>
<tr>
<th>Name</th>
<th>Purpose</th>
<th>Expires</th>
</tr>
</thead>
<tbody>
<tr>
<td>
notify_admin_session
</td>
<td width="50%">
Used to keep you signed in
</td>
<td>
20 hours
</td>
</tr>
<tr>
<td>
cookie_policy
</td>
<td width="50%">
Saves your cookie consent settings
</td>
<td>
1 year
</td>
</tr>
</tbody>
</table>
<h2 class="heading-medium" id="analytics-cookies">Analytics cookies (optional)</h2>
<p class="govuk-body">
With your permission, we use Google Analytics to collect data about how you use Notify. This information helps us to improve our service.
</p>
<p class="govuk-body">
Google is not allowed to use or share our analytics data with anyone.
</p>
<p class="govuk-body">
Google Analytics stores anonymized information about:
</p>
<ul class="govuk-list govuk-list--bullet">
<li>how you got to U.S. Notify</li>
<li>the pages you visit on Notify and how long you spend on them</li>
<li>any errors you see while using Notify</li>
</ul>
<table>
<caption class="govuk-visually-hidden">Google Analytics cookies</caption>
<thead>
<tr>
<th>Name</th>
<th>Purpose</th>
<th>Expires</th>
</tr>
</thead>
<tbody>
<tr>
<td>
_ga
</td>
<td width="50%">
Checks if you’ve visited Notify before. This helps us count how many people visit our site.
</td>
<td>
2 years
</td>
</tr>
<tr>
<td>
_gid
</td>
<td width="50%">
Checks if you’ve visited Notify before. This helps us count how many people visit our site.
</td>
<td>
24 hours
</td>
</tr>
</tbody>
</table>
<div class="cookie-settings__no-js">
<h2 class="govuk-heading-s govuk-!-margin-top-6">Do you want to accept analytics cookies?</h2>
<p class="govuk-body">We use Javascript to set our analytics cookies. Unfortunately Javascript is not running on your browser, so you cannot change your settings. You can try:</p>
<ul class="govuk-list govuk-list--bullet">
<li>reloading the page</li>
<li>turning on Javascript in your browser</li>
</ul>
</div>
<div class="cookie-settings__form-wrapper">
<form data-module="cookie-settings">
<div class="govuk-form-group govuk-!-margin-top-6">
<fieldset class="govuk-fieldset" aria-describedby="changed-name-hint">
<legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
Do you want to accept analytics cookies?
</legend>
<div class="govuk-radios govuk-radios--inline">
<div class="govuk-radios__item">
<input class="govuk-radios__input" id="cookies-analytics-yes" name="cookies-analytics" type="radio" value="on">
<label class="govuk-label govuk-radios__label" for="cookies-analytics-yes">
Yes
</label>
</div>
<div class="govuk-radios__item">
<input class="govuk-radios__input" id="cookies-analytics-no" name="cookies-analytics" type="radio" value="off">
<label class="govuk-label govuk-radios__label" for="cookies-analytics-no">
No
</label>
</div>
</div>
</fieldset>
</div>
<button class="govuk-button" type="submit">Save cookie settings</button>
</form>
</div>
</div>
</div>
{% endblock %}

2
app/templates/views/dashboard/dashboard.html
View File

@@ -20,7 +20,7 @@
{{ ajax_block(partials, updates_url, 'upcoming') }} {{ ajax_block(partials, updates_url, 'upcoming') }}
<h2 class="heading-medium"> <h2 class="heading-medium">
In the last 7 days In the last seven days
</h2> </h2>
{{ ajax_block(partials, updates_url, 'inbox') }} {{ ajax_block(partials, updates_url, 'inbox') }}

4
app/templates/views/features.html
View File

@@ -9,7 +9,7 @@
{% block content_column_content %} {% block content_column_content %}
<h1 class="heading-large">Features</h1> <h1 class="heading-large">Features</h1>
<p class="govuk-body">If you work for the federal government, you can use U.S. Notify to keep your users updated.</p> <p class="govuk-body">If you work for the government, you can use U.S. Notify to keep your users updated.</p>
<p class="govuk-body">Notify makes it easy to create, customize, and send <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_sms') }}">text messages</a>.</p> <p class="govuk-body">Notify makes it easy to create, customize, and send <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_sms') }}">text messages</a>.</p>
<!-- <ul class="list list-bullet"> <!-- <ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_email') }}">emails</a></li> <li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.features_email') }}">emails</a></li>
@@ -40,7 +40,7 @@
<p class="govuk-body">Read more about the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.message_status') }}">delivery status</a> of your messages.</p> <p class="govuk-body">Read more about the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.message_status') }}">delivery status</a> of your messages.</p>
<h2 class="heading-medium" id="permissions">Permissions</h2> <h2 class="heading-medium" id="permissions">Permissions</h2>
<p class="govuk-body">Control which members of your team can see, create, edit and send messages.</p> <p class="govuk-body">Control which members of your team can see, create, edit, and send messages.</p>
<p class="govuk-body">Notify lets you:</p> <p class="govuk-body">Notify lets you:</p>
<ul class="list list-bullet"> <ul class="list list-bullet">
<li>set different permission levels for each team member</li> <li>set different permission levels for each team member</li>

4
app/templates/views/forgot-password.html
View File

@@ -3,14 +3,14 @@
{% from "components/form.html" import form_wrapper %} {% from "components/form.html" import form_wrapper %}
{% block per_page_title %} {% block per_page_title %}
Forgotten your password? Forgot your password?
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="govuk-grid-column-two-thirds">
<h1 class="heading-large">Forgotten your password?</h1> <h1 class="heading-large">Forgot your password?</h1>
<p class="govuk-body">We’ll send you an email to create a new password.</p> <p class="govuk-body">We’ll send you an email to create a new password.</p>

2
app/templates/views/get-started.html
View File

@@ -55,7 +55,7 @@
{% else %} {% else %}
<p class="govuk-body">You should <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p> <p class="govuk-body">You should <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
{% endif %} {% endif %}
<p class="govuk-body">Check <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.how_to_pay') }}">how to pay</a> if you’re planning to exceed the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing', _anchor='text-messages') }}">free text message allowance</a>.</p> <!-- <p class="govuk-body">Check <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.how_to_pay') }}">how to pay</a> if you’re planning to exceed the <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.pricing', _anchor='text-messages') }}">free text message allowance</a>.</p> -->
</li> </li>
</ol> </ol>

112
app/templates/views/guidance/index.html
View File

@@ -1,6 +1,7 @@
{% extends "content_template.html" %} {% extends "content_template.html" %}
{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %} {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
{% from "components/sub-navigation.html" import sub_navigation %} {% from "components/sub-navigation.html" import sub_navigation %}
{% from "components/service-link.html" import service_link %}
{% block per_page_title %} {% block per_page_title %}
Guidance Guidance
@@ -15,19 +16,110 @@
<p class="govuk-body">It explains how to:</p> <p class="govuk-body">It explains how to:</p>
<ul class="list list-bullet"> <ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.edit_and_format_messages') }}">edit and format messages</a></li> <li><a class="govuk-link govuk-link--no-visited-state" href="#editandformat">edit and format messages</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation') }}">add branding and customization</a></li> <li><a class="govuk-link govuk-link--no-visited-state" href="#branding">add branding and customization</a></li>
<!-- <li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_files_by_email') }}">send files by email</a></li> --> <!-- <li><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.send_files_by_email') }}">send files by email</a></li> -->
</ul> </ul>
<!-- <h2 class="heading-medium">More information</h2> <h2 class="heading-medium" id="#formatting">Edit and format messages</h2>
<p class="govuk-body">The UK Notify Service Manual has additional advice on:</p> <p class="govuk-body">This section explains how to:</p>
<ul class="list list-bullet"> <ul class="list list-bullet">
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages">planning and writing text messages and emails</a></li> <li><a class="govuk-link govuk-link--no-visited-state" href="#formatting">format your content</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/technology/how-to-email-your-users">sending emails from your service domain</a></li> <li><a class="govuk-link govuk-link--no-visited-state" href="#links">add links</a></li>
<li><a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/technology/sending-text-messages-securely">sending text messages securely</a></li> <li><a class="govuk-link govuk-link--no-visited-state" href="#personalised-content">personalize your content</a></li>
</ul> --> <li><a class="govuk-link govuk-link--no-visited-state" href="#optional-content">add optional content</a></li>
</ul>
<h3 class="heading-small" id="formatting">Format your content</h3>
<p class="govuk-body">You can see a list of formatting instructions on the edit template page:</p>
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
</ol>
<h3 class="heading-small" id="links">Add links</h3>
<p class="govuk-body">When composing a text message, write URLs in full and Notify will convert them into links for you.
</p>
<p class="govuk-body">You cannot convert text into a link.
<!-- Research shows that people like to check a URL looks genuine before clicking the link in an email. This is hard to do if the URL is hidden behind clickable link text.-->
</p>
<p class="govuk-body">We do not recommend using a third-party link shortening service because:</p>
<ul class="list list-bullet">
<li>your users cannot see where the link will take them</li>
<li>your link might stop working if there’s a service outage</li>
<li>you can no longer control where the redirect goes</li>
</ul>
<h3 class="heading-small" id="personalised-content">Personalize your content</h3>
<p class="govuk-body">To personalize the content of your messages, add a placeholder to the template.</p>
<p class="govuk-body">Placeholders are filled in with details, like a name or reference number, each time you send a
message.</p>
<p class="govuk-body">To add a placeholder to the template:</p>
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is
((ref&nbsp;number)).</li>
<li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
</ol>
<p class="govuk-body">When you send a message you can either:</p>
<ul class="list list-bullet">
<li>manually fill in the placeholders yourself</li>
<li>upload a list of personal details and let Notify do it for you</li>
</ul>
<p class="govuk-body">If you upload a list, the column names need to match the placeholders in your template.</p>
<h3 class="heading-small" id="optional-content">Add optional content</h3>
<p class="govuk-body">To add optional content to your messages:</p>
<ol class="list list-number">
<li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
<li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
<li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people
who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
<li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
</ol>
<p class="govuk-body">For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You
can either:</p>
<ul class="list list-bullet">
<li>do this yourself</li>
<li>upload a list of personal details and let Notify do it for you</li>
</ul>
<p class="govuk-body">If you upload a list, the column names need to match the optional content in your template.</p>
<h2 class="heading-medium" id="branding">Branding and customization</h2>
<h3 class="heading-small">Change the text message sender</h3>
<p class="govuk-body">The text message sender tells your users who the message is from.</p>
<p class="govuk-body">To change the text message sender from the default of ‘U.S. Notify’:</p>
<ol class="list list-number">
<li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{
service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
<li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message
senders</b> row.</li>
<li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message
sender</b>.</li>
</ol>
{% endblock %} {% endblock %}

10
app/templates/views/message-status.html
View File

@@ -9,8 +9,8 @@
<h1 class="heading-large">Delivery status</h1> <h1 class="heading-large">Delivery status</h1>
<p class="govuk-body">Notify’s real-time dashboard lets you check the status of any message, to see when it was delivered.</p> <p class="govuk-body">Notify’s real-time dashboard lets you check the status of any message.</p>
<p class="govuk-body">For <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for("main.security") }}">security</a>, this information is only available for 7 days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p> <p class="govuk-body">For <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for("main.security") }}">security</a>, this information is only available for seven days after a message has been sent. You can download a report, including a list of sent messages, for your own records.</p>
<p class="govuk-body">This page describes the statuses you’ll see when you’re signed in to Notify.</p> <p class="govuk-body">This page describes the statuses you’ll see when you’re signed in to Notify.</p>
<!-- <p class="govuk-body">If you’re using the Notify API, read our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">documentation</a> for a list of API statuses.<p class="govuk-body"> <!-- <p class="govuk-body">If you’re using the Notify API, read our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">documentation</a> for a list of API statuses.<p class="govuk-body">
@@ -24,7 +24,7 @@
) %} ) %}
{% for message_status, description in [ {% for message_status, description in [
('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'), ('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'),
('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'), ('Delivered', 'The message was successfully delivered. Notify cannot tell you if a user has opened or read a message.'),
('Email address does not exist', 'The provider could not deliver the message because the email address was wrong. You should remove these email addresses from your database.'), ('Email address does not exist', 'The provider could not deliver the message because the email address was wrong. You should remove these email addresses from your database.'),
('Inbox not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s inbox is full or their anti-spam filter rejects your email. <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages#protect-your-users-from-spam-and-phishing">Check your content does not look like spam</a> before you try to send the message again.' | safe), ('Inbox not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s inbox is full or their anti-spam filter rejects your email. <a class="govuk-link govuk-link--no-visited-state" href="https://www.gov.uk/service-manual/design/sending-emails-and-text-messages#protect-your-users-from-spam-and-phishing">Check your content does not look like spam</a> before you try to send the message again.' | safe),
('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again.'), ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again.'),
@@ -53,8 +53,8 @@
) %} ) %}
{% for message_status, description in [ {% for message_status, description in [
('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'), ('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'),
('Sent to an international number', 'The mobile networks in some countries do not provide any more delivery information.'), ('Sent', 'The mobile networks may not provide any more delivery information.'),
('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'), ('Delivered', 'The message was successfully delivered. Notify cannot tell you if a user has opened or read a message.'),
('Not delivered', ('The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. If you’re sure that these phone numbers are correct, you should <a class="govuk-link govuk-link--no-visited-state" href="' + url_for(".support") + '">contact us</a>. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.')|safe), ('Not delivered', ('The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. If you’re sure that these phone numbers are correct, you should <a class="govuk-link govuk-link--no-visited-state" href="' + url_for(".support") + '">contact us</a>. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.')|safe),
('Phone not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s phone is off, has no signal, or their text message inbox is full. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'), ('Phone not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s phone is off, has no signal, or their text message inbox is full. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'),
('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'), ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'),

4
app/templates/views/pricing/index.html
View File

@@ -15,7 +15,7 @@
{{ content_metadata( {{ content_metadata(
data={ data={
"Last updated": "27 Feb 2023" "Last updated": "Feb 27, 2023"
} }
) }} ) }}
@@ -190,7 +190,7 @@
</div> </div>
<h3 class="heading-small" id="international-numbers">Sending text messages to international numbers</h3> <h3 class="heading-small" id="international-numbers">Sending text messages to international numbers</h3>
<p class="govuk-body">It might cost more to send text messages to international numbers than US ones, depending on the country.</p> <p class="govuk-body">It might cost more to send text messages to international numbers than U.S. ones, depending on the country.</p>
<!-- {% set smsIntRates %} <!-- {% set smsIntRates %}
{{ live_search(target_selector='#international-pricing .table-row', show=True, form=search_form, label='Search by country name or code') }} {{ live_search(target_selector='#international-pricing .table-row', show=True, form=search_form, label='Search by country name or code') }}

10
app/templates/views/roadmap.html
View File

@@ -10,12 +10,12 @@
<h1 class="heading-large">Roadmap</h1> <h1 class="heading-large">Roadmap</h1>
{{ content_metadata( <!-- {{ content_metadata(
data={ data={
"Last updated": "1 November 2022", "Last updated": "1 November 2022",
"Next review due on": "15 December 2022" "Next review due on": "15 December 2022"
} }
) }} ) }} -->
<p class="govuk-body">The Notify roadmap shows what we’re working on and what we're planning to do next.</p> <p class="govuk-body">The Notify roadmap shows what we’re working on and what we're planning to do next.</p>
@@ -42,7 +42,7 @@
<li>Bulk, individually customizable one-way SMS sending via web UI</li> <li>Bulk, individually customizable one-way SMS sending via web UI</li>
<li>Organization permissions settings for various team members to edit/send</li> <li>Organization permissions settings for various team members to edit/send</li>
<li>Reusable message templates</li> <li>Reusable message templates</li>
<li>7-day records deletion</li> <li>Seven-day records deletion</li>
<li>Message send/failure analytics</li> <li>Message send/failure analytics</li>
</ul> </ul>
@@ -70,7 +70,7 @@
<h3 class="heading-small" id="later">Later</h3> <h3 class="heading-small" id="later">Later</h3>
<p class="govuk-body">In the future, we may decide to expand beyond SMS, or to offer the service government-wide</p> <p class="govuk-body">In the future, we may decide to expand beyond SMS, or to offer the service government-wide.</p>
<p class="govuk-body">Features to be considered during this stage:</p> <p class="govuk-body">Features to be considered during this stage:</p>
@@ -80,7 +80,7 @@
<li>Multiple-level decision two-way messaging (greater than one layer decision-tree)</li> <li>Multiple-level decision two-way messaging (greater than one layer decision-tree)</li>
<li>Open-text reply two-way messaging (rather than reply yes or no, 1 or 2, etc.)</li> <li>Open-text reply two-way messaging (rather than reply yes or no, 1 or 2, etc.)</li>
<li>Multilingual interface and content library options</li> <li>Multilingual interface and content library options</li>
<li>Recurring scheduled send (e.g. “Send each Monday for 3 weeks”)</li> <li>Recurring scheduled send (such as “Send each Monday for 3 weeks”)</li>
</ul> </ul>

2
app/templates/views/security.html
View File

@@ -21,7 +21,7 @@
<li>when it passes through the service</li> <li>when it passes through the service</li>
<li>when it’s stored on the service</li> <li>when it’s stored on the service</li>
</ul> </ul>
<p class="govuk-body">Any recipient data you upload is only held for 7 days.</p> <p class="govuk-body">Any recipient data you upload is only held for seven days.</p>
<!-- <p class="govuk-body">If you <a class="govuk-link govuk-link--no-visited-state" href="/features/email#send-files">send a file by email</a>, the file will be available for the recipient to download for 18 months.</p> --> <!-- <p class="govuk-body">If you <a class="govuk-link govuk-link--no-visited-state" href="/features/email#send-files">send a file by email</a>, the file will be available for the recipient to download for 18 months.</p> -->
<h2 class="heading-medium" id="technical-security">Technical security</h2> <h2 class="heading-medium" id="technical-security">Technical security</h2>

151
app/templates/views/service-settings.html
View File

@@ -46,6 +46,76 @@
) )
}} }}
{% endcall %} {% endcall %}
{% call row() %}
{{ text_field('Send text messages') }}
{{ boolean_field('sms' in current_service.permissions) }}
{{ edit_field(
'Change',
url_for(
'.service_set_channel',
service_id=current_service.id,
channel='sms'
),
permissions=['manage_service'],
suffix='your settings for sending text messages',
)}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Text message senders') }}
{% call field(status='default' if current_service.default_sms_sender == "None" else '') %}
{{ current_service.default_sms_sender | nl2br if current_service.default_sms_sender else 'None'}}
{% if current_service.count_sms_senders > 1 %}
<div class="hint">
{{ '…and %d more' | format(current_service.count_sms_senders - 1) }}
</div>
{% endif %}
{% endcall %}
{{ edit_field(
'Manage',
url_for('.service_sms_senders', service_id=current_service.id),
permissions=['manage_service','manage_api_keys'],
suffix='text message senders',
)
}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Start text messages with service name') }}
{{ boolean_field(current_service.prefix_sms) }}
{{ edit_field(
'Change',
url_for('.service_set_sms_prefix', service_id=current_service.id),
permissions=['manage_service'],
suffix='your settings for starting text messages with service name',
)
}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Send international text messages') }}
{{ boolean_field('international_sms' in current_service.permissions) }}
{{ edit_field(
'Change',
url_for('.service_set_international_sms', service_id=current_service.id),
permissions=['manage_service'],
suffix='your settings for sending international text messages',
)
}}
{% endcall %}
<!-- {% call settings_row(if_has_permission='sms') %}
{{ text_field('Receive text messages') }}
{{ boolean_field('inbound_sms' in current_service.permissions) }}
{{ edit_field(
'Change',
url_for('.service_set_inbound_sms', service_id=current_service.id),
permissions=['manage_service'],
suffix='your settings for receiving text messages',
)
}}
{% endcall %} -->
{% endcall %} {% endcall %}
<!-- {% call mapping_table( <!-- {% call mapping_table(
@@ -119,85 +189,6 @@
{% endcall %} --> {% endcall %} -->
{% call mapping_table(
caption='Text message settings',
field_headings=['Label', 'Value', 'Action'],
field_headings_visible=False,
caption_visible=True
) %}
{% call row() %}
{{ text_field('Send text messages') }}
{{ boolean_field('sms' in current_service.permissions) }}
{{ edit_field(
'Change',
url_for(
'.service_set_channel',
service_id=current_service.id,
channel='sms'
),
permissions=['manage_service'],
suffix='your settings for sending text messages',
)}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Text message senders') }}
{% call field(status='default' if current_service.default_sms_sender == "None" else '') %}
{{ current_service.default_sms_sender | nl2br if current_service.default_sms_sender else 'None'}}
{% if current_service.count_sms_senders > 1 %}
<div class="hint">
{{ '…and %d more' | format(current_service.count_sms_senders - 1) }}
</div>
{% endif %}
{% endcall %}
{{ edit_field(
'Manage',
url_for('.service_sms_senders', service_id=current_service.id),
permissions=['manage_service','manage_api_keys'],
suffix='text message senders',
)
}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Start text messages with service name') }}
{{ boolean_field(current_service.prefix_sms) }}
{{ edit_field(
'Change',
url_for('.service_set_sms_prefix', service_id=current_service.id),
permissions=['manage_service'],
suffix='your settings for starting text messages with service name',
)
}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Send international text messages') }}
{{ boolean_field('international_sms' in current_service.permissions) }}
{{ edit_field(
'Change',
url_for('.service_set_international_sms', service_id=current_service.id),
permissions=['manage_service'],
suffix='your settings for sending international text messages',
)
}}
{% endcall %}
{% call settings_row(if_has_permission='sms') %}
{{ text_field('Receive text messages') }}
{{ boolean_field('inbound_sms' in current_service.permissions) }}
{{ edit_field(
'Change',
url_for('.service_set_inbound_sms', service_id=current_service.id),
permissions=['manage_service'],
suffix='your settings for receiving text messages',
)
}}
{% endcall %}
{% endcall %}
</div> </div>
{% if current_service.trial_mode %} {% if current_service.trial_mode %}
@@ -206,7 +197,7 @@
<p class="govuk-body">You can only:</p> <p class="govuk-body">You can only:</p>
<ul class='list list-bullet'> <ul class='list list-bullet'>
<li>send {{ current_service.message_limit }} text messages and emails per day</li> <li>send {{ current_service.message_limit }} text messages per day</li>
<li>send messages to yourself and other people in your team</li> <li>send messages to yourself and other people in your team</li>
</ul> </ul>

6
app/templates/views/service-settings/name-local.html
View File

@@ -27,11 +27,11 @@
<div class="form-group"> <div class="form-group">
{% if current_service.prefix_sms %} {% if current_service.prefix_sms %}
<p class="govuk-body">Users will see your service name:</p> <p class="govuk-body">Users will see your service name at the start of every text message</p>
<ul class="govuk-list govuk-list--bullet"> <!-- <ul class="govuk-list govuk-list--bullet">
<li>at the start of every text message</li> <li>at the start of every text message</li>
<li>as your email sender name</li> <li>as your email sender name</li>
</ul> </ul> -->
{% else %} {% else %}
<p class="govuk-body">Users will see your service name as your email sender name.</p> <p class="govuk-body">Users will see your service name as your email sender name.</p>
{% endif %} {% endif %}

4
app/templates/views/service-settings/set-sms.html
View File

@@ -22,10 +22,10 @@
{{ '{:,}'.format(current_service.free_sms_fragment_limit) }} text messages each {{ '{:,}'.format(current_service.free_sms_fragment_limit) }} text messages each
financial year. financial year.
</p> </p>
<p class="govuk-body"> <!-- <p class="govuk-body">
It costs 1.58 pence (plus VAT) for each text message you send It costs 1.58 pence (plus VAT) for each text message you send
after your free allowance. after your free allowance.
</p> </p> -->
<p class="govuk-body"> <p class="govuk-body">
See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(".pricing") }}">pricing</a> for more details. See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(".pricing") }}">pricing</a> for more details.
</p> </p>

9
app/templates/views/signedout.html
View File

@@ -2,7 +2,7 @@
{% from "components/uk_components/button/macro.njk" import govukButton %} {% from "components/uk_components/button/macro.njk" import govukButton %}
{% block meta %} {% block meta %}
<meta name="description" content="U.S. Notify lets you send text messages and email to your users. Try it now if you work in federal, state or local government."> <meta name="description" content="U.S. Notify lets you send text messages to your users. Try it now if you work in federal, state, or local government.">
{% endblock %} {% endblock %}
{% block pageTitle %} {% block pageTitle %}
@@ -19,10 +19,10 @@
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds"> <div class="govuk-grid-column-two-thirds">
<h1> <h1>
Send text messages and email to your users Send text messages to your users
</h1> </h1>
<p class="govuk-body"> <p class="govuk-body">
Try U.S. Notify now if you work in federal, state or local government. Try U.S. Notify now if you work in federal, state, or local government.
</p> </p>
<div class="button-container"> <div class="button-container">
{{ govukButton({ {{ govukButton({
@@ -87,8 +87,7 @@
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-one-half"> <div class="govuk-grid-column-one-half">
<p class="govuk-body"> <p class="govuk-body">
Upload a spreadsheet of email&nbsp;addresses or Upload a spreadsheet of phone&nbsp;numbers and Notify sends the messages.
phone&nbsp;numbers and Notify sends the messages.
</p> </p>
<img <img
src="{{ asset_url('images/product/03-spreadsheet.svg') }}" src="{{ asset_url('images/product/03-spreadsheet.svg') }}"

2
app/templates/views/signin.html
View File

@@ -37,7 +37,7 @@
{% call form_wrapper(autocomplete=True) %} {% call form_wrapper(autocomplete=True) %}
{{ form.email_address(param_extensions={"autocomplete": "email"}) }} {{ form.email_address(param_extensions={"autocomplete": "email"}) }}
{{ form.password(param_extensions={"autocomplete": "current-password"}) }} {{ form.password(param_extensions={"autocomplete": "current-password"}) }}
{{ page_footer("Continue", secondary_link=password_reset_url, secondary_link_text="Forgotten your password?") }} {{ page_footer("Continue", secondary_link=password_reset_url, secondary_link_text="Forgot your password?") }}
{% endcall %} {% endcall %}
</div> </div>
</div> </div>

2
app/templates/views/support/index.html
View File

@@ -12,7 +12,7 @@
<p class="govuk-body">We are available at <a class="govuk-link govuk-link--no-visited-state"" href="mailto:notify-support@gsa.gov">notify-support@gsa.gov</a>.</p> <p class="govuk-body">We are available at <a class="govuk-link govuk-link--no-visited-state"" href="mailto:notify-support@gsa.gov">notify-support@gsa.gov</a>.</p>
<p class="govuk-body">You can expect a response within 1 business day.</p> <p class="govuk-body">You can expect a response within one business day.</p>
<!-- <p class="govuk-body">U.S. Notify provides 24-hour online support.</p> --> <!-- <p class="govuk-body">U.S. Notify provides 24-hour online support.</p> -->

2
app/templates/views/terms-of-use.html
View File

@@ -16,7 +16,7 @@
<h2 class="heading-medium" id="when-using-notify">When using Notify</h2> <h2 class="heading-medium" id="when-using-notify">When using Notify</h2>
<p class="govuk-body">You must:</p> <p class="govuk-body">You must:</p>
<ul class="list list-bullet"> <ul class="list list-bullet">
<li>complete your organization’s information assurance process (you do not need to include Notify or our delivery partners, we’ve already done that)</li> <li>ensure your organization has reviewed and approved any messages you will send</li>
<li>tell us immediately if you have any security breaches</li> <li>tell us immediately if you have any security breaches</li>
<li>keep your API keys secure</li> <li>keep your API keys secure</li>
<li>get the right levels of consent (to send messages and to use data)</li> <li>get the right levels of consent (to send messages and to use data)</li>

2
app/templates/views/trial-mode.html
View File

@@ -11,7 +11,7 @@
<p class="govuk-body">When you add a new service it will start in trial mode. This lets you try out U.S. Notify, with a few restrictions.</p> <p class="govuk-body">When you add a new service it will start in trial mode. This lets you try out U.S. Notify, with a few restrictions.</p>
<p class="govuk-body">While your service is in trial mode you can only:</p> <p class="govuk-body">While your service is in trial mode you can only:</p>
<ul class="list list-bullet"> <ul class="list list-bullet">
<li>send 50 text messages and emails per day</li> <li>send 50 text messages per day</li>
<li>send messages to yourself and other people in your team</li> <li>send messages to yourself and other people in your team</li>
</ul> </ul>

2
paas-failwhale/index.html
View File

@@ -106,7 +106,7 @@
<h2 class="govuk-visually-hidden">Support links</h2> <h2 class="govuk-visually-hidden">Support links</h2>
<div class="govuk-footer__meta-custom"> <div class="govuk-footer__meta-custom">
Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions" Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
class="govuk-footer__link">Technology Transformation Service</a> class="govuk-footer__link">Technology Transformation Services</a>
</div> </div>
<svg role="presentation" focusable="false" class="govuk-footer__licence-logo" <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"

80
tests/app/main/views/service_settings/test_service_settings.py
View File

@@ -56,38 +56,34 @@ def mock_get_service_settings_page_common(
'Label Value Action', 'Label Value Action',
'Service name Test Service Change service name', 'Service name Test Service Change service name',
'Sign-in method Text message code Change sign-in method', 'Sign-in method Text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages',
# 'Label Value Action', # 'Label Value Action',
# 'Send emails On Change your settings for sending emails', # 'Send emails On Change your settings for sending emails',
# 'Reply-to email addresses Not set Manage reply-to email addresses', # 'Reply-to email addresses Not set Manage reply-to email addresses',
# 'Email branding GOV.UK Change email branding', # 'Email branding GOV.UK Change email branding',
# 'Send files by email contact_us@gsa.gov Manage sending files by email', # 'Send files by email contact_us@gsa.gov Manage sending files by email',
# 'Receive text messages Off Change your settings for receiving text messages',
'Label Value Action',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages',
'Receive text messages Off Change your settings for receiving text messages',
]), ]),
(create_platform_admin_user(), [ (create_platform_admin_user(), [
'Label Value Action', 'Label Value Action',
'Service name Test Service Change service name', 'Service name Test Service Change service name',
'Sign-in method Text message code Change sign-in method', 'Sign-in method Text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages',
# 'Label Value Action', # 'Label Value Action',
# 'Send emails On Change your settings for sending emails', # 'Send emails On Change your settings for sending emails',
# 'Reply-to email addresses Not set Manage reply-to email addresses', # 'Reply-to email addresses Not set Manage reply-to email addresses',
# 'Email branding GOV.UK Change email branding', # 'Email branding GOV.UK Change email branding',
# 'Send files by email contact_us@gsa.gov Manage sending files by email', # 'Send files by email contact_us@gsa.gov Manage sending files by email',
# 'Receive text messages Off Change your settings for receiving text messages',
'Label Value Action',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages',
'Receive text messages Off Change your settings for receiving text messages',
'Label Value Action', 'Label Value Action',
'Live Off Change service status', 'Live Off Change service status',
@@ -216,42 +212,38 @@ def test_send_files_by_email_row_on_settings_page(
@pytest.mark.parametrize('permissions, expected_rows', [ @pytest.mark.parametrize('permissions, expected_rows', [
(['email', 'sms', 'inbound_sms', 'international_sms'], [ (['email', 'sms', 'international_sms'], [
'Service name service one Change service name', 'Service name service one Change service name',
'Sign-in method Text message code Change sign-in method', 'Sign-in method Text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages On Change your settings for sending international text messages',
# 'Label Value Action', # 'Label Value Action',
# 'Send emails On Change your settings for sending emails', # 'Send emails On Change your settings for sending emails',
# 'Reply-to email addresses test@example.com Manage reply-to email addresses', # 'Reply-to email addresses test@example.com Manage reply-to email addresses',
# 'Email branding Organisation name Change email branding', # 'Email branding Organisation name Change email branding',
# 'Send files by email Not set up Manage sending files by email', # 'Send files by email Not set up Manage sending files by email',
# 'Receive text messages On Change your settings for receiving text messages',
'Label Value Action',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages On Change your settings for sending international text messages',
'Receive text messages On Change your settings for receiving text messages',
]), ]),
(['email', 'sms', 'email_auth'], [ (['email', 'sms', 'email_auth'], [
'Service name service one Change service name', 'Service name service one Change service name',
'Sign-in method Email link or text message code Change sign-in method', 'Sign-in method Email link or text message code Change sign-in method',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages',
# 'Label Value Action', # 'Label Value Action',
# 'Send emails On Change your settings for sending emails', # 'Send emails On Change your settings for sending emails',
# 'Reply-to email addresses test@example.com Manage reply-to email addresses', # 'Reply-to email addresses test@example.com Manage reply-to email addresses',
# 'Email branding Organisation name Change email branding', # 'Email branding Organisation name Change email branding',
# 'Send files by email Not set up Manage sending files by email', # 'Send files by email Not set up Manage sending files by email'
# 'Receive text messages Off Change your settings for receiving text messages',
'Label Value Action',
'Send text messages On Change your settings for sending text messages',
'Text message senders GOVUK Manage text message senders',
'Start text messages with service name On Change your settings for starting text messages with service name',
'Send international text messages Off Change your settings for sending international text messages',
'Receive text messages Off Change your settings for receiving text messages',
]), ]),
]) ])
@@ -3538,20 +3530,20 @@ def test_send_files_by_email_contact_details_does_not_update_invalid_contact_det
@pytest.mark.parametrize('endpoint, permissions, expected_p', [ @pytest.mark.parametrize('endpoint, permissions, expected_p', [
( # (
'main.service_set_inbound_sms', # 'main.service_set_inbound_sms',
['sms'], # ['sms'],
( # (
'Contact us if you want to be able to receive text messages from your users.' # 'Contact us if you want to be able to receive text messages from your users.'
) # )
), # ),
( # (
'main.service_set_inbound_sms', # 'main.service_set_inbound_sms',
['sms', 'inbound_sms'], # ['sms', 'inbound_sms'],
( # (
'Your service can receive text messages sent to 2028675301.' # 'Your service can receive text messages sent to 2028675301.'
) # )
), # ),
( (
'main.service_set_auth_type', 'main.service_set_auth_type',
[], [],

2
tests/app/main/views/test_add_service.py
View File

@@ -142,7 +142,7 @@ def test_should_add_service_and_redirect_to_tour_when_no_services(
'sms', 'sms',
( (
"Hi, I’m trying out U.S. Notify. Today is " "Hi, I’m trying out U.S. Notify. Today is "
"((day of week)) and my favourite color is ((color))." "((day of week)) and my favorite color is ((color))."
), ),
101, 101,
) )

2
tests/app/main/views/test_dashboard.py
View File

@@ -458,7 +458,7 @@ def test_should_show_recent_templates_on_dashboard(
mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=7) mock_template_stats.assert_called_once_with(SERVICE_ONE_ID, limit_days=7)
headers = [header.text.strip() for header in page.find_all('h2') + page.find_all('h1')] headers = [header.text.strip() for header in page.find_all('h2') + page.find_all('h1')]
assert 'In the last 7 days' in headers assert 'In the last seven days' in headers
table_rows = page.find_all('tbody')[0].find_all('tr') table_rows = page.find_all('tbody')[0].find_all('tr')

6
tests/app/main/views/test_index.py
View File

@@ -16,7 +16,7 @@ def test_non_logged_in_user_can_see_homepage(
page = client_request.get('main.index', _test_page_title=False) page = client_request.get('main.index', _test_page_title=False)
assert page.h1.text.strip() == ( assert page.h1.text.strip() == (
'Send text messages and email to your users' 'Send text messages to your users'
) )
assert page.select_one('a[role=button][draggable=false]')['href'] == url_for( assert page.select_one('a[role=button][draggable=false]')['href'] == url_for(
@@ -24,8 +24,8 @@ def test_non_logged_in_user_can_see_homepage(
) )
assert page.select_one('meta[name=description]')['content'].strip() == ( assert page.select_one('meta[name=description]')['content'].strip() == (
'U.S. Notify lets you send text messages and email ' 'U.S. Notify lets you send text messages '
'to your users. Try it now if you work in federal, state or local government.' 'to your users. Try it now if you work in federal, state, or local government.'
) )
assert normalize_spaces(page.select_one('#whos-using-notify').text) == ( assert normalize_spaces(page.select_one('#whos-using-notify').text) == (

4
tests/app/main/views/test_sign_in.py
View File

@@ -21,7 +21,7 @@ def test_render_sign_in_template_for_new_user(
assert page.select_one('#password')['autocomplete'] == 'current-password' assert page.select_one('#password')['autocomplete'] == 'current-password'
assert page.select('main a')[0].text == 'create one now' assert page.select('main a')[0].text == 'create one now'
assert page.select('main a')[0]['href'] == url_for('main.register') assert page.select('main a')[0]['href'] == url_for('main.register')
assert page.select('main a')[1].text == 'Forgotten your password?' assert page.select('main a')[1].text == 'Forgot your password?'
assert page.select('main a')[1]['href'] == url_for('main.forgot_password') assert page.select('main a')[1]['href'] == url_for('main.forgot_password')
assert 'Sign in again' not in normalize_spaces(page.text) assert 'Sign in again' not in normalize_spaces(page.text)
@@ -36,7 +36,7 @@ def test_render_sign_in_template_with_next_link_for_password_reset(
_test_page_title=False _test_page_title=False
) )
forgot_password_link = page.find('a', class_="govuk-link govuk-link--no-visited-state page-footer-secondary-link") forgot_password_link = page.find('a', class_="govuk-link govuk-link--no-visited-state page-footer-secondary-link")
assert forgot_password_link.text == 'Forgotten your password?' assert forgot_password_link.text == 'Forgot your password?'
assert forgot_password_link['href'] == url_for('main.forgot_password', next=f'/services/{SERVICE_ONE_ID}/templates') assert forgot_password_link['href'] == url_for('main.forgot_password', next=f'/services/{SERVICE_ONE_ID}/templates')

4
tests/app/main/views/test_templates.py
View File

@@ -1249,8 +1249,8 @@ def test_should_403_when_create_template_with_process_type_of_priority_for_non_p
@pytest.mark.parametrize('old_content, new_content, expected_paragraphs', [ @pytest.mark.parametrize('old_content, new_content, expected_paragraphs', [
( (
"my favourite color is blue", "my favorite color is blue",
"my favourite color is ((color))", "my favorite color is ((color))",
[ [
'You added ((color))', 'You added ((color))',
'Before you send any messages, make sure your API calls include color.', 'Before you send any messages, make sure your API calls include color.',

2
tests/app/test_navigation.py
View File

@@ -380,7 +380,7 @@ def test_a_page_should_nave_selected_navigation_item(
@pytest.mark.parametrize('endpoint, selected_nav_item', [ @pytest.mark.parametrize('endpoint, selected_nav_item', [
('main.documentation', 'Documentation'), # ('main.documentation', 'Documentation'),
('main.support', 'Support'), ('main.support', 'Support'),
]) ])
def test_a_page_should_nave_selected_header_navigation_item( def test_a_page_should_nave_selected_header_navigation_item(