fix(records-ui): deleted PIDs return 404

- Fixes cases where a PID (record or draft) with deleted status and
  its record row deleted, should return a 404 page.

Author: slint

invenio_app_rdm/records_ui/views/records.py

@@ -475,20 +475,23 @@ def draft_not_found_error(error):
 
 def record_tombstone_error(error):
     """Tombstone page."""
-    # the RecordDeletedError will have the following properties,
-    # while the PIDDeletedError won't
+    # Handles both RecordDeletedException and PIDDeletedError:
+    # - RecordDeletedException: always has record and result_item attributes
+    # - PIDDeletedError: has a record attribute that can be None if the underlying
+    #   record object doesn't exist (e.g. deleted draft, or purged record)
     record = getattr(error, "record", None)
     if (record_ui := getattr(error, "result_item", None)) is not None:
         if record is None:
             record = record_ui._record
 
         record_ui = UIJSONSerializer().dump_obj(record_ui.to_dict())
 
-    # render a 404 page if the tombstone isn't visible
-    if not record.tombstone.is_visible:
+    # Return 404 if there's no record (e.g. deleted draft, purged record) or if the
+    # tombstone is not visible (e.g. admin chose to hide it)
+    if not (record and record.tombstone.is_visible):
         return not_found_error(error)
 
-    # we only render a tombstone page if there is a record with a visible tombstone
+    # Only render a tombstone page if there is a record with a visible tombstone
     return (
         render_template(
             "invenio_app_rdm/records/tombstone.html",

tests/ui/test_tombstone.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+#
+# Invenio-App-RDM is free software; you can redistribute it and/or modify
+# it under the terms of the MIT License; see LICENSE file for more details.
+
+"""Tests for tombstone/deleted record handling."""
+
+from flask import url_for
+from invenio_access.permissions import system_identity
+from invenio_rdm_records.proxies import current_rdm_records_service as service
+
+
+def test_deleted_record_shows_tombstone(client, record_with_file):
+    """Test that a soft-deleted record shows the tombstone page (410)."""
+    record_id = record_with_file.id
+
+    # Record should be accessible before deletion
+    record_url = url_for("invenio_app_rdm_records.record_detail", pid_value=record_id)
+    response = client.get(record_url)
+    assert response.status_code == 200
+
+    # Delete the record (soft delete with tombstone)
+    service.delete_record(system_identity, record_id, {})
+
+    # Accessing the record should now show the tombstone page
+    response = client.get(record_url)
+    assert response.status_code == 410
+
+
+def test_deleted_record_with_hidden_tombstone(client, record_with_file):
+    """Test that a deleted record with hidden tombstone returns 404."""
+    record_id = record_with_file.id
+
+    # Delete the record with tombstone visibility set to False
+    service.delete_record(system_identity, record_id, {"is_visible": False})
+
+    # Accessing a record with hidden tombstone should return 404
+    record_url = url_for("invenio_app_rdm_records.record_detail", pid_value=record_id)
+    response = client.get(record_url)
+    assert response.status_code == 404
+
+
+def test_deleted_draft_returns_404(client, draft_with_file):
+    """Test that accessing a deleted draft returns 404.
+
+    When a draft is deleted, the PID is marked as DELETED but the underlying
+    record object is removed. Accessing such a PID should return 404.
+    """
+    draft_id = draft_with_file.id
+    service.delete_draft(system_identity, draft_id)
+
+    record_url = url_for("invenio_app_rdm_records.record_detail", pid_value=draft_id)
+    response = client.get(record_url)
+    assert response.status_code == 404