Commit Graph

11387 Commits

Author SHA1 Message Date
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
pyup-bot
277f80a811 Update dnspython from 1.16.0 to 2.1.0 2021-04-14 17:24:26 +01:00
pyup-bot
3354cd4aa4 Update colorama from 0.4.3 to 0.4.4 2021-04-14 17:24:25 +01:00
pyup-bot
0864d560e5 Update botocore from 1.20.44 to 1.20.49 2021-04-14 17:24:24 +01:00
pyup-bot
f22ea11e11 Update boto3 from 1.17.44 to 1.17.49 2021-04-14 17:24:23 +01:00
pyup-bot
60ac229983 Update awscli from 1.19.44 to 1.19.49 2021-04-14 17:24:22 +01:00
pyup-bot
64d103dfa8 Update humanize from 3.3.0 to 3.4.0 2021-04-14 17:24:21 +01:00
pyup-bot
dea6a4dbe9 Update humanize from 3.3.0 to 3.4.0 2021-04-14 17:24:20 +01:00
Chris Hill-Scott
00f9df7606 Merge pull request #3860 from alphagov/search-templates-by-id
Allow users of the API to search templates by ID
2021-04-14 10:44:17 +01:00
Chris Hill-Scott
e32fc7c606 Use template-list-item selector
For consistency with other assertions
2021-04-14 10:30:00 +01:00
Chris Hill-Scott
e32726f692 Merge pull request #3859 from alphagov/use-rtreelib
Use pure Python Rtree library
2021-04-13 16:05:39 +01:00
Chris Hill-Scott
559c400e84 Add override from future GOV.UK Frontend version
We need to duplicate it until we upgrade.
2021-04-13 15:43:03 +01:00
Chris Hill-Scott
c95b2ef8b3 Allow users of the API to search templates by ID
For someone who has retrieved a template ID from their system the only
way to find it in Notify is:
- hack the URL
- click through every template, visually inspecting the ID shown on the
  page until you find the right one

Neither of these is ideal.

This commit adds searching by ID, for those services who have an API
integration. This means we don’t need to confuse teams who aren’t using
the API by talking about IDs.

This is similar to how we let these teams search for notifications by
reference[1]

1. https://github.com/alphagov/notifications-admin/pull/3223/files
2021-04-13 15:24:29 +01:00
sakisv
bfa8dfe95e Fix import order 2021-04-13 16:31:06 +03:00
Chris Hill-Scott
e7aad61220 Use pure Python Rtree library
The Python rtree library we are using to build RTrees has a dependency
on the C package libspatialindex. This package is not installed on PaaS,
so it’s hard for us to use it.

This commit changes the code to use a library called rtreelib instead.

rtreelib doesn’t have a built in way to serialise the index it builds,
so I’ve had to implement that using pickle.
2021-04-13 12:43:28 +01:00
Chris Hill-Scott
69ed9e965a Merge pull request #3844 from alphagov/calculate-phones-custom-areas
Calculate the estimated number of phones in an arbitrary polygon
2021-04-13 09:55:00 +01:00
Chris Hill-Scott
83c521915c Estimate number of phones in an arbitrary polygon
We want to know how many phones are in a user-supplied polygon, so we
can show the impact of a broadcast, in the same way that we do when
users pick areas from our library.

We already know how many phones are in each electoral ward. But there
are challenges with an arbitrary polygon:
- where it does overlap a ward, the overlap could be partial
- it could overlap more than one ward
- finding out which wards it overlaps by brute force (looping through
  all the wards and seeing which ones intersect with our polygon) would
  be way to slow to do in real time

Instead we can use a data structure called an R-tree[1] to build an
index which provides a much, much faster way of looking up which
polygons overlap another. We can build this tree in advance and save it
somewhere, which means there’s a lot of computation we don’t need to do
in real time.

The R-tree returns a set of objects (ward IDs) which we can go and look
up in our library of electoral wards. These wards will be the ones that
might have some overlap with our custom polygon.

Once we have this small set of wards which might overlap our ward, we
can look at the size of the area of overlap (relative to the size of the
whole ward) and multiply that by the known count of phones in that ward
to get an approximation of the count of phones in the overlap area.
Summing these approximations give an estimate for the whole area of the
custom polygon.

1. https://en.wikipedia.org/wiki/R-tree
2021-04-12 15:45:48 +01:00
Katie Smith
04d051df6b Merge pull request #3856 from alphagov/401-fix
Fix sign in link on 401 page
2021-04-09 08:53:30 +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