Commit Graph

4550 Commits

Author SHA1 Message Date
karlchillmaid
d97cfaaada Improve lead-in 2022-01-19 17:05:14 +00:00
karlchillmaid
6178a5504e Update ‘Things we’ve done’ 2022-01-19 17:04:09 +00:00
karlchillmaid
a1d9f18927 Reinstate line break 2022-01-19 15:45:42 +00:00
karlchillmaid
0c701a2b6d Update now, next, later bullets 2022-01-19 15:44:41 +00:00
karlchillmaid
e37172f585 Bump date 2022-01-18 16:38:07 +00:00
Ben Thorner
c11e317dad Point people to Zendesk if there's a problem
This was a minor issue in a recent incident [1].

We don't want people emailing us directly:

- It's harder to collaborate on replies than in Zendesk, where I
can see who's editing.

- We can't take advantage of macros like we can in Zendesk.

- People emailing us directly creates an unnecessary distraction
and it's easy to lose track. We want to minimise distractions in
an incident situation.

- We use notify-support@ for monitoring, so we don't want noise.

[1]: https://docs.google.com/document/d/1eArpcYoCmhlgB45FZpGj1_HnkAgpgtgwr-KBiUq7h8c/edit#
2022-01-18 11:48:17 +00:00
Katie Smith
f3baacfb56 Stop showing link for cancelled org users 2022-01-13 14:08:37 +00:00
Katie Smith
5bf0e8638e Remove two unused org templates
One of these was empty. The other could not be viewed without giving a
`500` status code and isn't needed or linked to from anywhere.
2022-01-13 14:08:37 +00:00
Katie Smith
de2afb2f1a Add hidden text next to the 'Cancel invitation' link
This matches what we do on the service team members page.
2022-01-13 14:08:37 +00:00
Katie Smith
d166c6382c Add link next to org team members allowing them to be removed
This adds a link next to the organisation team members which lets
them be removed from the organisation. Service team members have
their own page and the link to remove them appears there. For
organisation team members, we don't currently have any other
information we want to show or any  other actions to perform. As
a result, this change uses the 'Team members' page to show the
confirmation banner.

The endpoint called 'edit_user_org_permissions' was renamed to
'edit_organisation_user' and some of the existing code around deleting
org users (which didn't work) was changed.
2022-01-13 14:08:37 +00:00
Chris Hill-Scott
24ff80280e Move template file to parent directory
It was the only file in its directory.
2022-01-13 10:28:50 +00:00
Chris Hill-Scott
c630faf3b4 Remove re-enter password step from rename organisation
Note that this is copied from the same change made to the rename service
page:
1190e4541b

The original idea behind was to always ask users to re-enter their
password any time:
- we want them to be sure that they want to do what they’re about to do
- we want to be sure it’s really the user trying to do the thing (and
  not someone malicious)

In reality we:
- removed this from the initial place it was added (a descendent of the
  ‘suspend service’ feature)
- only ever added it to the ‘rename service’ and ‘rename organisation’
  features

So in reality it’s not a pattern we have persisted with. Arguably there
are several things you can now do in the admin app without re-entering
your password which are much more high consequence than changing the
service name.

Also, with browser autofill there’s a lot less chance that forcing
someone to re-enter a password really gives much defence against an
unattended laptop, for example.

So this commit removes the need to re-enter your password when renaming
an organisation.
2022-01-13 10:16:03 +00:00
Chris Hill-Scott
ef3b092831 Merge pull request #4118 from alphagov/platform-admin-client-request
Standardise on use of `client_request` fixture
2022-01-13 10:10:21 +00:00
Chris Hill-Scott
c40cc7f04a Remove errant >
It was showing up in the page
2022-01-12 12:20:27 +00:00
karlchillmaid
fd707432fc Remove extra ‘for’ in first bullet 2022-01-11 09:38:14 +00:00
Chris Hill-Scott
7e707db4b2 Replace uses of client.get and client.post
We have a `client_request` fixture which does a bunch of useful stuff
like:
- checking the status code of the response
- returning a `BeautifulSoup` object

Lots of our tests still use an older fixture called `client`. This is
not as good because it:
- returns a raw `Response` object
- doesn’t do the additional checks
- means our tests contain a lot of repetetive boilerplate like `page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')`

This commit converts all the tests which had a `client.get(…)` or
`client.post(…)` statement to use their equivalents on `client_request`
instead.

Subsequent commits will remove uses of `client` in other tests, but
doing it this way means the work can be broken up into more manageable
chunks.
2022-01-10 14:39:45 +00:00
Chris Hill-Scott
07318b2d11 Replace instances of client.login with client_request
We have a `client_request` fixture which does a bunch of useful stuff
like:
- checking the status code of the response
- returning a `BeautifulSoup` object

Lots of our tests still use an older fixture called `client`. This is
not as good because it:
- returns a raw `Response` object
- doesn’t do the additional checks
- means our tests contain a lot of repetetive boilerplate like `page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')`

This commit converts all the tests which had a `client.login(…)`
statement to use `client_request` (which is already logged in by
default).

Subsequent commits will remove uses of `client` in other tests, but
doing it this way means the work can be broken up into more manageable
chunks.
2022-01-10 14:39:45 +00:00
Chris Hill-Scott
0706664be4 Stop using logged_in_client fixture
We have a `client_request` fixture which does a bunch of useful stuff
like:
- checking the status code of the response
- returning a `BeautifulSoup` object

Lots of our tests still use an older fixture called `logged_in_client`.
This is not as good because:
- it returns a raw `Response` object
- doesn’t do the additional checks
- means our tests contain a lot of repetetive boilerplate like `page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')`

This commit converts all the tests using `logged_in_client` to:
use `client_request` instead.
2022-01-10 14:39:44 +00:00
Chris Hill-Scott
50eae6f935 Stop using platform_admin_client fixture
We have a `client_request` fixture which does a bunch of useful stuff
like:
- checking the status code of the response
- returning a `BeautifulSoup` object

For most tests of a platform admin view we used `platform_admin_client`
instead. This is not as good because it returns a raw `Response` object
and doesn’t do the additional checks.

This commit converts all the tests using `platform_admin_client` to:
use new `client_request` and log in as `platform_admin_user` before
making any requests.

This is also nice because it makes any test easy to parametrize with
additional users, for example to test differences in behaviour dependant
on being platform admin or not.
2022-01-10 14:39:40 +00:00
karlchillmaid
bd313e5e2a Add next review date 2022-01-06 15:41:36 +00:00
karlchillmaid
c08948ca3f Add next review date 2022-01-06 15:40:14 +00:00
Tom Byers
0fe03993cd Add content-metadata component to other pages 2022-01-05 15:22:59 +00:00
Tom Byers
4f10272b00 Add styles and Jinja for component
Most of these are cut-and-paste'd from the GOVUK
metadata component:

https://components.publishing.service.gov.uk/component-guide/metadata

...but stripped back to only include what we need
and a optional suffix paragraph added.

Links to styles and ERB template
https://github.com/alphagov/govuk_publishing_components/blob/master/app/assets/stylesheets/govuk_publishing_components/components/_metadata.scss
https://github.com/alphagov/govuk_publishing_components/blob/master/app/views/govuk_publishing_components/components/_metadata.html.erb

Also adds it to the accessibility statement as an
example and updates the test that checks any
updates bump the date.
2022-01-05 15:21:37 +00:00
karlchillmaid
342fd35136 Remove dates from end of statement 2022-01-05 15:20:23 +00:00
karlchillmaid
483fcf1a3a Update content to fit new component 2022-01-05 15:20:22 +00:00
karlchillmaid
41fef84f8a Update content to fit new component 2022-01-05 15:20:21 +00:00
karlchillmaid
00355c405b Update content to fit new component 2022-01-05 15:20:20 +00:00
karlchillmaid
ed8efb6a37 Make wording consistent 2022-01-05 15:20:19 +00:00
karlchillmaid
a222891f19 Update ‘updated’ content 2022-01-05 15:20:18 +00:00
karlchillmaid
bb98078315 Update ‘updated’ content 2022-01-05 15:20:17 +00:00
karlchillmaid
ca11d87a57 Add ‘last updated’ section 2022-01-05 15:20:16 +00:00
Chris Hill-Scott
2f0e3f39d3 Hide ‘Download this report’ link when no services
If an organisation doesn’t have any live services then there’s no data
to download. To make things less confusing we should hide the link in
this case.

This commit also modifies the existing test so that the assertions are
consistent.
2021-12-30 14:09:42 +00:00
Leo Hemsted
295cd9bf8b remove rogue bullet point 2021-12-29 12:52:27 +00:00
karlchillmaid
56889a4ada Merge pull request #4082 from alphagov/clarify-free-text-message-allowance
Update text message pricing description
2021-12-17 11:46:07 +00:00
karlchillmaid
9b197e1e6c Make content consistent 2021-12-15 19:28:05 +00:00
Ben Thorner
50c3c3e10c Merge pull request #4095 from alphagov/remove-413-error-177535141
Remove redundant 413 error page
2021-12-15 10:32:53 +00:00
karlchillmaid
76161efe34 Update bullets to be more accurate 2021-12-14 18:09:05 +00:00
Katie Smith
30824b110c Fix billing page to show correct user who signed MOU
If the organisation table contains an entry for `agreement_signed_by_id`
and for `agreement_signed_on_behalf_of_name` then we should the person
who signed the MOU as being the `agreement_signed_on_behalf_of_name`.
This was wrongly showing the `agreement_signed_by_id` as the person who
signed the agreement.
2021-12-13 09:48:41 +00:00
Katie Smith
58532ee4ca Merge pull request #4092 from alphagov/org-billing
Add new 'Billing' page for organisations
2021-12-10 12:48:37 +00:00
Katie Smith
aef83ad261 Add link to user page to go live tickets
This adds a link to the user profile of the person who requested to go
live for "Request to go live" Zendesk tickets. Viewing a user's profile
page helps us to check for duplicate organisations and services from
that user.
2021-12-10 11:51:04 +00:00
Katie Smith
66c50abc38 Add new 'Billing' page for organisations
We want organisation team members to be able to see the MOU details for
their organisation. This change creates a new page called billing, which
contains these details. It's only visible to platform admin users now -
the plan is to add more information to this page, then to make it visible
to all organisation users.

The page showing the MOU covers the case of when agreement_signed is
True, when an agreement_signed is False, and when agreement_signed is
None. The case when an agreement_signed is None is very rare - it
signifies that the agreement is not signed but that we have some
service-specific agreements in place. We only have a few organisations
in this state, so it's unlikely that the content for this scenario will
be seen.

When an organisation has signed the agreement we may know the full
details (signing date, version signed, the person who signed it or who it
was signed on behalf of), or we may only have the name of the person who
signed the agreement. We show the more detailed content if possible, and
a less detailed version of the content if not.

There's a new route for downloading the agreement which is almost
identical to the existing `.service_download_agreement` route (plus the
test is almost the same), except that it takes an organisation ID
instead of a service ID.
2021-12-10 08:46:24 +00:00
Ben Thorner
39e03cee50 Remove redundant 413 error page
This was used when there was an Nginx instance sitting in front of
Admin [1], but nowadays traffic goes through CloudFront, where we
decided not to implement the same protection:

- The likelihood of large requests being a security threat is small
because it's a difficult attack vector.

- We have put in place specific limits on routes where we the size
of the request is actually important [2].

Note that the other error pages can all still be used based on the
response code we get from API requests [3]. Also worth noting we've
had 0 413 response codes for Admin in the last month.

[1]: https://github.com/alphagov/notifications-aws/blob/master/ansible/roles/nginx/templates/nginx.conf.j2#L29-L30
[2]: https://github.com/alphagov/notifications-admin/pull/4090
[3]: b3c0abc496/app/__init__.py (L407-L416)
2021-12-09 14:48:34 +00:00
Ben Thorner
1e63ee2d09 Merge pull request #4089 from alphagov/flash-upload-errors-177535141
Show flash instead of inline upload errors
2021-12-08 10:03:06 +00:00
karlchillmaid
da6a037451 Remove content 2021-12-07 12:18:58 +00:00
Chris Hill-Scott
787cb3ef1f Merge pull request #3994 from alphagov/update-utils-coordinate-transformation
Update utils to bring in coordinate transformation
2021-12-07 11:07:07 +00:00
karlchillmaid
0a237ecc4f Remove ‘additional’ 2021-12-07 09:37:47 +00:00
karlchillmaid
5514839660 Remove link 2021-12-07 09:37:28 +00:00
karlchillmaid
05cc219c80 Make first bullet clearer 2021-12-07 09:37:15 +00:00
karlchillmaid
bf9db86354 Simplify lead in 2021-12-07 09:36:59 +00:00
Ben Thorner
92549fd2d6 Show flash instead of inline upload errors
This has several advantages:

- It gives us more room to explain the error and actions. This will
be useful for upcoming work we want to do, which will add yet more
validations for CSV uploads.

- We already use a flash to show certain kinds of errors on these
pages (just above). This is more consistent.

- It's potentially more accessible. Previously the error and the
button text used to be read out as a single sentence. Now the page
reloads and reads the flash error alone.

In theory we should show an error in both places, but this can be
confusing on pages where there's only a single form control, and
especially if the error is long.
2021-12-06 17:12:27 +00:00