qa fixes

PostHog · Dec 19, 2024 · dceb226 · dceb226
1 parent 2916760
commit dceb226
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/frontend/src/scenes/error-tracking/errorTrackingDataNodeLogic.tsx b/frontend/src/scenes/error-tracking/errorTrackingDataNodeLogic.tsx
@@ -42,14 +42,17 @@ export const errorTrackingDataNodeLogic = kea<errorTrackingDataNodeLogicType>([
                     ...values.response,
                     results: results
                         // remove merged issues
-                        .filter(({ id }) => !ids.includes(id))
+                        .filter(({ id }) => !mergingIds.includes(id))
                         .map((issue) =>
                             // replace primary issue
                             mergedIssue.id === issue.id ? mergedIssue : issue
                         ),
                 })
-                await api.errorTracking.mergeInto(primaryIssue.id, mergingIds)
-                actions.loadData(true)
+                try {
+                    await api.errorTracking.mergeInto(primaryIssue.id, mergingIds)
+                } catch (e) {
+                    actions.loadData(true)
+                }
             }
         },
         assignIssue: async ({ id, assigneeId }) => {

diff --git a/posthog/api/__init__.py b/posthog/api/__init__.py
@@ -515,12 +515,12 @@ def register_grandfathered_environment_nested_viewset(
     ["team_id"],
 )
 
-# projects_router.register(
-#     r"error_tracking",
-#     error_tracking.ErrorTrackingGroupViewSet,
-#     "project_error_tracking",
-#     ["team_id"],
-# )
+projects_router.register(
+    r"error_tracking/issue",
+    error_tracking.ErrorTrackingIssueViewSet,
+    "project_error_tracking_issue",
+    ["team_id"],
+)
 
 projects_router.register(
     r"error_tracking/stack_frames",

diff --git a/posthog/api/error_tracking.py b/posthog/api/error_tracking.py
@@ -34,7 +34,7 @@ class Meta:
         fields = ["assignee", "status"]
 
 
-class ErrorTrackingGroupViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
+class ErrorTrackingIssueViewSet(TeamAndOrgViewSetMixin, ForbidDestroyModel, viewsets.ModelViewSet):
     scope_object = "INTERNAL"
     queryset = ErrorTrackingIssue.objects.all()
     serializer_class = ErrorTrackingIssueSerializer