Merge pull request #3426 from akvo/release/candidate

RSR release 3.40.3 Managua hot-fix
akvo · Nov 20, 2018 · 5762018 · 5762018
2 parents b291a35 + c8a1f5b
commit 5762018
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/akvo/rest/pagination.py b/akvo/rest/pagination.py
@@ -8,12 +8,18 @@
 from rest_framework.response import Response
 
 
-class LimitSizePageNumberPagination(pagination.PageNumberPagination):
+class StandardSizePageNumberPagination(pagination.PageNumberPagination):
     page_size = 30
     page_size_query_param = 'limit'
     max_page_size = 100
 
 
+class LargeSizePageNumberPagination(pagination.PageNumberPagination):
+    page_size = 100
+    page_size_query_param = 'limit'
+    max_page_size = 1000
+
+
 class TastypieOffsetPagination(pagination.LimitOffsetPagination):
 
     def get_paginated_response(self, data):

diff --git a/akvo/rest/views/indicator_dimension.py b/akvo/rest/views/indicator_dimension.py
@@ -6,6 +6,7 @@
 
 
 from akvo.rsr.models import IndicatorDimension
+from akvo.rest.pagination import LargeSizePageNumberPagination
 
 from ..serializers import IndicatorDimensionSerializer
 from ..viewsets import PublicProjectViewSet
@@ -17,3 +18,4 @@ class IndicatorDimensionViewSet(PublicProjectViewSet):
     queryset = IndicatorDimension.objects.all()
     serializer_class = IndicatorDimensionSerializer
     project_relation = 'indicator__result__project__'
+    pagination_class = LargeSizePageNumberPagination
diff --git a/akvo/rsr/static/dist/vendors.bundle.js b/akvo/rsr/static/dist/vendors.bundle.js
diff --git a/akvo/rsr/static/scripts-src/my-results/actions/model-actions.js b/akvo/rsr/static/scripts-src/my-results/actions/model-actions.js
@@ -65,7 +65,11 @@ function fetchFromAPI(baseUrl) {
             // if data.next then we have more data than fits in one go
             if (data.next) {
                 // calculate how many pages we need to get and consturct URLs
-                const pageNumbers = range(2, Math.ceil(data.count / c.API_LIMIT));
+                const limitParam = baseUrl.match(/limit=\d+/);
+                const pageSize = limitParam
+                    ? parseInt(limitParam[0].split("=")[1]) || c.API_LIMIT
+                    : c.API_LIMIT;
+                const pageNumbers = range(2, Math.ceil(data.count / pageSize));
                 const urls = pageNumbers.map(n => `${baseUrl}&page=${n}`);
                 // NOTE: we need to bind url to wrappedFetch or the array index will leak as a
                 // second param into the call. Nasty!

diff --git a/akvo/rsr/static/scripts-src/my-results/const.js b/akvo/rsr/static/scripts-src/my-results/const.js
@@ -7,6 +7,7 @@
 
 // TODO: several of these constants should be derived from the RSR settings
 export const API_LIMIT = 100,
+    API_LARGE_LIMIT = 1000,
     // From rsr.models.indicator.IndicatorPeriodData
     ROLE_ME_MANAGER = "ROLE_ME_MANAGER",
     ROLE_PROJECT_EDITOR = "ROLE_PROJECT_EDITOR",

diff --git a/akvo/rsr/static/scripts-src/my-results/utils.js b/akvo/rsr/static/scripts-src/my-results/utils.js
@@ -131,7 +131,9 @@ export const endpoints = {
     results: id => `/rest/v2/result/?format=json&limit=${c.API_LIMIT}&project=${id}`,
     indicators: id => `/rest/v1/indicator/?format=json&limit=${c.API_LIMIT}&result__project=${id}`,
     dimensions: id =>
-        `/rest/v1/indicator_dimension/?format=json&limit=${c.API_LIMIT}&result__project=${id}`,
+        `/rest/v1/indicator_dimension/?format=json&limit=${
+            c.API_LARGE_LIMIT
+        }&indicator__result__project=${id}`,
     periods: id =>
         `/rest/v1/indicator_period/?format=json&limit=${
             c.API_LIMIT

diff --git a/akvo/settings/30-rsr.conf b/akvo/settings/30-rsr.conf
@@ -51,7 +51,7 @@ REST_FRAMEWORK = {
         'rest_framework.parsers.JSONParser',
         'rest_framework_xml.parsers.XMLParser',
     ),
-    'DEFAULT_PAGINATION_CLASS': 'akvo.rest.pagination.LimitSizePageNumberPagination',
+    'DEFAULT_PAGINATION_CLASS': 'akvo.rest.pagination.StandardSizePageNumberPagination',
     'PAGE_SIZE': 30,
     # Harmonize datetime format across serializer formats
     'DATETIME_FORMAT': 'iso-8601',