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

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

@@ -10,7 +10,12 @@
 Changes
 =======
 
-Versino v13.0.0b3.dev16 (released 2025-05-23)
+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.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b3.dev16
+Version: 13.0.0b3.dev17
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -41,15 +41,17 @@ 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-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 +100,12 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
-Versino v13.0.0b3.dev16 (released 2025-05-23)
+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.dev17}/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.dev17"
 
 __all__ = ("__version__",)

invenio_app_rdm-13.0.0b3.dev17/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.dev17}/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.dev17}/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.dev17}/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.dev17/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/theme/static → invenio_app_rdm-13.0.0b3.dev17/invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm}/robots.txt

@@ -9,3 +9,7 @@ Disallow: /login
 Disallow: /logout
 Disallow: /records/*/preview
 Crawl-delay: 10
+
+{%- for url_of_sitemap_index in urls_of_sitemap_indices %}
+Sitemap: {{ url_of_sitemap_index }}
+{%- endfor %}

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm/theme/views.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2019-2024 CERN.
-# Copyright (C) 2019-2020 Northwestern University.
+# Copyright (C) 2019-2025 Northwestern University.
 # Copyright (C)      2021 TU Wien.
 # Copyright (C) 2023-2024 Graz University of Technology.
 # Copyright (C)      2024 KTH Royal Institute of Technology.
@@ -17,6 +17,7 @@ from invenio_db import db
 from invenio_i18n import get_locale
 from invenio_i18n import lazy_gettext as _
 from invenio_pages.views import create_page_view
+from invenio_sitemap import iterate_urls_of_sitemap_indices
 from invenio_users_resources.forms import NotificationsForm
 
 from invenio_app_rdm.views import create_url_rule
@@ -67,7 +68,10 @@ def index():
 
 def robots():
     """Robots.txt."""
-    return current_app.send_static_file("robots.txt")
+    return render_template(
+        "invenio_app_rdm/robots.txt",
+        urls_of_sitemap_indices=iterate_urls_of_sitemap_indices(),
+    )
 
 
 def help_search():

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invenio-app-rdm
-Version: 13.0.0b3.dev16
+Version: 13.0.0b3.dev17
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -41,15 +41,17 @@ 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-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 +100,12 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
-Versino v13.0.0b3.dev16 (released 2025-05-23)
+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.dev17}/invenio_app_rdm.egg-info/SOURCES.txt

@@ -68,6 +68,7 @@ invenio_app_rdm/administration/views/__init__.py
 invenio_app_rdm/administration/views/ui.py
 invenio_app_rdm/communities_ui/__init__.py
 invenio_app_rdm/communities_ui/searchapp.py
+invenio_app_rdm/communities_ui/sitemap.py
 invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html
 invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
 invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/details/browse/index.html
@@ -83,6 +84,7 @@ invenio_app_rdm/fixtures/data/pages.yaml
 invenio_app_rdm/fixtures/pages/.gitkeep
 invenio_app_rdm/records_ui/__init__.py
 invenio_app_rdm/records_ui/searchapp.py
+invenio_app_rdm/records_ui/sitemap.py
 invenio_app_rdm/records_ui/utils.py
 invenio_app_rdm/records_ui/previewer/__init__.py
 invenio_app_rdm/records_ui/previewer/iiif_simple.py
@@ -389,7 +391,6 @@ invenio_app_rdm/theme/assets/semantic-ui/translations/invenio_app_rdm/messages/z
 invenio_app_rdm/theme/assets/semantic-ui/translations/invenio_app_rdm/messages/zh_TW/translations.json
 invenio_app_rdm/theme/assets/semantic-ui/translations/invenio_app_rdm/scripts/compileCatalog.js
 invenio_app_rdm/theme/assets/semantic-ui/translations/invenio_app_rdm/scripts/initCatalog.js
-invenio_app_rdm/theme/static/robots.txt
 invenio_app_rdm/theme/static/icons/licenses/cc-by-icon.svg
 invenio_app_rdm/theme/static/icons/licenses/cc-by-nc-eu-icon.svg
 invenio_app_rdm/theme/static/icons/licenses/cc-by-nc-icon.svg
@@ -422,6 +423,7 @@ invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/intro_section.html
 invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/javascript.html
 invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/page.html
 invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/page_cover.html
+invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/robots.txt
 invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/searchbar.html
 invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/site_footer.html
 invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/files_integrity_report/email/files_integrity_report.html
@@ -549,6 +551,7 @@ tests/ui/test_deposits.py
 tests/ui/test_export_formats.py
 tests/ui/test_file_download.py
 tests/ui/test_filters.py
+tests/ui/test_robotstxt.py
 tests/ui/test_signposting_ui.py
-tests/ui/test_static.py
+tests/ui/test_sitemaps.py
 tests/ui/test_stats_ui.py

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev17}/invenio_app_rdm.egg-info/requires.txt

@@ -28,11 +28,12 @@ invenio-files-rest<4.0.0,>=3.0.0
 invenio-previewer<4.0.0,>=3.0.0
 invenio-records-files<2.0.0,>=1.2.1
 invenio-communities<19.0.0,>=18.2.0
-invenio-rdm-records<19.0.0,>=18.4.0
+invenio-rdm-records<19.0.0,>=18.14.0
 CairoSVG<3.0.0,>=2.5.2
 invenio-banners<5.0.0,>=4.0.0
 invenio-pages<6.0.0,>=5.0.0
 invenio-audit-logs<1.0.0,>=0.1.0
+invenio-sitemap<2.0.0,>=0.1.0
 
 [elasticsearch7]
 invenio-search[elasticsearch7]<4.0.0,>=3.0.0
@@ -50,3 +51,4 @@ invenio-s3<3.0.0,>=2.0.0
 pytest-black-ng>=0.4.0
 pytest-invenio<4.0.0,>=3.3.0
 Sphinx>=4.5.0
+time-machine<3.0.0,>=2.12.0

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev17}/setup.cfg

@@ -48,17 +48,19 @@ install_requires =
 	invenio-previewer>=3.0.0,<4.0.0
 	invenio-records-files>=1.2.1,<2.0.0
 	invenio-communities>=18.2.0,<19.0.0
-	invenio-rdm-records>=18.4.0,<19.0.0
+	invenio-rdm-records>=18.14.0,<19.0.0
 	CairoSVG>=2.5.2,<3.0.0
 	invenio-banners>=4.0.0,<5.0.0
 	invenio-pages>=5.0.0,<6.0.0
 	invenio-audit-logs>=0.1.0,<1.0.0
+	invenio-sitemap>=0.1.0,<2.0.0
 
 [options.extras_require]
 tests = 
 	pytest-black-ng>=0.4.0
 	pytest-invenio>=3.3.0,<4.0.0
 	Sphinx>=4.5.0
+	time-machine>=2.12.0,<3.0.0
 elasticsearch7 = 
 	invenio-search[elasticsearch7]>=3.0.0,<4.0.0
 opensearch1 = 

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev17}/tests/conftest.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2019-2025 CERN.
-# Copyright (C) 2019-2021 Northwestern University.
+# Copyright (C) 2019-2025 Northwestern University.
 # Copyright (C) 2024-2025 Graz University of Technology.
 #
 # Invenio App RDM is free software; you can redistribute it and/or modify it
@@ -9,6 +9,9 @@
 
 """Common pytest fixtures and plugins."""
 
+import copy
+from collections import namedtuple
+
 # Monkey patch Werkzeug 2.1
 # Flask-Login uses the safe_str_cmp method which has been removed in Werkzeug
 # 2.1. Flask-Login v0.6.0 (yet to be released at the time of writing) fixes the
@@ -27,8 +30,6 @@ except AttributeError:
 
     security.safe_str_cmp = hmac.compare_digest
 
-from collections import namedtuple
-
 import pytest
 from flask_security import login_user
 from flask_security.utils import hash_password
@@ -67,6 +68,12 @@ def subjects_service(app):
     return current_service_registry.get("subjects")
 
 
+@pytest.fixture(scope="module")
+def records_service(app):
+    """Records service."""
+    return current_service_registry.get("records")
+
+
 pytest_plugins = ("celery.contrib.pytest",)
 
 
@@ -168,10 +175,16 @@ def client_with_login(client, users):
     return client
 
 
+def create_vocabulary_type(id_, pid_type):
+    """Create vocabulary type."""
+    vocabulary_service = current_service_registry.get("vocabularies")
+    return vocabulary_service.create_type(system_identity, id_, pid_type)
+
+
 @pytest.fixture(scope="module")
 def resource_type_type(app):
     """Resource type vocabulary type."""
-    return vocabulary_service.create_type(system_identity, "resourcetypes", "rsrct")
+    return create_vocabulary_type("resourcetypes", "rsrct")
 
 
 @pytest.fixture(scope="module")
@@ -207,7 +220,7 @@ def resource_type_item(app, resource_type_type):
 @pytest.fixture(scope="module")
 def languages_type(app):
     """Language vocabulary type."""
-    return vocabulary_service.create_type(system_identity, "languages", "lng")
+    return create_vocabulary_type("languages", "lng")
 
 
 @pytest.fixture(scope="module")
@@ -260,13 +273,118 @@ def subject_item(app, subjects_mesh_scheme, subjects_service):
     return subj
 
 
+@pytest.fixture(scope="module")
+def communitytypes_type(app):
+    """Creates and retrieves a vocabulary type."""
+    return create_vocabulary_type("communitytypes", "comtyp")
+
+
+@pytest.fixture(scope="module")
+def communitytypes(communitytypes_type):
+    """Community types."""
+    vocabulary_service = current_service_registry.get("vocabularies")
+    type_dicts = [
+        {"id": "organization", "title": {"en": "Organization"}},
+        {"id": "event", "title": {"en": "Event"}},
+        {"id": "topic", "title": {"en": "Topic"}},
+        {"id": "project", "title": {"en": "Project"}},
+    ]
+    [t.update({"type": "communitytypes"}) for t in type_dicts]
+    types = [
+        vocabulary_service.create(identity=system_identity, data=t) for t in type_dicts
+    ]
+    vocabulary_service.indexer.refresh()
+    return types
+
+
+@pytest.fixture()
+def community_input():
+    """Community input dict."""
+    return {
+        "access": {
+            "visibility": "public",
+            "member_policy": "open",
+            "record_policy": "open",
+        },
+        "slug": "my_community_id",
+        "metadata": {
+            "title": "My Community",
+            # "description": "This is an example Community.",
+            "type": {"id": "event"},
+            # "curation_policy": "This is the kind of records we accept.",
+            # "website": "https://inveniosoftware.org/",
+        },
+    }
+
+
 RunningApp = namedtuple(
     "RunningApp",
-    ["app", "location", "resource_type_item", "language_item", "subject_item"],
+    [
+        "app",
+        "location",
+        "resource_type_item",
+        "language_item",
+        "subject_item",
+        "communitytypes",
+    ],
 )
 
 
 @pytest.fixture
-def running_app(app, location, resource_type_item, language_item, subject_item):
+def running_app(
+    app, location, resource_type_item, language_item, subject_item, communitytypes
+):
     """Fixture mimicking a running app."""
-    return RunningApp(app, location, resource_type_item, language_item, subject_item)
+    return RunningApp(
+        app, location, resource_type_item, language_item, subject_item, communitytypes
+    )
+
+
+@pytest.fixture()
+def create_record(running_app, minimal_record, records_service):
+    """Record creation and publication function fixture."""
+    files_service = records_service.draft_files
+
+    def _create_record(identity=None, data=minimal_record, files=None):
+        """Create and publish an RDMRecord.
+
+        Optionally assign it files.
+        """
+        idty = identity or system_identity
+        data_copy = copy.deepcopy(data)
+        if files:
+            data_copy["files"] = {"enabled": True}
+
+        draft_data = records_service.create(idty, data_copy)._record
+        pid_value_of_draft = draft_data.pid.pid_value
+        if files:
+            files_service.init_files(idty, pid_value_of_draft, [f.data for f in files])
+            for f in files:
+                files_service.set_file_content(
+                    idty,
+                    id_=pid_value_of_draft,
+                    file_key=f.data["key"],
+                    stream=f.content,
+                    content_length=f.content.getbuffer().nbytes,
+                )
+                files_service.commit_file(
+                    idty, id_=pid_value_of_draft, file_key=f.data["key"]
+                )
+
+        record_result = records_service.publish(idty, id_=pid_value_of_draft)
+        return record_result
+
+    return _create_record
+
+
+@pytest.fixture()
+def create_community(running_app, community_input):
+    """Community creation function fixture."""
+    community_service = current_service_registry.get("communities")
+
+    def _create_community(identity=None, data=community_input):
+        """Create a community."""
+        idty = identity or system_identity
+        return community_service.create(idty, data)
+
+    return _create_community

{invenio_app_rdm-13.0.0b3.dev16 → invenio_app_rdm-13.0.0b3.dev17}/tests/ui/conftest.py

@@ -20,7 +20,7 @@ from flask_webpackext.manifest import (
 )
 from invenio_access.permissions import any_user, authenticated_user, system_identity
 from invenio_app.factory import create_ui
-from invenio_rdm_records.proxies import current_rdm_records
+from invenio_rdm_records.proxies import current_rdm_records_service
 from invenio_search import current_search
 
 
@@ -67,11 +67,9 @@ def index_templates(running_app):
 
 
 @pytest.fixture()
-def record(running_app, minimal_record):
+def record(running_app, minimal_record, create_record):
     """Create and publish a record."""
-    s = current_rdm_records.records_service
-    draft = s.create(system_identity, minimal_record)
-    return s.publish(system_identity, draft.id)
+    return create_record(data=minimal_record)
 
 
 @pytest.fixture()
@@ -83,7 +81,7 @@ def draft_with_file(running_app, minimal_record, users):
     user_identity = Identity(users["user1"].id)
     user_identity.provides.add(any_user)
     user_identity.provides.add(authenticated_user)
-    record_service = current_rdm_records.records_service
+    record_service = current_rdm_records_service
     file_service = record_service.draft_files
 
     draft = record_service.create(user_identity, minimal_record)
@@ -95,7 +93,7 @@ def draft_with_file(running_app, minimal_record, users):
             "metadata": {
                 "description": "Published article PDF.",
             },
-        }
+        },
     ]
     file_service.init_files(system_identity, draft.id, file_to_initialise)
     content = BytesIO(b"test file content")
@@ -113,5 +111,5 @@ def draft_with_file(running_app, minimal_record, users):
 @pytest.fixture()
 def record_with_file(draft_with_file):
     """Create and publish a record with file."""
-    record_service = current_rdm_records.records_service
+    record_service = current_rdm_records_service
     return record_service.publish(system_identity, draft_with_file.id)