Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(file-system): load creators with the folder count preview (#126409)

Paul D'Ambraf9e790942589
diff --git a/posthog/api/file_system/file_system.py b/posthog/api/file_system/file_system.py
index e50372d49598..23f2aff21c57 100644
--- a/posthog/api/file_system/file_system.py
+++ b/posthog/api/file_system/file_system.py
@@ -1451,22 +1451,7 @@ class FileSystemViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
if instance.type != "folder":
return Response({"detail": "Count can only be called on folders"}, status=status.HTTP_400_BAD_REQUEST)
- qs = FileSystem.objects.filter(path__startswith=f"{instance.path}/").order_by("depth", "path")
- qs = self._scope_by_project_and_environment(qs).exclude(type__in=RETIRED_FILE_SYSTEM_TYPES)
- qs = self._filter_by_access_control(qs)
-
- total_count = qs.count()
- preview_entries = list(qs[:DELETE_PREVIEW_ENTRY_LIMIT])
- serializer = self.get_serializer(preview_entries, many=True)
-
- return Response(
- {
- "count": total_count,
- "entries": serializer.data,
- "has_more": total_count > len(preview_entries),
- },
- status=status.HTTP_200_OK,
- )
+ return self._folder_count_response(instance.path)
@action(methods=["GET", "POST"], detail=False, url_path="log_view")
@disallow_if_impersonated(message="Impersonated sessions cannot log file system views.", allowed_methods=["GET"])
@@ -1524,7 +1509,14 @@ class FileSystemViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewSet):
if not path_param:
return Response({"detail": "path parameter is required"}, status=status.HTTP_400_BAD_REQUEST)
- qs = FileSystem.objects.filter(path__startswith=f"{path_param}/").order_by("depth", "path")
+ return self._folder_count_response(path_param)
+
+ def _folder_count_response(self, folder_path: str) -> Response:
+ qs = (
+ FileSystem.objects.filter(path__startswith=f"{folder_path}/")
+ .select_related("created_by")
+ .order_by("depth", "path")
+ )
qs = self._scope_by_project_and_environment(qs).exclude(type__in=RETIRED_FILE_SYSTEM_TYPES)
qs = self._filter_by_access_control(qs)
diff --git a/posthog/api/file_system/test/test_file_system.py b/posthog/api/file_system/test/test_file_system.py
index c3d870f68366..efcdef2f5430 100644
--- a/posthog/api/file_system/test/test_file_system.py
+++ b/posthog/api/file_system/test/test_file_system.py
@@ -981,6 +981,36 @@ class TestFileSystemAPI(APIBaseTest):
self.assertEqual(len(data["entries"]), DELETE_PREVIEW_ENTRY_LIMIT)
self.assertTrue(data["has_more"])
+ @parameterized.expand([("count",), ("count_by_path",)])
+ def test_count_preview_queries_do_not_scale_with_rows(self, endpoint: str) -> None:
+ folder = FileSystem.objects.create(team=self.team, path="ScaleFolder", type="folder", created_by=self.user)
+ if endpoint == "count":
+ url = f"/api/projects/{self.team.id}/file_system/{folder.pk}/count"
+ else:
+ url = f"/api/projects/{self.team.id}/file_system/count_by_path?path=ScaleFolder"
+
+ def create_files(start: int, end: int) -> None:
+ for index in range(start, end):
+ FileSystem.objects.create(
+ team=self.team, path=f"ScaleFolder/File{index}", type="feature_flag", created_by=self.user
+ )
+
+ def query_count(expected_entries: int) -> int:
+ cache.clear()
+ with CaptureQueriesContext(connection) as ctx:
+ response = self.client.post(url)
+ self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())
+ self.assertEqual(len(response.json()["entries"]), expected_entries)
+ return len(ctx)
+
+ create_files(0, 2)
+ self.client.post(url)
+ few = query_count(2)
+ create_files(2, 6)
+ many = query_count(6)
+
+ self.assertEqual(few, many)
+
def test_list_by_type_filter(self):
"""
Ensure that the list endpoint filters results by the 'type' query parameter.