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/views/deposits.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2021 Northwestern University.
 # Copyright (C)      2021 TU Wien.
-# Copyright (C) 2022-2024 KTH Royal Institute of Technology
+# Copyright (C) 2022-2025 KTH Royal Institute of Technology
 # Copyright (C) 2023-2024 Graz University of Technology.
 #
 # Invenio App RDM is free software; you can redistribute it and/or modify it
@@ -15,6 +15,9 @@ from copy import deepcopy
 
 from flask import current_app, g, redirect
 from flask_login import login_required
+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
@@ -25,6 +28,8 @@ from invenio_rdm_records.records.api import get_files_quota
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
 from invenio_rdm_records.services.schemas import RDMRecordSchema
 from invenio_rdm_records.services.schemas.utils import dump_empty
+from invenio_rdm_records.views import file_transfer_type
+from invenio_records_resources.proxies import current_transfer_registry
 from invenio_records_resources.services.errors import PermissionDeniedError
 from invenio_search.engine import dsl
 from invenio_vocabularies.proxies import current_service as vocabulary_service
@@ -32,7 +37,11 @@ from invenio_vocabularies.records.models import VocabularyScheme
 from marshmallow_utils.fields.babel import gettext_from_dict
 from sqlalchemy.orm import load_only
 
-from ..utils import set_default_value
+from ..utils import (
+    evaluate_file_modification,
+    evaluate_record_deletion,
+    set_default_value,
+)
 from .decorators import (
     no_cache_response,
     pass_draft,
@@ -82,10 +91,12 @@ def get_form_pids_config(record=None):
                 optional_doi_transitions["message"] = optional_doi_transitions.get(
                     "message"
                 ).format(sitename=sitename)
-                if set(optional_doi_transitions["allowed_providers"]) - set(
-                    ["external", "not_needed"]
+                if (
+                    "external" not in optional_doi_transitions["allowed_providers"]
+                    and "not_needed"
+                    not in optional_doi_transitions["allowed_providers"]
                 ):
-                    # In case we have locally managed provider as an allowed one, we need to
+                    # In case we have locally managed provider(s) as allowed ones, we need to
                     # select it by default. That is relevant for the case when the
                     # user creates a new version of the record and the previous version
                     # had a datacite DOI.
@@ -98,9 +109,9 @@ def get_form_pids_config(record=None):
 
         pids_provider = {
             "scheme": scheme,
-            "field_label": "Digital Object Identifier",
-            "pid_label": "DOI",
-            "pid_placeholder": "Copy/paste your existing DOI here...",
+            "field_label": _("Digital Object Identifier"),
+            "pid_label": _("DOI"),
+            "pid_placeholder": _("Copy/paste your existing DOI here..."),
             "can_be_managed": can_be_managed,
             "can_be_unmanaged": can_be_unmanaged,
             "btn_label_discard_pid": _(
@@ -200,10 +211,13 @@ class VocabulariesOptions:
             for hit in subset_resource_types.to_dict()["hits"]["hits"]
         ]
 
-    def _dump_vocabulary_w_basic_fields(self, vocabulary_type):
+    def _dump_vocabulary_w_basic_fields(self, vocabulary_type, extra_filter=None):
         """Dump vocabulary with id and title field."""
         results = vocabulary_service.read_all(
-            g.identity, fields=["id", "title"], type=vocabulary_type
+            g.identity,
+            fields=["id", "title"],
+            type=vocabulary_type,
+            extra_filter=extra_filter,
         )
         return [
             {
@@ -278,24 +292,40 @@ class VocabulariesOptions:
         """Dump linkable resource type vocabulary."""
         return self._resource_types(dsl.Q("term", tags="linkable"))
 
-    def identifier_schemes(self):
-        """Dump identifiers scheme (fake) vocabulary.
-
-        "Fake" because identifiers scheme is not a vocabulary.
-        """
+    def _dump_identifier_schemes(self, config_key):
+        """Dump identifier schemes from a given config key."""
         return [
             {"text": get_scheme_label(scheme), "value": scheme}
-            for scheme in current_app.config.get("RDM_RECORDS_IDENTIFIERS_SCHEMES", {})
+            for scheme in current_app.config.get(config_key, {})
         ]
 
-    def identifiers(self):
-        """Dump related identifiers vocabulary."""
-        self._vocabularies["identifiers"] = {
+    def _dump_identifiers(self, vocab_key, config_key):
+        """Dump identifiers vocabulary for a given vocab/config key pair."""
+        self._vocabularies[vocab_key] = {
             "relations": self.relation_types(),
             "resource_type": self.linkable_resource_types(),
-            "scheme": self.identifier_schemes(),
+            "scheme": self._dump_identifier_schemes(config_key),
         }
 
+    def identifiers(self):
+        """Dump identifiers vocabulary."""
+        self._dump_identifiers("identifiers", "RDM_RECORDS_IDENTIFIERS_SCHEMES")
+
+    def related_identifiers(self):
+        """Dump related identifiers vocabulary."""
+        self._dump_identifiers(
+            "related_identifiers", "RDM_RECORDS_RELATED_IDENTIFIERS_SCHEMES"
+        )
+
+    def deletion_request_removal_reasons(self):
+        """Dump deletion request removal reasons vocabulary."""
+        self._vocabularies["deletion_request_removal_reasons"] = (
+            self._dump_vocabulary_w_basic_fields(
+                "removalreasons", extra_filter=dsl.Q("term", tags="deletion-request")
+            )
+        )
+        return self._vocabularies["deletion_request_removal_reasons"]
+
     def dump(self):
         """Dump into dict."""
         # TODO: Nest vocabularies inside "metadata" key so that frontend dumber
@@ -307,6 +337,8 @@ class VocabulariesOptions:
         self.contributor_roles()
         self.subjects()
         self.identifiers()
+        self.related_identifiers()
+        self.deletion_request_removal_reasons()
         # We removed
         # vocabularies["relation_type"] = _dump_relation_types_vocabulary()
         return self._vocabularies
@@ -328,6 +360,8 @@ def load_custom_fields():
             # for each custom field. This is the label shown at the top of the upload
             # form
             field_error_label = field.get("props", {}).get("label")
+            # Add the field ID to the props to allow overriding the React widgets of custom fields
+            field["props"]["id"] = field["field"]
             if field_error_label:
                 error_labels[f"custom_fields.{field['field']}"] = field_error_label
             if getattr(field_instance, "relation_cls", None):
@@ -361,6 +395,7 @@ def get_form_config(**kwargs):
         cf for cf in custom_fields["ui"] if not cf.get("hide_from_upload_form", False)
     ]
     quota = deepcopy(conf.get("APP_RDM_DEPOSIT_FORM_QUOTA", {}))
+    max_file_size = conf.get("RDM_FILES_DEFAULT_MAX_FILE_SIZE", None)
     record_quota = kwargs.pop("quota", None)
     if record_quota:
         quota["maxStorage"] = record_quota["quota_size"]
@@ -375,7 +410,7 @@ def get_form_config(**kwargs):
         current_locale=str(current_i18n.locale),
         default_locale=conf.get("BABEL_DEFAULT_LOCALE", "en"),
         pids=get_form_pids_config(record=record),
-        quota=quota,
+        quota=dict(**quota, maxFileSize=max_file_size),
         decimal_size_display=conf.get("APP_RDM_DISPLAY_DECIMAL_FILE_SIZES", True),
         links=dict(
             user_dashboard_request=conf["RDM_REQUESTS_ROUTES"][
@@ -387,10 +422,24 @@ def get_form_config(**kwargs):
         publish_modal_extra=current_app.config.get(
             "APP_RDM_DEPOSIT_FORM_PUBLISH_MODAL_EXTRA"
         ),
+        default_transfer_type=current_transfer_registry.default_transfer_type,
+        enabled_transfer_types=list(current_transfer_registry.get_transfer_types()),
+        transfer_types=file_transfer_type()["transfer_types"],
         **kwargs,
     )
 
 
+def get_actual_files_quota(draft):
+    """Report the actual effective quota from the draft's bucket, if available."""
+    if draft is not None and draft.bucket is not None:
+        return {
+            "quota_size": draft.bucket.quota_size,
+            "max_file_size": draft.bucket.max_file_size,
+        }
+
+    return get_files_quota(draft)
+
+
 def get_search_url():
     """Get the search URL."""
     # TODO: this should not be used
@@ -427,7 +476,7 @@ def new_record():
 @login_required
 @no_cache_response
 @pass_draft_community
-def deposit_create(community=None):
+def deposit_create(community=None, community_ui=None):
     """Create a new deposit."""
     can_create = current_rdm_records.records_service.check_permission(
         g.identity, "create"
@@ -437,7 +486,7 @@ def deposit_create(community=None):
 
     community_theme = None
     if community is not None:
-        community_theme = community.get("theme", {})
+        community_theme = community_ui.get("theme", {})
 
     community_use_jinja_header = bool(community_theme)
     dashboard_routes = current_app.config["APP_RDM_USER_DASHBOARD_ROUTES"]
@@ -453,16 +502,17 @@ def deposit_create(community=None):
         forms_config=get_form_config(
             dashboard_routes=dashboard_routes,
             createUrl="/api/records",
-            quota=get_files_quota(),
+            quota=get_actual_files_quota(None),
             hide_community_selection=community_use_jinja_header,
             is_doi_required=is_doi_required,
         ),
         searchbar_config=dict(searchUrl=get_search_url()),
         record=new_record(),
         community=community,
+        community_ui=community_ui,
         community_use_jinja_header=community_use_jinja_header,
         files=dict(default_preview=None, entries=[], links={}),
-        preselectedCommunity=community,
+        preselectedCommunity=community_ui,
         files_locked=False,
         permissions=get_record_permissions(
             [
@@ -498,6 +548,24 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
     ui_serializer = UIJSONSerializer()
     record = ui_serializer.dump_obj(draft.to_dict())
 
+    published_record = None
+    if record["is_published"]:
+        published_record_result = service.read(
+            g.identity, id_=record["id"], expand=True
+        )
+        published_record = ui_serializer.dump_obj(published_record_result.to_dict())
+
+        record_deletion = evaluate_record_deletion(
+            published_record_result._record, g.identity
+        )
+        file_modification = evaluate_file_modification(
+            published_record_result._record, g.identity
+        )
+    else:
+        record_deletion = {}
+        file_modification = {}
+
+    community_ui = None
     community_theme = None
     community = record.get("expanded", {}).get("parent", {}).get("review", {}).get(
         "receiver"
@@ -512,6 +580,7 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
                 id_=community["id"], identity=g.identity
             )
             community_theme = community.to_dict().get("theme", {})
+            community_ui = UICommunityJSONSerializer().dump_obj(community.to_dict())
         except CommunityDeletedError:
             pass
 
@@ -529,11 +598,12 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
         apiUrl=f"/api/records/{pid_value}/draft",
         dashboard_routes=dashboard_routes,
         # maybe quota should be serialized into the record e.g for admins
-        quota=get_files_quota(draft._record),
+        quota=get_actual_files_quota(draft._record),
         # hide react community component
         hide_community_selection=community_use_jinja_header,
         is_doi_required=is_doi_required,
         record=draft._record,
+        published_record=published_record,
     )
 
     if is_doi_required and not record.get("pids", {}).get("doi"):
@@ -554,6 +624,7 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
         forms_config=form_config,
         record=record,
         community=community,
+        community_ui=community_ui,
         community_use_jinja_header=community_use_jinja_header,
         files=files_dict,
         searchbar_config=dict(searchUrl=get_search_url()),
@@ -567,6 +638,8 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
                 "manage_record_access",
             ]
         ),
+        record_deletion=record_deletion,
+        file_modification=file_modification,
     )
 
 

invenio_app_rdm/records_ui/views/filters.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2020 Northwestern University.
 # Copyright (C)      2021 TU Wien.
 # Copyright (C) 2024 Graz University of Technology.
@@ -123,9 +123,16 @@ def order_entries(files):
 
 def get_scheme_label(scheme):
     """Convert backend scheme to frontend label."""
-    scheme_to_label = current_app.config.get("RDM_RECORDS_IDENTIFIERS_SCHEMES", {})
+    configs = [
+        current_app.config.get("RDM_RECORDS_IDENTIFIERS_SCHEMES", {}),
+        current_app.config.get("RDM_RECORDS_RELATED_IDENTIFIERS_SCHEMES", {}),
+    ]
+
+    for cfg in configs:
+        if scheme in cfg:
+            return cfg[scheme].get("label", scheme)
 
-    return scheme_to_label.get(scheme, {}).get("label", scheme)
+    return scheme
 
 
 def localize_number(value):
@@ -207,6 +214,6 @@ def transform_record(record, serializer, module=None, throws=True, **kwargs):
         if throws:
             raise Exception("No serializer found.")
     except Exception:
-        current_app.logger.error("Record transformation failed.")
+        current_app.logger.exception("Record transformation failed.")
         if throws:
             raise

invenio_app_rdm/records_ui/views/records.py

@@ -37,7 +37,7 @@ from invenio_app_rdm.records_ui.previewer.iiif_simple import (
     previewable_extensions as image_extensions,
 )
 
-from ..utils import get_external_resources
+from ..utils import evaluate_record_deletion, get_external_resources
 from .decorators import (
     add_signposting_content_resources,
     add_signposting_landing_page,
@@ -52,7 +52,11 @@ from .decorators import (
     pass_record_media_files,
     pass_record_or_draft,
 )
-from .deposits import get_user_communities_memberships, load_custom_fields
+from .deposits import (
+    VocabulariesOptions,
+    get_user_communities_memberships,
+    load_custom_fields,
+)
 
 
 def get_record_community(record):
@@ -156,6 +160,16 @@ def record_detail(
         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
@@ -216,19 +230,13 @@ def record_detail(
     if record is not None and emitter is not None:
         emitter(current_app, record=record._record, via_api=False)
 
-    record_owner = (
-        record_ui.get("expanded", {})
-        .get("parent", {})
-        .get("access", {})
-        .get("owned_by", {})
-    )
     resolved_community, _ = get_record_community(record_ui)
-    resolved_community = (
+    resolved_community_ui = (
         UICommunityJSONSerializer().dump_obj(resolved_community.to_dict())
         if resolved_community
         else None
     )
-    theme = resolved_community.get("theme", {}) 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"),
@@ -249,6 +257,8 @@ def record_detail(
                 "view",
                 "media_read_files",
                 "moderate",
+                "request_deletion",
+                "immediately_delete",
             ]
         ),
         custom_fields_ui=custom_fields["ui"],
@@ -256,11 +266,11 @@ def record_detail(
         include_deleted=include_deleted,
         is_draft=is_draft,
         community=resolved_community,
+        community_ui=resolved_community_ui,
         external_resources=get_external_resources(record),
         user_avatar=avatar,
-        record_owner_id=(
-            record_owner.get("id")
-        ),  # record created with system_identity have not owners e.g demo
+        record_deletion=record_deletion,
+        record_deletion_options=record_deletion_options,
     )
 
 

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 %}

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/guest-access-request/index.html

@@ -30,11 +30,11 @@
           {# only display the header for the receiver #}
           {%- set back_button_url = url_for("invenio_app_rdm_users.requests") %}
           {{ inclusion_request_header(
-        back_button_url=back_button_url,
-        back_button_text=_("Back to requests"),
-        request=invenio_request,
-        accepted=request_is_accepted
-      ) }}
+            back_button_url=back_button_url,
+            back_button_text=_("Back to requests"),
+            request=invenio_request,
+            accepted=request_is_accepted
+          ) }}
 
         {%- else %}
           <div class="ui grid rel-mt-2">

invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/record-deletion/index.html

@@ -0,0 +1,95 @@
+{# -*- 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")
+    ) }}
+
+    <div class="twelve wide column mt-10">
+      <p><strong>{{ _("Reason:") }}</strong> {{ invenio_request["payload"]["reason_label"] }}</p>
+      {%- if invenio_request["payload"]["comment"] %}
+        <p><strong>{{ _("Justification:") }}</strong> {{ invenio_request["payload"]["comment"] }}</p>
+      {%- endif %}
+    </div>
+{%- 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 %}