feat(api/2): Removed meta from top of listings

wagtail/api/v2/pagination.py

@@ -37,9 +37,7 @@ def paginate_queryset(self, queryset, request, view=None):
 
     def get_paginated_response(self, data):
         data = OrderedDict([
-            ('meta', OrderedDict([
-                ('total_count', self.total_count),
-            ])),
+            ('total_count', self.total_count),
             (self.view.name, data),
         ])
         return Response(data)

wagtail/api/v2/tests/test_documents.py

@@ -31,14 +31,10 @@ def test_basic(self):
         # Will crash if the JSON is invalid
         content = json.loads(response.content.decode('UTF-8'))
 
-        # Check that the meta section is there
-        self.assertIn('meta', content)
-        self.assertIsInstance(content['meta'], dict)
-
         # Check that the total count is there and correct
-        self.assertIn('total_count', content['meta'])
-        self.assertIsInstance(content['meta']['total_count'], int)
-        self.assertEqual(content['meta']['total_count'], Document.objects.count())
+        self.assertIn('total_count', content)
+        self.assertIsInstance(content['total_count'], int)
+        self.assertEqual(content['total_count'], Document.objects.count())
 
         # Check that the documents section is there
         self.assertIn('documents', content)
@@ -193,7 +189,7 @@ def test_limit_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # The total count must not be affected by "limit"
-        self.assertEqual(content['meta']['total_count'], Document.objects.count())
+        self.assertEqual(content['total_count'], Document.objects.count())
 
     def test_limit_not_integer_gives_error(self):
         response = self.get_response(limit='abc')
@@ -246,7 +242,7 @@ def test_offset_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # The total count must not be affected by "offset"
-        self.assertEqual(content['meta']['total_count'], Document.objects.count())
+        self.assertEqual(content['total_count'], Document.objects.count())
 
     def test_offset_not_integer_gives_error(self):
         response = self.get_response(offset='abc')

wagtail/api/v2/tests/test_images.py

@@ -31,14 +31,10 @@ def test_basic(self):
         # Will crash if the JSON is invalid
         content = json.loads(response.content.decode('UTF-8'))
 
-        # Check that the meta section is there
-        self.assertIn('meta', content)
-        self.assertIsInstance(content['meta'], dict)
-
         # Check that the total count is there and correct
-        self.assertIn('total_count', content['meta'])
-        self.assertIsInstance(content['meta']['total_count'], int)
-        self.assertEqual(content['meta']['total_count'], get_image_model().objects.count())
+        self.assertIn('total_count', content)
+        self.assertIsInstance(content['total_count'], int)
+        self.assertEqual(content['total_count'], get_image_model().objects.count())
 
         # Check that the images section is there
         self.assertIn('images', content)
@@ -191,7 +187,7 @@ def test_limit_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # The total count must not be affected by "limit"
-        self.assertEqual(content['meta']['total_count'], get_image_model().objects.count())
+        self.assertEqual(content['total_count'], get_image_model().objects.count())
 
     def test_limit_not_integer_gives_error(self):
         response = self.get_response(limit='abc')
@@ -244,7 +240,7 @@ def test_offset_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # The total count must not be affected by "offset"
-        self.assertEqual(content['meta']['total_count'], get_image_model().objects.count())
+        self.assertEqual(content['total_count'], get_image_model().objects.count())
 
     def test_offset_not_integer_gives_error(self):
         response = self.get_response(offset='abc')

wagtail/api/v2/tests/test_pages.py

@@ -40,14 +40,10 @@ def test_basic(self):
         # Will crash if the JSON is invalid
         content = json.loads(response.content.decode('UTF-8'))
 
-        # Check that the meta section is there
-        self.assertIn('meta', content)
-        self.assertIsInstance(content['meta'], dict)
-
         # Check that the total count is there and correct
-        self.assertIn('total_count', content['meta'])
-        self.assertIsInstance(content['meta']['total_count'], int)
-        self.assertEqual(content['meta']['total_count'], get_total_page_count())
+        self.assertIn('total_count', content)
+        self.assertIsInstance(content['total_count'], int)
+        self.assertEqual(content['total_count'], get_total_page_count())
 
         # Check that the pages section is there
         self.assertIn('pages', content)
@@ -67,7 +63,7 @@ def test_unpublished_pages_dont_appear_in_list(self):
 
         response = self.get_response()
         content = json.loads(response.content.decode('UTF-8'))
-        self.assertEqual(content['meta']['total_count'], total_count - 1)
+        self.assertEqual(content['total_count'], total_count - 1)
 
     def test_private_pages_dont_appear_in_list(self):
         total_count = get_total_page_count()
@@ -80,7 +76,7 @@ def test_private_pages_dont_appear_in_list(self):
 
         response = self.get_response()
         content = json.loads(response.content.decode('UTF-8'))
-        self.assertEqual(content['meta']['total_count'], new_total_count)
+        self.assertEqual(content['total_count'], new_total_count)
 
 
     # TYPE FILTER
@@ -97,7 +93,7 @@ def test_type_filter_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # Total count must be reduced as this filters the results
-        self.assertEqual(content['meta']['total_count'], 3)
+        self.assertEqual(content['total_count'], 3)
 
     def test_non_existant_type_gives_error(self):
         response = self.get_response(type='demosite.IDontExist')
@@ -428,7 +424,7 @@ def test_limit_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # The total count must not be affected by "limit"
-        self.assertEqual(content['meta']['total_count'], get_total_page_count())
+        self.assertEqual(content['total_count'], get_total_page_count())
 
     def test_limit_not_integer_gives_error(self):
         response = self.get_response(limit='abc')
@@ -481,7 +477,7 @@ def test_offset_total_count(self):
         content = json.loads(response.content.decode('UTF-8'))
 
         # The total count must not be affected by "offset"
-        self.assertEqual(content['meta']['total_count'], get_total_page_count())
+        self.assertEqual(content['total_count'], get_total_page_count())
 
     def test_offset_not_integer_gives_error(self):
         response = self.get_response(offset='abc')