Commit Graph

11407 Commits

Author SHA1 Message Date
Chris Hill-Scott
ffd844b2a7 Add confirmation step to emergency alert settings
It feels quite dangerous that it’s just one click to make an emergency
alerts service live.

This commit adds a confirmation step which explains the consequences of
what you’re about to do.
2021-05-12 14:53:49 +01:00
Ben Thorner
78824f54fd Merge pull request #3880 from alphagov/small-follow-up-tweaks
Minor follow-up tweaks from #3878
2021-05-12 09:11:01 +01:00
Ben Thorner
9f9751adbf Tweak layout for dependencies section
This matches what we have in other repos [1][2].

[1]: https://github.com/alphagov/notifications-antivirus#to-update-application-dependencies
[2]: https://github.com/alphagov/notifications-api#to-update-application-dependencies
2021-05-11 18:22:11 +01:00
Ben Thorner
d15143606e Rewrite and expand docs on auto-JS scripts
This adds a note about automatically re-running JavaScript tests.
I've moved and rewritten the old content about re-building JS code
to match the new style.
2021-05-11 18:20:40 +01:00
Ben Thorner
d395d614b9 Use ID for row to avoid guessing position
This makes it easier to add / test other rows in future.
2021-05-11 17:53:36 +01:00
Katie Smith
389f98f63c Merge pull request #3877 from alphagov/no-none-providers
Stop checking for allowed_broadcast_provider being None
2021-05-11 16:40:22 +01:00
Chris Hill-Scott
2fba8e02c5 Merge pull request #3868 from alphagov/add-another-test-area
Add another area to the library of test polygons
2021-05-11 15:47:01 +01:00
Katie Smith
f7036825df Stop checking for allowed_broadcast_provider being None
The current_service.allowed_broadcast_provider is now always "all" or
one of the four providers, which means we can simply the code by not
checking if it is None.
2021-05-11 12:20:03 +01:00
Katie Smith
91453d3639 Merge pull request #3873 from alphagov/allowed-broadcast-provider-value
Start changing broadcast_provider value from None to "all"
2021-05-11 11:54:15 +01:00
Chris Hill-Scott
320c3553ae Merge pull request #3875 from alphagov/revert-3872-dependabot/pip/eventlet-0.31.0
Revert "Bump eventlet from 0.30.2 to 0.31.0"
2021-05-10 17:23:29 +01:00
Chris Hill-Scott
98847742d3 Stop pyup complaining
The apps won’t start with Eventlet 0.31.0

But Pyup complains when we try to downgrade
2021-05-10 17:06:10 +01:00
Chris Hill-Scott
9566bae96a Revert "Bump eventlet from 0.30.2 to 0.31.0" 2021-05-10 16:45:51 +01:00
Katie Smith
3485475270 Allow provider_restriction to be None or "all"
Until all the data is updated to always be "all", we have to handle the
case of provider_restriction being set to None or "all" (which mean the
same thing).

The code can be tidied up once the broadcast provider_restriction is never None.
2021-05-10 16:18:14 +01:00
Katie Smith
2f9e2dbc9d Send api the broadcast provider restriction of 'all', not 'None'
We're replacing the value of None with the value of all. API has been
updated to accept both values
(1767535def)
so this change starts sending notifications-api the value of "all".
2021-05-10 16:18:14 +01:00
Chris Hill-Scott
c9611e1cf7 Add another area to the library of test polygons 2021-05-10 16:09:02 +01:00
Chris Hill-Scott
a270d631e7 Merge pull request #3872 from alphagov/dependabot/pip/eventlet-0.31.0
Bump eventlet from 0.30.2 to 0.31.0
2021-05-10 16:06:45 +01:00
dependabot[bot]
3ad9e1ac6a Bump eventlet from 0.30.2 to 0.31.0
Bumps [eventlet](https://github.com/eventlet/eventlet) from 0.30.2 to 0.31.0.
- [Release notes](https://github.com/eventlet/eventlet/releases)
- [Changelog](https://github.com/eventlet/eventlet/blob/master/NEWS)
- [Commits](https://github.com/eventlet/eventlet/compare/v0.30.2...v0.31.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-08 16:57:07 +00:00
Rebecca Law
e7d6eebdfe Merge pull request #3871 from alphagov/remove-training-mode-test-channels
Remove some of the option we have for broadcast services.
2021-05-06 15:05:29 +01:00
Rebecca Law
cf160c3ae1 Update labels
Use more suscinct labels for the service settings page
2021-05-06 07:29:21 +01:00
Rebecca Law
5495de0b3b Remove some of the option we have for broadcast services.
This is the first step in making the UI easier for setting the
options for a broadcast service. Here we remove the options for
"Training mode" test channels. When we create a broadcast message for a trail mode service it is marked as stubbed and does not create a broadcast event that is sent to a provider.

The label for the form and setting page have been updated to reflect the
change.
2021-05-05 14:04:51 +01:00
Ben Thorner
bfc55b45ca Merge pull request #3863 from alphagov/show-suspended
Show service suspension in breadcrumb
2021-04-28 14:59:56 +01:00
Ben Thorner
b43eb3a591 Show service suspension in breadcrumb
Previously there was no indication that a service was suspended.
While this could also be shown for archived/deleted services, the
meaning is similar enough that it makes sense there too - the name
of the archived service should distinguish it as being archived.
2021-04-27 11:15:13 +01:00
karlchillmaid
c7840496d3 Merge pull request #3866 from alphagov/fix-typo
Fix apostrophe
2021-04-26 14:00:12 +01:00
karlchillmaid
487452b390 Fix apostrophe 2021-04-26 13:38:11 +01:00
Rebecca Law
7563cd79b8 Merge pull request #3865 from alphagov/update-allowances
Update pricing information on the features page
2021-04-22 13:36:17 +01:00
karlchillmaid
e78c10fc40 Remove details of allowance and pricing 2021-04-22 13:27:22 +01:00
karlchillmaid
029a6ec3b5 Update text message cost and rates
Update text message cost and rates on the features page
2021-04-22 13:25:40 +01:00
Pea Tyczynska
c55cc4574e Merge pull request #3854 from alphagov/admin-cancel-broadcast
Allow platform admins to cancel broadcasts.
2021-04-21 12:52:14 +01:00
karlchillmaid
bda66245a8 Merge pull request #3864 from alphagov/update-email-status-content
Update email status description
2021-04-20 17:40:04 +01:00
karlchillmaid
652f3f8065 Update {{ text_field(charge | safe) }} 2021-04-20 17:31:08 +01:00
karlchillmaid
94d71ca330 Update app/templates/views/message-status.html
Co-authored-by: Katie Smith <klssmith@users.noreply.github.com>
2021-04-20 17:30:03 +01:00
Pea Tyczynska
d77ec8a5ca Test that user without permission cannot reject broadcast 2021-04-20 17:27:56 +01:00
Pea Tyczynska
28378fdd3d Test that user without permission cannot accept broadcast
Also fix incorrect docstring.
2021-04-20 17:27:56 +01:00
Pea Tyczynska
6999d3bceb Refactor platform admin user fixtures
To make the code more DRY
2021-04-20 17:27:56 +01:00
Pea Tyczynska
0c0d9dd72f Admins won't see buttons for broadcast actions they can't do
These actions are creating, accepting and rejecting broadcasts.
2021-04-20 17:27:56 +01:00
Pea Tyczynska
002dd7485d Allow platform admins to cancel broadcasts.
Do not allow platform admins to:
- create broadcasts
- approve broadcasts
- reject broadcasts

that is, unless they have a send_messages permission
for a given service.

This is so platform admins have the minimum permissions necessary
to cancel a broadcast that might have been sent out accidentally.
2021-04-20 17:27:55 +01:00
karlchillmaid
6782f6770b Fix error 2021-04-20 16:41:51 +01:00
karlchillmaid
0fe60c3bd8 Update content 2021-04-20 15:51:12 +01:00
karlchillmaid
77f17db9dc Update email status description
Update email status description for ‘Inbox not accepting messages right now’
2021-04-20 15:46:16 +01:00
Rebecca Law
007fa5fa19 Merge pull request #3855 from alphagov/set-annual_billing-in-the-api
Let the API handle setting the default free allowance.
2021-04-20 07:17:57 +01:00
Rebecca Law
0ffcdf692c Merge pull request #3861 from alphagov/dont-add-sender-id-for-letter-jobs
If the job is for letters do not add the sender_id.
2021-04-20 07:17:41 +01:00
Rebecca Law
ac0b8ed95c If the job is for letters do not add the sender_id.
How this happens: a user starts to send a letter job, then in another tab starts a SMS
or email job, the sender_id is set in the session. Then the user goes
back to the letter job tab and creates the job. The sender_id is set in
the metadata of the csv file, and causes an exception when trying to persist
the letter notification.

This PR adds a check to ensure the sender_id is not set for letter jobs.

This will catch a small use case where the user has multiple tabs open
and has started sending an SMS or email job, then tries to send a letter
job.
2021-04-15 13:51:48 +01:00
David McDonald
2871d4cb04 Merge pull request #3858 from alphagov/pyup-scheduled-update-2021-04-12
Scheduled weekly dependency update for week 15
2021-04-14 17:41:09 +01:00
David McDonald
8a930c0ab6 make freeze requirements 2021-04-14 17:28:24 +01:00
Chris Hill-Scott
46d0e73e99 Freeze requirements 2021-04-14 17:24:31 +01:00
pyup-bot
ce2b83cab2 Update xlrd from 1.2.0 to 2.0.1 2021-04-14 17:24:30 +01:00
pyup-bot
5c31d3bbf4 Update prometheus-client from 0.9.0 to 0.10.1 2021-04-14 17:24:29 +01:00
pyup-bot
e3ad749131 Update phonenumbers from 8.12.20 to 8.12.21 2021-04-14 17:24:29 +01:00
pyup-bot
b1fe29f8e8 Update idna from 2.10 to 3.1 2021-04-14 17:24:28 +01:00
pyup-bot
902667021f Update docutils from 0.15.2 to 0.17 2021-04-14 17:24:27 +01:00