invenio-app-rdm 13.0.0b2.dev12__py2.py3-none-any.whl → 13.0.0b2.dev14__py2.py3-none-any.whl

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/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/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/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/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/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.dist-info → invenio_app_rdm-13.0.0b2.dev14.dist-info}/METADATA

@@ -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.dist-info → invenio_app_rdm-13.0.0b2.dev14.dist-info}/RECORD

@@ -1,9 +1,10 @@
-invenio_app_rdm/__init__.py,sha256=XetAYGL6hzOpgJS2Rwnou7awFxcglRdgtV7Lpxx7Luo,700
+invenio_app_rdm/__init__.py,sha256=bgblKvo6WIigUQCg4pKhZFqNnXFu8bDJ9Layy7cP0-8,700
 invenio_app_rdm/cli.py,sha256=G6QqNU2W6n6ICtTMnpeKFXIsdorncDmVXwwwsGH5F2k,2746
 invenio_app_rdm/config.py,sha256=aQHeG7QxiKx01eDi1Xo7hsOfyAfe_yb8SNrq-CDOYag,50448
 invenio_app_rdm/ext.py,sha256=PkZhATGJDgYqBJQh41NdvBZWR83mgI3Eej6rj10UVJE,5278
 invenio_app_rdm/tasks.py,sha256=FyrIQXVuPjms-dNEnLrVmmdwrX_IykJ87gcSNgOR6O0,1373
 invenio_app_rdm/urls.py,sha256=8S95QSs4yS0rtORsd4veo--rF3LSLwZenoowJ5ubbmM,2496
+invenio_app_rdm/views.py,sha256=SDr9NwZEWQcgT_3GFRYdDf6eUaK9DfnoafIkhUf9nSI,785
 invenio_app_rdm/administration/__init__.py,sha256=8r9LeoE9fNHZSVS5QsCfVhRU7MAiEOWJk9MA3Y--4F8,251
 invenio_app_rdm/administration/domains/__init__.py,sha256=Qob5kqjRPxpuSE5yDV2tesN6tmaKp5JcxCxGA8Mrcak,487
 invenio_app_rdm/administration/domains/domains.py,sha256=vafLa-mqkg_tQLjx328E64P_4mksB5kjBlsfunvdatg,5599
@@ -29,7 +30,7 @@ invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/details
 invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/records/index.html,sha256=5Ub4uyVsjjTHzbhNe8Y-AAZG5oI28wZs2jQXvSPofXw,700
 invenio_app_rdm/communities_ui/views/__init__.py,sha256=HsbOWjDobxXGx6WFlTn45JYr0V9yqjCpDXOR_i2wmtw,401
 invenio_app_rdm/communities_ui/views/communities.py,sha256=t7qDZ8CiEwT9lB9B9_nS7IJn3V80t1i-yN48CU9rAyc,6706
-invenio_app_rdm/communities_ui/views/ui.py,sha256=QBf1QyaXZ46OqUZXU5CDdg10e2HqCaVnggIpJIdVwok,3154
+invenio_app_rdm/communities_ui/views/ui.py,sha256=7Pk0AqwmNJHRd8wuZEvC17l7tpcxs5xQzsC4aXQzV-o,3009
 invenio_app_rdm/fixtures/__init__.py,sha256=XwWy4U66FkpWOEBFfn5EnXfuTKlXnh3HWZNBMDX4Rgk,1512
 invenio_app_rdm/fixtures/oai_sets.py,sha256=ZoS94FNkIsdEJWHihZRYvFAstp3GBrZ0viDml9mQXOI,621
 invenio_app_rdm/fixtures/pages.py,sha256=R2DaRV__iXQ8Zh-fGcs9g16rUKEDp0xV47iZUfoLIx0,1887
@@ -79,7 +80,7 @@ invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/
 invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/locations.html,sha256=27-KyPqb05pu-yRXHvxCgZWRSi5bFP6xf7XBn91sbeA,1741
 invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/stats_popup.html,sha256=5SVzfIS15Aro2Itd2BiaLbMXm0cvvwk6ZCdYjuSwhBw,625
 invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/version.html,sha256=JpE4e6RpbSR2pQD1rOsfvzD2ur584aRfBWUUap2IMBA,688
-invenio_app_rdm/records_ui/views/__init__.py,sha256=4NxQNADuvMsblEsGd3zkKXSNR5_4eLMcFEFYvc6NxVc,5718
+invenio_app_rdm/records_ui/views/__init__.py,sha256=M8eCKOBwsChhQC0alOflXAOl2b-5ke49Bxx6NT7o2vg,5726
 invenio_app_rdm/records_ui/views/decorators.py,sha256=XUSPpstYyh72IdNaIO4wz3sw1fjI_2DNGsKdUu3ueL4,15769
 invenio_app_rdm/records_ui/views/deposits.py,sha256=H7LoSmvPzkjVGfhp3TmjMkQkLpJ7jOdmigjVciLqDvA,21536
 invenio_app_rdm/records_ui/views/filters.py,sha256=Rm55fXJv97cqq8B_6KCe-3PxxHUH4VRu-jd9fTea6r4,6994
@@ -98,10 +99,10 @@ invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/subcommunity/
 invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/subcommunity-invitation/index.html,sha256=347Saf8Fv78uevCbK2nFiOtNFUT0QyZSZS7lgoNzHdQ,1448
 invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/user-access-request/index.html,sha256=ltSP9sYPnpmCKMDYpZYU25Wxr3Dfqe2RNDxm6bVjX_I,1779
 invenio_app_rdm/requests_ui/views/__init__.py,sha256=7QiAyRq8Eu84IXwjzxK63vNeTZnowZ5P85xtw7XgRjs,397
-invenio_app_rdm/requests_ui/views/requests.py,sha256=27QPF10j8pgnLmHujnpYuQscF70rI9EKkDuol-F1jE8,15693
+invenio_app_rdm/requests_ui/views/requests.py,sha256=grC2bQWF36xzeftdOSjy_vBWAGSUbupOliPervenF6s,16048
 invenio_app_rdm/requests_ui/views/ui.py,sha256=DBysYQa__gOCg-pikO6HmoVLmRmMAVWeTBiYhPa7PmA,2359
 invenio_app_rdm/theme/__init__.py,sha256=QbkxNjjOmGKRlie96HfTXgnFeVQjOX0GdiZnHP7pIhs,277
-invenio_app_rdm/theme/views.py,sha256=UJs2_C28BWsXY1JqbRK4_ML1JRtGo1yM2S0_W37JJo4,4545
+invenio_app_rdm/theme/views.py,sha256=sHDaOgCVbBha59S9YK4F68yFo9gg1LdQWyzNzYaEBjo,4312
 invenio_app_rdm/theme/webpack.py,sha256=5ucwIJQgM1y9EFdRcsxv_ThPs7hXRzdmipVBxoU1McI,5090
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/theme.js,sha256=2-BWDEH3YQPwPt1ey3jUHnMrKTyb0JBPRlydk5_reH8,4151
 invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/utils.js,sha256=zKROcc3qE64-UhM8ha42K-EDDxAXMupxoocZZ9bjEHo,3452
@@ -524,7 +525,7 @@ invenio_app_rdm/users_ui/views/__init__.py,sha256=SMdY2NJj9GICfr3Xuok7qdNYVtA2bJ
 invenio_app_rdm/users_ui/views/dashboard.py,sha256=iUn2PrODAwb8ugmMosJKAjPhUzjCiWiAWoXQr9RUFuc,1793
 invenio_app_rdm/users_ui/views/ui.py,sha256=W_eXM8dLVIrNHQB2UEh37C9BYoHauft6RyvcDNFHovA,1742
 invenio_app_rdm/utils/files.py,sha256=CruDyO2gDVadSlWEJD-WHpWHeOQ0juh-Ei9jz3D9yjc,3923
-invenio_app_rdm-13.0.0b2.dev12.dist-info/licenses/LICENSE,sha256=AZXFHRrZa5s4m9DV7zZr4bPGTMUvcEPCodeV_AmFI8k,1204
+invenio_app_rdm-13.0.0b2.dev14.dist-info/licenses/LICENSE,sha256=AZXFHRrZa5s4m9DV7zZr4bPGTMUvcEPCodeV_AmFI8k,1204
 tests/__init__.py,sha256=yKVf0yYRuxmXvyAtLjmfpHGVCsEkZOhs_FojAAM_w-8,244
 tests/conftest.py,sha256=6iR-l-DIpQDxN2LLMu6kbHnLsmAW1m8Lq-j8rNNucf8,8956
 tests/test_tasks.py,sha256=6l25lcMjL3ZuQr4hsxbAEjSTu_J1aKkOB3ZXqOZZIy0,3712
@@ -557,8 +558,8 @@ tests/ui/test_filters.py,sha256=Q90wsJffjMVir7wNX8taGf2KZleLtPbXZXHLTkBpzLA,284
 tests/ui/test_signposting_ui.py,sha256=KCSjQlMD2VKlwQCyZYDwYjtVNL35x3u-ZC4ceD5y21w,3847
 tests/ui/test_static.py,sha256=vO3OQAOhrQESJifnQfM1pw7JYz3J874O8BAb7Cc_PPA,868
 tests/ui/test_stats_ui.py,sha256=LHa_0hjvpYvliSk_jknWy-90CO82jVElUfK5Ua_ZmfA,3554
-invenio_app_rdm-13.0.0b2.dev12.dist-info/METADATA,sha256=R527v3kf8KBH24p6hYLTBVZe7TVEBXN94W2WcW9Dnfc,11959
-invenio_app_rdm-13.0.0b2.dev12.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-invenio_app_rdm-13.0.0b2.dev12.dist-info/entry_points.txt,sha256=r1vTqYNABeWqRMWitzyR9FnBsAy-KYZKZCp95IziyLY,2070
-invenio_app_rdm-13.0.0b2.dev12.dist-info/top_level.txt,sha256=NqTqrntInEAci7EXcNBvouXFMqwyjVQhEI0b7izYRBY,22
-invenio_app_rdm-13.0.0b2.dev12.dist-info/RECORD,,
+invenio_app_rdm-13.0.0b2.dev14.dist-info/METADATA,sha256=CvyWAPM3nrlUqRMNhl3D0m--P-EocQePLD-Q4bLG4wc,12263
+invenio_app_rdm-13.0.0b2.dev14.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+invenio_app_rdm-13.0.0b2.dev14.dist-info/entry_points.txt,sha256=r1vTqYNABeWqRMWitzyR9FnBsAy-KYZKZCp95IziyLY,2070
+invenio_app_rdm-13.0.0b2.dev14.dist-info/top_level.txt,sha256=NqTqrntInEAci7EXcNBvouXFMqwyjVQhEI0b7izYRBY,22
+invenio_app_rdm-13.0.0b2.dev14.dist-info/RECORD,,