Commit Graph

11340 Commits

Author SHA1 Message Date
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
Chris Hill-Scott
11ded9e828 Merge pull request #3801 from alphagov/show-rejected-broadcasts-on-previous
Show rejected broadcasts on ‘Previous alerts’ page
2021-04-08 14:34:13 +01:00
Chris Hill-Scott
06f2c7eaaa Remove verbs from old alerts
Now we’ve split the old alerts onto two pages the verbs (‘Broadcast’ and
‘Rejected’) will always be the same for each alert – so they’re not
adding any differentiation.

The specifics of what the datetime means is available on the page for
each alert.

Removing the verbs makes the page a bit less cluttered and makes it
easier to scan down the right hand column.
2021-04-08 14:19:36 +01:00
Chris Hill-Scott
4da38e42e3 Make alert page work for rejected broadcasts
The code for this page was making assumptions about properties which
aren’t present on rejected broadcasts.

This commit accounts for those properties and presents the relevant
elements on the page.
2021-04-08 14:19:36 +01:00
Chris Hill-Scott
9b256de4a9 Refactor to reduce duplication
> Rule of three ("Three strikes and you refactor") is a code refactoring
> rule of thumb to decide when similar pieces of code should be
> refactored to avoid duplication. It states that two instances of
> similar code don't require refactoring, but when similar code is used
> three times, it should be extracted into a new procedure

– https://en.wikipedia.org/wiki/Rule_of_three_(computer_programming)
2021-04-08 14:19:36 +01:00
Chris Hill-Scott
dc4db4951a Add a separate page for rejected alerts
We don’t want to mix these up with alerts that actually went out.
2021-04-08 14:19:36 +01:00
Chris Hill-Scott
9977028a83 Make Jinja template generic
This will let us reuse the same code for displaying pages of previous
and rejected alerts.
2021-04-08 13:38:54 +01:00
Leo Hemsted
856a667dcf Merge pull request #3857 from alphagov/prom-pin
pin prometheus-client to 0.9.0
2021-04-08 11:30:51 +01:00
Leo Hemsted
8954dc2fae skip prometheus-client 0.10.0
we saw exceptions on prod that I think might have caused a worker that
is being terminated to die ungracefully. While I'm not sure if this is
an actual problem that changed behaviour (app instances crashing and
restarting), at the very least it definitely polluted the logs and
obscured any actual issues we were having.

https://github.com/prometheus/client_python/releases/tag/v0.10.0

see the pending fix for this problem here:
https://github.com/prometheus/client_python/pull/644
2021-04-08 11:09:45 +01:00
Leo Hemsted
5d2b18e501 bump pip-tools when freezing dependencies
to stop big diffs from change in formatting of reqs.txt
2021-04-08 11:09:39 +01:00
Chris Hill-Scott
0bdd5cab2d Show rejected broadcasts on ‘Previous alerts’ page
Two reasons to not hide rejected broadcasts:
- if a broadcast was rejected by mistake then it’s useful to have an
  audit of who did that
- it means you can still see old broadcasts without having to leave
  in pending-approval, which is dangerous because they might
  accidentally be approved
2021-04-08 10:51:01 +01:00
Chris Hill-Scott
2c8fc4d523 Merge pull request #3852 from alphagov/pyup-scheduled-update-2021-04-05
Scheduled weekly dependency update for week 14
2021-04-07 17:01:04 +01:00
Chris Hill-Scott
caf4ddacaa Freeze requirements 2021-04-06 16:43:03 +01:00
David McDonald
e454a24e3d Merge pull request #3853 from alphagov/unknown-event-doer
Don't show user as unknown for service history
2021-04-06 16:33:29 +01:00
David McDonald
4acca3de4d Don't show user as unknown for service history
A commit was added:
600e3affc1

In it, it falls back to the string 'Unknown' for actions done by those
not belonging to the service.

This commit changes the behaviour such that if the user is not in the
list of active users for a service, it will go get the user from the DB
(or redis). This should be fine to do as redis will protect us from most
calls as most of these cases are for platform admins.

This will mean we can now see which user platform admin put a service
live rather than seeing 'Unknown'.
2021-04-06 11:36:54 +01:00
pyup-bot
1c741bb0c1 Update xlrd from 1.2.0 to 2.0.1 2021-04-05 14:55:10 +01:00
pyup-bot
65d11952dd Update s3transfer from 0.3.4 to 0.3.6 2021-04-05 14:55:09 +01:00
pyup-bot
0f4dc6323c Update phonenumbers from 8.12.19 to 8.12.20 2021-04-05 14:55:09 +01:00
pyup-bot
e3a03c7dde Update idna from 2.10 to 3.1 2021-04-05 14:55:09 +01:00
pyup-bot
9e501a0c30 Update docutils from 0.15.2 to 0.17 2021-04-05 14:55:08 +01:00
pyup-bot
25f7288f9a Update dnspython from 1.16.0 to 2.1.0 2021-04-05 14:55:08 +01:00
pyup-bot
f0d87dffe9 Update colorama from 0.4.3 to 0.4.4 2021-04-05 14:55:08 +01:00
pyup-bot
93e0be8f02 Update botocore from 1.20.27 to 1.20.44 2021-04-05 14:55:07 +01:00
pyup-bot
d64441033f Update boto3 from 1.17.27 to 1.17.44 2021-04-05 14:55:07 +01:00
pyup-bot
e32dd090c9 Update awscli from 1.19.27 to 1.19.44 2021-04-05 14:55:06 +01:00
pyup-bot
ba5694c6f8 Update flake8-bugbear from 21.3.2 to 21.4.3 2021-04-05 14:55:06 +01:00
pyup-bot
84b726df18 Update pytest from 6.2.2 to 6.2.3 2021-04-05 14:55:06 +01:00
pyup-bot
0b2e263b95 Update isort from 5.7.0 to 5.8.0 2021-04-05 14:55:05 +01:00
pyup-bot
907b27c473 Update prometheus-client from 0.9.0 to 0.10.0 2021-04-05 14:55:05 +01:00
pyup-bot
f136731442 Update prometheus-client from 0.9.0 to 0.10.0 2021-04-05 14:55:04 +01:00
pyup-bot
a472ce6580 Update gunicorn from 20.0.4 to 20.1.0 2021-04-05 14:55:04 +01:00
pyup-bot
415e570666 Update gunicorn from 20.0.4 to 20.1.0 2021-04-05 14:55:03 +01:00
pyup-bot
4e06d1b381 Update humanize from 3.2.0 to 3.3.0 2021-04-05 14:55:03 +01:00
pyup-bot
3f29d2bb0d Update humanize from 3.2.0 to 3.3.0 2021-04-05 14:55:03 +01:00
karlchillmaid
1d64fd6923 Merge pull request #3851 from alphagov/update-sms-pricing-april-2021
Update pricing information for text messages
2021-04-01 13:49:14 +01:00
karlchillmaid
b2e1c9492f Update content 2021-04-01 13:22:58 +01:00
karlchillmaid
018397fb7d Update pricing for text messages 2021-04-01 13:20:10 +01:00
karlchillmaid
f8feb28fe5 Update pricing information for text messages 2021-04-01 13:18:04 +01:00
Chris Hill-Scott
eeba15356d Merge pull request #3848 from alphagov/leohemsted-patch-1
Fix gov.scot typo
2021-04-01 11:23:58 +01:00
Chris Hill-Scott
18a96d3243 Merge pull request #3830 from alphagov/remove-2020-allowances
Remove 2020/21 free allowance data
2021-04-01 10:40:29 +01:00
Richard Baker
88872b96e9 Merge pull request #3850 from alphagov/extra_broadcast_test_areas
Create additional non-UK broadcast test polygons
2021-03-31 10:33:14 +01:00
Richard Baker
02600d76bd Create additional non-UK broadcast test polygons
This allows MNOs to test delivery to multiple non-adjacent cells without
risk of sending a broadcast on the public network. This will also support
testing of multiple polygon geometries in a single message.

Test polygons are all non-UK (northern Finland).

Signed-off-by: Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
2021-03-31 10:00:39 +01:00
Pea Tyczynska
a22fb3eb4e Merge pull request #3839 from alphagov/billing-report
Transform usage report to billing report
2021-03-30 15:27:10 +01:00
Pea Tyczynska
daba419b39 Fix tests - add flake8 exception and change endpoint name in navigation tests 2021-03-30 15:16:02 +01:00
Pea Tyczynska
f7142a1518 Catch validation error from API
When dates chosen for billing report are not in the same
financial year, API throws an error. This error was not being
caught so far. This PR starts to catch it and display a banner
with error message on the page, instead of page crashing.
2021-03-30 14:13:57 +01:00
Pea Tyczynska
38cfee6390 Rename usage report to billing report
Because only services with bills to pay are included, and
we started including billing details.

Also rename endpoints and file names to match this.
2021-03-30 14:13:54 +01:00
Pea Tyczynska
95f46ced8a Add billing details fields to Usage for all services report 2021-03-30 14:11:42 +01:00
Pea Tyczynska
2a9ebfb1cc Merge pull request #3849 from alphagov/allow-double-hyphens-in-email-domains
Bump utils to allow double hyphens in email address domain
2021-03-30 11:06:14 +01:00
Pea Tyczynska
a631942d55 Bump utils to allow double hyphens in email address domain
It was requested by our user and it is an allowed domain format
with Amazon SES, so we started allowing it in our validation.
2021-03-29 17:38:37 +01:00