Commit Graph

10969 Commits

Author SHA1 Message Date
Tom Byers
181b45c319 Update issue with moving templates/folders 2021-01-14 10:17:47 +00:00
Chris Hill-Scott
248406938f Merge pull request #3766 from alphagov/remove-session-size-logging
Remove logging of session size
2021-01-13 13:40:48 +00:00
Chris Hill-Scott
2bdd86c044 Remove logging of session size
There’s no record of this warning in our logs at the moment.
2021-01-13 13:11:58 +00:00
Rebecca Law
9058edca90 Merge pull request #3767 from alphagov/clear-org-cache
Clear the organisation cache when a service's organisation is changed.
2021-01-13 09:22:23 +00:00
Rebecca Law
6639dc6061 Add a test that the redis delete cache is being called. 2021-01-12 15:39:51 +00:00
Rebecca Law
c36180741b Clear the organisation cache when a service's organisation is changed.
The /organisations page was showing the wrong live services count after a change is made to the service organisation.
2021-01-12 13:45:28 +00:00
karlchillmaid
56239999d8 Merge pull request #3765 from alphagov/update-support-introduction
Update support page content
2021-01-11 16:25:53 +00:00
karlchillmaid
0dd107b2b8 Update support page content 2021-01-11 13:05:00 +00:00
Chris Hill-Scott
4e99cc1448 Merge pull request #3753 from alphagov/use-pip-tools
Use pip-tools
2021-01-11 10:56:12 +00:00
Chris Hill-Scott
54d3d0421b Restore and add comments 2021-01-08 17:02:39 +00:00
Chris Hill-Scott
8b1e4afd3b Install pip tools as part of freeze-requirements
Makes the command faster and more self contained.
2021-01-08 17:02:39 +00:00
Chris Hill-Scott
1cfd1ca7b9 Delete requirements-app.txt
This is the file we used to use to specify direct dependencies. We use
`requirements.in` now instead.
2021-01-08 17:02:39 +00:00
Chris Hill-Scott
fdb659e2bd Run pip-compile command and commit output
This command freezes all our requirements into the `.txt` files.

We want these files version controlled so that our builds are exactly
reproducible from environment to environment.
2021-01-08 17:02:39 +00:00
Chris Hill-Scott
f97517c6b0 Tell PyUp to look at .in files
We only want PyUp to be checking for the dependencies we specify
directly, not any sub-dependencies.

By telling it to now look only at `.in` files we preserve this existing
behaviour.
2021-01-08 17:02:39 +00:00
Chris Hill-Scott
0f68d25265 Replace custom pip freeze script with pip-tools
In the past we've avoided using out-of-the-box solutions for Python
dependency resolution because a) they haven't been very mature and b)
we've had lots of issues with version conflicts. See [[1]], [[2]] for
details. Instead, we've been using a custom Python script that
under-the-hood runs `pip freeze` and saves the output to
`requirements.txt`.

This script works well for us, but it doesn't integrate well with other
tools. On the other hand [`pip-tools`](https://github.com/jazzband/pip-tools)
as of 2020 seems to be well-supported by its maintainers and other
tools; for instance, GitHub's automated update service
[Dependabot](https://dependabot.com) supports `requirements.in` files.

This commit replaces our `freeze-requirements` make command with
`pip-compile`.

The Digital Marketplace team have made this change and seem happy with
the results.
2021-01-08 17:02:39 +00:00
Chris Hill-Scott
6786b892fd Copy requirements files to .in
We’re going to move to using pip-tools for freezing requirements.

pip-tools uses `.in` files for the un-frozen list of requirements, and
then generates `.txt` equivalents.

This commit just copies our existing `.txt` files, keeping the same name
but giving them a `.in` extension ready for pip-tools to use.
2021-01-08 17:02:39 +00:00
Chris Hill-Scott
287689c1b3 Merge pull request #3763 from alphagov/count-chars-sms-broadcast-templates
Add fragment or character counting when editing text message or broadcast templates
2021-01-08 16:38:03 +00:00
Chris Hill-Scott
43e57b7089 Handle textbox without existing aria-described-by
jQuery.attr returns `undefined` if an element does not have an
attribute. We want an empty string, rather than the default of coercing
`undefined` to the string `'undefined'`.
2021-01-08 16:05:55 +00:00
Chris Hill-Scott
638e505432 Stop content length message from making page jumpy
The content length message was making the page jumpy and causing reflows
in three ways. This commit addresses each of those ways:

As the user scrolled
---

The footer went from fixed to sticky and the spacing around the message
changed. This change in spacing was needed so that the message looked
right in both contexts.

I think the best way to resolve this is to not use the sticky footer
when editing text message or broadcast templates.

On my 1440×900 screen I can fit a 5 fragment text message, plus the
‘will be charged as 5 text messages’ message, plus the save button.

Our top 10 screen resolutions according to our analytics are:

Position | Resolution | Percentage of users
---------|------------|--------------------
 1       | 1920x1080  | 27.37%
 2       | 1280×720   | 11.07%
 3       | 1366×768   |  8.88%
 4       | 1536×864   |  5.79%
 5       | 1440×900   |  4.52%
 6       | 1600×900   |  3.71%
 7       | 1280×1024  |  3.10%
 8       | 1680×1050  |  2.42%
 9       | 1920×1200  |  2.33%
10       | 2560×1440  | 1.99%

When the page first loaded
---

The message is empty so takes up no space, then the javascript fires
and inserts the message, taking up a line of space.

This is resolved by making the empty message take up space with a
non-breaking space character.

When the user first typed
---

We previously didn’t show any message until the user started typing.
This meant that, with the above fix, there was a larger than normal
empty space between the textarea and the save button.

This is resolved by always showing the message, even when the user
hasn’t typed anything yet.

***

These are design decisions which made sense when the message was
displayed along side the button, but we’ve had to change now that the
message is above the button.
2021-01-08 15:39:21 +00:00
Chris Hill-Scott
c127de4268 Move message length information before the button
We feel that this is more appropriate because it’s part of the
information you’re agreeing to before you hit submit.

Sometimes users can missing information that doesn’t start left-aligned
to the column they’re interacting with.

It also makes it closer to the Design System component.

We’re keeping it in the sticky footer, so that it’s always visible no
matter where in the message you’re scrolled to (this means you won’t
have to edited to content then scroll down to check whether you’ve
made it fit).
2021-01-08 14:55:52 +00:00
Chris Hill-Scott
6f514ef019 Describe example textbox by hint not label
The `<textarea>` should have its existing `aria-describedby` point to a
hint. Pointing to the label is bad practice as it would duplicate the
accessible name into the accessible description. It’s good not to have
that in the tests in case anyone copies the code elsewhere.
2021-01-08 12:53:06 +00:00
Chris Hill-Scott
55c0e566a2 Use <div> for block level content 2021-01-08 12:49:05 +00:00
Chris Hill-Scott
dd30c9f970 Style template length message to sit inline
This looks tidy, and because of the sticky footer it means the message
is always visible, even if your template is quite long. So no matter
where you’re scrolled to in the template you don’t have to scroll to the
bottom to see the count update.
2021-01-08 12:49:05 +00:00
Chris Hill-Scott
d452c0081d Add throttling to AJAX calls
The endpoint that count characters should be pretty low-load because it
won’t talk to the database (unless, on the first request, the user and
service aren’t cached in Redis).

The response size is also very small, only one line of text wrapped in a
single `<span>`, so won’t be as CPU-intensive to render as a whole page.

Still, we don’t want to completely hammer the server if a user types
very quickly.

This commit adds some throttling, so that we wait until there’s a
certain amount of delay between keystrokes before firing off the request
to the backend.

I’ve set the delay at 150ms. At normal typing speed this makes the lag
feel fairly imperceptible – it feels like you get an updated count in
response to most keystrokes. It’s only if you really mash the keyboard
that the count won’t update until you take a breath.
2021-01-08 12:49:05 +00:00
Chris Hill-Scott
64835cba86 Merge pull request #3475 from alphagov/request-invite
Allow invite form to be pre-populated with an existing user
2021-01-08 11:16:18 +00:00
Chris Hill-Scott
fbd58ef1f8 Add separate messages for invited/team member
2 messages seems like a good idea.
2021-01-08 10:56:59 +00:00
Chris Hill-Scott
c3b6c03411 Add ARIA attributes from Design System component
This commit copies the same ARIA attributes that are added to the
character count component[1] in the GOV.UK Design System.

This means that screen reader users will hear the count message when
they stop typing.

1. https://design-system.service.gov.uk/components/character-count/
2021-01-07 17:14:12 +00:00
Chris Hill-Scott
3fdaa29f35 Fetch template length message as user types
This commit adds some Javascript that makes AJAX requests as the users
changes the content of their template.

It then takes the content returned by the backend and inserts it in the
page.
2021-01-07 17:11:43 +00:00
Chris Hill-Scott
ca50d77ac2 Make sticky footer take up full width
So that we have space to display the message about how long the template
content is alongside the button, without the message wrapping.
2021-01-07 17:11:07 +00:00
Chris Hill-Scott
48577b823e Add an endpoint to count the length of templates
Users sending text messages are sometimes unaware that long messages
will cost more.

Users sending broadcast messages need to be aware that there’s a
character limit, so they can take this into account when planning their
messages.

This commit adds an endpoint which counts the number of characters in
some template content, and returns a snippet of useful info about how
long the message is.

In subsequent commits we’ll be able to use AJAX to fetch this snippet as
the user types.

There’s a surprising amount of complexity in counting the length of
messages. So we’ll need to do this in Python because it would be too
convoluted to re-implement the length counting in client side code, let
alone ensuring it had parity with its Python equivalent.
2021-01-07 17:07:51 +00:00
Chris Hill-Scott
91b54c2d3b Bump utils to 43.7.0
Changes how we count the length of templates with personalisation
2021-01-07 17:07:47 +00:00
Chris Hill-Scott
68e4a2fb89 Merge pull request #3761 from alphagov/extract-formatters
Extract formatters into their own module
2021-01-07 15:22:29 +00:00
Chris Hill-Scott
ac44e6f2ef Remove message count macro file
It’s empty now, we can delete it.
2021-01-07 14:53:12 +00:00
Chris Hill-Scott
24b579418f Replace message count macros with formatters
We prefer formatters now. Removing uses of the aliasing macro lets
remove it entirely.
2021-01-07 14:53:12 +00:00
Chris Hill-Scott
0327ece7ad Replace iteration count macro with formatters
We prefer formatters now. Removing uses of the aliasing macro lets
remove it entirely.
2021-01-07 11:57:30 +00:00
Chris Hill-Scott
4615c0ea3d Replace recipient macros with formatters
We prefer formatters now. Removing uses of the aliasing macro lets
remove it entirely.
2021-01-07 11:57:30 +00:00
Chris Hill-Scott
462294c9d1 Make message and recipient counters formatters
As formatters we can use them in Jinja or Python code.

It also means we don’t need to import them every time we want to use
them – they’re always available in the template context.

For now this doesn’t remove the macros, it just aliases them to the
formatters. This gives us confidence that the formatters are working the
same way the old macros did, and reduces the diff size of each commit.
2021-01-07 11:57:30 +00:00
Chris Hill-Scott
7a95e1618e Extract formatters into their own module
We have lots of functions for converting various types of data into
strings to be displayed to the user somewhere.

This commit collects all these functions into their own module, rather
than having them cluttering up `app/__init__.py` or buried amongst
various other things that have ended up in `app/utils.py`.
2021-01-07 11:57:30 +00:00
Chris Hill-Scott
8595fcf01e Merge pull request #3762 from alphagov/extract-spreadsheet-into-models
Extract Spreadsheet model from app/utils.py
2021-01-07 11:54:49 +00:00
Tom Byers
8f12505330 Merge pull request #3764 from alphagov/give-hidden-input-a-label
Add label for hidden username field
2021-01-07 10:45:08 +00:00
Tom Byers
77c1595826 Add label for hidden username field 2021-01-07 10:34:47 +00:00
Chris Hill-Scott
2c46d023da Extract Spreadsheet model from app/utils.py
`app/utils.py` is a bit of a dumping ground for things we don’t have a
better place for.

We now have a place and structure for storing ‘model’ code (‘model’ in
the model, view, controller (MVC) sense of the word).

This commit moves the spreadsheet model to that place.
2021-01-06 12:31:39 +00:00
Tom Byers
1def62c497 Merge pull request #3760 from alphagov/remove-chrome-form-heuristics-hack
Remove hack for bug in Chrome autocomplete
2021-01-06 10:31:46 +00:00
Tom Byers
d6ffcd3abe Remove hack for bug in Chrome autocomplete
We added an extra, hidden, <input> to our /sign-in
and /register forms to stop Chrome's form
heuristics filling the fields in wrong.

See the commit that added it:

33b15cdec6

This removes it after testing with the following
Chrome/OS combinations and all working without the
hack:

- Chrome 87, Windows 7
- Chrome 86, Windows 7
- Chrome 86, Windows 10
- Chrome 85, Windows 7
- Chrome 80, Windows 10
- Chrome 81, Windows 7
- Chrome 52, Windows 7
- Chrome 68, Windows 7
- Chrome 78, Windows 8.1
- Chrome 86, Windows 8.1

These combinations were based on the most-used
versions recorded in our analytics for the last 3
months.
2021-01-05 17:08:50 +00:00
Tom Byers
ad44e10cb7 Merge pull request #3759 from alphagov/make-big-number-inline
Make big number inline
2021-01-05 16:24:50 +00:00
Tom Byers
72bf9679c6 Remove big_number import from _upcoming template
Think the only use of the macro in this page was
removed in:

https://github.com/alphagov/notifications-admin/pull/3316

...but the import wasn't. This removes it.
2021-01-05 11:44:35 +00:00
Tom Byers
ab8a68ccd1 Remove jobs/_scheduled.html template
From what I can determine, the last include for
this template was removed in:

https://github.com/alphagov/notifications-admin/pull/3338

This assumes that it should have been removed then
so removes it now.
2021-01-05 11:44:35 +00:00
Tom Byers
0237ce7725 Remove big_number import from _inbox partial
It was used for the spark bar but, I think, wasn't
removed when the call to big_number_with_status
was:

https://github.com/alphagov/notifications-admin/pull/3295
2021-01-05 11:44:35 +00:00
Tom Byers
fb442237a1 Remove big_number import from dashboard
It was added in:

https://github.com/alphagov/notifications-admin/pull/734

but neither macro is called so assuming it can be
removed.
2021-01-05 11:44:35 +00:00
Tom Byers
5205743871 Remove big_number import from uploaded-letters
Looks like the import was there when the template
was added but there are no calls to it so removing
it.
2021-01-05 11:44:35 +00:00