Merge pull request #921 from alphagov/fix-ajax-probs

Fix problem with AJAX not updating scheduled jobs

app/templates/partials/jobs/count.html

@@ -1,5 +1,5 @@
 {% from "components/pill.html" import pill %}
 
-<div class="bottom-gutter">
+<div class="bottom-gutter ajax-block-container">
   {{ pill('Status', counts, request.args.get('status', '')) }}
 </div>

app/templates/partials/jobs/notifications.html

@@ -1,12 +1,13 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
 
-{% if job.job_status == 'scheduled' %}
+<div class="ajax-block-container">
+  {% if job.job_status == 'scheduled' %}
 
     <p>
       Sending will start at {{ job.scheduled_for|format_time }}
     </p>
 
-{% else %}
+  {% else %}
 
     {% if notifications %}
       <div class="dashboard-table">
@@ -68,4 +69,5 @@
       </div>
     {% endif %}
 
-{% endif %}
+  {% endif %}
+</div>

app/templates/partials/jobs/status.html

@@ -1,4 +1,4 @@
-<div>
+<div class="ajax-block-container">
   <p class='heading-small bottom-gutter'>
     Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
   </p>

app/templates/views/dashboard/_jobs.html

@@ -1,7 +1,7 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
 {% from "components/big-number.html" import big_number -%}
 
-<div class='dashboard-table'>
+<div class='dashboard-table ajax-block-container'>
   {% call(item, row_number) list_table(
     jobs,
     caption="Recent files uploaded",

app/templates/views/dashboard/_totals.html

@@ -1,7 +1,7 @@
 {% from "components/big-number.html" import big_number_with_status %}
 {% from "components/message-count-label.html" import message_count_label %}
 
-<div class="grid-row">
+<div class="grid-row ajax-block-container">
   <div class="column-half">
     {{ big_number_with_status(
       statistics['email']['requested'],

app/templates/views/dashboard/_upcoming.html

@@ -2,7 +2,8 @@
 {% from "components/big-number.html" import big_number %}
 {% from "components/show-more.html" import show_more %}
 
-{% if scheduled_jobs %}
+<div class="ajax-block-container">
+  {% if scheduled_jobs %}
     <div class='dashboard-table'>
       <h2 class="heading-medium">
         In the next 24 hours
@@ -35,4 +36,5 @@
       {% endcall %}
       {{ show_more() }}
     </div>
-{% endif %}
+  {% endif %}
+</div>

app/templates/views/dashboard/_usage.html

@@ -1,6 +1,6 @@
 {% from "components/big-number.html" import big_number %}
 
-<div class='grid-row'>
+<div class='grid-row ajax-block-container'>
   <div class='column-half'>
     <div class="keyline-block">
       {{ big_number("Unlimited", 'free email allowance', smaller=True) }}

package.json

@@ -20,7 +20,7 @@
   "dependencies": {
     "babel-core": "6.3.26",
     "babel-preset-es2015": "6.3.13",
-    "diff-dom": "2.0.3",
+    "diff-dom": "2.1.0",
     "govuk-elements-sass": "1.1.1",
     "govuk_frontend_toolkit": "4.6.0",
     "govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.18.0/jinja_govuk_template-0.18.0.tgz",