invenio-app-rdm 14.0.0b1.dev5__tar.gz → 14.0.0b2.dev0__tar.gz

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/CHANGES.rst

@@ -10,6 +10,15 @@
 Changes
 =======
 
+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.0b2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 14.0.0b1.dev5
+Version: 14.0.0b2.dev0
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -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,15 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+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.0b2.dev0}/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.0b2.dev0"
 
 __all__ = ("__version__",)

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

@@ -212,17 +212,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.0b2.dev0}/invenio_app_rdm/records_ui/views/deposits.py

@@ -289,24 +289,31 @@ 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 removal_reasons(self):
         """Dump removal reasons vocabulary."""
         self._vocabularies["removal_reasons"] = self._dump_vocabulary_w_basic_fields(
@@ -325,6 +332,7 @@ class VocabulariesOptions:
         self.contributor_roles()
         self.subjects()
         self.identifiers()
+        self.related_identifiers()
         self.removal_reasons()
         # We removed
         # vocabularies["relation_type"] = _dump_relation_types_vocabulary()

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/invenio_app_rdm/records_ui/views/filters.py

@@ -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):
@@ -187,12 +194,19 @@ def custom_fields_search(field, field_value, field_cfg=None):
         # the \ is necessary for the lucene syntax but produces a SyntaxWarning.
         # The r marks the string as raw and prevents the warning
         # https://docs.python.org/3/reference/lexical_analysis.html#escape-sequences
-        namespace_string = r"\:".join(namespace_array) + f".{localised_title}.{locale}"
+        namespace_string = r"\:".join(namespace_array) + rf".{localised_title}.{locale}"
     else:
         namespace_string = r"\:".join(namespace_array)
+        # Check if the field config has a landing page search attribute to search by
+        landing_page_search_attr = (field_cfg or {}).get(
+            "landing_page_search_attr", False
+        )
+        if landing_page_search_attr:
+            namespace_string += rf".{landing_page_search_attr}"
 
     return url_for(
-        "invenio_search_ui.search", q=f"custom_fields.{namespace_string}:{field_value}"
+        "invenio_search_ui.search",
+        q=f'custom_fields.{namespace_string}:"{field_value}"',
     )
 
 

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/components/CompactStats.js

@@ -8,6 +8,7 @@ import { i18next } from "@translations/invenio_app_rdm/i18next";
 import PropTypes from "prop-types";
 import React from "react";
 import { Icon, Label, Popup } from "semantic-ui-react";
+import { localizedFormatNumber } from "../utils";
 
 export const CompactStats = ({ uniqueViews, uniqueDownloads }) => {
   return (
@@ -19,7 +20,7 @@ export const CompactStats = ({ uniqueViews, uniqueDownloads }) => {
           trigger={
             <Label className="transparent">
               <Icon name="eye" />
-              {uniqueViews}
+              {localizedFormatNumber(uniqueViews)}
             </Label>
           }
         />
@@ -31,7 +32,7 @@ export const CompactStats = ({ uniqueViews, uniqueDownloads }) => {
           trigger={
             <Label className="transparent">
               <Icon name="download" />
-              {uniqueDownloads}
+              {localizedFormatNumber(uniqueDownloads)}
             </Label>
           }
         />

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/utils.js

@@ -119,3 +119,12 @@ export function SearchItemCreators({ creators, className, othersLink }) {
  */
 export const timestampToRelativeTime = (timestamp) =>
   DateTime.fromISO(timestamp).setLocale(i18next.language).toRelative();
+
+/**
+ * Returns a string-formatted number in the user's locale (e.g. 1,000 in en-GB but 1.000 in de-DE)
+ *
+ * @param {Number} number
+ * @returns string
+ */
+export const localizedFormatNumber = (number) =>
+  new Intl.NumberFormat(i18next.language).format(number);

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/administration_page.html

@@ -7,9 +7,13 @@
   under the terms of the MIT License; see LICENSE file for more details.
 #}
 
-{%- extends "invenio_theme/page.html" -%}
+{% if base_template|default(false) %}
+  {%- extends base_template %}
+{% else %}
+  {%- extends config.BASE_TEMPLATE %}
+{% endif %}
 
 {%- block css %}
   {{ super()}}
   <link rel="stylesheet" href="/static/css/json-diff-kit.css">
-{%- endblock css %}
+{%- endblock css %}

invenio_app_rdm-14.0.0b2.dev0/invenio_app_rdm/upgrade_scripts/migrate_13_0_to_14_0.py

@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+#
+# Invenio-App-RDM is free software; you can redistribute it and/or modify
+# it under the terms of the MIT License; see LICENSE file for more details.
+
+"""Record migration script from InvenioRDM 13.0 to 14.0.
+
+Disclaimer: This script is intended to be executed *only once*, namely when
+upgrading from InvenioRDM 13.0 to 14.0!
+If this script is executed at any other time, probably the best case scenario
+is that nothing happens!
+
+
+This script has been tested for the following scenarios:
+1. Draft with resource type publication-thesis
+2. Record with resource type publication-thesis with a DOI and no draft
+3. Record with resource type publication-thesis with a no DOI and an existing draft
+4. Records with multiple versions
+"""
+
+import time
+
+from click import secho
+from invenio_access.permissions import system_identity
+from invenio_db import db
+from invenio_drafts_resources.resources.records.errors import DraftNotCreatedError
+from invenio_rdm_records.proxies import current_rdm_records_service as records_service
+from invenio_search.engine import dsl
+
+
+def run_upgrade(has, migrate_record, migrate_draft):
+    """Run upgrade on selected records and drafts.
+
+    Args:
+        has (dsl.Q): Query filter to select records/drafts to update.
+        migrate_record (callable): Function to migrate a record.
+        migrate_draft (callable): Function to migrate a draft.
+    """
+    # Handle published records
+    published_records = records_service.scan(
+        identity=system_identity,
+        params={"allversions": True},
+        extra_filter=has,
+    )
+    for result in published_records.hits:
+        try:
+            migrate_record(result)
+        except Exception as error:
+            secho(f"> Error {repr(error)}", fg="red")
+            error = f"Record {result['id']} failed to update"
+
+    # Handle draft records
+    draft_records = records_service._search(
+        identity=system_identity,
+        action="scan",
+        params={"allversions": True},
+        search_preference=None,
+        record_cls=records_service.draft_cls,
+        search_opts=records_service.config.search_drafts,
+        extra_filter=has,
+        permission_action="read_draft",
+    ).scan()
+    for result in draft_records:
+        try:
+            migrate_draft(result)
+        except Exception as error:
+            secho(f"> Error {repr(error)}", fg="red")
+            error = f"Draft {result['id']} failed to update"
+
+
+def run_update_for_resource_type():
+    """Run update for resource type."""
+
+    def migrate_resource_type_in_record(hit_result):
+        """
+        Update resource type from publication-thesis to publication-dissertation.
+
+        We go through the service layer to automatically trigger the DOI update and re-indexing.
+        """
+        secho(f"Updating resource type for record {hit_result['id']}", fg="yellow")
+        record = records_service.read(system_identity, hit_result["id"])
+        if record.data["metadata"]["resource_type"]["id"] != "publication-thesis":
+            secho(
+                f"Skipping record <{record.id}> because it doesn't have resource-type 'publication-thesis'!",
+                fg="yellow",
+            )
+            return
+
+        try:
+            draft = records_service.read_draft(system_identity, record.id)
+            # Step 1: Update the resource type in the record via low-level API
+            # We need to make sure we don't publish the record with different metadata
+            secho(
+                f"Record <{record.id}> has an existing draft <{draft.id}>! Updating record via low-level API.",
+                fg="yellow",
+            )
+            # Update the record directly without affecting the draft
+            record._record["metadata"]["resource_type"][
+                "id"
+            ] = "publication-dissertation"
+            # Save the record changes and reindex
+            record._record.commit()
+            db.session.commit()
+            records_service.indexer.index(record._record)
+            # Update DOI metadata if record has DOI
+            if hasattr(record, "pids") and record.pids.get("doi", None):
+                records_service.pids.register_or_update(
+                    system_identity, record.id, "doi", parent=False
+                )
+            # Step 2: Update the resource type in the draft
+            secho(f"Updating resource type for draft {draft.id}", fg="yellow")
+            draft.data["metadata"]["resource_type"]["id"] = "publication-dissertation"
+            # After updating the record, update the draft's fork_version_id to match the record's new version_id, to avoid conflicts when publishing
+            draft._record.fork_version_id = record._record.revision_id
+            updated_draft = records_service.update_draft(
+                system_identity, draft.id, draft.data
+            )
+            secho(f"Draft {draft.id} has been updated successfully.", fg="green")
+        except DraftNotCreatedError:
+            # If the draft didn't exist, we simply edit and publish the record
+            draft = records_service.edit(system_identity, record.id)
+            draft.data["metadata"]["resource_type"]["id"] = "publication-dissertation"
+            updated_draft = records_service.update_draft(
+                system_identity, draft.id, draft.data
+            )
+            record = records_service.publish(system_identity, updated_draft.id)
+
+        secho(f"Record <{record.id}> has been updated successfully.", fg="green")
+
+    def migrate_resource_type_in_draft(hit_result):
+        """
+        Update resource type from publication-thesis to publication-dissertation.
+
+        We go through the service layer to automatically trigger the DOI update and re-indexing.
+        """
+        secho(f"Updating resource type for draft {hit_result['id']}", fg="yellow")
+        draft = records_service.edit(system_identity, hit_result["id"])
+        if draft.data["metadata"]["resource_type"]["id"] != "publication-thesis":
+            secho(
+                f"Skipping draft <{draft.id}> because it doesn't have resource-type 'publication-thesis'!",
+                fg="yellow",
+            )
+            return
+
+        draft.data["metadata"]["resource_type"]["id"] = "publication-dissertation"
+        updated_draft = records_service.update_draft(
+            system_identity, draft.id, draft.data
+        )
+        secho(f"Draft <{updated_draft.id}> has been updated successfully.", fg="green")
+
+    # Query records/drafts with resource type publication-thesis
+    has_resource_type = dsl.Q(
+        "query_string", query="metadata.resource_type.id:publication-thesis"
+    )
+
+    secho("Resource type update has started.", fg="green")
+
+    run_upgrade(
+        has_resource_type,
+        migrate_resource_type_in_record,
+        migrate_resource_type_in_draft,
+    )
+
+    secho("Resource type update has finished.", fg="green")
+
+
+def execute_upgrade():
+    """Execute the upgrade from InvenioRDM 13.0 to 14.0.
+
+    Please read the disclaimer on this module before thinking about executing
+    this function!
+    THIS MODULE IS WORK IN PROGRESS, UNTIL official v14 release
+
+    NOTE:
+    since the data upgrade steps are more selective now, the approach how to do
+    it has been changed. now the records/drafts which should be updated are
+    searched by a filter and then the updates are applied to those
+    records/drafts explicitly. this should improve speed and should make it
+    easier to upgrade large instances
+
+    """
+    secho("Starting data migration...", fg="green")
+
+    run_update_for_resource_type()
+
+
+# if the script is executed on its own, perform the upgrade
+if __name__ == "__main__":
+    execute_upgrade()

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/invenio_app_rdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 14.0.0b1.dev5
+Version: 14.0.0b2.dev0
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -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,15 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+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.0b2.dev0}/invenio_app_rdm.egg-info/SOURCES.txt

@@ -499,6 +499,7 @@ invenio_app_rdm/upgrade_scripts/fix_migrated_records_from_8_0_to_9_0.py
 invenio_app_rdm/upgrade_scripts/migrate_10_0_to_11_0.py
 invenio_app_rdm/upgrade_scripts/migrate_11_0_to_12_0.py
 invenio_app_rdm/upgrade_scripts/migrate_12_0_to_13_0.py
+invenio_app_rdm/upgrade_scripts/migrate_13_0_to_14_0.py
 invenio_app_rdm/upgrade_scripts/migrate_1_0_records_to_2_0.py
 invenio_app_rdm/upgrade_scripts/migrate_2_0_to_3_0.py
 invenio_app_rdm/upgrade_scripts/migrate_3_0_to_4_0.py

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/invenio_app_rdm.egg-info/requires.txt

@@ -29,7 +29,7 @@ invenio-previewer<4.0.0,>=3.0.0
 invenio-records-files<2.0.0,>=1.2.1
 invenio-collections<3.0.0,>=1.0.0
 invenio-communities<22.0.0,>=21.0.0
-invenio-rdm-records<22.0.0,>=21.0.0
+invenio-rdm-records<23.0.0,>=22.0.0
 CairoSVG<3.0.0,>=2.5.2
 invenio-banners<6.0.0,>=5.0.0
 invenio-pages<8.0.0,>=7.0.0

{invenio_app_rdm-14.0.0b1.dev5 → invenio_app_rdm-14.0.0b2.dev0}/setup.cfg

@@ -49,7 +49,7 @@ install_requires =
 	invenio-records-files>=1.2.1,<2.0.0
 	invenio-collections>=1.0.0,<3.0.0
 	invenio-communities>=21.0.0,<22.0.0
-	invenio-rdm-records>=21.0.0,<22.0.0
+	invenio-rdm-records>=22.0.0,<23.0.0
 	CairoSVG>=2.5.2,<3.0.0
 	invenio-banners>=5.0.0,<6.0.0
 	invenio-pages>=7.0.0,<8.0.0