Commit Graph

4247 Commits

Author SHA1 Message Date
pyup-bot
9ff5fdeec0 Update pytest-xdist from 1.19.1 to 1.20.0 2017-08-18 12:48:41 +01:00
chfw
886fb2bb3c 🐛 fix the broken test by replacing a buggy depdency ezodf v0.3.2 with pyexcerl-ezodf v0.3.2. More info can be found here: https://github.com/pyexcel/pyexcel-ezodf/issues/1. The package name change reason can be found here: https://github.com/pyexcel/pyexcel-ezodf/issues/2. 2017-08-17 23:52:34 +01:00
chfw
2a0b83e101 🤝 Merge remote-tracking branch 'alphagov/master' 2017-08-17 23:48:04 +01:00
Pete Herlihy
c5c37c5957 Merge pull request #1428 from alphagov/update-testing-page
Reckon on the integration testing page...
2017-08-17 19:09:53 +01:00
Pete Herlihy
f02c02310a Merge pull request #1434 from alphagov/70-71
70-71 and 34-35 for Manage your application for criminal injury compe…
2017-08-17 19:09:28 +01:00
Chris Hill-Scott
0092c8bb33 Change manage team layout to fit extra option
We’ve moved from three to four permissions. Four permissions don’t fit
in the exiting horizontal layout.

This commit makes the permissions stack vertically instead.

This approach has some downsides:
- makes the permissions less easy to scan vertically
- makes them take up a lot more space (and at lives services, most of
  them have somewhere around 15 team members)

But I think for now it’s better than any horizontal alternative that I
tried.
2017-08-17 17:53:12 +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
Chris Hill-Scott
fd5dfdf4ad Refactor form -> permissions function into helper
This functionality was implemented twice, in two different ways. This
commit factors it out into a helper method that can be reused in the
two places. We chose to go with the more explicit implementation because
it’s easier to understand.
2017-08-17 17:39:23 +01:00
Imdad Ahad
8c09d07f76 Merge pull request #1433 from alphagov/imdad-fix-call-correct-endpoint-for-billing-usage
Call the correct endpoint to retrieve yearly billing usage
2017-08-17 16:36:48 +01:00
Pete Herlihy
3d951866af 70-71 and 34-35 for Manage your application for criminal injury compensation, Criminal Injuries Compensation Authority 2017-08-17 16:16:01 +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
4848f6b5c6 Merge pull request #1431 from alphagov/revert-1427-job-stats-table
Revert "Job stats table" - Data in Job statistics table needs further investigation
2017-08-16 15:37:47 +01:00
Venus Bailey
cbe2df3946 Revert "Job stats table" 2017-08-16 15:25:26 +01:00
Venus Bailey
38e6b8188c Merge pull request #1427 from alphagov/job-stats-table
Update the admin to use new end points in job statistics table
2017-08-16 11:49:39 +01:00
venusbb
d3421423ac package-lock.json revert 2 2017-08-16 11:40:57 +01:00
venusbb
9dc7a22c5d package-lock.json revert 2017-08-16 11:37:53 +01:00
venusbb
62775e8a59 Merge branch 'master' of https://github.com/alphagov/notifications-admin into job-stats-table 2017-08-16 11:16:13 +01:00
Rebecca Law
f0944fd421 Revert package-lock 2017-08-16 11:10:14 +01:00
Rebecca Law
d6c7048640 Added link to service from inbound number page 2017-08-16 11:03:41 +01:00
Rebecca Law
9d8462e430 Fix codestyle.
Revert commit for package-lock.json
2017-08-16 10:00:53 +01:00
Chris Hill-Scott
de44295e58 Merge pull request #1430 from alphagov/pyup-update-coveralls-1.1-to-1.2.0
Update coveralls to 1.2.0
2017-08-16 09:17:15 +01:00
pyup-bot
17267e6dfa Update coveralls from 1.1 to 1.2.0 2017-08-16 04:19:35 +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
venusbb
3c38d54cf7 Merge branch 'master' of https://github.com/alphagov/notifications-admin 2017-08-15 09:58:30 +01:00
chfw
56e49a7031 use iget_array to reduce memory footprint. and removed useless imports because they are loaded when required by pyexcel and lml 2017-08-14 22:18:09 +01:00
Pete Herlihy
77fed5eeb6 Reckon on the integration testing page...
Make people explicitly clear they shouldn't use a live key with invalid addresses for tests.
2017-08-14 17:07:07 +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
5b4a4ea1b1 Remove message preview from row error page
Two reasons to remove this:

1. It’s potentially confusing because you’ll see a preview of the first
   message, but the first row might not appear in the table shown on
   screen if it doesn’t have any errors.

2. If there are row-level errors in your file then they’re not related
   to the template – it’s a distraction.
2017-08-14 15:59:09 +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
Chris Hill-Scott
25e7015537 Remove stuff about test jobs on row errors page
The send yourself a test flow doesn’t reference any kind of
file/rows/table in the front end any more, and doesn’t create a CSV in
the background (except for letters). And it should validate any mistakes
before getting to the check page.

So any user doing a send yourself a test flow should never get to this
template, which means we can remove some redundant code.
2017-08-14 15:56:05 +01:00
Chris Hill-Scott
849b3737be Track errors in analytics on multiple row errors
Accidentally missed out on adding the tracking code to this particular
error message.
2017-08-14 15:55:19 +01:00
venusbb
9d446bc942 Tests not completed 2017-08-14 11:56:12 +01:00
Chris Hill-Scott
fca85537aa Merge pull request #1422 from alphagov/science-technology-facilities-council
Allow Science & Technology Facilities Council
2017-08-14 10:18:28 +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
pyup-bot
302c4384dc Update boto3 from 1.4.5 to 1.4.6 2017-08-12 02:00:26 +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
Chris Hill-Scott
95258488aa Merge pull request #1420 from alphagov/pyup-update-pytest-xdist-1.19.0-to-1.19.1
Update pytest-xdist to 1.19.1
2017-08-11 16:15:41 +01:00
Chris Hill-Scott
6ba5de753d Merge pull request #1411 from alphagov/pyup-update-pyexcel-io-0.4.3-to-0.4.4
Update pyexcel-io to 0.4.4
2017-08-11 16:15:11 +01:00
venusbb
ef1ec17789 progress of writing tests 2017-08-11 12:45:35 +01:00
venusbb
bf5b4fe4c0 package-lock.json 2017-08-11 10:34:11 +01:00
venusbb
eb881cc0e0 Merge branch 'master' of https://github.com/alphagov/notifications-admin 2017-08-11 09:48:13 +01:00