Get paginator limit from url params (#646)

* Get paginator limit from url params

When profiling requests with a huge number of queries sometimes we end up with multiple pages. This will allow the user to specify a page size via URL params.

* Handle invalid pages, add page size selector

Author: strig

project/tests/test_end_points.py

@@ -61,7 +61,16 @@ def test_request_sql(self):
             .filter(request_id__isnull=False)
         )
         request_id = request_query_data['request_id']
-        response = self.client.get(silky_reverse('request_sql', kwargs={'request_id': request_id}))
+        base_url = silky_reverse('request_sql', kwargs={'request_id': request_id})
+        response = self.client.get(base_url)
+        self.assertTrue(response.status_code == 200)
+
+        # Test with valid page size
+        response = self.client.get(base_url + "?per_page=100")
+        self.assertTrue(response.status_code == 200)
+
+        # Test with invalid page size
+        response = self.client.get(base_url + "?per_page=notanumber")
         self.assertTrue(response.status_code == 200)
 
     def test_request_sql_detail(self):

silk/templates/silk/sql.html

@@ -22,6 +22,26 @@
     <link rel="stylesheet" href="{% static 'silk/css/components/cell.css' %}">
 {% endblock %}
 
+{% block filter %}
+    <form id="filter-form" action="." method="get"></form>
+
+    <div class="menu-item">
+        <div class="menu-item-outer">
+            <div class="menu-item-inner">
+                <label>Show:
+                    <select name="per_page" form="filter-form" onchange="this.form.submit();">
+                        {% for option in options_page_size %}
+                            <option value="{{ option }}"
+                                    {% if option == per_page %}selected{% endif %}>{{ option }}</option>
+                        {% endfor %}
+                    </select>
+                </label>
+            </div>
+        </div>
+    </div>
+    {{ block.super }}
+{% endblock %}
+
 {% block menu %}
     {% if profile %}
         {% profile_menu request profile silk_request %}
@@ -78,13 +98,13 @@
 
                 <div class="step-links">
                     {% if items.has_previous %}
-                        <a href="?page={{ items.previous_page_number }}">previous</a>
+                        <a href="?page={{ items.previous_page_number }}&per_page={{ per_page }}">previous</a>
                     {% else %}
                         previous
                     {% endif %}
                     |
                     {% if items.has_next %}
-                        <a href="?page={{ items.next_page_number }}">next</a>
+                        <a href="?page={{ items.next_page_number }}&per_page={{ per_page }}">next</a>
                     {% else %}
                         next
                     {% endif %}

silk/utils/pagination.py

@@ -3,8 +3,8 @@
 __author__ = 'mtford'
 
 
-def _page(request, query_set):
-    paginator = Paginator(query_set, 200)
+def _page(request, query_set, per_page=200):
+    paginator = Paginator(query_set, per_page)
     page_number = request.GET.get('page')
     try:
         page = paginator.page(page_number)

silk/views/sql.py

@@ -10,25 +10,33 @@
 
 
 class SQLView(View):
+    page_sizes = [5, 10, 25, 100, 200, 500, 1000]
+    default_page_size = 200
 
     @method_decorator(login_possibly_required)
     @method_decorator(permissions_possibly_required)
     def get(self, request, *_, **kwargs):
         request_id = kwargs.get('request_id')
         profile_id = kwargs.get('profile_id')
+        try:
+            per_page = int(request.GET.get('per_page', self.default_page_size))
+        except (TypeError, ValueError):
+            per_page = self.default_page_size
         context = {
             'request': request,
+            'options_page_size': self.page_sizes,
+            'per_page': per_page,
         }
         if request_id:
             silk_request = Request.objects.get(id=request_id)
             query_set = SQLQuery.objects.filter(request=silk_request).order_by('-start_time')
             for q in query_set:
                 q.start_time_relative = q.start_time - silk_request.start_time
-            page = _page(request, query_set)
+            page = _page(request, query_set, per_page)
             context['silk_request'] = silk_request
         if profile_id:
             p = Profile.objects.get(id=profile_id)
-            page = _page(request, p.queries.order_by('-start_time').all())
+            page = _page(request, p.queries.order_by('-start_time').all(), per_page)
             context['profile'] = p
         if not (request_id or profile_id):
             raise KeyError('no profile_id or request_id')