Merge branch 'release/2.025.43' into release/2.025.47

Author: kobo-bot[bot]

jsapp/js/api/models/paginatedAuditLogResponseList.ts

@@ -12,7 +12,6 @@ The endpoints are grouped by area of intended use. Each category contains relate
 import type { AuditLogResponse } from './auditLogResponse'
 
 export interface PaginatedAuditLogResponseList {
-  count: number
   /** @nullable */
   next?: string | null
   /** @nullable */

jsapp/js/api/models/paginatedProjectHistoryLogResponseList.ts

@@ -12,7 +12,6 @@ The endpoints are grouped by area of intended use. Each category contains relate
 import type { ProjectHistoryLogResponse } from './projectHistoryLogResponse'
 
 export interface PaginatedProjectHistoryLogResponseList {
-  count: number
   /** @nullable */
   next?: string | null
   /** @nullable */

jsapp/js/api/models/paginatedSuperUserAccessLogResponseList.ts

@@ -0,0 +1,20 @@
+/**
+ * Generated by orval v7.10.0 🍺
+ * Do not edit manually.
+ * KoboToolbox Primary API
+ * This page documents all KoboToolbox API endpoints, except for those implementing the OpenRosa protocol, which are [documented separately](/api/openrosa/docs/).
+
+The endpoints are grouped by area of intended use. Each category contains related endpoints, with detailed documentation on usage and configuration. Use this as a reference to quickly find the right endpoint for managing projects, forms, data, permissions, integrations, logs, and organizational resources.
+
+**General note**: All projects (whether deployed or draft), as well as all library content (questions, blocks, templates, and collections) in the user-facing application are represented in the API as "assets".
+ * OpenAPI spec version: 2.0.0 (api_v2)
+ */
+import type { SuperUserAccessLogResponse } from './superUserAccessLogResponse'
+
+export interface PaginatedSuperUserAccessLogResponseList {
+  /** @nullable */
+  next?: string | null
+  /** @nullable */
+  previous?: string | null
+  results: SuperUserAccessLogResponse[]
+}

jsapp/js/api/models/superUserAccessLogResponse.ts

@@ -0,0 +1,21 @@
+/**
+ * Generated by orval v7.10.0 🍺
+ * Do not edit manually.
+ * KoboToolbox Primary API
+ * This page documents all KoboToolbox API endpoints, except for those implementing the OpenRosa protocol, which are [documented separately](/api/openrosa/docs/).
+
+The endpoints are grouped by area of intended use. Each category contains related endpoints, with detailed documentation on usage and configuration. Use this as a reference to quickly find the right endpoint for managing projects, forms, data, permissions, integrations, logs, and organizational resources.
+
+**General note**: All projects (whether deployed or draft), as well as all library content (questions, blocks, templates, and collections) in the user-facing application are represented in the API as "assets".
+ * OpenAPI spec version: 2.0.0 (api_v2)
+ */
+import type { SuperUserAccessLogResponseMetadata } from './superUserAccessLogResponseMetadata'
+
+export interface SuperUserAccessLogResponse {
+  user: string
+  date_created: string
+  username: string
+  metadata: SuperUserAccessLogResponseMetadata
+  user_uid: string
+  count: number
+}

jsapp/js/api/models/superUserAccessLogResponseMetadata.ts

@@ -0,0 +1,20 @@
+/**
+ * Generated by orval v7.10.0 🍺
+ * Do not edit manually.
+ * KoboToolbox Primary API
+ * This page documents all KoboToolbox API endpoints, except for those implementing the OpenRosa protocol, which are [documented separately](/api/openrosa/docs/).
+
+The endpoints are grouped by area of intended use. Each category contains related endpoints, with detailed documentation on usage and configuration. Use this as a reference to quickly find the right endpoint for managing projects, forms, data, permissions, integrations, logs, and organizational resources.
+
+**General note**: All projects (whether deployed or draft), as well as all library content (questions, blocks, templates, and collections) in the user-facing application are represented in the API as "assets".
+ * OpenAPI spec version: 2.0.0 (api_v2)
+ */
+
+export type SuperUserAccessLogResponseMetadata = {
+  source?: string
+  auth_type?: string
+  ip_address?: string
+  initial_user_uid?: string
+  initial_user_username?: string
+  authorized_app_name?: string
+}

jsapp/js/api/react-query/server-logs-superusers.ts

@@ -33,12 +33,12 @@ import type { ExportHistoryResponse } from '../models/exportHistoryResponse'
 
 import type { ExportListResponse } from '../models/exportListResponse'
 
-import type { PaginatedAccessLogResponseList } from '../models/paginatedAccessLogResponseList'
-
 import type { PaginatedAuditLogResponseList } from '../models/paginatedAuditLogResponseList'
 
 import type { PaginatedProjectHistoryLogResponseList } from '../models/paginatedProjectHistoryLogResponseList'
 
+import type { PaginatedSuperUserAccessLogResponseList } from '../models/paginatedSuperUserAccessLogResponseList'
+
 import type { PaginatedUserReportsListResponseList } from '../models/paginatedUserReportsListResponseList'
 
 import type { ProjectHistoryLogsListParams } from '../models/projectHistoryLogsListParams'
@@ -78,7 +78,7 @@ Submissions will be grouped together by user by hour
 
  */
 export type accessLogsListResponse200 = {
-  data: PaginatedAccessLogResponseList
+  data: PaginatedSuperUserAccessLogResponseList
   status: 200
 }
 

kobo/apps/audit_log/schema_extensions/v2/access_logs/serializers.py

@@ -28,6 +28,11 @@
     },
 )
 
+SuperUserAccessLogResponse = inline_serializer_class(
+    name='SuperUserAccessLogResponse',
+    fields=AccessLogResponse().get_fields(),
+)
+
 
 ExportListResponse = inline_serializer_class(
     name='ExportListResponse',

kobo/apps/audit_log/tests/api/v2/test_api_audit_log.py

@@ -71,7 +71,7 @@ def test_results_have_expected_fields(self):
             date_created=now,
         )
         response = self.client.get(self.url)
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         ph_log = response.data['results'][0]
         self.assertListEqual(
             sorted(list(ph_log.keys())),
@@ -121,7 +121,7 @@ def test_results_are_sorted_by_date_descending(self):
             date_created=now,
         )
         response = self.client.get(self.url)
-        self.assertEqual(response.data['count'], 2)
+        self.assertEqual(len(response.data['results']), 2)
         self.assertEqual(
             response.data['results'][0]['date_created'],
             now.strftime('%Y-%m-%dT%H:%M:%SZ'),
@@ -164,7 +164,7 @@ def test_results_can_be_searched_by_subtype(self):
             f'{self.url}?q=metadata__log_subtype:'
             f'{PROJECT_HISTORY_LOG_PERMISSION_SUBTYPE}'
         )
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         self.assertEqual(
             response.data['results'][0]['metadata']['log_subtype'],
             PROJECT_HISTORY_LOG_PERMISSION_SUBTYPE,
@@ -250,9 +250,7 @@ def test_list_as_superuser(self):
             },
         ]
         response = self.client.get(self.url)
-        audit_logs_count = AuditLog.objects.count()
         assert response.status_code == status.HTTP_200_OK
-        assert response.data['count'] == audit_logs_count
         assert response.data['results'] == expected
 
     def test_filter_list(self):
@@ -295,7 +293,6 @@ def test_filter_list(self):
         audit_logs_count = AuditLog.objects.count()
         assert response.status_code == status.HTTP_200_OK
         assert audit_logs_count == 2
-        assert response.data['count'] == 1
         assert response.data['results'] == expected
 
     def test_view_log_from_deleted_user(self):
@@ -314,7 +311,7 @@ def test_view_log_from_deleted_user(self):
         self.login_user(username='adminuser', password='pass')
         response = self.client.get(self.url)
         assert response.status_code == status.HTTP_200_OK
-        assert response.data['count'] == 1
+        assert len(response.data['results']) == 1
         assert response.data['results'][0]['username'] is None
         assert response.data['results'][0]['user'] is None
 
@@ -337,7 +334,7 @@ def test_show_user_access_logs_correctly_filters_to_user(self):
         self.force_login_user(user1)
 
         response = self.client.get(self.url)
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         self.assertEqual(response.data['results'][0]['username'], 'someuser')
 
     def test_endpoint_ignores_querystring(self):
@@ -349,7 +346,7 @@ def test_endpoint_ignores_querystring(self):
         self.force_login_user(user1)
         response = self.client.get(f'{self.url}?q=user__username:anotheruser')
         # check we still only got logs for the logged-in user
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         self.assertEqual(response.data['results'][0]['username'], 'someuser')
 
     def test_endpoint_orders_results_by_date_desc(self):
@@ -393,7 +390,7 @@ def test_endpoint_groups_submissions(self):
         )
         response = self.client.get(self.url)
         # should return 1 submission group with 2 submissions
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         result = response.data['results'][0]
         self.assertEqual(
             result['metadata']['auth_type'],
@@ -430,7 +427,7 @@ def test_show_all_access_logs_includes_all_users(self):
         AccessLog.objects.create(user=user2)
         self.force_login_user(admin)
         response = self.client.get(self.url)
-        self.assertEqual(response.data['count'], 2)
+        self.assertEqual(len(response.data['results']), 2)
         self.assertEqual(response.data['results'][0]['username'], 'anotheruser')
         self.assertEqual(response.data['results'][1]['username'], 'someuser')
 
@@ -472,7 +469,7 @@ def test_endpoint_groups_submissions(self):
         )
         response = self.client.get(self.url)
         # should return 2 submission group with 2 submissions each
-        self.assertEqual(response.data['count'], 2)
+        self.assertEqual(len(response.data['results']), 2)
 
         # user2's submission group should be first
         group1 = response.data['results'][0]
@@ -503,7 +500,7 @@ def test_can_search_access_logs_by_username(self):
         # only return logs from user1
         for audit_log_dict in response.data['results']:
             self.assertEqual(audit_log_dict['username'], 'anotheruser')
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
 
     def test_can_search_access_logs_by_username_including_submission_groups(
         self,
@@ -532,7 +529,7 @@ def test_can_search_access_logs_by_username_including_submission_groups(
         AccessLog.objects.create(user=user2)
 
         response = self.client.get(f'{self.url}?q=user__username:someuser')
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         result = response.data['results'][0]
         self.assertEqual(result['username'], 'someuser')
         self.assertEqual(
@@ -559,7 +556,7 @@ def test_can_search_access_logs_by_date(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         # should only return the log from tomorrow
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         result = response.data['results'][0]
         self.assertEqual(
             result['date_created'], tomorrow.strftime('%Y-%m-%dT%H:%M:%SZ')
@@ -593,7 +590,7 @@ def test_can_search_access_logs_by_date_including_submission_groups(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         # should only return the submission group
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         group = response.data['results'][0]
         self.assertEqual(
             group['date_created'],
@@ -656,7 +653,7 @@ def test_show_project_history_logs_filters_to_project(self):
             metadata={**self.default_metadata, 'asset_uid': asset2.uid},
         )
         response = self.client.get(self.url)
-        self.assertEqual(response.data['count'], 1)
+        self.assertEqual(len(response.data['results']), 1)
         self.assertEqual(
             response.data['results'][0]['metadata']['asset_uid'], self.asset.uid
         )
@@ -754,7 +751,7 @@ def test_show_all_project_history_logs(self):
             },
         )
         response = self.client.get(self.url)
-        self.assertEqual(response.data['count'], 2)
+        self.assertEqual(len(response.data['results']), 2)
         self.assertEqual(
             response.data['results'][0]['metadata']['asset_uid'], asset2.uid
         )

kobo/apps/audit_log/views.py

@@ -13,7 +13,7 @@
     ImportExportStatusChoices,
     ProjectHistoryLogExportTask,
 )
-from kpi.paginators import FastPagination, Paginated
+from kpi.paginators import FastPagination, NoCountPagination, Paginated
 from kpi.permissions import IsAuthenticated
 from kpi.renderers import BasicHTMLRenderer
 from kpi.tasks import export_task_in_background
@@ -30,6 +30,7 @@
     AccessLogResponse,
     ExportCreateResponse,
     ExportListResponse,
+    SuperUserAccessLogResponse,
 )
 from .schema_extensions.v2.audit_logs.serializers import (
     AuditLogResponse,
@@ -89,15 +90,15 @@ class AuditLogViewSet(mixins.ListModelMixin, viewsets.GenericViewSet):
         'model_name__icontains',
         'metadata__icontains',
     ]
-    pagination_class = FastPagination
+    pagination_class = NoCountPagination
 
 
 @extend_schema_view(
     list=extend_schema(
         tags=['Server logs (superusers)'],
         description=read_md('audit_log', 'access_logs/list'),
         responses=open_api_200_ok_response(
-            AccessLogResponse,
+            SuperUserAccessLogResponse,
             require_auth=False,
             validate_payload=False,
             raise_not_found=False,
@@ -116,7 +117,6 @@ class AllAccessLogViewSet(AuditLogViewSet):
     """
     queryset = AccessLog.objects.with_submissions_grouped().order_by('-date_created')
     serializer_class = AccessLogSerializer
-    pagination_class = Paginated
 
 
 @extend_schema_view(
@@ -165,9 +165,9 @@ class AllProjectHistoryLogViewSet(AuditLogViewSet):
     ViewSet for managing the all projects history
 
     Available actions:
-    - list        → GET  /api/v2/asset/project-history-logs/
-    - export        → GET  /api/v2/asset/project-history-logs/export/
-    - export        → POST /api/v2/asset/project-history-logs/export/
+    - list        → GET  /api/v2/project-history-logs/
+    - export        → GET  /api/v2/project-history-logs/export/
+    - export        → POST /api/v2/project-history-logs/export/
 
     Documentation:
     - docs/api/v2/project-history-log/list.md
@@ -286,9 +286,9 @@ class ProjectHistoryLogViewSet(
     ViewSet for managing the current project's history
 
     Available actions:
-    - action        → GET   /api/v2/asset/{uid_asset}/history/action/
-    - export        → POST  /api/v2/asset/{uid_asset}/history/
-    - list          → GET   /api/v2/asset/{uid_asset}/history/
+    - action        → GET   /api/v2/assets/{uid_asset}/history/action/
+    - export        → POST  /api/v2/assets/{uid_asset}/history/
+    - list          → GET   /api/v2/assets/{uid_asset}/history/
 
     Documentation:
     - docs/api/v2/history/action.md
@@ -300,6 +300,7 @@ class ProjectHistoryLogViewSet(
     model = ProjectHistoryLog
     permission_classes = (ViewProjectHistoryLogsPermission,)
     lookup_field = 'uid'
+    pagination_class = FastPagination
 
     def get_queryset(self):
         return self.model.objects.filter(metadata__asset_uid=self.asset_uid).order_by(