invenio-app-rdm 13.0.0b3.dev16__tar.gz → 13.0.0b3.dev18__tar.gz

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/CHANGES.rst

@@ -10,7 +10,17 @@
 Changes
 =======
 
-Versino v13.0.0b3.dev16 (released 2025-05-23)
+Version v13.0.0b3.dev18 (released 2025-06-02)
+
+- installation: add collections dependency
+- views: rename record_ui correctly
+
+Version v13.0.0b3.dev17 (released 2025-06-02)
+
+- Move collections implementaiton to Invenio-Collections
+- Integrate Invenio-Sitemap
+
+Version v13.0.0b3.dev16 (released 2025-05-23)
 
 - administration: audit_logs: Add View Changes and View Log button and modals
 

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b3.dev16
+Version: 13.0.0b3.dev18
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -40,16 +40,19 @@ Requires-Dist: invenio-search-ui<5.0.0,>=4.0.0
 Requires-Dist: invenio-files-rest<4.0.0,>=3.0.0
 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<1.0.0,>=0.4.0
 Requires-Dist: invenio-communities<19.0.0,>=18.2.0
-Requires-Dist: invenio-rdm-records<19.0.0,>=18.4.0
+Requires-Dist: invenio-rdm-records<19.0.0,>=18.14.0
 Requires-Dist: CairoSVG<3.0.0,>=2.5.2
 Requires-Dist: invenio-banners<5.0.0,>=4.0.0
 Requires-Dist: invenio-pages<6.0.0,>=5.0.0
 Requires-Dist: invenio-audit-logs<1.0.0,>=0.1.0
+Requires-Dist: invenio-sitemap<2.0.0,>=0.1.0
 Provides-Extra: tests
 Requires-Dist: pytest-black-ng>=0.4.0; extra == "tests"
 Requires-Dist: pytest-invenio<4.0.0,>=3.3.0; extra == "tests"
 Requires-Dist: Sphinx>=4.5.0; extra == "tests"
+Requires-Dist: time-machine<3.0.0,>=2.12.0; extra == "tests"
 Provides-Extra: elasticsearch7
 Requires-Dist: invenio-search[elasticsearch7]<4.0.0,>=3.0.0; extra == "elasticsearch7"
 Provides-Extra: opensearch1
@@ -98,7 +101,17 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
-Versino v13.0.0b3.dev16 (released 2025-05-23)
+Version v13.0.0b3.dev18 (released 2025-06-02)
+
+- installation: add collections dependency
+- views: rename record_ui correctly
+
+Version v13.0.0b3.dev17 (released 2025-06-02)
+
+- Move collections implementaiton to Invenio-Collections
+- Integrate Invenio-Sitemap
+
+Version v13.0.0b3.dev16 (released 2025-05-23)
 
 - administration: audit_logs: Add View Changes and View Log button and modals
 

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/__init__.py

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

invenio_app_rdm-13.0.0b3.dev18/invenio_app_rdm/communities_ui/sitemap.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+# Copyright (C) 2025 Northwestern University.
+#
+# 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.
+
+"""Community sitemap content."""
+
+from invenio_base import invenio_url_for
+from invenio_communities.proxies import current_communities
+from invenio_search.api import RecordsSearchV2
+from invenio_sitemap import SitemapSection, format_to_w3c
+
+
+class SitemapSectionOfCommunities(SitemapSection):
+    """Defines the Sitemap entries for Communities."""
+
+    def iter_entities(self):
+        """Iterate over objects."""
+        communities_scan = (
+            RecordsSearchV2(index=current_communities.service.record_cls.index._name)
+            .filter("term", **{"access.visibility": "public"})
+            .filter("term", deletion_status="P")
+            .sort("-updated")
+            # Using preserve_order is fine.
+            # Using Point in Time is a recommended alternative but not
+            # particularly better than this one for our needs. See
+            # https://opensearch.org/docs/latest/search-plugins/searching-data/point-in-time/
+            .params(preserve_order=True)
+            # In keeping with original: only page is looked for
+            # (curation policy is not most relevant)
+            .source(["slug", "updated", "metadata.page"])
+            .scan()
+        )
+
+        for community in communities_scan:
+            yield {
+                "slug": community.slug,
+                "updated": community.updated,
+                "loc": invenio_url_for(
+                    "invenio_app_rdm_communities.communities_detail",
+                    pid_value=community.slug,
+                ),
+            }
+
+            if "page" in community.get("metadata", {}):
+                yield {
+                    "slug": community.slug,
+                    "updated": community.updated,
+                    "loc": invenio_url_for(
+                        "invenio_communities.communities_about",
+                        pid_value=community.slug,
+                    ),
+                }
+
+    def to_dict(self, entity):
+        """To dict used in sitemap."""
+        return {
+            "loc": entity["loc"],
+            "lastmod": format_to_w3c(entity["updated"]),
+        }

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/communities_ui/views/communities.py

@@ -9,6 +9,12 @@
 """Request views module."""
 
 from flask import abort, g, redirect, request, url_for
+from invenio_collections.errors import (
+    CollectionNotFound,
+    CollectionTreeNotFound,
+    LogoNotFoundError,
+)
+from invenio_collections.proxies import current_collections
 from invenio_communities.views.communities import (
     HEADER_PERMISSIONS,
     _get_roles_can_invite,
@@ -18,11 +24,6 @@ from invenio_communities.views.communities import (
 from invenio_communities.views.decorators import pass_community
 from invenio_pages.proxies import current_pages_service
 from invenio_pages.records.errors import PageNotFoundError
-from invenio_rdm_records.collections import (
-    CollectionNotFound,
-    CollectionTreeNotFound,
-    LogoNotFoundError,
-)
 from invenio_rdm_records.proxies import (
     current_community_records_service,
     current_rdm_records,
@@ -54,7 +55,7 @@ def communities_detail(pid_value, community, community_ui):
 def communities_home(pid_value, community, community_ui):
     """Community home page."""
     query_params = request.args
-    collections_service = current_rdm_records.collections_service
+    collections_service = current_collections.service
     permissions = community.has_permissions_to(HEADER_PERMISSIONS)
     if not permissions["can_read"]:
         raise PermissionDeniedError()
@@ -124,7 +125,7 @@ def communities_browse(pid_value, community, community_ui):
     """Community browse page."""
     permissions = community.has_permissions_to(HEADER_PERMISSIONS)
 
-    collections_service = current_rdm_records.collections_service
+    collections_service = current_collections.service
 
     trees_ui = collections_service.list_trees(
         g.identity, community_id=community.id, depth=2
@@ -167,7 +168,7 @@ def community_collection(
     community, community_ui, pid_value, tree_slug=None, collection_slug=None
 ):
     """Render a community collection page."""
-    collections_service = current_rdm_records.collections_service
+    collections_service = current_collections.service
     try:
         collection = collections_service.read(
             identity=g.identity,

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/communities_ui/views/ui.py

@@ -10,6 +10,7 @@
 """Communities UI blueprints module."""
 
 from flask import Blueprint, current_app, request
+from invenio_collections.searchapp import search_app_context as c_search_app_context
 from invenio_communities.errors import CommunityDeletedError
 from invenio_communities.views.ui import (
     not_found_error,
@@ -17,7 +18,6 @@ from invenio_communities.views.ui import (
     record_tombstone_error,
 )
 from invenio_pidstore.errors import PIDDeletedError, PIDDoesNotExistError
-from invenio_rdm_records.collections import search_app_context as c_search_app_context
 from invenio_records_resources.services.errors import (
     PermissionDeniedError,
     RecordPermissionDeniedError,

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/config.py

@@ -167,6 +167,8 @@ from invenio_vocabularies.contrib.subjects.datastreams import (
 )
 from werkzeug.local import LocalProxy
 
+from .communities_ui.sitemap import SitemapSectionOfCommunities
+from .records_ui.sitemap import SitemapSectionOfRDMRecords
 from .theme.views import notification_settings
 from .users.schemas import NotificationsUserSchema, UserPreferencesNotificationsSchema
 
@@ -485,6 +487,10 @@ CELERY_BEAT_SCHEDULE = {
         "task": "invenio_jobs.logging.tasks.delete_logs",
         "schedule": crontab(minute=5, hour=0),
     },
+    "update_sitemap": {
+        "task": "invenio_sitemap.tasks.update_sitemap_cache",
+        "schedule": crontab(minute=0, hour=2),
+    },
 }
 """Scheduled tasks configuration (aka cronjobs)."""
 
@@ -1479,3 +1485,11 @@ APP_RDM_SUBCOMMUNITIES_LABEL = "Subcommunities"
 
 RDM_DETAIL_SIDE_BAR_MANAGE_ATTRIBUTES_EXTENSION_TEMPLATE = None
 """Side bar manage attributes extension template."""
+
+# Invenio-Sitemap
+# ===============
+# See https://github.com/inveniosoftware/invenio-sitemap/blob/master/invenio_sitemap/config.py  # noqa
+SITEMAP_SECTIONS = [
+    SitemapSectionOfRDMRecords(),
+    SitemapSectionOfCommunities(),
+]

invenio_app_rdm-13.0.0b3.dev18/invenio_app_rdm/records_ui/sitemap.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 CERN.
+# Copyright (C) 2025 Northwestern University.
+#
+# 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.
+
+"""RDMRecords sitemap content."""
+
+from invenio_base import invenio_url_for
+from invenio_rdm_records.proxies import current_rdm_records_service
+from invenio_search.api import RecordsSearchV2
+from invenio_sitemap import SitemapSection, format_to_w3c
+
+
+class SitemapSectionOfRDMRecords(SitemapSection):
+    """Defines the Sitemap entries for Records."""
+
+    def iter_entities(self):
+        """Iterate over objects."""
+        records_scan = (
+            RecordsSearchV2(index=current_rdm_records_service.record_cls.index._name)
+            .filter("term", **{"access.record": "public"})
+            .filter("term", deletion_status="P")
+            .sort("-updated")
+            # Using preserve_order is fine.
+            # Using Point in Time is a recommended alternative but not
+            # particularly better than this one for our needs. See
+            # https://opensearch.org/docs/latest/search-plugins/searching-data/point-in-time/
+            .params(preserve_order=True)
+            .source(["id", "updated"])
+            .scan()
+        )
+        return records_scan
+
+    def to_dict(self, entity):
+        """To dict used in sitemap."""
+        return {
+            "loc": invenio_url_for(
+                "invenio_app_rdm_records.record_detail", pid_value=entity["id"]
+            ),
+            "lastmod": format_to_w3c(entity["updated"]),
+        }

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/detail.html

@@ -23,8 +23,8 @@
 
 {%- from "invenio_app_rdm/records/macros/files.html" import file_list_box, preview_file_box, media_file_list_box %}
 
-{%- set title = record.metadata.title %}
-{%- set metadata = record.metadata %}
+{%- set title = record_ui["metadata"]["title"] %}
+{%- set metadata = record_ui["metadata"] %}
 
 {%- set can_curate_record = permissions is defined and (permissions.can_edit or permissions.can_review) %}
 
@@ -32,9 +32,9 @@
 {%- set is_preview_submission_request = preview_submission_request or false %}
 {%- set show_record_management_menu = can_curate_record and (not is_preview or is_preview_submission_request) %}
 
-{%- if record.parent.access.settings %}
-  {%- set allow_user_requests = not current_user.is_anonymous and record.parent.access.settings.allow_user_requests %}
-  {%- set allow_guest_requests = current_user.is_anonymous and record.parent.access.settings.allow_guest_requests %}
+{%- if record_ui["parent"]["access"]["settings"] %}
+  {%- set allow_user_requests = not current_user.is_anonymous and record_ui["parent"]["access"]["settings"]["allow_user_requests"] %}
+  {%- set allow_guest_requests = current_user.is_anonymous and record_ui["parent"]["access"]["settings"]["allow_guest_requests"] %}
 {%- endif %}
 
 {%- block head_meta %}
@@ -49,7 +49,6 @@
 
 {%- block page_body %}
   <section id="banners" class="banners" aria-label="{{ _('Information banner') }}">
-
     <!-- COMMUNITY HEADER: hide it when displaying the submission request -->
     {% if not is_preview_submission_request %}
       {% if community %}
@@ -114,11 +113,11 @@
           <p>
             {% if not is_draft %}
               {{ _("You are previewing a published record.") }}
-            {% elif record.is_published %}
+            {% elif record_ui["is_published"] %}
               {{ _("You are previewing changes that have not yet been published.") }}
-            {% elif not record.is_published and record.versions.index == 1 %}
+            {% elif not record_ui["is_published"] and record_ui["versions"]["index"] == 1 %}
               {{ _("You are previewing a new record that has not yet been published.") }}
-            {% elif not record.is_published and record.versions.index > 1 %}
+            {% elif not record_ui["is_published"] and record_ui["versions"]["index"] > 1 %}
               {{ _("You are previewing a new record version that has not yet been published.") }}
             {% endif %}
           </p>
@@ -127,14 +126,14 @@
     {% endif %}
     <!-- /PREVIEW HEADER -->
 
-    {% if record.is_published and record.links.latest_html and not record.versions.is_latest %}
+    {% if record_ui["is_published"] and record_ui["links"]["latest_html"] and not record_ui["versions"]["is_latest"] %}
       <div class="ui warning flashed bottom attached manage message">
         <div class="ui container">
           <div class="ui relaxed grid">
             <div class="column">
               <div class="row">
                 <p>
-                  {% trans link_start=('<a href="' + record.links.latest_html + '"><b>')|safe, link_end='</b></a>'|safe %}
+                  {% trans link_start=('<a href="' + record_ui["links"]["latest_html"] + '"><b>')|safe, link_end='</b></a>'|safe %}
                     There is a {{ link_start }}newer version{{ link_end }} of the record
                     available.
                   {% endtrans %}
@@ -155,17 +154,17 @@
         {# Main content #}
         <article
           class="sixteen wide tablet eleven wide computer column main-record-content">
-          {% if record.access.record == 'restricted' %}
+          {% if record_ui["access"]["record"] == 'restricted' %}
             <section id="record-access-status"
-                     class="ui {{ record.ui.access_status.message_class }} message rel-mt-1"
+                     class="ui {{ record_ui["ui"]["access_status"]["message_class"] }} message rel-mt-1"
                      aria-label="{{ _('Record access information') }}"
             >
-              <i class="{{ record.ui.access_status.icon }} icon" aria-hidden="true"></i>
-              <strong>{{ record.ui.access_status.title_l10n }}</strong>
-              {{ record.ui.access_status.description_l10n }}
+              <i class="{{ record_ui["ui"]["access_status"]["icon"] }} icon" aria-hidden="true"></i>
+              <strong>{{ record_ui["ui"]["access_status"]["title_l10n"] }}</strong>
+              {{ record_ui["ui"]["access_status"]["description_l10n"] }}
 
-              {% if record.access.embargo.reason %}
-                <p>{{ _("Reason") }}: {{ record.access.embargo.reason }}</p>
+              {% if record_ui["access"]["embargo"]["reason"] %}
+                <p>{{ _("Reason") }}: {{ record_ui["access"]["embargo"]["reason"] }}</p>
               {% endif %}
             </section>
           {% endif %}
@@ -179,7 +178,7 @@
                 {% if is_preview and not is_preview_submission_request and can_curate_record and is_draft %}
                   <nav class="back-navigation rel-pb-2 pl-0"
                        aria-label="{{ _('Back-navigation') }}">
-                    {%- set back_page = url_for('invenio_app_rdm_records.deposit_edit', pid_value=record.id) -%}
+                    {%- set back_page = url_for('invenio_app_rdm_records.deposit_edit', pid_value=record_ui.id) -%}
                     {%- set back_btn_label = _('Back to edit') -%}
                     <a class="ui button labeled icon small compact"
                        href="{{ back_page }}">
@@ -204,7 +203,7 @@
                   <div id="recordManagementMobile"
                        role="dialog"
                        class="ui flowing popup transition hidden"
-                       data-record='{{ record | tojson }}'
+                       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 %}
@@ -221,35 +220,35 @@
                   <div class="two column row">
                     <div class="left floated left aligned column">
                       <span class="ui" title="{{ _('Publication date') }}">
-                        {{ _('Published') }} {{ record.ui.publication_date_l10n_long }}
+                        {{ _('Published') }} {{ record_ui["ui"]["publication_date_l10n_long"] }}
                       </span>
                       <span
-                        class="label text-muted"> | {{ _('Version {version_number}').format(version_number=record.ui.version) }}</span>
+                        class="label text-muted"> | {{ _('Version {version_number}').format(version_number=record_ui["ui"]["version"]) }}</span>
                     </div>
                     <div class="right floated right aligned column">
 
-                      {% if record.ui.resource_type %}
+                      {% if record_ui["ui"]["resource_type"] %}
                         <span role="note"
                               class="ui label horizontal small neutral mb-5"
                               aria-label="{{ _('Resource type') }}"
                         >
-                          {{ record.ui.resource_type.title_l10n }}
+                          {{ record_ui["ui"]["resource_type"]["title_l10n"] }}
                         </span>
                       {% endif %}
 
                       <span role="note"
-                            class="ui label horizontal small access-status {{ record.ui.access_status.id }} mb-5"
-                            data-tooltip="{{ record.ui.access_status.description_l10n }}"
+                            class="ui label horizontal small access-status {{ record_ui["ui"]["access_status"]["id"] }} mb-5"
+                            data-tooltip="{{ record_ui["ui"]["access_status"]["description_l10n"] }}"
                             data-inverted=""
                             aria-label="{{ _('Access status') }}"
                       >
-                        {% if record.ui.access_status.icon %}
-                          <i class="icon {{ record.ui.access_status.icon }}"
+                        {% if record_ui["ui"]["access_status"]["icon"] %}
+                          <i class="icon {{ record_ui["ui"]["access_status"]["icon"] }}"
                              aria-hidden="true"></i>
                         {% endif %}
                         <span
-                          aria-label="{{ record.ui.access_status.description_l10n }}">
-                          {{ record.ui.access_status.title_l10n }}
+                          aria-label="{{ record_ui["ui"]["access_status"]["description_l10n"] }}">
+                          {{ record_ui["ui"]["access_status"]["title_l10n"] }}
                         </span>
                       </span>
                     </div>
@@ -267,7 +266,7 @@
                 <h1 id="record-title"
                     class="wrap-overflowing-text">{{ metadata.title }}</h1>
 
-                {% if record.ui.creators or record.ui.contributors %}
+                {% if record_ui["ui"]["creators"] or record_ui["ui"]["contributors"] %}
                   <section id="creatibutors"
                            aria-label="{{ _('Creators and contributors') }}">
                     {%- include "invenio_app_rdm/records/details/creatibutors.html" %}
@@ -284,7 +283,7 @@
             {# Files #}
             {%- block record_files -%}
               {# record has files BUT passed files are empty. This happens when we display are request. #}
-              {%- if record.files.enabled -%}
+              {%- if record_ui["files"]["enabled"] -%}
                 <section id="record-files" class="rel-mt-2 rel-mb-3"
                          aria-label="{{ _('Files') }}">
                   {%- if permissions.can_read_files -%}
@@ -293,18 +292,18 @@
                     {%- if files|length > 0 -%}
                       <h2 id="files-heading">{{ _('Files') }}</h2>
                       {%- if files|has_previewable_files -%}
-                        {%-set preview_file = files|select_preview_file(default_preview=record.files.default_preview) %}
-                        {{ preview_file_box(preview_file, record.id, is_preview, record, include_deleted) }}
+                        {%-set preview_file = files|select_preview_file(default_preview=record_ui["files"]["default_preview"]) %}
+                        {{ preview_file_box(preview_file, record_ui["id"], is_preview, record, include_deleted) }}
                       {%- endif -%}
-                      {{ file_list_box(files, record.id, is_preview, include_deleted, record, permissions) }}
+                      {{ file_list_box(files, record_ui["id"], is_preview, include_deleted, record, permissions) }}
                     {% endif %}
                   {% else %}
                     {# record has files BUT user does not have permission to see files #}
                     <div
-                      class="ui accordion panel mb-10 {{ record.ui.access_status.id }}"
+                      class="ui accordion panel mb-10 {{ record_ui["ui"]["access_status"]["id"] }}"
                       href="#files-preview-accordion-panel">
                       <h3
-                        class="active title panel-heading {{ record.ui.access_status.id }} m-0">
+                        class="active title panel-heading {{ record_ui["ui"]["access_status"]["id"] }} m-0">
                         <div role="button" id="files-preview-accordion-trigger"
                              tabindex="0" class="trigger"
                              aria-controls="files-preview-accordion-panel">
@@ -316,15 +315,15 @@
                            aria-labelledby="files-preview-accordion-trigger"
                            class="active content preview-container pt-0">
                         <div
-                          class="ui {{ record.ui.access_status.message_class }} message file-box-message rel-pl-1 rel-pr-1">
-                          <i class="ui {{ record.ui.access_status.icon }} icon"
+                          class="ui {{ record_ui["ui"]["access_status"]["message_class"] }} message file-box-message rel-pl-1 rel-pr-1">
+                          <i class="ui {{ record_ui["ui"]["access_status"]["icon"] }} icon"
                              aria-hidden="true"></i>
                           <h4
-                            class="inline">{{ record.ui.access_status.title_l10n }}</h4>
-                          <p>{{ record.ui.access_status.description_l10n }}</p>
+                            class="inline">{{ record_ui["ui"]["access_status"]["title_l10n"] }}</h4>
+                          <p>{{ record_ui["ui"]["access_status"]["description_l10n"] }}</p>
 
-                          {% if record.access.embargo.reason %}
-                            <p>{{ _("Reason") }}: {{ record.access.embargo.reason }}</p>
+                          {% if record_ui["access"]["embargo"]["reason"] %}
+                            <p>{{ _("Reason") }}: {{ record_ui["access"]["embargo"]["reason"] }}</p>
                           {% endif %}
 
                           {% block record_files_access_request %}
@@ -334,8 +333,8 @@
                               <p>
                                 {{ _("If you would like to request access to these files, please fill out the form below.") }}
                               </p>
-                              {%- if record.parent.access.settings %}
-                                {%- set accept_conditions_text = record.parent.access.settings.accept_conditions_text %}
+                              {%- if record_ui["parent"]["access"]["settings"] %}
+                                {%- set accept_conditions_text = record_ui["parent"]["access"]["settings"]["accept_conditions_text"] %}
                               {%- endif %}
 
                               {%- if accept_conditions_text %}
@@ -368,7 +367,7 @@
                   <section id="record-media-files" aria-label="{{ _('System files') }}">
                     {%- set media_files = media_files | order_entries | selectattr("status", "==", "completed") | list %}
                     {%- if media_files|length > 0 -%}
-                      {{ media_file_list_box(media_files, record.id, is_preview, include_deleted, record, permissions) }}
+                      {{ media_file_list_box(media_files, record_ui["id"], is_preview, include_deleted, record, permissions) }}
                     {%- endif %}
                   </section>
                 {%- endif %}
@@ -431,7 +430,7 @@
     {% include config.THEME_JAVASCRIPT_TEMPLATE %}
   {% endif %}
   {%- block record_jsonld %}
-    {% set jsonld_serialization = record | transform_record('SchemaorgJSONLDSerializer', throws=False) %}
+    {% set jsonld_serialization = record_ui | transform_record('SchemaorgJSONLDSerializer', throws=False) %}
     {%- if jsonld_serialization %}
       <script type='application/ld+json'>{{ jsonld_serialization | tojson }}</script>
     {%- endif %}

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/access-form.html

@@ -33,7 +33,7 @@
     </div>
   {% endif %}
   <div id="access-request-form-root"
-       data-record='{{ record | tojson }}'
+       data-record='{{ record_ui | tojson }}'
        data-user-anonymous='{{ current_user.is_anonymous | tojson }}'
        data-user-full-name='{{ full_name | tojson }}'
        data-user-email='{{ email | tojson }}'>

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/citation.html

@@ -7,7 +7,7 @@
     it under the terms of the MIT License; see LICENSE file for more details.
 #}
 
-<div id="recordCitation" data-record='{{ record | tojson }}'
+<div id="recordCitation" data-record='{{ record_ui | tojson }}'
   data-styles='{{ config.get("RDM_CITATION_STYLES") | tojson }}'
   data-defaultstyle='{{ config.get("RDM_CITATION_STYLES_DEFAULT") | tojson }}'
   data-include-deleted='{{ include_deleted | tojson }}'>

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/creatibutors.html

@@ -10,29 +10,29 @@
 {%- from "invenio_app_rdm/records/macros/creatibutors.html" import affiliations_accordion, show_creatibutors %}
 
 <div class="ui grid">
-  {% if record.ui.creators and record.ui.creators.creators %}
+  {% 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>
           <ul class="creatibutors">
-            {{ show_creatibutors(record.ui.creators.creators, show_affiliations=True, show_role=True) }}
+            {{ show_creatibutors(record_ui["ui"]["creators"]["creators"], show_affiliations=True, show_role=True) }}
           </ul>
       </div>
 
         {# Todo: get full list of all affiliations (both creators & contributors) e.g.
-        record.ui.affiliation and merge to one accordion #}
-        {% if record.ui.creators and record.ui.creators.affiliations %}
-          {{ affiliations_accordion('creators', record.ui.creators.affiliations)}}
+        record_ui["ui"]["affiliation"] and merge to one accordion #}
+        {% if record_ui["ui"]["creators"] and record_ui["ui"]["creators"]["affiliations"] %}
+          {{ affiliations_accordion('creators', record_ui["ui"]["creators"]["affiliations"])}}
         {% endif %}
 
     </div>
   {% endif %}
 
-  {% if record.ui.contributors and record.ui.contributors.contributors %}
+  {% if record_ui["ui"]["contributors"] and record_ui["ui"]["contributors"]["contributors"] %}
     <div class="row ui accordion affiliations">
       <div class="sixteen wide mobile twelve wide tablet thirteen wide computer column">
           <h3>{{ _('Contributors') }}</h3>
-          {%- for group in record.ui.contributors.contributors|groupby('role.title')%}
+          {%- for group in record_ui["ui"]["contributors"]["contributors"]|groupby('role.title')%}
           <div>
             <h3 class="creatibutors-header ui small header">{{group.grouper}}{%- if group.list|length > 1 -%}s{%- endif -%}:</h3>
             <ul class="creatibutors">
@@ -42,8 +42,8 @@
           {%- endfor %}
       </div>
 
-      {% if record.ui.contributors and record.ui.contributors.affiliations %}
-        {{ affiliations_accordion('contributors', record.ui.contributors.affiliations)}}
+      {% if record_ui["ui"]["contributors"] and record_ui["ui"]["contributors"]["affiliations"] %}
+        {{ affiliations_accordion('contributors', record_ui["ui"]["contributors"]["affiliations"])}}
       {% endif %}
 
     </div>

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev18}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/description.html

@@ -20,4 +20,4 @@
   </section>
 {% endif %}
 
-{{ show_add_descriptions(record.ui.additional_descriptions) if record.ui.additional_descriptions }}
+{{ show_add_descriptions(record_ui["ui"]["additional_descriptions"]) if record_ui["ui"]["additional_descriptions"] }}