Commit Graph

766 Commits

Author SHA1 Message Date
Chris Hill-Scott
610eaab1f8 Add more markdown to the example email
We have a route at /_email for testing the email template.

This commit adds:
- ordered lists
- a URL

And it fixes:
- the unordered list (markdown requires two line break before starting
  a list)

This is so that we can test how these features look locally without
having to send an email.
2016-09-19 09:39:37 +01:00
imdadahad
69c16cb0e4 Merge pull request #936 from alphagov/fix-forgot-password-empty-user-issue
Fix exception raised when a pending user attempts to complete 'forgotten password' flow
2016-09-13 15:39:29 +01:00
Chris Hill-Scott
311ae4cfa4 Sort services by newest created first
Other than which services are live it’s also interesting to know what
services are getting created on Notify. So let’s put the newest ones at
the top of the page.
2016-09-13 10:38:33 +01:00
Chris Hill-Scott
88fff50ea3 Split platform admin page into live and trial mode
It sucks having to scroll down the massive list of services just to see
which ones are live.
2016-09-13 10:38:33 +01:00
Imdad Ahad
defa7ac2c8 Remove spacing 2016-09-09 15:24:56 +01:00
Imdad Ahad
9eab8a726f - Add test to check that two-factor auth activates a user as expected
- Ensure DB user activation statusupdate only executed when required
- Fix test_should_activate_user_after_verify
2016-09-09 15:22:56 +01:00
Imdad Ahad
171eec5984 Remove pdb breaks 2016-09-08 16:59:32 +01:00
Imdad Ahad
65072e41d3 Fix issue where exception thrown when user does not activate email but successfully completes forgotten-password flow (which includes 2f) 2016-09-08 16:57:06 +01:00
minglis
2ea401213e Merge pull request #928 from alphagov/rationalise-configs
Simplified the config files for admin.
2016-09-08 10:27:45 +01:00
Martyn Inglis
130698f720 Removed unused route and fixed some formatting 2016-09-08 09:29:08 +01:00
Chris Hill-Scott
bafbeac8e6 Merge pull request #930 from alphagov/fix-display-of-jobs-on-dashboard
Fix empty jobs table showing on dashbord
2016-09-07 15:25:41 +01:00
Chris Hill-Scott
9cf3854ac6 Merge pull request #929 from alphagov/fix-trial-mode-500
Fix 500 on trial mode page
2016-09-07 15:01:49 +01:00
imdadahad
be60e74a21 Merge pull request #926 from alphagov/add-redirect-for-email-verification
Redirect and resend verification email when pending user attempts to login
2016-09-07 14:23:56 +01:00
Chris Hill-Scott
9fa99fe007 Fix empty jobs table showing on dashbord
If you have scheduled and then cancelled jobs this would be enough to
show the jobs block on the dashboard (in otherwords it wasn’t filtering
out cancelled jobs). However the contents of the table _were_ filtering
out cancelled jobs, so the table would be empty and look broken.

This commit changes the conditional to operate on the `list` of jobs
with cancelled ones filtered out.
2016-09-07 11:13:07 +01:00
Chris Hill-Scott
743377f6b7 Fix 500 on trial mode page
I was using the trial mode page to prototype the time picker as part of
225a61ddd3.

I didn’t clean up properly, and left an errant undefined variable, which
caused the trial mode page to `500`.

This commit:
- removes the errant argument
- adds a test for all the static pages to make sure that they at least
  return a `200`
2016-09-07 10:49:57 +01:00
Martyn Inglis
42b04f0565 Merge branch 'master' into rationalise-configs
Conflicts:
	app/main/views/jobs.py
2016-09-07 10:34:53 +01:00
Martyn Inglis
b249477953 Simplified the config files for admin. 2016-09-07 10:31:33 +01:00
Chris Hill-Scott
93ca29eab8 Merge pull request #922 from alphagov/cancelled-jobs
Let users cancel a job
2016-09-06 17:12:19 +01:00
Chris Hill-Scott
eb11615a32 Add a cancel job button
If you schedule a job you might change your mind or circumstances might
change. So you need to be able to cancel it. This commit adds a button
on the job page which hits the `…/cancel` API endpoint for a job.
2016-09-06 16:55:24 +01:00
Imdad Ahad
91c878a80e Remove flash banner as unncessary 2016-09-06 16:53:53 +01:00
Imdad Ahad
998d33e283 Redirect and resend verification email when pending user attempts to login 2016-09-06 15:44:33 +01:00
Martyn Inglis
1ad2665bfe Merge branch 'master' into remove-code-that-handled-old-new-job-api
Conflicts:
	app/main/views/jobs.py
	app/notify_client/job_api_client.py
2016-09-05 14:29:58 +01:00
Martyn Inglis
380340187b Fixe formatting pep8 issues 2016-09-05 13:38:33 +01:00
Chris Hill-Scott
c94675f457 Don’t show cancelled jobs anywhere
The information about a job doesn’t make sense if a job is cancelled.

We could change the information to reflect that the job won’t be sent/
wasn’t sent/was cancelled, but there’s nothing you can really do with
this info.

So instead let’s:
- hide cancelled jobs from the dashboard
- hide cancelled jobs from the jobs page
- 404 the page if the user tries to click back enough times to hit the
  job page
2016-09-02 12:44:36 +01:00
Chris Hill-Scott
6921d8b59e Sort scheduled jobs so soonest is first
The scheduled job you probably care about the most is the soonest –
irrespective of when you scheduled it.
2016-08-31 16:59:24 +01:00
Chris Hill-Scott
72f92b5249 Use list comprehensions instead of filter
“filter's pretty oldschool” – @leohemsted
2016-08-31 16:59:16 +01:00
Chris Hill-Scott
661f5ba702 Don’t allow test messages to be scheduled
For two reasons:
- it’s extra stuff in tour that users dont yet need to know about
- test messages are hidden from the dashboard, so you’d have no
  visibility of when they were sending once you’d scheduled them
2016-08-31 16:59:04 +01:00
Chris Hill-Scott
31a032e678 Show message on job page if job is scheduled
If a job is scheduled then we can’t show the notifications yet, and the
progress report will stay at 0%.

In their place we should show what time a job will start.

Later on (when the API is ready) this area of the page should also show
a cancel button.
2016-08-31 16:58:52 +01:00
Chris Hill-Scott
4342b721f1 Show upcoming jobs on the dashboard
On the dashboard:
- adds a new ‘in the next 24 hours’ section to the dashboard which lists
  upcoming jobs
- tweaks some spacing on the dashboard so that it doesn’t look like too
  much of a mess
- don’t show scheduled jobs in the table of normal jobs

On the jobs page:
- don’t show scheduled jobs
2016-08-31 16:58:43 +01:00
Chris Hill-Scott
225a61ddd3 Add a component for picking the time to send a job
Users need to pick a time in the next 24hrs, or send a file immediately.

Rationale for this is a bit lost in time-before-holiday, but generally:

‘Now’ and ‘later’ as the inital choices makes it really clear what
this feature is about conceptually.

The choice of times is absolute, eg ‘1pm’ not ‘in 3 hours’
2016-08-31 16:58:09 +01:00
Chris Hill-Scott
bf872ab342 Base ‘% complete’ on notifications requested
The job is complete when all notifications are delivered or failed.

The report is complete once we have all notifications are in the
database.

This commit changes the meaning of the percentage from the former to the
latter. This is how it was before we removed the aggregate stats for
jobs.
2016-08-30 15:16:36 +01:00
Chris Hill-Scott
8ff70f0814 Merge pull request #904 from alphagov/make-settings-page-a-table
Make settings page a table and do a better job of explaining the reply to address/text message sender
2016-08-26 15:49:49 +01:00
Chris Hill-Scott
e6fd8faa02 Optionally prefix text message on job page
Missed this as part of #905
2016-08-26 15:20:06 +01:00
Chris Hill-Scott
01ac70f6a0 Merge pull request #905 from alphagov/sms-sender-no-prefix
Don’t prefix text messages is sender name is set
2016-08-26 15:10:34 +01:00
Chris Hill-Scott
c745422578 Don’t prefix text messages is sender name is set
Implements:
- [x] alphagov/notifications-utils#66
2016-08-26 14:45:26 +01:00
Leo Hemsted
4fbd23d5e9 Merge pull request #907 from alphagov/plat-admin
Platform admin stats rework
2016-08-26 13:51:36 +01:00
minglis
9a60cf49a4 Merge pull request #899 from alphagov/handle-new-jobs-api
Handle new jobs api
2016-08-25 09:56:30 +01:00
Martyn Inglis
c61199d17d Rewrote some slighlt over complicated logic 2016-08-25 09:15:55 +01:00
Leo Hemsted
6ad7b019ea added tests for reworked platform admin page 2016-08-24 17:39:20 +01:00
Leo Hemsted
b983f020ff remove old statistics_api_client
now unused - replaced mock fn with detailed_services too
2016-08-24 16:26:08 +01:00
Chris Hill-Scott
58b2a8a825 Make email branding settings a table
So that it matches the other settings on this page
2016-08-24 15:26:04 +01:00
Chris Hill-Scott
05a493f1e8 Remove ‘suspend API keys’
This was an early reckon feature. There were a few of problems with
it:
- it worked on the service, not just on the API keys as described
- it was back to front, ‘suspending’ a service set `active` to `True`,
  reactivating it set `active` to `False`
- no part of the API actually respected the `active` flag on a service

The same intent can be acheived by either:
- revoking an API key
- having a platform admin put your service back into trial mode

So this commit removes the link and the code behind it.
2016-08-24 15:12:00 +01:00
Chris Hill-Scott
f84e8e2519 Remove flash messages when changing settings
Since we’re playing back the values in the table there’s no need to
give confirmation of the new value in a flash message.
2016-08-24 15:08:27 +01:00
Leo Hemsted
7864f9455d rewrite platform-admin page to use new non-stats endpoints
had to change because format from api is slightly different
2016-08-24 15:04:03 +01:00
Martyn Inglis
d56c14e147 Actually use the right exception class.
Two HTTPError classes exist. Need to use the one in notifications_python_client.
2016-08-24 12:12:19 +01:00
Martyn Inglis
d149a9691a Added tests for the 2 use cases:
used templates

unused templates
2016-08-24 12:09:38 +01:00
Martyn Inglis
0b95a30e2f Raise the exception if not a 404 2016-08-24 11:26:34 +01:00
Martyn Inglis
5b2ae43d5d Wrote some tests around the stats conversions.
Properly named the finished parameter.

Handled the root JSON key
2016-08-24 10:35:04 +01:00
Martyn Inglis
c44a6cb65d Merge branch 'master' into new-api-for-deleting-templates 2016-08-23 09:31:05 +01:00
Martyn Inglis
49b4387b25 Merge branch 'master' into handle-new-template-stats-endpoint 2016-08-23 09:30:38 +01:00