Commit Graph

9167 Commits

Author SHA1 Message Date
Chris Hill-Scott
af8395956e Cache returned letter summary in Redis
We’re going to start using the returned letters summary to show some
info on the dashboard.

This means we will be accessing it more often than it changes. And we
know exactly when it changes because it’s us manually submitting the
references we get from DVLA.

This makes it a good candidate for being cached, and Redis is where we
cache stuff that we’d otherwise go to the API for.
2020-02-12 11:42:06 +00:00
karlchillmaid
4d7a41d55d Merge pull request #3289 from alphagov/change-callout-to-inset-text
Change callout to inset text
2020-02-12 11:17:07 +00:00
Leo Hemsted
b0ee3f22d9 Merge pull request #3283 from alphagov/pyup-scheduled-update-2020-02-03
Scheduled weekly dependency update for week 05
2020-02-11 16:30:04 +00:00
Tom Byers
1d0c2070db Merge pull request #3291 from alphagov/fix-pill-heights
Make pill items match their heights
2020-02-11 14:28:14 +00:00
Chris Hill-Scott
6b703614b9 Merge pull request #3280 from alphagov/swap-nav-order-org-users
Swap order of usage and team members in navigation when organisation users are looking at a service
2020-02-11 11:21:14 +00:00
Chris Hill-Scott
8a4bf1d07e Make test more robust
Now tests:
- that the user doesn’t have the usage menu item when they’re not a
  member of the organisation (i.e. the counterfactual)
- that the user still gets a 403 when they try to view the usage page if
  they’re not a member of the organisation
2020-02-11 11:11:18 +00:00
Tom Byers
4433db346b Center pill content using more flexbox
Turns each pill item (already full height) into a
flex container with its content as a column. Uses
this to align the content (the pill label) to the
middle of the column.
2020-02-07 17:42:53 +00:00
Tom Byers
c8d9625518 Merge pull request #3164 from alphagov/update-static-error-pages
Update static error pages
2020-02-07 12:49:47 +00:00
Tom Byers
76240d5d55 Fix issues from pull request review
Fixes for the following:
- `<p>` tags need `govuk-body` class
  - https://github.com/alphagov/notifications-admin/pull/3164#discussion_r375921631
  - https://github.com/alphagov/notifications-admin/pull/3164#discussion_r375924387
- unused JS file
  - https://github.com/alphagov/notifications-admin/pull/3164#discussion_r375949386
- link to GDS has incorrect href
  - https://github.com/alphagov/notifications-admin/pull/3164#discussion_r375966464
  - https://github.com/alphagov/notifications-admin/pull/3164#discussion_r375966555
2020-02-07 11:21:11 +00:00
Tom Byers
a5ea785474 Make pill items match their heights 2020-02-06 16:38:24 +00:00
karlchillmaid
79373909bd Add 'add' 2020-02-06 12:54:27 +00:00
karlchillmaid
5775ccb5b1 Change callout to inset text 2020-02-06 12:30:22 +00:00
Rebecca Law
94c9886a58 Merge pull request #3288 from alphagov/delete-template-dialog
Delete template dialog
2020-02-06 10:58:43 +00:00
Rebecca Law
b242467d77 Change the content for the delete template confirmation dialog.
As per https://www.pivotaltracker.com/story/show/170796514 we want to make the delete template confirmation dialog box more consistent and clear.
The API has been updated with a new endpoint that only returns the last-used date, this date is more accurate since it goes to the ft_notification_status table, if the notification table is empty.
2020-02-06 10:16:00 +00:00
Rebecca Law
60dd6bca44 Merge pull request #3287 from alphagov/check-current-user-is_authenticated
Reorder the methods called in sign out
2020-02-05 16:29:31 +00:00
Rebecca Law
039628cff7 Reorder the methods called in sign out
We found another scenario where signing out of the db can cause a 500.
If the user archives their trial mode service, current_service.active = false, then signs out, the current user was being signed out client side first, meaning current_user is now an Anonymous user, next the call to the API is made to log out user on db, all calls to NotifyApiClient `check_inactive_service`, which is only authorised if user is platform_admin, but an AnonymousUser does not have that attribute, so a 500 is raise.
Seemed a bit cleaner to change the User.signout method to rather than the `check_inactive_service` method for current_user.is_authenticated.
2020-02-05 15:58:15 +00:00
Matt Hobbs
a4a6ad04f7 Merge pull request #3279 from alphagov/image-optimisation
Image optimisation
2020-02-05 10:46:42 +00:00
Tom Byers
2bb651865a Remove unused images
As per @quis's comment:

https://github.com/alphagov/notifications-admin/pull/3279#issuecomment-581902125
2020-02-05 10:37:57 +00:00
Leo Hemsted
636a702d19 Merge pull request #3286 from alphagov/remove-api-keys
cleanup
2020-02-05 10:11:47 +00:00
Leo Hemsted
4eeddb40f8 bump reqs 2020-02-04 17:16:58 +00:00
Pea M. Tyczynska
b5723a1aef Merge pull request #3285 from alphagov/uploads-fix-letter-link
Fix bug where job url type was constructed for letter on uploads page
2020-02-04 16:26:49 +00:00
Tom Byers
fbff4beef5 Update app/assets/error_pages/5xx.html
Remove unneeded GOV.UK suffix from page title on error page.

Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2020-02-04 16:07:33 +00:00
Tom Byers
0d80a4cc8b Update paas-failwhale/index.html
Remove unneeded GOV.UK suffix from page title.

Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
2020-02-04 16:07:17 +00:00
Rebecca Law
143564c7f0 Update message seen when deleting a template. 2020-02-04 16:00:51 +00:00
Pea Tyczynska
9ebd18ea85 Add upload_type property to Job class 2020-02-04 15:36:55 +00:00
Leo Hemsted
5b868ff268 remove api keys from codebase
these are just used for tests so don't need to look like real api keys.
2020-02-04 14:44:19 +00:00
Rebecca Law
fd59491d19 Merge pull request #3284 from alphagov/fix-sign-out-bug
Check if user is authenticated before signing out
2020-02-04 14:37:08 +00:00
Pea Tyczynska
46292949cd Fix bug where job url type was constructed for letter on uploads page 2020-02-04 14:19:07 +00:00
karlchillmaid
238fcd4652 Fix spacing 2020-02-04 13:45:55 +00:00
karlchillmaid
faf983356e Add status page and email
Add status page and email instructions to the 5xx error.

These match what we show on the 500 error page.
2020-02-04 13:44:55 +00:00
Rebecca Law
8a19d9496a Check if user is authenticated before signing out, this will prevent a 500 if the user is an AnonymousUser.
I ended up creating a new test user and logged_in_client, which isn't really great. But I tried adding a current_session_id to the active user in the test, but that broke all other tests.
I tried setting current_session_id in all the users being tested but that didn't work either. I'd like to come back to fixing the tests and reducing the number of conftest methods in another PR. For now this fixes the bug.
2020-02-04 12:16:58 +00:00
karlchillmaid
fa8a4ae4c2 Update error description 2020-02-03 17:02:22 +00:00
Tom Byers
f8564ebe0c Make agreed changes to content
The following changes are still to be decided:
- how to tell userr when the service will be up
  again on the PaaS failwhale page
- contact information for both pages
2020-02-03 17:02:01 +00:00
Tom Byers
9263bac59e Remove all code targetting IE8
We've dropped support for IE8 so this isn't
needed. For reference:

https://github.com/alphagov/notifications-admin/pull/3158#pullrequestreview-308447860
2020-02-03 17:01:54 +00:00
Tom Byers
048f0f3179 Update JavaScripts 2020-02-03 17:01:47 +00:00
Tom Byers
3e31cdbfd2 Update fonts 2020-02-03 17:01:38 +00:00
Tom Byers
88bd14811d Update app/assets/error_pages/5xx.html 2020-02-03 17:01:28 +00:00
Tom Byers
a42eaf4184 Update PaaS Failwhale HTML page 2020-02-03 17:00:57 +00:00
Tom Byers
974826e3e2 Update stylesheets 2020-02-03 17:00:24 +00:00
Tom Byers
340111b187 Update images 2020-02-03 17:00:08 +00:00
Chris Hill-Scott
cceb731596 Rename test to be a more explicit about what it’s testing
It’s not just that they’re an org user, it’s that they’re also a service user. And the usage page is the special case.
2020-02-03 16:28:47 +00:00
Leo Hemsted
c8648553eb freeze reqs 2020-02-03 16:13:58 +00:00
Chris Hill-Scott
b7b9e9747b Add test for org user who is also a service user
Org users should always be able to see the usage page, even if they
don’t have the `manage_service` permission for the service.
2020-02-03 16:05:46 +00:00
Rebecca Law
18523587a6 Merge pull request #3282 from alphagov/sign-out-user-server-side
Ensure that the session is logged out server side, not just client side.
2020-02-03 15:25:18 +00:00
Rebecca Law
0e1ee504ac - Add unit test for when case when the cookie doesn't match the db.
- Move code into User.signout method to further encapsulate the code.
2020-02-03 15:08:55 +00:00
pyup-bot
de5ddf1823 Update notifications-python-client from 5.5.0 to 5.5.1 2020-02-03 13:47:04 +00:00
Rebecca Law
937c9f2adc Ensure that the session is logged out server side, not just client side.
Anytime a user clicks "sign out" we should be signing them out server side as well. This can be accomplished by setting the Users.current_session_id = null.
I found that the method User.logged_in_elsewhere doesn't need to check if the current_session_id is None. The current_session_ids in the cookie and db (redis or postgres) then the user should be forced to log in again.
2020-02-03 12:24:02 +00:00
Chris Hill-Scott
a35931a33a Swap order of usage and team members for org users
Org users, when looking at the page for their org, see:
> Usage
> Team members

When they click into a service it switches to:
> Team members
> Usage

This is jarring. It should stay consistent. I think it that _Usage_ then
_Team members_ is the natural way of ordering the navigation at the
organisation level, so let’s follow that through to the service level.

This does mean that if someone is a member of both an organisation and a
service that the nav will jump (because it’ll switch to the existing,
service-level order of _Team members_ then _Usage_) but it’s going to
jump anyway because you get all the extra navigation items when you’re a
member of a service.
2020-02-03 11:39:58 +00:00
Chris Hill-Scott
172f93e841 Refactor navigation logic
Will be easier to change if the navigation shown to org users is
separated from the navigation shown to regular users of a service.
2020-02-03 11:39:13 +00:00
Matt Hobbs
9d4b761d12 Minify SVG, other SVG's already optimised 2020-01-29 17:33:56 +00:00