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.

feat(devex): move the data deletion request workflow into the admin console (#130730)

Julian Bezde619af5a296
diff --git a/.agents/skills/extending-the-admin-console/SKILL.md b/.agents/skills/extending-the-admin-console/SKILL.md
index 4d35ae94ceec..adad9c1a89de 100644
--- a/.agents/skills/extending-the-admin-console/SKILL.md
+++ b/.agents/skills/extending-the-admin-console/SKILL.md
@@ -49,7 +49,7 @@ Invoke `/writing-user-facing-copy`. In the console that means:
1. Point the operation at the old view with `AdminViewBridge(Model, SomeAdmin.view_method)` while the logic still lives in the `ModelAdmin`.
2. Replace the old button in Django admin with `MovedToConsole.action("<record>", obj, "<panel-key>", "<what moved>")`, so staff who look in the usual place find the new one.
3. When a whole page moves, keep its old URL name and route it to `MovedToConsole.page_redirect`, which tells staff the page moved.
-4. Every old URL keeps working, query parameters included. Support staff keep bookmarks to old admin pages and actions. When you delete a record action's view, add its old path to `MOVED_TEAM_ACTIONS` or `MOVED_ORGANIZATION_ACTIONS` in `posthog/admin/console/urls.py`, so it redirects to the console form or panel.
+4. Every old URL keeps working, query parameters included. Support staff keep bookmarks to old admin pages and actions. When you delete a record action's view, add its old path to the `MOVED_*_ACTIONS` map of its record type in `posthog/admin/console/urls.py`, so it redirects to the console form or panel.
## 6. Before you call it done
diff --git a/posthog/admin/admins/data_deletion_request_admin.py b/posthog/admin/admins/data_deletion_request_admin.py
index ff4fd85f7f98..0341a0193a79 100644
--- a/posthog/admin/admins/data_deletion_request_admin.py
+++ b/posthog/admin/admins/data_deletion_request_admin.py
@@ -4,26 +4,18 @@ from datetime import UTC
from django import forms
from django.conf import settings
from django.contrib import admin, messages
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
-from django.template.response import TemplateResponse
-from django.urls import path, reverse
+from django.urls import reverse
from django.utils import timezone
from django.utils.dateparse import parse_datetime
from django.utils.html import format_html
from posthog.models.data_deletion_request import (
- AUTO_APPROVE_INTERVAL_MINUTES,
- AUTO_APPROVE_MAX_EVENTS,
DataDeletionRequest,
ExecutionMode,
RequestStatus,
RequestType,
build_deletion_count_query,
- count_adhoc_event_deletion_backlog,
- count_remaining_for_request,
- fetch_deletion_stats,
invalidate_compiled_predicate_cache,
- refresh_deletion_stats,
)
from posthog.models.team import Team
@@ -494,431 +486,9 @@ class DataDeletionRequestAdmin(admin.ModelAdmin):
"This person removal request has no drop flag set "
"(profiles/events/recordings) — nothing will be deleted.",
)
- extra_context["is_draft"] = obj.status == RequestStatus.DRAFT
- extra_context["submit_url"] = reverse("admin:posthog_datadeletionrequest_submit", args=[obj.pk])
- extra_context["can_approve"] = (
- obj.status == RequestStatus.PENDING and request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists()
- )
- extra_context["approve_url"] = reverse("admin:posthog_datadeletionrequest_approve", args=[obj.pk])
- extra_context["can_revert_to_draft"] = obj.status in (RequestStatus.PENDING, RequestStatus.APPROVED)
- extra_context["revert_to_draft_url"] = reverse(
- "admin:posthog_datadeletionrequest_revert_to_draft", args=[obj.pk]
- )
- extra_context["can_retry"] = (
- obj.status == RequestStatus.FAILED and request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists()
- )
- extra_context["retry_url"] = reverse("admin:posthog_datadeletionrequest_retry", args=[obj.pk])
- extra_context["can_verify"] = request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists()
- extra_context["verify_url"] = reverse("admin:posthog_datadeletionrequest_verify", args=[obj.pk])
-
- # ClickHouse stats are calculated from this page (works for any status).
- extra_context["fetch_stats_url"] = reverse("admin:posthog_datadeletionrequest_fetch_stats", args=[obj.pk])
- extra_context["preview_stats_url"] = reverse(
- "admin:posthog_datadeletionrequest_preview_stats", args=[obj.pk]
- )
- extra_context["is_clickhouse_team"] = request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists()
- preview_stats = request.session.pop("data_deletion_preview_stats", None)
- if preview_stats and str(preview_stats.get("obj_pk")) != str(obj.pk):
- # Belongs to a different request — drop it rather than mislead the operator.
- preview_stats = None
- extra_context["preview_stats"] = preview_stats
-
if self._is_locked(obj):
# Locked requests have no editable fields — hide the misleading Save row.
extra_context["show_save"] = False
extra_context["show_save_and_continue"] = False
extra_context["show_save_and_add_another"] = False
return super().change_view(request, object_id, form_url, extra_context)
-
- def get_urls(self):
- urls = super().get_urls()
- custom_urls = [
- path(
- "<path:object_id>/submit/",
- self.admin_site.admin_view(self.submit_view),
- name="posthog_datadeletionrequest_submit",
- ),
- path(
- "<path:object_id>/fetch-stats/",
- self.admin_site.admin_view(self.fetch_stats_view),
- name="posthog_datadeletionrequest_fetch_stats",
- ),
- path(
- "<path:object_id>/preview-stats/",
- self.admin_site.admin_view(self.preview_stats_view),
- name="posthog_datadeletionrequest_preview_stats",
- ),
- path(
- "<path:object_id>/approve/",
- self.admin_site.admin_view(self.approve_view),
- name="posthog_datadeletionrequest_approve",
- ),
- path(
- "<path:object_id>/revert-to-draft/",
- self.admin_site.admin_view(self.revert_to_draft_view),
- name="posthog_datadeletionrequest_revert_to_draft",
- ),
- path(
- "<path:object_id>/retry/",
- self.admin_site.admin_view(self.retry_view),
- name="posthog_datadeletionrequest_retry",
- ),
- path(
- "<path:object_id>/verify/",
- self.admin_site.admin_view(self.verify_view),
- name="posthog_datadeletionrequest_verify",
- ),
- ]
- return custom_urls + urls
-
- def submit_view(self, request, object_id):
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if obj.status != RequestStatus.DRAFT:
- messages.error(request, "Only draft requests can be submitted.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- missing_properties = (
- obj.request_type == RequestType.PROPERTY_REMOVAL and not obj.properties and not obj.person_properties
- )
- missing_person_selectors = obj.request_type == RequestType.PERSON_REMOVAL and not (
- obj.person_uuids or obj.person_distinct_ids
- )
- missing_person_drop_flag = obj.request_type == RequestType.PERSON_REMOVAL and not (
- obj.person_drop_profiles or obj.person_drop_events or obj.person_drop_recordings
- )
- can_submit = not (missing_properties or missing_person_selectors or missing_person_drop_flag)
- # Only event removals are ever auto-approved, so they're the only ones offered the opt-out.
- # Everything else about eligibility (the time range, the size) is time-dependent and left to
- # the sweep job, which re-evaluates it against stats it fetches itself.
- auto_approve_candidate = obj.request_type == RequestType.EVENT_REMOVAL
-
- if request.method == "POST":
- if missing_properties:
- messages.error(
- request,
- "Cannot submit: property removal request requires at least one property or person_property.",
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
- if missing_person_selectors:
- messages.error(
- request,
- "Cannot submit: person removal request requires at least one person UUID or distinct ID.",
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
- if missing_person_drop_flag:
- messages.error(
- request,
- "Cannot submit: person removal request requires at least one drop flag (profiles/events/recordings).",
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
- # The checkbox only posts when ticked. A request that can't be auto-approved at all still
- # gets True: the field means "a human must approve this", and leaving it False would hide
- # the request from the changelist's "requires approval" filter — on precisely the requests
- # a reviewer needs to find.
- requires_approval = not auto_approve_candidate or bool(request.POST.get("requires_approval"))
- return self._submit_for_approval(request, obj, requires_approval=requires_approval)
-
- context = {
- **self.admin_site.each_context(request),
- "obj": obj,
- "missing_properties": missing_properties,
- "missing_person_selectors": missing_person_selectors,
- "missing_person_drop_flag": missing_person_drop_flag,
- "is_person_removal": obj.request_type == RequestType.PERSON_REMOVAL,
- "can_submit": can_submit,
- "auto_approve_candidate": auto_approve_candidate,
- # Thousands separators are applied here — django.contrib.humanize isn't installed.
- "auto_approve_max_events": f"{AUTO_APPROVE_MAX_EVENTS:,}",
- "auto_approve_interval_minutes": AUTO_APPROVE_INTERVAL_MINUTES,
- "opts": self.model._meta,
- "title": f"Submit deletion request {obj.pk}",
- }
- return TemplateResponse(request, "admin/posthog/datadeletionrequest/submit.html", context)
-
- def _submit_for_approval(
- self, request: HttpRequest, obj: DataDeletionRequest, *, requires_approval: bool
- ) -> HttpResponse:
- """Move the request draft → pending. Approval is somebody else's job, human or scheduled."""
- updated = DataDeletionRequest.objects.filter(
- pk=obj.pk,
- status=RequestStatus.DRAFT,
- ).update(
- status=RequestStatus.PENDING,
- requires_approval=requires_approval,
- updated_at=timezone.now(),
- )
- if not updated:
- messages.error(request, "Request is no longer in draft status.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
- obj.refresh_from_db()
- self.log_change(request, obj, "Submitted: status changed from draft to pending.")
- if requires_approval:
- messages.success(request, "Request submitted and is now pending ClickHouse Team approval.")
- else:
- messages.success(
- request,
- f"Request submitted and is now pending. The auto-approval job will check it within the next "
- f"{AUTO_APPROVE_INTERVAL_MINUTES} minutes and approve it if it matches fewer than "
- f"{AUTO_APPROVE_MAX_EVENTS:,} events.",
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- def fetch_stats_view(self, request, object_id):
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if request.method != "POST":
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if obj.request_type == RequestType.PERSON_REMOVAL:
- # No ClickHouse query yet for person_removal — just count selectors.
- obj.count = len(obj.person_uuids) + len(obj.person_distinct_ids)
- obj.stats_calculated_at = timezone.now()
- obj.save(update_fields=["count", "stats_calculated_at", "updated_at"])
- self.log_change(request, obj, "Counted person_removal selectors.")
- messages.success(request, f"Selector count: {obj.count} person target(s).")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- try:
- stats = refresh_deletion_stats(obj, user_id=request.user.id)
- self.log_change(request, obj, "Fetched ClickHouse stats.")
- messages.success(request, f"Stats fetched: {stats['count']:,} matching events found.")
- except Exception as e:
- messages.error(request, f"Failed to fetch stats: {e}")
-
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- def preview_stats_view(self, request, object_id):
- """ClickHouse-Team-only ephemeral stats run.
-
- Runs the same ClickHouse queries as ``fetch_stats_view`` but does **not**
- persist anything to the model — useful while iterating on a predicate.
- Results are stashed in the session and rendered on the next change page
- render under a separate "Preview (not saved)" block.
- """
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if not request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists():
- messages.error(request, "Only ClickHouse Team members can preview stats.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if request.method != "POST":
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if obj.request_type == RequestType.PERSON_REMOVAL:
- count = len(obj.person_uuids) + len(obj.person_distinct_ids)
- request.session["data_deletion_preview_stats"] = {
- "obj_pk": str(obj.pk),
- "count": count,
- "calculated_at": timezone.now().isoformat(),
- }
- messages.info(request, f"Preview selector count: {count} person target(s). Not saved.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- try:
- stats = fetch_deletion_stats(obj, user_id=request.user.id)
- request.session["data_deletion_preview_stats"] = {
- "obj_pk": str(obj.pk),
- "count": stats["count"],
- "part_count": stats["part_count"],
- "parts_size": stats["parts_size"],
- "parts_row_count": stats["parts_row_count"],
- "min_timestamp": stats["min_timestamp"].isoformat() if stats["min_timestamp"] else None,
- "max_timestamp": stats["max_timestamp"].isoformat() if stats["max_timestamp"] else None,
- "calculated_at": timezone.now().isoformat(),
- }
- messages.info(
- request,
- f"Preview stats: {stats['count']:,} matching events. Not saved to the request.",
- )
- except Exception as e:
- messages.error(request, f"Failed to preview stats: {e}")
-
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- def approve_view(self, request, object_id):
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if not request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists():
- messages.error(request, "Only ClickHouse Team members can approve deletion requests.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- supports_deferred = obj.request_type in (RequestType.EVENT_REMOVAL, RequestType.HOGQL_EVENT_REMOVAL)
- is_hogql_event_removal = obj.request_type == RequestType.HOGQL_EVENT_REMOVAL
- default_execution_mode = ExecutionMode.DEFERRED if supports_deferred else ExecutionMode.IMMEDIATE
-
- if request.method == "POST":
- execution_mode = request.POST.get("execution_mode", default_execution_mode)
- if is_hogql_event_removal:
- execution_mode = ExecutionMode.DEFERRED
- elif obj.request_type == RequestType.PERSON_REMOVAL:
- execution_mode = ExecutionMode.IMMEDIATE
- if execution_mode not in ExecutionMode.values:
- messages.error(request, f"Invalid execution mode: {execution_mode!r}.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_approve", args=[obj.pk]))
- if execution_mode == ExecutionMode.DEFERRED and not supports_deferred:
- messages.error(request, "Deferred execution is only supported for event removal requests.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_approve", args=[obj.pk]))
-
- updated = DataDeletionRequest.objects.filter(
- pk=obj.pk,
- status=RequestStatus.PENDING,
- ).update(
- status=RequestStatus.APPROVED,
- approved=True,
- approved_by=request.user,
- approved_at=timezone.now(),
- execution_mode=execution_mode,
- updated_at=timezone.now(),
- )
-
- if not updated:
- messages.error(request, "Only pending requests can be approved.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- obj.refresh_from_db()
- self.log_change(request, obj, f"Approved deletion request (execution_mode={execution_mode}).")
- messages.success(request, f"Deletion request approved ({obj.get_execution_mode_display()}).")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if obj.status != RequestStatus.PENDING:
- messages.error(request, "Only pending requests can be approved.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- # The backlog only informs the approver, so a ClickHouse failure must not block approval.
- try:
- adhoc_backlog = count_adhoc_event_deletion_backlog(obj.team_id)
- except Exception as e:
- adhoc_backlog = None
- messages.warning(request, f"Could not count queued adhoc event deletions: {e}")
-
- context = {
- **self.admin_site.each_context(request),
- "obj": obj,
- "adhoc_backlog": adhoc_backlog,
- "supports_deferred": supports_deferred,
- "is_hogql_event_removal": is_hogql_event_removal,
- "is_person_removal": obj.request_type == RequestType.PERSON_REMOVAL,
- "execution_mode_choices": ExecutionMode.choices,
- "default_execution_mode": default_execution_mode,
- "opts": self.model._meta,
- "title": f"Approve deletion request {obj.pk}",
- }
- return TemplateResponse(request, "admin/posthog/datadeletionrequest/approve.html", context)
-
- def revert_to_draft_view(self, request, object_id):
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if request.method != "POST":
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- updated = DataDeletionRequest.objects.filter(
- pk=obj.pk,
- status__in=[RequestStatus.PENDING, RequestStatus.APPROVED],
- ).update(
- status=RequestStatus.DRAFT,
- approved=False,
- approved_automatically=False,
- approved_by=None,
- approved_at=None,
- updated_at=timezone.now(),
- )
-
- if not updated:
- messages.error(request, "Only pending or approved requests can be moved back to draft.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- obj.refresh_from_db()
- self.log_change(request, obj, "Reverted to draft: cleared approval.")
- messages.success(request, "Request moved back to draft.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- def retry_view(self, request, object_id):
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if request.method != "POST":
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if not request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists():
- messages.error(request, "Only ClickHouse Team members can retry deletion requests.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- # Re-promote FAILED → APPROVED so the pickup sensor relaunches the job.
- # approved_by / approved_at are preserved — the retry re-executes the same approval.
- # attempt_count and last_executed_at are bumped by the load_* op when execution actually starts.
- updated = DataDeletionRequest.objects.filter(
- pk=obj.pk,
- status=RequestStatus.FAILED,
- ).update(status=RequestStatus.APPROVED, updated_at=timezone.now())
-
- if not updated:
- messages.error(request, "Only failed requests can be retried.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- obj.refresh_from_db()
- next_attempt = obj.attempt_count + 1
- self.log_change(request, obj, f"Retry triggered (attempt #{next_attempt}): status FAILED → APPROVED.")
- messages.success(
- request,
- "Request requeued. The pickup sensor will launch a new run on its next tick.",
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- def verify_view(self, request, object_id):
- obj = self.get_object(request, object_id)
- if not obj:
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_changelist"))
-
- if request.method != "POST":
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if not request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists():
- messages.error(request, "Only ClickHouse Team members can verify deletion requests.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if obj.request_type in (RequestType.PERSON_REMOVAL, RequestType.HOGQL_EVENT_REMOVAL):
- request_type = obj.get_request_type_display().lower()
- messages.warning(
- request, f"Automated verification is not available for {request_type} requests. Verify manually."
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- try:
- remaining = count_remaining_for_request(obj)
- except Exception as e:
- messages.error(request, f"Failed to verify: {e}")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- if remaining:
- messages.warning(
- request,
- f"{remaining} matching row(s) still present in ClickHouse. "
- f"Left {obj.get_status_display().lower()} — re-run after the next scheduled deletion.",
- )
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
-
- prior_status = obj.status
- promoted = (
- DataDeletionRequest.objects.filter(pk=obj.pk)
- .exclude(status=RequestStatus.COMPLETED)
- .update(status=RequestStatus.COMPLETED, updated_at=timezone.now())
- )
- if promoted:
- obj.refresh_from_db()
- self.log_change(request, obj, f"Verified: 0 matching rows remain, status {prior_status} → completed.")
- messages.success(request, "Verified — no matching rows remain. Marked completed.")
- else:
- messages.info(request, "Verified — no matching rows remain. Already completed.")
- return HttpResponseRedirect(reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]))
diff --git a/posthog/admin/console/AGENTS.md b/posthog/admin/console/AGENTS.md
index b7f1c3db12ca..11e5975225ba 100644
--- a/posthog/admin/console/AGENTS.md
+++ b/posthog/admin/console/AGENTS.md
@@ -18,7 +18,7 @@ Before you add or change a panel, operation or tool, invoke `/extending-the-admi
## Add a panel
-1. In `products/<product>/backend/console.py`, subclass `Panel` and decorate it with `@console.register_panel`. Set `record` to a key from `RECORD_TYPES` in `records.py` (`team` or `organization`). Import only your product's `facade/`, `posthog.admin.console`, and, for a bridge, the `ModelAdmin` that still holds the view. `products/workflows/backend/console.py` is the reference.
+1. In `products/<product>/backend/console.py`, subclass `Panel` and decorate it with `@console.register_panel`. Set `record` to a key from `RECORD_TYPES` in `records.py` (`team`, `organization` or `deletion-request`). Import only your product's `facade/`, `posthog.admin.console`, and, for a bridge, the `ModelAdmin` that still holds the view. `products/workflows/backend/console.py` is the reference.
2. Set `owner = Owner(name=..., crest=...)`. The crest is a mini crest slug from `@posthog/brand`, for example `workflows`.
3. For each action, return an `Operation`. Put its inputs in a Django `forms.Form` (`form_class`); the console renders and validates it. Its `handler(request, obj, form)` returns `None` when done. The handler is a service function, or `AdminViewBridge(Model, SomeAdmin.view_method)` while the logic still lives in a `ModelAdmin`. A bridged view must take a POST and answer with a redirect. Later, replace the bridge with a service function; the panel stays as it is.
4. Run `pnpm --filter=@posthog/frontend build:admin-console` when you add an owner crest or change a template. `posthog/admin/test_admin_console.py` fails when a template class, a linked asset or an owner crest is missing from the build output.
@@ -37,7 +37,7 @@ A tool is a page that is not about one record, for example a report across all t
## Move a Django admin action
Replace the old button with `MovedToConsole.action(record, obj, panel_key, label)` from `moved.py`. It links to the panel on the console record page, so staff who look in the usual place find the new one. When a whole page moves, route its old URL to `MovedToConsole.page_redirect(title, url)`, which tells staff the page moved.
-Old URLs never break, because staff keep bookmarks to them, query parameters included. When a record action's view is deleted, its old path goes into `MOVED_TEAM_ACTIONS` or `MOVED_ORGANIZATION_ACTIONS` in `urls.py`, which redirects to the console form or panel.
+Old URLs never break, because staff keep bookmarks to them, query parameters included. When a record action's view is deleted, its old path goes into the `MOVED_*_ACTIONS` map of its record type in `urls.py`, which redirects to the console form or panel.
## Read when needed
diff --git a/posthog/admin/console/deletion_request_panels.py b/posthog/admin/console/deletion_request_panels.py
new file mode 100644
index 000000000000..81f567c398e2
--- /dev/null
+++ b/posthog/admin/console/deletion_request_panels.py
@@ -0,0 +1,577 @@
+import json
+from datetime import UTC, datetime
+from typing import Any, ClassVar, cast
+
+from django import forms
+from django.contrib import messages
+from django.contrib.admin.models import CHANGE, LogEntry
+from django.db.models import Model
+from django.http import HttpRequest, HttpResponse
+from django.template.defaultfilters import filesizeformat
+from django.utils import timezone
+
+from posthog.admin.admins.data_deletion_request_admin import CLICKHOUSE_TEAM_GROUP
+from posthog.admin.console.panels import Fact, Gate, Operation, Owner, Panel, ReasonForm, Tone
+from posthog.admin.console.records import RECORD_TYPES, request_type_label
+from posthog.admin.console.registry import console
+from posthog.admin.console.tools import Cell, Notice, Page, Row, Table
+from posthog.models.data_deletion_request import (
+ AUTO_APPROVE_INTERVAL_MINUTES,
+ AUTO_APPROVE_MAX_EVENTS,
+ DataDeletionRequest,
+ ExecutionMode,
+ RequestStatus,
+ RequestType,
+ count_adhoc_event_deletion_backlog,
+ count_remaining_for_request,
+ fetch_deletion_stats,
+ refresh_deletion_stats,
+)
+from posthog.models.team.team import Team
+from posthog.models.user import User
+
+CLICKHOUSE = Owner(name="ClickHouse", crest="clickhouse")
+CLICKHOUSE_TEAM = Gate.group(CLICKHOUSE_TEAM_GROUP)
+
+STATUS_TONES = {
+ RequestStatus.PENDING: Tone.INFO,
+ RequestStatus.APPROVED: Tone.INFO,
+ RequestStatus.IN_PROGRESS: Tone.INFO,
+ RequestStatus.QUEUED: Tone.INFO,
+ RequestStatus.COMPLETED: Tone.SUCCESS,
+ RequestStatus.FAILED: Tone.DESTRUCTIVE,
+}
+
+# The first mode is the default. Query-backed removals only work deferred, and only event removals can be deferred.
+EXECUTION_MODES = {
+ RequestType.EVENT_REMOVAL: (ExecutionMode.DEFERRED, ExecutionMode.IMMEDIATE),
+ RequestType.HOGQL_EVENT_REMOVAL: (ExecutionMode.DEFERRED,),
+ RequestType.PERSON_REMOVAL: (ExecutionMode.IMMEDIATE,),
+ RequestType.PROPERTY_REMOVAL: (ExecutionMode.IMMEDIATE,),
+}
+EXECUTION_MODE_EFFECTS = {
+ ExecutionMode.DEFERRED: "Queues the matching event UUIDs. The scheduled deletes job removes them with other batched deletes.",
+ ExecutionMode.IMMEDIATE: "Starts a delete on each shard right away.",
+}
+
+
+def _when(value: datetime | None) -> str:
+ if value is None:
+ return "-"
+ return value.astimezone(UTC).strftime("%Y-%m-%d %H:%M UTC")
+
+
+def _number(value: int | None) -> str:
+ return "-" if value is None else f"{value:,}"
+
+
+def _log_change(request: HttpRequest, obj: DataDeletionRequest, message: str) -> None:
+ # The same entry ModelAdmin.log_change writes, so the history on the Django admin page stays complete.
+ LogEntry.objects.log_actions(
+ user_id=cast(User, request.user).pk,
+ queryset=[obj],
+ action_flag=CHANGE,
+ change_message=message,
+ single_object=True,
+ )
+
+
+def _missing_criteria(obj: DataDeletionRequest) -> str | None:
+ """What the request lacks before it can be submitted, or None when it is complete."""
+ if obj.request_type == RequestType.PROPERTY_REMOVAL and not obj.properties and not obj.person_properties:
+ return "Add at least one property or person property."
+ if obj.request_type == RequestType.PERSON_REMOVAL:
+ if not (obj.person_uuids or obj.person_distinct_ids):
+ return "Add at least one person UUID or distinct ID."
+ if not (obj.person_drop_profiles or obj.person_drop_events or obj.person_drop_recordings):
+ return "Set at least one drop flag: profiles, events or recordings."
+ return None
+
+
+def _criteria_lookup(revision: datetime | None) -> dict[str, Any]:
+ if revision is None:
+ return {"criteria_updated_at__isnull": True}
+ return {"criteria_updated_at": revision}
+
+
+def _person_selector_count(obj: DataDeletionRequest) -> int:
+ # Person removals have no ClickHouse count query, so their stats count the selectors.
+ return len(obj.person_uuids) + len(obj.person_distinct_ids)
+
+
+class DeletionRequestOverviewPanel(Panel):
+ record = "deletion-request"
+ key = "overview"
+ title = "Overview"
+ owner = CLICKHOUSE
+
+ def facts(self, obj: Model) -> list[Fact]:
+ assert isinstance(obj, DataDeletionRequest)
+ team = Team.objects.filter(pk=obj.team_id).only("id", "name").first()
+ if team is None:
+ team_fact = Fact(label="Team", value=f"Team {obj.team_id} no longer exists", tone=Tone.WARNING)
+ else:
+ team_fact = Fact(label="Team", value=f"{team.name} ({team.pk})", href=RECORD_TYPES["team"].url(team))
+ if obj.approved_automatically:
+ approved = f"Automatically, {_when(obj.approved_at)}"
+ elif obj.approved:
+ approver = obj.approved_by.email if obj.approved_by else "a deleted user"
+ approved = f"By {approver}, {_when(obj.approved_at)}"
+ else:
+ approved = "Not yet"
+ facts = [
+ Fact(label="Status", value=obj.get_status_display(), tone=STATUS_TONES.get(RequestStatus(obj.status))),
+ Fact(label="Type", value=request_type_label(obj)),
+ team_fact,
+ Fact(label="Requires approval", value="Yes" if obj.requires_approval else "No"),
+ Fact(label="Approved", value=approved),
+ Fact(
+ label="Execution mode",
+ value=obj.get_execution_mode_display() if obj.approved else "Chosen at approval",
+ ),
+ Fact(label="Attempts", value=str(obj.attempt_count)),
+ ]
+ if obj.last_dagster_run_id:
+ # Facts link within PostHog only. The Django admin page links to the run in Dagster.
+ facts.append(Fact(label="Last Dagster run", value=obj.last_dagster_run_id, mono=True))
+ return facts
+
+
+def fetch_stats(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest)
+ if obj.request_type == RequestType.PERSON_REMOVAL:
+ obj.count = _person_selector_count(obj)
+ obj.stats_calculated_at = timezone.now()
+ obj.save(update_fields=["count", "stats_calculated_at", "updated_at"])
+ _log_change(request, obj, "Counted person_removal selectors.")
+ messages.success(request, f"Selector count: {obj.count} person targets.")
+ return None
+ try:
+ stats = refresh_deletion_stats(obj, user_id=request.user.pk)
+ except Exception as error:
+ messages.error(request, f"Could not fetch stats: {error}")
+ return HttpResponse(status=502)
+ _log_change(request, obj, "Fetched ClickHouse stats.")
+ messages.success(request, f"Stats fetched: {stats['count']:,} matching events.")
+ return None
+
+
+def preview_stats(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest)
+ if obj.request_type == RequestType.PERSON_REMOVAL:
+ messages.info(request, f"Selector count: {_person_selector_count(obj)} person targets. Not saved.")
+ return None
+ try:
+ stats = fetch_deletion_stats(obj, user_id=request.user.pk)
+ except Exception as error:
+ messages.error(request, f"Could not preview stats: {error}")
+ return HttpResponse(status=502)
+ messages.info(
+ request,
+ f"{stats['count']:,} matching events, from {_when(stats['min_timestamp'])} to {_when(stats['max_timestamp'])}. "
+ f"{_number(stats['part_count'])} parts, {filesizeformat(stats['parts_size'] or 0)}, "
+ f"{_number(stats['parts_row_count'])} rows in those parts. Not saved to the request.",
+ )
+ return None
+
+
+class DeletionRequestStatsPanel(Panel):
+ record = "deletion-request"
+ key = "stats"
+ title = "ClickHouse stats"
+ owner = CLICKHOUSE
+
+ def facts(self, obj: Model) -> list[Fact]:
+ assert isinstance(obj, DataDeletionRequest)
+ if obj.stats_calculated_at is None:
+ return [Fact(label="Stats", value="Not fetched yet")]
+ return [
+ Fact(label="Matching events", value=_number(obj.count)),
+ Fact(label="Parts", value=_number(obj.part_count)),
+ Fact(label="Parts size", value=filesizeformat(obj.parts_size or 0)),
+ Fact(label="Rows in those parts", value=_number(obj.parts_row_count)),
+ Fact(label="Earliest event", value=_when(obj.min_timestamp)),
+ Fact(label="Latest event", value=_when(obj.max_timestamp)),
+ Fact(label="Calculated", value=_when(obj.stats_calculated_at)),
+ ]
+
+ def operations(self, obj: Model) -> list[Operation]:
+ return [
+ Operation(
+ key="fetch",
+ label="Fetch stats",
+ handler=fetch_stats,
+ description="Counts the matching events in ClickHouse and saves the numbers on the request.",
+ ),
+ Operation(
+ key="preview",
+ label="Preview stats",
+ handler=preview_stats,
+ description="Counts the matching events without saving, for example while you change the criteria.",
+ gate=CLICKHOUSE_TEAM,
+ ),
+ ]
+
+
+class AutoApprovableSubmitForm(ReasonForm):
+ requires_approval = forms.BooleanField(
+ required=False, label="Do not approve automatically. Send it to the ClickHouse Team instead."
+ )
+ field_order = ["requires_approval", "reason"]
+
+
+def submit(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest) and form is not None
+ # Only event removals are offered the opt-out. Every other type still records True: the field means
+ # "a human must approve this", and False would hide the request from the changelist's "requires approval"
+ # filter, on precisely the requests a reviewer needs to find.
+ requires_approval = not isinstance(form, AutoApprovableSubmitForm) or form.cleaned_data["requires_approval"]
+ updated = DataDeletionRequest.objects.filter(pk=obj.pk, status=RequestStatus.DRAFT).update(
+ status=RequestStatus.PENDING, requires_approval=requires_approval, updated_at=timezone.now()
+ )
+ if not updated:
+ messages.error(request, "The request is no longer a draft.")
+ return HttpResponse(status=409)
+ obj.refresh_from_db()
+ _log_change(request, obj, "Submitted: status changed from draft to pending.")
+ if requires_approval:
+ messages.success(request, "Request submitted. It waits for approval by the ClickHouse Team.")
+ else:
+ messages.success(
+ request,
+ f"Request submitted. The auto-approval job checks it within {AUTO_APPROVE_INTERVAL_MINUTES} minutes and "
+ f"approves it if it matches fewer than {AUTO_APPROVE_MAX_EVENTS:,} events.",
+ )
+ return None
+
+
+class ApproveForm(ReasonForm):
+ execution_mode = forms.ChoiceField(label="Execution mode", choices=ExecutionMode.choices)
+ # Which edit of the criteria staff reviewed. The approval only lands on that edit.
+ criteria_revision = forms.CharField(required=False, widget=forms.HiddenInput)
+ field_order = ["execution_mode", "reason"]
+
+ modes: ClassVar[tuple[ExecutionMode, ...]] = tuple(ExecutionMode)
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ super().__init__(*args, **kwargs)
+ mode_field = self.fields["execution_mode"]
+ assert isinstance(mode_field, forms.ChoiceField)
+ mode_field.choices = [(mode.value, mode.label) for mode in self.modes]
+ mode_field.help_text = " ".join(f"{mode.label}: {EXECUTION_MODE_EFFECTS[mode]}" for mode in self.modes)
+
+ def clean_criteria_revision(self) -> datetime | None:
+ value = self.cleaned_data["criteria_revision"]
+ if not value:
+ return None
+ try:
+ return datetime.fromisoformat(value)
+ except ValueError:
+ raise forms.ValidationError("Open the form again from the request page.")
+
+ @classmethod
+ def for_request(cls, obj: DataDeletionRequest) -> type["ApproveForm"]:
+ modes = EXECUTION_MODES[RequestType(obj.request_type)]
+ return type("ApproveForm", (cls,), {"modes": modes})
+
+
+# The preview names the actual targets, so two requests with the same counts never look alike. Past this many it
+# counts the rest, and the Django admin page has the full list.
+MAX_LISTED_TARGETS = 20
+
+
+def _listed(values: list[str]) -> str:
+ if not values:
+ return ""
+ shown = ", ".join(values[:MAX_LISTED_TARGETS])
+ hidden = len(values) - MAX_LISTED_TARGETS
+ return f"{shown} and {hidden:,} more" if hidden > 0 else shown
+
+
+def _criteria_rows(obj: DataDeletionRequest) -> list[Row]:
+ criteria = [
+ ("Type", request_type_label(obj)),
+ ("Team", str(obj.team_id)),
+ ("Time range", f"{_when(obj.start_time)} to {_when(obj.end_time)}"),
+ ("Events", "All events" if obj.delete_all_events else ", ".join(obj.events)),
+ ("Properties", ", ".join(obj.properties)),
+ ("Person properties", ", ".join(obj.person_properties or [])),
+ ("HogQL filter", obj.hogql_predicate),
+ ("HogQL query", obj.hogql_query),
+ ("HogQL variables", json.dumps(obj.hogql_variables, sort_keys=True) if obj.hogql_variables else ""),
+ ("Person UUIDs", _listed([str(uuid) for uuid in obj.person_uuids])),
+ ("Person distinct IDs", _listed(obj.person_distinct_ids)),
+ ]
+ if obj.request_type == RequestType.PERSON_REMOVAL:
+ dropped = [
+ name
+ for name, flag in (
+ ("profiles", obj.person_drop_profiles),
+ ("events", obj.person_drop_events),
+ ("recordings", obj.person_drop_recordings),
+ )
+ if flag
+ ]
+ criteria.append(("Drops", ", ".join(dropped)))
+ return [Row(cells=(Cell(text=label), Cell(text=value, mono=True))) for label, value in criteria if value]
+
+
+def _stats_block(obj: DataDeletionRequest) -> Notice | Table:
+ if obj.stats_calculated_at is None:
+ return Notice(text="No stats were fetched for these criteria. Fetch stats before you approve.")
+ rows = [
+ ("Matching events", _number(obj.count)),
+ ("Parts", _number(obj.part_count)),
+ ("Parts size", filesizeformat(obj.parts_size or 0)),
+ ("Calculated", _when(obj.stats_calculated_at)),
+ ]
+ return Table(columns=("Stored stats", ""), rows=tuple(Row(cells=(Cell(text=k), Cell(text=v))) for k, v in rows))
+
+
+def _backlog_notice(obj: DataDeletionRequest) -> Notice:
+ # The backlog only informs the approver, so a ClickHouse failure must not block approval.
+ try:
+ backlog = count_adhoc_event_deletion_backlog(obj.team_id)
+ except Exception as error:
+ return Notice(text=f"Could not count the events already queued for deletion: {error}")
+ return Notice(
+ text=f"{backlog.total:,} events are queued for deletion and not deleted yet, "
+ f"{backlog.for_team:,} of them for team {obj.team_id}."
+ )
+
+
+def preview_approval(request: HttpRequest, obj: Model, form: forms.Form) -> Page:
+ assert isinstance(obj, DataDeletionRequest)
+ if form.cleaned_data["criteria_revision"] != obj.criteria_updated_at:
+ form.add_error(None, "The criteria changed since you opened this form. Review them again.")
+ return Page(blocks=())
+ mode = ExecutionMode(form.cleaned_data["execution_mode"])
+ return Page(
+ blocks=(
+ Notice(text=f"Execution mode: {mode.label}. {EXECUTION_MODE_EFFECTS[mode]}"),
+ Table(columns=("Criteria", ""), rows=tuple(_criteria_rows(obj))),
+ _stats_block(obj),
+ _backlog_notice(obj),
+ )
+ )
+
+
+def approve(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest) and form is not None
+ execution_mode = form.cleaned_data["execution_mode"]
+ now = timezone.now()
+ updated = DataDeletionRequest.objects.filter(
+ pk=obj.pk, status=RequestStatus.PENDING, **_criteria_lookup(form.cleaned_data["criteria_revision"])
+ ).update(
+ status=RequestStatus.APPROVED,
+ approved=True,
+ approved_by=request.user,
+ approved_at=now,
+ execution_mode=execution_mode,
+ updated_at=now,
+ )
+ if not updated:
+ messages.error(request, "The request changed since you reviewed it, so it was not approved. Review it again.")
+ return HttpResponse(status=409)
+ obj.refresh_from_db()
+ _log_change(request, obj, f"Approved deletion request (execution_mode={execution_mode}).")
+ messages.success(request, f"Deletion request approved ({obj.get_execution_mode_display()}).")
+ return None
+
+
+def revert_to_draft(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest)
+ updated = DataDeletionRequest.objects.filter(
+ pk=obj.pk, status__in=[RequestStatus.PENDING, RequestStatus.APPROVED]
+ ).update(
+ status=RequestStatus.DRAFT,
+ approved=False,
+ approved_automatically=False,
+ approved_by=None,
+ approved_at=None,
+ updated_at=timezone.now(),
+ )
+ if not updated:
+ messages.error(request, "Only pending or approved requests can move back to draft.")
+ return HttpResponse(status=409)
+ obj.refresh_from_db()
+ _log_change(request, obj, "Reverted to draft: cleared approval.")
+ messages.success(request, "Request moved back to draft.")
+ return None
+
+
+def retry(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest)
+ # Keeps approved_by and approved_at: the retry runs the same approval again. The job bumps attempt_count
+ # and last_executed_at when it starts.
+ updated = DataDeletionRequest.objects.filter(pk=obj.pk, status=RequestStatus.FAILED).update(
+ status=RequestStatus.APPROVED, updated_at=timezone.now()
+ )
+ if not updated:
+ messages.error(request, "Only failed requests can be retried.")
+ return HttpResponse(status=409)
+ obj.refresh_from_db()
+ _log_change(request, obj, f"Retry triggered (attempt #{obj.attempt_count + 1}): status FAILED → APPROVED.")
+ messages.success(request, "Request requeued. The pickup sensor starts a new run on its next tick.")
+ return None
+
+
+def verify(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest)
+ # Read before counting, so a criteria edit during the count cannot mark the new criteria completed.
+ revision = obj.criteria_updated_at
+ prior_status = obj.status
+ try:
+ remaining = count_remaining_for_request(obj)
+ except Exception as error:
+ messages.error(request, f"Could not verify: {error}")
+ return HttpResponse(status=502)
+ if remaining:
+ messages.warning(
+ request,
+ f"{remaining:,} matching rows are still in ClickHouse. The request stays "
+ f"{obj.get_status_display().lower()}. Verify again after the next scheduled deletion.",
+ )
+ return None
+ promoted = (
+ DataDeletionRequest.objects.filter(pk=obj.pk, **_criteria_lookup(revision))
+ .exclude(status=RequestStatus.COMPLETED)
+ .update(status=RequestStatus.COMPLETED, updated_at=timezone.now())
+ )
+ if promoted:
+ obj.refresh_from_db()
+ _log_change(request, obj, f"Verified: 0 matching rows remain, status {prior_status} → completed.")
+ messages.success(request, "Verified: no matching rows remain. Marked completed.")
+ return None
+ obj.refresh_from_db()
+ if obj.status == RequestStatus.COMPLETED:
+ messages.info(request, "Verified: no matching rows remain. It was already completed.")
+ return None
+ messages.error(request, "The criteria changed while verifying, so the request was not completed. Verify again.")
+ return HttpResponse(status=409)
+
+
+UNVERIFIABLE_TYPES = (RequestType.PERSON_REMOVAL, RequestType.HOGQL_EVENT_REMOVAL)
+
+
+class DeletionRequestWorkflowPanel(Panel):
+ record = "deletion-request"
+ key = "workflow"
+ title = "Workflow"
+ owner = CLICKHOUSE
+ danger = True
+
+ def facts(self, obj: Model) -> list[Fact]:
+ assert isinstance(obj, DataDeletionRequest)
+ facts = []
+ missing = _missing_criteria(obj) if obj.status == RequestStatus.DRAFT else None
+ if missing is not None:
+ facts.append(Fact(label="Cannot submit", value=missing, tone=Tone.WARNING))
+ if obj.request_type in UNVERIFIABLE_TYPES and obj.status != RequestStatus.COMPLETED:
+ facts.append(
+ Fact(
+ label="Verification",
+ value="Not automated for this request type. Verify manually.",
+ )
+ )
+ return facts
+
+ def operations(self, obj: Model) -> list[Operation]:
+ assert isinstance(obj, DataDeletionRequest)
+ operations = []
+ if obj.status == RequestStatus.DRAFT and _missing_criteria(obj) is None:
+ operations.append(self._submit(obj))
+ if obj.status == RequestStatus.PENDING:
+ operations.append(
+ Operation(
+ key="approve",
+ label="Approve deletion",
+ handler=approve,
+ preview=preview_approval,
+ danger=True,
+ form_class=ApproveForm.for_request(obj),
+ form_initial={
+ "execution_mode": EXECUTION_MODES[RequestType(obj.request_type)][0].value,
+ "criteria_revision": obj.criteria_updated_at.isoformat() if obj.criteria_updated_at else "",
+ },
+ description="The deletion job picks up the request and deletes the matching data.",
+ undo_hint=(
+ "Until the deletion job picks it up, move the request back to draft. "
+ "Data that a run already deleted cannot be restored."
+ ),
+ gate=CLICKHOUSE_TEAM,
+ )
+ )
+ if obj.status in (RequestStatus.PENDING, RequestStatus.APPROVED):
+ operations.append(
+ Operation(
+ key="revert-to-draft",
+ label="Move back to draft",
+ handler=revert_to_draft,
+ description="Clears the approval, so the criteria can be edited again.",
+ )
+ )
+ if obj.status == RequestStatus.FAILED:
+ operations.append(
+ Operation(
+ key="retry",
+ label="Retry deletion",
+ handler=retry,
+ danger=True,
+ form_class=ReasonForm,
+ description=(
+ f"Queues the request again after {obj.attempt_count} failed attempts. The original approval "
+ "stays."
+ ),
+ undo_hint=(
+ "Until the next run starts, move the request back to draft. Data that a run already "
+ "deleted cannot be restored."
+ ),
+ gate=CLICKHOUSE_TEAM,
+ )
+ )
+ if obj.status != RequestStatus.COMPLETED and obj.request_type not in UNVERIFIABLE_TYPES:
+ operations.append(
+ Operation(
+ key="verify",
+ label="Verify deletion",
+ handler=verify,
+ description="Counts the matching rows in ClickHouse. When none remain, the request is completed.",
+ gate=CLICKHOUSE_TEAM,
+ )
+ )
+ return operations
+
+ def _submit(self, obj: DataDeletionRequest) -> Operation:
+ if obj.request_type == RequestType.EVENT_REMOVAL:
+ return Operation(
+ key="submit",
+ label="Submit for approval",
+ handler=submit,
+ # Unless staff tick the opt-out, the auto-approval job can approve it with no other human step.
+ danger=True,
+ form_class=AutoApprovableSubmitForm,
+ undo_hint=(
+ "Until the deletion job picks it up, move the request back to draft. Data that a run already "
+ "deleted cannot be restored."
+ ),
+ description=(
+ f"Moves the request to pending. Every {AUTO_APPROVE_INTERVAL_MINUTES} minutes a job refreshes "
+ f"the stats of pending event removals, and approves those that match fewer than "
+ f"{AUTO_APPROVE_MAX_EVENTS:,} events and whose time range has ended. The rest wait for the "
+ "ClickHouse Team."
+ ),
+ )
+ return Operation(
+ key="submit",
+ label="Submit for approval",
+ handler=submit,
+ form_class=ReasonForm,
+ description=(
+ "Moves the request to pending. Only event removals are approved automatically, so this one waits "
+ "for the ClickHouse Team."
+ ),
+ )
diff --git a/posthog/admin/console/panels.py b/posthog/admin/console/panels.py
index 45ea816413b8..7ef2186e740d 100644
--- a/posthog/admin/console/panels.py
+++ b/posthog/admin/console/panels.py
@@ -11,6 +11,8 @@ if TYPE_CHECKING:
from django.db.models import Model
from django.http import HttpRequest, HttpResponse
+ from posthog.admin.console.tools import Page
+
class Tone(StrEnum):
DEFAULT = "default"
@@ -86,6 +88,15 @@ class OperationHandler(Protocol):
def __call__(self, request: "HttpRequest", obj: "Model", form: forms.Form | None) -> "HttpResponse | None": ...
+class RecordPreviewHandler(Protocol):
+ """Shows what an operation would change on the record before it runs, as a `Page`. It must not change anything.
+
+ To refuse the input, add an error to the form; the console then shows the form again.
+ """
+
+ def __call__(self, request: "HttpRequest", obj: "Model", form: forms.Form) -> "Page": ...
+
+
@frozen
class Operation:
"""An action on a record. The handler returns None when it is done, and the console sends staff back to the record.
@@ -103,9 +114,13 @@ class Operation:
description: str = ""
undo_hint: str = ""
gate: Gate | None = None
+ # Staff confirm on a page that shows what will change, for an action that is hard to take back.
+ preview: RecordPreviewHandler | None = None
def __post_init__(self) -> None:
check_danger(self.key, self.danger, self.form_class, self.undo_hint)
+ if self.preview is not None and self.form_class is None:
+ raise ValueError(f"Operation {self.key!r} has a preview, so it needs a form for the preview to read")
class ReasonForm(forms.Form):
diff --git a/posthog/admin/console/records.py b/posthog/admin/console/records.py
index a7b2b970604c..d5eb1a555e97 100644
--- a/posthog/admin/console/records.py
+++ b/posthog/admin/console/records.py
@@ -4,6 +4,7 @@ from django.db.models import Model, QuerySet
from django.urls import reverse
from posthog.dataclasses import frozen
+from posthog.models.data_deletion_request import DataDeletionRequest
from posthog.models.organization import Organization
from posthog.models.team.team import Team
@@ -113,4 +114,47 @@ class OrganizationRecord(RecordType):
]
-RECORD_TYPES: dict[str, RecordType] = {record.key: record for record in (TeamRecord(), OrganizationRecord())}
+def request_type_label(obj: DataDeletionRequest) -> str:
+ """The request type in sentence case. The model's choice labels are title case, such as "Event Removal"."""
+ label = obj.get_request_type_display()
+ return label if label.startswith("HogQL") else label.capitalize()
+
+
+class DeletionRequestRecord(RecordType):
+ key = "deletion-request"
+ plural = "deletion-requests"
+ label = "Deletion request"
+ pk_converter = "uuid"
+
+ def queryset(self) -> QuerySet:
+ return DataDeletionRequest.objects.select_related("approved_by")
+
+ def title(self, obj: Model) -> str:
+ assert isinstance(obj, DataDeletionRequest)
+ return f"{request_type_label(obj)} request"
+
+ def subtitle(self, obj: Model) -> str:
+ assert isinstance(obj, DataDeletionRequest)
+ return f"Team {obj.team_id}"
+
+ def parents(self, obj: Model) -> list[RecordLink]:
+ assert isinstance(obj, DataDeletionRequest)
+ # The request keeps a bare team ID, and the team may be gone by now.
+ team = Team.objects.select_related("organization").filter(pk=obj.team_id).first()
+ if team is None:
+ return []
+ return [*TeamRecord().parents(team), RecordLink(label=team.name, href=TeamRecord().url(team))]
+
+ def links(self, obj: Model) -> list[RecordLink]:
+ return [
+ RecordLink(
+ label="Edit in Django admin",
+ href=reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]),
+ title="The raw request, where its criteria are edited",
+ ),
+ ]
+
+
+RECORD_TYPES: dict[str, RecordType] = {
+ record.key: record for record in (TeamRecord(), OrganizationRecord(), DeletionRequestRecord())
+}
diff --git a/posthog/admin/console/registry.py b/posthog/admin/console/registry.py
index ce01185785c5..8765a8c85b51 100644
--- a/posthog/admin/console/registry.py
+++ b/posthog/admin/console/registry.py
@@ -77,6 +77,7 @@ class ConsoleRegistry:
import posthog.admin.console.usage_reports_tool # noqa: F401, PLC0415 — registers a core tool
import posthog.admin.console.organization_panels # noqa: F401, PLC0415 — registers the core Organization panels
import posthog.admin.console.events_retention_tool # noqa: F401, PLC0415 — registers a core tool
+ import posthog.admin.console.deletion_request_panels # noqa: F401, PLC0415 — registers the core deletion request panels
autodiscover_modules("console")
# Set only after the imports succeed, so a failed import raises again on the next request instead of
diff --git a/posthog/admin/console/urls.py b/posthog/admin/console/urls.py
index 6cd4bf9a187d..cfef075b665e 100644
--- a/posthog/admin/console/urls.py
+++ b/posthog/admin/console/urls.py
@@ -23,6 +23,16 @@ MOVED_ORGANIZATION_ACTIONS = {
"sync-to-billing": "#panel-billing",
}
+MOVED_DELETION_REQUEST_ACTIONS = {
+ "submit": "workflow/submit/",
+ "approve": "workflow/approve/",
+ "retry": "workflow/retry/",
+ "revert-to-draft": "#panel-workflow",
+ "verify": "#panel-workflow",
+ "fetch-stats": "#panel-stats",
+ "preview-stats": "#panel-stats",
+}
+
# Every route sits under /admin/, so AdminOAuth2Middleware adds its Google step-up, and admin_view
# adds the staff check, the login redirect and CSRF protection. The console needs no auth of its own.
urlpatterns = [
@@ -74,6 +84,13 @@ urlpatterns = [
)
for old, target in MOVED_ORGANIZATION_ACTIONS.items()
],
+ *[
+ path(
+ f"admin/posthog/datadeletionrequest/<uuid:pk>/{old}/",
+ admin.site.admin_view(MovedToConsole.record_redirect("deletion-requests", target)),
+ )
+ for old, target in MOVED_DELETION_REQUEST_ACTIONS.items()
+ ],
path(
"admin/posthog/organization/bulk-deactivate/",
MovedToConsole.page_redirect("Bulk deactivation", "/admin/console/tools/bulk-deactivate-organizations/"),
diff --git a/posthog/admin/console/views.py b/posthog/admin/console/views.py
index e0a8b269b144..8ad4be1cb5d3 100644
--- a/posthog/admin/console/views.py
+++ b/posthog/admin/console/views.py
@@ -283,6 +283,40 @@ def _operation_context(
}
+class ConfirmStep:
+ """The form data an operation runs with: the submitted form, or the input a confirmed preview showed."""
+
+ def __init__(self, request: HttpRequest, confirmation: ConfirmationToken) -> None:
+ self.confirmation = confirmation
+ self.token = request.POST.get("confirm_token") if request.method == "POST" else None
+ submitted = request.POST if request.method == "POST" else None
+ self.data: QueryDict | None = confirmation.load(self.token) if self.token is not None else submitted
+
+ @property
+ def confirmed(self) -> bool:
+ return self.token is not None
+
+ @property
+ def expired(self) -> bool:
+ return self.confirmed and self.data is None
+
+ def render_expired(self, request: HttpRequest) -> HttpResponse:
+ messages.error(request, "This confirmation expired or was made for something else. Review the change again.")
+ return redirect(request.get_full_path())
+
+ def render_preview(
+ self, request: HttpRequest, context: dict[str, object], form: forms.Form, preview: Callable[[], Page]
+ ) -> HttpResponse:
+ page = preview()
+ if form.errors:
+ return render(request, "admin_console/operation.html", context, status=400)
+ return render(
+ request,
+ "admin_console/confirm.html",
+ {**context, "page": page, "confirm_token": self.confirmation.sign(form)},
+ )
+
+
def run_operation(request: HttpRequest, record: str, pk: object, panel_key: str, operation_key: str) -> HttpResponse:
record_type = _record_type(record)
obj = get_object_or_404(record_type.queryset(), pk=pk)
@@ -305,9 +339,13 @@ def run_operation(request: HttpRequest, record: str, pk: object, panel_key: str,
if request.method == "GET" and operation.form_class is None:
return redirect(record_url)
+ # The panel is part of the target, so a confirmation for one record or panel cannot confirm another.
+ step = ConfirmStep(request, ConfirmationToken(request, f"{record_type.key}:{obj.pk}:{panel.key}", operation.key))
+ if step.expired:
+ return step.render_expired(request)
form = None
if operation.form_class is not None:
- form = operation.form_class(request.POST if request.method == "POST" else None, initial=operation.form_initial)
+ form = operation.form_class(step.data, initial=operation.form_initial)
title = record_type.title(obj)
target = OperationTarget(
kicker="This acts on",
@@ -328,6 +366,10 @@ def run_operation(request: HttpRequest, record: str, pk: object, panel_key: str,
if form is not None and not form.is_valid():
return render(request, "admin_console/operation.html", context, status=400)
+ preview = operation.preview
+ if preview is not None and form is not None and not step.confirmed:
+ return step.render_preview(request, context, form, lambda: preview(request, obj, form))
+
audit = audit.bind(reason=form.cleaned_data.get("reason") if form is not None else None)
response = _audited(audit, lambda: operation.handler(request, obj, form))
if response is None:
@@ -432,35 +474,22 @@ def run_tool_operation(request: HttpRequest, tool_key: str, operation_key: str)
breadcrumbs=(RecordLink(label=tool.title, href=tool_url),),
is_record=False,
)
- confirmation = ConfirmationToken(request, f"tool:{tool.key}", operation.key)
- data: QueryDict | None = request.POST if request.method == "POST" else None
- confirm_token = request.POST.get("confirm_token") if request.method == "POST" else None
- if confirm_token is not None:
- data = confirmation.load(confirm_token)
- if data is None:
- messages.error(
- request, "This confirmation expired or was made for something else. Review the change again."
- )
- return redirect(request.get_full_path())
+ step = ConfirmStep(request, ConfirmationToken(request, f"tool:{tool.key}", operation.key))
+ if step.expired:
+ return step.render_expired(request)
form = None
if operation.form_class is not None:
- form = operation.form_class(data, initial=operation.form_initial)
+ form = operation.form_class(step.data, initial=operation.form_initial)
context = _operation_context(target, operation, form, request)
if request.method == "GET":
return render(request, "admin_console/operation.html", context)
if form is not None and not form.is_valid():
return render(request, "admin_console/operation.html", context, status=400)
- if operation.preview is not None and form is not None and confirm_token is None:
- preview = operation.preview(request, form)
- if form.errors:
- return render(request, "admin_console/operation.html", context, status=400)
- return render(
- request,
- "admin_console/confirm.html",
- {**context, "page": preview, "confirm_token": confirmation.sign(form)},
- )
+ preview = operation.preview
+ if preview is not None and form is not None and not step.confirmed:
+ return step.render_preview(request, context, form, lambda: preview(request, form))
audit = audit.bind(reason=form.cleaned_data.get("reason") if form is not None else None)
result = _audited(audit, lambda: operation.handler(request, form))
diff --git a/posthog/admin/test_admin_console.py b/posthog/admin/test_admin_console.py
index 7fef501a2040..3f687a132bb5 100644
--- a/posthog/admin/test_admin_console.py
+++ b/posthog/admin/test_admin_console.py
@@ -8,6 +8,7 @@ from unittest.mock import MagicMock, patch
from django.conf import settings
from django.contrib.auth.models import Group
+from django.db.models import Model
from django.http import HttpRequest, HttpResponse
from django.template.loader import render_to_string
from django.test import Client, RequestFactory, SimpleTestCase, override_settings
@@ -21,6 +22,7 @@ from posthog.admin.console.records import RECORD_TYPES
from posthog.admin.console.registry import ConsoleRegistry, console
from posthog.admin.console.tools import Cell, ConsoleTool, Live, Notice, Page, Paging, Row, Table
from posthog.csp_middleware import CSPMiddleware
+from posthog.models.data_deletion_request import DataDeletionRequest, RequestType
from posthog.models.events_retention_config import OrganizationEventsRetentionConfig
from posthog.models.organization import Organization
from posthog.models.team.team import Team
@@ -318,16 +320,29 @@ class TestAdminConsoleViews(BaseTest):
("form_page_keeps_its_parameters", "team", "set-api-token/?from=ticket", "api-token/set/?from=ticket"),
("button_action_lands_on_its_panel", "team", "rebuild-cache/", "#panel-remote-config"),
("organization_action", "organization", "limit-product/?resource=events", "?resource=events#panel-billing"),
+ (
+ "deletion_request_form_page",
+ "datadeletionrequest",
+ "approve/?from=ticket",
+ "workflow/approve/?from=ticket",
+ ),
]
)
def test_an_old_django_admin_action_url_lands_on_the_console(
self, _name: str, record: str, old: str, new: str
) -> None:
- obj = self.team if record == "team" else self.organization
+ obj: Model
+ if record == "team":
+ obj, plural = self.team, "teams"
+ elif record == "organization":
+ obj, plural = self.organization, "organizations"
+ else:
+ obj = DataDeletionRequest.objects.create(team_id=self.team.pk, request_type=RequestType.EVENT_REMOVAL)
+ plural = "deletion-requests"
response = self.client.get(f"/admin/posthog/{record}/{obj.pk}/{old}")
assert response.status_code == 302
- assert response["Location"] == f"/admin/console/{record}s/{obj.pk}/{new}"
+ assert response["Location"] == f"/admin/console/{plural}/{obj.pk}/{new}"
def test_django_admin_team_page_points_moved_actions_to_the_console(self) -> None:
response = self.client.get(f"/admin/posthog/team/{self.team.pk}/change/")
diff --git a/posthog/admin/test_data_deletion_request_admin.py b/posthog/admin/test_data_deletion_request_admin.py
index cf9ac683bc4c..6307a8b36ec3 100644
--- a/posthog/admin/test_data_deletion_request_admin.py
+++ b/posthog/admin/test_data_deletion_request_admin.py
@@ -7,7 +7,6 @@ from unittest.mock import patch
from django.contrib.admin.sites import AdminSite
from django.contrib.auth.models import Group
-from django.contrib.messages import get_messages
from django.contrib.messages.storage.fallback import FallbackStorage
from django.test import RequestFactory, SimpleTestCase, override_settings
from django.urls import reverse
@@ -32,7 +31,7 @@ def _fake_reverse(name, args=None, kwargs=None):
@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminApprovalFlow(BaseTest):
+class TestDataDeletionRequestAdminCreateForm(BaseTest):
def setUp(self):
super().setUp()
self.user.is_staff = True
@@ -43,28 +42,6 @@ class TestDataDeletionRequestAdminApprovalFlow(BaseTest):
self.factory = RequestFactory()
self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
- def _pending_request(self, request_type: str = RequestType.EVENT_REMOVAL, properties: list | None = None):
- return DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=request_type,
- events=["$pageview"],
- properties=properties or [],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.PENDING,
- )
-
- def _call_approve(self, method: str, request: DataDeletionRequest, data: dict | None = None, user=None):
- path = f"/admin/posthog/datadeletionrequest/{request.pk}/approve/"
- if method == "GET":
- http_request = self.factory.get(path)
- else:
- http_request = self.factory.post(path, data or {})
- http_request.user = user or self.user
- _attach_messages(http_request)
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- return self.admin.approve_view(http_request, str(request.pk))
-
@parameterized.expand([("clickhouse_team", True), ("outside_clickhouse_team", False)])
def test_create_form_offers_property_removal_only_to_clickhouse_team(self, _name, in_clickhouse_team):
if not in_clickhouse_team:
@@ -77,384 +54,6 @@ class TestDataDeletionRequestAdminApprovalFlow(BaseTest):
offered = TestDataDeletionRequestFormHidesUnsupportedTypes._type_values(form)
self.assertEqual(RequestType.PROPERTY_REMOVAL in offered, in_clickhouse_team)
- def test_approve_view_get_renders_picker_for_event_removal(self):
- request = self._pending_request()
- response = self._call_approve("GET", request)
-
- self.assertEqual(response.status_code, 200)
- context = response.context_data
- self.assertTrue(context["supports_deferred"])
- self.assertEqual(context["default_execution_mode"], ExecutionMode.DEFERRED)
-
- def test_approve_view_approves_query_backed_request_as_deferred(self):
- request = self._pending_request(request_type=RequestType.HOGQL_EVENT_REMOVAL)
-
- response = self._call_approve("POST", request, {"execution_mode": ExecutionMode.IMMEDIATE.value})
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.APPROVED)
- self.assertEqual(request.execution_mode, ExecutionMode.DEFERRED)
-
- def test_approve_view_get_hides_picker_for_property_removal(self):
- request = self._pending_request(request_type=RequestType.PROPERTY_REMOVAL, properties=["$ip"])
- response = self._call_approve("GET", request)
-
- self.assertEqual(response.status_code, 200)
- self.assertFalse(response.context_data["supports_deferred"])
-
- @parameterized.expand(
- [
- ("deferred", ExecutionMode.DEFERRED),
- ("immediate", ExecutionMode.IMMEDIATE),
- ]
- )
- def test_approve_view_post_persists_execution_mode_for_event_removal(self, _name, execution_mode):
- request = self._pending_request()
- response = self._call_approve("POST", request, {"execution_mode": execution_mode.value})
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.APPROVED)
- self.assertEqual(request.execution_mode, execution_mode)
- self.assertTrue(request.approved)
-
- def test_approve_view_post_defaults_event_removal_to_deferred(self):
- request = self._pending_request()
- response = self._call_approve("POST", request, {})
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.APPROVED)
- self.assertEqual(request.execution_mode, ExecutionMode.DEFERRED)
-
- def test_approve_view_post_deferred_rejected_for_property_removal(self):
- request = self._pending_request(request_type=RequestType.PROPERTY_REMOVAL, properties=["$ip"])
- response = self._call_approve("POST", request, {"execution_mode": ExecutionMode.DEFERRED.value})
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.PENDING)
-
- def test_approve_view_rejects_non_clickhouse_team_user(self):
- request = self._pending_request()
- self.user.groups.clear()
- response = self._call_approve("POST", request, {"execution_mode": ExecutionMode.IMMEDIATE.value})
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.PENDING)
-
- def test_approve_view_rejects_invalid_execution_mode(self):
- request = self._pending_request()
- response = self._call_approve("POST", request, {"execution_mode": "bogus"})
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.PENDING)
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminRetry(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- clickhouse_team, _ = Group.objects.get_or_create(name="ClickHouse Team")
- self.user.groups.add(clickhouse_team)
-
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _failed_request(self, attempt_count: int = 1):
- approved_at = datetime.now() - timedelta(hours=2)
- return DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.EVENT_REMOVAL,
- events=["$pageview"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.FAILED,
- approved=True,
- approved_by=self.user,
- approved_at=approved_at,
- execution_mode=ExecutionMode.IMMEDIATE,
- attempt_count=attempt_count,
- first_executed_at=approved_at,
- last_executed_at=approved_at,
- )
-
- def _call_retry(self, method: str, request: DataDeletionRequest, user=None):
- path = f"/admin/posthog/datadeletionrequest/{request.pk}/retry/"
- if method == "GET":
- http_request = self.factory.get(path)
- else:
- http_request = self.factory.post(path, {})
- http_request.user = user or self.user
- _attach_messages(http_request)
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- return self.admin.retry_view(http_request, str(request.pk))
-
- def test_retry_view_post_re_promotes_failed_to_approved(self):
- request = self._failed_request(attempt_count=2)
- request.refresh_from_db()
- original_approved_at = request.approved_at
-
- response = self._call_retry("POST", request)
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.APPROVED)
- self.assertEqual(request.approved_by, self.user)
- self.assertEqual(request.approved_at, original_approved_at)
- self.assertTrue(request.approved)
- self.assertEqual(request.attempt_count, 2)
-
- def test_retry_view_requeues_query_backed_request(self):
- request = self._failed_request()
- request.request_type = RequestType.HOGQL_EVENT_REMOVAL
- request.execution_mode = ExecutionMode.DEFERRED
- request.hogql_query = "SELECT uuid FROM events"
- request.save(update_fields=["request_type", "execution_mode", "hogql_query"])
-
- response = self._call_retry("POST", request)
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.APPROVED)
- self.assertEqual(request.execution_mode, ExecutionMode.DEFERRED)
-
- def test_retry_view_get_does_not_change_status(self):
- request = self._failed_request()
- response = self._call_retry("GET", request)
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.FAILED)
-
- def test_retry_view_rejects_non_clickhouse_team_user(self):
- request = self._failed_request()
- self.user.groups.clear()
- response = self._call_retry("POST", request)
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.FAILED)
-
- @parameterized.expand(
- [
- ("draft", RequestStatus.DRAFT),
- ("pending", RequestStatus.PENDING),
- ("approved", RequestStatus.APPROVED),
- ("in_progress", RequestStatus.IN_PROGRESS),
- ("queued", RequestStatus.QUEUED),
- ("completed", RequestStatus.COMPLETED),
- ]
- )
- def test_retry_view_rejects_non_failed_status(self, _name, status):
- request = self._failed_request()
- DataDeletionRequest.objects.filter(pk=request.pk).update(status=status)
-
- response = self._call_retry("POST", request)
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, status)
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminChangeView(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _make_request(self, status: str):
- return DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.EVENT_REMOVAL,
- events=["$pageview"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=status,
- )
-
- def _can_retry(self, request: DataDeletionRequest, in_clickhouse_team: bool) -> bool:
- if in_clickhouse_team:
- clickhouse_team, _ = Group.objects.get_or_create(name="ClickHouse Team")
- self.user.groups.add(clickhouse_team)
- else:
- self.user.groups.clear()
-
- path = f"/admin/posthog/datadeletionrequest/{request.pk}/change/"
- http_request = self.factory.get(path)
- http_request.user = self.user
- _attach_messages(http_request)
- captured: dict = {}
-
- def _capture_super(self_admin, http_req, object_id, form_url, extra_context):
- captured.update(extra_context)
- from django.http import HttpResponse
-
- return HttpResponse(status=200)
-
- with (
- patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse),
- patch("django.contrib.admin.ModelAdmin.change_view", _capture_super),
- ):
- self.admin.change_view(http_request, str(request.pk))
- return captured.get("can_retry", False)
-
- def test_can_retry_only_when_failed_and_clickhouse_team(self):
- failed = self._make_request(RequestStatus.FAILED)
- self.assertTrue(self._can_retry(failed, in_clickhouse_team=True))
-
- def test_can_retry_false_when_not_in_clickhouse_team(self):
- failed = self._make_request(RequestStatus.FAILED)
- self.assertFalse(self._can_retry(failed, in_clickhouse_team=False))
-
- @parameterized.expand(
- [
- ("draft", RequestStatus.DRAFT),
- ("pending", RequestStatus.PENDING),
- ("approved", RequestStatus.APPROVED),
- ("in_progress", RequestStatus.IN_PROGRESS),
- ("queued", RequestStatus.QUEUED),
- ("completed", RequestStatus.COMPLETED),
- ]
- )
- def test_can_retry_false_for_non_failed_status(self, _name, status):
- request = self._make_request(status)
- self.assertFalse(self._can_retry(request, in_clickhouse_team=True))
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminSubmitView(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _property_removal_request(self, properties=None, person_properties=None):
- return DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.PROPERTY_REMOVAL,
- events=["$pageview"],
- properties=properties or [],
- person_properties=person_properties or [],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.DRAFT,
- )
-
- def _call_submit(self, request: DataDeletionRequest, method: str = "POST", data: dict | None = None):
- path = f"/admin/posthog/datadeletionrequest/{request.pk}/submit/"
- http_request = self.factory.post(path, data or {}) if method == "POST" else self.factory.get(path)
- http_request.user = self.user
- _attach_messages(http_request)
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- return self.admin.submit_view(http_request, str(request.pk))
-
- def _event_removal_request(self, **kwargs):
- now = timezone.now()
- fields = {
- "team_id": self.team.id,
- "request_type": RequestType.EVENT_REMOVAL,
- "events": ["$pageview"],
- "start_time": now - timedelta(days=7),
- "end_time": now - timedelta(minutes=1),
- "status": RequestStatus.DRAFT,
- **kwargs,
- }
- return DataDeletionRequest.objects.create(**fields)
-
- def test_submit_with_properties_only_succeeds(self):
- request = self._property_removal_request(properties=["$ip"])
- response = self._call_submit(request)
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.PENDING)
-
- def test_submit_with_person_properties_only_succeeds(self):
- request = self._property_removal_request(person_properties=["email"])
- response = self._call_submit(request)
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.PENDING)
-
- def test_submit_with_both_properties_succeeds(self):
- request = self._property_removal_request(properties=["$ip"], person_properties=["email"])
- response = self._call_submit(request)
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.PENDING)
-
- def test_submit_with_both_empty_is_rejected(self):
- request = self._property_removal_request(properties=[], person_properties=[])
- response = self._call_submit(request)
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.DRAFT)
-
- def test_submit_get_exposes_can_submit_flag(self):
- ok = self._property_removal_request(properties=["$ip"])
- empty = self._property_removal_request(properties=[], person_properties=[])
-
- path_ok = f"/admin/posthog/datadeletionrequest/{ok.pk}/submit/"
- http_req_ok = self.factory.get(path_ok)
- http_req_ok.user = self.user
- _attach_messages(http_req_ok)
-
- path_empty = f"/admin/posthog/datadeletionrequest/{empty.pk}/submit/"
- http_req_empty = self.factory.get(path_empty)
- http_req_empty.user = self.user
- _attach_messages(http_req_empty)
-
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- resp_ok = self.admin.submit_view(http_req_ok, str(ok.pk))
- resp_empty = self.admin.submit_view(http_req_empty, str(empty.pk))
-
- self.assertTrue(resp_ok.context_data["can_submit"])
- self.assertFalse(resp_empty.context_data["can_submit"])
- self.assertTrue(resp_empty.context_data["missing_properties"])
-
- @parameterized.expand(
- [
- ("event_removal_opted_in", RequestType.EVENT_REMOVAL, {}, False),
- ("event_removal_opted_out", RequestType.EVENT_REMOVAL, {"requires_approval": "on"}, True),
- # No checkbox is rendered for these, and requires_approval must still say a human is needed —
- # False would hide them from the changelist's "requires approval" filter, on precisely the
- # requests a reviewer has to find.
- ("property_removal", RequestType.PROPERTY_REMOVAL, {}, True),
- ]
- )
- def test_submit_leaves_request_pending_and_records_optout(self, _name, request_type, post_data, expected_flag):
- request = (
- self._event_removal_request()
- if request_type == RequestType.EVENT_REMOVAL
- else self._property_removal_request(properties=["$ip"])
- )
-
- response = self._call_submit(request, data=post_data)
-
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- # Submitting never approves — the sweep job owns that decision now.
- self.assertEqual(request.status, RequestStatus.PENDING)
- self.assertFalse(request.approved)
- self.assertEqual(request.requires_approval, expected_flag)
-
- def test_submit_get_offers_the_optout_only_to_event_removals(self):
- event_removal = self._event_removal_request()
- property_removal = self._property_removal_request(properties=["$ip"])
-
- self.assertTrue(self._call_submit(event_removal, method="GET").context_data["auto_approve_candidate"])
- self.assertFalse(self._call_submit(property_removal, method="GET").context_data["auto_approve_candidate"])
-
@time_machine.travel("2025-01-15 12:00:00", tick=False)
@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
@@ -679,7 +278,7 @@ class TestDataDeletionRequestAdminEditLock(BaseTest):
@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminChangeViewStatsAndLock(BaseTest):
+class TestDataDeletionRequestAdminChangeViewLock(BaseTest):
def setUp(self):
super().setUp()
self.user.is_staff = True
@@ -697,20 +296,10 @@ class TestDataDeletionRequestAdminChangeViewStatsAndLock(BaseTest):
status=status,
)
- def _change_context(
- self, request: DataDeletionRequest, in_clickhouse_team: bool = False, session: dict | None = None
- ):
- if in_clickhouse_team:
- clickhouse_team, _ = Group.objects.get_or_create(name="ClickHouse Team")
- self.user.groups.add(clickhouse_team)
- else:
- self.user.groups.clear()
-
+ def _change_context(self, request: DataDeletionRequest):
http_request = self.factory.get(f"/admin/posthog/datadeletionrequest/{request.pk}/change/")
http_request.user = self.user
_attach_messages(http_request)
- if session:
- http_request.session.update(session)
captured: dict = {}
@@ -727,29 +316,6 @@ class TestDataDeletionRequestAdminChangeViewStatsAndLock(BaseTest):
self.admin.change_view(http_request, str(request.pk))
return captured
- def test_change_view_exposes_stats_urls(self):
- request = self._make_request()
- ctx = self._change_context(request)
- self.assertIn("fetch_stats_url", ctx)
- self.assertIn("preview_stats_url", ctx)
-
- def test_change_view_is_clickhouse_team_flag(self):
- request = self._make_request()
- self.assertTrue(self._change_context(request, in_clickhouse_team=True)["is_clickhouse_team"])
- self.assertFalse(self._change_context(request, in_clickhouse_team=False)["is_clickhouse_team"])
-
- def test_change_view_pops_matching_preview_stats(self):
- request = self._make_request()
- preview = {"obj_pk": str(request.pk), "count": 42, "calculated_at": "2025-01-15T12:00:00"}
- ctx = self._change_context(request, session={"data_deletion_preview_stats": preview})
- self.assertEqual(ctx["preview_stats"], preview)
-
- def test_change_view_drops_mismatched_preview_stats(self):
- request = self._make_request()
- preview = {"obj_pk": "999999", "count": 42, "calculated_at": "2025-01-15T12:00:00"}
- ctx = self._change_context(request, session={"data_deletion_preview_stats": preview})
- self.assertIsNone(ctx["preview_stats"])
-
@parameterized.expand(
[
("approved", RequestStatus.APPROVED),
@@ -866,172 +432,6 @@ class TestDataDeletionRequestAdminChangeFormScripts(BaseTest):
self.assertEqual(rendered, expected)
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminStatsViewRedirects(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- clickhouse_team, _ = Group.objects.get_or_create(name="ClickHouse Team")
- self.user.groups.add(clickhouse_team)
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _person_request(self):
- return DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.PERSON_REMOVAL,
- person_uuids=["00000000-0000-0000-0000-000000000001"],
- person_drop_profiles=True,
- status=RequestStatus.APPROVED,
- approved_at=datetime.now(),
- )
-
- def _call(self, view, request: DataDeletionRequest, user=None):
- http_request = self.factory.post(f"/admin/posthog/datadeletionrequest/{request.pk}/x/")
- http_request.user = user or self.user
- _attach_messages(http_request)
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- return view(http_request, str(request.pk)), http_request
-
- def test_fetch_stats_redirects_to_change_page(self):
- request = self._person_request()
- response, _ = self._call(self.admin.fetch_stats_view, request)
- self.assertEqual(response.status_code, 302)
- self.assertIn("posthog_datadeletionrequest_change", response.url)
- request.refresh_from_db()
- self.assertIsNotNone(request.stats_calculated_at)
-
- def test_preview_stats_redirects_to_change_page(self):
- request = self._person_request()
- response, _ = self._call(self.admin.preview_stats_view, request)
- self.assertEqual(response.status_code, 302)
- self.assertIn("posthog_datadeletionrequest_change", response.url)
-
- def test_preview_stats_rejects_non_clickhouse_team(self):
- request = self._person_request()
- self.user.groups.clear()
-
- response, http_request = self._call(self.admin.preview_stats_view, request)
-
- self.assertEqual(response.status_code, 302)
- self.assertIn("posthog_datadeletionrequest_change", response.url)
- # The guard must short-circuit before any preview is computed or stashed in the session, and
- # surface the rejection — otherwise removing the authz check would still pass this test.
- self.assertNotIn("data_deletion_preview_stats", http_request.session)
- self.assertIn("Only ClickHouse Team members can preview stats.", [str(m) for m in get_messages(http_request)])
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminVerify(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- clickhouse_team, _ = Group.objects.get_or_create(name="ClickHouse Team")
- self.user.groups.add(clickhouse_team)
-
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _queued_request(self):
- return DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.EVENT_REMOVAL,
- events=["$pageview"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.QUEUED,
- execution_mode=ExecutionMode.DEFERRED,
- )
-
- def _call_verify(self, request, user=None):
- path = f"/admin/posthog/datadeletionrequest/{request.pk}/verify/"
- http_request = self.factory.post(path)
- http_request.user = user or self.user
- _attach_messages(http_request)
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- return self.admin.verify_view(http_request, str(request.pk))
-
- def test_verify_view_promotes_when_events_gone(self):
- request = self._queued_request()
- with patch("posthog.models.data_deletion_request.count_remaining_matching_events", return_value=0):
- response = self._call_verify(request)
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.COMPLETED)
-
- def test_verify_view_keeps_queued_when_events_remain(self):
- request = self._queued_request()
- with patch("posthog.models.data_deletion_request.count_remaining_matching_events", return_value=5):
- response = self._call_verify(request)
- self.assertEqual(response.status_code, 302)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.QUEUED)
-
- def test_verify_view_promotes_from_any_status_when_events_gone(self):
- request = self._queued_request()
- request.status = RequestStatus.APPROVED
- request.save(update_fields=["status"])
- with patch("posthog.models.data_deletion_request.count_remaining_matching_events", return_value=0):
- self._call_verify(request)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.COMPLETED)
-
- def test_verify_view_promotes_failed_when_events_gone(self):
- request = self._queued_request()
- request.status = RequestStatus.FAILED
- request.save(update_fields=["status"])
- with patch("posthog.models.data_deletion_request.count_remaining_matching_events", return_value=0):
- self._call_verify(request)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.COMPLETED)
-
- def test_verify_view_keeps_failed_when_events_remain(self):
- request = self._queued_request()
- request.status = RequestStatus.FAILED
- request.save(update_fields=["status"])
- with patch("posthog.models.data_deletion_request.count_remaining_matching_events", return_value=3):
- self._call_verify(request)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.FAILED)
-
- def test_verify_view_verifies_property_removal(self):
- request = self._queued_request()
- request.request_type = RequestType.PROPERTY_REMOVAL
- request.properties = ["$ip"]
- request.status = RequestStatus.FAILED
- request.save(update_fields=["request_type", "properties", "status"])
- with patch("posthog.models.data_deletion_request.count_remaining_property_events", return_value=0):
- self._call_verify(request)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.COMPLETED)
-
- @parameterized.expand(
- [
- ("person_removal", RequestType.PERSON_REMOVAL),
- ("query_backed_event_removal", RequestType.HOGQL_EVENT_REMOVAL),
- ]
- )
- def test_verify_view_reports_unsupported_request_type(self, _name, request_type):
- request = self._queued_request()
- request.request_type = request_type
- request.status = RequestStatus.FAILED
- request.save(update_fields=["request_type", "status"])
- with patch("posthog.admin.admins.data_deletion_request_admin.count_remaining_for_request") as counted:
- self._call_verify(request)
- counted.assert_not_called()
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.FAILED)
-
- def test_verify_view_rejects_non_clickhouse_team(self):
- request = self._queued_request()
- self.user.groups.clear()
- self._call_verify(request)
- request.refresh_from_db()
- self.assertEqual(request.status, RequestStatus.QUEUED)
-
-
@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
class TestDataDeletionRequestAdminDuplicate(BaseTest):
def setUp(self):
diff --git a/posthog/admin/test_deletion_request_console.py b/posthog/admin/test_deletion_request_console.py
new file mode 100644
index 000000000000..9a88812f3bcf
--- /dev/null
+++ b/posthog/admin/test_deletion_request_console.py
@@ -0,0 +1,365 @@
+from datetime import timedelta
+
+import time_machine
+from posthog.test.base import BaseTest
+from unittest.mock import patch
+
+from django.contrib.admin.models import LogEntry
+from django.contrib.auth.models import Group
+from django.test import override_settings
+from django.utils import timezone
+
+from parameterized import parameterized
+
+from posthog.admin.console.panels import MAX_FACTS_PER_PANEL
+from posthog.admin.console.registry import console
+from posthog.models.data_deletion_request import (
+ AdhocEventDeletionBacklog,
+ DataDeletionRequest,
+ ExecutionMode,
+ RequestStatus,
+ RequestType,
+)
+
+PANELS = "posthog.admin.console.deletion_request_panels"
+
+
+@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
+@time_machine.travel("2026-11-06T12:00:00Z", tick=False)
+class TestDeletionRequestConsole(BaseTest):
+ def setUp(self) -> None:
+ super().setUp()
+ self.user.is_staff = True
+ self.user.save()
+ clickhouse_team, _ = Group.objects.get_or_create(name="ClickHouse Team")
+ self.user.groups.add(clickhouse_team)
+ self.client.force_login(self.user)
+
+ def _request(self, **fields) -> DataDeletionRequest:
+ now = timezone.now()
+ defaults = {
+ "team_id": self.team.pk,
+ "request_type": RequestType.EVENT_REMOVAL,
+ "events": ["$pageview"],
+ "start_time": now - timedelta(days=7),
+ "end_time": now - timedelta(minutes=1),
+ "status": RequestStatus.DRAFT,
+ }
+ return DataDeletionRequest.objects.create(**{**defaults, **fields})
+
+ def _url(self, obj: DataDeletionRequest, panel: str = "", operation: str = "") -> str:
+ url = f"/admin/console/deletion-requests/{obj.pk}/"
+ return f"{url}{panel}/{operation}/" if operation else url
+
+ def _preview_approval(self, obj: DataDeletionRequest, mode: ExecutionMode):
+ revision = obj.criteria_updated_at.isoformat() if obj.criteria_updated_at else ""
+ with patch(
+ f"{PANELS}.count_adhoc_event_deletion_backlog", return_value=AdhocEventDeletionBacklog(total=5, for_team=2)
+ ):
+ return self.client.post(
+ self._url(obj, "workflow", "approve"),
+ {"execution_mode": mode.value, "criteria_revision": revision, "reason": "Ticket 123"},
+ )
+
+ def test_record_page_shows_the_request_and_django_admin_links_to_it(self) -> None:
+ obj = self._request(status=RequestStatus.FAILED, attempt_count=2, last_dagster_run_id="run-1")
+
+ response = self.client.get(self._url(obj))
+
+ assert response.status_code == 200
+ content = response.content.decode()
+ for title in ("Overview", "ClickHouse stats", "Workflow", "Retry deletion", "Verify deletion"):
+ assert title in content
+ assert f"/admin/console/teams/{self.team.pk}/" in content
+ for panel in console.panels_for("deletion-request"):
+ assert len(panel.facts(obj)) <= MAX_FACTS_PER_PANEL, f"{panel.key} shows too many facts"
+ admin_page = self.client.get(f"/admin/posthog/datadeletionrequest/{obj.pk}/change/").content.decode()
+ assert self._url(obj) in admin_page
+
+ @parameterized.expand(
+ [
+ ("event_removal_auto_approvable", RequestType.EVENT_REMOVAL, {}, False),
+ ("event_removal_opted_out", RequestType.EVENT_REMOVAL, {"requires_approval": "on"}, True),
+ # No checkbox for these. False would hide them from the changelist's "requires approval" filter.
+ ("property_removal", RequestType.PROPERTY_REMOVAL, {}, True),
+ ]
+ )
+ def test_submit_moves_a_draft_to_pending_and_records_the_opt_out(
+ self, _name: str, request_type: RequestType, data: dict, requires_approval: bool
+ ) -> None:
+ obj = self._request(request_type=request_type, properties=["$ip"] if request_type != "event_removal" else [])
+
+ response = self.client.post(self._url(obj, "workflow", "submit"), {"reason": "Customer asked", **data})
+
+ assert response.status_code == 302
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.PENDING
+ assert not obj.approved
+ assert obj.requires_approval == requires_approval
+
+ def test_submit_needs_a_reason(self) -> None:
+ obj = self._request()
+
+ response = self.client.post(self._url(obj, "workflow", "submit"), {"reason": " "})
+
+ assert response.status_code == 400
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.DRAFT
+
+ @parameterized.expand(
+ [
+ ("property_removal_without_properties", {"request_type": RequestType.PROPERTY_REMOVAL}),
+ (
+ "person_removal_without_targets",
+ {"request_type": RequestType.PERSON_REMOVAL, "events": [], "person_drop_profiles": True},
+ ),
+ (
+ "person_removal_without_drop_flag",
+ {"request_type": RequestType.PERSON_REMOVAL, "events": [], "person_distinct_ids": ["user-1"]},
+ ),
+ ]
+ )
+ def test_an_incomplete_draft_cannot_be_submitted(self, _name: str, fields: dict) -> None:
+ obj = self._request(**fields)
+
+ response = self.client.post(self._url(obj, "workflow", "submit"), {"reason": "Customer asked"})
+
+ assert response.status_code == 404
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.DRAFT
+ assert "Cannot submit" in self.client.get(self._url(obj)).content.decode()
+
+ @parameterized.expand(
+ [
+ ("event_removal_deferred", RequestType.EVENT_REMOVAL, ExecutionMode.DEFERRED, True),
+ ("event_removal_immediate", RequestType.EVENT_REMOVAL, ExecutionMode.IMMEDIATE, True),
+ ("query_backed_deferred", RequestType.HOGQL_EVENT_REMOVAL, ExecutionMode.DEFERRED, True),
+ ("query_backed_never_immediate", RequestType.HOGQL_EVENT_REMOVAL, ExecutionMode.IMMEDIATE, False),
+ ("property_removal_never_deferred", RequestType.PROPERTY_REMOVAL, ExecutionMode.DEFERRED, False),
+ ("person_removal_immediate", RequestType.PERSON_REMOVAL, ExecutionMode.IMMEDIATE, True),
+ ]
+ )
+ def test_approve_offers_only_the_execution_modes_the_type_supports(
+ self, _name: str, request_type: RequestType, mode: ExecutionMode, allowed: bool
+ ) -> None:
+ obj = self._request(request_type=request_type, properties=["$ip"], status=RequestStatus.PENDING)
+
+ preview = self._preview_approval(obj, mode)
+
+ if not allowed:
+ assert preview.status_code == 400
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.PENDING
+ return
+ assert preview.status_code == 200
+ assert "5 events are queued for deletion" in preview.content.decode()
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.PENDING
+
+ confirmed = self.client.post(
+ self._url(obj, "workflow", "approve"), {"confirm_token": preview.context["confirm_token"]}
+ )
+
+ assert confirmed.status_code == 302
+ obj.refresh_from_db()
+ assert (obj.status, obj.execution_mode, obj.approved_by) == (RequestStatus.APPROVED, mode, self.user)
+ assert LogEntry.objects.filter(object_id=str(obj.pk), change_message__startswith="Approved").exists()
+
+ @parameterized.expand(
+ [
+ (
+ "person_targets",
+ {
+ "request_type": RequestType.PERSON_REMOVAL,
+ "person_distinct_ids": [f"user-{index}" for index in range(25)],
+ "person_drop_events": True,
+ },
+ ExecutionMode.IMMEDIATE,
+ ["user-0", "user-19", "and 5 more"],
+ ["user-24"],
+ ),
+ (
+ "query_variables",
+ {
+ "request_type": RequestType.HOGQL_EVENT_REMOVAL,
+ "hogql_query": "SELECT uuid FROM events WHERE timestamp < {cutoff}",
+ "hogql_variables": {"cutoff": "2026-01-01"},
+ },
+ ExecutionMode.DEFERRED,
+ ["cutoff", "2026-01-01"],
+ [],
+ ),
+ ]
+ )
+ def test_approve_preview_names_what_gets_deleted(
+ self, _name: str, fields: dict, mode: ExecutionMode, shown: list[str], hidden: list[str]
+ ) -> None:
+ obj = self._request(status=RequestStatus.PENDING, **fields)
+
+ content = self._preview_approval(obj, mode).content.decode()
+
+ for text in shown:
+ assert text in content
+ for text in hidden:
+ assert text not in content
+
+ def test_approve_preview_still_shows_when_the_backlog_count_fails(self) -> None:
+ obj = self._request(status=RequestStatus.PENDING)
+
+ with patch(f"{PANELS}.count_adhoc_event_deletion_backlog", side_effect=Exception("ClickHouse is down")):
+ response = self.client.post(
+ self._url(obj, "workflow", "approve"),
+ {"execution_mode": "deferred", "criteria_revision": "", "reason": "Ticket 123"},
+ )
+
+ assert response.status_code == 200
+ assert "Could not count the events already queued for deletion" in response.content.decode()
+
+ def test_an_approval_confirmed_for_one_request_cannot_approve_another(self) -> None:
+ previewed = self._request(status=RequestStatus.PENDING)
+ other = self._request(status=RequestStatus.PENDING)
+ preview = self._preview_approval(previewed, ExecutionMode.DEFERRED)
+
+ response = self.client.post(
+ self._url(other, "workflow", "approve"), {"confirm_token": preview.context["confirm_token"]}
+ )
+
+ assert response.status_code == 302
+ other.refresh_from_db()
+ assert other.status == RequestStatus.PENDING
+
+ @parameterized.expand([("criteria_never_edited", None), ("criteria_edited_before", timedelta(hours=1))])
+ def test_an_approval_does_not_land_on_criteria_edited_after_the_preview(
+ self, _name: str, edited_ago: timedelta | None
+ ) -> None:
+ obj = self._request(
+ status=RequestStatus.PENDING,
+ criteria_updated_at=timezone.now() - edited_ago if edited_ago else None,
+ )
+ preview = self._preview_approval(obj, ExecutionMode.DEFERRED)
+ # An edit resets the request to draft. Submitting it again brings it back to pending with new criteria.
+ DataDeletionRequest.objects.filter(pk=obj.pk).update(
+ events=["$autocapture"], criteria_updated_at=timezone.now()
+ )
+
+ response = self.client.post(
+ self._url(obj, "workflow", "approve"), {"confirm_token": preview.context["confirm_token"]}
+ )
+
+ assert response.status_code == 409
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.PENDING
+ assert not obj.approved
+
+ @parameterized.expand(
+ [
+ ("approve", RequestStatus.PENDING, "workflow", "approve"),
+ ("retry", RequestStatus.FAILED, "workflow", "retry"),
+ ("verify", RequestStatus.QUEUED, "workflow", "verify"),
+ ("preview_stats", RequestStatus.DRAFT, "stats", "preview"),
+ ]
+ )
+ def test_clickhouse_operations_need_the_clickhouse_team_group(
+ self, _name: str, status: RequestStatus, panel: str, operation: str
+ ) -> None:
+ obj = self._request(status=status)
+ self.user.groups.clear()
+
+ with patch(f"{PANELS}.count_remaining_for_request", return_value=0) as counted:
+ response = self.client.post(
+ self._url(obj, panel, operation), {"reason": "Ticket 123", "execution_mode": "deferred"}
+ )
+
+ assert response.status_code == 403
+ counted.assert_not_called()
+ obj.refresh_from_db()
+ assert obj.status == status
+
+ def test_retry_requeues_a_failed_request_with_its_original_approval(self) -> None:
+ approved_at = timezone.now() - timedelta(hours=2)
+ obj = self._request(
+ status=RequestStatus.FAILED, approved=True, approved_by=self.user, approved_at=approved_at, attempt_count=2
+ )
+
+ response = self.client.post(self._url(obj, "workflow", "retry"), {"reason": "Shard was down"})
+
+ assert response.status_code == 302
+ obj.refresh_from_db()
+ assert (obj.status, obj.approved_by, obj.approved_at, obj.attempt_count) == (
+ RequestStatus.APPROVED,
+ self.user,
+ approved_at,
+ 2,
+ )
+
+ @parameterized.expand([(status.value, status) for status in RequestStatus if status != RequestStatus.FAILED])
+ def test_retry_is_only_offered_for_failed_requests(self, _name: str, status: RequestStatus) -> None:
+ obj = self._request(status=status)
+
+ response = self.client.post(self._url(obj, "workflow", "retry"), {"reason": "Shard was down"})
+
+ assert response.status_code == 404
+ obj.refresh_from_db()
+ assert obj.status == status
+
+ @parameterized.expand(
+ [
+ ("queued_and_gone", RequestStatus.QUEUED, 0, RequestStatus.COMPLETED),
+ ("queued_with_rows_left", RequestStatus.QUEUED, 5, RequestStatus.QUEUED),
+ ("approved_and_gone", RequestStatus.APPROVED, 0, RequestStatus.COMPLETED),
+ ("failed_and_gone", RequestStatus.FAILED, 0, RequestStatus.COMPLETED),
+ ("failed_with_rows_left", RequestStatus.FAILED, 3, RequestStatus.FAILED),
+ ]
+ )
+ def test_verify_completes_a_request_once_no_rows_remain(
+ self, _name: str, status: RequestStatus, remaining: int, expected: RequestStatus
+ ) -> None:
+ obj = self._request(status=status)
+
+ with patch(f"{PANELS}.count_remaining_for_request", return_value=remaining):
+ response = self.client.post(self._url(obj, "workflow", "verify"))
+
+ assert response.status_code == 302
+ obj.refresh_from_db()
+ assert obj.status == expected
+
+ def test_verify_does_not_complete_criteria_edited_while_it_counted(self) -> None:
+ obj = self._request(status=RequestStatus.FAILED)
+
+ def count_during_an_edit(request: DataDeletionRequest) -> int:
+ DataDeletionRequest.objects.filter(pk=request.pk).update(criteria_updated_at=timezone.now())
+ return 0
+
+ with patch(f"{PANELS}.count_remaining_for_request", side_effect=count_during_an_edit):
+ self.client.post(self._url(obj, "workflow", "verify"))
+
+ obj.refresh_from_db()
+ assert obj.status == RequestStatus.FAILED
+
+ @parameterized.expand(
+ [("person_removal", RequestType.PERSON_REMOVAL), ("query_backed", RequestType.HOGQL_EVENT_REMOVAL)]
+ )
+ def test_verify_is_not_offered_where_it_is_not_automated(self, _name: str, request_type: RequestType) -> None:
+ obj = self._request(request_type=request_type, status=RequestStatus.FAILED)
+
+ with patch(f"{PANELS}.count_remaining_for_request") as counted:
+ response = self.client.post(self._url(obj, "workflow", "verify"))
+
+ assert response.status_code == 404
+ counted.assert_not_called()
+ assert "Verify manually" in self.client.get(self._url(obj)).content.decode()
+
+ @parameterized.expand([("fetch", True), ("preview", False)])
+ def test_stats_of_a_person_removal_count_its_targets(self, operation: str, saved: bool) -> None:
+ obj = self._request(
+ request_type=RequestType.PERSON_REMOVAL,
+ events=[],
+ person_distinct_ids=["user-1", "user-2"],
+ person_drop_profiles=True,
+ )
+
+ response = self.client.post(self._url(obj, "stats", operation), follow=True)
+
+ assert "Selector count: 2 person targets" in response.content.decode()
+ obj.refresh_from_db()
+ assert (obj.count, obj.stats_calculated_at is not None) == ((2, True) if saved else (None, False))
diff --git a/posthog/templates/admin/posthog/datadeletionrequest/approve.html b/posthog/templates/admin/posthog/datadeletionrequest/approve.html
deleted file mode 100644
index 864f0830d500..000000000000
--- a/posthog/templates/admin/posthog/datadeletionrequest/approve.html
+++ /dev/null
@@ -1,127 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block title %}Approve deletion request{% endblock %}
-{% block content %}
- <h1>Approve deletion request</h1>
- <table style="margin: 20px 0; border-collapse: collapse; width: 100%;">
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Team ID</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.team_id }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Request type</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.get_request_type_display }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Time range</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.start_time }} &ndash; {{ obj.end_time }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Events</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- <ul style="margin: 0; padding-left: 20px;">
- {% for event in obj.events %}
- <li><code>{{ event }}</code></li>
- {% empty %}
- <li><em>None</em></li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- {% if obj.properties %}
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Properties</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- <ul style="margin: 0; padding-left: 20px;">
- {% for prop in obj.properties %}
- <li><code>{{ prop }}</code></li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- {% endif %}
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Matching events</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.count|default:"—" }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Queued in adhoc_events_deletion</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- {% if adhoc_backlog %}
- {{ adhoc_backlog.total|floatformat:"0g" }} events not yet deleted ({{ adhoc_backlog.for_team|floatformat:"0g" }} for team {{ obj.team_id }})
- {% else %}
- &mdash;
- {% endif %}
- </td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px;">Created by</th>
- <td style="padding: 8px;">{{ obj.created_by|default:"—" }}</td>
- </tr>
- </table>
- <form method="post">
- {% csrf_token %}
- <fieldset style="margin: 20px 0;
- padding: 16px;
- border: 1px solid #ccc;
- border-radius: 4px">
- <legend style="font-weight: bold; padding: 0 8px;">Execution mode</legend>
- {% if is_hogql_event_removal %}
- <p style="color: #555; margin: 4px 0;">
- Query-backed event removal requests use deferred execution. Matching event UUIDs are queued for the scheduled deletion job.
- </p>
- <input type="hidden" name="execution_mode" value="deferred" />
- {% elif supports_deferred %}
- <p style="color: #555; margin: 4px 0 12px 0;">Pick how this deletion should execute.</p>
- {% for value, label in execution_mode_choices %}
- <div style="margin: 8px 0;">
- <label style="cursor: pointer;">
- <input type="radio"
- name="execution_mode"
- value="{{ value }}"
- {% if value == default_execution_mode %}checked{% endif %} />
- <strong>{{ label }}</strong>
- {% if value == "immediate" %}
- &mdash; Dispatch a dedicated lightweight-delete mutation now on each shard. Events gone when the job finishes.
- {% elif value == "deferred" %}
- &mdash; Queue matching event UUIDs into <code>adhoc_events_deletion</code>. The scheduled <code>deletes_job</code> drains them alongside other batched deletes. Request lands in <code>queued</code> and transitions to <code>completed</code> once the events are gone.
- {% endif %}
- </label>
- </div>
- {% endfor %}
- {% elif is_person_removal %}
- <p style="color: #555; margin: 4px 0;">
- Person removal requests always execute immediately &mdash; deferred mode is only supported for event removal.
- </p>
- <select disabled style="opacity: 0.6;">
- <option selected>Immediate</option>
- </select>
- <input type="hidden" name="execution_mode" value="immediate" />
- {% else %}
- <p style="color: #555; margin: 4px 0;">
- Property removal requests always execute immediately &mdash; deferred mode is only supported for event removal.
- </p>
- <input type="hidden" name="execution_mode" value="immediate" />
- {% endif %}
- </fieldset>
- <div style="margin-top: 20px;
- display: flex;
- gap: 10px;
- align-items: center">
- <input type="submit"
- value="Confirm &amp; Approve"
- class="default"
- style="padding: 10px 15px;
- background: #5cb85c;
- color: white" />
- <a href="{% url 'admin:posthog_datadeletionrequest_change' obj.pk %}"
- style="padding: 10px 15px">Back</a>
- </div>
- </form>
-{% endblock %}
diff --git a/posthog/templates/admin/posthog/datadeletionrequest/change_form.html b/posthog/templates/admin/posthog/datadeletionrequest/change_form.html
index 8cec7550f7b2..2b84fdd53b3e 100644
--- a/posthog/templates/admin/posthog/datadeletionrequest/change_form.html
+++ b/posthog/templates/admin/posthog/datadeletionrequest/change_form.html
@@ -1,5 +1,12 @@
{% extends "admin/change_form.html" %}
{% load i18n %}
+{% block admin_console_url %}
+ {% if original.pk %}
+ {% url 'admin_console_deletion-request' pk=original.pk %}
+ {% else %}
+ {{ block.super }}
+ {% endif %}
+{% endblock %}
{% block after_field_sets %}
{{ block.super }}
{% if original.events %}
@@ -22,240 +29,15 @@
</ul>
</fieldset>
{% endif %}
- {% comment %}
- Stats are calculated from this page (works for any status). These buttons use
- formaction= to post the surrounding admin <form> to the stats views.
- Guarded on `original` — the stats URLs only exist for a saved object, and on the
- add view an empty formaction would post back and create a record.
- {% endcomment %}
{% if original %}
- <fieldset style="margin: 20px 0;
- padding: 16px;
- border: 1px solid #ccc;
- border-radius: 4px">
- <h2>ClickHouse stats</h2>
- {% if original.stats_calculated_at %}
- <table style="border-collapse: collapse; width: 100%;">
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #eee">Matching events</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #eee;">{{ original.count|default:"0" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #eee">Min timestamp</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #eee;">{{ original.min_timestamp|default:"—" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #eee">Max timestamp</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #eee;">{{ original.max_timestamp|default:"—" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #eee">Part count</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #eee;">{{ original.part_count|default:"0" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #eee">Parts size</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #eee;">{{ original.parts_size|default:"0" }} bytes</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #eee">Total rows in affected parts</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #eee;">{{ original.parts_row_count|default:"0" }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 6px 8px;">Calculated at</th>
- <td style="padding: 6px 8px;">{{ original.stats_calculated_at }}</td>
- </tr>
- </table>
- {% else %}
- <p style="color: #666; margin: 4px 0;">No stats have been fetched yet.</p>
- {% endif %}
- <div style="margin-top: 12px;
- display: flex;
- gap: 8px;
- align-items: center">
- <button type="submit"
- formaction="{{ fetch_stats_url }}"
- formmethod="post"
- formnovalidate
- class="button"
- style="padding: 8px 14px">{% if original.stats_calculated_at %}Refresh stats{% else %}Fetch stats{% endif %}</button>
- {% if is_clickhouse_team %}
- <button type="submit"
- formaction="{{ preview_stats_url }}"
- formmethod="post"
- formnovalidate
- class="button"
- style="padding: 8px 14px">Show stats now (don't save)</button>
- {% endif %}
- </div>
- </fieldset>
- {% endif %}
- {% if preview_stats %}
- <fieldset style="margin: 20px 0;
- padding: 16px;
- border: 1px dashed #0c5460;
- border-radius: 4px;
- background: #d1ecf1;
- color: #0c5460">
- <h2 style="color: #0c5460;">Preview (not saved)</h2>
- <table style="border-collapse: collapse; width: 100%;">
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #bee5eb">Matching events</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #bee5eb;">{{ preview_stats.count|default:"0" }}</td>
- </tr>
- {% if preview_stats.min_timestamp is not None %}
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #bee5eb">Min timestamp</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #bee5eb;">{{ preview_stats.min_timestamp|default:"—" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #bee5eb">Max timestamp</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #bee5eb;">{{ preview_stats.max_timestamp|default:"—" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #bee5eb">Part count</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #bee5eb;">{{ preview_stats.part_count|default:"0" }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #bee5eb">Parts size</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #bee5eb;">{{ preview_stats.parts_size|default:"0" }} bytes</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 6px 8px;
- border-bottom: 1px solid #bee5eb">Total rows in affected parts</th>
- <td style="padding: 6px 8px; border-bottom: 1px solid #bee5eb;">{{ preview_stats.parts_row_count|default:"0" }}</td>
- </tr>
- {% endif %}
- <tr>
- <th style="text-align: left; padding: 6px 8px;">Previewed at</th>
- <td style="padding: 6px 8px;">{{ preview_stats.calculated_at }}</td>
- </tr>
- </table>
+ <fieldset class="module">
+ <h2>Stats and workflow</h2>
+ <p>
+ Fetching stats, submitting, approving, retrying and verifying are in PostHog Admin.
+ <a href="{% url 'admin_console_deletion-request' pk=original.pk %}">Open this request in PostHog Admin &#8599;</a>
+ </p>
</fieldset>
{% endif %}
- {% if is_draft %}
- <div class="submit-row"
- style="margin-top: 20px;
- padding: 20px;
- border-radius: 5px;
- border: 1px solid #417690;
- display: flex;
- align-items: center;
- gap: 10px">
- <div class="info">This request is a <strong>draft</strong>. When ready, submit it for review.</div>
- <a class="button" style="padding: 10px 15px;" href="{{ submit_url }}">Review &amp; Submit</a>
- </div>
- {% endif %}
- {# NOTE: These submit buttons use formaction= to bypass the surrounding admin <form>, since browsers collapse nested <form> elements. #}
- {% if can_approve %}
- <div class="submit-row"
- style="margin-top: 20px;
- padding: 20px;
- border-radius: 5px;
- border: 1px solid #5cb85c;
- display: flex;
- align-items: center;
- gap: 10px">
- <div class="info">This request is <strong>pending</strong> and awaiting approval.</div>
- <a class="button"
- style="padding: 10px 15px;
- background: #5cb85c;
- color: white"
- href="{{ approve_url }}">Review &amp; Approve</a>
- </div>
- {% endif %}
- {% if can_revert_to_draft %}
- <div class="submit-row"
- style="margin-top: 20px;
- padding: 20px;
- border-radius: 5px;
- border: 1px solid #f0ad4e;
- display: flex;
- align-items: center;
- gap: 10px">
- <div class="info">This request is <strong>{{ original.get_status_display|lower }}</strong>. Moving it back to draft will clear the approval.</div>
- <button type="submit"
- formaction="{{ revert_to_draft_url }}"
- formmethod="post"
- formnovalidate
- class="button"
- style="padding: 10px 15px">Move to draft</button>
- </div>
- {% endif %}
- {% if can_retry %}
- <div class="submit-row"
- style="margin-top: 20px;
- padding: 20px;
- border-radius: 5px;
- border: 1px solid #d9534f;
- display: flex;
- align-items: center;
- gap: 10px">
- <div class="info">
- This request <strong>failed</strong> after {{ original.attempt_count }} attempt{{ original.attempt_count|pluralize }}.
- Retry to re-queue it for execution — the original approval is preserved.
- </div>
- <button type="submit"
- formaction="{{ retry_url }}"
- formmethod="post"
- formnovalidate
- class="button"
- style="padding: 10px 15px;
- background: #d9534f;
- color: white"
- data-confirm="Retry this failed request? It will be re-queued for execution.">Retry execution</button>
- </div>
- {% endif %}
- {% if can_verify %}
- <div class="submit-row"
- style="margin-top: 20px;
- padding: 20px;
- border-radius: 5px;
- border: 1px solid #417690;
- display: flex;
- align-items: center;
- gap: 10px">
- <div class="info">
- This request is <strong>{{ original.get_status_display|lower }}</strong>.
- {% if original.request_type == "person_removal" %}
- Automated verification isn't available for person removal requests — verifying will report that a manual check is required.
- {% else %}
- Verify to re-check ClickHouse now — if no matching rows remain, it will be marked completed{% if original.status == "failed" %} (use this when the job errored after the data was already deleted){% endif %}.
- {% endif %}
- </div>
- <button type="submit"
- formaction="{{ verify_url }}"
- formmethod="post"
- formnovalidate
- class="button"
- style="padding: 10px 15px;
- background: #417690;
- color: white"
- data-confirm="Verify this request against ClickHouse now?">Verify deletion</button>
- </div>
- {% endif %}
{% comment %}
Behaviour for ArrayTextareaWidget. It lives here rather than in the widget because a widget's
render() gets no request, so it cannot reach the nonce this policy requires, and because one
diff --git a/posthog/templates/admin/posthog/datadeletionrequest/submit.html b/posthog/templates/admin/posthog/datadeletionrequest/submit.html
deleted file mode 100644
index 4e09bd5ab1b9..000000000000
--- a/posthog/templates/admin/posthog/datadeletionrequest/submit.html
+++ /dev/null
@@ -1,185 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n %}
-{% block title %}Submit deletion request{% endblock %}
-{% block content %}
- <h1>Submit deletion request</h1>
- <table style="margin: 20px 0; border-collapse: collapse; width: 100%;">
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Team ID</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.team_id }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Request type</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.get_request_type_display }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Time range</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.start_time }} &ndash; {{ obj.end_time }}</td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Events</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- <ul style="margin: 0; padding-left: 20px;">
- {% for event in obj.events %}
- <li><code>{{ event }}</code></li>
- {% empty %}
- <li><em>None</em></li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Properties</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- {% if obj.properties %}
- <ul style="margin: 0; padding-left: 20px;">
- {% for prop in obj.properties %}
- <li><code>{{ prop }}</code></li>
- {% endfor %}
- </ul>
- {% else %}
- <em>None</em>
- {% endif %}
- </td>
- </tr>
- {% if is_person_removal %}
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Person UUIDs</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- {% if obj.person_uuids %}
- <ul style="margin: 0; padding-left: 20px;">
- {% for uuid in obj.person_uuids %}<li><code>{{ uuid }}</code></li>{% endfor %}
- </ul>
- {% else %}
- <em>None</em>
- {% endif %}
- </td>
- </tr>
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Person distinct IDs</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- {% if obj.person_distinct_ids %}
- <ul style="margin: 0; padding-left: 20px;">
- {% for did in obj.person_distinct_ids %}<li><code>{{ did }}</code></li>{% endfor %}
- </ul>
- {% else %}
- <em>None</em>
- {% endif %}
- </td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Drop flags</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">
- profiles: <strong>{{ obj.person_drop_profiles|yesno:"yes,no" }}</strong>,
- events: <strong>{{ obj.person_drop_events|yesno:"yes,no" }}</strong>,
- recordings: <strong>{{ obj.person_drop_recordings|yesno:"yes,no" }}</strong>
- </td>
- </tr>
- {% endif %}
- {% if obj.notes %}
- <tr>
- <th style="text-align: left;
- padding: 8px;
- border-bottom: 1px solid #ddd;
- vertical-align: top">Notes</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.notes }}</td>
- </tr>
- {% endif %}
- <tr>
- <th style="text-align: left; padding: 8px; border-bottom: 1px solid #ddd">Created by</th>
- <td style="padding: 8px; border-bottom: 1px solid #ddd;">{{ obj.created_by|default:"—" }}</td>
- </tr>
- <tr>
- <th style="text-align: left; padding: 8px;">Created at</th>
- <td style="padding: 8px;">{{ obj.created_at }}</td>
- </tr>
- </table>
- {% if missing_properties %}
- <div style="margin: 16px 0;
- padding: 12px 16px;
- border: 1px solid #dc3545;
- border-radius: 4px;
- background: #f8d7da;
- color: #721c24">
- <strong>Cannot submit:</strong> This is a property removal request but no properties are specified. Go back and add properties before submitting.
- </div>
- {% endif %}
- {% if missing_person_selectors %}
- <div style="margin: 16px 0;
- padding: 12px 16px;
- border: 1px solid #dc3545;
- border-radius: 4px;
- background: #f8d7da;
- color: #721c24">
- <strong>Cannot submit:</strong> This is a person removal request but no person UUIDs or distinct IDs are specified.
- </div>
- {% endif %}
- {% if missing_person_drop_flag %}
- <div style="margin: 16px 0;
- padding: 12px 16px;
- border: 1px solid #dc3545;
- border-radius: 4px;
- background: #f8d7da;
- color: #721c24">
- <strong>Cannot submit:</strong> Person removal needs at least one drop flag (profiles/events/recordings).
- </div>
- {% endif %}
- {% if can_submit %}
- {% if auto_approve_candidate %}
- <div style="margin: 16px 0;
- padding: 12px 16px;
- border: 1px solid #f0ad4e;
- border-radius: 4px;
- background: #fcf8e3;
- color: #8a6d3b">
- <strong>This request may be approved automatically.</strong>
- A job checks pending event removals every {{ auto_approve_interval_minutes }} minutes. It refreshes the
- ClickHouse stats, and if the request
- matches fewer than {{ auto_approve_max_events }} events and its time range has already ended, it approves the
- request and queues it for the scheduled deletes job. Anything larger, or still collecting events, waits for the
- ClickHouse Team.
- </div>
- {% else %}
- <p style="margin: 16px 0; color: #666;">
- Only event removal requests can be approved automatically. This is a
- {{ obj.get_request_type_display|lower }} request, so submitting sends it to the ClickHouse Team for manual
- approval.
- </p>
- {% endif %}
- {% endif %}
- <form method="post">
- {% csrf_token %}
- {% if can_submit and auto_approve_candidate %}
- <div style="margin-top: 16px;">
- <label>
- <input type="checkbox" name="requires_approval" />
- Do not auto-approve. Send this to the ClickHouse Team for manual review instead.
- </label>
- </div>
- {% endif %}
- <div style="margin-top: 20px;
- display: flex;
- gap: 10px;
- align-items: center">
- <input type="submit"
- value="Confirm &amp; Submit"
- class="default"
- style="padding: 10px 15px"
- {% if not can_submit %} disabled{% endif %} />
- <a href="{% url 'admin:posthog_datadeletionrequest_change' obj.pk %}"
- style="padding: 10px 15px">Back</a>
- </div>
- </form>
-{% endblock %}
diff --git a/posthog/templates/admin_console/operation.html b/posthog/templates/admin_console/operation.html
index 6d84a2a644d1..f78b142c0e92 100644
--- a/posthog/templates/admin_console/operation.html
+++ b/posthog/templates/admin_console/operation.html
@@ -36,7 +36,13 @@
{% for error in form.non_field_errors %}
<p class="quill-field__error m-0" role="alert">{{ error }}</p>
{% endfor %}
- {% for field in form %}
+ {% for field in form.hidden_fields %}
+ {{ field }}
+ {% for error in field.errors %}
+ <p class="quill-field__error m-0" role="alert">{{ error }}</p>
+ {% endfor %}
+ {% endfor %}
+ {% for field in form.visible_fields %}
{% include "admin_console/_form_field.html" %}
{% endfor %}
</div>