Commit Graph

11080 Commits

Author SHA1 Message Date
pyup-bot
dcde359deb Update requests-mock from 1.7.0 to 1.8.0 2021-02-15 13:55:13 +00:00
pyup-bot
56e67ce3a0 Update flake8-print from 3.1.4 to 4.0.0 2021-02-15 13:55:13 +00:00
pyup-bot
f04de93e74 Update flake8-bugbear from 19.8.0 to 20.11.1 2021-02-15 13:55:12 +00:00
pyup-bot
098397457f Update flake8 from 3.7.9 to 3.8.4 2021-02-15 13:55:12 +00:00
pyup-bot
b7dd7bf6f7 Update freezegun from 0.3.12 to 1.1.0 2021-02-15 13:55:12 +00:00
pyup-bot
1d3b4e9cb8 Update beautifulsoup4 from 4.8.1 to 4.9.3 2021-02-15 13:55:11 +00:00
pyup-bot
8aae790a72 Update pytest-xdist from 1.31.0 to 2.2.1 2021-02-15 13:55:11 +00:00
pyup-bot
292e0ad358 Update pytest-mock from 1.11.2 to 3.5.1 2021-02-15 13:55:11 +00:00
pyup-bot
298259a591 Update pytest from 5.3.2 to 6.2.2 2021-02-15 13:55:10 +00:00
pyup-bot
c7112c0e69 Update isort from 4.3.21 to 5.7.0 2021-02-15 13:55:10 +00:00
pyup-bot
baabff6284 Update notifications-python-client from 5.7.1 to 6.0.2 2021-02-15 13:55:09 +00:00
pyup-bot
d70e5bb104 Update notifications-python-client from 5.7.1 to 6.0.2 2021-02-15 13:55:09 +00:00
pyup-bot
ab4466e66f Update eventlet from 0.30.0 to 0.30.1 2021-02-15 13:55:09 +00:00
pyup-bot
e017aa6c9a Update eventlet from 0.30.0 to 0.30.1 2021-02-15 13:55:08 +00:00
pyup-bot
c4cc0b9674 Update pytz from 2020.5 to 2021.1 2021-02-15 13:55:08 +00:00
pyup-bot
aa0394f2d1 Update pytz from 2020.5 to 2021.1 2021-02-15 13:55:07 +00:00
Chris Hill-Scott
5a53f28747 Merge pull request #3800 from alphagov/reduce-default-broadcast-expiry
Reduce default broadcast expiry time
2021-02-15 11:19:24 +00:00
Chris Hill-Scott
276644f504 Reduce default broadcast expiry time to 4 hours
We don’t think we need to broadcast longer than this to validate that
the system is working.
2021-02-12 17:43:11 +00:00
Chris Hill-Scott
32e60ab507 Merge pull request #3799 from alphagov/alternative-product-image-desktop-only
Only show the alternative product image on desktop
2021-02-12 15:08:51 +00:00
Chris Hill-Scott
691e1396f3 Merge pull request #3776 from alphagov/utils-polygons
Replace polygons module with the one from utils
2021-02-12 15:08:46 +00:00
Chris Hill-Scott
769b85ff25 Replace polygons module with the one from utils
We moved it in https://github.com/alphagov/notifications-utils/pull/818/files
2021-02-12 14:52:53 +00:00
Chris Hill-Scott
e193358f78 Only show the alternative product image on desktop
This matches what we do with the regular product image, to make sure the
text doesn’t overlap it.
2021-02-12 14:28:19 +00:00
Chris Hill-Scott
f83a8b49f1 Merge pull request #3797 from alphagov/optimise-product-image-js
Progressively enhance the proposition illustration
2021-02-11 17:10:03 +00:00
Chris Hill-Scott
7463510378 Progressively enhance the proposition illustration
When users with Javascript enabled request it we can show a higher
quality SVG image which will look better in certain circumstances.
2021-02-11 17:03:13 +00:00
David McDonald
70b606a2d4 Merge pull request #3795 from alphagov/drop-go-live-link
Remove text about service is live or in trial mode
2021-02-11 12:01:35 +00:00
David McDonald
dc69fa5a90 Remove text about service is live or in trial mode
This is not relevant for broadcast services. This information is
given in the heading bar next to the service name. There is no process
to request to go live and it is not necessary to tell you again that the
service is live
2021-02-10 15:35:48 +00:00
Ben Thorner
0abc143147 Merge pull request #3790 from alphagov/show-from-reply-to
Fix not showing 'From' / 'Reply to' after sending
2021-02-10 14:40:54 +00:00
Ben Thorner
486393962e Show 'From' / 'Reply to' on all sending screens
This makes the preview of the email / SMS to send consistent with
the final screen, which we previously changed to show the "reply
to" text irrespective of whether the user had selected anything.
2021-02-10 10:43:29 +00:00
Ben Thorner
933d5bf68e Show 'From' / 'Reply To' if set for notification
Previously when a service had multiple "reply to" entries setup for
email or SMS, we would show the one that was selected on all screens
[1][2] except the final one, where the notification is actually sent.
This fixes that, with the caveat that it will also show for services
with only one "reply to" entry (see notes below) - we will look at
making this consistent on the previous screens in the next commit.

Here's a bit more detail on how this works:

- If a service has multiple "reply to" entries, the journey to send a
  one-off message starts with a screen to select the "sender_id", which
  is otherwise "None" [3].

- The "sender_id" is subsequently resolved to an actual email / phone
  number by calling an API [4] and plucking it out of the response JSON.

- The email / phone number then get rendered as part of the preview
  template [5][6].

- Unfortunately the "sender_id" is removed from the session by the time
  we get to the "view_notification" view [7].

- However, we can get back the equivalent text from the notification
  JSON, which is set by the API when the notification is created [8],
  give or take a bit of validation code [9][10].

- But the "reply_to_text" field is also set by the API when the service
  only has one "reply to" entry, so it will show then as well.

We could add look at the number of "reply to" entries for the service,
in order to consistently only show it when there is more the one. But
it seems more useful to show it on previous screens, since it provides
more information than is currently show (esp. for emails).

[1]: 93226ec5d6/app/main/views/send.py (L441-L442)
[2]: 93226ec5d6/app/main/views/send.py (L966-L967)
[3]: 93226ec5d6/app/main/views/send.py (L247)
[4]: 93226ec5d6/app/main/views/send.py (L1071-L1082)
[5]: 93226ec5d6/app/templates/views/notifications/notification.html (L80)
[6]: https://github.com/alphagov/notifications-utils/blob/master/notifications_utils/jinja_templates/sms_preview_template.jinja2
[7]: 93226ec5d6/app/main/views/send.py (L1059)
[8]: f8b4c9151c/app/service/send_notification.py (L87-L93)
[9]: f8b4c9151c/app/models.py (L653)
[10]: https://github.com/alphagov/notifications-utils/blob/master/notifications_utils/recipients.py#L482
2021-02-10 10:43:27 +00:00
Rebecca Law
b8f652cb2e Merge pull request #3793 from alphagov/update-utils-address-validation
Update utils to version 43.8.
2021-02-10 09:56:41 +00:00
Rebecca Law
f0ce2c6f5b Update utils to version 43.8.
Invalid characters for the first line of a postal address now include < >
2021-02-09 14:07:01 +00:00
Katie Smith
6972b4b6b0 Merge pull request #3791 from alphagov/compare-broadcasts-no-updated-at
Allow broadcasts which have no created_at to be compared
2021-02-09 09:52:29 +00:00
Katie Smith
c9234bcf72 Allow broadcasts which have no created_at to be compared
This adds to the `__le__` method on the `BroadcastMessage` class to
allow two BroadcastMessages with no `updated_at` to be compared.
Previously, the method expected at least one message to have
`updated_at` set, but this is not necessarily the case.
2021-02-09 09:32:07 +00:00
David McDonald
93226ec5d6 Merge pull request #3787 from alphagov/platform-admin-service-settings
Show only relevant platform admin settings for broadcast service
2021-02-08 14:31:00 +00:00
David McDonald
752b685b26 Show only relevant platform admin settings for broadcast service
A few of note

Count in list of live services - this should be set to no in the API (to
be implemented) so we never show broadcast services in the list of live
services to reduce security leaks

Organisation - all broadcast services are currently going to be found in
a single organisation so we keep track of them easily. Therefore there
is no need to allow the changing of the organisation

Email authentication - we may in time not allow these services to use
email auth to log in but this hasn't been decided so let's keep it for
the moment

Rate limit - although a service may end up using our API to create
broadcasts, there is currently no rate limit check on this endpoint
and it's also extremely unlikely that any service would ever breach
the default limit
2021-02-04 17:36:30 +00:00
Katie Smith
2bedcd79cc Merge pull request #3786 from alphagov/remove-link
Remove a link from using-notify page
2021-02-04 16:05:27 +00:00
Katie Smith
3ee16ecdbe Adjust test instruction 2021-02-04 15:21:29 +00:00
Katie Smith
1fdfd453f7 Remove a link from using-notify page
This stops the 'inset text' linking to the design system on the
'edit-and-format-messages' page. The link has been removed to avoid
confusion - someone thought they needed to use the design system
code in order to create inset text in templates.
2021-02-04 15:17:36 +00:00
Pea Tyczynska
5bc229222b Merge pull request #3779 from alphagov/show-billing-details-for-service
Show billing details for service
2021-02-03 10:52:50 +00:00
Pea Tyczynska
25534dbee3 Remove 'billing' from option labels
They were unnecessary it turned out.
2021-02-03 10:30:02 +00:00
Pea Tyczynska
0f6cbdf27e Add extra spacing to billing details and remove unnecessary autofocus
Add more spacing between characters for billing reference number and PO number, so they are easier to read. 

Also remove unnecessary autofocus.

Co-authored-by: Chris Hill-Scott <me@quis.cc>
2021-02-03 10:30:02 +00:00
Pea Tyczynska
c60be7000a Add notes to edit billing details page
As per ticket and as per Caley's request, so everything can be
edited together.

Also pluralise labels for billing contact info, to indicate
that putting multiple in is ok, and widen the input fields so
that it is more comfortable to input multiple contact details.
2021-02-03 10:30:02 +00:00
Pea Tyczynska
079f371bc5 Update attribute names following changes in API 2021-02-03 10:30:01 +00:00
Pea Tyczynska
8f21caa87a Change service billing details
View page that lets you change service billing details and
update details on form submission.
2021-02-03 10:30:01 +00:00
Pea Tyczynska
73031962a7 Change link leads to edit billing details view 2021-02-03 10:29:19 +00:00
Pea Tyczynska
d82f90754f Fix permissions for edit service note page 2021-02-03 10:29:18 +00:00
Pea Tyczynska
4a7bfcc9c5 Add billing details property
This property lets service settings know if there are any
billing details to preview.
2021-02-03 10:29:18 +00:00
Pea Tyczynska
8219e5a2f9 Show billing details row for admins on service settings page 2021-02-03 10:29:18 +00:00
Pea Tyczynska
f5e639050b Merge pull request #3784 from alphagov/notes-fix
Allow to update service notes
2021-02-02 17:37:27 +00:00
Pea Tyczynska
77008fe3cc Update requirements - install patch for jinja2 vulnerability 2021-02-02 17:13:18 +00:00