invenio-app-rdm 13.0.0b3.dev2__tar.gz → 13.0.0b3.dev3__tar.gz

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/CHANGES.rst

@@ -10,6 +10,13 @@
 Changes
 =======
 
+Version v13.0.0b3.dev3 (released 2025-04-04)
+
+- fix: Handle undefined record attributes in templates to avoid rendering errors (#2932)
+- communities_ui: make routes + views configurable
+- views: extract create_url_rule utility and plan for deprecation
+
+
 Version v13.0.0b3.dev2 (released 2025-03-29)
 
 - fix: restore messages index.js and remove unused imports

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b3.dev2
+Version: 13.0.0b3.dev3
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -97,6 +97,13 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b3.dev3 (released 2025-04-04)
+
+- fix: Handle undefined record attributes in templates to avoid rendering errors (#2932)
+- communities_ui: make routes + views configurable
+- views: extract create_url_rule utility and plan for deprecation
+
+
 Version v13.0.0b3.dev2 (released 2025-03-29)
 
 - fix: restore messages index.js and remove unused imports

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/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.dev2"
+__version__ = "13.0.0b3.dev3"
 
 __all__ = ("__version__",)

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm/communities_ui/views/ui.py

@@ -9,18 +9,13 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 """Communities UI blueprints module."""
 
-from flask import Blueprint, current_app, render_template, request
-from flask_login import current_user
-from invenio_communities.communities.resources.serializer import (
-    UICommunityJSONSerializer,
-)
+from flask import Blueprint, current_app, request
 from invenio_communities.errors import CommunityDeletedError
 from invenio_communities.views.ui import (
     not_found_error,
     record_permission_denied_error,
     record_tombstone_error,
 )
-from invenio_i18n import lazy_gettext as _
 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 (
@@ -28,6 +23,8 @@ from invenio_records_resources.services.errors import (
     RecordPermissionDeniedError,
 )
 
+from invenio_app_rdm.views import create_url_rule
+
 from ..searchapp import search_app_context
 from .communities import (
     communities_browse,
@@ -58,29 +55,24 @@ def create_ui_blueprint(app):
     )
 
     blueprint.add_url_rule(
-        routes["community-detail"],
-        view_func=communities_detail,
+        **create_url_rule(routes["community-detail"], communities_detail),
         strict_slashes=False,
     )
 
     blueprint.add_url_rule(
-        routes["community-home"],
-        view_func=communities_home,
+        **create_url_rule(routes["community-home"], communities_home)
     )
 
     blueprint.add_url_rule(
-        routes["community-browse"],
-        view_func=communities_browse,
+        **create_url_rule(routes["community-browse"], communities_browse)
     )
 
     blueprint.add_url_rule(
-        routes["community-static-page"],
-        view_func=community_static_page,
+        **create_url_rule(routes["community-static-page"], community_static_page)
     )
 
     blueprint.add_url_rule(
-        routes["community-collection"],
-        view_func=community_collection,
+        **create_url_rule(routes["community-collection"], community_collection)
     )
     # Register error handlers
     blueprint.register_error_handler(

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html

@@ -3,6 +3,7 @@
     Copyright (C) 2020 Northwestern University.
     Copyright (C) 2021 Graz University of Technology.
     Copyright (C) 2021-2022 New York University.
+    Copyright (C) 2025 KTH Royal Institute of Technology.
 
     Invenio RDM Records is free software; you can redistribute it and/or modify
     it under the terms of the MIT License; see LICENSE file for more details.
@@ -15,11 +16,11 @@
     {% for scheme, details in config.APP_RDM_IDENTIFIER_SCHEMES_UI.items() %}
       {% for identifier in creatibutor.person_or_org.identifiers|selectattr("scheme", "equalto", scheme) %}
         {% set identifier_found.value = True %}
-        <a href="{{ identifier.identifier|pid_url(scheme) }}" 
-           aria-label="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}" 
+        <a href="{{ identifier.identifier|pid_url(scheme) }}"
+           aria-label="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}"
            title="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}">
-          <img class="ml-5 inline-id-icon" 
-               src="{{ url_for('static', filename=details.icon) }}" 
+          <img class="ml-5 inline-id-icon"
+               src="{{ url_for('static', filename=details.icon) }}"
                alt="{{ details.label }} icon"/>
         </a>
       {% endfor %}
@@ -39,7 +40,7 @@
 
 
 {% macro show_creatibutors(creatibutors, show_affiliations=False, type="creators", show_role=False) %}
-  {% for creatibutor in creatibutors %}
+  {% for creatibutor in creatibutors if creatibutor.person_or_org and creatibutor.person_or_org.name %}
   <li class="creatibutor-wrap separated">
     <a class="ui creatibutor-link"
       {% if show_affiliations and creatibutor.affiliations %}
@@ -85,11 +86,11 @@
     {% for affiliation in affiliations %}
     <li>
       {{ affiliation[0] }}.
-  
+
       {% if affiliation[2] %}
         {% set scheme, identifier = (affiliation[2].split(':', 1) if ':' in affiliation[2] else ('ror', affiliation[2])) %}
         {% set scheme_config = config.APP_RDM_IDENTIFIER_SCHEMES_UI.get(scheme) %}
-        
+
         {% if scheme_config %}
           <a class="no-text-decoration"
              href="{{ scheme_config.url_prefix + identifier }}"
@@ -103,11 +104,11 @@
           </a>
         {% endif %}
       {% endif %}
-  
+
       {{ affiliation[1] }}
     </li>
   {% endfor %}
-  
+
     </ul>
 </section>
 {% endmacro %}

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html

@@ -1,6 +1,7 @@
 {#
   Copyright (C) 2020-2025 CERN.
   Copyright (C) 2024 Northwestern University.
+  Copyright (C) 2024-2025 KTH Royal Institute of Technology.
 
   Invenio RDM Records is free software; you can redistribute it and/or modify
   it under the terms of the MIT License; see LICENSE file for more details.
@@ -59,18 +60,25 @@
 
 {% macro show_add_descriptions(add_descriptions) %}
   {% for add_description in add_descriptions %}
-    <section id="additional-description-{{ loop.index }}" class="rel-mt-2 rich-input-content"
-             aria-label="{{ _( add_description.type.title_l10n ) }}">
-      <h2>{{ add_description.type.title_l10n }} <span
-        class="text-muted language">{{ '(' + add_description.lang.title_l10n + ')' if add_description.lang }}</span>
+    {% set desc_type_defined = add_description.type is defined %}
+    {% set desc_text = add_description.description|default('') %}
+    <section
+      id="additional-description-{{ loop.index }}"
+      class="rel-mt-2 rich-input-content"
+      aria-label="{{ (add_description.type.title_l10n if desc_type_defined else _('Missing description type!')) }}"
+    >
+      <h2>
+        {{ add_description.type.title_l10n if desc_type_defined else _('Missing description type!') }}
+        <span class="text-muted language">
+          {{ '(' ~ add_description.lang.title_l10n ~ ')' if add_description.lang is defined else '' }}
+        </span>
       </h2>
-
-      {% if add_description.type.id == "notes" %}
+      {% if desc_type_defined and add_description.type.id == "notes" %}
         <div class="ui message warning">
-          {{ add_description.description | sanitize_html() | safe }}
+          {{ desc_text | sanitize_html() | safe }}
         </div>
       {% else %}
-        {{ add_description.description | sanitize_html() | safe }}
+        {{ desc_text | sanitize_html() | safe }}
       {% endif %}
     </section>
   {% endfor %}
@@ -79,10 +87,11 @@
 
 {% macro show_dates(dates) %}
   {% for date in dates %}
-    <dt class="ui tiny header">{{ date.type.title_l10n }}</dt>
+    {% set date_type_title = date.get('type', {}).get('title_l10n', _('Unknown date type')) %}
+    <dt class="ui tiny header">{{ date_type_title }}</dt>
     <dd>
-      <div>{{ date.date }}</div>
-      <div class="text-muted">{{ date.description }}</div>
+      <div>{{ date.date|default('') }}</div>
+      <div class="text-muted">{{ date.description|default('') }}</div>
     </dd>
   {% endfor %}
 {% endmacro %}
@@ -103,7 +112,7 @@
       {% if item.award.acronym %}
         {{ item.award.acronym }} –
       {% endif %}
-      
+
       {%- if item.award.title_l10n -%}
         {{ item.award.title_l10n }}
       {%- endif -%}
@@ -130,15 +139,13 @@
 {% macro show_references(references) %}
   <ul class="ui bulleted list details-list">
     {% for reference in references %}
-      {% set reference_string = reference.reference %}
-      {% if 'identifier' in reference %}
-        {% if 'scheme' in reference %}
+      {% set reference_string = reference.reference|default('') %}
+      {% if reference.get('identifier') %}
+        {% if reference.scheme is defined and reference.scheme %}
           {% set reference_scheme = reference.scheme | get_scheme_label %}
-          {% set reference_string = reference_string + ' ( ' + reference_scheme +
-          ' - ' + reference.identifier + ' )' %}
+          {% set reference_string = reference_string ~ ' (' ~ reference_scheme ~ ' - ' ~ reference.identifier ~ ')' %}
         {% else %}
-          {% set reference_string = reference_string + ' ( ' + reference.identifier +
-          ' )' %}
+          {% set reference_string = reference_string ~ ' (' ~ reference.identifier ~ ')' %}
         {% endif %}
       {% endif %}
       <li class="item">{{ reference_string | urlize }}</li>
@@ -150,20 +157,23 @@
 {% macro _identifiers_for_group(related_identifiers) %}
   {% for identifier in related_identifiers %}
     <dd>
-      {% if identifier.resource_type is defined %}
+      {% if identifier.resource_type is defined and identifier.resource_type.title_l10n is defined %}
         {{ identifier.resource_type.title_l10n }}:
       {% endif %}
 
-      {% set url = identifier.identifier|pid_url %}
+      {% set ident_val = identifier.identifier|default('') %}
+      {% set url = ident_val|pid_url %}
       {% if url %}
         <a href="{{ url }}" target="_blank" title="{{ _('Opens in new tab') }}">
-          {{ identifier.identifier }}
+          {{ ident_val }}
         </a>
       {% else %}
-        {{ identifier.identifier }}
+        {{ ident_val }}
       {% endif %}
 
-      {{ ' (' + identifier.scheme | get_scheme_label + ')' }}
+      {% if identifier.scheme is defined and identifier.scheme %}
+        {{ ' (' ~ (identifier.scheme|get_scheme_label) ~ ')' }}
+      {% endif %}
     </dd>
   {% endfor %}
 {% endmacro %}
@@ -171,7 +181,7 @@
 
 {% macro show_related_identifiers(related_identifiers) %}
   <dl class="details-list">
-    {%- for group in related_identifiers | groupby('relation_type.title_l10n') %}
+    {%- for group in (related_identifiers|selectattr("relation_type","defined")|list) | groupby('relation_type.title_l10n') %}
       <dt class="ui tiny header">{{ group.grouper }}</dt>
       {{ _identifiers_for_group(group.list) }}
     {%- endfor %}

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm/records_ui/views/__init__.py

@@ -23,7 +23,8 @@ from invenio_records_resources.services.errors import (
     RecordPermissionDeniedError,
 )
 
-from ...theme.views import create_url_rule
+from invenio_app_rdm.views import create_url_rule
+
 from ..searchapp import search_app_context
 from .deposits import community_upload, deposit_create, deposit_edit
 from .filters import (

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm/theme/views.py

@@ -19,15 +19,7 @@ from invenio_i18n import lazy_gettext as _
 from invenio_pages.views import create_page_view
 from invenio_users_resources.forms import NotificationsForm
 
-
-def create_url_rule(rule, default_view_func):
-    """Generate rule from string or tuple."""
-    if isinstance(rule, tuple):
-        path, view_func = rule
-
-        return {"rule": path, "view_func": view_func}
-    else:
-        return {"rule": rule, "view_func": default_view_func}
+from invenio_app_rdm.views import create_url_rule
 
 
 #

invenio_app_rdm-13.0.0b3.dev3/invenio_app_rdm/views.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2019-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.
+
+"""General views and view utilities."""
+
+
+def create_url_rule(rule, default_view_func):
+    """Generate rule from string or tuple."""
+    # TODO: We want to deprecate the use of this kind of "string or 2-tuple" config
+    #       values, and directly use dictionaries that map exactly to the parameters
+    #       that `Blueprint.add_url_rule(...)` accepts, with some sane defaults.
+    if isinstance(rule, tuple):
+        path, view_func = rule
+
+        return {"rule": path, "view_func": view_func}
+    else:
+        return {"rule": rule, "view_func": default_view_func}

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b3.dev2
+Version: 13.0.0b3.dev3
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -97,6 +97,13 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b3.dev3 (released 2025-04-04)
+
+- fix: Handle undefined record attributes in templates to avoid rendering errors (#2932)
+- communities_ui: make routes + views configurable
+- views: extract create_url_rule utility and plan for deprecation
+
+
 Version v13.0.0b3.dev2 (released 2025-03-29)
 
 - fix: restore messages index.js and remove unused imports

{invenio_app_rdm-13.0.0b3.dev2 → invenio_app_rdm-13.0.0b3.dev3}/invenio_app_rdm.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ invenio_app_rdm/config.py
 invenio_app_rdm/ext.py
 invenio_app_rdm/tasks.py
 invenio_app_rdm/urls.py
+invenio_app_rdm/views.py
 invenio_app_rdm.egg-info/PKG-INFO
 invenio_app_rdm.egg-info/SOURCES.txt
 invenio_app_rdm.egg-info/dependency_links.txt