Commit Graph

10800 Commits

Author SHA1 Message Date
Chris Hill-Scott
c898b68fa8 Add comment explaining mocking
> I'd find it useful to know mock_get_jobs mocks
> app.job_api_client.get_jobs here, perhaps through a comment. Reading
> it, I associated it with contact_list.get_jobs above.
2020-11-30 14:24:40 +00:00
Chris Hill-Scott
a9783f7907 Test for old but unused contact lists
Old contact lists can be:
- never used
- used, but so long ago we no longer have data about the jobs due to
  retention settings

We show different messages in each of these cases. This commit
parametrizes the tests to ensure that both cases are covered.

Also makes the job a bit older so that both cases are logically possible
with the test data.
2020-11-30 14:20:53 +00:00
Chris Hill-Scott
94c713e1b4 Make dates line up in
Having a contact list uploaded in 2020 but used in 2015 isn’t possible,
and so makes the tests confusing to read.
2020-11-30 14:14:26 +00:00
Chris Hill-Scott
45b60e9555 Show usage count on uploads page
Because we’re be grouping jobs under their parent contact lists it’s
good to have some information ‘scent’ to help people find their jobs,
ie by clicking into a contact list. It also lets you see which list have
been used more than others, maybe because the update hasn’t been sent
to that group of people yet.

The hint text under uploads always says when they were used. For contact
lists this is a bit more complicated, since they can:
- never have been used
- been used multiple times

This commit makes use of the new fields being returned by the API to say
determine when these messages are relevant. They also let us
differentiate between a contact list that’s never been used, and one
that has been used, but not recently enough to show any jobs against it.
2020-11-30 13:54:54 +00:00
Chris Hill-Scott
423875011c Show jobs on contact list
It’s a bit unintuitive that starting a job from a contact list makes a
copy of the file, which has no relationship to the list it was copied
from. This is more of an implementation detail, rather than something
that comes from people’s mental models of what is going on. Or at least
that’s what I hypothesise.

I think it’s clearer to show jobs that come from contact lists within
the lists that they were created from. By naming the jobs by template
this gives a clearer view of what messages have been sent to the group
over time.
2020-11-30 13:54:54 +00:00
Chris Hill-Scott
149456b73a Add some more macros for counting things 2020-11-30 13:54:53 +00:00
Chris Hill-Scott
8f5c07336d Add method to get jobs for a contact list
Because the API lets us query jobs by contact list now, let’s add the
model and client layer code that will let us display them in the admin
app.
2020-11-30 13:54:53 +00:00
Chris Hill-Scott
236ddf053d Make created_at a property of contact lists
The view layer shouldn’t be having to deal with converting dates as
strings. This is an artefact of how we send data from the API to the
admin app. The model layer should be responsible for turning JSON into
richer types, where it can.
2020-11-30 13:54:53 +00:00
Chris Hill-Scott
fc1ca3ab2f Refactor to make pagination reusable
The responses we get to paginated queries from the API are fairly
consistent, so we should be able to reuse the code that takes JSON
from the API and turns it into Python objects. This commits factors out
that code so that it is reusable (by inheriting from it).
2020-11-30 13:54:53 +00:00
Chris Hill-Scott
ee720662e1 Merge pull request #3722 from alphagov/remove-unused-component
Remove unused imports
2020-11-30 11:56:19 +00:00
Chris Hill-Scott
063a09aab8 Merge pull request #3723 from alphagov/bump-utils-43.5.2
Bump utils to 43.5.2
2020-11-30 11:56:10 +00:00
Chris Hill-Scott
6dc84194ff Bump utils to 43.5.2
Brings in:
- [x] https://github.com/alphagov/notifications-utils/pull/808/files

Changes:
- https://github.com/alphagov/notifications-utils/compare/43.5.1...43.5.2
2020-11-30 10:52:23 +00:00
Rebecca Law
9463a94263 Remove the api_key component that was not being used on a few pages but imported. 2020-11-26 08:37:33 +00:00
Tom Byers
15ee8ad2c5 Merge pull request #3721 from alphagov/fix-user-permissions-for-manage-folder
Correct field_label attribute to 'users' on  manage folder page
2020-11-24 14:39:43 +00:00
Tom Byers
2f5f836dda Correct 'thing' to users on manage folder page
The checkboxes component that lets you choose
which users have permission to see the folder is
currently using the noun of 'folder' in the
summary it generates.

This is because this page users the
TemplateFolderForm class, which defaults the
permissions to 'folder'.

This updates the field_label attribute, used by
the code that generates the summary, to 'user' to
match the type of permission.
2020-11-24 14:22:08 +00:00
Chris Hill-Scott
6ebecec1f1 Merge pull request #3714 from alphagov/fix-focus-colour-edit-letter-links
Fix the focus colour on edit template links
2020-11-20 09:58:10 +00:00
Chris Hill-Scott
d1f5d51cc8 Merge pull request #3720 from alphagov/gamma
Remove line about beta from the roadmap
2020-11-20 09:58:04 +00:00
Chris Hill-Scott
806552ce1d Remove line about beta from the roadmap
We’re not in beta any more, and we don’t need to explain what beta means
any more.
2020-11-19 15:59:18 +00:00
Tom Byers
3f47ecd448 Merge pull request #3719 from alphagov/update-accessibility-statement
Update accessibility statement
2020-11-19 15:26:49 +00:00
karlchillmaid
83c3d31629 Remove bullets and update content 2020-11-19 15:05:35 +00:00
Tom Byers
1801793440 Update 'last reviewed' date 2020-11-19 14:44:19 +00:00
Tom Byers
ee03eb0767 Remove issue with blank alt text in email images
This is no longer happening with the NVDA screen
reader, which had the issue, when testing in
Outlook.

The hack added as a temporary solution has now
been removed. It went live on 19 November 2020 at
2.20pm.
2020-11-19 14:43:08 +00:00
Tom Byers
09fbd15b2f Merge pull request #3718 from alphagov/bump-utils
Bump utils to 43.5.1
2020-11-19 10:55:08 +00:00
Tom Byers
f64db263cd Bump utils to 43.5.1
Brings in the following changes:
- https://github.com/alphagov/notifications-utils/pull/800
  (Update colours used in email template to match
  design system)
- https://github.com/alphagov/notifications-utils/pull/801
  (Concern `BroadcastMessageTemplate` only with
  content, not XML)
- https://github.com/alphagov/notifications-utils/pull/802
  (Update pytest to 6.1.2)
- https://github.com/alphagov/notifications-utils/pull/798
  (Validate email message size is within SES
  limits)
- https://github.com/alphagov/notifications-utils/pull/804
  (Revert 798 validate email size)
- https://github.com/alphagov/notifications-utils/pull/805
  (Revert "Revert 798 validate email size")
- https://github.com/alphagov/notifications-utils/pull/806
  (Add service id to logs)
- https://github.com/alphagov/notifications-utils/pull/803
  (Take extended GSM characters into account in
  fragment count)
- https://github.com/alphagov/notifications-utils/pull/807
  (Remove alt text hack)

Of those, #801 is the only major version bump
(42.3.0 to 43.0.0).
2020-11-18 17:25:19 +00:00
Katie Smith
02ef7d5d7b Merge pull request #3716 from alphagov/pyup-scheduled-update-2020-11-16
Scheduled weekly dependency update for week 46
2020-11-18 15:00:46 +00:00
Katie Smith
6767f86085 Freeze requirements 2020-11-18 12:16:23 +00:00
Tom Byers
1941151513 Merge pull request #3715 from alphagov/add-govuk-radios
Add GOVUK radios [part 1]
2020-11-18 11:38:25 +00:00
Tom Byers
ad3ff9e539 Merge pull request #3713 from alphagov/fix-fix-for-template-list-focus-styles
Fix how template list item focus extends
2020-11-17 11:23:43 +00:00
Katie Smith
b49b789b8c Merge pull request #3711 from alphagov/add-extended-character-set-content
Add content about the extended character set
2020-11-17 10:18:35 +00:00
pyup-bot
173ccac454 Update prometheus-client from 0.8.0 to 0.9.0 2020-11-16 13:54:03 +00:00
pyup-bot
39fcebb79a Update pyexcel from 0.6.5 to 0.6.6 2020-11-16 13:54:02 +00:00
Tom Byers
070ed818cf Add HTML and CSS for extended GSM characters
Based on feedback from this pull request:

https://github.com/alphagov/notifications-admin/pull/3711
2020-11-13 22:40:32 +00:00
Tom Byers
b0bab205da Plug GovukRadiosField into edit sms|email pages
Proof of concept for the GovukRadiosField class.

Includes the removal of the a DataRequired
validator. This doesn't seem to be needed as the
RadioField superclass catches any submissions
without any data from field.choices in its
pre_validate method (which also outputs the
correct error message).
2020-11-12 10:13:22 +00:00
Tom Byers
dd36137e3f Add GovukRadiosField
Roughly based on GovukCheckboxesField.
2020-11-12 10:13:20 +00:00
Chris Hill-Scott
1a1b3bb9a8 Fix the focus colour on edit template links
Since the focus background colour is now Design System yellow, the text
should be black for sufficent contrast.

This wasn’t happening because the `:link` selector’s definition had
greater specificity.
2020-11-11 14:58:21 +00:00
Tom Byers
48499f0c00 Bring in Jinja and Sass for radios component 2020-11-11 10:21:32 +00:00
Tom Byers
5293e3e1eb Refactor GovukCheckboxField and all variants
Aims to make the structure of their code more like
GovukTextInputField so this convention can be
extended for radios.

It does that by:
- moving the code in their widget methods out into
  the govuk_checkbox_field_widget helper function
- moving the code that wraps the checkboxes
  in HTML to make them collapsible into the helper
  function
- remove GovukCheckboxesMixin in favour of having
  the extend_params method as a stand-alone
  function*

*The code is generic enough that it can be used
with other fields that share the same type of
data.

These changes also:
- don't alter the interface of any classes
  involved
- don't break any tests
2020-11-10 22:25:40 +00:00
Tom Byers
d648af5b76 Rename govukCheckboxField and similar
Follows naming conventions for classes and matches
work done on GovukTextInputField.
2020-11-10 12:35:29 +00:00
Tom Byers
3f71138a39 Make name of govuk_field_widget more specific
There will be a variant for each type of field so
make the original specific to text input fields.
2020-11-10 12:35:29 +00:00
Katie Smith
d992f7d472 Merge pull request #3712 from alphagov/go-live-once
Stop live services requesting to go live
2020-11-10 08:46:48 +00:00
karlchillmaid
c1151c5e8e Update content
The _Long text messages_ section of the page is probably the most relevant place to talk about this – so users are aware of the double-characters before they see the table of message lengths.
2020-11-09 16:21:10 +00:00
Katie Smith
1d1973050d Stop live services requesting to go live
Live services shouldn't be able to request to go live again. Once a
service is live we remove the option to go live from the Settings page,
but we still link to the page to request to go live from other places
e.g. the 'Get started' page. As a result, we've seen some services make
another request to go live when their service has already been live for
months - this change will stop that from happening.
2020-11-09 14:00:52 +00:00
Tom Byers
44402e0949 Fix how template list item focus extends
We use a hack to extend the focus style of single
links in template list items (those not part of a
path of links).

This extended the 'focus box' downwards so it
covered the hint text below the link by the height
of the link (which is block-level).

Problems happen if the link wraps to multiple
lines. The hint is always on one line so the focus
looks over-extended.

These changes guard against those problems by
using the line-height instead of the block-height.
They include adding a Sass function to reference
the line-heights in GOVUK Frontend's Sass API:

https://frontend.design-system.service.gov.uk/sass-api-reference/#govuk-typography-scale
2020-11-06 15:25:47 +00:00
karlchillmaid
b4c21280e3 Update draft content 2020-11-05 14:43:22 +00:00
karlchillmaid
b4f8e6e4ac Add content about the extended character set 2020-11-05 14:38:05 +00:00
Katie Smith
9ab3cb1d99 Merge pull request #3707 from alphagov/filenames-metadata-2
Stop checking the query string for original_file_name
2020-11-05 10:28:47 +00:00
Katie Smith
247e7c2d93 Stop checking query string for filename when sending a job
We look for `original_file_name` in the metadata now. Initially we were
still checking the query string too, but now that the change to add the
filename to the metadata has been deployed for a while there shouldn't
be any cases of the filename still being in a query string.

Since the `original_file_name` is not being added to the metadata in
`.check_messages` (it has happened earlier in the process) a few tests
are no longer needed.
2020-11-05 10:03:21 +00:00
Katie Smith
18e4e86565 Stop checking query string for filename if uploading contact list
The code was looking for `original_file_name` in the metadata for a
contact list, or the query string if it wasn't in the metadata. Now that
the change to use the metadata for the file name has been deployed for a
while e can stop looking in the query string for the
`original_file_name`.
2020-11-05 10:03:21 +00:00
David McDonald
cebdf7afa1 Merge pull request #3710 from alphagov/update-terms
Remove reference to sending personally or commercially sensitive data
2020-11-04 14:22:15 +00:00
Pete Herlihy
672531c559 Remove reference to sending personally or commercially sensitive data
These data are fine to send if the service team determines they are. It's not for us to determine that.
2020-11-04 12:14:52 +00:00