From ecb42e150d590c6288377c1abc6f21f882e4a4de Mon Sep 17 00:00:00 2001
From: Carlin MacKenzie <carlin.mackenzie@gmail.com>
Date: Wed, 20 Nov 2024 11:00:51 +0100
Subject: [PATCH] config: add subcommunity invitation request notifications

---
 invenio_app_rdm/config.py                     |  5 +++++
 invenio_app_rdm/requests_ui/views/requests.py | 21 +++++--------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/invenio_app_rdm/config.py b/invenio_app_rdm/config.py
index f5a9f099f..6c4de0adf 100644
--- a/invenio_app_rdm/config.py
+++ b/invenio_app_rdm/config.py
@@ -1384,6 +1384,11 @@ def github_link_render(record):
     community_notifications.SubCommunityCreate.type: community_notifications.SubCommunityCreate,
     community_notifications.SubCommunityAccept.type: community_notifications.SubCommunityAccept,
     community_notifications.SubCommunityDecline.type: community_notifications.SubCommunityDecline,
+    # Subcommunity invitation request
+    community_notifications.SubComInvitationCreate.type: community_notifications.SubComInvitationCreate,
+    community_notifications.SubComInvitationAccept.type: community_notifications.SubComInvitationAccept,
+    community_notifications.SubComInvitationDecline.type: community_notifications.SubComInvitationDecline,
+    community_notifications.SubComInvitationExpire.type: community_notifications.SubComInvitationExpire,
 }
 """Notification builders."""
 
diff --git a/invenio_app_rdm/requests_ui/views/requests.py b/invenio_app_rdm/requests_ui/views/requests.py
index 94ed307d6..35c82843e 100644
--- a/invenio_app_rdm/requests_ui/views/requests.py
+++ b/invenio_app_rdm/requests_ui/views/requests.py
@@ -15,8 +15,8 @@
 from invenio_communities.members.services.request import CommunityInvitation
 from invenio_communities.proxies import current_identities_cache
 from invenio_communities.subcommunities.services.request import (
-    SubCommunityRequest,
     SubCommunityInvitationRequest,
+    SubCommunityRequest,
 )
 from invenio_communities.utils import identity_cache_key
 from invenio_communities.views.communities import render_community_theme_template
@@ -245,7 +245,9 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
     is_record_inclusion = request_type == CommunityInclusion.type_id
     is_member_invitation = request_type == CommunityInvitation.type_id
     is_subcommunity_request = request_type == SubCommunityRequest.type_id
-    is_subcommunity_invitation_request = request_type == SubCommunityInvitationRequest.type_id
+    is_subcommunity_invitation_request = (
+        request_type == SubCommunityInvitationRequest.type_id
+    )
     request_is_accepted = request["status"] == AcceptAction.status_to
 
     permissions = community.has_permissions_to(
@@ -297,20 +299,7 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
             include_deleted=False,
         )
 
-    elif is_subcommunity_request:
-        return render_community_theme_template(
-            f"invenio_requests/{request_type}/index.html",
-            theme=community.to_dict().get("theme", {}),
-            base_template="invenio_communities/details/base.html",
-            invenio_request=request.to_dict(),
-            community=community_ui,
-            permissions=permissions,
-            request_is_accepted=request_is_accepted,
-            user_avatar=avatar,
-            include_deleted=False,
-        )
-
-    elif is_subcommunity_invitation_request:
+    elif is_subcommunity_request or is_subcommunity_invitation_request:
         return render_community_theme_template(
             f"invenio_requests/{request_type}/index.html",
             theme=community.to_dict().get("theme", {}),