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 deletion request editing into the admin console (#130755)

Julian Bez89ff6df07652
diff --git a/posthog/admin/admins/data_deletion_request_admin.py b/posthog/admin/admins/data_deletion_request_admin.py
index 0341a0193a79..f00e54faf7ab 100644
--- a/posthog/admin/admins/data_deletion_request_admin.py
+++ b/posthog/admin/admins/data_deletion_request_admin.py
@@ -1,79 +1,11 @@
-import ast
-from datetime import UTC
-
-from django import forms
from django.conf import settings
-from django.contrib import admin, messages
+from django.contrib import admin
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 (
- DataDeletionRequest,
- ExecutionMode,
- RequestStatus,
- RequestType,
- build_deletion_count_query,
- invalidate_compiled_predicate_cache,
-)
+from posthog.models.data_deletion_request import DataDeletionRequest, build_deletion_count_query
from posthog.models.team import Team
-CRITERIA_FIELDS = {
- "request_type",
- "events",
- "delete_all_events",
- "properties",
- "person_properties",
- "start_time",
- "end_time",
- "hogql_predicate",
- "hogql_query",
- "hogql_variables",
- "person_uuids",
- "person_distinct_ids",
- "person_drop_profiles",
- "person_drop_events",
- "person_drop_recordings",
-}
-CLICKHOUSE_TEAM_GROUP = "ClickHouse Team"
-
-PERSON_REMOVAL_FIELDS = (
- "person_uuids",
- "person_distinct_ids",
- "person_drop_profiles",
- "person_drop_events",
- "person_drop_recordings",
-)
-
-UNSUPPORTED_REQUEST_TYPES = (
- RequestType.HOGQL_EVENT_REMOVAL,
- RequestType.PERSON_REMOVAL,
- RequestType.PROPERTY_REMOVAL,
-)
-
-# Unsupported types that ClickHouse Team members may still pick on the create form.
-CLICKHOUSE_TEAM_REQUEST_TYPES = (RequestType.PROPERTY_REMOVAL,)
-
-# Requests can only be edited while draft or pending. Once approved (or later), the
-# criteria are locked — operators must explicitly "revert to draft" to change them.
-EDITABLE_STATUSES = {RequestStatus.DRAFT, RequestStatus.PENDING}
-
-# The non-readonly fields rendered in the fieldsets. When a request is locked these are
-# added to readonly_fields so the whole form becomes read-only.
-EDITABLE_FIELDS = (
- "team_id",
- "request_type",
- "start_time",
- "end_time",
- "events",
- "delete_all_events",
- "properties",
- "person_properties",
- "hogql_predicate",
- "notes",
-)
-
# Dagster Cloud deployment slug per PostHog cloud environment. The admin runs on web pods, which
# don't carry DAGSTER_DOMAIN (only Dagster pods do), so the run URL is derived from CLOUD_DEPLOYMENT.
DAGSTER_DEPLOYMENT_BY_CLOUD = {"US": "prod-us", "EU": "prod-eu", "DEV": "dev"}
@@ -89,109 +21,10 @@ def dagster_run_url(run_id: str) -> str | None:
return None
-# ---------------------------------------------------------------------------
-# Custom widget + field for ArrayField editing
-# ---------------------------------------------------------------------------
-
-# The widget renders markup only. Its behaviour lives in a nonce'd block in
-# admin/posthog/datadeletionrequest/change_form.html, because a widget's render() receives no
-# request and so cannot reach {{ request.csp_nonce }}. Admin pages serve a policy whose script-src
-# carries no 'unsafe-inline', so an un-nonced inline script here is refused and the preview never
-# runs. Keeping the script in the template also emits it once rather than once per field.
-_WIDGET_TEMPLATE = '{html}<div class="array-textarea-preview" data-textarea-id="{id}" style="margin-top:6px"></div>'
-
-
-class ArrayTextareaWidget(forms.Textarea):
- """Textarea that displays list values one-per-line and shows a live parsed preview."""
-
- def __init__(self, attrs=None):
- defaults = {"rows": 5, "style": "font-family: monospace; width: 100%;"}
- if attrs:
- defaults.update(attrs)
- super().__init__(attrs=defaults)
-
- def format_value(self, value):
- if isinstance(value, list):
- return "\n".join(str(v) for v in value)
- return value
-
- def render(self, name, value, attrs=None, renderer=None):
- html = super().render(name, value, attrs, renderer)
- widget_id = attrs.get("id", f"id_{name}") if attrs else f"id_{name}"
- # html from super() is already a SafeString; widget_id is Django-generated (e.g. "id_events"),
- # not user input — format_html still HTML-escapes it for defense in depth.
- return format_html(_WIDGET_TEMPLATE, html=html, id=widget_id)
-
-
-class ArrayTextareaField(forms.CharField):
- """Form field that parses newline-separated or JSON array input into a list."""
-
- widget = ArrayTextareaWidget
-
- def clean(self, value):
- value = super().clean(value)
- if not value:
- return []
- text = value.strip()
- if text.startswith("["):
- # ast.literal_eval accepts both Python-style ('a') and JSON-style ("a") quotes
- try:
- parsed = ast.literal_eval(text)
- if isinstance(parsed, list | tuple):
- return [str(item).strip() for item in parsed if str(item).strip()]
- except (ValueError, SyntaxError):
- pass
- return [line.strip() for line in text.split("\n") if line.strip()]
-
-
-class DataDeletionRequestForm(forms.ModelForm):
- events = ArrayTextareaField(
- required=False,
- help_text="One event name per line. You can also paste a JSON array. "
- "Leave empty only when 'delete all events' is set.",
- )
- properties = ArrayTextareaField(
- required=False,
- help_text="One property name per line. You can also paste a JSON array. Required for property removal requests when person_properties is empty.",
- )
- person_properties = ArrayTextareaField(
- required=False,
- help_text="One property name per line. You can also paste a JSON array. "
- "Properties to remove from events.person_properties. Required for property removal requests when properties is empty.",
- )
- hogql_predicate = forms.CharField(
- required=False,
- widget=forms.Textarea(attrs={"rows": 4, "style": "font-family: monospace; width: 100%;"}),
- help_text="Optional HogQL boolean expression (validated against the events table). "
- "Combined with the other filters via AND. Example: properties.$browser = 'Chrome'.",
- )
-
- # DataDeletionRequestAdmin.get_form sets this for ClickHouse Team members.
- offer_clickhouse_team_types: bool = False
-
- class Meta:
- model = DataDeletionRequest
- exclude = PERSON_REMOVAL_FIELDS
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- request_type = self.fields.get("request_type")
- if isinstance(request_type, forms.ChoiceField):
- current_type = getattr(self.instance, "request_type", None)
- hidden_types = set(UNSUPPORTED_REQUEST_TYPES)
- if self.offer_clickhouse_team_types:
- hidden_types -= set(CLICKHOUSE_TEAM_REQUEST_TYPES)
- request_type.choices = [
- (value, label)
- for value, label in RequestType.choices
- if value not in hidden_types or value == current_type
- ]
-
-
@admin.register(DataDeletionRequest)
class DataDeletionRequestAdmin(admin.ModelAdmin):
- form = DataDeletionRequestForm
- actions = ["duplicate_requests"]
+ """Read-only browsing. Staff create, edit, duplicate and run requests in PostHog Admin."""
+
list_display = (
"id",
"team_id",
@@ -209,6 +42,7 @@ class DataDeletionRequestAdmin(admin.ModelAdmin):
list_filter = ("request_type", "status", "requires_approval", "approved", "approved_automatically")
search_fields = ("team_id", "events", "properties", "person_properties", "notes")
readonly_fields = (
+ "console_page",
"team_details",
"status",
"count",
@@ -237,13 +71,13 @@ class DataDeletionRequestAdmin(admin.ModelAdmin):
"rendered_count_query",
)
ordering = ("-created_at",)
- change_form_template = "admin/posthog/datadeletionrequest/change_form.html"
fieldsets = (
(
None,
{
"fields": (
+ "console_page",
"team_id",
"request_type",
"status",
@@ -299,35 +133,18 @@ class DataDeletionRequestAdmin(admin.ModelAdmin):
),
)
- @admin.action(permissions=["add"], description="Duplicate selected requests (as new drafts)")
- def duplicate_requests(self, request, queryset):
- """Copy each selected request into a fresh draft, noting it's a copy of the original."""
- created = 0
- for original in queryset:
- original_url = request.build_absolute_uri(
- reverse("admin:posthog_datadeletionrequest_change", args=[original.pk])
- )
- copy_note = f"Copy of data deletion request {original.pk} ({original_url})."
- notes = f"{copy_note}\n\n{original.notes}" if original.notes else copy_note
- # Build a fresh draft from CRITERIA_FIELDS (the single source of truth) so a new
- # criteria field is copied automatically. Everything operational — stats, approval,
- # execution tracking — falls back to model defaults (DRAFT, no stats, not approved).
- criteria = {field: getattr(original, field) for field in CRITERIA_FIELDS}
- # Shallow-copy mutable list fields so the duplicate never aliases the original's lists.
- criteria = {k: list(v) if isinstance(v, list) else v for k, v in criteria.items()}
- if original.request_type == RequestType.HOGQL_EVENT_REMOVAL:
- criteria["execution_mode"] = ExecutionMode.DEFERRED
- DataDeletionRequest.objects.create(
- **criteria,
- team_id=original.team_id,
- requires_approval=original.requires_approval,
- notes=notes,
- status=RequestStatus.DRAFT,
- created_by=request.user,
- created_by_staff=request.user.is_staff,
- )
- created += 1
- messages.success(request, f"Duplicated {created} request(s) as new draft(s).")
+ def has_add_permission(self, request, obj=None):
+ return False
+
+ def has_change_permission(self, request, obj=None):
+ return False
+
+ @admin.display(description="PostHog Admin")
+ def console_page(self, obj: DataDeletionRequest) -> str:
+ return format_html(
+ '<a href="{}">Open this request in PostHog Admin &#8599;</a>',
+ reverse("admin_console_deletion-request", kwargs={"pk": obj.pk}),
+ )
@admin.display(description="Team")
def team_details(self, obj: DataDeletionRequest) -> str:
@@ -379,116 +196,3 @@ class DataDeletionRequestAdmin(admin.ModelAdmin):
'<pre style="white-space: pre-wrap; background: #f5f5f5; padding: 8px;">{}</pre>',
rendered,
)
-
- def _is_locked(self, obj: DataDeletionRequest | None) -> bool:
- """Approved and later requests are locked — only draft/pending are editable."""
- return obj is not None and obj.pk is not None and obj.status not in EDITABLE_STATUSES
-
- def get_readonly_fields(self, request, obj=None):
- readonly = super().get_readonly_fields(request, obj)
- if self._is_locked(obj):
- return tuple(readonly) + EDITABLE_FIELDS
- if obj is not None:
- # team_id is immutable once the request exists — a request belongs to one team.
- return (*tuple(readonly), "team_id")
- return readonly
-
- def get_form(self, request, obj=None, change=False, **kwargs):
- form = super().get_form(request, obj, change=change, **kwargs)
- is_clickhouse_team = request.user.groups.filter(name=CLICKHOUSE_TEAM_GROUP).exists()
- return type(form.__name__, (form,), {"offer_clickhouse_team_types": is_clickhouse_team})
-
- def get_changeform_initial_data(self, request):
- initial: dict[str, object] = dict(super().get_changeform_initial_data(request))
- # The split datetime widget can't render a raw query-string value, so a prefilled add link
- # with dates would error. Parse them, read naive values as UTC, and drop what doesn't parse.
- for field in ("start_time", "end_time"):
- value = initial.get(field)
- if not isinstance(value, str):
- continue
- try:
- parsed = parse_datetime(value)
- except ValueError:
- parsed = None
- if parsed is None:
- initial.pop(field)
- elif timezone.is_naive(parsed):
- initial[field] = timezone.make_aware(parsed, UTC)
- else:
- initial[field] = parsed
- return initial
-
- def save_model(self, request, obj, form, change):
- if not change:
- obj.created_by = request.user
- obj.created_by_staff = request.user.is_staff
- elif form.changed_data and CRITERIA_FIELDS & set(form.changed_data):
- obj.criteria_updated_by = request.user
- obj.criteria_updated_at = timezone.now()
- # Criteria changed — the cached compiled predicate (used by stats/preview) is stale.
- invalidate_compiled_predicate_cache(obj.pk)
- obj.count = None
- obj.part_count = None
- obj.parts_size = None
- obj.parts_row_count = None
- obj.min_timestamp = None
- obj.max_timestamp = None
- obj.stats_calculated_at = None
- # Rows cleaned under the old criteria are ordinary candidates for the new ones —
- # a stale marker would make the copy pass skip them as "already cleaned".
- obj.property_removal_marker = None
- if obj.status != RequestStatus.DRAFT:
- obj.status = RequestStatus.DRAFT
- messages.warning(request, "Deletion criteria were changed — status has been reset to draft.")
- if obj.request_type == RequestType.EVENT_REMOVAL and (obj.properties or obj.person_properties):
- obj.properties = []
- obj.person_properties = []
- messages.info(request, "Properties cleared — event removal requests do not use properties.")
- if obj.request_type == RequestType.PERSON_REMOVAL and (
- obj.events or obj.delete_all_events or obj.hogql_predicate
- ):
- obj.events = []
- obj.delete_all_events = False
- obj.hogql_predicate = ""
- messages.info(
- request,
- "Event filters cleared — person removal requests do not use events/hogql_predicate.",
- )
- if obj.request_type != RequestType.PERSON_REMOVAL and (
- obj.person_uuids
- or obj.person_distinct_ids
- or obj.person_drop_profiles
- or obj.person_drop_events
- or obj.person_drop_recordings
- ):
- obj.person_uuids = []
- obj.person_distinct_ids = []
- obj.person_drop_profiles = None
- obj.person_drop_events = None
- obj.person_drop_recordings = None
- messages.info(request, "Person targets cleared — only person_removal requests use them.")
- super().save_model(request, obj, form, change)
-
- def change_view(self, request, object_id, form_url="", extra_context=None):
- extra_context = extra_context or {}
- obj = self.get_object(request, object_id)
- if obj:
- if obj.request_type == RequestType.PROPERTY_REMOVAL and not obj.properties and not obj.person_properties:
- messages.warning(
- request, "This is a property removal request but no properties or person_properties are specified."
- )
- if obj.request_type == RequestType.PERSON_REMOVAL:
- if not (obj.person_uuids or obj.person_distinct_ids):
- messages.warning(request, "This is a person removal request but no person targets are specified.")
- elif not (obj.person_drop_profiles or obj.person_drop_events or obj.person_drop_recordings):
- messages.warning(
- request,
- "This person removal request has no drop flag set "
- "(profiles/events/recordings) — nothing will be deleted.",
- )
- 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)
diff --git a/posthog/admin/console/deletion_request_form.py b/posthog/admin/console/deletion_request_form.py
new file mode 100644
index 000000000000..3898efcda9a8
--- /dev/null
+++ b/posthog/admin/console/deletion_request_form.py
@@ -0,0 +1,182 @@
+import ast
+from datetime import UTC, datetime
+from typing import Any, ClassVar
+
+from django import forms
+from django.http import QueryDict
+from django.utils import timezone
+from django.utils.dateparse import parse_datetime
+
+from posthog.models.data_deletion_request import DataDeletionRequest, RequestType
+
+CLICKHOUSE_TEAM_GROUP = "ClickHouse Team"
+
+# Types staff do not create by hand. An existing request of one of these types keeps its own type selectable.
+UNSUPPORTED_REQUEST_TYPES = (
+ RequestType.HOGQL_EVENT_REMOVAL,
+ RequestType.PERSON_REMOVAL,
+ RequestType.PROPERTY_REMOVAL,
+)
+
+CLICKHOUSE_TEAM_REQUEST_TYPES = (RequestType.PROPERTY_REMOVAL,)
+
+DATETIME_FIELDS = ("start_time", "end_time")
+DATETIME_HELP = "In UTC, for example 2026-01-31 23:59."
+
+
+def _parse_list(text: str) -> list[str]:
+ text = text.strip()
+ if not text:
+ return []
+ if text.startswith("["):
+ try:
+ parsed = ast.literal_eval(text)
+ except (ValueError, SyntaxError):
+ parsed = None
+ if isinstance(parsed, list | tuple):
+ return [str(item).strip() for item in parsed if str(item).strip()]
+ return [line.strip() for line in text.split("\n") if line.strip()]
+
+
+class ArrayTextareaField(forms.CharField):
+ widget = forms.Textarea
+
+ def prepare_value(self, value: Any) -> Any:
+ if isinstance(value, list):
+ return "\n".join(str(item) for item in value)
+ return value
+
+ def clean(self, value: Any) -> list[str]:
+ return _parse_list(super().clean(value) or "")
+
+ def has_changed(self, initial: Any, data: Any) -> bool:
+ # The initial value is a list and the submitted one is text, so compare them parsed.
+ initial_list = [str(item) for item in initial] if isinstance(initial, list) else _parse_list(initial or "")
+ return initial_list != _parse_list(data or "")
+
+
+class UTCDateTimeField(forms.DateTimeField):
+ def prepare_value(self, value: Any) -> Any:
+ # The console template prints the value as is, and a datetime would print in the localized long format.
+ if isinstance(value, datetime):
+ return value.astimezone(UTC).replace(tzinfo=None).isoformat(sep=" ")
+ return value
+
+
+def _choice_label(value: str, label: str) -> str:
+ return label if label.startswith("HogQL") else label.capitalize()
+
+
+# The console types operation forms as forms.Form, so the ModelForm also derives from it. Form adds nothing to
+# BaseForm, so this changes no behavior.
+class DataDeletionRequestForm(forms.ModelForm, forms.Form):
+ events = ArrayTextareaField(
+ required=False,
+ help_text="One event name per line. Leave it empty only when every event is matched.",
+ )
+ properties = ArrayTextareaField(
+ required=False,
+ help_text="One property name per line. A property removal needs a property or a person property.",
+ )
+ person_properties = ArrayTextareaField(
+ required=False,
+ label="Person properties",
+ help_text="One property name per line, removed from the person properties stored on each event.",
+ )
+ start_time = UTCDateTimeField(required=False, label="Start time", help_text=DATETIME_HELP)
+ end_time = UTCDateTimeField(required=False, label="End time", help_text=DATETIME_HELP)
+ hogql_predicate = forms.CharField(
+ required=False,
+ label="HogQL filter",
+ widget=forms.Textarea,
+ help_text="Optional. A HogQL condition on the events table, combined with the other filters. "
+ "For example: properties.$browser = 'Chrome'.",
+ )
+
+ # The request's updated_at when staff opened the form. The edit lands only if nothing changed since.
+ revision = forms.CharField(required=False, widget=forms.HiddenInput)
+
+ offer_clickhouse_team_types: ClassVar[bool] = False
+ # Set by for_request, because the console builds an operation's form without an instance.
+ bound_instance: ClassVar[DataDeletionRequest | None] = None
+
+ class Meta:
+ model = DataDeletionRequest
+ fields = (
+ "team_id",
+ "request_type",
+ "start_time",
+ "end_time",
+ "events",
+ "delete_all_events",
+ "properties",
+ "person_properties",
+ "hogql_predicate",
+ "notes",
+ )
+ labels = {
+ "team_id": "Team ID",
+ "request_type": "Type",
+ "delete_all_events": "Match every event in the time range",
+ }
+ help_texts = {
+ "request_type": "Event removal deletes whole events. Property removal removes properties from them.",
+ "delete_all_events": "Leave the events empty when you set this.",
+ }
+
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
+ if self.bound_instance is not None:
+ kwargs.setdefault("instance", self.bound_instance)
+ super().__init__(*args, **kwargs)
+ self.original_request_type: str | None = None
+ if self.instance._state.adding:
+ del self.fields["revision"]
+ else:
+ self.original_request_type = self.instance.request_type
+ del self.fields["team_id"]
+ updated_at = self.instance.updated_at
+ self.fields["revision"].initial = updated_at.isoformat() if updated_at else ""
+ hidden_types = set(UNSUPPORTED_REQUEST_TYPES)
+ if self.offer_clickhouse_team_types:
+ hidden_types -= set(CLICKHOUSE_TEAM_REQUEST_TYPES)
+ request_type = self.fields["request_type"]
+ assert isinstance(request_type, forms.ChoiceField)
+ request_type.choices = [
+ (value, _choice_label(value, label))
+ for value, label in RequestType.choices
+ if value not in hidden_types or value == self.original_request_type
+ ]
+
+ def needs_clickhouse_team(self) -> bool:
+ chosen = self.cleaned_data.get("request_type")
+ return chosen in CLICKHOUSE_TEAM_REQUEST_TYPES and chosen != self.original_request_type
+
+ @classmethod
+ def for_staff(cls, offer_clickhouse_team_types: bool) -> type["DataDeletionRequestForm"]:
+ return type("DataDeletionRequestForm", (cls,), {"offer_clickhouse_team_types": offer_clickhouse_team_types})
+
+ @classmethod
+ def for_request(cls, obj: DataDeletionRequest) -> type["DataDeletionRequestForm"]:
+ # Record operations build their form without the request, so every type ClickHouse Team members may pick
+ # is offered here, and the handler refuses it for everyone else.
+ return type("DataDeletionRequestForm", (cls,), {"offer_clickhouse_team_types": True, "bound_instance": obj})
+
+
+def initial_from_query(query: QueryDict) -> dict[str, object]:
+ initial: dict[str, object] = dict(query.items())
+ # Read naive values as UTC, and drop values that do not parse, so a bad link still opens the form.
+ for field in DATETIME_FIELDS:
+ value = initial.get(field)
+ if not isinstance(value, str):
+ continue
+ try:
+ parsed = parse_datetime(value)
+ except ValueError:
+ parsed = None
+ if parsed is None:
+ initial.pop(field)
+ elif timezone.is_naive(parsed):
+ initial[field] = timezone.make_aware(parsed, UTC)
+ else:
+ initial[field] = parsed
+ return initial
diff --git a/posthog/admin/console/deletion_request_panels.py b/posthog/admin/console/deletion_request_panels.py
index 81f567c398e2..39b65a2a61d2 100644
--- a/posthog/admin/console/deletion_request_panels.py
+++ b/posthog/admin/console/deletion_request_panels.py
@@ -4,24 +4,34 @@ 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.contrib.admin.models import ADDITION, CHANGE, LogEntry
+from django.contrib.admin.utils import construct_change_message
+from django.db import transaction
from django.db.models import Model
-from django.http import HttpRequest, HttpResponse
+from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
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.deletion_request_form import (
+ CLICKHOUSE_TEAM_GROUP,
+ UNSUPPORTED_REQUEST_TYPES,
+ DataDeletionRequestForm,
+ initial_from_query,
+)
+from posthog.admin.console.panels import MAX_FACTS_PER_PANEL, 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.admin.console.tools import Cell, ConsoleTool, Notice, Page, Row, Table, ToolOperation
+from posthog.dataclasses import frozen
from posthog.models.data_deletion_request import (
AUTO_APPROVE_INTERVAL_MINUTES,
AUTO_APPROVE_MAX_EVENTS,
+ EDITABLE_STATUSES,
DataDeletionRequest,
ExecutionMode,
RequestStatus,
RequestType,
+ StaffEditNotice,
count_adhoc_event_deletion_backlog,
count_remaining_for_request,
fetch_deletion_stats,
@@ -65,12 +75,14 @@ def _number(value: int | None) -> str:
return "-" if value is None else f"{value:,}"
-def _log_change(request: HttpRequest, obj: DataDeletionRequest, message: str) -> None:
+def _log_change(
+ request: HttpRequest, obj: DataDeletionRequest, message: str | list[dict], action_flag: int = CHANGE
+) -> 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,
+ action_flag=action_flag,
change_message=message,
single_object=True,
)
@@ -290,7 +302,13 @@ def _listed(values: list[str]) -> str:
return f"{shown} and {hidden:,} more" if hidden > 0 else shown
-def _criteria_rows(obj: DataDeletionRequest) -> list[Row]:
+@frozen
+class Criterion:
+ label: str
+ value: str
+
+
+def _criteria_values(obj: DataDeletionRequest) -> list[Criterion]:
criteria = [
("Type", request_type_label(obj)),
("Team", str(obj.team_id)),
@@ -315,7 +333,14 @@ def _criteria_rows(obj: DataDeletionRequest) -> list[Row]:
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]
+ return [Criterion(label=label, value=value) for label, value in criteria if value]
+
+
+def _criteria_rows(obj: DataDeletionRequest) -> list[Row]:
+ return [
+ Row(cells=(Cell(text=criterion.label), Cell(text=criterion.value, mono=True)))
+ for criterion in _criteria_values(obj)
+ ]
def _stats_block(obj: DataDeletionRequest) -> Notice | Table:
@@ -575,3 +600,158 @@ class DeletionRequestWorkflowPanel(Panel):
"for the ClickHouse Team."
),
)
+
+
+def _show_notices(request: HttpRequest, notices: list[StaffEditNotice]) -> None:
+ for notice in notices:
+ if notice.warning:
+ messages.warning(request, notice.text)
+ else:
+ messages.info(request, notice.text)
+
+
+def _refuse_clickhouse_team_type(request: HttpRequest, form: DataDeletionRequestForm) -> HttpResponse | None:
+ # The create form hides these types from everyone else, and the edit form cannot, because record forms are
+ # built without the request. This check covers both, and a hand-built POST.
+ if not form.needs_clickhouse_team() or CLICKHOUSE_TEAM.allows(request):
+ return None
+ form.add_error("request_type", f"Only {CLICKHOUSE_TEAM.label} can pick this type.")
+ return HttpResponse(status=400)
+
+
+def create_request(request: HttpRequest, form: forms.Form | None) -> HttpResponse | Page | None:
+ assert isinstance(form, DataDeletionRequestForm)
+ refused = _refuse_clickhouse_team_type(request, form)
+ if refused is not None:
+ return refused
+ obj = form.instance
+ notices = obj.apply_staff_edit(cast(User, request.user), form.changed_data, is_new=True)
+ obj.save()
+ _log_change(request, obj, construct_change_message(form, [], add=True), action_flag=ADDITION)
+ _show_notices(request, notices)
+ messages.success(request, "Draft created. Fetch its stats, then submit it for approval.")
+ return HttpResponseRedirect(RECORD_TYPES["deletion-request"].url(obj))
+
+
+def edit_criteria(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest) and isinstance(form, DataDeletionRequestForm)
+ refused = _refuse_clickhouse_team_type(request, form)
+ if refused is not None:
+ return refused
+ if not form.has_changed():
+ messages.info(request, "Nothing changed.")
+ return None
+ change_message = construct_change_message(form, [], add=False)
+ with transaction.atomic():
+ # The lock makes a concurrent approval wait for this save, and then miss the request it moved to draft.
+ current = (
+ DataDeletionRequest.objects.select_for_update()
+ .filter(pk=obj.pk)
+ .values_list("status", "updated_at")
+ .first()
+ )
+ if current is None or current[1].isoformat() != form.cleaned_data["revision"]:
+ messages.error(request, "Someone changed the request since you opened this form. Reload it.")
+ return HttpResponse(status=409)
+ if current[0] not in EDITABLE_STATUSES:
+ messages.error(request, "The request was approved or started since you opened this form. Reload it.")
+ return HttpResponse(status=409)
+ notices = obj.apply_staff_edit(cast(User, request.user), form.changed_data, is_new=False)
+ obj.save()
+ _log_change(request, obj, change_message)
+ _show_notices(request, notices)
+ messages.success(request, "Criteria saved.")
+ return None
+
+
+def duplicate(request: HttpRequest, obj: Model, form: forms.Form | None) -> HttpResponse | None:
+ assert isinstance(obj, DataDeletionRequest)
+ original_url = request.build_absolute_uri(RECORD_TYPES["deletion-request"].url(obj))
+ copy = obj.duplicate_as_draft(
+ cast(User, request.user), copy_note=f"Copy of data deletion request {obj.pk} ({original_url})."
+ )
+ _log_change(request, copy, [{"added": {}}], action_flag=ADDITION)
+ messages.success(request, "Duplicated as a new draft. This is the copy.")
+ return HttpResponseRedirect(RECORD_TYPES["deletion-request"].url(copy))
+
+
+class DeletionRequestCriteriaPanel(Panel):
+ record = "deletion-request"
+ key = "criteria"
+ title = "Criteria"
+ owner = CLICKHOUSE
+
+ def facts(self, obj: Model) -> list[Fact]:
+ assert isinstance(obj, DataDeletionRequest)
+ facts = [
+ Fact(label=criterion.label, value=criterion.value, mono=True)
+ for criterion in _criteria_values(obj)
+ if criterion.label not in ("Type", "Team")
+ ]
+ if obj.criteria_updated_at is not None:
+ editor = obj.criteria_updated_by.email if obj.criteria_updated_by else "a deleted user"
+ facts.append(Fact(label="Last changed", value=f"By {editor}, {_when(obj.criteria_updated_at)}"))
+ return facts[:MAX_FACTS_PER_PANEL]
+
+ def operations(self, obj: Model) -> list[Operation]:
+ assert isinstance(obj, DataDeletionRequest)
+ operations = []
+ if obj.status in EDITABLE_STATUSES:
+ operations.append(
+ Operation(
+ key="edit",
+ label="Edit criteria",
+ handler=edit_criteria,
+ form_class=DataDeletionRequestForm.for_request(obj),
+ description=(
+ "Changes what the request matches. A changed criterion clears the stats, and a pending "
+ "request goes back to draft."
+ ),
+ )
+ )
+ operations.append(
+ Operation(
+ key="duplicate",
+ label="Duplicate as a new draft",
+ handler=duplicate,
+ description="Creates a draft with the same criteria and opens it.",
+ # A copy is a new request, so only ClickHouse Team members copy types the create form does not
+ # offer everyone.
+ gate=CLICKHOUSE_TEAM if obj.request_type in UNSUPPORTED_REQUEST_TYPES else None,
+ )
+ )
+ return operations
+
+
+class NewDeletionRequestTool(ConsoleTool):
+ key = "new-deletion-request"
+ title = "New deletion request"
+ owner = CLICKHOUSE
+ group = "Data"
+ description = "Creates a draft request to delete events, or properties from events, of one team."
+
+ def page(self, request: HttpRequest) -> Page:
+ return Page(
+ blocks=(
+ Notice(
+ text="A new request starts as a draft. Nothing is deleted until it is submitted and approved.",
+ link_text="All requests in Django admin",
+ href="/admin/posthog/datadeletionrequest/",
+ ),
+ )
+ )
+
+ def operations(self, request: HttpRequest) -> list[ToolOperation]:
+ return [
+ ToolOperation(
+ key="create",
+ label="Create deletion request",
+ handler=create_request,
+ form_class=DataDeletionRequestForm.for_staff(CLICKHOUSE_TEAM.allows(request)),
+ # Support links prefill the form, for example ?team_id=2&events=$pageview.
+ form_initial={"request_type": RequestType.EVENT_REMOVAL.value, **initial_from_query(request.GET)},
+ description="Creates a draft and opens it. Nothing is deleted yet.",
+ )
+ ]
diff --git a/posthog/admin/console/records.py b/posthog/admin/console/records.py
index d5eb1a555e97..a75eed555726 100644
--- a/posthog/admin/console/records.py
+++ b/posthog/admin/console/records.py
@@ -127,7 +127,7 @@ class DeletionRequestRecord(RecordType):
pk_converter = "uuid"
def queryset(self) -> QuerySet:
- return DataDeletionRequest.objects.select_related("approved_by")
+ return DataDeletionRequest.objects.select_related("approved_by", "criteria_updated_by")
def title(self, obj: Model) -> str:
assert isinstance(obj, DataDeletionRequest)
@@ -148,9 +148,9 @@ class DeletionRequestRecord(RecordType):
def links(self, obj: Model) -> list[RecordLink]:
return [
RecordLink(
- label="Edit in Django admin",
+ label="Raw record in Django admin",
href=reverse("admin:posthog_datadeletionrequest_change", args=[obj.pk]),
- title="The raw request, where its criteria are edited",
+ title="The raw request, with every field",
),
]
diff --git a/posthog/admin/console/urls.py b/posthog/admin/console/urls.py
index cfef075b665e..4f06a9dd27f7 100644
--- a/posthog/admin/console/urls.py
+++ b/posthog/admin/console/urls.py
@@ -91,6 +91,12 @@ urlpatterns = [
)
for old, target in MOVED_DELETION_REQUEST_ACTIONS.items()
],
+ path(
+ "admin/posthog/datadeletionrequest/add/",
+ MovedToConsole.page_redirect(
+ "Creating a deletion request", "/admin/console/tools/new-deletion-request/create/"
+ ),
+ ),
path(
"admin/posthog/organization/bulk-deactivate/",
MovedToConsole.page_redirect("Bulk deactivation", "/admin/console/tools/bulk-deactivate-organizations/"),
diff --git a/posthog/admin/test_data_deletion_request_admin.py b/posthog/admin/test_data_deletion_request_admin.py
index 6307a8b36ec3..4063317401bd 100644
--- a/posthog/admin/test_data_deletion_request_admin.py
+++ b/posthog/admin/test_data_deletion_request_admin.py
@@ -1,158 +1,17 @@
-import re
from datetime import datetime, timedelta
import time_machine
from posthog.test.base import BaseTest
-from unittest.mock import patch
from django.contrib.admin.sites import AdminSite
-from django.contrib.auth.models import Group
-from django.contrib.messages.storage.fallback import FallbackStorage
-from django.test import RequestFactory, SimpleTestCase, override_settings
+from django.test import SimpleTestCase, override_settings
from django.urls import reverse
-from django.utils import timezone
from bs4 import BeautifulSoup
from parameterized import parameterized
-from posthog.admin.admins.data_deletion_request_admin import EDITABLE_FIELDS, DataDeletionRequestAdmin, dagster_run_url
-from posthog.models.data_deletion_request import DataDeletionRequest, ExecutionMode, RequestStatus, RequestType
-
-
-def _attach_messages(request) -> None:
- request.session = {}
- request._messages = FallbackStorage(request)
-
-
-def _fake_reverse(name, args=None, kwargs=None):
- if args:
- return f"/{name}/{'/'.join(str(a) for a in args)}/"
- return f"/{name}/"
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminCreateForm(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())
-
- @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:
- self.user.groups.clear()
- http_request = self.factory.get("/admin/posthog/datadeletionrequest/add/")
- http_request.user = self.user
-
- form = self.admin.get_form(http_request)()
-
- offered = TestDataDeletionRequestFormHidesUnsupportedTypes._type_values(form)
- self.assertEqual(RequestType.PROPERTY_REMOVAL in offered, in_clickhouse_team)
-
-
-@time_machine.travel("2025-01-15 12:00:00", tick=False)
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminSaveModel(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _call_save(self, obj: DataDeletionRequest, changed_data: list[str] | None = None):
- path = f"/admin/posthog/datadeletionrequest/{obj.pk}/change/"
- http_request = self.factory.post(path)
- http_request.user = self.user
- _attach_messages(http_request)
-
- class _FakeForm:
- changed_data: list[str] = []
-
- form = _FakeForm()
- if changed_data is not None:
- form.changed_data = changed_data
- self.admin.save_model(http_request, obj, form, change=True)
-
- def test_event_removal_clears_properties_on_save(self):
- obj = DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.EVENT_REMOVAL,
- events=["$pageview"],
- properties=["$ip"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.DRAFT,
- )
- self._call_save(obj)
- obj.refresh_from_db()
- self.assertEqual(obj.properties, [])
-
- def test_event_removal_clears_person_properties_on_save(self):
- obj = DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.EVENT_REMOVAL,
- events=["$pageview"],
- person_properties=["email"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.DRAFT,
- )
- self._call_save(obj)
- obj.refresh_from_db()
- self.assertEqual(obj.person_properties, [])
-
- def test_event_removal_clears_both_on_save(self):
- obj = DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.EVENT_REMOVAL,
- events=["$pageview"],
- properties=["$ip"],
- person_properties=["email"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.DRAFT,
- )
- self._call_save(obj)
- obj.refresh_from_db()
- self.assertEqual(obj.properties, [])
- self.assertEqual(obj.person_properties, [])
-
- def test_property_removal_preserves_both_fields_on_save(self):
- obj = DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.PROPERTY_REMOVAL,
- events=["$pageview"],
- properties=["$ip"],
- person_properties=["email"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.DRAFT,
- )
- self._call_save(obj)
- obj.refresh_from_db()
- self.assertEqual(obj.properties, ["$ip"])
- self.assertEqual(obj.person_properties, ["email"])
-
- def test_criteria_change_clears_property_removal_marker(self):
- obj = DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.PROPERTY_REMOVAL,
- events=["$pageview"],
- properties=["$ip"],
- start_time=datetime.now() - timedelta(days=7),
- end_time=datetime.now(),
- status=RequestStatus.PENDING,
- property_removal_marker=timezone.now(),
- )
- self._call_save(obj, changed_data=["properties"])
- obj.refresh_from_db()
- self.assertIsNone(obj.property_removal_marker)
+from posthog.admin.admins.data_deletion_request_admin import DataDeletionRequestAdmin, dagster_run_url
+from posthog.models.data_deletion_request import DataDeletionRequest, RequestStatus, RequestType
@time_machine.travel("2025-01-15 12:00:00", tick=False)
@@ -216,140 +75,16 @@ class TestDataDeletionRequestModelValidation(BaseTest):
self.assertNotIn("person_properties", msg_dict)
+@time_machine.travel("2026-11-06T12:00:00Z", tick=False)
@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminEditLock(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 _readonly_fields(self, obj):
- http_request = self.factory.get("/admin/posthog/datadeletionrequest/")
- http_request.user = self.user
- return self.admin.get_readonly_fields(http_request, obj)
-
- @parameterized.expand(
- [
- ("approved", RequestStatus.APPROVED),
- ("in_progress", RequestStatus.IN_PROGRESS),
- ("queued", RequestStatus.QUEUED),
- ("completed", RequestStatus.COMPLETED),
- ("failed", RequestStatus.FAILED),
- ]
- )
- def test_locked_statuses_make_all_fields_readonly(self, _name, status):
- obj = self._make_request(status)
- readonly = self._readonly_fields(obj)
- for field in EDITABLE_FIELDS:
- self.assertIn(field, readonly)
-
- @parameterized.expand(
- [
- ("draft", RequestStatus.DRAFT),
- ("pending", RequestStatus.PENDING),
- ]
- )
- def test_editable_statuses_keep_fields_editable(self, _name, status):
- obj = self._make_request(status)
- readonly = self._readonly_fields(obj)
- # team_id is immutable once the request exists, so it stays readonly even when editable.
- for field in EDITABLE_FIELDS:
- if field == "team_id":
- self.assertIn(field, readonly)
- else:
- self.assertNotIn(field, readonly)
-
- def test_add_view_fields_editable(self):
- readonly = self._readonly_fields(None)
- for field in EDITABLE_FIELDS:
- self.assertNotIn(field, readonly)
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminChangeViewLock(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 = RequestStatus.DRAFT):
- 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 _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)
-
- 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
-
- @parameterized.expand(
- [
- ("approved", RequestStatus.APPROVED),
- ("in_progress", RequestStatus.IN_PROGRESS),
- ("queued", RequestStatus.QUEUED),
- ("completed", RequestStatus.COMPLETED),
- ("failed", RequestStatus.FAILED),
- ]
- )
- def test_change_view_hides_save_for_locked(self, _name, status):
- ctx = self._change_context(self._make_request(status))
- self.assertFalse(ctx.get("show_save", True))
-
- @parameterized.expand(
- [
- ("draft", RequestStatus.DRAFT),
- ("pending", RequestStatus.PENDING),
- ]
- )
- def test_change_view_shows_save_for_editable(self, _name, status):
- ctx = self._change_context(self._make_request(status))
- self.assertTrue(ctx.get("show_save", True))
-
-
-@time_machine.travel("2025-01-15 12:00:00", tick=False)
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminChangeFormScripts(BaseTest):
+class TestDataDeletionRequestAdminChangePage(BaseTest):
def setUp(self):
super().setUp()
self.user.is_staff = True
self.user.save()
self.client.force_login(self.user)
- def test_array_previews_are_wired_by_a_script_carrying_the_page_nonce(self):
+ def test_change_page_is_read_only_and_links_to_the_console(self):
request = DataDeletionRequest.objects.create(
team_id=self.team.id,
request_type=RequestType.EVENT_REMOVAL,
@@ -360,26 +95,15 @@ class TestDataDeletionRequestAdminChangeFormScripts(BaseTest):
)
response = self.client.get(f"/admin/posthog/datadeletionrequest/{request.pk}/change/")
+ posted = self.client.post(f"/admin/posthog/datadeletionrequest/{request.pk}/change/", {"notes": "edited"})
self.assertEqual(response.status_code, 200)
- nonce = re.search(r"'nonce-([^']+)'", response["Content-Security-Policy"])
- assert nonce is not None
soup = BeautifulSoup(response.content, "html.parser")
- inline_scripts = soup.select("script:not([src])")
- self.assertEqual({script.get("nonce") for script in inline_scripts}, {nonce.group(1)})
- self.assertTrue(
- any(
- "array-textarea-preview" in script.get_text() and "textareaId" in script.get_text()
- for script in inline_scripts
- )
- )
- self.assertEqual(
- {preview.get("data-textarea-id") for preview in soup.select("div.array-textarea-preview")},
- {
- soup.select_one(f"textarea[name={field}]").get("id")
- for field in ("events", "properties", "person_properties")
- },
- )
+ self.assertIsNone(soup.select_one("textarea, input[name=_save]"))
+ self.assertIsNotNone(soup.select_one(f'a[href="/admin/console/deletion-requests/{request.pk}/"]'))
+ self.assertEqual(posted.status_code, 403)
+ request.refresh_from_db()
+ self.assertEqual(request.notes, "")
@parameterized.expand([("existing_team", True), ("deleted_team", False)])
def test_change_view_shows_team_and_organization(self, _name, team_exists):
@@ -414,96 +138,6 @@ class TestDataDeletionRequestAdminChangeFormScripts(BaseTest):
self.assertEqual(links, {})
self.assertIn(f"{team_id} (team not found)", team_field.get_text())
- @parameterized.expand(
- [
- ("naive", "2025-01-08 08:12:00", ("2025-01-08", "08:12:00")),
- ("iso_utc", "2025-01-08T08:12:00Z", ("2025-01-08", "08:12:00")),
- ("other_offset", "2025-01-08T10:12:00+02:00", ("2025-01-08", "08:12:00")),
- ("unparseable", "next tuesday", ("", "")),
- ("invalid_date", "2025-13-45 08:12:00", ("", "")),
- ]
- )
- def test_add_view_prefills_datetimes_from_query_string(self, _name, value, expected):
- response = self.client.get("/admin/posthog/datadeletionrequest/add/", {"start_time": value})
-
- self.assertEqual(response.status_code, 200)
- soup = BeautifulSoup(response.content, "html.parser")
- rendered = tuple(soup.select_one(f"input[name=start_time_{i}]").get("value", "") for i in (0, 1))
- self.assertEqual(rendered, expected)
-
-
-@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
-class TestDataDeletionRequestAdminDuplicate(BaseTest):
- def setUp(self):
- super().setUp()
- self.user.is_staff = True
- self.user.save()
- self.factory = RequestFactory()
- self.admin = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
-
- def _call_duplicate(self, queryset):
- http_request = self.factory.post("/admin/posthog/datadeletionrequest/")
- http_request.user = self.user
- _attach_messages(http_request)
- with patch("posthog.admin.admins.data_deletion_request_admin.reverse", side_effect=_fake_reverse):
- self.admin.duplicate_requests(http_request, queryset)
-
- @parameterized.expand(
- [
- ("with_notes", "please be careful"),
- ("without_notes", ""),
- ]
- )
- @time_machine.travel("2026-01-15", tick=False)
- def test_duplicate_copies_criteria_into_a_fresh_draft_with_link_note(self, _name, original_notes):
- original = 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(),
- notes=original_notes,
- status=RequestStatus.COMPLETED,
- count=42,
- approved=True,
- approved_at=datetime.now(),
- attempt_count=3,
- )
-
- self._call_duplicate(DataDeletionRequest.objects.filter(pk=original.pk))
-
- copy = DataDeletionRequest.objects.exclude(pk=original.pk).get()
- self.assertEqual(copy.team_id, original.team_id)
- self.assertEqual(copy.events, ["$pageview"])
- self.assertEqual(copy.status, RequestStatus.DRAFT)
- self.assertIsNone(copy.count)
- self.assertFalse(copy.approved)
- self.assertEqual(copy.attempt_count, 0)
- self.assertEqual(copy.created_by, self.user)
- self.assertIn(str(original.pk), copy.notes)
- self.assertIn("Copy of data deletion request", copy.notes)
- if original_notes:
- self.assertIn(original_notes, copy.notes)
- else:
- # No original notes — the copy note stands alone, no trailing separator.
- self.assertFalse(copy.notes.endswith("\n"))
-
- def test_duplicate_preserves_query_snapshot(self):
- original = DataDeletionRequest.objects.create(
- team_id=self.team.id,
- request_type=RequestType.HOGQL_EVENT_REMOVAL,
- hogql_query="SELECT uuid FROM events WHERE event = {event}",
- hogql_variables={"event": "$pageview"},
- execution_mode=ExecutionMode.DEFERRED,
- )
-
- self._call_duplicate(DataDeletionRequest.objects.filter(pk=original.pk))
-
- copy = DataDeletionRequest.objects.exclude(pk=original.pk).get()
- self.assertEqual(copy.hogql_query, original.hogql_query)
- self.assertEqual(copy.hogql_variables, original.hogql_variables)
- self.assertEqual(copy.execution_mode, ExecutionMode.DEFERRED)
-
class TestDagsterRunLink(SimpleTestCase):
RUN_ID = "f5f3a611-4be8-48bc-9b29-ff8b06d01189"
@@ -538,46 +172,3 @@ class TestDagsterRunLink(SimpleTestCase):
def test_admin_renders_placeholder_when_never_executed(self):
admin_obj = DataDeletionRequestAdmin(DataDeletionRequest, AdminSite())
self.assertEqual(admin_obj.last_dagster_run(DataDeletionRequest()), "—")
-
-
-class TestDataDeletionRequestFormHidesUnsupportedTypes(SimpleTestCase):
- @staticmethod
- def _type_values(form) -> list[str]:
- from typing import cast
-
- from django import forms
-
- request_type = form.fields["request_type"]
- assert isinstance(request_type, forms.ChoiceField)
- choices = cast("list[tuple[str, str]]", request_type.choices)
- return [value for value, _ in choices]
-
- @parameterized.expand(
- [
- ("outside_clickhouse_team", False, [RequestType.EVENT_REMOVAL]),
- ("clickhouse_team", True, [RequestType.PROPERTY_REMOVAL, RequestType.EVENT_REMOVAL]),
- ]
- )
- def test_types_offered_on_a_new_request(self, _name, offer_clickhouse_team_types, expected_types):
- from posthog.admin.admins.data_deletion_request_admin import PERSON_REMOVAL_FIELDS, DataDeletionRequestForm
-
- form_class = type(
- "Form", (DataDeletionRequestForm,), {"offer_clickhouse_team_types": offer_clickhouse_team_types}
- )
- form = form_class()
- self.assertEqual(self._type_values(form), expected_types)
- for field in PERSON_REMOVAL_FIELDS:
- self.assertNotIn(field, form.fields)
-
- @parameterized.expand(
- [
- (RequestType.HOGQL_EVENT_REMOVAL,),
- (RequestType.PROPERTY_REMOVAL,),
- (RequestType.PERSON_REMOVAL,),
- ]
- )
- def test_existing_request_keeps_its_own_type_selectable(self, request_type):
- from posthog.admin.admins.data_deletion_request_admin import DataDeletionRequestForm
-
- form = DataDeletionRequestForm(instance=DataDeletionRequest(team_id=1, request_type=request_type))
- self.assertIn(request_type, self._type_values(form))
diff --git a/posthog/admin/test_deletion_request_console.py b/posthog/admin/test_deletion_request_console.py
index 9a88812f3bcf..185c4a5af8c8 100644
--- a/posthog/admin/test_deletion_request_console.py
+++ b/posthog/admin/test_deletion_request_console.py
@@ -1,19 +1,24 @@
from datetime import timedelta
+from typing import cast
import time_machine
from posthog.test.base import BaseTest
from unittest.mock import patch
-from django.contrib.admin.models import LogEntry
+from django import forms
+from django.contrib.admin.models import ADDITION, LogEntry
from django.contrib.auth.models import Group
-from django.test import override_settings
+from django.test import SimpleTestCase, override_settings
from django.utils import timezone
+from bs4 import BeautifulSoup
from parameterized import parameterized
+from posthog.admin.console.deletion_request_form import ArrayTextareaField, DataDeletionRequestForm
from posthog.admin.console.panels import MAX_FACTS_PER_PANEL
from posthog.admin.console.registry import console
from posthog.models.data_deletion_request import (
+ EDITABLE_STATUSES,
AdhocEventDeletionBacklog,
DataDeletionRequest,
ExecutionMode,
@@ -22,6 +27,7 @@ from posthog.models.data_deletion_request import (
)
PANELS = "posthog.admin.console.deletion_request_panels"
+CREATE_URL = "/admin/console/tools/new-deletion-request/create/"
@override_settings(STORAGES={"staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"}})
@@ -51,6 +57,11 @@ class TestDeletionRequestConsole(BaseTest):
url = f"/admin/console/deletion-requests/{obj.pk}/"
return f"{url}{panel}/{operation}/" if operation else url
+ def _edit(self, obj: DataDeletionRequest, data: dict[str, str]):
+ # The form carries the revision it was opened at; tests open it at the request's current one.
+ obj.refresh_from_db()
+ return self.client.post(self._url(obj, "criteria", "edit"), {"revision": obj.updated_at.isoformat(), **data})
+
def _preview_approval(self, obj: DataDeletionRequest, mode: ExecutionMode):
revision = obj.criteria_updated_at.isoformat() if obj.criteria_updated_at else ""
with patch(
@@ -68,7 +79,14 @@ class TestDeletionRequestConsole(BaseTest):
assert response.status_code == 200
content = response.content.decode()
- for title in ("Overview", "ClickHouse stats", "Workflow", "Retry deletion", "Verify deletion"):
+ for title in (
+ "Overview",
+ "ClickHouse stats",
+ "Criteria",
+ "Workflow",
+ "Retry deletion",
+ "Duplicate as a new draft",
+ ):
assert title in content
assert f"/admin/console/teams/{self.team.pk}/" in content
for panel in console.panels_for("deletion-request"):
@@ -363,3 +381,268 @@ class TestDeletionRequestConsole(BaseTest):
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))
+
+ def _create(self, **data):
+ fields = {
+ "team_id": str(self.team.pk),
+ "request_type": RequestType.EVENT_REMOVAL.value,
+ "start_time": "2026-11-01 00:00",
+ "end_time": "2026-11-02 00:00",
+ "events": "$pageview\n$autocapture",
+ "properties": "$ip",
+ "notes": "Ticket 123",
+ }
+ return self.client.post(CREATE_URL, {**fields, **data})
+
+ def test_create_makes_a_draft_and_opens_it(self) -> None:
+ response = self._create()
+
+ obj = DataDeletionRequest.objects.get()
+ assert response.status_code == 302
+ assert response["Location"] == self._url(obj)
+ assert (obj.status, obj.events, obj.properties, obj.created_by, obj.created_by_staff) == (
+ RequestStatus.DRAFT,
+ ["$pageview", "$autocapture"],
+ [],
+ self.user,
+ True,
+ )
+ assert LogEntry.objects.filter(object_id=str(obj.pk), action_flag=ADDITION).exists()
+
+ @parameterized.expand([("member", True, 302), ("outside_clickhouse_team", False, 400)])
+ def test_property_removal_is_only_created_by_the_clickhouse_team(
+ self, _name: str, in_clickhouse_team: bool, expected: int
+ ) -> None:
+ if not in_clickhouse_team:
+ self.user.groups.clear()
+
+ response = self._create(request_type=RequestType.PROPERTY_REMOVAL.value)
+
+ assert response.status_code == expected
+ assert DataDeletionRequest.objects.exists() == in_clickhouse_team
+
+ @parameterized.expand(
+ [
+ ("naive", "2025-01-08 08:12:00", "2025-01-08 08:12:00"),
+ ("iso_utc", "2025-01-08T08:12:00Z", "2025-01-08 08:12:00"),
+ ("other_offset", "2025-01-08T10:12:00+02:00", "2025-01-08 08:12:00"),
+ ("unparseable", "next tuesday", ""),
+ ("invalid_date", "2025-13-45 08:12:00", ""),
+ ]
+ )
+ def test_create_form_is_prefilled_from_the_link(self, _name: str, start_time: str, expected: str) -> None:
+ response = self.client.get(CREATE_URL, {"team_id": "42", "events": "$pageview", "start_time": start_time})
+
+ assert response.status_code == 200
+ soup = BeautifulSoup(response.content, "html.parser")
+ assert soup.select_one("input[name=team_id]")["value"] == "42"
+ assert soup.select_one("textarea[name=events]").get_text() == "$pageview"
+ assert soup.select_one("input[name=start_time]")["value"] == expected
+
+ def test_the_old_django_admin_add_link_opens_the_create_form_with_its_values(self) -> None:
+ response = self.client.get("/admin/posthog/datadeletionrequest/add/?team_id=42&events=%24pageview")
+
+ assert response.status_code == 302
+ assert response["Location"] == f"{CREATE_URL}?team_id=42&events=%24pageview"
+
+ def test_editing_the_criteria_of_a_pending_request_moves_it_back_to_draft(self) -> None:
+ obj = self._request(status=RequestStatus.PENDING, count=10, stats_calculated_at=timezone.now())
+
+ page = self.client.get(self._url(obj, "criteria", "edit"))
+ response = self._edit(
+ obj,
+ {
+ "request_type": RequestType.EVENT_REMOVAL.value,
+ "start_time": "2026-10-30 12:00",
+ "end_time": "2026-11-06 11:59",
+ "events": "$autocapture",
+ },
+ )
+
+ assert "$pageview" in BeautifulSoup(page.content, "html.parser").select_one("textarea[name=events]").get_text()
+ assert response.status_code == 302
+ obj.refresh_from_db()
+ assert (obj.status, obj.events, obj.count, obj.stats_calculated_at, obj.criteria_updated_by) == (
+ RequestStatus.DRAFT,
+ ["$autocapture"],
+ None,
+ None,
+ self.user,
+ )
+ assert LogEntry.objects.filter(object_id=str(obj.pk), change_message__contains='"events"').exists()
+
+ def test_editing_only_the_notes_keeps_a_pending_request_and_its_stats(self) -> None:
+ obj = self._request(status=RequestStatus.PENDING, count=10)
+
+ response = self._edit(
+ obj,
+ {
+ "request_type": RequestType.EVENT_REMOVAL.value,
+ "start_time": "2026-10-30 12:00",
+ "end_time": "2026-11-06 11:59",
+ "events": "$pageview",
+ "notes": "More context",
+ },
+ )
+
+ assert response.status_code == 302
+ obj.refresh_from_db()
+ assert (obj.status, obj.count, obj.notes) == (RequestStatus.PENDING, 10, "More context")
+
+ def test_staff_outside_the_clickhouse_team_cannot_switch_to_property_removal(self) -> None:
+ obj = self._request()
+ self.user.groups.clear()
+
+ response = self._edit(
+ obj,
+ {
+ "request_type": RequestType.PROPERTY_REMOVAL.value,
+ "start_time": "2026-10-30 12:00",
+ "end_time": "2026-11-06 11:59",
+ "events": "$pageview",
+ "properties": "$ip",
+ },
+ )
+
+ assert response.status_code == 400
+ assert "Only the ClickHouse Team group can pick this type" in response.content.decode()
+ obj.refresh_from_db()
+ assert obj.request_type == RequestType.EVENT_REMOVAL
+
+ def test_an_edit_does_not_overwrite_a_change_made_after_the_form_opened(self) -> None:
+ obj = self._request(status=RequestStatus.PENDING)
+ opened_at = obj.updated_at.isoformat()
+ with time_machine.travel("2026-11-06T12:05:00Z", tick=False):
+ DataDeletionRequest.objects.filter(pk=obj.pk).update(events=["$autocapture"], updated_at=timezone.now())
+
+ response = self.client.post(
+ self._url(obj, "criteria", "edit"),
+ {
+ "revision": opened_at,
+ "request_type": RequestType.EVENT_REMOVAL.value,
+ "start_time": "2026-10-30 12:00",
+ "end_time": "2026-11-06 11:59",
+ "events": "$pageview",
+ "notes": "From a stale form",
+ },
+ )
+
+ assert response.status_code == 409
+ obj.refresh_from_db()
+ assert (obj.events, obj.notes) == (["$autocapture"], "")
+
+ @parameterized.expand(
+ [
+ ("property_removal", {"request_type": RequestType.PROPERTY_REMOVAL, "properties": ["$ip"]}),
+ (
+ "person_removal",
+ {"request_type": RequestType.PERSON_REMOVAL, "person_distinct_ids": ["user-1"], "events": []},
+ ),
+ ]
+ )
+ def test_staff_outside_the_clickhouse_team_cannot_duplicate_a_type_they_cannot_create(
+ self, _name: str, fields: dict
+ ) -> None:
+ obj = self._request(**fields)
+ self.user.groups.clear()
+
+ response = self.client.post(self._url(obj, "criteria", "duplicate"))
+
+ assert response.status_code == 403
+ assert DataDeletionRequest.objects.count() == 1
+
+ @parameterized.expand([(status.value, status) for status in RequestStatus if status not in EDITABLE_STATUSES])
+ def test_criteria_of_an_approved_or_later_request_cannot_be_edited(self, _name: str, status: RequestStatus) -> None:
+ obj = self._request(status=status)
+
+ response = self._edit(obj, {"events": "$autocapture"})
+
+ assert response.status_code == 404
+ obj.refresh_from_db()
+ assert obj.events == ["$pageview"]
+
+ @parameterized.expand(
+ [
+ ("with_notes", RequestType.EVENT_REMOVAL, "please be careful"),
+ ("query_backed", RequestType.HOGQL_EVENT_REMOVAL, ""),
+ ]
+ )
+ def test_duplicate_copies_the_criteria_into_a_new_draft(
+ self, _name: str, request_type: RequestType, notes: str
+ ) -> None:
+ if request_type == RequestType.HOGQL_EVENT_REMOVAL:
+ original = self._request(
+ request_type=request_type,
+ events=[],
+ start_time=None,
+ end_time=None,
+ hogql_query="SELECT uuid FROM events WHERE event = {event}",
+ hogql_variables={"event": "$pageview"},
+ execution_mode=ExecutionMode.DEFERRED,
+ status=RequestStatus.COMPLETED,
+ )
+ else:
+ original = self._request(
+ notes=notes, status=RequestStatus.COMPLETED, count=42, approved=True, attempt_count=3
+ )
+
+ response = self.client.post(self._url(original, "criteria", "duplicate"))
+
+ copy = DataDeletionRequest.objects.exclude(pk=original.pk).get()
+ assert response["Location"] == self._url(copy)
+ assert (copy.team_id, copy.events, copy.hogql_query, copy.hogql_variables, copy.execution_mode) == (
+ original.team_id,
+ original.events,
+ original.hogql_query,
+ original.hogql_variables,
+ original.execution_mode,
+ )
+ assert (copy.status, copy.count, copy.approved, copy.attempt_count, copy.created_by) == (
+ RequestStatus.DRAFT,
+ None,
+ False,
+ 0,
+ self.user,
+ )
+ assert copy.notes.startswith(
+ f"Copy of data deletion request {original.pk} (http://testserver{self._url(original)})."
+ )
+ assert copy.notes.endswith(notes or ").")
+
+
+class TestDeletionRequestForm(SimpleTestCase):
+ @staticmethod
+ def _type_values(form: DataDeletionRequestForm) -> list[str]:
+ request_type = form.fields["request_type"]
+ assert isinstance(request_type, forms.ChoiceField)
+ return [value for value, _ in cast("list[tuple[str, str]]", request_type.choices)]
+
+ @parameterized.expand(
+ [
+ ("outside_clickhouse_team", False, [RequestType.EVENT_REMOVAL]),
+ ("clickhouse_team", True, [RequestType.PROPERTY_REMOVAL, RequestType.EVENT_REMOVAL]),
+ ]
+ )
+ def test_types_offered_on_a_new_request(self, _name: str, member: bool, expected: list[RequestType]) -> None:
+ assert self._type_values(DataDeletionRequestForm.for_staff(member)()) == expected
+
+ @parameterized.expand([(RequestType.HOGQL_EVENT_REMOVAL,), (RequestType.PERSON_REMOVAL,)])
+ def test_an_existing_request_keeps_its_own_type_selectable(self, request_type: RequestType) -> None:
+ obj = DataDeletionRequest(team_id=1, request_type=request_type)
+ obj._state.adding = False
+
+ form = DataDeletionRequestForm.for_request(obj)()
+
+ assert request_type in self._type_values(form)
+ assert "team_id" not in form.fields
+
+ @parameterized.expand(
+ [
+ ("one_per_line", "a\n b \n\n", ["a", "b"]),
+ ("json_list", '["a", "b"]', ["a", "b"]),
+ ("python_list", "['a', 'b']", ["a", "b"]),
+ ("empty", "", []),
+ ]
+ )
+ def test_list_fields_parse_what_staff_paste(self, _name: str, text: str, expected: list[str]) -> None:
+ assert ArrayTextareaField(required=False).clean(text) == expected
diff --git a/posthog/models/data_deletion_request.py b/posthog/models/data_deletion_request.py
index 5262429d2e7f..523bdc86c1b4 100644
--- a/posthog/models/data_deletion_request.py
+++ b/posthog/models/data_deletion_request.py
@@ -17,6 +17,7 @@ from posthog.models.utils import UUIDModel
if TYPE_CHECKING:
from posthog.models.deletion_targets import DeletionTarget
+ from posthog.models.user import User
def jsonhas_expr(prop: str, param_prefix: str, column: str = "properties") -> str:
@@ -451,6 +452,37 @@ class ExecutionMode(models.TextChoices):
DEFERRED = "deferred"
+# The fields that decide what a request deletes. Changing one invalidates stats and any approval.
+CRITERIA_FIELDS = frozenset(
+ {
+ "request_type",
+ "events",
+ "delete_all_events",
+ "properties",
+ "person_properties",
+ "start_time",
+ "end_time",
+ "hogql_predicate",
+ "hogql_query",
+ "hogql_variables",
+ "person_uuids",
+ "person_distinct_ids",
+ "person_drop_profiles",
+ "person_drop_events",
+ "person_drop_recordings",
+ }
+)
+
+# Approved and later requests are locked. Staff move one back to draft to change its criteria.
+EDITABLE_STATUSES = frozenset({RequestStatus.DRAFT, RequestStatus.PENDING})
+
+
+@frozen
+class StaffEditNotice:
+ text: str
+ warning: bool = False
+
+
class DataDeletionRequest(UUIDModel):
# Request config
team_id = models.IntegerField()
@@ -771,6 +803,86 @@ class DataDeletionRequest(UUIDModel):
if self.person_drop_profiles or self.person_drop_events or self.person_drop_recordings:
raise ValidationError({"person_drop_profiles": "person_drop_* flags are only valid for person_removal."})
+ def apply_staff_edit(self, user: "User", changed_fields: Collection[str], *, is_new: bool) -> list[StaffEditNotice]:
+ """Applies the rules of a staff create or edit before the save, and returns what to tell staff.
+
+ `changed_fields` are the fields the staff form changed. The request is not saved here.
+ """
+ notices = []
+ if is_new:
+ self.created_by = user
+ self.created_by_staff = user.is_staff
+ elif CRITERIA_FIELDS & set(changed_fields):
+ self.criteria_updated_by = user
+ self.criteria_updated_at = timezone.now()
+ invalidate_compiled_predicate_cache(self.pk)
+ self.count = None
+ self.part_count = None
+ self.parts_size = None
+ self.parts_row_count = None
+ self.min_timestamp = None
+ self.max_timestamp = None
+ self.stats_calculated_at = None
+ # Rows cleaned under the old criteria are ordinary candidates for the new ones. A stale marker would
+ # make the copy pass skip them as already cleaned.
+ self.property_removal_marker = None
+ if self.status != RequestStatus.DRAFT:
+ self.status = RequestStatus.DRAFT
+ notices.append(
+ StaffEditNotice(
+ text="Deletion criteria were changed. Status has been reset to draft.", warning=True
+ )
+ )
+ if self.request_type == RequestType.EVENT_REMOVAL and (self.properties or self.person_properties):
+ self.properties = []
+ self.person_properties = []
+ notices.append(StaffEditNotice(text="Properties cleared. Event removal requests do not use properties."))
+ if self.request_type == RequestType.PERSON_REMOVAL and (
+ self.events or self.delete_all_events or self.hogql_predicate
+ ):
+ self.events = []
+ self.delete_all_events = False
+ self.hogql_predicate = ""
+ notices.append(
+ StaffEditNotice(
+ text="Event filters cleared. Person removal requests do not use events or a HogQL filter."
+ )
+ )
+ if self.request_type != RequestType.PERSON_REMOVAL and (
+ self.person_uuids
+ or self.person_distinct_ids
+ or self.person_drop_profiles
+ or self.person_drop_events
+ or self.person_drop_recordings
+ ):
+ self.person_uuids = []
+ self.person_distinct_ids = []
+ self.person_drop_profiles = None
+ self.person_drop_events = None
+ self.person_drop_recordings = None
+ notices.append(StaffEditNotice(text="Person targets cleared. Only person removal requests use them."))
+ return notices
+
+ def duplicate_as_draft(self, user: "User", copy_note: str) -> "DataDeletionRequest":
+ notes = f"{copy_note}\n\n{self.notes}" if self.notes else copy_note
+ # Copied from CRITERIA_FIELDS, so a new criteria field is copied without a change here. Lists are copied,
+ # so the duplicate never shares a list with the original.
+ criteria: dict[str, Any] = {}
+ for field in CRITERIA_FIELDS:
+ value = getattr(self, field)
+ criteria[field] = list(value) if isinstance(value, list) else value
+ if self.request_type == RequestType.HOGQL_EVENT_REMOVAL:
+ criteria["execution_mode"] = ExecutionMode.DEFERRED
+ return DataDeletionRequest.objects.create(
+ **criteria,
+ team_id=self.team_id,
+ requires_approval=self.requires_approval,
+ notes=notes,
+ status=RequestStatus.DRAFT,
+ created_by=user,
+ created_by_staff=user.is_staff,
+ )
+
def _append_hogql_predicate(fragment: str, params: dict, obj) -> tuple[str, dict]:
"""Append the compiled HogQL predicate (if any) to ``fragment`` and merge params."""
diff --git a/posthog/models/test/test_data_deletion_request.py b/posthog/models/test/test_data_deletion_request.py
index c5bfa7effeb1..0775b6ffe172 100644
--- a/posthog/models/test/test_data_deletion_request.py
+++ b/posthog/models/test/test_data_deletion_request.py
@@ -28,6 +28,7 @@ from posthog.models.deletion_targets import FLAG_EVALUATIONS, FLAG_EVALUATIONS_H
from posthog.models.flag_evaluations.sql import FLAG_EVALUATIONS_SOURCE_EVENT
from posthog.models.organization import Organization
from posthog.models.team import Team
+from posthog.models.user import User
from products.data_modeling.backend.facade.models import DataWarehouseSavedQuery
from products.event_definitions.backend.models import PropertyDefinition
@@ -990,3 +991,77 @@ def test_refresh_deletion_stats_does_not_write_over_a_concurrent_criteria_edit(t
request.refresh_from_db()
assert request.count is None
assert request.stats_calculated_at is None
+
+
+def _staff_request(**fields) -> DataDeletionRequest:
+ defaults = {
+ "team_id": TEAM_ID,
+ "request_type": RequestType.EVENT_REMOVAL,
+ "events": ["$pageview"],
+ "status": RequestStatus.DRAFT,
+ }
+ obj = DataDeletionRequest(**{**defaults, **fields})
+ obj._state.adding = False
+ return obj
+
+
+@override_settings(CACHES=LOCMEM_CACHE)
+@time_machine.travel("2026-11-06T12:00:00Z", tick=False)
+ "start_status,changed_fields,expected_status,stats_cleared,warned",
+ [
+ (RequestStatus.PENDING, ["events"], RequestStatus.DRAFT, True, True),
+ (RequestStatus.DRAFT, ["events"], RequestStatus.DRAFT, True, False),
+ (RequestStatus.PENDING, ["notes"], RequestStatus.PENDING, False, False),
+ ],
+)
+def test_staff_edit_of_criteria_resets_stats_and_status(
+ start_status, changed_fields, expected_status, stats_cleared, warned
+):
+ obj = _staff_request(
+ status=start_status, count=5, stats_calculated_at=timezone.now(), property_removal_marker=timezone.now()
+ )
+ user = User(email="[email protected]", is_staff=True)
+
+ notices = obj.apply_staff_edit(user, changed_fields, is_new=False)
+
+ assert obj.status == expected_status
+ assert (obj.count is None, obj.stats_calculated_at is None, obj.property_removal_marker is None) == (
+ stats_cleared,
+ stats_cleared,
+ stats_cleared,
+ )
+ assert (obj.criteria_updated_by is user) == stats_cleared
+ assert any(notice.warning for notice in notices) == warned
+
+
+ "fields,cleared",
+ [
+ ({"properties": ["$ip"], "person_properties": ["email"]}, {"properties": [], "person_properties": []}),
+ ({"person_distinct_ids": ["user-1"], "person_drop_events": True}, {"person_distinct_ids": []}),
+ (
+ {
+ "request_type": RequestType.PERSON_REMOVAL,
+ "hogql_predicate": "event = 'x'",
+ "person_distinct_ids": ["user-1"],
+ "person_drop_events": True,
+ },
+ {"events": [], "hogql_predicate": "", "person_distinct_ids": ["user-1"]},
+ ),
+ (
+ {"request_type": RequestType.PROPERTY_REMOVAL, "properties": ["$ip"], "person_properties": ["email"]},
+ {"properties": ["$ip"], "person_properties": ["email"]},
+ ),
+ ],
+)
+def test_staff_create_clears_fields_the_type_does_not_use(fields, cleared):
+ obj = DataDeletionRequest(
+ team_id=TEAM_ID, events=["$pageview"], **{"request_type": RequestType.EVENT_REMOVAL, **fields}
+ )
+ user = User(email="[email protected]", is_staff=True)
+
+ obj.apply_staff_edit(user, [], is_new=True)
+
+ assert (obj.created_by, obj.created_by_staff) == (user, True)
+ assert {field: getattr(obj, field) for field in cleared} == cleared
diff --git a/posthog/templates/admin/posthog/datadeletionrequest/change_form.html b/posthog/templates/admin/posthog/datadeletionrequest/change_form.html
deleted file mode 100644
index 2b84fdd53b3e..000000000000
--- a/posthog/templates/admin/posthog/datadeletionrequest/change_form.html
+++ /dev/null
@@ -1,123 +0,0 @@
-{% 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 %}
- <fieldset>
- <h2>Events list</h2>
- <ul style="margin: 8px 0 8px 20px;">
- {% for event in original.events %}
- <li><code>{{ event }}</code></li>
- {% endfor %}
- </ul>
- </fieldset>
- {% endif %}
- {% if original.properties %}
- <fieldset>
- <h2>Properties list</h2>
- <ul style="margin: 8px 0 8px 20px;">
- {% for prop in original.properties %}
- <li><code>{{ prop }}</code></li>
- {% endfor %}
- </ul>
- </fieldset>
- {% endif %}
- {% if original %}
- <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 %}
- {% 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
- block covers every field instead of one copy per field.
- {% endcomment %}
- <script nonce="{{ request.csp_nonce }}">
- (function () {
- function parse(text) {
- text = text.trim();
- if (!text) {
- return [];
- }
- if (text.startsWith("[")) {
- // Python prints a list of strings with single quotes, so retry with them swapped
- // for double quotes. Skip the swap when the text holds an escaped apostrophe (\'),
- // because the swap turns it into an escaped double quote and changes the value.
- // ArrayTextareaField.clean still parses that input with ast.literal_eval on submit.
- var candidates = [text];
- if (!text.includes("\\'")) {
- candidates.push(text.replace(/'/g, '"'));
- }
- for (var i = 0; i < candidates.length; i++) {
- try {
- var arr = JSON.parse(candidates[i]);
- if (Array.isArray(arr)) {
- return arr.map(function (s) { return String(s).trim(); }).filter(Boolean);
- }
- } catch (e) {}
- }
- }
- return text.split("\n").map(function (s) { return s.trim(); }).filter(Boolean);
- }
-
- document.querySelectorAll(".array-textarea-preview").forEach(function (preview) {
- var textarea = document.getElementById(preview.dataset.textareaId);
- if (!textarea) {
- return;
- }
-
- function render() {
- var items = parse(textarea.value);
- preview.replaceChildren();
- if (items.length === 0) {
- var empty = document.createElement("em");
- empty.style.color = "#999";
- empty.textContent = "No items";
- preview.appendChild(empty);
- return;
- }
- var label = document.createElement("strong");
- label.textContent = items.length + " item(s):";
- preview.appendChild(label);
- items.forEach(function (item) {
- var code = document.createElement("code");
- code.style.cssText = "background:#e8e8e8;padding:2px 6px;border-radius:3px;margin:2px";
- // textContent, so a value containing markup is shown rather than parsed.
- code.textContent = item;
- preview.appendChild(document.createTextNode(" "));
- preview.appendChild(code);
- });
- }
-
- function normalizeIfArray() {
- // Rewrite an array literal to one per line. Only on paste and blur, so live
- // editing is not clobbered.
- if (!textarea.value.trim().startsWith("[")) {
- return;
- }
- var items = parse(textarea.value);
- if (items.length > 0) {
- textarea.value = items.join("\n");
- render();
- }
- }
-
- textarea.addEventListener("input", render);
- textarea.addEventListener("blur", normalizeIfArray);
- textarea.addEventListener("paste", function () { window.setTimeout(normalizeIfArray, 0); });
- render();
- });
- })();
- </script>
-{% endblock %}