Commit Graph

3846 Commits

Author SHA1 Message Date
Chris Hill-Scott
55054b81b5 Include test key data by default on platform admin
This is the existing behaviour. It’s broken by this issue in WTForms
2.2.1: https://github.com/wtforms/wtforms/issues/401

This commit hand-crafts the default value, because WTForms is ignoring
the `default` argument on the form object attribute.

Not really sure how this ever worked 🤔
2018-08-03 14:53:40 +01:00
Chris Hill-Scott
dd2364654a Merge pull request #2166 from alphagov/basic-view-description
Revise how we talk about what basic view is
2018-08-02 17:41:26 +01:00
Chris Hill-Scott
26823b6122 Fix straight apostrophe 2018-08-02 17:35:37 +01:00
karlchillmaid
8eaf7caa05 Updated hint text
Updated hint text
2018-08-02 17:31:16 +01:00
karlchillmaid
48ddce8410 Removed reference to 'their' sent messages
Removed reference to 'their' sent messages – because users will be able to see all sent messages
2018-08-02 17:09:20 +01:00
karlchillmaid
5c5fe54cb4 Updated content to include next steps
Updated content to explain what users need to do next.

Includes explicit instructions and a repetition of 'team members'.
2018-08-02 16:58:43 +01:00
Chris Hill-Scott
cabb0a74c1 Fix broken keys for basic view event tracking
Bad copy/paste…
2018-08-02 16:44:15 +01:00
Chris Hill-Scott
d92340b7cf Merge pull request #2197 from alphagov/track-basic-view
Track onboarding of basic view in Google Analytics
2018-08-02 16:17:14 +01:00
Chris Hill-Scott
c655826b17 Merge pull request #2195 from alphagov/geo.gov.uk
Add Government Equalities Office to domain list
2018-08-02 15:24:30 +01:00
Chris Hill-Scott
fc5f3ee132 Merge pull request #2192 from alphagov/jobs-one-off
Show uploaded files in basic view
2018-08-02 15:23:58 +01:00
Chris Hill-Scott
8e6efadb23 Track virtual page view when enabling basic view
So we can see what pages people go to after turning it on.
2018-08-02 15:23:52 +01:00
Chris Hill-Scott
77d96032bf Track event when someone previews basic view
We’re interested to know which services are looking at the basic view
preview (even if they’re not turning it on).

This commit logs their service IDs as events into Google Analytics.
2018-08-02 15:23:52 +01:00
Chris Hill-Scott
291b919e78 Add Government Equalities Office to domain list
They have been using Notify for the Gender Pay Gap service for ages.
2018-08-01 12:54:36 +01:00
Chris Hill-Scott
c551ce9a42 Show jobs in basic view
There are some teams who send jobs on a daily/weekly basis. They have
team members who only use Notify for this purpose. So they would
probably benefit from basic view, because they don’t need to see the
dashboard.

This commit:
- adds a new item (uploaded files) to the basic view navigation for
  teams that have sent at least one job
- makes the job pages visible to basic view users

I think we should do this now, rather than as a later enhancement to
basic view. We only have one chance to announce the feature, so teams
who do send jobs may otherwise discount it as not useful for them and
the opportunity to have them use it is lost.
2018-08-01 10:45:02 +01:00
Rebecca Law
d512f330cd Edit, don’t duplicate, existing templates 2018-07-31 16:23:46 +01:00
Chris Hill-Scott
b35f6e9d5f Merge pull request #2180 from alphagov/service-model
Make a service model
2018-07-31 13:31:09 +01:00
karlchillmaid
6b33bc7956 Remove reference to 'one-off' messages
Basic view should work for sending multiple messages too.
2018-07-31 12:35:36 +01:00
Chris Hill-Scott
45579c59cd Store boolean values in Redis as valid JSON
Calling `.set()` with `True` stores the byte string `'True'` which
cannot subsequently be decoded from JSON (because boolean values in
JSON are lowercase, ie `true`).
2018-07-31 12:17:28 +01:00
Chris Hill-Scott
1073b8f178 Merge pull request #2178 from alphagov/cache-has-jobs
Check if any jobs exist before querying jobs
2018-07-31 11:17:42 +01:00
Chris Hill-Scott
eb8e433820 Rename variable to be more descriptive
> "normal" is a word that does not really tell much, could we maybe name
> this constant better?

‘Non-scheduled’ more explicitly describes that statues in this set.
2018-07-31 09:57:55 +01:00
Chris Hill-Scott
41e0f7941f Refactor to avoid duplicated method definitions
Each of these methods does the same thing, so this refactors into an
attribute lookup, which saves writing boilerplate code and makes it
easier to add new properties.
2018-07-30 14:56:36 +01:00
Chris Hill-Scott
92a258dc41 Use model for template previews 2018-07-30 14:56:36 +01:00
Chris Hill-Scott
1304561a70 Use service model to look up service attributes
This is better than just keying into the JSON because it means you get
an exception straight away when looking up a key that doesn’t exist
(which via mocking you could ordinarily miss).
2018-07-30 14:56:36 +01:00
Chris Hill-Scott
036923c382 Make a service model and use for permissions
Having the service floating about as JSON is a bit flakey. Could easily
introduce a mistake where you mistype the name of a key and silently
get `None`.

Also means doing awkward things like `if 'permission' in
current_service['permissions']`, whereas for users we can do the
much cleaner `user.has_permission()`.

So this commit:
- introduces a model
- adds a `.has_permission` method similar to the one we have for users
2018-07-30 14:56:36 +01:00
karlchillmaid
8b608f7a89 Updated caseworker permissions content
Updated description of caseworker / basic view permissions
2018-07-30 11:53:00 +01:00
karlchillmaid
cef8c6d90e Updated content
Updated the description of what basic view does
2018-07-30 11:50:39 +01:00
Chris Hill-Scott
2070314cb1 Fix missing organisation services from user search
The list of services this page was looking at only included those not
belonging to an organisation.

On production this excludes services we’ve added to organisations to
make the management of those services easier (eg ‘GDS’ and ‘DVLA’).
2018-07-30 11:31:52 +01:00
Chris Hill-Scott
19632ea4ab Add option to copy existing template when adding
Sometimes when setting up a service you might have a few very similar
templates, in which only a small amount of content. Or you might even
have a few of services, which are used by different teams but have
similar templates.

Copy and pasting, especially from one service to another, is a pain.
This commit makes it easier by allowing users to copy an existing
template when choosing to add a new one, instead of starting from
scratch.
2018-07-30 11:31:51 +01:00
Chris Hill-Scott
505de52d38 Check if any jobs exist before querying jobs
At the moment the dashboard does two API calls to find out if a service
has:

1. Scheduled jobs
2. Normal jobs

API calls are slow because they are synchronous, go over the network and
touch the database. We can’t cache these API calls because:
- a scheduled job could become a normal job at any time
- the statistics on a normal job are constantly updating

However there are plenty of services which don’t have any jobs, and
probably never will. And finding out if a service has any jobs is
reliably cacheable (because as soon as a service creates its first job
it has some jobs).

So this commit:
- refactors the way we get scheduled/normal jobs into the job_api_client
  to make the view a bit slimmer
- makes an additional, Redis-wrapped call to find out if any jobs exist
  before trying to get the jobs

This should result in a speedup on the dashboard, and can be used in the
future if there’s anywhere else we want to show or hide something
depending on whether a service has created any jobs (I have some ideas).
2018-07-30 11:14:01 +01:00
Chris Hill-Scott
c1b2f63671 Merge pull request #2173 from alphagov/gamblingcommission.gov.uk
Mark agreement signed by the Gambling Commission
2018-07-30 10:44:38 +01:00
Pea Tyczynska
6d2aad5561 Remove functions and comments redundant after monthly_billing removal 2018-07-25 11:48:17 +01:00
Pea Tyczynska
72e8303987 Remove view displaying data form monthly_billing table 2018-07-24 14:32:33 +01:00
Chris Hill-Scott
7d535544db Merge pull request #2164 from alphagov/rename-basic-nav
Improve navigation in basic view
2018-07-20 14:54:15 +01:00
Chris Hill-Scott
49dff1f5fe Merge pull request #2176 from alphagov/woking
Added Woking to the signed contracts list
2018-07-20 14:54:06 +01:00
Pete Herlihy
eee9059fd7 Updated the service and org counts 2018-07-20 13:59:11 +01:00
Pete Herlihy
6fbb376df0 Adding Cheshire East to the domains with contracts 2018-07-20 10:25:20 +01:00
Chris Hill-Scott
2fdf38d0db Use canonical domain name 2018-07-20 10:23:18 +01:00
Pete Herlihy
538aa1bc10 Added Woking to the signed contracts list 2018-07-19 16:44:57 +01:00
Chris Hill-Scott
dc6993d000 Mark agreement signed by the Gambling Commission 2018-07-19 10:21:46 +01:00
Katie Smith
eb9e9fac3b Ensure one-off jobs do not appear on message log page
Upcoming changes to API will mean that by default its
`get_notifications_for_service` DAO function will return one-off
notifications. In most cases this is what we want, but the message log
page should not show one-off notifications. By passing in the `include_one_off=False`
option to API we can ensure that this page will stay the same when API
changes.
2018-07-18 08:11:42 +01:00
Chris Hill-Scott
b33e08b3db mark agreement as signed 2018-07-17 11:47:12 +01:00
Chris Hill-Scott
a6fe161c8a Add Croydon council to list of domains 2018-07-17 11:45:36 +01:00
Pea (Malgorzata Tyczynska)
7f73fb0c27 Merge pull request #2167 from alphagov/fix_services_finding_user_info
Fix displaying of services on User Information page
2018-07-16 17:48:43 +01:00
Pea Tyczynska
2fab363253 Link to user services on User Information page 2018-07-16 17:37:26 +01:00
Pea Tyczynska
b3d99507bd Fix displaying of services on User Information page 2018-07-16 17:37:26 +01:00
Chris Hill-Scott
9fe66d6866 Revise how we talk about what basic view is
The page where you switch on the feature
---

This content aims to describe:
- the benefit of basic view – ‘make Notify quicker and simpler’
- who it benefits – ‘team members who only need to send messages’
- how it does it – ‘by hiding…’
- what it prevents users from being able to do or see –  ‘everything
  except…’
- what it allows users to do – ‘send messages’, [see] ‘templates, a list
  of sent messages’

I’m still keen to mention sent messages here, as it feels weird not to
mention it at all when it’s 1 of only 2 options in Basic view. I don’t
think it’s as important to mention it on the Edit team member screen.

I’ve specifically used ‘a list of sent messages’ rather than just ‘sent
messages’, to make it seem less like a noun (new feature).

The page where you choose whether someone has basic view
---

Switches the focus from what you can see to what you can’t.

Aims to be consistent with both:
- the description of permissions in admin view
- the language used to describe basic view in settings
2018-07-16 17:00:02 +01:00
Chris Hill-Scott
1d5de9bd7d Add Scottish Environmental Protection Agency
They are a (Scottish) government organisation.

https://www.sepa.org.uk/
2018-07-16 16:18:37 +01:00
Pea (Malgorzata Tyczynska)
d76f30e9f8 Merge pull request #2158 from alphagov/admin_platform_users_search
Admin can find users by email and see information about them
2018-07-16 16:11:36 +01:00
Pea Tyczynska
8258de084c Change part of the tests to use client_request
Two tests retained the old syntax because of mocker conflict:
when logging in as a user through client_request, it sets up a
side_effect on user_api_client.get_user to the user you log in
as. If you later want to set return_value for get_user to
something else, problems start :d.
2018-07-16 15:37:53 +01:00
Chris Hill-Scott
b946a6008d Add H1 to sent messages page
> Suggest making the H1 visible here for consistency, but also to make
> it clear to users what they’re looking at.

> This screen is similar to – but not exactly the same as – the
> individual text, email and letter dashboard screens from Admin view,
> so the H1 could help to distinguish it from them for users who may
> have interacted with both.
2018-07-13 17:02:27 +01:00