invenio-app-rdm 13.0.0b2.dev12__tar.gz → 13.0.0b2.dev14__tar.gz

{invenio_app_rdm-13.0.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/CHANGES.rst

@@ -10,6 +10,15 @@
 Changes
 =======
 
+Version v13.0.0b2.dev14 (released 2025-04-02)
+
+- views: extract `create_url_rule` utility and plan for deprecation
+- communities_ui: make routes + views configurable
+
+Version v13.0.0b2.dev13 (released 2025-03-27)
+
+- checks: add checks tab to requests (fix record ID retrieval with same logic as record)
+
 Version v13.0.0b2.dev12 (released 2025-03-27)
 
 - checks: add checks tab to requests (fix record ID retrieval)

{invenio_app_rdm-13.0.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev12
+Version: 13.0.0b2.dev14
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -97,6 +97,15 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev14 (released 2025-04-02)
+
+- views: extract `create_url_rule` utility and plan for deprecation
+- communities_ui: make routes + views configurable
+
+Version v13.0.0b2.dev13 (released 2025-03-27)
+
+- checks: add checks tab to requests (fix record ID retrieval with same logic as record)
+
 Version v13.0.0b2.dev12 (released 2025-03-27)
 
 - checks: add checks tab to requests (fix record ID retrieval)

{invenio_app_rdm-13.0.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/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.0b2.dev12"
+__version__ = "13.0.0b2.dev14"
 
 __all__ = ("__version__",)

{invenio_app_rdm-13.0.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/invenio_app_rdm/communities_ui/views/ui.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2022 Northwestern University.
 # Copyright (C)      2022 TU Wien.
 # Copyright (C) 2023-2024 Graz University of Technology.
@@ -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.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/invenio_app_rdm/records_ui/views/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2021 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2022 Northwestern University.
 # Copyright (C)      2021 TU Wien.
 #
@@ -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.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/invenio_app_rdm/requests_ui/views/requests.py

@@ -53,9 +53,10 @@ def _resolve_topic_record(request):
     user_owns_request = str(creator_id) == str(current_user.id)
 
     if request["is_closed"] and not user_owns_request:
-        return dict(permissions={}, record_ui=None, record=None)
+        return dict(permissions={}, record_ui=None, record=None, record_uuid=None)
 
     record = None
+    record_uuid = None
     # parse the topic field to get the draft/record pid `record:abcd-efgh`
     entity = ResolverRegistry.resolve_entity_proxy(request["topic"])
     pid = entity._parse_ref_dict_id()
@@ -84,11 +85,15 @@ def _resolve_topic_record(request):
                     break
             # read published record
             record = current_rdm_records_service.read(g.identity, pid, expand=True)
+            record_uuid = current_rdm_records_service.record_cls.pid.resolve(pid).id
         else:
             # read draft
             record = current_rdm_records_service.read_draft(
                 g.identity, pid, expand=True
             )
+            record_uuid = current_rdm_records_service.draft_cls.pid.resolve(
+                pid, registered_only=False
+            ).id
     except (NoResultFound, PIDDoesNotExistError):
         # We catch PIDDoesNotExistError because a published record with
         # a soft-deleted draft will raise this error. The lines below
@@ -98,6 +103,7 @@ def _resolve_topic_record(request):
         try:
             # read published record
             record = current_rdm_records_service.read(g.identity, pid, expand=True)
+            record_uuid = current_rdm_records_service.record_cls.pid.resolve(pid).id
         except NoResultFound:
             # record tab not displayed when the record is not found
             # the request is probably not open anymore
@@ -116,9 +122,14 @@ def _resolve_topic_record(request):
                 "read",
             ]
         )
-        return dict(permissions=permissions, record_ui=record_ui, record=record)
+        return dict(
+            permissions=permissions,
+            record_ui=record_ui,
+            record=record,
+            record_uuid=record_uuid,
+        )
 
-    return dict(permissions={}, record_ui=None, record=None)
+    return dict(permissions={}, record_ui=None, record=None, record_uuid=None)
 
 
 def _resolve_record_or_draft_files(record, request):
@@ -163,7 +174,7 @@ def _resolve_record_or_draft_media_files(record, request):
     return None
 
 
-def _resolve_checks(record, request, community=None):
+def _resolve_checks(record_uuid, request, community=None):
     """Resolve the checks for this draft/record related to the community and the request."""
     # FIXME: Move this logic to invenio-checks
 
@@ -181,6 +192,10 @@ def _resolve_checks(record, request, community=None):
     if not is_draft_submission and not is_record_inclusion:
         return None
 
+    # Early exit if there is no record UUID (for instance for some closed requests)
+    if not record_uuid:
+        return None
+
     # Resolve the target community from the request if the community was not passed as an argument
     if not community:
         community_uuid = request["receiver"]["community"]
@@ -196,15 +211,6 @@ def _resolve_checks(record, request, community=None):
         communities.append(community_parent_id)
     communities.append(community.id)
 
-    # Resolve the record UUID
-    record_pid = record["id"]
-    if is_record_inclusion:
-        record_uuid = current_rdm_records_service.record_cls.pid.resolve(record_pid).id
-    else:
-        record_uuid = current_rdm_records_service.draft_cls.pid.resolve(
-            record_pid, registered_only=False
-        ).id
-
     # Early exit if no check config found for the communities
     from invenio_checks.models import CheckConfig, CheckRun
 
@@ -253,8 +259,9 @@ def user_dashboard_request_view(request, **kwargs):
         topic = _resolve_topic_record(request)
         record_ui = topic["record_ui"]
         record = topic["record"]
+        record_uuid = topic["record_uuid"]
         is_draft = record_ui["is_draft"] if record_ui else False
-        checks = _resolve_checks(record_ui, request)
+        checks = _resolve_checks(record_uuid, request)
 
         files = _resolve_record_or_draft_files(record_ui, request)
         media_files = _resolve_record_or_draft_media_files(record_ui, request)
@@ -332,8 +339,9 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
         topic = _resolve_topic_record(request)
         record_ui = topic["record_ui"]
         record = topic["record"]
+        record_uuid = topic["record_uuid"]
         is_draft = record_ui["is_draft"] if record_ui else False
-        checks = _resolve_checks(record_ui, request, community)
+        checks = _resolve_checks(record_uuid, request, community)
 
         permissions.update(topic["permissions"])
         files = _resolve_record_or_draft_files(record_ui, request)

{invenio_app_rdm-13.0.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/invenio_app_rdm/theme/views.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2020 Northwestern University.
 # Copyright (C)      2021 TU Wien.
 # Copyright (C) 2023-2024 Graz University of Technology.
@@ -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.0b2.dev14/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.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/invenio_app_rdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev12
+Version: 13.0.0b2.dev14
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -97,6 +97,15 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev14 (released 2025-04-02)
+
+- views: extract `create_url_rule` utility and plan for deprecation
+- communities_ui: make routes + views configurable
+
+Version v13.0.0b2.dev13 (released 2025-03-27)
+
+- checks: add checks tab to requests (fix record ID retrieval with same logic as record)
+
 Version v13.0.0b2.dev12 (released 2025-03-27)
 
 - checks: add checks tab to requests (fix record ID retrieval)

{invenio_app_rdm-13.0.0b2.dev12 → invenio_app_rdm-13.0.0b2.dev14}/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