Commit Graph

1293 Commits

Author SHA1 Message Date
Leo Hemsted
f97f249bc0 Merge pull request #1414 from alphagov/logs-cleanup
don't capture logs directly from stdout
2017-08-22 14:44:59 +01:00
Leo Hemsted
f68cdb20b5 Merge pull request #1439 from alphagov/dvla-endpoint
Add platform–admin-only page to preview DVLA code
2017-08-22 14:44:48 +01:00
Chris Hill-Scott
1e745bb736 Merge pull request #1424 from alphagov/row-error-cleanup
Tidy up some things around row-level errors in CSV files
2017-08-22 12:31:05 +01:00
Chris Hill-Scott
dd5d6e4d59 Merge pull request #1435 from alphagov/manage-templates-permission
Separate ‘manage service’ and ‘manage templates’ permissions
2017-08-22 12:30:57 +01:00
Chris Hill-Scott
eee9c2bb99 Merge pull request #1425 from alphagov/split-settings
Split settings page into multiple sections
2017-08-22 12:22:50 +01:00
Chris Hill-Scott
5ffd7c4448 Add platform–admin-only page to preview DVLA code
Debugging the DVLA markup stuff is quite slow, because it’s split
between the API and utils, and things that work in tests don’t always
work with real template content.

This commit adds us a private endpoint that will let us see what DVLA
markup will be generated for any template, enabling a quicker feedback
loop.
2017-08-22 12:03:05 +01:00
Rebecca Law
0f6fcb8d0b formatting 2017-08-21 14:04:40 +01:00
Rebecca Law
8cf29a7d04 Merge branch 'master' into inbound_number_admin 2017-08-21 13:50:49 +01:00
Rebecca Law
6b04373bcf Remove unused template.
Revert formatting changes
2017-08-21 13:47:24 +01:00
Chris Hill-Scott
d591b9aeb9 Add a fourth, ‘manage templates’ permission
We’ve seen from research (a long time ago) that the ‘manage service’
permission is too broad, and gives too much control to someone who only
needs the ability to edit templates. In other words, editing content
should be its own, separate permission, rather than being rolled up
into manage service.

Since this is already disaggregated on the API side, making this change
just means changing the mapping on the admin side and adding an extra
checkbox on the invite/edit page. Which is what this commit does.

So for now, an existing user who has the manage service permission gets
both manage service and manage templates (ie no change to what they can
do). Newly invited users will get to choose if they have both, either,
or neither.
2017-08-17 17:47:30 +01:00
Chris Hill-Scott
aac654cd38 Test that the right permissions in page
This commit makes sure that the right permission choices are shown in
these pages:
- manage team page
- invite a user page
- edit permissions page

This is in order to make changing these pages easier (see subsequent
commits).
2017-08-17 17:45:52 +01:00
Chris Hill-Scott
726e91bebb Make existing tests use ``client_request fixture
This commit makes the existing tests around user permissions less
verbose by using the new `client_request` fixture.

This fixture takes care of:
- setting up a service
- asserting that the response is `200`

It also tests that the page titles, some of which didn’t match with the
`<h1>`s, so this commit also fixes that mismatch.
2017-08-17 17:42:40 +01:00
Imdad Ahad
232912ab3b Call the correct endpoint to retrieve yearly billing usage 2017-08-17 16:02:30 +01:00
Imdad Ahad
fa99af6598 Merge pull request #1432 from alphagov/imdad-feat-make-usage-use-new-endpoints
Update the usage page to use new billing endpoints
2017-08-17 15:37:26 +01:00
Imdad Ahad
32242c4501 Update the usage page to use new billing endpoints
* Create new billing_api_client for separation and remove
older methods in the service_api_client
2017-08-16 16:31:47 +01:00
Venus Bailey
cbe2df3946 Revert "Job stats table" 2017-08-16 15:25:26 +01:00
Rebecca Law
9d8462e430 Fix codestyle.
Revert commit for package-lock.json
2017-08-16 10:00:53 +01:00
Rebecca Law
8aab08d4d2 View to show all inbound sms numbers for the platform admin user. 2017-08-15 17:04:57 +01:00
venusbb
6a483c14f5 change get-jobs to point to new statistics tables 2017-08-15 15:53:26 +01:00
Rebecca Law
27a9180d2a Merge branch 'master' into inbound_number_admin 2017-08-15 15:08:58 +01:00
Rebecca Law
c6a8ef43ec When setting the permisssion to allow inbound numbers the client will call an api endpoint that will set the next avaiable inbound number for the service.
As before the service manager will not be able to change the Text message sender once they have the inbound sms permission.
If the inbound sms permission is turned off the Text message sender setting is once more configurable by the service manager.
The inbound number remains bound to the service, but has "inactive", so that the number can not be used again.
2017-08-15 15:02:20 +01:00
Rebecca Law
0387b72c00 Get the inbound sms working.
Created a new test file for the inbound sms service settings changes, felt like the other file was too massive
2017-08-15 13:34:29 +01:00
Chris Hill-Scott
e520790025 Rename letters on/off option to send letters
For consistency with ‘send text messages’/‘send emails’.
2017-08-14 16:26:35 +01:00
Chris Hill-Scott
45a0a767f4 Split settings page into multiple sections
There are quite a few more options that there used to be in the settings
page. This means it’s hard to find the thing you want to change.

Grouping options is a common way of making things easier to find.

Grouping by channel (text, email, letter) is something we do elsewhere
that seems to work pretty well.
2017-08-14 16:23:56 +01:00
Chris Hill-Scott
5c872e7936 Put file name in error message
‘Your data’ sounds ambiguous and computery. Using the name of the file
is better because it’s a thing you know about.
2017-08-14 15:57:51 +01:00
venusbb
9d446bc942 Tests not completed 2017-08-14 11:56:12 +01:00
Chris Hill-Scott
e3d26bb2a2 Allow Science & Technology Facilities Council
> STFC is an executive non-departmental public body, sponsored by the
> Department for Business, Energy & Industrial Strategy.
> http://www.stfc.ac.uk/https://www.gov.uk/government/organisations/science-and-technology-facilities-council
2017-08-14 09:52:11 +01:00
Chris Hill-Scott
77452b1b25 Merge pull request #1418 from alphagov/local-email-address-for-local-government
Tell local government folk that they can sign up
2017-08-11 16:20:06 +01:00
venusbb
bff5c11bab merge pull 2017-08-11 09:43:56 +01:00
venusbb
87e987b148 merge master 2017-08-11 09:36:05 +01:00
venusbb
6ffd8b9b2e test written before merge Kens change 2017-08-11 09:17:01 +01:00
venusbb
981aa1aaea some test codes 2017-08-10 17:08:01 +01:00
Chris Hill-Scott
a10e76a9c2 Stop referring to central gov in error messages 2017-08-10 13:51:46 +01:00
Chris Hill-Scott
ab5d203d60 Merge pull request #1419 from alphagov/british-library-domain
Add British Library to email domain whitelist
2017-08-10 13:18:14 +01:00
Chris Hill-Scott
01d92fdbb3 Add British Library to email domain whitelist
I think that British Library can use Notify. Need to double check
though.

> BL is an executive non-departmental public body, sponsored by the
> Department for Digital, Culture, Media & Sport.
> https://www.bl.uk/https://www.gov.uk/government/organisations/british-library
2017-08-10 12:47:56 +01:00
Rebecca Law
9b9c6d75dc - Change update service name to check that the name/email_from is unique across all services.
- This is done using a new endpoint in the api.
- Removed the AddServiceForm in favor or using the ServiceNameForm
- Removed ServiceApiClient.find_all_service_email_from
2017-08-09 16:52:10 +01:00
Leo Hemsted
56746e6f0f don't capture logs directly from stdout
previously in run_app_paas.sh, we captured stdout from the app and
piped that into the log file. However, this came up with a bunch of
problems, mainly that exceptions with stack traces often weren't
formatted properly, and kibana could not parse them

instead, with the updated utils library, we can use that to log json
straight to the appropriate directory directly.
2017-08-09 15:41:33 +01:00
Chris Hill-Scott
5eb2cf859c Merge pull request #1403 from alphagov/ken-admin-orgs
Add pages to create and manage organisation branding for Emails
2017-08-09 13:15:27 +01:00
Rebecca Law
7e8c76bbc5 Let the API error when the service name is a duplicate.
- Remove the name_func from the AddServiceForm
- Catch the HTTPError and set the error on the form
2017-08-08 11:15:22 +01:00
Rebecca Law
186202cc9d [WIP]
Let the API return a 400 error message if the service name is a duplicate.
2017-08-07 11:30:25 +01:00
Ken Tsang
82f0ef58bf Refactor code after rebase 2017-08-02 11:20:33 +01:00
Ken Tsang
b1d1c6881f Refactor code 2017-08-02 11:07:27 +01:00
Ken Tsang
6c18c9d6ac Update config to new s3 bucket names 2017-08-02 11:05:17 +01:00
Ken Tsang
81d8494755 Add tests for s3_client 2017-08-02 11:04:14 +01:00
Ken Tsang
93eab4ca5f Refactored to use kwarg 2017-08-02 11:04:14 +01:00
Ken Tsang
615d80cd41 Add test for update org 2017-08-02 11:04:14 +01:00
Ken Tsang
681cf3b852 Fixed pep8 issues in test_org 2017-08-02 11:04:14 +01:00
Ken Tsang
005c8b53d7 Add org select and manage pages 2017-08-02 11:04:14 +01:00
Ken Tsang
6e1bcb8405 Update emails to use logos cdn 2017-08-02 11:03:02 +01:00
Imdad Ahad
5a81064f07 Update message for last used template on delete:
* API now returns an empty response if a template was last used more than seven
* days ago
* Handle the empty response appropriately
2017-08-01 13:51:27 +01:00