darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-18 21:44:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from GSA/tdlowden-contentPatch

Browse Source 
Delivery Status, Text Messages, Nav cleanup
This commit is contained in:
Ryan Ahearn
2022-11-28 13:50:25 -05:00
committed by GitHub
parent 1262e570ce 75e1975de1
commit 383733612b
7 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,14 +59,14 @@ def using_notify_nav():
"name": "Formatting",
"link": "main.edit_and_format_messages",
},
{
"name": "Branding",
"link": "main.branding_and_customisation",
},
{
"name": "Send files by email",
"link": "main.send_files_by_email",
},
# {
# "name": "Branding",
# "link": "main.branding_and_customisation",
# },
# {
# "name": "Send files by email",
# "link": "main.send_files_by_email",
# },
# {
# "name": "Upload a letter",
# "link": "main.upload_a_letter",
@@ -77,8 +77,8 @@ def using_notify_nav():
# },
]
},
{
"name": "API documentation",
"link": "main.documentation",
},
# {
# "name": "API documentation",
# "link": "main.documentation",
# },
]

16
app/templates/views/features/text-messages.html
View File

@@ -1,5 +1,6 @@
{% extends "content_template.html" %}
{% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
{% from "components/service-link.html" import service_link %}
{% block per_page_title %}
Text messages
@@ -17,18 +18,25 @@
<p class="govuk-body">Notify makes it easy to:</p>
<ul class="list list-bullet">
<li>create reusable text message templates</li>
<li>personalise the content of your texts</li>
<li>personalize the content of your texts</li>
<li>send and schedule bulk messages</li></ul>
<p class="govuk-body">You can also <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">integrate with our API</a> to send text messages automatically.<p class="govuk-body">
<!-- <p class="govuk-body">You can also <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">integrate with our API</a> to send text messages automatically.<p class="govuk-body">
<h3 class="heading heading-small" id="receive">Receive text messages</h3>
<p class="govuk-body">Let people send messages to your service or reply to your texts.</p>
<p class="govuk-body">You can see and reply to the messages you receive when you sign in to Notify. If you’re using our API, you can set up your own automated processes to manage replies.</p>
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> to request a unique number for text message replies.</p>
<p class="govuk-body"><a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.support') }}">Contact us</a> to request a unique number for text message replies.</p> -->
<h3 class="heading heading-small" id="sender">Show people who your texts are from</h3>
<p class="govuk-body">When you send a text message with Notify, the sender name tells people who it’s from.</p>
<p class="govuk-body">See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.branding_and_customisation', _anchor='text-message-sender') }}">how to change the text message sender</a>.</p>
<p class="govuk-body">To change the text message sender from the default of ‘US 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>
<h2 class="heading heading-medium">Pricing<h2>
<p class="govuk-body">Each service you add has an annual allowance of free text messages.</p>

2
app/templates/views/guidance/branding-and-customisation.html
View File

@@ -45,7 +45,7 @@
<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 ‘GOVUK’:</p>
<p class="govuk-body">To change the text message sender from the default of ‘US 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>

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

@@ -12,7 +12,7 @@
<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">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">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">
<h2 id="email-statuses" class="heading-medium">Emails</h2>
<div class="bottom-gutter-3-2">
@@ -41,7 +41,7 @@
<p class="govuk-body">If an email is marked as spam, Notify receives a ‘complaint’ from the email provider. We’ll contact you if we receive a complaint about any of your emails. When this happens you should remove the recipient’s email address from your list.</p>
<h3 id="open-rates" class="heading-small">Open rates and click-throughs</h3>
<p class="govuk-body">Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p>
<p class="govuk-body">Notify cannot tell you if your users open an email or click on the links in an email. We do not track open rates and click-throughs because there are privacy issues. Tracking emails without asking permission from users could breach General Data Protection Regulations (GDPR).</p> -->
<h2 id="text-message-statuses" class="heading-medium">Text messages</h2>
<div class="bottom-gutter-3-2">

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

@@ -1,10 +1,12 @@
import uuid
from collections import OrderedDict
from datetime import date
from unittest.mock import call
import pytest
from flask import url_for
from app.formatters import format_datetime_short
from tests import sample_uuid, validate_route_permission
from tests.conftest import (
SERVICE_ONE_ID,
@@ -195,7 +197,7 @@ def test_should_show_api_keys_page(
revoke_link = page.select_one('main tr a.govuk-link.govuk-link--destructive')
assert rows[0] == 'API keys Action'
assert rows[1] == 'another key name Revoked 1 January at 1:00am'
assert rows[1] == f"another key name Revoked {format_datetime_short(date.fromtimestamp(0).isoformat())}"
assert rows[2] == 'some key name Revoke some key name'
assert normalize_spaces(revoke_link.text) == 'Revoke some key name'

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

@@ -184,7 +184,8 @@ def test_message_status_page_contains_message_status_ids(client_request):
# so this test ensures we don't accidentally remove them
page = client_request.get('main.message_status')
assert page.find(id='email-statuses')
# email-statuses is commented out in view
# assert page.find(id='email-statuses')
assert page.find(id='text-message-statuses')

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

@@ -259,7 +259,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
'No messages to show yet…'
)),
# Created a while ago, started just within the last 24h
(datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 9, 1, 0, 1), (
(datetime(2020, 1, 1, 0, 0, 0), datetime(2020, 1, 9, 6, 0, 1), (
'No messages to show yet…'
)),
# Created a while ago, started exactly 24h ago