paginate jobs page

(only views/jobs/jobs.html, which is the drill-down page, not the dashboard view)

app/main/views/jobs.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import ago
-import time
 import dateutil
-import json
 from orderedset import OrderedSet
 from datetime import datetime, timedelta, timezone
 from itertools import chain
@@ -29,7 +27,8 @@ from app import (
 from app.main import main
 from app.utils import (
     get_page_from_request,
-    generate_previous_next_dict,
+    generate_next_dict,
+    generate_previous_dict,
     user_has_permissions,
     generate_notifications_csv,
     get_help_argument
@@ -66,6 +65,7 @@ def _set_status_filters(filter_args):
 @login_required
 @user_has_permissions('view_activity', admin_override=True)
 def view_jobs(service_id):
+    page = int(request.args.get('page', 1))
     # all but scheduled and cancelled
     statuses_to_display = [
         'pending',
@@ -73,12 +73,26 @@ def view_jobs(service_id):
         'finished',
         'sending limits exceeded',
     ]
+    jobs_response = job_api_client.get_jobs(service_id, statuses=statuses_to_display, page=page)
+    jobs = [
+        add_rate_to_job(job) for job in jobs_response['data']
+        if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
+    ]
+
+
+    prev_page = None
+    if jobs_response['links'].get('prev', None):
+        prev_page = generate_previous_dict('main.view_jobs', service_id, page=page - 1)
+    next_page = None
+    if jobs_response['links'].get('next', None):
+        next_page = generate_next_dict('main.view_jobs', service_id, page=page + 1)
+
     return render_template(
         'views/jobs/jobs.html',
-        jobs=[
-            add_rate_to_job(job) for job in job_api_client.get_jobs(service_id, statuses=statuses_to_display)['data']
-            if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
-        ]
+        jobs=jobs,
+        page=page,
+        prev_page=prev_page,
+        next_page=next_page,
     )
 
 
@@ -213,28 +227,18 @@ def get_notifications(service_id, message_type, status_override=None):
         template_type=[message_type],
         status=filter_args.get('status'),
         limit_days=current_app.config['ACTIVITY_STATS_LIMIT_DAYS'])
-    view_dict = dict(
-        message_type=message_type,
-        status=request.args.get('status')
-    )
+
+    url_args = {
+        'message_type': message_type,
+        'status': request.args.get('status')
+    }
     prev_page = None
     if notifications['links'].get('prev', None):
-        prev_page = generate_previous_next_dict(
-            'main.view_notifications',
-            service_id,
-            view_dict,
-            page - 1,
-            'Previous page',
-            'page {}'.format(page - 1))
+        prev_page = generate_previous_dict('main.view_notifications', service_id, page - 1, url_args=url_args)
     next_page = None
     if notifications['links'].get('next', None):
-        next_page = generate_previous_next_dict(
-            'main.view_notifications',
-            service_id,
-            view_dict,
-            page + 1,
-            'Next page',
-            'page {}'.format(page + 1))
+        next_page = generate_next_dict('main.view_notifications', service_id, page + 1, url_args)
+
     if request.path.endswith('csv'):
         csv_content = generate_notifications_csv(
             notification_api_client.get_notifications_for_service(

app/notify_client/job_api_client.py

@@ -38,8 +38,8 @@ class JobApiClient(BaseAPIClient):
 
         return job
 
-    def get_jobs(self, service_id, limit_days=None, statuses=None):
-        params = {}
+    def get_jobs(self, service_id, limit_days=None, statuses=None, page=1):
+        params = {'page': page}
         if limit_days is not None:
             params['limit_days'] = limit_days
         if statuses is not None:

app/templates/components/previous-next-navigation.html

@@ -8,7 +8,7 @@
             <span class="pagination-label">{{previous_page['label']}}</span>
           </a>
         </li>
-        {% endif %}
+      {% endif %}
       {% if next_page %}
         <li class="next-page">
           <a href="{{next_page['url']}}" rel="next">
@@ -19,4 +19,4 @@
       {% endif %}
     </ul>
   </nav>
-{% endmacro %}
+{% endmacro %}

app/templates/views/jobs/jobs.html

@@ -1,3 +1,4 @@
+{% from "components/previous-next-navigation.html" import previous_next_navigation %}
 {% extends "withnav_template.html" %}
 
 {% block page_title %}
@@ -8,5 +9,6 @@
     <h1 class="heading-large">Uploaded files</h1>
     <div class="dashboard">
       {% include 'views/dashboard/_jobs.html' %}
+      {{ previous_next_navigation(prev_page, next_page) }}
     </div>
 {% endblock %}