Merge branch 'master' into fix/mathjax-description-wrap

TahaKhan998 · web-flow · commit 9e3b4b127b2e · 2026-04-07T13:17:19.000+02:00
diff --git a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/collection.html
@@ -41,7 +41,7 @@ <h1 class="ui medium header">
 
     {% if root_collection.breadcrumbs %}
     {%- for breadcrumb in root_collection.breadcrumbs -%}
-    <a class="section" href="{{ breadcrumb.link }}">
+    <a class="section" href="{{ breadcrumb.link or url_for('invenio_app_rdm_communities.community_collection', pid_value=community.slug, tree_slug=tree.slug, collection_slug=breadcrumb.slug) }}">
       {{ breadcrumb.title }}
     </a>
     {% if not loop.last %}
diff --git a/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html b/invenio_app_rdm/communities_ui/templates/semantic-ui/invenio_communities/collections/macros.html
@@ -6,8 +6,15 @@
     <div class="ui grid">
       <div class="twelve wide column middle aligned left floated">
         <div class="flex align-items-center">
-          <img class="computer only rel-mr-1" src="{{ logo_url }}" width="45" height="auto" alt=""
-            onerror="null;"/>
+          <div class="collection-logo-wrapper computer only">
+            <img class="collection-logo"
+                 src="{{ logo_url }}"
+                 alt="{{ root_collection.title }}"
+                 onerror="this.style.display='none'; this.nextElementSibling.style.display='flex';" />
+            <div class="collection-logo-fallback" style="display:none;">
+              <i class="folder open outline icon"></i>
+            </div>
+          </div>
           <h4 class="theme-primary-text mt-0">
             <a
               href='{{ url_for("invenio_app_rdm_communities.community_collection", pid_value=community.slug, collection_slug=root_collection.slug, tree_slug=tree.slug )}}'>
diff --git a/invenio_app_rdm/communities_ui/views/communities.py b/invenio_app_rdm/communities_ui/views/communities.py
@@ -129,7 +129,7 @@ def communities_browse(pid_value, community, community_ui):
     collections_service = current_collections.service
 
     trees_ui = collections_service.list_trees(
-        g.identity, community_id=community.id, depth=2
+        g.identity, namespace_id=community.id, depth=2
     ).to_dict()
     return render_community_theme_template(
         "invenio_communities/details/browse/index.html",
@@ -180,7 +180,7 @@ def community_collection(
     try:
         collection = collections_service.read(
             identity=g.identity,
-            community_id=community.id,
+            namespace_id=community.id,
             slug=collection_slug,
             tree_slug=tree_slug,
         )
diff --git a/invenio_app_rdm/communities_ui/views/ui.py b/invenio_app_rdm/communities_ui/views/ui.py
@@ -9,7 +9,8 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 """Communities UI blueprints module."""
 
-from flask import Blueprint, current_app, request
+from flask import Blueprint, current_app, g, request
+from invenio_collections.proxies import current_collections
 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 (
@@ -37,10 +38,29 @@
 
 def _show_browse_page():
     """Whether the browse page should be visible in the menu."""
-    return (
-        current_app.config.get("COMMUNITIES_SHOW_BROWSE_MENU_ENTRY", False)
-        and request.community["children"]["allow"]
-    )
+    feature_enabled = current_app.config.get("COMMUNITIES_COLLECTIONS_ENABLED", True)
+    if not feature_enabled:
+        return False
+
+    community = getattr(request, "community", None)
+    if not community:
+        return False
+
+    subcommunities_enabled = community.get("children", {}).get("allow", False)
+
+    has_collections = False
+    try:
+        collections_service = current_collections.service
+        community_id = community.get("id")
+        if community_id:
+            trees = collections_service.list_trees(
+                g.identity, namespace_id=community_id, depth=0
+            )
+            has_collections = len(trees.to_dict()) > 0
+    except Exception:
+        has_collections = False
+
+    return subcommunities_enabled or has_collections
 
 
 def create_ui_blueprint(app):
diff --git a/invenio_app_rdm/config.py b/invenio_app_rdm/config.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2025 CERN.
+# Copyright (C) 2019-2026 CERN.
 # Copyright (C) 2019-2020 Northwestern University.
 # Copyright (C) 2021-2025 Graz University of Technology.
 # Copyright (C) 2022-2025 KTH Royal Institute of Technology.
@@ -80,7 +80,6 @@
     InvalidAccessRestrictions,
     InvalidCommunityVisibility,
 )
-from invenio_rdm_records.services.github.release import RDMGithubRelease
 from invenio_rdm_records.services.permissions import RDMRequestsPermissionPolicy
 from invenio_rdm_records.services.stats import permissions_policy_lookup_factory
 from invenio_rdm_records.services.tasks import StatsRDMReindexTask
@@ -1065,8 +1064,6 @@ def github_link_render(record):
 }
 """Community requests search configuration (i.e list of community requests)"""
 
-COMMUNITIES_SHOW_BROWSE_MENU_ENTRY = False
-"""Toggle to show or hide the 'Browse' menu entry for communities."""
 
 # Invenio-RDM-Records
 # ===================
@@ -1480,13 +1477,6 @@ def github_link_render(record):
 }
 
 
-# Invenio-Github
-# =================
-#
-GITHUB_RELEASE_CLASS = RDMGithubRelease
-"""Default RDM release class."""
-
-
 # Flask-Menu
 # ==========
 #
@@ -1564,3 +1554,11 @@ def github_link_render(record):
     "is_open": {"facet": facets.is_open, "ui": {"field": "is_open"}},
 }
 """Available facets defined for this module."""
+
+# Invenio-VCS
+# ===========
+VCS_TEMPLATE_INDEX = "invenio_vcs/rdm-index.html"
+VCS_TEMPLATE_INDEX_ITEM = "invenio_vcs/rdm-index-item.html"
+VCS_TEMPLATE_VIEW = "invenio_vcs/rdm-view.html"
+VCS_TEMPLATE_REPO_SWITCH = "invenio_vcs/rdm-repo-switch.html"
+VCS_TEMPLATE_RELEASE_ITEM = "invenio_vcs/rdm-release-item.html"
diff --git a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/creatibutors.html b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/creatibutors.html
@@ -34,7 +34,7 @@ <h3 class="sr-only">{{ _('Authors/Creators') }}</h3>
           <h3>{{ _('Contributors') }}</h3>
           {%- 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>
+            <h3 class="creatibutors-header ui small header">{{group.grouper}}{% if group.list|length > 1 %} ({{group.list|length}}){% endif %}:</h3>
             <ul class="creatibutors">
               {{ show_creatibutors(group.list, show_affiliations=True, type="contributors") }}
             </ul>
diff --git a/invenio_app_rdm/records_ui/views/records.py b/invenio_app_rdm/records_ui/views/records.py
@@ -473,7 +473,7 @@ def record_latest(record=None, **kwargs):
 
 @pass_record_from_pid
 def record_from_pid(record=None, **kwargs):
-    """Redirect to record's latest version page."""
+    """Redirect to record's page."""
     return redirect(record["links"]["self_html"], code=302)
 
 
diff --git a/invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/community-invitation/user_dashboard.html b/invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/community-invitation/user_dashboard.html
@@ -2,25 +2,13 @@
 
   This file is part of Invenio.
   Copyright (C) 2022 CERN.
+  Copyright (C) 2026 Northwestern University.
 
   Invenio is free software; you can redistribute it and/or modify it
   under the terms of the MIT License; see LICENSE file for more details.
 #}
-{% set title = invenio_request.title %}
-{% extends "invenio_requests/details/index.html" %}
-{% from "invenio_requests/macros/request_header.html" import invitation_request_header %}
-
-
-{% block request_header %}
-  {% set back_button_url = url_for("invenio_app_rdm_users.requests") %}
-  {{
-    invitation_request_header(
-      back_button_url=back_button_url,
-      back_button_text=_("Back to requests"),
-      request=invenio_request,
-      accepted=request_is_accepted
-    )
-  }}
-{% endblock %}
-
-{% set active_dashboard_menu_item = 'requests' %}
+{#
+  Kept as pure extension with no customization only to keep the call structure
+  in the view for those who do have customization.
+#}
+{% extends "invenio_requests/user_dashboard.html" %}
diff --git a/invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/community-membership-request/user_dashboard.html b/invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/community-membership-request/user_dashboard.html
@@ -0,0 +1,13 @@
+{# -*- coding: utf-8 -*-
+
+  Copyright (C) 2026 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.
+#}
+
+{#
+  Kept as pure extension with no customization only to keep the call structure
+  in the view for those who do have customization.
+#}
+{% extends "invenio_requests/user_dashboard.html" %}
diff --git a/invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/user_dashboard.html b/invenio_app_rdm/requests_ui/templates/semantic-ui/invenio_requests/user_dashboard.html
@@ -0,0 +1,37 @@
+{# -*- coding: utf-8 -*-
+
+  Copyright (C) 2026 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.
+#}
+
+{% extends "invenio_requests/details/index.html" %}
+
+{% set title = invenio_request.title %}
+{% set active_dashboard_menu_item = 'requests' %}
+
+{% block request_header %}
+  <div class="flex wrap space-between">
+    <div class="mb-10">
+      <a href="{{ url_for('invenio_app_rdm_users.requests') }}" class="ui small button labeled icon rel-mr-1">
+        <i class="ui icon left arrow" aria-hidden="true"></i>
+        {{ _("Back to requests") }}
+      </a>
+    </div>
+
+    <div id="request-actions" class="flex align-items-center ml-auto mb-10">
+      {% if is_accepted_request(invenio_request) %}
+      <a href="{{ url_for('invenio_app_rdm_communities.communities_detail', pid_value=invenio_request.topic.community) }}"
+        class="ui small button">
+        {{ _("View Community") }}
+      </a>
+      {% endif %}
+    </div>
+  </div>
+
+  <h2 class="ui header">{{ invenio_request.title }}</h2>
+  <p class="ui header">{{ invenio_request.description|safe }}</p>
+
+  <div class="ui divider"></div>
+{% endblock %}
diff --git a/invenio_app_rdm/requests_ui/views/requests.py b/invenio_app_rdm/requests_ui/views/requests.py
@@ -191,6 +191,7 @@ def user_dashboard_request_view(request, **kwargs):
     )
 
     if has_record_topic:
+        # Submission or inclusion request
         topic = _resolve_topic_record(request)
         record_ui = topic["record_ui"]
         record = topic["record"]
@@ -243,14 +244,14 @@ def user_dashboard_request_view(request, **kwargs):
         )
 
     elif has_community_topic or not has_topic:
+        # Invitation or membership request
         return render_template(
             f"invenio_requests/{request_type}/user_dashboard.html",
             base_template="invenio_app_rdm/users/base.html",
             user_avatar=avatar,
             invenio_request=request.to_dict(),
-            request_is_accepted=request_is_accepted,
             permissions={**request_permissions},
-            include_deleted=False,
+            include_deleted=False,  # Could probably be removed
         )
 
     topic = _resolve_topic_record(request)
@@ -372,3 +373,8 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
             user_avatar=avatar,
             include_deleted=False,
         )
+
+
+def is_accepted_request(request_dict):
+    """Jinja test for if request is accepted."""
+    return request_dict["status"] == AcceptAction.status_to
diff --git a/invenio_app_rdm/requests_ui/views/ui.py b/invenio_app_rdm/requests_ui/views/ui.py
@@ -23,7 +23,11 @@
 from sqlalchemy.exc import NoResultFound
 
 from ...records_ui.searchapp import search_app_context
-from .requests import community_dashboard_request_view, user_dashboard_request_view
+from .requests import (
+    community_dashboard_request_view,
+    is_accepted_request,
+    user_dashboard_request_view,
+)
 
 
 def create_ui_blueprint(app):
@@ -37,6 +41,7 @@ def create_ui_blueprint(app):
         static_folder="../static",
     )
 
+    # Register url rules
     blueprint.add_url_rule(
         routes["user-dashboard-request-details"],
         view_func=user_dashboard_request_view,
@@ -67,6 +72,11 @@ def create_ui_blueprint(app):
     blueprint.register_error_handler(PIDDoesNotExistError, not_found_error)
     # due to requests found by ID, not PID (check service read method)
     blueprint.register_error_handler(NoResultFound, not_found_error)
+
+    # Register app-scoped context processors
     blueprint.app_context_processor(search_app_context)
 
+    # Register blueprint-scoped context processors
+    blueprint.context_processor(lambda: {"is_accepted_request": is_accepted_request})
+
     return blueprint
diff --git a/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/AccessRequestForm.js b/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/AccessRequestForm.js
@@ -197,7 +197,7 @@ export class AccessRequestForm extends Component {
                           control={Checkbox}
                           fieldPath="consent_to_share_personal_data"
                           label={i18next.t(
-                            "I agree to that my full name and email address is shared with the owners of the record"
+                            "I agree that my full name and email address will be shared with the owners of the record"
                           )}
                           onChange={this.handleChangeConsent}
                         />
diff --git a/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/ShareOptions/AccessUsersGroups/AddUserGroupAccessModal.js b/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/ShareOptions/AccessUsersGroups/AddUserGroupAccessModal.js
@@ -78,7 +78,9 @@ export class AddUserGroupAccessModal extends Component {
       searchBarTooltip = i18next.t(
         "Search for users to grant access (only users with a public profile can be invited)"
       );
-      searchBarPlaceholder = i18next.t("Search by email, full name or username");
+      searchBarPlaceholder = i18next.t(
+        "Search by full name, username or email (if publicly visible)"
+      );
       doneButtonTipType = i18next.t("users");
     }
     if (searchType === "role") {
diff --git a/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/requests.js b/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/requests.js
@@ -18,6 +18,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import { overrideStore, parametrize } from "react-overridable";
 import { withState } from "react-searchkit";
+import { Icon } from "semantic-ui-react";
 import { defaultContribComponents } from "@js/invenio_requests/contrib";
 import { RDMRecordSearchBarElement } from "../search/components";
 import {
@@ -56,6 +57,20 @@ const RequestsSearchLayoutWithApp = parametrize(RequestsSearchLayout, {
   showSharedFilters: true,
 });
 
+/**
+ * This component is used to override the icon of a membership
+ * request. For now it's placed here rather than like others in
+ * invenio-requests/invenio_requests/assets/semantic-ui/js/invenio_requests/
+ * contrib/Icons.js bc that repository shouldn't know about specific
+ * request implementations in the first place. It's ideal location might be
+ * in invenio-communities, but because of simple implementation, development
+ * order and low cost of repeating, it's here for now. It can eventually be
+ * moved.
+ */
+function CommunityMembershipRequestIcon() {
+  return <Icon name="user plus" className="neutral" />;
+}
+
 export const defaultComponents = {
   [`${appName}.BucketAggregation.element`]: ContribBucketAggregationElement,
   [`${appName}.BucketAggregationValues.element`]: ContribBucketAggregationValuesElement,
@@ -68,6 +83,8 @@ export const defaultComponents = {
   [`${appName}.SearchBar.element`]: RDMRecordSearchBarElement,
   [`${appName}.EmptyResults.element`]: RequestsEmptyResultsWithState,
   ...defaultContribComponents,
+  "InvenioRequests.RequestTypeIcon.layout.community-membership-request":
+    CommunityMembershipRequestIcon,
 };
 
 const overriddenComponents = overrideStore.getAll();
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -200,7 +200,7 @@ def resource_type_item(app, resource_type_type):
                 "datacite_general": "Image",
                 "datacite_type": "Photo",
                 "eurepo": "info:eu-repo/semantic/image-photo",
-                "openaire_resourceType": "25",
+                "openaire_resourceType": "0025",
                 "openaire_type": "dataset",
                 "schema.org": "https://schema.org/Photograph",
                 "subtype": "image-photo",
diff --git a/tests/ui/test_deposits.py b/tests/ui/test_deposits.py
@@ -29,7 +29,7 @@ def additional_resource_types(running_app):
                 "datacite_general": "Text",
                 "datacite_type": "",
                 "eurepo": "info:eu-repo/semantics/other",
-                "openaire_resourceType": "17",
+                "openaire_resourceType": "0017",
                 "openaire_type": "publication",
                 "schema.org": "https://schema.org/CreativeWork",
                 "subtype": "",
@@ -50,7 +50,7 @@ def additional_resource_types(running_app):
                 "datacite_general": "Collection",
                 "datacite_type": "",
                 "eurepo": "info:eu-repo/semantics/technicalDocumentation",
-                "openaire_resourceType": "9",
+                "openaire_resourceType": "0009",
                 "openaire_type": "publication",
                 "schema.org": "https://schema.org/Collection",
                 "subtype": "publication-annotationcollection",
