invenio-app-rdm 14.0.0b1.dev5__tar.gz → 14.0.0b3.dev4__tar.gz

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/CHANGES.rst

@@ -10,6 +10,75 @@
 Changes
 =======
 
+Version v14.0.0b3.dev4 (released 2025-12-08)
+
+- fix: ensure that pages render if accessed via secret link
+- UI: change button icon and text
+- chore: drill recordRequests into the modal
+- fix: restrict to only community sub/inc reqs
+- frontend: add direct link to request if user has access
+- feat(css): styles for quote replies
+- fix(requests_ui): Inject lock_request and create_comment permissions
+- fix: correct types
+
+Version v14.0.0b3.dev3 (released 2025-11-21)
+
+- feat(css): request comment deep links
+
+Version v14.0.0b3.dev2 (released 2025-11-21)
+
+- fix: revert mapping.js symlink
+
+Version v14.0.0b3.dev1 (released 2025-11-21)
+
+- UI: add info message about remaining days to publish changes
+- request: add file mod request template
+- fix: set files_locked to `bucket.locked` rather than permission
+    * currently the permission is whether you can unlock the files
+    * but the files are only unlocked when you create the draft
+    * as such as an admin when you edit a published draft, if it was
+      created by a user it will look like the files are unlocked but
+      this is false
+- feat: pass file modification eval to deposit form
+- fix: align selector with semantic-ui
+- fix(views): pass API record to evaluate record deletion
+- fix(record-ui): do not sanitize additional description in template
+- admin: requests details view improvements
+    - Replace `Record deletion` by `Deletion request for "Record name"`
+    - Link showing all requests for a given user
+- tombstone: add deletion policy
+- Update release date for version v14.0.0b3.dev0
+
+Version v14.0.0b3.dev0 (released 2025-11-12)
+
+- setup: bump major version of `invenio-oauthclient`
+
+Version v14.0.0b2.dev4 (released 2025-11-05)
+
+- refactor(config): Update DataCite serializer for schema v4.5
+
+Version v14.0.0b2.dev3 (released 2025-11-04)
+
+- feat(share links): handle optional/required expiration date
+- feat(form): rename creators to authors and help text
+
+Version v14.0.0b2.dev2 (released 2025-10-24)
+
+- upgrade_scripts: v14: optimize scan to avoid scroll context overhead
+
+Version v14.0.0b2.dev1 (released 2025-10-21)
+
+- deposit-form: updated related works options vocab
+
+Version v14.0.0b2.dev0 (released 2025-10-21)
+
+- installation: bump invenio-rdm-records
+- upgrade_scripts: Add v13 to v14 migration script
+- ui: add new related identifiers to vocabulary
+- ui: format numbers in CompactStats
+- fix(macros): Fix custom fields vocabularies links on landing page
+- fix(admin): use configured base template instead of hard-coded value
+
 Version v14.0.0b1.dev5 (released 2025-10-14)
 
 - fix(community-submission): add missing var in side bar template

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 14.0.0b1.dev5
+Version: 14.0.0b3.dev4
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -27,7 +27,7 @@ Requires-Dist: invenio-theme<5.0.0,>=4.0.0
 Requires-Dist: invenio-access<5.0.0,>=4.0.0
 Requires-Dist: invenio-accounts<7.0.0,>=6.0.0
 Requires-Dist: invenio-oauth2server<4.0.0,>=3.0.0
-Requires-Dist: invenio-oauthclient<6.0.0,>=5.0.0
+Requires-Dist: invenio-oauthclient<7.0.0,>=6.0.0
 Requires-Dist: invenio-userprofiles<5.0.0,>=4.0.0
 Requires-Dist: invenio-indexer<4.0.0,>=3.0.0
 Requires-Dist: invenio-jsonschemas<3.0.0,>=2.0.0
@@ -42,7 +42,7 @@ Requires-Dist: invenio-previewer<4.0.0,>=3.0.0
 Requires-Dist: invenio-records-files<2.0.0,>=1.2.1
 Requires-Dist: invenio-collections<3.0.0,>=1.0.0
 Requires-Dist: invenio-communities<22.0.0,>=21.0.0
-Requires-Dist: invenio-rdm-records<22.0.0,>=21.0.0
+Requires-Dist: invenio-rdm-records<23.0.0,>=22.0.0
 Requires-Dist: CairoSVG<3.0.0,>=2.5.2
 Requires-Dist: invenio-banners<6.0.0,>=5.0.0
 Requires-Dist: invenio-pages<8.0.0,>=7.0.0
@@ -101,6 +101,75 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v14.0.0b3.dev4 (released 2025-12-08)
+
+- fix: ensure that pages render if accessed via secret link
+- UI: change button icon and text
+- chore: drill recordRequests into the modal
+- fix: restrict to only community sub/inc reqs
+- frontend: add direct link to request if user has access
+- feat(css): styles for quote replies
+- fix(requests_ui): Inject lock_request and create_comment permissions
+- fix: correct types
+
+Version v14.0.0b3.dev3 (released 2025-11-21)
+
+- feat(css): request comment deep links
+
+Version v14.0.0b3.dev2 (released 2025-11-21)
+
+- fix: revert mapping.js symlink
+
+Version v14.0.0b3.dev1 (released 2025-11-21)
+
+- UI: add info message about remaining days to publish changes
+- request: add file mod request template
+- fix: set files_locked to `bucket.locked` rather than permission
+    * currently the permission is whether you can unlock the files
+    * but the files are only unlocked when you create the draft
+    * as such as an admin when you edit a published draft, if it was
+      created by a user it will look like the files are unlocked but
+      this is false
+- feat: pass file modification eval to deposit form
+- fix: align selector with semantic-ui
+- fix(views): pass API record to evaluate record deletion
+- fix(record-ui): do not sanitize additional description in template
+- admin: requests details view improvements
+    - Replace `Record deletion` by `Deletion request for "Record name"`
+    - Link showing all requests for a given user
+- tombstone: add deletion policy
+- Update release date for version v14.0.0b3.dev0
+
+Version v14.0.0b3.dev0 (released 2025-11-12)
+
+- setup: bump major version of `invenio-oauthclient`
+
+Version v14.0.0b2.dev4 (released 2025-11-05)
+
+- refactor(config): Update DataCite serializer for schema v4.5
+
+Version v14.0.0b2.dev3 (released 2025-11-04)
+
+- feat(share links): handle optional/required expiration date
+- feat(form): rename creators to authors and help text
+
+Version v14.0.0b2.dev2 (released 2025-10-24)
+
+- upgrade_scripts: v14: optimize scan to avoid scroll context overhead
+
+Version v14.0.0b2.dev1 (released 2025-10-21)
+
+- deposit-form: updated related works options vocab
+
+Version v14.0.0b2.dev0 (released 2025-10-21)
+
+- installation: bump invenio-rdm-records
+- upgrade_scripts: Add v13 to v14 migration script
+- ui: add new related identifiers to vocabulary
+- ui: format numbers in CompactStats
+- fix(macros): Fix custom fields vocabularies links on landing page
+- fix(admin): use configured base template instead of hard-coded value
+
 Version v14.0.0b1.dev5 (released 2025-10-14)
 
 - fix(community-submission): add missing var in side bar template

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/__init__.py

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "14.0.0b1.dev5"
+__version__ = "14.0.0b3.dev4"
 
 __all__ = ("__version__",)

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/administration/moderation/requests.py

@@ -51,7 +51,7 @@ class ModerationRequestListView(AdminResourceListView):
     search_sort_config_name = "APP_RDM_MODERATION_REQUEST_SORT_OPTIONS"
 
     item_field_list = {
-        "type": {"text": _("Type"), "order": 1, "width": 3},
+        "title": {"text": _("Title"), "order": 1, "width": 3},
         "created": {"text": _("Created"), "order": 2, "width": 3},
         "last_reply": {"text": _("Last reply"), "order": 3, "width": 3},
     }

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/administration/templates/semantic-ui/invenio_app_rdm/administration/requests_details.html

@@ -31,7 +31,9 @@ under the terms of the MIT License; see LICENSE file for more details.
 
         <div class="twelve wide column mt-10">
           <p><strong>{{ _("Reason:") }}</strong> {{ invenio_request["payload"]["reason_label"] }}</p>
-          <p><strong>{{ _("Justification:") }}</strong> {{ invenio_request["payload"]["comment"] }}</p>
+          {%- if invenio_request["payload"]["comment"] %}
+            <p><strong>{{ _("Justification:") }}</strong> {{ invenio_request["payload"]["comment"] }}</p>
+          {%- endif %}
         </div>
 
         <div class="ui divider"></div>

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/config.py

@@ -651,7 +651,7 @@ OAISERVER_METADATA_FORMATS = {
     },
     "datacite": {
         "serializer": "invenio_rdm_records.oai:datacite_etree",
-        "schema": "http://schema.datacite.org/meta/kernel-4.3/metadata.xsd",
+        "schema": "http://schema.datacite.org/meta/kernel-4.5/metadata.xsd",
         "namespace": "http://datacite.org/schema/kernel-4",
     },
     "oai_datacite": {
@@ -661,7 +661,7 @@ OAISERVER_METADATA_FORMATS = {
     },
     "datacite4": {
         "serializer": "invenio_rdm_records.oai:datacite_etree",
-        "schema": "http://schema.datacite.org/meta/kernel-4.3/metadata.xsd",
+        "schema": "http://schema.datacite.org/meta/kernel-4.5/metadata.xsd",
         "namespace": "http://datacite.org/schema/kernel-4",
     },
     "oai_datacite4": {
@@ -840,7 +840,7 @@ APP_RDM_RECORD_EXPORTERS = {
     "datacite-json": {
         "name": _("DataCite JSON"),
         "serializer": (
-            "invenio_rdm_records.resources.serializers:DataCite43JSONSerializer"
+            "invenio_rdm_records.resources.serializers:DataCite45JSONSerializer"
         ),
         "params": {"options": {"indent": 2, "sort_keys": True}},
         "content-type": "application/vnd.datacite.datacite+json",
@@ -849,7 +849,7 @@ APP_RDM_RECORD_EXPORTERS = {
     "datacite-xml": {
         "name": _("DataCite XML"),
         "serializer": (
-            "invenio_rdm_records.resources.serializers:DataCite43XMLSerializer"
+            "invenio_rdm_records.resources.serializers:DataCite45XMLSerializer"
         ),
         "params": {},
         "content-type": "application/vnd.datacite.datacite+xml",

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/deposit.html

@@ -51,6 +51,9 @@
   {% if record_deletion %}
     <input type="hidden" name="deposits-record-deletion" value='{{ record_deletion | tojson }}'>
   {% endif %}
+  {% if file_modification %}
+    <input type="hidden" name="deposits-file-modification" value='{{ file_modification | tojson }}'>
+  {% endif %}
   <input type="hidden" name="config-groups-enabled"
           value='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'>
   <input type="hidden" name="records-resources-allow-empty-files"
@@ -69,6 +72,9 @@
            value='{{ permissions | tojson }}'>
   {%- endif %}
 
+<input type="hidden" id="deposits-share-btn-require-link-expiration"
+        data-share-btn-require-link-expiration='{{ config.RDM_RECORDS_REQUIRE_SECRET_LINKS_EXPIRATION | tojson }}'>
+
   <div id="deposit-form"></div>
 
 {%- endblock page_body %}

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/detail.html

@@ -48,6 +48,9 @@
 
 
 {%- block page_body %}
+<span id="detail-share-btn-require-link-expiration"
+        data-share-btn-require-link-expiration='{{ config.RDM_RECORDS_REQUIRE_SECRET_LINKS_EXPIRATION | tojson }}'>
+
   <section id="banners" class="banners" aria-label="{{ _('Information banner') }}">
     <!-- COMMUNITY HEADER: hide it when displaying the submission request -->
     {% if not is_preview_submission_request %}
@@ -203,9 +206,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 %}
@@ -262,13 +262,13 @@
             {# Title #}
             {%- block record_title -%}
               <section id="record-title-section"
-                       aria-label="{{ _('Record title and creators') }}">
+                       aria-label="{{ _('Record title, authors and contributors') }}">
                 <h1 id="record-title"
                     class="wrap-overflowing-text">{{ metadata.title }}</h1>
 
                 {% if record_ui["ui"]["creators"] or record_ui["ui"]["contributors"] %}
                   <section id="creatibutors"
-                           aria-label="{{ _('Creators and contributors') }}">
+                           aria-label="{{ _('Authors and contributors') }}">
                     {%- include "invenio_app_rdm/records/details/creatibutors.html" %}
                   </section>
                 {% endif %}

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/creatibutors.html

@@ -13,7 +13,7 @@
   {% if record_ui["ui"]["creators"] and record_ui["ui"]["creators"]["creators"] %}
     <div class="row ui accordion affiliations">
       <div class="sixteen wide mobile twelve wide tablet thirteen wide computer column">
-          <h3 class="sr-only">{{ _('Creators') }}</h3>
+          <h3 class="sr-only">{{ _('Authors/Creators') }}</h3>
           <ul class="creatibutors">
             {{ show_creatibutors(record_ui["ui"]["creators"]["creators"], show_affiliations=True, show_role=True) }}
           </ul>

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/communities.html

@@ -9,6 +9,7 @@
   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 }}'
   data-record='{{ record_ui | tojson }}'
+  data-record-requests='{{ record_requests | default({}) | tojson }}'
   class='sidebar-container'
 >
 

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/manage_menu.html

@@ -20,8 +20,10 @@ it under the terms of the MIT License; see LICENSE file for more details.
          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 %}

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html

@@ -73,12 +73,13 @@
           {{ '(' ~ add_description.lang.title_l10n ~ ')' if add_description.lang is defined else '' }}
         </span>
       </h2>
+      {# additional description data is being sanitized by marshmallow in the backend #}
       {% if desc_type_defined and add_description.type.id == "notes" %}
         <div class="ui message warning">
-          {{ desc_text | sanitize_html() | safe }}
+          {{ desc_text | safe }}
         </div>
       {% else %}
-        {{ desc_text | sanitize_html() | safe }}
+        {{ desc_text | safe }}
       {% endif %}
     </section>
   {% endfor %}
@@ -212,17 +213,28 @@
   {% endfor %}
 {% endmacro %}
 
+
+{% macro _vocabulary_search_url(field, value, field_cfg) %}
+  {% if field_cfg.landing_page_search_attr and field_cfg.landing_page_search_attr in field_cfg %}
+    {% set search_text = value[field_cfg.landing_page_search_attr] %}
+  {% else %}
+    {% set search_text = value.title_l10n %}
+  {% endif %}
+  {% set search_url = field | custom_fields_search(search_text, field_cfg) %}
+  {% if search_url %}
+    <a href="{{ search_url }}">{{ value.title_l10n | safe }}</a>
+  {% else %}
+    {{ value.title_l10n }}
+  {% endif %}
+{% endmacro %}
+
+
 {% macro list_vocabulary_values(field, values, field_cfg) %}
-  {% if values.title_l10n is defined %}
-    {% set search_url = field | custom_fields_search(values.title_l10n, field_cfg) %}
-    {% if search_url %}
-      <a href="{{ search_url }}">{{ values.title_l10n | safe }}</a>
-    {% else %}
-      {{ values.title_l10n }}
-    {% endif %}
+  {% if values is mapping %}
+    {{ _vocabulary_search_url(field, values, field_cfg) }}
   {% else %}
     {% for value in values %}
-      {{ value.title_l10n }}{{ ", " if not loop.last }}
+      {{ _vocabulary_search_url(field, value, field_cfg) }}{{ ", " if not loop.last }}
     {% endfor %}
   {% endif %}
 {% endmacro %}

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/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-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/utils.py

@@ -9,11 +9,17 @@
 
 """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
@@ -95,7 +101,7 @@ def dump_external_resource(
 
 
 def get_existing_deletion_request(record_id):
-    """Return existing open deletion requests for the record."""
+    """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(
@@ -108,4 +114,69 @@ def get_existing_deletion_request(record_id):
         ),
     )
     if existing_requests.total > 0:
-        return list(existing_requests)[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-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/views/decorators.py

@@ -81,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

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b3.dev4}/invenio_app_rdm/records_ui/views/deposits.py

@@ -26,7 +26,6 @@ from invenio_i18n.ext import current_i18n
 from invenio_rdm_records.proxies import current_rdm_records
 from invenio_rdm_records.records.api import get_files_quota
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
-from invenio_rdm_records.services.config import RDMRecordDeletionPolicy
 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
@@ -38,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 get_existing_deletion_request, set_default_value
+from ..utils import (
+    evaluate_file_modification,
+    evaluate_record_deletion,
+    set_default_value,
+)
 from .decorators import (
     no_cache_response,
     pass_draft,
@@ -289,30 +292,39 @@ 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 removal_reasons(self):
-        """Dump removal reasons vocabulary."""
-        self._vocabularies["removal_reasons"] = self._dump_vocabulary_w_basic_fields(
-            "removalreasons", extra_filter=dsl.Q("term", tags="deletion-request")
+    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["removal_reasons"]
+        return self._vocabularies["deletion_request_removal_reasons"]
 
     def dump(self):
         """Dump into dict."""
@@ -325,7 +337,8 @@ class VocabulariesOptions:
         self.contributor_roles()
         self.subjects()
         self.identifiers()
-        self.removal_reasons()
+        self.related_identifiers()
+        self.deletion_request_removal_reasons()
         # We removed
         # vocabularies["relation_type"] = _dump_relation_types_vocabulary()
         return self._vocabularies
@@ -542,45 +555,15 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
         )
         published_record = ui_serializer.dump_obj(published_record_result.to_dict())
 
-        rec_del = RDMRecordDeletionPolicy().evaluate(
-            g.identity, published_record_result._record
-        )
-        immediate, request = rec_del["immediate_deletion"], rec_del["request_deletion"]
-        rd_enabled = immediate.enabled or request.enabled
-        rd_valid_user = (
-            rec_del["immediate_deletion"].valid_user
-            or rec_del["request_deletion"].valid_user
+        record_deletion = evaluate_record_deletion(
+            published_record_result._record, g.identity
         )
-        rd_allowed = immediate.allowed or request.allowed
-        existing_request = get_existing_deletion_request(record.get("id"))
-
-        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": draft._record.files.count,
-                    "internalDoi": draft._record.pids["doi"]["provider"] != "external",
-                },
-            }
-        else:
-            record_deletion = {
-                "enabled": rd_enabled,
-                "valid_user": rd_valid_user,
-                "allowed": rd_allowed,
-            }
-        record_deletion["existing_request"] = (
-            existing_request["links"]["self_html"] if existing_request else None
+        file_modification = evaluate_file_modification(
+            published_record_result._record, g.identity
         )
     else:
         record_deletion = {}
+        file_modification = {}
 
     community_ui = None
     community_theme = None
@@ -656,6 +639,7 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
             ]
         ),
         record_deletion=record_deletion,
+        file_modification=file_modification,
     )