Commit Graph

11245 Commits

Author SHA1 Message Date
Leo Hemsted
dc02d036f1 Merge pull request #3827 from alphagov/invited-user-id
Invited user
2021-03-15 13:42:16 +00:00
Leo Hemsted
bf979128ab use new check api endpoints for validating invite tokens
added in https://github.com/alphagov/notifications-api/pull/3171
2021-03-15 12:22:00 +00:00
Leo Hemsted
45297eae43 store invited user ids in session
same as the invited org user ids in the previous commit
2021-03-15 12:21:58 +00:00
Chris Hill-Scott
90ab5f5d71 Merge pull request #3835 from alphagov/fix-performance-page-services-without-org
Fix bug when live services have no organisation
2021-03-15 09:55:42 +00:00
Chris Hill-Scott
3ea9cba0bc Fix bug when live services have no organisation
The performance page expects all live services to have an organisation.
This should be true on production, but it isn’t always the case in
other environments.

When the organisation name is `None`, the frontend can’t sort the list
of organisations alphabetically and so raises an exception.
2021-03-15 09:42:06 +00:00
Chris Hill-Scott
f424837429 Merge pull request #3832 from alphagov/performance-platform-page
Add a page to show performance data
2021-03-15 09:20:47 +00:00
Chris Hill-Scott
42e69c5e8c Add a word 2021-03-15 09:08:03 +00:00
Chris Hill-Scott
f959985b81 Repoint other links to the performance page 2021-03-12 17:23:55 +00:00
Chris Hill-Scott
7583c8d9fa Remove redundant hidden H3s
This commit replaces the H3s which only repeated information with some
hidden text that will make it read nicer for screenreaders.
2021-03-12 17:19:50 +00:00
Chris Hill-Scott
f7989b84cb Add captions to tables
Co-authored-by: Tom Byers <tombaromba@gmail.com>
2021-03-12 17:08:49 +00:00
Leo Hemsted
6d62c9ba36 store invited org user ids in session
first of a two step process to remove invited user objects from the
session. we're removing them because they're of variable size, and with
a lot of folder permissions they can cause the session to exceed the 4kb
cookie size limit and not save properly.

this commit looks at invited org users only.

in this step, start saving the invited org user's id to the
session alongside the session object. Then, if the invited_org_user_id
is present in the next step of the invite flow, fetch the user object
from the API instead of from the session. If it's not present (due to a
session set by an older instance of the admin app), then just use the
old code to get the entire object out of the session.

For invites where the user is small enough to persist to the cookie,
this will still save both the old and the new way, but will always make
an extra check to the API, I think this minor performance hit is totally
fine. For invites where the user is too big to persist, they'll still
fail for now, and will need to wait until the next PR comes along and
stops saving the large invited user object to the session entirely.
2021-03-12 16:36:02 +00:00
Leo Hemsted
c89be0079a rename get_invited_user funcs
make it clear they're expecting a service/org id
2021-03-12 15:59:32 +00:00
Chris Hill-Scott
67316df3aa Repoint footer and homepage links
Performance Platform is going away at 10am on Monday, so let’s point to
our Performance Page instead.
2021-03-12 14:44:49 +00:00
Chris Hill-Scott
4d0264d196 Switch org and service order on home page
This matches what’s on the performance page – orgs on the left, services
on the right.
2021-03-12 14:44:41 +00:00
Chris Hill-Scott
5fa6639b52 Add count of orgs and services
This uses the existing endpoint so it matches what’s on the homepage.
It will be more up-to-date than the list of services, but no-one’s going
to be adding things up to check they match exactly.
2021-03-12 14:44:32 +00:00
Chris Hill-Scott
8106d6fdf2 Limit data to last 7 days
Otherwise the page gets really long. Also matches what we have on our
dashboards by default.
2021-03-12 14:44:24 +00:00
Chris Hill-Scott
c3699e0e35 Format numbers as millions or billions
This matches the existing performance platform page, and I think is a
bit easier to read for high-level numbers where you don’t need to see
that they’re changing second-by-second.
2021-03-12 14:44:15 +00:00
Chris Hill-Scott
646075f61f Put some stuff on the page
This basically copies the same sections from the existing performance
platform page, with the frontend cobbled together from our existing
patterns.
2021-03-12 14:44:06 +00:00
Chris Hill-Scott
545f933e37 Cache the JSON in Redis
The endpoints are probably fast enough, but it seems risky to have a
public URL which causes a new query every time the page is loaded.
2021-03-12 14:43:58 +00:00
Chris Hill-Scott
25a6788d66 Use arguments rather than passing around a dict
This makes it harder to write code which will pass tests but fail in
real life.
2021-03-12 14:43:50 +00:00
Chris Hill-Scott
fce4082fff Rename to performance
This is consistent with the old performance platform URLs, which were
gov.uk/performance, and others that we have like /pricing and /features
2021-03-12 13:56:21 +00:00
Ben Thorner
ee5875668a Merge pull request #3834 from alphagov/update-isort-cf
Update isort config to match that in API
2021-03-12 13:34:16 +00:00
Ben Thorner
1c65d0a13c Update isort config to match that in API
As discussed in [1]. This has no effect on the existing imports.

[1]: https://github.com/alphagov/notifications-api/pull/3175#issuecomment-795530323
2021-03-12 13:03:20 +00:00
Rebecca Law
3ca2840652 Rename to performance-dashboard 2021-03-12 11:17:51 +00:00
Rebecca Law
042527e74c Start to build a page to performance platform page. 2021-03-12 11:17:44 +00:00
Chris Hill-Scott
3d590a71e4 Merge pull request #3831 from alphagov/dont-show-future-financal-year-org-usage
Don’t show future financial years on organisation usage page
2021-03-10 16:49:26 +00:00
Chris Hill-Scott
79bbd0fd98 Don’t show future financal years on org page
There’s no useful information in the page for the future financial year
because there’s no way for any of the services to have yet used
anything.

Changes this matches the change we made to the service usage page in
https://github.com/alphagov/notifications-admin/pull/3439/files
2021-03-10 15:39:06 +00:00
Chris Hill-Scott
19488aad97 Merge pull request #3826 from alphagov/add-new-rates-for-2021-financial-year
Add new free allowance rates for 2021 financial year
2021-03-10 14:41:58 +00:00
David McDonald
12484b08cd Merge pull request #3828 from alphagov/pyup-scheduled-update-2021-03-08
Scheduled weekly dependency update for week 10
2021-03-09 10:25:20 +00:00
David McDonald
3e80ba4734 Fix flake8 and isort errors
Note, isort now has default behaviour of searching recursively so we no
longer need the `-rc` flag
2021-03-08 18:48:56 +00:00
David McDonald
2745fb70d8 make freeze 2021-03-08 18:48:55 +00:00
pyup-bot
f6c382add5 Update xlrd from 1.2.0 to 2.0.1 2021-03-08 18:48:54 +00:00
pyup-bot
58ed109cc9 Update rsa from 4.7.1 to 4.7.2 2021-03-08 18:48:53 +00:00
pyup-bot
2a0bdbc039 Update phonenumbers from 8.12.18 to 8.12.19 2021-03-08 18:48:52 +00:00
pyup-bot
ae9a4d805e Update idna from 2.10 to 3.1 2021-03-08 18:48:51 +00:00
pyup-bot
ec8595a31e Update docutils from 0.15.2 to 0.16 2021-03-08 18:48:50 +00:00
pyup-bot
21b9bfcc83 Update dnspython from 1.16.0 to 2.1.0 2021-03-08 18:48:49 +00:00
pyup-bot
218f48d285 Update colorama from 0.4.3 to 0.4.4 2021-03-08 18:48:48 +00:00
pyup-bot
b3f338813a Update botocore from 1.20.13 to 1.20.22 2021-03-08 18:48:47 +00:00
pyup-bot
69b9627b88 Update boto3 from 1.17.13 to 1.17.22 2021-03-08 18:48:46 +00:00
pyup-bot
fec79380b6 Update awscli from 1.19.13 to 1.19.22 2021-03-08 18:48:45 +00:00
pyup-bot
7cc23020d6 Update requests-mock from 1.7.0 to 1.8.0 2021-03-08 18:48:44 +00:00
pyup-bot
66c0ddc7e2 Update flake8-print from 3.1.4 to 4.0.0 2021-03-08 18:48:43 +00:00
pyup-bot
0e0caa0c33 Update flake8-bugbear from 19.8.0 to 21.3.1 2021-03-08 18:48:42 +00:00
pyup-bot
4dd6668055 Update flake8 from 3.7.9 to 3.8.4 2021-03-08 18:48:41 +00:00
pyup-bot
46df5d7fb9 Update freezegun from 0.3.12 to 1.1.0 2021-03-08 18:48:40 +00:00
pyup-bot
be7ddef86b Update beautifulsoup4 from 4.8.1 to 4.9.3 2021-03-08 18:48:39 +00:00
pyup-bot
a6131ba53a Update pytest-xdist from 1.31.0 to 2.2.1 2021-03-08 18:48:38 +00:00
pyup-bot
908ea66cff Update pytest-mock from 1.11.2 to 3.5.1 2021-03-08 18:48:37 +00:00
pyup-bot
3f0e67aa3a Update pytest from 5.3.2 to 6.2.2 2021-03-08 18:48:36 +00:00