invenio-app-rdm 13.0.0b4.dev1__py2.py3-none-any.whl → 14.0.0b1.dev8__py2.py3-none-any.whl

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/detail.html

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020-2024 CERN.
+  Copyright (C) 2020-2025 CERN.
   Copyright (C) 2020-2021 Northwestern University.
   Copyright (C) 2021-2023 TU Wien.
   Copyright (C) 2021 Graz University of Technology.
@@ -21,7 +21,7 @@
   {%- endblock css %}
 {% endif %}
 
-{%- from "invenio_app_rdm/records/macros/files.html" import file_list_box, preview_file_box, media_file_list_box %}
+{%- from "invenio_app_rdm/records/macros/files.html" import file_list_box, preview_file_box, media_file_list_box with context %}
 
 {%- set title = record_ui["metadata"]["title"] %}
 {%- set metadata = record_ui["metadata"] %}
@@ -203,9 +203,6 @@
                   <div id="recordManagementMobile"
                        role="dialog"
                        class="ui flowing popup transition hidden"
-                       data-record='{{ record_ui | tojson }}'
-                       data-permissions='{{ permissions | tojson }}'
-                       data-is-draft="{{ is_draft | tojson }}"
                        {% if config.RDM_DETAIL_SIDE_BAR_MANAGE_ATTRIBUTES_EXTENSION_TEMPLATE %}
                         {% include config.RDM_DETAIL_SIDE_BAR_MANAGE_ATTRIBUTES_EXTENSION_TEMPLATE %}
                        {% endif %}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/citation.html

@@ -1,5 +1,5 @@
 {#
-    Copyright (C) 2020-2021 CERN.
+    Copyright (C) 2020-2025 CERN.
     Copyright (C) 2020 Northwestern University.
     Copyright (C) 2021 New York University.
 
@@ -7,7 +7,7 @@
     it under the terms of the MIT License; see LICENSE file for more details.
 #}
 
-<div id="recordCitation" data-record='{{ record_ui | tojson }}'
+<div id="recordCitation" data-record-links='{{ record_ui.links | tojson }}'
   data-styles='{{ config.get("RDM_CITATION_STYLES") | tojson }}'
   data-defaultstyle='{{ config.get("RDM_CITATION_STYLES_DEFAULT") | tojson }}'
   data-include-deleted='{{ include_deleted | tojson }}'>

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/details.html

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020-2021 CERN.
+  Copyright (C) 2020-2025 CERN.
   Copyright (C) 2020-2021 Northwestern University.
   Copyright (C) 2021 New York University.
 
@@ -316,7 +316,7 @@ show_alternate_identifiers, show_related_identifiers, show_funding, show_dates %
           id="references-panel"
           role="region"
           aria-labelledby="references-accordion-trigger"
-          class="active content sixteen wide mobile twelve wide tablet thirteen wide computer column"
+          class="active content sixteen wide mobile twelve wide tablet thirteen wide computer column text-break"
         >
           {{ show_references(metadata.references) }}
         </div>

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/communities.html

@@ -1,14 +1,15 @@
 <div
   id="sidebar-communities-manage"
   data-user-communities-memberships='{{ user_communities_memberships | tojson }}'
-  data-record-community-endpoint="{{ record_ui['links']['communities'] }}"
-  data-record-community-search-endpoint="{{ record_ui['links']['communities-suggestions'] }}"
-  data-record-user-community-search-endpoint="{{ record_ui['links']['user-communities-suggestions'] }}"
-  data-pending-communities-search-config='{{ search_app_rdm_record_requests_config(app_id="InvenioAppRdm.RecordRequests", endpoint=record_ui['links']['requests']) | tojson }}'
-  data-record-community-search-config='{{ search_app_rdm_record_communities_config(app_id="InvenioAppRdm.RecordCommunitiesSuggestions", endpoint=record_ui['links']["communities-suggestions"]) | tojson }}'
-  data-record-user-community-search-config='{{ search_app_rdm_record_user_communities_config(app_id="InvenioAppRdm.RecordUserCommunitiesSuggestions", endpoint=record_ui['links']["communities-suggestions"]) | tojson }}'
+  data-record-community-endpoint='{{ record_ui["links"]["communities"] }}'
+  data-record-community-search-endpoint='{{ record_ui["links"]["communities-suggestions"] }}'
+  data-record-community-search-config='{{ search_app_rdm_record_communities_config(app_id="InvenioAppRdm.RecordCommunitiesSuggestions", endpoint=record_ui["links"]["communities-suggestions"]) | tojson }}'
+  data-record-user-community-search-endpoint='{{ record_ui["links"]["user-communities-suggestions"] }}'
+  data-record-user-community-search-config='{{ search_app_rdm_record_user_communities_config(app_id="InvenioAppRdm.RecordUserCommunitiesSuggestions", endpoint=record_ui["links"]["communities-suggestions"]) | tojson }}'
+  data-pending-communities-search-config='{{ search_app_rdm_record_requests_config(app_id="InvenioAppRdm.RecordRequests", endpoint=record_ui["links"]["requests"]) | tojson }}'
   data-permissions='{{ permissions | tojson }}'
-  class="sidebar-container"
+  data-record='{{ record_ui | tojson }}'
+  class='sidebar-container'
 >
 
   <h2 class="ui medium top attached header">{{ _("Communities") }}</h2>

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/external_resources.html

@@ -1,5 +1,5 @@
 {#
-Copyright (C) 2020 CERN.
+Copyright (C) 2020-2025 CERN.
 
 Invenio RDM Records is free software; you can redistribute it and/or modify
 it under the terms of the MIT License; see LICENSE file for more details.
@@ -7,15 +7,14 @@ it under the terms of the MIT License; see LICENSE file for more details.
 {%- if external_resources -%}
 <div class="sidebar-container">
   <h2 class="ui small top attached header">{{ _('External resources')}}</h2>
-  <div id="external-resource" aria-label="{{ _('External resources') }}" class="ui bottom attached segment rdm-sidebar external resource">
+  <dl id="external-resource" aria-label="{{ _('External resources') }}" class="ui bottom attached segment rdm-sidebar external resource details-list">
 
     {# dynamically create the list of external resources #}
     {%- for section, external_resources in external_resources | groupby("content.section") -%}
-      <h3 class="ui small header">{{ section }}</h3>
-      <ul class="ui relaxed list no-bullet">
+      <dt class="ui tiny header">{{ section }}</dt>
+      <ul class="ui list no-bullet m-0">
 
         {%- for resource in external_resources -%}
-
           {%- if resource -%}
             {%- if resource.template -%}
               {# It's up to the template to render the `resource` as it wishes #}
@@ -50,7 +49,7 @@ it under the terms of the MIT License; see LICENSE file for more details.
         {%- endfor -%}
       </ul>
     {%- endfor -%}
-  </div>
+  </dl>
 </div>
 {%- endif -%}
 

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/licenses.html

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020 CERN.
+  Copyright (C) 2020-2025 CERN.
   Copyright (C) 2020 Northwestern University.
   Copyright (C) 2021 Graz University of Technology.
   Copyright (C) 2021 New York University.
@@ -25,11 +25,11 @@
   <div class="sidebar-container">
     <h2 class="ui medium top attached header mt-0">{{ _('Rights') }}</h2>
     <div id="licenses" class="ui segment bottom attached rdm-sidebar">
+      <dl class="details-list">
       {% if rights %}
-        <h4>License</h4>
-        <ul class="details-list m-0 p-0">
+        <dt class="ui tiny header">License</dt>
           {%- for license in rights -%}
-            <li id="license-{{ license.id }}-{{ loop.index }}" class="has-popup">
+            <dd id="license-{{ license.id }}-{{ loop.index }}" class="has-popup">
               <div id="title-{{ license.id }}-{{ loop.index }}"
                    class="license clickable"
                    tabindex="0"
@@ -45,7 +45,6 @@
                        alt="{{ license.id }} icon"/>
                 </span>
                 {% endif %}
-
                 <span class="title-text">
                 {{ license.title_l10n }}
               </span>
@@ -57,7 +56,6 @@
               >
                 <i role="button" tabindex="0" class="close icon text-muted"
                    aria-label="{{ _('Close') }}"></i>
-
                 <div id="license-description-{{ loop.index }}" class="description">
                 <span class="text-muted">
                   {{ license.description_l10n or _('No further description.') }}
@@ -65,18 +63,16 @@
                   {{ license_link(license) }}
                 </div>
               </div>
-            </li>
+            </dd>
           {% endfor %}
-
-        </ul>
       {% endif %}
       {% if copyrights %}
-        <h4>Copyrights</h4>
-        <div id="copyrights">
+        <dt class="ui tiny header">Copyright</dt>
+        <dd id="copyrights">
           {{ copyrights }}
-        </div>
+        </dd>
       {% endif %}
+      </dl>
     </div>
-
   </div>
 {% endif %}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/manage_menu.html

@@ -1,5 +1,5 @@
 {#
-Copyright (C) 2022-2024 CERN.
+Copyright (C) 2022-2025 CERN.
 
 Invenio RDM Records is free software; you can redistribute it and/or modify
 it under the terms of the MIT License; see LICENSE file for more details.
@@ -17,8 +17,14 @@ it under the terms of the MIT License; see LICENSE file for more details.
          data-is-draft="{{ is_draft | tojson }}"
          data-is-preview-submission-request="{{ is_preview_submission_request | tojson }}"
          data-current-user-id="{{ current_user.id }}"
-         data-record-owner-id='{{ record_owner_id }}'
          data-groups-enabled='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'
+         {% if record_deletion %}
+            data-record-deletion='{{ record_deletion | tojson }}'
+            data-record-deletion-options='{{ record_deletion_options | tojson }}'
+         {% else %}
+            data-record-deletion='{{ {} | tojson }}'
+            data-record-deletion-options='{{ [] | tojson }}'
+         {% endif %}
          {% if config.RDM_DETAIL_SIDE_BAR_MANAGE_ATTRIBUTES_EXTENSION_TEMPLATE %}
           {% include config.RDM_DETAIL_SIDE_BAR_MANAGE_ATTRIBUTES_EXTENSION_TEMPLATE %}
          {% endif %}
@@ -29,9 +35,6 @@ it under the terms of the MIT License; see LICENSE file for more details.
           <div class="full line"></div>
           <div class="full line"></div>
           <div class="full line"></div>
-          <div class="full line"></div>
-          <div class="full line"></div>
-          <div class="full line"></div>
         </div>
       </div>
     </div>

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/stats.html

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020 CERN.
+  Copyright (C) 2020-2025 CERN.
 
   Invenio RDM Records is free software; you can redistribute it and/or modify
   it under the terms of the MIT License; see LICENSE file for more details.
@@ -28,11 +28,9 @@
 </div>
 
 <div class="ui accordion rel-mt-1 centered">
-  <div class="title">
+  <div class="title trigger" tabindex="0">
     <i class="caret right icon" aria-hidden="true"></i>
     <span
-      tabindex="0"
-      class="trigger"
       data-open-text="{{ _('Show more details') }}"
       data-close-text="{{ _('Show less details') }}"
     >

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html

@@ -110,7 +110,7 @@
   <dt class="ui tiny header">
     <span class="mr-0 text-muted">
       {% if item.award.acronym %}
-        {{ item.award.acronym }} –
+        {{ item.award.acronym }} -
       {% endif %}
 
       {%- if item.award.title_l10n -%}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/doi.html

@@ -6,15 +6,17 @@
 #}
 
 {% macro show_doi(doi_value, record_ui, badge_id="record-doi-badge", modal_id="doi-modal", subheader=None, parent_doi=false) %}
+  {%- set doi_link = record_ui["links"]["doi"] if not parent_doi else record_ui["links"]["parent_doi"] %}
   <dt class="ui tiny header">{{_('DOI')}}
     {% if subheader %}
-      <i><span class="doi sub header">{{subheader}}</span></i></dt>
+      <i><span class="doi sub header">{{subheader}}</span></i>
     {% endif %}
+  </dt>
   <dd>
-    <span class="get-badge" data-toggle="tooltip" data-placement="bottom" style="cursor: pointer;"
-      title="{{ _('Get the DOI badge!') }}">
-      <img id='{{badge_id}}' data-target="[data-modal='{{ doi_value }}']"
+    <span class="get-badge details-doi-section" data-toggle="tooltip" data-placement="bottom">
+      <img id='{{badge_id}}' data-target="[data-modal='{{ doi_value }}']" title="{{ _('Get the DOI badge!') }}"
         src="{{ url_for('invenio_formatter_badges.badge', title='DOI', value=doi_value, ext='svg') }}" alt="{{ doi_value }}" />
+      <div id="copy-button-{{ badge_id }}" class="copy-doi-button" data-value={{ doi_link }} data-size="mini"></div>
     </span>
 
     <div id="{{modal_id}}" class="ui modal fade badge-modal" data-modal="{{ doi_value }}">
@@ -27,7 +29,7 @@
           <pre>{{ doi_value }}</pre>
         </h4>
         {% from "semantic-ui/invenio_formatter/macros/badges.html" import badges_formats_list %}
-        {{ badges_formats_list(url_for('invenio_formatter_badges.badge', title='DOI', value=doi_value, ext='svg', _external=True, _scheme='https'), record_ui["links"]["parent_doi"] if parent_doi else record_ui["links"]["doi"]) }}
+        {{ badges_formats_list(url_for('invenio_formatter_badges.badge', title='DOI', value=doi_value, ext='svg', _external=True, _scheme='https'), doi_link) }}
       </div>
     </div>
   </dd>

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/files.html

@@ -32,6 +32,7 @@
 
 
 {% macro preview_file_box(file, pid, is_preview, record, include_deleted) %}
+  {%- set is_remote_file = file.transfer.type == transfer_types.REMOTE %}
   <div class="ui accordion panel mb-10 {{record.ui.access_status.id}}" href="#files-preview-accordion-panel">
     <h3 class="active title panel-heading {{ record.ui.access_status.id }} m-0">
       <div
@@ -53,9 +54,22 @@
       aria-labelledby="files-preview-accordion-trigger"
       class="active content preview-container pt-0 {{record.ui.access_status.id}}"
     >
+      {%- if is_remote_file %}
+      <div class="ui info message">
+        <div class="header">
+          {{ _('This file cannot be previewed') }}
+        </div>
+        <ul class="list">
+          <li>{{ _('This file is an external reference and not stored directly in this repository.
+To access its content, please download it and open it locally.') }}
+          </li>
+        </ul>
+      </div>
+      {%- else %}
       <div>
         {{ preview_file('invenio_app_rdm_records.record_file_preview', pid_value=pid, filename=file.key, is_preview=is_preview, include_deleted=include_deleted) }}
       </div>
+      {%- endif %}
     </div>
   </div>
 {%- endmacro %}
@@ -93,6 +107,7 @@
     {% endif %}
     {% for file in files %}
       {% if not file.access.hidden %}
+        {%- set is_remote_file = file.transfer.type == transfer_types.REMOTE %}
         {% if is_preview %}
           {%- set file_url_download = url_for(download_endpoint, pid_value=pid, filename=file.key, download=1, preview=1) %}
           {%- set file_url_preview = url_for(preview_endpoint, pid_value=pid, filename=file.key, preview=1, include_deleted=include_deleted_value) %}
@@ -107,16 +122,18 @@
             <div>
               <a href="{{ file_url_download }}">{{ file.key }}</a>
             </div>
-            <small class="ui text-muted font-tiny">{{ file.checksum }}
+            {%- if not is_remote_file %}
+            <small class="ui text-muted font-tiny">{{ file.checksum or _("Checksum not yet calculated.") }}
             <div class="ui icon inline-block" data-tooltip="{{_('This is the file fingerprint (checksum), which can be used to verify the file integrity.')}}">
               <i class="question circle checksum icon"></i>
             </div>
             </small>
+            {%- endif %}
           </td>
-          <td>{{ file.size|filesizeformat(binary=binary_sizes) }}</td>
+          <td>{%- if is_remote_file %}{{_("N/A (external)")}}{%- else -%}{{ file.size|filesizeformat(binary=binary_sizes) }}{%- endif %}</td>
           <td class="right aligned">
             <span>
-              {% if with_preview and file_type|lower is previewable %}
+              {% if with_preview and file_type|lower is previewable and not is_remote_file %}
                 <a role="button" class="ui compact mini button preview-link" href="{{ file_url_preview }}" target="preview-iframe" data-file-key="{{file.key}}">
                   <i class="eye icon" aria-hidden="true"></i>{{_("Preview")}}
                 </a>
@@ -140,7 +157,7 @@
     <h3 class="active title panel-heading {{ record.ui.access_status.id }} m-0">
       <div role="button" id="files-list-accordion-trigger" aria-controls="files-list-accordion-panel" aria-expanded="true" tabindex="0" class="trigger">
         {{ _("Files") }}
-        <small class="text-muted">{% if files %} ({{files|sum(attribute='size')|filesizeformat(binary=binary_sizes)}}){% endif %}</small>
+        <small class="text-muted">{% if files %} ({{files|map(attribute='size', default=0)|sum()|filesizeformat(binary=binary_sizes)}}){% endif %}</small>
         <i class="angle right icon" aria-hidden="true"></i>
       </div>
     </h3>

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/tombstone.html

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2021 CERN.
+  Copyright (C) 2021-2025 CERN.
   Copyright (C) 2023 TU Wien.
 
   Invenio App RDM is free software; you can redistribute it and/or modify it
@@ -37,6 +37,11 @@
       <p>
         <strong>{{ _("Removed by:") }}</strong> {{ record.ui.tombstone.removed_by }}
       </p>
+      {%- if record.ui.tombstone.deletion_policy %}
+      <p>
+        <strong>{{ _("Deletion Policy:") }}</strong> {{ record.ui.tombstone.deletion_policy }}
+      </p>
+      {%- endif %}
       {%- if record.ui.tombstone.note %}
       <p>
         <strong>{{ _("Removal note:") }}</strong> {{ record.ui.tombstone.note }}

invenio_app_rdm/records_ui/utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 CERN.
+# Copyright (C) 2020-2025 CERN.
 # Copyright (C) 2020 Northwestern University.
 # Copyright (C) 2021 TU Wien.
 #
@@ -9,12 +9,22 @@
 
 """Utility functions."""
 
+from datetime import datetime, timezone
 from itertools import chain
 
 from flask import current_app
+from invenio_access.permissions import system_identity
+from invenio_rdm_records.records.api import RDMRecord
+from invenio_rdm_records.requests.record_deletion import RecordDeletion
+from invenio_rdm_records.services.config import (
+    FileModificationPolicyEvaluator,
+    RDMRecordDeletionPolicy,
+)
 from invenio_records.dictutils import dict_set
 from invenio_records.errors import MissingModelError
 from invenio_records_files.api import FileObject
+from invenio_requests.proxies import current_requests_service
+from invenio_search.api import dsl
 
 
 def previewer_record_file_factory(pid, record, filename):
@@ -88,3 +98,85 @@ def dump_external_resource(
         },
         "template": template,
     }
+
+
+def get_existing_deletion_request(record_id):
+    """Return the self HTML link of the existing open deletion request for the record."""
+    existing_requests = current_requests_service.search(
+        system_identity,
+        extra_filter=dsl.Q(
+            "bool",
+            must=[
+                dsl.Q("term", **{"topic.record": record_id}),
+                dsl.Q("term", **{"type": RecordDeletion.type_id}),
+                dsl.Q("term", **{"is_open": True}),
+            ],
+        ),
+    )
+    if existing_requests.total > 0:
+        return list(existing_requests)[0]["links"]["self_html"]
+
+
+def evaluate_record_deletion(record: RDMRecord, identity):
+    """Evaluate whether a given record can be deleted by an identity."""
+    rec_del = RDMRecordDeletionPolicy().evaluate(identity, record)
+
+    immediate, request = rec_del["immediate_deletion"], rec_del["request_deletion"]
+    rd_enabled = immediate.enabled or request.enabled
+    rd_valid_user = immediate.valid_user or request.valid_user
+    rd_allowed = immediate.allowed or request.allowed
+
+    if rd_allowed:
+        record_deletion = {
+            "enabled": rd_enabled,
+            "valid_user": rd_valid_user,
+            "allowed": rd_allowed,
+            "recordDeletion": rec_del,
+            "checklist": (
+                current_app.config["RDM_IMMEDIATE_RECORD_DELETION_CHECKLIST"]
+                if immediate.allowed
+                else current_app.config["RDM_REQUEST_RECORD_DELETION_CHECKLIST"]
+            ),
+            "context": {
+                "files": record.files.count,
+                "internalDoi": record.pids.get("doi", {}).get("provider") != "external",
+            },
+        }
+    else:
+        record_deletion = {
+            "enabled": rd_enabled,
+            "valid_user": rd_valid_user,
+            "allowed": rd_allowed,
+        }
+    record_deletion["existing_request"] = (
+        # We show existing requests to valid users (even if they are not allowed to delete a record anymore).
+        get_existing_deletion_request(record.pid.pid_value)
+        if rd_valid_user
+        else None
+    )
+
+    return record_deletion
+
+
+def evaluate_file_modification(record, identity):
+    """Evaluate whether a given record file's can be edited by an identity."""
+    file_mod = FileModificationPolicyEvaluator().evaluate(identity, record)
+
+    file_mod = file_mod["immediate_file_modification"]
+
+    file_modification = {
+        "enabled": file_mod.enabled,
+        "valid_user": file_mod.valid_user,
+        "allowed": file_mod.allowed,
+    }
+
+    if file_mod.allowed:
+        file_modification["fileModification"] = file_mod
+        created = record.created.replace(tzinfo=timezone.utc)
+        modification_until = created + current_app.config.get(
+            "RDM_FILE_MODIFICATION_PERIOD"
+        )
+        days_until = (modification_until - datetime.now(timezone.utc)).days
+        file_modification["context"] = {"days_until": days_until}
+
+    return file_modification

invenio_app_rdm/records_ui/views/decorators.py

@@ -23,6 +23,7 @@ from invenio_rdm_records.proxies import current_rdm_records
 from invenio_rdm_records.resources.serializers.signposting import (
     FAIRSignpostingProfileLvl1Serializer,
 )
+from invenio_rdm_records.services.errors import RecordDeletedException
 from invenio_records_resources.services.errors import PermissionDeniedError
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -80,11 +81,7 @@ def pass_draft(expand=False):
                     expand=expand,
                 )
                 kwargs["draft"] = draft
-                kwargs["files_locked"] = (
-                    record_service.config.lock_edit_published_files(
-                        record_service, g.identity, draft=draft, record=draft._record
-                    )
-                )
+                kwargs["files_locked"] = draft._record.files.bucket.locked
                 return f(**kwargs)
             except PIDDoesNotExistError:
                 # Redirect to /records/:id because users are interchangeably
@@ -224,16 +221,28 @@ def pass_file_item(is_media=False):
             )
             record_service = media_files_service if is_media else files_service
 
-            if is_preview:
-                try:
-                    item = draft_service().get_file_content(**read_kwargs)
-                except NoResultFound:
+            try:
+                if is_preview:
+                    try:
+                        item = draft_service().get_file_content(**read_kwargs)
+                    except NoResultFound:
+                        item = record_service().get_file_content(**read_kwargs)
+                else:
                     item = record_service().get_file_content(**read_kwargs)
-            else:
-                item = record_service().get_file_content(**read_kwargs)
 
-            kwargs["file_item"] = item
-            return f(**kwargs)
+                kwargs["file_item"] = item
+                return f(**kwargs)
+
+            except RecordDeletedException:
+                # Redirect to the record page which has proper tombstone handling
+                return redirect(
+                    url_for(
+                        "invenio_app_rdm_records.record_detail",
+                        pid_value=pid_value,
+                    ),
+                    # Use 302 (temporary) instead of 301 since records can be restored
+                    code=302,
+                )
 
         return view
 
@@ -358,7 +367,8 @@ def pass_draft_community(f):
         comid = request.args.get("community")
         if comid:
             community = current_communities.service.read(id_=comid, identity=g.identity)
-            kwargs["community"] = UICommunityJSONSerializer().dump_obj(
+            kwargs["community"] = community
+            kwargs["community_ui"] = UICommunityJSONSerializer().dump_obj(
                 community.to_dict()
             )