invenio-app-rdm 12.0.0.dev8__py2.py3-none-any.whl → 14.0.0b1.dev8__py2.py3-none-any.whl

invenio_app_rdm/records_ui/views/records.py

@@ -1,37 +1,62 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2021 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
-# Copyright (C)      2021 TU Wien.
+# Copyright (C) 2021-2023 TU Wien.
 #
 # 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.
 
 """Routes for record-related pages provided by Invenio-App-RDM."""
 
+import itertools
 from os.path import splitext
+from pathlib import Path
 
 from flask import abort, current_app, g, redirect, render_template, request, url_for
 from flask_login import current_user
 from invenio_base.utils import obj_or_import_string
-from invenio_previewer.extensions import default
+from invenio_communities.communities.resources.serializer import (
+    UICommunityJSONSerializer,
+)
+from invenio_communities.errors import CommunityDeletedError
+from invenio_communities.proxies import current_communities
+from invenio_communities.views.communities import render_community_theme_template
+from invenio_previewer.extensions import default as default_previewer
 from invenio_previewer.proxies import current_previewer
 from invenio_rdm_records.proxies import current_rdm_records
+from invenio_rdm_records.records.systemfields.access.access_settings import (
+    AccessSettings,
+)
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
 from invenio_stats.proxies import current_stats
+from invenio_users_resources.proxies import current_user_resources
 from marshmallow import ValidationError
 
-from invenio_app_rdm.records_ui.views.deposits import load_custom_fields
+from invenio_app_rdm.records_ui.previewer.iiif_simple import (
+    previewable_extensions as image_extensions,
+)
 
+from ..utils import evaluate_record_deletion, get_external_resources
 from .decorators import (
+    add_signposting_content_resources,
+    add_signposting_landing_page,
+    add_signposting_metadata_resources,
     pass_file_item,
     pass_file_metadata,
+    pass_include_deleted,
     pass_is_preview,
     pass_record_files,
     pass_record_from_pid,
     pass_record_latest,
+    pass_record_media_files,
     pass_record_or_draft,
 )
+from .deposits import (
+    VocabulariesOptions,
+    get_user_communities_memberships,
+    load_custom_fields,
+)
 
 
 def get_record_community(record):
@@ -54,11 +79,22 @@ def get_record_community(record):
     ) or expanded_parent.get("communities", {}).get("default")
 
     if community_review or community_default:
-        is_community_deleted = expanded_community.get("is_ghost", False)
-        if is_community_deleted:
+        is_community_pid_deleted = expanded_community.get("is_ghost", False)
+        if is_community_pid_deleted:
+            # community pid is not found in search i.e its pid is deleted
+            return None, community_id
+
+        # resolve the community again to check the deletion status
+        # deleted communities with tombstones are not identified as ghost records
+        # at the moment because `read_many()` function is not filtering them out
+        try:
+            community = current_communities.service.read(
+                id_=community_id, identity=g.identity
+            )
+            # community has not tombstone
+            return community, community_id
+        except CommunityDeletedError:
             return None, community_id
-        else:
-            return expanded_community, community_id
     else:
         return None, None
 
@@ -70,10 +106,11 @@ class PreviewFile:
     `invenio_previewer.api.PreviewFile`.
     """
 
-    def __init__(self, file_item, record_pid_value, url=None):
+    def __init__(self, file_item, record_pid_value, record=None, url=None):
         """Create a new PreviewFile."""
         self.file = file_item
         self.data = file_item.data
+        self.record = record
         self.size = self.data["size"]
         self.filename = self.data["key"]
         self.bucket = self.data["bucket_id"]
@@ -105,70 +142,47 @@ class PreviewFile:
 #
 
 
-def _get_query(query_name):
-    """Build the statistics query from configuration."""
-    query_config = current_stats.queries[query_name]
-    return query_config.cls(name=query_config.name, **query_config.params)
-
-
-def _get_stats(recid, parent_recid):
-    """Fetch the statistics for the given record."""
-    try:
-        views = _get_query("record-view").run(recid=recid)
-        views_all = _get_query("record-view-all-versions").run(
-            parent_recid=parent_recid
-        )
-    except Exception as e:
-        # e.g. opensearchpy.exceptions.NotFoundError
-        # when the aggregation search index hasn't been created yet
-        current_app.logger.warning(e)
-
-        fallback_result = {
-            "views": 0,
-            "unique_views": 0,
-        }
-        views = views_all = downloads = downloads_all = fallback_result
-
-    try:
-        downloads = _get_query("record-download").run(recid=recid)
-        downloads_all = _get_query("record-download-all-versions").run(
-            parent_recid=parent_recid
-        )
-    except Exception as e:
-        # same as above, but for failure in the download statistics
-        # because they are a separate index that can fail independently
-        current_app.logger.warning(e)
-
-        fallback_result = {
-            "downloads": 0,
-            "unique_downloads": 0,
-            "data_volume": 0,
-        }
-        downloads = downloads_all = fallback_result
-
-    stats = {
-        "this_version": {
-            **views,
-            **downloads,
-        },
-        "all_versions": {
-            **views_all,
-            **downloads_all,
-        },
-    }
-
-    return stats
-
-
 @pass_is_preview
+@pass_include_deleted
 @pass_record_or_draft(expand=True)
 @pass_record_files
-def record_detail(pid_value, record, files, is_preview=False):
+@pass_record_media_files
+@add_signposting_landing_page
+def record_detail(
+    pid_value, record, files, media_files, is_preview=False, include_deleted=False
+):
     """Record detail page (aka landing page)."""
     files_dict = None if files is None else files.to_dict()
+    media_files_dict = None if media_files is None else media_files.to_dict()
+
+    access = record._record.parent["access"]
+    if "settings" not in access or access["settings"] is None:
+        record._record.parent["access"]["settings"] = AccessSettings({}).dump()
+
     record_ui = UIJSONSerializer().dump_obj(record.to_dict())
 
+    record_deletion = evaluate_record_deletion(record._record, g.identity)
+
+    # The deletion options are only needed if the user is allowed to delete the given record.
+    record_deletion_options = (
+        VocabulariesOptions().deletion_request_removal_reasons()
+        if record_deletion["allowed"]
+        else []
+    )
+
     is_draft = record_ui["is_draft"]
+    custom_fields = load_custom_fields()
+    # keep only landing page configurable custom fields
+    custom_fields["ui"] = [
+        cf for cf in custom_fields["ui"] if not cf.get("hide_from_landing_page", False)
+    ]
+    avatar = None
+
+    if current_user.is_authenticated:
+        avatar = current_user_resources.users_service.links_item_tpl.expand(
+            g.identity, current_user
+        )["avatar"]
+
     if is_preview and is_draft:
         # it is possible to save incomplete drafts that break the normal
         # (preview) landing page rendering
@@ -180,6 +194,36 @@ def record_detail(pid_value, record, files, is_preview=False):
             )
         except ValidationError:
             abort(404)
+        # inject parent doi format for new drafts so we can show in preview if parent doi is required
+        if current_app.config["DATACITE_ENABLED"]:
+            service = current_rdm_records.records_service
+            datacite_provider = [
+                v["datacite"]
+                for p, v in service.config.parent_pids_providers.items()
+                if p == "doi" and "datacite" in v
+            ]
+            if datacite_provider:
+                should_mint_parent_doi = True
+                is_doi_required = (
+                    current_app.config.get("RDM_PARENT_PERSISTENT_IDENTIFIERS", {})
+                    .get("doi", {})
+                    .get("required")
+                )
+                if not is_doi_required:
+                    # check if the draft has a reserved doi and mint parent doi only in that case
+                    record_doi = record._record.pids.get("doi", {})
+                    is_doi_reserved = record_doi.get(
+                        "provider", ""
+                    ) == "datacite" and record_doi.get("identifier")
+                    if not is_doi_reserved:
+                        should_mint_parent_doi = False
+
+                if should_mint_parent_doi:
+                    datacite_provider = datacite_provider[0]
+                    parent_doi = datacite_provider.client.generate_doi(
+                        record._record.parent
+                    )
+                    record_ui["ui"]["new_draft_parent_doi"] = parent_doi
 
     # emit a record view stats event
     emitter = current_stats.get_event_emitter("record-view")
@@ -187,23 +231,52 @@ def record_detail(pid_value, record, files, is_preview=False):
         emitter(current_app, record=record._record, via_api=False)
 
     resolved_community, _ = get_record_community(record_ui)
-    return render_template(
+    resolved_community_ui = (
+        UICommunityJSONSerializer().dump_obj(resolved_community.to_dict())
+        if resolved_community
+        else None
+    )
+    theme = resolved_community_ui.get("theme", {}) if resolved_community else None
+
+    return render_community_theme_template(
         current_app.config.get("APP_RDM_RECORD_LANDING_PAGE_TEMPLATE"),
-        record=record_ui,
+        theme=theme,
+        record=record,
+        record_ui=record_ui,
         files=files_dict,
+        media_files=media_files_dict,
+        user_communities_memberships=get_user_communities_memberships(),
         permissions=record.has_permissions_to(
-            ["edit", "new_version", "manage", "update_draft", "read_files", "review"]
+            [
+                "edit",
+                "new_version",
+                "manage",
+                "update_draft",
+                "read_files",
+                "review",
+                "view",
+                "media_read_files",
+                "moderate",
+                "request_deletion",
+                "immediately_delete",
+            ]
         ),
-        custom_fields_ui=load_custom_fields()["ui"],
+        custom_fields_ui=custom_fields["ui"],
         is_preview=is_preview,
+        include_deleted=include_deleted,
         is_draft=is_draft,
-        stats=_get_stats(record_ui["id"], record_ui["parent"]["id"]),
         community=resolved_community,
+        community_ui=resolved_community_ui,
+        external_resources=get_external_resources(record),
+        user_avatar=avatar,
+        record_deletion=record_deletion,
+        record_deletion_options=record_deletion_options,
     )
 
 
 @pass_is_preview
 @pass_record_or_draft(expand=False)
+@add_signposting_metadata_resources
 def record_export(
     pid_value, record, export_format=None, permissions=None, is_preview=False
 ):
@@ -214,10 +287,7 @@ def record_export(
         abort(404)
 
     serializer = obj_or_import_string(exporter["serializer"])(
-        options={
-            "indent": 2,
-            "sort_keys": True,
-        }
+        **exporter.get("params", {})
     )
     exported_record = serializer.serialize_object(record.to_dict())
     contentType = exporter.get("content-type", export_format)
@@ -230,6 +300,7 @@ def record_export(
 
 
 @pass_is_preview
+@pass_include_deleted
 @pass_record_or_draft(expand=False)
 @pass_file_metadata
 def record_file_preview(
@@ -238,13 +309,10 @@ def record_file_preview(
     pid_type="recid",
     file_metadata=None,
     is_preview=False,
+    include_deleted=False,
     **kwargs,
 ):
     """Render a preview of the specified file."""
-    # Try to see if specific previewer is set
-    # TODO: what's the analog of: file_previewer = fileobj.get("previewer") ?
-    file_previewer = file_metadata.data.get("previewer")
-
     url = url_for(
         "invenio_app_rdm_records.record_file_download",
         pid_value=pid_value,
@@ -253,18 +321,25 @@ def record_file_preview(
     )
 
     # Find a suitable previewer
-    fileobj = PreviewFile(file_metadata, pid_value, url)
-    for plugin in current_previewer.iter_previewers(
-        previewers=[file_previewer] if file_previewer else None
-    ):
+    fileobj = PreviewFile(file_metadata, pid_value, record, url)
+    # Try to see if specific previewer preference is set for the file
+    file_previewer = (file_metadata.data.get("metadata") or {}).get("previewer")
+    if file_previewer:
+        previewer = current_previewer.previewers.get(file_previewer)
+        if previewer and previewer.can_preview(fileobj):
+            return previewer.preview(fileobj)
+
+    # Go through all previewers to find the first one that can preview the file
+    for plugin in current_previewer.iter_previewers():
         if plugin.can_preview(fileobj):
             return plugin.preview(fileobj)
 
-    return default.preview(fileobj)
+    return default_previewer.preview(fileobj)
 
 
 @pass_is_preview
-@pass_file_item
+@pass_file_item(is_media=False)
+@add_signposting_content_resources
 def record_file_download(pid_value, file_item=None, is_preview=False, **kwargs):
     """Download a file from a record."""
     download = bool(request.args.get("download"))
@@ -278,16 +353,61 @@ def record_file_download(pid_value, file_item=None, is_preview=False, **kwargs):
     return file_item.send_file(as_attachment=download)
 
 
+@pass_record_or_draft(expand=False)
+def record_thumbnail(pid_value, size, record=None, **kwargs):
+    """Display a record's thumbnail."""
+    # Verify against allowed thumbnail sizes
+    if size not in current_app.config["APP_RDM_RECORD_THUMBNAIL_SIZES"]:
+        abort(404)
+    files = record.data.get("files", {})
+    default_preview = files.get("default_preview")
+    file_entries = files.get("entries", {})
+    if file_entries:
+        file_key = next(
+            (
+                key
+                for key in itertools.chain([default_preview], file_entries)
+                if key and Path(key).suffix[1:] in image_extensions
+            ),
+            None,
+        )
+        if file_key:
+            file = current_rdm_records.records_service.files.read_file_metadata(
+                id_=pid_value, file_key=file_key, identity=g.identity
+            )
+            iiif_base_url = file["links"]["iiif_base"]
+            return redirect(f"{iiif_base_url}/full/{size},/0/default.png")
+    return abort(404)
+
+
+# Media files download
+
+
+@pass_is_preview
+@pass_file_item(is_media=True)
+def record_media_file_download(pid_value, file_item=None, is_preview=False, **kwargs):
+    """Download a media file from a record."""
+    download = bool(request.args.get("download"))
+
+    # emit a file download stats event
+    emitter = current_stats.get_event_emitter("file-download")
+    if file_item is not None and emitter is not None:
+        obj = file_item._file.object_version
+        emitter(current_app, record=file_item._record, obj=obj, via_api=False)
+
+    return file_item.send_file(as_attachment=download)
+
+
 @pass_record_latest
 def record_latest(record=None, **kwargs):
-    """Redirect to record'd latest version page."""
-    return redirect(record["links"]["self_html"], code=301)
+    """Redirect to record's latest version page."""
+    return redirect(record["links"]["self_html"], code=302)
 
 
 @pass_record_from_pid
 def record_from_pid(record=None, **kwargs):
-    """Redirect to record'd latest version page."""
-    return redirect(record["links"]["self_html"], code=301)
+    """Redirect to record's latest version page."""
+    return redirect(record["links"]["self_html"], code=302)
 
 
 #
@@ -298,14 +418,60 @@ def not_found_error(error):
     return render_template(current_app.config["THEME_404_TEMPLATE"]), 404
 
 
+def draft_not_found_error(error):
+    """Handler for draft not found while published record exists."""
+    return (
+        render_template(
+            "invenio_app_rdm/records/draft_not_found.html",
+            record_id=error.pid_value,
+        ),
+        404,
+    )
+
+
 def record_tombstone_error(error):
     """Tombstone page."""
-    return render_template("invenio_app_rdm/records/tombstone.html"), 410
+    # the RecordDeletedError will have the following properties,
+    # while the PIDDeletedError won't
+    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 not_found_error(error)
+
+    # we only render a tombstone page if there is a record with a visible tombstone
+    return (
+        render_template(
+            "invenio_app_rdm/records/tombstone.html",
+            record=record_ui,
+        ),
+        410,
+    )
 
 
 def record_permission_denied_error(error):
-    """Handle permission denier error on record views."""
+    """Handle permission denied error on record views."""
     if not current_user.is_authenticated:
         # trigger the flask-login unauthorized handler
         return current_app.login_manager.unauthorized()
+
+    record = getattr(error, "record", None)
+
+    if record:
+        is_restricted = record.get("access", {}).get("record", None) == "restricted"
+        has_doi = "doi" in record.get("pids", {})
+        if is_restricted and has_doi:
+            return (
+                render_template(
+                    "invenio_app_rdm/records/restricted_with_doi_tombstone.html",
+                    record=record,
+                ),
+                403,
+            )
+
     return render_template(current_app.config["THEME_403_TEMPLATE"]), 403

invenio_app_rdm/redirector/resource.py

@@ -69,6 +69,7 @@ class RedirectorResource(Resource):
                     rule=source,
                     view_meth=self.redirect_view_factory,
                     endpoint=endpoint,
+                    rule_options=rule.get("rule_options"),
                 )
             )
         return url_rules

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/community-submission/index.html

@@ -1,7 +1,7 @@
 {# -*- coding: utf-8 -*-
 
   This file is part of Invenio.
-  Copyright (C) 2016-2023 CERN.
+  Copyright (C) 2016-2025 CERN.
 
   Invenio is free software; you can redistribute it and/or modify it
   under the terms of the MIT License; see LICENSE file for more details.
@@ -23,15 +23,13 @@
     {% set back_button_url = url_for("invenio_communities.communities_requests", pid_value=community.id) %}
   {% endif %}
   {% from "invenio_requests/macros/request_header.html" import inclusion_request_header %}
-  {{
-    inclusion_request_header(
+  {{ inclusion_request_header(
       request=invenio_request,
       record=record,
       accepted=request_is_accepted,
       back_button_url=back_button_url,
       back_button_text=_("Back to requests")
-    )
-  }}
+    ) }}
 {%- endblock request_header %}
 
 {% block request_timeline %}
@@ -54,7 +52,7 @@
         {{ _("Conversation") }}
       </a>
 
-      {% if record %}
+      {% if record_ui %}
         <a
           role="tab"
           class="item"
@@ -66,6 +64,19 @@
           {{ _("Record") }}
         </a>
       {% endif %}
+
+      {% if checks %}
+        <a
+          role="tab"
+          class="item"
+          data-tab="checks"
+          aria-selected="false"
+          aria-controls="checks-tab-panel"
+          id="checks-tab"
+        >
+          <i class="{% include 'invenio_checks/requests/overall_severity_level.html' %}"></i> {{ _("Checks") }}
+        </a>
+      {% endif %}
     </div>
 
     <div
@@ -78,7 +89,21 @@
       {{ super() }}
     </div>
 
-    {% if record %}
+    {% if checks %}
+      <div
+        class="ui bottom attached tab segment borderless"
+        data-tab="checks"
+        role="tabpanel"
+        aria-labelledby="checks-tab"
+        id="checks-tab-panel"
+        hidden="hidden"
+      >
+        {% include "invenio_checks/requests/details.html" %}
+      </div>
+    {% endif %}
+
+    {# The record tab content needs to be last since the HTML structure is complex and breaks following tab contents #}
+    {% if record_ui %}
       <div
         class="ui bottom attached tab segment borderless"
         data-tab="record"
@@ -89,8 +114,9 @@
       >
         {% set use_theme_basic_template = false %}
         {% set preview_submission_request = true %}
-        {% include "invenio_app_rdm/records/detail.html" %}
+        {% include config.APP_RDM_RECORD_LANDING_PAGE_TEMPLATE %}
       </div>
     {% endif %}
+
   </div>
 {% endblock request_timeline %}

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/file-modification/index.html

@@ -0,0 +1,88 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2016-2025 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{% extends "invenio_requests/details/index.html" %}
+
+{% set active_dashboard_menu_item = 'requests' %}
+{% set active_community_header_menu_item = 'requests' %}
+
+{%- block request_header %}
+    {% set back_button_url = url_for("invenio_app_rdm_users.requests") %}
+  {% from "invenio_requests/macros/request_header.html" import inclusion_request_header %}
+  {{ inclusion_request_header(
+      request=invenio_request,
+      record=record,
+      accepted=request_is_accepted,
+      back_button_url=back_button_url,
+      back_button_text=_("Back to requests")
+    ) }}
+{%- endblock request_header %}
+
+{% block request_timeline %}
+  <div
+    class="ui container rdm-tab-container fluid rel-pt-2 ml-0-mobile mr-0-mobile"
+    id="request-request-deletion-tab-container"
+  >
+    <div
+      class="ui secondary pointing menu rdm-tab-menu"
+      id="request-deletion-request-tab"
+    >
+      <a
+        class="active item"
+        data-tab="conversation"
+        role="tab"
+        aria-selected="true"
+        aria-controls="conversation-tab-panel"
+        id="conversation-tab"
+      >
+        {{ _("Conversation") }}
+      </a>
+
+      {% if record_ui %}
+        <a
+          role="tab"
+          class="item"
+          data-tab="record"
+          aria-selected="false"
+          aria-controls="record-tab-panel"
+          id="record-tab"
+        >
+          {{ _("Record") }}
+        </a>
+      {% endif %}
+    </div>
+
+    <div
+      class="ui bottom attached tab segment active borderless p-0"
+      data-tab="conversation"
+      role="tabpanel"
+      aria-labelledby="conversation-tab"
+      id="conversation-tab-panel"
+    >
+      {{ super() }}
+    </div>
+
+    {# The record tab content needs to be last since the HTML structure is complex and breaks following tab contents #}
+    {% if record_ui %}
+      <div
+        class="ui bottom attached tab segment borderless"
+        data-tab="record"
+        role="tabpanel"
+        aria-labelledby="record-tab"
+        id="record-tab-panel"
+        hidden="hidden"
+      >
+        {% set use_theme_basic_template = false %}
+        {% set preview_submission_request = true %}
+        {% include config.APP_RDM_RECORD_LANDING_PAGE_TEMPLATE %}
+      </div>
+    {% endif %}
+
+  </div>
+{% endblock request_timeline %}